diff options
| author | kumavis <aaron@kumavis.me> | 2018-01-09 05:19:18 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2018-01-09 05:20:38 +0800 |
| commit | 63ae7fb589b43d2af87f31d51f5b5f96669dabe0 (patch) | |
| tree | 671db03d75b41ba318378fab6b670f146fa94ccb /app | |
| parent | 2147b8a59a81334bf9b2d9b3fad713967db7f3c7 (diff) | |
| download | tangerine-wallet-browser-63ae7fb589b43d2af87f31d51f5b5f96669dabe0.tar.gz tangerine-wallet-browser-63ae7fb589b43d2af87f31d51f5b5f96669dabe0.tar.zst tangerine-wallet-browser-63ae7fb589b43d2af87f31d51f5b5f96669dabe0.zip | |
bugfix - transactions controller - breakout logic and fix order of operations bug
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/controllers/transactions.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js index 469deb670..ded9739a8 100644 --- 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 |