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

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

@@ -2,58 +2,8 @@
 
 var noModal = require('@web3auth/no-modal');
 
-const defaultSolanaDappModalConfig = {
-  chainNamespace: noModal.CHAIN_NAMESPACES.SOLANA,
-  connectors: {
-    [noModal.SOLANA_CONNECTORS.AUTH]: {
-      label: "Auth",
-      showOnModal: true,
-      showOnMobile: true,
-      showOnDesktop: true
-    }
-  }
-};
-const defaultEvmDappModalConfig = {
-  chainNamespace: noModal.CHAIN_NAMESPACES.EIP155,
-  connectors: {
-    [noModal.EVM_CONNECTORS.AUTH]: {
-      label: "Auth",
-      showOnModal: true,
-      showOnMobile: true,
-      showOnDesktop: true
-    },
-    [noModal.EVM_CONNECTORS.WALLET_CONNECT_V2]: {
-      label: "Wallet Connect",
-      showOnModal: true,
-      showOnMobile: true,
-      showOnDesktop: true
-    }
-  }
-};
-const defaultSolanaWalletModalConfig = {
-  chainNamespace: noModal.CHAIN_NAMESPACES.SOLANA,
-  connectors: {
-    [noModal.SOLANA_CONNECTORS.AUTH]: {
-      label: "Auth",
-      showOnModal: true,
-      showOnMobile: true,
-      showOnDesktop: true
-    }
-  }
-};
-const defaultEvmWalletModalConfig = {
-  chainNamespace: noModal.CHAIN_NAMESPACES.EIP155,
-  connectors: {
-    [noModal.EVM_CONNECTORS.AUTH]: {
-      label: "Auth",
-      showOnModal: true,
-      showOnMobile: true,
-      showOnDesktop: true
-    }
-  }
-};
-const defaultOtherModalConfig = {
-  chainNamespace: noModal.CHAIN_NAMESPACES.OTHER,
+const defaultConnectorsModalConfig = {
+  hideWalletDiscovery: false,
   connectors: {
     [noModal.EVM_CONNECTORS.AUTH]: {
       label: "Auth",
@@ -65,9 +15,5 @@ const defaultOtherModalConfig = {
 };
 const walletRegistryUrl = "https://assets.web3auth.io/v1/wallet-registry.json";
 
-exports.defaultEvmDappModalConfig = defaultEvmDappModalConfig;
-exports.defaultEvmWalletModalConfig = defaultEvmWalletModalConfig;
-exports.defaultOtherModalConfig = defaultOtherModalConfig;
-exports.defaultSolanaDappModalConfig = defaultSolanaDappModalConfig;
-exports.defaultSolanaWalletModalConfig = defaultSolanaWalletModalConfig;
+exports.defaultConnectorsModalConfig = defaultConnectorsModalConfig;
 exports.walletRegistryUrl = walletRegistryUrl;

package/dist/lib.cjs/packages/modal/src/index.js

@@ -6,11 +6,7 @@ var noModal = require('@web3auth/no-modal');
 
 
 
-exports.defaultEvmDappModalConfig = config.defaultEvmDappModalConfig;
-exports.defaultEvmWalletModalConfig = config.defaultEvmWalletModalConfig;
-exports.defaultOtherModalConfig = config.defaultOtherModalConfig;
-exports.defaultSolanaDappModalConfig = config.defaultSolanaDappModalConfig;
-exports.defaultSolanaWalletModalConfig = config.defaultSolanaWalletModalConfig;
+exports.defaultConnectorsModalConfig = config.defaultConnectorsModalConfig;
 exports.walletRegistryUrl = config.walletRegistryUrl;
 exports.Web3Auth = modalManager.Web3Auth;
 Object.keys(noModal).forEach(function (k) {

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

@@ -15,50 +15,52 @@ class Web3Auth extends noModal.Web3AuthNoModal {
     super(options);
     _defineProperty(this, "loginModal", void 0);
     _defineProperty(this, "options", void 0);
-    _defineProperty(this, "modalConfig", noModal.cloneDeep(config.defaultOtherModalConfig));
+    _defineProperty(this, "modalConfig", noModal.cloneDeep(config.defaultConnectorsModalConfig));
     this.options = _objectSpread({}, options);
     if (!this.options.uiConfig) this.options.uiConfig = {};
+    if (this.options.modalConfig) this.modalConfig = this.options.modalConfig;
+    noModal.log.info("modalConfig", this.modalConfig);
   }
-  setModalConfig(modalConfig) {
+  async initModal() {
+    var _this$coreOptions$cha;
     super.checkInitRequirements();
-    this.modalConfig = modalConfig;
-  }
-  async initModal(params) {
-    super.checkInitRequirements();
-    super.initCachedConnectorAndChainId();
     // get project config and wallet registry
     const {
       projectConfig,
       walletRegistry
-    } = await this.getProjectAndWalletConfig(params);
+    } = await this.getProjectAndWalletConfig();
     this.options.uiConfig = deepmerge(noModal.cloneDeep(projectConfig.whitelabel || {}), this.options.uiConfig || {});
     if (!this.options.uiConfig.defaultLanguage) this.options.uiConfig.defaultLanguage = utils.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.LoginModal(_objectSpread(_objectSpread({}, this.options.uiConfig), {}, {
       connectorListener: this,
-      chainNamespace: this.currentChain.chainNamespace,
-      walletRegistry
+      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: filteredWalletRegistry
     }));
     this.subscribeToLoginModalEvents();
     await this.loginModal.initModal();
-
     // setup common JRPC provider
     await this.setupCommonJRPCProvider();
-
     // initialize connectors
     this.on(noModal.CONNECTOR_EVENTS.CONNECTORS_UPDATED, ({
       connectors: newConnectors
     }) => this.initConnectors({
       connectors: newConnectors,
       projectConfig,
-      modalConfig: params
+      disabledExternalWallets
     }));
     await this.loadConnectors({
       projectConfig
     });
-
     // initialize plugins
     await this.initPlugins();
   }
@@ -82,7 +84,33 @@ class Web3Auth extends noModal.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 = noModal.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 {
@@ -92,13 +120,13 @@ class Web3Auth extends noModal.Web3AuthNoModal {
       noModal.log.error("Failed to fetch project configurations", e);
       throw noModal.WalletInitializationError.notReady("failed to fetch project configurations", e);
     }
-
     // get wallet registry
     let walletRegistry = {
       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 noModal.fetchWalletRegistry(config.walletRegistryUrl);
       } catch (e) {
@@ -113,16 +141,18 @@ class Web3Auth extends noModal.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
@@ -133,113 +163,116 @@ class Web3Auth extends noModal.Web3AuthNoModal {
         showExternalWalletsOnly: true
       });
     }
-
     // emit ready event if connector is ready
     if (this.status === noModal.CONNECTOR_STATUS.NOT_READY) {
       this.status = noModal.CONNECTOR_STATUS.READY;
       this.emit(noModal.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 = {
-        [noModal.WALLET_CONNECTORS.AUTH]: {
-          label: noModal.WALLET_CONNECTORS.AUTH,
-          loginMethods: {
-            [noModal.LOGIN_PROVIDER.SMS_PASSWORDLESS]: {
-              name: noModal.LOGIN_PROVIDER.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[noModal.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[noModal.LOGIN_PROVIDER.SMS_PASSWORDLESS]) === null || _params$modalConfig$W === void 0 ? void 0 : _params$modalConfig$W.showOnModal;
-      if (localSmsOtpEnabled === true && smsOtpEnabled === false) {
-        throw noModal.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 = {
+      [noModal.WALLET_CONNECTORS.AUTH]: {
+        label: noModal.WALLET_CONNECTORS.AUTH,
+        loginMethods
       }
-      params.modalConfig = deepmerge(connectorConfig, noModal.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[noModal.WALLET_CONNECTORS.AUTH]) {
+      if (!this.modalConfig.connectors[noModal.WALLET_CONNECTORS.AUTH].loginMethods) this.modalConfig.connectors[noModal.WALLET_CONNECTORS.AUTH].loginMethods = {};
     }
-
+    this.modalConfig.connectors = deepmerge(dashboardConnectorConfig, noModal.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[noModal.WALLET_CONNECTORS.AUTH]) !== null && _this$modalConfig3 !== void 0 && _this$modalConfig3.loginMethods) {
+      const authProviders = new Set(config$1.AUTH_PROVIDERS);
+      Object.keys(this.modalConfig.connectors[noModal.WALLET_CONNECTORS.AUTH].loginMethods).forEach(key => {
+        if (!authProviders.has(key)) {
+          throw noModal.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: noModal.CONNECTOR_NAMES[connectorName] || connectorName.split("-").map(config$1.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);
-      noModal.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);
-
-      // 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 noModal.WalletInitializationError.invalidParams(`Connector ${connectorName} is not configured`);
-      } else if ((connector === null || connector === void 0 ? void 0 : connector.type) === noModal.CONNECTOR_CATEGORY.IN_APP || (connector === null || connector === void 0 ? void 0 : connector.type) === noModal.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 === noModal.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 : {}), {}, {
-              [noModal.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[noModal.WALLET_CONNECTORS.WALLET_CONNECT_V2]) !== null && _this$modalConfig$con6 !== void 0 ? _this$modalConfig$con6 : {}), {}, {
-                showOnModal: false
-              })
-            });
-            this.modalConfig.connectors[noModal.WALLET_CONNECTORS.WALLET_CONNECT_V2].showOnModal = false;
-          }
-        }
-        return connectorName;
+      noModal.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);
+      // 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 noModal.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 === noModal.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 === noModal.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 !== noModal.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 = utils.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;
     });
     noModal.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 === noModal.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) === noModal.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 === noModal.WALLET_CONNECTORS.WALLET_CONNECT_V2) return true;
+      return ((_this$getConnector = this.getConnector(connectorName)) === null || _this$getConnector === void 0 ? void 0 : _this$getConnector.type) === noModal.CONNECTOR_CATEGORY.EXTERNAL && ((_this$modalConfig$con5 = this.modalConfig.connectors) === null || _this$modalConfig$con5 === void 0 ? void 0 : _this$modalConfig$con5[connectorName].showOnModal);
     });
     return {
       hasInAppConnectors,
@@ -253,10 +286,8 @@ class Web3Auth extends noModal.Web3AuthNoModal {
       try {
         // skip if connector is already initialized
         if (connector.status !== noModal.CONNECTOR_STATUS.NOT_READY) return;
-
         // only initialize a external connectors here if it is a cached connector.
-        if (this.cachedConnector !== connectorName && connector.type === noModal.CONNECTOR_CATEGORY.EXTERNAL) return;
-
+        if (this.cachedConnector !== connectorName && connectorName !== noModal.WALLET_CONNECTORS.METAMASK && connector.type === noModal.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.
         // external wallets are initialized on INIT_EXTERNAL_WALLET event.
@@ -266,13 +297,12 @@ class Web3Auth extends noModal.Web3AuthNoModal {
           autoConnect: this.cachedConnector === connectorName,
           chainId: initialChain.chainId
         });
-
         // note: not adding cachedWallet to modal if it is external wallet.
         // adding it later if no in-app wallets are available.
         if (connector.type === noModal.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;
           noModal.log.info("connectorInitResults", connectorName);
-          const loginMethods = utils.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) || config$1.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"
@@ -327,7 +357,14 @@ class Web3Auth extends noModal.Web3AuthNoModal {
     });
   }
   subscribeToLoginModalEvents() {
-    this.loginModal.on(interfaces.LOGIN_MODAL_EVENTS.LOGIN, async params => {
+    this.loginModal.on(interfaces.LOGIN_MODAL_EVENTS.EXTERNAL_WALLET_LOGIN, async params => {
+      try {
+        await this.connectTo(params.connector);
+      } catch (error) {
+        noModal.log.error(`Error while connecting to connector: ${params.connector}`, error);
+      }
+    });
+    this.loginModal.on(interfaces.LOGIN_MODAL_EVENTS.SOCIAL_LOGIN, async params => {
       try {
         await this.connectTo(params.connector, params.loginParams);
       } catch (error) {
@@ -353,7 +390,6 @@ class Web3Auth extends noModal.Web3AuthNoModal {
         noModal.log.debug("trying refreshing wc session", visibility, walletConnectStatus);
         if (visibility && (walletConnectStatus === noModal.CONNECTOR_STATUS.READY || walletConnectStatus === noModal.CONNECTOR_STATUS.CONNECTING)) {
           noModal.log.debug("refreshing wc session");
-
           // refreshing session for wallet connect whenever modal is opened.
           try {
             const initialChain = this.getInitialChainIdForConnector(wcConnector);

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

@@ -87,18 +87,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.cjs/packages/modal/src/ui/components/AdapterLoader.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var jsxRuntime = require('react/jsx-runtime');
 var noModal = require('@web3auth/no-modal');
 var React = require('react');
 var reactI18next = require('react-i18next');
@@ -7,9 +8,8 @@ var interfaces = require('../interfaces.js');
 var localeImport = require('../localeImport.js');
 var Icon = require('./Icon.js');
 var Image = require('./Image.js');
-var jsxRuntime = require('react/jsx-runtime');
 
-const closeIcon = /*#__PURE__*/jsxRuntime.jsx(Icon, {
+const closeIcon = jsxRuntime.jsx(Icon, {
   iconName: "x-light",
   darkIconName: "close"
 });
@@ -22,9 +22,9 @@ function DetailedLoader(props) {
     connectorName,
     onClose
   } = props;
-  const providerIcon = connector === "twitter" ? /*#__PURE__*/jsxRuntime.jsx(Image, {
+  const providerIcon = connector === "twitter" ? jsxRuntime.jsx(Image, {
     imageId: "login-x-dark"
-  }) : /*#__PURE__*/jsxRuntime.jsx(Image, {
+  }) : jsxRuntime.jsx(Image, {
     imageId: `login-${connector}`,
     height: "30",
     width: "30"
@@ -40,63 +40,63 @@ function DetailedLoader(props) {
       }, 3000);
     }
   }, [modalStatus, onClose]);
-  return modalStatus !== interfaces.MODAL_STATUS.INITIALIZED ? /*#__PURE__*/jsxRuntime.jsxs("div", {
+  return modalStatus !== interfaces.MODAL_STATUS.INITIALIZED ? jsxRuntime.jsxs("div", {
     className: "w3ajs-modal-loader w3a-modal__loader w3a--h-full",
-    children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+    children: [jsxRuntime.jsx("div", {
       className: "w3a-modal__loader-content",
-      children: /*#__PURE__*/jsxRuntime.jsxs("div", {
+      children: jsxRuntime.jsxs("div", {
         className: "w3a-modal__loader-info",
-        children: [modalStatus === interfaces.MODAL_STATUS.CONNECTING && /*#__PURE__*/jsxRuntime.jsxs(jsxRuntime.Fragment, {
-          children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
+        children: [modalStatus === interfaces.MODAL_STATUS.CONNECTING && jsxRuntime.jsxs(jsxRuntime.Fragment, {
+          children: [jsxRuntime.jsxs("div", {
             className: "w3a-modal__loader-bridge",
-            children: [/*#__PURE__*/jsxRuntime.jsxs("div", {
+            children: [jsxRuntime.jsxs("div", {
               className: "w3a-modal__loader-app-logo",
-              children: [/*#__PURE__*/jsxRuntime.jsx("img", {
+              children: [jsxRuntime.jsx("img", {
                 src: appLogo,
                 className: "w3a--block dark:w3a--hidden w3a--h-10 w3a--w-10",
                 alt: ""
-              }), /*#__PURE__*/jsxRuntime.jsx("img", {
+              }), jsxRuntime.jsx("img", {
                 src: appLogo,
                 className: "w3a--hidden dark:w3a--block w3a--h-10 w3a--w-10",
                 alt: ""
               })]
-            }), /*#__PURE__*/jsxRuntime.jsx("div", {
+            }), jsxRuntime.jsx("div", {
               className: "w3a-modal__connector",
-              children: /*#__PURE__*/jsxRuntime.jsxs("div", {
+              children: jsxRuntime.jsxs("div", {
                 className: "w3a-modal__connector-beat",
-                children: [/*#__PURE__*/jsxRuntime.jsx("div", {}), /*#__PURE__*/jsxRuntime.jsx("div", {}), /*#__PURE__*/jsxRuntime.jsx("div", {}), /*#__PURE__*/jsxRuntime.jsx("div", {}), /*#__PURE__*/jsxRuntime.jsx("div", {})]
+                children: [jsxRuntime.jsx("div", {}), jsxRuntime.jsx("div", {}), jsxRuntime.jsx("div", {}), jsxRuntime.jsx("div", {}), jsxRuntime.jsx("div", {})]
               })
-            }), /*#__PURE__*/jsxRuntime.jsx("div", {
+            }), jsxRuntime.jsx("div", {
               className: "w3a-modal__loader-social-logo",
               children: providerIcon
             })]
-          }), /*#__PURE__*/jsxRuntime.jsxs("div", {
-            children: [/*#__PURE__*/jsxRuntime.jsx("div", {
+          }), jsxRuntime.jsxs("div", {
+            children: [jsxRuntime.jsx("div", {
               className: "w3a-modal__loader-bridge-message",
               children: t("modal.adapter-loader.message1", {
                 adapter: connectorName
               })
-            }), /*#__PURE__*/jsxRuntime.jsx("div", {
+            }), jsxRuntime.jsx("div", {
               className: "w3a-modal__loader-bridge-message",
               children: t("modal.adapter-loader.message2", {
                 adapter: connectorName
               })
             })]
           })]
-        }), modalStatus === noModal.CONNECTOR_STATUS.CONNECTED && /*#__PURE__*/jsxRuntime.jsxs("div", {
+        }), modalStatus === noModal.CONNECTOR_STATUS.CONNECTED && jsxRuntime.jsxs("div", {
           className: "w3a--flex w3a--flex-col w3a--items-center",
-          children: [/*#__PURE__*/jsxRuntime.jsx(Icon, {
+          children: [jsxRuntime.jsx(Icon, {
             iconName: "connected"
-          }), /*#__PURE__*/jsxRuntime.jsx("div", {
+          }), jsxRuntime.jsx("div", {
             className: "w3ajs-modal-loader__message w3a-spinner-message w3a--mt-4",
             children: message
           })]
-        }), modalStatus === noModal.CONNECTOR_STATUS.ERRORED && /*#__PURE__*/jsxRuntime.jsx("div", {
+        }), modalStatus === noModal.CONNECTOR_STATUS.ERRORED && jsxRuntime.jsx("div", {
           className: "w3ajs-modal-loader__message w3a-spinner-message w3a-spinner-message--error",
           children: message
         })]
       })
-    }), (modalStatus === noModal.CONNECTOR_STATUS.CONNECTED || modalStatus === noModal.CONNECTOR_STATUS.ERRORED) && /*#__PURE__*/jsxRuntime.jsx("button", {
+    }), (modalStatus === noModal.CONNECTOR_STATUS.CONNECTED || modalStatus === noModal.CONNECTOR_STATUS.ERRORED) && jsxRuntime.jsx("button", {
       type: "button",
       className: "w3a-header__button w3ajs-loader-close-btn",
       onClick: onClose,

package/dist/lib.cjs/packages/modal/src/ui/components/Button/Button.js

@@ -1,8 +1,8 @@
 'use strict';
 
+var jsxRuntime = require('react/jsx-runtime');
 require('./styles.css.js');
 var React = require('react');
-var jsxRuntime = require('react/jsx-runtime');
 
 function Button(props) {
   const {
@@ -17,10 +17,9 @@ function Button(props) {
     type = "button"
   } = props;
   const sizeClass = `size-${size}`;
-  return /*#__PURE__*/jsxRuntime.jsx("button", {
-    disabled: disabled
+  return jsxRuntime.jsx("button", {
+    disabled: disabled,
     // eslint-disable-next-line react/button-has-type
-    ,
     type: type,
     className: `t-btn t-btn-${variant} w3a--rounded-full ${sizeClass} ${className}`,
     onClick: onClick,