diff options
| author | kumavis <aaron@kumavis.me> | 2017-08-04 06:05:32 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-08-04 06:05:32 +0800 |
| commit | da16f396266daa5ab0acc8f0c04d3e25b98c39f0 (patch) | |
| tree | 44fad3fc645ac8165e4832259d8c6fe43196bccb /ui | |
| parent | da7471e0958d30b4465ef35090dbfa05b85471f0 (diff) | |
| download | tangerine-wallet-browser-da16f396266daa5ab0acc8f0c04d3e25b98c39f0.tar.gz tangerine-wallet-browser-da16f396266daa5ab0acc8f0c04d3e25b98c39f0.tar.zst tangerine-wallet-browser-da16f396266daa5ab0acc8f0c04d3e25b98c39f0.zip | |
Merge branch 'master' of github.com:MetaMask/metamask-extension into greenkeeper/initial
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/app/components/pending-tx.js | 2 | ||||
| -rw-r--r-- | ui/app/reducers.js | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index d7d602f31..5324ccd64 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -15,7 +15,7 @@ const addressSummary = util.addressSummary const nameForAddress = require('../../lib/contract-namer') const BNInput = require('./bn-as-decimal-input') -const MIN_GAS_PRICE_GWEI_BN = new BN(2) +const MIN_GAS_PRICE_GWEI_BN = new BN(1) const GWEI_FACTOR = new BN(1e9) const MIN_GAS_PRICE_BN = MIN_GAS_PRICE_GWEI_BN.mul(GWEI_FACTOR) const MIN_GAS_LIMIT_BN = new BN(21000) diff --git a/ui/app/reducers.js b/ui/app/reducers.js index 11efca529..36045772f 100644 --- a/ui/app/reducers.js +++ b/ui/app/reducers.js @@ -43,7 +43,6 @@ function rootReducer (state, action) { window.logState = function () { var stateString = JSON.stringify(window.METAMASK_CACHED_LOG_STATE, removeSeedWords, 2) - console.log(stateString) return stateString } |