aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/reducers
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2018-03-21 04:01:08 +0800
committerkumavis <aaron@kumavis.me>2018-03-21 04:01:08 +0800
commit29cc2f8ab9628d21cc32962666879c71be4e69d1 (patch)
tree592a68784a7e8f7ee600249380fb2f4e11d1e8dd /ui/app/reducers
parent2ddc2cc1fbe5249f70d80e2a74146cb87dcc8421 (diff)
parentfd3e240dd934c0938a57344a6ae09a213aaa8e37 (diff)
downloadtangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.gz
tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.tar.zst
tangerine-wallet-browser-29cc2f8ab9628d21cc32962666879c71be4e69d1.zip
Merge branch 'master' of github.com:MetaMask/metamask-extension into i18n-translator-redux
Diffstat (limited to 'ui/app/reducers')
-rw-r--r--ui/app/reducers/metamask.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/app/reducers/metamask.js b/ui/app/reducers/metamask.js
index 611c55391..6e226b0e6 100644
--- a/ui/app/reducers/metamask.js
+++ b/ui/app/reducers/metamask.js
@@ -38,6 +38,7 @@ function reduceMetamask (state, action) {
errors: {},
maxModeOn: false,
editingTransactionId: null,
+ forceGasMin: null,
},
coinOptions: {},
useBlockie: false,
@@ -298,6 +299,7 @@ function reduceMetamask (state, action) {
memo: '',
errors: {},
editingTransactionId: null,
+ forceGasMin: null,
},
})