Replace useSafeGasEstimatePolling with usePolling

app/scripts/metamask-controller.js

@@ -2973,6 +2973,10 @@ export default class MetamaskController extends EventEmitter {
         this.networkController.getEIP1559Compatibility.bind(
           this.networkController,
         ),
+      getNetworkConfigurationByNetworkClientId:
+        this.networkController.getNetworkConfigurationByNetworkClientId.bind(
+          this.networkController,
+        ),
       // PreferencesController
       setSelectedAddress: (address) => {
         const account = this.accountsController.getAccountByAddress(address);
@@ -3453,6 +3457,12 @@ export default class MetamaskController extends EventEmitter {
       ),
 
       // GasFeeController
+      gasFeeStartPollingByNetworkClientId:
+        gasFeeController.startPollingByNetworkClientId.bind(gasFeeController),
+
+      gasFeeStopPollingByPollingToken:
+        gasFeeController.stopPollingByPollingToken.bind(gasFeeController),
+
       getGasFeeEstimatesAndStartPolling:
         gasFeeController.getGasFeeEstimatesAndStartPolling.bind(
           gasFeeController,

development/ts-migration-dashboard/files-to-convert.json

@@ -1130,7 +1130,6 @@
   "ui/hooks/useIncrementedGasFees.js",
   "ui/hooks/useOriginMetadata.js",
   "ui/hooks/usePrevious.js",
-  "ui/hooks/useSafeGasEstimatePolling.js",
   "ui/hooks/useSegmentContext.js",
   "ui/hooks/useShouldAnimateGasEstimations.js",
   "ui/hooks/useShouldShowSpeedUp.js",

test/data/mock-send-state.json

@@ -14,6 +14,7 @@
     "importNftsModal": { "open": false },
     "gasIsLoading": false,
     "isLoading": false,
+    "importTokensModalOpen": false,
     "modal": {
       "open": false,
       "modalState": {
@@ -24,6 +25,9 @@
         "name": null
       }
     },
+    "showIpfsModalOpen": false,
+    "showKeyringRemovalSnapModal": false,
+    "showWhatsNewPopup": false,
     "warning": null,
     "alertOpen": false
   },
@@ -90,13 +94,46 @@
       "priorityFeeTrend": "down",
       "networkCongestion": 0.90625
     },
+    "gasFeeEstimatesByChainId": {
+      "0x5": {
+        "gasEstimateType": "fee-market",
+        "gasFeeEstimates": {
+          "low": {
+            "minWaitTimeEstimate": 180000,
+            "maxWaitTimeEstimate": 300000,
+            "suggestedMaxPriorityFeePerGas": "3",
+            "suggestedMaxFeePerGas": "53"
+          },
+          "medium": {
+            "minWaitTimeEstimate": 15000,
+            "maxWaitTimeEstimate": 60000,
+            "suggestedMaxPriorityFeePerGas": "7",
+            "suggestedMaxFeePerGas": "70"
+          },
+          "high": {
+            "minWaitTimeEstimate": 0,
+            "maxWaitTimeEstimate": 15000,
+            "suggestedMaxPriorityFeePerGas": "10",
+            "suggestedMaxFeePerGas": "100"
+          },
+          "estimatedBaseFee": "50",
+          "historicalBaseFeeRange": ["28.533098435", "70.351148354"],
+          "baseFeeTrend": "up",
+          "latestPriorityFeeRange": ["1", "40"],
+          "historicalPriorityFeeRange": ["0.1458417", "700.156384646"],
+          "priorityFeeTrend": "down",
+          "networkCongestion": 0.90625
+        }
+      }
+    },
     "snaps": [{}],
     "preferences": {
       "hideZeroBalanceTokens": false,
       "showFiatInTestnets": false,
       "showTestNetworks": true,
       "useNativeCurrencyAsPrimaryCurrency": true
     },
+    "seedPhraseBackedUp": null,
     "ensResolutionsByAddress": {},
     "isAccountMenuOpen": false,
     "isUnlocked": true,

test/data/mock-state.json

@@ -50,6 +50,38 @@
     "participateInMetaMetrics": false,
     "gasEstimateType": "fee-market",
     "showBetaHeader": false,
+    "gasFeeEstimatesByChainId": {
+      "0x5": {
+        "gasEstimateType": "fee-market",
+        "gasFeeEstimates": {
+          "low": {
+            "minWaitTimeEstimate": 180000,
+            "maxWaitTimeEstimate": 300000,
+            "suggestedMaxPriorityFeePerGas": "3",
+            "suggestedMaxFeePerGas": "53"
+          },
+          "medium": {
+            "minWaitTimeEstimate": 15000,
+            "maxWaitTimeEstimate": 60000,
+            "suggestedMaxPriorityFeePerGas": "7",
+            "suggestedMaxFeePerGas": "70"
+          },
+          "high": {
+            "minWaitTimeEstimate": 0,
+            "maxWaitTimeEstimate": 15000,
+            "suggestedMaxPriorityFeePerGas": "10",
+            "suggestedMaxFeePerGas": "100"
+          },
+          "estimatedBaseFee": "50",
+          "historicalBaseFeeRange": ["28.533098435", "70.351148354"],
+          "baseFeeTrend": "up",
+          "latestPriorityFeeRange": ["1", "40"],
+          "historicalPriorityFeeRange": ["0.1458417", "700.156384646"],
+          "priorityFeeTrend": "down",
+          "networkCongestion": 0.90625
+        }
+      }
+    },
     "permissionHistory": {},
     "gasFeeEstimates": {
       "low": {

test/e2e/snaps/test-snap-txinsights-v2.spec.js

@@ -99,6 +99,12 @@ describe('Test Snap TxInsights-v2', function () {
           WINDOW_TITLES.Dialog,
           windowHandles,
         );
+
+        await driver.findClickableElement({
+          text: 'Confirm',
+          tag: 'button',
+        });
+
         await driver.waitForSelector({
           text: 'Insights Example Snap',
           tag: 'button',

ui/components/app/cancel-speedup-popover/cancel-speedup-popover.test.js

@@ -48,6 +48,15 @@ const MOCK_SUGGESTED_MEDIUM_MAXFEEPERGAS_HEX_WEI =
   MOCK_SUGGESTED_MEDIUM_MAXFEEPERGAS_BN_WEI.toString(16);
 
 jest.mock('../../../store/actions', () => ({
+  gasFeeStartPollingByNetworkClientId: jest
+    .fn()
+    .mockResolvedValue('pollingToken'),
+  gasFeeStopPollingByPollingToken: jest.fn(),
+  getNetworkConfigurationByNetworkClientId: jest.fn().mockImplementation(() =>
+    Promise.resolve({
+      chainId: '0x5',
+    }),
+  ),
   disconnectGasFeeEstimatePoller: jest.fn(),
   getGasFeeTimeEstimate: jest.fn().mockImplementation(() => Promise.resolve()),
   getGasFeeEstimatesAndStartPolling: jest
@@ -85,6 +94,14 @@ const render = (
       featureFlags: { advancedInlineGas: true },
       gasFeeEstimates:
         mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
+      gasFeeEstimatesByChainId: {
+        ...mockState.metamask.gasFeeEstimatesByChainId,
+        '0x5': {
+          ...mockState.metamask.gasFeeEstimatesByChainId['0x5'],
+          gasFeeEstimates:
+            mockEstimates[GasEstimateTypes.feeMarket].gasFeeEstimates,
+        },
+      },
     },
   });
 

ui/components/app/transaction-list-item-details/transaction-list-item-details.component.test.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import configureMockStore from 'redux-mock-store';
 import thunk from 'redux-thunk';
-import { waitFor } from '@testing-library/react';
+import { act, waitFor } from '@testing-library/react';
 import { TransactionStatus } from '@metamask/transaction-controller';
 import { GAS_LIMITS } from '../../../../shared/constants/gas';
 import { renderWithProvider } from '../../../../test/lib/render-helpers';
@@ -10,8 +10,13 @@ import TransactionListItemDetails from '.';
 
 jest.mock('../../../store/actions.ts', () => ({
   tryReverseResolveAddress: () => jest.fn(),
-  getGasFeeEstimatesAndStartPolling: jest.fn().mockResolvedValue(),
-  addPollingTokenToAppState: jest.fn(),
+  gasFeeStartPollingByNetworkClientId: jest
+    .fn()
+    .mockResolvedValue('pollingToken'),
+  gasFeeStopPollingByPollingToken: jest.fn(),
+  getNetworkConfigurationByNetworkClientId: jest
+    .fn()
+    .mockResolvedValue({ chainId: '0x5' }),
 }));
 
 let mockGetCustodianTransactionDeepLink = jest.fn();
@@ -22,34 +27,34 @@ jest.mock('../../../store/institutional/institution-background', () => ({
   }),
 }));
 
-describe('TransactionListItemDetails Component', () => {
-  const transaction = {
-    history: [],
-    id: 1,
-    status: TransactionStatus.confirmed,
-    txParams: {
-      from: '0x1',
-      gas: GAS_LIMITS.SIMPLE,
-      gasPrice: '0x3b9aca00',
-      nonce: '0xa4',
-      to: '0x2',
-      value: '0x2386f26fc10000',
-    },
-    metadata: {
-      note: 'some note',
-    },
-    custodyId: '1',
-  };
-
-  const transactionGroup = {
-    transactions: [transaction],
-    primaryTransaction: transaction,
-    initialTransaction: transaction,
+const transaction = {
+  history: [],
+  id: 1,
+  status: TransactionStatus.confirmed,
+  txParams: {
+    from: '0x1',
+    gas: GAS_LIMITS.SIMPLE,
+    gasPrice: '0x3b9aca00',
     nonce: '0xa4',
-    hasRetried: false,
-    hasCancelled: false,
-  };
-
+    to: '0x2',
+    value: '0x2386f26fc10000',
+  },
+  metadata: {
+    note: 'some note',
+  },
+  custodyId: '1',
+};
+
+const transactionGroup = {
+  transactions: [transaction],
+  primaryTransaction: transaction,
+  initialTransaction: transaction,
+  nonce: '0xa4',
+  hasRetried: false,
+  hasCancelled: false,
+};
+
+const render = async (overrideProps) => {
   const rpcPrefs = {
     blockExplorerUrl: 'https://customblockexplorer.com/',
   };
@@ -69,70 +74,52 @@ describe('TransactionListItemDetails Component', () => {
     transactionStatus: () => <div></div>,
     blockExplorerLinkText,
     rpcPrefs,
+    ...overrideProps,
   };
 
-  it('should render title with title prop', async () => {
-    const mockStore = configureMockStore([thunk])(mockState);
+  const mockStore = configureMockStore([thunk])(mockState);
+
+  let result;
 
-    const { queryByText } = renderWithProvider(
-      <TransactionListItemDetails {...props} />,
-      mockStore,
-    );
+  await act(
+    async () =>
+      (result = renderWithProvider(
+        <TransactionListItemDetails {...props} />,
+        mockStore,
+      )),
+  );
+
+  return result;
+};
+
+describe('TransactionListItemDetails Component', () => {
+  it('should render title with title prop', async () => {
+    const { queryByText } = await render();
 
     await waitFor(() => {
-      expect(queryByText(props.title)).toBeInTheDocument();
+      expect(queryByText('Test Transaction Details')).toBeInTheDocument();
     });
   });
 
   describe('Retry button', () => {
-    it('should render retry button with showRetry prop', () => {
-      const retryProps = {
-        ...props,
-        showRetry: true,
-      };
-
-      const mockStore = configureMockStore([thunk])(mockState);
-
-      const { queryByTestId } = renderWithProvider(
-        <TransactionListItemDetails {...retryProps} />,
-        mockStore,
-      );
+    it('should render retry button with showRetry prop', async () => {
+      const { queryByTestId } = await render({ showRetry: true });
 
       expect(queryByTestId('rety-button')).toBeInTheDocument();
     });
   });
 
   describe('Cancel button', () => {
-    it('should render cancel button with showCancel prop', () => {
-      const retryProps = {
-        ...props,
-        showCancel: true,
-      };
-
-      const mockStore = configureMockStore([thunk])(mockState);
-
-      const { queryByTestId } = renderWithProvider(
-        <TransactionListItemDetails {...retryProps} />,
-        mockStore,
-      );
+    it('should render cancel button with showCancel prop', async () => {
+      const { queryByTestId } = await render({ showCancel: true });
 
       expect(queryByTestId('cancel-button')).toBeInTheDocument();
     });
   });
 
   describe('Speedup button', () => {
-    it('should render speedup button with showSpeedUp prop', () => {
-      const retryProps = {
-        ...props,
-        showSpeedUp: true,
-      };
-
-      const mockStore = configureMockStore([thunk])(mockState);
-
-      const { queryByTestId } = renderWithProvider(
-        <TransactionListItemDetails {...retryProps} />,
-        mockStore,
-      );
+    it('should render speedup button with showSpeedUp prop', async () => {
+      const { queryByTestId } = await render({ showSpeedUp: true });
 
       expect(queryByTestId('speedup-button')).toBeInTheDocument();
     });
@@ -144,9 +131,7 @@ describe('TransactionListItemDetails Component', () => {
         .fn()
         .mockReturnValue({ url: 'https://url.com' });
 
-      const mockStore = configureMockStore([thunk])(mockState);
-
-      renderWithProvider(<TransactionListItemDetails {...props} />, mockStore);
+      await render({ showCancel: true });
 
       await waitFor(() => {
         const custodianViewButton = document.querySelector(
@@ -173,15 +158,10 @@ describe('TransactionListItemDetails Component', () => {
         primaryTransaction: newTransaction,
         initialTransaction: newTransaction,
       };
-      const mockStore = configureMockStore([thunk])(mockState);
 
-      const { queryByText } = renderWithProvider(
-        <TransactionListItemDetails
-          {...props}
-          transactionGroup={newTransactionGroup}
-        />,
-        mockStore,
-      );
+      const { queryByText } = await render({
+        transactionGroup: newTransactionGroup,
+      });
 
       await waitFor(() => {
         expect(queryByText('some note')).toBeInTheDocument();