@reown/appkit-react-native 0.0.0-chore-spring-effect-20250909214820 → 0.0.0-chore-examples-20251009175707

package/src/AppKit.ts

@@ -15,6 +15,7 @@ import {
   SendController,
   BlockchainApiController,
   WalletUtil,
+  LogController,
   type RouterControllerState
 } from '@reown/appkit-core-react-native';
 
@@ -37,13 +38,20 @@ 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';
+
+const APPKIT_INSTANCE_KEY = Symbol.for('__REOWN_APPKIT_INSTANCE__');
+
+// Type helper to access the symbol-keyed property on globalThis
+interface GlobalWithAppKit {
+  [key: symbol]: AppKit | undefined;
+}
 
 export class AppKit {
   private projectId: string;
@@ -131,8 +139,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);
@@ -145,16 +152,12 @@ export class AppKit {
         });
       }
     } catch (error) {
-      console.warn('Connection failed:', error);
+      LogController.sendError(error, 'AppKit.ts', 'connect');
       throw error;
     }
   }
 
-  private async 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');
     }
@@ -176,19 +179,7 @@ export class AppKit {
     // Sync accounts
     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 });
   }
 
   /**
@@ -196,7 +187,7 @@ export class AppKit {
    * @param namespace - The namespace to disconnect from.
    * @param isInternal - Whether the disconnect is internal (i.e. from the AppKit) or external (i.e. from wallet side).
    */
-  async disconnect(namespace?: string, isInternal?: boolean): Promise<void> {
+  async disconnect(namespace?: ChainNamespace, isInternal?: boolean): Promise<void> {
     try {
       const activeNamespace = namespace ?? ConnectionsController.state.activeNamespace;
 
@@ -223,6 +214,7 @@ export class AppKit {
       SendController.resetState();
       OnRampController.resetState();
       WcController.resetState();
+      EventsController.resetState();
 
       if (ConnectionsController.state.activeNamespace === undefined) {
         ConnectionsController.setActiveNamespace(
@@ -230,15 +222,19 @@ export class AppKit {
         );
       }
 
-      if (OptionsController.state.isSiweEnabled) {
-        await SIWEController.signOut();
+      if (SIWXUtil.getSIWX()?.signOutOnDisconnect) {
+        await SIWXUtil.clearSessions();
       }
 
       EventsController.sendEvent({
         type: 'track',
-        event: 'DISCONNECT_SUCCESS'
+        event: 'DISCONNECT_SUCCESS',
+        properties: {
+          namespace: activeNamespace
+        }
       });
     } catch (error) {
+      LogController.sendError(error, 'AppKit.ts', 'disconnect');
       EventsController.sendEvent({
         type: 'track',
         event: 'DISCONNECT_ERROR'
@@ -249,7 +245,7 @@ export class AppKit {
   /**
    * Returns the provider for a given namespace.
    * @param namespace - The namespace to get the provider for.
-   * @returns The provider for the given namespace.
+   * @returns The provider for the given namespace, or null if not available or not yet initialized.
    */
   getProvider<T extends Provider>(namespace?: string): T | null {
     const activeNamespace = namespace ?? ConnectionsController.state.activeNamespace;
@@ -260,7 +256,15 @@ export class AppKit {
     );
     if (!connection || !connection.adapter || !connection.adapter.connector) return null;
 
-    return connection.adapter.connector.getProvider() as T;
+    try {
+      return connection.adapter.connector.getProvider() as T | null;
+    } catch (error) {
+      // Provider not initialized yet during session restoration
+      // This can happen on app restart when restoring a previous connection
+      LogController.sendError(error, 'AppKit.ts', 'getProvider');
+
+      return null;
+    }
   }
 
   getNetworks() {
@@ -285,7 +289,7 @@ export class AppKit {
       type: 'track',
       event: 'SWITCH_NETWORK',
       properties: {
-        network: network.id
+        network: network.caipNetworkId
       }
     });
 
@@ -298,15 +302,11 @@ 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
-      ) {
+    if (isSIWXRequired && ConnectionsController.state.isConnected) {
+      const sessions = await SIWXUtil.getSessions();
+      if (!sessions.length) {
         return await this.disconnect();
       }
     }
@@ -317,6 +317,7 @@ export class AppKit {
 
     RouterUtil.checkOnRampBack();
     RouterUtil.checkSocialLoginBack();
+    EventsController.sendWalletImpressions();
   }
 
   back() {
@@ -326,6 +327,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();
   }
 
@@ -396,25 +404,44 @@ export class AppKit {
    * This attempts to restore previous sessions.
    */
   private async initConnectors() {
+    ModalController.setLoading(true);
+
+    //Always init the walletconnect connector
+    await this.createWalletConnectConnector();
+
     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();
 
-          await 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);
+          LogController.sendError(error, 'AppKit.ts', 'initializeConnector', {
+            connectorType: connected.type
+          });
           await StorageUtil.removeConnectedConnectors(connected.type);
         }
       }
-      ModalController.setLoading(false);
+
+      const address = ConnectionsController.state.activeAddress;
+      const walletInfo = ConnectionsController.state.walletInfo;
+      if (address) {
+        EventsController.sendEvent({
+          type: 'track',
+          event: 'CONNECT_SUCCESS',
+          address: CoreHelperUtil.getPlainAddress(address),
+          properties: {
+            name: walletInfo?.name ?? 'Unknown',
+            reconnect: true
+          }
+        });
+      }
     }
+
+    ModalController.setLoading(false);
   }
 
   private setupAdaptersAndSubscribe(
@@ -506,6 +533,7 @@ export class AppKit {
           );
         }
       } catch (error) {
+        LogController.sendError(error, 'AppKit.ts', 'syncIdentity');
         // Continue processing other addresses even if one fails
       }
     }
@@ -524,8 +552,9 @@ export class AppKit {
           this.syncNativeBalance(adapter, network);
         }
       }
-    } catch {
+    } catch (error) {
       // ignore
+      LogController.sendError(error, 'AppKit.ts', 'refreshBalance');
     }
   }
 
@@ -603,11 +632,7 @@ export class AppKit {
   private subscribeToAdapterEvents(adapter: BlockchainAdapter): void {
     adapter.on('accountsChanged', ({ accounts }) => {
       const namespace = adapter.getSupportedNamespace();
-      const hasChanged = ConnectionsController.updateAccounts(namespace, accounts);
-
-      if (hasChanged && namespace === 'eip155') {
-        this.handleSiweChange({ isAccountChange: true });
-      }
+      ConnectionsController.updateAccounts(namespace, accounts);
     });
 
     adapter.on('chainChanged', async ({ chainId }) => {
@@ -618,6 +643,7 @@ export class AppKit {
 
       const namespace = adapter.getSupportedNamespace();
       const chain = `${namespace}:${chainId}` as CaipNetworkId;
+
       ConnectionsController.setActiveNetwork(namespace, chain);
 
       const connection = ConnectionsController.state.connections.get(namespace);
@@ -639,10 +665,13 @@ export class AppKit {
         TransactionsController.fetchTransactions(address, true);
       }
 
-      // Check if user needs to sign in again
-      if (namespace === 'eip155') {
-        this.handleSiweChange({ isNetworkChange: true });
-      }
+      const closeModal = RouterController.state.view === 'UnsupportedChain';
+
+      SIWXUtil.initializeIfEnabled({
+        onDisconnect: this.disconnect,
+        caipAddress: address,
+        closeModal
+      });
     });
 
     adapter.on('disconnect', () => {
@@ -658,6 +687,7 @@ export class AppKit {
 
   private async initControllers(options: AppKitConfig) {
     await this.initStorageAndValues(options);
+    let defaultNetwork;
 
     OptionsController.setProjectId(options.projectId);
     OptionsController.setMetadata(options.metadata);
@@ -667,15 +697,23 @@ export class AppKit {
     OptionsController.setFeaturedWalletIds(options.featuredWalletIds);
     OptionsController.setEnableAnalytics(options.enableAnalytics);
     OptionsController.setDebug(options.debug);
+
+    LogController.sendInfo('AppKit initialization started', 'AppKit.ts', 'initControllers', {
+      projectId: options.projectId,
+      adapters: this.adapters.map(a => a.constructor.name),
+      networks: this.networks.map(n => n.name),
+      debug: options.debug
+    });
+
     OptionsController.setFeatures(options.features);
     OptionsController.setRequestedNetworks(this.networks);
 
     if (options.defaultNetwork) {
-      const network = NetworkUtil.formatNetwork(options.defaultNetwork, this.projectId);
-      OptionsController.setDefaultNetwork(network);
+      defaultNetwork = NetworkUtil.formatNetwork(options.defaultNetwork, this.projectId);
+      OptionsController.setDefaultNetwork(defaultNetwork);
     }
 
-    ThemeController.setThemeMode(options.themeMode);
+    ThemeController.setDefaultThemeMode(options.themeMode);
     ThemeController.setThemeVariables(options.themeVariables);
 
     OptionsController.setSdkVersion(
@@ -688,9 +726,8 @@ export class AppKit {
 
     ConnectionsController.setNetworks(this.networks);
 
-    if (options.siweConfig) {
-      SIWEController.setSIWEClient(options.siweConfig);
-      OptionsController.setIsSiweEnabled(options.siweConfig.options.enabled);
+    if (options.siwx) {
+      OptionsController.setSiwx(options.siwx);
     }
 
     if (
@@ -699,6 +736,24 @@ export class AppKit {
     ) {
       OptionsController.setIsOnRampEnabled(true);
     }
+
+    EventsController.sendEvent({
+      type: 'track',
+      event: 'INITIALIZE',
+      properties: {
+        showWallets: options.features?.showWallets,
+        themeMode: options.themeMode,
+        themeVariables: options.themeVariables,
+        networks: this.networks.map(network => network.caipNetworkId).filter(Boolean),
+        defaultNetwork: defaultNetwork?.caipNetworkId,
+        metadata: options.metadata,
+        enableAnalytics: options.enableAnalytics,
+        features: options.features,
+        adapters: this.adapters.map(adapter => adapter?.constructor?.name).filter(Boolean),
+        extraConnectors: this.extraConnectors.map(connector => connector?.type).filter(Boolean),
+        siwx: !!options.siwx
+      }
+    });
   }
 
   private async initActiveNamespace() {
@@ -796,47 +851,43 @@ export class AppKit {
       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 || RouterController.state.view === 'ConnectingSiwe') {
-      // Do nothing if view is connecting siwe or siwe is not enabled
-      return;
-    }
-
-    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.navigate('ConnectingSiwe');
-      }
-    } else if (session && isNetworkChange) {
-      if (signOutOnNetworkChange) {
-        // If the network has changed and signOnNetworkChange is enabled, sign out
-        await SIWEController.signOut();
-
-        return this.navigate('ConnectingSiwe');
+/**
+ * Creates or returns the existing AppKit singleton instance.
+ *
+ * @warning This function implements a singleton pattern. If an instance already exists,
+ * it will be returned and the provided config parameter will be IGNORED. If you need to
+ * change configuration, you must reload your application or clear the singleton manually.
+ *
+ * @param config - AppKit configuration options
+ * @returns The AppKit singleton instance
+ * @throws Error if configuration validation fails
+ */
+export function createAppKit(config: AppKitConfig): AppKit {
+  try {
+    const globalWithAppKit = globalThis as GlobalWithAppKit;
+
+    if (!globalWithAppKit[APPKIT_INSTANCE_KEY]) {
+      if (config.debug && __DEV__) {
+        // using console.log to avoid possible issues with LogController not being initialized
+        //eslint-disable-next-line no-console
+        console.log('AppKit: Creating new instance - AppKit.ts:createAppKit');
       }
-    } else if (!session) {
-      // If it's connected but there's no session, show sign view
+      globalWithAppKit[APPKIT_INSTANCE_KEY] = new AppKit(config);
+    } else if (config.debug && __DEV__) {
+      //eslint-disable-next-line no-console
+      console.log('AppKit: Reusing existing instance - AppKit.ts:createAppKit');
+    }
 
-      return this.navigate('ConnectingSiwe');
-    } else if (isConnection) {
-      // Already connected with 1CA
-      ModalController.close();
+    return globalWithAppKit[APPKIT_INSTANCE_KEY]!;
+  } catch (error) {
+    if (__DEV__) {
+      // using console.error to avoid possible issues with LogController not being initialized
+      //eslint-disable-next-line no-console
+      console.error('AppKit: Failed to create instance - AppKit.ts:createAppKit', error);
     }
-  }
-}
 
-export function createAppKit(config: AppKitConfig): AppKit {
-  return new AppKit(config);
+    throw error;
+  }
 }

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) {
@@ -229,7 +193,7 @@ export class WalletConnectConnector extends WalletConnector {
 
   override getNamespaces(): Namespaces {
     const namespaces =
-      ((this.provider as IUniversalProvider)?.session?.namespaces as Namespaces) ?? {};
+      ((this.provider as UniversalProvider)?.session?.namespaces as Namespaces) ?? {};
     this.namespaces = namespaces;
 
     return namespaces;
@@ -244,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();
   }
@@ -259,7 +223,7 @@ export class WalletConnectConnector extends WalletConnector {
       return undefined;
     }
 
-    const chainId = (this.provider as IUniversalProvider).rpcProviders[
+    const chainId = (this.provider as UniversalProvider).rpcProviders[
       namespace
     ]?.getDefaultChain?.();