diff options
| author | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-27 07:22:08 +0800 |
|---|---|---|
| committer | Kevin Serrano <kevin.serrano@consensys.net> | 2017-10-27 07:22:08 +0800 |
| commit | 1e9c0a9db2d58e61361bff7430d3a74006ef131c (patch) | |
| tree | 1d1f09bfe2e1985c42d5a117e8e63d19c71a360b /ui/app/components/pending-tx.js | |
| parent | a387def701303e56f721fdc7c716e72641bfaf8f (diff) | |
| parent | 19afb638194a11367250153a710d77011665132a (diff) | |
| download | tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.gz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.bz2 tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.lz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.xz tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.tar.zst tangerine-wallet-browser-1e9c0a9db2d58e61361bff7430d3a74006ef131c.zip | |
Resolve merge conflicts
Diffstat (limited to 'ui/app/components/pending-tx.js')
| -rw-r--r-- | ui/app/components/pending-tx.js | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index c3350fcc1..5b1b367c6 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -15,10 +15,9 @@ 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(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) +// corresponds with 0.1 GWEI +const MIN_GAS_PRICE_BN = new BN('100000000') +const MIN_GAS_LIMIT_BN = new BN('21000') module.exports = PendingTx inherits(PendingTx, Component) @@ -175,7 +174,7 @@ PendingTx.prototype.render = function () { precision: 0, scale: 0, // The hard lower limit for gas. - min: MIN_GAS_LIMIT_BN.toString(10), + min: MIN_GAS_LIMIT_BN, max: safeGasLimit, suffix: 'UNITS', style: { @@ -200,7 +199,7 @@ PendingTx.prototype.render = function () { precision: 9, scale: 9, suffix: 'GWEI', - min: MIN_GAS_PRICE_GWEI_BN.toString(10), + min: MIN_GAS_PRICE_BN, style: { position: 'relative', top: '5px', |