diff options
author | Dan Miller <danjm.com@gmail.com> | 2018-11-14 00:36:52 +0800 |
---|---|---|
committer | Dan Miller <danjm.com@gmail.com> | 2018-12-04 11:36:22 +0800 |
commit | 7f2c5c09de67a67972fcbaae254d39aac6c96f56 (patch) | |
tree | 827332f85c8086dbdb427d6addbf10eef03a9bb6 /ui/app/components/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js | |
parent | fe535159bb3ec5849d670d9bc53067f5d6f330b7 (diff) | |
download | tangerine-wallet-browser-7f2c5c09de67a67972fcbaae254d39aac6c96f56.tar.gz tangerine-wallet-browser-7f2c5c09de67a67972fcbaae254d39aac6c96f56.tar.zst tangerine-wallet-browser-7f2c5c09de67a67972fcbaae254d39aac6c96f56.zip |
Uses more reliable api on main send screen; caches basic api results in modal
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.js | 10 |
1 files changed, 8 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 c3b7a5960..770493be0 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 @@ -13,6 +13,8 @@ import { setCustomGasLimit, resetCustomData, setCustomTimeEstimate, + fetchGasEstimates, + fetchBasicGasAndTimeEstimates, } from '../../../ducks/gas.duck' import { hideGasButtonGroup, @@ -28,7 +30,7 @@ import { } from '../../../selectors.js' import { formatTimeEstimate, - getAveragePriceEstimateInHexWEI, + getFastPriceEstimateInHexWEI, getBasicGasEstimateLoadingStatus, getCustomGasLimit, getCustomGasPrice, @@ -36,6 +38,7 @@ import { getEstimatedGasPrices, getEstimatedGasTimes, getRenderableBasicEstimateData, + getBasicGasEstimateBlockTime, } from '../../../selectors/custom-gas' import { submittedPendingTransactionsSelector, @@ -100,6 +103,7 @@ const mapStateToProps = (state, ownProps) => { customGasLimit: calcCustomGasLimit(customModalGasLimitInHex), newTotalFiat, currentTimeEstimate: getRenderableTimeEstimate(customGasPrice, gasPrices, estimatedTimes), + blockTime: getBasicGasEstimateBlockTime(state), gasPriceButtonGroupProps: { buttonDataLoading, defaultActiveButtonIndex: getDefaultActiveButtonIndex(gasButtonInfo, customModalGasPriceInHex), @@ -150,6 +154,8 @@ const mapDispatchToProps = dispatch => { hideGasButtonGroup: () => dispatch(hideGasButtonGroup()), setCustomTimeEstimate: (timeEstimateInSeconds) => dispatch(setCustomTimeEstimate(timeEstimateInSeconds)), hideSidebar: () => dispatch(hideSidebar()), + fetchGasEstimates: (blockTime) => dispatch(fetchGasEstimates(blockTime)), + fetchBasicGasAndTimeEstimates: () => dispatch(fetchBasicGasAndTimeEstimates()), } } @@ -209,7 +215,7 @@ function getTxParams (state, transactionId) { return txData.txParams || pendingTxParams || { from: send.from, gas: send.gasLimit, - gasPrice: send.gasPrice || getAveragePriceEstimateInHexWEI(state), + gasPrice: send.gasPrice || getFastPriceEstimateInHexWEI(state, true), to: send.to, value: getSelectedToken(state) ? '0x0' : send.amount, } |