@reown/appkit-core-react-native 0.0.0-feat-onramp-20250718191948 → 0.0.0-feat-coinbase-20250722173213

package/src/controllers/OnRampController.ts

@@ -9,8 +9,7 @@ import type {
   OnRampCryptoCurrency,
   OnRampServiceProvider,
   OnRampError,
-  OnRampErrorTypeValues,
-  OnRampCountryDefaults
+  OnRampErrorTypeValues
 } from '../utils/TypeUtil';
 
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
@@ -33,23 +32,23 @@ const mapErrorMessage = (errorCode: string): OnRampError => {
   const errorMap: Record<string, { type: OnRampErrorTypeValues; message: string }> = {
     [OnRampErrorType.AMOUNT_TOO_LOW]: {
       type: OnRampErrorType.AMOUNT_TOO_LOW,
-      message: 'The amount is too low'
+      message: 'Amount is too low'
     },
     [OnRampErrorType.AMOUNT_TOO_HIGH]: {
       type: OnRampErrorType.AMOUNT_TOO_HIGH,
-      message: 'The amount is too high'
+      message: 'Amount is too high'
     },
     [OnRampErrorType.INVALID_AMOUNT]: {
       type: OnRampErrorType.INVALID_AMOUNT,
-      message: 'Enter a valid amount'
+      message: 'Please adjust amount'
     },
     [OnRampErrorType.INCOMPATIBLE_REQUEST]: {
       type: OnRampErrorType.INCOMPATIBLE_REQUEST,
-      message: 'Enter a valid amount'
+      message: 'Try different amount or payment method'
     },
     [OnRampErrorType.BAD_REQUEST]: {
       type: OnRampErrorType.BAD_REQUEST,
-      message: 'Enter a valid amount'
+      message: 'Try different amount or payment method'
     }
   };
 
@@ -64,7 +63,6 @@ const mapErrorMessage = (errorCode: string): OnRampError => {
 // -- Types --------------------------------------------- //
 export interface OnRampControllerState {
   countries: OnRampCountry[];
-  countriesDefaults?: OnRampCountryDefaults[];
   selectedCountry?: OnRampCountry;
   serviceProviders: OnRampServiceProvider[];
   selectedServiceProvider?: OnRampServiceProvider;
@@ -116,8 +114,9 @@ export const OnRampController = {
 
     if (updateCurrency) {
       const currencyCode =
-        state.countriesDefaults?.find(d => d.countryCode === country.countryCode)
-          ?.defaultCurrencyCode || 'USD';
+        ConstantsUtil.COUNTRY_CURRENCIES[
+          country.countryCode as keyof typeof ConstantsUtil.COUNTRY_CURRENCIES
+        ] || 'USD';
 
       const currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
 
@@ -127,7 +126,6 @@ export const OnRampController = {
     }
 
     await Promise.all([this.fetchPaymentMethods(), this.fetchCryptoCurrencies()]);
-    this.clearQuotes();
 
     state.loading = false;
 
@@ -136,6 +134,8 @@ 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,27 +231,6 @@ 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();
@@ -280,8 +259,10 @@ export const OnRampController = {
       });
 
       const defaultCountryPaymentMethods =
-        state.countriesDefaults?.find(d => d.countryCode === state.selectedCountry?.countryCode)
-          ?.defaultPaymentMethods || [];
+        ConstantsUtil.COUNTRY_DEFAULT_PAYMENT_METHOD[
+          state.selectedCountry
+            ?.countryCode as keyof typeof ConstantsUtil.COUNTRY_DEFAULT_PAYMENT_METHOD
+        ];
 
       state.paymentMethods =
         paymentMethods?.sort((a, b) => {
@@ -295,7 +276,9 @@ export const OnRampController = {
           return aIndex - bIndex;
         }) || [];
 
-      state.selectedPaymentMethod = state.paymentMethods[0];
+      state.selectedPaymentMethod = paymentMethods?.[0] || undefined;
+
+      this.clearQuotes();
     } catch (error) {
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_METHODS,
@@ -353,8 +336,9 @@ export const OnRampController = {
 
       if (countryCode) {
         currencyCode =
-          state.countriesDefaults?.find(d => d.countryCode === countryCode)?.defaultCurrencyCode ||
-          'USD';
+          ConstantsUtil.COUNTRY_CURRENCIES[
+            countryCode as keyof typeof ConstantsUtil.COUNTRY_CURRENCIES
+          ];
       }
 
       const preferredCurrency = await StorageUtil.getOnRampPreferredFiatCurrency();
@@ -403,25 +387,25 @@ 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!,
-        excludeProviders: ['BINANCECONNECT', 'COINBASEPAY']
+        walletAddress: AccountController.state.address!
       };
 
-      const response = await BlockchainApiController.getOnRampQuotes(body, currentSignal);
+      const response = await BlockchainApiController.getOnRampQuotes(
+        body,
+        quotesAbortController.signal
+      );
 
       if (!response || !response.length) {
         throw new Error('No quotes available');
@@ -430,48 +414,9 @@ export const OnRampController = {
       const quotes = response.sort((a, b) => b.customerScore - a.customerScore);
 
       state.quotes = quotes;
-
-      //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.selectedQuote = quotes[0];
       state.selectedServiceProvider = state.serviceProviders.find(
-        sp => sp.serviceProvider === state.selectedQuote?.serviceProvider
+        sp => sp.serviceProvider === quotes[0]?.serviceProvider
       );
     } catch (error: any) {
       if (error.name === 'AbortError') {
@@ -490,9 +435,7 @@ export const OnRampController = {
       this.clearQuotes();
       state.error = mapErrorMessage(error?.code || 'UNKNOWN_ERROR');
     } finally {
-      if (!currentSignal.aborted) {
-        state.quotesLoading = false;
-      }
+      state.quotesLoading = false;
     }
   },
 
@@ -549,7 +492,7 @@ export const OnRampController = {
         throw new Error('Invalid quote');
       }
 
-      const body = {
+      const widget = await BlockchainApiController.getOnRampWidget({
         countryCode: quote.countryCode,
         destinationCurrencyCode: quote.destinationCurrencyCode,
         paymentMethodType: quote.paymentMethodType,
@@ -558,9 +501,7 @@ 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');
@@ -614,7 +555,6 @@ export const OnRampController = {
       await this.fetchServiceProviders();
 
       await Promise.all([
-        this.fetchCountriesDefaults(),
         this.fetchPaymentMethods(),
         this.fetchFiatLimits(),
         this.fetchCryptoCurrencies(),

package/src/controllers/OptionsController.ts

@@ -1,13 +1,7 @@
 import { proxy, ref } from 'valtio';
-import type {
-  CustomWallet,
-  Features,
-  Metadata,
-  ProjectId,
-  SdkType,
-  SdkVersion,
-  Tokens
-} from '../utils/TypeUtil';
+import type { Tokens, Storage, Metadata, AppKitNetwork } from '@reown/appkit-common-react-native';
+import type { CustomWallet, Features, ProjectId, SdkType, SdkVersion } from '../utils/TypeUtil';
+
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 
 // -- Types --------------------------------------------- //
@@ -17,7 +11,8 @@ export interface ClipboardClient {
 
 export interface OptionsControllerState {
   projectId: ProjectId;
-  _clipboardClient?: ClipboardClient;
+  clipboardClient?: ClipboardClient;
+  storage?: Storage;
   includeWalletIds?: string[];
   excludeWalletIds?: string[];
   featuredWalletIds?: string[];
@@ -31,6 +26,7 @@ export interface OptionsControllerState {
   isOnRampEnabled?: boolean;
   features?: Features;
   debug?: boolean;
+  defaultNetwork?: AppKitNetwork;
 }
 
 // -- State --------------------------------------------- //
@@ -47,7 +43,7 @@ export const OptionsController = {
   state,
 
   setClipboardClient(client: ClipboardClient) {
-    state._clipboardClient = ref(client);
+    state.clipboardClient = ref(client);
   },
 
   setProjectId(projectId: OptionsControllerState['projectId']) {
@@ -102,12 +98,22 @@ export const OptionsController = {
     state.isOnRampEnabled = isOnRampEnabled;
   },
 
+  setStorage(storage?: OptionsControllerState['storage']) {
+    if (storage) {
+      state.storage = ref(storage);
+    }
+  },
+
+  setDefaultNetwork(defaultNetwork?: OptionsControllerState['defaultNetwork']) {
+    state.defaultNetwork = defaultNetwork;
+  },
+
   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 '../utils/TypeUtil.js';
+import type { CaipNetworkId } from '@reown/appkit-common-react-native';
 
 // -- Types --------------------------------------------- //
 export interface PublicStateControllerState {

package/src/controllers/RouterController.ts

@@ -1,22 +1,9 @@
 import { proxy } from 'valtio';
-import type {
-  WcWallet,
-  CaipNetwork,
-  Connector,
-  SwapInputTarget,
-  OnRampTransactionResult
-} from '../utils/TypeUtil';
+import type { CaipNetwork, SocialProvider } from '@reown/appkit-common-react-native';
 
-// -- Types --------------------------------------------- //
-type TransactionAction = {
-  goBack: boolean;
-  view: RouterControllerState['view'] | null;
-  close?: boolean;
-  replace?: boolean;
-  onSuccess?: () => void;
-  onCancel?: () => void;
-};
+import type { WcWallet, OnRampTransactionResult } from '../utils/TypeUtil';
 
+// -- Types --------------------------------------------- //
 export interface RouterControllerState {
   view:
     | 'Account'
@@ -27,11 +14,7 @@ export interface RouterControllerState {
     | 'ConnectingExternal'
     | 'ConnectingSiwe'
     | 'ConnectingSocial'
-    | 'ConnectingFarcaster'
     | 'ConnectingWalletConnect'
-    | 'Create'
-    | 'EmailVerifyDevice'
-    | 'EmailVerifyOtp'
     | 'GetWallet'
     | 'Networks'
     | 'OnRamp'
@@ -41,15 +24,10 @@ export interface RouterControllerState {
     | 'OnRampTransaction'
     | 'SwitchNetwork'
     | 'Swap'
-    | 'SwapSelectToken'
     | 'SwapPreview'
     | 'Transactions'
     | 'UnsupportedChain'
-    | 'UpdateEmailPrimaryOtp'
-    | 'UpdateEmailSecondaryOtp'
-    | 'UpdateEmailWallet'
     | 'UpgradeEmailWallet'
-    | 'UpgradeToSmartAccount'
     | 'WalletCompatibleNetworks'
     | 'WalletReceive'
     | 'WalletSend'
@@ -59,22 +37,19 @@ 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'],
-  transactionStack: []
+  history: ['Connect']
 });
 
 // -- Controller ---------------------------------------- //
@@ -89,30 +64,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];