aboutsummaryrefslogtreecommitdiffstats
path: root/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
diff options
context:
space:
mode:
authorDan Miller <danjm.com@gmail.com>2018-12-12 22:54:03 +0800
committerDan Miller <danjm.com@gmail.com>2018-12-12 23:30:57 +0800
commit1145a0a9ad46fda5fb9a7ad9cf5cf062c574691d (patch)
tree8d5e4f3f8b316a6912d987e98dee0919b20f083d /ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
parent9c2401965911aa78496a8168a76e9c0c2e4c86b5 (diff)
downloadtangerine-wallet-browser-1145a0a9ad46fda5fb9a7ad9cf5cf062c574691d.tar
tangerine-wallet-browser-1145a0a9ad46fda5fb9a7ad9cf5cf062c574691d.tar.gz
tangerine-wallet-browser-1145a0a9ad46fda5fb9a7ad9cf5cf062c574691d.tar.bz2
tangerine-wallet-browser-1145a0a9ad46fda5fb9a7ad9cf5cf062c574691d.tar.lz
tangerine-wallet-browser-1145a0a9ad46fda5fb9a7ad9cf5cf062c574691d.tar.xz
tangerine-wallet-browser-1145a0a9ad46fda5fb9a7ad9cf5cf062c574691d.tar.zst
tangerine-wallet-browser-1145a0a9ad46fda5fb9a7ad9cf5cf062c574691d.zip
Ensures that advanced tab gas limit reflects tx gas limit
Diffstat (limited to 'ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js')
-rw-r--r--ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js b/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
index dde0f2b94..1671f95fa 100644
--- a/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
+++ b/ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
@@ -76,7 +76,7 @@ const mapStateToProps = (state, ownProps) => {
const customGasTotal = calcGasTotal(customModalGasLimitInHex, customModalGasPriceInHex)
- const gasButtonInfo = getRenderableBasicEstimateData(state)
+ const gasButtonInfo = getRenderableBasicEstimateData(state, customModalGasLimitInHex)
const currentCurrency = getCurrentCurrency(state)
const conversionRate = getConversionRate(state)
@@ -235,7 +235,7 @@ function getTxParams (state, transactionId) {
const { txParams: pendingTxParams } = pendingTransaction || {}
return txData.txParams || pendingTxParams || {
from: send.from,
- gas: send.gasLimit,
+ gas: send.gasLimit || '0x5208',
gasPrice: send.gasPrice || getFastPriceEstimateInHexWEI(state, true),
to: send.to,
value: getSelectedToken(state) ? '0x0' : send.amount,