@web3auth/no-modal 10.16.0 → 11.0.0-beta.1

package/dist/lib.cjs/react/context/WalletServicesInnerContext.js

@@ -1,21 +1,7 @@
 'use strict';
 
 var react = require('react');
-require('@babel/runtime/helpers/objectSpread2');
-require('@babel/runtime/helpers/defineProperty');
-require('@segment/analytics-next');
-require('../../base/loglevel.js');
-require('@toruslabs/base-controllers');
-require('@web3auth/auth');
-require('../../base/errors/index.js');
-require('../../base/wallet/index.js');
-require('../../base/connector/connectorStatus.js');
-var constants = require('../../base/connector/constants.js');
-require('jwt-decode');
-require('../../base/plugin/errors.js');
-var IPlugin = require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
+var useWalletServicesContextValue = require('./useWalletServicesContextValue.js');
 
 const WalletServicesContext = react.createContext(null);
 function WalletServicesContextProvider({
@@ -23,60 +9,7 @@ function WalletServicesContextProvider({
   context
 }) {
   const web3AuthContext = react.useContext(context);
-  const {
-    getPlugin,
-    isInitialized,
-    isConnected
-  } = web3AuthContext;
-  const [ready, setReady] = react.useState(false);
-  const [connecting, setConnecting] = react.useState(false);
-  const [walletServicesPlugin, setWalletServicesPlugin] = react.useState(null);
-  react.useEffect(() => {
-    if (isInitialized) {
-      const plugin = getPlugin(IPlugin.EVM_PLUGINS.WALLET_SERVICES);
-      setWalletServicesPlugin(plugin);
-    }
-  }, [isInitialized, getPlugin]);
-  react.useEffect(() => {
-    if (isConnected) {
-      const plugin = getPlugin(IPlugin.EVM_PLUGINS.WALLET_SERVICES);
-      setWalletServicesPlugin(plugin);
-      // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
-      if ((plugin === null || plugin === void 0 ? void 0 : plugin.status) === constants.CONNECTOR_STATUS.CONNECTED) setReady(true);
-    }
-  }, [isConnected, getPlugin, walletServicesPlugin]);
-  react.useEffect(() => {
-    const connectedListener = () => {
-      setReady(true);
-      setConnecting(false);
-    };
-    const disconnectedListener = () => {
-      setReady(false);
-      setConnecting(false);
-    };
-    const connectingListener = () => {
-      setConnecting(true);
-    };
-    if (walletServicesPlugin) {
-      walletServicesPlugin.on(IPlugin.PLUGIN_EVENTS.CONNECTED, connectedListener);
-      walletServicesPlugin.on(IPlugin.PLUGIN_EVENTS.DISCONNECTED, disconnectedListener);
-      walletServicesPlugin.on(IPlugin.PLUGIN_EVENTS.CONNECTING, connectingListener);
-    }
-    return () => {
-      if (walletServicesPlugin) {
-        walletServicesPlugin.removeListener(IPlugin.PLUGIN_EVENTS.CONNECTED, connectedListener);
-        walletServicesPlugin.removeListener(IPlugin.PLUGIN_EVENTS.DISCONNECTED, disconnectedListener);
-        walletServicesPlugin.removeListener(IPlugin.PLUGIN_EVENTS.CONNECTING, connectingListener);
-      }
-    };
-  }, [walletServicesPlugin]);
-  const value = react.useMemo(() => {
-    return {
-      plugin: walletServicesPlugin,
-      ready,
-      connecting
-    };
-  }, [walletServicesPlugin, ready, connecting]);
+  const value = useWalletServicesContextValue.useWalletServicesContextValue(web3AuthContext);
   return react.createElement(WalletServicesContext.Provider, {
     value
   }, children);

package/dist/lib.cjs/react/context/Web3AuthInnerContext.js

@@ -1,21 +1,8 @@
 'use strict';
 
 var react = require('react');
-var analytics = require('../../base/analytics.js');
-require('@toruslabs/base-controllers');
-require('@babel/runtime/helpers/defineProperty');
-require('@web3auth/auth');
-var index = require('../../base/errors/index.js');
-require('../../base/wallet/index.js');
-require('../../base/connector/connectorStatus.js');
-var constants = require('../../base/connector/constants.js');
-require('jwt-decode');
-require('../../base/loglevel.js');
-require('../../base/plugin/errors.js');
-require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var noModal = require('../../noModal.js');
+var useWeb3AuthInnerContextValue = require('./useWeb3AuthInnerContextValue.js');
 
 const Web3AuthInnerContext = react.createContext(null);
 function Web3AuthInnerProvider(params) {
@@ -27,153 +14,11 @@ function Web3AuthInnerProvider(params) {
   const {
     web3AuthOptions
   } = config;
-  const web3Auth = react.useMemo(() => {
-    setProvider(null);
-    return new noModal.Web3AuthNoModal(web3AuthOptions, initialState);
-  }, [web3AuthOptions, initialState]);
-  const [chainId, setChainId] = react.useState(null);
-  const [chainNamespace, setChainNamespace] = react.useState(null);
-  const [isInitializing, setIsInitializing] = react.useState(false);
-  const [initError, setInitError] = react.useState(null);
-  const [isConnected, setIsConnected] = react.useState(false);
-  const [provider, setProvider] = react.useState(null);
-  const [isInitialized, setIsInitialized] = react.useState(false);
-  const [status, setStatus] = react.useState(null);
-  const [isMFAEnabled, setIsMFAEnabled] = react.useState(false);
-  const [isAuthorized, setIsAuthorized] = react.useState(false);
-  const getPlugin = react.useCallback(name => {
-    if (!web3Auth) throw index.WalletInitializationError.notReady();
-    return web3Auth.getPlugin(name);
-  }, [web3Auth]);
-  react.useEffect(() => {
-    const controller = new AbortController();
-    async function init() {
-      try {
-        var _web3Auth$currentChai;
-        setInitError(null);
-        setIsInitializing(true);
-        web3Auth.setAnalyticsProperties({
-          integration_type: analytics.ANALYTICS_INTEGRATION_TYPE.REACT_HOOKS
-        });
-        await web3Auth.init({
-          signal: controller.signal
-        });
-        setChainId(web3Auth.currentChainId);
-        setChainNamespace((_web3Auth$currentChai = web3Auth.currentChain) === null || _web3Auth$currentChai === void 0 ? void 0 : _web3Auth$currentChai.chainNamespace);
-      } catch (error) {
-        setInitError(error);
-      } finally {
-        setIsInitializing(false);
-      }
-    }
-    if (web3Auth) init();
-    return () => {
-      controller.abort();
-    };
-  }, [web3Auth]);
-  react.useEffect(() => {
-    const handleChainChange = async chainId => {
-      var _web3Auth$currentChai2;
-      setChainId(chainId);
-      setChainNamespace(web3Auth === null || web3Auth === void 0 || (_web3Auth$currentChai2 = web3Auth.currentChain) === null || _web3Auth$currentChai2 === void 0 ? void 0 : _web3Auth$currentChai2.chainNamespace);
-    };
-    if (provider) {
-      provider.on("chainChanged", handleChainChange);
-      return () => {
-        if (provider) {
-          provider.removeListener("chainChanged", handleChainChange);
-        }
-      };
-    }
-  }, [web3Auth, provider]);
-  react.useEffect(() => {
-    const notReadyListener = () => setStatus(constants.CONNECTOR_STATUS.NOT_READY);
-    const readyListener = () => {
-      setStatus(web3Auth.status);
-      setIsInitialized(true);
-    };
-    const connectedListener = data => {
-      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 === constants.CONNECTOR_STATUS.CONNECTED) {
-        setIsInitialized(true);
-        setIsConnected(true);
-        setProvider(data.provider);
-      }
-    };
-    const disconnectedListener = () => {
-      setStatus(web3Auth.status);
-      setIsConnected(false);
-      setIsAuthorized(false);
-      setProvider(null);
-    };
-    const connectingListener = () => {
-      setStatus(web3Auth.status);
-    };
-    const errorListener = () => {
-      setStatus(web3Auth.status);
-    };
-    const rehydrationErrorListener = () => {
-      setStatus(web3Auth.status);
-      setIsConnected(false);
-      setIsAuthorized(false);
-      setProvider(null);
-    };
-    const authorizedListener = () => {
-      setStatus(web3Auth.status);
-      if (web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
-        setIsConnected(true);
-        setIsAuthorized(true);
-      }
-    };
-    const mfaEnabledListener = isMFAEnabled => {
-      if (typeof isMFAEnabled === "boolean") setIsMFAEnabled(isMFAEnabled);
-    };
-    // TODO: In strict mode, web3auth becomes null and .off throws an error sometimes.
-    if (web3Auth) {
-      // web3Auth is initialized here.
-      setStatus(web3Auth.status);
-      web3Auth.on(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
-      web3Auth.on(constants.CONNECTOR_EVENTS.READY, readyListener);
-      web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTED, connectedListener);
-      web3Auth.on(constants.CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
-      web3Auth.on(constants.CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
-      web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTING, connectingListener);
-      web3Auth.on(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
-      web3Auth.on(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
-      web3Auth.on(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
-    }
-    return () => {
-      if (web3Auth) {
-        web3Auth.removeListener(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
-        web3Auth.removeListener(constants.CONNECTOR_EVENTS.READY, readyListener);
-        web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONNECTED, connectedListener);
-        web3Auth.removeListener(constants.CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
-        web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONNECTING, connectingListener);
-        web3Auth.removeListener(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
-        web3Auth.removeListener(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
-        web3Auth.removeListener(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
-        web3Auth.removeListener(constants.CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
-      }
-    };
-  }, [web3Auth]);
-  const value = react.useMemo(() => {
-    return {
-      web3Auth,
-      isConnected,
-      isInitialized,
-      provider,
-      status,
-      isInitializing,
-      initError,
-      isMFAEnabled,
-      chainId,
-      chainNamespace,
-      getPlugin,
-      setIsMFAEnabled,
-      isAuthorized
-    };
-  }, [web3Auth, isConnected, isInitialized, provider, status, getPlugin, isInitializing, initError, isMFAEnabled, setIsMFAEnabled, chainId, chainNamespace, isAuthorized]);
+  const value = useWeb3AuthInnerContextValue.useWeb3AuthInnerContextValue({
+    Web3AuthConstructor: noModal.Web3AuthNoModal,
+    web3AuthOptions,
+    initialState
+  });
   return react.createElement(Web3AuthInnerContext.Provider, {
     value
   }, children);

package/dist/lib.cjs/react/context/useWalletServicesContextValue.js

@@ -0,0 +1,76 @@
+'use strict';
+
+var react = require('react');
+require('@babel/runtime/helpers/objectSpread2');
+require('@babel/runtime/helpers/defineProperty');
+require('@segment/analytics-next');
+require('../../base/loglevel.js');
+require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
+require('@web3auth/auth');
+require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../base/constants.js');
+require('../../base/wallet/index.js');
+var connectorStatus = require('../../base/connector/connectorStatus.js');
+require('../../base/connector/constants.js');
+require('jwt-decode');
+require('../../base/plugin/errors.js');
+var IPlugin = require('../../base/plugin/IPlugin.js');
+
+function useWalletServicesContextValue(web3AuthContext) {
+  const {
+    getPlugin,
+    isInitialized,
+    isConnected
+  } = web3AuthContext;
+  const [ready, setReady] = react.useState(false);
+  const [connecting, setConnecting] = react.useState(false);
+  const [walletServicesPlugin, setWalletServicesPlugin] = react.useState(null);
+  react.useEffect(() => {
+    if (!isInitialized) return;
+    const plugin = getPlugin(IPlugin.EVM_PLUGINS.WALLET_SERVICES);
+    setWalletServicesPlugin(plugin);
+  }, [isInitialized, getPlugin]);
+  react.useEffect(() => {
+    if (!isConnected) return;
+    const plugin = getPlugin(IPlugin.EVM_PLUGINS.WALLET_SERVICES);
+    setWalletServicesPlugin(plugin);
+    // When rehydrating, the connected listener may be registered after the connected event is emitted.
+    if (connectorStatus.CONNECTED_STATUSES.includes(plugin === null || plugin === void 0 ? void 0 : plugin.status)) setReady(true);
+  }, [isConnected, getPlugin]);
+  react.useEffect(() => {
+    const plugin = walletServicesPlugin;
+    if (!plugin) return undefined;
+    const connectedListener = () => {
+      setReady(true);
+      setConnecting(false);
+    };
+    const disconnectedListener = () => {
+      setReady(false);
+      setConnecting(false);
+    };
+    const connectingListener = () => {
+      setConnecting(true);
+    };
+    plugin.on(IPlugin.PLUGIN_EVENTS.CONNECTED, connectedListener);
+    plugin.on(IPlugin.PLUGIN_EVENTS.DISCONNECTED, disconnectedListener);
+    plugin.on(IPlugin.PLUGIN_EVENTS.CONNECTING, connectingListener);
+    return () => {
+      if (!plugin) return;
+      plugin.removeListener(IPlugin.PLUGIN_EVENTS.CONNECTED, connectedListener);
+      plugin.removeListener(IPlugin.PLUGIN_EVENTS.DISCONNECTED, disconnectedListener);
+      plugin.removeListener(IPlugin.PLUGIN_EVENTS.CONNECTING, connectingListener);
+    };
+  }, [walletServicesPlugin]);
+  return react.useMemo(() => {
+    return {
+      plugin: walletServicesPlugin,
+      ready,
+      connecting
+    };
+  }, [walletServicesPlugin, ready, connecting]);
+}
+
+exports.useWalletServicesContextValue = useWalletServicesContextValue;

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

@@ -0,0 +1,216 @@
+'use strict';
+
+var react = require('react');
+var analytics = require('../../base/analytics.js');
+require('@toruslabs/base-controllers');
+require('@babel/runtime/helpers/defineProperty');
+require('@toruslabs/session-manager');
+require('@web3auth/auth');
+var index = require('../../base/errors/index.js');
+require('../../base/loglevel.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+var constants$1 = require('../../base/constants.js');
+require('../../base/wallet/index.js');
+var connectorStatus = require('../../base/connector/connectorStatus.js');
+var constants = require('../../base/connector/constants.js');
+require('jwt-decode');
+require('../../base/plugin/errors.js');
+require('../../base/plugin/IPlugin.js');
+
+function getInitialState(web3Auth) {
+  var _web3Auth$currentChai, _web3Auth$currentChai2;
+  const isConnected = connectorStatus.CONNECTED_STATUSES.includes(web3Auth.status);
+  const isAuthorized = web3Auth.status === constants.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,
+  initialState,
+  notReadyUsesCurrentStatus = false,
+  cleanupOnUnmount = false,
+  initEffectDependency
+}) {
+  const web3Auth = react.useMemo(() => {
+    return new Web3AuthConstructor(web3AuthOptions, initialState);
+  }, [Web3AuthConstructor, web3AuthOptions, initialState]);
+  const initialWeb3AuthState = getInitialState(web3Auth);
+  const [chainId, setChainId] = react.useState(() => initialWeb3AuthState.chainId);
+  const [chainNamespace, setChainNamespace] = react.useState(() => initialWeb3AuthState.chainNamespace);
+  const [isInitializing, setIsInitializing] = react.useState(false);
+  const [initError, setInitError] = react.useState(null);
+  const [connection, setConnection] = react.useState(() => initialWeb3AuthState.connection);
+  const [isInitialized, setIsInitialized] = react.useState(initialWeb3AuthState.isInitialized);
+  const [isMFAEnabled, setIsMFAEnabled] = react.useState(false);
+  const [isConnected, setIsConnected] = react.useState(initialWeb3AuthState.isConnected);
+  const [status, setStatus] = react.useState(initialWeb3AuthState.status);
+  const [isAuthorized, setIsAuthorized] = react.useState(initialWeb3AuthState.isAuthorized);
+  const getPlugin = react.useCallback(name => {
+    if (!web3Auth) throw index.WalletInitializationError.notReady();
+    return web3Auth.getPlugin(name);
+  }, [web3Auth]);
+  react.useEffect(() => {
+    const controller = new AbortController();
+    async function init() {
+      try {
+        var _web3Auth$currentChai3;
+        setInitError(null);
+        setIsInitializing(true);
+        web3Auth.setAnalyticsProperties({
+          integration_type: analytics.ANALYTICS_INTEGRATION_TYPE.REACT_HOOKS
+        });
+        await web3Auth.init({
+          signal: controller.signal
+        });
+        setChainId(web3Auth.currentChainId);
+        setChainNamespace((_web3Auth$currentChai3 = web3Auth.currentChain) === null || _web3Auth$currentChai3 === void 0 ? void 0 : _web3Auth$currentChai3.chainNamespace);
+      } catch (error) {
+        setInitError(error);
+      } finally {
+        setIsInitializing(false);
+      }
+    }
+    init();
+    return () => {
+      controller.abort();
+    };
+  }, [web3Auth, initEffectDependency]);
+  react.useEffect(() => {
+    var _connection$ethereumP;
+    const handleChainChange = async nextChainId => {
+      var _web3Auth$currentChai4;
+      setChainId(nextChainId);
+      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;
+    provider.on("chainChanged", handleChainChange);
+    return () => {
+      provider.removeListener("chainChanged", handleChainChange);
+    };
+  }, [web3Auth.currentChain, connection === null || connection === void 0 ? void 0 : connection.ethereumProvider]);
+  react.useEffect(() => {
+    const notReadyListener = () => {
+      setStatus(notReadyUsesCurrentStatus ? web3Auth.status : constants.CONNECTOR_STATUS.NOT_READY);
+    };
+    const readyListener = () => {
+      setStatus(web3Auth.status);
+      setIsInitialized(true);
+    };
+    const connectedListener = data => {
+      if (data.pendingUserConsent) return;
+      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 === constants.CONNECTOR_STATUS.CONNECTED) {
+        var _web3Auth$currentChai5, _web3Auth$currentChai6;
+        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);
+      }
+    };
+    const disconnectedListener = () => {
+      setStatus(web3Auth.status);
+      setIsConnected(false);
+      setIsAuthorized(false);
+      setConnection(null);
+    };
+    const connectingListener = () => {
+      setStatus(web3Auth.status);
+    };
+    const errorListener = () => {
+      setStatus(web3Auth.status);
+    };
+    const rehydrationErrorListener = () => {
+      setStatus(web3Auth.status);
+      setIsConnected(false);
+      setIsAuthorized(false);
+      setConnection(null);
+    };
+    const authorizedListener = () => {
+      setStatus(web3Auth.status);
+      if (web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
+        setIsConnected(true);
+        setIsAuthorized(true);
+      }
+    };
+    const consentAcceptedListener = () => {
+      setStatus(web3Auth.status);
+      if (web3Auth.status === constants.CONNECTOR_STATUS.CONNECTED || web3Auth.status === constants.CONNECTOR_STATUS.AUTHORIZED) {
+        var _web3Auth$currentChai7, _web3Auth$currentChai8;
+        setIsInitialized(true);
+        setIsConnected(true);
+        setConnection(web3Auth.connection);
+        setChainId(web3Auth.currentChainId);
+        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 === constants.CONNECTOR_STATUS.AUTHORIZED) {
+          setIsAuthorized(true);
+        }
+      }
+    };
+    const mfaEnabledListener = nextIsMFAEnabled => {
+      if (typeof nextIsMFAEnabled === "boolean") setIsMFAEnabled(nextIsMFAEnabled);
+    };
+    if (web3Auth) {
+      web3Auth.on(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.READY, readyListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTED, connectedListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.CONNECTING, connectingListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
+      web3Auth.on(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+      if (web3Auth.loginMode === constants$1.LOGIN_MODE.MODAL) {
+        web3Auth.on(constants.CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
+      }
+    }
+    return () => {
+      if (!web3Auth) return;
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.NOT_READY, notReadyListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.READY, readyListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONNECTED, connectedListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.DISCONNECTED, disconnectedListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONNECTING, connectingListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.ERRORED, errorListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.REHYDRATION_ERROR, rehydrationErrorListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.MFA_ENABLED, mfaEnabledListener);
+      web3Auth.removeListener(constants.CONNECTOR_EVENTS.AUTHORIZED, authorizedListener);
+      if (web3Auth.loginMode === constants$1.LOGIN_MODE.MODAL) {
+        web3Auth.removeListener(constants.CONNECTOR_EVENTS.CONSENT_ACCEPTED, consentAcceptedListener);
+      }
+      if (cleanupOnUnmount) {
+        web3Auth.cleanup();
+      }
+    };
+  }, [cleanupOnUnmount, notReadyUsesCurrentStatus, web3Auth]);
+  return react.useMemo(() => {
+    return {
+      web3Auth,
+      isConnected,
+      isInitialized,
+      connection,
+      status,
+      isInitializing,
+      initError,
+      isMFAEnabled,
+      chainId,
+      chainNamespace,
+      getPlugin,
+      setIsMFAEnabled,
+      isAuthorized
+    };
+  }, [web3Auth, isConnected, isInitialized, connection, status, getPlugin, isInitializing, initError, isMFAEnabled, setIsMFAEnabled, chainId, chainNamespace, isAuthorized]);
+}
+
+exports.useWeb3AuthInnerContextValue = useWeb3AuthInnerContextValue;

package/dist/lib.cjs/react/hooks/{useIdentityToken.js → useAuthTokenInfo.js}

@@ -3,20 +3,19 @@
 var react = require('react');
 var useWeb3AuthInner = require('./useWeb3AuthInner.js');
 
-const useIdentityToken = () => {
+const useAuthTokenInfo = () => {
   const {
     web3Auth,
-    isConnected,
     isAuthorized
   } = useWeb3AuthInner.useWeb3AuthInner();
   const [loading, setLoading] = react.useState(false);
   const [error, setError] = react.useState(null);
   const [token, setToken] = react.useState(null);
-  const getIdentityToken = react.useCallback(async () => {
+  const getAuthTokenInfo = react.useCallback(async () => {
     setLoading(true);
     setError(null);
     try {
-      const userAuthInfo = await web3Auth.getIdentityToken();
+      const userAuthInfo = await web3Auth.getAuthTokenInfo();
       if (userAuthInfo !== null && userAuthInfo !== void 0 && userAuthInfo.idToken) {
         setToken(userAuthInfo.idToken);
       }
@@ -35,13 +34,13 @@ const useIdentityToken = () => {
     if (isAuthorized && !token) {
       setToken(web3Auth.idToken);
     }
-  }, [isConnected, isAuthorized, token]);
+  }, [isAuthorized, token, web3Auth]);
   return {
     loading,
     error,
     token,
-    getIdentityToken
+    getAuthTokenInfo
   };
 };
 
-exports.useIdentityToken = useIdentityToken;
+exports.useAuthTokenInfo = useAuthTokenInfo;

package/dist/lib.cjs/react/hooks/useCheckout.js

@@ -6,16 +6,18 @@ require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
 require('../../base/loglevel.js');
 require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 require('@web3auth/auth');
 require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
 var errors = require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var useWalletServicesPlugin = require('./useWalletServicesPlugin.js');
 
 const useCheckout = () => {

package/dist/lib.cjs/react/hooks/useFunding.js

@@ -6,16 +6,18 @@ require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
 require('../../base/loglevel.js');
 require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 require('@web3auth/auth');
 require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
 var errors = require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var useWalletServicesPlugin = require('./useWalletServicesPlugin.js');
 
 const useFunding = () => {

package/dist/lib.cjs/react/hooks/useReceive.js

@@ -6,16 +6,18 @@ require('@babel/runtime/helpers/defineProperty');
 require('@segment/analytics-next');
 require('../../base/loglevel.js');
 require('@toruslabs/base-controllers');
+require('@toruslabs/session-manager');
 require('@web3auth/auth');
 require('../../base/errors/index.js');
+require('@toruslabs/constants');
+require('@toruslabs/http-helpers');
+require('../../base/constants.js');
 require('../../base/wallet/index.js');
 require('../../base/connector/connectorStatus.js');
 require('../../base/connector/constants.js');
 require('jwt-decode');
 var errors = require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
 var useWalletServicesPlugin = require('./useWalletServicesPlugin.js');
 
 const useReceive = () => {