Fix NewUI reveal seed flow. (#3410)

ui/app/actions.js

@@ -853,15 +853,16 @@ function markPasswordForgotten () {
 function unMarkPasswordForgotten () {
   return (dispatch) => {
     return background.unMarkPasswordForgotten(() => {
-      dispatch(actions.forgotPassword())
+      dispatch(actions.forgotPassword(false))
       forceUpdateMetamaskState(dispatch)
     })
   }
 }
 
-function forgotPassword () {
+function forgotPassword (forgotPasswordState = true) {
   return {
     type: actions.FORGOT_PASSWORD,
+    value: forgotPasswordState,
   }
 }
 

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'})

ui/app/reducers/app.js

@@ -140,10 +140,10 @@ function reduceApp (state, action) {
     case actions.FORGOT_PASSWORD:
       return extend(appState, {
         currentView: {
-          name: 'restoreVault',
+          name: action.value ? 'restoreVault' : 'accountDetail',
         },
         transForward: false,
-        forgottenPassword: true,
+        forgottenPassword: action.value,
       })
 
     case actions.SHOW_INIT_MENU:

ui/app/reducers/metamask.js

@@ -43,12 +43,15 @@ function reduceMetamask (state, action) {
     useBlockie: false,
     featureFlags: {},
     networkEndpointType: OLD_UI_NETWORK_TYPE,
+    isRevealingSeedWords: false,
   }, state.metamask)
 
   switch (action.type) {
 
     case actions.SHOW_ACCOUNTS_PAGE:
-      newState = extend(metamaskState)
+      newState = extend(metamaskState, {
+        isRevealingSeedWords: false,
+      })
       delete newState.seedWords
       return newState
 
@@ -124,10 +127,12 @@ function reduceMetamask (state, action) {
         },
       })
 
+
     case actions.SHOW_NEW_VAULT_SEED:
       return extend(metamaskState, {
         isUnlocked: true,
         isInitialized: false,
+        isRevealingSeedWords: true,
         seedWords: action.value,
       })