diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2016-12-20 07:28:43 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-20 07:28:43 +0800 |
| commit | f7eec0b282de511d54fd50f2c75d7371ca6f399d (patch) | |
| tree | 7476af4926a4e27999086ee570e46c4f74621b84 /ui/app/reducers/app.js | |
| parent | 1b6ee56cac34cd3544fd375cad342eb8240ae8aa (diff) | |
| parent | 77d2deb17654b87dfd306b7f7cef335b1b511a8f (diff) | |
| download | tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.gz tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.bz2 tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.lz tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.xz tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.tar.zst tangerine-wallet-browser-f7eec0b282de511d54fd50f2c75d7371ca6f399d.zip | |
Merge pull request #936 from MetaMask/MergeMaster
Merge master
Diffstat (limited to 'ui/app/reducers/app.js')
| -rw-r--r-- | ui/app/reducers/app.js | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js index 67a926948..719d8c8b9 100644 --- a/ui/app/reducers/app.js +++ b/ui/app/reducers/app.js @@ -248,6 +248,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, |