diff options
author | Dan Finlay <dan@danfinlay.com> | 2016-12-20 05:35:43 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2016-12-20 05:37:27 +0800 |
commit | 77d2deb17654b87dfd306b7f7cef335b1b511a8f (patch) | |
tree | 7476af4926a4e27999086ee570e46c4f74621b84 /ui/app/reducers | |
parent | 1b6ee56cac34cd3544fd375cad342eb8240ae8aa (diff) | |
parent | 6ce0bc4b11ccb7ffae4f58980db0301dc418c9c0 (diff) | |
download | tangerine-wallet-browser-77d2deb17654b87dfd306b7f7cef335b1b511a8f.tar.gz tangerine-wallet-browser-77d2deb17654b87dfd306b7f7cef335b1b511a8f.tar.zst tangerine-wallet-browser-77d2deb17654b87dfd306b7f7cef335b1b511a8f.zip |
Merged master into dev
Diffstat (limited to 'ui/app/reducers')
-rw-r--r-- | ui/app/reducers/app.js | 6 | ||||
-rw-r--r-- | ui/app/reducers/metamask.js | 13 |
2 files changed, 19 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, diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js index 1a4514a21..8679ab062 100644 --- a/ui/app/reducers/metamask.js +++ b/ui/app/reducers/metamask.js @@ -16,6 +16,8 @@ function reduceMetamask (state, action) { currentFiat: 'USD', conversionRate: 0, conversionDate: 'N/A', + noActiveNotices: true, + lastUnreadNotice: undefined, }, state.metamask) switch (action.type) { @@ -25,6 +27,17 @@ function reduceMetamask (state, action) { delete newState.seedWords return newState + case actions.SHOW_NOTICE: + return extend(metamaskState, { + noActiveNotices: false, + lastUnreadNotice: action.value, + }) + + case actions.CLEAR_NOTICES: + return extend(metamaskState, { + noActiveNotices: true, + }) + case actions.UPDATE_METAMASK_STATE: return extend(metamaskState, action.value) |