chore(runway): cherry-pick fix: hardware wallet eip 7702 issue () (#27892)

- fix: hardware wallet eip 7702 issue (cp-7.71.0) (#27615)

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

This PR will provide a fix for hardware wallet to gas free network like
Monad and Sei.
Due to currently Hardware wallet is not supported for EIP 7702 gas
sponsorship, and Swap feature is not working for hardware wallet user.

This fix will fall back the Gasless transaction to User pay gas previous
model so that user can still do the swap and sign transaction like
bfore.

This is temporately fix for current version of extensions, and we will
do a proper support in the future.

Similar to extension PR:
MetaMask/metamask-extension#40915
Ticket:

https://consensyssoftware.atlassian.net/jira/software/c/projects/NEB/boards/3738/backlog?selectedIssue=NEB-767


## **Changelog**

<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`

If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`

(This helps the Release Engineer do their job more quickly and
accurately)
-->

CHANGELOG entry: Hardware wallet user will fall back to use `User pay
gas` for those Gasless network due to hardware wallet not supported in
Gasless network like Sei and Monad.

## **Related issues**

Fixes:

## **Manual testing steps**

```gherkin
Feature: Gas sponsorship disabled for hardware wallet accounts

  Scenario: Hardware wallet user does not use gas sponsorship on sponsored network
    Given the user has added a hardware wallet account (Ledger or QR-based)
    And the hardware wallet account is selected as the active account
    And the user has added a gas-sponsored network (e.g. Monad)

    When the user attempts to perform a swap a dapp interaction or send a transaction on the sponsored network
    Then the transaction should not use gas sponsorship
    And the UI should not display any gas sponsorship labels (e.g. "No network fee", "Paid by MetaMask")
    And the user should see the normal network gas fee
    And the transaction should follow the standard user-pays-gas flow
```

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

> With HW account: 

Network list: 
<img width="392" height="800" alt="Screenshot 2026-03-18 at 16 05 48"

src="https://github.com/user-attachments/assets/601c30cc-fd78-456e-87b5-cc70e7ce3433"
/>

Tx flow: 
<img width="392" height="800" alt="Screenshot 2026-03-18 at 15 53 04"

src="https://github.com/user-attachments/assets/7c7b60cf-3f79-4701-a1e5-1fbba2bfe84e"
/>
<img width="392" height="800" alt="Screenshot 2026-03-18 at 15 55 20"

src="https://github.com/user-attachments/assets/a3258815-f1d2-4abf-8b22-209b73a0fbba"
/>
<img width="392" height="800" alt="Screenshot 2026-03-18 at 15 55 47"

src="https://github.com/user-attachments/assets/9275c82c-e56a-47ad-a203-a34f67ed6ed9"
/>


### **After**

> With HW account: 

Network list: 
<img width="392" height="800" alt="Screenshot 2026-03-18 at 16 06 19"

src="https://github.com/user-attachments/assets/03a296be-17fe-4387-baa0-23bae3ba00eb"
/>

Tx flow:
<img width="392" height="800" alt="Screenshot 2026-03-18 at 15 49 55"

src="https://github.com/user-attachments/assets/b39bc1b0-4b28-4e06-ae06-a381458ba7f6"
/>
<img width="392" height="800" alt="Screenshot 2026-03-18 at 15 50 29"

src="https://github.com/user-attachments/assets/76a31213-9ecd-4290-b407-58ffb8d82f48"
/>


<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding

Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I've included tests if applicable
- [ ] I've documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I've applied the right labels on the PR (see [labeling

guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> **Medium Risk**
> Touches gasless sponsorship and transaction publishing paths
(including 7702 delegation), which can affect whether transactions are
sponsored vs user-paid and could change behavior on supported chains.
Changes are scoped to hardware-wallet detection gates with added tests,
reducing regression risk.
> 
> **Overview**
> Hardware wallet accounts now **opt out of gasless / EIP-7702
sponsorship**, forcing swaps/bridge and confirmations to use the normal
*user-pays-gas* path.
> 
> This adds an `accountSupports7702` gate to `TransactionControllerInit`
so `Delegation7702PublishHook` and `isEIP7702GasFeeTokensEnabled` only
activate for keyrings that support 7702, and updates
`useIsGaslessSupported`/`useIsGasIncluded7702Supported` (via new
`useIsHardwareWalletForBridge`) to report unsupported for hardware
signers.
> 
> Network selection UI (`NetworkSelector`, `NetworkMultiSelectorList`,
`CustomNetwork`) now hides the “No network fee” sponsored label for
hardware wallets, and a patched `@metamask/bridge-status-controller`
waits for approval tx confirmation when required. Tests were
added/updated to cover the new hardware-wallet gating behavior.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
83f66fc. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

---------

Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: Julien Fontanel <julien.fontanel@consensys.net>
Co-authored-by: Frederic HENG <frederic.heng@consensys.net>
Co-authored-by: Arafet (CN - Hong Kong)
<52028926+arafetbenmakhlouf@users.noreply.github.com>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
[c4b93de](c4b93de)

---------

Co-authored-by: khanti42 <florin.dzeladini@consensys.net>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: Julien Fontanel <julien.fontanel@consensys.net>
Co-authored-by: Frederic HENG <frederic.heng@consensys.net>
Co-authored-by: Arafet (CN - Hong Kong) <52028926+arafetbenmakhlouf@users.noreply.github.com>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>

Author: 7 people

.yarn/patches/@metamask-bridge-status-controller-npm-68.1.0-8a2c809398.patch

@@ -0,0 +1,38 @@
+diff --git a/dist/bridge-status-controller.cjs b/dist/bridge-status-controller.cjs
+index b787174f2c8c448ed1ad9c8884204c5c8b6858be..af058623871badb4891564c003693ea19d0aa676 100644
+--- a/dist/bridge-status-controller.cjs
++++ b/dist/bridge-status-controller.cjs
+@@ -834,7 +834,13 @@ class BridgeStatusController extends (0, polling_controller_1.StaticIntervalPoll
+                         ? quoteResponse.approval
+                         : undefined, quoteResponse.resetApproval, requireApproval);
+                     approvalTxId = approvalTxMeta?.id;
+-                    await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
++                    if (requireApproval && approvalTxMeta) {
++                        await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
++                        await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxMeta.id);
++                    }
++                    else {
++                        await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
++                    }
+                     // Generate actionId for pre-submission history (non-batch EVM only)
+                     const actionId = (0, transaction_1.generateActionId)().toString();
+                     // Add pre-submission history keyed by actionId
+diff --git a/dist/bridge-status-controller.mjs b/dist/bridge-status-controller.mjs
+index 2fe71bdd2caf4d62f7946e9466b31367d360cd7c..fb9c0bc45abf88873452667b85ef2ea0cdfd929c 100644
+--- a/dist/bridge-status-controller.mjs
++++ b/dist/bridge-status-controller.mjs
+@@ -831,7 +831,13 @@ export class BridgeStatusController extends StaticIntervalPollingController() {
+                         ? quoteResponse.approval
+                         : undefined, quoteResponse.resetApproval, requireApproval);
+                     approvalTxId = approvalTxMeta?.id;
+-                    await handleMobileHardwareWalletDelay(requireApproval);
++                    if (requireApproval && approvalTxMeta) {
++                        await handleMobileHardwareWalletDelay(requireApproval);
++                        await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxMeta.id);
++                    }
++                    else {
++                        await handleMobileHardwareWalletDelay(requireApproval);
++                    }
+                     // Generate actionId for pre-submission history (non-batch EVM only)
+                     const actionId = generateActionId().toString();
+                     // Add pre-submission history keyed by actionId

.yarn/patches/@metamask-bridge-status-controller-npm-69.0.0-ec19aeeecf.patch

@@ -0,0 +1,38 @@
+diff --git a/dist/bridge-status-controller.cjs b/dist/bridge-status-controller.cjs
+index ec19aeeecfa32a3cdf955ccc1152829ee4ddfd8f..d9b427f9f0f4b05238d79c731fc81566634a7c25 100644
+--- a/dist/bridge-status-controller.cjs
++++ b/dist/bridge-status-controller.cjs
+@@ -855,7 +855,13 @@
+                         ? quoteResponse.approval
+                         : undefined, quoteResponse.resetApproval, requireApproval);
+                     approvalTxId = approvalTxMeta?.id;
+-                    await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
++                    if (requireApproval && approvalTxMeta) {
++                        await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
++                        await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxMeta.id);
++                    }
++                    else {
++                        await (0, transaction_1.handleMobileHardwareWalletDelay)(requireApproval);
++                    }
+                     // Generate actionId for pre-submission history (non-batch EVM only)
+                     const actionId = (0, transaction_1.generateActionId)().toString();
+                     // Add pre-submission history keyed by actionId
+diff --git a/dist/bridge-status-controller.mjs b/dist/bridge-status-controller.mjs
+index a5661d63c35b5ad3526c1804936dc0e189c90c29..86efc019968599662466e643dae7002ebf5f5014 100644
+--- a/dist/bridge-status-controller.mjs
++++ b/dist/bridge-status-controller.mjs
+@@ -852,7 +852,13 @@
+                         ? quoteResponse.approval
+                         : undefined, quoteResponse.resetApproval, requireApproval);
+                     approvalTxId = approvalTxMeta?.id;
+-                    await handleMobileHardwareWalletDelay(requireApproval);
++                    if (requireApproval && approvalTxMeta) {
++                        await handleMobileHardwareWalletDelay(requireApproval);
++                        await __classPrivateFieldGet(this, _BridgeStatusController_waitForTxConfirmation, "f").call(this, approvalTxMeta.id);
++                    }
++                    else {
++                        await handleMobileHardwareWalletDelay(requireApproval);
++                    }
+                     // Generate actionId for pre-submission history (non-batch EVM only)
+                     const actionId = generateActionId().toString();
+                     // Add pre-submission history keyed by actionId

app/components/UI/Bridge/hooks/useBridgeQuoteRequest/useBridgeQuoteRequest.test.ts

@@ -484,6 +484,50 @@ describe('useBridgeQuoteRequest', () => {
     });
   });
 
+  describe('hardware wallet accounts', () => {
+    it('sends gasIncluded and gasIncluded7702 false when useIsGasIncluded7702Supported dispatches false for hardware wallet', async () => {
+      // useIsGasIncluded7702Supported now incorporates the HW wallet check and
+      // dispatches isGasIncluded7702Supported=false for hardware wallets.
+      // useIsGasIncludedSTXSendBundleSupported already dispatches false for HW
+      // wallets via selectShouldUseSmartTransaction.
+      const testState = createBridgeTestState({
+        bridgeReducerOverrides: {
+          isGasIncludedSTXSendBundleSupported: false,
+          isGasIncluded7702Supported: false,
+          sourceToken: {
+            address: '0xSourceToken',
+            chainId: '0x1',
+            decimals: 18,
+            symbol: 'SRC',
+          },
+          destToken: {
+            address: '0xDestToken',
+            chainId: '0x1',
+            decimals: 18,
+            symbol: 'DEST',
+          },
+        },
+      });
+
+      const { result } = renderHookWithProvider(() => useBridgeQuoteRequest(), {
+        state: testState,
+      });
+
+      await act(async () => {
+        await result.current();
+        jest.advanceTimersByTime(DEBOUNCE_WAIT);
+      });
+
+      expect(spyUpdateBridgeQuoteRequestParams).toHaveBeenCalledWith(
+        expect.objectContaining({
+          gasIncluded: false,
+          gasIncluded7702: false,
+        }),
+        undefined,
+      );
+    });
+  });
+
   describe('insufficientBal parameter', () => {
     it('includes insufficientBal false when balance is sufficient', async () => {
       mockUseIsInsufficientBalance.mockReturnValue(false);

app/components/UI/Bridge/hooks/useIsGasIncluded7702Supported/index.ts

@@ -8,13 +8,15 @@ import {
   formatChainIdToHex,
   isNonEvmChainId,
 } from '@metamask/bridge-controller';
+import { useIsHardwareWalletForBridge } from '../useIsHardwareWalletForBridge';
 
 /**
  * Hook that determines if 7702 gasless support is available for bridge/swap.
  * Should be used at the page level (e.g., BridgeView) to avoid repeated calculations.
  *
- * Requirement for 7702:
+ * Requirements for 7702:
  * - Relay must be supported (for 7702 delegation)
+ * - Source wallet must not be a hardware wallet
  *
  * @param chainId - The chain ID to check (can be Hex, CAIP, or other format) - only EVM chains are supported
  */
@@ -40,9 +42,11 @@ export const useIsGasIncluded7702Supported = (
     return isRelaySupported(evmChainId as Hex);
   }, [evmChainId]);
 
+  const isHardwareWallet = useIsHardwareWalletForBridge();
+
   // 7702 is available when ALL conditions are met
   const isGasIncluded7702Supported = Boolean(
-    evmChainId && !!isRelaySupportedForChain,
+    evmChainId && !!isRelaySupportedForChain && !isHardwareWallet,
   );
 
   useEffect(() => {

app/components/UI/Bridge/hooks/useIsGasIncluded7702Supported/useIsGasIncluded7702Supported.test.ts

@@ -7,8 +7,18 @@ import configureStore from '../../../../../util/test/configureStore';
 
 // Mock dependencies
 jest.mock('../../../../../util/transactions/transaction-relay');
+jest.mock('../useIsHardwareWalletForBridge', () => ({
+  useIsHardwareWalletForBridge: jest.fn().mockReturnValue(false),
+}));
 
 const mockIsRelaySupported = jest.mocked(isRelaySupported);
+const { useIsHardwareWalletForBridge } = jest.requireMock(
+  '../useIsHardwareWalletForBridge',
+);
+const mockUseIsHardwareWalletForBridge =
+  useIsHardwareWalletForBridge as jest.MockedFunction<
+    typeof useIsHardwareWalletForBridge
+  >;
 
 describe('useIsGasIncluded7702Supported', () => {
   const MAINNET_CHAIN_ID = '0x1' as Hex;
@@ -28,6 +38,7 @@ describe('useIsGasIncluded7702Supported', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockIsRelaySupported.mockResolvedValue(false);
+    mockUseIsHardwareWalletForBridge.mockReturnValue(false);
   });
 
   afterEach(() => {
@@ -147,6 +158,32 @@ describe('useIsGasIncluded7702Supported', () => {
     });
   });
 
+  describe('when source wallet is a hardware account', () => {
+    it('updates isGasIncluded7702Supported to false even when relay is supported', async () => {
+      mockIsRelaySupported.mockResolvedValue(true);
+      mockUseIsHardwareWalletForBridge.mockReturnValue(true);
+
+      const { store } = renderHookWithProvider(
+        () => useIsGasIncluded7702Supported(MAINNET_CHAIN_ID),
+        { state: {} },
+      );
+
+      await expectGasIncluded7702State(store, false);
+    });
+
+    it('updates isGasIncluded7702Supported to false for hardware wallet regardless of chain', async () => {
+      mockIsRelaySupported.mockResolvedValue(true);
+      mockUseIsHardwareWalletForBridge.mockReturnValue(true);
+
+      const { store } = renderHookWithProvider(
+        () => useIsGasIncluded7702Supported('eip155:59144'), // Linea
+        { state: {} },
+      );
+
+      await expectGasIncluded7702State(store, false);
+    });
+  });
+
   describe('edge cases', () => {
     it('handles case-insensitive chainId matching', async () => {
       mockIsRelaySupported.mockResolvedValue(true);

app/components/UI/Bridge/hooks/useIsHardwareWalletForBridge/index.test.ts

@@ -0,0 +1,56 @@
+import { renderHook } from '@testing-library/react-hooks';
+import { useSelector } from 'react-redux';
+import { useIsHardwareWalletForBridge } from './index';
+import { isHardwareAccount } from '../../../../../util/address';
+
+jest.mock('react-redux', () => ({
+  useSelector: jest.fn(),
+}));
+
+jest.mock('../../../../../util/address', () => ({
+  isHardwareAccount: jest.fn(),
+}));
+
+const mockUseSelector = useSelector as jest.MockedFunction<typeof useSelector>;
+const mockIsHardwareAccount = isHardwareAccount as jest.MockedFunction<
+  typeof isHardwareAccount
+>;
+
+describe('useIsHardwareWalletForBridge', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mockUseSelector.mockReturnValue(undefined);
+    mockIsHardwareAccount.mockReturnValue(false);
+  });
+
+  it('returns false when source wallet address is undefined', () => {
+    mockUseSelector.mockReturnValue(undefined);
+
+    const { result } = renderHook(() => useIsHardwareWalletForBridge());
+
+    expect(result.current).toBe(false);
+    expect(mockIsHardwareAccount).not.toHaveBeenCalled();
+  });
+
+  it('returns true when source wallet is a hardware account', () => {
+    const address = '0x1234567890123456789012345678901234567890';
+    mockUseSelector.mockReturnValue(address);
+    mockIsHardwareAccount.mockReturnValue(true);
+
+    const { result } = renderHook(() => useIsHardwareWalletForBridge());
+
+    expect(result.current).toBe(true);
+    expect(mockIsHardwareAccount).toHaveBeenCalledWith(address);
+  });
+
+  it('returns false when source wallet is not a hardware account', () => {
+    const address = '0x1234567890123456789012345678901234567890';
+    mockUseSelector.mockReturnValue(address);
+    mockIsHardwareAccount.mockReturnValue(false);
+
+    const { result } = renderHook(() => useIsHardwareWalletForBridge());
+
+    expect(result.current).toBe(false);
+    expect(mockIsHardwareAccount).toHaveBeenCalledWith(address);
+  });
+});

app/components/UI/Bridge/hooks/useIsHardwareWalletForBridge/index.ts

@@ -0,0 +1,18 @@
+import { useMemo } from 'react';
+import { useSelector } from 'react-redux';
+import { selectSourceWalletAddress } from '../../../../../selectors/bridge';
+import { isHardwareAccount } from '../../../../../util/address';
+
+/**
+ * Returns whether the current bridge source account is a hardware wallet.
+ * Used to omit gas-included / 7702 params from bridge quote requests so responses
+ * are non-sponsored for hardware signers.
+ */
+export function useIsHardwareWalletForBridge(): boolean {
+  const walletAddress = useSelector(selectSourceWalletAddress);
+
+  return useMemo(
+    () => Boolean(walletAddress && isHardwareAccount(walletAddress)),
+    [walletAddress],
+  );
+}

app/components/UI/Bridge/utils/transaction.ts

@@ -11,7 +11,9 @@ export const getIsBridgeTransaction = (txMeta: TransactionMeta) => {
   return (
     origin === ORIGIN_METAMASK &&
     (txMeta.type === TransactionType.bridgeApproval ||
-      txMeta.type === TransactionType.bridge)
+      txMeta.type === TransactionType.bridge ||
+      txMeta.type === TransactionType.swap ||
+      txMeta.type === TransactionType.swapApproval)
   );
 };
 

app/components/UI/NetworkMultiSelectorList/NetworkMultiSelectorList.test.tsx

@@ -31,6 +31,27 @@ jest.mock('react-redux', () => ({
   useSelector: jest.fn(),
 }));
 
+// Avoid loading keyring-utils, keyring-api, and the network/Engine chain in this test
+jest.mock('../../../selectors/accountsController', () => ({
+  selectSelectedInternalAccountFormattedAddress: jest.fn(),
+}));
+
+jest.mock('../../../util/address', () => ({
+  isHardwareAccount: jest.fn(() => false),
+}));
+
+jest.mock('@metamask/keyring-api', () => ({
+  EntropySourceId: {},
+  BtcMethod: {},
+  EthMethod: {},
+  SolAccountType: {},
+  SolMethod: {},
+  TrxMethod: {},
+  isEvmAccountType: jest.fn(),
+  KeyringAccountType: {},
+  EthScope: {},
+}));
+
 jest.mock('react-native-safe-area-context', () => ({
   useSafeAreaInsets: jest.fn(),
 }));

app/components/UI/NetworkMultiSelectorList/NetworkMultiSelectorList.tsx

@@ -59,6 +59,8 @@ import { selectEvmChainId } from '../../../selectors/networkController';
 import { formatChainIdToCaip } from '@metamask/bridge-controller';
 import { NETWORK_MULTI_SELECTOR_TEST_IDS } from '../NetworkMultiSelector/NetworkMultiSelector.constants';
 import { getGasFeesSponsoredNetworkEnabled } from '../../../selectors/featureFlagController/gasFeesSponsored/index.ts';
+import { selectSelectedInternalAccountFormattedAddress } from '../../../selectors/accountsController';
+import { isHardwareAccount } from '../../../util/address';
 import { strings } from '../../../../locales/i18n';
 import TagColored, {
   TagColor,
@@ -106,6 +108,12 @@ const NetworkMultiSelectList = ({
   const isGasFeesSponsoredNetworkEnabled = useSelector(
     getGasFeesSponsoredNetworkEnabled,
   );
+  const selectedAddress = useSelector(
+    selectSelectedInternalAccountFormattedAddress,
+  );
+  const isHardwareWallet = Boolean(
+    selectedAddress && isHardwareAccount(selectedAddress),
+  );
 
   const { styles } = useStyles(styleSheet, {});
 
@@ -269,7 +277,8 @@ const NetworkMultiSelectList = ({
       const isDisabled = isLoading || isSelectionDisabled;
       const showButtonIcon = Boolean(networkTypeOrRpcUrl);
 
-      const isGasSponsored = isGasFeesSponsoredNetworkEnabled(chainId);
+      const isGasSponsored =
+        !isHardwareWallet && isGasFeesSponsoredNetworkEnabled(chainId);
 
       return (
         <View>
@@ -342,6 +351,7 @@ const NetworkMultiSelectList = ({
       isSelectAllNetworksSection,
       openRpcModal,
       isGasFeesSponsoredNetworkEnabled,
+      isHardwareWallet,
       styles.centeredNetworkCell,
       styles.noNetworkFeeContainer,
     ],
@@ -351,11 +361,17 @@ const NetworkMultiSelectList = ({
     if (!networks.length || !isAutoScrollEnabled) return;
     if (networksLengthRef.current !== networks.length) {
       const selectedNetwork = networks.find(({ isSelected }) => isSelected);
-      networkListRef?.current?.scrollToOffset({
-        offset: selectedNetwork?.yOffset ?? 0,
-        animated: false,
-      });
+      const offset = selectedNetwork?.yOffset ?? 0;
       networksLengthRef.current = networks.length;
+      // Defer scroll so FlashList has time to lay out items and avoid "index out of bounds"
+      requestAnimationFrame(() => {
+        if (networkListRef?.current?.scrollToOffset) {
+          networkListRef.current.scrollToOffset({
+            offset,
+            animated: false,
+          });
+        }
+      });
     }
   }, [networks, isAutoScrollEnabled]);