aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/app.js
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2018-03-03 10:14:05 +0800
committerGitHub <noreply@github.com>2018-03-03 10:14:05 +0800
commit0d97ff221017b78ccfa02defdb7a52ad701981a5 (patch)
tree76963deed2ee585c79a3dac92b50cd374c012e60 /ui/app/app.js
parent0c163dcb32ddafde8a8ed3e9e21be552a5eeeed5 (diff)
downloadtangerine-wallet-browser-0d97ff221017b78ccfa02defdb7a52ad701981a5.tar
tangerine-wallet-browser-0d97ff221017b78ccfa02defdb7a52ad701981a5.tar.gz
tangerine-wallet-browser-0d97ff221017b78ccfa02defdb7a52ad701981a5.tar.bz2
tangerine-wallet-browser-0d97ff221017b78ccfa02defdb7a52ad701981a5.tar.lz
tangerine-wallet-browser-0d97ff221017b78ccfa02defdb7a52ad701981a5.tar.xz
tangerine-wallet-browser-0d97ff221017b78ccfa02defdb7a52ad701981a5.tar.zst
tangerine-wallet-browser-0d97ff221017b78ccfa02defdb7a52ad701981a5.zip
Fix NewUI reveal seed flow. (#3410)
Diffstat (limited to 'ui/app/app.js')
-rw-r--r--ui/app/app.js14
1 files changed, 11 insertions, 3 deletions
diff --git a/ui/app/app.js b/ui/app/app.js
index 5d37b9bdf..bfa8d8aa7 100644
--- a/ui/app/app.js
+++ b/ui/app/app.js
@@ -89,6 +89,7 @@ function mapStateToProps (state) {
currentCurrency: state.metamask.currentCurrency,
isMouseUser: state.appState.isMouseUser,
betaUI: state.metamask.featureFlags.betaUI,
+ isRevealingSeedWords: state.metamask.isRevealingSeedWords,
// state needed to get account dropdown temporarily rendering from app bar
identities,
@@ -362,9 +363,16 @@ App.prototype.renderBackButton = function (style, justArrow = false) {
App.prototype.renderPrimary = function () {
log.debug('rendering primary')
var props = this.props
- const {isMascara, isOnboarding, betaUI} = props
+ const {
+ isMascara,
+ isOnboarding,
+ betaUI,
+ isRevealingSeedWords,
+ } = props
+ const isMascaraOnboarding = isMascara && isOnboarding
+ const isBetaUIOnboarding = betaUI && isOnboarding && !props.isPopup && !isRevealingSeedWords
- if ((isMascara || betaUI) && isOnboarding && !props.isPopup) {
+ if (isMascaraOnboarding || isBetaUIOnboarding) {
return h(MascaraFirstTime)
}
@@ -388,7 +396,7 @@ App.prototype.renderPrimary = function () {
if (props.isInitialized && props.forgottenPassword) {
log.debug('rendering restore vault screen')
return h(HDRestoreVaultScreen, {key: 'HDRestoreVaultScreen'})
- } else if (!props.isInitialized && !props.isUnlocked) {
+ } else if (!props.isInitialized && !props.isUnlocked && !isRevealingSeedWords) {
log.debug('rendering menu screen')
return props.isPopup
? h(OldUIInitializeMenuScreen, {key: 'menuScreenInit'})