@reown/appkit-core-react-native 0.0.0-feat-multi-social-20250715153550 → 0.0.0-feat-onramp-20250718185718

package/src/controllers/OnRampController.ts

@@ -9,7 +9,8 @@ import type {
   OnRampCryptoCurrency,
   OnRampServiceProvider,
   OnRampError,
-  OnRampErrorTypeValues
+  OnRampErrorTypeValues,
+  OnRampCountryDefaults
 } from '../utils/TypeUtil';
 
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
@@ -32,23 +33,23 @@ const mapErrorMessage = (errorCode: string): OnRampError => {
   const errorMap: Record<string, { type: OnRampErrorTypeValues; message: string }> = {
     [OnRampErrorType.AMOUNT_TOO_LOW]: {
       type: OnRampErrorType.AMOUNT_TOO_LOW,
-      message: 'Amount is too low'
+      message: 'The amount is too low'
     },
     [OnRampErrorType.AMOUNT_TOO_HIGH]: {
       type: OnRampErrorType.AMOUNT_TOO_HIGH,
-      message: 'Amount is too high'
+      message: 'The amount is too high'
     },
     [OnRampErrorType.INVALID_AMOUNT]: {
       type: OnRampErrorType.INVALID_AMOUNT,
-      message: 'Please adjust amount'
+      message: 'Enter a valid amount'
     },
     [OnRampErrorType.INCOMPATIBLE_REQUEST]: {
       type: OnRampErrorType.INCOMPATIBLE_REQUEST,
-      message: 'Try different amount or payment method'
+      message: 'Enter a valid amount'
     },
     [OnRampErrorType.BAD_REQUEST]: {
       type: OnRampErrorType.BAD_REQUEST,
-      message: 'Try different amount or payment method'
+      message: 'Enter a valid amount'
     }
   };
 
@@ -63,6 +64,7 @@ const mapErrorMessage = (errorCode: string): OnRampError => {
 // -- Types --------------------------------------------- //
 export interface OnRampControllerState {
   countries: OnRampCountry[];
+  countriesDefaults?: OnRampCountryDefaults[];
   selectedCountry?: OnRampCountry;
   serviceProviders: OnRampServiceProvider[];
   selectedServiceProvider?: OnRampServiceProvider;
@@ -114,9 +116,8 @@ export const OnRampController = {
 
     if (updateCurrency) {
       const currencyCode =
-        ConstantsUtil.COUNTRY_CURRENCIES[
-          country.countryCode as keyof typeof ConstantsUtil.COUNTRY_CURRENCIES
-        ] || 'USD';
+        state.countriesDefaults?.find(d => d.countryCode === country.countryCode)
+          ?.defaultCurrencyCode || 'USD';
 
       const currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
 
@@ -126,6 +127,7 @@ export const OnRampController = {
     }
 
     await Promise.all([this.fetchPaymentMethods(), this.fetchCryptoCurrencies()]);
+    this.clearQuotes();
 
     state.loading = false;
 
@@ -134,8 +136,6 @@ export const OnRampController = {
 
   setSelectedPaymentMethod(paymentMethod: OnRampPaymentMethod) {
     state.selectedPaymentMethod = paymentMethod;
-
-    this.clearQuotes();
   },
 
   setPurchaseCurrency(currency: OnRampCryptoCurrency) {
@@ -184,7 +184,7 @@ export const OnRampController = {
       selectedCurrency = state.purchaseCurrencies?.find(c => c.currencyCode === defaultCurrency);
     }
 
-    state.purchaseCurrency = selectedCurrency || state.purchaseCurrencies?.[0] || undefined;
+    state.purchaseCurrency = selectedCurrency ?? state.purchaseCurrencies?.[0] ?? undefined;
   },
 
   getServiceProviderImage(serviceProviderName?: string) {
@@ -231,6 +231,27 @@ export const OnRampController = {
     }
   },
 
+  async fetchCountriesDefaults() {
+    try {
+      let countriesDefaults = await StorageUtil.getOnRampCountriesDefaults();
+
+      if (!countriesDefaults.length) {
+        countriesDefaults = (await BlockchainApiController.fetchOnRampCountriesDefaults()) ?? [];
+
+        if (countriesDefaults.length) {
+          StorageUtil.setOnRampCountriesDefaults(countriesDefaults);
+        }
+      }
+
+      state.countriesDefaults = countriesDefaults;
+    } catch (error) {
+      state.error = {
+        type: OnRampErrorType.FAILED_TO_LOAD_COUNTRIES,
+        message: 'Failed to load countries defaults'
+      };
+    }
+  },
+
   async fetchServiceProviders() {
     try {
       let serviceProviders = await StorageUtil.getOnRampServiceProviders();
@@ -259,10 +280,8 @@ export const OnRampController = {
       });
 
       const defaultCountryPaymentMethods =
-        ConstantsUtil.COUNTRY_DEFAULT_PAYMENT_METHOD[
-          state.selectedCountry
-            ?.countryCode as keyof typeof ConstantsUtil.COUNTRY_DEFAULT_PAYMENT_METHOD
-        ];
+        state.countriesDefaults?.find(d => d.countryCode === state.selectedCountry?.countryCode)
+          ?.defaultPaymentMethods || [];
 
       state.paymentMethods =
         paymentMethods?.sort((a, b) => {
@@ -276,9 +295,7 @@ export const OnRampController = {
           return aIndex - bIndex;
         }) || [];
 
-      state.selectedPaymentMethod = paymentMethods?.[0] || undefined;
-
-      this.clearQuotes();
+      state.selectedPaymentMethod = state.paymentMethods[0];
     } catch (error) {
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_METHODS,
@@ -336,9 +353,8 @@ export const OnRampController = {
 
       if (countryCode) {
         currencyCode =
-          ConstantsUtil.COUNTRY_CURRENCIES[
-            countryCode as keyof typeof ConstantsUtil.COUNTRY_CURRENCIES
-          ];
+          state.countriesDefaults?.find(d => d.countryCode === countryCode)?.defaultCurrencyCode ||
+          'USD';
       }
 
       const preferredCurrency = await StorageUtil.getOnRampPreferredFiatCurrency();
@@ -387,25 +403,24 @@ export const OnRampController = {
     }
 
     state.quotesLoading = true;
+    state.selectedQuote = undefined;
+    state.selectedServiceProvider = undefined;
     state.error = undefined;
 
     this.abortGetQuotes(false);
     quotesAbortController = new AbortController();
+    const currentSignal = quotesAbortController.signal;
 
     try {
       const body = {
         countryCode: state.selectedCountry?.countryCode!,
-        paymentMethodType: state.selectedPaymentMethod?.paymentMethod!,
         destinationCurrencyCode: state.purchaseCurrency?.currencyCode!,
         sourceAmount: state.paymentAmount,
         sourceCurrencyCode: state.paymentCurrency?.currencyCode!,
         walletAddress: AccountController.state.address!
       };
 
-      const response = await BlockchainApiController.getOnRampQuotes(
-        body,
-        quotesAbortController.signal
-      );
+      const response = await BlockchainApiController.getOnRampQuotes(body, currentSignal);
 
       if (!response || !response.length) {
         throw new Error('No quotes available');
@@ -414,9 +429,48 @@ export const OnRampController = {
       const quotes = response.sort((a, b) => b.customerScore - a.customerScore);
 
       state.quotes = quotes;
-      state.selectedQuote = quotes[0];
+
+      //Replace payment method if it's not in the quotes
+      const isValidPaymentMethod =
+        state.selectedPaymentMethod &&
+        quotes.some(
+          quote => quote.paymentMethodType === state.selectedPaymentMethod?.paymentMethod
+        );
+
+      if (!isValidPaymentMethod) {
+        const countryMethods =
+          state.countriesDefaults?.find(d => d.countryCode === state.selectedCountry?.countryCode)
+            ?.defaultPaymentMethods || [];
+
+        const availableQuoteMethods = new Set(quotes.map(q => q.paymentMethodType));
+
+        let newPaymentMethodType: string | undefined;
+        for (const dpm of countryMethods) {
+          if (availableQuoteMethods.has(dpm)) {
+            newPaymentMethodType = dpm;
+            break;
+          }
+        }
+
+        if (newPaymentMethodType) {
+          state.selectedPaymentMethod =
+            state.paymentMethods.find(m => m.paymentMethod === newPaymentMethodType) ||
+            state.paymentMethods.find(
+              method => method.paymentMethod === quotes[0]?.paymentMethodType
+            );
+        } else {
+          state.selectedPaymentMethod = state.paymentMethods.find(
+            method => method.paymentMethod === quotes[0]?.paymentMethodType
+          );
+        }
+      }
+
+      state.selectedQuote = quotes.find(
+        quote => quote.paymentMethodType === state.selectedPaymentMethod?.paymentMethod
+      );
+
       state.selectedServiceProvider = state.serviceProviders.find(
-        sp => sp.serviceProvider === quotes[0]?.serviceProvider
+        sp => sp.serviceProvider === state.selectedQuote?.serviceProvider
       );
     } catch (error: any) {
       if (error.name === 'AbortError') {
@@ -435,7 +489,9 @@ export const OnRampController = {
       this.clearQuotes();
       state.error = mapErrorMessage(error?.code || 'UNKNOWN_ERROR');
     } finally {
-      state.quotesLoading = false;
+      if (!currentSignal.aborted) {
+        state.quotesLoading = false;
+      }
     }
   },
 
@@ -492,7 +548,7 @@ export const OnRampController = {
         throw new Error('Invalid quote');
       }
 
-      const widget = await BlockchainApiController.getOnRampWidget({
+      const body = {
         countryCode: quote.countryCode,
         destinationCurrencyCode: quote.destinationCurrencyCode,
         paymentMethodType: quote.paymentMethodType,
@@ -501,7 +557,9 @@ export const OnRampController = {
         sourceCurrencyCode: quote.sourceCurrencyCode,
         walletAddress: AccountController.state.address!,
         redirectUrl: metadata?.redirect?.universal ?? metadata?.redirect?.native
-      });
+      };
+
+      const widget = await BlockchainApiController.getOnRampWidget(body);
 
       if (!widget || !widget.widgetUrl) {
         throw new Error('Invalid widget response');
@@ -555,6 +613,7 @@ export const OnRampController = {
       await this.fetchServiceProviders();
 
       await Promise.all([
+        this.fetchCountriesDefaults(),
         this.fetchPaymentMethods(),
         this.fetchFiatLimits(),
         this.fetchCryptoCurrencies(),

package/src/controllers/OptionsController.ts

@@ -1,7 +1,13 @@
 import { proxy, ref } from 'valtio';
-import type { Tokens, Storage, Metadata } from '@reown/appkit-common-react-native';
-import type { CustomWallet, Features, ProjectId, SdkType, SdkVersion } from '../utils/TypeUtil';
-
+import type {
+  CustomWallet,
+  Features,
+  Metadata,
+  ProjectId,
+  SdkType,
+  SdkVersion,
+  Tokens
+} from '../utils/TypeUtil';
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 
 // -- Types --------------------------------------------- //
@@ -11,8 +17,7 @@ export interface ClipboardClient {
 
 export interface OptionsControllerState {
   projectId: ProjectId;
-  clipboardClient?: ClipboardClient;
-  storage?: Storage;
+  _clipboardClient?: ClipboardClient;
   includeWalletIds?: string[];
   excludeWalletIds?: string[];
   featuredWalletIds?: string[];
@@ -42,7 +47,7 @@ export const OptionsController = {
   state,
 
   setClipboardClient(client: ClipboardClient) {
-    state.clipboardClient = ref(client);
+    state._clipboardClient = ref(client);
   },
 
   setProjectId(projectId: OptionsControllerState['projectId']) {
@@ -97,18 +102,12 @@ export const OptionsController = {
     state.isOnRampEnabled = isOnRampEnabled;
   },
 
-  setStorage(storage?: OptionsControllerState['storage']) {
-    if (storage) {
-      state.storage = ref(storage);
-    }
-  },
-
   isClipboardAvailable() {
-    return !!state.clipboardClient;
+    return !!state._clipboardClient;
   },
 
   copyToClipboard(value: string) {
-    const client = state.clipboardClient;
+    const client = state._clipboardClient;
     if (client) {
       client?.setString(value);
     }

package/src/controllers/PublicStateController.ts

@@ -1,6 +1,6 @@
 import { proxy, subscribe as sub } from 'valtio';
 import { subscribeKey as subKey } from 'valtio/utils';
-import type { CaipNetworkId } from '@reown/appkit-common-react-native';
+import type { CaipNetworkId } from '../utils/TypeUtil.js';
 
 // -- Types --------------------------------------------- //
 export interface PublicStateControllerState {

package/src/controllers/RouterController.ts

@@ -1,9 +1,22 @@
 import { proxy } from 'valtio';
-import type { CaipNetwork, SocialProvider } from '@reown/appkit-common-react-native';
-
-import type { WcWallet, OnRampTransactionResult } from '../utils/TypeUtil';
+import type {
+  WcWallet,
+  CaipNetwork,
+  Connector,
+  SwapInputTarget,
+  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'
@@ -14,7 +27,11 @@ export interface RouterControllerState {
     | 'ConnectingExternal'
     | 'ConnectingSiwe'
     | 'ConnectingSocial'
+    | 'ConnectingFarcaster'
     | 'ConnectingWalletConnect'
+    | 'Create'
+    | 'EmailVerifyDevice'
+    | 'EmailVerifyOtp'
     | 'GetWallet'
     | 'Networks'
     | 'OnRamp'
@@ -24,10 +41,15 @@ export interface RouterControllerState {
     | 'OnRampTransaction'
     | 'SwitchNetwork'
     | 'Swap'
+    | 'SwapSelectToken'
     | 'SwapPreview'
     | 'Transactions'
     | 'UnsupportedChain'
+    | 'UpdateEmailPrimaryOtp'
+    | 'UpdateEmailSecondaryOtp'
+    | 'UpdateEmailWallet'
     | 'UpgradeEmailWallet'
+    | 'UpgradeToSmartAccount'
     | 'WalletCompatibleNetworks'
     | 'WalletReceive'
     | 'WalletSend'
@@ -37,19 +59,22 @@ export interface RouterControllerState {
     | 'WhatIsAWallet';
   history: RouterControllerState['view'][];
   data?: {
+    connector?: Connector;
     wallet?: WcWallet;
     network?: CaipNetwork;
     email?: string;
     newEmail?: string;
+    swapTarget?: SwapInputTarget;
     onrampResult?: OnRampTransactionResult;
-    socialProvider?: SocialProvider;
   };
+  transactionStack: TransactionAction[];
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<RouterControllerState>({
   view: 'Connect',
-  history: ['Connect']
+  history: ['Connect'],
+  transactionStack: []
 });
 
 // -- Controller ---------------------------------------- //
@@ -64,6 +89,30 @@ 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

@@ -1,12 +1,13 @@
-import { subscribeKey as subKey } from 'valtio/vanilla/utils';
-import { proxy, ref, subscribe as sub } from 'valtio/vanilla';
+import { subscribeKey as subKey } from 'valtio/utils';
+import { proxy, ref, subscribe as sub } from 'valtio';
 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';
 import { EventsController } from './EventsController';
+import { NetworkController } from './NetworkController';
 import { RouterController } from './RouterController';
-import { ConnectionsController } from './ConnectionsController';
 
 // -- Types --------------------------------------------- //
 export interface TxParams {
@@ -96,33 +97,33 @@ export const SendController = {
         type: 'track',
         event: 'SEND_INITIATED',
         properties: {
-          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount',
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
           token: this.state.token.address,
           amount: this.state.sendTokenAmount,
-          network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
+          network: NetworkController.state.caipNetwork?.id || ''
         }
       });
       this.sendERC20Token({
         receiverAddress: this.state.receiverAddress,
         tokenAddress: this.state.token.address,
         sendTokenAmount: this.state.sendTokenAmount,
-        decimals: this.state.token.quantity?.decimals || '0'
+        decimals: this.state.token.quantity.decimals
       });
     } 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: ConnectionsController.state.accountType === 'smartAccount',
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
           token: this.state.token?.symbol,
           amount: this.state.sendTokenAmount,
-          network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
+          network: NetworkController.state.caipNetwork?.id || ''
         }
       });
       this.sendNativeToken({
@@ -135,24 +136,21 @@ export const SendController = {
   },
 
   async sendNativeToken(params: TxParams) {
-    const isAuth = !!ConnectionsController.state.connection?.properties?.provider;
+    RouterController.pushTransactionStack({
+      view: 'Account',
+      goBack: false
+    });
 
     const to = params.receiverAddress as `0x${string}`;
-    const address = CoreHelperUtil.getPlainAddress(
-      ConnectionsController.state.activeAddress
-    ) as `0x${string}`;
-    if (!address) {
-      throw new Error('Invalid address');
-    }
-
-    const value = ConnectionsController.parseUnits(
+    const address = AccountController.state.address as `0x${string}`;
+    const value = ConnectionController.parseUnits(
       params.sendTokenAmount.toString(),
       Number(params.decimals)
     );
     const data = '0x';
 
     try {
-      await ConnectionsController.sendTransaction({
+      await ConnectionController.sendTransaction({
         to,
         address,
         data,
@@ -164,13 +162,12 @@ export const SendController = {
         type: 'track',
         event: 'SEND_SUCCESS',
         properties: {
-          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount',
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
           token: this.state.token?.symbol || '',
           amount: params.sendTokenAmount,
-          network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
+          network: NetworkController.state.caipNetwork?.id || ''
         }
       });
-      RouterController.reset(isAuth ? 'Account' : 'AccountDefault');
       this.resetSend();
     } catch (error) {
       state.loading = false;
@@ -178,10 +175,10 @@ export const SendController = {
         type: 'track',
         event: 'SEND_ERROR',
         properties: {
-          isSmartAccount: ConnectionsController.state.accountType === 'smartAccount',
+          isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
           token: this.state.token?.symbol || '',
           amount: params.sendTokenAmount,
-          network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
+          network: NetworkController.state.caipNetwork?.id || ''
         }
       });
       SnackController.showError('Something went wrong');
@@ -189,16 +186,19 @@ export const SendController = {
   },
 
   async sendERC20Token(params: ContractWriteParams) {
-    const isAuth = !!ConnectionsController.state.connection?.properties?.provider;
+    RouterController.pushTransactionStack({
+      view: 'Account',
+      goBack: false
+    });
 
-    const amount = ConnectionsController.parseUnits(
+    const amount = ConnectionController.parseUnits(
       params.sendTokenAmount.toString(),
       Number(params.decimals)
     );
 
     try {
       if (
-        ConnectionsController.state.activeAddress &&
+        AccountController.state.address &&
         params.sendTokenAmount &&
         params.receiverAddress &&
         params.tokenAddress
@@ -206,23 +206,14 @@ 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 ConnectionsController.writeContract({
-          fromAddress,
+        await ConnectionController.writeContract({
+          fromAddress: AccountController.state.address as `0x${string}`,
           tokenAddress,
           receiverAddress: params.receiverAddress as `0x${string}`,
           tokenAmount: amount,
           method: 'transfer',
           abi: ContractUtil.getERC20Abi(tokenAddress)
         });
-        RouterController.reset(isAuth ? 'Account' : 'AccountDefault');
         SnackController.showSuccess('Transaction started');
         this.resetSend();
       }

package/src/controllers/SnackController.ts

@@ -22,52 +22,26 @@ const state = proxy<SnackControllerState>({
   long: false
 });
 
-// -- Private Variables --------------------------------- //
-let hideTimeout: NodeJS.Timeout | null = null;
-
-// -- Private Functions --------------------------------- //
-const clearHideTimeout = () => {
-  if (hideTimeout) {
-    clearTimeout(hideTimeout);
-    hideTimeout = null;
-  }
-};
-
-const scheduleAutoHide = (long: boolean) => {
-  clearHideTimeout();
-
-  const duration = long ? 15000 : 2200;
-  hideTimeout = setTimeout(() => {
-    SnackController.hide();
-  }, duration);
-};
-
 // -- Controller ---------------------------------------- //
 export const SnackController = {
   state,
 
-  showSuccess(message: SnackControllerState['message'], long = false) {
+  showSuccess(message: SnackControllerState['message']) {
     state.message = message;
     state.variant = 'success';
     state.open = true;
-    state.long = long;
-    scheduleAutoHide(long);
   },
 
-  showError(message: SnackControllerState['message'], long = false) {
+  showError(message: SnackControllerState['message']) {
     state.message = message;
     state.variant = 'error';
     state.open = true;
-    state.long = long;
-    scheduleAutoHide(long);
   },
 
-  showLoading(message: SnackControllerState['message'], long = false) {
+  showLoading(message: SnackControllerState['message']) {
     state.message = message;
     state.variant = 'loading';
     state.open = true;
-    state.long = long;
-    scheduleAutoHide(long);
   },
 
   showInternalError(error: Message) {
@@ -78,7 +52,6 @@ export const SnackController = {
       state.variant = 'error';
       state.open = true;
       state.long = true;
-      scheduleAutoHide(true);
     }
 
     if (error.longMessage) {
@@ -88,8 +61,9 @@ export const SnackController = {
   },
 
   hide() {
-    clearHideTimeout();
     state.open = false;
     state.long = false;
+    state.message = '';
+    state.variant = 'success';
   }
 };