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

package/src/AppKit.ts

@@ -14,7 +14,8 @@ import {
   CoreHelperUtil,
   SendController,
   BlockchainApiController,
-  WalletUtil
+  WalletUtil,
+  type RouterControllerState
 } from '@reown/appkit-core-react-native';
 
 import {
@@ -36,13 +37,13 @@ import {
   type Connection,
   type WcWallet
 } from '@reown/appkit-common-react-native';
-import { SIWEController } from '@reown/appkit-siwe-react-native';
 
 import { WalletConnectConnector } from './connectors/WalletConnectConnector';
 import { WcHelpersUtil } from './utils/HelpersUtil';
 import { NetworkUtil } from './utils/NetworkUtil';
 import { RouterUtil } from './utils/RouterUtil';
 import { type AppKitConfig } from './types';
+import { SIWXUtil } from './utils/SIWXUtil';
 
 export class AppKit {
   private projectId: string;
@@ -130,8 +131,7 @@ export class AppKit {
       const approvedNamespaces = await connector.connect({
         namespaces: this.namespaces,
         defaultNetwork: chain,
-        universalLink: targetWallet?.link_mode ?? undefined,
-        siweConfig: this.config?.siweConfig
+        universalLink: targetWallet?.link_mode ?? undefined
       });
 
       this.processConnection(connector, approvedNamespaces);
@@ -149,11 +149,7 @@ export class AppKit {
     }
   }
 
-  private processConnection(
-    connector: WalletConnector,
-    namespaces?: Namespaces,
-    shouldCloseModal: boolean = true
-  ) {
+  private async processConnection(connector: WalletConnector, namespaces?: Namespaces) {
     if (!namespaces || Object.keys(namespaces).length === 0) {
       throw new Error('No namespaces provided');
     }
@@ -173,21 +169,9 @@ export class AppKit {
     this.setConnection(initializedAdapters, namespaces, walletInfo, properties);
 
     // Sync accounts
-    this.syncAccounts(initializedAdapters);
+    await this.syncAccounts(initializedAdapters);
 
-    // Handle SIWE if enabled
-    this.handleSiweConnectionIfEnabled(shouldCloseModal);
-  }
-
-  private handleSiweConnectionIfEnabled(shouldCloseModal: boolean = true): void {
-    if (
-      OptionsController.state.isSiweEnabled &&
-      ConnectionsController.state.activeNamespace === 'eip155'
-    ) {
-      this.handleSiweChange({ isConnection: true });
-    } else if (shouldCloseModal) {
-      ModalController.close();
-    }
+    await SIWXUtil.initializeIfEnabled({ onDisconnect: this.disconnect, closeModal: true });
   }
 
   /**
@@ -229,8 +213,8 @@ export class AppKit {
         );
       }
 
-      if (OptionsController.state.isSiweEnabled) {
-        await SIWEController.signOut();
+      if (SIWXUtil.getSIWX()?.signOutOnDisconnect) {
+        await SIWXUtil.clearSessions();
       }
 
       EventsController.sendEvent({
@@ -289,10 +273,6 @@ export class AppKit {
     });
 
     ConnectionsController.setActiveNetwork(network.chainNamespace, network.caipNetworkId);
-
-    if (ConnectionsController.state.activeNamespace !== network.chainNamespace) {
-      ConnectionsController.setActiveNamespace(network.chainNamespace);
-    }
   }
 
   open(options?: AppKitOpenOptions) {
@@ -301,19 +281,19 @@ export class AppKit {
 
   async close() {
     ModalController.close();
+    const isSIWXRequired = SIWXUtil.getSIWX()?.getRequired?.();
 
-    if (OptionsController.state.isSiweEnabled && ConnectionsController.state.isConnected) {
-      const session = await SIWEController.getSession();
-      if (
-        !session &&
-        SIWEController.state.status !== 'success' &&
-        ConnectionsController.state.activeNamespace === 'eip155' &&
-        !!ConnectionsController.state.activeAddress
-      ) {
-        await this.disconnect();
+    if (isSIWXRequired && ConnectionsController.state.isConnected) {
+      const sessions = await SIWXUtil.getSessions();
+      if (!sessions.length) {
+        return await this.disconnect();
       }
     }
 
+    if (RouterController.state.view === 'UnsupportedChain') {
+      return await this.disconnect();
+    }
+
     RouterUtil.checkOnRampBack();
     RouterUtil.checkSocialLoginBack();
   }
@@ -325,6 +305,13 @@ export class AppKit {
       return RouterController.goBack();
     }
 
+    const isSIWXRequired = SIWXUtil.getSIWX()?.getRequired?.();
+
+    if (isSIWXRequired) {
+      // Don't close the modal if SIWX is required
+      return;
+    }
+
     return this.close();
   }
 
@@ -332,11 +319,16 @@ export class AppKit {
     const adapter = this.getAdapterByNamespace(namespace);
     if (!adapter) throw new Error('No active adapter');
 
-    ConnectionsController.setAccountType(namespace, type);
+    const address = ConnectionsController.setAccountType(namespace, type);
 
     // Get balances from API
     ConnectionsController.fetchBalance();
 
+    // Fetch transactions for the new account
+    if (address) {
+      TransactionsController.fetchTransactions(address, true);
+    }
+
     // Sync balances from adapter
     this.syncNativeBalance(adapter, network);
 
@@ -390,25 +382,27 @@ export class AppKit {
    * This attempts to restore previous sessions.
    */
   private async initConnectors() {
+    ModalController.setLoading(true);
     const connectedConnectors = await StorageUtil.getConnectedConnectors();
     if (connectedConnectors.length > 0) {
-      ModalController.setLoading(true);
-
       for (const connected of connectedConnectors) {
         try {
           const connector = await this.createConnector(connected.type);
 
           const namespaces = connector.getNamespaces();
 
-          this.processConnection(connector, namespaces, false);
+          await this.processConnection(connector, namespaces);
         } catch (error) {
           // Use console.warn for non-critical initialization failures
           console.warn(`Failed to initialize connector type ${connected.type}:`, error);
           await StorageUtil.removeConnectedConnectors(connected.type);
         }
       }
-      ModalController.setLoading(false);
     }
+
+    //Always init the walletconnect connector
+    await this.createWalletConnectConnector();
+    ModalController.setLoading(false);
   }
 
   private setupAdaptersAndSubscribe(
@@ -505,7 +499,7 @@ export class AppKit {
     }
   }
 
-  private async refreshBalance(fetchAllBalances: boolean = false) {
+  private refreshBalance(fetchAllBalances: boolean = false) {
     try {
       if (fetchAllBalances) {
         ConnectionsController.fetchBalance();
@@ -542,7 +536,6 @@ export class AppKit {
     const recomputePolling = () => {
       const open = ModalController.state.open;
       const view = RouterController.state.view;
-
       if (open && (view === 'Account' || view === 'AccountDefault')) {
         // fetch all balances when user is using embedded wallet
         this.startBalancePolling(view === 'Account');
@@ -550,9 +543,7 @@ export class AppKit {
         this.stopBalancePolling();
       }
     };
-
     recomputePolling();
-
     subscribeKey(RouterController.state, 'view', () => recomputePolling());
     subscribeKey(ModalController.state, 'open', () => recomputePolling());
   }
@@ -573,7 +564,8 @@ export class AppKit {
       const caipNetwork = adapter?.connector?.getChainId(namespace);
       const namespaceProperties = {
         ...properties,
-        smartAccounts: properties?.smartAccounts?.filter(account => account.startsWith(namespace))
+        smartAccounts: properties?.smartAccounts?.filter(account => account.startsWith(namespace)),
+        canAddEvmChain: wallet?.name === 'MetaMask Wallet' // MetaMask allows adding EVM chains after connecting
       };
 
       ConnectionsController.setConnection({
@@ -600,21 +592,21 @@ export class AppKit {
     adapter.on('accountsChanged', ({ accounts }) => {
       const namespace = adapter.getSupportedNamespace();
       ConnectionsController.updateAccounts(namespace, accounts);
+    });
 
-      if (namespace === 'eip155') {
-        this.handleSiweChange({ isAccountChange: true });
+    adapter.on('chainChanged', async ({ chainId }) => {
+      const isSupported = this.networks.some(network => network.id?.toString() === chainId);
+      if (!isSupported) {
+        return this.navigate('UnsupportedChain');
       }
-    });
 
-    adapter.on('chainChanged', ({ chainId }) => {
       const namespace = adapter.getSupportedNamespace();
       const chain = `${namespace}:${chainId}` as CaipNetworkId;
       ConnectionsController.setActiveNetwork(namespace, chain);
+
       const connection = ConnectionsController.state.connections.get(namespace);
       const isAuth = !!connection?.properties?.provider;
 
-      const activeNamespace = ConnectionsController.state.activeNamespace;
-
       const network = this.networks.find(n => n.id?.toString() === chainId);
       this.syncNativeBalance(adapter, network);
       SendController.resetState();
@@ -624,20 +616,14 @@ export class AppKit {
         ConnectionsController.fetchBalance();
       }
 
-      // Refresh transactions only when the active network changes
-      if (namespace === activeNamespace) {
-        const address = connection?.accounts?.find(account =>
-          account.startsWith(`${namespace}:${chainId}`)
-        );
-        if (address) {
-          TransactionsController.fetchTransactions(address, true);
-        }
+      const address = connection?.accounts?.find(account =>
+        account.startsWith(`${namespace}:${chainId}`)
+      );
+      if (address) {
+        TransactionsController.fetchTransactions(address, true);
       }
 
-      // Check if user needs to sign in again
-      if (namespace === 'eip155') {
-        this.handleSiweChange({ isNetworkChange: true });
-      }
+      SIWXUtil.initializeIfEnabled({ onDisconnect: this.disconnect, caipAddress: address });
     });
 
     adapter.on('disconnect', () => {
@@ -670,7 +656,7 @@ export class AppKit {
       OptionsController.setDefaultNetwork(network);
     }
 
-    ThemeController.setThemeMode(options.themeMode);
+    ThemeController.setDefaultThemeMode(options.themeMode);
     ThemeController.setThemeVariables(options.themeVariables);
 
     OptionsController.setSdkVersion(
@@ -683,8 +669,8 @@ export class AppKit {
 
     ConnectionsController.setNetworks(this.networks);
 
-    if (options.siweConfig) {
-      SIWEController.setSIWEClient(options.siweConfig);
+    if (options.siwx) {
+      OptionsController.setSiwx(options.siwx);
     }
 
     if (
@@ -779,48 +765,17 @@ export class AppKit {
     await this.initRecentWallets(options);
   }
 
-  private onSiweNavigation = () => {
+  private navigate = (routeName: RouterControllerState['view']) => {
+    if (RouterController.state.view === routeName) {
+      return;
+    }
+
     if (ModalController.state.open) {
-      RouterController.push('ConnectingSiwe');
+      RouterController.push(routeName);
     } else {
-      ModalController.open({ view: 'ConnectingSiwe' });
+      ModalController.open({ view: routeName });
     }
   };
-
-  private async handleSiweChange(params?: {
-    isConnection?: boolean;
-    isNetworkChange?: boolean;
-    isAccountChange?: boolean;
-  }) {
-    const { isNetworkChange, isAccountChange, isConnection } = params ?? {};
-    const { enabled, signOutOnAccountChange, signOutOnNetworkChange } =
-      SIWEController.state._client?.options ?? {};
-
-    if (enabled) {
-      const session = await SIWEController.getSession();
-      if (session && isAccountChange) {
-        if (signOutOnAccountChange) {
-          // If the address has changed and signOnAccountChange is enabled, sign out
-          await SIWEController.signOut();
-
-          return this.onSiweNavigation();
-        }
-      } else if (isNetworkChange) {
-        if (signOutOnNetworkChange) {
-          // If the network has changed and signOnNetworkChange is enabled, sign out
-          await SIWEController.signOut();
-
-          return this.onSiweNavigation();
-        }
-      } else if (!session) {
-        // If it's connected but there's no session, show sign view
-        return this.onSiweNavigation();
-      } else if (isConnection) {
-        // Connected with 1CA
-        ModalController.close();
-      }
-    }
-  }
 }
 
 export function createAppKit(config: AppKitConfig): AppKit {

package/src/AppKitContext.tsx

@@ -1,4 +1,4 @@
-import React, { createContext, useContext, type ReactNode } from 'react';
+import React, { createContext, useContext, useMemo, type ReactNode } from 'react';
 import { AppKit } from './AppKit';
 
 interface AppKitContextType {
@@ -26,14 +26,22 @@ export const useInternalAppKit = () => {
     throw new Error('AppKit instance is not yet available in context.');
   }
 
-  return {
-    connect: context.appKit.connect.bind(context.appKit),
-    disconnect: context.appKit.disconnect.bind(context.appKit),
-    open: context.appKit.open.bind(context.appKit),
-    close: context.appKit.close.bind(context.appKit),
-    back: context.appKit.back.bind(context.appKit),
-    switchNetwork: context.appKit.switchNetwork.bind(context.appKit),
-    getProvider: context.appKit.getProvider.bind(context.appKit),
-    switchAccountType: context.appKit.switchAccountType.bind(context.appKit)
-  };
+  const stableFunctions = useMemo(() => {
+    if (!context.appKit) {
+      throw new Error('AppKit instance is not available');
+    }
+
+    return {
+      connect: context.appKit.connect.bind(context.appKit),
+      disconnect: context.appKit.disconnect.bind(context.appKit),
+      open: context.appKit.open.bind(context.appKit),
+      close: context.appKit.close.bind(context.appKit),
+      back: context.appKit.back.bind(context.appKit),
+      switchNetwork: context.appKit.switchNetwork.bind(context.appKit),
+      getProvider: context.appKit.getProvider.bind(context.appKit),
+      switchAccountType: context.appKit.switchAccountType.bind(context.appKit)
+    };
+  }, [context.appKit]);
+
+  return stableFunctions;
 };

package/src/connectors/WalletConnectConnector.ts

@@ -1,5 +1,5 @@
 import { WcController } from '@reown/appkit-core-react-native';
-import { UniversalProvider, type IUniversalProvider } from '@walletconnect/universal-provider';
+import UniversalProvider from '@walletconnect/universal-provider';
 import {
   WalletConnector,
   type AppKitNetwork,
@@ -14,7 +14,7 @@ import {
   type ConnectionProperties,
   type RequestArguments
 } from '@reown/appkit-common-react-native';
-import { getDidAddress, getDidChainId, SIWEController } from '@reown/appkit-siwe-react-native';
+import { SIWXUtil } from '../utils/SIWXUtil';
 
 interface WalletConnectConnectorConfig {
   projectId: string;
@@ -42,7 +42,7 @@ export class WalletConnectConnector extends WalletConnector {
   }
 
   override async restoreSession(): Promise<boolean> {
-    const provider = this.getProvider() as IUniversalProvider;
+    const provider = this.getProvider() as UniversalProvider;
     if (!provider) {
       return false;
     }
@@ -67,9 +67,15 @@ export class WalletConnectConnector extends WalletConnector {
         this.wallet = {
           ...metadata,
           name: metadata.name,
-          icon: metadata.icons?.[0]
+          icon: metadata.icons?.[0],
+          type: 'walletconnect'
         };
       }
+    } else {
+      this.wallet = {
+        name: 'Unknown Wallet',
+        type: 'walletconnect'
+      };
     }
 
     return true;
@@ -81,7 +87,7 @@ export class WalletConnectConnector extends WalletConnector {
   }: {
     projectId: string;
     metadata: Metadata;
-  }): Promise<IUniversalProvider> {
+  }): Promise<UniversalProvider> {
     if (!this.provider) {
       this.provider = (await UniversalProvider.init({
         projectId,
@@ -90,82 +96,36 @@ export class WalletConnectConnector extends WalletConnector {
       })) as Provider;
     }
 
-    return this.provider as IUniversalProvider;
+    return this.provider as UniversalProvider;
   }
 
   override async connect(opts: ConnectOptions) {
-    const { siweConfig, namespaces, defaultNetwork, universalLink } = opts;
+    const { namespaces, defaultNetwork, universalLink } = opts;
     function onUri(uri: string) {
       WcController.setWcUri(uri);
     }
 
-    const provider = this.getProvider() as IUniversalProvider;
+    const provider = this.getProvider() as UniversalProvider;
 
     // @ts-ignore
     provider.on('display_uri', onUri);
 
-    let session: IUniversalProvider['session'];
+    let session: UniversalProvider['session'];
 
     // SIWE
     const isEVMOnly = Object.keys(namespaces ?? {}).length === 1 && namespaces?.['eip155'];
-    const params = await siweConfig?.getMessageParams?.();
-    if (siweConfig?.options?.enabled && params && Object.keys(params).length > 0 && isEVMOnly) {
+
+    if (isEVMOnly && SIWXUtil.getSIWX()) {
       // 1CA is only supported on EVM
 
-      // @ts-ignore
-      const result = await provider.authenticate(
-        {
-          ...params,
-          nonce: await siweConfig.getNonce(),
-          methods: namespaces?.['eip155']?.methods,
-          chains: params.chains
-        },
+      session = await SIWXUtil.universalProviderAuthenticate({
+        universalProvider: this.provider as UniversalProvider,
+        chains: namespaces?.['eip155']?.chains ?? [],
+        methods: namespaces?.['eip155']?.methods ?? [],
         universalLink
-      );
-
-      // Auths is an array of signed CACAO objects https://github.com/ChainAgnostic/CAIPs/blob/main/CAIPs/caip-74.md
-      const signedCacao = result?.auths?.[0];
-      if (signedCacao) {
-        const { p, s } = signedCacao;
-        const chainId = getDidChainId(p.iss);
-        const address = getDidAddress(p.iss);
-
-        try {
-          // Kicks off verifyMessage and populates external states
-          const message = provider?.client?.formatAuthMessage({
-            request: p,
-            iss: p.iss
-          })!;
-
-          await SIWEController.verifyMessage({
-            message,
-            signature: s.s,
-            cacao: signedCacao
-          });
-
-          if (address && chainId) {
-            const siweSession = {
-              address,
-              chainId: parseInt(chainId, 10)
-            };
-
-            SIWEController.setSession(siweSession);
-            SIWEController.onSignIn?.(siweSession);
-          }
-        } catch (error) {
-          // eslint-disable-next-line no-console
-          console.error('Error verifying message', error);
-          // eslint-disable-next-line no-console
-          await provider.disconnect().catch(console.error);
-          // eslint-disable-next-line no-console
-          await SIWEController.signOut().catch(console.error);
-          throw error;
-        }
-      }
-      session = result?.session;
+      });
     } else {
-      session = await (this.provider as IUniversalProvider).connect({
-        namespaces: {},
+      session = await (this.provider as UniversalProvider).connect({
         optionalNamespaces: namespaces
       });
     }
@@ -175,14 +135,18 @@ export class WalletConnectConnector extends WalletConnector {
       this.wallet = {
         ...metadata,
         name: metadata?.name,
-        icon: metadata?.icons?.[0]
+        icon: metadata?.icons?.[0],
+        type: 'walletconnect'
       };
     } else {
-      this.wallet = undefined;
+      this.wallet = {
+        name: 'Unknown Wallet',
+        type: 'walletconnect'
+      };
     }
 
     if (defaultNetwork?.caipNetworkId) {
-      (this.provider as IUniversalProvider).setDefaultChain(defaultNetwork.caipNetworkId);
+      (this.provider as UniversalProvider).setDefaultChain(defaultNetwork.caipNetworkId);
     }
 
     if (session?.sessionProperties) {
@@ -199,7 +163,7 @@ export class WalletConnectConnector extends WalletConnector {
 
     provider.off('display_uri', onUri);
 
-    return this.namespaces;
+    return (session?.namespaces as Namespaces) ?? {};
   }
 
   override getProvider(namespace?: ChainNamespace): Provider {
@@ -207,13 +171,16 @@ export class WalletConnectConnector extends WalletConnector {
       throw new Error('WalletConnectConnector: Provider not initialized. Call init() first.');
     }
 
-    const provider = this.provider as IUniversalProvider;
+    const provider = this.provider;
 
     if (namespace) {
-      // @ts-ignore
       return {
-        ...provider,
-        request: (args: RequestArguments, chainId?: CaipNetworkId) => {
+        ...this.provider,
+        connect: async (params?: any) => provider.connect(params) as Promise<any>,
+        disconnect: provider.disconnect.bind(provider),
+        on: provider.on.bind(provider),
+        off: provider.off.bind(provider),
+        request: async (args: RequestArguments, chainId?: CaipNetworkId) => {
           const _chainId = this.getChainId(namespace);
 
           return provider.request(args, chainId || _chainId);
@@ -225,7 +192,11 @@ export class WalletConnectConnector extends WalletConnector {
   }
 
   override getNamespaces(): Namespaces {
-    return this.namespaces ?? {};
+    const namespaces =
+      ((this.provider as UniversalProvider)?.session?.namespaces as Namespaces) ?? {};
+    this.namespaces = namespaces;
+
+    return namespaces;
   }
 
   override getProperties(): ConnectionProperties | undefined {
@@ -237,7 +208,7 @@ export class WalletConnectConnector extends WalletConnector {
 
     let caipNetworkId = network.caipNetworkId ?? `eip155:${network.id}`;
 
-    (this.provider as IUniversalProvider).setDefaultChain(caipNetworkId);
+    (this.provider as UniversalProvider).setDefaultChain(caipNetworkId);
 
     return Promise.resolve();
   }
@@ -247,11 +218,12 @@ export class WalletConnectConnector extends WalletConnector {
   }
 
   override getChainId(namespace: ChainNamespace): CaipNetworkId | undefined {
-    if (!this.namespaces || !this.namespaces[namespace]) {
+    const namespaces = this.getNamespaces();
+    if (!namespaces || !namespaces[namespace]) {
       return undefined;
     }
 
-    const chainId = (this.provider as IUniversalProvider).rpcProviders[
+    const chainId = (this.provider as UniversalProvider).rpcProviders[
       namespace
     ]?.getDefaultChain?.();
 

package/src/hooks/useAccount.ts

@@ -1,5 +1,7 @@
+/* eslint-disable valtio/state-snapshot-rule */
+import { useMemo } from 'react';
 import { useSnapshot } from 'valtio';
-import { ConnectionsController } from '@reown/appkit-core-react-native';
+import { ConnectionsController, CoreHelperUtil } from '@reown/appkit-core-react-native';
 import { useAppKit } from './useAppKit';
 
 export function useAccount() {
@@ -8,15 +10,23 @@ export function useAccount() {
   const {
     activeAddress: address,
     activeNamespace,
-    connections
+    connection,
+    networks
   } = useSnapshot(ConnectionsController.state);
 
-  const connection = activeNamespace ? connections.get(activeNamespace) : undefined;
+  const activeChain = useMemo(
+    () =>
+      connection?.caipNetwork
+        ? networks.find(network => network.caipNetworkId === connection?.caipNetwork)
+        : undefined,
+    [connection?.caipNetwork, networks]
+  );
 
   return {
-    address: address?.split(':')[2],
+    address: CoreHelperUtil.getPlainAddress(address),
     isConnected: !!address,
-    chainId: connection?.caipNetwork,
+    chainId: activeChain?.id,
+    chain: activeChain,
     namespace: activeNamespace
   };
 }