diff options
author | Dan <danjm.com@gmail.com> | 2018-03-09 13:37:27 +0800 |
---|---|---|
committer | Dan <danjm.com@gmail.com> | 2018-03-09 13:37:27 +0800 |
commit | 81e72147ef829acbbed85bced7f0eb4533f2fb17 (patch) | |
tree | 0e13f8ea4e6fb80fe57e437a466e3f7ae04c6c22 /ui/app/reducers/app.js | |
parent | 2d6b378bf8f8f0b23ef54b48118b61fb6c7deee1 (diff) | |
parent | f28bbe5b0392a9ae45f7f17fbc979ef796b27d16 (diff) | |
download | tangerine-wallet-browser-81e72147ef829acbbed85bced7f0eb4533f2fb17.tar.gz tangerine-wallet-browser-81e72147ef829acbbed85bced7f0eb4533f2fb17.tar.zst tangerine-wallet-browser-81e72147ef829acbbed85bced7f0eb4533f2fb17.zip |
Merge branch 'master' into retry-tx-refractor
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, |