aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers.js
diff options
context:
space:
mode:
authorEsteban MiƱo <efmino@uc.cl>2018-07-21 08:09:37 +0800
committerGitHub <noreply@github.com>2018-07-21 08:09:37 +0800
commit110efa9ec1525b5fd925de5a0d9350c40823464b (patch)
tree3cfe09a52c4c6b86ced28a32c2190ccf5c3084a2 /ui/app/reducers.js
parent9c955549338f49d8b5eb6ca003c2c65c725aa328 (diff)
parente094d4ad1fb84a9bc663c328d0650bd9d8bf8716 (diff)
downloadtangerine-wallet-browser-110efa9ec1525b5fd925de5a0d9350c40823464b.tar
tangerine-wallet-browser-110efa9ec1525b5fd925de5a0d9350c40823464b.tar.gz
tangerine-wallet-browser-110efa9ec1525b5fd925de5a0d9350c40823464b.tar.bz2
tangerine-wallet-browser-110efa9ec1525b5fd925de5a0d9350c40823464b.tar.lz
tangerine-wallet-browser-110efa9ec1525b5fd925de5a0d9350c40823464b.tar.xz
tangerine-wallet-browser-110efa9ec1525b5fd925de5a0d9350c40823464b.tar.zst
tangerine-wallet-browser-110efa9ec1525b5fd925de5a0d9350c40823464b.zip
Merge branch 'develop' into detectTokenFeature
Diffstat (limited to 'ui/app/reducers.js')
-rw-r--r--ui/app/reducers.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/app/reducers.js b/ui/app/reducers.js
index 0b158a778..80e76d570 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -8,6 +8,7 @@ const reduceMetamask = require('./reducers/metamask')
const reduceApp = require('./reducers/app')
const reduceLocale = require('./reducers/locale')
const reduceSend = require('./ducks/send.duck').default
+import reduceConfirmTransaction from './ducks/confirm-transaction.duck'
window.METAMASK_CACHED_LOG_STATE = null
@@ -45,6 +46,8 @@ function rootReducer (state, action) {
state.send = reduceSend(state, action)
+ state.confirmTransaction = reduceConfirmTransaction(state, action)
+
window.METAMASK_CACHED_LOG_STATE = state
return state
}