Fix unsupported network detection and UI handling

apps/native/tests/shared/pages/ModalPage.ts

@@ -32,7 +32,7 @@ export class ModalPage {
     const qrLoadInitiatedTime = new Date();
 
     const qrCode = this.page.getByTestId('qr-code');
-    await expect(qrCode).toBeVisible();
+    await expect(qrCode).toBeVisible({ timeout: 20000 });
     const uri = await this.clickCopyLink();
 
     const qrLoadedTime = new Date();
@@ -51,7 +51,7 @@ export class ModalPage {
     const qrLoadInitiatedTime = new Date();
 
     const qrCode = this.page.getByTestId('qr-code');
-    await expect(qrCode).toBeVisible();
+    await expect(qrCode).toBeVisible({ timeout: 20000 });
     const uri = await this.clickCopyLink();
     const qrLoadedTime = new Date();
     if (timingRecords) {

apps/native/tests/shared/pages/WalletPage.ts

@@ -81,8 +81,8 @@ export class WalletPage {
       timeout: 30000
     });
     await expect(btn).toBeEnabled();
-    await btn.focus();
-    await this.page.keyboard.press('Space');
+    await this.page.waitForTimeout(1000);
+    await btn.click();
   }
 
   /**

apps/native/tests/shared/validators/WalletValidator.ts

@@ -28,14 +28,14 @@ export class WalletValidator {
   async expectSessionCard({ visible = true }: { visible?: boolean }) {
     if (visible) {
       await expect(
-        this.page.getByTestId('session-card'),
+        this.page.getByTestId('session-card').first(),
         'Session card should be visible'
       ).toBeVisible({
         timeout: MAX_WAIT
       });
     } else {
       await expect(
-        this.page.getByTestId('session-card'),
+        this.page.getByTestId('session-card').first(),
         'Session card should not be visible'
       ).not.toBeVisible({
         timeout: MAX_WAIT
@@ -46,7 +46,7 @@ export class WalletValidator {
   async expectDisconnected() {
     await this.gotoSessions.click();
     await expect(
-      this.page.getByTestId('session-card'),
+      this.page.getByTestId('session-card').first(),
       'Session card should not be visible'
     ).not.toBeVisible({
       timeout: MAX_WAIT

apps/native/tests/wallet.spec.ts

@@ -137,7 +137,7 @@ sampleWalletTest('it should disconnect using hook', async () => {
   await modalValidator.expectDisconnected();
 });
 
-sampleWalletTest('it should disconnect and close modal when connecting from wallet', async () => {
+sampleWalletTest('it should disconnect and close modal when disconnecting from wallet', async () => {
   await modalValidator.expectDisconnected();
   await modalPage.qrCodeFlow(modalPage, walletPage);
   await modalValidator.expectConnected();

packages/core/src/__tests__/controllers/NetworkController.test.ts

@@ -19,7 +19,6 @@ const client: NetworkControllerClient = {
 const initialState = {
   _client: client,
   supportsAllNetworks: true,
-  isDefaultCaipNetwork: false,
   smartAccountEnabledNetworks: []
 };
 
@@ -65,7 +64,7 @@ describe('NetworkController', () => {
   it('should update state correctly on setDefaultCaipNetwork()', () => {
     NetworkController.setDefaultCaipNetwork(caipNetwork);
     expect(NetworkController.state.caipNetwork).toEqual(caipNetwork);
-    expect(NetworkController.state.isDefaultCaipNetwork).toEqual(true);
+    expect(NetworkController.state.defaultCaipNetwork).toEqual(caipNetwork);
   });
 
   it('should reset state correctly when default caip network is true', () => {

packages/core/src/controllers/ConnectionController.ts

@@ -93,7 +93,7 @@ export const ConnectionController = {
 
   async connectExternal(options: ConnectExternalOptions) {
     await this._getClient().connectExternal?.(options);
-    ConnectorController.setConnectedConnector(options.type);
+    await ConnectorController.setConnectedConnector(options.type);
   },
 
   async signMessage(message: string) {

packages/core/src/controllers/ConnectorController.ts

@@ -42,17 +42,17 @@ export const ConnectorController = {
     return state.connectors.find(c => c.type === 'AUTH');
   },
 
-  setConnectedConnector(
+  async setConnectedConnector(
     connectorType: ConnectorControllerState['connectedConnector'],
     saveStorage = true
   ) {
     state.connectedConnector = connectorType;
 
     if (saveStorage) {
       if (connectorType) {
-        StorageUtil.setConnectedConnector(connectorType);
+        await StorageUtil.setConnectedConnector(connectorType);
       } else {
-        StorageUtil.removeConnectedConnector();
+        await StorageUtil.removeConnectedConnector();
       }
     }
   },

packages/core/src/controllers/NetworkController.ts

@@ -15,9 +15,9 @@ export interface NetworkControllerClient {
 
 export interface NetworkControllerState {
   supportsAllNetworks: boolean;
-  isDefaultCaipNetwork: boolean;
   _client?: NetworkControllerClient;
   caipNetwork?: CaipNetwork;
+  defaultCaipNetwork?: CaipNetwork;
   requestedCaipNetworks?: CaipNetwork[];
   approvedCaipNetworkIds?: CaipNetworkId[];
   smartAccountEnabledNetworks: number[];
@@ -26,7 +26,7 @@ export interface NetworkControllerState {
 // -- State --------------------------------------------- //
 const state = proxy<NetworkControllerState>({
   supportsAllNetworks: true,
-  isDefaultCaipNetwork: false,
+  defaultCaipNetwork: undefined,
   smartAccountEnabledNetworks: []
 });
 
@@ -53,7 +53,7 @@ export const NetworkController = {
 
   setDefaultCaipNetwork(caipNetwork: NetworkControllerState['caipNetwork']) {
     state.caipNetwork = caipNetwork;
-    state.isDefaultCaipNetwork = true;
+    state.defaultCaipNetwork = caipNetwork;
     PublicStateController.set({ selectedNetworkId: caipNetwork?.id });
   },
 
@@ -84,9 +84,11 @@ export const NetworkController = {
   },
 
   getApprovedCaipNetworks() {
-    return state.approvedCaipNetworkIds
+    const networks = state.approvedCaipNetworkIds
       ?.map(id => state.requestedCaipNetworks?.find(network => network.id === id))
       .filter(Boolean) as CaipNetwork[];
+
+    return networks ?? [];
   },
 
   getSmartAccountEnabledNetworks() {
@@ -110,9 +112,7 @@ export const NetworkController = {
   },
 
   resetNetwork() {
-    if (!state.isDefaultCaipNetwork) {
-      state.caipNetwork = undefined;
-    }
+    state.caipNetwork = state.defaultCaipNetwork || undefined;
     state.approvedCaipNetworkIds = undefined;
     state.supportsAllNetworks = true;
     state.smartAccountEnabledNetworks = [];

packages/core/src/utils/NetworkUtil.ts

@@ -7,18 +7,20 @@ import { SwapController } from '../controllers/SwapController';
 import type { CaipNetwork } from '../utils/TypeUtil';
 
 export const NetworkUtil = {
-  async handleNetworkSwitch(network: CaipNetwork) {
+  async handleNetworkSwitch(network: CaipNetwork, navigate: boolean = true) {
     const { isConnected } = AccountController.state;
     const { caipNetwork, approvedCaipNetworkIds, supportsAllNetworks } = NetworkController.state;
-    const isAuthConnected = ConnectorController.state.connectedConnector === 'AUTH';
+    const isAuthConnector = ConnectorController.state.connectedConnector === 'AUTH';
     let eventData = null;
 
     if (isConnected && caipNetwork?.id !== network.id) {
-      if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnected) {
+      if (approvedCaipNetworkIds?.includes(network.id) && !isAuthConnector) {
         await NetworkController.switchActiveNetwork(network);
-        RouterUtil.navigateAfterNetworkSwitch(['ConnectingSiwe']);
+        if (navigate) {
+          RouterUtil.goBackOrCloseModal();
+        }
         eventData = { type: 'SWITCH_NETWORK', networkId: network.id };
-      } else if (supportsAllNetworks || isAuthConnected) {
+      } else if (supportsAllNetworks || isAuthConnector) {
         RouterController.push('SwitchNetwork', { network });
       }
     } else if (!isConnected) {

packages/core/src/utils/RouterUtil.ts

@@ -1,19 +1,10 @@
-import { RouterController, type RouterControllerState } from '../controllers/RouterController';
+import { RouterController } from '../controllers/RouterController';
 import { ModalController } from '../controllers/ModalController';
 
 export const RouterUtil = {
-  navigateAfterNetworkSwitch(excludeViews: RouterControllerState['view'][] = []) {
-    if (excludeViews.includes(RouterController.state.view)) {
-      return;
-    }
-
-    const { history } = RouterController.state;
-    const networkSelectIndex = history.findIndex(
-      name => name === 'Networks' || name === 'UnsupportedChain'
-    );
-
-    if (networkSelectIndex >= 1) {
-      RouterController.goBackToIndex(networkSelectIndex - 1);
+  goBackOrCloseModal() {
+    if (RouterController.state.history.length > 1) {
+      RouterController.goBack();
     } else {
       ModalController.close();
     }