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

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

@@ -5,9 +5,8 @@ import type {
   BlockchainApiSwapAllowanceRequest,
   SwapTokenWithBalance
 } from './TypeUtil';
-import { AccountController } from '../controllers/AccountController';
 import { ConnectionsController } from '../controllers/ConnectionsController';
-import type { CaipNetworkId } from '@reown/appkit-common-react-native';
+import type { CaipAddress, CaipNetworkId } from '@reown/appkit-common-react-native';
 import { ConstantsUtil } from './ConstantsUtil';
 
 export const SwapApiUtil = {
@@ -64,22 +63,14 @@ export const SwapApiUtil = {
     return false;
   },
 
-  async getMyTokensWithBalance(forceUpdate?: string) {
-    const { activeAddress, activeNetwork: network } = ConnectionsController.state;
-    const address = activeAddress?.split(':')[2];
+  async getMyTokensWithBalance(forceUpdate?: CaipAddress[]) {
+    const { activeAddress } = ConnectionsController.state;
 
-    if (!address) {
-      return [];
-    }
-
-    const response = await BlockchainApiController.getBalance(
-      address,
-      network?.caipNetworkId,
-      forceUpdate
-    );
+    const response = await BlockchainApiController.getBalance(activeAddress, forceUpdate);
     const balances = response?.balances.filter(balance => balance.quantity.decimals !== '0');
 
-    AccountController.setTokenBalance(balances);
+    // TODO: update balances
+    // ConnectionsController.updateBalances(balances);
 
     return this.mapBalancesToSwapTokens(balances);
   },

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 {
@@ -367,9 +380,6 @@ export type EventName =
   | 'CLICK_NETWORK_HELP'
   | 'CLICK_GET_WALLET'
   | 'EMAIL_LOGIN_SELECTED'
-  | 'EMAIL_SUBMITTED'
-  | 'DEVICE_REGISTERED_FOR_EMAIL'
-  | 'EMAIL_VERIFICATION_CODE_SENT'
   | 'EMAIL_VERIFICATION_CODE_PASS'
   | 'EMAIL_VERIFICATION_CODE_FAIL'
   | 'EMAIL_EDIT'
@@ -484,18 +494,6 @@ export type Event =
       type: 'track';
       event: 'EMAIL_LOGIN_SELECTED';
     }
-  | {
-      type: 'track';
-      event: 'EMAIL_SUBMITTED';
-    }
-  | {
-      type: 'track';
-      event: 'DEVICE_REGISTERED_FOR_EMAIL';
-    }
-  | {
-      type: 'track';
-      event: 'EMAIL_VERIFICATION_CODE_SENT';
-    }
   | {
       type: 'track';
       event: 'EMAIL_VERIFICATION_CODE_PASS';