Complete integration of gas chart with redux.

2 files changed, 16 insertions, 2 deletions

diff --git a/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-component.test.js b/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-component.test.js
index bb1a28136..61871f5f3 100644
--- a/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-component.test.js
+++ b/ui/app/components/gas-customization/gas-modal-page-container/tests/gas-modal-page-container-component.test.js
@@ -65,6 +65,7 @@ describe('GasModalPageContainer Component', function () {
       customGasLimit={54321}
       gasPriceButtonGroupProps={mockGasPriceButtonGroupProps}
       infoRowProps={mockInfoRowProps}
+      currentTimeEstimate={'1 min 31 sec'}
       customGasPriceInHex={'mockCustomGasPriceInHex'}
       customGasLimitInHex={'mockCustomGasLimitInHex'}
     />, { context: { t: (str1, str2) => str2 ? str1 + str2 : str1 } })
@@ -199,6 +200,7 @@ describe('GasModalPageContainer Component', function () {
         customGasPrice: 123,
         customGasLimit: 456,
         newTotalFiat: '$0.30',
+        currentTimeEstimate: '1 min 31 sec',
       })
       const advancedTabContentProps = renderAdvancedTabContentResult.props
       assert.equal(advancedTabContentProps.updateCustomGasPrice(), 'mockConvertThenUpdateCustomGasPrice')
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 c16a07b76..3f3be8d0c 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
@@ -75,7 +75,12 @@ describe('gas-modal-page-container container', () => {
             limit: 'aaaaaaaa',
             price: 'ffffffff',
           },
-          priceAndTimeEstimates: 'mockPriceAndTimeEstimates',
+          priceAndTimeEstimates: [
+            { gasprice: 3, expectedTime: '31' },
+            { gasprice: 4, expectedTime: '62' },
+            { gasprice: 5, expectedTime: '93' },
+            { gasprice: 6, expectedTime: '124' },
+          ],
         },
         confirmTransaction: {
           txData: {
@@ -93,11 +98,18 @@ describe('gas-modal-page-container container', () => {
         isConfirm: true,
         customGasPrice: 4.294967295,
         customGasLimit: 2863311530,
+        currentTimeEstimate: '~1 min 11 sec',
         newTotalFiat: '637.41',
         customModalGasLimitInHex: 'aaaaaaaa',
         customModalGasPriceInHex: 'ffffffff',
         gasChartProps: {
-          priceAndTimeEstimates: 'mockPriceAndTimeEstimates',
+          'currentPrice': 4.294967295,
+          priceAndTimeEstimates: [
+            { gasprice: 3, expectedTime: '31' },
+            { gasprice: 4, expectedTime: '62' },
+            { gasprice: 5, expectedTime: '93' },
+            { gasprice: 6, expectedTime: '124' },
+          ],
         },
         gasPriceButtonGroupProps: {
           buttonDataLoading: 'mockBasicGasEstimateLoadingStatus:4',