Merge branch 'master' into i3076-UseStorageLocalInstead

1 files changed, 3 insertions, 2 deletions

diff --git a/app/scripts/lib/tx-gas-utils.js b/app/scripts/lib/tx-gas-utils.js
index f68f3a9e2..6f6ff7852 100644
--- a/app/scripts/lib/tx-gas-utils.js
+++ b/app/scripts/lib/tx-gas-utils.js
@@ -4,6 +4,7 @@ const {
   BnMultiplyByFraction,
   bnToHex,
 } = require('./util')
+const addHexPrefix = require('ethereumjs-util').addHexPrefix
 const SIMPLE_GAS_COST = '0x5208' // Hex for 21000, cost of a simple send.
 
 /*
@@ -13,7 +14,7 @@ and used to do things like calculate gas of a tx.
 */
 
 module.exports = class TxGasUtil {
-  
+
   constructor (provider) {
     this.query = new EthQuery(provider)
   }
@@ -68,7 +69,7 @@ module.exports = class TxGasUtil {
   }
 
   setTxGas (txMeta, blockGasLimitHex, estimatedGasHex) {
-    txMeta.estimatedGas = estimatedGasHex
+    txMeta.estimatedGas = addHexPrefix(estimatedGasHex)
     const txParams = txMeta.txParams
 
     // if gasLimit was specified and doesnt OOG,