Merge branch 'uat-next' of https://github.com/MetaMask/metamask-extension into cb-254

1 files changed, 23 insertions, 15 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 09af2db2c..0ecfd0dde 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -352,7 +352,6 @@ class App extends Component {
     const {
       noActiveNotices,
       lostAccounts,
-      isInitialized,
       forgottenPassword,
       currentView,
       activeAddress,
@@ -373,6 +372,15 @@ class App extends Component {
       })
     }
 
+    if (forgottenPassword) {
+      log.debug('rendering restore vault screen')
+      return h(Redirect, {
+        to: {
+          pathname: RESTORE_VAULT_ROUTE,
+        },
+      })
+    }
+
     // notices
     if (!noActiveNotices || (lostAccounts && lostAccounts.length > 0)) {
       return h(Redirect, {
@@ -422,20 +430,20 @@ class App extends Component {
     // }
 
     // show initialize screen
-    if (!isInitialized || forgottenPassword) {
-      // show current view
-      log.debug('rendering an initialize screen')
-      // switch (props.currentView.name) {
-
-        // case 'restoreVault':
-        //   log.debug('rendering restore vault screen')
-        //   return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
-
-      //   default:
-      //     log.debug('rendering menu screen')
-      //     return h(InitializeMenuScreen, {key: 'menuScreenInit'})
-      // }
-    }
+    // if (!isInitialized || forgottenPassword) {
+    //   // show current view
+    //   log.debug('rendering an initialize screen')
+    //   // switch (props.currentView.name) {
+
+    //     // case 'restoreVault':
+    //     //   log.debug('rendering restore vault screen')
+    //     //   return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
+
+    //   //   default:
+    //   //     log.debug('rendering menu screen')
+    //   //     return h(InitializeMenuScreen, {key: 'menuScreenInit'})
+    //   // }
+    // }
 
     // // show unlock screen
     // if (!props.isUnlocked) {