diff options
| author | Dan Finlay <flyswatter@users.noreply.github.com> | 2017-05-25 07:36:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-25 07:36:00 +0800 |
| commit | 764806d211e026226bf8003cbdd6ff3ec570d5db (patch) | |
| tree | 51954c6b0459310b0f6c4457fa181e8e6d29e44b /ui/app/components/pending-tx.js | |
| parent | a5f6cfe7d7c38686679ad8a5870630d12569f8e2 (diff) | |
| parent | b95f2158bb3094f6a47236c2e0e4e0ae9b87bb91 (diff) | |
| download | tangerine-wallet-browser-764806d211e026226bf8003cbdd6ff3ec570d5db.tar tangerine-wallet-browser-764806d211e026226bf8003cbdd6ff3ec570d5db.tar.gz tangerine-wallet-browser-764806d211e026226bf8003cbdd6ff3ec570d5db.tar.bz2 tangerine-wallet-browser-764806d211e026226bf8003cbdd6ff3ec570d5db.tar.lz tangerine-wallet-browser-764806d211e026226bf8003cbdd6ff3ec570d5db.tar.xz tangerine-wallet-browser-764806d211e026226bf8003cbdd6ff3ec570d5db.tar.zst tangerine-wallet-browser-764806d211e026226bf8003cbdd6ff3ec570d5db.zip | |
Merge pull request #1494 from MetaMask/1472-gasceiling
Add Max GasLimit Ceiling
Diffstat (limited to 'ui/app/components/pending-tx.js')
| -rw-r--r-- | ui/app/components/pending-tx.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js index d66d98dd5..b46f715bc 100644 --- a/ui/app/components/pending-tx.js +++ b/ui/app/components/pending-tx.js @@ -47,6 +47,7 @@ PendingTx.prototype.render = function () { // Gas const gas = txParams.gas const gasBn = hexToBn(gas) + const safeGasLimit = parseInt(txMeta.blockGasLimit) // Gas Price const gasPrice = txParams.gasPrice || MIN_GAS_PRICE_BN.toString(16) @@ -159,6 +160,7 @@ PendingTx.prototype.render = function () { scale: 0, // The hard lower limit for gas. min: MIN_GAS_LIMIT_BN.toString(10), + max: safeGasLimit, suffix: 'UNITS', style: { position: 'relative', |