@reown/appkit-core-react-native 0.0.0-feat-onramp-20250602154313 → 0.0.0-feat-multichain-20250604171123

package/src/controllers/SwapController.ts

@@ -1,10 +1,9 @@
 import { subscribeKey as subKey } from 'valtio/utils';
 import { proxy, subscribe as sub } from 'valtio';
-import { NumberUtil } from '@reown/appkit-common-react-native';
+import { NumberUtil, type CaipAddress } from '@reown/appkit-common-react-native';
 
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 import { SwapApiUtil } from '../utils/SwapApiUtil';
-import { NetworkController } from './NetworkController';
 import { BlockchainApiController } from './BlockchainApiController';
 import { OptionsController } from './OptionsController';
 import { SwapCalculationUtil } from '../utils/SwapCalculationUtil';
@@ -14,9 +13,9 @@ import type { SwapInputTarget, SwapTokenWithBalance } from '../utils/TypeUtil';
 import { ConnectorController } from './ConnectorController';
 import { AccountController } from './AccountController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
-import { ConnectionController } from './ConnectionController';
 import { TransactionsController } from './TransactionsController';
 import { EventsController } from './EventsController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Constants ---------------------------------------- //
 export const INITIAL_GAS_LIMIT = 150000;
@@ -158,9 +157,15 @@ export const SwapController = {
   },
 
   getParams() {
-    const caipAddress = AccountController.state.caipAddress;
-    const address = CoreHelperUtil.getPlainAddress(caipAddress);
-    const networkAddress = NetworkController.getActiveNetworkTokenAddress();
+    const { activeAddress, activeNamespace, activeNetwork } = ConnectionsController.state;
+    const address = CoreHelperUtil.getPlainAddress(activeAddress);
+
+    if (!activeNamespace || !activeNetwork) {
+      throw new Error('No active namespace or network found to swap the tokens from.');
+    }
+
+    const networkAddress: CaipAddress = `${activeNetwork.caipNetworkId}:${ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]}`;
+
     const type = ConnectorController.state.connectedConnector;
 
     if (!address) {
@@ -178,7 +183,7 @@ export const SwapController = {
     return {
       networkAddress,
       fromAddress: address,
-      fromCaipAddress: caipAddress,
+      fromCaipAddress: activeAddress,
       sourceTokenAddress: state.sourceToken?.address,
       toTokenAddress: state.toToken?.address,
       toTokenAmount: state.toTokenAmount,
@@ -189,7 +194,7 @@ export const SwapController = {
       invalidSourceToken,
       invalidSourceTokenAmount,
       availableToSwap:
-        caipAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
+        activeAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
       isAuthConnector: type === 'AUTH'
     };
   },
@@ -282,7 +287,6 @@ export const SwapController = {
 
   async getMyTokensWithBalance(forceUpdate?: string) {
     const balances = await SwapApiUtil.getMyTokensWithBalance(forceUpdate);
-
     if (!balances) {
       return;
     }
@@ -401,7 +405,7 @@ export const SwapController = {
 
   setBalances(balances: SwapTokenWithBalance[]) {
     const { networkAddress } = this.getParams();
-    const caipNetwork = NetworkController.state.caipNetwork;
+    const caipNetwork = ConnectionsController.state.activeNetwork;
 
     if (!caipNetwork) {
       return;
@@ -413,7 +417,9 @@ export const SwapController = {
       state.tokensPriceMap[token.address] = token.price || 0;
     });
 
-    state.myTokensWithBalance = balances.filter(token => token.address?.startsWith(caipNetwork.id));
+    state.myTokensWithBalance = balances.filter(
+      token => token.address?.startsWith(caipNetwork.caipNetworkId)
+    );
 
     state.networkBalanceInUSD = networkToken
       ? NumberUtil.multiply(networkToken.quantity.numeric, networkToken.price).toString()
@@ -464,12 +470,12 @@ export const SwapController = {
 
   // -- Swap ---------------------------------------------- //
   async swapTokens() {
-    const address = AccountController.state.address as `${string}:${string}:${string}`;
+    const address = ConnectionsController.state.activeAddress;
     const sourceToken = state.sourceToken;
     const toToken = state.toToken;
     const haveSourceTokenAmount = NumberUtil.bigNumber(state.sourceTokenAmount).isGreaterThan(0);
 
-    if (!toToken || !sourceToken || state.loadingPrices || !haveSourceTokenAmount) {
+    if (!toToken || !sourceToken || state.loadingPrices || !haveSourceTokenAmount || !address) {
       return;
     }
 
@@ -479,39 +485,44 @@ export const SwapController = {
       .multipliedBy(10 ** sourceToken.decimals)
       .integerValue();
 
-    const quoteResponse = await BlockchainApiController.fetchSwapQuote({
-      userAddress: address,
-      projectId: OptionsController.state.projectId,
-      from: sourceToken.address,
-      to: toToken.address,
-      gasPrice: state.gasFee,
-      amount: amountDecimal.toString()
-    });
+    try {
+      const quoteResponse = await BlockchainApiController.fetchSwapQuote({
+        userAddress: address,
+        projectId: OptionsController.state.projectId,
+        from: sourceToken.address,
+        to: toToken.address,
+        gasPrice: state.gasFee,
+        amount: amountDecimal.toString()
+      });
 
-    state.loadingQuote = false;
+      state.loadingQuote = false;
 
-    const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
+      const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
 
-    if (!quoteToAmount) {
-      return;
-    }
+      if (!quoteToAmount) {
+        return;
+      }
 
-    const toTokenAmount = NumberUtil.bigNumber(quoteToAmount)
-      .dividedBy(10 ** toToken.decimals)
-      .toString();
+      const toTokenAmount = NumberUtil.bigNumber(quoteToAmount)
+        .dividedBy(10 ** toToken.decimals)
+        .toString();
 
-    this.setToTokenAmount(toTokenAmount);
+      this.setToTokenAmount(toTokenAmount);
 
-    const isInsufficientToken = this.hasInsufficientToken(
-      state.sourceTokenAmount,
-      sourceToken.address
-    );
+      const isInsufficientToken = this.hasInsufficientToken(
+        state.sourceTokenAmount,
+        sourceToken.address
+      );
 
-    if (isInsufficientToken) {
-      state.inputError = 'Insufficient balance';
-    } else {
-      state.inputError = undefined;
-      this.setTransactionDetails();
+      if (isInsufficientToken) {
+        state.inputError = 'Insufficient balance';
+      } else {
+        state.inputError = undefined;
+        this.setTransactionDetails();
+      }
+    } catch (error) {
+      SnackController.showError('Failed to get swap quote');
+      state.loadingQuote = false;
     }
   },
 
@@ -580,7 +591,7 @@ export const SwapController = {
       if (!response) {
         throw new Error('createAllowanceTransaction - No response from generateApproveCalldata');
       }
-      const gasLimit = await ConnectionController.estimateGas({
+      const gasLimit = await ConnectionsController.estimateGas({
         address: fromAddress as `0x${string}`,
         to: CoreHelperUtil.getPlainAddress(response.tx.to) as `0x${string}`,
         data: response.tx.data
@@ -633,7 +644,7 @@ export const SwapController = {
       return undefined;
     }
 
-    const amount = ConnectionController.parseUnits(
+    const amount = ConnectionsController.parseUnits(
       sourceTokenAmount,
       sourceToken.decimals
     )?.toString();
@@ -701,13 +712,13 @@ export const SwapController = {
     }
 
     try {
-      await ConnectionController.sendTransaction({
+      await ConnectionsController.sendTransaction({
         address: fromAddress as `0x${string}`,
         to: data.to as `0x${string}`,
         data: data.data as `0x${string}`,
         value: BigInt(data.value),
         gasPrice: BigInt(data.gasPrice),
-        chainNamespace: 'eip155'
+        chainNamespace: ConnectionsController.state.activeNamespace
       });
 
       await this.swapTokens();
@@ -726,7 +737,6 @@ export const SwapController = {
     if (!data) {
       return undefined;
     }
-
     const { fromAddress, toTokenAmount, isAuthConnector } = this.getParams();
 
     state.loadingTransaction = true;
@@ -753,14 +763,14 @@ export const SwapController = {
 
     try {
       const forceUpdateAddresses = [state.sourceToken?.address, state.toToken?.address].join(',');
-      const transactionHash = await ConnectionController.sendTransaction({
+      const transactionHash = await ConnectionsController.sendTransaction({
         address: fromAddress as `0x${string}`,
         to: data.to as `0x${string}`,
         data: data.data as `0x${string}`,
         gas: data.gas,
         gasPrice: BigInt(data.gasPrice),
         value: data.value,
-        chainNamespace: 'eip155'
+        chainNamespace: ConnectionsController.state.activeNamespace
       });
 
       state.loadingTransaction = false;
@@ -769,7 +779,7 @@ export const SwapController = {
         type: 'track',
         event: 'SWAP_SUCCESS',
         properties: {
-          network: NetworkController.state.caipNetwork?.id || '',
+          network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
@@ -801,7 +811,7 @@ export const SwapController = {
         event: 'SWAP_ERROR',
         properties: {
           message: error?.shortMessage ?? error?.message ?? 'Unknown',
-          network: NetworkController.state.caipNetwork?.id || '',
+          network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',

package/src/controllers/ThemeController.ts

@@ -1,10 +1,11 @@
+import { Appearance } from 'react-native';
 import { proxy, subscribe as sub } from 'valtio';
 import type { ThemeMode, ThemeVariables } from '@reown/appkit-common-react-native';
 
 // -- Types --------------------------------------------- //
 export interface ThemeControllerState {
   themeMode?: ThemeMode;
-  themeVariables: ThemeVariables;
+  themeVariables?: ThemeVariables;
 }
 
 // -- State --------------------------------------------- //
@@ -22,10 +23,18 @@ export const ThemeController = {
   },
 
   setThemeMode(themeMode: ThemeControllerState['themeMode']) {
-    state.themeMode = themeMode;
+    if (!themeMode) {
+      state.themeMode = Appearance.getColorScheme() as ThemeMode;
+    } else {
+      state.themeMode = themeMode;
+    }
   },
 
   setThemeVariables(themeVariables: ThemeControllerState['themeVariables']) {
+    if (!themeVariables) {
+      state.themeVariables = {};
+    }
+
     state.themeVariables = { ...state.themeVariables, ...themeVariables };
   }
 };

package/src/controllers/TransactionsController.ts

@@ -3,9 +3,9 @@ import { proxy, subscribe as sub } from 'valtio/vanilla';
 import { OptionsController } from './OptionsController';
 import { EventsController } from './EventsController';
 import { SnackController } from './SnackController';
-import { NetworkController } from './NetworkController';
 import { BlockchainApiController } from './BlockchainApiController';
 import { AccountController } from './AccountController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Types --------------------------------------------- //
 type TransactionByMonthMap = Record<string, Transaction[]>;
@@ -121,7 +121,7 @@ export const TransactionsController = {
   },
 
   filterByConnectedChain(transactions: Transaction[]) {
-    const chainId = NetworkController.state.caipNetwork?.id;
+    const chainId = ConnectionsController.state.activeCaipNetworkId;
     const filteredTransactions = transactions.filter(
       transaction => transaction.metadata.chain === chainId
     );

package/src/index.ts

@@ -21,6 +21,11 @@ export {
   type ConnectionControllerState
 } from './controllers/ConnectionController';
 
+export {
+  ConnectionsController,
+  type ConnectionsControllerState
+} from './controllers/ConnectionsController';
+
 export {
   ConnectorController,
   type ConnectorControllerState
@@ -62,7 +67,6 @@ export { WebviewController, type WebviewControllerState } from './controllers/We
 // -- Utils -------------------------------------------------------------------
 export { ApiUtil } from './utils/ApiUtil';
 export { AssetUtil } from './utils/AssetUtil';
-export { ConnectionUtil } from './utils/ConnectionUtil';
 export { ConstantsUtil } from './utils/ConstantsUtil';
 export { CoreHelperUtil } from './utils/CoreHelperUtil';
 export { StorageUtil } from './utils/StorageUtil';

package/src/utils/AssetUtil.ts

@@ -1,5 +1,5 @@
 import { AssetController } from '../controllers/AssetController';
-import type { CaipNetwork, Connector, WcWallet } from './TypeUtil';
+import type { Connector, WcWallet } from './TypeUtil';
 
 export const AssetUtil = {
   getWalletImage(wallet?: WcWallet) {
@@ -14,13 +14,11 @@ export const AssetUtil = {
     return undefined;
   },
 
-  getNetworkImage(network?: CaipNetwork) {
-    if (network?.imageUrl) {
-      return network?.imageUrl;
-    }
+  getNetworkImage(networkId?: string | number) {
+    //TODO: check if imageUrl case is needed
 
-    if (network?.imageId) {
-      return AssetController.state.networkImages[network.imageId];
+    if (networkId) {
+      return AssetController.state.networkImages[networkId];
     }
 
     return undefined;

package/src/utils/ConstantsUtil.ts

@@ -1,10 +1,12 @@
+import type { ChainNamespace } from '@reown/appkit-common-react-native';
 import type { Features } from './TypeUtil';
 
+//TODO: enable this again after implemented
 const defaultFeatures: Features = {
   swaps: true,
-  onramp: true,
-  email: true,
-  emailShowWallets: true,
+  onramp: false,
+  email: false,
+  emailShowWallets: false,
   socials: ['x', 'discord', 'apple']
 };
 
@@ -34,7 +36,12 @@ export const ConstantsUtil = {
 
   LINKING_ERROR: 'LINKING_ERROR',
 
-  NATIVE_TOKEN_ADDRESS: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+  NATIVE_TOKEN_ADDRESS: {
+    eip155: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
+    solana: 'So11111111111111111111111111111111111111111',
+    polkadot: '0x',
+    bip122: '0x'
+  } as const satisfies Record<ChainNamespace, string>,
 
   ONRAMP_ERROR_TYPES: OnRampErrorType,
 
@@ -64,7 +71,7 @@ export const ConstantsUtil = {
     'BICO',
     'CRV',
     'ENS',
-    'POL',
+    'MATIC',
     'OP'
   ],
 
@@ -94,7 +101,7 @@ export const ConstantsUtil = {
     'BICO',
     'CRV',
     'ENS',
-    'POL',
+    'MATIC',
     'OP',
     'METAL',
     'DAI',
@@ -128,6 +135,116 @@ export const ConstantsUtil = {
     'WNT'
   ],
 
+  //TODO: replace with supported chains from backend
+  ACTIVITY_SUPPORTED_CHAINS: [
+    // Arbitrum
+    'eip155:42161',
+    // BNB Chain
+    'eip155:56',
+    // Ethereum
+    'eip155:1',
+    // Blast
+    'eip155:81457',
+    // Ape Chain
+    'eip155:99999',
+    // Avalanche
+    'eip155:43114',
+    // Abstract
+    'eip155:900',
+    // opBNB
+    'eip155:204',
+    // Astar zkEVM
+    'eip155:3776',
+    // ZKsync Era
+    'eip155:324',
+    // Berachain
+    'eip155:80085',
+    // BOB
+    'eip155:60808',
+    // Cyber
+    'eip155:7560',
+    // Degen Chain
+    'eip155:666666666',
+    // Fraxtal
+    'eip155:252',
+    // Gravity Alpha
+    'eip155:10003',
+    // Ink
+    'eip155:999',
+    // Lens
+    'eip155:1348',
+    // Lisk
+    'eip155:113',
+    // Mode
+    'eip155:34443',
+    // Base
+    'eip155:8453',
+    // Mantle
+    'eip155:5000',
+    // Optimism
+    'eip155:10',
+    // Polygon
+    'eip155:137',
+    // Celo
+    'eip155:42220',
+    // Manta Pacific
+    'eip155:169',
+    // Gnosis Chain
+    'eip155:100',
+    // Fantom
+    'eip155:250',
+    // Ronin
+    'eip155:2020',
+    // Linea
+    'eip155:59144',
+    // Metis Andromeda
+    'eip155:1088',
+    // Aurora
+    'eip155:1313161554',
+    // XDC
+    'eip155:50',
+    // Cronos zkEVM
+    'eip155:1030',
+    // Polygon zkEVM
+    'eip155:1101',
+    // Polynomial
+    'eip155:80001',
+    // Rari
+    'eip155:1380012617',
+    // Redstone
+    'eip155:690',
+    // Scroll
+    'eip155:534352',
+    // Sei
+    'eip155:1329',
+    // Soneium
+    'eip155:1499',
+    // Sonic
+    'eip155:7007',
+    // Swellchain
+    'eip155:7777777',
+    // Taiko
+    'eip155:167000',
+    // Viction
+    'eip155:88',
+    // Unichain
+    'eip155:12345',
+    // Wonder
+    'eip155:8787',
+    // X Layer
+    'eip155:196',
+    // World Chain
+    'eip155:2008',
+    // ZERϴ
+    'eip155:77777',
+    // ZkLink Nova
+    'eip155:810180',
+    // re.al
+    'eip155:666',
+    // Zora
+    'eip155:7777777'
+  ],
+
   SWAP_SUPPORTED_NETWORKS: [
     // Ethereum'
     'eip155:1',
@@ -417,7 +534,7 @@ export const ConstantsUtil = {
   NETWORK_DEFAULT_CURRENCIES: {
     'eip155:1': 'ETH', // Ethereum Mainnet
     'eip155:56': 'BNB', // Binance Smart Chain
-    'eip155:137': 'POL', // Polygon
+    'eip155:137': 'MATIC', // Polygon
     'eip155:42161': 'ETH_ARBITRUM', // Arbitrum One
     'eip155:43114': 'AVAX', // Avalanche C-Chain
     'eip155:10': 'ETH_OPTIMISM', // Optimism
@@ -504,5 +621,102 @@ export const ConstantsUtil = {
     US: ['CREDIT_DEBIT_CARD', 'APPLE_PAY', 'GOOGLE_PAY'],
     VN: ['BINANCE_P2P', 'VN_BANK_TRANSFER', 'CREDIT_DEBIT_CARD'],
     ZA: ['BINANCE_P2P', 'LOCAL_BANK_TRANSFER', 'CREDIT_DEBIT_CARD']
+  },
+
+  CURRENCY_SUGGESTED_VALUES: {
+    AED: [50, 100, 500],
+    AMD: [5000, 10000, 50000],
+    ANG: [50, 100, 500],
+    AOA: [10000, 20000, 50000],
+    ARS: [20000, 35000, 50000],
+    AUD: [50, 100, 150],
+    AZN: [50, 100, 200],
+    BDT: [2500, 5000, 10000],
+    BGN: [50, 100, 200],
+    BHD: [10, 20, 50],
+    BOB: [150, 300, 500],
+    BRL: [100, 200, 500],
+    BWP: [200, 500, 1000],
+    CAD: [50, 100, 150],
+    CHF: [50, 100, 150],
+    CLP: [10000, 20000, 50000],
+    CNY: [200, 500, 1000],
+    COP: [50000, 100000, 200000],
+    CRC: [10000, 20000, 50000],
+    CZK: [500, 1000, 2000],
+    DKK: [200, 500, 1000],
+    DOP: [2000, 5000, 10000],
+    DZD: [3000, 5000, 10000],
+    EGP: [2000, 5000, 10000],
+    EUR: [50, 100, 150],
+    GBP: [50, 100, 150],
+    GEL: [100, 200, 500],
+    GHS: [100, 200, 500],
+    GTQ: [200, 500, 1000],
+    HKD: [200, 500, 1000],
+    HNL: [500, 1000, 2000],
+    HRK: [200, 500, 1000],
+    HTG: [3000, 5000, 10000],
+    HUF: [5000, 10000, 20000],
+    IDR: [100000, 200000, 500000],
+    ILS: [100, 200, 500],
+    INR: [1000, 2000, 5000],
+    IQD: [30000, 50000, 100000],
+    ISK: [5000, 10000, 20000],
+    JOD: [20, 50, 100],
+    JPY: [5000, 10000, 20000],
+    KES: [1000, 2000, 5000],
+    KGS: [1000, 2000, 5000],
+    KHR: [250000, 500000, 1000000],
+    KRW: [50000, 100000, 200000],
+    KWD: [10, 20, 50],
+    KZT: [10000, 20000, 50000],
+    LAK: [500000, 1000000, 2000000],
+    LBP: [2000000, 3000000, 5000000],
+    LKR: [5000, 6000, 7000],
+    MAD: [200, 500, 1000],
+    MDL: [500, 1000, 2000],
+    MMK: [50000, 100000, 200000],
+    MNT: [100000, 200000, 500000],
+    MWK: [5000, 10000, 20000],
+    MXN: [500, 1000, 2000],
+    MYR: [100, 200, 500],
+    NGN: [5000, 10000, 20000],
+    NIO: [1000, 2000, 5000],
+    NOK: [500, 1000, 2000],
+    NPR: [3000, 5000, 10000],
+    NZD: [50, 100, 150],
+    OMR: [10, 20, 50],
+    PAB: [50, 100, 200],
+    PEN: [100, 200, 500],
+    PGK: [1000, 2000, 5000],
+    PHP: [1000, 2000, 5000],
+    PKR: [5000, 10000, 20000],
+    PLN: [100, 200, 500],
+    PYG: [200000, 300000, 500000],
+    QAR: [100, 200, 500],
+    RON: [100, 200, 500],
+    RSD: [2000, 5000, 10000],
+    RWF: [5000, 10000, 20000],
+    SAR: [100, 200, 500],
+    SEK: [500, 1000, 2000],
+    SGD: [50, 100, 150],
+    THB: [1000, 2000, 5000],
+    TJS: [500, 1000, 2000],
+    TND: [100, 200, 500],
+    TRY: [500, 1000, 2000],
+    TWD: [1000, 2000, 5000],
+    TZS: [5000, 10000, 20000],
+    UAH: [1000, 2000, 5000],
+    UGX: [20000, 50000, 100000],
+    USD: [50, 100, 150],
+    UYU: [1000, 2000, 5000],
+    UZS: [300000, 500000, 1000000],
+    VND: [500000, 1000000, 2000000],
+    XAF: [5000, 10000, 20000],
+    XCD: [100, 200, 500],
+    XOF: [5000, 10000, 20000],
+    ZAR: [500, 1000, 2000],
+    ZMW: [500, 1000, 2000]
   }
 };

package/src/utils/CoreHelperUtil.ts

@@ -1,12 +1,17 @@
 /* eslint-disable no-bitwise */
 
 import { Linking, Platform } from 'react-native';
-import { ConstantsUtil as CommonConstants, type Balance } from '@reown/appkit-common-react-native';
+import {
+  ConstantsUtil as CommonConstants,
+  type Balance,
+  type CaipAddress,
+  type CaipNetwork
+} from '@reown/appkit-common-react-native';
+
 import * as ct from 'countries-and-timezones';
 
 import { ConstantsUtil } from './ConstantsUtil';
-import type { CaipAddress, CaipNetwork, DataWallet, LinkingRecord } from './TypeUtil';
-
+import type { DataWallet, LinkingRecord } from './TypeUtil';
 // -- Helpers -----------------------------------------------------------------
 async function isAppInstalledIos(deepLink?: string): Promise<boolean> {
   try {

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;

package/src/utils/NetworkUtil.ts

@@ -4,7 +4,7 @@ import { NetworkController } from '../controllers/NetworkController';
 import { AccountController } from '../controllers/AccountController';
 import { ConnectorController } from '../controllers/ConnectorController';
 import { SwapController } from '../controllers/SwapController';
-import type { CaipNetwork } from '../utils/TypeUtil';
+import { type CaipNetwork } from '@reown/appkit-common-react-native';
 
 export const NetworkUtil = {
   async handleNetworkSwitch(network: CaipNetwork) {