diff options
author | Dan Miller <danjm.com@gmail.com> | 2018-10-24 12:22:22 +0800 |
---|---|---|
committer | Dan Miller <danjm.com@gmail.com> | 2018-12-04 11:36:05 +0800 |
commit | d14af8346af2517db2e50f142377948c9f2ae5e9 (patch) | |
tree | ccdfe345dd000b44c0eedfbee0037969ff2d6f38 /ui/app/components/gas-customization | |
parent | d0619b024fb092182e77e16c6742e157c89b2dc9 (diff) | |
download | tangerine-wallet-browser-d14af8346af2517db2e50f142377948c9f2ae5e9.tar.gz tangerine-wallet-browser-d14af8346af2517db2e50f142377948c9f2ae5e9.tar.zst tangerine-wallet-browser-d14af8346af2517db2e50f142377948c9f2ae5e9.zip |
Improve data management and tests for gas-modal-page-container price estimates.
Diffstat (limited to 'ui/app/components/gas-customization')
2 files changed, 15 insertions, 15 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 67c1ff2e3..64b94e66c 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 @@ -24,13 +24,16 @@ import { getSelectedToken, } from '../../../selectors.js' import { - getCustomGasPrice, - getCustomGasLimit, - getRenderableBasicEstimateData, - getBasicGasEstimateLoadingStatus, + formatTimeEstimate, getAveragePriceEstimateInHexWEI, + getBasicGasEstimateLoadingStatus, + getCustomGasLimit, + getCustomGasPrice, getDefaultActiveButtonIndex, - formatTimeEstimate, + getEstimatedGasPrices, + getEstimatedGasTimes, + getPriceAndTimeEstimates, + getRenderableBasicEstimateData, } from '../../../selectors/custom-gas' import { formatCurrency, @@ -69,9 +72,8 @@ const mapStateToProps = state => { const customGasPrice = calcCustomGasPrice(customModalGasPriceInHex) - const priceAndTimeEstimates = state.gas.priceAndTimeEstimates - const gasPrices = priceAndTimeEstimates.map(({ gasprice }) => gasprice) - const estimatedTimes = priceAndTimeEstimates.map(({ expectedTime }) => expectedTime) + const gasPrices = getEstimatedGasPrices(state) + const estimatedTimes = getEstimatedGasTimes(state) return { hideBasic, @@ -81,7 +83,7 @@ const mapStateToProps = state => { customGasPrice, customGasLimit: calcCustomGasLimit(customModalGasLimitInHex), newTotalFiat, - currentTimeEstimate: getRenderableTimeEstimate(customGasPrice, priceAndTimeEstimates), + currentTimeEstimate: getRenderableTimeEstimate(customGasPrice, getPriceAndTimeEstimates(state)), gasPriceButtonGroupProps: { buttonDataLoading, defaultActiveButtonIndex: getDefaultActiveButtonIndex(gasButtonInfo, customModalGasPriceInHex), diff --git a/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js b/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js index 3f3be8d0c..2170c242d 100644 --- a/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js +++ b/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-container.test.js @@ -104,12 +104,10 @@ describe('gas-modal-page-container container', () => { customModalGasPriceInHex: 'ffffffff', gasChartProps: { 'currentPrice': 4.294967295, - priceAndTimeEstimates: [ - { gasprice: 3, expectedTime: '31' }, - { gasprice: 4, expectedTime: '62' }, - { gasprice: 5, expectedTime: '93' }, - { gasprice: 6, expectedTime: '124' }, - ], + estimatedTimes: ['31', '62', '93', '124'], + estimatedTimesMax: '31', + gasPrices: [3, 4, 5, 6], + gasPricesMax: 7, }, gasPriceButtonGroupProps: { buttonDataLoading: 'mockBasicGasEstimateLoadingStatus:4', |