Ensures that mascara initialize screen is not shown in popup. (#3279)

1 files changed, 4 insertions, 1 deletions

diff --git a/ui/app/app.js b/ui/app/app.js
index 5ffd263d1..1a64bb1a4 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -9,6 +9,7 @@ const classnames = require('classnames')
 const MascaraFirstTime = require('../../mascara/src/app/first-time').default
 const MascaraBuyEtherScreen = require('../../mascara/src/app/first-time/buy-ether-screen').default
 // init
+const OldUIInitializeMenuScreen = require('./first-time/init-menu')
 const InitializeMenuScreen = MascaraFirstTime
 const NewKeyChainScreen = require('./new-keychain')
 // accounts
@@ -381,7 +382,9 @@ App.prototype.renderPrimary = function () {
     return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
   } else if (!props.isInitialized) {
     log.debug('rendering menu screen')
-    return h(InitializeMenuScreen, {key: 'menuScreenInit'})
+    return props.isPopup
+      ? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'})
+      : h(InitializeMenuScreen, {key: 'menuScreenInit'})
   }
 
   // show unlock screen