@web3auth/modal 10.15.0 → 11.0.0-beta.0

package/dist/lib.cjs/types/ui/context/ModalStateContext.d.ts

@@ -0,0 +1,28 @@
+import { type Dispatch, type FC, type ReactNode, type SetStateAction } from "react";
+import { type ExternalWalletEventType, ModalState, type SocialLoginEventType, StateEmitterEvents } from "../interfaces";
+type StateListener = {
+    on: <K extends keyof StateEmitterEvents>(event: K, listener: StateEmitterEvents[K]) => void;
+    emit: <K extends keyof StateEmitterEvents>(event: K, ...args: Parameters<StateEmitterEvents[K]>) => void;
+};
+type ModalStateContextType = {
+    modalState: ModalState;
+    setModalState: Dispatch<SetStateAction<ModalState>>;
+    preHandleExternalWalletClick: (params: ExternalWalletEventType) => void;
+    preHandleSocialLoginClick: (params: SocialLoginEventType) => void;
+    handleShowExternalWallets: (flag: boolean) => void;
+    areSocialLoginsVisible: boolean;
+    isEmailPrimary: boolean;
+    isExternalPrimary: boolean;
+    isEmailPasswordLessLoginVisible: boolean;
+    isSmsPasswordLessLoginVisible: boolean;
+    showPasswordLessInput: boolean;
+    showExternalWalletButton: boolean;
+    shouldShowLoginPage: boolean;
+};
+type ModalStateProviderProps = {
+    children: ReactNode;
+    stateListener: StateListener;
+};
+export declare const ModalStateProvider: FC<ModalStateProviderProps>;
+export declare const useModalState: () => ModalStateContextType;
+export {};

package/dist/lib.cjs/types/ui/context/RootContext.d.ts

@@ -1,4 +1,4 @@
-import { Dispatch, SetStateAction } from "react";
+import { type Dispatch, type FC, type ReactNode, type SetStateAction } from "react";
 import { ExternalButton, ToastType } from "../interfaces";
 export type BodyState = {
     installLinks?: {
@@ -9,19 +9,31 @@ export type BodyState = {
         show: boolean;
         wallet: ExternalButton;
     };
-    metamaskQrCode: {
-        show: boolean;
-        wallet: ExternalButton;
-    };
+    preSelectedWallet?: ExternalButton;
 };
 export type ToastState = {
     message: string;
     type: ToastType;
 };
-export type RootContextType = {
+export declare const initialBodyState: BodyState;
+export declare const initialToastState: ToastState;
+type RootContextType = {
+    bodyState: BodyState;
+    setBodyState: Dispatch<SetStateAction<BodyState>>;
+    toast: ToastState;
+    setToast: Dispatch<SetStateAction<ToastState>>;
+};
+type RootProviderProps = {
+    children: ReactNode;
+};
+export declare const RootProvider: FC<RootProviderProps>;
+export declare const useRoot: () => RootContextType;
+export declare const useBodyState: () => {
     bodyState: BodyState;
     setBodyState: Dispatch<SetStateAction<BodyState>>;
+};
+export declare const useToast: () => {
     toast: ToastState;
     setToast: Dispatch<SetStateAction<ToastState>>;
 };
-export declare const RootContext: import("react").Context<RootContextType>;
+export {};

package/dist/lib.cjs/types/ui/context/WidgetContext.d.ts

@@ -0,0 +1,45 @@
+import { WALLET_CONNECTOR_TYPE } from "@web3auth/no-modal";
+import { type FC, type ReactNode } from "react";
+import { browser, ExternalWalletEventType, LoginModalProps, os, platform, SocialLoginEventType } from "../interfaces";
+type WidgetContextType = {
+    isDark: boolean;
+    appLogo?: string;
+    deviceDetails: {
+        platform: platform;
+        browser: browser;
+        os: os;
+    };
+    uiConfig: LoginModalProps;
+    isConnectAndSignAuthenticationMode: boolean;
+    handleSocialLoginClick: (params: SocialLoginEventType) => void;
+    handleExternalWalletClick: (params: ExternalWalletEventType) => void;
+    handleMobileVerifyConnect: (params: {
+        connector: WALLET_CONNECTOR_TYPE;
+    }) => void;
+    handleShowExternalWallets: (externalWalletsInitialized: boolean) => void;
+    handleAcceptConsent: () => void | Promise<void>;
+    handleDeclineConsent: () => void | Promise<void>;
+    closeModal: () => void;
+};
+type WidgetProviderProps = {
+    children: ReactNode;
+    isDark: boolean;
+    deviceDetails: {
+        platform: platform;
+        browser: browser;
+        os: os;
+    };
+    uiConfig: LoginModalProps;
+    handleSocialLoginClick: (params: SocialLoginEventType) => void;
+    handleExternalWalletClick: (params: ExternalWalletEventType) => void;
+    handleMobileVerifyConnect: (params: {
+        connector: WALLET_CONNECTOR_TYPE;
+    }) => void;
+    handleShowExternalWallets: (externalWalletsInitialized: boolean) => void;
+    handleAcceptConsent: () => void | Promise<void>;
+    handleDeclineConsent: () => void | Promise<void>;
+    closeModal: () => void;
+};
+export declare const WidgetProvider: FC<WidgetProviderProps>;
+export declare const useWidget: () => WidgetContextType;
+export {};

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

@@ -45,6 +45,14 @@ export interface UIConfig extends CoreUIConfig, LoginModalConfig {
      */
     hideSuccessScreen?: boolean;
     connectorListener: SafeEventEmitter<Web3AuthNoModalEvents>;
+    /**
+     * Config for consent required.
+     *
+     * @defaultValue `undefined`
+     */
+    consentConfig?: {
+        required: boolean;
+    };
 }
 export type ModalLoginParams = Pick<AuthLoginParams, "authConnection" | "authConnectionId" | "groupedAuthConnectionId" | "loginHint" | "extraLoginOptions"> & {
     name: string;
@@ -63,7 +71,6 @@ export interface LoginModalCallbacks {
         externalWalletsInitialized: boolean;
     }) => Promise<void>;
     onSocialLogin: (params: {
-        connector: WALLET_CONNECTOR_TYPE;
         loginParams: ModalLoginParams;
     }) => Promise<void>;
     onExternalWalletLogin: (params: {
@@ -76,6 +83,8 @@ export interface LoginModalCallbacks {
     onMobileVerifyConnect: (params: {
         connector: WALLET_CONNECTOR_TYPE;
     }) => Promise<void>;
+    onAcceptConsent: () => Promise<void>;
+    onDeclineConsent: () => Promise<void>;
 }
 export declare const LOGIN_MODAL_EVENTS: {
     readonly MODAL_VISIBILITY: "MODAL_VISIBILITY";
@@ -83,7 +92,6 @@ export declare const LOGIN_MODAL_EVENTS: {
 export type SocialLoginsConfig = {
     loginMethodsOrder: string[];
     loginMethods: LoginMethodConfig;
-    connector: WALLET_CONNECTOR_TYPE;
     uiConfig: Omit<UIConfig, "connectorListener">;
 };
 export declare const MODAL_STATUS: {
@@ -93,30 +101,26 @@ export declare const MODAL_STATUS: {
     readonly ERRORED: "errored";
     readonly AUTHORIZING: "authorizing";
     readonly AUTHORIZED: "authorized";
+    readonly CONSENT_REQUIRING: "consent_requiring";
 };
 export type ModalStatusType = (typeof MODAL_STATUS)[keyof typeof MODAL_STATUS];
 export interface ModalState {
     status: ModalStatusType;
-    externalWalletsInitialized: boolean;
-    hasExternalWallets: boolean;
-    externalWalletsVisibility: boolean;
     modalVisibility: boolean;
-    modalVisibilityDelayed: boolean;
+    externalWalletsVisibility: boolean;
+    currentPage?: string;
     postLoadingMessage: string;
+    detailedLoaderConnector: string;
+    detailedLoaderConnectorName: string;
+    hasExternalWallets: boolean;
+    externalWalletsInitialized: boolean;
+    showExternalWalletsOnly: boolean;
     walletConnectUri: string;
     metamaskConnectUri: string;
     socialLoginsConfig: SocialLoginsConfig;
     externalWalletsConfig: Record<string, BaseConnectorConfig>;
-    detailedLoaderConnector: string;
-    detailedLoaderConnectorName: string;
-    showExternalWalletsOnly: boolean;
-    currentPage?: string;
-    web3authClientId: string;
-    web3authNetwork: WEB3AUTH_NETWORK_TYPE;
-    authBuildEnv: BUILD_ENV_TYPE;
 }
 export type SocialLoginEventType = {
-    connector: WALLET_CONNECTOR_TYPE;
     loginParams: ModalLoginParams;
 };
 export type ExternalWalletEventType = {
@@ -150,7 +154,6 @@ export type rowType = {
     isDark: boolean;
     isPrimaryBtn: boolean;
     name: string;
-    connector: SocialLoginsConfig["connector"];
     loginParams: {
         authConnection: AUTH_CONNECTION_TYPE;
         name: string;

package/dist/lib.cjs/types/ui/loginModal.d.ts

@@ -1,15 +1,15 @@
 import "./css/index.css";
-import { type BaseConnectorConfig, type LoginMethodConfig, type WALLET_CONNECTOR_TYPE } from "@web3auth/no-modal";
+import { type BaseConnectorConfig, type LoginMethodConfig } from "@web3auth/no-modal";
 import { browser, LoginModalCallbacks, LoginModalProps, os, platform, UIConfig } from "./interfaces";
 export declare class LoginModal {
     private uiConfig;
     private stateEmitter;
-    private chainNamespaces;
-    private walletRegistry;
     private callbacks;
     private externalWalletsConfig;
     private analytics;
+    private modalStatus;
     constructor(uiConfig: LoginModalProps, callbacks: LoginModalCallbacks);
+    get consentRequired(): boolean;
     get isDark(): boolean;
     get deviceDetails(): {
         platform: platform;
@@ -17,7 +17,7 @@ export declare class LoginModal {
         os: os;
     };
     initModal: () => Promise<void>;
-    addSocialLogins: (connector: WALLET_CONNECTOR_TYPE, loginMethods: LoginMethodConfig, loginMethodsOrder: string[], uiConfig: Omit<UIConfig, "connectorListener">) => void;
+    addSocialLogins: (loginMethods: LoginMethodConfig, loginMethodsOrder: string[], uiConfig: Omit<UIConfig, "connectorListener">) => void;
     addWalletLogins: (externalWalletsConfig: Record<string, BaseConnectorConfig>, options?: {
         externalWalletsInitialized: boolean;
         externalWalletsVisibility: boolean;
@@ -29,6 +29,8 @@ export declare class LoginModal {
     private handleShowExternalWallets;
     private handleExternalWalletClick;
     private handleMobileVerifyConnect;
+    private handleAcceptConsent;
+    private handleDeclineConsent;
     private handleSocialLoginClick;
     private setState;
     private handleConnectorData;

package/dist/lib.cjs/types/vue/composables/index.d.ts

@@ -1,16 +1,4 @@
-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 "./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/vue";
+export { useAuthTokenInfo, useChain, useCheckout, useEnableMFA, useFunding, useManageMFA, useReceive, useSwap, useSwitchChain, useWalletConnectScanner, useWalletServicesPlugin, useWalletUI, useWeb3AuthDisconnect, useWeb3AuthUser, } from "@web3auth/no-modal/vue";

package/dist/lib.cjs/types/vue/composables/useWeb3Auth.d.ts

@@ -1,3 +1,2 @@
 import { IWeb3AuthInnerContext } from "../interfaces";
-export type IWeb3AuthModalContext = IWeb3AuthInnerContext;
-export declare const useWeb3Auth: () => IWeb3AuthModalContext;
+export declare const useWeb3Auth: () => IWeb3AuthInnerContext;

package/dist/lib.cjs/types/vue/composables/useWeb3AuthConnect.d.ts

@@ -1,11 +1,11 @@
-import { IProvider, LoginParamMap, WALLET_CONNECTOR_TYPE, Web3AuthError } from "@web3auth/no-modal";
+import { Connection, LoginParamMap, WALLET_CONNECTOR_TYPE, Web3AuthError } from "@web3auth/no-modal";
 import { Ref } from "vue";
 export interface IUseWeb3AuthConnect {
     isConnected: Ref<boolean>;
     loading: Ref<boolean>;
     error: Ref<Web3AuthError | null>;
     connectorName: Ref<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/vue/interfaces.d.ts

@@ -1,4 +1,5 @@
-import type { ChainNamespaceType, CONNECTOR_STATUS_TYPE, IPlugin, IProvider, WalletServicesPluginType } from "@web3auth/no-modal";
+import type { WalletServicesPluginType } from "@web3auth/no-modal";
+import type { IWeb3AuthInnerContext as INoModalWeb3AuthInnerContext } from "@web3auth/no-modal/vue";
 import { Ref, ShallowRef } from "vue";
 import type { Web3Auth, Web3AuthOptions } from "../modalManager";
 export type Web3AuthContextConfig = {
@@ -7,21 +8,7 @@ export type Web3AuthContextConfig = {
 export interface Web3AuthProviderProps {
     config: Web3AuthContextConfig;
 }
-interface IBaseWeb3AuthComposableContext {
-    isConnected: Ref<boolean>;
-    isAuthorized: Ref<boolean>;
-    provider: Ref<IProvider | null>;
-    isInitializing: Ref<boolean>;
-    initError: Ref<Error | null>;
-    isInitialized: Ref<boolean>;
-    status: Ref<CONNECTOR_STATUS_TYPE | null>;
-    isMFAEnabled: Ref<boolean>;
-    chainId: Ref<string | null>;
-    chainNamespace: Ref<ChainNamespaceType | null>;
-    getPlugin: (pluginName: string) => IPlugin | null;
-    setIsMFAEnabled: (isMfaEnabled: boolean) => void;
-}
-export interface IWeb3AuthInnerContext extends IBaseWeb3AuthComposableContext {
+export interface IWeb3AuthInnerContext extends Omit<INoModalWeb3AuthInnerContext, "web3Auth"> {
     web3Auth: ShallowRef<Web3Auth | null>;
 }
 export interface IWalletServicesInnerContext {
@@ -29,4 +16,3 @@ export interface IWalletServicesInnerContext {
     ready: Ref<boolean>;
     connecting: Ref<boolean>;
 }
-export {};

package/dist/lib.cjs/types/vue/solana/composables/index.d.ts

@@ -1,4 +1,3 @@
-export * from "./useSignAndSendTransaction";
-export * from "./useSignMessage";
-export * from "./useSignTransaction";
-export * from "./useSolanaWallet";
+export * from "./useSolanaClient";
+export type { IUseSignAndSendTransaction, IUseSignMessage, IUseSignTransaction, IUseSolanaWallet } from "@web3auth/no-modal/vue/solana";
+export { useSignAndSendTransaction, useSignMessage, useSignTransaction, useSolanaWallet } from "@web3auth/no-modal/vue/solana";

package/dist/lib.cjs/types/vue/solana/composables/useSolanaClient.d.ts

@@ -0,0 +1 @@
+export { useSolanaClient } from "@web3auth/no-modal/vue/solana";

package/dist/lib.cjs/types/vue/solana/constants.d.ts

@@ -0,0 +1 @@
+export { SOLANA_CLIENT_KEY } from "@web3auth/no-modal/vue/solana";

package/dist/lib.cjs/types/vue/solana/index.d.ts

@@ -1 +1,3 @@
 export * from "./composables";
+export * from "./constants";
+export * from "./provider";

package/dist/lib.cjs/types/vue/solana/provider.d.ts

@@ -0,0 +1 @@
+export { SolanaProvider } from "@web3auth/no-modal/vue/solana";

package/dist/lib.cjs/types/x402/index.d.ts

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

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

@@ -0,0 +1,2 @@
+export type { IUseX402FetchParams, IUseX402FetchReturnValues } from "@web3auth/no-modal/x402/react";
+export { createEvmX402Fetch, createProviderBackedEvmSigner, createSolanaX402Fetch, getEvmAddress, useX402Fetch } from "@web3auth/no-modal/x402/react";

package/dist/lib.cjs/types/x402/vue.d.ts

@@ -0,0 +1,2 @@
+export type { IUseX402FetchParams, IUseX402FetchReturnValues } from "@web3auth/no-modal/x402/vue";
+export { createEvmX402Fetch, createSolanaX402Fetch, useX402Fetch } from "@web3auth/no-modal/x402/vue";

package/dist/lib.esm/node_modules/style-inject/dist/style-inject.es.js

@@ -1,7 +1,7 @@
 function styleInject(css, ref) {
   if (ref === void 0) ref = {};
   var insertAt = ref.insertAt;
-  if (typeof document === 'undefined') {
+  if (!css || typeof document === 'undefined') {
     return;
   }
   var head = document.head || document.getElementsByTagName('head')[0];

package/dist/lib.esm/packages/modal/src/config.js

@@ -1,6 +1,6 @@
 import { EVM_CONNECTORS } from '@web3auth/no-modal';
 
-const version = "10.15.0";
+const version = "11.0.0-beta.0";
 const defaultConnectorsModalConfig = {
   hideWalletDiscovery: false,
   connectors: {

package/dist/lib.esm/packages/modal/src/modalManager.js

@@ -1,7 +1,7 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
 import { serializeError } from '@web3auth/auth';
-import { Web3AuthNoModal, cloneDeep, WALLET_CONNECTORS, LOGIN_MODE, log, CONNECTOR_STATUS, CONNECTED_STATUSES, sdkVersion, ANALYTICS_SDK_TYPE, withAbort, CONNECTOR_EVENTS, ANALYTICS_EVENTS, getErrorAnalyticsProperties, WalletInitializationError, CONNECTOR_INITIAL_AUTHENTICATION_MODE, fetchProjectConfig, fetchWalletRegistry, WALLET_REGISTRY_URL, CONNECTOR_CATEGORY, CONNECTOR_NAMES, CONNECTOR_NAMESPACES } from '@web3auth/no-modal';
+import { Web3AuthNoModal, LOGIN_MODE, cloneDeep, WALLET_CONNECTORS, log, CONNECTOR_STATUS, CONNECTED_STATUSES, CONNECTOR_INITIAL_AUTHENTICATION_MODE, sdkVersion, ANALYTICS_SDK_TYPE, withAbort, CONNECTOR_EVENTS, ANALYTICS_EVENTS, getErrorAnalyticsProperties, WalletInitializationError, fetchProjectConfig, fetchWalletRegistry, WALLET_REGISTRY_URL, CONNECTOR_CATEGORY, CONNECTOR_NAMES, CONNECTOR_NAMESPACES } from '@web3auth/no-modal';
 import deepmerge from 'deepmerge';
 import { defaultConnectorsModalConfig } from './config.js';
 import { AUTH_PROVIDERS_NAMES, AUTH_PROVIDERS, capitalizeFirstLetter } from './ui/config.js';
@@ -11,8 +11,10 @@ import { getUserLanguage } from './ui/utils.js';
 
 class Web3Auth extends Web3AuthNoModal {
   constructor(options, initialState) {
+    var _this$options$uiConfi;
     super(options, initialState);
     _defineProperty(this, "loginModal", void 0);
+    _defineProperty(this, "loginMode", LOGIN_MODE.MODAL);
     _defineProperty(this, "options", void 0);
     _defineProperty(this, "modalConfig", cloneDeep(defaultConnectorsModalConfig));
     _defineProperty(this, "onInitExternalWallets", async params => {
@@ -27,7 +29,7 @@ class Web3Auth extends Web3AuthNoModal {
       try {
         await this.connectTo(WALLET_CONNECTORS.AUTH, params.loginParams, LOGIN_MODE.MODAL);
       } catch (error) {
-        log.error(`Error while connecting to connector: ${params.connector}`, error);
+        log.error("Error while connecting via social login (AUTH)", error);
       }
     });
     _defineProperty(this, "onExternalWalletLogin", async params => {
@@ -79,18 +81,38 @@ class Web3Auth extends Web3AuthNoModal {
     _defineProperty(this, "onMobileVerifyConnect", async params => {
       try {
         const connector = this.getConnector(params.connector);
-        await connector.getIdentityToken();
+        await connector.getAuthTokenInfo();
       } catch (error) {
         log.error(`Error while connecting to connector: ${params.connector}`, error);
       }
     });
+    _defineProperty(this, "onAcceptConsent", async () => {
+      try {
+        await this.acceptConsent();
+      } catch (error) {
+        log.error("Error while accepting consent", error);
+      }
+    });
+    _defineProperty(this, "onDeclineConsent", async () => {
+      try {
+        await this.logout();
+      } catch (error) {
+        log.error("Error while declining consent", error);
+      } finally {
+        this.loginModal.closeModal();
+      }
+    });
     _defineProperty(this, "getChainNamespaces", () => {
       var _this$coreOptions$cha;
       return [...new Set(((_this$coreOptions$cha = this.coreOptions.chains) === null || _this$coreOptions$cha === void 0 ? void 0 : _this$coreOptions$cha.map(x => x.chainNamespace)) || [])];
     });
     this.options = _objectSpread({}, options);
+    if (!this.options.initialAuthenticationMode) {
+      this.options.initialAuthenticationMode = CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN;
+    }
     if (!this.options.uiConfig) this.options.uiConfig = {};
     if (this.options.modalConfig) this.modalConfig = this.options.modalConfig;
+    this.consentRequired = ((_this$options$uiConfi = this.options.uiConfig.consentConfig) === null || _this$options$uiConfi === void 0 ? void 0 : _this$options$uiConfi.required) || false;
     log.info("modalConfig", this.modalConfig);
   }
   async init(options) {
@@ -111,7 +133,7 @@ class Web3Auth extends Web3AuthNoModal {
     });
     let trackData = {};
     try {
-      var _authConnector$authIn, _this$coreOptions$uiC;
+      var _this$options$uiConfi2, _authConnector$authIn, _this$coreOptions$uiC;
       const {
         signal
       } = options || {};
@@ -153,8 +175,11 @@ class Web3Auth extends Web3AuthNoModal {
         onSocialLogin: this.onSocialLogin,
         onExternalWalletLogin: this.onExternalWalletLogin,
         onModalVisibility: this.onModalVisibility,
-        onMobileVerifyConnect: this.onMobileVerifyConnect
+        onMobileVerifyConnect: this.onMobileVerifyConnect,
+        onAcceptConsent: this.onAcceptConsent,
+        onDeclineConsent: this.onDeclineConsent
       });
+      this.consentRequired = ((_this$options$uiConfi2 = this.options.uiConfig.consentConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.required) || false;
       await withAbort(() => this.loginModal.initModal(), signal);
 
       // setup common JRPC provider
@@ -208,41 +233,52 @@ class Web3Auth extends Web3AuthNoModal {
   }
   async connect() {
     if (!this.loginModal) throw WalletInitializationError.notReady("Login modal is not initialized");
-    // if already connected return provider
-    if (this.connectedConnectorName && CONNECTED_STATUSES.includes(this.status) && this.provider) return this.provider;
+    // if already connected return connection
+    if (this.connectedConnectorName && CONNECTED_STATUSES.includes(this.status) && this.connection) return this.connection;
     this.loginModal.open();
     return new Promise((resolve, reject) => {
       // remove all listeners when promise is resolved or rejected.
       // this is to prevent memory leaks if user clicks connect button multiple times.
-      const handleConnected = () => {
+      const handleCompletion = () => {
         this.removeListener(CONNECTOR_EVENTS.ERRORED, handleError);
         this.removeListener(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
-        return resolve(this.provider);
+        if (this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN) {
+          this.removeListener(CONNECTOR_EVENTS.AUTHORIZED, handleCompletion);
+        } else {
+          this.removeListener(CONNECTOR_EVENTS.CONNECTED, handleCompletion);
+        }
+        return resolve(this.connection);
       };
       const handleError = err => {
-        this.removeListener(CONNECTOR_EVENTS.CONNECTED, handleConnected);
-        this.removeListener(CONNECTOR_EVENTS.AUTHORIZED, handleConnected);
+        this.removeListener(CONNECTOR_EVENTS.CONNECTED, handleCompletion);
+        this.removeListener(CONNECTOR_EVENTS.AUTHORIZED, handleCompletion);
         this.removeListener(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
         return reject(err);
       };
       const handleVisibility = visibility => {
         // modal is closed but user is not connected to any wallet.
         if (!visibility && !CONNECTED_STATUSES.includes(this.status)) {
-          this.removeListener(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+          this.removeListener(CONNECTOR_EVENTS.CONNECTED, handleCompletion);
           this.removeListener(CONNECTOR_EVENTS.ERRORED, handleError);
-          this.removeListener(CONNECTOR_EVENTS.AUTHORIZED, handleConnected);
+          this.removeListener(CONNECTOR_EVENTS.AUTHORIZED, handleCompletion);
           return reject(new Error("User closed the modal"));
         }
       };
+      if (this.consentRequired) {
+        this.once(CONNECTOR_EVENTS.CONSENT_ACCEPTED, handleCompletion);
+      }
       if (this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN) {
-        this.once(CONNECTOR_EVENTS.AUTHORIZED, handleConnected);
+        this.once(CONNECTOR_EVENTS.AUTHORIZED, handleCompletion);
       } else {
-        this.once(CONNECTOR_EVENTS.CONNECTED, handleConnected);
+        this.once(CONNECTOR_EVENTS.CONNECTED, handleCompletion);
       }
       this.once(CONNECTOR_EVENTS.ERRORED, handleError);
       this.once(LOGIN_MODAL_EVENTS.MODAL_VISIBILITY, handleVisibility);
     });
   }
+  async acceptConsent() {
+    await super.completeConsentAcceptance();
+  }
   initUIConfig(projectConfig) {
     super.initUIConfig(projectConfig);
     this.options.uiConfig = deepmerge(cloneDeep(projectConfig.whitelabel || {}), this.options.uiConfig || {});
@@ -265,26 +301,26 @@ class Web3Auth extends Web3AuthNoModal {
     this.options.uiConfig.loginMethodsOrder = loginMethodsOrder;
   }
   getInitializationTrackData() {
-    var _this$modalConfig, _this$modalConfig2, _this$modalConfig3, _this$options$uiConfi, _this$options$uiConfi2, _this$options$uiConfi3, _this$options$uiConfi4, _this$options$uiConfi5, _this$options$uiConfi6, _this$options$uiConfi7, _this$options$uiConfi8, _this$options$uiConfi9, _this$options$uiConfi0, _this$options$uiConfi1, _this$options$uiConfi10, _this$options$uiConfi11, _this$options$uiConfi12;
+    var _this$modalConfig, _this$modalConfig2, _this$modalConfig3, _this$options$uiConfi3, _this$options$uiConfi4, _this$options$uiConfi5, _this$options$uiConfi6, _this$options$uiConfi7, _this$options$uiConfi8, _this$options$uiConfi9, _this$options$uiConfi0, _this$options$uiConfi1, _this$options$uiConfi10, _this$options$uiConfi11, _this$options$uiConfi12, _this$options$uiConfi13, _this$options$uiConfi14;
     return _objectSpread(_objectSpread({}, super.getInitializationTrackData()), {}, {
       modal_hide_wallet_discovery: (_this$modalConfig = this.modalConfig) === null || _this$modalConfig === void 0 ? void 0 : _this$modalConfig.hideWalletDiscovery,
       modal_connectors: Object.keys(((_this$modalConfig2 = this.modalConfig) === null || _this$modalConfig2 === void 0 ? void 0 : _this$modalConfig2.connectors) || {}),
       modal_auth_connector_login_methods: Object.keys(((_this$modalConfig3 = this.modalConfig) === null || _this$modalConfig3 === void 0 || (_this$modalConfig3 = _this$modalConfig3.connectors) === null || _this$modalConfig3 === void 0 || (_this$modalConfig3 = _this$modalConfig3[WALLET_CONNECTORS.AUTH]) === null || _this$modalConfig3 === void 0 ? void 0 : _this$modalConfig3.loginMethods) || {}),
       // UI config
-      ui_login_methods_order: (_this$options$uiConfi = this.options.uiConfig) === null || _this$options$uiConfi === void 0 ? void 0 : _this$options$uiConfi.loginMethodsOrder,
-      ui_modal_z_index: (_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.modalZIndex,
-      ui_display_errors_on_modal: (_this$options$uiConfi3 = this.options.uiConfig) === null || _this$options$uiConfi3 === void 0 ? void 0 : _this$options$uiConfi3.displayErrorsOnModal,
-      ui_login_grid_col: (_this$options$uiConfi4 = this.options.uiConfig) === null || _this$options$uiConfi4 === void 0 ? void 0 : _this$options$uiConfi4.loginGridCol,
-      ui_primary_button: (_this$options$uiConfi5 = this.options.uiConfig) === null || _this$options$uiConfi5 === void 0 ? void 0 : _this$options$uiConfi5.primaryButton,
-      ui_modal_widget_type: (_this$options$uiConfi6 = this.options.uiConfig) === null || _this$options$uiConfi6 === void 0 ? void 0 : _this$options$uiConfi6.widgetType,
-      ui_modal_target_id_used: Boolean((_this$options$uiConfi7 = this.options.uiConfig) === null || _this$options$uiConfi7 === void 0 ? void 0 : _this$options$uiConfi7.targetId),
-      ui_modal_logo_alignment: (_this$options$uiConfi8 = this.options.uiConfig) === null || _this$options$uiConfi8 === void 0 ? void 0 : _this$options$uiConfi8.logoAlignment,
-      ui_modal_border_radius_type: (_this$options$uiConfi9 = this.options.uiConfig) === null || _this$options$uiConfi9 === void 0 ? void 0 : _this$options$uiConfi9.borderRadiusType,
-      ui_modal_button_radius_type: (_this$options$uiConfi0 = this.options.uiConfig) === null || _this$options$uiConfi0 === void 0 ? void 0 : _this$options$uiConfi0.buttonRadiusType,
-      ui_modal_sign_in_methods: (_this$options$uiConfi1 = this.options.uiConfig) === null || _this$options$uiConfi1 === void 0 ? void 0 : _this$options$uiConfi1.signInMethods,
-      ui_modal_add_previous_login_hint: (_this$options$uiConfi10 = this.options.uiConfig) === null || _this$options$uiConfi10 === void 0 ? void 0 : _this$options$uiConfi10.addPreviousLoginHint,
-      ui_modal_display_installed_external_wallets: (_this$options$uiConfi11 = this.options.uiConfig) === null || _this$options$uiConfi11 === void 0 ? void 0 : _this$options$uiConfi11.displayInstalledExternalWallets,
-      ui_modal_display_external_wallets_count: (_this$options$uiConfi12 = this.options.uiConfig) === null || _this$options$uiConfi12 === void 0 ? void 0 : _this$options$uiConfi12.displayExternalWalletsCount
+      ui_login_methods_order: (_this$options$uiConfi3 = this.options.uiConfig) === null || _this$options$uiConfi3 === void 0 ? void 0 : _this$options$uiConfi3.loginMethodsOrder,
+      ui_modal_z_index: (_this$options$uiConfi4 = this.options.uiConfig) === null || _this$options$uiConfi4 === void 0 ? void 0 : _this$options$uiConfi4.modalZIndex,
+      ui_display_errors_on_modal: (_this$options$uiConfi5 = this.options.uiConfig) === null || _this$options$uiConfi5 === void 0 ? void 0 : _this$options$uiConfi5.displayErrorsOnModal,
+      ui_login_grid_col: (_this$options$uiConfi6 = this.options.uiConfig) === null || _this$options$uiConfi6 === void 0 ? void 0 : _this$options$uiConfi6.loginGridCol,
+      ui_primary_button: (_this$options$uiConfi7 = this.options.uiConfig) === null || _this$options$uiConfi7 === void 0 ? void 0 : _this$options$uiConfi7.primaryButton,
+      ui_modal_widget_type: (_this$options$uiConfi8 = this.options.uiConfig) === null || _this$options$uiConfi8 === void 0 ? void 0 : _this$options$uiConfi8.widgetType,
+      ui_modal_target_id_used: Boolean((_this$options$uiConfi9 = this.options.uiConfig) === null || _this$options$uiConfi9 === void 0 ? void 0 : _this$options$uiConfi9.targetId),
+      ui_modal_logo_alignment: (_this$options$uiConfi0 = this.options.uiConfig) === null || _this$options$uiConfi0 === void 0 ? void 0 : _this$options$uiConfi0.logoAlignment,
+      ui_modal_border_radius_type: (_this$options$uiConfi1 = this.options.uiConfig) === null || _this$options$uiConfi1 === void 0 ? void 0 : _this$options$uiConfi1.borderRadiusType,
+      ui_modal_button_radius_type: (_this$options$uiConfi10 = this.options.uiConfig) === null || _this$options$uiConfi10 === void 0 ? void 0 : _this$options$uiConfi10.buttonRadiusType,
+      ui_modal_sign_in_methods: (_this$options$uiConfi11 = this.options.uiConfig) === null || _this$options$uiConfi11 === void 0 ? void 0 : _this$options$uiConfi11.signInMethods,
+      ui_modal_add_previous_login_hint: (_this$options$uiConfi12 = this.options.uiConfig) === null || _this$options$uiConfi12 === void 0 ? void 0 : _this$options$uiConfi12.addPreviousLoginHint,
+      ui_modal_display_installed_external_wallets: (_this$options$uiConfi13 = this.options.uiConfig) === null || _this$options$uiConfi13 === void 0 ? void 0 : _this$options$uiConfi13.displayInstalledExternalWallets,
+      ui_modal_display_external_wallets_count: (_this$options$uiConfi14 = this.options.uiConfig) === null || _this$options$uiConfi14 === void 0 ? void 0 : _this$options$uiConfi14.displayExternalWalletsCount
     });
   }
   filterWalletRegistry(walletRegistry, projectConfig) {
@@ -551,18 +587,18 @@ class Web3Auth extends Web3AuthNoModal {
         await connector.init({
           autoConnect,
           chainId: initialChain.chainId,
-          getIdentityToken: this.options.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN
+          getAuthTokenInfo: this.options.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN
         });
 
         // note: not adding cachedWallet to modal if it is external wallet.
         // adding it later if no in-app wallets are available.
         if (connector.type === CONNECTOR_CATEGORY.IN_APP) {
-          var _this$modalConfig$con6, _this$options$uiConfi13, _this$options$uiConfi14, _this$options$uiConfi15;
+          var _this$modalConfig$con6, _this$options$uiConfi15, _this$options$uiConfi16, _this$options$uiConfi17;
           log.info("connectorInitResults", connectorName);
           const loginMethods = ((_this$modalConfig$con6 = this.modalConfig.connectors[connectorName]) === null || _this$modalConfig$con6 === void 0 ? void 0 : _this$modalConfig$con6.loginMethods) || {};
-          this.loginModal.addSocialLogins(connectorName, loginMethods, ((_this$options$uiConfi13 = this.options.uiConfig) === null || _this$options$uiConfi13 === void 0 ? void 0 : _this$options$uiConfi13.loginMethodsOrder) || AUTH_PROVIDERS, _objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
-            loginGridCol: ((_this$options$uiConfi14 = this.options.uiConfig) === null || _this$options$uiConfi14 === void 0 ? void 0 : _this$options$uiConfi14.loginGridCol) || 3,
-            primaryButton: ((_this$options$uiConfi15 = this.options.uiConfig) === null || _this$options$uiConfi15 === void 0 ? void 0 : _this$options$uiConfi15.primaryButton) || "socialLogin"
+          this.loginModal.addSocialLogins(loginMethods, ((_this$options$uiConfi15 = this.options.uiConfig) === null || _this$options$uiConfi15 === void 0 ? void 0 : _this$options$uiConfi15.loginMethodsOrder) || AUTH_PROVIDERS, _objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
+            loginGridCol: ((_this$options$uiConfi16 = this.options.uiConfig) === null || _this$options$uiConfi16 === void 0 ? void 0 : _this$options$uiConfi16.loginGridCol) || 3,
+            primaryButton: ((_this$options$uiConfi17 = this.options.uiConfig) === null || _this$options$uiConfi17 === void 0 ? void 0 : _this$options$uiConfi17.primaryButton) || "socialLogin"
           }));
         }
       } catch (error) {
@@ -596,7 +632,7 @@ class Web3Auth extends Web3AuthNoModal {
           await connector.init({
             autoConnect: this.cachedConnector === connectorName,
             chainId: initialChain.chainId,
-            getIdentityToken: this.options.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN
+            getAuthTokenInfo: this.options.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN
           });
         } catch (error) {
           log.error(error, "error while initializing connector", connectorName);

package/dist/lib.esm/packages/modal/src/react/Web3AuthProvider.js

@@ -1,13 +1,15 @@
 import { createElement } from 'react';
 import { WalletServicesContextProvider } from './context/WalletServicesInnerContext.js';
-import { Web3AuthInnerProvider, Web3AuthInnerContext } from './context/Web3AuthInnerContext.js';
+import { Web3AuthInnerProvider } from './context/Web3AuthInnerContext.js';
+import { Web3AuthInnerContext } from '@web3auth/no-modal/react';
 
 function Web3AuthProvider({
   config,
   initialState,
   children
 }) {
-  const pluginChild = /*#__PURE__*/createElement(WalletServicesContextProvider, {
+  const SharedWalletServicesContextProvider = WalletServicesContextProvider;
+  const pluginChild = /*#__PURE__*/createElement(SharedWalletServicesContextProvider, {
     context: Web3AuthInnerContext
   }, children);
   return /*#__PURE__*/createElement(Web3AuthInnerProvider, {