aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorDan <danjm.com@gmail.com>2018-03-23 00:59:18 +0800
committerDan <danjm.com@gmail.com>2018-03-23 00:59:18 +0800
commit6393c381173e854e280025e8b89d7e0f105984fc (patch)
tree849a6346abca2fb5c7165011c2bfe49e333afdc7 /ui
parent04b1f8428b487663b276a541d739631954fe0be1 (diff)
downloadtangerine-wallet-browser-6393c381173e854e280025e8b89d7e0f105984fc.tar
tangerine-wallet-browser-6393c381173e854e280025e8b89d7e0f105984fc.tar.gz
tangerine-wallet-browser-6393c381173e854e280025e8b89d7e0f105984fc.tar.bz2
tangerine-wallet-browser-6393c381173e854e280025e8b89d7e0f105984fc.tar.lz
tangerine-wallet-browser-6393c381173e854e280025e8b89d7e0f105984fc.tar.xz
tangerine-wallet-browser-6393c381173e854e280025e8b89d7e0f105984fc.tar.zst
tangerine-wallet-browser-6393c381173e854e280025e8b89d7e0f105984fc.zip
Pop uses new ui onboarding when in beta.
Diffstat (limited to 'ui')
-rw-r--r--ui/app/app.js6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 6d9296131..d1b17ab5d 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -386,7 +386,7 @@ App.prototype.renderPrimary = function () {
isUnlocked,
} = props
const isMascaraOnboarding = isMascara && isOnboarding
- const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords
+ const isBetaUIOnboarding = betaUI && isOnboarding
if (!welcomeScreenSeen && betaUI && !isInitialized && !isUnlocked) {
return h(WelcomeScreen)
@@ -397,7 +397,7 @@ App.prototype.renderPrimary = function () {
}
// notices
- if (!props.noActiveNotices) {
+ if (!props.noActiveNotices && !betaUI) {
log.debug('rendering notice screen for unread notices.')
return h(NoticeScreen, {
notice: props.lastUnreadNotice,
@@ -418,7 +418,7 @@ App.prototype.renderPrimary = function () {
return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
} else if (!props.isInitialized && !props.isUnlocked && !isRevealingSeedWords) {
log.debug('rendering menu screen')
- return props.isPopup
+ return !betaUI
? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'})
: h(InitializeMenuScreen, {key: 'menuScreenInit'})
}