@reown/appkit-core-react-native 2.0.0-alpha.1 → 2.0.0-alpha.3

package/src/utils/FetchUtil.ts

@@ -1,4 +1,4 @@
-import type { RequestCache } from './TypeUtil';
+import type { RequestCache } from '@reown/appkit-common-react-native';
 
 // -- Types ----------------------------------------------------------------------
 interface Options {
@@ -88,26 +88,53 @@ export class FetchUtil {
   }
 
   private createUrl({ path, params }: RequestArguments) {
-    const url = new URL(path, this.baseUrl);
-    if (params) {
-      Object.entries(params).forEach(([key, value]) => {
-        if (value) {
-          url.searchParams.append(key, value);
-        }
-      });
+    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 allParams: Record<string, string | undefined> = { ...params };
     if (this.clientId) {
-      url.searchParams.append('clientId', this.clientId);
+      allParams['clientId'] = this.clientId;
+    }
+
+    const queryParams: string[] = [];
+    for (const key in allParams) {
+      const value = allParams[key];
+      if (value !== undefined && value !== null && value !== '') {
+        queryParams.push(`${encodeURIComponent(key)}=${encodeURIComponent(value)}`);
+      }
+    }
+
+    if (queryParams.length > 0) {
+      const queryString = queryParams.join('&');
+      if (fullUrl.includes('?')) {
+        fullUrl = `${fullUrl}&${queryString}`;
+      } else {
+        fullUrl = `${fullUrl}?${queryString}`;
+      }
     }
 
-    return url.toString();
+    return fullUrl;
   }
 
   private async processResponse<T>(response: Response) {
     if (!response.ok) {
       if (response.headers.get('content-type')?.includes('application/json')) {
-        return Promise.reject((await response.json()) as T);
+        try {
+          const errorData = await response.json();
+
+          return Promise.reject(errorData);
+        } catch (jsonError) {
+          return Promise.reject(`Code: ${response.status} - ${response.statusText}`);
+        }
       }
 
       const errorText = await response.text();

package/src/utils/StorageUtil.ts

@@ -1,40 +1,27 @@
 /* eslint-disable no-console */
-import AsyncStorage from '@react-native-async-storage/async-storage';
-import type {
-  OnRampCountry,
-  OnRampFiatCurrency,
-  OnRampFiatLimit,
-  OnRampServiceProvider,
-  WcWallet
-} from './TypeUtil';
 import {
+  type OnRampCountry,
+  type OnRampFiatCurrency,
+  type OnRampFiatLimit,
+  type OnRampServiceProvider,
+  type OnRampCountryDefaults,
+  type WcWallet,
   DateUtil,
-  type SocialProvider,
-  type New_ConnectorType,
   type ConnectorType,
-  type ChainNamespace
+  type ChainNamespace,
+  type WalletDeepLink,
+  ConstantsUtil
 } from '@reown/appkit-common-react-native';
-
-// -- 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_CONNECTORS = '@appkit/connected_connectors';
-const CONNECTED_SOCIAL = '@appkit/connected_social';
-const ONRAMP_PREFERRED_COUNTRY = '@appkit/onramp_preferred_country';
-const ONRAMP_COUNTRIES = '@appkit/onramp_countries';
-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';
-const ACTIVE_NAMESPACE = '@appkit/active_namespace';
+import { OptionsController } from '../controllers/OptionsController';
 
 // -- 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');
     }
@@ -42,9 +29,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');
@@ -55,9 +44,9 @@ 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');
+      console.info('Unable to remove WalletConnect deep link');
     }
   },
 
@@ -74,7 +63,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,
+        recentWallets
+      );
 
       return recentWallets;
     } catch {
@@ -86,7 +78,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,
+        wallets
+      );
     } catch {
       console.info('Unable to set recent wallets');
     }
@@ -94,9 +89,11 @@ 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) : [];
+      return recent ?? [];
     } catch {
       console.info('Unable to get recent wallets');
     }
@@ -104,40 +101,11 @@ export const StorageUtil = {
     return [];
   },
 
-  //TODO: remove this
-  async setConnectedConnector(connectorType: ConnectorType) {
-    try {
-      await AsyncStorage.setItem(CONNECTED_CONNECTOR, JSON.stringify(connectorType));
-    } catch {
-      console.info('Unable to set Connected Connector');
-    }
-  },
-
-  async getConnectedConnector(): Promise<ConnectorType | undefined> {
-    try {
-      const connector = (await AsyncStorage.getItem(CONNECTED_CONNECTOR)) as ConnectorType;
-
-      return connector ? JSON.parse(connector) : undefined;
-    } catch {
-      console.info('Unable to get Connected Connector');
-    }
-
-    return undefined;
-  },
-
-  async removeConnectedConnector() {
-    try {
-      await AsyncStorage.removeItem(CONNECTED_CONNECTOR);
-    } catch {
-      console.info('Unable to remove Connected Connector');
-    }
-  },
-
   async setConnectedConnectors({
     type,
     namespaces
   }: {
-    type: New_ConnectorType;
+    type: ConnectorType;
     namespaces: string[];
   }) {
     try {
@@ -145,144 +113,151 @@ export const StorageUtil = {
       // Only add if it doesn't exist already
       if (!currentConnectors.some(c => c.type === type)) {
         const updatedConnectors = [...currentConnectors, { type, namespaces }];
-        await AsyncStorage.setItem(CONNECTED_CONNECTORS, JSON.stringify(updatedConnectors));
+        await OptionsController.getStorage().setItem(
+          ConstantsUtil.STORAGE_KEYS.CONNECTED_CONNECTORS,
+          updatedConnectors
+        );
       }
     } catch {
       console.info('Unable to set Connected Connector');
     }
   },
 
-  async getConnectedConnectors(): Promise<{ type: New_ConnectorType; namespaces: string[] }[]> {
+  async getConnectedConnectors(): Promise<{ type: ConnectorType; namespaces: string[] }[]> {
     try {
-      const connectors = await AsyncStorage.getItem(CONNECTED_CONNECTORS);
+      const connectors = await OptionsController.getStorage().getItem<
+        { type: ConnectorType; namespaces: string[] }[]
+      >(ConstantsUtil.STORAGE_KEYS.CONNECTED_CONNECTORS);
 
-      return connectors ? JSON.parse(connectors) : [];
-    } catch {
+      return connectors ?? [];
+    } catch (err) {
       console.info('Unable to get Connected Connector');
     }
 
     return [];
   },
 
-  async removeConnectedConnectors(type: New_ConnectorType) {
+  async removeConnectedConnectors(type: ConnectorType) {
     try {
       const currentConnectors = await StorageUtil.getConnectedConnectors();
       const updatedConnectors = currentConnectors.filter(c => c.type !== type);
-      await AsyncStorage.setItem(CONNECTED_CONNECTORS, JSON.stringify(updatedConnectors));
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.CONNECTED_CONNECTORS,
+        updatedConnectors
+      );
     } catch {
       console.info('Unable to remove Connected Connector');
     }
   },
 
-  async setConnectedWalletImageUrl(url: string) {
+  async setOnRampPreferredCountry(country: OnRampCountry) {
     try {
-      await AsyncStorage.setItem(CONNECTED_WALLET_IMAGE_URL, url);
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_PREFERRED_COUNTRY,
+        country
+      );
     } catch {
-      console.info('Unable to set Connected Wallet Image URL');
+      console.info('Unable to set OnRamp Preferred Country');
     }
   },
 
-  async getConnectedWalletImageUrl() {
+  async getOnRampPreferredCountry() {
     try {
-      return await AsyncStorage.getItem(CONNECTED_WALLET_IMAGE_URL);
+      const country = await OptionsController.getStorage().getItem<OnRampCountry>(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_PREFERRED_COUNTRY
+      );
+
+      return country ?? undefined;
     } catch {
-      console.info('Unable to get Connected Wallet Image URL');
+      console.info('Unable to get OnRamp Preferred Country');
     }
 
     return undefined;
   },
 
-  async removeConnectedWalletImageUrl() {
-    try {
-      await AsyncStorage.removeItem(CONNECTED_WALLET_IMAGE_URL);
-    } catch {
-      console.info('Unable to remove Connected Wallet Image URL');
-    }
-  },
-
-  async setConnectedSocialProvider(provider: SocialProvider) {
+  async setOnRampPreferredFiatCurrency(currency: OnRampFiatCurrency) {
     try {
-      await AsyncStorage.setItem(CONNECTED_SOCIAL, JSON.stringify(provider));
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_PREFERRED_FIAT_CURRENCY,
+        currency
+      );
     } catch {
-      console.info('Unable to set Connected Social Provider');
+      console.info('Unable to set OnRamp Preferred Fiat Currency');
     }
   },
 
-  async getConnectedSocialProvider() {
+  async getOnRampPreferredFiatCurrency() {
     try {
-      const provider = (await AsyncStorage.getItem(CONNECTED_SOCIAL)) as SocialProvider;
+      const currency = await OptionsController.getStorage().getItem<OnRampFiatCurrency>(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_PREFERRED_FIAT_CURRENCY
+      );
 
-      return provider ? JSON.parse(provider) : undefined;
+      return currency ?? undefined;
     } catch {
-      console.info('Unable to get Connected Social Provider');
+      console.info('Unable to get OnRamp Preferred Fiat Currency');
     }
 
     return undefined;
   },
 
-  async removeConnectedSocialProvider() {
-    try {
-      await AsyncStorage.removeItem(CONNECTED_SOCIAL);
-    } catch {
-      console.info('Unable to remove Connected Social Provider');
-    }
-  },
-
-  async setOnRampPreferredCountry(country: OnRampCountry) {
+  async setOnRampCountries(countries: OnRampCountry[]) {
     try {
-      await AsyncStorage.setItem(ONRAMP_PREFERRED_COUNTRY, JSON.stringify(country));
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_COUNTRIES,
+        countries
+      );
     } catch {
-      console.info('Unable to set OnRamp Preferred Country');
+      console.info('Unable to set OnRamp Countries');
     }
   },
 
-  async getOnRampPreferredCountry() {
+  async getOnRampCountries() {
     try {
-      const country = await AsyncStorage.getItem(ONRAMP_PREFERRED_COUNTRY);
+      const countries = await OptionsController.getStorage().getItem<OnRampCountry[]>(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_COUNTRIES
+      );
 
-      return country ? (JSON.parse(country) as OnRampCountry) : undefined;
+      return countries ?? [];
     } catch {
-      console.info('Unable to get OnRamp Preferred Country');
+      console.info('Unable to get OnRamp Countries');
     }
 
-    return undefined;
+    return [];
   },
 
-  async setOnRampPreferredFiatCurrency(currency: OnRampFiatCurrency) {
+  async setOnRampCountriesDefaults(countriesDefaults: OnRampCountryDefaults[]) {
     try {
-      await AsyncStorage.setItem(ONRAMP_PREFERRED_FIAT_CURRENCY, JSON.stringify(currency));
+      const timestamp = Date.now();
+
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_COUNTRIES_DEFAULTS,
+        { data: countriesDefaults, timestamp }
+      );
     } catch {
-      console.info('Unable to set OnRamp Preferred Fiat Currency');
+      console.info('Unable to set OnRamp Countries Defaults');
     }
   },
 
-  async getOnRampPreferredFiatCurrency() {
+  async getOnRampCountriesDefaults() {
     try {
-      const currency = await AsyncStorage.getItem(ONRAMP_PREFERRED_FIAT_CURRENCY);
-
-      return currency ? (JSON.parse(currency) as OnRampFiatCurrency) : undefined;
-    } catch {
-      console.info('Unable to get OnRamp Preferred Fiat Currency');
-    }
+      const result = await OptionsController.getStorage().getItem(
+        ConstantsUtil.STORAGE_KEYS.ONRAMP_COUNTRIES_DEFAULTS
+      );
 
-    return undefined;
-  },
+      if (!result) {
+        return [];
+      }
 
-  async setOnRampCountries(countries: OnRampCountry[]) {
-    try {
-      await AsyncStorage.setItem(ONRAMP_COUNTRIES, JSON.stringify(countries));
-    } catch {
-      console.info('Unable to set OnRamp Countries');
-    }
-  },
+      const { data, timestamp } = result;
 
-  async getOnRampCountries() {
-    try {
-      const countries = await AsyncStorage.getItem(ONRAMP_COUNTRIES);
+      // Cache for 1 week
+      if (timestamp && DateUtil.isMoreThanOneWeekAgo(timestamp)) {
+        return [];
+      }
 
-      return countries ? (JSON.parse(countries) as OnRampCountry[]) : [];
+      return (data as OnRampCountryDefaults[]) ?? [];
     } catch {
-      console.info('Unable to get OnRamp Countries');
+      console.info('Unable to get OnRamp Countries Defaults');
     }
 
     return [];
@@ -292,9 +267,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');
@@ -303,20 +278,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');
@@ -329,10 +306,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');
     }
@@ -340,20 +317,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');
     }
@@ -365,9 +344,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');
@@ -376,20 +355,22 @@ 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');
     }
@@ -400,12 +381,17 @@ export const StorageUtil = {
   async setActiveNamespace(namespace?: ChainNamespace) {
     try {
       if (!namespace) {
-        await AsyncStorage.removeItem(ACTIVE_NAMESPACE);
+        await OptionsController.getStorage().removeItem(
+          ConstantsUtil.STORAGE_KEYS.ACTIVE_NAMESPACE
+        );
 
         return;
       }
 
-      await AsyncStorage.setItem(ACTIVE_NAMESPACE, namespace);
+      await OptionsController.getStorage().setItem(
+        ConstantsUtil.STORAGE_KEYS.ACTIVE_NAMESPACE,
+        namespace
+      );
     } catch {
       console.info('Unable to set Active Namespace');
     }
@@ -413,10 +399,13 @@ export const StorageUtil = {
 
   async getActiveNamespace() {
     try {
-      const namespace = (await AsyncStorage.getItem(ACTIVE_NAMESPACE)) as ChainNamespace;
+      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');
     }
 
@@ -425,7 +414,7 @@ export const StorageUtil = {
 
   async removeActiveNamespace() {
     try {
-      await AsyncStorage.removeItem(ACTIVE_NAMESPACE);
+      await OptionsController.getStorage().removeItem(ConstantsUtil.STORAGE_KEYS.ACTIVE_NAMESPACE);
     } catch {
       console.info('Unable to remove Active Namespace');
     }

package/src/utils/SwapApiUtil.ts

@@ -1,13 +1,12 @@
-import { BlockchainApiController } from '../controllers/BlockchainApiController';
-import { OptionsController } from '../controllers/OptionsController';
 import type {
-  BlockchainApiBalanceResponse,
+  Balance,
+  CaipNetworkId,
   BlockchainApiSwapAllowanceRequest,
   SwapTokenWithBalance
-} from './TypeUtil';
-import { AccountController } from '../controllers/AccountController';
+} from '@reown/appkit-common-react-native';
+import { BlockchainApiController } from '../controllers/BlockchainApiController';
+import { OptionsController } from '../controllers/OptionsController';
 import { ConnectionsController } from '../controllers/ConnectionsController';
-import type { CaipNetworkId } from '@reown/appkit-common-react-native';
 import { ConstantsUtil } from './ConstantsUtil';
 
 export const SwapApiUtil = {
@@ -64,43 +63,25 @@ export const SwapApiUtil = {
     return false;
   },
 
-  async getMyTokensWithBalance(forceUpdate?: string) {
-    const { activeAddress, activeNetwork: network } = ConnectionsController.state;
-    const address = activeAddress?.split(':')[2];
-
-    if (!address) {
-      return [];
-    }
-
-    const response = await BlockchainApiController.getBalance(
-      address,
-      network?.caipNetworkId,
-      forceUpdate
-    );
-    const balances = response?.balances.filter(balance => balance.quantity.decimals !== '0');
-
-    AccountController.setTokenBalance(balances);
-
-    return this.mapBalancesToSwapTokens(balances);
-  },
-
-  mapBalancesToSwapTokens(balances?: BlockchainApiBalanceResponse['balances']) {
+  mapBalancesToSwapTokens(balances?: Balance[]) {
     const { activeNamespace, activeCaipNetworkId } = ConnectionsController.state;
     const address = activeNamespace
       ? ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]
       : undefined;
 
     return (
-      balances?.map(
-        token =>
-          ({
-            ...token,
-            address: token?.address ?? `${token?.chainId ?? activeCaipNetworkId}:${address}`,
-            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
+        ) || []
     );
   },