diff options
author | PhyrexTsai <x01ep23i@hotmail.com> | 2018-07-04 09:06:10 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-04 09:06:10 +0800 |
commit | f38dc03b27a457733315cbb16d59d0ea339505da (patch) | |
tree | 77cfdf13c0e83c8e6d87099bfedddc3d58667de1 /ui/app/reducers.js | |
parent | 11736e6318182ab5b43430410a46059e5f46ad52 (diff) | |
parent | 13b03ec090df70512d43e0d6acbe6bf60040a892 (diff) | |
download | tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.gz tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.tar.zst tangerine-wallet-browser-f38dc03b27a457733315cbb16d59d0ea339505da.zip |
Merge pull request #4 from brunobar79/portal-metamask-lint-fix
Lint fix for Integration ENS with IPFS
Diffstat (limited to 'ui/app/reducers.js')
-rw-r--r-- | ui/app/reducers.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ui/app/reducers.js b/ui/app/reducers.js index f155b2bf3..0b158a778 100644 --- a/ui/app/reducers.js +++ b/ui/app/reducers.js @@ -4,10 +4,10 @@ const copyToClipboard = require('copy-to-clipboard') // // Sub-Reducers take in the complete state and return their sub-state // -const reduceIdentities = require('./reducers/identities') 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 @@ -22,12 +22,6 @@ function rootReducer (state, action) { } // - // Identities - // - - state.identities = reduceIdentities(state, action) - - // // MetaMask // @@ -45,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 } |