@reown/appkit-core-react-native 0.0.0-feat-onramp-20250722205908 → 0.0.0-feat-coinbase-20250723185200

package/src/utils/FetchUtil.ts

@@ -8,7 +8,7 @@ interface Options {
 
 interface RequestArguments {
   path: string;
-  headers?: HeadersInit_;
+  headers?: HeadersInit;
   params?: Record<string, string | undefined>;
   cache?: RequestCache;
   signal?: AbortSignal;
@@ -88,41 +88,20 @@ export class FetchUtil {
   }
 
   private createUrl({ path, params }: RequestArguments) {
-    let fullUrl: string;
-
-    const isAbsoluteUrl = path.startsWith('http://') || path.startsWith('https://');
-
-    if (isAbsoluteUrl) {
-      fullUrl = path;
-    } else {
-      const baseUrl = this.baseUrl.endsWith('/') ? this.baseUrl : `${this.baseUrl}/`;
-      const pathUrl = path.startsWith('/') ? path.substring(1) : path;
-      fullUrl = `${baseUrl}${pathUrl}`;
+    const url = new URL(path, this.baseUrl);
+    if (params) {
+      Object.entries(params).forEach(([key, value]) => {
+        if (value) {
+          url.searchParams.append(key, value);
+        }
+      });
     }
 
-    const allParams: Record<string, string | undefined> = { ...params };
     if (this.clientId) {
-      allParams['clientId'] = this.clientId;
-    }
-
-    const queryParams: string[] = [];
-    for (const key in allParams) {
-      const value = allParams[key];
-      if (value !== undefined) {
-        queryParams.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
-      }
-    }
-
-    if (queryParams.length > 0) {
-      const queryString = queryParams.join('&');
-      if (fullUrl.includes('?')) {
-        fullUrl = `${fullUrl}&${queryString}`;
-      } else {
-        fullUrl = `${fullUrl}?${queryString}`;
-      }
+      url.searchParams.append('clientId', this.clientId);
     }
 
-    return fullUrl;
+    return url.toString();
   }
 
   private async processResponse<T>(response: Response) {

package/src/utils/StorageUtil.ts

@@ -1,8 +1,6 @@
 /* eslint-disable no-console */
-import AsyncStorage from '@react-native-async-storage/async-storage';
 import type {
   OnRampCountry,
-  OnRampCountryDefaults,
   OnRampFiatCurrency,
   OnRampFiatLimit,
   OnRampServiceProvider,
@@ -11,27 +9,21 @@ import type {
 import {
   DateUtil,
   type SocialProvider,
-  type ConnectorType
+  type ConnectorType,
+  type ChainNamespace,
+  type WalletDeepLink,
+  ConstantsUtil
 } from '@reown/appkit-common-react-native';
+import { OptionsController } from '../controllers/OptionsController';
 
-// -- Helpers -----------------------------------------------------------------
-const WC_DEEPLINK = 'WALLETCONNECT_DEEPLINK_CHOICE';
-const RECENT_WALLET = '@w3m/recent';
-const CONNECTED_WALLET_IMAGE_URL = '@w3m/connected_wallet_image_url';
-const CONNECTED_CONNECTOR = '@w3m/connected_connector';
-const CONNECTED_SOCIAL = '@appkit/connected_social';
-const ONRAMP_PREFERRED_COUNTRY = '@appkit/onramp_preferred_country';
-const ONRAMP_COUNTRIES = '@appkit/onramp_countries';
-const ONRAMP_COUNTRIES_DEFAULTS = '@appkit/onramp_countries_defaults';
-const ONRAMP_SERVICE_PROVIDERS = '@appkit/onramp_service_providers';
-const ONRAMP_FIAT_LIMITS = '@appkit/onramp_fiat_limits';
-const ONRAMP_FIAT_CURRENCIES = '@appkit/onramp_fiat_currencies';
-const ONRAMP_PREFERRED_FIAT_CURRENCY = '@appkit/onramp_preferred_fiat_currency';
 // -- Utility -----------------------------------------------------------------
 export const StorageUtil = {
-  setWalletConnectDeepLink({ href, name }: { href: string; name: string }) {
+  setWalletConnectDeepLink({ href, name }: WalletDeepLink) {
     try {
-      AsyncStorage.setItem(WC_DEEPLINK, JSON.stringify({ href, name }));
+      OptionsController.getStorage().setItem(ConstantsUtil.STORAGE_KEYS.WC_DEEPLINK, {
+        href,
+        name
+      });
     } catch {
       console.info('Unable to set WalletConnect deep link');
     }
@@ -39,9 +31,11 @@ export const StorageUtil = {
 
   async getWalletConnectDeepLink() {
     try {
-      const deepLink = await AsyncStorage.getItem(WC_DEEPLINK);
+      const deepLink = await OptionsController.getStorage().getItem<WalletDeepLink>(
+        ConstantsUtil.STORAGE_KEYS.WC_DEEPLINK
+      );
       if (deepLink) {
-        return JSON.parse(deepLink);
+        return deepLink;
       }
     } catch {
       console.info('Unable to get WalletConnect deep link');
@@ -52,7 +46,7 @@ export const StorageUtil = {
 
   async removeWalletConnectDeepLink() {
     try {
-      await AsyncStorage.removeItem(WC_DEEPLINK);
+      await OptionsController.getStorage().removeItem(ConstantsUtil.STORAGE_KEYS.WC_DEEPLINK);
     } catch {
       console.info('Unable to delete WalletConnect deep link');
     }
@@ -71,7 +65,10 @@ export const StorageUtil = {
       if (recentWallets.length > 2) {
         recentWallets.pop();
       }
-      AsyncStorage.setItem(RECENT_WALLET, JSON.stringify(recentWallets));
+      OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.RECENT_WALLET,
+        JSON.stringify(recentWallets)
+      );
 
       return recentWallets;
     } catch {
@@ -83,7 +80,10 @@ export const StorageUtil = {
 
   async setRecentWallets(wallets: WcWallet[]) {
     try {
-      await AsyncStorage.setItem(RECENT_WALLET, JSON.stringify(wallets));
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.RECENT_WALLET,
+        JSON.stringify(wallets)
+      );
     } catch {
       console.info('Unable to set recent wallets');
     }
@@ -91,7 +91,9 @@ export const StorageUtil = {
 
   async getRecentWallets(): Promise<WcWallet[]> {
     try {
-      const recent = await AsyncStorage.getItem(RECENT_WALLET);
+      const recent = await OptionsController.getStorage().getItem(
+        ConstantsUtil.STORAGE_KEYS.RECENT_WALLET
+      );
 
       return recent ? JSON.parse(recent) : [];
     } catch {
@@ -101,29 +103,50 @@ export const StorageUtil = {
     return [];
   },
 
-  async setConnectedConnector(connectorType: ConnectorType) {
+  async setConnectedConnectors({
+    type,
+    namespaces
+  }: {
+    type: ConnectorType;
+    namespaces: string[];
+  }) {
     try {
-      await AsyncStorage.setItem(CONNECTED_CONNECTOR, JSON.stringify(connectorType));
+      const currentConnectors = (await StorageUtil.getConnectedConnectors()) || [];
+      // Only add if it doesn't exist already
+      if (!currentConnectors.some(c => c.type === type)) {
+        const updatedConnectors = [...currentConnectors, { type, namespaces }];
+        await OptionsController.getStorage().setItem(
+          ConstantsUtil.STORAGE_KEYS.CONNECTED_CONNECTORS,
+          updatedConnectors
+        );
+      }
     } catch {
       console.info('Unable to set Connected Connector');
     }
   },
 
-  async getConnectedConnector(): Promise<ConnectorType | undefined> {
+  async getConnectedConnectors(): Promise<{ type: ConnectorType; namespaces: string[] }[]> {
     try {
-      const connector = (await AsyncStorage.getItem(CONNECTED_CONNECTOR)) as ConnectorType;
+      const connectors = await OptionsController.getStorage().getItem<
+        { type: ConnectorType; namespaces: string[] }[]
+      >(ConstantsUtil.STORAGE_KEYS.CONNECTED_CONNECTORS);
 
-      return connector ? JSON.parse(connector) : undefined;
-    } catch {
+      return connectors ?? [];
+    } catch (err) {
       console.info('Unable to get Connected Connector');
     }
 
-    return undefined;
+    return [];
   },
 
-  async removeConnectedConnector() {
+  async removeConnectedConnectors(type: ConnectorType) {
     try {
-      await AsyncStorage.removeItem(CONNECTED_CONNECTOR);
+      const currentConnectors = await StorageUtil.getConnectedConnectors();
+      const updatedConnectors = currentConnectors.filter(c => c.type !== type);
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.CONNECTED_CONNECTORS,
+        updatedConnectors
+      );
     } catch {
       console.info('Unable to remove Connected Connector');
     }
@@ -131,7 +154,10 @@ export const StorageUtil = {
 
   async setConnectedWalletImageUrl(url: string) {
     try {
-      await AsyncStorage.setItem(CONNECTED_WALLET_IMAGE_URL, url);
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.CONNECTED_WALLET_IMAGE_URL,
+        url
+      );
     } catch {
       console.info('Unable to set Connected Wallet Image URL');
     }
@@ -139,7 +165,9 @@ export const StorageUtil = {
 
   async getConnectedWalletImageUrl() {
     try {
-      return await AsyncStorage.getItem(CONNECTED_WALLET_IMAGE_URL);
+      return await OptionsController.getStorage().getItem(
+        ConstantsUtil.STORAGE_KEYS.CONNECTED_WALLET_IMAGE_URL
+      );
     } catch {
       console.info('Unable to get Connected Wallet Image URL');
     }
@@ -149,7 +177,9 @@ export const StorageUtil = {
 
   async removeConnectedWalletImageUrl() {
     try {
-      await AsyncStorage.removeItem(CONNECTED_WALLET_IMAGE_URL);
+      await OptionsController.getStorage().removeItem(
+        ConstantsUtil.STORAGE_KEYS.CONNECTED_WALLET_IMAGE_URL
+      );
     } catch {
       console.info('Unable to remove Connected Wallet Image URL');
     }
@@ -157,17 +187,22 @@ export const StorageUtil = {
 
   async setConnectedSocialProvider(provider: SocialProvider) {
     try {
-      await AsyncStorage.setItem(CONNECTED_SOCIAL, JSON.stringify(provider));
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.CONNECTED_SOCIAL,
+        provider
+      );
     } catch {
       console.info('Unable to set Connected Social Provider');
     }
   },
 
-  async getConnectedSocialProvider() {
+  async getConnectedSocialProvider(): Promise<SocialProvider | undefined> {
     try {
-      const provider = (await AsyncStorage.getItem(CONNECTED_SOCIAL)) as SocialProvider;
+      const provider = await OptionsController.getStorage().getItem<SocialProvider>(
+        ConstantsUtil.STORAGE_KEYS.CONNECTED_SOCIAL
+      );
 
-      return provider ? JSON.parse(provider) : undefined;
+      return provider ?? undefined;
     } catch {
       console.info('Unable to get Connected Social Provider');
     }
@@ -177,7 +212,7 @@ export const StorageUtil = {
 
   async removeConnectedSocialProvider() {
     try {
-      await AsyncStorage.removeItem(CONNECTED_SOCIAL);
+      await OptionsController.getStorage().removeItem(ConstantsUtil.STORAGE_KEYS.CONNECTED_SOCIAL);
     } catch {
       console.info('Unable to remove Connected Social Provider');
     }
@@ -185,7 +220,10 @@ export const StorageUtil = {
 
   async setOnRampPreferredCountry(country: OnRampCountry) {
     try {
-      await AsyncStorage.setItem(ONRAMP_PREFERRED_COUNTRY, JSON.stringify(country));
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_PREFERRED_COUNTRY,
+        country
+      );
     } catch {
       console.info('Unable to set OnRamp Preferred Country');
     }
@@ -193,9 +231,11 @@ export const StorageUtil = {
 
   async getOnRampPreferredCountry() {
     try {
-      const country = await AsyncStorage.getItem(ONRAMP_PREFERRED_COUNTRY);
+      const country = await OptionsController.getStorage().getItem<OnRampCountry>(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_PREFERRED_COUNTRY
+      );
 
-      return country ? (JSON.parse(country) as OnRampCountry) : undefined;
+      return country ?? undefined;
     } catch {
       console.info('Unable to get OnRamp Preferred Country');
     }
@@ -205,7 +245,10 @@ export const StorageUtil = {
 
   async setOnRampPreferredFiatCurrency(currency: OnRampFiatCurrency) {
     try {
-      await AsyncStorage.setItem(ONRAMP_PREFERRED_FIAT_CURRENCY, JSON.stringify(currency));
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_PREFERRED_FIAT_CURRENCY,
+        currency
+      );
     } catch {
       console.info('Unable to set OnRamp Preferred Fiat Currency');
     }
@@ -213,9 +256,11 @@ export const StorageUtil = {
 
   async getOnRampPreferredFiatCurrency() {
     try {
-      const currency = await AsyncStorage.getItem(ONRAMP_PREFERRED_FIAT_CURRENCY);
+      const currency = await OptionsController.getStorage().getItem<OnRampFiatCurrency>(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_PREFERRED_FIAT_CURRENCY
+      );
 
-      return currency ? (JSON.parse(currency) as OnRampFiatCurrency) : undefined;
+      return currency ?? undefined;
     } catch {
       console.info('Unable to get OnRamp Preferred Fiat Currency');
     }
@@ -225,7 +270,10 @@ export const StorageUtil = {
 
   async setOnRampCountries(countries: OnRampCountry[]) {
     try {
-      await AsyncStorage.setItem(ONRAMP_COUNTRIES, JSON.stringify(countries));
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_COUNTRIES,
+        countries
+      );
     } catch {
       console.info('Unable to set OnRamp Countries');
     }
@@ -233,47 +281,13 @@ export const StorageUtil = {
 
   async getOnRampCountries() {
     try {
-      const countries = await AsyncStorage.getItem(ONRAMP_COUNTRIES);
-
-      return countries ? (JSON.parse(countries) as OnRampCountry[]) : [];
-    } catch {
-      console.info('Unable to get OnRamp Countries');
-    }
-
-    return [];
-  },
-
-  async setOnRampCountriesDefaults(countriesDefaults: OnRampCountryDefaults[]) {
-    try {
-      const timestamp = Date.now();
-
-      await AsyncStorage.setItem(
-        ONRAMP_COUNTRIES_DEFAULTS,
-        JSON.stringify({ data: countriesDefaults, timestamp })
+      const countries = await OptionsController.getStorage().getItem<OnRampCountry[]>(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_COUNTRIES
       );
-    } catch {
-      console.info('Unable to set OnRamp Countries Defaults');
-    }
-  },
-
-  async getOnRampCountriesDefaults() {
-    try {
-      const result = await AsyncStorage.getItem(ONRAMP_COUNTRIES_DEFAULTS);
-
-      if (!result) {
-        return [];
-      }
-
-      const { data, timestamp } = JSON.parse(result);
-
-      // Cache for 1 week
-      if (timestamp && DateUtil.isMoreThanOneWeekAgo(timestamp)) {
-        return [];
-      }
 
-      return data ? (data as OnRampCountryDefaults[]) : [];
+      return countries ?? [];
     } catch {
-      console.info('Unable to get OnRamp Countries Defaults');
+      console.info('Unable to get OnRamp Countries');
     }
 
     return [];
@@ -283,9 +297,9 @@ export const StorageUtil = {
     try {
       const timestamp = Date.now();
 
-      await AsyncStorage.setItem(
-        ONRAMP_SERVICE_PROVIDERS,
-        JSON.stringify({ data: serviceProviders, timestamp })
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_SERVICE_PROVIDERS,
+        { data: serviceProviders, timestamp }
       );
     } catch {
       console.info('Unable to set OnRamp Service Providers');
@@ -294,20 +308,22 @@ export const StorageUtil = {
 
   async getOnRampServiceProviders() {
     try {
-      const result = await AsyncStorage.getItem(ONRAMP_SERVICE_PROVIDERS);
+      const result = await OptionsController.getStorage().getItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_SERVICE_PROVIDERS
+      );
 
       if (!result) {
         return [];
       }
 
-      const { data, timestamp } = JSON.parse(result);
+      const { data, timestamp } = result;
 
       // Cache for 1 week
       if (timestamp && DateUtil.isMoreThanOneWeekAgo(timestamp)) {
         return [];
       }
 
-      return data ? (data as OnRampServiceProvider[]) : [];
+      return (data as OnRampServiceProvider[]) ?? [];
     } catch (err) {
       console.error(err);
       console.info('Unable to get OnRamp Service Providers');
@@ -320,10 +336,10 @@ export const StorageUtil = {
     try {
       const timestamp = Date.now();
 
-      await AsyncStorage.setItem(
-        ONRAMP_FIAT_LIMITS,
-        JSON.stringify({ data: fiatLimits, timestamp })
-      );
+      await OptionsController.getStorage().setItem(ConstantsUtil.STORAGE_KEYS.ONRAMP_FIAT_LIMITS, {
+        data: fiatLimits,
+        timestamp
+      });
     } catch {
       console.info('Unable to set OnRamp Fiat Limits');
     }
@@ -331,20 +347,22 @@ export const StorageUtil = {
 
   async getOnRampFiatLimits() {
     try {
-      const result = await AsyncStorage.getItem(ONRAMP_FIAT_LIMITS);
+      const result = await OptionsController.getStorage().getItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_FIAT_LIMITS
+      );
 
       if (!result) {
         return [];
       }
 
-      const { data, timestamp } = JSON.parse(result);
+      const { data, timestamp } = result;
 
       // Cache for 1 week
       if (timestamp && DateUtil.isMoreThanOneWeekAgo(timestamp)) {
         return [];
       }
 
-      return data ? (data as OnRampFiatLimit[]) : [];
+      return (data as OnRampFiatLimit[]) ?? [];
     } catch {
       console.info('Unable to get OnRamp Fiat Limits');
     }
@@ -356,9 +374,9 @@ export const StorageUtil = {
     try {
       const timestamp = Date.now();
 
-      await AsyncStorage.setItem(
-        ONRAMP_FIAT_CURRENCIES,
-        JSON.stringify({ data: fiatCurrencies, timestamp })
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_FIAT_CURRENCIES,
+        { data: fiatCurrencies, timestamp }
       );
     } catch {
       console.info('Unable to set OnRamp Fiat Currencies');
@@ -367,24 +385,68 @@ export const StorageUtil = {
 
   async getOnRampFiatCurrencies() {
     try {
-      const result = await AsyncStorage.getItem(ONRAMP_FIAT_CURRENCIES);
+      const result = await OptionsController.getStorage().getItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_FIAT_CURRENCIES
+      );
 
       if (!result) {
         return [];
       }
 
-      const { data, timestamp } = JSON.parse(result);
+      const { data, timestamp } = result;
 
       // Cache for 1 week
       if (timestamp && DateUtil.isMoreThanOneWeekAgo(timestamp)) {
         return [];
       }
 
-      return data ? (data as OnRampFiatCurrency[]) : [];
+      return (data as OnRampFiatCurrency[]) ?? [];
     } catch {
       console.info('Unable to get OnRamp Fiat Currencies');
     }
 
     return [];
+  },
+
+  async setActiveNamespace(namespace?: ChainNamespace) {
+    try {
+      if (!namespace) {
+        await OptionsController.getStorage().removeItem(
+          ConstantsUtil.STORAGE_KEYS.ACTIVE_NAMESPACE
+        );
+
+        return;
+      }
+
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ACTIVE_NAMESPACE,
+        namespace
+      );
+    } catch {
+      console.info('Unable to set Active Namespace');
+    }
+  },
+
+  async getActiveNamespace() {
+    try {
+      const namespace = (await OptionsController.getStorage().getItem(
+        ConstantsUtil.STORAGE_KEYS.ACTIVE_NAMESPACE
+      )) as ChainNamespace;
+
+      return namespace ?? undefined;
+    } catch (err) {
+      console.error(err);
+      console.info('Unable to get Active Namespace');
+    }
+
+    return undefined;
+  },
+
+  async removeActiveNamespace() {
+    try {
+      await OptionsController.getStorage().removeItem(ConstantsUtil.STORAGE_KEYS.ACTIVE_NAMESPACE);
+    } catch {
+      console.info('Unable to remove Active Namespace');
+    }
   }
 };

package/src/utils/SwapApiUtil.ts

@@ -1,19 +1,17 @@
+import type { Balance, CaipNetworkId } from '@reown/appkit-common-react-native';
 import { BlockchainApiController } from '../controllers/BlockchainApiController';
 import { OptionsController } from '../controllers/OptionsController';
-import { NetworkController } from '../controllers/NetworkController';
-import type {
-  BlockchainApiBalanceResponse,
-  BlockchainApiSwapAllowanceRequest,
-  SwapTokenWithBalance
-} from './TypeUtil';
-import { AccountController } from '../controllers/AccountController';
-import { ConnectionController } from '../controllers/ConnectionController';
+import type { BlockchainApiSwapAllowanceRequest, SwapTokenWithBalance } from './TypeUtil';
+import { ConnectionsController } from '../controllers/ConnectionsController';
+import { ConstantsUtil } from './ConstantsUtil';
 
 export const SwapApiUtil = {
   async getTokenList() {
+    const chainId: CaipNetworkId =
+      ConnectionsController.state.activeNetwork?.caipNetworkId ?? 'eip155:1';
     const response = await BlockchainApiController.fetchSwapTokens({
       projectId: OptionsController.state.projectId,
-      chainId: NetworkController.state.caipNetwork?.id
+      chainId
     });
     const tokens =
       response?.tokens?.map(
@@ -52,7 +50,7 @@ export const SwapApiUtil = {
 
     if (response?.allowance && sourceTokenAmount && sourceTokenDecimals) {
       const parsedValue =
-        ConnectionController.parseUnits(sourceTokenAmount, sourceTokenDecimals) || 0;
+        ConnectionsController.parseUnits(sourceTokenAmount, sourceTokenDecimals) || 0;
       const hasAllowance = BigInt(response.allowance) >= parsedValue;
 
       return hasAllowance;
@@ -61,40 +59,31 @@ export const SwapApiUtil = {
     return false;
   },
 
-  async getMyTokensWithBalance(forceUpdate?: string) {
-    const address = AccountController.state.address;
-    const chainId = NetworkController.state.caipNetwork?.id;
+  mapBalancesToSwapTokens(balances?: Balance[]) {
+    const { activeNamespace, activeCaipNetworkId } = ConnectionsController.state;
+    const address = activeNamespace
+      ? ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]
+      : undefined;
 
-    if (!address) {
-      return [];
-    }
-
-    const response = await BlockchainApiController.getBalance(address, chainId, forceUpdate);
-    const balances = response?.balances.filter(balance => balance.quantity.decimals !== '0');
-
-    AccountController.setTokenBalance(balances);
-
-    return this.mapBalancesToSwapTokens(balances);
-  },
-
-  mapBalancesToSwapTokens(balances?: BlockchainApiBalanceResponse['balances']) {
     return (
-      balances?.map(
-        token =>
-          ({
-            ...token,
-            address: token?.address || NetworkController.getActiveNetworkTokenAddress(),
-            decimals: parseInt(token.quantity.decimals, 10),
-            logoUri: token.iconUrl,
-            eip2612: false
-          }) as SwapTokenWithBalance
-      ) || []
+      balances
+        ?.filter(balance => balance?.quantity?.numeric)
+        .map(
+          token =>
+            ({
+              ...token,
+              address: token?.address ?? `${token?.chainId ?? activeCaipNetworkId}:${address}`,
+              decimals: parseInt(token.quantity?.decimals ?? '0', 10),
+              logoUri: token.iconUrl,
+              eip2612: false
+            }) as SwapTokenWithBalance
+        ) || []
     );
   },
 
   async fetchGasPrice() {
     const projectId = OptionsController.state.projectId;
-    const caipNetwork = NetworkController.state.caipNetwork;
+    const caipNetwork = ConnectionsController.state.activeNetwork;
 
     if (!caipNetwork) {
       return null;
@@ -102,7 +91,7 @@ export const SwapApiUtil = {
 
     return await BlockchainApiController.fetchGasPrice({
       projectId,
-      chainId: caipNetwork.id
+      chainId: caipNetwork.caipNetworkId
     });
   }
 };