@web3auth/no-modal 10.9.0-alpha.0 → 10.10.0

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

@@ -129,7 +129,7 @@ const getAaAnalyticsProperties = accountAbstractionConfig => {
   };
 };
 const getWalletServicesAnalyticsProperties = walletServicesConfig => {
-  var _walletServicesConfig, _walletServicesConfig2, _walletServicesConfig3, _walletServicesConfig4, _walletServicesConfig5, _walletServicesConfig6, _walletServicesConfig7, _walletServicesConfig8, _walletServicesConfig9, _walletServicesConfig0, _walletServicesConfig1;
+  var _walletServicesConfig, _walletServicesConfig2, _walletServicesConfig3, _walletServicesConfig4, _walletServicesConfig5, _walletServicesConfig6, _walletServicesConfig7, _walletServicesConfig8, _walletServicesConfig9, _walletServicesConfig0, _walletServicesConfig1, _walletServicesConfig10;
   return {
     ws_confirmation_strategy: walletServicesConfig === null || walletServicesConfig === void 0 ? void 0 : walletServicesConfig.confirmationStrategy,
     ws_enable_key_export: walletServicesConfig === null || walletServicesConfig === void 0 ? void 0 : walletServicesConfig.enableKeyExport,
@@ -143,10 +143,11 @@ const getWalletServicesAnalyticsProperties = walletServicesConfig => {
     ws_hide_swap: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig8 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig8 === void 0 ? void 0 : _walletServicesConfig8.hideSwap,
     ws_hide_show_all_tokens: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig9 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig9 === void 0 ? void 0 : _walletServicesConfig9.hideShowAllTokens,
     ws_hide_wallet_connect: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig0 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig0 === void 0 ? void 0 : _walletServicesConfig0.hideWalletConnect,
-    ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig1 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig1 === void 0 ? void 0 : _walletServicesConfig1.defaultPortfolio
+    ws_hide_defi_positions_display: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig1 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig1 === void 0 ? void 0 : _walletServicesConfig1.hideDefiPositionsDisplay,
+    ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig10 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig10 === void 0 ? void 0 : _walletServicesConfig10.defaultPortfolio
   };
 };
-const sdkVersion = "10.9.0-alpha.0";
+const sdkVersion = "10.10.0";
 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/auth-connector/authConnector.js

@@ -147,7 +147,7 @@ class AuthConnector extends baseConnector.BaseConnector {
         this.rehydrated = true;
         await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
       } else if (!sessionId && options.autoConnect) {
         // if here, this means that the connector is cached but the sessionId is not available.

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

@@ -66,7 +66,7 @@ class CoinbaseConnector extends baseEvmConnector.BaseEvmConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         // the connect function could fail silently as well.
         if (!provider) {
@@ -148,12 +148,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/injected-evm-connector/injectedEvmConnector.js

@@ -54,7 +54,7 @@ class InjectedEvmConnector extends baseEvmConnector.BaseEvmConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         if (!provider) {
           this.rehydrated = false;

package/dist/lib.cjs/connectors/injected-solana-connector/walletStandardConnector.js

@@ -70,7 +70,7 @@ class WalletStandardConnector extends baseSolanaConnector.BaseSolanaConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         if (!provider) {
           this.rehydrated = false;

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

@@ -80,7 +80,7 @@ class MetaMaskConnector extends baseEvmConnector.BaseEvmConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         if (!provider) {
           this.rehydrated = false;
@@ -216,7 +216,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/connectors/wallet-connect-v2-connector/walletConnectV2Connector.js

@@ -106,7 +106,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
         try {
           await this.onConnectHandler({
             chain: chainConfig,
-            getIdentityToken: false
+            getIdentityToken: options.getIdentityToken
           });
         } catch (error) {
           loglevel.log.error("wallet auto connect", error);
@@ -171,7 +171,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       if (this.connected) {
         await this.onConnectHandler({
           chain: chainConfig,
-          getIdentityToken: false
+          getIdentityToken
         });
         return this.provider;
       }

package/dist/lib.cjs/noModal.js

@@ -348,6 +348,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     cleanup: false
   }) {
     if (!connectorStatus.CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw index.WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (this.connectedConnector.status === constants.CONNECTOR_STATUS.DISCONNECTING) return;
     await this.connectedConnector.disconnect(options);
   }
   async getUserInfo() {
@@ -544,6 +545,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       enableReceiveButton = true,
       enableShowAllTokensButton = true,
       enableConfirmationModal = false,
+      enableDefiPositionsDisplay = true,
       portfolioWidgetPosition = baseControllers.BUTTON_POSITION.BOTTOM_LEFT,
       defaultPortfolio = "token"
     } = walletUi || {};
@@ -557,6 +559,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       hideSwap: !enableSwapButton,
       hideShowAllTokens: !enableShowAllTokensButton,
       hideWalletConnect: !enableWalletConnect,
+      hideDefiPositionsDisplay: !enableDefiPositionsDisplay,
       buttonPosition: portfolioWidgetPosition,
       defaultPortfolio
     };
@@ -613,7 +616,8 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
       const autoConnect = this.checkIfAutoConnect(connector);
       await connector.init({
         autoConnect,
-        chainId: initialChain.chainId
+        chainId: initialChain.chainId,
+        getIdentityToken: this.coreOptions.initialAuthenticationMode === constants.CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN
       });
     } catch (e) {
       loglevel.log.error(e, connector.name);
@@ -635,9 +639,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));
@@ -673,13 +677,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.cjs/types/base/connector/interfaces.d.ts

@@ -19,6 +19,10 @@ export interface ConnectorInitOptions {
      * The chainId to connect to
      */
     chainId: string;
+    /**
+     * Whether to get the identity token
+     */
+    getIdentityToken?: boolean;
 }
 export type CONNECTOR_STATUS_TYPE = (typeof CONNECTOR_STATUS)[keyof typeof CONNECTOR_STATUS];
 export type IdentityTokenInfo = {

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

@@ -45,8 +45,9 @@ export interface WalletUiConfig {
     enableSendButton?: boolean;
     enableSwapButton?: boolean;
     enableReceiveButton?: boolean;
+    enableDefiPositionsDisplay?: boolean;
     portfolioWidgetPosition?: BUTTON_POSITION_TYPE;
-    defaultPortfolio?: "token" | "nft";
+    defaultPortfolio?: "token" | "nft" | "defi";
 }
 export type ModalSignInMethodType = (typeof MODAL_SIGN_IN_METHODS)[keyof typeof MODAL_SIGN_IN_METHODS];
 export type WidgetType = (typeof WIDGET_TYPE)[keyof typeof WIDGET_TYPE];

package/dist/lib.cjs/types/base/utils.d.ts

@@ -56,7 +56,8 @@ export declare const getWalletServicesAnalyticsProperties: (walletServicesConfig
     ws_hide_swap: boolean;
     ws_hide_show_all_tokens: boolean;
     ws_hide_wallet_connect: boolean;
-    ws_default_portfolio: "token" | "nft";
+    ws_hide_defi_positions_display: boolean;
+    ws_default_portfolio: "token" | "nft" | "defi";
 };
 export declare const sdkVersion: string;
 export declare const getErrorAnalyticsProperties: (error: unknown) => {

package/dist/lib.cjs/vue/WalletServicesInnerProvider.js

@@ -42,7 +42,7 @@ const WalletServicesInnerProvider = vue.defineComponent({
       if (newIsConnected) {
         var _walletServicesPlugin;
         const plugin = getPlugin(IPlugin.EVM_PLUGINS.WALLET_SERVICES);
-        if (!walletServicesPlugin.value) walletServicesPlugin.value = plugin;
+        walletServicesPlugin.value = plugin;
         // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
         if (((_walletServicesPlugin = walletServicesPlugin.value) === null || _walletServicesPlugin === void 0 ? void 0 : _walletServicesPlugin.status) === constants.CONNECTOR_STATUS.CONNECTED) ready.value = true;
       }

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

@@ -128,7 +128,7 @@ const getAaAnalyticsProperties = accountAbstractionConfig => {
   };
 };
 const getWalletServicesAnalyticsProperties = walletServicesConfig => {
-  var _walletServicesConfig, _walletServicesConfig2, _walletServicesConfig3, _walletServicesConfig4, _walletServicesConfig5, _walletServicesConfig6, _walletServicesConfig7, _walletServicesConfig8, _walletServicesConfig9, _walletServicesConfig0, _walletServicesConfig1;
+  var _walletServicesConfig, _walletServicesConfig2, _walletServicesConfig3, _walletServicesConfig4, _walletServicesConfig5, _walletServicesConfig6, _walletServicesConfig7, _walletServicesConfig8, _walletServicesConfig9, _walletServicesConfig0, _walletServicesConfig1, _walletServicesConfig10;
   return {
     ws_confirmation_strategy: walletServicesConfig === null || walletServicesConfig === void 0 ? void 0 : walletServicesConfig.confirmationStrategy,
     ws_enable_key_export: walletServicesConfig === null || walletServicesConfig === void 0 ? void 0 : walletServicesConfig.enableKeyExport,
@@ -142,10 +142,11 @@ const getWalletServicesAnalyticsProperties = walletServicesConfig => {
     ws_hide_swap: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig8 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig8 === void 0 ? void 0 : _walletServicesConfig8.hideSwap,
     ws_hide_show_all_tokens: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig9 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig9 === void 0 ? void 0 : _walletServicesConfig9.hideShowAllTokens,
     ws_hide_wallet_connect: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig0 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig0 === void 0 ? void 0 : _walletServicesConfig0.hideWalletConnect,
-    ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig1 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig1 === void 0 ? void 0 : _walletServicesConfig1.defaultPortfolio
+    ws_hide_defi_positions_display: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig1 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig1 === void 0 ? void 0 : _walletServicesConfig1.hideDefiPositionsDisplay,
+    ws_default_portfolio: walletServicesConfig === null || walletServicesConfig === void 0 || (_walletServicesConfig10 = walletServicesConfig.whiteLabel) === null || _walletServicesConfig10 === void 0 ? void 0 : _walletServicesConfig10.defaultPortfolio
   };
 };
-const sdkVersion = "10.9.0-alpha.0";
+const sdkVersion = "10.10.0";
 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/auth-connector/authConnector.js

@@ -144,7 +144,7 @@ class AuthConnector extends BaseConnector {
         this.rehydrated = true;
         await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
       } else if (!sessionId && options.autoConnect) {
         // if here, this means that the connector is cached but the sessionId is not available.

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

@@ -55,7 +55,7 @@ class CoinbaseConnector extends BaseEvmConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         // the connect function could fail silently as well.
         if (!provider) {
@@ -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/injected-evm-connector/injectedEvmConnector.js

@@ -44,7 +44,7 @@ class InjectedEvmConnector extends BaseEvmConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         if (!provider) {
           this.rehydrated = false;

package/dist/lib.esm/connectors/injected-solana-connector/walletStandardConnector.js

@@ -58,7 +58,7 @@ class WalletStandardConnector extends BaseSolanaConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         if (!provider) {
           this.rehydrated = false;

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

@@ -74,7 +74,7 @@ class MetaMaskConnector extends BaseEvmConnector {
         this.rehydrated = true;
         const provider = await this.connect({
           chainId: options.chainId,
-          getIdentityToken: false
+          getIdentityToken: options.getIdentityToken
         });
         if (!provider) {
           this.rehydrated = false;
@@ -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/connectors/wallet-connect-v2-connector/walletConnectV2Connector.js

@@ -100,7 +100,7 @@ class WalletConnectV2Connector extends BaseConnector {
         try {
           await this.onConnectHandler({
             chain: chainConfig,
-            getIdentityToken: false
+            getIdentityToken: options.getIdentityToken
           });
         } catch (error) {
           log.error("wallet auto connect", error);
@@ -167,7 +167,7 @@ class WalletConnectV2Connector extends BaseConnector {
       if (this.connected) {
         await this.onConnectHandler({
           chain: chainConfig,
-          getIdentityToken: false
+          getIdentityToken
         });
         return this.provider;
       }

package/dist/lib.esm/noModal.js

@@ -12,9 +12,9 @@ import { CONNECTOR_STATUS, CONNECTOR_INITIAL_AUTHENTICATION_MODE, CONNECTOR_EVEN
 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 { WalletInitializationError, WalletLoginError } from './base/errors/index.js';
 import { log } from './base/loglevel.js';
 import { WALLET_CONNECTORS } from './base/wallet/index.js';
@@ -353,6 +353,7 @@ class Web3AuthNoModal extends SafeEventEmitter {
     cleanup: false
   }) {
     if (!CONNECTED_STATUSES.includes(this.status) || !this.connectedConnector) throw WalletLoginError.notConnectedError(`No wallet is connected`);
+    if (this.connectedConnector.status === CONNECTOR_STATUS.DISCONNECTING) return;
     await this.connectedConnector.disconnect(options);
   }
   async getUserInfo() {
@@ -553,6 +554,7 @@ class Web3AuthNoModal extends SafeEventEmitter {
       enableReceiveButton = true,
       enableShowAllTokensButton = true,
       enableConfirmationModal = false,
+      enableDefiPositionsDisplay = true,
       portfolioWidgetPosition = BUTTON_POSITION.BOTTOM_LEFT,
       defaultPortfolio = "token"
     } = walletUi || {};
@@ -566,6 +568,7 @@ class Web3AuthNoModal extends SafeEventEmitter {
       hideSwap: !enableSwapButton,
       hideShowAllTokens: !enableShowAllTokensButton,
       hideWalletConnect: !enableWalletConnect,
+      hideDefiPositionsDisplay: !enableDefiPositionsDisplay,
       buttonPosition: portfolioWidgetPosition,
       defaultPortfolio
     };
@@ -623,7 +626,8 @@ class Web3AuthNoModal extends SafeEventEmitter {
       const autoConnect = this.checkIfAutoConnect(connector);
       await connector.init({
         autoConnect,
-        chainId: initialChain.chainId
+        chainId: initialChain.chainId,
+        getIdentityToken: this.coreOptions.initialAuthenticationMode === CONNECTOR_INITIAL_AUTHENTICATION_MODE.CONNECT_AND_SIGN
       });
     } catch (e) {
       log.error(e, connector.name);
@@ -647,9 +651,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));
@@ -686,14 +690,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 {

package/dist/lib.esm/vue/WalletServicesInnerProvider.js

@@ -28,7 +28,7 @@ const WalletServicesInnerProvider = defineComponent({
       if (newIsConnected) {
         var _walletServicesPlugin;
         const plugin = getPlugin(EVM_PLUGINS.WALLET_SERVICES);
-        if (!walletServicesPlugin.value) walletServicesPlugin.value = plugin;
+        walletServicesPlugin.value = plugin;
         // when rehydrating, the connectedListener may be registered after the connected event is emitted, we need to check the status here
         if (((_walletServicesPlugin = walletServicesPlugin.value) === null || _walletServicesPlugin === void 0 ? void 0 : _walletServicesPlugin.status) === CONNECTOR_STATUS.CONNECTED) ready.value = true;
       }