@reown/appkit-core-react-native 0.0.0-chore-spring-effect-20250909214820 → 0.0.0-chore-added-import-20251002170458

package/src/controllers/OnRampController.ts

@@ -19,6 +19,7 @@ import { OptionsController } from './OptionsController';
 import { ConstantsUtil, OnRampErrorType } from '../utils/ConstantsUtil';
 import { StorageUtil } from '../utils/StorageUtil';
 import { SnackController } from './SnackController';
+import { LogController } from './LogController';
 import { EventsController } from './EventsController';
 import { BlockchainApiController, EXCLUDED_ONRAMP_PROVIDERS } from './BlockchainApiController';
 import { ConnectionsController } from './ConnectionsController';
@@ -142,6 +143,7 @@ export const OnRampController = {
 
       StorageUtil.setOnRampPreferredCountry(country);
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'setSelectedCountry');
       state.loading = false;
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_COUNTRIES,
@@ -240,6 +242,7 @@ export const OnRampController = {
           countries.find(c => c.countryCode === countryCode) || countries[0] || undefined;
       }
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchCountries');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_COUNTRIES,
         message: 'Failed to load countries'
@@ -261,6 +264,7 @@ export const OnRampController = {
 
       state.countriesDefaults = countriesDefaults;
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchCountriesDefaults');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_COUNTRIES,
         message: 'Failed to load countries defaults'
@@ -282,6 +286,7 @@ export const OnRampController = {
 
       state.serviceProviders = serviceProviders || [];
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchServiceProviders');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_PROVIDERS,
         message: 'Failed to load service providers'
@@ -313,6 +318,7 @@ export const OnRampController = {
 
       state.selectedPaymentMethod = state.paymentMethods[0];
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchPaymentMethods');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_METHODS,
         message: 'Failed to load payment methods'
@@ -342,6 +348,7 @@ export const OnRampController = {
 
       state.purchaseCurrency = selectedCurrency || undefined;
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchCryptoCurrencies');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_CURRENCIES,
         message: 'Failed to load crypto currencies'
@@ -385,6 +392,7 @@ export const OnRampController = {
         this.setPaymentCurrency(defaultCurrency);
       }
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchFiatCurrencies');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_CURRENCIES,
         message: 'Failed to load fiat currencies'
@@ -503,6 +511,7 @@ export const OnRampController = {
         sp => sp.serviceProvider === state.selectedQuote?.serviceProvider
       );
     } catch (error: any) {
+      LogController.sendError(error, 'OnRampController.ts', 'getQuotes');
       if (error.name === 'AbortError') {
         // Do nothing, another request was made
         return;
@@ -553,6 +562,7 @@ export const OnRampController = {
 
       state.paymentCurrenciesLimits = limits;
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'fetchFiatLimits');
       state.error = {
         type: OnRampErrorType.FAILED_TO_LOAD_LIMITS,
         message: 'Failed to load fiat limits'
@@ -617,6 +627,7 @@ export const OnRampController = {
 
       return widget;
     } catch (e: any) {
+      LogController.sendError(e, 'OnRampController.ts', 'generateWidget', { quote });
       EventsController.sendEvent({
         type: 'track',
         event: 'BUY_FAIL',
@@ -662,6 +673,7 @@ export const OnRampController = {
         this.fetchFiatCurrencies()
       ]);
     } catch (error) {
+      LogController.sendError(error, 'OnRampController.ts', 'loadOnRampData');
       if (!state.error) {
         state.error = {
           type: OnRampErrorType.FAILED_TO_LOAD,

package/src/controllers/OptionsController.ts

@@ -7,7 +7,8 @@ import type {
   Features,
   ProjectId,
   SdkType,
-  SdkVersion
+  SdkVersion,
+  SIWXConfig
 } from '@reown/appkit-common-react-native';
 
 import { ConstantsUtil } from '../utils/ConstantsUtil';
@@ -29,7 +30,7 @@ export interface OptionsControllerState {
   sdkType: SdkType;
   sdkVersion: SdkVersion;
   metadata?: Metadata;
-  isSiweEnabled?: boolean;
+  siwx?: SIWXConfig;
   isOnRampEnabled?: boolean;
   features?: Features;
   debug?: boolean;
@@ -87,10 +88,6 @@ export const OptionsController = {
     state.metadata = metadata;
   },
 
-  setIsSiweEnabled(isSiweEnabled: OptionsControllerState['isSiweEnabled']) {
-    state.isSiweEnabled = isSiweEnabled;
-  },
-
   setFeatures(features: OptionsControllerState['features']) {
     state.features = { ...ConstantsUtil.DEFAULT_FEATURES, ...features };
   },
@@ -117,6 +114,14 @@ export const OptionsController = {
     state.requestedNetworks = requestedNetworks;
   },
 
+  setSiwx(siwx?: OptionsControllerState['siwx']) {
+    if (siwx && (siwx?.signOutOnDisconnect === undefined || siwx?.signOutOnDisconnect === null)) {
+      siwx.signOutOnDisconnect = true;
+    }
+
+    state.siwx = siwx;
+  },
+
   isClipboardAvailable() {
     return !!state.clipboardClient;
   },

package/src/controllers/RouterController.ts

@@ -15,23 +15,23 @@ export interface RouterControllerState {
     | 'Connect'
     | 'ConnectSocials'
     | 'ConnectingExternal'
-    | 'ConnectingSiwe'
     | 'ConnectingSocial'
-    | 'ConnectingWalletConnect'
     | 'GetWallet'
     | 'Networks'
-    | 'SwitchNetwork'
     | 'OnRamp'
     | 'OnRampCheckout'
     | 'OnRampLoading'
     | 'OnRampSettings'
     | 'OnRampTransaction'
+    | 'SIWXSignMessage'
     | 'Swap'
     | 'SwapPreview'
+    | 'SwitchNetwork'
     | 'Transactions'
     | 'UnsupportedChain'
     | 'UpgradeEmailWallet'
     | 'WalletCompatibleNetworks'
+    | 'WalletConnect'
     | 'WalletReceive'
     | 'WalletSend'
     | 'WalletSendPreview'

package/src/controllers/SendController.ts

@@ -8,6 +8,8 @@ import { EventsController } from './EventsController';
 import { RouterController } from './RouterController';
 import { ConnectionsController } from './ConnectionsController';
 import { SwapController } from './SwapController';
+import { ConstantsUtil as CoreConstantsUtil } from '../utils/ConstantsUtil';
+import { LogController } from './LogController';
 
 // -- Types --------------------------------------------- //
 export interface TxParams {
@@ -85,7 +87,7 @@ export const SendController = {
       isSmartAccount: ConnectionsController.state.accountType === 'smartAccount',
       token: this.state.token?.address ?? this.state.token?.symbol ?? '',
       amount: this.state.sendTokenAmount || 0,
-      network: ConnectionsController.state.activeNetwork?.caipNetworkId ?? ''
+      network: ConnectionsController.state.activeNetwork?.caipNetworkId
     };
 
     try {
@@ -118,13 +120,22 @@ export const SendController = {
       });
       RouterController.reset(isAuth ? 'Account' : 'AccountDefault');
       this.resetState();
-    } catch (error) {
+    } catch (error: any) {
+      LogController.sendError(error, 'SendController.ts', 'sendToken');
       EventsController.sendEvent({
         type: 'track',
         event: 'SEND_ERROR',
         properties: eventProperties
       });
-      SnackController.showError('Something went wrong');
+
+      if (
+        error?.message &&
+        (error?.message.includes('user rejected') || error?.message.includes('canceled'))
+      ) {
+        SnackController.showError('Transaction cancelled');
+      } else {
+        SnackController.showError('Something went wrong');
+      }
     } finally {
       this.state.loading = false;
     }
@@ -222,7 +233,21 @@ export const SendController = {
       throw new Error('Invalid address');
     }
 
+    let tokenMint: string | undefined;
+
+    if (
+      SendController.state.token &&
+      SendController.state.token.address !== CoreConstantsUtil.NATIVE_TOKEN_ADDRESS.solana
+    ) {
+      if (CoreHelperUtil.isCaipAddress(SendController.state.token.address)) {
+        tokenMint = CoreHelperUtil.getPlainAddress(SendController.state.token.address);
+      } else {
+        tokenMint = SendController.state.token.address;
+      }
+    }
+
     await ConnectionsController.sendTransaction({
+      tokenMint,
       fromAddress: plainAddress,
       toAddress: this.state.receiverAddress,
       amount: this.state.sendTokenAmount,

package/src/controllers/SwapController.ts

@@ -14,6 +14,7 @@ import { BlockchainApiController } from './BlockchainApiController';
 import { OptionsController } from './OptionsController';
 import { SwapCalculationUtil } from '../utils/SwapCalculationUtil';
 import { SnackController } from './SnackController';
+import { LogController } from './LogController';
 import { RouterController } from './RouterController';
 import { CoreHelperUtil } from '../utils/CoreHelperUtil';
 import { TransactionsController } from './TransactionsController';
@@ -249,6 +250,7 @@ export const SwapController = {
         this.setSourceTokenAmount('1');
       }
     } catch (error) {
+      LogController.sendError(error, 'SwapController.ts', 'initializeState');
       SnackController.showError('Failed to initialize swap');
       RouterController.goBack();
     } finally {
@@ -491,6 +493,7 @@ export const SwapController = {
         this.setTransactionDetails();
       }
     } catch (error) {
+      LogController.sendError(error, 'SwapController.ts', 'getQuote');
       SnackController.showError('Failed to get swap quote');
     } finally {
       state.loadingQuote = false;
@@ -729,7 +732,7 @@ export const SwapController = {
         type: 'track',
         event: 'SWAP_SUCCESS',
         properties: {
-          network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
+          network: ConnectionsController.state.activeNetwork?.caipNetworkId,
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',
@@ -750,6 +753,11 @@ export const SwapController = {
       return transactionHash;
     } catch (err) {
       const error = err as TransactionError;
+      LogController.sendError(error, 'SwapController.ts', 'sendTransactionForSwap', {
+        sourceToken: this.state.sourceToken?.symbol,
+        toToken: this.state.toToken?.symbol,
+        amount: this.state.sourceTokenAmount
+      });
       state.transactionError = error?.shortMessage;
       state.loadingTransaction = false;
       SnackController.showError(error?.shortMessage ?? 'Transaction error');
@@ -758,7 +766,7 @@ export const SwapController = {
         event: 'SWAP_ERROR',
         properties: {
           message: error?.shortMessage ?? error?.message ?? 'Unknown',
-          network: ConnectionsController.state.activeNetwork?.caipNetworkId || '',
+          network: ConnectionsController.state.activeNetwork?.caipNetworkId,
           swapFromToken: this.state.sourceToken?.symbol || '',
           swapToToken: this.state.toToken?.symbol || '',
           swapFromAmount: this.state.sourceTokenAmount || '',

package/src/controllers/ThemeController.ts

@@ -5,12 +5,14 @@ import type { ThemeMode, ThemeVariables } from '@reown/appkit-common-react-nativ
 // -- Types --------------------------------------------- //
 export interface ThemeControllerState {
   themeMode?: ThemeMode;
+  defaultThemeMode?: ThemeMode;
   themeVariables?: ThemeVariables;
 }
 
 // -- State --------------------------------------------- //
 const state = proxy<ThemeControllerState>({
   themeMode: undefined,
+  defaultThemeMode: undefined,
   themeVariables: {}
 });
 
@@ -30,6 +32,11 @@ export const ThemeController = {
     }
   },
 
+  setDefaultThemeMode(themeMode: ThemeControllerState['defaultThemeMode']) {
+    state.defaultThemeMode = themeMode;
+    this.setThemeMode(themeMode);
+  },
+
   setThemeVariables(themeVariables: ThemeControllerState['themeVariables']) {
     if (!themeVariables) {
       state.themeVariables = {};

package/src/controllers/TransactionsController.ts

@@ -5,6 +5,7 @@ import { EventsController } from './EventsController';
 import { SnackController } from './SnackController';
 import { BlockchainApiController } from './BlockchainApiController';
 import { ConnectionsController } from './ConnectionsController';
+import { LogController } from './LogController';
 
 // -- Types --------------------------------------------- //
 type TransactionByMonthMap = Record<string, Transaction[]>;
@@ -74,6 +75,7 @@ export const TransactionsController = {
       state.empty = nonSpamTransactions.length === 0;
       state.next = response?.next ? response.next : undefined;
     } catch (error) {
+      LogController.sendError(error, 'TransactionsController.ts', 'fetchTransactions');
       EventsController.sendEvent({
         type: 'track',
         event: 'ERROR_FETCH_TRANSACTIONS',