@web3auth/no-modal 11.0.0-beta.0 → 11.0.0-beta.2

package/dist/lib.esm/plugins/wallet-services-plugin/plugin.js

@@ -2,10 +2,10 @@ import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { SafeEventEmitter } from '@web3auth/auth';
 export { BUTTON_POSITION, CONFIRMATION_STRATEGY } from '@web3auth/ws-embed';
 import { EVM_PLUGINS, PLUGIN_STATUS, PLUGIN_NAMESPACES, PLUGIN_EVENTS } from '../../base/plugin/IPlugin.js';
-import { WalletServicesPluginError } from '../../base/plugin/errors.js';
-import { CAN_AUTHORIZE_STATUSES } from '../../base/connector/connectorStatus.js';
 import { WALLET_CONNECTORS } from '../../base/wallet/index.js';
+import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
+import { CAN_AUTHORIZE_STATUSES } from '../../base/connector/connectorStatus.js';
 import { log } from '../../base/loglevel.js';
 import { ANALYTICS_EVENTS } from '../../base/analytics.js';
 
@@ -24,7 +24,7 @@ class WalletServicesPlugin extends SafeEventEmitter {
   async initWithWeb3Auth(web3auth, _whiteLabel, analytics) {
     if (this.isInitialized) return;
     if (!web3auth) throw WalletServicesPluginError.web3authRequired();
-    if (web3auth.connection && !this.SUPPORTED_CONNECTORS.includes(web3auth.connectedConnectorName)) throw WalletServicesPluginError.notInitialized();
+    if (web3auth.connection && !this.SUPPORTED_CONNECTORS.includes(web3auth.primaryConnectorName)) throw WalletServicesPluginError.notInitialized();
     const currentChainConfig = web3auth.currentChain;
     if (![CHAIN_NAMESPACES.EIP155, CHAIN_NAMESPACES.SOLANA].includes(currentChainConfig === null || currentChainConfig === void 0 ? void 0 : currentChainConfig.chainNamespace)) throw WalletServicesPluginError.unsupportedChainNamespace();
     this.web3auth = web3auth;

package/dist/lib.esm/providers/base-provider/baseProvider.js

@@ -1,6 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { BaseController, createEventEmitterProxy } from '@toruslabs/base-controllers';
+import { BaseController } from '@toruslabs/base-controllers';
 import { rpcErrors } from '@web3auth/auth';
 import { EIP1193_EVENTS } from './utils.js';
 import { WalletInitializationError, WalletProviderError } from '../../base/errors/index.js';
@@ -19,6 +19,8 @@ class BaseProvider extends BaseController {
     // set to true when the keyExportEnabled flag is set by code.
     // This is to prevent the flag from being overridden by the dashboard config.
     _defineProperty(this, "keyExportFlagSetByCode", false);
+    _defineProperty(this, "providerEventBridges", new Map());
+    _defineProperty(this, "providerListenerBridgeRegistered", false);
     const {
       chain
     } = config;
@@ -90,45 +92,19 @@ class BaseProvider extends BaseController {
     })).catch(err => callback(err, null));
   }
   updateProviderEngineProxy(provider) {
+    if (this._providerEngineProxy === provider) return;
     if (this._providerEngineProxy) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      this._providerEngineProxy.setTarget(provider);
-
-      // we want events to propagate from Ethereum provider -> wrapper provider (e.g. CommonJRPC provider) -> SDK -> dapp
-      // ensure that only one handler is added for each event
-      const reEmitHandler = event => {
-        // skip newListener event
-        if (event === "newListener") return;
-
-        // listen to the event from the Ethereum provider
-        provider.on(event, (...args) => {
-          // handle chainChanged event: update chainId state
-          if (event === EIP1193_EVENTS.CHAIN_CHANGED) {
-            const chainId = args[0];
-            this.update({
-              chainId
-            });
-          }
-
-          // re-emit the event
-          // eslint-disable-next-line @typescript-eslint/no-explicit-any
-          this.emit(event, ...args);
-        });
-      };
-
-      // handle existing events
-      this.eventNames().forEach(event => {
-        reEmitHandler(event);
-      });
-      // handle when a new listener is added
-      this.on("newListener", event => {
-        // skip if the event already exists
-        if (this.listenerCount(event) > 0) return;
-        reEmitHandler(event);
-      });
-    } else {
-      this._providerEngineProxy = createEventEmitterProxy(provider);
+      // remove all event bridges from the previous provider
+      this.detachProviderEventBridges(this._providerEngineProxy);
     }
+
+    // attach all event bridges to the new provider
+    this._providerEngineProxy = provider;
+    this.ensureProviderListenerBridge();
+    this.eventNames().forEach(event => {
+      this.ensureProviderEventBridge(event);
+    });
+    this.attachProviderEventBridges(provider);
   }
   setKeyExportFlag(flag) {
     if (!this.keyExportFlagSetByCode) {
@@ -143,6 +119,60 @@ class BaseProvider extends BaseController {
   getChain(chainId) {
     return this.config.chains.find(chain => chain.chainId === chainId);
   }
+  ensureProviderListenerBridge() {
+    if (this.providerListenerBridgeRegistered) return;
+    this.providerListenerBridgeRegistered = true;
+    this.on("newListener", event => {
+      this.ensureProviderEventBridge(event);
+    });
+  }
+  ensureProviderEventBridge(event) {
+    if (event === "newListener" || event === "removeListener" || this.providerEventBridges.has(event)) return;
+    const bridge = {
+      handler: (...args) => {
+        if (event === EIP1193_EVENTS.CHAIN_CHANGED) {
+          const chainId = args[0];
+          this.update({
+            chainId
+          });
+        }
+
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        this.emit(event, ...args);
+      }
+    };
+    this.providerEventBridges.set(event, bridge);
+    if (!this._providerEngineProxy) return;
+    bridge.detach = this.attachProviderEventBridge(this._providerEngineProxy, event, bridge.handler);
+  }
+  attachProviderEventBridges(provider) {
+    this.providerEventBridges.forEach((bridge, event) => {
+      if (bridge.detach) return;
+      bridge.detach = this.attachProviderEventBridge(provider, event, bridge.handler);
+    });
+  }
+  attachProviderEventBridge(provider, event, handler) {
+    const removableProvider = provider;
+    const maybeDetach = removableProvider.on(event, handler);
+    return typeof maybeDetach === "function" ? () => {
+      maybeDetach();
+    } : undefined;
+  }
+  detachProviderEventBridges(provider) {
+    this.providerEventBridges.forEach((bridge, event) => {
+      if (bridge.detach) {
+        bridge.detach();
+      } else {
+        const removableProvider = provider;
+        if (typeof removableProvider.removeListener === "function") {
+          removableProvider.removeListener(event, bridge.handler);
+        } else if (typeof removableProvider.off === "function") {
+          removableProvider.off(event, bridge.handler);
+        }
+      }
+      bridge.detach = undefined;
+    });
+  }
 }
 
 export { BaseProvider };

package/dist/lib.esm/react/context/useWeb3AuthInnerContextValue.js

@@ -1,9 +1,24 @@
-import { useState, useMemo, useCallback, useEffect } from 'react';
+import { useMemo, useState, useCallback, useEffect } from 'react';
 import { WalletInitializationError } from '../../base/errors/index.js';
-import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from '../../base/connector/constants.js';
 import { LOGIN_MODE } from '../../base/constants.js';
 import { ANALYTICS_INTEGRATION_TYPE } from '../../base/analytics.js';
+import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from '../../base/connector/constants.js';
+import { CONNECTED_STATUSES } from '../../base/connector/connectorStatus.js';
 
+function getInitialState(web3Auth) {
+  var _web3Auth$currentChai, _web3Auth$currentChai2;
+  const isConnected = CONNECTED_STATUSES.includes(web3Auth.status);
+  const isAuthorized = web3Auth.status === CONNECTOR_STATUS.AUTHORIZED;
+  return {
+    chainId: isConnected ? web3Auth.currentChainId : null,
+    chainNamespace: isConnected ? (_web3Auth$currentChai = (_web3Auth$currentChai2 = web3Auth.currentChain) === null || _web3Auth$currentChai2 === void 0 ? void 0 : _web3Auth$currentChai2.chainNamespace) !== null && _web3Auth$currentChai !== void 0 ? _web3Auth$currentChai : null : null,
+    connection: isConnected ? web3Auth.connection : null,
+    isAuthorized,
+    isConnected,
+    isInitialized: isConnected,
+    status: web3Auth.status
+  };
+}
 function useWeb3AuthInnerContextValue({
   Web3AuthConstructor,
   web3AuthOptions,
@@ -12,20 +27,20 @@ function useWeb3AuthInnerContextValue({
   cleanupOnUnmount = false,
   initEffectDependency
 }) {
-  const [chainId, setChainId] = useState(null);
-  const [chainNamespace, setChainNamespace] = useState(null);
-  const [isInitializing, setIsInitializing] = useState(false);
-  const [initError, setInitError] = useState(null);
-  const [connection, setConnection] = useState(null);
-  const [isInitialized, setIsInitialized] = useState(false);
-  const [isMFAEnabled, setIsMFAEnabled] = useState(false);
   const web3Auth = useMemo(() => {
-    setConnection(null);
     return new Web3AuthConstructor(web3AuthOptions, initialState);
   }, [Web3AuthConstructor, web3AuthOptions, initialState]);
-  const [isConnected, setIsConnected] = useState(false);
-  const [status, setStatus] = useState(null);
-  const [isAuthorized, setIsAuthorized] = useState(false);
+  const initialWeb3AuthState = getInitialState(web3Auth);
+  const [chainId, setChainId] = useState(() => initialWeb3AuthState.chainId);
+  const [chainNamespace, setChainNamespace] = useState(() => initialWeb3AuthState.chainNamespace);
+  const [isInitializing, setIsInitializing] = useState(false);
+  const [initError, setInitError] = useState(null);
+  const [connection, setConnection] = useState(() => initialWeb3AuthState.connection);
+  const [isInitialized, setIsInitialized] = useState(initialWeb3AuthState.isInitialized);
+  const [isMFAEnabled, setIsMFAEnabled] = useState(false);
+  const [isConnected, setIsConnected] = useState(initialWeb3AuthState.isConnected);
+  const [status, setStatus] = useState(initialWeb3AuthState.status);
+  const [isAuthorized, setIsAuthorized] = useState(initialWeb3AuthState.isAuthorized);
   const getPlugin = useCallback(name => {
     if (!web3Auth) throw WalletInitializationError.notReady();
     return web3Auth.getPlugin(name);
@@ -34,7 +49,7 @@ function useWeb3AuthInnerContextValue({
     const controller = new AbortController();
     async function init() {
       try {
-        var _web3Auth$currentChai;
+        var _web3Auth$currentChai3;
         setInitError(null);
         setIsInitializing(true);
         web3Auth.setAnalyticsProperties({
@@ -44,7 +59,7 @@ function useWeb3AuthInnerContextValue({
           signal: controller.signal
         });
         setChainId(web3Auth.currentChainId);
-        setChainNamespace((_web3Auth$currentChai = web3Auth.currentChain) === null || _web3Auth$currentChai === void 0 ? void 0 : _web3Auth$currentChai.chainNamespace);
+        setChainNamespace((_web3Auth$currentChai3 = web3Auth.currentChain) === null || _web3Auth$currentChai3 === void 0 ? void 0 : _web3Auth$currentChai3.chainNamespace);
       } catch (error) {
         setInitError(error);
       } finally {
@@ -59,9 +74,9 @@ function useWeb3AuthInnerContextValue({
   useEffect(() => {
     var _connection$ethereumP;
     const handleChainChange = async nextChainId => {
-      var _web3Auth$currentChai2;
+      var _web3Auth$currentChai4;
       setChainId(nextChainId);
-      setChainNamespace((_web3Auth$currentChai2 = web3Auth.currentChain) === null || _web3Auth$currentChai2 === void 0 ? void 0 : _web3Auth$currentChai2.chainNamespace);
+      setChainNamespace((_web3Auth$currentChai4 = web3Auth.currentChain) === null || _web3Auth$currentChai4 === void 0 ? void 0 : _web3Auth$currentChai4.chainNamespace);
     };
     const provider = (_connection$ethereumP = connection === null || connection === void 0 ? void 0 : connection.ethereumProvider) !== null && _connection$ethereumP !== void 0 ? _connection$ethereumP : null;
     if (!provider) return undefined;
@@ -83,12 +98,12 @@ function useWeb3AuthInnerContextValue({
       setStatus(web3Auth.status);
       // we do this because of rehydration issues. status connected is fired first but web3auth sdk is not ready yet.
       if (web3Auth.status === CONNECTOR_STATUS.CONNECTED) {
-        var _web3Auth$currentChai3, _web3Auth$currentChai4;
+        var _web3Auth$currentChai5, _web3Auth$currentChai6;
         setIsInitialized(true);
         setIsConnected(true);
         setConnection(web3Auth.connection);
         setChainId(web3Auth.currentChainId);
-        setChainNamespace((_web3Auth$currentChai3 = (_web3Auth$currentChai4 = web3Auth.currentChain) === null || _web3Auth$currentChai4 === void 0 ? void 0 : _web3Auth$currentChai4.chainNamespace) !== null && _web3Auth$currentChai3 !== void 0 ? _web3Auth$currentChai3 : null);
+        setChainNamespace((_web3Auth$currentChai5 = (_web3Auth$currentChai6 = web3Auth.currentChain) === null || _web3Auth$currentChai6 === void 0 ? void 0 : _web3Auth$currentChai6.chainNamespace) !== null && _web3Auth$currentChai5 !== void 0 ? _web3Auth$currentChai5 : null);
       }
     };
     const disconnectedListener = () => {
@@ -119,12 +134,12 @@ function useWeb3AuthInnerContextValue({
     const consentAcceptedListener = () => {
       setStatus(web3Auth.status);
       if (web3Auth.status === CONNECTOR_STATUS.CONNECTED || web3Auth.status === CONNECTOR_STATUS.AUTHORIZED) {
-        var _web3Auth$currentChai5, _web3Auth$currentChai6;
+        var _web3Auth$currentChai7, _web3Auth$currentChai8;
         setIsInitialized(true);
         setIsConnected(true);
         setConnection(web3Auth.connection);
         setChainId(web3Auth.currentChainId);
-        setChainNamespace((_web3Auth$currentChai5 = (_web3Auth$currentChai6 = web3Auth.currentChain) === null || _web3Auth$currentChai6 === void 0 ? void 0 : _web3Auth$currentChai6.chainNamespace) !== null && _web3Auth$currentChai5 !== void 0 ? _web3Auth$currentChai5 : null);
+        setChainNamespace((_web3Auth$currentChai7 = (_web3Auth$currentChai8 = web3Auth.currentChain) === null || _web3Auth$currentChai8 === void 0 ? void 0 : _web3Auth$currentChai8.chainNamespace) !== null && _web3Auth$currentChai7 !== void 0 ? _web3Auth$currentChai7 : null);
         if (web3Auth.status === CONNECTOR_STATUS.AUTHORIZED) {
           setIsAuthorized(true);
         }
@@ -133,6 +148,13 @@ function useWeb3AuthInnerContextValue({
     const mfaEnabledListener = nextIsMFAEnabled => {
       if (typeof nextIsMFAEnabled === "boolean") setIsMFAEnabled(nextIsMFAEnabled);
     };
+    const connectionUpdatedListener = () => {
+      var _web3Auth$currentChai9, _web3Auth$currentChai0;
+      setStatus(web3Auth.status);
+      setConnection(web3Auth.connection);
+      setChainId(web3Auth.currentChainId);
+      setChainNamespace((_web3Auth$currentChai9 = (_web3Auth$currentChai0 = web3Auth.currentChain) === null || _web3Auth$currentChai0 === void 0 ? void 0 : _web3Auth$currentChai0.chainNamespace) !== null && _web3Auth$currentChai9 !== void 0 ? _web3Auth$currentChai9 : null);
+    };
     if (web3Auth) {
       web3Auth.on(CONNECTOR_EVENTS.NOT_READY, notReadyListener);
       web3Auth.on(CONNECTOR_EVENTS.READY, readyListener);
@@ -143,6 +165,7 @@ function useWeb3AuthInnerContextValue({
       web3Auth.on(CONNECTOR_EVENTS.ERRORED, errorListener);
       web3Auth.on(CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
       web3Auth.on(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+      web3Auth.on(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
       if (web3Auth.loginMode === LOGIN_MODE.MODAL) {
         web3Auth.on(CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }
@@ -158,6 +181,7 @@ function useWeb3AuthInnerContextValue({
       web3Auth.removeListener(CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
       web3Auth.removeListener(CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
       web3Auth.removeListener(CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
+      web3Auth.removeListener(CONNECTOR_EVENTS.CONNECTION_UPDATED, connectionUpdatedListener);
       if (web3Auth.loginMode === LOGIN_MODE.MODAL) {
         web3Auth.removeListener(CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
       }

package/dist/lib.esm/react/hooks/useWallets.js

@@ -0,0 +1,33 @@
+import { useState, useCallback } from 'react';
+import { useWeb3AuthInner } from './useWeb3AuthInner.js';
+import { WalletInitializationError } from '../../base/errors/index.js';
+
+const useWallets = () => {
+  const {
+    web3Auth
+  } = useWeb3AuthInner();
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState(null);
+  const [wallets, setWallets] = useState([]);
+  const syncWallets = useCallback(async () => {
+    if (!web3Auth) throw WalletInitializationError.notReady();
+    setLoading(true);
+    setError(null);
+    try {
+      const result = await web3Auth.getConnectedAccountsWithProviders();
+      setWallets(result);
+    } catch (err) {
+      setError(err);
+    } finally {
+      setLoading(false);
+    }
+  }, [web3Auth]);
+  return {
+    loading,
+    error,
+    wallets,
+    syncWallets
+  };
+};
+
+export { useWallets };

package/dist/lib.esm/react/hooks/useWeb3AuthConnect.js

@@ -16,7 +16,7 @@ const useWeb3AuthConnect = () => {
       setConnectorName(null);
     }
     if (isConnected && !connectorName) {
-      setConnectorName(web3Auth.connectedConnectorName);
+      setConnectorName(web3Auth.primaryConnectorName);
     }
   }, [isConnected, connectorName, web3Auth]);
   const connect = useCallback(async (connector, params) => {
@@ -25,7 +25,7 @@ const useWeb3AuthConnect = () => {
     try {
       const provider = await web3Auth.connectTo(connector, params);
       if (provider) {
-        setConnectorName(web3Auth.connectedConnectorName);
+        setConnectorName(web3Auth.primaryConnectorName);
       }
       return provider;
     } catch (error) {

package/dist/lib.esm/react/index.js

@@ -14,6 +14,7 @@ export { useWalletConnectScanner } from './hooks/useWalletConnectScanner.js';
 export { useWalletServicesContextValue } from './context/useWalletServicesContextValue.js';
 export { useWalletServicesPlugin } from './hooks/useWalletServicesPlugin.js';
 export { useWalletUI } from './hooks/useWalletUI.js';
+export { useWallets } from './hooks/useWallets.js';
 export { useWeb3Auth } from './hooks/useWeb3Auth.js';
 export { useWeb3AuthConnect } from './hooks/useWeb3AuthConnect.js';
 export { useWeb3AuthDisconnect } from './hooks/useWeb3AuthDisconnect.js';

package/dist/lib.esm/react/solana/hooks/useSolanaWallet.js

@@ -28,12 +28,12 @@ const useSolanaWallet = () => {
     return createSolanaRpc(web3Auth.currentChain.rpcTarget);
   }, [web3Auth, solanaWallet, chainNamespace]);
   const getPrivateKey = useCallback(async () => {
-    var _web3Auth$connectedCo;
+    var _web3Auth$primaryConn;
     if (!web3Auth) throw new Error("Web3Auth not initialized");
     if ((connection === null || connection === void 0 ? void 0 : connection.connectorName) !== WALLET_CONNECTORS.AUTH) {
       throw new Error("getPrivateKey is only supported with the Auth connector");
     }
-    const provider = (_web3Auth$connectedCo = web3Auth.connectedConnector) === null || _web3Auth$connectedCo === void 0 ? void 0 : _web3Auth$connectedCo.provider;
+    const provider = (_web3Auth$primaryConn = web3Auth.primaryConnector) === null || _web3Auth$primaryConn === void 0 ? void 0 : _web3Auth$primaryConn.provider;
     if (!provider) throw new Error("Provider not available");
     const privateKey = await provider.request({
       method: SOLANA_METHOD_TYPES.SOLANA_PRIVATE_KEY

package/dist/lib.esm/react/solana/provider.js

@@ -3,8 +3,8 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import { createWalletStandardConnector, createClient } from '@solana/client';
 import { SolanaProvider as SolanaProvider$1 } from '@solana/react-hooks';
 import { createElement, useRef, useState, useEffect } from 'react';
-import { useChain } from '../hooks/useChain.js';
 import { useWeb3Auth } from '../hooks/useWeb3Auth.js';
+import { useChain } from '../hooks/useChain.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { log } from '../../base/loglevel.js';
 
@@ -52,6 +52,7 @@ function useFrameworkKitSolanaClient() {
     isInitialized
   } = useWeb3Auth();
   const {
+    chainId,
     chainNamespace
   } = useChain();
   const ref = useRef(null);
@@ -100,6 +101,12 @@ function useFrameworkKitSolanaClient() {
         adopt(makePlaceholder(rpc));
         return;
       }
+
+      // only reconnect for the primary connector
+      if (conn.connectorName !== (web3Auth === null || web3Auth === void 0 ? void 0 : web3Auth.primaryConnectorName)) {
+        adopt(makePlaceholder(rpc));
+        return;
+      }
       try {
         const solanaWalletId = "wallet-standard:" + conn.connectorName;
         const connector = createWalletStandardConnector(solanaWallet, {
@@ -131,7 +138,7 @@ function useFrameworkKitSolanaClient() {
     return () => {
       stale = true;
     };
-  }, [isConnected, connection === null || connection === void 0 ? void 0 : connection.solanaWallet, chainNamespace, web3Auth, isInitialized, connection === null || connection === void 0 ? void 0 : connection.connectorName]);
+  }, [isConnected, connection === null || connection === void 0 ? void 0 : connection.solanaWallet, chainId, chainNamespace, web3Auth, isInitialized, connection === null || connection === void 0 ? void 0 : connection.connectorName]);
   return client;
 }
 function SolanaProvider(_ref) {

package/dist/lib.esm/react/wagmi/provider.js

@@ -1,14 +1,14 @@
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
-import { useMemo, createElement, useEffect, Fragment } from 'react';
+import { useMemo, createElement, useRef, useEffect, Fragment } from 'react';
 import { defineChain } from 'viem';
 import { createConfig, WagmiProvider as WagmiProvider$1, webSocket, http, fallback, useConfig, useReconnect, useConnectionEffect } from 'wagmi';
 import { injected } from 'wagmi/connectors';
 import { defaultWagmiConfig } from './constants.js';
 import { useWeb3Auth } from '../hooks/useWeb3Auth.js';
-import { useWeb3AuthDisconnect } from '../hooks/useWeb3AuthDisconnect.js';
 import { CHAIN_NAMESPACES } from '@toruslabs/base-controllers';
 import { WalletInitializationError } from '../../base/errors/index.js';
+import { useWeb3AuthDisconnect } from '../hooks/useWeb3AuthDisconnect.js';
 import { log } from '../../base/loglevel.js';
 
 const _excluded = ["children"];
@@ -78,7 +78,8 @@ function Web3AuthWagmiProvider({
 }) {
   const {
     isConnected,
-    connection
+    connection,
+    chainNamespace
   } = useWeb3Auth();
   const {
     disconnect
@@ -87,10 +88,17 @@ function Web3AuthWagmiProvider({
   const {
     mutate: reconnect
   } = useReconnect();
+  const suppressWagmiDisconnect = useRef(false);
+  const lastSyncedBinding = useRef({
+    provider: null,
+    connectorName: null
+  });
   useConnectionEffect({
     onDisconnect: async () => {
       log.info("Disconnected from wagmi");
-      if (isConnected) await disconnect();
+      const isSuppressed = suppressWagmiDisconnect.current;
+      suppressWagmiDisconnect.current = false;
+      if (!isSuppressed && isConnected) await disconnect();
       const connector = getWeb3authConnector(wagmiConfig);
       // reset wagmi connector state if the provider handles disconnection because of the accountsChanged event
       // from the connected provider
@@ -101,20 +109,44 @@ function Web3AuthWagmiProvider({
   });
   useEffect(() => {
     (async () => {
-      if (isConnected && connection !== null && connection !== void 0 && connection.ethereumProvider) {
+      const shouldBindToWagmi = isConnected && chainNamespace === CHAIN_NAMESPACES.EIP155 && Boolean(connection === null || connection === void 0 ? void 0 : connection.ethereumProvider);
+      if (shouldBindToWagmi) {
+        const hasSameBinding = lastSyncedBinding.current.provider === connection.ethereumProvider && lastSyncedBinding.current.connectorName === connection.connectorName;
+        if (hasSameBinding && wagmiConfig.state.status === "connected") {
+          return;
+        }
+        if (!hasSameBinding && getWeb3authConnector(wagmiConfig)) {
+          if (wagmiConfig.state.status === "connected") {
+            suppressWagmiDisconnect.current = true;
+            await disconnectWeb3AuthFromWagmi(wagmiConfig);
+          } else {
+            resetConnectorState(wagmiConfig);
+          }
+        }
         const connector = await setupConnector(connection.ethereumProvider, wagmiConfig);
         if (!connector) {
           throw new Error("Failed to setup connector");
         }
         await connectWeb3AuthWithWagmi(connector, wagmiConfig);
+        lastSyncedBinding.current = {
+          provider: connection.ethereumProvider,
+          connectorName: connection.connectorName
+        };
         reconnect();
-      } else if (!isConnected) {
+      } else {
+        lastSyncedBinding.current = {
+          provider: null,
+          connectorName: null
+        };
         if (wagmiConfig.state.status === "connected") {
+          suppressWagmiDisconnect.current = true;
           await disconnectWeb3AuthFromWagmi(wagmiConfig);
+        } else if (getWeb3authConnector(wagmiConfig)) {
+          resetConnectorState(wagmiConfig);
         }
       }
     })();
-  }, [isConnected, wagmiConfig, connection, reconnect]);
+  }, [chainNamespace, connection, isConnected, reconnect, wagmiConfig]);
   return createElement(Fragment, null, children);
 }
 function WagmiProvider(_ref) {

package/dist/lib.esm/vue/composables/useCheckout.js

@@ -1,7 +1,7 @@
 import { ref } from 'vue';
 import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
-import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { log } from '../../base/loglevel.js';
+import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 
 const useCheckout = () => {
   const {

package/dist/lib.esm/vue/composables/useFunding.js

@@ -1,7 +1,7 @@
 import { ref } from 'vue';
 import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
-import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { log } from '../../base/loglevel.js';
+import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 
 const useFunding = () => {
   const {

package/dist/lib.esm/vue/composables/useReceive.js

@@ -1,7 +1,7 @@
 import { ref } from 'vue';
 import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
-import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { log } from '../../base/loglevel.js';
+import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 
 const useReceive = () => {
   const {

package/dist/lib.esm/vue/composables/useSwap.js

@@ -1,7 +1,7 @@
 import { ref } from 'vue';
 import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
-import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { log } from '../../base/loglevel.js';
+import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 
 const useSwap = () => {
   const {

package/dist/lib.esm/vue/composables/useWalletConnectScanner.js

@@ -1,7 +1,7 @@
 import { ref } from 'vue';
 import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
-import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { log } from '../../base/loglevel.js';
+import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 
 const useWalletConnectScanner = () => {
   const {

package/dist/lib.esm/vue/composables/useWalletUI.js

@@ -1,7 +1,7 @@
 import { ref } from 'vue';
 import { useWalletServicesPlugin } from './useWalletServicesPlugin.js';
-import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 import { log } from '../../base/loglevel.js';
+import { WalletServicesPluginError } from '../../base/plugin/errors.js';
 
 const useWalletUI = () => {
   const {

package/dist/lib.esm/vue/composables/useWallets.js

@@ -0,0 +1,35 @@
+import { ref } from 'vue';
+import { useWeb3AuthInner } from './useWeb3AuthInner.js';
+import { WalletInitializationError } from '../../base/errors/index.js';
+import { log } from '../../base/loglevel.js';
+
+const useWallets = () => {
+  const {
+    web3Auth
+  } = useWeb3AuthInner();
+  const loading = ref(false);
+  const error = ref(null);
+  const wallets = ref([]);
+  const syncWallets = async () => {
+    if (!web3Auth.value) throw WalletInitializationError.notReady();
+    error.value = null;
+    loading.value = true;
+    try {
+      const result = await web3Auth.value.getConnectedAccountsWithProviders();
+      wallets.value = result;
+    } catch (err) {
+      log.error("Error getting wallets", err);
+      error.value = err;
+    } finally {
+      loading.value = false;
+    }
+  };
+  return {
+    loading,
+    error,
+    wallets,
+    syncWallets
+  };
+};
+
+export { useWallets };

package/dist/lib.esm/vue/composables/useWeb3AuthConnect.js

@@ -17,7 +17,7 @@ const useWeb3AuthConnect = () => {
     }
     if (newVal && !connectorName.value) {
       var _web3Auth$value;
-      connectorName.value = (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.connectedConnectorName;
+      connectorName.value = (_web3Auth$value = web3Auth.value) === null || _web3Auth$value === void 0 ? void 0 : _web3Auth$value.primaryConnectorName;
     }
   }, {
     immediate: true
@@ -28,7 +28,7 @@ const useWeb3AuthConnect = () => {
       error.value = null;
       loading.value = true;
       const localProvider = await web3Auth.value.connectTo(connectorType, loginParams);
-      connectorName.value = web3Auth.value.connectedConnectorName;
+      connectorName.value = web3Auth.value.primaryConnectorName;
       return localProvider;
     } catch (err) {
       log.error("Error connecting", err);

package/dist/lib.esm/vue/index.js

@@ -15,6 +15,7 @@ export { useSwitchChain } from './composables/useSwitchChain.js';
 export { useWalletConnectScanner } from './composables/useWalletConnectScanner.js';
 export { useWalletServicesPlugin } from './composables/useWalletServicesPlugin.js';
 export { useWalletUI } from './composables/useWalletUI.js';
+export { useWallets } from './composables/useWallets.js';
 export { useWeb3Auth } from './composables/useWeb3Auth.js';
 export { useWeb3AuthConnect } from './composables/useWeb3AuthConnect.js';
 export { useWeb3AuthDisconnect } from './composables/useWeb3AuthDisconnect.js';

package/dist/lib.esm/vue/solana/composables/useSignAndSendTransaction.js

@@ -1,8 +1,8 @@
 import { ref } from 'vue';
 import { WalletInitializationError } from '../../../base/errors/index.js';
 import { useSolanaWallet } from './useSolanaWallet.js';
-import { walletSignAndSendTransaction } from '../../../base/wallet/solana.js';
 import { log } from '../../../base/loglevel.js';
+import { walletSignAndSendTransaction } from '../../../base/wallet/solana.js';
 
 const useSignAndSendTransaction = () => {
   const {