diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2018-03-14 01:46:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-14 01:46:14 +0800 |
| commit | 572234e383f944eb2be28c4192f209c3972747b7 (patch) | |
| tree | 3d6a214b845790c96e2c98e6c140ed6724d261e4 /ui/app/reducers | |
| parent | 70f33d47472863e3fce41eff60c1fe078efef7de (diff) | |
| parent | 1fa5cec2ec784ace2dd8d1afab6c0d8cc195feb5 (diff) | |
| download | tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.gz tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.tar.zst tangerine-wallet-browser-572234e383f944eb2be28c4192f209c3972747b7.zip | |
Merge branch 'master' into i3033-responsive-newui-onboarding
Diffstat (limited to 'ui/app/reducers')
| -rw-r--r-- | ui/app/reducers/app.js | 14 | ||||
| -rw-r--r-- | ui/app/reducers/metamask.js | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 4dda839a2..74a0f9299 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -138,14 +138,18 @@ function reduceApp (state, action) { }) case actions.FORGOT_PASSWORD: - return extend(appState, { - currentView: { - name: action.value ? 'restoreVault' : 'accountDetail', - }, - transForward: false, + const newState = extend(appState, { forgottenPassword: action.value, }) + if (action.value) { + newState.currentView = { + name: 'restoreVault', + } + } + + return newState + case actions.SHOW_INIT_MENU: return extend(appState, { currentView: defaultView, diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 246d8839b..4ca7d221e 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -131,8 +131,6 @@ function reduceMetamask (state, action) { case actions.SHOW_NEW_VAULT_SEED: return extend(metamaskState, { - isUnlocked: true, - isInitialized: false, isRevealingSeedWords: true, seedWords: action.value, }) |