Merge pull request #2896 from MetaMask/kumavis-patch-2

bugfix - transaction controller - fix order of operations
7 years ago · f441bb7248
parent 2147b8a59a 9a8670309d
commit f441bb7248
1 changed files with 4 additions and 2 deletions
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@ -180,8 +180,10 @@ module.exports = class TransactionController extends EventEmitter {
    // ensure value
    txMeta.gasPriceSpecified = Boolean(txParams.gasPrice)
    txMeta.nonceSpecified = Boolean(txParams.nonce)
-    const gasPrice = txParams.gasPrice || this.getGasPrice ? this.getGasPrice()
-      : await this.query.gasPrice()
+    let gasPrice = txParams.gasPrice
+    if (!gasPrice) {
+      gasPrice = this.getGasPrice ? this.getGasPrice() : await this.query.gasPrice()
+    }
    txParams.gasPrice = ethUtil.addHexPrefix(gasPrice.toString(16))
    txParams.value = txParams.value || '0x0'
    // set gasLimit