From 1481a3ef8e3352eb74fa11c4f578d15d84c76de7 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Sat, 15 Oct 2016 10:48:12 -0700
Subject: Initial work on UI side

---
 ui/app/reducers/app.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index c2ac099a6..2bfb2567a 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -119,6 +119,15 @@ function reduceApp (state, action) {
         warning: null,
       })
 
+    case actions.SHOW_NEW_KEYCHAIN:
+      return extend(appState, {
+        currentView: {
+          name: 'newKeychain',
+          context: appState.currentView.context
+        },
+        transForward: true,
+      })
+
   // unlock
 
     case actions.UNLOCK_METAMASK:
@@ -540,4 +549,3 @@ function indexForPending (state, txId) {
   })
   return idx
 }
-
-- 
cgit v1.2.3


From 40f175c06fbd7de6754dc7ce3597534046c9add8 Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 20 Oct 2016 09:50:29 -0700
Subject: Linted

---
 ui/app/reducers/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 2bfb2567a..5b3f44d68 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -123,7 +123,7 @@ function reduceApp (state, action) {
       return extend(appState, {
         currentView: {
           name: 'newKeychain',
-          context: appState.currentView.context
+          context: appState.currentView.context,
         },
         transForward: true,
       })
-- 
cgit v1.2.3


From 678301a20e6112d79a052c13f921bb75c451c613 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Tue, 25 Oct 2016 13:24:03 -0700
Subject: Phase out extra warning screen.

---
 ui/app/reducers/app.js      | 5 +----
 ui/app/reducers/metamask.js | 6 ------
 2 files changed, 1 insertion(+), 10 deletions(-)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 5b3f44d68..d34cd1c2a 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -29,13 +29,10 @@ function reduceApp (state, action) {
     name: 'createVaultComplete',
     seedWords,
   }
-  var ethStoreWarning = {
-    name: 'EthStoreWarning',
-  }
 
   var appState = extend({
     menuOpen: false,
-    currentView: seedWords ? seedConfView : !state.metamask.isEthConfirmed ? ethStoreWarning : defaultView,
+    currentView: seedWords ? seedConfView : defaultView,
     accountDetail: {
       subview: 'transactions',
     },
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 84953d734..aa809b333 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -10,7 +10,6 @@ function reduceMetamask (state, action) {
   var metamaskState = extend({
     isInitialized: false,
     isUnlocked: false,
-    isEthConfirmed: false,
     rpcTarget: 'https://rawtestrpc.metamask.io/',
     identities: {},
     unconfTxs: {},
@@ -34,11 +33,6 @@ 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,
-- 
cgit v1.2.3


From b5f6ef8c013f2f742546a04e148bac99fbc4691c Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Tue, 1 Nov 2016 17:00:17 -0700
Subject: Fixed bugs related to clearing caches when restoring to a new vault

---
 ui/app/reducers/app.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index d34cd1c2a..49507eb30 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -335,7 +335,7 @@ function reduceApp (state, action) {
 
     case actions.UNLOCK_FAILED:
       return extend(appState, {
-        warning: 'Incorrect password. Try again.',
+        warning: action.value || 'Incorrect password. Try again.',
       })
 
     case actions.SHOW_LOADING:
-- 
cgit v1.2.3


From 23263bec7d5100accd61f7648fd9355fc95e2bb7 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Fri, 11 Nov 2016 10:26:12 -0800
Subject: Linting to the max.

---
 ui/app/reducers/app.js | 1 -
 1 file changed, 1 deletion(-)

(limited to 'ui/app/reducers')

diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 49507eb30..ca450fd89 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -278,7 +278,6 @@ function reduceApp (state, action) {
           warning: null,
         })
       } else {
-
         notification.closePopup()
 
         return extend(appState, {
-- 
cgit v1.2.3


From 7de6b12aad4a674bdbb0749d2e61d9fd5f69c536 Mon Sep 17 00:00:00 2001
From: Kevin Serrano <kevgagser@gmail.com>
Date: Mon, 14 Nov 2016 16:49:16 -0800
Subject: Re-enable disclaimer screen. Rename variables to reflect role more
 clearly.

---
 ui/app/reducers/metamask.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/app/reducers')

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:
-- 
cgit v1.2.3