@web3auth/modal 7.0.0-beta.0 → 7.0.0

package/dist/types/default.d.ts

@@ -1,5 +1,6 @@
 import type { OPENLOGIN_NETWORK_TYPE } from "@toruslabs/openlogin-utils";
 import { CustomChainConfig, IAdapter, IBaseProvider, WALLET_ADAPTER_TYPE } from "@web3auth/base";
+import { UIConfig } from "@web3auth/ui";
 export declare function getPrivateKeyProvider(chainConfig: CustomChainConfig): Promise<IBaseProvider<string>>;
 export declare const getDefaultAdapterModule: (params: {
     name: WALLET_ADAPTER_TYPE;
@@ -7,4 +8,5 @@ export declare const getDefaultAdapterModule: (params: {
     customChainConfig: Partial<CustomChainConfig> & Pick<CustomChainConfig, "chainNamespace">;
     sessionTime?: number;
     web3AuthNetwork?: OPENLOGIN_NETWORK_TYPE;
+    uiConfig?: Omit<UIConfig, "adapterListener">;
 }) => Promise<IAdapter<unknown>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@web3auth/modal",
-  "version": "7.0.0-beta.0",
+  "version": "7.0.0",
   "homepage": "https://github.com/Web3Auth/Web3Auth#readme",
   "license": "ISC",
   "main": "dist/modal.cjs.js",
@@ -19,18 +19,18 @@
     "pre-commit": "lint-staged --cwd ."
   },
   "dependencies": {
-    "@web3auth/base": "^7.0.0-beta.0",
-    "@web3auth/base-provider": "^7.0.0-beta.0",
-    "@web3auth/ethereum-provider": "^7.0.0-beta.0",
-    "@web3auth/metamask-adapter": "^7.0.0-beta.0",
-    "@web3auth/no-modal": "^7.0.0-beta.0",
-    "@web3auth/openlogin-adapter": "^7.0.0-beta.0",
-    "@web3auth/phantom-adapter": "^7.0.0-beta.0",
-    "@web3auth/solana-provider": "^7.0.0-beta.0",
-    "@web3auth/torus-evm-adapter": "^7.0.0-beta.0",
-    "@web3auth/torus-solana-adapter": "^7.0.0-beta.0",
-    "@web3auth/ui": "^7.0.0-beta.0",
-    "@web3auth/wallet-connect-v2-adapter": "^7.0.0-beta.0"
+    "@web3auth/base": "^7.0.0",
+    "@web3auth/base-provider": "^7.0.0",
+    "@web3auth/ethereum-provider": "^7.0.0",
+    "@web3auth/metamask-adapter": "^7.0.0",
+    "@web3auth/no-modal": "^7.0.0",
+    "@web3auth/openlogin-adapter": "^7.0.0",
+    "@web3auth/phantom-adapter": "^7.0.0",
+    "@web3auth/solana-provider": "^7.0.0",
+    "@web3auth/torus-evm-adapter": "^7.0.0",
+    "@web3auth/torus-solana-adapter": "^7.0.0",
+    "@web3auth/ui": "^7.0.0",
+    "@web3auth/wallet-connect-v2-adapter": "^7.0.0"
   },
   "devDependencies": {
     "@svgr/webpack": "^8.1.0",
@@ -71,5 +71,5 @@
     "node": ">=18.x",
     "npm": ">=9.x"
   },
-  "gitHead": "3555b328ece2c5f3b97be93f6ff7ddecb322535a"
+  "gitHead": "b13ea4976979dcd6c63a1ecb3d96b5dc448fd535"
 }

package/src/default.ts

@@ -1,6 +1,7 @@
 import type { OPENLOGIN_NETWORK_TYPE, OpenLoginOptions } from "@toruslabs/openlogin-utils";
 import { CHAIN_NAMESPACES, CustomChainConfig, getChainConfig, IAdapter, IBaseProvider, WALLET_ADAPTER_TYPE, WALLET_ADAPTERS } from "@web3auth/base";
 import { CommonPrivateKeyProvider } from "@web3auth/base-provider";
+import { UIConfig } from "@web3auth/ui";
 
 export async function getPrivateKeyProvider(chainConfig: CustomChainConfig): Promise<IBaseProvider<string>> {
   if (chainConfig.chainNamespace === CHAIN_NAMESPACES.SOLANA) {
@@ -24,8 +25,9 @@ export const getDefaultAdapterModule = async (params: {
   customChainConfig: Partial<CustomChainConfig> & Pick<CustomChainConfig, "chainNamespace">;
   sessionTime?: number;
   web3AuthNetwork?: OPENLOGIN_NETWORK_TYPE;
+  uiConfig?: Omit<UIConfig, "adapterListener">;
 }): Promise<IAdapter<unknown>> => {
-  const { name, customChainConfig, clientId, sessionTime, web3AuthNetwork } = params;
+  const { name, customChainConfig, clientId, sessionTime, web3AuthNetwork, uiConfig } = params;
   if (!Object.values(CHAIN_NAMESPACES).includes(customChainConfig.chainNamespace))
     throw new Error(`Invalid chainNamespace: ${customChainConfig.chainNamespace}`);
   const finalChainConfig = {
@@ -73,7 +75,7 @@ export const getDefaultAdapterModule = async (params: {
       ...defaultOptions,
       clientId,
       chainConfig: { ...finalChainConfig },
-      adapterSettings: { ...(defaultOptions.adapterSettings as OpenLoginOptions), clientId, network: web3AuthNetwork },
+      adapterSettings: { ...(defaultOptions.adapterSettings as OpenLoginOptions), clientId, network: web3AuthNetwork, whiteLabel: uiConfig },
       sessionTime,
       web3AuthNetwork,
       privateKeyProvider,

package/src/modalManager.ts

@@ -15,7 +15,7 @@ import {
 import { CommonJRPCProvider } from "@web3auth/base-provider";
 import { Web3AuthNoModal, Web3AuthNoModalOptions } from "@web3auth/no-modal";
 import type { OpenloginAdapter } from "@web3auth/openlogin-adapter";
-import { getAdapterSocialLogins, LOGIN_MODAL_EVENTS, LoginModal, OPENLOGIN_PROVIDERS, UIConfig } from "@web3auth/ui";
+import { getAdapterSocialLogins, getUserLanguage, LOGIN_MODAL_EVENTS, LoginModal, OPENLOGIN_PROVIDERS, UIConfig } from "@web3auth/ui";
 
 import {
   defaultEvmDappModalConfig,
@@ -26,7 +26,6 @@ import {
 } from "./config";
 import { getDefaultAdapterModule, getPrivateKeyProvider } from "./default";
 import { AdaptersModalConfig, IWeb3AuthModal, ModalConfig } from "./interface";
-import { getUserLanguage } from "./utils";
 
 export interface Web3AuthOptions extends Web3AuthNoModalOptions {
   /**
@@ -77,19 +76,12 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
       throw new Error(`Invalid chainNamespace provided: ${providedChainConfig.chainNamespace}`);
     }
 
-    // get userLanguage
-    const defaultLanguage = getUserLanguage(this.options.uiConfig?.defaultLanguage);
+    if (!this.options.uiConfig.defaultLanguage) this.options.uiConfig.defaultLanguage = getUserLanguage(this.options.uiConfig.defaultLanguage);
+    if (!this.options.uiConfig.mode) this.options.uiConfig.mode = "auto";
 
     this.loginModal = new LoginModal({
-      theme: this.options.uiConfig?.theme,
-      appName: this.options.uiConfig?.appName || "blockchain",
-      appLogo: this.options.uiConfig?.appLogo || "",
+      ...this.options.uiConfig,
       adapterListener: this,
-      displayErrorsOnModal: this.options.uiConfig?.displayErrorsOnModal,
-      defaultLanguage,
-      modalZIndex: this.options.uiConfig?.modalZIndex || "99998",
-      loginGridCol: this.options.uiConfig?.loginGridCol || 3,
-      primaryButton: this.options.uiConfig?.primaryButton || "socialLogin",
     });
     this.subscribeToLoginModalEvents();
   }
@@ -131,6 +123,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
           clientId: this.options.clientId,
           sessionTime: this.options.sessionTime,
           web3AuthNetwork: this.options.web3AuthNetwork,
+          uiConfig: this.options.uiConfig,
         });
 
         this.walletAdapters[adapterName] = ad;
@@ -159,7 +152,7 @@ export class Web3Auth extends Web3AuthNoModal implements IWeb3AuthModal {
           const openloginAdapter = this.walletAdapters[adapterName] as OpenloginAdapter;
           if (!openloginAdapter.privateKeyProvider) {
             const currentPrivateKeyProvider = await getPrivateKeyProvider(openloginAdapter.chainConfigProxy as CustomChainConfig);
-            openloginAdapter.setAdapterSettings({ privateKeyProvider: currentPrivateKeyProvider });
+            openloginAdapter.setAdapterSettings({ privateKeyProvider: currentPrivateKeyProvider, whiteLabel: this.options.uiConfig });
           }
         }
 

package/dist/types/utils.d.ts

@@ -1,12 +0,0 @@
-export declare const languageMap: {
-    en: string;
-    de: string;
-    ja: string;
-    ko: string;
-    zh: string;
-    es: string;
-    fr: string;
-    pt: string;
-    nl: string;
-};
-export declare const getUserLanguage: (defaultLanguage: string | undefined) => string;

package/src/utils.ts

@@ -1,25 +0,0 @@
-interface NavigatorLanguage {
-  userLanguage?: string;
-}
-
-export const languageMap = {
-  en: "english",
-  de: "german",
-  ja: "japanese",
-  ko: "korean",
-  zh: "mandarin",
-  es: "spanish",
-  fr: "french",
-  pt: "portuguese",
-  nl: "dutch",
-};
-
-export const getUserLanguage = (defaultLanguage: string | undefined) => {
-  let userLanguage = defaultLanguage;
-  if (!userLanguage) {
-    const browserLanguage =
-      typeof window !== "undefined" ? (window.navigator as NavigatorLanguage).userLanguage || window.navigator.language || "en-US" : "en-US";
-    userLanguage = browserLanguage.split("-")[0];
-  }
-  return Object.prototype.hasOwnProperty.call(languageMap, userLanguage) ? userLanguage : "en";
-};