diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-13 00:54:08 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-13 00:54:08 +0800 |
| commit | 07d8bfaec51a798e090bd2521debeddaf53bf2f9 (patch) | |
| tree | 735338e1dbaa38601376024ed6e4fa4d89c66a2c /ui/app/reducers.js | |
| parent | 2a0a7853249284cb27831890f3b62847ea27eb83 (diff) | |
| parent | 0d4dbbec2abfa8c8015063d6e4a5ff0d34abe7b9 (diff) | |
| download | tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.gz tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.tar.zst tangerine-wallet-browser-07d8bfaec51a798e090bd2521debeddaf53bf2f9.zip | |
Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support
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 } |