diff options
| author | Esteban MIno <efmino@uc.cl> | 2018-08-04 02:56:02 +0800 |
|---|---|---|
| committer | Esteban MIno <efmino@uc.cl> | 2018-08-04 02:56:02 +0800 |
| commit | 21a61f2987ae83a48bb1f7256ec9c34978413eb2 (patch) | |
| tree | 3bc9ef3d342f17269942cd3fe58da1f3b97ef214 /ui/app/reducers.js | |
| parent | 0481335dda447ba4c228d146834952bac0ad641b (diff) | |
| parent | fa4423bab2886017996955f809b6e3102cbf1781 (diff) | |
| download | tangerine-wallet-browser-21a61f2987ae83a48bb1f7256ec9c34978413eb2.tar.gz tangerine-wallet-browser-21a61f2987ae83a48bb1f7256ec9c34978413eb2.tar.zst tangerine-wallet-browser-21a61f2987ae83a48bb1f7256ec9c34978413eb2.zip | |
merge develop
Diffstat (limited to 'ui/app/reducers.js')
| -rw-r--r-- | ui/app/reducers.js | 3 |
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 } |