fix: (cp-7.46.0) network switcher - use additional checks for non-evm networks (#15283)

## **Description**

I have not been able to replicate this
[bug](#15272), but
this is some additional checks to ensure we are correctly checking
against EVM networks and ignore non-EVM networks.

We already added checks into main from
#15184
^ However this targets `@metamask/multichain-network-controller@^0.4.0`,
whereas the RC uses `0.3.0`

## **Related issues**

Fixes: #15272

## **Manual testing steps**

N/A, I still haven't figured out how to repro this.

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

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

## **Pre-merge author checklist**

- [x] 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).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] 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.

---------

Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>

Author: Prithpal-Sooriya

app/components/Views/Settings/NetworksSettings/NetworkSettings/CustomNetworkView/CustomNetwork.test.tsx

@@ -0,0 +1,70 @@
+import React from 'react';
+import { backgroundState } from '../../../../../../util/test/initial-root-state';
+import renderWithProvider from '../../../../../../util/test/renderWithProvider';
+import CustomNetwork from './CustomNetwork';
+import { CustomNetworkProps } from './CustomNetwork.types';
+import { PopularList } from '../../../../../../util/networks/customNetworks';
+
+const getMockState = () => ({ engine: { backgroundState } });
+
+jest.mock('@react-navigation/native', () => {
+  const actualNav = jest.requireActual('@react-navigation/native');
+  return {
+    ...actualNav,
+    useNavigation: () => ({
+      navigate: jest.fn(),
+    }),
+  };
+});
+
+describe('CustomNetwork component', () => {
+  const getMockCustomNetworkProps = (
+    overrides?: Partial<CustomNetworkProps>,
+  ) => {
+    const mockCloseNetworkModal = jest.fn();
+    const mockShowNetworkModal = jest.fn();
+    const mockCustomNetworkProps: CustomNetworkProps = {
+      showPopularNetworkModal: false,
+      isNetworkModalVisible: false,
+      closeNetworkModal: mockCloseNetworkModal,
+      selectedNetwork: {
+        chainId: '0x1',
+        nickname: 'Ethereum Mainnet',
+        rpcUrl: 'https://mainnet.infura.io/v3/your-api-key',
+        ticker: 'ETH',
+        rpcPrefs: {
+          blockExplorerUrl: 'https://etherscan.io',
+        },
+      },
+      showNetworkModal: mockShowNetworkModal,
+      shouldNetworkSwitchPopToWallet: false,
+      ...overrides,
+    };
+    return mockCustomNetworkProps;
+  };
+
+  it('filters out CAIP-2 networks when showing all networks (included added networks)', () => {
+    const props = getMockCustomNetworkProps({ showAddedNetworks: true });
+    const mockState = getMockState();
+    const { getByText, queryByText } = renderWithProvider(
+      <CustomNetwork {...props} />,
+      {
+        state: mockState,
+      },
+    );
+
+    const additionalNetworksVisible = PopularList.map((p) => p.nickname);
+    additionalNetworksVisible.forEach((name) => {
+      expect(getByText(name)).toBeOnTheScreen();
+    });
+
+    Object.values(
+      Object.values(
+        mockState.engine.backgroundState.MultichainNetworkController
+          .multichainNetworkConfigurationsByChainId,
+      ),
+    ).forEach((n) => {
+      expect(queryByText(n.name)).not.toBeOnTheScreen();
+    });
+  });
+});

app/components/Views/Settings/NetworksSettings/NetworkSettings/CustomNetworkView/CustomNetwork.tsx

@@ -51,7 +51,8 @@ const CustomNetwork = ({
         ) => {
           if (
             isNonEvmChainId(networkConfiguration.chainId) ||
-            isNonEvmChainId(savedNetwork.chainId)
+            isNonEvmChainId(savedNetwork.chainId) ||
+            ('isEvm' in savedNetwork && savedNetwork.isEvm === false)
           ) {
             return false;
           }