fix status for connected and authorized

chaitanyapotti · chaitanyapotti · commit bfc42d04d897 · 2025-12-05T19:29:27.000+08:00
diff --git a/packages/modal/src/modalManager.ts b/packages/modal/src/modalManager.ts
@@ -8,8 +8,10 @@ import {
   type BaseConnectorConfig,
   type ChainNamespaceType,
   cloneDeep,
+  CONNECTED_STATUSES,
   CONNECTOR_CATEGORY,
   CONNECTOR_EVENTS,
+  CONNECTOR_INITIAL_AUTHENTICATION_MODE,
   CONNECTOR_NAMES,
   CONNECTOR_NAMESPACES,
   CONNECTOR_STATUS,
@@ -176,7 +178,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
   public async connect(): Promise<IProvider | null> {
     if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
     // if already connected return provider
-    if (this.connectedConnectorName && this.status === CONNECTOR_STATUS.CONNECTED && this.provider) return this.provider;
+    if (this.connectedConnectorName && CONNECTED_STATUSES.includes(this.status) && this.provider) return this.provider;
     this.loginModal.open();
     return new Promise((resolve, reject) => {
       // remove all listeners when promise is resolved or rejected.
@@ -202,7 +204,12 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
         }
       };
 
-      this.once(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+      if (this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN) {
+        this.once(CONNECTOR_EVENTS.AUTHORIZED, handleConnected);
+      } else {
+        this.once(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+      }
+
       this.once(CONNECTOR_EVENTS.ERRORED, handleError);
       this.once(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
     });
@@ -651,7 +658,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
       }
       if (
         !visibility &&
-        this.status === CONNECTOR_STATUS.CONNECTED &&
+        CONNECTED_STATUSES.includes(this.status) &&
         (walletConnectStatus === CONNECTOR_STATUS.READY || walletConnectStatus === CONNECTOR_STATUS.CONNECTING)
       ) {
         log.debug("this stops wc connector from trying to reconnect once proposal expires");
diff --git a/packages/modal/src/react/context/WalletServicesInnerContext.ts b/packages/modal/src/react/context/WalletServicesInnerContext.ts
@@ -1,4 +1,4 @@
-import { CONNECTOR_STATUS, EVM_PLUGINS, PLUGIN_EVENTS } from "@web3auth/no-modal";
+import { CONNECTED_STATUSES, EVM_PLUGINS, PLUGIN_EVENTS } from "@web3auth/no-modal";
 import { type WalletServicesPluginType } from "@web3auth/no-modal";
 import { Context, createContext, createElement, PropsWithChildren, useContext, useEffect, useMemo, useState } from "react";
 
@@ -26,7 +26,7 @@ export function WalletServicesContextProvider({ children, context }: PropsWithCh
       const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES) as WalletServicesPluginType;
       setWalletServicesPlugin(plugin);
       // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
-      if (plugin?.status === CONNECTOR_STATUS.CONNECTED) setReady(true);
+      if (CONNECTED_STATUSES.includes(plugin?.status)) setReady(true);
     }
   }, [isConnected, getPlugin, walletServicesPlugin]);
 
diff --git a/packages/modal/src/ui/components/Loader/Loader.tsx b/packages/modal/src/ui/components/Loader/Loader.tsx
@@ -144,24 +144,28 @@ function Loader(props: LoaderProps) {
   // eslint-disable-next-line no-console
   console.log("connectorName", connectorName);
 
+  const isConnectedAccordingToAuthenticationMode = useMemo(
+    () =>
+      (!isConnectAndSignAuthenticationMode && modalStatus === MODAL_STATUS.CONNECTED) ||
+      (isConnectAndSignAuthenticationMode && modalStatus === MODAL_STATUS.AUTHORIZED),
+    [modalStatus, isConnectAndSignAuthenticationMode]
+  );
+
   useEffect(() => {
-    if (modalStatus === MODAL_STATUS.CONNECTED) {
-      setTimeout(() => {
-        onClose();
-      }, 1000);
-    }
-    if (isConnectAndSignAuthenticationMode && modalStatus === MODAL_STATUS.AUTHORIZED) {
-      setTimeout(() => {
+    if (isConnectedAccordingToAuthenticationMode) {
+      const timeout = setTimeout(() => {
         onClose();
       }, 1000);
+
+      return () => clearTimeout(timeout);
     }
-  }, [modalStatus, onClose, isConnectAndSignAuthenticationMode]);
+  }, [isConnectedAccordingToAuthenticationMode, onClose]);
 
   return (
     <div className="w3a--flex w3a--h-full w3a--flex-1 w3a--flex-col w3a--items-center w3a--justify-center w3a--gap-y-4">
       {modalStatus === MODAL_STATUS.CONNECTING && <ConnectingStatus connector={connector} connectorName={connectorName} appLogo={appLogo} />}
 
-      {(modalStatus === MODAL_STATUS.CONNECTED || modalStatus === MODAL_STATUS.AUTHORIZED) && <ConnectedStatus message={message} />}
+      {isConnectedAccordingToAuthenticationMode && <ConnectedStatus message={message} />}
 
       {modalStatus === MODAL_STATUS.ERRORED && <ErroredStatus message={message} />}
 
diff --git a/packages/modal/src/ui/components/Widget/Widget.tsx b/packages/modal/src/ui/components/Widget/Widget.tsx
@@ -170,7 +170,7 @@ function Widget(props: WidgetProps) {
   };
 
   const onCloseLoader = () => {
-    if (modalState.status === MODAL_STATUS.CONNECTED) {
+    if (!isConnectAndSignAuthenticationMode && modalState.status === MODAL_STATUS.CONNECTED) {
       setModalState({
         ...modalState,
         modalVisibility: false,
@@ -195,7 +195,10 @@ function Widget(props: WidgetProps) {
 
   const showCloseIcon = useMemo(() => {
     return (
-      modalState.status === MODAL_STATUS.INITIALIZED || modalState.status === MODAL_STATUS.CONNECTED || modalState.status === MODAL_STATUS.ERRORED
+      modalState.status === MODAL_STATUS.INITIALIZED ||
+      modalState.status === MODAL_STATUS.CONNECTED ||
+      modalState.status === MODAL_STATUS.ERRORED ||
+      modalState.status === MODAL_STATUS.AUTHORIZED
     );
   }, [modalState.status]);
 
diff --git a/packages/no-modal/src/base/connector/baseConnector.ts b/packages/no-modal/src/base/connector/baseConnector.ts
@@ -3,6 +3,7 @@ import { SafeEventEmitter } from "@web3auth/auth";
 import { CHAIN_NAMESPACES, CONNECTOR_NAMESPACES, ConnectorNamespaceType, CustomChainConfig } from "../chain/IChainInterface";
 import { WalletInitializationError, WalletLoginError } from "../errors";
 import { WALLET_CONNECTOR_TYPE, WALLET_CONNECTORS } from "../wallet";
+import { CONNECTED_STATUSES } from "./connectorStatus";
 import { CONNECTOR_EVENTS, CONNECTOR_STATUS } from "./constants";
 import type {
   BaseConnectorLoginParams,
@@ -41,8 +42,12 @@ export abstract class BaseConnector<T> extends SafeEventEmitter<ConnectorEvents>
     this.coreOptions = options.coreOptions;
   }
 
-  get connnected(): boolean {
-    return this.status === CONNECTOR_STATUS.CONNECTED;
+  get connected(): boolean {
+    return CONNECTED_STATUSES.includes(this.status);
+  }
+
+  get canAuthorize(): boolean {
+    return ([CONNECTOR_STATUS.AUTHORIZING, CONNECTOR_STATUS.AUTHORIZED, CONNECTOR_STATUS.CONNECTED] as CONNECTOR_STATUS_TYPE[]).includes(this.status);
   }
 
   public abstract get provider(): IProvider | null;
@@ -53,7 +58,7 @@ export abstract class BaseConnector<T> extends SafeEventEmitter<ConnectorEvents>
     if (this.name === WALLET_CONNECTORS.METAMASK && !this.isInjected && this.status === CONNECTOR_STATUS.CONNECTING) return;
 
     if (this.status === CONNECTOR_STATUS.CONNECTING) throw WalletInitializationError.notReady("Already connecting");
-    if (this.status === CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.connectionError("Already connected");
+    if (this.connected) throw WalletLoginError.connectionError("Already connected");
     if (this.status !== CONNECTOR_STATUS.READY)
       throw WalletLoginError.connectionError(
         "Wallet connector is not ready yet, Please wait for init function to resolve before calling connect/connectTo function"
@@ -72,12 +77,12 @@ export abstract class BaseConnector<T> extends SafeEventEmitter<ConnectorEvents>
     if (this.connectorNamespace !== CONNECTOR_NAMESPACES.MULTICHAIN && this.connectorNamespace !== chainConfig.chainNamespace)
       throw WalletInitializationError.invalidParams("Connector doesn't support this chain namespace");
     if (this.status === CONNECTOR_STATUS.NOT_READY) return;
-    if (this.status === CONNECTOR_STATUS.CONNECTED) throw WalletInitializationError.notReady("Already connected");
+    if (this.connected) throw WalletInitializationError.notReady("Already connected");
     if (this.status === CONNECTOR_STATUS.READY) throw WalletInitializationError.notReady("Connector is already initialized");
   }
 
   checkDisconnectionRequirements(): void {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.disconnectionError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.disconnectionError("Not connected with wallet");
   }
 
   checkSwitchChainRequirements(params: { chainId: string }, init = false): void {
diff --git a/packages/no-modal/src/base/connector/connectorStatus.ts b/packages/no-modal/src/base/connector/connectorStatus.ts
@@ -0,0 +1,4 @@
+import { CONNECTOR_STATUS } from "./constants";
+import { CONNECTOR_STATUS_TYPE } from "./interfaces";
+
+export const CONNECTED_STATUSES: CONNECTOR_STATUS_TYPE[] = [CONNECTOR_STATUS.CONNECTED, CONNECTOR_STATUS.AUTHORIZED];
diff --git a/packages/no-modal/src/base/connector/index.ts b/packages/no-modal/src/base/connector/index.ts
@@ -1,4 +1,5 @@
 export * from "./baseConnector";
+export * from "./connectorStatus";
 export * from "./constants";
 export * from "./interfaces";
 export * from "./utils";
diff --git a/packages/no-modal/src/base/connector/interfaces.ts b/packages/no-modal/src/base/connector/interfaces.ts
@@ -73,7 +73,7 @@ export interface IConnector<T> extends SafeEventEmitter {
   status: CONNECTOR_STATUS_TYPE;
   provider: IProvider | null;
   connectorData?: unknown;
-  connnected: boolean;
+  connected: boolean;
   isInjected?: boolean;
   icon?: string;
   init(options?: ConnectorInitOptions): Promise<void>;
diff --git a/packages/no-modal/src/connectors/auth-connector/authConnector.ts b/packages/no-modal/src/connectors/auth-connector/authConnector.ts
@@ -221,7 +221,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   }
 
   public async enableMFA(params: AuthLoginParams = { authConnection: "" }): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     try {
       const result = await this.authInstance.enableMFA(params);
@@ -237,7 +237,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   }
 
   public async manageMFA(params: AuthLoginParams = { authConnection: "" }): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     try {
       await this.authInstance.manageMFA(params);
@@ -251,7 +251,7 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   }
 
   async disconnect(options: { cleanup: boolean } = { cleanup: false }): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connected) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     this.status = CONNECTOR_STATUS.DISCONNECTING;
     await this.authInstance.logout();
@@ -271,13 +271,13 @@ class AuthConnector extends BaseConnector<AuthLoginParams> {
   }
 
   async getIdentityToken(): Promise<{ idToken: string }> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     const userInfo = await this.getUserInfo();
     return { idToken: userInfo.idToken as string };
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet");
     if (!this.authInstance) throw WalletInitializationError.notReady("authInstance is not ready");
     const userInfo = this.authInstance.getUserInfo();
     return userInfo;
diff --git a/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts b/packages/no-modal/src/connectors/base-evm-connector/baseEvmConnector.ts
@@ -6,8 +6,6 @@ import {
   checkIfTokenIsExpired,
   clearToken,
   CONNECTOR_EVENTS,
-  CONNECTOR_STATUS,
-  CONNECTOR_STATUS_TYPE,
   ConnectorInitOptions,
   getSavedToken,
   IdentityTokenInfo,
@@ -20,8 +18,7 @@ export abstract class BaseEvmConnector<T> extends BaseConnector<T> {
   async init(_?: ConnectorInitOptions): Promise<void> {}
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
-    if (!this.provider || !([CONNECTOR_STATUS.CONNECTED, CONNECTOR_STATUS.AUTHORIZING] as CONNECTOR_STATUS_TYPE[]).includes(this.status))
-      throw WalletLoginError.notConnectedError();
+    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with valid options");
 
     const accounts = await this.provider.request<never, string[]>({ method: EVM_METHOD_TYPES.GET_ACCOUNTS });
diff --git a/packages/no-modal/src/connectors/base-solana-connector/baseSolanaConnector.ts b/packages/no-modal/src/connectors/base-solana-connector/baseSolanaConnector.ts
@@ -6,8 +6,6 @@ import {
   checkIfTokenIsExpired,
   clearToken,
   CONNECTOR_EVENTS,
-  CONNECTOR_STATUS,
-  CONNECTOR_STATUS_TYPE,
   ConnectorInitOptions,
   getSavedToken,
   IdentityTokenInfo,
@@ -20,8 +18,7 @@ export abstract class BaseSolanaConnector<T> extends BaseConnector<T> {
   async init(_?: ConnectorInitOptions): Promise<void> {}
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
-    if (!this.provider || !([CONNECTOR_STATUS.CONNECTED, CONNECTOR_STATUS.AUTHORIZING] as CONNECTOR_STATUS_TYPE[]).includes(this.status))
-      throw WalletLoginError.notConnectedError();
+    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
     if (!this.coreOptions) throw WalletInitializationError.invalidParams("Please initialize Web3Auth with a valid options");
 
     const accounts = await this.provider.request<never, string[]>({ method: SOLANA_METHOD_TYPES.GET_ACCOUNTS });
diff --git a/packages/no-modal/src/connectors/coinbase-connector/coinbaseConnector.ts b/packages/no-modal/src/connectors/coinbase-connector/coinbaseConnector.ts
@@ -158,7 +158,7 @@ class CoinbaseConnector extends BaseEvmConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
 
diff --git a/packages/no-modal/src/connectors/injected-evm-connector/injectedEvmConnector.ts b/packages/no-modal/src/connectors/injected-evm-connector/injectedEvmConnector.ts
@@ -157,7 +157,7 @@ class InjectedEvmConnector extends BaseEvmConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
 
diff --git a/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts b/packages/no-modal/src/connectors/injected-solana-connector/walletStandardConnector.ts
@@ -63,7 +63,7 @@ export class WalletStandardConnector extends BaseSolanaConnector<void> {
   }
 
   get isWalletConnected(): boolean {
-    return !!(this.status === CONNECTOR_STATUS.CONNECTED && this.wallet.accounts.length > 0);
+    return !!(this.connected && this.wallet.accounts.length > 0);
   }
 
   async init(options: ConnectorInitOptions): Promise<void> {
diff --git a/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts b/packages/no-modal/src/connectors/metamask-connector/metamaskConnector.ts
@@ -234,7 +234,7 @@ class MetaMaskConnector extends BaseEvmConnector<void> {
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
+    if (!this.canAuthorize) throw WalletLoginError.notConnectedError("Not connected with wallet, Please login/connect first");
     return {};
   }
 
diff --git a/packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Connector.ts b/packages/no-modal/src/connectors/wallet-connect-v2-connector/walletConnectV2Connector.ts
@@ -267,7 +267,7 @@ class WalletConnectV2Connector extends BaseConnector<void> {
   }
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
-    if (!this.provider || this.status !== CONNECTOR_STATUS.CONNECTED) throw WalletLoginError.notConnectedError();
+    if (!this.provider || !this.canAuthorize) throw WalletLoginError.notConnectedError();
     const { chainId } = this.provider;
     const currentChainConfig = this.coreOptions.chains.find((x) => x.chainId === chainId);
     if (!currentChainConfig) throw WalletLoginError.connectionError("Chain config is not available");
diff --git a/packages/no-modal/src/noModal.ts b/packages/no-modal/src/noModal.ts
@@ -13,6 +13,7 @@ import {
   CHAIN_NAMESPACES,
   type ChainNamespaceType,
   type CONNECTED_EVENT_DATA,
+  CONNECTED_STATUSES,
   CONNECTOR_EVENTS,
   CONNECTOR_INITIAL_AUTHENTICATION_MODE,
   CONNECTOR_NAMESPACES,
@@ -104,7 +105,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
 
     this.loadState(initialState);
     if (this.state.idToken && this.coreOptions.ssr) {
-      this.status = CONNECTOR_STATUS.CONNECTED;
+      this.status = CONNECTOR_STATUS.AUTHORIZED;
     }
   }
 
@@ -276,7 +277,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
     const newChainConfig = this.coreOptions.chains.find((x) => x.chainId === params.chainId);
     if (!newChainConfig) throw WalletInitializationError.invalidParams("Invalid chainId");
 
-    if (this.status === CONNECTOR_STATUS.CONNECTED && this.connectedConnector) {
+    if (CONNECTED_STATUSES.includes(this.status) && this.connectedConnector) {
       await this.connectedConnector.switchChain(params);
       return;
     }
@@ -356,6 +357,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
       const cleanup = () => {
         this.off(CONNECTOR_EVENTS.CONNECTED, onConnected);
         this.off(CONNECTOR_EVENTS.ERRORED, onErrored);
+        this.off(CONNECTOR_EVENTS.AUTHORIZED, onConnected);
       };
       const onConnected = async () => {
         // track connection completed event
@@ -391,18 +393,18 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async logout(options: { cleanup: boolean } = { cleanup: false }): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
     await this.connectedConnector.disconnect(options);
   }
 
   async getUserInfo(): Promise<Partial<UserInfo>> {
     log.debug("Getting user info", this.status, this.connectedConnector?.name);
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
     return this.connectedConnector.getUserInfo();
   }
 
   async enableMFA<T>(loginParams?: T): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
     if (this.connectedConnector.name !== WALLET_CONNECTORS.AUTH)
       throw WalletLoginError.unsupportedOperation(`EnableMFA is not supported for this connector.`);
 
@@ -421,7 +423,7 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async manageMFA<T>(loginParams?: T): Promise<void> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
     if (this.connectedConnector.name !== WALLET_CONNECTORS.AUTH)
       throw WalletLoginError.unsupportedOperation(`ManageMFA is not supported for this connector.`);
 
@@ -440,7 +442,8 @@ export class Web3AuthNoModal extends SafeEventEmitter<Web3AuthNoModalEvents> imp
   }
 
   async getIdentityToken(): Promise<IdentityTokenInfo> {
-    if (this.status !== CONNECTOR_STATUS.CONNECTED || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (![...CONNECTED_STATUSES, CONNECTOR_STATUS.AUTHORIZING].includes(this.status) || !this.connectedConnector)
+      throw WalletLoginError.notConnectedError(`No wallet is connected`);
 
     const trackData = { connector: this.connectedConnector.name };
     try {
diff --git a/packages/no-modal/src/plugins/nft-checkout-plugin/plugin.ts b/packages/no-modal/src/plugins/nft-checkout-plugin/plugin.ts
diff --git a/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts b/packages/no-modal/src/plugins/wallet-services-plugin/plugin.ts
