diff options
| author | Thomas <thomas.b.huang@gmail.com> | 2018-05-08 05:30:43 +0800 |
|---|---|---|
| committer | Thomas <thomas.b.huang@gmail.com> | 2018-05-08 05:30:43 +0800 |
| commit | 8250fd9d6daae3bcef17d8de4e3f2b22ac58ce5b (patch) | |
| tree | 7deae9281915f1499883fc1eb71b6fb62717dd42 /old-ui/app/components | |
| parent | 6bf6589c440330d0089da4012709b831c722945a (diff) | |
| parent | caf5a6c15c3375d9d64116d80d87eb064e955e59 (diff) | |
| download | tangerine-wallet-browser-8250fd9d6daae3bcef17d8de4e3f2b22ac58ce5b.tar tangerine-wallet-browser-8250fd9d6daae3bcef17d8de4e3f2b22ac58ce5b.tar.gz tangerine-wallet-browser-8250fd9d6daae3bcef17d8de4e3f2b22ac58ce5b.tar.bz2 tangerine-wallet-browser-8250fd9d6daae3bcef17d8de4e3f2b22ac58ce5b.tar.lz tangerine-wallet-browser-8250fd9d6daae3bcef17d8de4e3f2b22ac58ce5b.tar.xz tangerine-wallet-browser-8250fd9d6daae3bcef17d8de4e3f2b22ac58ce5b.tar.zst tangerine-wallet-browser-8250fd9d6daae3bcef17d8de4e3f2b22ac58ce5b.zip | |
Merge branch 'develop' into testing
Diffstat (limited to 'old-ui/app/components')
| -rw-r--r-- | old-ui/app/components/buy-button-subview.js | 4 | ||||
| -rw-r--r-- | old-ui/app/components/pending-tx.js | 3 | ||||
| -rw-r--r-- | old-ui/app/components/shapeshift-form.js | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/old-ui/app/components/buy-button-subview.js b/old-ui/app/components/buy-button-subview.js index 56d173839..8bb73ae3e 100644 --- a/old-ui/app/components/buy-button-subview.js +++ b/old-ui/app/components/buy-button-subview.js @@ -8,7 +8,7 @@ const ShapeshiftForm = require('./shapeshift-form') const Loading = require('./loading') const AccountPanel = require('./account-panel') const RadioList = require('./custom-radio-list') -const networkNames = require('../../../app/scripts/config.js').networkNames +const { getNetworkDisplayName } = require('../../../app/scripts/controllers/network/util') module.exports = connect(mapStateToProps)(BuyButtonSubview) @@ -142,7 +142,7 @@ BuyButtonSubview.prototype.primarySubview = function () { case '3': case '4': case '42': - const networkName = networkNames[network] + const networkName = getNetworkDisplayName(network) const label = `${networkName} Test Faucet` return ( h('div.flex-column', { 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), |