@web3auth/modal 10.0.0-alpha.2 → 10.0.0-beta.0

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

@@ -1,44 +1,50 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import { Web3AuthNoModal, cloneDeep, CONNECTOR_EVENTS, WalletInitializationError, CONNECTOR_STATUS, fetchProjectConfig, log, fetchWalletRegistry, WALLET_CONNECTORS, AUTH_CONNECTION, CONNECTOR_NAMES, CONNECTOR_CATEGORY } from '@web3auth/no-modal';
+import { Web3AuthNoModal, cloneDeep, log, CONNECTOR_EVENTS, WalletInitializationError, CONNECTOR_STATUS, fetchProjectConfig, fetchWalletRegistry, WALLET_CONNECTORS, CONNECTOR_NAMES, CONNECTOR_CATEGORY } from '@web3auth/no-modal';
 import deepmerge from 'deepmerge';
-import { defaultOtherModalConfig, walletRegistryUrl } from './config.js';
-import { capitalizeFirstLetter, AUTH_PROVIDERS } from './ui/config.js';
+import { defaultConnectorsModalConfig, walletRegistryUrl } from './config.js';
+import { AUTH_PROVIDERS, capitalizeFirstLetter } from './ui/config.js';
 import { LOGIN_MODAL_EVENTS } from './ui/interfaces.js';
 import { LoginModal } from './ui/loginModal.js';
-import { getUserLanguage, getConnectorSocialLogins } from './ui/utils.js';
+import { getUserLanguage } from './ui/utils.js';
 
 class Web3Auth extends Web3AuthNoModal {
   constructor(options) {
     super(options);
     _defineProperty(this, "loginModal", void 0);
     _defineProperty(this, "options", void 0);
-    _defineProperty(this, "modalConfig", cloneDeep(defaultOtherModalConfig));
+    _defineProperty(this, "modalConfig", cloneDeep(defaultConnectorsModalConfig));
     this.options = _objectSpread({}, options);
     if (!this.options.uiConfig) this.options.uiConfig = {};
+    if (this.options.modalConfig) this.modalConfig = this.options.modalConfig;
+    log.info("modalConfig", this.modalConfig);
   }
-  setModalConfig(modalConfig) {
-    super.checkInitRequirements();
-    this.modalConfig = modalConfig;
-  }
-  async initModal(params) {
+  async initModal() {
     var _this$coreOptions$cha;
     super.checkInitRequirements();
-    super.initCachedConnectorAndChainId();
     // get project config and wallet registry
     const {
       projectConfig,
       walletRegistry
-    } = await this.getProjectAndWalletConfig(params);
+    } = await this.getProjectAndWalletConfig();
     this.options.uiConfig = deepmerge(cloneDeep(projectConfig.whitelabel || {}), this.options.uiConfig || {});
     if (!this.options.uiConfig.defaultLanguage) this.options.uiConfig.defaultLanguage = getUserLanguage(this.options.uiConfig.defaultLanguage);
     if (!this.options.uiConfig.mode) this.options.uiConfig.mode = "light";
 
+    // init config
+    super.initAccountAbstractionConfig(projectConfig);
+    super.initChainsConfig(projectConfig);
+    super.initCachedConnectorAndChainId();
+
     // init login modal
+    const {
+      filteredWalletRegistry,
+      disabledExternalWallets
+    } = this.filterWalletRegistry(walletRegistry, projectConfig);
     this.loginModal = new LoginModal(_objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
       connectorListener: this,
       chainNamespaces: [...new Set(((_this$coreOptions$cha = this.coreOptions.chains) === null || _this$coreOptions$cha === void 0 ? void 0 : _this$coreOptions$cha.map(x => x.chainNamespace)) || [])],
-      walletRegistry
+      walletRegistry: filteredWalletRegistry
     }));
     this.subscribeToLoginModalEvents();
     await this.loginModal.initModal();
@@ -52,7 +58,7 @@ class Web3Auth extends Web3AuthNoModal {
     }) => this.initConnectors({
       connectors: newConnectors,
       projectConfig,
-      modalConfig: params
+      disabledExternalWallets
     }));
     await this.loadConnectors({
       projectConfig
@@ -81,7 +87,35 @@ class Web3Auth extends Web3AuthNoModal {
       });
     });
   }
-  async getProjectAndWalletConfig(params) {
+  filterWalletRegistry(walletRegistry, projectConfig) {
+    const {
+      disableAllRecommendedWallets,
+      disableAllOtherWallets,
+      disabledWallets
+    } = projectConfig.externalWalletAuth || {};
+
+    // add disabled wallets to set
+    const disabledExternalWallets = new Set(disabledWallets || []);
+    if (disableAllRecommendedWallets) {
+      Object.keys(walletRegistry.default).forEach(wallet => disabledExternalWallets.add(wallet));
+    }
+    if (disableAllOtherWallets) {
+      Object.keys(walletRegistry.others).forEach(wallet => disabledExternalWallets.add(wallet));
+    }
+
+    // remove wallets that are disabled in project config from wallet registry
+    const filteredWalletRegistry = cloneDeep(walletRegistry);
+    disabledExternalWallets.forEach(wallet => {
+      delete filteredWalletRegistry.default[wallet];
+      delete filteredWalletRegistry.others[wallet];
+    });
+    return {
+      disabledExternalWallets,
+      filteredWalletRegistry
+    };
+  }
+  async getProjectAndWalletConfig() {
+    var _this$modalConfig;
     // get project config
     let projectConfig;
     try {
@@ -97,7 +131,8 @@ class Web3Auth extends Web3AuthNoModal {
       others: {},
       default: {}
     };
-    if (!(params !== null && params !== void 0 && params.hideWalletDiscovery)) {
+    const isExternalWalletEnabled = Boolean(projectConfig.externalWalletAuth);
+    if (isExternalWalletEnabled && !((_this$modalConfig = this.modalConfig) !== null && _this$modalConfig !== void 0 && _this$modalConfig.hideWalletDiscovery)) {
       try {
         walletRegistry = await fetchWalletRegistry(walletRegistryUrl);
       } catch (e) {
@@ -112,16 +147,19 @@ class Web3Auth extends Web3AuthNoModal {
   async initConnectors({
     connectors,
     projectConfig,
-    modalConfig
+    disabledExternalWallets
   }) {
     // filter connectors based on config
-    const filteredConnectorNames = await this.filterConnectors(modalConfig, projectConfig);
+    const filteredConnectorNames = await this.filterConnectors({
+      projectConfig,
+      disabledExternalWallets
+    });
 
     // initialize connectors based on availability
     const {
       hasInAppConnectors,
       hasExternalConnectors
-    } = await this.checkConnectorAvailability(filteredConnectorNames, modalConfig);
+    } = await this.checkConnectorAvailability(filteredConnectorNames);
     if (hasInAppConnectors) {
       await this.initInAppAndCachedConnectors(connectors, filteredConnectorNames);
       // show connect button if external wallets are available
@@ -139,106 +177,119 @@ class Web3Auth extends Web3AuthNoModal {
       this.emit(CONNECTOR_EVENTS.READY);
     }
   }
-  async filterConnectors(params, projectConfig) {
-    // update auth connector config
-    const {
-      sms_otp_enabled: smsOtpEnabled
-    } = projectConfig;
-    if (smsOtpEnabled !== undefined) {
-      var _params, _params$modalConfig$W;
-      // TODO: use the new login config method
-      const connectorConfig = {
-        [WALLET_CONNECTORS.AUTH]: {
-          label: WALLET_CONNECTORS.AUTH,
-          loginMethods: {
-            [AUTH_CONNECTION.SMS_PASSWORDLESS]: {
-              name: AUTH_CONNECTION.SMS_PASSWORDLESS,
-              showOnModal: smsOtpEnabled,
-              showOnDesktop: smsOtpEnabled,
-              showOnMobile: smsOtpEnabled
-            }
-          }
-        }
-      };
-      if (!((_params = params) !== null && _params !== void 0 && _params.modalConfig)) params = {
-        modalConfig: {}
-      };
-      const localSmsOtpEnabled = (_params$modalConfig$W = params.modalConfig[WALLET_CONNECTORS.AUTH]) === null || _params$modalConfig$W === void 0 || (_params$modalConfig$W = _params$modalConfig$W.loginMethods) === null || _params$modalConfig$W === void 0 || (_params$modalConfig$W = _params$modalConfig$W[AUTH_CONNECTION.SMS_PASSWORDLESS]) === null || _params$modalConfig$W === void 0 ? void 0 : _params$modalConfig$W.showOnModal;
-      if (localSmsOtpEnabled === true && smsOtpEnabled === false) {
-        throw WalletInitializationError.invalidParams("must enable sms otp on dashboard in order to utilise it");
+  async filterConnectors({
+    projectConfig,
+    disabledExternalWallets
+  }) {
+    var _this$modalConfig2, _this$modalConfig3, _projectConfig$loginM, _projectConfig$loginM2;
+    // Auth connector config: merge code config with config from dashboard
+    const loginMethods = {};
+    for (const authConnectionConfig of projectConfig.embeddedWalletAuth || []) {
+      const {
+        isDefault,
+        authConnectionId,
+        groupedAuthConnectionId,
+        authConnection
+      } = authConnectionConfig;
+      // for custom auth connections, authConnectionId or groupedAuthConnectionId are required.
+      if (!isDefault && (!authConnectionId || !groupedAuthConnectionId)) return;
+      loginMethods[authConnection] = _objectSpread(_objectSpread({
+        name: authConnection
+      }, authConnectionConfig), {}, {
+        showOnModal: true,
+        showOnDesktop: true,
+        showOnMobile: true
+      });
+    }
+    const dashboardConnectorConfig = {
+      [WALLET_CONNECTORS.AUTH]: {
+        label: WALLET_CONNECTORS.AUTH,
+        loginMethods
       }
-      params.modalConfig = deepmerge(connectorConfig, cloneDeep(params.modalConfig));
+    };
+    if ((_this$modalConfig2 = this.modalConfig) !== null && _this$modalConfig2 !== void 0 && (_this$modalConfig2 = _this$modalConfig2.connectors) !== null && _this$modalConfig2 !== void 0 && _this$modalConfig2[WALLET_CONNECTORS.AUTH]) {
+      if (!this.modalConfig.connectors[WALLET_CONNECTORS.AUTH].loginMethods) this.modalConfig.connectors[WALLET_CONNECTORS.AUTH].loginMethods = {};
     }
+    this.modalConfig.connectors = deepmerge(dashboardConnectorConfig, cloneDeep(this.modalConfig.connectors || {}));
+    // TODO: validate modal connector config here.!!
+
+    if ((_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 && _this$modalConfig3.loginMethods) {
+      const authProviders = new Set(AUTH_PROVIDERS);
+      Object.keys(this.modalConfig.connectors[WALLET_CONNECTORS.AUTH].loginMethods).forEach(key => {
+        if (!authProviders.has(key)) {
+          throw WalletInitializationError.invalidParams(`Invalid auth connection: ${key}`);
+        }
+      });
+    }
+
+    // external wallets config
+    const isExternalWalletEnabled = Boolean(projectConfig.externalWalletAuth);
+    const isInstalledWalletWalletDisplayed = Boolean((_projectConfig$loginM = (_projectConfig$loginM2 = projectConfig.loginModal) === null || _projectConfig$loginM2 === void 0 ? void 0 : _projectConfig$loginM2.displayInstalledExternalWallets) !== null && _projectConfig$loginM !== void 0 ? _projectConfig$loginM : true);
 
     // merge default connectors with the custom configured connectors.
     const allConnectorNames = [...new Set([...Object.keys(this.modalConfig.connectors || {}), ...this.connectors.map(connector => connector.name)])];
-    const connectorConfigurationPromises = allConnectorNames.map(async connectorName => {
-      var _this$modalConfig$con, _params2, _this$modalConfig$con2, _this$modalConfig$con3;
+    const connectorNames = allConnectorNames.map(connectorName => {
+      var _this$modalConfig4, _this$modalConfig$con, _this$modalConfig$con2;
       // start with the default config of connector.
-      let connectorConfig = ((_this$modalConfig$con = this.modalConfig.connectors) === null || _this$modalConfig$con === void 0 ? void 0 : _this$modalConfig$con[connectorName]) || {
+      const defaultConnectorConfig = {
         label: CONNECTOR_NAMES[connectorName] || connectorName.split("-").map(capitalizeFirstLetter).join(" "),
         showOnModal: true,
         showOnMobile: true,
         showOnDesktop: true
       };
-      // override the default config of connector if some config is being provided by the user.
-      if ((_params2 = params) !== null && _params2 !== void 0 && (_params2 = _params2.modalConfig) !== null && _params2 !== void 0 && _params2[connectorName]) {
-        connectorConfig = _objectSpread(_objectSpread({}, connectorConfig), params.modalConfig[connectorName]);
-      }
-      this.modalConfig.connectors[connectorName] = connectorConfig;
+      this.modalConfig.connectors[connectorName] = _objectSpread(_objectSpread({}, defaultConnectorConfig), ((_this$modalConfig4 = this.modalConfig) === null || _this$modalConfig4 === void 0 || (_this$modalConfig4 = _this$modalConfig4.connectors) === null || _this$modalConfig4 === void 0 ? void 0 : _this$modalConfig4[connectorName]) || {});
 
       // check if connector is configured/added by user and exist in connectors map.
       const connector = this.getConnector(connectorName);
-      log.debug("connector config", connectorName, (_this$modalConfig$con2 = this.modalConfig.connectors) === null || _this$modalConfig$con2 === void 0 ? void 0 : _this$modalConfig$con2[connectorName].showOnModal, connector);
+      log.debug("connector config", connectorName, (_this$modalConfig$con = this.modalConfig.connectors) === null || _this$modalConfig$con === void 0 || (_this$modalConfig$con = _this$modalConfig$con[connectorName]) === null || _this$modalConfig$con === void 0 ? void 0 : _this$modalConfig$con.showOnModal, connector);
 
-      // if connector is not custom configured then check if it is available in default connectors.
-      // and if connector is not hidden by user
-      if (!connector && (_this$modalConfig$con3 = this.modalConfig.connectors) !== null && _this$modalConfig$con3 !== void 0 && _this$modalConfig$con3[connectorName].showOnModal) {
-        throw WalletInitializationError.invalidParams(`Connector ${connectorName} is not configured`);
-      } else if ((connector === null || connector === void 0 ? void 0 : connector.type) === CONNECTOR_CATEGORY.IN_APP || (connector === null || connector === void 0 ? void 0 : connector.type) === CONNECTOR_CATEGORY.EXTERNAL || connectorName === this.cachedConnector) {
-        var _this$modalConfig$con4;
-        if (!((_this$modalConfig$con4 = this.modalConfig.connectors) !== null && _this$modalConfig$con4 !== void 0 && _this$modalConfig$con4[connectorName].showOnModal)) return;
-        if (connectorName === WALLET_CONNECTORS.WALLET_CONNECT_V2) {
-          const {
-            wallet_connect_enabled: walletConnectEnabled
-          } = projectConfig;
-          if (walletConnectEnabled === false) {
-            var _this$modalConfig$con5, _this$modalConfig$con6, _this$modalConfig$con7;
-            // override user specified config by hiding wallet connect
-            this.modalConfig.connectors = _objectSpread(_objectSpread({}, (_this$modalConfig$con5 = this.modalConfig.connectors) !== null && _this$modalConfig$con5 !== void 0 ? _this$modalConfig$con5 : {}), {}, {
-              [WALLET_CONNECTORS.WALLET_CONNECT_V2]: _objectSpread(_objectSpread({}, (_this$modalConfig$con6 = (_this$modalConfig$con7 = this.modalConfig.connectors) === null || _this$modalConfig$con7 === void 0 ? void 0 : _this$modalConfig$con7[WALLET_CONNECTORS.WALLET_CONNECT_V2]) !== null && _this$modalConfig$con6 !== void 0 ? _this$modalConfig$con6 : {}), {}, {
-                showOnModal: false
-              })
-            });
-            this.modalConfig.connectors[WALLET_CONNECTORS.WALLET_CONNECT_V2].showOnModal = false;
-          }
-        }
-        return connectorName;
+      // check if connector is configured/added by user and exist in connectors map.
+      const connectorConfig = (_this$modalConfig$con2 = this.modalConfig.connectors) === null || _this$modalConfig$con2 === void 0 ? void 0 : _this$modalConfig$con2[connectorName];
+      if (!connector) {
+        if (connectorConfig.showOnModal) throw WalletInitializationError.invalidParams(`Connector ${connectorName} is not configured`);
+        return;
       }
+
+      // skip connector if it is hidden by user
+      if (!connectorConfig.showOnModal) return;
+
+      // skip external connector if external wallets are disabled or it is disabled or displayInstalledExternalWallets is false
+      if (connector.type === CONNECTOR_CATEGORY.EXTERNAL) {
+        if (!isExternalWalletEnabled) return;
+        if (disabledExternalWallets.has(connectorName)) return;
+        if (!isInstalledWalletWalletDisplayed) return;
+      }
+
+      // skip WC connector if external wallets are disabled or hideWalletDiscovery is true
+      if (connectorName === WALLET_CONNECTORS.WALLET_CONNECT_V2) {
+        var _this$modalConfig5;
+        if (!isExternalWalletEnabled) return;
+        if ((_this$modalConfig5 = this.modalConfig) !== null && _this$modalConfig5 !== void 0 && _this$modalConfig5.hideWalletDiscovery) return;
+      }
+      this.modalConfig.connectors[connectorName] = connectorConfig;
+      return connectorName;
     });
-    const connectorNames = await Promise.all(connectorConfigurationPromises);
+    // const connectorNames = await Promise.all(connectorConfigurationPromises);
     return connectorNames.filter(name => name !== undefined);
   }
-  async checkConnectorAvailability(connectorNames, modalConfig) {
+  async checkConnectorAvailability(connectorNames) {
     // currently all default in app and external wallets can be hidden or shown based on config.
     // check if in app connectors are available
     const hasInAppConnectors = this.connectors.some(connector => {
-      var _this$modalConfig$con8, _this$modalConfig$con9, _connector$name;
+      var _this$modalConfig$con3, _this$modalConfig$con4;
       if (connector.type !== CONNECTOR_CATEGORY.IN_APP) return false;
-      if (((_this$modalConfig$con8 = this.modalConfig.connectors) === null || _this$modalConfig$con8 === void 0 || (_this$modalConfig$con8 = _this$modalConfig$con8[connector.name]) === null || _this$modalConfig$con8 === void 0 ? void 0 : _this$modalConfig$con8.showOnModal) !== true) return false;
-      if (!((_this$modalConfig$con9 = this.modalConfig.connectors) !== null && _this$modalConfig$con9 !== void 0 && (_this$modalConfig$con9 = _this$modalConfig$con9[connector.name]) !== null && _this$modalConfig$con9 !== void 0 && _this$modalConfig$con9.loginMethods)) return true;
-      const mergedLoginMethods = getConnectorSocialLogins(connector.name, (_connector$name = this.modalConfig.connectors[connector.name]) === null || _connector$name === void 0 ? void 0 : _connector$name.loginMethods);
-      if (Object.values(mergedLoginMethods).some(method => method.showOnModal)) return true;
+      if (((_this$modalConfig$con3 = this.modalConfig.connectors) === null || _this$modalConfig$con3 === void 0 || (_this$modalConfig$con3 = _this$modalConfig$con3[connector.name]) === null || _this$modalConfig$con3 === void 0 ? void 0 : _this$modalConfig$con3.showOnModal) !== true) return false;
+      if (!((_this$modalConfig$con4 = this.modalConfig.connectors) !== null && _this$modalConfig$con4 !== void 0 && (_this$modalConfig$con4 = _this$modalConfig$con4[connector.name]) !== null && _this$modalConfig$con4 !== void 0 && _this$modalConfig$con4.loginMethods)) return true;
+      if (Object.values(this.modalConfig.connectors[connector.name].loginMethods).some(method => method.showOnModal)) return true;
       return false;
     });
     log.debug(hasInAppConnectors, this.connectors, connectorNames, "hasInAppWallets");
 
     // check if external connectors are available
     const hasExternalConnectors = connectorNames.some(connectorName => {
-      var _this$getConnector, _this$modalConfig$con10;
-      // if wallet connect connector is available but hideWalletDiscovery is true then don't consider it as external wallet
-      if (connectorName === WALLET_CONNECTORS.WALLET_CONNECT_V2 && modalConfig !== null && modalConfig !== void 0 && modalConfig.hideWalletDiscovery) return false;
-      return ((_this$getConnector = this.getConnector(connectorName)) === null || _this$getConnector === void 0 ? void 0 : _this$getConnector.type) === CONNECTOR_CATEGORY.EXTERNAL && ((_this$modalConfig$con10 = this.modalConfig.connectors) === null || _this$modalConfig$con10 === void 0 ? void 0 : _this$modalConfig$con10[connectorName].showOnModal);
+      var _this$getConnector, _this$modalConfig$con5;
+      if (connectorName === WALLET_CONNECTORS.WALLET_CONNECT_V2) return true;
+      return ((_this$getConnector = this.getConnector(connectorName)) === null || _this$getConnector === void 0 ? void 0 : _this$getConnector.type) === CONNECTOR_CATEGORY.EXTERNAL && ((_this$modalConfig$con5 = this.modalConfig.connectors) === null || _this$modalConfig$con5 === void 0 ? void 0 : _this$modalConfig$con5[connectorName].showOnModal);
     });
     return {
       hasInAppConnectors,
@@ -254,7 +305,7 @@ class Web3Auth extends Web3AuthNoModal {
         if (connector.status !== CONNECTOR_STATUS.NOT_READY) return;
 
         // only initialize a external connectors here if it is a cached connector.
-        if (this.cachedConnector !== connectorName && connector.type === CONNECTOR_CATEGORY.EXTERNAL) return;
+        if (this.cachedConnector !== connectorName && connectorName !== WALLET_CONNECTORS.METAMASK && connector.type === CONNECTOR_CATEGORY.EXTERNAL) return;
 
         // in-app wallets or cached wallet (being connected or already connected) are initialized first.
         // if connector is configured then only initialize in app or cached connector.
@@ -269,9 +320,9 @@ class Web3Auth extends Web3AuthNoModal {
         // 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 _connectorName, _this$options$uiConfi, _this$options$uiConfi2, _this$options$uiConfi3;
+          var _this$modalConfig$con6, _this$options$uiConfi, _this$options$uiConfi2, _this$options$uiConfi3;
           log.info("connectorInitResults", connectorName);
-          const loginMethods = getConnectorSocialLogins(connectorName, (_connectorName = this.modalConfig.connectors[connectorName]) === null || _connectorName === void 0 ? void 0 : _connectorName.loginMethods);
+          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$uiConfi = this.options.uiConfig) === null || _this$options$uiConfi === void 0 ? void 0 : _this$options$uiConfi.loginMethodsOrder) || AUTH_PROVIDERS, _objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
             loginGridCol: ((_this$options$uiConfi2 = this.options.uiConfig) === null || _this$options$uiConfi2 === void 0 ? void 0 : _this$options$uiConfi2.loginGridCol) || 3,
             primaryButton: ((_this$options$uiConfi3 = this.options.uiConfig) === null || _this$options$uiConfi3 === void 0 ? void 0 : _this$options$uiConfi3.primaryButton) || "socialLogin"

package/dist/lib.esm/packages/modal/src/react/context/Web3AuthInnerContext.js

@@ -85,18 +85,7 @@ function Web3AuthInnerProvider(params) {
       try {
         setInitError(null);
         setIsInitializing(true);
-        const {
-          modalConfig,
-          hideWalletDiscovery
-        } = config;
-        if (modalConfig) {
-          await web3Auth.initModal({
-            modalConfig,
-            hideWalletDiscovery
-          });
-        } else {
-          await web3Auth.initModal();
-        }
+        await web3Auth.initModal();
       } catch (error) {
         setInitError(error);
       } finally {

package/dist/lib.esm/packages/modal/src/ui/components/ExternalWallets.js

@@ -36,7 +36,7 @@ function ExternalWallets(props) {
     i18n: i18nInstance
   });
   const walletDiscoverySupported = useMemo(() => {
-    const supported = walletRegistry && Object.keys(walletRegistry.default).length > 0 && Object.keys(walletRegistry.others).length > 0;
+    const supported = walletRegistry && (Object.keys(walletRegistry.default).length > 0 || Object.keys(walletRegistry.others).length > 0);
     return supported;
   }, [walletRegistry]);
   const deviceDetails = useMemo(() => {
@@ -84,11 +84,12 @@ function ExternalWallets(props) {
   useEffect(() => {
     if (walletDiscoverySupported) {
       const isWalletConnectAdapterIncluded = Object.keys(config).some(adapter => adapter === WALLET_CONNECTORS.WALLET_CONNECT_V2);
-      const defaultButtonKeys = new Set(Object.keys(walletRegistry.default));
       const generateWalletButtons = wallets => {
         return Object.keys(wallets).reduce((acc, wallet) => {
           var _walletRegistryItem$c, _walletRegistryItem$i, _config$wallet, _walletRegistryItem$w;
           if (adapterVisibilityMap[wallet] === false) return acc;
+          // Metamask is always visible in the main screen, no need to show it in the external wallets list
+          if (wallet === WALLET_CONNECTORS.METAMASK) return acc;
           const walletRegistryItem = wallets[wallet];
           let href = "";
           if (deviceDetails.platform === Bowser.PLATFORMS_MAP.mobile) {
@@ -125,6 +126,8 @@ function ExternalWallets(props) {
 
       // Generate custom adapter buttons
       const customAdapterButtons = Object.keys(config).reduce((acc, adapter) => {
+        // Metamask is always visible in the main screen, no need to show it in the external wallets list
+        if (adapter === WALLET_CONNECTORS.METAMASK) return acc;
         if (![WALLET_CONNECTORS.WALLET_CONNECT_V2].includes(adapter) && !config[adapter].isInjected && adapterVisibilityMap[adapter]) {
           log.debug("custom adapter", adapter, config[adapter]);
           acc.push({
@@ -145,6 +148,8 @@ function ExternalWallets(props) {
         log.debug("filteredLists", filteredList);
         setExternalButtons(filteredList);
       } else {
+        const finalDefaultButtons = defaultButtons.length > 0 ? defaultButtons : allButtons.slice(0, 10);
+        const defaultButtonKeys = new Set(finalDefaultButtons.map(button => button.name));
         const sortedButtons = [...allButtons.filter(button => button.hasInjectedWallet && defaultButtonKeys.has(button.name)), ...customAdapterButtons, ...allButtons.filter(button => !button.hasInjectedWallet && defaultButtonKeys.has(button.name))];
         setExternalButtons(sortedButtons);
       }
@@ -200,7 +205,7 @@ function ExternalWallets(props) {
         }), totalExternalWallets > 15 && /*#__PURE__*/jsx("div", {
           className: "w3a--py-4",
           children: /*#__PURE__*/jsx("input", {
-            className: "w3a--w-full w3a-text-field",
+            className: "w3a-text-field w3a--w-full",
             name: "passwordless-input",
             required: true,
             value: walletSearch,
@@ -218,7 +223,7 @@ function ExternalWallets(props) {
             onChange: e => handleWalletSearch(e)
           })
         }), externalButtons.length === 0 ? /*#__PURE__*/jsx("div", {
-          className: "w3a--w-full w3a--text-center w3a--text-app-gray-400 dark:w3a--text-app-gray-500 w3a--py-6 w3a--flex w3a--justify-center w3a--items-center",
+          className: "w3a--flex w3a--w-full w3a--items-center w3a--justify-center w3a--py-6 w3a--text-center w3a--text-app-gray-400 dark:w3a--text-app-gray-500",
           children: t("modal.external.no-wallets-found")
         }) : /*#__PURE__*/jsx("div", {
           className: `w3a-adapter-list-container ${totalExternalWallets < 15 ? "w3a--py-4" : ""}`,
@@ -248,7 +253,7 @@ function ExternalWallets(props) {
                 }))]
               }, button.name + button.displayName);
             }), totalExternalWallets > 10 && !walletSearch && /*#__PURE__*/jsxs("li", {
-              className: "w3a--flex w3a--flex-col w3a--items-center w3a--justify-center w3a--gap-y-0.5 w3a--my-4 w3a--w-full w3a--mx-auto w3a-adapter-item--full",
+              className: "w3a-adapter-item--full w3a--mx-auto w3a--my-4 w3a--flex w3a--w-full w3a--flex-col w3a--items-center w3a--justify-center w3a--gap-y-0.5",
               children: [/*#__PURE__*/jsx("p", {
                 className: "w3a--text-xs w3a--text-app-gray-500 dark:w3a--text-app-gray-400",
                 children: t("modal.external.search-text")

package/dist/lib.esm/packages/modal/src/ui/components/Modal.js

@@ -1,6 +1,6 @@
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { AUTH_CONNECTION } from '@web3auth/auth';
-import { log, cloneDeep, CONNECTOR_NAMES } from '@web3auth/no-modal';
+import { log, cloneDeep, CONNECTOR_NAMES, WALLET_CONNECTORS } from '@web3auth/no-modal';
 import deepmerge from 'deepmerge';
 import { useState, useEffect, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -11,6 +11,7 @@ import Button from './Button/Button.js';
 import ExternalWallets from './ExternalWallets.js';
 import Footer from './Footer.js';
 import memoizedHeader from './Header.js';
+import Image from './Image.js';
 import SocialLoginPasswordless from './SocialLoginPasswordless.js';
 import SocialLogins from './SocialLogins.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -138,7 +139,7 @@ function Modal(props) {
       children: /*#__PURE__*/jsx(Button, {
         variant: isExternalPrimary ? "primary" : "tertiary",
         type: "button",
-        className: "w3a--w-full w3ajs-external-toggle__button",
+        className: "w3ajs-external-toggle__button w3a--w-full",
         style: {
           width: "100%"
         },
@@ -158,6 +159,39 @@ function Modal(props) {
       })
     })
   });
+  const metamaskWalletButton = /*#__PURE__*/jsx("div", {
+    className: "w3ajs-external-wallet w3a-group w3a--w-full",
+    children: /*#__PURE__*/jsx("div", {
+      className: "w3a-external-toggle w3ajs-external-toggle",
+      children: /*#__PURE__*/jsxs(Button, {
+        variant: isExternalPrimary ? "primary" : "tertiary",
+        type: "button",
+        className: "w3a--w-full w3ajs-external-toggle__button",
+        style: {
+          width: "100%"
+        },
+        onClick: () => {
+          preHandleExternalWalletClick({
+            connector: WALLET_CONNECTORS.METAMASK
+          });
+        },
+        children: [/*#__PURE__*/jsx(Image, {
+          imageId: "login-metamask",
+          hoverImageId: "login-metamask",
+          fallbackImageId: "wallet",
+          height: "24",
+          width: "24",
+          isButton: true,
+          extension: "svg"
+        }), /*#__PURE__*/jsx("span", {
+          className: "ml-2",
+          children: t("modal.external.continue-custom", {
+            wallet: "MetaMask"
+          })
+        })]
+      })
+    })
+  });
   const areSocialLoginsVisible = useMemo(() => {
     var _modalState$socialLog3, _modalState$socialLog4;
     if (modalState.showExternalWalletsOnly) return false;
@@ -215,7 +249,7 @@ function Modal(props) {
               handleSocialLoginClick: params => preHandleSocialWalletClick(params),
               socialLoginsConfig: modalState.socialLoginsConfig,
               isPrimaryBtn: isEmailPrimary
-            }), modalState.hasExternalWallets && externalWalletButton]
+            }), metamaskWalletButton, modalState.hasExternalWallets && externalWalletButton]
           })]
         }) : /*#__PURE__*/jsx("div", {
           className: "w3a-modal__content_external_wallet w3ajs-content",

package/dist/lib.esm/packages/modal/src/ui/components/SocialLoginPasswordless.js

@@ -34,7 +34,8 @@ function SocialLoginPasswordless(props) {
           loginParams: {
             authConnection: AUTH_CONNECTION.EMAIL_PASSWORDLESS,
             authConnectionId: emailConfig.authConnectionId,
-            groupedAuthConnectionId: "",
+            groupedAuthConnectionId: emailConfig.groupedAuthConnectionId,
+            extraLoginOptions: emailConfig.extraLoginOptions,
             login_hint: value,
             name: "Email"
           }
@@ -52,6 +53,7 @@ function SocialLoginPasswordless(props) {
             authConnection: AUTH_CONNECTION.SMS_PASSWORDLESS,
             authConnectionId: smsConfig.authConnectionId,
             groupedAuthConnectionId: smsConfig.groupedAuthConnectionId,
+            extraLoginOptions: smsConfig.extraLoginOptions,
             login_hint: typeof result === "string" ? result : number,
             name: "Mobile"
           }
@@ -94,16 +96,16 @@ function SocialLoginPasswordless(props) {
     children: [/*#__PURE__*/jsxs("div", {
       className: "w3a-group__title",
       children: [t(title), isSmsVisible && /*#__PURE__*/jsxs("div", {
-        className: "w3a--relative w3a--flex w3a--flex-col w3a--items-center w3a--cursor-pointer w3a--group",
+        className: "w3a--group w3a--relative w3a--flex w3a--cursor-pointer w3a--flex-col w3a--items-center",
         children: [/*#__PURE__*/jsx(Icon, {
           iconName: "information-circle-light",
           darkIconName: "information-circle"
         }), /*#__PURE__*/jsxs("div", {
-          className: "w3a--absolute w3a--z-20 w3a--flex-col w3a--items-center w3a--hidden w3a--mb-5 w3a--top-4 group-hover:w3a--flex",
+          className: "w3a--absolute w3a--top-4 w3a--z-20 w3a--mb-5 w3a--hidden w3a--flex-col w3a--items-center group-hover:w3a--flex",
           children: [/*#__PURE__*/jsx("div", {
-            className: "w3a--w-3 w3a--h-3 w3a--ml-[3px] -w3a--mb-2 w3a--rotate-45 w3a--bg-app-gray-50 dark:w3a--bg-app-gray-600"
+            className: "-w3a--mb-2 w3a--ml-[3px] w3a--size-3 w3a--rotate-45 w3a--bg-app-gray-50 dark:w3a--bg-app-gray-600"
           }), /*#__PURE__*/jsxs("div", {
-            className: `w3a--relative w3a--p-4 w3a--w-[300px] w3a--text-xs w3a--leading-none w3a--text-app-white w3a--rounded-md w3a--bg-app-gray-50 dark:w3a--bg-app-gray-600 w3a--shadow-lg ${isSmsVisible && !isEmailVisible ? "w3a--left-20" : "w3a--left-8"}`,
+            className: `w3a--relative w3a--w-[300px] w3a--rounded-md w3a--bg-app-gray-50 w3a--p-4 w3a--text-xs w3a--leading-none w3a--text-app-white w3a--shadow-lg dark:w3a--bg-app-gray-600 ${isSmsVisible && !isEmailVisible ? "w3a--left-20" : "w3a--left-8"}`,
             children: [/*#__PURE__*/jsx("div", {
               className: "w3a--mb-1 w3a--text-xs w3a--font-medium w3a--text-app-gray-900 dark:w3a--text-app-white",
               children: t("modal.popup.phone-header")
@@ -118,7 +120,7 @@ function SocialLoginPasswordless(props) {
       className: "w3ajs-passwordless-form",
       onSubmit: e => handleFormSubmit(e),
       children: [/*#__PURE__*/jsx("input", {
-        className: "w3a--w-full w3a--mb-4 w3a-text-field",
+        className: "w3a-text-field w3a--mb-4 w3a--w-full",
         name: "passwordless-input",
         required: true,
         placeholder: `${t("modal.social.sms-placeholder-text")} ${placeholder}`,

package/dist/lib.esm/packages/modal/src/ui/components/SocialLogins.js

@@ -80,7 +80,7 @@ function SocialLogins(props) {
         const loginMethodSpan = classNames("w3a-adapter-item", (socialLoginsConfig === null || socialLoginsConfig === void 0 || (_socialLoginsConfig$u2 = socialLoginsConfig.uiConfig) === null || _socialLoginsConfig$u2 === void 0 ? void 0 : _socialLoginsConfig$u2.loginGridCol) === 2 ? "w3a--col-span-3" : "w3a--col-span-2");
         if (isMainOption || order === 1) {
           return /*#__PURE__*/jsx("li", {
-            className: "w3a--col-span-6 w3a-adapter-item",
+            className: "w3a-adapter-item w3a--col-span-6",
             style: {
               order
             },
@@ -93,6 +93,7 @@ function SocialLogins(props) {
                   name: socialLoginConfig.name,
                   authConnectionId: socialLoginConfig.authConnectionId,
                   groupedAuthConnectionId: socialLoginConfig.groupedAuthConnectionId,
+                  extraLoginOptions: socialLoginConfig.extraLoginOptions,
                   login_hint: ""
                 }
               }),

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

@@ -5,9 +5,9 @@ function capitalizeFirstLetter(string) {
 }
 const restrictedLoginMethods = new Set([AUTH_CONNECTION.CUSTOM, AUTH_CONNECTION.PASSKEYS, AUTH_CONNECTION.TELEGRAM, AUTH_CONNECTION.AUTHENTICATOR]);
 const AUTH_PROVIDERS = Object.values(AUTH_CONNECTION).filter(x => !restrictedLoginMethods.has(x));
-const AUTH_PROVIDERS_NAMES = AUTH_PROVIDERS.reduce((acc, x) => {
+AUTH_PROVIDERS.reduce((acc, x) => {
   if (x === "email_passwordless") acc[x] = "Email";else if (x === "sms_passwordless") acc[x] = "Mobile";else acc[x] = capitalizeFirstLetter(x);
   return acc;
 }, {});
 
-export { AUTH_PROVIDERS, AUTH_PROVIDERS_NAMES, capitalizeFirstLetter };
+export { AUTH_PROVIDERS, capitalizeFirstLetter };