@reown/appkit-core-react-native 0.0.0-feat-multi-social-20250701154123 → 0.0.0-feat-multi-social-20250703185818

package/src/controllers/ConnectionsController.ts

@@ -7,21 +7,27 @@ import {
   type CaipAddress,
   type CaipNetworkId,
   type ChainNamespace,
-  type GetBalanceResponse,
-  type WalletInfo
+  type Balance,
+  type WalletInfo,
+  type ConnectionProperties,
+  type AccountType
 } from '@reown/appkit-common-react-native';
 import { StorageUtil } from '../utils/StorageUtil';
+import { BlockchainApiController } from './BlockchainApiController';
+import { SnackController } from './SnackController';
+import { OptionsController } from './OptionsController';
 
 // -- Types --------------------------------------------- //
-type Balance = GetBalanceResponse;
 
 //TODO: balance could be elsewhere
 interface Connection {
   accounts: CaipAddress[];
-  balances: Record<CaipAddress, Balance>; //TODO: make this an array of balances
+  balances: Map<CaipAddress, Balance[]>; // Changed to support multiple tokens per address
   adapter: BlockchainAdapter;
   caipNetwork: CaipNetworkId;
   wallet?: WalletInfo;
+  properties?: ConnectionProperties;
+  type?: AccountType;
 }
 
 export interface ConnectionsControllerState {
@@ -37,59 +43,115 @@ const baseState = proxy<ConnectionsControllerState>({
   networks: []
 });
 
+// -- Helper Functions --------------------------------------------- //
+const getActiveConnection = (snap: ConnectionsControllerState): Connection | undefined => {
+  if (!snap.activeNamespace) return undefined;
+
+  return snap.connections.get(snap.activeNamespace);
+};
+
+const hasValidAccounts = (connection: Connection): boolean => {
+  return connection?.accounts && connection.accounts.length > 0;
+};
+
+const findSmartAccountForNetwork = (connection: Connection): CaipAddress | undefined => {
+  return connection.properties?.smartAccounts?.find(account =>
+    account.startsWith(connection.caipNetwork)
+  );
+};
+
+const findEOAForNetwork = (connection: Connection): CaipAddress | undefined => {
+  const smartAccounts = connection.properties?.smartAccounts || [];
+
+  return connection.accounts.find(
+    account => account.startsWith(connection.caipNetwork) && !smartAccounts.includes(account)
+  );
+};
+
+const getActiveAddress = (connection: Connection): CaipAddress | undefined => {
+  if (!hasValidAccounts(connection)) {
+    return undefined;
+  }
+
+  // For smart accounts, prioritize smart account addresses
+  if (connection.type === 'smartAccount') {
+    const smartAccount = findSmartAccountForNetwork(connection);
+    if (smartAccount) {
+      return smartAccount;
+    }
+  }
+
+  // Fall back to EOA or any account that matches the network
+  return findEOAForNetwork(connection);
+};
+
+const updateConnection = (namespace: ChainNamespace, updates: Partial<Connection>) => {
+  const connection = baseState.connections.get(namespace);
+  if (!connection) return;
+  const newConnectionsMap = new Map(baseState.connections);
+  newConnectionsMap.set(namespace, { ...connection, ...updates });
+  baseState.connections = newConnectionsMap;
+};
+
 const derivedState = derive(
   {
     activeAddress: (get): CaipAddress | undefined => {
       const snap = get(baseState);
+      const connection = getActiveConnection(snap);
+
+      return connection ? getActiveAddress(connection) : undefined;
+    },
+    activeBalance: (get): Balance | undefined => {
+      const snap = get(baseState);
+      const connection = getActiveConnection(snap);
 
-      if (!snap.activeNamespace) {
+      if (!connection) {
         return undefined;
       }
 
-      const connection = snap.connections.get(snap.activeNamespace);
-
-      if (!connection || !connection.accounts || connection.accounts.length === 0) {
+      const activeAddress = getActiveAddress(connection);
+      if (!activeAddress || !connection.balances || connection.balances.size === 0) {
         return undefined;
       }
 
-      //TODO: what happens if there are several accounts on the same chain?
-      const activeAccount = connection.accounts.find(account =>
-        account.startsWith(connection.caipNetwork)
-      );
-
-      return activeAccount;
-    },
-    activeBalance: (get): Balance | undefined => {
-      const snap = get(baseState);
-
-      if (!snap.activeNamespace) return undefined;
-      const connection = snap.connections.get(snap.activeNamespace);
-
-      if (!connection || !connection.accounts || connection.accounts.length === 0) {
+      const addressBalances = connection.balances.get(activeAddress);
+      if (!addressBalances || addressBalances.length === 0) {
         return undefined;
       }
 
-      const activeAccount = connection.accounts.find(account =>
-        account.startsWith(connection.caipNetwork)
+      // 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 (
-        !connection ||
-        !connection.balances ||
-        !activeAccount ||
-        Object.keys(connection.balances).length === 0
-      ) {
-        return undefined;
+      if (configuredTokens && activeNetwork) {
+        const configuredToken = configuredTokens[activeNetwork.caipNetworkId];
+        if (configuredToken) {
+          // Find the configured token in the balances
+          const specificToken = addressBalances.find(
+            balance => balance.contractAddress === configuredToken.address
+          );
+          if (specificToken) {
+            return specificToken;
+          }
+        }
+      }
+
+      // Return the native token (first balance without contractAddress)
+      const nativeToken = addressBalances.find(balance => !balance.contractAddress);
+      if (nativeToken) {
+        return nativeToken;
       }
 
-      return connection.balances[activeAccount];
+      // Fallback to first available balance
+      return addressBalances[0];
     },
     activeNetwork: (get): AppKitNetwork | undefined => {
       const snap = get(baseState);
-
-      if (!snap.activeNamespace) return undefined;
-
-      const connection = snap.connections.get(snap.activeNamespace);
+      const connection = getActiveConnection(snap);
 
       if (!connection) return undefined;
 
@@ -101,21 +163,41 @@ const derivedState = derive(
     },
     activeCaipNetworkId: (get): CaipNetworkId | undefined => {
       const snap = get(baseState);
+      const connection = getActiveConnection(snap);
+
+      return connection?.caipNetwork;
+    },
+    accountType: (get): AccountType | undefined => {
+      const snap = get(baseState);
+      const connection = getActiveConnection(snap);
 
-      if (!snap.activeNamespace) return undefined;
+      return connection?.type;
+    },
+    connection: (get): Connection | undefined => {
+      const snap = get(baseState);
 
-      const connection = snap.connections.get(snap.activeNamespace);
+      return getActiveConnection(snap);
+    },
+    balances: (get): Balance[] | undefined => {
+      const snap = get(baseState);
 
-      if (!connection) return undefined;
+      const _connection = getActiveConnection(snap);
 
-      return connection.caipNetwork;
+      if (!_connection) {
+        return undefined;
+      }
+
+      const _activeAddress = getActiveAddress(_connection);
+
+      if (!_activeAddress) return [];
+
+      return _connection?.balances.get(_activeAddress);
     },
     walletInfo: (get): WalletInfo | undefined => {
       const snap = get(baseState);
+      const connection = getActiveConnection(snap);
 
-      if (!snap.activeNamespace) return undefined;
-
-      return snap.connections.get(snap.activeNamespace)?.wallet;
+      return connection?.wallet;
     }
   },
   {
@@ -132,28 +214,35 @@ export const ConnectionsController = {
     StorageUtil.setActiveNamespace(namespace);
   },
 
-  storeConnection({
-    namespace,
-    adapter,
+  setConnection({
     accounts,
-    chains,
-    wallet,
-    caipNetwork
+    adapter,
+    caipNetwork,
+    namespace,
+    properties,
+    wallet
   }: {
-    namespace: ChainNamespace;
-    adapter: BlockchainAdapter;
     accounts: CaipAddress[];
-    chains: CaipNetworkId[];
+    adapter: BlockchainAdapter;
+    caipNetwork: CaipNetworkId;
+    namespace: ChainNamespace;
+    properties?: ConnectionProperties;
     wallet?: WalletInfo;
-    caipNetwork?: CaipNetworkId;
   }) {
-    const newConnectionEntry = {
-      balances: {},
-      caipNetwork: caipNetwork ?? chains[0]!,
+    const type: AccountType =
+      properties?.smartAccounts?.length &&
+      properties.smartAccounts.find(account => account.startsWith(caipNetwork))
+        ? 'smartAccount'
+        : 'eoa';
+
+    const newConnectionEntry: Connection = {
+      balances: new Map<CaipAddress, Balance[]>(),
+      caipNetwork,
       adapter: ref(adapter),
       accounts,
-      chains,
-      wallet
+      wallet,
+      properties,
+      type
     };
 
     // Create a new Map to ensure Valtio detects the change
@@ -177,14 +266,34 @@ export const ConnectionsController = {
   updateBalance(namespace: ChainNamespace, address: CaipAddress, balance: Balance) {
     const connection = baseState.connections.get(namespace);
     if (!connection) {
+      console.warn(`No connection found for namespace: ${namespace}`);
+
       return;
     }
+    const newBalances = new Map(connection.balances);
+    const existingBalances = connection.balances.get(address) || [];
+    // Check if this token already exists by contract address or symbol
+    const existingIndex = existingBalances.findIndex(existingBalance => {
+      if (balance.contractAddress) {
+        return existingBalance.contractAddress === balance.contractAddress;
+      }
 
-    const newBalances = { ...connection.balances, [address]: balance };
-    const updatedConnection = { ...connection, balances: newBalances };
-    const newConnectionsMap = new Map(baseState.connections);
-    newConnectionsMap.set(namespace, updatedConnection);
-    baseState.connections = newConnectionsMap;
+      return existingBalance.symbol === balance.symbol;
+    });
+    let updatedBalances: Balance[];
+    if (existingIndex >= 0) {
+      // Update existing token
+      updatedBalances = [...existingBalances];
+      updatedBalances[existingIndex] = {
+        ...updatedBalances[existingIndex],
+        ...balance
+      };
+    } else {
+      // Add new token
+      updatedBalances = [...existingBalances, balance];
+    }
+    newBalances.set(address, updatedBalances);
+    updateConnection(namespace, { balances: newBalances });
   },
 
   setActiveNetwork(namespace: ChainNamespace, networkId: CaipNetworkId) {
@@ -213,6 +322,15 @@ export const ConnectionsController = {
     );
   },
 
+  setAccountType(namespace: ChainNamespace, type: AccountType) {
+    const connection = baseState.connections.get(namespace);
+    if (!connection) return;
+
+    const newConnectionsMap = new Map(baseState.connections);
+    newConnectionsMap.set(namespace, { ...connection, type });
+    baseState.connections = newConnectionsMap;
+  },
+
   async disconnect(namespace: ChainNamespace, isInternal = true) {
     const connection = baseState.connections.get(namespace);
     if (!connection) return;
@@ -287,7 +405,6 @@ export const ConnectionsController = {
     if (!baseState.activeNamespace) return undefined;
 
     const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
-
     if (adapter instanceof EVMAdapter) {
       return adapter.sendTransaction(args);
     }
@@ -299,11 +416,73 @@ export const ConnectionsController = {
     if (!baseState.activeNamespace || baseState.activeNamespace !== 'eip155') return undefined;
 
     const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
-
     if (adapter instanceof EVMAdapter) {
       return adapter.estimateGas(args);
     }
 
     return undefined;
+  },
+
+  async fetchBalance() {
+    const connection = getActiveConnection(baseState);
+    if (!connection) {
+      console.warn('No active connection found for balance fetch');
+
+      return;
+    }
+    const chainId = connection.caipNetwork;
+    const address = getActiveAddress(connection);
+    const namespace = baseState.activeNamespace;
+    if (!namespace || !address || !chainId) {
+      console.warn('Missing required data for balance fetch', { namespace, address, chainId });
+
+      return;
+    }
+
+    try {
+      const response = await BlockchainApiController.getBalance(address);
+      if (!response) {
+        throw new Error('Failed to fetch token balance');
+      }
+      // Update balances for each token in the response
+      response.balances.forEach(balance => {
+        this.updateBalance(namespace, address, {
+          name: balance.name,
+          symbol: balance.symbol,
+          amount: balance.quantity.numeric,
+          contractAddress: balance.address,
+          quantity: balance.quantity,
+          price: balance.price,
+          value: balance.value,
+          iconUrl: balance.iconUrl
+        });
+      });
+    } catch (error) {
+      SnackController.showError('Failed to get account balance');
+    }
+  },
+
+  getSmartAccountEnabledNetworks(): AppKitNetwork[] {
+    const activeConnection = getActiveConnection(baseState);
+    if (!activeConnection) {
+      return [];
+    }
+    if (!activeConnection.properties?.smartAccounts?.length) {
+      return [];
+    }
+    const smartAccountNetworks = new Set<CaipNetworkId>();
+    activeConnection.properties.smartAccounts.forEach(smartAccount => {
+      const parts = smartAccount.split(':');
+      if (parts.length >= 2) {
+        const networkId: CaipNetworkId = `${parts[0]}:${parts[1]}`;
+        smartAccountNetworks.add(networkId);
+      }
+    });
+
+    return baseState.networks.filter(network => {
+      const networkId: CaipNetworkId = `${network.chainNamespace}:${network.id}`;
+
+      return smartAccountNetworks.has(networkId);
+    });
   }
 };

package/src/controllers/ModalController.ts

@@ -5,7 +5,7 @@ import { RouterController } from './RouterController';
 import { PublicStateController } from './PublicStateController';
 import { EventsController } from './EventsController';
 import { ApiController } from './ApiController';
-import { ConnectorController } from './ConnectorController';
+import { ConnectionsController } from './ConnectionsController';
 
 // -- Types --------------------------------------------- //
 export interface ModalControllerState {
@@ -35,7 +35,7 @@ export const ModalController = {
     if (options?.view) {
       RouterController.reset(options.view);
     } else if (AccountController.state.isConnected) {
-      const isUniversalWallet = ConnectorController.state.connectedConnector === 'AUTH';
+      const isUniversalWallet = !!ConnectionsController.state.connection?.properties?.provider;
       RouterController.reset(isUniversalWallet ? 'Account' : 'AccountDefault');
     } else {
       RouterController.reset('Connect');

package/src/controllers/RouterController.ts

@@ -29,8 +29,6 @@ export interface RouterControllerState {
     | 'ConnectingSiwe'
     | 'ConnectingSocial'
     | 'ConnectingWalletConnect'
-    | 'EmailVerifyDevice'
-    | 'EmailVerifyOtp'
     | 'GetWallet'
     | 'Networks'
     | 'OnRamp'
@@ -48,7 +46,6 @@ export interface RouterControllerState {
     | 'UpdateEmailSecondaryOtp'
     | 'UpdateEmailWallet'
     | 'UpgradeEmailWallet'
-    | 'UpgradeToSmartAccount'
     | 'WalletCompatibleNetworks'
     | 'WalletReceive'
     | 'WalletSend'

package/src/controllers/SendController.ts

@@ -1,7 +1,7 @@
 import { subscribeKey as subKey } from 'valtio/vanilla/utils';
 import { proxy, ref, subscribe as sub } from 'valtio/vanilla';
 import { ContractUtil, type Balance } from '@reown/appkit-common-react-native';
-import { AccountController } from './AccountController';
+
 import { ConnectionController } from './ConnectionController';
 import { SnackController } from './SnackController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
@@ -91,36 +91,40 @@ export const SendController = {
   },
 
   sendToken() {
-    if (this.state.token?.address && this.state.sendTokenAmount && this.state.receiverAddress) {
+    if (
+      this.state.token?.contractAddress &&
+      this.state.sendTokenAmount &&
+      this.state.receiverAddress
+    ) {
       state.loading = true;
       EventsController.sendEvent({
         type: 'track',
         event: 'SEND_INITIATED',
         properties: {
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
-          token: this.state.token.address,
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount',
+          token: this.state.token.contractAddress,
           amount: this.state.sendTokenAmount,
           network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
         }
       });
       this.sendERC20Token({
         receiverAddress: this.state.receiverAddress,
-        tokenAddress: this.state.token.address,
+        tokenAddress: this.state.token.contractAddress,
         sendTokenAmount: this.state.sendTokenAmount,
-        decimals: this.state.token.quantity.decimals
+        decimals: this.state.token.quantity?.decimals || '0'
       });
     } else if (
       this.state.receiverAddress &&
       this.state.sendTokenAmount &&
       this.state.gasPrice &&
-      this.state.token?.quantity.decimals
+      this.state.token?.quantity?.decimals
     ) {
       state.loading = true;
       EventsController.sendEvent({
         type: 'track',
         event: 'SEND_INITIATED',
         properties: {
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount',
           token: this.state.token?.symbol,
           amount: this.state.sendTokenAmount,
           network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
@@ -142,7 +146,13 @@ export const SendController = {
     });
 
     const to = params.receiverAddress as `0x${string}`;
-    const address = AccountController.state.address as `0x${string}`;
+    const address = CoreHelperUtil.getPlainAddress(
+      ConnectionsController.state.activeAddress
+    ) as `0x${string}`;
+    if (!address) {
+      throw new Error('Invalid address');
+    }
+
     const value = ConnectionController.parseUnits(
       params.sendTokenAmount.toString(),
       Number(params.decimals)
@@ -162,7 +172,7 @@ export const SendController = {
         type: 'track',
         event: 'SEND_SUCCESS',
         properties: {
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount',
           token: this.state.token?.symbol || '',
           amount: params.sendTokenAmount,
           network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
@@ -175,7 +185,7 @@ export const SendController = {
         type: 'track',
         event: 'SEND_ERROR',
         properties: {
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount',
           token: this.state.token?.symbol || '',
           amount: params.sendTokenAmount,
           network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
@@ -198,7 +208,7 @@ export const SendController = {
 
     try {
       if (
-        AccountController.state.address &&
+        ConnectionsController.state.activeAddress &&
         params.sendTokenAmount &&
         params.receiverAddress &&
         params.tokenAddress
@@ -206,8 +216,16 @@ export const SendController = {
         const tokenAddress = CoreHelperUtil.getPlainAddress(
           params.tokenAddress as `${string}:${string}:${string}`
         ) as `0x${string}`;
+
+        const fromAddress = CoreHelperUtil.getPlainAddress(
+          ConnectionsController.state.activeAddress
+        ) as `0x${string}`;
+        if (!fromAddress) {
+          throw new Error('Invalid address');
+        }
+
         await ConnectionController.writeContract({
-          fromAddress: AccountController.state.address as `0x${string}`,
+          fromAddress,
           tokenAddress,
           receiverAddress: params.receiverAddress as `0x${string}`,
           tokenAmount: amount,

package/src/controllers/SwapController.ts

@@ -11,7 +11,6 @@ import { SnackController } from './SnackController';
 import { RouterController } from './RouterController';
 import type { SwapInputTarget, SwapTokenWithBalance } from '../utils/TypeUtil';
 import { ConnectorController } from './ConnectorController';
-import { AccountController } from './AccountController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { TransactionsController } from './TransactionsController';
 import { EventsController } from './EventsController';
@@ -285,7 +284,7 @@ export const SwapController = {
     }, {});
   },
 
-  async getMyTokensWithBalance(forceUpdate?: string) {
+  async getMyTokensWithBalance(forceUpdate?: CaipAddress[]) {
     const balances = await SwapApiUtil.getMyTokensWithBalance(forceUpdate);
     if (!balances) {
       return;
@@ -762,7 +761,10 @@ export const SwapController = {
     }
 
     try {
-      const forceUpdateAddresses = [state.sourceToken?.address, state.toToken?.address].join(',');
+      const forceUpdateAddresses = [state.sourceToken?.address, state.toToken?.address].filter(
+        Boolean
+      ) as CaipAddress[];
+
       const transactionHash = await ConnectionsController.sendTransaction({
         address: fromAddress as `0x${string}`,
         to: data.to as `0x${string}`,
@@ -784,7 +786,7 @@ export const SwapController = {
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
           swapToAmount: this.state.toTokenAmount || '',
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount'
         }
       });
       SwapController.resetState();
@@ -794,10 +796,10 @@ export const SwapController = {
       }
 
       SwapController.getMyTokensWithBalance(forceUpdateAddresses);
-      AccountController.fetchTokenBalance();
+      ConnectionsController.fetchBalance();
 
       setTimeout(() => {
-        TransactionsController.fetchTransactions(AccountController.state.address, true);
+        TransactionsController.fetchTransactions(ConnectionsController.state.activeAddress, true);
       }, 5000);
 
       return transactionHash;
@@ -816,7 +818,7 @@ export const SwapController = {
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
           swapToAmount: this.state.toTokenAmount || '',
-          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount'
+          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount'
         }
       });
 
@@ -833,7 +835,7 @@ export const SwapController = {
     );
 
     let insufficientNetworkTokenForGas = true;
-    if (AccountController.state.preferredAccountType === 'smartAccount') {
+    if (ConnectionsController.state.accountType === 'smartAccount') {
       // Smart Accounts may pay gas in any ERC20 token
       insufficientNetworkTokenForGas = false;
     } else {