From 1145a0a9ad46fda5fb9a7ad9cf5cf062c574691d Mon Sep 17 00:00:00 2001 From: Dan Miller Date: Wed, 12 Dec 2018 11:24:03 -0330 Subject: Ensures that advanced tab gas limit reflects tx gas limit --- .../gas-modal-page-container/gas-modal-page-container.container.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js') 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, -- cgit v1.2.3