fix: release-blocker restore gas estimate alerts

Author: maxime-oe

app/components/Views/confirmations/hooks/alerts/useGasEstimateFailedAlert.test.ts

@@ -10,7 +10,17 @@ import { useTransactionMetadataRequest } from '../transactions/useTransactionMet
 import { AlertKeys } from '../../constants/alerts';
 import { RowAlertKey } from '../../components/UI/info-row/alert-row/constants';
 import { Severity } from '../../types/alerts';
-import { useIsGaslessSupported } from '../gas/useIsGaslessSupported';
+import { getGasFeesSponsoredNetworkEnabled } from '../../../../../selectors/featureFlagController/gasFeesSponsored';
+import { isHardwareAccount } from '../../../../../util/address';
+import { selectSelectedInternalAccountFormattedAddress } from '../../../../../selectors/accountsController';
+
+jest.mock('../../../../../selectors/featureFlagController/gasFeesSponsored');
+jest.mock('../transactions/useTransactionMetadataRequest');
+jest.mock('../../../../../selectors/accountsController');
+jest.mock('../../../../../util/address', () => ({
+  ...jest.requireActual('../../../../../util/address'),
+  isHardwareAccount: jest.fn(),
+}));
 
 const MOCK_TRANSACTION_META = {
   id: '1',
@@ -30,21 +40,31 @@ const MOCK_TRANSACTION_META_WITH_SIMULATION_FAILS = {
   },
 } as unknown as TransactionMeta;
 
-jest.mock('../transactions/useTransactionMetadataRequest');
-jest.mock('../gas/useIsGaslessSupported');
+const mockGetGasFeesSponsoredNetworkEnabled = jest.mocked(
+  getGasFeesSponsoredNetworkEnabled,
+);
+
+const mockIsHardwareAccount = jest.mocked(isHardwareAccount);
+const mockSelectSelectedInternalAccountFormattedAddress = jest.mocked(
+  selectSelectedInternalAccountFormattedAddress,
+);
 
 describe('useGasEstimateFailedAlert', () => {
   const mockUseTransactionMetadataRequest = jest.mocked(
     useTransactionMetadataRequest,
   );
-  const useIsGaslessSupportedMock = jest.mocked(useIsGaslessSupported);
+
   beforeEach(() => {
     jest.clearAllMocks();
-    useIsGaslessSupportedMock.mockReturnValue({
-      isSmartTransaction: false,
-      isSupported: false,
-      pending: false,
-    });
+    mockGetGasFeesSponsoredNetworkEnabled.mockReturnValue(() => false);
+    mockIsHardwareAccount.mockReturnValue(false);
+    mockSelectSelectedInternalAccountFormattedAddress.mockReturnValue(
+      '0x13b7e6EBcd40777099E4c45d407745aB2de1D1F8',
+    );
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
   });
 
   it('returns alert when simulationFails is truthy', () => {
@@ -113,35 +133,32 @@ describe('useGasEstimateFailedAlert', () => {
     expect(result.current).toEqual([]);
   });
 
-  it('returns no alerts if simulation fails but transaction is gasless or sponsored', () => {
+  it('returns no alerts if simulation fails but network is sponsored', () => {
     mockUseTransactionMetadataRequest.mockReturnValue(
       MOCK_TRANSACTION_META_WITH_SIMULATION_FAILS,
     );
-    useIsGaslessSupportedMock.mockReturnValue({
-      isSmartTransaction: false,
-      isSupported: true,
-      pending: false,
-    });
+    mockGetGasFeesSponsoredNetworkEnabled.mockReturnValue(() => true);
     const { result } = renderHookWithProvider(() =>
       useGasEstimateFailedAlert(),
     );
 
-    expect(result.current[0]).toBe(undefined);
+    expect(result.current).toEqual([]);
   });
 
-  it('returns no alerts when gasless support check is pending', () => {
+  it('returns alert with correct message content if network is sponsored but user is hardware wallet', () => {
     mockUseTransactionMetadataRequest.mockReturnValue(
       MOCK_TRANSACTION_META_WITH_SIMULATION_FAILS,
     );
-    useIsGaslessSupportedMock.mockReturnValue({
-      isSmartTransaction: false,
-      isSupported: false,
-      pending: true,
-    });
+    mockIsHardwareAccount.mockReturnValue(true);
+    mockGetGasFeesSponsoredNetworkEnabled.mockReturnValue(() => true);
+
     const { result } = renderHookWithProvider(() =>
       useGasEstimateFailedAlert(),
     );
 
-    expect(result.current[0]).toBe(undefined);
+    expect(result.current.length).toBe(1);
+    expect(result.current[0].message).toBe(
+      "We're unable to provide an accurate fee and this estimate might be high. We suggest you to input a custom gas limit, but there's a risk the transaction will still fail.",
+    );
   });
 });

app/components/Views/confirmations/hooks/alerts/useGasEstimateFailedAlert.ts

@@ -5,21 +5,33 @@ import { RowAlertKey } from '../../components/UI/info-row/alert-row/constants';
 import { AlertKeys } from '../../constants/alerts';
 import { Alert, Severity } from '../../types/alerts';
 import { useEstimationFailed } from '../gas/useEstimationFailed';
-import { useIsGaslessSupported } from '../gas/useIsGaslessSupported';
+import { useSelector } from 'react-redux';
+import { getGasFeesSponsoredNetworkEnabled } from '../../../../../selectors/featureFlagController/gasFeesSponsored';
+import { isHardwareAccount } from '../../../../../util/address';
+import { selectSelectedInternalAccountFormattedAddress } from '../../../../../selectors/accountsController';
+import { useTransactionMetadataRequest } from '../transactions/useTransactionMetadataRequest';
 
 export const useGasEstimateFailedAlert = (): Alert[] => {
   const estimationFailed = useEstimationFailed();
-  const {
-    isSupported: isGaslessSupported,
-    pending: isGaslessSupportCheckPending,
-  } = useIsGaslessSupported();
+
+  const transactionMeta = useTransactionMetadataRequest();
+
+  const isGasFeesSponsoredNetworkEnabled = useSelector(
+    getGasFeesSponsoredNetworkEnabled,
+  );
+  const selectedAddress = useSelector(
+    selectSelectedInternalAccountFormattedAddress,
+  );
+  const isHardwareWallet = Boolean(
+    selectedAddress && isHardwareAccount(selectedAddress),
+  );
+  const isGasSponsored =
+    transactionMeta?.chainId &&
+    !isHardwareWallet &&
+    isGasFeesSponsoredNetworkEnabled(transactionMeta?.chainId);
 
   return useMemo(() => {
-    if (
-      !estimationFailed ||
-      isGaslessSupportCheckPending ||
-      isGaslessSupported
-    ) {
+    if (!estimationFailed || isGasSponsored) {
       return [];
     }
 
@@ -33,5 +45,5 @@ export const useGasEstimateFailedAlert = (): Alert[] => {
         severity: Severity.Warning,
       },
     ];
-  }, [estimationFailed, isGaslessSupportCheckPending, isGaslessSupported]);
+  }, [estimationFailed, isGasSponsored]);
 };