@reown/appkit-core-react-native 0.0.0-chore-solflare-20250730210452 → 0.0.0-chore-spring-effect-20250909214820

package/src/controllers/ConnectionsController.ts

@@ -18,7 +18,6 @@ import {
 import { StorageUtil } from '../utils/StorageUtil';
 import { BlockchainApiController } from './BlockchainApiController';
 import { SnackController } from './SnackController';
-import { OptionsController } from './OptionsController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 
 // -- Types --------------------------------------------- //
@@ -81,11 +80,13 @@ const updateConnection = (
   namespace: ChainNamespace,
   connection: Connection,
   updates: Partial<Connection>
-) => {
-  if (!connection) return;
+): Connection => {
   const newConnectionsMap = new Map(baseState.connections);
-  newConnectionsMap.set(namespace, { ...connection, ...updates });
+  const newConnection = { ...connection, ...updates };
+  newConnectionsMap.set(namespace, newConnection);
   baseState.connections = newConnectionsMap;
+
+  return newConnection;
 };
 
 const getActiveIdentity = (connection: Connection): Identity | undefined => {
@@ -132,27 +133,6 @@ const derivedState = derive(
         return undefined;
       }
 
-      // Check if there's a specific token configured in OptionsController
-      const configuredTokens = OptionsController.state.tokens;
-      const activeNetwork = snap.networks.find(
-        network =>
-          network.chainNamespace === snap.activeNamespace &&
-          network.id?.toString() === connection.caipNetwork?.split(':')[1]
-      );
-
-      if (configuredTokens && activeNetwork) {
-        const configuredToken = configuredTokens[activeNetwork.caipNetworkId];
-        if (configuredToken) {
-          // Find the configured token in the balances
-          const specificToken = addressBalances.find(
-            balance => balance.address === configuredToken.address
-          );
-          if (specificToken) {
-            return specificToken;
-          }
-        }
-      }
-
       // Return the native token (first balance without address)
       const nativeToken = addressBalances.find(balance => !balance.address);
       if (nativeToken) {
@@ -228,6 +208,10 @@ export const ConnectionsController = {
   state: derivedState,
 
   setActiveNamespace(namespace?: ChainNamespace) {
+    if (baseState.activeNamespace === namespace) {
+      return;
+    }
+
     baseState.activeNamespace = namespace;
     StorageUtil.setActiveNamespace(namespace);
   },
@@ -269,16 +253,19 @@ export const ConnectionsController = {
     baseState.connections = newConnectionsMap;
   },
 
-  updateAccounts(namespace: ChainNamespace, accounts: CaipAddress[]) {
+  updateAccounts(namespace: ChainNamespace, accounts: CaipAddress[]): boolean {
     const connection = baseState.connections.get(namespace);
     if (!connection) {
-      return;
+      return false;
     }
 
-    const newConnectionsMap = new Map(baseState.connections);
-    const updatedConnection = { ...connection, accounts };
-    newConnectionsMap.set(namespace, updatedConnection);
-    baseState.connections = newConnectionsMap;
+    if (connection.accounts.toString() === accounts.toString()) {
+      return false;
+    }
+
+    updateConnection(namespace, connection, { accounts });
+
+    return true;
   },
 
   updateBalance(namespace: ChainNamespace, address: CaipAddress, balance: Balance) {
@@ -349,10 +336,9 @@ export const ConnectionsController = {
       return;
     }
 
-    baseState.connections.set(namespace, {
-      ...connection,
-      caipNetwork: networkId
-    });
+    updateConnection(namespace, connection, { caipNetwork: networkId });
+
+    this.setActiveNamespace(namespace);
   },
 
   setNetworks(networks: AppKitNetwork[]) {
@@ -360,6 +346,11 @@ export const ConnectionsController = {
   },
 
   getConnectedNetworks() {
+    const connection = getActiveConnection(baseState);
+    if (!connection) {
+      return [];
+    }
+
     return baseState.networks.filter(
       network =>
         baseState.connections
@@ -368,14 +359,31 @@ export const ConnectionsController = {
     );
   },
 
+  getAvailableNetworks() {
+    const connection = getActiveConnection(baseState);
+
+    if (!connection) {
+      return baseState.networks;
+    }
+
+    const canAddEvmChain = connection.properties?.canAddEvmChain;
+
+    return baseState.networks.filter(
+      network =>
+        baseState.connections
+          .get(network.chainNamespace)
+          ?.accounts.some(account => account.startsWith(network.caipNetworkId)) ||
+        (canAddEvmChain && network.chainNamespace === 'eip155')
+    );
+  },
+
   setAccountType(namespace: ChainNamespace, type: AccountType) {
     const connection = baseState.connections.get(namespace);
     if (!connection) return;
 
-    const newConnectionsMap = new Map(baseState.connections);
-    const newConnection = { ...connection, type };
-    newConnectionsMap.set(namespace, newConnection);
-    baseState.connections = newConnectionsMap;
+    const newConnection = updateConnection(namespace, connection, { type });
+
+    return getActiveAddress(newConnection);
   },
 
   async disconnect(namespace: ChainNamespace, isInternal = true) {

package/src/controllers/EnsController.ts

@@ -1,7 +1,7 @@
 import { subscribeKey as subKey } from 'valtio/utils';
 import { proxy, subscribe as sub } from 'valtio';
 import { BlockchainApiController } from './BlockchainApiController';
-import type { BlockchainApiEnsError } from '../utils/TypeUtil';
+import type { BlockchainApiEnsError } from '@reown/appkit-common-react-native';
 
 // -- Types --------------------------------------------- //
 

package/src/controllers/EventsController.ts

@@ -3,7 +3,7 @@ import { ApiController } from './ApiController';
 import { OptionsController } from './OptionsController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { FetchUtil } from '../utils/FetchUtil';
-import type { Event, EventName } from '../utils/TypeUtil';
+import type { Event, EventName } from '@reown/appkit-common-react-native';
 
 // -- Helpers ------------------------------------------- //
 const baseUrl = CoreHelperUtil.getAnalyticsUrl();

package/src/controllers/ModalController.ts

@@ -30,10 +30,14 @@ export const ModalController = {
   async open(options?: ModalControllerArguments['open']) {
     await ApiController.state.prefetchPromise;
     const isConnected = ConnectionsController.state.isConnected;
+    const isUniversalWallet = !!ConnectionsController.state.connection?.properties?.provider;
     if (options?.view) {
+      if (options.view === 'Account' && !isUniversalWallet) {
+        options.view = 'AccountDefault';
+      }
+
       RouterController.reset(options.view);
     } else if (isConnected) {
-      const isUniversalWallet = !!ConnectionsController.state.connection?.properties?.provider;
       RouterController.reset(isUniversalWallet ? 'Account' : 'AccountDefault');
     } else {
       RouterController.reset('Connect');

package/src/controllers/OnRampController.ts

@@ -12,7 +12,7 @@ import {
   type OnRampErrorTypeValues,
   type OnRampCountryDefaults,
   BlockchainOnRampError
-} from '../utils/TypeUtil';
+} from '@reown/appkit-common-react-native';
 
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { OptionsController } from './OptionsController';
@@ -124,7 +124,11 @@ export const OnRampController = {
           state.countriesDefaults?.find(d => d.countryCode === country.countryCode)
             ?.defaultCurrencyCode || 'USD';
 
-        const currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
+        let currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
+
+        if (!currency) {
+          currency = state.paymentCurrencies?.find(c => c.currencyCode === 'USD');
+        }
 
         if (currency) {
           this.setPaymentCurrency(currency);

package/src/controllers/OptionsController.ts

@@ -1,6 +1,14 @@
 import { proxy, ref } from 'valtio';
-import type { Tokens, Storage, Metadata, AppKitNetwork } from '@reown/appkit-common-react-native';
-import type { CustomWallet, Features, ProjectId, SdkType, SdkVersion } from '../utils/TypeUtil';
+import type {
+  Storage,
+  Metadata,
+  AppKitNetwork,
+  CustomWallet,
+  Features,
+  ProjectId,
+  SdkType,
+  SdkVersion
+} from '@reown/appkit-common-react-native';
 
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 
@@ -17,7 +25,6 @@ export interface OptionsControllerState {
   excludeWalletIds?: string[];
   featuredWalletIds?: string[];
   customWallets?: CustomWallet[];
-  tokens?: Tokens;
   enableAnalytics?: boolean;
   sdkType: SdkType;
   sdkVersion: SdkVersion;
@@ -27,14 +34,16 @@ export interface OptionsControllerState {
   features?: Features;
   debug?: boolean;
   defaultNetwork?: AppKitNetwork;
+  requestedNetworks?: AppKitNetwork[];
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<OptionsControllerState>({
   projectId: '',
   sdkType: 'appkit',
-  sdkVersion: 'react-native-wagmi-undefined',
+  sdkVersion: 'react-native-undefined-undefined',
   features: ConstantsUtil.DEFAULT_FEATURES,
+  customWallets: [],
   debug: false
 });
 
@@ -62,10 +71,6 @@ export const OptionsController = {
     state.featuredWalletIds = featuredWalletIds;
   },
 
-  setTokens(tokens: OptionsControllerState['tokens']) {
-    state.tokens = tokens;
-  },
-
   setCustomWallets(customWallets: OptionsControllerState['customWallets']) {
     state.customWallets = customWallets;
   },
@@ -108,6 +113,10 @@ export const OptionsController = {
     state.defaultNetwork = defaultNetwork;
   },
 
+  setRequestedNetworks(requestedNetworks?: OptionsControllerState['requestedNetworks']) {
+    state.requestedNetworks = requestedNetworks;
+  },
+
   isClipboardAvailable() {
     return !!state.clipboardClient;
   },

package/src/controllers/RouterController.ts

@@ -1,7 +1,10 @@
 import { proxy } from 'valtio';
-import type { CaipNetwork, SocialProvider } from '@reown/appkit-common-react-native';
-
-import type { WcWallet, OnRampTransactionResult } from '../utils/TypeUtil';
+import type {
+  AppKitNetwork,
+  SocialProvider,
+  WcWallet,
+  OnRampTransactionResult
+} from '@reown/appkit-common-react-native';
 
 // -- Types --------------------------------------------- //
 export interface RouterControllerState {
@@ -17,12 +20,12 @@ export interface RouterControllerState {
     | 'ConnectingWalletConnect'
     | 'GetWallet'
     | 'Networks'
+    | 'SwitchNetwork'
     | 'OnRamp'
     | 'OnRampCheckout'
     | 'OnRampLoading'
     | 'OnRampSettings'
     | 'OnRampTransaction'
-    | 'SwitchNetwork'
     | 'Swap'
     | 'SwapPreview'
     | 'Transactions'
@@ -39,9 +42,7 @@ export interface RouterControllerState {
   navigationDirection: 'forward' | 'backward' | 'none';
   data?: {
     wallet?: WcWallet;
-    network?: CaipNetwork;
-    email?: string;
-    newEmail?: string;
+    network?: AppKitNetwork;
     onrampResult?: OnRampTransactionResult;
     socialProvider?: SocialProvider;
   };
@@ -58,9 +59,13 @@ const state = proxy<RouterControllerState>({
 export const RouterController = {
   state,
 
-  push(view: RouterControllerState['view'], data?: RouterControllerState['data']) {
+  push(
+    view: RouterControllerState['view'],
+    data?: RouterControllerState['data'],
+    direction: 'forward' | 'backward' = 'forward'
+  ) {
     if (view !== state.view) {
-      state.navigationDirection = 'forward';
+      state.navigationDirection = direction;
       state.view = view;
       state.history = [...state.history, view];
       state.data = data;

package/src/controllers/SwapController.ts

@@ -3,7 +3,9 @@ import { proxy, subscribe as sub } from 'valtio';
 import {
   NumberUtil,
   type CaipAddress,
-  type CaipNetworkId
+  type CaipNetworkId,
+  type SwapInputTarget,
+  type SwapTokenWithBalance
 } from '@reown/appkit-common-react-native';
 
 import { ConstantsUtil } from '../utils/ConstantsUtil';
@@ -13,7 +15,6 @@ import { OptionsController } from './OptionsController';
 import { SwapCalculationUtil } from '../utils/SwapCalculationUtil';
 import { SnackController } from './SnackController';
 import { RouterController } from './RouterController';
-import type { SwapInputTarget, SwapTokenWithBalance } from '../utils/TypeUtil';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { TransactionsController } from './TransactionsController';
 import { EventsController } from './EventsController';

package/src/controllers/WcController.ts

@@ -0,0 +1,93 @@
+import { proxy } from 'valtio';
+import { subscribeKey as subKey } from 'valtio/utils';
+import type { WalletDeepLink, WcWallet } from '@reown/appkit-common-react-native';
+import { CoreHelperUtil } from '../utils/CoreHelperUtil';
+import { StorageUtil } from '../utils/StorageUtil';
+
+// -- Types --------------------------------------------- //
+export interface WcControllerState {
+  wcUri?: string;
+  wcPromise?: Promise<void>;
+  wcPairingExpiry?: number;
+  wcLinking?: WalletDeepLink;
+  wcError?: boolean;
+  pressedWallet?: WcWallet;
+  recentWallets?: WcWallet[];
+}
+
+type StateKey = keyof WcControllerState;
+
+// -- State --------------------------------------------- //
+const state = proxy<WcControllerState>({
+  wcError: false
+});
+
+// -- Controller ---------------------------------------- //
+export const WcController = {
+  state,
+
+  subscribeKey<K extends StateKey>(key: K, callback: (value: WcControllerState[K]) => void) {
+    return subKey(state, key, callback);
+  },
+
+  setWcLinking(wcLinking: WcControllerState['wcLinking']) {
+    state.wcLinking = wcLinking;
+  },
+
+  removeWcLinking() {
+    state.wcLinking = undefined;
+  },
+
+  setWcError(wcError: WcControllerState['wcError']) {
+    state.wcError = wcError;
+  },
+
+  setPressedWallet(wallet: WcControllerState['pressedWallet']) {
+    state.pressedWallet = wallet;
+  },
+
+  removePressedWallet() {
+    state.pressedWallet = undefined;
+  },
+
+  setWcPromise(wcPromise: WcControllerState['wcPromise']) {
+    state.wcPromise = wcPromise;
+  },
+
+  setWcUri(wcUri: WcControllerState['wcUri']) {
+    state.wcUri = wcUri;
+    state.wcPairingExpiry = CoreHelperUtil.getPairingExpiry();
+  },
+
+  setRecentWallets(wallets: WcControllerState['recentWallets']) {
+    state.recentWallets = wallets;
+  },
+
+  async addRecentWallet(wallet: WcWallet) {
+    const recentWallets = await StorageUtil.addRecentWallet(wallet);
+    if (recentWallets) {
+      WcController.setRecentWallets(recentWallets);
+    }
+  },
+
+  setConnectedWallet: async (wcLinking: WalletDeepLink, pressedWallet?: WcWallet) => {
+    StorageUtil.setWalletConnectDeepLink(wcLinking);
+
+    if (pressedWallet) {
+      WcController.addRecentWallet(pressedWallet);
+    }
+  },
+
+  clearUri() {
+    state.wcUri = undefined;
+    state.wcPairingExpiry = undefined;
+    state.wcPromise = undefined;
+    state.wcLinking = undefined;
+  },
+
+  resetState() {
+    this.clearUri();
+    state.pressedWallet = undefined;
+    StorageUtil.removeWalletConnectDeepLink();
+  }
+};

package/src/index.ts

@@ -7,11 +7,7 @@ export {
 
 export { RouterController, type RouterControllerState } from './controllers/RouterController';
 
-export {
-  ConnectionController,
-  type ConnectionControllerClient,
-  type ConnectionControllerState
-} from './controllers/ConnectionController';
+export { WcController, type WcControllerState } from './controllers/WcController';
 
 export {
   ConnectionsController,
@@ -57,6 +53,6 @@ export { ConstantsUtil } from './utils/ConstantsUtil';
 export { CoreHelperUtil } from './utils/CoreHelperUtil';
 export { StorageUtil } from './utils/StorageUtil';
 export { EventUtil } from './utils/EventUtil';
-export { RouterUtil } from './utils/RouterUtil';
+export { WalletUtil } from './utils/WalletUtil';
 
-export type * from './utils/TypeUtil';
+// Types are now exported from @reown/appkit-common-react-native

package/src/utils/AssetUtil.ts

@@ -1,24 +1,27 @@
-import { AssetController } from '../controllers/AssetController';
-import type { WcWallet } from './TypeUtil';
+import type { AppKitNetwork, WcWallet } from '@reown/appkit-common-react-native';
 
 export const AssetUtil = {
-  getWalletImage(wallet?: WcWallet) {
+  getWalletImage(wallet?: WcWallet, walletImages?: Record<string, string>) {
     if (wallet?.image_url) {
       return wallet?.image_url;
     }
 
     if (wallet?.image_id) {
-      return AssetController.state.walletImages[wallet.image_id];
+      return walletImages?.[wallet.image_id];
     }
 
     return undefined;
   },
 
-  getConnectorImage(imageId?: string) {
-    if (imageId) {
-      return AssetController.state.connectorImages[imageId];
+  getNetworkImage(network?: AppKitNetwork, networkImages?: Record<string, string>) {
+    if (!network) {
+      return undefined;
     }
 
-    return undefined;
+    if (network?.imageUrl) {
+      return network.imageUrl;
+    }
+
+    return networkImages?.[network?.id];
   }
 };

package/src/utils/ConstantsUtil.ts

@@ -1,5 +1,4 @@
-import type { ChainNamespace } from '@reown/appkit-common-react-native';
-import type { Features } from './TypeUtil';
+import type { ChainNamespace, Features } from '@reown/appkit-common-react-native';
 
 const defaultFeatures: Features = {
   swaps: true,
@@ -220,8 +219,6 @@ export const ConstantsUtil = {
     'eip155:1499',
     // Sonic
     'eip155:7007',
-    // Swellchain
-    'eip155:7777777',
     // Taiko
     'eip155:167000',
     // Viction
@@ -239,9 +236,7 @@ export const ConstantsUtil = {
     // ZkLink Nova
     'eip155:810180',
     // re.al
-    'eip155:666',
-    // Zora
-    'eip155:7777777'
+    'eip155:666'
   ],
 
   SWAP_SUPPORTED_NETWORKS: [

package/src/utils/CoreHelperUtil.ts

@@ -10,13 +10,15 @@ import {
   type CaipNetwork,
   type ChainNamespace,
   type SocialProvider,
-  type LinkingRecord
+  type LinkingRecord,
+  type DataWallet,
+  type SdkVersion
 } from '@reown/appkit-common-react-native';
 
 import * as ct from 'countries-and-timezones';
 
 import { ConstantsUtil } from './ConstantsUtil';
-import type { DataWallet, SdkVersion } from './TypeUtil';
+import { OptionsController } from '../controllers/OptionsController';
 
 // -- Helpers -----------------------------------------------------------------
 async function isAppInstalledIos(deepLink?: string): Promise<boolean> {
@@ -344,5 +346,14 @@ export const CoreHelperUtil = {
           .join(',');
 
     return `react-native-${adapterNames}-${version}`;
+  },
+
+  getRequestedCaipNetworkIds() {
+    const chains = OptionsController.state.requestedNetworks;
+    if (!chains) return [];
+
+    const requestedIds = chains.map(caipNetwork => caipNetwork.caipNetworkId);
+
+    return requestedIds;
   }
 };

package/src/utils/EventUtil.ts

@@ -1,4 +1,4 @@
-import type { Platform, WcWallet } from './TypeUtil';
+import type { Platform, WcWallet } from '@reown/appkit-common-react-native';
 
 export const EventUtil = {
   getWalletPlatform(wallet: WcWallet, installed?: boolean): Platform | undefined {

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 {

package/src/utils/StorageUtil.ts

@@ -1,15 +1,12 @@
 /* eslint-disable no-console */
-import type {
-  OnRampCountry,
-  OnRampFiatCurrency,
-  OnRampFiatLimit,
-  OnRampServiceProvider,
-  OnRampCountryDefaults,
-  WcWallet
-} from './TypeUtil';
 import {
+  type OnRampCountry,
+  type OnRampFiatCurrency,
+  type OnRampFiatLimit,
+  type OnRampServiceProvider,
+  type OnRampCountryDefaults,
+  type WcWallet,
   DateUtil,
-  type SocialProvider,
   type ConnectorType,
   type ChainNamespace,
   type WalletDeepLink,
@@ -153,73 +150,6 @@ export const StorageUtil = {
     }
   },
 
-  async setConnectedWalletImageUrl(url: string) {
-    try {
-      await OptionsController.getStorage().setItem(
-        ConstantsUtil.STORAGE_KEYS.CONNECTED_WALLET_IMAGE_URL,
-        url
-      );
-    } catch {
-      console.info('Unable to set Connected Wallet Image URL');
-    }
-  },
-
-  async getConnectedWalletImageUrl() {
-    try {
-      return await OptionsController.getStorage().getItem(
-        ConstantsUtil.STORAGE_KEYS.CONNECTED_WALLET_IMAGE_URL
-      );
-    } catch {
-      console.info('Unable to get Connected Wallet Image URL');
-    }
-
-    return undefined;
-  },
-
-  async removeConnectedWalletImageUrl() {
-    try {
-      await OptionsController.getStorage().removeItem(
-        ConstantsUtil.STORAGE_KEYS.CONNECTED_WALLET_IMAGE_URL
-      );
-    } catch (e) {
-      console.error(e);
-      console.info('Unable to remove Connected Wallet Image URL');
-    }
-  },
-
-  async setConnectedSocialProvider(provider: SocialProvider) {
-    try {
-      await OptionsController.getStorage().setItem(
-        ConstantsUtil.STORAGE_KEYS.CONNECTED_SOCIAL,
-        provider
-      );
-    } catch {
-      console.info('Unable to set Connected Social Provider');
-    }
-  },
-
-  async getConnectedSocialProvider(): Promise<SocialProvider | undefined> {
-    try {
-      const provider = await OptionsController.getStorage().getItem<SocialProvider>(
-        ConstantsUtil.STORAGE_KEYS.CONNECTED_SOCIAL
-      );
-
-      return provider ?? undefined;
-    } catch {
-      console.info('Unable to get Connected Social Provider');
-    }
-
-    return undefined;
-  },
-
-  async removeConnectedSocialProvider() {
-    try {
-      await OptionsController.getStorage().removeItem(ConstantsUtil.STORAGE_KEYS.CONNECTED_SOCIAL);
-    } catch {
-      console.info('Unable to remove Connected Social Provider');
-    }
-  },
-
   async setOnRampPreferredCountry(country: OnRampCountry) {
     try {
       await OptionsController.getStorage().setItem(

package/src/utils/SwapApiUtil.ts

@@ -1,7 +1,11 @@
-import type { Balance, CaipNetworkId } from '@reown/appkit-common-react-native';
+import type {
+  Balance,
+  CaipNetworkId,
+  BlockchainApiSwapAllowanceRequest,
+  SwapTokenWithBalance
+} from '@reown/appkit-common-react-native';
 import { BlockchainApiController } from '../controllers/BlockchainApiController';
 import { OptionsController } from '../controllers/OptionsController';
-import type { BlockchainApiSwapAllowanceRequest, SwapTokenWithBalance } from './TypeUtil';
 import { ConnectionsController } from '../controllers/ConnectionsController';
 import { ConstantsUtil } from './ConstantsUtil';