@reown/appkit-core-react-native 0.0.0-feat-multi-social-20250701185040 → 0.0.0-feat-multi-social-20250708154835

package/src/controllers/SwapController.ts

@@ -10,8 +10,6 @@ import { SwapCalculationUtil } from '../utils/SwapCalculationUtil';
 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';
@@ -67,7 +65,6 @@ export interface SwapControllerState {
   toTokenAmount: string;
   toTokenPriceInUSD: number;
   networkPrice: string;
-  networkBalanceInUSD: string;
   networkTokenSymbol: string;
   inputError: string | undefined;
 
@@ -119,7 +116,6 @@ const initialState: SwapControllerState = {
   toTokenAmount: '',
   toTokenPriceInUSD: 0,
   networkPrice: '0',
-  networkBalanceInUSD: '0',
   networkTokenSymbol: '',
   inputError: undefined,
 
@@ -157,7 +153,8 @@ export const SwapController = {
   },
 
   getParams() {
-    const { activeAddress, activeNamespace, activeNetwork } = ConnectionsController.state;
+    const { activeAddress, activeNamespace, activeNetwork, connection } =
+      ConnectionsController.state;
     const address = CoreHelperUtil.getPlainAddress(activeAddress);
 
     if (!activeNamespace || !activeNetwork) {
@@ -166,8 +163,6 @@ export const SwapController = {
 
     const networkAddress: CaipAddress = `${activeNetwork.caipNetworkId}:${ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]}`;
 
-    const type = ConnectorController.state.connectedConnector;
-
     if (!address) {
       throw new Error('No address found to swap the tokens from.');
     }
@@ -195,7 +190,7 @@ export const SwapController = {
       invalidSourceTokenAmount,
       availableToSwap:
         activeAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
-      isAuthConnector: type === 'AUTH'
+      isAuthConnector: !!connection?.properties?.provider
     };
   },
 
@@ -237,7 +232,6 @@ export const SwapController = {
     state.toTokenPriceInUSD = initialState.toTokenPriceInUSD;
     state.networkPrice = initialState.networkPrice;
     state.networkTokenSymbol = initialState.networkTokenSymbol;
-    state.networkBalanceInUSD = initialState.networkBalanceInUSD;
     state.inputError = initialState.inputError;
   },
 
@@ -285,14 +279,15 @@ export const SwapController = {
     }, {});
   },
 
-  async getMyTokensWithBalance(forceUpdate?: string) {
-    const balances = await SwapApiUtil.getMyTokensWithBalance(forceUpdate);
-    if (!balances) {
+  async getMyTokensWithBalance(forceUpdate?: CaipAddress[]) {
+    await ConnectionsController.fetchBalance(forceUpdate);
+    const swapBalances = SwapApiUtil.mapBalancesToSwapTokens(ConnectionsController.state.balances);
+    if (!swapBalances) {
       return;
     }
 
     await this.getInitialGasPrice();
-    this.setBalances(balances);
+    this.setBalances(swapBalances);
   },
 
   getFilteredPopularTokens() {
@@ -404,26 +399,11 @@ export const SwapController = {
   },
 
   setBalances(balances: SwapTokenWithBalance[]) {
-    const { networkAddress } = this.getParams();
-    const caipNetwork = ConnectionsController.state.activeNetwork;
-
-    if (!caipNetwork) {
-      return;
-    }
-
-    const networkToken = balances.find(token => token.address === networkAddress);
+    state.myTokensWithBalance = balances;
 
     balances.forEach(token => {
       state.tokensPriceMap[token.address] = token.price || 0;
     });
-
-    state.myTokensWithBalance = balances.filter(
-      token => token.address?.startsWith(caipNetwork.caipNetworkId)
-    );
-
-    state.networkBalanceInUSD = networkToken
-      ? NumberUtil.multiply(networkToken.quantity.numeric, networkToken.price).toString()
-      : '0';
   },
 
   setToToken(toToken: SwapTokenWithBalance | undefined) {
@@ -694,22 +674,10 @@ export const SwapController = {
   },
 
   async sendTransactionForApproval(data: TransactionParams) {
-    const { fromAddress, isAuthConnector } = this.getParams();
-
+    const { fromAddress } = this.getParams();
     state.loadingApprovalTransaction = true;
-    const approveLimitMessage = `Approve limit increase in your wallet`;
-
-    if (isAuthConnector) {
-      RouterController.pushTransactionStack({
-        view: null,
-        goBack: true,
-        onSuccess() {
-          SnackController.showLoading(approveLimitMessage);
-        }
-      });
-    } else {
-      SnackController.showLoading(approveLimitMessage);
-    }
+
+    SnackController.showLoading('Approve limit increase in your wallet');
 
     try {
       await ConnectionsController.sendTransaction({
@@ -741,28 +709,17 @@ export const SwapController = {
 
     state.loadingTransaction = true;
 
-    const snackbarPendingMessage = `Swapping ${state.sourceToken
-      ?.symbol} to ${NumberUtil.formatNumberToLocalString(toTokenAmount, 3)} ${state.toToken
-      ?.symbol}`;
     const snackbarSuccessMessage = `Swapped ${state.sourceToken
       ?.symbol} to ${NumberUtil.formatNumberToLocalString(toTokenAmount, 3)} ${state.toToken
       ?.symbol}`;
 
-    if (isAuthConnector) {
-      RouterController.pushTransactionStack({
-        view: 'Account',
-        goBack: false,
-        onSuccess() {
-          SnackController.showLoading(snackbarPendingMessage);
-          SwapController.resetState();
-        }
-      });
-    } else {
-      SnackController.showLoading('Confirm transaction in your wallet');
-    }
+    SnackController.showLoading('Confirm transaction in your wallet');
 
     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 +741,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 +751,9 @@ export const SwapController = {
       }
 
       SwapController.getMyTokensWithBalance(forceUpdateAddresses);
-      AccountController.fetchTokenBalance();
 
       setTimeout(() => {
-        TransactionsController.fetchTransactions(AccountController.state.address, true);
+        TransactionsController.fetchTransactions(ConnectionsController.state.activeAddress, true);
       }, 5000);
 
       return transactionHash;
@@ -816,7 +772,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'
         }
       });
 
@@ -826,6 +782,12 @@ export const SwapController = {
 
   // -- Checks -------------------------------------------- //
   hasInsufficientToken(sourceTokenAmount: string, sourceTokenAddress: string) {
+    const { balances } = ConnectionsController.state;
+    const networkToken = balances?.find(t => t.address === undefined);
+    const networkBalanceInUSD = networkToken
+      ? NumberUtil.multiply(networkToken.quantity?.numeric ?? '0', networkToken.price).toString()
+      : '0';
+
     const isInsufficientSourceTokenForSwap = SwapCalculationUtil.isInsufficientSourceTokenForSwap(
       sourceTokenAmount,
       sourceTokenAddress,
@@ -833,12 +795,12 @@ 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 {
       insufficientNetworkTokenForGas = SwapCalculationUtil.isInsufficientNetworkTokenForGas(
-        state.networkBalanceInUSD,
+        networkBalanceInUSD,
         state.gasPriceInUSD
       );
     }

package/src/controllers/TransactionsController.ts

@@ -1,10 +1,9 @@
-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/vanilla';
 import { OptionsController } from './OptionsController';
 import { EventsController } from './EventsController';
 import { SnackController } from './SnackController';
 import { BlockchainApiController } from './BlockchainApiController';
-import { AccountController } from './AccountController';
 import { ConnectionsController } from './ConnectionsController';
 
 // -- Types --------------------------------------------- //
@@ -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');

package/src/utils/CoreHelperUtil.ts

@@ -285,7 +285,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);

package/src/utils/SwapApiUtil.ts

@@ -1,13 +1,8 @@
+import type { Balance, CaipNetworkId } from '@reown/appkit-common-react-native';
 import { BlockchainApiController } from '../controllers/BlockchainApiController';
 import { OptionsController } from '../controllers/OptionsController';
-import type {
-  BlockchainApiBalanceResponse,
-  BlockchainApiSwapAllowanceRequest,
-  SwapTokenWithBalance
-} from './TypeUtil';
-import { AccountController } from '../controllers/AccountController';
+import type { BlockchainApiSwapAllowanceRequest, SwapTokenWithBalance } from './TypeUtil';
 import { ConnectionsController } from '../controllers/ConnectionsController';
-import type { CaipNetworkId } from '@reown/appkit-common-react-native';
 import { ConstantsUtil } from './ConstantsUtil';
 
 export const SwapApiUtil = {
@@ -64,27 +59,7 @@ export const SwapApiUtil = {
     return false;
   },
 
-  async getMyTokensWithBalance(forceUpdate?: string) {
-    const { activeAddress, activeNetwork: network } = ConnectionsController.state;
-    const address = activeAddress?.split(':')[2];
-
-    if (!address) {
-      return [];
-    }
-
-    const response = await BlockchainApiController.getBalance(
-      address,
-      network?.caipNetworkId,
-      forceUpdate
-    );
-    const balances = response?.balances.filter(balance => balance.quantity.decimals !== '0');
-
-    AccountController.setTokenBalance(balances);
-
-    return this.mapBalancesToSwapTokens(balances);
-  },
-
-  mapBalancesToSwapTokens(balances?: BlockchainApiBalanceResponse['balances']) {
+  mapBalancesToSwapTokens(balances?: Balance[]) {
     const { activeNamespace, activeCaipNetworkId } = ConnectionsController.state;
     const address = activeNamespace
       ? ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]
@@ -96,7 +71,7 @@ export const SwapApiUtil = {
           ({
             ...token,
             address: token?.address ?? `${token?.chainId ?? activeCaipNetworkId}:${address}`,
-            decimals: parseInt(token.quantity.decimals, 10),
+            decimals: parseInt(token.quantity?.decimals ?? '0', 10),
             logoUri: token.iconUrl,
             eip2612: false
           }) as SwapTokenWithBalance

package/src/utils/TypeUtil.ts

@@ -2,7 +2,6 @@ import { type EventEmitter } from 'events';
 import type { CaipAddress, CaipNetworkId } from '@reown/appkit-common-react-native';
 
 import type {
-  Balance,
   SocialProvider,
   ThemeMode,
   Transaction,
@@ -157,8 +156,22 @@ export interface BlockchainApiIdentityResponse {
   name: string;
 }
 
+export interface BlockchainApiBalance {
+  name: string;
+  symbol: string;
+  chainId: string;
+  address?: CaipAddress;
+  value?: number;
+  price: number;
+  quantity: {
+    decimals: string;
+    numeric: string;
+  };
+  iconUrl: string;
+}
+
 export interface BlockchainApiBalanceResponse {
-  balances: Balance[];
+  balances: BlockchainApiBalance[];
 }
 
 export interface BlockchainApiTransactionsRequest {