@reown/appkit-core-react-native 2.0.0-alpha.4 → 2.0.0-alpha.6

package/src/controllers/ConnectionsController.ts

@@ -13,6 +13,7 @@ import {
   type AccountType,
   type Connection,
   SolanaBaseAdapter,
+  BitcoinBaseAdapter,
   type Identity
 } from '@reown/appkit-common-react-native';
 import { StorageUtil } from '../utils/StorageUtil';
@@ -80,11 +81,13 @@ const updateConnection = (
   namespace: ChainNamespace,
   connection: Connection,
   updates: Partial<Connection>
-) => {
-  if (!connection) return;
+): Connection => {
   const newConnectionsMap = new Map(baseState.connections);
-  newConnectionsMap.set(namespace, { ...connection, ...updates });
+  const newConnection = { ...connection, ...updates };
+  newConnectionsMap.set(namespace, newConnection);
   baseState.connections = newConnectionsMap;
+
+  return newConnection;
 };
 
 const getActiveIdentity = (connection: Connection): Identity | undefined => {
@@ -206,6 +209,10 @@ export const ConnectionsController = {
   state: derivedState,
 
   setActiveNamespace(namespace?: ChainNamespace) {
+    if (baseState.activeNamespace === namespace) {
+      return;
+    }
+
     baseState.activeNamespace = namespace;
     StorageUtil.setActiveNamespace(namespace);
   },
@@ -247,16 +254,19 @@ export const ConnectionsController = {
     baseState.connections = newConnectionsMap;
   },
 
-  updateAccounts(namespace: ChainNamespace, accounts: CaipAddress[]) {
+  updateAccounts(namespace: ChainNamespace, accounts: CaipAddress[]): boolean {
     const connection = baseState.connections.get(namespace);
     if (!connection) {
-      return;
+      return false;
     }
 
-    const newConnectionsMap = new Map(baseState.connections);
-    const updatedConnection = { ...connection, accounts };
-    newConnectionsMap.set(namespace, updatedConnection);
-    baseState.connections = newConnectionsMap;
+    if (connection.accounts.toString() === accounts.toString()) {
+      return false;
+    }
+
+    updateConnection(namespace, connection, { accounts });
+
+    return true;
   },
 
   updateBalance(namespace: ChainNamespace, address: CaipAddress, balance: Balance) {
@@ -270,8 +280,11 @@ export const ConnectionsController = {
     const existingBalances = connection.balances.get(address) || [];
     // Check if this token already exists by contract address or symbol
     const existingIndex = existingBalances.findIndex(existingBalance => {
-      if (balance.address) {
-        return existingBalance.address === balance.address;
+      if (balance.address && existingBalance.address) {
+        return (
+          CoreHelperUtil.getPlainAddress(existingBalance.address) ===
+          CoreHelperUtil.getPlainAddress(balance.address)
+        );
       }
 
       return existingBalance.symbol === balance.symbol;
@@ -327,10 +340,9 @@ export const ConnectionsController = {
       return;
     }
 
-    baseState.connections.set(namespace, {
-      ...connection,
-      caipNetwork: networkId
-    });
+    updateConnection(namespace, connection, { caipNetwork: networkId });
+
+    this.setActiveNamespace(namespace);
   },
 
   setNetworks(networks: AppKitNetwork[]) {
@@ -338,6 +350,11 @@ export const ConnectionsController = {
   },
 
   getConnectedNetworks() {
+    const connection = getActiveConnection(baseState);
+    if (!connection) {
+      return [];
+    }
+
     return baseState.networks.filter(
       network =>
         baseState.connections
@@ -346,14 +363,31 @@ export const ConnectionsController = {
     );
   },
 
+  getAvailableNetworks() {
+    const connection = getActiveConnection(baseState);
+
+    if (!connection) {
+      return baseState.networks;
+    }
+
+    const canAddEvmChain = connection.properties?.canAddEvmChain;
+
+    return baseState.networks.filter(
+      network =>
+        baseState.connections
+          .get(network.chainNamespace)
+          ?.accounts.some(account => account.startsWith(network.caipNetworkId)) ||
+        (canAddEvmChain && network.chainNamespace === 'eip155')
+    );
+  },
+
   setAccountType(namespace: ChainNamespace, type: AccountType) {
     const connection = baseState.connections.get(namespace);
     if (!connection) return;
 
-    const newConnectionsMap = new Map(baseState.connections);
-    const newConnection = { ...connection, type };
-    newConnectionsMap.set(namespace, newConnection);
-    baseState.connections = newConnectionsMap;
+    const newConnection = updateConnection(namespace, connection, { type });
+
+    return getActiveAddress(newConnection);
   },
 
   async disconnect(namespace: ChainNamespace, isInternal = true) {
@@ -419,7 +453,13 @@ export const ConnectionsController = {
 
     const adapter = baseState.connections.get(baseState.activeNamespace)?.adapter;
 
-    if (adapter instanceof EVMAdapter && plainAddress && chainId) {
+    if (
+      (adapter instanceof EVMAdapter ||
+        adapter instanceof SolanaBaseAdapter ||
+        adapter instanceof BitcoinBaseAdapter) &&
+      plainAddress &&
+      chainId
+    ) {
       return adapter.signMessage(plainAddress, message, chainId);
     }
 

package/src/controllers/ModalController.ts

@@ -30,10 +30,14 @@ export const ModalController = {
   async open(options?: ModalControllerArguments['open']) {
     await ApiController.state.prefetchPromise;
     const isConnected = ConnectionsController.state.isConnected;
+    const isUniversalWallet = !!ConnectionsController.state.connection?.properties?.provider;
     if (options?.view) {
+      if (options.view === 'Account' && !isUniversalWallet) {
+        options.view = 'AccountDefault';
+      }
+
       RouterController.reset(options.view);
     } else if (isConnected) {
-      const isUniversalWallet = !!ConnectionsController.state.connection?.properties?.provider;
       RouterController.reset(isUniversalWallet ? 'Account' : 'AccountDefault');
     } else {
       RouterController.reset('Connect');

package/src/controllers/OnRampController.ts

@@ -124,7 +124,11 @@ export const OnRampController = {
           state.countriesDefaults?.find(d => d.countryCode === country.countryCode)
             ?.defaultCurrencyCode || 'USD';
 
-        const currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
+        let currency = state.paymentCurrencies?.find(c => c.currencyCode === currencyCode);
+
+        if (!currency) {
+          currency = state.paymentCurrencies?.find(c => c.currencyCode === 'USD');
+        }
 
         if (currency) {
           this.setPaymentCurrency(currency);

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,9 +15,7 @@ export interface RouterControllerState {
     | 'Connect'
     | 'ConnectSocials'
     | 'ConnectingExternal'
-    | 'ConnectingSiwe'
     | 'ConnectingSocial'
-    | 'ConnectingWalletConnect'
     | 'GetWallet'
     | 'Networks'
     | 'OnRamp'
@@ -25,13 +23,15 @@ export interface RouterControllerState {
     | 'OnRampLoading'
     | 'OnRampSettings'
     | 'OnRampTransaction'
-    | 'SwitchNetwork'
+    | 'SIWXSignMessage'
     | 'Swap'
     | 'SwapPreview'
+    | 'SwitchNetwork'
     | 'Transactions'
     | 'UnsupportedChain'
     | 'UpgradeEmailWallet'
     | 'WalletCompatibleNetworks'
+    | 'WalletConnect'
     | 'WalletReceive'
     | 'WalletSend'
     | 'WalletSendPreview'

package/src/controllers/SendController.ts

@@ -8,6 +8,7 @@ import { EventsController } from './EventsController';
 import { RouterController } from './RouterController';
 import { ConnectionsController } from './ConnectionsController';
 import { SwapController } from './SwapController';
+import { ConstantsUtil as CoreConstantsUtil } from '../utils/ConstantsUtil';
 
 // -- Types --------------------------------------------- //
 export interface TxParams {
@@ -118,13 +119,18 @@ export const SendController = {
       });
       RouterController.reset(isAuth ? 'Account' : 'AccountDefault');
       this.resetState();
-    } catch (error) {
+    } catch (error: any) {
       EventsController.sendEvent({
         type: 'track',
         event: 'SEND_ERROR',
         properties: eventProperties
       });
-      SnackController.showError('Something went wrong');
+
+      if (error?.message && error?.message.includes('user rejected')) {
+        SnackController.showError('Transaction cancelled');
+      } else {
+        SnackController.showError('Something went wrong');
+      }
     } finally {
       this.state.loading = false;
     }
@@ -222,7 +228,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/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 = {};