@reown/appkit-core-react-native 2.0.0-alpha.4 → 2.0.0-alpha.5

package/src/controllers/ApiController.ts

@@ -108,87 +108,104 @@ export const ApiController = {
   },
 
   async fetchInstalledWallets() {
-    const { includeWalletIds, customWallets } = OptionsController.state;
-    const path = Platform.select({ default: 'getIosData', android: 'getAndroidData' });
-    const response = await api.get<ApiGetDataWalletsResponse>({
-      path,
-      headers: ApiController._getApiHeaders()
-    });
+    // Add timeout to prevent hanging
+    const controller = new AbortController();
+    let timeoutId: NodeJS.Timeout | undefined;
 
-    if (!response) return;
-
-    let { data: walletData } = response;
+    try {
+      const { includeWalletIds, customWallets } = OptionsController.state;
+      const path = Platform.select({ default: 'getIosData', android: 'getAndroidData' });
+      const response = await api.get<ApiGetDataWalletsResponse>({
+        path,
+        headers: ApiController._getApiHeaders()
+      });
 
-    if (includeWalletIds?.length) {
-      walletData = walletData.filter(({ id }) => includeWalletIds.includes(id));
-    }
+      if (!response) return;
 
-    const promises = walletData.map(async item => {
-      return {
-        id: item.id,
-        isInstalled: await CoreHelperUtil.checkInstalled(item)
-      };
-    });
+      let { data: walletData } = response;
 
-    const customPromises = customWallets?.map(async item => {
-      return {
-        id: item.id,
-        isInstalled: await CoreHelperUtil.checkInstalled(item)
-      };
-    });
+      if (includeWalletIds?.length) {
+        walletData = walletData.filter(({ id }) => includeWalletIds.includes(id));
+      }
 
-    const results = await Promise.all(promises);
-    const installed = results.filter(({ isInstalled }) => isInstalled).map(({ id }) => id);
-    const { excludeWalletIds } = OptionsController.state;
-    const chains = CoreHelperUtil.getRequestedCaipNetworkIds();
+      const promises = walletData.map(async item => {
+        return {
+          id: item.id,
+          isInstalled: await CoreHelperUtil.checkInstalled(item)
+        };
+      });
 
-    // Collect API-sourced installed wallets
-    let apiInstalledWallets: WcWallet[] = [];
-    if (installed.length > 0) {
-      const walletResponse = await api.get<ApiGetWalletsResponse>({
-        path: '/getWallets',
-        headers: ApiController._getApiHeaders(),
-        params: {
-          page: '1',
-          platform: this.platform(),
-          entries: installed?.length.toString(),
-          include: installed?.join(','),
-          exclude: excludeWalletIds?.join(','),
-          chains: chains.join(',')
-        }
+      const customPromises = customWallets?.map(async item => {
+        return {
+          id: item.id,
+          isInstalled: await CoreHelperUtil.checkInstalled(item)
+        };
       });
 
-      if (walletResponse?.data) {
-        const walletImages = walletResponse.data.map(d => d.image_id).filter(Boolean);
-        await CoreHelperUtil.allSettled(
-          (walletImages as string[]).map(id => ApiController._fetchWalletImage(id))
-        );
-        apiInstalledWallets = walletResponse.data;
+      const results = await Promise.all(promises);
+      const installed = results.filter(({ isInstalled }) => isInstalled).map(({ id }) => id);
+      const { excludeWalletIds } = OptionsController.state;
+      const chains = CoreHelperUtil.getRequestedCaipNetworkIds();
+
+      // Add timeout to prevent hanging
+      timeoutId = setTimeout(() => controller.abort(), 10000);
+
+      // Collect API-sourced installed wallets
+      let apiInstalledWallets: WcWallet[] = [];
+      if (installed.length > 0) {
+        const walletResponse = await api.get<ApiGetWalletsResponse>({
+          path: '/getWallets',
+          headers: ApiController._getApiHeaders(),
+          params: {
+            page: '1',
+            platform: this.platform(),
+            entries: installed?.length.toString(),
+            include: installed?.join(','),
+            exclude: excludeWalletIds?.join(','),
+            chains: chains.join(',')
+          },
+          signal: controller.signal
+        });
+
+        if (walletResponse?.data) {
+          const walletImages = walletResponse.data.map(d => d.image_id).filter(Boolean);
+          await CoreHelperUtil.allSettled(
+            (walletImages as string[]).map(id => ApiController._fetchWalletImage(id))
+          );
+          apiInstalledWallets = walletResponse.data;
+        }
       }
-    }
 
-    // Collect custom installed wallets
-    let customInstalledWallets: CustomWallet[] = [];
-    if (customPromises?.length) {
-      const customResults = await Promise.all(customPromises);
-      const customInstalled = customResults
-        .filter(({ isInstalled }) => isInstalled)
-        .map(({ id }) => id);
-      customInstalledWallets =
-        customWallets?.filter(wallet => customInstalled.includes(wallet.id)) ?? [];
-    }
+      clearTimeout(timeoutId);
+
+      // Collect custom installed wallets
+      let customInstalledWallets: CustomWallet[] = [];
+      if (customPromises?.length) {
+        const customResults = await Promise.all(customPromises);
+        const customInstalled = customResults
+          .filter(({ isInstalled }) => isInstalled)
+          .map(({ id }) => id);
+        customInstalledWallets =
+          customWallets?.filter(wallet => customInstalled.includes(wallet.id)) ?? [];
+      }
 
-    // Merge and de-duplicate by id, preserving order (API first, then custom)
-    const byId = new Map<string, WcWallet>();
-    [...apiInstalledWallets, ...customInstalledWallets].forEach(wallet => {
-      if (!byId.has(wallet.id)) {
-        byId.set(wallet.id, wallet);
+      // Merge and de-duplicate by id, preserving order (API first, then custom)
+      const byId = new Map<string, WcWallet>();
+      [...apiInstalledWallets, ...customInstalledWallets].forEach(wallet => {
+        if (!byId.has(wallet.id)) {
+          byId.set(wallet.id, wallet);
+        }
+      });
+      const combinedInstalled = Array.from(byId.values());
+      state.installed = combinedInstalled;
+      if (combinedInstalled.length) {
+        this.updateRecentWalletsInfo(combinedInstalled);
       }
-    });
-    const combinedInstalled = Array.from(byId.values());
-    state.installed = combinedInstalled;
-    if (combinedInstalled.length) {
-      this.updateRecentWalletsInfo(combinedInstalled);
+    } catch (error) {
+      state.installed = [];
+      clearTimeout(timeoutId);
+      // eslint-disable-next-line no-console
+      console.log('Error fetching installed wallets', error);
     }
   },
 
@@ -375,19 +392,22 @@ export const ApiController = {
     try {
       state.prefetchError = false;
       state.prefetchLoading = true;
-      // this fetch must resolve first so we filter them in the other wallet requests
-      await ApiController.fetchInstalledWallets();
 
       const promises = [
-        ApiController.fetchFeaturedWallets(),
-        ApiController.fetchRecommendedWallets(),
         ApiController.fetchNetworkImages(),
         ApiController.fetchCustomWalletImages()
       ];
+
       if (OptionsController.state.enableAnalytics === undefined) {
         promises.push(ApiController.fetchAnalyticsConfig());
       }
 
+      // this fetch must resolve first so we filter them in the other wallet requests
+      await ApiController.fetchInstalledWallets();
+
+      promises.push(ApiController.fetchFeaturedWallets());
+      promises.push(ApiController.fetchRecommendedWallets());
+
       state.prefetchPromise = Promise.race([
         CoreHelperUtil.allSettled(promises),
         CoreHelperUtil.wait(3000)

package/src/controllers/BlockchainApiController.ts

@@ -119,7 +119,7 @@ export const BlockchainApiController = {
 
   async fetchTransactions(params: BlockchainApiTransactionsRequest) {
     const { account, projectId, cursor, signal, cache, chainId } = params;
-    const isSupported = await BlockchainApiController.isNetworkSupported(chainId);
+    const isSupported = ConstantsUtil.ACTIVITY_SUPPORTED_CHAINS.includes(chainId);
 
     if (!isSupported) {
       return { data: [], next: undefined };

package/src/controllers/ConnectionsController.ts

@@ -80,11 +80,13 @@ const updateConnection = (
   namespace: ChainNamespace,
   connection: Connection,
   updates: Partial<Connection>
-) => {
-  if (!connection) return;
+): Connection => {
   const newConnectionsMap = new Map(baseState.connections);
-  newConnectionsMap.set(namespace, { ...connection, ...updates });
+  const newConnection = { ...connection, ...updates };
+  newConnectionsMap.set(namespace, newConnection);
   baseState.connections = newConnectionsMap;
+
+  return newConnection;
 };
 
 const getActiveIdentity = (connection: Connection): Identity | undefined => {
@@ -206,6 +208,10 @@ export const ConnectionsController = {
   state: derivedState,
 
   setActiveNamespace(namespace?: ChainNamespace) {
+    if (baseState.activeNamespace === namespace) {
+      return;
+    }
+
     baseState.activeNamespace = namespace;
     StorageUtil.setActiveNamespace(namespace);
   },
@@ -247,16 +253,19 @@ export const ConnectionsController = {
     baseState.connections = newConnectionsMap;
   },
 
-  updateAccounts(namespace: ChainNamespace, accounts: CaipAddress[]) {
+  updateAccounts(namespace: ChainNamespace, accounts: CaipAddress[]): boolean {
     const connection = baseState.connections.get(namespace);
     if (!connection) {
-      return;
+      return false;
     }
 
-    const newConnectionsMap = new Map(baseState.connections);
-    const updatedConnection = { ...connection, accounts };
-    newConnectionsMap.set(namespace, updatedConnection);
-    baseState.connections = newConnectionsMap;
+    if (connection.accounts.toString() === accounts.toString()) {
+      return false;
+    }
+
+    updateConnection(namespace, connection, { accounts });
+
+    return true;
   },
 
   updateBalance(namespace: ChainNamespace, address: CaipAddress, balance: Balance) {
@@ -327,10 +336,9 @@ export const ConnectionsController = {
       return;
     }
 
-    baseState.connections.set(namespace, {
-      ...connection,
-      caipNetwork: networkId
-    });
+    updateConnection(namespace, connection, { caipNetwork: networkId });
+
+    this.setActiveNamespace(namespace);
   },
 
   setNetworks(networks: AppKitNetwork[]) {
@@ -338,6 +346,11 @@ export const ConnectionsController = {
   },
 
   getConnectedNetworks() {
+    const connection = getActiveConnection(baseState);
+    if (!connection) {
+      return [];
+    }
+
     return baseState.networks.filter(
       network =>
         baseState.connections
@@ -346,14 +359,31 @@ export const ConnectionsController = {
     );
   },
 
+  getAvailableNetworks() {
+    const connection = getActiveConnection(baseState);
+
+    if (!connection) {
+      return baseState.networks;
+    }
+
+    const canAddEvmChain = connection.properties?.canAddEvmChain;
+
+    return baseState.networks.filter(
+      network =>
+        baseState.connections
+          .get(network.chainNamespace)
+          ?.accounts.some(account => account.startsWith(network.caipNetworkId)) ||
+        (canAddEvmChain && network.chainNamespace === 'eip155')
+    );
+  },
+
   setAccountType(namespace: ChainNamespace, type: AccountType) {
     const connection = baseState.connections.get(namespace);
     if (!connection) return;
 
-    const newConnectionsMap = new Map(baseState.connections);
-    const newConnection = { ...connection, type };
-    newConnectionsMap.set(namespace, newConnection);
-    baseState.connections = newConnectionsMap;
+    const newConnection = updateConnection(namespace, connection, { type });
+
+    return getActiveAddress(newConnection);
   },
 
   async disconnect(namespace: ChainNamespace, isInternal = true) {

package/src/controllers/ModalController.ts

@@ -30,10 +30,14 @@ export const ModalController = {
   async open(options?: ModalControllerArguments['open']) {
     await ApiController.state.prefetchPromise;
     const isConnected = ConnectionsController.state.isConnected;
+    const isUniversalWallet = !!ConnectionsController.state.connection?.properties?.provider;
     if (options?.view) {
+      if (options.view === 'Account' && !isUniversalWallet) {
+        options.view = 'AccountDefault';
+      }
+
       RouterController.reset(options.view);
     } else if (isConnected) {
-      const isUniversalWallet = !!ConnectionsController.state.connection?.properties?.provider;
       RouterController.reset(isUniversalWallet ? 'Account' : 'AccountDefault');
     } else {
       RouterController.reset('Connect');

package/src/controllers/OnRampController.ts

@@ -124,7 +124,11 @@ export const OnRampController = {
           state.countriesDefaults?.find(d => d.countryCode === country.countryCode)
             ?.defaultCurrencyCode || 'USD';
 
-        const currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
+        let currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
+
+        if (!currency) {
+          currency = state.paymentCurrencies?.find(c => c.currencyCode === 'USD');
+        }
 
         if (currency) {
           this.setPaymentCurrency(currency);

package/src/controllers/RouterController.ts

@@ -17,15 +17,15 @@ export interface RouterControllerState {
     | 'ConnectingExternal'
     | 'ConnectingSiwe'
     | 'ConnectingSocial'
-    | 'ConnectingWalletConnect'
+    | 'WalletConnect'
     | 'GetWallet'
     | 'Networks'
+    | 'SwitchNetwork'
     | 'OnRamp'
     | 'OnRampCheckout'
     | 'OnRampLoading'
     | 'OnRampSettings'
     | 'OnRampTransaction'
-    | 'SwitchNetwork'
     | 'Swap'
     | 'SwapPreview'
     | 'Transactions'

package/src/controllers/ThemeController.ts

@@ -5,12 +5,14 @@ import type { ThemeMode, ThemeVariables } from '@reown/appkit-common-react-nativ
 // -- Types --------------------------------------------- //
 export interface ThemeControllerState {
   themeMode?: ThemeMode;
+  defaultThemeMode?: ThemeMode;
   themeVariables?: ThemeVariables;
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<ThemeControllerState>({
   themeMode: undefined,
+  defaultThemeMode: undefined,
   themeVariables: {}
 });
 
@@ -30,6 +32,11 @@ export const ThemeController = {
     }
   },
 
+  setDefaultThemeMode(themeMode: ThemeControllerState['defaultThemeMode']) {
+    state.defaultThemeMode = themeMode;
+    this.setThemeMode(themeMode);
+  },
+
   setThemeVariables(themeVariables: ThemeControllerState['themeVariables']) {
     if (!themeVariables) {
       state.themeVariables = {};

package/src/index.ts

@@ -53,7 +53,6 @@ export { ConstantsUtil } from './utils/ConstantsUtil';
 export { CoreHelperUtil } from './utils/CoreHelperUtil';
 export { StorageUtil } from './utils/StorageUtil';
 export { EventUtil } from './utils/EventUtil';
-export { RouterUtil } from './utils/RouterUtil';
 export { WalletUtil } from './utils/WalletUtil';
 
 // Types are now exported from @reown/appkit-common-react-native

package/src/utils/ConstantsUtil.ts

@@ -219,8 +219,6 @@ export const ConstantsUtil = {
     'eip155:1499',
     // Sonic
     'eip155:7007',
-    // Swellchain
-    'eip155:7777777',
     // Taiko
     'eip155:167000',
     // Viction
@@ -238,9 +236,7 @@ export const ConstantsUtil = {
     // ZkLink Nova
     'eip155:810180',
     // re.al
-    'eip155:666',
-    // Zora
-    'eip155:7777777'
+    'eip155:666'
   ],
 
   SWAP_SUPPORTED_NETWORKS: [

package/lib/commonjs/utils/RouterUtil.js

@@ -1,25 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.RouterUtil = void 0;
-var _RouterController = require("../controllers/RouterController");
-var _ModalController = require("../controllers/ModalController");
-const RouterUtil = exports.RouterUtil = {
-  navigateAfterNetworkSwitch(excludeViews = []) {
-    if (excludeViews.includes(_RouterController.RouterController.state.view)) {
-      return;
-    }
-    const {
-      history
-    } = _RouterController.RouterController.state;
-    const networkSelectIndex = history.findIndex(name => name === 'Networks' || name === 'UnsupportedChain');
-    if (networkSelectIndex >= 1) {
-      _RouterController.RouterController.goBackToIndex(networkSelectIndex - 1);
-    } else {
-      _ModalController.ModalController.close();
-    }
-  }
-};
-//# sourceMappingURL=RouterUtil.js.map

package/lib/commonjs/utils/RouterUtil.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_RouterController","require","_ModalController","RouterUtil","exports","navigateAfterNetworkSwitch","excludeViews","includes","RouterController","state","view","history","networkSelectIndex","findIndex","name","goBackToIndex","ModalController","close"],"sourceRoot":"../../../src","sources":["utils/RouterUtil.ts"],"mappings":";;;;;;AAAA,IAAAA,iBAAA,GAAAC,OAAA;AACA,IAAAC,gBAAA,GAAAD,OAAA;AAEO,MAAME,UAAU,GAAAC,OAAA,CAAAD,UAAA,GAAG;EACxBE,0BAA0BA,CAACC,YAA6C,GAAG,EAAE,EAAE;IAC7E,IAAIA,YAAY,CAACC,QAAQ,CAACC,kCAAgB,CAACC,KAAK,CAACC,IAAI,CAAC,EAAE;MACtD;IACF;IAEA,MAAM;MAAEC;IAAQ,CAAC,GAAGH,kCAAgB,CAACC,KAAK;IAC1C,MAAMG,kBAAkB,GAAGD,OAAO,CAACE,SAAS,CAC1CC,IAAI,IAAIA,IAAI,KAAK,UAAU,IAAIA,IAAI,KAAK,kBAC1C,CAAC;IAED,IAAIF,kBAAkB,IAAI,CAAC,EAAE;MAC3BJ,kCAAgB,CAACO,aAAa,CAACH,kBAAkB,GAAG,CAAC,CAAC;IACxD,CAAC,MAAM;MACLI,gCAAe,CAACC,KAAK,CAAC,CAAC;IACzB;EACF;AACF,CAAC","ignoreList":[]}

package/lib/module/utils/RouterUtil.js

@@ -1,21 +0,0 @@
-"use strict";
-
-import { RouterController } from '../controllers/RouterController';
-import { ModalController } from '../controllers/ModalController';
-export const RouterUtil = {
-  navigateAfterNetworkSwitch(excludeViews = []) {
-    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);
-    } else {
-      ModalController.close();
-    }
-  }
-};
-//# sourceMappingURL=RouterUtil.js.map

package/lib/module/utils/RouterUtil.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["RouterController","ModalController","RouterUtil","navigateAfterNetworkSwitch","excludeViews","includes","state","view","history","networkSelectIndex","findIndex","name","goBackToIndex","close"],"sourceRoot":"../../../src","sources":["utils/RouterUtil.ts"],"mappings":";;AAAA,SAASA,gBAAgB,QAAoC,iCAAiC;AAC9F,SAASC,eAAe,QAAQ,gCAAgC;AAEhE,OAAO,MAAMC,UAAU,GAAG;EACxBC,0BAA0BA,CAACC,YAA6C,GAAG,EAAE,EAAE;IAC7E,IAAIA,YAAY,CAACC,QAAQ,CAACL,gBAAgB,CAACM,KAAK,CAACC,IAAI,CAAC,EAAE;MACtD;IACF;IAEA,MAAM;MAAEC;IAAQ,CAAC,GAAGR,gBAAgB,CAACM,KAAK;IAC1C,MAAMG,kBAAkB,GAAGD,OAAO,CAACE,SAAS,CAC1CC,IAAI,IAAIA,IAAI,KAAK,UAAU,IAAIA,IAAI,KAAK,kBAC1C,CAAC;IAED,IAAIF,kBAAkB,IAAI,CAAC,EAAE;MAC3BT,gBAAgB,CAACY,aAAa,CAACH,kBAAkB,GAAG,CAAC,CAAC;IACxD,CAAC,MAAM;MACLR,eAAe,CAACY,KAAK,CAAC,CAAC;IACzB;EACF;AACF,CAAC","ignoreList":[]}

package/lib/typescript/utils/RouterUtil.d.ts

@@ -1,5 +0,0 @@
-import { type RouterControllerState } from '../controllers/RouterController';
-export declare const RouterUtil: {
-    navigateAfterNetworkSwitch(excludeViews?: RouterControllerState['view'][]): void;
-};
-//# sourceMappingURL=RouterUtil.d.ts.map

package/lib/typescript/utils/RouterUtil.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"RouterUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/RouterUtil.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,qBAAqB,EAAE,MAAM,iCAAiC,CAAC;AAG/F,eAAO,MAAM,UAAU;8CACoB,qBAAqB,CAAC,MAAM,CAAC,EAAE;CAgBzE,CAAC"}

package/src/utils/RouterUtil.ts

@@ -1,21 +0,0 @@
-import { RouterController, type RouterControllerState } 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);
-    } else {
-      ModalController.close();
-    }
-  }
-};