@reown/appkit-core-react-native 0.0.0-fix-approved-networks-20250822000414 → 0.0.0-fix-improvements-20250827190629

package/src/controllers/TransactionsController.ts

@@ -1,11 +1,10 @@
-import type { Transaction } from '@reown/appkit-common-react-native';
+import type { CaipAddress, Transaction } from '@reown/appkit-common-react-native';
 import { proxy, subscribe as sub } from 'valtio';
 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[]>;
@@ -34,22 +33,29 @@ export const TransactionsController = {
     return sub(state, () => callback(state));
   },
 
-  async fetchTransactions(accountAddress?: string, reset?: boolean) {
-    const { projectId } = OptionsController.state;
+  async fetchTransactions(accountAddress: CaipAddress, reset?: boolean) {
+    try {
+      const { projectId } = OptionsController.state;
 
-    if (!projectId || !accountAddress) {
-      throw new Error("Transactions can't be fetched without a projectId and an accountAddress");
-    }
+      if (!projectId || !accountAddress) {
+        throw new Error("Transactions can't be fetched without a projectId and an accountAddress");
+      }
 
-    state.loading = true;
+      state.loading = true;
 
-    if (reset) {
-      state.next = undefined;
-    }
+      if (reset) {
+        state.next = undefined;
+      }
+
+      const [namespace, chain, address] = accountAddress?.split(':') ?? [];
+
+      if (!namespace || !chain || !address) {
+        throw new Error('Invalid address');
+      }
 
-    try {
       const response = await BlockchainApiController.fetchTransactions({
-        account: accountAddress,
+        account: address,
+        chainId: `${namespace}:${chain}`,
         projectId,
         cursor: state.next
       });
@@ -72,10 +78,10 @@ export const TransactionsController = {
         type: 'track',
         event: 'ERROR_FETCH_TRANSACTIONS',
         properties: {
-          address: accountAddress,
-          projectId,
+          address: accountAddress ?? '',
+          projectId: OptionsController.state.projectId,
           cursor: state.next,
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount'
         }
       });
       SnackController.showError('Failed to fetch transactions');
@@ -121,7 +127,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
     );
@@ -133,7 +139,7 @@ export const TransactionsController = {
     state.next = undefined;
   },
 
-  resetTransactions() {
+  resetState() {
     state.transactions = [];
     state.loading = false;
     state.empty = false;

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,24 +7,12 @@ export {
 
 export { RouterController, type RouterControllerState } from './controllers/RouterController';
 
-export { AccountController, type AccountControllerState } from './controllers/AccountController';
+export { WcController, type WcControllerState } from './controllers/WcController';
 
 export {
-  NetworkController,
-  type NetworkControllerClient,
-  type NetworkControllerState
-} from './controllers/NetworkController';
-
-export {
-  ConnectionController,
-  type ConnectionControllerClient,
-  type ConnectionControllerState
-} from './controllers/ConnectionController';
-
-export {
-  ConnectorController,
-  type ConnectorControllerState
-} from './controllers/ConnectorController';
+  ConnectionsController,
+  type ConnectionsControllerState
+} from './controllers/ConnectionsController';
 
 export { SnackController, type SnackControllerState } from './controllers/SnackController';
 
@@ -57,17 +45,15 @@ export {
 export { SendController, type SendControllerState } from './controllers/SendController';
 
 export { OnRampController, type OnRampControllerState } from './controllers/OnRampController';
-export { WebviewController, type WebviewControllerState } from './controllers/WebviewController';
 
 // -- 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';
 export { EventUtil } from './utils/EventUtil';
 export { RouterUtil } from './utils/RouterUtil';
-export { NetworkUtil } from './utils/NetworkUtil';
+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,38 +1,33 @@
-import { AssetController } from '../controllers/AssetController';
-import type { CaipNetwork, Connector, WcWallet } from './TypeUtil';
+import type { AppKitNetwork, WcWallet } from '@reown/appkit-common-react-native';
 
 export const AssetUtil = {
-  getWalletImage(wallet?: WcWallet) {
-    if (wallet?.image_url) {
-      return wallet?.image_url;
+  getWalletImage(wallet?: WcWallet, walletImages?: Record<string, string>) {
+    if (!wallet) {
+      return undefined;
     }
 
-    if (wallet?.image_id) {
-      return AssetController.state.walletImages[wallet.image_id];
+    if (wallet.image_url) {
+      return wallet.image_url;
     }
 
-    return undefined;
-  },
-
-  getNetworkImage(network?: CaipNetwork) {
-    if (network?.imageUrl) {
-      return network?.imageUrl;
-    }
-
-    if (network?.imageId) {
-      return AssetController.state.networkImages[network.imageId];
+    if (wallet.image_id) {
+      return walletImages?.[wallet.image_id];
     }
 
     return undefined;
   },
 
-  getConnectorImage(connector?: Connector) {
-    if (connector?.imageUrl) {
-      return connector.imageUrl;
+  getNetworkImage(network?: AppKitNetwork, networkImages?: Record<string, string>) {
+    if (!network) {
+      return undefined;
+    }
+
+    if (network?.imageUrl) {
+      return network.imageUrl;
     }
 
-    if (connector?.imageId) {
-      return AssetController.state.connectorImages[connector.imageId];
+    if (network?.id) {
+      return networkImages?.[network.id];
     }
 
     return undefined;

package/src/utils/ConstantsUtil.ts

@@ -1,11 +1,10 @@
-import type { Features } from './TypeUtil';
+import type { ChainNamespace, Features } from '@reown/appkit-common-react-native';
 
 const defaultFeatures: Features = {
   swaps: true,
   onramp: true,
-  email: true,
-  emailShowWallets: true,
-  socials: ['x', 'discord', 'apple']
+  socials: ['email', 'google', 'x', 'discord', 'apple', 'facebook', 'github', 'farcaster'],
+  showWallets: true
 };
 
 export const OnRampErrorType = {
@@ -35,7 +34,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,
 
@@ -129,6 +133,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',
@@ -156,6 +270,10 @@ export const ConstantsUtil = {
     'eip155:1313161554'
   ],
 
+  SEND_SUPPORTED_NAMESPACES: ['eip155', 'solana'],
+
+  ONRAMP_SUPPORTED_NAMESPACES: ['eip155', 'solana', 'bip122'],
+
   CONVERT_SLIPPAGE_TOLERANCE: 1,
 
   DEFAULT_FEATURES: defaultFeatures,
@@ -183,6 +301,8 @@ export const ConstantsUtil = {
     'eip155:7700': 'CANTO', // Canto
     'eip155:59144': 'ETH_LINEA', // Linea
     'eip155:1101': 'ETH_POLYGONZKEVM', // Polygon zkEVM
-    'eip155:196': 'XIN' // Mixin
+    'eip155:196': 'XIN', // Mixin
+    'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp': 'SOL',
+    'bip122:000000000019d6689c085ae165831e93': 'BTC'
   }
 };

package/src/utils/CoreHelperUtil.ts

@@ -1,11 +1,24 @@
 /* eslint-disable no-bitwise */
 
 import { Linking, Platform } from 'react-native';
-import { ConstantsUtil as CommonConstants, type Balance } from '@reown/appkit-common-react-native';
+import {
+  BlockchainAdapter,
+  ConstantsUtil as CommonConstants,
+  type AdapterType,
+  type Balance,
+  type CaipAddress,
+  type CaipNetwork,
+  type ChainNamespace,
+  type SocialProvider,
+  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 { CaipAddress, CaipNetwork, DataWallet, LinkingRecord } from './TypeUtil';
+import { OptionsController } from '../controllers/OptionsController';
 
 // -- Helpers -----------------------------------------------------------------
 async function isAppInstalledIos(deepLink?: string): Promise<boolean> {
@@ -97,7 +110,7 @@ export const CoreHelperUtil = {
     };
   },
 
-  formatUniversalUrl(appUrl: string, wcUri: string): LinkingRecord {
+  formatUniversalUrl(appUrl: string, wcUri: string, provider?: SocialProvider): LinkingRecord {
     if (CoreHelperUtil.isLinkModeURL(wcUri)) {
       return {
         redirect: wcUri,
@@ -115,7 +128,9 @@ export const CoreHelperUtil = {
     const encodedWcUrl = encodeURIComponent(wcUri);
 
     return {
-      redirect: `${safeAppUrl}wc?uri=${encodedWcUrl}`,
+      redirect: provider
+        ? `${safeAppUrl}wc?uri=${encodedWcUrl}&provider=${provider}`
+        : `${safeAppUrl}wc?uri=${encodedWcUrl}`,
       href: safeAppUrl
     };
   },
@@ -144,8 +159,8 @@ export const CoreHelperUtil = {
     return formattedBalance ? `${formattedBalance} ${symbol}` : `0.000 ${symbol || ''}`;
   },
 
-  isAddress(address: string, chain = 'eip155'): boolean {
-    switch (chain) {
+  isAddress(address: string, namespace: ChainNamespace = 'eip155'): boolean {
+    switch (namespace) {
       case 'eip155':
         if (!/^(?:0x)?[0-9a-f]{40}$/iu.test(address)) {
           return false;
@@ -277,7 +292,7 @@ export const CoreHelperUtil = {
 
     let sum = 0;
     for (const item of array) {
-      sum += item.value ?? 0;
+      sum += item?.value ?? 0;
     }
 
     const roundedNumber = sum.toFixed(2);
@@ -317,5 +332,28 @@ export const CoreHelperUtil = {
         func(...args);
       }, wait);
     };
+  },
+
+  generateSdkVersion(adapters: BlockchainAdapter[], version: string): SdkVersion {
+    const hasNoAdapters = adapters.length === 0;
+    const universalType: AdapterType = 'universal';
+
+    const adapterNames = hasNoAdapters
+      ? universalType
+      : adapters
+          .sort((a, b) => a.adapterType.localeCompare(b.adapterType))
+          .map(adapter => adapter.adapterType)
+          .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 {
@@ -8,7 +8,7 @@ interface Options {
 
 interface RequestArguments {
   path: string;
-  headers?: HeadersInit_;
+  headers?: HeadersInit;
   params?: Record<string, string | undefined>;
   cache?: RequestCache;
   signal?: AbortSignal;