diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-01-14 05:26:57 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-14 05:26:57 +0800 |
| commit | 9f162e72b48552b7ab3f2755114c9e2be6d0aace (patch) | |
| tree | ef7323e51a8c80e76471cce2a745ca6a937bc2e5 /ui/app/components/pending-tx-details.js | |
| parent | 29e83d71a82bfdbeadc9fbecfa97d73ef11fecfb (diff) | |
| parent | c1253016fcd678445e860a666ee8c4e04506f01a (diff) | |
| download | tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.gz tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.bz2 tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.lz tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.xz tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.tar.zst tangerine-wallet-browser-9f162e72b48552b7ab3f2755114c9e2be6d0aace.zip | |
Merge branch 'dev' into bug-submitTx
Diffstat (limited to 'ui/app/components/pending-tx-details.js')
| -rw-r--r-- | ui/app/components/pending-tx-details.js | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js index 89472b221..286931f6f 100644 --- a/ui/app/components/pending-tx-details.js +++ b/ui/app/components/pending-tx-details.js @@ -7,8 +7,6 @@ const EthBalance = require('./eth-balance') const util = require('../util') const addressSummary = util.addressSummary const nameForAddress = require('../../lib/contract-namer') -const ethUtil = require('ethereumjs-util') -const BN = ethUtil.BN module.exports = PendingTxDetails @@ -29,15 +27,9 @@ 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) + var txFee = txData.txFee || '' + var maxCost = txData.maxCost || '' var dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0 - var imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons return ( |