@web3auth/modal 10.16.0 → 11.0.0-beta.1

package/dist/lib.cjs/packages/modal/src/vue/composables/useWeb3AuthConnect.js

@@ -1,59 +1,57 @@
 'use strict';
 
 var noModal = require('@web3auth/no-modal');
-var vue = require('vue');
+var vue = require('@web3auth/no-modal/vue');
+var vue$1 = require('vue');
 var useWeb3AuthInner = require('./useWeb3AuthInner.js');
 
 const useWeb3AuthConnect = () => {
   const {
-    web3Auth,
-    isConnected
+    web3Auth
   } = useWeb3AuthInner.useWeb3AuthInner();
-  const loading = vue.ref(false);
-  const error = vue.ref(null);
-  const connectorName = vue.ref(null);
-  vue.watch(isConnected, newVal => {
-    if (!newVal && connectorName.value) {
-      connectorName.value = null;
-    }
-    if (newVal && !connectorName.value) {
-      var _web3Auth$value;
-      connectorName.value = (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.connectedConnectorName;
-    }
+  // Web3AuthModal extends the NoModal class, so we can use the same composable
+  const {
+    isConnected,
+    loading: sharedLoading,
+    error: sharedError,
+    connectorName,
+    connect: sharedConnectTo
+  } = vue.useWeb3AuthConnect();
+  const loading = vue$1.ref(false);
+  const error = vue$1.ref(null);
+  const connectLoading = vue$1.ref(false);
+  const connectError = vue$1.ref(null);
+  const activeFlow = vue$1.ref(null);
+  vue$1.watch([connectLoading, sharedLoading], ([newConnectLoading, newSharedLoading]) => {
+    loading.value = newConnectLoading || newSharedLoading;
+  }, {
+    immediate: true
+  });
+  vue$1.watch([activeFlow, connectError, sharedError], ([newActiveFlow, newConnectError, newSharedError]) => {
+    error.value = newActiveFlow === "connect" ? newConnectError : newSharedError;
   }, {
     immediate: true
   });
   const connect = async () => {
     try {
+      activeFlow.value = "connect";
       if (!web3Auth.value) throw noModal.WalletInitializationError.notReady();
-      error.value = null;
-      loading.value = true;
+      connectError.value = null;
+      connectLoading.value = true;
       const localProvider = await web3Auth.value.connect();
-      connectorName.value = web3Auth.value.connectedConnectorName;
       return localProvider;
     } catch (err) {
       noModal.log.error("Error connecting", err);
-      error.value = err;
+      connectError.value = err;
       return null;
     } finally {
-      loading.value = false;
+      connectLoading.value = false;
     }
   };
   const connectTo = async (connectorType, loginParams) => {
-    try {
-      if (!web3Auth.value) throw noModal.WalletInitializationError.notReady();
-      error.value = null;
-      loading.value = true;
-      const localProvider = await web3Auth.value.connectTo(connectorType, loginParams);
-      connectorName.value = web3Auth.value.connectedConnectorName;
-      return localProvider;
-    } catch (err) {
-      noModal.log.error("Error connecting to", err);
-      error.value = err;
-      return null;
-    } finally {
-      loading.value = false;
-    }
+    activeFlow.value = "connectTo";
+    connectError.value = null;
+    return sharedConnectTo(connectorType, loginParams);
   };
   return {
     isConnected,

package/dist/lib.cjs/packages/modal/src/vue/composables/useWeb3AuthInner.js

@@ -1,12 +1,9 @@
 'use strict';
 
-var noModal = require('@web3auth/no-modal');
-var vue = require('vue');
+var vue = require('@web3auth/no-modal/vue');
 
 const useWeb3AuthInner = () => {
-  const context = vue.inject(noModal.Web3AuthContextKey);
-  if (!context) throw noModal.WalletInitializationError.fromCode(1000, "usage of `useWeb3Auth` not wrapped in `Web3AuthProvider`.");
-  return context;
+  return vue.useInjectedWeb3AuthInnerContext();
 };
 
 exports.useWeb3AuthInner = useWeb3AuthInner;

package/dist/lib.cjs/packages/modal/src/vue/index.js

@@ -1,39 +1,72 @@
 'use strict';
 
-var useChain = require('./composables/useChain.js');
-var useCheckout = require('./composables/useCheckout.js');
-var useEnableMFA = require('./composables/useEnableMFA.js');
-var useFunding = require('./composables/useFunding.js');
-var useIdentityToken = require('./composables/useIdentityToken.js');
-var useManageMFA = require('./composables/useManageMFA.js');
-var useReceive = require('./composables/useReceive.js');
-var useSwap = require('./composables/useSwap.js');
-var useSwitchChain = require('./composables/useSwitchChain.js');
-var useWalletConnectScanner = require('./composables/useWalletConnectScanner.js');
-var useWalletServicesPlugin = require('./composables/useWalletServicesPlugin.js');
-var useWalletUI = require('./composables/useWalletUI.js');
+var vue = require('@web3auth/no-modal/vue');
 var useWeb3Auth = require('./composables/useWeb3Auth.js');
 var useWeb3AuthConnect = require('./composables/useWeb3AuthConnect.js');
-var useWeb3AuthDisconnect = require('./composables/useWeb3AuthDisconnect.js');
-var useWeb3AuthUser = require('./composables/useWeb3AuthUser.js');
 var Web3AuthProvider = require('./Web3AuthProvider.js');
 
 
 
-exports.useChain = useChain.useChain;
-exports.useCheckout = useCheckout.useCheckout;
-exports.useEnableMFA = useEnableMFA.useEnableMFA;
-exports.useFunding = useFunding.useFunding;
-exports.useIdentityToken = useIdentityToken.useIdentityToken;
-exports.useManageMFA = useManageMFA.useManageMFA;
-exports.useReceive = useReceive.useReceive;
-exports.useSwap = useSwap.useSwap;
-exports.useSwitchChain = useSwitchChain.useSwitchChain;
-exports.useWalletConnectScanner = useWalletConnectScanner.useWalletConnectScanner;
-exports.useWalletServicesPlugin = useWalletServicesPlugin.useWalletServicesPlugin;
-exports.useWalletUI = useWalletUI.useWalletUI;
+Object.defineProperty(exports, "useAuthTokenInfo", {
+	enumerable: true,
+	get: function () { return vue.useAuthTokenInfo; }
+});
+Object.defineProperty(exports, "useChain", {
+	enumerable: true,
+	get: function () { return vue.useChain; }
+});
+Object.defineProperty(exports, "useCheckout", {
+	enumerable: true,
+	get: function () { return vue.useCheckout; }
+});
+Object.defineProperty(exports, "useEnableMFA", {
+	enumerable: true,
+	get: function () { return vue.useEnableMFA; }
+});
+Object.defineProperty(exports, "useFunding", {
+	enumerable: true,
+	get: function () { return vue.useFunding; }
+});
+Object.defineProperty(exports, "useManageMFA", {
+	enumerable: true,
+	get: function () { return vue.useManageMFA; }
+});
+Object.defineProperty(exports, "useReceive", {
+	enumerable: true,
+	get: function () { return vue.useReceive; }
+});
+Object.defineProperty(exports, "useSwap", {
+	enumerable: true,
+	get: function () { return vue.useSwap; }
+});
+Object.defineProperty(exports, "useSwitchChain", {
+	enumerable: true,
+	get: function () { return vue.useSwitchChain; }
+});
+Object.defineProperty(exports, "useWalletConnectScanner", {
+	enumerable: true,
+	get: function () { return vue.useWalletConnectScanner; }
+});
+Object.defineProperty(exports, "useWalletServicesPlugin", {
+	enumerable: true,
+	get: function () { return vue.useWalletServicesPlugin; }
+});
+Object.defineProperty(exports, "useWalletUI", {
+	enumerable: true,
+	get: function () { return vue.useWalletUI; }
+});
+Object.defineProperty(exports, "useWallets", {
+	enumerable: true,
+	get: function () { return vue.useWallets; }
+});
+Object.defineProperty(exports, "useWeb3AuthDisconnect", {
+	enumerable: true,
+	get: function () { return vue.useWeb3AuthDisconnect; }
+});
+Object.defineProperty(exports, "useWeb3AuthUser", {
+	enumerable: true,
+	get: function () { return vue.useWeb3AuthUser; }
+});
 exports.useWeb3Auth = useWeb3Auth.useWeb3Auth;
 exports.useWeb3AuthConnect = useWeb3AuthConnect.useWeb3AuthConnect;
-exports.useWeb3AuthDisconnect = useWeb3AuthDisconnect.useWeb3AuthDisconnect;
-exports.useWeb3AuthUser = useWeb3AuthUser.useWeb3AuthUser;
 exports.Web3AuthProvider = Web3AuthProvider.Web3AuthProvider;

package/dist/lib.cjs/packages/modal/src/vue/solana/index.js

@@ -1,13 +1,34 @@
 'use strict';
 
-var useSignAndSendTransaction = require('./composables/useSignAndSendTransaction.js');
-var useSignMessage = require('./composables/useSignMessage.js');
-var useSignTransaction = require('./composables/useSignTransaction.js');
-var useSolanaWallet = require('./composables/useSolanaWallet.js');
+var solana = require('@web3auth/no-modal/vue/solana');
 
 
 
-exports.useSignAndSendTransaction = useSignAndSendTransaction.useSignAndSendTransaction;
-exports.useSignMessage = useSignMessage.useSignMessage;
-exports.useSignTransaction = useSignTransaction.useSignTransaction;
-exports.useSolanaWallet = useSolanaWallet.useSolanaWallet;
+Object.defineProperty(exports, "SOLANA_CLIENT_KEY", {
+	enumerable: true,
+	get: function () { return solana.SOLANA_CLIENT_KEY; }
+});
+Object.defineProperty(exports, "SolanaProvider", {
+	enumerable: true,
+	get: function () { return solana.SolanaProvider; }
+});
+Object.defineProperty(exports, "useSignAndSendTransaction", {
+	enumerable: true,
+	get: function () { return solana.useSignAndSendTransaction; }
+});
+Object.defineProperty(exports, "useSignMessage", {
+	enumerable: true,
+	get: function () { return solana.useSignMessage; }
+});
+Object.defineProperty(exports, "useSignTransaction", {
+	enumerable: true,
+	get: function () { return solana.useSignTransaction; }
+});
+Object.defineProperty(exports, "useSolanaClient", {
+	enumerable: true,
+	get: function () { return solana.useSolanaClient; }
+});
+Object.defineProperty(exports, "useSolanaWallet", {
+	enumerable: true,
+	get: function () { return solana.useSolanaWallet; }
+});

package/dist/lib.cjs/packages/modal/src/vue/wagmi/provider.js

@@ -2,15 +2,14 @@
 
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var core = require('@wagmi/core');
-var vue$1 = require('@wagmi/vue');
+var vue$2 = require('@wagmi/vue');
 var connectors = require('@wagmi/vue/connectors');
 var auth = require('@web3auth/auth');
 var noModal = require('@web3auth/no-modal');
 var viem = require('viem');
 var vue = require('vue');
-require('@web3auth/no-modal/vue');
+var vue$1 = require('@web3auth/no-modal/vue');
 var useWeb3Auth = require('../composables/useWeb3Auth.js');
-var useWeb3AuthDisconnect = require('../composables/useWeb3AuthDisconnect.js');
 var constants = require('./constants.js');
 
 const WEB3AUTH_CONNECTOR_ID = "web3auth";
@@ -76,16 +75,18 @@ const Web3AuthWagmiProvider = vue.defineComponent({
   setup() {
     const {
       isConnected,
-      provider
+      connection,
+      web3Auth
     } = useWeb3Auth.useWeb3Auth();
     const {
       disconnect
-    } = useWeb3AuthDisconnect.useWeb3AuthDisconnect();
-    const wagmiConfig = vue$1.useConfig();
+    } = vue$1.useWeb3AuthDisconnect();
+    const wagmiConfig = vue$2.useConfig();
     const {
-      reconnect
-    } = vue$1.useReconnect();
-    vue$1.useAccountEffect({
+      mutate: reconnect
+    } = vue$2.useReconnect();
+    const lastSyncedWeb3AuthConnection = vue.shallowRef(null);
+    vue$2.useConnectionEffect({
       onDisconnect: async () => {
         noModal.log.info("Disconnected from wagmi");
         if (isConnected.value) await disconnect();
@@ -97,16 +98,29 @@ const Web3AuthWagmiProvider = vue.defineComponent({
         }
       }
     });
-    vue.watch(isConnected, async newIsConnected => {
-      if (newIsConnected && provider.value) {
-        const connector = await setupConnector(provider.value, wagmiConfig);
-        if (!connector) {
-          noModal.log.error("Failed to setup vue wagmi connector");
-          throw new Error("Failed to setup connector");
+    vue.watch([isConnected, connection], async () => {
+      var _newConnection$ethere, _web3Auth$value;
+      const newIsConnected = isConnected.value;
+      const newConnection = connection.value;
+      const newEth = (_newConnection$ethere = newConnection === null || newConnection === void 0 ? void 0 : newConnection.ethereumProvider) !== null && _newConnection$ethere !== void 0 ? _newConnection$ethere : null;
+      if (newIsConnected && newConnection && newEth && newConnection.connectorName === ((_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.primaryConnectorName)) {
+        // `ethereumProvider` is a stable proxy (`commonJRPCProvider`) across account switches,
+        // so key wagmi resyncs off the Web3Auth connection object instead of provider identity.
+        if (lastSyncedWeb3AuthConnection.value !== newConnection) {
+          if (getWeb3authConnector(wagmiConfig)) {
+            resetConnectorState(wagmiConfig);
+          }
+          lastSyncedWeb3AuthConnection.value = newConnection;
+          const connector = await setupConnector(newEth, wagmiConfig);
+          if (!connector) {
+            noModal.log.error("Failed to setup vue wagmi connector");
+            throw new Error("Failed to setup connector");
+          }
+          await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+          reconnect();
         }
-        await connectWeb3AuthWithWagmi(connector, wagmiConfig);
-        reconnect();
       } else if (!newIsConnected) {
+        lastSyncedWeb3AuthConnection.value = null;
         if (wagmiConfig.state.status === "connected") {
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
         }
@@ -132,7 +146,7 @@ const Web3AuthWagmiInnerProvider = vue.defineComponent({
     const {
       config
     } = props;
-    vue.provide(vue$1.configKey, config);
+    vue.provide(vue$2.configKey, config);
   },
   render() {
     var _this$$slots$default2;
@@ -172,7 +186,7 @@ const WagmiProvider = vue.defineComponent({
       return viem.fallback(transports);
     };
     const defineWagmiConfig = () => {
-      var _web3Auth$value;
+      var _web3Auth$value2;
       const configParams = _objectSpread(_objectSpread({
         ssr: true
       }, config), {}, {
@@ -183,7 +197,7 @@ const WagmiProvider = vue.defineComponent({
         client: undefined
       });
       const wagmiChains = [];
-      if (isInitialized.value && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$value = web3Auth.value) !== null && _web3Auth$value !== void 0 && (_web3Auth$value = _web3Auth$value.coreOptions) !== null && _web3Auth$value !== void 0 && _web3Auth$value.chains) {
+      if (isInitialized.value && web3Auth !== null && web3Auth !== void 0 && (_web3Auth$value2 = web3Auth.value) !== null && _web3Auth$value2 !== void 0 && (_web3Auth$value2 = _web3Auth$value2.coreOptions) !== null && _web3Auth$value2 !== void 0 && _web3Auth$value2.chains) {
         var _web3Auth$value$curre;
         const defaultChainId = (_web3Auth$value$curre = web3Auth.value.currentChain) === null || _web3Auth$value$curre === void 0 ? void 0 : _web3Auth$value$curre.chainId;
         const chains = web3Auth.value.coreOptions.chains.filter(chain => chain.chainNamespace === noModal.CHAIN_NAMESPACES.EIP155);
@@ -221,7 +235,7 @@ const WagmiProvider = vue.defineComponent({
         });
         configParams.chains = [wagmiChains[0], ...wagmiChains.slice(1)];
       }
-      return vue$1.createConfig(configParams);
+      return vue$2.createConfig(configParams);
     };
     const hydrateWagmiConfig = () => {
       if (finalConfig.value) {
@@ -231,8 +245,8 @@ const WagmiProvider = vue.defineComponent({
       }
     };
     vue.watch(isInitialized, (newIsInitialized, prevIsInitialized) => {
-      var _web3Auth$value2;
-      (_web3Auth$value2 = web3Auth.value) === null || _web3Auth$value2 === void 0 || _web3Auth$value2.setAnalyticsProperties({
+      var _web3Auth$value3;
+      (_web3Auth$value3 = web3Auth.value) === null || _web3Auth$value3 === void 0 || _web3Auth$value3.setAnalyticsProperties({
         wagmi_enabled: true
       });
       if (newIsInitialized && !prevIsInitialized) {

package/dist/lib.cjs/packages/modal/src/x402/index.js

@@ -0,0 +1,12 @@
+'use strict';
+
+var x402 = require('@web3auth/no-modal/x402');
+
+
+
+Object.keys(x402).forEach(function (k) {
+	if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
+		enumerable: true,
+		get: function () { return x402[k]; }
+	});
+});

package/dist/lib.cjs/packages/modal/src/x402/react.js

@@ -0,0 +1,26 @@
+'use strict';
+
+var react = require('@web3auth/no-modal/x402/react');
+
+
+
+Object.defineProperty(exports, "createEvmX402Fetch", {
+	enumerable: true,
+	get: function () { return react.createEvmX402Fetch; }
+});
+Object.defineProperty(exports, "createProviderBackedEvmSigner", {
+	enumerable: true,
+	get: function () { return react.createProviderBackedEvmSigner; }
+});
+Object.defineProperty(exports, "createSolanaX402Fetch", {
+	enumerable: true,
+	get: function () { return react.createSolanaX402Fetch; }
+});
+Object.defineProperty(exports, "getEvmAddress", {
+	enumerable: true,
+	get: function () { return react.getEvmAddress; }
+});
+Object.defineProperty(exports, "useX402Fetch", {
+	enumerable: true,
+	get: function () { return react.useX402Fetch; }
+});

package/dist/lib.cjs/packages/modal/src/x402/vue.js

@@ -0,0 +1,18 @@
+'use strict';
+
+var vue = require('@web3auth/no-modal/x402/vue');
+
+
+
+Object.defineProperty(exports, "createEvmX402Fetch", {
+	enumerable: true,
+	get: function () { return vue.createEvmX402Fetch; }
+});
+Object.defineProperty(exports, "createSolanaX402Fetch", {
+	enumerable: true,
+	get: function () { return vue.createSolanaX402Fetch; }
+});
+Object.defineProperty(exports, "useX402Fetch", {
+	enumerable: true,
+	get: function () { return vue.useX402Fetch; }
+});

package/dist/lib.cjs/types/account-linking/index.d.ts

@@ -0,0 +1 @@
+export * from "@web3auth/no-modal/account-linking";

package/dist/lib.cjs/types/account-linking/react.d.ts

@@ -0,0 +1,2 @@
+export type { CITADEL_NETWORK, CitadelLinkAccountPayload, IUseLinkAccount, IUseSwitchAccount, LinkAccountParams, LinkAccountResult, LinkedAccountInfo, UnlinkAccountPayload, UnlinkAccountResult, } from "@web3auth/no-modal/account-linking/react";
+export { makeAccountLinkingRequest, makeAccountUnlinkingRequest, useLinkAccount, useSwitchAccount } from "@web3auth/no-modal/account-linking/react";

package/dist/lib.cjs/types/account-linking/vue.d.ts

@@ -0,0 +1,2 @@
+export type { CITADEL_NETWORK, CitadelLinkAccountPayload, IUseLinkAccount, IUseSwitchAccount, LinkAccountParams, LinkAccountResult, LinkedAccountInfo, UnlinkAccountPayload, UnlinkAccountResult, } from "@web3auth/no-modal/account-linking/vue";
+export { makeAccountLinkingRequest, makeAccountUnlinkingRequest, useLinkAccount, useSwitchAccount } from "@web3auth/no-modal/account-linking/vue";

package/dist/lib.cjs/types/interface.d.ts

@@ -1,4 +1,4 @@
-import type { BaseConnectorConfig, IProvider, IWeb3Auth, LoginMethodConfig, WALLET_CONNECTOR_TYPE } from "@web3auth/no-modal";
+import type { BaseConnectorConfig, Connection, IWeb3Auth, LoginMethodConfig, WALLET_CONNECTOR_TYPE } from "@web3auth/no-modal";
 export interface ModalConfig extends Omit<BaseConnectorConfig, "isInjected" | "chainNamespaces"> {
     loginMethods?: LoginMethodConfig;
 }
@@ -7,5 +7,5 @@ export interface ConnectorsModalConfig {
     hideWalletDiscovery?: boolean;
 }
 export interface IWeb3AuthModal extends IWeb3Auth {
-    connect(): Promise<IProvider | null>;
+    connect(): Promise<Connection | null>;
 }

package/dist/lib.cjs/types/modalManager.d.ts

@@ -1,6 +1,6 @@
-import { type IProvider, type IWeb3AuthCoreOptions, IWeb3AuthState, type ProjectConfig, Web3AuthNoModal } from "@web3auth/no-modal";
+import { type Connection, type IConnector, type IWeb3AuthCoreOptions, IWeb3AuthState, type LinkAccountParams, type LinkAccountResult, type LinkedAccountInfo, LoginModeType, type ProjectConfig, type WALLET_CONNECTOR_TYPE, Web3AuthNoModal } from "@web3auth/no-modal";
 import { type ConnectorsModalConfig, type IWeb3AuthModal } from "./interface";
-import { LoginModal, type UIConfig } from "./ui";
+import { ACCOUNT_LINKING_INTENT, type AccountLinkingState, LoginModal, type UIConfig } from "./ui";
 export interface Web3AuthOptions extends IWeb3AuthCoreOptions {
     /**
      * Config for configuring modal ui display properties
@@ -13,13 +13,32 @@ export interface Web3AuthOptions extends IWeb3AuthCoreOptions {
 }
 export declare class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
     loginModal: LoginModal;
+    loginMode: LoginModeType;
     readonly options: Web3AuthOptions;
     private modalConfig;
-    constructor(options: Web3AuthOptions, initialState?: IWeb3AuthState);
+    private removeAccountLinkingConnectorListeners;
+    private removeAccountLinkingResetOnCloseListener;
+    private accountLinkingPickerResolver;
+    private removeAccountLinkingPickerCloseListener;
+    constructor(options: Web3AuthOptions, initialState?: Partial<IWeb3AuthState>);
     init(options?: {
         signal?: AbortSignal;
     }): Promise<void>;
-    connect(): Promise<IProvider | null>;
+    connect(): Promise<Connection | null>;
+    acceptConsent(): Promise<void>;
+    switchAccount(account: LinkedAccountInfo): Promise<void>;
+    linkAccount(params?: LinkAccountParams): Promise<LinkAccountResult>;
+    protected startAccountLinkingModalSession(params: {
+        connectorName: WALLET_CONNECTOR_TYPE | string;
+        transportConnectorName?: WALLET_CONNECTOR_TYPE | string;
+        chainId: string;
+        intent: (typeof ACCOUNT_LINKING_INTENT)[keyof typeof ACCOUNT_LINKING_INTENT];
+    }): void;
+    protected updateAccountLinkingModalSession(accountLinking: Partial<AccountLinkingState>): void;
+    protected resetAccountLinkingModalSession(): void;
+    protected formatAccountLinkingErrorMessage(error: unknown): string | undefined;
+    protected prepareAccountLinkingConnector(connectorName: WALLET_CONNECTOR_TYPE | string, chainId: string): Promise<IConnector<unknown>>;
+    protected prepareAccountSwitchConnector(connectorName: WALLET_CONNECTOR_TYPE | string, chainId: string, projectConfig?: ProjectConfig): Promise<IConnector<unknown>>;
     protected initUIConfig(projectConfig: ProjectConfig): void;
     protected getInitializationTrackData(): Record<string, unknown>;
     private filterWalletRegistry;
@@ -34,6 +53,29 @@ export declare class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal
     private onExternalWalletLogin;
     private onModalVisibility;
     private onMobileVerifyConnect;
+    private onAcceptConsent;
+    private onDeclineConsent;
     private getChainNamespaces;
+    private switchToWalletConnectV2Account;
+    /**
+     * Runs a link/switch action for WalletConnect v2, racing connector.connect()
+     * against a modal-close promise to cancel and clean up the WC session if the
+     * user closes the modal during QR scanning.
+     * For synchronous connectors use {@link runNonWalletConnectAccountAction}.
+     */
+    private runWalletConnectV2AccountAction;
+    private linkAccountWithChosenConnector;
+    private pickWalletForAccountLinking;
+    /**
+     * Runs a link/switch action for synchronous connectors (injected wallets, already-connected).
+     * Shows the connecting loader, forwards AUTHORIZING events to the modal, and
+     * resolves/rejects the loader on completion.
+     * For WalletConnect v2 use {@link runWalletConnectV2AccountAction}.
+     */
+    private runNonWalletConnectAccountAction;
+    private subscribeToAccountLinkingConnectorEvents;
+    private clearAccountLinkingConnectorListeners;
+    private installAccountLinkingResetOnCloseListener;
+    private clearAccountLinkingResetOnCloseListener;
     private getCombinedConnectionId;
 }

package/dist/lib.cjs/types/react/context/WalletServicesInnerContext.d.ts

@@ -1,6 +1,13 @@
-import { Context, PropsWithChildren } from "react";
-import { IWalletServicesContext, IWeb3AuthInnerContext } from "../interfaces";
+import { type Context, PropsWithChildren } from "react";
+import { type IWalletServicesContext } from "../interfaces";
+type IWeb3AuthContextForWalletServices = {
+    getPlugin: (name: string) => unknown;
+    isInitialized: boolean;
+    isConnected: boolean;
+};
+type WalletServicesContextProviderProps<TWeb3AuthContext extends IWeb3AuthContextForWalletServices> = PropsWithChildren<{
+    context: Context<TWeb3AuthContext>;
+}>;
 export declare const WalletServicesContext: Context<IWalletServicesContext>;
-export declare function WalletServicesContextProvider({ children, context }: PropsWithChildren<{
-    context: Context<IWeb3AuthInnerContext>;
-}>): import("react").FunctionComponentElement<import("react").ProviderProps<IWalletServicesContext>>;
+export declare function WalletServicesContextProvider<TWeb3AuthContext extends IWeb3AuthContextForWalletServices>({ children, context, }: WalletServicesContextProviderProps<TWeb3AuthContext>): import("react").FunctionComponentElement<import("react").ProviderProps<IWalletServicesContext>>;
+export {};

package/dist/lib.cjs/types/react/context/Web3AuthInnerContext.d.ts

@@ -1,4 +1,5 @@
+import { Web3AuthInnerContext as Web3AuthInnerContextNoModal } from "@web3auth/no-modal/react";
 import { PropsWithChildren } from "react";
-import { IWeb3AuthInnerContext, Web3AuthProviderProps } from "../interfaces";
-export declare const Web3AuthInnerContext: import("react").Context<IWeb3AuthInnerContext>;
-export declare function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProviderProps>): import("react").FunctionComponentElement<import("react").ProviderProps<IWeb3AuthInnerContext>>;
+import { Web3AuthProviderProps } from "../interfaces";
+export { Web3AuthInnerContextNoModal as Web3AuthInnerContext };
+export declare function Web3AuthInnerProvider(params: PropsWithChildren<Web3AuthProviderProps>): import("react").FunctionComponentElement<import("react").ProviderProps<import("@web3auth/no-modal/react").IWeb3AuthInnerContext>>;

package/dist/lib.cjs/types/react/hooks/index.d.ts

@@ -1,16 +1,18 @@
-export * from "./useChain";
-export * from "./useCheckout";
-export * from "./useEnableMFA";
-export * from "./useFunding";
-export * from "./useIdentityToken";
-export * from "./useManageMFA";
-export * from "./useReceive";
-export * from "./useSwap";
-export * from "./useSwitchChain";
-export * from "./useWalletConnectScanner";
-export * from "./useWalletServicesPlugin";
-export * from "./useWalletUI";
+export * from "./useWallets";
 export * from "./useWeb3Auth";
 export * from "./useWeb3AuthConnect";
-export * from "./useWeb3AuthDisconnect";
-export * from "./useWeb3AuthUser";
+export type { IUseAuthTokenInfo, IUseChain, IUseCheckout, IUseEnableMFA, IUseFunding, IUseManageMFA, IUseReceive, IUseSwap, IUseSwitchChain, IUseWalletConnectScanner, IUseWalletUI, IUseWeb3AuthDisconnect, IUseWeb3AuthUser, } from "@web3auth/no-modal/react";
+export { useAuthTokenInfo } from "@web3auth/no-modal/react";
+export { useChain } from "@web3auth/no-modal/react";
+export { useCheckout } from "@web3auth/no-modal/react";
+export { useEnableMFA } from "@web3auth/no-modal/react";
+export { useFunding } from "@web3auth/no-modal/react";
+export { useManageMFA } from "@web3auth/no-modal/react";
+export { useReceive } from "@web3auth/no-modal/react";
+export { useSwap } from "@web3auth/no-modal/react";
+export { useSwitchChain } from "@web3auth/no-modal/react";
+export { useWalletConnectScanner } from "@web3auth/no-modal/react";
+export { useWalletServicesPlugin } from "@web3auth/no-modal/react";
+export { useWalletUI } from "@web3auth/no-modal/react";
+export { useWeb3AuthDisconnect } from "@web3auth/no-modal/react";
+export { useWeb3AuthUser } from "@web3auth/no-modal/react";

package/dist/lib.cjs/types/react/hooks/useWallets.d.ts

@@ -0,0 +1,2 @@
+export type { IUseWallets } from "@web3auth/no-modal/react";
+export { useWallets } from "@web3auth/no-modal/react";

package/dist/lib.cjs/types/react/hooks/useWeb3Auth.d.ts

@@ -1,3 +1,2 @@
 import { IWeb3AuthInnerContext } from "../interfaces";
-export type IUseWeb3Auth = Omit<IWeb3AuthInnerContext, "isMFAEnabled" | "setIsMFAEnabled" | "chainId" | "chainNamespace">;
-export declare const useWeb3Auth: () => IUseWeb3Auth;
+export declare const useWeb3Auth: () => IWeb3AuthInnerContext;

package/dist/lib.cjs/types/react/hooks/useWeb3AuthConnect.d.ts

@@ -1,10 +1,10 @@
-import type { IProvider, LoginParamMap, WALLET_CONNECTOR_TYPE, Web3AuthError } from "@web3auth/no-modal";
+import type { Connection, LoginParamMap, WALLET_CONNECTOR_TYPE, Web3AuthError } from "@web3auth/no-modal";
 export interface IUseWeb3AuthConnect {
     isConnected: boolean;
     loading: boolean;
     error: Web3AuthError | null;
     connectorName: WALLET_CONNECTOR_TYPE | null;
-    connect(): Promise<IProvider | null>;
-    connectTo<T extends WALLET_CONNECTOR_TYPE>(connector: T, params?: LoginParamMap[T]): Promise<IProvider | null>;
+    connect(): Promise<Connection | null>;
+    connectTo<T extends WALLET_CONNECTOR_TYPE>(connector: T, params?: LoginParamMap[T]): Promise<Connection | null>;
 }
 export declare const useWeb3AuthConnect: () => IUseWeb3AuthConnect;

package/dist/lib.cjs/types/react/interfaces.d.ts

@@ -1,4 +1,5 @@
-import type { IBaseWeb3AuthHookContext, IWeb3AuthState, WalletServicesPluginType } from "@web3auth/no-modal";
+import type { IWeb3AuthState, WalletServicesPluginType } from "@web3auth/no-modal";
+import type { IWeb3AuthInnerContext as INoModalWeb3AuthInnerContext } from "@web3auth/no-modal/react";
 import type { Web3Auth, Web3AuthOptions } from "../modalManager";
 export type Web3AuthContextConfig = {
     web3AuthOptions: Web3AuthOptions;
@@ -7,7 +8,7 @@ export interface Web3AuthProviderProps {
     config: Web3AuthContextConfig;
     initialState?: IWeb3AuthState;
 }
-export interface IWeb3AuthInnerContext extends IBaseWeb3AuthHookContext {
+export interface IWeb3AuthInnerContext extends Omit<INoModalWeb3AuthInnerContext, "web3Auth"> {
     web3Auth: Web3Auth | null;
 }
 export interface IWalletServicesContext {