@web3auth/no-modal 10.8.0 → 10.8.2

package/dist/lib.cjs/base/utils.js

@@ -145,7 +145,7 @@ const getWalletServicesAnalyticsProperties = walletServicesConfig => {
     ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig1 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig1 === void 0 ? void 0 : _walletServicesConfig1.defaultPortfolio
   };
 };
-const sdkVersion = "10.8.0";
+const sdkVersion = "10.8.2";
 const getErrorAnalyticsProperties = error => {
   try {
     const code = error instanceof index.Web3AuthError ? error.code : error === null || error === void 0 ? void 0 : error.code;

package/dist/lib.cjs/connectors/coinbase-connector/coinbaseConnector.js

@@ -147,12 +147,37 @@ class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
   }
   async switchChain(params, init = false) {
     super.checkSwitchChainRequirements(params, init);
-    await this.coinbaseProvider.request({
-      method: "wallet_switchEthereumChain",
-      params: [{
-        chainId: params.chainId
-      }]
-    });
+    try {
+      await this.coinbaseProvider.request({
+        method: "wallet_switchEthereumChain",
+        params: [{
+          chainId: params.chainId
+        }]
+      });
+    } catch (switchError) {
+      // 4902 indicates that the client does not recognize the Harmony One network
+      if (switchError.code === 4902) {
+        const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId);
+        if (!chainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
+        await this.coinbaseProvider.request({
+          method: "wallet_addEthereumChain",
+          params: [{
+            chainId: chainConfig.chainId,
+            rpcUrls: [chainConfig.rpcTarget],
+            chainName: chainConfig.displayName,
+            nativeCurrency: {
+              name: chainConfig.tickerName,
+              symbol: chainConfig.ticker,
+              decimals: chainConfig.decimals || 18
+            },
+            blockExplorerUrls: [chainConfig.blockExplorerUrl],
+            iconUrls: [chainConfig.logo]
+          }]
+        });
+        return;
+      }
+      throw switchError;
+    }
   }
   async enableMFA() {
     throw new Error("Method Not implemented");

package/dist/lib.cjs/connectors/metamask-connector/metamaskConnector.js

@@ -215,7 +215,7 @@ class MetaMaskConnector extends baseEvmConnector.BaseEvmConnector {
     } catch (error) {
       // If the error code is 4902, the network needs to be added
       if ((error === null || error === void 0 ? void 0 : error.code) === 4902) {
-        const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId && [baseControllers.CHAIN_NAMESPACES.EIP155, baseControllers.CHAIN_NAMESPACES.SOLANA].includes(x.chainNamespace));
+        const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId && [baseControllers.CHAIN_NAMESPACES.EIP155].includes(x.chainNamespace));
         await this.addChain(chainConfig);
         await requestSwitchChain();
       } else {

package/dist/lib.cjs/noModal.js

@@ -597,9 +597,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     const isExternalWalletEnabled = Boolean(projectConfig.externalWalletAuth);
     const isMipdEnabled = isExternalWalletEnabled && ((_this$coreOptions$mul = this.coreOptions.multiInjectedProviderDiscovery) !== null && _this$coreOptions$mul !== void 0 ? _this$coreOptions$mul : true);
     const chainNamespaces = new Set(this.coreOptions.chains.map(chain => chain.chainNamespace));
-    // it's safe to add it here as if there is a MetaMask injected provider, this won't override it
-    // only set headless to true if modal SDK is used, otherwise just use the modal from native Metamask SDK
-    if (utils.isBrowser() && chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155) && !chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.SOLANA)) {
+    // prioritize using MM connector over injected connector for EVM chains
+    if (utils.isBrowser() && chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155)) {
+      // only set headless to true if modal SDK is used, otherwise just use the modal from native Metamask SDK
       connectorFns.push(metamaskConnector.metaMaskConnector(modalMode ? {
         headless: true
       } : undefined));
@@ -635,13 +635,6 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         connectorFns.push(...evmMipd.getProviders().map(injectedEvmConnector));
       }
     }
-    // it's safe to add it here as if there is a MetaMask injected provider, this won't override it
-    // only set headless to true if modal SDK is used, otherwise just use the modal from native Metamask SDK
-    if (utils.isBrowser() && (chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155))) {
-      connectorFns.push(metamaskConnector.metaMaskConnector(modalMode ? {
-        headless: true
-      } : undefined));
-    }
     // add WalletConnectV2 connector if external wallets are enabled
     if (utils.isBrowser() && isExternalWalletEnabled && (chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(baseControllers.CHAIN_NAMESPACES.EIP155))) {
       const {

package/dist/lib.esm/base/utils.js

@@ -145,7 +145,7 @@ const getWalletServicesAnalyticsProperties = walletServicesConfig => {
     ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig1 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig1 === void 0 ? void 0 : _walletServicesConfig1.defaultPortfolio
   };
 };
-const sdkVersion = "10.8.0";
+const sdkVersion = "10.8.2";
 const getErrorAnalyticsProperties = error => {
   try {
     const code = error instanceof Web3AuthError ? error.code : error === null || error === void 0 ? void 0 : error.code;

package/dist/lib.esm/connectors/coinbase-connector/coinbaseConnector.js

@@ -137,12 +137,37 @@ class CoinbaseConnector extends BaseEvmConnector {
   }
   async switchChain(params, init = false) {
     super.checkSwitchChainRequirements(params, init);
-    await this.coinbaseProvider.request({
-      method: "wallet_switchEthereumChain",
-      params: [{
-        chainId: params.chainId
-      }]
-    });
+    try {
+      await this.coinbaseProvider.request({
+        method: "wallet_switchEthereumChain",
+        params: [{
+          chainId: params.chainId
+        }]
+      });
+    } catch (switchError) {
+      // 4902 indicates that the client does not recognize the Harmony One network
+      if (switchError.code === 4902) {
+        const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId);
+        if (!chainConfig) throw WalletLoginError.connectionError("Chain config is not available");
+        await this.coinbaseProvider.request({
+          method: "wallet_addEthereumChain",
+          params: [{
+            chainId: chainConfig.chainId,
+            rpcUrls: [chainConfig.rpcTarget],
+            chainName: chainConfig.displayName,
+            nativeCurrency: {
+              name: chainConfig.tickerName,
+              symbol: chainConfig.ticker,
+              decimals: chainConfig.decimals || 18
+            },
+            blockExplorerUrls: [chainConfig.blockExplorerUrl],
+            iconUrls: [chainConfig.logo]
+          }]
+        });
+        return;
+      }
+      throw switchError;
+    }
   }
   async enableMFA() {
     throw new Error("Method Not implemented");

package/dist/lib.esm/connectors/metamask-connector/metamaskConnector.js

@@ -215,7 +215,7 @@ class MetaMaskConnector extends BaseEvmConnector {
     } catch (error) {
       // If the error code is 4902, the network needs to be added
       if ((error === null || error === void 0 ? void 0 : error.code) === 4902) {
-        const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId && [CHAIN_NAMESPACES.EIP155, CHAIN_NAMESPACES.SOLANA].includes(x.chainNamespace));
+        const chainConfig = this.coreOptions.chains.find(x => x.chainId === params.chainId && [CHAIN_NAMESPACES.EIP155].includes(x.chainNamespace));
         await this.addChain(chainConfig);
         await requestSwitchChain();
       } else {

package/dist/lib.esm/noModal.js

@@ -11,9 +11,9 @@ import { Analytics, ANALYTICS_INTEGRATION_TYPE, ANALYTICS_SDK_TYPE, ANALYTICS_EV
 import { sdkVersion, fetchProjectConfig, withAbort, getErrorAnalyticsProperties, getCaipChainId, isHexStrict, getHostname, getWhitelabelAnalyticsProperties, getAaAnalyticsProperties, getWalletServicesAnalyticsProperties, isBrowser } from './base/utils.js';
 import { CommonJRPCProvider } from './providers/base-provider/CommonJRPCProvider.js';
 import { authConnector } from './connectors/auth-connector/authConnector.js';
-import { metaMaskConnector } from './connectors/metamask-connector/metamaskConnector.js';
 import { walletServicesPlugin } from './plugins/wallet-services-plugin/plugin.js';
 import { storageAvailable } from './base/connector/utils.js';
+import { metaMaskConnector } from './connectors/metamask-connector/metamaskConnector.js';
 import { CONNECTOR_STATUS, CONNECTOR_EVENTS } from './base/connector/constants.js';
 import { WalletInitializationError, WalletLoginError } from './base/errors/index.js';
 import { log } from './base/loglevel.js';
@@ -609,9 +609,9 @@ class Web3AuthNoModal extends SafeEventEmitter {
     const isMipdEnabled = isExternalWalletEnabled && ((_this$coreOptions$mul = this.coreOptions.multiInjectedProviderDiscovery) !== null && _this$coreOptions$mul !== void 0 ? _this$coreOptions$mul : true);
     const chainNamespaces = new Set(this.coreOptions.chains.map(chain => chain.chainNamespace));
 
-    // it's safe to add it here as if there is a MetaMask injected provider, this won't override it
-    // only set headless to true if modal SDK is used, otherwise just use the modal from native Metamask SDK
-    if (isBrowser() && chainNamespaces.has(CHAIN_NAMESPACES.EIP155) && !chainNamespaces.has(CHAIN_NAMESPACES.SOLANA)) {
+    // prioritize using MM connector over injected connector for EVM chains
+    if (isBrowser() && chainNamespaces.has(CHAIN_NAMESPACES.EIP155)) {
+      // only set headless to true if modal SDK is used, otherwise just use the modal from native Metamask SDK
       connectorFns.push(metaMaskConnector(modalMode ? {
         headless: true
       } : undefined));
@@ -648,14 +648,6 @@ class Web3AuthNoModal extends SafeEventEmitter {
       }
     }
 
-    // it's safe to add it here as if there is a MetaMask injected provider, this won't override it
-    // only set headless to true if modal SDK is used, otherwise just use the modal from native Metamask SDK
-    if (isBrowser() && (chainNamespaces.has(CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(CHAIN_NAMESPACES.EIP155))) {
-      connectorFns.push(metaMaskConnector(modalMode ? {
-        headless: true
-      } : undefined));
-    }
-
     // add WalletConnectV2 connector if external wallets are enabled
     if (isBrowser() && isExternalWalletEnabled && (chainNamespaces.has(CHAIN_NAMESPACES.SOLANA) || chainNamespaces.has(CHAIN_NAMESPACES.EIP155))) {
       const {