Improve send slice tests (#11091)

* Improve send slice tests
MetaMask · Jun 7, 2021 · fbf0c6e · fbf0c6e
1 parent 9cc49b5
commit fbf0c6e
Show file tree

Hide file tree

Showing 8 changed files with 1,468 additions and 428 deletions.
diff --git a/...app/gas-customization/gas-modal-page-container/gas-modal-page-container-container.test.js b/...app/gas-customization/gas-modal-page-container/gas-modal-page-container-container.test.js
@@ -12,7 +12,6 @@ import {
   useAdvancedGasEstimation,
   updateGasLimit,
   updateGasPrice,
-  ASSET_TYPES,
 } from '../../../../ducks/send';
 
 let mapDispatchToProps;
@@ -60,7 +59,7 @@ jest.mock('../../../../ducks/send', () => ({
   useAdvancedGasEstimation: jest.fn(),
   updateGasLimit: jest.fn(),
   updateGasPrice: jest.fn(),
-  getSendAsset: jest.fn(() => ({ type: ASSET_TYPES.NATIVE })),
+  getSendAsset: jest.fn(() => ({ type: 'NATIVE' })),
 }));
 
 require('./gas-modal-page-container.container');
@@ -251,7 +250,7 @@ describe('gas-modal-page-container container', () => {
         'mockNewLimit',
         'mockNewPrice',
       ]);
-      expect(dispatchProps.useAdvancedGasEstimation.callCount).toStrictEqual(0);
+      expect(dispatchProps.useAdvancedGasEstimation.callCount).toStrictEqual(1);
       expect(dispatchProps.cancelAndClose.callCount).toStrictEqual(1);
 
       expect(dispatchProps.updateCustomGasPrice.callCount).toStrictEqual(0);

diff --git a/...ents/app/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js b/...ents/app/gas-customization/gas-modal-page-container/gas-modal-page-container.container.js
@@ -230,6 +230,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
     transaction,
   } = stateProps;
   const {
+    useAdvancedGasEstimation: dispatchUseAdvancedGasEstimation,
     setGasData: dispatchSetGasData,
     updateConfirmTxGasAndCalculate: dispatchUpdateConfirmTxGasAndCalculate,
     createSpeedUpTransaction: dispatchCreateSpeedUpTransaction,
@@ -272,7 +273,7 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
         dispatchCancelAndClose();
       } else {
         dispatchSetGasData(gasLimit, gasPrice);
-        dispatchProps.useAdvancedGasEstimation();
+        dispatchUseAdvancedGasEstimation();
         dispatchCancelAndClose();
       }
     },

diff --git a/ui/ducks/metamask/metamask.test.js b/ui/ducks/metamask/metamask.test.js
@@ -48,13 +48,11 @@ describe('MetaMask Reducers', () => {
       {},
       {
         type: actionConstants.SHOW_ACCOUNT_DETAIL,
-        value: 'test address',
       },
     );
 
     expect(state.isUnlocked).toStrictEqual(true);
     expect(state.isInitialized).toStrictEqual(true);
-    expect(state.selectedAddress).toStrictEqual('test address');
   });
 
   it('sets account label', () => {

diff --git a/ui/ducks/send/send.js b/ui/ducks/send/send.js
@@ -938,10 +938,9 @@ const slice = createSlice({
         // the gasPrice in our slice. We call into the caseReducer
         // updateGasPrice to also tap into the appropriate follow up checks
         // and gasTotal calculation.
-        slice.caseReducers.updateGasPrice(
-          state,
-          getGasPriceInHexWei(action.value.average ?? '0x0'),
-        );
+        slice.caseReducers.updateGasPrice(state, {
+          payload: getGasPriceInHexWei(action.value.average ?? '0x0'),
+        });
       })
       .addCase(BASIC_GAS_ESTIMATE_STATUS, (state, action) => {
         // When we fetch gas prices we should temporarily set the form invalid