@reown/appkit-core-react-native 0.0.0-feat-multi-siwe-20250623183423 → 0.0.0-feat-onramp-20250626173252

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,8 +1,7 @@
 import { proxy } from 'valtio';
-import type { CaipNetwork } from '@reown/appkit-common-react-native';
-
 import type {
   WcWallet,
+  CaipNetwork,
   Connector,
   SwapInputTarget,
   OnRampTransactionResult

package/src/controllers/SendController.ts

@@ -1,13 +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 {
@@ -100,7 +100,7 @@ export const SendController = {
           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({
@@ -123,7 +123,7 @@ export const SendController = {
           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({
@@ -165,7 +165,7 @@ export const SendController = {
           isSmartAccount: AccountController.state.preferredAccountType === 'smartAccount',
           token: this.state.token?.symbol || '',
           amount: params.sendTokenAmount,
-          network: ConnectionsController.state.activeNetwork?.caipNetworkId || ''
+          network: NetworkController.state.caipNetwork?.id || ''
         }
       });
       this.resetSend();
@@ -178,7 +178,7 @@ export const SendController = {
           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');

package/src/controllers/SwapController.ts

@@ -1,9 +1,10 @@
 import { subscribeKey as subKey } from 'valtio/utils';
 import { proxy, subscribe as sub } from 'valtio';
-import { NumberUtil, type CaipAddress } from '@reown/appkit-common-react-native';
+import { NumberUtil } from '@reown/appkit-common-react-native';
 
 import { ConstantsUtil } from '../utils/ConstantsUtil';
 import { SwapApiUtil } from '../utils/SwapApiUtil';
+import { NetworkController } from './NetworkController';
 import { BlockchainApiController } from './BlockchainApiController';
 import { OptionsController } from './OptionsController';
 import { SwapCalculationUtil } from '../utils/SwapCalculationUtil';
@@ -13,9 +14,9 @@ import type { SwapInputTarget, SwapTokenWithBalance } from '../utils/TypeUtil';
 import { ConnectorController } from './ConnectorController';
 import { AccountController } from './AccountController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
+import { ConnectionController } from './ConnectionController';
 import { TransactionsController } from './TransactionsController';
 import { EventsController } from './EventsController';
-import { ConnectionsController } from './ConnectionsController';
 
 // -- Constants ---------------------------------------- //
 export const INITIAL_GAS_LIMIT = 150000;
@@ -157,15 +158,9 @@ export const SwapController = {
   },
 
   getParams() {
-    const { activeAddress, activeNamespace, activeNetwork } = ConnectionsController.state;
-    const address = CoreHelperUtil.getPlainAddress(activeAddress);
-
-    if (!activeNamespace || !activeNetwork) {
-      throw new Error('No active namespace or network found to swap the tokens from.');
-    }
-
-    const networkAddress: CaipAddress = `${activeNetwork.caipNetworkId}:${ConstantsUtil.NATIVE_TOKEN_ADDRESS[activeNamespace]}`;
-
+    const caipAddress = AccountController.state.caipAddress;
+    const address = CoreHelperUtil.getPlainAddress(caipAddress);
+    const networkAddress = NetworkController.getActiveNetworkTokenAddress();
     const type = ConnectorController.state.connectedConnector;
 
     if (!address) {
@@ -183,7 +178,7 @@ export const SwapController = {
     return {
       networkAddress,
       fromAddress: address,
-      fromCaipAddress: activeAddress,
+      fromCaipAddress: caipAddress,
       sourceTokenAddress: state.sourceToken?.address,
       toTokenAddress: state.toToken?.address,
       toTokenAmount: state.toTokenAmount,
@@ -194,7 +189,7 @@ export const SwapController = {
       invalidSourceToken,
       invalidSourceTokenAmount,
       availableToSwap:
-        activeAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
+        caipAddress && !invalidToToken && !invalidSourceToken && !invalidSourceTokenAmount,
       isAuthConnector: type === 'AUTH'
     };
   },
@@ -287,6 +282,7 @@ export const SwapController = {
 
   async getMyTokensWithBalance(forceUpdate?: string) {
     const balances = await SwapApiUtil.getMyTokensWithBalance(forceUpdate);
+
     if (!balances) {
       return;
     }
@@ -405,7 +401,7 @@ export const SwapController = {
 
   setBalances(balances: SwapTokenWithBalance[]) {
     const { networkAddress } = this.getParams();
-    const caipNetwork = ConnectionsController.state.activeNetwork;
+    const caipNetwork = NetworkController.state.caipNetwork;
 
     if (!caipNetwork) {
       return;
@@ -417,9 +413,7 @@ export const SwapController = {
       state.tokensPriceMap[token.address] = token.price || 0;
     });
 
-    state.myTokensWithBalance = balances.filter(
-      token => token.address?.startsWith(caipNetwork.caipNetworkId)
-    );
+    state.myTokensWithBalance = balances.filter(token => token.address?.startsWith(caipNetwork.id));
 
     state.networkBalanceInUSD = networkToken
       ? NumberUtil.multiply(networkToken.quantity.numeric, networkToken.price).toString()
@@ -470,12 +464,12 @@ export const SwapController = {
 
   // -- Swap ---------------------------------------------- //
   async swapTokens() {
-    const address = ConnectionsController.state.activeAddress;
+    const address = AccountController.state.address as `${string}:${string}:${string}`;
     const sourceToken = state.sourceToken;
     const toToken = state.toToken;
     const haveSourceTokenAmount = NumberUtil.bigNumber(state.sourceTokenAmount).isGreaterThan(0);
 
-    if (!toToken || !sourceToken || state.loadingPrices || !haveSourceTokenAmount || !address) {
+    if (!toToken || !sourceToken || state.loadingPrices || !haveSourceTokenAmount) {
       return;
     }
 
@@ -485,44 +479,39 @@ export const SwapController = {
       .multipliedBy(10 ** sourceToken.decimals)
       .integerValue();
 
-    try {
-      const quoteResponse = await BlockchainApiController.fetchSwapQuote({
-        userAddress: address,
-        projectId: OptionsController.state.projectId,
-        from: sourceToken.address,
-        to: toToken.address,
-        gasPrice: state.gasFee,
-        amount: amountDecimal.toString()
-      });
+    const quoteResponse = await BlockchainApiController.fetchSwapQuote({
+      userAddress: address,
+      projectId: OptionsController.state.projectId,
+      from: sourceToken.address,
+      to: toToken.address,
+      gasPrice: state.gasFee,
+      amount: amountDecimal.toString()
+    });
 
-      state.loadingQuote = false;
+    state.loadingQuote = false;
 
-      const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
+    const quoteToAmount = quoteResponse?.quotes?.[0]?.toAmount;
 
-      if (!quoteToAmount) {
-        return;
-      }
+    if (!quoteToAmount) {
+      return;
+    }
 
-      const toTokenAmount = NumberUtil.bigNumber(quoteToAmount)
-        .dividedBy(10 ** toToken.decimals)
-        .toString();
+    const toTokenAmount = NumberUtil.bigNumber(quoteToAmount)
+      .dividedBy(10 ** toToken.decimals)
+      .toString();
 
-      this.setToTokenAmount(toTokenAmount);
+    this.setToTokenAmount(toTokenAmount);
 
-      const isInsufficientToken = this.hasInsufficientToken(
-        state.sourceTokenAmount,
-        sourceToken.address
-      );
+    const isInsufficientToken = this.hasInsufficientToken(
+      state.sourceTokenAmount,
+      sourceToken.address
+    );
 
-      if (isInsufficientToken) {
-        state.inputError = 'Insufficient balance';
-      } else {
-        state.inputError = undefined;
-        this.setTransactionDetails();
-      }
-    } catch (error) {
-      SnackController.showError('Failed to get swap quote');
-      state.loadingQuote = false;
+    if (isInsufficientToken) {
+      state.inputError = 'Insufficient balance';
+    } else {
+      state.inputError = undefined;
+      this.setTransactionDetails();
     }
   },
 
@@ -591,7 +580,7 @@ export const SwapController = {
       if (!response) {
         throw new Error('createAllowanceTransaction - No response from generateApproveCalldata');
       }
-      const gasLimit = await ConnectionsController.estimateGas({
+      const gasLimit = await ConnectionController.estimateGas({
         address: fromAddress as `0x${string}`,
         to: CoreHelperUtil.getPlainAddress(response.tx.to) as `0x${string}`,
         data: response.tx.data
@@ -644,7 +633,7 @@ export const SwapController = {
       return undefined;
     }
 
-    const amount = ConnectionsController.parseUnits(
+    const amount = ConnectionController.parseUnits(
       sourceTokenAmount,
       sourceToken.decimals
     )?.toString();
@@ -712,13 +701,13 @@ export const SwapController = {
     }
 
     try {
-      await ConnectionsController.sendTransaction({
+      await ConnectionController.sendTransaction({
         address: fromAddress as `0x${string}`,
         to: data.to as `0x${string}`,
         data: data.data as `0x${string}`,
         value: BigInt(data.value),
         gasPrice: BigInt(data.gasPrice),
-        chainNamespace: ConnectionsController.state.activeNamespace
+        chainNamespace: 'eip155'
       });
 
       await this.swapTokens();
@@ -737,6 +726,7 @@ export const SwapController = {
     if (!data) {
       return undefined;
     }
+
     const { fromAddress, toTokenAmount, isAuthConnector } = this.getParams();
 
     state.loadingTransaction = true;
@@ -763,14 +753,14 @@ export const SwapController = {
 
     try {
       const forceUpdateAddresses = [state.sourceToken?.address, state.toToken?.address].join(',');
-      const transactionHash = await ConnectionsController.sendTransaction({
+      const transactionHash = await ConnectionController.sendTransaction({
         address: fromAddress as `0x${string}`,
         to: data.to as `0x${string}`,
         data: data.data as `0x${string}`,
         gas: data.gas,
         gasPrice: BigInt(data.gasPrice),
         value: data.value,
-        chainNamespace: ConnectionsController.state.activeNamespace
+        chainNamespace: 'eip155'
       });
 
       state.loadingTransaction = false;
@@ -779,7 +769,7 @@ export const SwapController = {
         type: 'track',
         event: 'SWAP_SUCCESS',
         properties: {
-          network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
+          network: NetworkController.state.caipNetwork?.id || '',
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
@@ -811,7 +801,7 @@ export const SwapController = {
         event: 'SWAP_ERROR',
         properties: {
           message: error?.shortMessage ?? error?.message ?? 'Unknown',
-          network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
+          network: NetworkController.state.caipNetwork?.id || '',
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',

package/src/controllers/ThemeController.ts

@@ -1,11 +1,10 @@
-import { Appearance } from 'react-native';
 import { proxy, subscribe as sub } from 'valtio';
 import type { ThemeMode, ThemeVariables } from '@reown/appkit-common-react-native';
 
 // -- Types --------------------------------------------- //
 export interface ThemeControllerState {
   themeMode?: ThemeMode;
-  themeVariables?: ThemeVariables;
+  themeVariables: ThemeVariables;
 }
 
 // -- State --------------------------------------------- //
@@ -23,18 +22,10 @@ export const ThemeController = {
   },
 
   setThemeMode(themeMode: ThemeControllerState['themeMode']) {
-    if (!themeMode) {
-      state.themeMode = Appearance.getColorScheme() as ThemeMode;
-    } else {
-      state.themeMode = themeMode;
-    }
+    state.themeMode = themeMode;
   },
 
   setThemeVariables(themeVariables: ThemeControllerState['themeVariables']) {
-    if (!themeVariables) {
-      state.themeVariables = {};
-    }
-
     state.themeVariables = { ...state.themeVariables, ...themeVariables };
   }
 };