diff options
author | Jenny Pollack <jennypollack3@gmail.com> | 2018-06-08 05:10:56 +0800 |
---|---|---|
committer | Jenny Pollack <jennypollack3@gmail.com> | 2018-06-08 05:10:56 +0800 |
commit | e7c2710a55a49b8a266fa61cfed1caecc2623de7 (patch) | |
tree | c8553c02b63b10626ef561ca0bfe26c560b295d6 /ui/app/reducers.js | |
parent | fd8bcc9cb1b9f9c1cc5ef48eda4952182b23e499 (diff) | |
parent | c0d2dab28b4083ee3ef65b6b561e28c811c6773d (diff) | |
download | tangerine-wallet-browser-e7c2710a55a49b8a266fa61cfed1caecc2623de7.tar tangerine-wallet-browser-e7c2710a55a49b8a266fa61cfed1caecc2623de7.tar.gz tangerine-wallet-browser-e7c2710a55a49b8a266fa61cfed1caecc2623de7.tar.bz2 tangerine-wallet-browser-e7c2710a55a49b8a266fa61cfed1caecc2623de7.tar.lz tangerine-wallet-browser-e7c2710a55a49b8a266fa61cfed1caecc2623de7.tar.xz tangerine-wallet-browser-e7c2710a55a49b8a266fa61cfed1caecc2623de7.tar.zst tangerine-wallet-browser-e7c2710a55a49b8a266fa61cfed1caecc2623de7.zip |
Merge branch 'develop' into save-brave
Diffstat (limited to 'ui/app/reducers.js')
-rw-r--r-- | ui/app/reducers.js | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ui/app/reducers.js b/ui/app/reducers.js index e3a3077d9..0b158a778 100644 --- a/ui/app/reducers.js +++ b/ui/app/reducers.js @@ -7,6 +7,7 @@ const copyToClipboard = require('copy-to-clipboard') const reduceMetamask = require('./reducers/metamask') const reduceApp = require('./reducers/app') const reduceLocale = require('./reducers/locale') +const reduceSend = require('./ducks/send.duck').default window.METAMASK_CACHED_LOG_STATE = null @@ -38,6 +39,12 @@ function rootReducer (state, action) { state.localeMessages = reduceLocale(state, action) + // + // Send + // + + state.send = reduceSend(state, action) + window.METAMASK_CACHED_LOG_STATE = state return state } |