@reown/appkit-core-react-native 0.0.0-feat-multi-social-20250710162403 → 0.0.0-feat-multi-social-20250714194032

package/lib/typescript/controllers/SwapController.d.ts

@@ -11,8 +11,7 @@ type TransactionParams = {
     toAmount: string;
 };
 export interface SwapControllerState {
-    initializing: boolean;
-    initialized: boolean;
+    loadingTokens: boolean;
     loadingPrices: boolean;
     loadingQuote?: boolean;
     loadingApprovalTransaction?: boolean;
@@ -68,10 +67,9 @@ export declare const SwapController: {
     fetchTokens(): Promise<void>;
     getTokenList(): Promise<void>;
     getMyTokensWithBalance(forceUpdate?: CaipAddress[]): Promise<void>;
-    getFilteredPopularTokens(): SwapTokenWithBalance[] | undefined;
+    getFilteredPopularTokens(balances?: SwapTokenWithBalance[]): SwapTokenWithBalance[] | undefined;
     setSourceToken(sourceToken: SwapTokenWithBalance | undefined): void;
     setSourceTokenAmount(amount: string): void;
-    initializeState(): Promise<void>;
     getAddressPrice(address: string): Promise<number>;
     getNetworkTokenPrice(): Promise<void>;
     getInitialGasPrice(): Promise<{

package/lib/typescript/controllers/SwapController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwapController.d.ts","sourceRoot":"","sources":["../../../src/controllers/SwapController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AASjF,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAO/E,eAAO,MAAM,iBAAiB,SAAS,CAAC;AACxC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAGpC,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAYF,MAAM,WAAW,mBAAmB;IAElC,YAAY,EAAE,OAAO,CAAC;IACtB,WAAW,EAAE,OAAO,CAAC;IACrB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAG7B,UAAU,EAAE,OAAO,CAAC;IAGpB,mBAAmB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACnD,eAAe,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC/C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,WAAW,CAAC,EAAE,oBAAoB,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,oBAAoB,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAG/B,QAAQ,EAAE,MAAM,CAAC;IAGjB,MAAM,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAChC,eAAe,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACzC,aAAa,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACvC,WAAW,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACrC,mBAAmB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC7C,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAGvC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAwDD,eAAO,MAAM,cAAc;;mCAGM,mBAAmB,KAAK,IAAI;2GAI2B,IAAI;;;;;;;;;;;;;;;;;;;;yCAoH/C,WAAW,EAAE;;gCAiB5B,oBAAoB,GAAG,SAAS;iCAa/B,MAAM;;6BA2BJ,MAAM;;;;;;;;;;;;0BA8Df,oBAAoB,EAAE;wBAQxB,oBAAoB,GAAG,SAAS;6BAa3B,MAAM;2BAMF,MAAM,UAAU,eAAe;;;;;;;;;;;;;;;;;;;qCAwPrB,iBAAiB;iCA4BrB,iBAAiB,GAAG,SAAS;;;4CAsGxB,MAAM,sBAAsB,MAAM;;CAiD3E,CAAC"}
+{"version":3,"file":"SwapController.d.ts","sourceRoot":"","sources":["../../../src/controllers/SwapController.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,WAAW,EAAE,MAAM,mCAAmC,CAAC;AASjF,OAAO,KAAK,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAO/E,eAAO,MAAM,iBAAiB,SAAS,CAAC;AACxC,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAGpC,KAAK,iBAAiB,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAYF,MAAM,WAAW,mBAAmB;IAElC,aAAa,EAAE,OAAO,CAAC;IACvB,aAAa,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAG7B,UAAU,EAAE,OAAO,CAAC;IAGpB,mBAAmB,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACnD,eAAe,EAAE,iBAAiB,GAAG,SAAS,CAAC;IAC/C,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAG1B,WAAW,CAAC,EAAE,oBAAoB,CAAC;IACnC,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qBAAqB,EAAE,MAAM,CAAC;IAC9B,OAAO,CAAC,EAAE,oBAAoB,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,UAAU,EAAE,MAAM,GAAG,SAAS,CAAC;IAG/B,QAAQ,EAAE,MAAM,CAAC;IAGjB,MAAM,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAChC,eAAe,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACzC,aAAa,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACvC,WAAW,CAAC,EAAE,oBAAoB,EAAE,CAAC;IACrC,mBAAmB,CAAC,EAAE,oBAAoB,EAAE,CAAC;IAC7C,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAGvC,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;CACjC;AAuDD,eAAO,MAAM,cAAc;;mCAGM,mBAAmB,KAAK,IAAI;2GAI2B,IAAI;;;;;;;;;;;;;;;;;;;;yCA+H/C,WAAW,EAAE;wCAWpB,oBAAoB,EAAE;gCAQ9B,oBAAoB,GAAG,SAAS;iCAa/B,MAAM;6BAQJ,MAAM;;;;;;;;;;;;0BA8Df,oBAAoB,EAAE;wBAQxB,oBAAoB,GAAG,SAAS;6BAa3B,MAAM;2BAMF,MAAM,UAAU,eAAe;;;;;;;;;;;;;;;;;;;qCAyPrB,iBAAiB;iCA6BrB,iBAAiB,GAAG,SAAS;;;4CAoGxB,MAAM,sBAAsB,MAAM;;CAiD3E,CAAC"}

package/lib/typescript/utils/SwapApiUtil.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"SwapApiUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/SwapApiUtil.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,mCAAmC,CAAC;AAGhF,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAI1F,eAAO,MAAM,WAAW;;;2BAgCD,MAAM;6BACJ,MAAM;;uCAqBM,OAAO,EAAE;;CAiC7C,CAAC"}
+{"version":3,"file":"SwapApiUtil.d.ts","sourceRoot":"","sources":["../../../src/utils/SwapApiUtil.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAiB,MAAM,mCAAmC,CAAC;AAGhF,OAAO,KAAK,EAAE,iCAAiC,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAI1F,eAAO,MAAM,WAAW;;;2BAgCD,MAAM;6BACJ,MAAM;;uCAqBM,OAAO,EAAE;;CAmC7C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reown/appkit-core-react-native",
-  "version": "0.0.0-feat-multi-social-20250710162403",
+  "version": "0.0.0-feat-multi-social-20250714194032",
   "main": "lib/commonjs/index.js",
   "types": "lib/typescript/index.d.ts",
   "module": "lib/module/index.js",
@@ -38,7 +38,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@reown/appkit-common-react-native": "0.0.0-feat-multi-social-20250710162403",
+    "@reown/appkit-common-react-native": "0.0.0-feat-multi-social-20250714194032",
     "countries-and-timezones": "3.7.2",
     "valtio": "1.11.2"
   },

package/src/controllers/ConnectionsController.ts

@@ -192,7 +192,12 @@ const derivedState = derive(
 
       if (!_activeAddress) return [];
 
-      return _connection?.balances.get(_activeAddress);
+      return (
+        _connection?.balances
+          .get(_activeAddress)
+          // Filter out tokens with no quantity
+          ?.filter(balance => balance?.quantity?.numeric)
+      );
     },
     walletInfo: (get): WalletInfo | undefined => {
       const snap = get(baseState);

package/src/controllers/RouterController.ts

@@ -1,23 +1,9 @@
 import { proxy } from 'valtio';
 import type { CaipNetwork, SocialProvider } from '@reown/appkit-common-react-native';
 
-import type {
-  WcWallet,
-  Connector,
-  SwapInputTarget,
-  OnRampTransactionResult
-} from '../utils/TypeUtil';
+import type { WcWallet, Connector, OnRampTransactionResult } from '../utils/TypeUtil';
 
 // -- Types --------------------------------------------- //
-type TransactionAction = {
-  goBack: boolean;
-  view: RouterControllerState['view'] | null;
-  close?: boolean;
-  replace?: boolean;
-  onSuccess?: () => void;
-  onCancel?: () => void;
-};
-
 export interface RouterControllerState {
   view:
     | 'Account'
@@ -38,7 +24,6 @@ export interface RouterControllerState {
     | 'OnRampTransaction'
     | 'SwitchNetwork'
     | 'Swap'
-    | 'SwapSelectToken'
     | 'SwapPreview'
     | 'Transactions'
     | 'UnsupportedChain'
@@ -57,18 +42,15 @@ export interface RouterControllerState {
     network?: CaipNetwork;
     email?: string;
     newEmail?: string;
-    swapTarget?: SwapInputTarget;
     onrampResult?: OnRampTransactionResult;
     socialProvider?: SocialProvider;
   };
-  transactionStack: TransactionAction[];
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<RouterControllerState>({
   view: 'Connect',
-  history: ['Connect'],
-  transactionStack: []
+  history: ['Connect']
 });
 
 // -- Controller ---------------------------------------- //
@@ -83,30 +65,6 @@ export const RouterController = {
     }
   },
 
-  pushTransactionStack(action: TransactionAction) {
-    state.transactionStack = [...state.transactionStack, action];
-  },
-
-  popTransactionStack(cancel?: boolean) {
-    const action = state.transactionStack.pop();
-
-    if (!action) {
-      return;
-    }
-
-    if (cancel) {
-      this.goBack();
-      action?.onCancel?.();
-    } else {
-      if (action.goBack) {
-        this.goBack();
-      } else if (action.view) {
-        this.reset(action.view);
-      }
-      action?.onSuccess?.();
-    }
-  },
-
   reset(view: RouterControllerState['view'], data?: RouterControllerState['data']) {
     state.view = view;
     state.history = [view];

package/src/controllers/SendController.ts

@@ -135,10 +135,7 @@ export const SendController = {
   },
 
   async sendNativeToken(params: TxParams) {
-    RouterController.pushTransactionStack({
-      view: 'Account',
-      goBack: false
-    });
+    const isAuth = !!ConnectionsController.state.connection?.properties?.provider;
 
     const to = params.receiverAddress as `0x${string}`;
     const address = CoreHelperUtil.getPlainAddress(
@@ -173,6 +170,7 @@ export const SendController = {
           network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
         }
       });
+      RouterController.reset(isAuth ? 'Account' : 'AccountDefault');
       this.resetSend();
     } catch (error) {
       state.loading = false;
@@ -191,10 +189,7 @@ export const SendController = {
   },
 
   async sendERC20Token(params: ContractWriteParams) {
-    RouterController.pushTransactionStack({
-      view: 'Account',
-      goBack: false
-    });
+    const isAuth = !!ConnectionsController.state.connection?.properties?.provider;
 
     const amount = ConnectionsController.parseUnits(
       params.sendTokenAmount.toString(),
@@ -227,6 +222,7 @@ export const SendController = {
           method: 'transfer',
           abi: ContractUtil.getERC20Abi(tokenAddress)
         });
+        RouterController.reset(isAuth ? 'Account' : 'AccountDefault');
         SnackController.showSuccess('Transaction started');
         this.resetSend();
       }

package/src/controllers/SwapController.ts

@@ -41,8 +41,7 @@ class TransactionError extends Error {
 
 export interface SwapControllerState {
   // Loading states
-  initializing: boolean;
-  initialized: boolean;
+  loadingTokens: boolean;
   loadingPrices: boolean;
   loadingQuote?: boolean;
   loadingApprovalTransaction?: boolean;
@@ -92,8 +91,7 @@ type StateKey = keyof SwapControllerState;
 // -- State --------------------------------------------- //
 const initialState: SwapControllerState = {
   // Loading states
-  initializing: false,
-  initialized: false,
+  loadingTokens: false,
   loadingPrices: false,
   loadingQuote: false,
   loadingApprovalTransaction: false,
@@ -195,7 +193,7 @@ export const SwapController = {
   },
 
   switchTokens() {
-    if (state.initializing || !state.initialized) {
+    if (state.loadingTokens) {
       return;
     }
 
@@ -221,24 +219,35 @@ export const SwapController = {
   },
 
   async fetchTokens() {
-    const { networkAddress } = this.getParams();
+    try {
+      const { networkAddress } = this.getParams();
 
-    await this.getTokenList();
-    await this.getNetworkTokenPrice();
-    await this.getMyTokensWithBalance();
+      state.loadingTokens = true;
+      await this.getTokenList();
+      await this.getNetworkTokenPrice();
+      await this.getMyTokensWithBalance();
 
-    const networkToken = state.tokens?.find(token => token.address === networkAddress);
+      const networkToken = state.tokens?.find(token => token.address === networkAddress);
 
-    if (networkToken) {
-      state.networkTokenSymbol = networkToken.symbol;
-    }
+      if (networkToken) {
+        state.networkTokenSymbol = networkToken.symbol;
+      }
 
-    const sourceToken =
-      state.myTokensWithBalance?.find(token => token.address.startsWith(networkAddress)) ||
-      state.myTokensWithBalance?.[0];
+      // Set default source token if not set
+      if (!state.sourceToken && state.myTokensWithBalance?.length) {
+        const sourceToken =
+          state.myTokensWithBalance?.find(token => token.address.startsWith(networkAddress)) ||
+          state.myTokensWithBalance?.[0];
 
-    this.setSourceToken(sourceToken);
-    this.setSourceTokenAmount('1');
+        this.setSourceToken(sourceToken);
+        this.setSourceTokenAmount('1');
+      }
+    } catch (error) {
+      SnackController.showError('Failed to initialize swap');
+      RouterController.goBack();
+    } finally {
+      state.loadingTokens = false;
+    }
   },
 
   async getTokenList() {
@@ -275,10 +284,12 @@ export const SwapController = {
     this.setBalances(swapBalances);
   },
 
-  getFilteredPopularTokens() {
-    return state.popularTokens?.filter(
-      token => !state.myTokensWithBalance?.some(t => t.address === token.address)
-    );
+  getFilteredPopularTokens(balances?: SwapTokenWithBalance[]) {
+    if (!balances) {
+      return state.popularTokens;
+    }
+
+    return state.popularTokens?.filter(token => !balances.some(t => t.address === token.address));
   },
 
   setSourceToken(sourceToken: SwapTokenWithBalance | undefined) {
@@ -302,25 +313,6 @@ export const SwapController = {
     }
   },
 
-  async initializeState() {
-    if (state.initializing) {
-      return;
-    }
-
-    state.initializing = true;
-    if (!state.initialized) {
-      try {
-        await this.fetchTokens();
-        state.initialized = true;
-      } catch (error) {
-        state.initialized = false;
-        SnackController.showError('Failed to initialize swap');
-        RouterController.goBack();
-      }
-    }
-    state.initializing = false;
-  },
-
   async getAddressPrice(address: string) {
     const existPrice = state.tokensPriceMap[address];
 
@@ -460,11 +452,11 @@ export const SwapController = {
         amount: amountDecimal.toString()
       });
 
-      state.loadingQuote = false;
-
       const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
 
       if (!quoteToAmount) {
+        state.loadingQuote = false;
+
         return;
       }
 
@@ -487,6 +479,7 @@ export const SwapController = {
       }
     } catch (error) {
       SnackController.showError('Failed to get swap quote');
+    } finally {
       state.loadingQuote = false;
     }
   },
@@ -677,12 +670,13 @@ export const SwapController = {
       await this.swapTokens();
       await this.getTransaction();
       state.approvalTransaction = undefined;
-      state.loadingApprovalTransaction = false;
     } catch (err) {
       const error = err as TransactionError;
       state.transactionError = error?.shortMessage as unknown as string;
-      state.loadingApprovalTransaction = false;
+
       SnackController.showError(error?.shortMessage ?? 'Transaction error');
+    } finally {
+      state.loadingApprovalTransaction = false;
     }
   },
 
@@ -690,13 +684,11 @@ export const SwapController = {
     if (!data) {
       return undefined;
     }
-    const { fromAddress, toTokenAmount, isAuthConnector } = this.getParams();
+    const { fromAddress, isAuthConnector } = this.getParams();
 
     state.loadingTransaction = true;
 
-    const snackbarSuccessMessage = `Swapped ${state.sourceToken
-      ?.symbol} to ${NumberUtil.formatNumberToLocalString(toTokenAmount, 3)} ${state.toToken
-      ?.symbol}`;
+    const snackbarSuccessMessage = `Swapped ${state.sourceToken?.symbol} to ${state.toToken?.symbol}`;
 
     SnackController.showLoading('Confirm transaction in your wallet');
 
@@ -770,21 +762,21 @@ export const SwapController = {
     state.toTokenAmount = initialState.toTokenAmount;
     state.toTokenPriceInUSD = initialState.toTokenPriceInUSD;
     state.inputError = initialState.inputError;
+    state.loadingApprovalTransaction = initialState.loadingApprovalTransaction;
+    state.loadingBuildTransaction = initialState.loadingBuildTransaction;
+    state.loadingTransaction = initialState.loadingTransaction;
+    state.fetchError = initialState.fetchError;
+    state.transactionError = initialState.transactionError;
+    state.swapTransaction = initialState.swapTransaction;
+    state.approvalTransaction = initialState.approvalTransaction;
   },
 
   resetState() {
+    this.clearTokens();
     state.myTokensWithBalance = initialState.myTokensWithBalance;
     state.tokensPriceMap = initialState.tokensPriceMap;
-    state.initialized = initialState.initialized;
-    state.sourceToken = initialState.sourceToken;
-    state.sourceTokenAmount = initialState.sourceTokenAmount;
-    state.sourceTokenPriceInUSD = initialState.sourceTokenPriceInUSD;
-    state.toToken = initialState.toToken;
-    state.toTokenAmount = initialState.toTokenAmount;
-    state.toTokenPriceInUSD = initialState.toTokenPriceInUSD;
     state.networkPrice = initialState.networkPrice;
     state.networkTokenSymbol = initialState.networkTokenSymbol;
-    state.inputError = initialState.inputError;
   },
 
   // -- Checks -------------------------------------------- //

package/src/utils/SwapApiUtil.ts

@@ -66,16 +66,18 @@ export const SwapApiUtil = {
       : undefined;
 
     return (
-      balances?.map(
-        token =>
-          ({
-            ...token,
-            address: token?.address ?? `${token?.chainId ?? activeCaipNetworkId}:${address}`,
-            decimals: parseInt(token.quantity?.decimals ?? '0', 10),
-            logoUri: token.iconUrl,
-            eip2612: false
-          }) as SwapTokenWithBalance
-      ) || []
+      balances
+        ?.filter(balance => balance?.quantity?.numeric)
+        .map(
+          token =>
+            ({
+              ...token,
+              address: token?.address ?? `${token?.chainId ?? activeCaipNetworkId}:${address}`,
+              decimals: parseInt(token.quantity?.decimals ?? '0', 10),
+              logoUri: token.iconUrl,
+              eip2612: false
+            }) as SwapTokenWithBalance
+        ) || []
     );
   },