Merge pull request #937 from MetaMask/i900-forgot-password-flow

I900 forgot password flow

5 files changed, 28 insertions, 22 deletions

diff --git a/ui/app/actions.js b/ui/app/actions.js
index 58600dd34..1c32c9bb1 100644
--- a/ui/app/actions.js
+++ b/ui/app/actions.js
@@ -26,6 +26,8 @@ var actions = {
   CREATE_NEW_VAULT_IN_PROGRESS: 'CREATE_NEW_VAULT_IN_PROGRESS',
   SHOW_CREATE_VAULT: 'SHOW_CREATE_VAULT',
   SHOW_RESTORE_VAULT: 'SHOW_RESTORE_VAULT',
+  FORGOT_PASSWORD: 'FORGOT_PASSWORD',
+  forgotPassword: forgotPassword,
   SHOW_INIT_MENU: 'SHOW_INIT_MENU',
   SHOW_NEW_VAULT_SEED: 'SHOW_NEW_VAULT_SEED',
   SHOW_INFO_PAGE: 'SHOW_INFO_PAGE',
@@ -184,13 +186,13 @@ function tryUnlockMetamask (password) {
   }
 }
 
-function transitionForward() {
+function transitionForward () {
   return {
     type: this.TRANSITION_FORWARD,
   }
 }
 
-function transitionBackward() {
+function transitionBackward () {
   return {
     type: this.TRANSITION_BACKWARD,
   }
@@ -387,6 +389,12 @@ function showRestoreVault () {
   }
 }
 
+function forgotPassword () {
+  return {
+    type: actions.FORGOT_PASSWORD,
+  }
+}
+
 function showInitializeMenu () {
   return {
     type: actions.SHOW_INIT_MENU,
diff --git a/ui/app/first-time/init-menu.js b/ui/app/first-time/init-menu.js
index c41aecc48..152d28809 100644
--- a/ui/app/first-time/init-menu.js
+++ b/ui/app/first-time/init-menu.js
@@ -21,7 +21,6 @@ function mapStateToProps (state) {
     // state from plugin
     currentView: state.appState.currentView,
     warning: state.appState.warning,
-    forgottenPassword: state.metamask.isInitialized,
   }
 }
 
@@ -118,17 +117,6 @@ InitializeMenuScreen.prototype.renderMenu = function (state) {
         },
       }, 'Create'),
 
-      state.forgottenPassword ? h('.flex-row.flex-center.flex-grow', [
-        h('p.pointer', {
-          onClick: this.backToUnlockView.bind(this),
-          style: {
-            fontSize: '0.8em',
-            color: 'rgb(247, 134, 28)',
-            textDecoration: 'underline',
-          },
-        }, 'Return to Login'),
-      ]) : null,
-
       h('.flex-row.flex-center.flex-grow', [
         h('p.pointer', {
           onClick: this.showRestoreVault.bind(this),
@@ -159,10 +147,6 @@ InitializeMenuScreen.prototype.showRestoreVault = function () {
   this.props.dispatch(actions.showRestoreVault())
 }
 
-InitializeMenuScreen.prototype.backToUnlockView = function () {
-  this.props.dispatch(actions.backToUnlockView())
-}
-
 InitializeMenuScreen.prototype.createNewVaultAndKeychain = function () {
   var passwordBox = document.getElementById('password-box')
   var password = passwordBox.value
diff --git a/ui/app/keychains/hd/restore-vault.js b/ui/app/keychains/hd/restore-vault.js
index 3fa25a2eb..06e51d9b3 100644
--- a/ui/app/keychains/hd/restore-vault.js
+++ b/ui/app/keychains/hd/restore-vault.js
@@ -14,6 +14,7 @@ function RestoreVaultScreen () {
 function mapStateToProps (state) {
   return {
     warning: state.appState.warning,
+    forgottenPassword: state.appState.forgottenPassword,
   }
 }
 
@@ -100,14 +101,17 @@ RestoreVaultScreen.prototype.render = function () {
         }, 'OK'),
 
       ]),
-
     ])
 
   )
 }
 
 RestoreVaultScreen.prototype.showInitializeMenu = function () {
-  this.props.dispatch(actions.showInitializeMenu())
+  if (this.props.forgottenPassword) {
+    this.props.dispatch(actions.backToUnlockView())
+  } else {
+    this.props.dispatch(actions.showInitializeMenu())
+  }
 }
 
 RestoreVaultScreen.prototype.createOnEnter = function (event) {
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 719d8c8b9..65a3dba49 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -72,6 +72,16 @@ function reduceApp (state, action) {
           name: 'restoreVault',
         },
         transForward: true,
+        forgottenPassword: true,
+      })
+
+    case actions.FORGOT_PASSWORD:
+      return extend(appState, {
+        currentView: {
+          name: 'restoreVault',
+        },
+        transForward: false,
+        forgottenPassword: true,
       })
 
     case actions.SHOW_INIT_MENU:
@@ -169,7 +179,7 @@ function reduceApp (state, action) {
       return extend(appState, {
         warning: null,
         transForward: true,
-        forgottenPassword: !appState.forgottenPassword,
+        forgottenPassword: false,
         currentView: {
           name: 'UnlockScreen',
         },
diff --git a/ui/app/unlock.js b/ui/app/unlock.js
index 17416766d..19f5eaec2 100644
--- a/ui/app/unlock.js
+++ b/ui/app/unlock.js
@@ -70,7 +70,7 @@ UnlockScreen.prototype.render = function () {
 
       h('.flex-row.flex-center.flex-grow', [
         h('p.pointer', {
-          onClick: () => this.props.dispatch(actions.goBackToInitView()),
+          onClick: () => this.props.dispatch(actions.forgotPassword()),
           style: {
             fontSize: '0.8em',
             color: 'rgb(247, 134, 28)',