diff options
| author | Thomas Huang <tmashuang@users.noreply.github.com> | 2018-05-01 05:37:22 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 05:37:22 +0800 |
| commit | 3180b69b974f8ffc0d6546a647725d1bf8539483 (patch) | |
| tree | f66de97601e859214c3d59eee45c38b337393342 /old-ui | |
| parent | 099fc0917dd5d281b60e2879bd1f555fe0988981 (diff) | |
| parent | 477063a5a0e9f218af2a49886c44a9bc153c13d3 (diff) | |
| download | tangerine-wallet-browser-3180b69b974f8ffc0d6546a647725d1bf8539483.tar tangerine-wallet-browser-3180b69b974f8ffc0d6546a647725d1bf8539483.tar.gz tangerine-wallet-browser-3180b69b974f8ffc0d6546a647725d1bf8539483.tar.bz2 tangerine-wallet-browser-3180b69b974f8ffc0d6546a647725d1bf8539483.tar.lz tangerine-wallet-browser-3180b69b974f8ffc0d6546a647725d1bf8539483.tar.xz tangerine-wallet-browser-3180b69b974f8ffc0d6546a647725d1bf8539483.tar.zst tangerine-wallet-browser-3180b69b974f8ffc0d6546a647725d1bf8539483.zip | |
Merge pull request #4140 from MetaMask/v4.6.1
Version 4.6.1
Diffstat (limited to 'old-ui')
| -rw-r--r-- | old-ui/app/components/pending-tx.js | 3 | ||||
| -rw-r--r-- | old-ui/app/components/shapeshift-form.js | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/old-ui/app/components/pending-tx.js b/old-ui/app/components/pending-tx.js index cd4189fc4..c8132539c 100644 --- a/old-ui/app/components/pending-tx.js +++ b/old-ui/app/components/pending-tx.js @@ -16,8 +16,7 @@ const addressSummary = util.addressSummary const nameForAddress = require('../../lib/contract-namer') const BNInput = require('./bn-as-decimal-input') -// corresponds with 0.1 GWEI -const MIN_GAS_PRICE_BN = new BN('100000000') +const MIN_GAS_PRICE_BN = new BN('0') const MIN_GAS_LIMIT_BN = new BN('21000') module.exports = PendingTx diff --git a/old-ui/app/components/shapeshift-form.js b/old-ui/app/components/shapeshift-form.js index a54987c04..97068db0a 100644 --- a/old-ui/app/components/shapeshift-form.js +++ b/old-ui/app/components/shapeshift-form.js @@ -138,7 +138,7 @@ ShapeshiftForm.prototype.renderMain = function () { width: '229px', height: '82px', }, - }, this.props.warning) + }, this.props.warning + '') : this.renderInfo(), this.renderRefundAddressForCoin(coin), |