@web3auth/no-modal 10.0.0 → 10.0.1-beta.0

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

@@ -87,28 +87,39 @@ class Analytics {
   }
 }
 const ANALYTICS_EVENTS = {
+  // SDK Initialization
   SDK_INITIALIZATION_COMPLETED: "SDK Initialization Completed",
   SDK_INITIALIZATION_FAILED: "SDK Initialization Failed",
+  // Connection
   CONNECTION_STARTED: "Connection Started",
   CONNECTION_COMPLETED: "Connection Completed",
   CONNECTION_FAILED: "Connection Failed",
+  // Identity Token
   IDENTITY_TOKEN_STARTED: "Identity Token Started",
   IDENTITY_TOKEN_COMPLETED: "Identity Token Completed",
   IDENTITY_TOKEN_FAILED: "Identity Token Failed",
+  // MFA
   MFA_ENABLEMENT_STARTED: "MFA Enablement Started",
   MFA_ENABLEMENT_COMPLETED: "MFA Enablement Completed",
   MFA_ENABLEMENT_FAILED: "MFA Enablement Failed",
   MFA_MANAGEMENT_SELECTED: "MFA Management Selected",
   MFA_MANAGEMENT_FAILED: "MFA Management Failed",
+  // Login Modal
   LOGIN_MODAL_OPENED: "Login Modal Opened",
   LOGIN_MODAL_CLOSED: "Login Modal Closed",
   SOCIAL_LOGIN_SELECTED: "Social Login Selected",
   EXTERNAL_WALLET_SELECTED: "External Wallet Selected",
-  EXTERNAL_WALLET_LIST_EXPANDED: "External Wallet List Expanded"
+  EXTERNAL_WALLET_LIST_EXPANDED: "External Wallet List Expanded",
+  // Wallet Plugin
+  WALLET_UI_CLICKED: "Wallet UI Clicked",
+  WALLET_CONNECT_SCANNER_CLICKED: "Wallet Connect Scanner Clicked",
+  WALLET_CHECKOUT_CLICKED: "Wallet Checkout Clicked",
+  WALLET_SWAP_CLICKED: "Wallet Swap Clicked"
 };
 const ANALYTICS_INTEGRATION_TYPE = {
   REACT_HOOKS: "React Hooks",
-  VUE_COMPOSABLES: "Vue Composables"
+  VUE_COMPOSABLES: "Vue Composables",
+  NATIVE_SDK: "Native SDK"
 };
 const ANALYTICS_SDK_TYPE = {
   WEB_NO_MODAL: "Web NoModal",

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.0.0";
+const sdkVersion = "10.0.1-beta.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

@@ -288,6 +288,24 @@ class AuthConnector extends baseConnector.BaseConnector {
       this.wsEmbedInstance.clearInit();
     }
   }
+  getOAuthProviderConfig(params) {
+    const {
+      authConnection,
+      authConnectionId,
+      groupedAuthConnectionId
+    } = params;
+    const providerConfig = this.authConnectionConfig.find(x => {
+      if (groupedAuthConnectionId) {
+        return x.authConnection === authConnection && x.groupedAuthConnectionId === groupedAuthConnectionId;
+      }
+      if (authConnectionId) {
+        return x.authConnection === authConnection && x.authConnectionId === authConnectionId;
+      }
+      // return the default auth connection, if not found, return undefined
+      return x.authConnection === authConnection && x.isDefault;
+    });
+    return providerConfig;
+  }
   getChain(chainId) {
     return this.coreOptions.chains.find(x => x.chainId === chainId);
   }
@@ -500,24 +518,6 @@ class AuthConnector extends baseConnector.BaseConnector {
     delete loginParams.chainId;
     return this.authInstance.postLoginInitiatedMessage(loginParams);
   }
-  getOAuthProviderConfig(params) {
-    const {
-      authConnection,
-      authConnectionId,
-      groupedAuthConnectionId
-    } = params;
-    const providerConfig = this.authConnectionConfig.find(x => {
-      if (groupedAuthConnectionId) {
-        return x.authConnection === authConnection && x.groupedAuthConnectionId === groupedAuthConnectionId;
-      }
-      if (authConnectionId) {
-        return x.authConnection === authConnection && x.authConnectionId === authConnectionId;
-      }
-      // return the default auth connection, if not found, return undefined
-      return x.authConnection === authConnection && x.isDefault;
-    });
-    return providerConfig;
-  }
 }
 const authConnector = params => {
   return ({
@@ -532,7 +532,12 @@ const authConnector = params => {
       sessionTime
     } = projectConfig;
     if (whitelist) connectorSettings.originData = whitelist.signed_urls;
-    if (sessionTime) connectorSettings.sessionTime = sessionTime;
+    // If sessionTime is provided in the coreOptions, it takes precedence over the sessionTime in the projectConfig.
+    if (coreOptions.sessionTime) {
+      connectorSettings.sessionTime = coreOptions.sessionTime;
+    } else if (sessionTime) {
+      connectorSettings.sessionTime = sessionTime;
+    }
     if ((_coreOptions$uiConfig = coreOptions.uiConfig) !== null && _coreOptions$uiConfig !== void 0 && _coreOptions$uiConfig.uxMode) connectorSettings.uxMode = coreOptions.uiConfig.uxMode;
     const uiConfig = coreOptions.uiConfig || {};
     connectorSettings.whiteLabel = uiConfig;

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

@@ -3,20 +3,19 @@
 var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var sdk = require('@metamask/sdk');
+var baseControllers = require('@toruslabs/base-controllers');
 var deepmerge = require('deepmerge');
-require('@segment/analytics-next');
-require('../../base/loglevel.js');
+var analytics = require('../../base/analytics.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
 require('@web3auth/auth');
 var index$1 = require('../../base/errors/index.js');
 var index = require('../../base/wallet/index.js');
 var constants = require('../../base/connector/constants.js');
 require('jwt-decode');
+require('../../base/loglevel.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-var baseControllers = require('@toruslabs/base-controllers');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
+var utils$1 = require('../../base/utils.js');
 var baseEvmConnector = require('../base-evm-connector/baseEvmConnector.js');
 var utils = require('../utils.js');
 
@@ -31,7 +30,9 @@ class MetaMaskConnector extends baseEvmConnector.BaseEvmConnector {
     _defineProperty(this, "metamaskProvider", null);
     _defineProperty(this, "metamaskSDK", null);
     _defineProperty(this, "metamaskOptions", void 0);
+    _defineProperty(this, "analytics", void 0);
     this.metamaskOptions = connectorOptions.connectorSettings;
+    this.analytics = connectorOptions.analytics;
   }
   get provider() {
     if (this.status !== constants.CONNECTOR_STATUS.NOT_READY && this.metamaskProvider) {
@@ -96,6 +97,19 @@ class MetaMaskConnector extends baseEvmConnector.BaseEvmConnector {
     if (!this.metamaskSDK) throw index$1.WalletLoginError.notConnectedError("Connector is not initialized");
     const chainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
     if (!chainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
+    // Skip tracking for injected MetaMask since it's handled in connectTo
+    // Skip tracking for rehydration since only new connections are tracked
+    // Only track non-injected MetaMask when connection completes since it auto-initializes to generate QR code
+    const shouldTrack = !this.isInjected && !this.rehydrated;
+    const startTime = Date.now();
+    const eventData = {
+      connector: this.name,
+      connector_type: this.type,
+      is_injected: this.isInjected,
+      chain_id: utils$1.getCaipChainId(chainConfig),
+      chain_name: chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.displayName,
+      chain_namespace: chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.chainNamespace
+    };
     try {
       if (this.status !== constants.CONNECTOR_STATUS.CONNECTING) {
         var _this$metamaskOptions;
@@ -131,6 +145,14 @@ class MetaMaskConnector extends baseEvmConnector.BaseEvmConnector {
         this.disconnect();
       });
       this.status = constants.CONNECTOR_STATUS.CONNECTED;
+      // track connection events
+      if (shouldTrack) {
+        var _this$analytics, _this$analytics2;
+        (_this$analytics = this.analytics) === null || _this$analytics === void 0 || _this$analytics.track(analytics.ANALYTICS_EVENTS.CONNECTION_STARTED, eventData);
+        (_this$analytics2 = this.analytics) === null || _this$analytics2 === void 0 || _this$analytics2.track(analytics.ANALYTICS_EVENTS.CONNECTION_COMPLETED, _objectSpread(_objectSpread({}, eventData), {}, {
+          duration: Date.now() - startTime
+        }));
+      }
       this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
         connector: index.WALLET_CONNECTORS.METAMASK,
         reconnected: this.rehydrated,
@@ -142,6 +164,14 @@ class MetaMaskConnector extends baseEvmConnector.BaseEvmConnector {
       this.status = constants.CONNECTOR_STATUS.READY;
       if (!this.rehydrated) this.emit(constants.CONNECTOR_EVENTS.ERRORED, error);
       this.rehydrated = false;
+      // track connection events
+      if (shouldTrack) {
+        var _this$analytics3, _this$analytics4;
+        (_this$analytics3 = this.analytics) === null || _this$analytics3 === void 0 || _this$analytics3.track(analytics.ANALYTICS_EVENTS.CONNECTION_STARTED, eventData);
+        (_this$analytics4 = this.analytics) === null || _this$analytics4 === void 0 || _this$analytics4.track(analytics.ANALYTICS_EVENTS.CONNECTION_FAILED, _objectSpread(_objectSpread(_objectSpread({}, eventData), baseControllers.getErrorAnalyticsProperties(error)), {}, {
+          duration: Date.now() - startTime
+        }));
+      }
       if (error instanceof index$1.Web3AuthError) throw error;
       throw index$1.WalletLoginError.connectionError("Failed to login with MetaMask wallet", error);
     }
@@ -214,11 +244,13 @@ class MetaMaskConnector extends baseEvmConnector.BaseEvmConnector {
 }
 const metaMaskConnector = params => {
   return ({
-    coreOptions
+    coreOptions,
+    analytics
   }) => {
     return new MetaMaskConnector({
       connectorSettings: params,
-      coreOptions
+      coreOptions,
+      analytics
     });
   };
 };

package/dist/lib.cjs/connectors/wallet-connect-v2-connector/walletConnectV2Connector.js

@@ -4,21 +4,20 @@ var _objectSpread = require('@babel/runtime/helpers/objectSpread2');
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
 var baseControllers = require('@toruslabs/base-controllers');
 var Client = require('@walletconnect/sign-client');
-var utils$1 = require('@walletconnect/utils');
+var utils$2 = require('@walletconnect/utils');
 var wsEmbed = require('@web3auth/ws-embed');
 var deepmerge = require('deepmerge');
-require('@segment/analytics-next');
-var loglevel = require('../../base/loglevel.js');
+var analytics = require('../../base/analytics.js');
 var IChainInterface = require('../../base/chain/IChainInterface.js');
 var baseConnector = require('../../base/connector/baseConnector.js');
 var constants = require('../../base/connector/constants.js');
 require('@web3auth/auth');
-var utils = require('../../base/connector/utils.js');
+var utils$1 = require('../../base/connector/utils.js');
 var index$1 = require('../../base/errors/index.js');
+var loglevel = require('../../base/loglevel.js');
 require('../../base/plugin/errors.js');
 require('../../base/plugin/IPlugin.js');
-require('@toruslabs/constants');
-require('@toruslabs/http-helpers');
+var utils = require('../../base/utils.js');
 var index = require('../../base/wallet/index.js');
 var config = require('./config.js');
 var WalletConnectV2Provider = require('./WalletConnectV2Provider.js');
@@ -39,6 +38,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     _defineProperty(this, "connector", null);
     _defineProperty(this, "activeSession", null);
     _defineProperty(this, "wcProvider", null);
+    _defineProperty(this, "analytics", void 0);
     this.connectorOptions = _objectSpread({}, options);
     const {
       qrcodeModal,
@@ -48,6 +48,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       connectorSettings: (_this$connectorOption = (_this$connectorOption2 = this.connectorOptions) === null || _this$connectorOption2 === void 0 ? void 0 : _this$connectorOption2.connectorSettings) !== null && _this$connectorOption !== void 0 ? _this$connectorOption : {},
       loginSettings: (_this$connectorOption3 = (_this$connectorOption4 = this.connectorOptions) === null || _this$connectorOption4 === void 0 ? void 0 : _this$connectorOption4.loginSettings) !== null && _this$connectorOption3 !== void 0 ? _this$connectorOption3 : {}
     });
+    this.analytics = options.analytics;
     if (qrcodeModal) this.connectorOptions.connectorSettings.qrcodeModal = qrcodeModal;
     if (walletConnectInitOptions) this.connectorOptions.connectorSettings.walletConnectInitOptions = _objectSpread(_objectSpread({}, (_this$connectorOption5 = this.connectorOptions.connectorSettings.walletConnectInitOptions) !== null && _this$connectorOption5 !== void 0 ? _this$connectorOption5 : {}), walletConnectInitOptions);
     const {
@@ -122,7 +123,47 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     const chainConfig = this.coreOptions.chains.find(x => x.chainId === chainId);
     if (!chainConfig) throw index$1.WalletLoginError.connectionError("Chain config is not available");
     if (!this.connector) throw index$1.WalletInitializationError.notReady("Wallet connector is not ready yet");
+    // Skip tracking for rehydration since only new connections are tracked
+    // Track when connection completes since it auto-initializes to generate QR code
+    const shouldTrack = !this.connected && !this.rehydrated;
+    const startTime = Date.now();
+    let eventData = {
+      connector: this.name,
+      connector_type: this.type,
+      is_injected: this.isInjected,
+      is_wallet_connect: true,
+      chain_id: utils.getCaipChainId(chainConfig),
+      chain_name: chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.displayName,
+      chain_namespace: chainConfig === null || chainConfig === void 0 ? void 0 : chainConfig.chainNamespace
+    };
     try {
+      const trackCompletionEvents = () => {
+        // track connection events
+        if (shouldTrack) {
+          var _this$activeSession, _this$analytics, _this$analytics2;
+          const {
+            name,
+            url,
+            redirect
+          } = ((_this$activeSession = this.activeSession) === null || _this$activeSession === void 0 || (_this$activeSession = _this$activeSession.peer) === null || _this$activeSession === void 0 ? void 0 : _this$activeSession.metadata) || {};
+          const {
+            native,
+            universal,
+            linkMode
+          } = redirect || {};
+          eventData = _objectSpread(_objectSpread({}, eventData), {}, {
+            connector: name || this.name,
+            wallet_url: url,
+            redirect_native: native,
+            redirect_universal: universal,
+            redirect_link_mode_enabled: linkMode
+          });
+          (_this$analytics = this.analytics) === null || _this$analytics === void 0 || _this$analytics.track(analytics.ANALYTICS_EVENTS.CONNECTION_STARTED, eventData);
+          (_this$analytics2 = this.analytics) === null || _this$analytics2 === void 0 || _this$analytics2.track(analytics.ANALYTICS_EVENTS.CONNECTION_COMPLETED, _objectSpread(_objectSpread({}, eventData), {}, {
+            duration: Date.now() - startTime
+          }));
+        }
+      };
       // if already connected
       if (this.connected) {
         await this.onConnectHandler({
@@ -132,7 +173,8 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       }
       if (this.status !== constants.CONNECTOR_STATUS.CONNECTING) {
         await this.createNewSession({
-          chainConfig
+          chainConfig,
+          trackCompletionEvents
         });
       }
       return this.provider;
@@ -142,6 +184,14 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       this.status = constants.CONNECTOR_STATUS.READY;
       this.rehydrated = true;
       this.emit(constants.CONNECTOR_EVENTS.ERRORED, error);
+      // track connection events
+      if (shouldTrack) {
+        var _this$analytics3, _this$analytics4;
+        (_this$analytics3 = this.analytics) === null || _this$analytics3 === void 0 || _this$analytics3.track(analytics.ANALYTICS_EVENTS.CONNECTION_STARTED, eventData);
+        (_this$analytics4 = this.analytics) === null || _this$analytics4 === void 0 || _this$analytics4.track(analytics.ANALYTICS_EVENTS.CONNECTION_FAILED, _objectSpread(_objectSpread(_objectSpread({}, eventData), baseControllers.getErrorAnalyticsProperties(error)), {}, {
+          duration: Date.now() - startTime
+        }));
+      }
       const finalError = error instanceof index$1.Web3AuthError ? error : index$1.WalletLoginError.connectionError(`Failed to login with wallet connect: ${(error === null || error === void 0 ? void 0 : error.message) || ""}`, error);
       throw finalError;
     }
@@ -166,14 +216,14 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     cleanup: false,
     sessionRemovedByWallet: false
   }) {
-    var _this$activeSession, _this$activeSession2;
+    var _this$activeSession2, _this$activeSession3;
     const {
       cleanup
     } = options;
-    if (!this.connector || !this.connected || !((_this$activeSession = this.activeSession) !== null && _this$activeSession !== void 0 && _this$activeSession.topic)) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet");
+    if (!this.connector || !this.connected || !((_this$activeSession2 = this.activeSession) !== null && _this$activeSession2 !== void 0 && _this$activeSession2.topic)) throw index$1.WalletLoginError.notConnectedError("Not connected with wallet");
     if (!options.sessionRemovedByWallet) await this.connector.disconnect({
-      topic: (_this$activeSession2 = this.activeSession) === null || _this$activeSession2 === void 0 ? void 0 : _this$activeSession2.topic,
-      reason: utils$1.getSdkError("USER_DISCONNECTED")
+      topic: (_this$activeSession3 = this.activeSession) === null || _this$activeSession3 === void 0 ? void 0 : _this$activeSession3.topic,
+      reason: utils$2.getSdkError("USER_DISCONNECTED")
     });
     this.rehydrated = false;
     if (cleanup) {
@@ -201,9 +251,9 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       method: chainNamespace === baseControllers.CHAIN_NAMESPACES.EIP155 ? wsEmbed.EVM_METHOD_TYPES.GET_ACCOUNTS : wsEmbed.SOLANA_METHOD_TYPES.GET_ACCOUNTS
     });
     if (accounts && accounts.length > 0) {
-      const existingToken = utils.getSavedToken(accounts[0], this.name);
+      const existingToken = utils$1.getSavedToken(accounts[0], this.name);
       if (existingToken) {
-        const isExpired = utils.checkIfTokenIsExpired(existingToken);
+        const isExpired = utils$1.checkIfTokenIsExpired(existingToken);
         if (!isExpired) {
           return {
             idToken: existingToken
@@ -222,7 +272,7 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       const challenge = await baseControllers.signChallenge(payload, chainNamespace);
       const signedMessage = await this._getSignedMessage(challenge, accounts, chainNamespace);
       const idToken = await baseControllers.verifySignedChallenge(chainNamespace, signedMessage, challenge, this.name, this.coreOptions.sessionTime, this.coreOptions.clientId, this.coreOptions.web3AuthNetwork);
-      utils.saveToken(accounts[0], this.name, idToken);
+      utils$1.saveToken(accounts[0], this.name, idToken);
       return {
         idToken
       };
@@ -240,10 +290,10 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     const inactivePairings = this.connector.pairing.getAll({
       active: false
     });
-    if (!utils$1.isValidArray(inactivePairings)) return;
+    if (!utils$2.isValidArray(inactivePairings)) return;
     inactivePairings.forEach(pairing => {
       if (this.connector) {
-        this.connector.pairing.delete(pairing.topic, utils$1.getSdkError("USER_DISCONNECTED"));
+        this.connector.pairing.delete(pairing.topic, utils$2.getSdkError("USER_DISCONNECTED"));
       }
     });
   }
@@ -257,21 +307,22 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
   }
   async createNewSession({
     forceNewSession = false,
-    chainConfig
+    chainConfig,
+    trackCompletionEvents
   }) {
     try {
-      var _this$activeSession3, _this$connectorOption7;
+      var _this$activeSession4, _this$connectorOption7;
       if (!this.connector) throw index$1.WalletInitializationError.notReady("Wallet connector is not ready yet");
       if (!this.connectorOptions.loginSettings || Object.keys(this.connectorOptions.loginSettings).length === 0) throw index$1.WalletInitializationError.notReady("login settings are not set yet");
       this.status = constants.CONNECTOR_STATUS.CONNECTING;
       this.emit(constants.CONNECTOR_EVENTS.CONNECTING, {
         connector: index.WALLET_CONNECTORS.WALLET_CONNECT_V2
       });
-      if (forceNewSession && (_this$activeSession3 = this.activeSession) !== null && _this$activeSession3 !== void 0 && _this$activeSession3.topic) {
-        var _this$activeSession4;
+      if (forceNewSession && (_this$activeSession4 = this.activeSession) !== null && _this$activeSession4 !== void 0 && _this$activeSession4.topic) {
+        var _this$activeSession5;
         await this.connector.disconnect({
-          topic: (_this$activeSession4 = this.activeSession) === null || _this$activeSession4 === void 0 ? void 0 : _this$activeSession4.topic,
-          reason: utils$1.getSdkError("USER_DISCONNECTED")
+          topic: (_this$activeSession5 = this.activeSession) === null || _this$activeSession5 === void 0 ? void 0 : _this$activeSession5.topic,
+          reason: utils$2.getSdkError("USER_DISCONNECTED")
         });
       }
       const {
@@ -304,7 +355,8 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
       this.activeSession = session;
       // Handle the returned session (e.g. update UI to "connected" state).
       await this.onConnectHandler({
-        chain: chainConfig
+        chain: chainConfig,
+        trackCompletionEvents
       });
       if (qrcodeModal) {
         qrcodeModal.closeModal();
@@ -332,7 +384,8 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     }
   }
   async onConnectHandler({
-    chain
+    chain,
+    trackCompletionEvents
   }) {
     var _this$connectorOption8;
     if (!this.connector || !this.wcProvider) throw index$1.WalletInitializationError.notReady("Wallet connect connector is not ready yet");
@@ -350,6 +403,8 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
     await this.wcProvider.setupProvider(this.connector);
     this.cleanupPendingPairings();
     this.status = constants.CONNECTOR_STATUS.CONNECTED;
+    // track connection events
+    if (trackCompletionEvents) trackCompletionEvents();
     this.emit(constants.CONNECTOR_EVENTS.CONNECTED, {
       connector: index.WALLET_CONNECTORS.WALLET_CONNECT_V2,
       reconnected: this.rehydrated,
@@ -394,7 +449,8 @@ class WalletConnectV2Connector extends baseConnector.BaseConnector {
 const walletConnectV2Connector = params => {
   return ({
     coreOptions,
-    projectConfig
+    projectConfig,
+    analytics
   }) => {
     var _params$walletConnect;
     const projectId = (params === null || params === void 0 || (_params$walletConnect = params.walletConnectInitOptions) === null || _params$walletConnect === void 0 ? void 0 : _params$walletConnect.projectId) || (projectConfig === null || projectConfig === void 0 ? void 0 : projectConfig.walletConnectProjectId);
@@ -405,7 +461,8 @@ const walletConnectV2Connector = params => {
     });
     return new WalletConnectV2Connector({
       connectorSettings,
-      coreOptions
+      coreOptions,
+      analytics
     });
   };
 };

package/dist/lib.cjs/noModal.js

@@ -51,6 +51,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     this.coreOptions = options;
     this.storage = this.getStorageMethod();
     this.analytics = new analytics.Analytics();
+    this.analytics.setGlobalProperties({
+      integration_type: analytics.ANALYTICS_INTEGRATION_TYPE.NATIVE_SDK
+    });
     this.loadState(initialState);
     if (this.state.idToken && this.coreOptions.ssr) {
       this.status = constants.CONNECTOR_STATUS.CONNECTED;
@@ -58,6 +61,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   }
   get currentChain() {
     var _this$coreOptions$cha;
+    if (!this.currentChainId) return undefined;
     return (_this$coreOptions$cha = this.coreOptions.chains) === null || _this$coreOptions$cha === void 0 ? void 0 : _this$coreOptions$cha.find(chain => chain.chainId === this.currentChainId);
   }
   get connected() {
@@ -76,7 +80,8 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     return this.state.cachedConnector;
   }
   get currentChainId() {
-    return this.state.currentChainId || this.coreOptions.defaultChainId || this.coreOptions.chains[0].chainId;
+    var _this$coreOptions$cha2;
+    return this.state.currentChainId || this.coreOptions.defaultChainId || ((_this$coreOptions$cha2 = this.coreOptions.chains) === null || _this$coreOptions$cha2 === void 0 || (_this$coreOptions$cha2 = _this$coreOptions$cha2[0]) === null || _this$coreOptions$cha2 === void 0 ? void 0 : _this$coreOptions$cha2.chainId) || null;
   }
   get connectedConnector() {
     var _this$currentChain;
@@ -203,12 +208,10 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     if (!newChainConfig) throw index.WalletInitializationError.invalidParams("Invalid chainId");
     if (this.status === constants.CONNECTOR_STATUS.CONNECTED && this.connectedConnector) {
       await this.connectedConnector.switchChain(params);
-      this.setCurrentChain(params.chainId);
       return;
     }
     if (this.commonJRPCProvider) {
       await this.commonJRPCProvider.switchChain(params);
-      this.setCurrentChain(params.chainId);
       return;
     }
     throw index.WalletInitializationError.notReady(`No wallet is ready`);
@@ -231,10 +234,16 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     if (connectorName === index$1.WALLET_CONNECTORS.AUTH) {
       var _connector$authInstan;
       const authLoginParams = loginParams;
+      const authConnectionConfig = connector.getOAuthProviderConfig({
+        authConnection: authLoginParams.authConnection,
+        authConnectionId: authLoginParams.authConnectionId,
+        groupedAuthConnectionId: authLoginParams.groupedAuthConnectionId
+      });
       eventData = {
         connector: connectorName,
         connector_type: connector.type,
         chain_id: utils.getCaipChainId(initialChain),
+        chain_name: initialChain.displayName,
         chain_namespace: initialChain.chainNamespace,
         auth_connection: authLoginParams.authConnection,
         auth_connection_id: authLoginParams.authConnectionId,
@@ -246,6 +255,7 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         curve: authLoginParams.curve,
         auth_dapp_url: authLoginParams.dappUrl,
         is_sfa: Boolean(authLoginParams.idToken),
+        is_default_auth_connection: authConnectionConfig === null || authConnectionConfig === void 0 ? void 0 : authConnectionConfig.isDefault,
         auth_ux_mode: (_connector$authInstan = connector.authInstance) === null || _connector$authInstan === void 0 || (_connector$authInstan = _connector$authInstan.options) === null || _connector$authInstan === void 0 ? void 0 : _connector$authInstan.uxMode
       };
     } else {
@@ -254,25 +264,37 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
         connector_type: connector.type,
         is_injected: connector.isInjected,
         chain_id: utils.getCaipChainId(initialChain),
+        chain_name: initialChain.displayName,
         chain_namespace: initialChain.chainNamespace
       };
     }
+    // track connection started event
     this.analytics.track(analytics.ANALYTICS_EVENTS.CONNECTION_STARTED, eventData);
     return new Promise((resolve, reject) => {
-      this.once(constants.CONNECTOR_EVENTS.CONNECTED, async _ => {
+      const cleanup = () => {
+        this.off(constants.CONNECTOR_EVENTS.CONNECTED, onConnected);
+        this.off(constants.CONNECTOR_EVENTS.ERRORED, onErrored);
+      };
+      const onConnected = async () => {
         // track connection completed event
+        const userInfo = await connector.getUserInfo();
         this.analytics.track(analytics.ANALYTICS_EVENTS.CONNECTION_COMPLETED, _objectSpread(_objectSpread({}, eventData), {}, {
+          is_mfa_enabled: userInfo === null || userInfo === void 0 ? void 0 : userInfo.isMfaEnabled,
           duration: Date.now() - startTime
         }));
+        cleanup();
         resolve(this.provider);
-      });
-      this.once(constants.CONNECTOR_EVENTS.ERRORED, async err => {
+      };
+      const onErrored = async err => {
         // track connection failed event
         this.analytics.track(analytics.ANALYTICS_EVENTS.CONNECTION_FAILED, _objectSpread(_objectSpread(_objectSpread({}, eventData), utils.getErrorAnalyticsProperties(err)), {}, {
           duration: Date.now() - startTime
         }));
+        cleanup();
         reject(err);
-      });
+      };
+      this.once(constants.CONNECTOR_EVENTS.CONNECTED, onConnected);
+      this.once(constants.CONNECTOR_EVENTS.ERRORED, onErrored);
       connector.connect(finalLoginParams);
       this.setCurrentChain(initialChain.chainId);
     });
@@ -500,13 +522,15 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   }
   getInitializationTrackData() {
     try {
-      var _this$coreOptions$cha2, _this$coreOptions$cha3, _this$coreOptions$cha4, _this$coreOptions$uiC2;
-      const defaultChain = (_this$coreOptions$cha2 = this.coreOptions.chains) === null || _this$coreOptions$cha2 === void 0 ? void 0 : _this$coreOptions$cha2.find(chain => chain.chainId === this.coreOptions.defaultChainId);
-      const rpcHostnames = Array.from(new Set((_this$coreOptions$cha3 = this.coreOptions.chains) === null || _this$coreOptions$cha3 === void 0 ? void 0 : _this$coreOptions$cha3.map(chain => utils.getHostname(chain.rpcTarget)))).filter(Boolean);
+      var _this$coreOptions$cha3, _this$coreOptions$cha4, _this$coreOptions$cha5, _this$coreOptions$cha6, _this$coreOptions$uiC2;
+      const defaultChain = (_this$coreOptions$cha3 = this.coreOptions.chains) === null || _this$coreOptions$cha3 === void 0 ? void 0 : _this$coreOptions$cha3.find(chain => chain.chainId === this.coreOptions.defaultChainId);
+      const rpcHostnames = Array.from(new Set((_this$coreOptions$cha4 = this.coreOptions.chains) === null || _this$coreOptions$cha4 === void 0 ? void 0 : _this$coreOptions$cha4.map(chain => utils.getHostname(chain.rpcTarget)))).filter(Boolean);
       return _objectSpread(_objectSpread(_objectSpread({
-        chain_ids: (_this$coreOptions$cha4 = this.coreOptions.chains) === null || _this$coreOptions$cha4 === void 0 ? void 0 : _this$coreOptions$cha4.map(chain => utils.getCaipChainId(chain)),
+        chain_ids: (_this$coreOptions$cha5 = this.coreOptions.chains) === null || _this$coreOptions$cha5 === void 0 ? void 0 : _this$coreOptions$cha5.map(chain => utils.getCaipChainId(chain)),
+        chain_names: (_this$coreOptions$cha6 = this.coreOptions.chains) === null || _this$coreOptions$cha6 === void 0 ? void 0 : _this$coreOptions$cha6.map(chain => chain.displayName),
         chain_rpc_targets: rpcHostnames,
         default_chain_id: defaultChain ? utils.getCaipChainId(defaultChain) : undefined,
+        default_chain_name: defaultChain === null || defaultChain === void 0 ? void 0 : defaultChain.displayName,
         logging_enabled: this.coreOptions.enableLogging,
         storage_type: this.coreOptions.storageType,
         session_time: this.coreOptions.sessionTime,
@@ -537,8 +561,9 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     this.subscribeToConnectorEvents(connector);
     try {
       const initialChain = this.getInitialChainIdForConnector(connector);
+      const autoConnect = this.checkIfAutoConnect(connector);
       await connector.init({
-        autoConnect: this.cachedConnector === connector.name,
+        autoConnect,
         chainId: initialChain.chainId
       });
     } catch (e) {
@@ -554,7 +579,8 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
     const connectorFns = [...(this.coreOptions.connectors || []), authConnector.authConnector()];
     const config = {
       projectConfig,
-      coreOptions: this.coreOptions
+      coreOptions: this.coreOptions,
+      analytics: this.analytics
     };
     // add injected connectors
     const isExternalWalletEnabled = Boolean(projectConfig.externalWalletAuth);
@@ -775,6 +801,14 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   checkInitRequirements() {
     if (this.status === constants.CONNECTOR_STATUS.READY) throw index.WalletInitializationError.notReady("Connector is already initialized");
   }
+  checkIfAutoConnect(connector) {
+    var _this$currentChain5;
+    let autoConnect = this.cachedConnector === connector.name;
+    if (autoConnect && (_this$currentChain5 = this.currentChain) !== null && _this$currentChain5 !== void 0 && _this$currentChain5.chainNamespace) {
+      if (connector.connectorNamespace === IChainInterface.CONNECTOR_NAMESPACES.MULTICHAIN) autoConnect = true;else autoConnect = connector.connectorNamespace === this.currentChain.chainNamespace;
+    }
+    return autoConnect;
+  }
   /**
    * Gets the initial chain configuration for a connector
    * @throws WalletInitializationError If no chain is found for the connector's namespace
@@ -804,14 +838,14 @@ class Web3AuthNoModal extends auth.SafeEventEmitter {
   connectToPlugins(data) {
     Object.values(this.plugins).map(async plugin => {
       try {
-        var _this$currentChain5;
+        var _this$currentChain6;
         // skip if it's not compatible with the connector
         if (!plugin.SUPPORTED_CONNECTORS.includes(data.connector)) return;
         // skip if it's not compatible with the current chain
-        if (plugin.pluginNamespace !== IPlugin.PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== ((_this$currentChain5 = this.currentChain) === null || _this$currentChain5 === void 0 ? void 0 : _this$currentChain5.chainNamespace)) return;
+        if (plugin.pluginNamespace !== IPlugin.PLUGIN_NAMESPACES.MULTICHAIN && plugin.pluginNamespace !== ((_this$currentChain6 = this.currentChain) === null || _this$currentChain6 === void 0 ? void 0 : _this$currentChain6.chainNamespace)) return;
         // skip if it's already connected
         if (plugin.status === IPlugin.PLUGIN_STATUS.CONNECTED) return;
-        await plugin.initWithWeb3Auth(this, this.coreOptions.uiConfig);
+        await plugin.initWithWeb3Auth(this, this.coreOptions.uiConfig, this.analytics);
         await plugin.connect();
       } catch (error) {
         // swallow error if connector connector doesn't supports this plugin.