Merge pull request #2848 from MetaMask/NewUI-flat

[NewUI] Merge NewUI-flat into uat

1 files changed, 6 insertions, 5 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 1f40eccbe..c6fce0e47 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -360,11 +360,6 @@ App.prototype.renderPrimary = function () {
     })
   }
 
-  if (props.seedWords) {
-    log.debug('rendering seed words')
-    return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
-  }
-
   // show initialize screen
   if (!props.isInitialized || props.forgottenPassword) {
     // show current view
@@ -389,6 +384,12 @@ App.prototype.renderPrimary = function () {
     })
   }
 
+  // show seed words screen
+  if (props.seedWords) {
+    log.debug('rendering seed words')
+    return h(HDCreateVaultComplete, {key: 'HDCreateVaultComplete'})
+  }
+
   // show current view
   switch (props.currentView.name) {