Use hex values only in send.js to handle limit and price; GasTooltip accepts and returns values as hex (allows user to enter floats)

1 files changed, 2 insertions, 4 deletions

diff --git a/ui/app/util.js b/ui/app/util.js
index 4b48db0ca..a624726e2 100644
--- a/ui/app/util.js
+++ b/ui/app/util.js
@@ -233,6 +233,7 @@ function bnMultiplyByFraction (targetBN, numerator, denominator) {
 }
 
 function getTxFeeBn (gas, gasPrice = MIN_GAS_PRICE_BN.toString(16), blockGasLimit) {
+  // Gas Limit
   const gasBn = hexToBn(gas)
   const gasLimit = new ethUtil.BN(parseInt(blockGasLimit))
   const safeGasLimit = bnMultiplyByFraction(gasLimit, 19, 20).toString(10)
@@ -240,9 +241,6 @@ function getTxFeeBn (gas, gasPrice = MIN_GAS_PRICE_BN.toString(16), blockGasLimi
   // Gas Price
   const gasPriceBn = hexToBn(gasPrice)
   const txFeeBn = gasBn.mul(gasPriceBn)
-  
-  const fiatMultiplier = hexToBn((1000000000).toString(16))
-  const txFeeAsFiatBn = txFeeBn.mul(fiatMultiplier)
 
-  return txFeeAsFiatBn;
+  return txFeeBn.toString(16);
 }