diff options
author | kumavis <kumavis@users.noreply.github.com> | 2016-10-17 03:54:23 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-17 03:54:23 +0800 |
commit | 11c114599c75c6188703c619135ce41877f83b66 (patch) | |
tree | 115ed3828722fc0a60b83d19bb34b0a198e153b6 /ui/app/components/pending-tx-details.js | |
parent | 8d5b2478e3aa939cb4b0a58b20b199cded62769e (diff) | |
parent | 35232c5e293b30da90049b094d87336bb22dc59e (diff) | |
download | tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.gz tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.bz2 tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.lz tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.xz tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.tar.zst tangerine-wallet-browser-11c114599c75c6188703c619135ce41877f83b66.zip |
Merge pull request #720 from MetaMask/i#495CustomGasField
add a gasPrice field
Diffstat (limited to 'ui/app/components/pending-tx-details.js')
-rw-r--r-- | ui/app/components/pending-tx-details.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js index d8e8524bf..545302098 100644 --- a/ui/app/components/pending-tx-details.js +++ b/ui/app/components/pending-tx-details.js @@ -29,8 +29,10 @@ PTXP.render = function () { var account = props.accounts[address] var balance = account ? account.balance : '0x0' + var gasMultiplier = txData.gasMultiplier var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txData.estimatedGas), 16) var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16) + gasPrice = gasPrice.mul(new BN(gasMultiplier * 100), 10).div(new BN(100, 10)) var txFee = gasCost.mul(gasPrice) var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16) var maxCost = txValue.add(txFee) |