Re-enable disclaimer screen. Rename variables to reflect role more clearly.

2 files changed, 4 insertions, 4 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index abe609eca..977392c57 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -39,7 +39,7 @@ function mapStateToProps (state) {
   return {
     // state from plugin
     isLoading: state.appState.isLoading,
-    isConfirmed: state.metamask.isConfirmed,
+    isDisclaimerConfirmed: state.metamask.isDisclaimerConfirmed,
     isInitialized: state.metamask.isInitialized,
     isUnlocked: state.metamask.isUnlocked,
     currentView: state.appState.currentView,
@@ -323,7 +323,7 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
 App.prototype.renderBackToInitButton = function () {
   var props = this.props
   var button = null
-  if (!props.isConfirmed) return button
+  if (!props.isDisclaimerConfirmed) return button
 
   if (!props.isUnlocked) {
     if (props.currentView.name === 'InitMenu') {
@@ -356,7 +356,7 @@ App.prototype.renderBackToInitButton = function () {
 App.prototype.renderPrimary = function () {
   var props = this.props
 
-  if (!props.isConfirmed) {
+  if (!props.isDisclaimerConfirmed) {
     return h(DisclaimerScreen, {key: 'disclaimerScreen'})
   }
 
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index aa809b333..82904dcc6 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -30,7 +30,7 @@ function reduceMetamask (state, action) {
 
     case actions.AGREE_TO_DISCLAIMER:
       return extend(metamaskState, {
-        isConfirmed: true,
+        isDisclaimerConfirmed: true,
       })
 
     case actions.UNLOCK_METAMASK: