diff options
author | Frankie <frankie.diamond@gmail.com> | 2016-12-22 06:31:07 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-22 06:31:07 +0800 |
commit | 6f7c23fd28ef37ae51478b735c1f5888c97bbaf5 (patch) | |
tree | b927871ed00c33a66341a26de09f00cf006314b8 /ui/app/reducers/app.js | |
parent | a85c691b71d5142d2412000930328fbe9161760a (diff) | |
parent | 73cdf0bfd49470bad1f0da4d0d894278c87af54e (diff) | |
download | tangerine-wallet-browser-6f7c23fd28ef37ae51478b735c1f5888c97bbaf5.tar.gz tangerine-wallet-browser-6f7c23fd28ef37ae51478b735c1f5888c97bbaf5.tar.zst tangerine-wallet-browser-6f7c23fd28ef37ae51478b735c1f5888c97bbaf5.zip |
Merge branch 'dev' into TxManager
Diffstat (limited to 'ui/app/reducers/app.js')
-rw-r--r-- | ui/app/reducers/app.js | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 67a926948..65a3dba49 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -72,6 +72,16 @@ function reduceApp (state, action) { name: 'restoreVault', }, transForward: true, + forgottenPassword: true, + }) + + case actions.FORGOT_PASSWORD: + return extend(appState, { + currentView: { + name: 'restoreVault', + }, + transForward: false, + forgottenPassword: true, }) case actions.SHOW_INIT_MENU: @@ -169,7 +179,7 @@ function reduceApp (state, action) { return extend(appState, { warning: null, transForward: true, - forgottenPassword: !appState.forgottenPassword, + forgottenPassword: false, currentView: { name: 'UnlockScreen', }, @@ -248,6 +258,12 @@ function reduceApp (state, action) { forgottenPassword: false, }) + case actions.SHOW_NOTICE: + return extend(appState, { + transForward: true, + isLoading: false, + }) + case actions.REVEAL_ACCOUNT: return extend(appState, { scrollToBottom: true, |