@reown/appkit-core-react-native 0.0.0-feat-multichain-20250520183003 → 0.0.0-feat-onramp-20250602135932

package/src/controllers/OnRampController.ts

@@ -134,6 +134,10 @@ export const OnRampController = {
 
   setSelectedPaymentMethod(paymentMethod: OnRampPaymentMethod) {
     state.selectedPaymentMethod = paymentMethod;
+    state.paymentMethods = [
+      paymentMethod,
+      ...state.paymentMethods.filter(m => m.paymentMethod !== paymentMethod.paymentMethod)
+    ];
 
     this.clearQuotes();
   },
@@ -184,7 +188,7 @@ export const OnRampController = {
       selectedCurrency = state.purchaseCurrencies?.find(c => c.currencyCode === defaultCurrency);
     }
 
-    state.purchaseCurrency = selectedCurrency || state.purchaseCurrencies?.[0] || undefined;
+    state.purchaseCurrency = selectedCurrency ?? state.purchaseCurrencies?.[0] ?? undefined;
   },
 
   getServiceProviderImage(serviceProviderName?: string) {

package/src/controllers/OptionsController.ts

@@ -1,14 +1,13 @@
 import { proxy, ref } from 'valtio';
-import type { Tokens } from '@reown/appkit-common-react-native';
 import type {
   CustomWallet,
   Features,
   Metadata,
   ProjectId,
   SdkType,
-  SdkVersion
+  SdkVersion,
+  Tokens
 } from '../utils/TypeUtil';
-
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 
 // -- Types --------------------------------------------- //
@@ -18,7 +17,7 @@ export interface ClipboardClient {
 
 export interface OptionsControllerState {
   projectId: ProjectId;
-  clipboardClient?: ClipboardClient;
+  _clipboardClient?: ClipboardClient;
   includeWalletIds?: string[];
   excludeWalletIds?: string[];
   featuredWalletIds?: string[];
@@ -48,7 +47,7 @@ export const OptionsController = {
   state,
 
   setClipboardClient(client: ClipboardClient) {
-    state.clipboardClient = ref(client);
+    state._clipboardClient = ref(client);
   },
 
   setProjectId(projectId: OptionsControllerState['projectId']) {
@@ -104,11 +103,11 @@ export const OptionsController = {
   },
 
   isClipboardAvailable() {
-    return !!state.clipboardClient;
+    return !!state._clipboardClient;
   },
 
   copyToClipboard(value: string) {
-    const client = state.clipboardClient;
+    const client = state._clipboardClient;
     if (client) {
       client?.setString(value);
     }

package/src/controllers/PublicStateController.ts

@@ -1,6 +1,6 @@
 import { proxy, subscribe as sub } from 'valtio';
 import { subscribeKey as subKey } from 'valtio/utils';
-import type { CaipNetworkId } from '@reown/appkit-common-react-native';
+import type { CaipNetworkId } from '../utils/TypeUtil.js';
 
 // -- Types --------------------------------------------- //
 export interface PublicStateControllerState {

package/src/controllers/RouterController.ts

@@ -1,8 +1,7 @@
 import { proxy } from 'valtio';
-import type { CaipNetwork } from '@reown/appkit-common-react-native';
-
 import type {
   WcWallet,
+  CaipNetwork,
   Connector,
   SwapInputTarget,
   OnRampTransactionResult

package/src/controllers/SwapController.ts

@@ -17,7 +17,6 @@ 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;
@@ -159,17 +158,9 @@ export const SwapController = {
   },
 
   getParams() {
-    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 = `${activeNetwork.caipNetworkId ?? 'eip155:1'}:${
-      ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]
-    }`;
-
+    const caipAddress = AccountController.state.caipAddress;
+    const address = CoreHelperUtil.getPlainAddress(caipAddress);
+    const networkAddress = NetworkController.getActiveNetworkTokenAddress();
     const type = ConnectorController.state.connectedConnector;
 
     if (!address) {
@@ -187,7 +178,7 @@ export const SwapController = {
     return {
       networkAddress,
       fromAddress: address,
-      fromCaipAddress: activeAddress,
+      fromCaipAddress: caipAddress,
       sourceTokenAddress: state.sourceToken?.address,
       toTokenAddress: state.toToken?.address,
       toTokenAmount: state.toTokenAmount,
@@ -198,7 +189,7 @@ export const SwapController = {
       invalidSourceToken,
       invalidSourceTokenAmount,
       availableToSwap:
-        activeAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
+        caipAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
       isAuthConnector: type === 'AUTH'
     };
   },

package/src/controllers/ThemeController.ts

@@ -1,11 +1,10 @@
-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 --------------------------------------------- //
@@ -23,18 +22,10 @@ export const ThemeController = {
   },
 
   setThemeMode(themeMode: ThemeControllerState['themeMode']) {
-    if (!themeMode) {
-      state.themeMode = Appearance.getColorScheme() as ThemeMode;
-    } else {
-      state.themeMode = themeMode;
-    }
+    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 = ConnectionsController.state.activeCaipNetworkId;
+    const chainId = NetworkController.state.caipNetwork?.id;
     const filteredTransactions = transactions.filter(
       transaction => transaction.metadata.chain === chainId
     );

package/src/index.ts

@@ -21,11 +21,6 @@ export {
   type ConnectionControllerState
 } from './controllers/ConnectionController';
 
-export {
-  ConnectionsController,
-  type ConnectionsControllerState
-} from './controllers/ConnectionsController';
-
 export {
   ConnectorController,
   type ConnectorControllerState
@@ -67,6 +62,7 @@ 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 { Connector, WcWallet } from './TypeUtil';
+import type { CaipNetwork, Connector, WcWallet } from './TypeUtil';
 
 export const AssetUtil = {
   getWalletImage(wallet?: WcWallet) {
@@ -14,11 +14,13 @@ export const AssetUtil = {
     return undefined;
   },
 
-  getNetworkImage(networkId?: string | number) {
-    //TODO: check if imageUrl case is needed
+  getNetworkImage(network?: CaipNetwork) {
+    if (network?.imageUrl) {
+      return network?.imageUrl;
+    }
 
-    if (networkId) {
-      return AssetController.state.networkImages[networkId];
+    if (network?.imageId) {
+      return AssetController.state.networkImages[network.imageId];
     }
 
     return undefined;

package/src/utils/ConnectionUtil.ts

@@ -0,0 +1,27 @@
+import { AccountController } from '../controllers/AccountController';
+import { ConnectionController } from '../controllers/ConnectionController';
+import { EventsController } from '../controllers/EventsController';
+import { ModalController } from '../controllers/ModalController';
+import { RouterController } from '../controllers/RouterController';
+import { TransactionsController } from '../controllers/TransactionsController';
+
+export const ConnectionUtil = {
+  async disconnect() {
+    try {
+      await ConnectionController.disconnect();
+      ModalController.close();
+      AccountController.setIsConnected(false);
+      RouterController.reset('Connect');
+      TransactionsController.resetTransactions();
+      EventsController.sendEvent({
+        type: 'track',
+        event: 'DISCONNECT_SUCCESS'
+      });
+    } catch (error) {
+      EventsController.sendEvent({
+        type: 'track',
+        event: 'DISCONNECT_ERROR'
+      });
+    }
+  }
+};

package/src/utils/ConstantsUtil.ts

@@ -1,12 +1,10 @@
-import type { ChainNamespace } from '@reown/appkit-common-react-native';
 import type { Features } from './TypeUtil';
 
-//TODO: enable this again after implemented
 const defaultFeatures: Features = {
-  swaps: false,
-  onramp: false,
-  email: false,
-  emailShowWallets: false,
+  swaps: true,
+  onramp: true,
+  email: true,
+  emailShowWallets: true,
   socials: ['x', 'discord', 'apple']
 };
 
@@ -36,12 +34,7 @@ export const ConstantsUtil = {
 
   LINKING_ERROR: 'LINKING_ERROR',
 
-  NATIVE_TOKEN_ADDRESS: {
-    eip155: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
-    solana: 'So11111111111111111111111111111111111111111',
-    polkadot: '0x',
-    bip122: '0x'
-  } as const satisfies Record<ChainNamespace, string>,
+  NATIVE_TOKEN_ADDRESS: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee',
 
   ONRAMP_ERROR_TYPES: OnRampErrorType,
 
@@ -71,7 +64,7 @@ export const ConstantsUtil = {
     'BICO',
     'CRV',
     'ENS',
-    'MATIC',
+    'POL',
     'OP'
   ],
 
@@ -101,7 +94,7 @@ export const ConstantsUtil = {
     'BICO',
     'CRV',
     'ENS',
-    'MATIC',
+    'POL',
     'OP',
     'METAL',
     'DAI',
@@ -424,7 +417,7 @@ export const ConstantsUtil = {
   NETWORK_DEFAULT_CURRENCIES: {
     'eip155:1': 'ETH', // Ethereum Mainnet
     'eip155:56': 'BNB', // Binance Smart Chain
-    'eip155:137': 'MATIC', // Polygon
+    'eip155:137': 'POL', // Polygon
     'eip155:42161': 'ETH_ARBITRUM', // Arbitrum One
     'eip155:43114': 'AVAX', // Avalanche C-Chain
     'eip155:10': 'ETH_OPTIMISM', // Optimism
@@ -511,102 +504,5 @@ 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,17 +1,12 @@
 /* eslint-disable no-bitwise */
 
 import { Linking, Platform } from 'react-native';
-import {
-  ConstantsUtil as CommonConstants,
-  type Balance,
-  type CaipAddress,
-  type CaipNetwork
-} from '@reown/appkit-common-react-native';
-
+import { ConstantsUtil as CommonConstants, type Balance } from '@reown/appkit-common-react-native';
 import * as ct from 'countries-and-timezones';
 
 import { ConstantsUtil } from './ConstantsUtil';
-import type { DataWallet, LinkingRecord } from './TypeUtil';
+import type { CaipAddress, CaipNetwork, 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 '@reown/appkit-common-react-native';
+import type { CaipNetwork } from '../utils/TypeUtil';
 
 export const NetworkUtil = {
   async handleNetworkSwitch(network: CaipNetwork) {

package/src/utils/StorageUtil.ts

@@ -10,9 +10,7 @@ import type {
 import {
   DateUtil,
   type SocialProvider,
-  type New_ConnectorType,
-  type ConnectorType,
-  type ChainNamespace
+  type ConnectorType
 } from '@reown/appkit-common-react-native';
 
 // -- Helpers -----------------------------------------------------------------
@@ -20,7 +18,6 @@ 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';
@@ -28,8 +25,6 @@ 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';
-
 // -- Utility -----------------------------------------------------------------
 export const StorageUtil = {
   setWalletConnectDeepLink({ href, name }: { href: string; name: string }) {
@@ -104,7 +99,6 @@ export const StorageUtil = {
     return [];
   },
 
-  //TODO: remove this
   async setConnectedConnector(connectorType: ConnectorType) {
     try {
       await AsyncStorage.setItem(CONNECTED_CONNECTOR, JSON.stringify(connectorType));
@@ -133,47 +127,6 @@ export const StorageUtil = {
     }
   },
 
-  async setConnectedConnectors({
-    type,
-    namespaces
-  }: {
-    type: New_ConnectorType;
-    namespaces: string[];
-  }) {
-    try {
-      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 AsyncStorage.setItem(CONNECTED_CONNECTORS, JSON.stringify(updatedConnectors));
-      }
-    } catch {
-      console.info('Unable to set Connected Connector');
-    }
-  },
-
-  async getConnectedConnectors(): Promise<{ type: New_ConnectorType; namespaces: string[] }[]> {
-    try {
-      const connectors = await AsyncStorage.getItem(CONNECTED_CONNECTORS);
-
-      return connectors ? JSON.parse(connectors) : [];
-    } catch {
-      console.info('Unable to get Connected Connector');
-    }
-
-    return [];
-  },
-
-  async removeConnectedConnectors(type: New_ConnectorType) {
-    try {
-      const currentConnectors = await StorageUtil.getConnectedConnectors();
-      const updatedConnectors = currentConnectors.filter(c => c.type !== type);
-      await AsyncStorage.setItem(CONNECTED_CONNECTORS, JSON.stringify(updatedConnectors));
-    } catch {
-      console.info('Unable to remove Connected Connector');
-    }
-  },
-
   async setConnectedWalletImageUrl(url: string) {
     try {
       await AsyncStorage.setItem(CONNECTED_WALLET_IMAGE_URL, url);
@@ -395,39 +348,5 @@ export const StorageUtil = {
     }
 
     return [];
-  },
-
-  async setActiveNamespace(namespace?: ChainNamespace) {
-    try {
-      if (!namespace) {
-        await AsyncStorage.removeItem(ACTIVE_NAMESPACE);
-
-        return;
-      }
-
-      await AsyncStorage.setItem(ACTIVE_NAMESPACE, namespace);
-    } catch {
-      console.info('Unable to set Active Namespace');
-    }
-  },
-
-  async getActiveNamespace() {
-    try {
-      const namespace = (await AsyncStorage.getItem(ACTIVE_NAMESPACE)) as ChainNamespace;
-
-      return namespace ?? undefined;
-    } catch (err) {
-      console.info('Unable to get Active Namespace');
-    }
-
-    return undefined;
-  },
-
-  async removeActiveNamespace() {
-    try {
-      await AsyncStorage.removeItem(ACTIVE_NAMESPACE);
-    } catch {
-      console.info('Unable to remove Active Namespace');
-    }
   }
 };

package/src/utils/SwapApiUtil.ts

@@ -8,14 +8,12 @@ import type {
 } from './TypeUtil';
 import { AccountController } from '../controllers/AccountController';
 import { ConnectionController } from '../controllers/ConnectionController';
-import { ConnectionsController } from '../controllers/ConnectionsController';
 
 export const SwapApiUtil = {
   async getTokenList() {
-    const chainId = ConnectionsController.state.activeNetwork?.caipNetworkId ?? 'eip155:1';
     const response = await BlockchainApiController.fetchSwapTokens({
       projectId: OptionsController.state.projectId,
-      chainId
+      chainId: NetworkController.state.caipNetwork?.id
     });
     const tokens =
       response?.tokens?.map(
@@ -64,18 +62,14 @@ export const SwapApiUtil = {
   },
 
   async getMyTokensWithBalance(forceUpdate?: string) {
-    const { activeAddress, activeNetwork: network } = ConnectionsController.state;
-    const address = activeAddress?.split(':')[2];
+    const address = AccountController.state.address;
+    const chainId = NetworkController.state.caipNetwork?.id;
 
     if (!address) {
       return [];
     }
 
-    const response = await BlockchainApiController.getBalance(
-      address,
-      network?.caipNetworkId,
-      forceUpdate
-    );
+    const response = await BlockchainApiController.getBalance(address, chainId, forceUpdate);
     const balances = response?.balances.filter(balance => balance.quantity.decimals !== '0');
 
     AccountController.setTokenBalance(balances);