m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Fix initial tx fee estimation

Browse Source
This commit is contained in:
Dan Finlay 2017-03-23 16:36:33 -07:00
parent 3400ed0955
commit 9bea31a402
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/app/components/hex-as-decimal-input.js
View File

@ -116,7 +116,6 @@ HexAsDecimalInput.prototype.updateValidity = function (event) {
}
const valid = target.checkValidity()
console.log('change triggered checking validity and found ' + valid)
if (valid) {
this.setState({ invalid: null })
}

8
ui/app/components/pending-tx.js
View File

@ -44,11 +44,13 @@ PendingTx.prototype.render = function () {
const account = props.accounts[address]
const balance = account ? account.balance : '0x0'
const gas = (state.gas === undefined) ? txParams.gas : state.gas
const gasPrice = (state.gasPrice === undefined) ? txData.gasPrice : state.gasPrice
const gasBn = new BN(gas, 16)
const gasPriceBn = new BN(gasPrice, 16)
const txFee = state.txFee || txData.txFee || ''
const txFeeBn = new BN(txFee, 16)
const txFeeBn = gasBn.mul(gasPriceBn)
const maxCost = state.maxCost || txData.maxCost || ''
const dataLength = txParams.data ? (txParams.data.length - 2) / 2 : 0
const imageify = props.imageifyIdenticons === undefined ? true : props.imageifyIdenticons
@ -380,7 +382,7 @@ PendingTx.prototype.calculateGas = function () {
const txParams = txMeta.txParams
const gasLimit = new BN(ethUtil.stripHexPrefix(txParams.gas || txMeta.estimatedGas), 16)
const gasPriceHex = state.gasPrice || txData.gasPrice
const gasPriceHex = (state.gasPrice === undefined) ? txData.gasPrice : state.gasPrice
const gasPrice = new BN(ethUtil.stripHexPrefix(gasPriceHex), 16)
const valid = !gasPrice.lt(MIN_GAS_PRICE_BN)