aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers.js
diff options
context:
space:
mode:
authorDan J Miller <danjm.com@gmail.com>2018-12-05 00:32:08 +0800
committerGitHub <noreply@github.com>2018-12-05 00:32:08 +0800
commitd1996509deccd98d7ffa4cc360dc96c5392879d3 (patch)
treec8d9dbf1a3b393573f51af2563cdc3f589b1a162 /ui/app/reducers.js
parent35670e926116b19e66931dace838d785adffac09 (diff)
parent8194309a9a7319bcebd6761a4596c208375adfab (diff)
downloadtangerine-wallet-browser-d1996509deccd98d7ffa4cc360dc96c5392879d3.tar
tangerine-wallet-browser-d1996509deccd98d7ffa4cc360dc96c5392879d3.tar.gz
tangerine-wallet-browser-d1996509deccd98d7ffa4cc360dc96c5392879d3.tar.bz2
tangerine-wallet-browser-d1996509deccd98d7ffa4cc360dc96c5392879d3.tar.lz
tangerine-wallet-browser-d1996509deccd98d7ffa4cc360dc96c5392879d3.tar.xz
tangerine-wallet-browser-d1996509deccd98d7ffa4cc360dc96c5392879d3.tar.zst
tangerine-wallet-browser-d1996509deccd98d7ffa4cc360dc96c5392879d3.zip
Merge pull request #5704 from MetaMask/new-gas-customize-feature-branch-d
Gas customization features
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 e1a982f93..786af853d 100644
--- a/ui/app/reducers.js
+++ b/ui/app/reducers.js
@@ -10,6 +10,7 @@ const reduceApp = require('./reducers/app')
const reduceLocale = require('./reducers/locale')
const reduceSend = require('./ducks/send.duck').default
import reduceConfirmTransaction from './ducks/confirm-transaction.duck'
+import reduceGas from './ducks/gas.duck'
window.METAMASK_CACHED_LOG_STATE = null
@@ -49,6 +50,8 @@ function rootReducer (state, action) {
state.confirmTransaction = reduceConfirmTransaction(state, action)
+ state.gas = reduceGas(state, action)
+
window.METAMASK_CACHED_LOG_STATE = state
return state
}