Merge branch 'master' into buyForm

2 files changed, 23 insertions, 1 deletions

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 06afd0ae1..a9d6e4ff0 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -28,10 +28,13 @@ function reduceApp (state, action) {
     name: 'createVaultComplete',
     seedWords,
   }
+  var ethStoreWarning = {
+    name: 'EthStoreWarning',
+  }
 
   var appState = extend({
     menuOpen: false,
-    currentView: seedWords ? seedConfView : defaultView,
+    currentView: seedWords ? seedConfView : !state.metamask.isEthConfirmed ? ethStoreWarning : defaultView,
     accountDetail: {
       subview: 'transactions',
     },
@@ -366,6 +369,17 @@ function reduceApp (state, action) {
         },
       })
 
+    case actions.SHOW_ETH_WARNING:
+      return extend(appState, {
+        transForward: true,
+        currentView: {
+          name: 'accountDetail',
+          context: appState.currentView.context,
+        },
+        accountDetail: {
+          subview: 'buy-eth-warning',
+        },
+      })
     default:
       return appState
   }
@@ -390,3 +404,5 @@ function indexForPending (state, txId) {
   })
   return idx
 }
+
+
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index f3ef8eb11..4eef20f56 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -10,6 +10,7 @@ function reduceMetamask (state, action) {
   var metamaskState = extend({
     isInitialized: false,
     isUnlocked: false,
+    isEthConfirmed: false,
     currentDomain: 'example.com',
     rpcTarget: 'https://rawtestrpc.metamask.io/',
     identities: {},
@@ -31,6 +32,11 @@ function reduceMetamask (state, action) {
         isConfirmed: true,
       })
 
+    case actions.AGREE_TO_ETH_WARNING:
+      return extend(metamaskState, {
+        isEthConfirmed: !metamaskState.isEthConfirmed,
+      })
+
     case actions.UNLOCK_METAMASK:
       return extend(metamaskState, {
         isUnlocked: true,