diff options
author | Dan Finlay <dan@danfinlay.com> | 2017-03-01 06:08:00 +0800 |
---|---|---|
committer | Dan Finlay <dan@danfinlay.com> | 2017-03-01 06:08:00 +0800 |
commit | da88481560f0f2ad7e12b3e94082aa10147b900e (patch) | |
tree | d90c02a55451768807babb49ef95519d44f93e1c /ui/app/components/pending-tx-details.js | |
parent | 5a74c0fcad92cf4192eefedcb092d4525157902f (diff) | |
download | tangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.tar.gz tangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.tar.zst tangerine-wallet-browser-da88481560f0f2ad7e12b3e94082aa10147b900e.zip |
Remove gasMultiplier txMeta param
This was used by the custom gas slider on the `send` screen, and it was used to modify the gas value before sending it out, breaking our new custom gas field logic.
Removed it and the logic that referred to this now-outdated parameter.
Diffstat (limited to 'ui/app/components/pending-tx-details.js')
-rw-r--r-- | ui/app/components/pending-tx-details.js | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js index 643e69902..f5651bb1d 100644 --- a/ui/app/components/pending-tx-details.js +++ b/ui/app/components/pending-tx-details.js @@ -248,13 +248,11 @@ PTXP.miniAccountPanelForRecipient = function () { } PTXP.componentDidUpdate = function (prevProps, previousState) { + log.debug(`pending-tx-details componentDidUpdate`) const state = this.state || {} const prevState = previousState || {} const { gas, gasPrice } = state - log.debug(`pending-tx-details componentDidUpdate`) - console.log(arguments) - // Only if gas or gasPrice changed: if (!prevState || (gas !== prevState.gas || @@ -269,10 +267,8 @@ PTXP.calculateGas = function () { log.debug(`pending-tx-details calculating gas for ${JSON.stringify(txMeta)}`) var txParams = txMeta.txParams - var gasMultiplier = txMeta.gasMultiplier var gasCost = new BN(ethUtil.stripHexPrefix(txParams.gas || txMeta.estimatedGas), 16) var gasPrice = new BN(ethUtil.stripHexPrefix(txParams.gasPrice || '0x4a817c800'), 16) - gasPrice = gasPrice.mul(new BN(gasMultiplier * 100), 10).div(new BN(100, 10)) var txFee = gasCost.mul(gasPrice) var txValue = new BN(ethUtil.stripHexPrefix(txParams.value || '0x0'), 16) var maxCost = txValue.add(txFee) |