@reown/appkit-core-react-native 0.0.0-fix-approved-networks-20250822000414 → 0.0.0-fix-ui-changes-20250828183750

package/src/controllers/ApiController.ts

@@ -4,20 +4,21 @@ import { proxy } from 'valtio';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { FetchUtil } from '../utils/FetchUtil';
 import { StorageUtil } from '../utils/StorageUtil';
-import type {
-  ApiGetAnalyticsConfigResponse,
-  ApiGetDataWalletsResponse,
-  ApiGetWalletsRequest,
-  ApiGetWalletsResponse,
-  WcWallet
-} from '../utils/TypeUtil';
+import {
+  type ApiGetAnalyticsConfigResponse,
+  type ApiGetDataWalletsResponse,
+  type ApiGetWalletsRequest,
+  type ApiGetWalletsResponse,
+  type CustomWallet,
+  type WcWallet,
+  PresetsUtil
+} from '@reown/appkit-common-react-native';
 import { AssetController } from './AssetController';
-import { NetworkController } from './NetworkController';
 import { OptionsController } from './OptionsController';
-import { ConnectorController } from './ConnectorController';
-import { ConnectionController } from './ConnectionController';
+import { WcController } from './WcController';
 import { ApiUtil } from '../utils/ApiUtil';
 import { SnackController } from './SnackController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Helpers ------------------------------------------- //
 const baseUrl = CoreHelperUtil.getApiUrl();
@@ -84,42 +85,30 @@ export const ApiController = {
     }
   },
 
-  async _fetchConnectorImage(imageId: string) {
-    const headers = ApiController._getApiHeaders();
-    const url = await api.fetchImage(`/public/getAssetImage/${imageId}`, headers);
-    if (url) {
-      AssetController.setConnectorImage(imageId, url);
+  async _fetchNetworkImage(networkId: string) {
+    const imageId = PresetsUtil.NetworkImageIds[networkId];
+    if (!imageId) {
+      return;
     }
-  },
 
-  async _fetchNetworkImage(imageId: string) {
     const headers = ApiController._getApiHeaders();
     const url = await api.fetchImage(`/public/getAssetImage/${imageId}`, headers);
     if (url) {
-      AssetController.setNetworkImage(imageId, url);
+      AssetController.setNetworkImage(networkId, url);
     }
   },
 
-  async fetchConnectorImages() {
-    const { connectors } = ConnectorController.state;
-    const ids = connectors.map(({ imageId }) => imageId).filter(Boolean);
-    await CoreHelperUtil.allSettled(
-      (ids as string[]).map(id => ApiController._fetchConnectorImage(id))
-    );
-  },
-
   async fetchNetworkImages() {
-    const { requestedCaipNetworks } = NetworkController.state;
-    const ids = requestedCaipNetworks?.map(({ imageId }) => imageId).filter(Boolean);
-    if (ids) {
+    const networks = ConnectionsController.state.networks;
+    if (networks) {
       await CoreHelperUtil.allSettled(
-        (ids as string[]).map(id => ApiController._fetchNetworkImage(id))
+        networks.map(network => ApiController._fetchNetworkImage(network.id as string))
       );
     }
   },
 
   async fetchInstalledWallets() {
-    const { includeWalletIds } = OptionsController.state;
+    const { includeWalletIds, customWallets } = OptionsController.state;
     const path = Platform.select({ default: 'getIosData', android: 'getAndroidData' });
     const response = await api.get<ApiGetDataWalletsResponse>({
       path,
@@ -141,10 +130,20 @@ export const ApiController = {
       };
     });
 
+    const customPromises = customWallets?.map(async item => {
+      return {
+        id: item.id,
+        isInstalled: await CoreHelperUtil.checkInstalled(item)
+      };
+    });
+
     const results = await Promise.all(promises);
     const installed = results.filter(({ isInstalled }) => isInstalled).map(({ id }) => id);
     const { excludeWalletIds } = OptionsController.state;
+    const chains = CoreHelperUtil.getRequestedCaipNetworkIds();
 
+    // Collect API-sourced installed wallets
+    let apiInstalledWallets: WcWallet[] = [];
     if (installed.length > 0) {
       const walletResponse = await api.get<ApiGetWalletsResponse>({
         path: '/getWallets',
@@ -154,7 +153,8 @@ export const ApiController = {
           platform: this.platform(),
           entries: installed?.length.toString(),
           include: installed?.join(','),
-          exclude: excludeWalletIds?.join(',')
+          exclude: excludeWalletIds?.join(','),
+          chains: chains.join(',')
         }
       });
 
@@ -163,15 +163,39 @@ export const ApiController = {
         await CoreHelperUtil.allSettled(
           (walletImages as string[]).map(id => ApiController._fetchWalletImage(id))
         );
-        state.installed = walletResponse.data;
-        this.updateRecentWalletsInfo(walletResponse.data);
+        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)) ?? [];
+    }
+
+    // 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);
+    }
   },
 
   async fetchFeaturedWallets() {
     const { featuredWalletIds } = OptionsController.state;
     const exclude = state.installed.map(({ id }) => id);
+    const chains = CoreHelperUtil.getRequestedCaipNetworkIds();
 
     if (featuredWalletIds?.length) {
       const response = await api.get<ApiGetWalletsResponse>({
@@ -184,7 +208,8 @@ export const ApiController = {
             ? String(featuredWalletIds.length)
             : recommendedEntries,
           include: featuredWalletIds?.join(','),
-          exclude: exclude?.join(',')
+          exclude: exclude?.join(','),
+          chains: chains.join(',')
         }
       });
       if (!response) return;
@@ -201,9 +226,22 @@ export const ApiController = {
     }
   },
 
+  async fetchCustomWalletImages() {
+    const { customWallets } = OptionsController.state;
+    if (!customWallets?.length) {
+      return;
+    }
+
+    const images = customWallets.map(w => w.image_id).filter(Boolean);
+    await CoreHelperUtil.allSettled(
+      (images as string[]).map(id => ApiController._fetchWalletImage(id))
+    );
+  },
+
   async fetchRecommendedWallets() {
     const { installed } = ApiController.state;
     const { includeWalletIds, excludeWalletIds, featuredWalletIds } = OptionsController.state;
+    const chains = CoreHelperUtil.getRequestedCaipNetworkIds();
 
     const exclude = [
       ...installed.map(({ id }) => id),
@@ -219,7 +257,8 @@ export const ApiController = {
         platform: this.platform(),
         entries: recommendedEntries,
         include: includeWalletIds?.join(','),
-        exclude: exclude?.join(',')
+        exclude: exclude?.join(','),
+        chains: chains.join(',')
       }
     });
 
@@ -242,6 +281,7 @@ export const ApiController = {
 
   async fetchWallets({ page }: Pick<ApiGetWalletsRequest, 'page'>) {
     const { includeWalletIds, excludeWalletIds, featuredWalletIds } = OptionsController.state;
+    const chains = CoreHelperUtil.getRequestedCaipNetworkIds();
     const exclude = [
       ...state.installed.map(({ id }) => id),
       ...state.recommended.map(({ id }) => id),
@@ -256,7 +296,8 @@ export const ApiController = {
         platform: this.platform(),
         entries: String(defaultEntries),
         include: includeWalletIds?.join(','),
-        exclude: exclude.join(',')
+        exclude: exclude.join(','),
+        chains: chains.join(',')
       }
     });
 
@@ -279,6 +320,7 @@ export const ApiController = {
 
   async searchWallet({ search }: Pick<ApiGetWalletsRequest, 'search'>) {
     const { includeWalletIds, excludeWalletIds } = OptionsController.state;
+    const chains = CoreHelperUtil.getRequestedCaipNetworkIds();
     state.search = [];
     const response = await api.get<ApiGetWalletsResponse>({
       path: '/getWallets',
@@ -289,7 +331,8 @@ export const ApiController = {
         entries: String(defaultEntries),
         search,
         include: includeWalletIds?.join(','),
-        exclude: excludeWalletIds?.join(',')
+        exclude: excludeWalletIds?.join(','),
+        chains: chains.join(',')
       }
     });
 
@@ -324,7 +367,7 @@ export const ApiController = {
 
     if (update) {
       await StorageUtil.setRecentWallets(updatedRecent);
-      ConnectionController.setRecentWallets(updatedRecent);
+      WcController.setRecentWallets(updatedRecent);
     }
   },
 
@@ -339,7 +382,7 @@ export const ApiController = {
         ApiController.fetchFeaturedWallets(),
         ApiController.fetchRecommendedWallets(),
         ApiController.fetchNetworkImages(),
-        ApiController.fetchConnectorImages()
+        ApiController.fetchCustomWalletImages()
       ];
       if (OptionsController.state.enableAnalytics === undefined) {
         promises.push(ApiController.fetchAnalyticsConfig());

package/src/controllers/AssetController.ts

@@ -4,7 +4,6 @@ import { proxy } from 'valtio';
 export interface AssetControllerState {
   walletImages: Record<string, string>;
   networkImages: Record<string, string>;
-  connectorImages: Record<string, string>;
   tokenImages: Record<string, string>;
 }
 
@@ -12,7 +11,6 @@ export interface AssetControllerState {
 const state = proxy<AssetControllerState>({
   walletImages: {},
   networkImages: {},
-  connectorImages: {},
   tokenImages: {}
 });
 
@@ -28,10 +26,6 @@ export const AssetController = {
     state.networkImages[key] = value;
   },
 
-  setConnectorImage(key: string, value: string) {
-    state.connectorImages[key] = value;
-  },
-
   setTokenImage(key: string, value: string) {
     state.tokenImages[key] = value;
   }

package/src/controllers/BlockchainApiController.ts

@@ -33,12 +33,16 @@ import type {
   BlockchainApiOnRampWidgetRequest,
   BlockchainApiOnRampQuotesRequest,
   OnRampFiatLimit,
-  OnRampCountryDefaults
-} from '../utils/TypeUtil';
+  OnRampCountryDefaults,
+  CaipAddress,
+  CaipNetworkId
+} from '@reown/appkit-common-react-native';
 import { OptionsController } from './OptionsController';
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 import { ApiUtil } from '../utils/ApiUtil';
 
+import { SnackController } from './SnackController';
+
 // -- Helpers ------------------------------------------- //
 const baseUrl = CoreHelperUtil.getBlockchainApiUrl();
 
@@ -57,22 +61,53 @@ const getHeaders = () => {
 export const EXCLUDED_ONRAMP_PROVIDERS = ['BINANCECONNECT', 'COINBASEPAY'];
 
 // -- Types --------------------------------------------- //
+type WithCaipNetworkId = { caipNetworkId: CaipNetworkId };
+
 export interface BlockchainApiControllerState {
   clientId: string | null;
   api: FetchUtil;
+  supportedChains: { http: CaipNetworkId[]; ws: CaipNetworkId[] };
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<BlockchainApiControllerState>({
   clientId: null,
-  api: new FetchUtil({ baseUrl })
+  api: new FetchUtil({ baseUrl }),
+  supportedChains: { http: [], ws: [] }
 });
 
 // -- Controller ---------------------------------------- //
 export const BlockchainApiController = {
   state,
 
-  fetchIdentity({ address }: BlockchainApiIdentityRequest) {
+  async isNetworkSupported(networkId?: CaipNetworkId) {
+    if (!networkId) {
+      return false;
+    }
+    try {
+      if (!state.supportedChains.http.length) {
+        await BlockchainApiController.getSupportedNetworks();
+      }
+    } catch (e) {
+      return false;
+    }
+
+    return state.supportedChains.http.includes(networkId);
+  },
+
+  async getSupportedNetworks() {
+    const supportedChains = await state.api.get<BlockchainApiControllerState['supportedChains']>({
+      path: 'v1/supported-chains'
+    });
+
+    state.supportedChains = supportedChains!;
+
+    return supportedChains;
+  },
+
+  async fetchIdentity(params: BlockchainApiIdentityRequest) {
+    const { address } = params;
+
     return state.api.get<BlockchainApiIdentityResponse>({
       path: `/v1/identity/${address}`,
       params: {
@@ -82,29 +117,38 @@ export const BlockchainApiController = {
     });
   },
 
-  fetchTransactions({
-    account,
-    projectId,
-    cursor,
-    onramp,
-    signal,
-    cache
-  }: BlockchainApiTransactionsRequest) {
-    return state.api.get<BlockchainApiTransactionsResponse>({
+  async fetchTransactions(params: BlockchainApiTransactionsRequest) {
+    const { account, projectId, cursor, signal, cache, chainId } = params;
+    const isSupported = await BlockchainApiController.isNetworkSupported(chainId);
+
+    if (!isSupported) {
+      return { data: [], next: undefined };
+    }
+
+    const response = await state.api.get<BlockchainApiTransactionsResponse>({
       path: `/v1/account/${account}/history`,
       headers: getHeaders(),
       params: {
         projectId,
         cursor,
-        onramp
+        chainId
       },
       signal,
       cache
     });
+
+    return response;
   },
 
-  fetchTokenPrice({ projectId, addresses }: BlockchainApiTokenPriceRequest) {
-    return state.api.post<BlockchainApiTokenPriceResponse>({
+  async fetchTokenPrice(params: BlockchainApiTokenPriceRequest & WithCaipNetworkId) {
+    const { projectId, addresses, caipNetworkId } = params;
+    const isSupported = await BlockchainApiController.isNetworkSupported(caipNetworkId);
+
+    if (!isSupported) {
+      return { fungibles: [] };
+    }
+
+    const response = await state.api.post<BlockchainApiTokenPriceResponse>({
       path: '/v1/fungible/price',
       body: {
         projectId,
@@ -113,9 +157,20 @@ export const BlockchainApiController = {
       },
       headers: getHeaders()
     });
+
+    return response;
   },
 
-  fetchSwapAllowance({ projectId, tokenAddress, userAddress }: BlockchainApiSwapAllowanceRequest) {
+  async fetchSwapAllowance(params: BlockchainApiSwapAllowanceRequest) {
+    const { projectId, tokenAddress, userAddress } = params;
+    const [namespace, chain] = userAddress.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
+    const isSupported = await BlockchainApiController.isNetworkSupported(networkId);
+
+    if (!isSupported) {
+      return { allowance: '0' };
+    }
+
     return state.api.get<BlockchainApiSwapAllowanceResponse>({
       path: `/v1/convert/allowance`,
       params: {
@@ -127,7 +182,14 @@ export const BlockchainApiController = {
     });
   },
 
-  fetchGasPrice({ projectId, chainId }: BlockchainApiGasPriceRequest) {
+  async fetchGasPrice(params: BlockchainApiGasPriceRequest) {
+    const { projectId, chainId } = params;
+    const isSupported = await BlockchainApiController.isNetworkSupported(chainId);
+
+    if (!isSupported) {
+      throw new Error('Network not supported for Gas Price');
+    }
+
     return state.api.get<BlockchainApiGasPriceResponse>({
       path: `/v1/convert/gas-price`,
       headers: getHeaders(),
@@ -138,14 +200,16 @@ export const BlockchainApiController = {
     });
   },
 
-  fetchSwapQuote({
-    projectId,
-    amount,
-    userAddress,
-    from,
-    to,
-    gasPrice
-  }: BlockchainApiSwapQuoteRequest) {
+  async fetchSwapQuote(params: BlockchainApiSwapQuoteRequest) {
+    const { projectId, amount, userAddress, from, to, gasPrice } = params;
+    const [namespace, chain] = userAddress.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
+    const isSupported = await BlockchainApiController.isNetworkSupported(networkId);
+
+    if (!isSupported) {
+      return { quotes: [] };
+    }
+
     return state.api.get<BlockchainApiSwapQuoteResponse>({
       path: `/v1/convert/quotes`,
       headers: getHeaders(),
@@ -160,7 +224,14 @@ export const BlockchainApiController = {
     });
   },
 
-  fetchSwapTokens({ projectId, chainId }: BlockchainApiSwapTokensRequest) {
+  async fetchSwapTokens(params: BlockchainApiSwapTokensRequest) {
+    const { projectId, chainId } = params;
+    const isSupported = await BlockchainApiController.isNetworkSupported(chainId);
+
+    if (!isSupported) {
+      return { tokens: [] };
+    }
+
     return state.api.get<BlockchainApiSwapTokensResponse>({
       path: `/v1/convert/tokens`,
       headers: getHeaders(),
@@ -171,13 +242,16 @@ export const BlockchainApiController = {
     });
   },
 
-  generateSwapCalldata({
-    amount,
-    from,
-    projectId,
-    to,
-    userAddress
-  }: BlockchainApiGenerateSwapCalldataRequest) {
+  async generateSwapCalldata(params: BlockchainApiGenerateSwapCalldataRequest) {
+    const { amount, from, projectId, to, userAddress } = params;
+    const [namespace, chain] = userAddress.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
+    const isSupported = await BlockchainApiController.isNetworkSupported(networkId);
+
+    if (!isSupported) {
+      throw new Error('Network not supported for Swaps');
+    }
+
     return state.api.post<BlockchainApiGenerateSwapCalldataResponse>({
       path: '/v1/convert/build-transaction',
       headers: getHeaders(),
@@ -194,12 +268,16 @@ export const BlockchainApiController = {
     });
   },
 
-  generateApproveCalldata({
-    from,
-    projectId,
-    to,
-    userAddress
-  }: BlockchainApiGenerateApproveCalldataRequest) {
+  async generateApproveCalldata(params: BlockchainApiGenerateApproveCalldataRequest) {
+    const { from, projectId, to, userAddress } = params;
+    const [namespace, chain] = userAddress.split(':');
+    const networkId: CaipNetworkId = `${namespace}:${chain}`;
+    const isSupported = await BlockchainApiController.isNetworkSupported(networkId);
+
+    if (!isSupported) {
+      throw new Error('Network not supported for Swaps');
+    }
+
     return state.api.get<BlockchainApiGenerateApproveCalldataResponse>({
       path: `/v1/convert/build-approve`,
       headers: getHeaders(),
@@ -212,15 +290,29 @@ export const BlockchainApiController = {
     });
   },
 
-  async getBalance(address: string, chainId?: string, forceUpdate?: string) {
+  async getBalance(address?: CaipAddress, forceUpdate?: CaipAddress[]) {
+    const [namespace, chain, plainAddress] = address?.split(':') ?? [];
+
+    if (!namespace || !chain || !plainAddress) {
+      throw new Error('Invalid address');
+    }
+
+    const isSupported = await BlockchainApiController.isNetworkSupported(`${namespace}:${chain}`);
+
+    if (!isSupported) {
+      SnackController.showError('Token Balance Unavailable');
+
+      return { balances: [] };
+    }
+
     return state.api.get<BlockchainApiBalanceResponse>({
-      path: `/v1/account/${address}/balance`,
+      path: `/v1/account/${plainAddress}/balance`,
       headers: getHeaders(),
       params: {
         currency: 'usd',
         projectId: OptionsController.state.projectId,
-        chainId,
-        forceUpdate
+        chainId: `${namespace}:${chain}`,
+        forceUpdate: forceUpdate?.join(',')
       }
     });
   },