diff options
author | kumavis <aaron@kumavis.me> | 2018-03-09 06:14:49 +0800 |
---|---|---|
committer | kumavis <aaron@kumavis.me> | 2018-03-09 06:14:49 +0800 |
commit | 455faece9e9ca110337fcfa19d1cd4a1967c8571 (patch) | |
tree | 8e45aee9455cd10aa681af0f7b7d25485b29ff7f /ui/app/reducers/app.js | |
parent | 1712ab3fff95668e789465d5074b73ef77f959ba (diff) | |
parent | cbb65cc4930ff1571a84ac526a29a76010d6003f (diff) | |
download | tangerine-wallet-browser-455faece9e9ca110337fcfa19d1cd4a1967c8571.tar.gz tangerine-wallet-browser-455faece9e9ca110337fcfa19d1cd4a1967c8571.tar.zst tangerine-wallet-browser-455faece9e9ca110337fcfa19d1cd4a1967c8571.zip |
Merge branch 'master' of github.com:MetaMask/metamask-extension into i3076-UseStorageLocalInstead
Diffstat (limited to 'ui/app/reducers/app.js')
-rw-r--r-- | ui/app/reducers/app.js | 14 |
1 files changed, 9 insertions, 5 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, |