Fix initial tx fee estimation

2 files changed, 5 insertions, 4 deletions

diff --git a/ui/app/components/hex-as-decimal-input.js b/ui/app/components/hex-as-decimal-input.js
index 96a11b84f..e37aaa8c3 100644
--- a/ui/app/components/hex-as-decimal-input.js
+++ b/ui/app/components/hex-as-decimal-input.js
@@ -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 })
   }
diff --git a/ui/app/components/pending-tx.js b/ui/app/components/pending-tx.js
index 82d9b9fe7..9a3ef272d 100644
--- a/ui/app/components/pending-tx.js
+++ b/ui/app/components/pending-tx.js
@@ -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)