@tonconnect/ui 2.3.1 → 2.4.0-beta.0

package/lib/index.mjs

@@ -50,7 +50,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 var _a, _b, _c, _d, _e, _f, _g, _h;
-import { TonConnectError, isWalletInfoCurrentlyInjected, toUserFriendlyAddress, CHAIN, TonConnect, isTelegramUrl, encodeTelegramUrlParameters, WalletMissingRequiredFeaturesError, isWalletInfoRemote, checkRequiredWalletFeatures, isWalletInfoCurrentlyEmbedded, BrowserEventDispatcher, createVersionInfo, createResponseVersionEvent, createRequestVersionEvent, createConnectionStartedEvent, createConnectionCompletedEvent, createConnectionErrorEvent, createConnectionRestoringStartedEvent, createConnectionRestoringCompletedEvent, createConnectionRestoringErrorEvent, createDisconnectionEvent, createTransactionSentForSignatureEvent, createTransactionSignedEvent, createTransactionSigningFailedEvent, createDataSentForSignatureEvent, createDataSignedEvent, createDataSigningFailedEvent, WalletNotSupportFeatureError, SessionCrypto } from "@tonconnect/sdk";
+import { TonConnectError, isWalletInfoCurrentlyInjected, toUserFriendlyAddress, CHAIN, TonConnect, isTelegramUrl, decodeTelegramUrlParameters, encodeTelegramUrlParameters, WalletMissingRequiredFeaturesError, isWalletInfoRemote, checkRequiredWalletFeatures, isConnectUrl, UUIDv7, isWalletInfoCurrentlyEmbedded, createVersionInfo, createResponseVersionEvent, createRequestVersionEvent, createWalletModalOpenedEvent, createSelectedWalletEvent, createConnectionStartedEvent, createConnectionCompletedEvent, createConnectionErrorEvent, createConnectionRestoringStartedEvent, createConnectionRestoringCompletedEvent, createConnectionRestoringErrorEvent, createDisconnectionEvent, createTransactionSentForSignatureEvent, createTransactionSignedEvent, createTransactionSigningFailedEvent, createDataSentForSignatureEvent, createDataSignedEvent, createDataSigningFailedEvent, BrowserEventDispatcher, WalletNotSupportFeatureError, SessionCrypto } from "@tonconnect/sdk";
 export * from "@tonconnect/sdk";
 import UAParser from "ua-parser-js";
 import deepmerge from "deepmerge";
@@ -1717,6 +1717,7 @@ function logWarning(...args) {
   }
 }
 function openLink(href, target = "_self") {
+  setLastOpenedLink({ link: href });
   logDebug("openLink", href, target);
   window.open(href, target, "noopener noreferrer");
 }
@@ -1962,6 +1963,13 @@ const setLastSelectedWalletInfo = (walletInfo) => {
   _setLastSelectedWalletInfo(walletInfo);
 };
 const [action, setAction] = createSignal(null);
+const [lastVisibleWalletsInfo, setLastVisibleWalletsInfo] = createSignal({
+  walletsMenu: "explicit_wallet",
+  wallets: []
+});
+const [lastOpenedLink, setLastOpenedLink] = createSignal({
+  link: ""
+});
 const common$1 = { "close": "Close", "openWallet": "Open wallet", "copyLink": "Copy Link", "linkCopied": "Link Copied", "copied": "Copied", "yourWallet": "Your Wallet", "retry": "Retry", "get": "GET", "mobile": "Mobile", "browserExtension": "Browser Extension", "desktop": "Desktop" };
 const button$1 = { "connectWallet": "Connect Wallet", "dropdown": { "copy": "Copy address", "copied": "Address copied!", "disconnect": "Disconnect" } };
 const notifications$1 = { "confirm": { "header": "Open {{ name }} to confirm the transaction." }, "transactionSent": { "header": "Transaction sent", "text": "Your transaction will be processed in a few seconds." }, "transactionCanceled": { "header": "Transaction canceled", "text": "There will be no changes to your account." }, "dataSigned": { "header": "Data signed" }, "signDataCanceled": { "header": "Sign data canceled" } };
@@ -2436,6 +2444,27 @@ if (!webAppVersion) {
   const window2 = getWindow$1();
   webAppVersion = (_g = (_f = (_e = window2 == null ? void 0 : window2.Telegram) == null ? void 0 : _e.WebApp) == null ? void 0 : _f.version) != null ? _g : "6.0";
 }
+const initDataRaw = initParams == null ? void 0 : initParams.tgWebAppData;
+let telegramUser = void 0;
+try {
+  if (initDataRaw) {
+    let initData = urlParseQueryString(initDataRaw);
+    let userRaw = initData.user;
+    if (userRaw) {
+      let user = JSON.parse(userRaw);
+      if (typeof user.id === "number" && typeof user.is_premium === "boolean") {
+        telegramUser = {
+          id: user.id,
+          isPremium: user.is_premium
+        };
+      }
+    }
+  }
+} catch (e2) {
+}
+function getTgUser() {
+  return telegramUser;
+}
 function isTmaPlatform(...platforms) {
   return platforms.includes(tmaPlatform);
 }
@@ -2467,6 +2496,7 @@ function sendOpenTelegramLink(link, fallback) {
   }
   const pathFull = url.pathname + url.search;
   if (isIframe() || versionAtLeast("6.1")) {
+    setLastOpenedLink({ link: pathFull, type: "tg_link" });
     postEvent("web_app_open_tg_link", { path_full: pathFull });
   } else {
     openLinkBlank("https://t.me" + pathFull);
@@ -8711,6 +8741,10 @@ const AllWalletsListModal = (props) => {
   };
   const walletsList = () => isMobile() ? props.walletsList.filter(supportsMobile) : props.walletsList;
   const supportedWallets = () => walletsList().filter((wallet) => wallet.isSupportRequiredFeatures);
+  setLastVisibleWalletsInfo({
+    walletsMenu: "other_wallets",
+    wallets: supportedWallets()
+  });
   const unsupportedWallets = () => walletsList().filter((wallet) => !wallet.isSupportRequiredFeatures);
   return createComponent(DesktopSelectWalletModalStyled, {
     "data-tc-wallets-modal-list": "true",
@@ -9245,28 +9279,48 @@ function redirectToWallet(universalLink, deepLink, options, setOpenMethod) {
     }
   }
 }
-function addSessionIdToUniversalLink(universalLink, sessionId) {
-  if (!sessionId) {
-    return universalLink;
-  }
+function enrichUniversalLink(universalLink, params) {
+  var _a2, _b2;
   if (!isTelegramUrl(universalLink)) {
-    const newUrl2 = addQueryParameter(universalLink, "id", sessionId);
-    return newUrl2;
+    return addQueryParametersIfNotPresented(universalLink, {
+      id: params.sessionId,
+      trace_id: params.traceId
+    });
   }
   const directLink = convertToTGDirectLink(universalLink);
   const directLinkUrl = new URL(directLink);
-  if (!directLinkUrl.searchParams.has("startapp")) {
-    directLinkUrl.searchParams.append("startapp", "tonconnect");
-  }
-  const newUrl = addQueryParameter(directLinkUrl.toString(), "id", sessionId);
-  const lastParam = newUrl.slice(newUrl.lastIndexOf("&") + 1);
-  return newUrl.slice(0, newUrl.lastIndexOf("&")) + "-v__2-" + encodeTelegramUrlParameters(lastParam);
+  const previousStartApp = decodeTelegramUrlParameters(
+    (_a2 = directLinkUrl.searchParams.get("startapp")) != null ? _a2 : ""
+  );
+  let searchParams = buildSearchParams(previousStartApp);
+  const sessionId = (_b2 = params.sessionId) != null ? _b2 : searchParams.get("id");
+  const traceId = params.traceId;
+  const orderedKeys = ["tonconnect", "v", "id", "trace_id"];
+  const unorderedParams = searchParams.entries().filter(([key]) => !orderedKeys.includes(key));
+  const startApp = buildQueryParams(__spreadProps(__spreadValues({
+    tonconnect: "",
+    v: "2",
+    id: sessionId
+  }, Object.fromEntries(unorderedParams)), {
+    trace_id: traceId
+  })).replace("=&", "&");
+  directLinkUrl.searchParams.set("startapp", encodeTelegramUrlParameters(startApp));
+  return directLinkUrl.toString();
 }
 function addQueryParameter(url, key, value) {
   const parsed = new URL(url);
   parsed.searchParams.append(key, value);
   return parsed.toString();
 }
+function addQueryParametersIfNotPresented(url, params) {
+  const parsed = new URL(url);
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== void 0 && value !== null) {
+      parsed.searchParams.set(key, value);
+    }
+  }
+  return parsed.toString();
+}
 function convertToTGDirectLink(universalLink) {
   const url = new URL(universalLink);
   if (url.searchParams.has("attach")) {
@@ -9275,6 +9329,20 @@ function convertToTGDirectLink(universalLink) {
   }
   return url.toString();
 }
+function buildSearchParams(search = "") {
+  const url = new URL("https://example.com");
+  url.search = search;
+  return url.searchParams;
+}
+function buildQueryParams(params) {
+  const searchParams = buildSearchParams();
+  for (const [key, value] of Object.entries(params)) {
+    if (value !== void 0 && value !== null) {
+      searchParams.append(key, value);
+    }
+  }
+  return searchParams.toString();
+}
 function convertToTGDeepLink(directLink) {
   const parsed = new URL(directLink);
   const [, domain, appname] = parsed.pathname.split("/");
@@ -9303,11 +9371,14 @@ const DesktopConnectionModal = (props) => {
   });
   onCleanup(unsubscribe);
   const generateUniversalLink = () => {
+    var _a2;
     try {
       const universalLink2 = connector.connect({
         universalLink: props.wallet.universalLink,
         bridgeUrl: props.wallet.bridgeUrl
-      }, props.additionalRequest);
+      }, props.additionalRequest, {
+        traceId: (_a2 = props.walletsModalState) == null ? void 0 : _a2.traceId
+      });
       setUniversalLink(universalLink2);
     } catch (e2) {
     }
@@ -9361,13 +9432,16 @@ const DesktopConnectionModal = (props) => {
     });
   };
   const onClickExtension = () => {
+    var _a2;
     setConnectionErrored(null);
     setMode("extension");
     if (isWalletInfoCurrentlyInjected(props.wallet)) {
       setLastSelectedWalletInfo(props.wallet);
       connector.connect({
         jsBridgeKey: props.wallet.jsBridgeKey
-      }, props.additionalRequest);
+      }, props.additionalRequest, {
+        traceId: (_a2 = props.walletsModalState) == null ? void 0 : _a2.traceId
+      });
     }
   };
   if (supportsMobile(props.wallet)) {
@@ -10079,10 +10153,15 @@ const MobileConnectionModal = (props) => {
   }, () => {
     setConnectionErrored(null);
   });
-  const universalLink = createMemo(() => connector.connect({
-    universalLink: props.wallet.universalLink,
-    bridgeUrl: props.wallet.bridgeUrl
-  }, props.additionalRequest));
+  const universalLink = createMemo(() => {
+    var _a2;
+    return connector.connect({
+      universalLink: props.wallet.universalLink,
+      bridgeUrl: props.wallet.bridgeUrl
+    }, props.additionalRequest, {
+      traceId: (_a2 = props.walletModalState) == null ? void 0 : _a2.traceId
+    });
+  });
   const onClickTelegram = () => {
     const alwaysForceRedirect = true;
     setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
@@ -10626,7 +10705,9 @@ const MobileUniversalModal = (props) => {
   }, null);
   const getUniversalLink = () => {
     if (!universalLink()) {
-      setUniversalLink(connector.connect(walletsBridges(), props.additionalRequest));
+      setUniversalLink(connector.connect(walletsBridges(), props.additionalRequest, {
+        traceId: props.walletModalState.traceId
+      }));
     }
     return universalLink();
   };
@@ -10663,7 +10744,9 @@ const MobileUniversalModal = (props) => {
     const walletLink = connector.connect({
       bridgeUrl: atWallet.bridgeUrl,
       universalLink: atWallet.universalLink
-    }, props.additionalRequest);
+    }, props.additionalRequest, {
+      traceId: props.walletModalState.traceId
+    });
     const forceRedirect = !firstClick();
     setFirstClick(false);
     redirectToTelegram(walletLink, {
@@ -10686,6 +10769,10 @@ const MobileUniversalModal = (props) => {
   };
   const supportedWallets = createMemo(() => walletsList().filter((wallet) => wallet.isSupportRequiredFeatures), null);
   const visibleWallets = createMemo(() => supportedWallets().slice(0, 3), null);
+  setLastVisibleWalletsInfo({
+    walletsMenu: "main_screen",
+    wallets: atWalletSupportFeatures() ? [props.walletsList.find((wallet) => wallet.appName === AT_WALLET_APP_NAME), ...visibleWallets()] : visibleWallets()
+  });
   const fourWalletsItem = createMemo(() => walletsList().filter((wallet) => !visibleWallets().find((w) => w.appName === wallet.appName)).slice(0, 4), null);
   return (() => {
     var _el$ = _tmpl$2();
@@ -10916,9 +11003,15 @@ const DesktopUniversalModal = (props) => {
   setLastSelectedWalletInfo({
     openMethod: "qrcode"
   });
-  const request = createMemo(() => connector.connect(walletsBridges(), props.additionalRequest));
+  const request = createMemo(() => connector.connect(walletsBridges(), props.additionalRequest, {
+    traceId: props.walletModalState.traceId
+  }));
   const supportedWallets = createMemo(() => props.walletsList.filter((wallet) => wallet.isSupportRequiredFeatures), null);
   const visibleWallets = createMemo(() => supportedWallets().slice(0, 3), null);
+  setLastVisibleWalletsInfo({
+    walletsMenu: "main_screen",
+    wallets: visibleWallets()
+  });
   const fourWalletsItem = createMemo(() => props.walletsList.filter((wallet) => !visibleWallets().find((w) => w.appName === wallet.appName)).slice(0, 4), null);
   return createComponent(DesktopUniversalModalStyled, {
     onClick: () => setPopupOpened(false),
@@ -11513,6 +11606,9 @@ const WalletsModal = () => {
                         get component() {
                           return isMobile() ? MobileConnectionModal : DesktopConnectionModal;
                         },
+                        get walletsModalState() {
+                          return walletsModalState();
+                        },
                         get wallet() {
                           return selectedWalletInfo();
                         },
@@ -11535,6 +11631,9 @@ const WalletsModal = () => {
                           return isMobile() ? MobileUniversalModal : DesktopUniversalModal;
                         },
                         onSelect: setSelectedWalletInfo,
+                        get walletModalState() {
+                          return walletsModalState();
+                        },
                         get walletsList() {
                           return walletsList();
                         },
@@ -11625,7 +11724,10 @@ const ActionModal = (props) => {
     const returnStrategy = "returnStrategy" in currentAction ? currentAction.returnStrategy : appState.returnStrategy;
     const forceRedirect = !firstClick();
     setFirstClick(false);
-    const linkWithSessionId = addSessionIdToUniversalLink(universalLink, currentAction.sessionId);
+    const linkWithSessionId = enrichUniversalLink(universalLink, {
+      sessionId: currentAction.sessionId,
+      traceId: currentAction.traceId
+    });
     if (isTelegramUrl(universalLink)) {
       redirectToTelegram(linkWithSessionId, {
         returnStrategy,
@@ -12034,9 +12136,13 @@ const App = (props) => {
   });
 };
 const widgetController = {
-  openWalletsModal: () => void setTimeout(() => setWalletsModalState({
-    status: "opened",
-    closeReason: null
+  openWalletsModal: (options) => void setTimeout(() => setWalletsModalState((prev) => {
+    var _a2;
+    return {
+      status: "opened",
+      traceId: (_a2 = options == null ? void 0 : options.traceId) != null ? _a2 : prev == null ? void 0 : prev.traceId,
+      closeReason: null
+    };
   })),
   closeWalletsModal: (reason) => void setTimeout(() => setWalletsModalState({
     status: "closed",
@@ -12053,8 +12159,9 @@ const widgetController = {
     status: "closed",
     closeReason: reason
   })),
-  openWalletNotSupportFeatureModal: (cause) => void setTimeout(() => setWalletsModalState({
+  openWalletNotSupportFeatureModal: (cause, options) => void setTimeout(() => setWalletsModalState({
     status: "opened",
+    traceId: options.traceId,
     closeReason: null,
     type: "wallet-not-support-feature",
     requiredFeature: cause.requiredFeature
@@ -12062,6 +12169,7 @@ const widgetController = {
   setAction: (action2) => void setTimeout(() => setAction(action2)),
   clearAction: () => void setTimeout(() => setAction(null)),
   getSelectedWalletInfo: () => lastSelectedWalletInfo(),
+  getLastVisibleWallets: () => lastVisibleWalletsInfo(),
   removeSelectedWalletInfo: () => setLastSelectedWalletInfo(null),
   renderApp: (root, tonConnectUI) => render(() => createComponent(App, {
     tonConnectUI
@@ -12079,19 +12187,67 @@ class WalletsModalManager {
       this.state = state;
       this.consumers.forEach((consumer) => consumer(state));
     });
+    createEffect(
+      on(lastSelectedWalletInfo, (selectedWallet, previousWallet) => __async(this, null, function* () {
+        try {
+          const { wallets, walletsMenu } = widgetController.getLastVisibleWallets();
+          if (selectedWallet && "appName" in selectedWallet) {
+            if (previousWallet && "appName" in previousWallet && previousWallet.appName === selectedWallet.appName) {
+              return;
+            }
+            const clientId = yield this.connector.getSessionId();
+            this.tracker.trackSelectedWallet(
+              wallets.map((wallet) => wallet.name),
+              selectedWallet,
+              walletsMenu,
+              "",
+              void 0,
+              clientId,
+              this.state.traceId
+            );
+          }
+        } catch (error) {
+          logError(error);
+        }
+      }))
+    );
+    createEffect(
+      on(lastOpenedLink, (openedLink) => __async(this, null, function* () {
+        try {
+          const { wallets, walletsMenu } = widgetController.getLastVisibleWallets();
+          if (isConnectUrl(openedLink.link)) {
+            const selectedWallet = lastSelectedWalletInfo();
+            const clientId = yield this.connector.getSessionId();
+            this.tracker.trackSelectedWallet(
+              wallets.map((wallet) => wallet.name),
+              selectedWallet && "appName" in selectedWallet ? selectedWallet : null,
+              walletsMenu,
+              openedLink.link,
+              openedLink.type,
+              clientId,
+              this.state.traceId
+            );
+          }
+        } catch (error) {
+          logError(error);
+        }
+      }))
+    );
   }
   /**
    * Opens the modal window.
    */
-  open() {
+  open(options) {
     return __async(this, null, function* () {
+      var _a2;
+      const traceId = (_a2 = options == null ? void 0 : options.traceId) != null ? _a2 : UUIDv7();
       this.tracker.trackConnectionStarted();
       const walletsList = yield this.connector.getWallets();
       const embeddedWallet = walletsList.find(isWalletInfoCurrentlyEmbedded);
       if (embeddedWallet) {
-        return this.connectEmbeddedWallet(embeddedWallet);
+        return this.connectEmbeddedWallet(embeddedWallet, { traceId });
       } else {
-        return this.openWalletsModal();
+        return this.openWalletsModal({ traceId });
       }
     });
   }
@@ -12119,10 +12275,12 @@ class WalletsModalManager {
    * @param embeddedWallet - Information about the embedded wallet to connect to.
    * @internal
    */
-  connectEmbeddedWallet(embeddedWallet) {
+  connectEmbeddedWallet(embeddedWallet, options) {
     const connect = (parameters) => {
       setLastSelectedWalletInfo(embeddedWallet);
-      this.connector.connect({ jsBridgeKey: embeddedWallet.jsBridgeKey }, parameters);
+      this.connector.connect({ jsBridgeKey: embeddedWallet.jsBridgeKey }, parameters, {
+        traceId: options.traceId
+      });
     };
     const additionalRequest = appState.connectRequestParameters;
     if ((additionalRequest == null ? void 0 : additionalRequest.state) === "loading") {
@@ -12135,12 +12293,12 @@ class WalletsModalManager {
    * Opens the modal window to connect to an external wallet, and waits when modal window is opened.
    * @internal
    */
-  openWalletsModal() {
+  openWalletsModal(options) {
     return __async(this, null, function* () {
       if (isInTMA()) {
         sendExpand();
       }
-      widgetController.openWalletsModal();
+      widgetController.openWalletsModal({ traceId: options.traceId });
       return new Promise((resolve) => {
         const unsubscribe = this.onStateChange((state) => {
           const { status } = state;
@@ -12273,10 +12431,9 @@ class SingleWalletModalManager {
 }
 class TonConnectUITracker {
   constructor(options) {
-    var _a2;
     this.eventPrefix = "ton-connect-ui-";
     this.tonConnectSdkVersion = null;
-    this.eventDispatcher = (_a2 = options == null ? void 0 : options.eventDispatcher) != null ? _a2 : new BrowserEventDispatcher();
+    this.eventDispatcher = options == null ? void 0 : options.eventDispatcher;
     this.tonConnectUiVersion = options.tonConnectUiVersion;
     this.init().catch();
   }
@@ -12352,6 +12509,29 @@ class TonConnectUITracker {
     } catch (e2) {
     }
   }
+  /**
+   * Track wallet opened event.
+   * @param args
+   */
+  trackWalletModalOpened(...args) {
+    try {
+      const event = createWalletModalOpenedEvent(this.version, ...args);
+      this.dispatchUserActionEvent(event);
+    } catch (e2) {
+    }
+  }
+  /**
+   * Track wallet selected event.
+   * @param args
+   */
+  trackSelectedWallet(...args) {
+    try {
+      const event = createSelectedWalletEvent(this.version, ...args);
+      this.dispatchUserActionEvent(event);
+    } catch (e2) {
+      logError(e2);
+    }
+  }
   /**
    * Track connection init event.
    * @param args
@@ -12496,22 +12676,48 @@ class TonConnectUITracker {
     }
   }
 }
-const tonConnectUiVersion = "2.3.1";
+const tonConnectUiVersion = "2.4.0-beta.0";
+class TonConnectEnvironment {
+  constructor() {
+    this.userAgent = getUserAgent();
+  }
+  getLocale() {
+    var _a2;
+    return ((_a2 = navigator.languages) == null ? void 0 : _a2[0]) || navigator.language || "";
+  }
+  getBrowser() {
+    var _a2;
+    return (_a2 = this.userAgent.browser) != null ? _a2 : "";
+  }
+  getPlatform() {
+    var _a2;
+    return (_a2 = this.userAgent.os) != null ? _a2 : "";
+  }
+  getTelegramUser() {
+    return getTgUser();
+  }
+  getClientEnvironment() {
+    return isInTMA() ? "miniapp" : "web";
+  }
+}
 class TonConnectUI {
   // TODO: `actionsConfiguration.twaReturnUrl` is used only in `connectWallet` method, but it's not used in `sendTransaction` method, NEED TO FIX IT
   constructor(options) {
+    var _a2;
     this.walletInfoStorage = new WalletInfoStorage();
     this.preferredWalletStorage = new PreferredWalletStorage();
     this.walletInfo = null;
     this.systemThemeChangeUnsubscribe = null;
     this.connectionRestored = Promise.resolve(false);
+    let eventDispatcher = (_a2 = options == null ? void 0 : options.eventDispatcher) != null ? _a2 : new BrowserEventDispatcher();
     if (options && "connector" in options && options.connector) {
       this.connector = options.connector;
     } else if (options && "manifestUrl" in options && options.manifestUrl) {
       this.connector = new TonConnect({
         manifestUrl: options.manifestUrl,
-        eventDispatcher: options.eventDispatcher,
-        walletsRequiredFeatures: options.walletsRequiredFeatures
+        eventDispatcher,
+        walletsRequiredFeatures: options.walletsRequiredFeatures,
+        environment: new TonConnectEnvironment()
       });
     } else {
       throw new TonConnectUIError(
@@ -12519,7 +12725,7 @@ class TonConnectUI {
       );
     }
     this.tracker = new TonConnectUITracker({
-      eventDispatcher: options == null ? void 0 : options.eventDispatcher,
+      eventDispatcher,
       tonConnectUiVersion
     });
     this.modal = new WalletsModalManager({
@@ -12687,9 +12893,18 @@ class TonConnectUI {
   /**
    * Opens the modal window, returns a promise that resolves after the modal window is opened.
    */
-  openModal() {
+  openModal(options) {
     return __async(this, null, function* () {
-      return this.modal.open();
+      var _a2;
+      const traceId = (_a2 = options == null ? void 0 : options.traceId) != null ? _a2 : UUIDv7();
+      yield this.modal.open({ traceId });
+      const sessionId = yield this.getSessionId();
+      const visibleWallets = widgetController.getLastVisibleWallets();
+      this.tracker.trackWalletModalOpened(
+        visibleWallets.wallets.map((wallet) => wallet.name),
+        sessionId,
+        options == null ? void 0 : options.traceId
+      );
     });
   }
   /**
@@ -12746,26 +12961,30 @@ class TonConnectUI {
    * @return Connected wallet.
    * @throws TonConnectUIError if connection was aborted.
    */
-  connectWallet() {
+  connectWallet(options) {
     return __async(this, null, function* () {
+      var _a2;
+      const traceId = (_a2 = options == null ? void 0 : options.traceId) != null ? _a2 : UUIDv7();
       const walletsList = yield this.getWallets();
       const embeddedWallet = walletsList.find(isWalletInfoCurrentlyEmbedded);
       if (embeddedWallet) {
-        return yield this.connectEmbeddedWallet(embeddedWallet);
+        return yield this.connectEmbeddedWallet(embeddedWallet, { traceId });
       } else {
-        return yield this.connectExternalWallet();
+        return yield this.connectExternalWallet({ traceId });
       }
     });
   }
   /**
    * Disconnect wallet and clean localstorage.
    */
-  disconnect() {
+  disconnect(options) {
+    var _a2;
+    const traceId = (_a2 = options == null ? void 0 : options.traceId) != null ? _a2 : UUIDv7();
     this.tracker.trackDisconnection(this.wallet, "dapp");
     widgetController.clearAction();
     widgetController.removeSelectedWalletInfo();
     this.walletInfoStorage.removeWalletInfo();
-    return this.connector.disconnect();
+    return this.connector.disconnect({ traceId });
   }
   /**
    * Opens the modal window and handles the transaction sending.
@@ -12774,6 +12993,8 @@ class TonConnectUI {
    */
   sendTransaction(tx, options) {
     return __async(this, null, function* () {
+      var _a2;
+      const traceId = (_a2 = options == null ? void 0 : options.traceId) != null ? _a2 : UUIDv7();
       this.tracker.trackTransactionSentForSignature(this.wallet, tx);
       if (!this.connected) {
         this.tracker.trackTransactionSigningFailed(this.wallet, tx, "Wallet was not connected");
@@ -12789,11 +13010,12 @@ class TonConnectUI {
         showNotification: notifications2.includes("before"),
         openModal: modals.includes("before"),
         sent: false,
-        sessionId: sessionId || void 0
+        sessionId: sessionId || void 0,
+        traceId
       });
       const abortController = new AbortController();
       const onRequestSent = () => {
-        var _a2;
+        var _a3;
         if (abortController.signal.aborted) {
           return;
         }
@@ -12802,12 +13024,14 @@ class TonConnectUI {
           showNotification: notifications2.includes("before"),
           openModal: modals.includes("before"),
           sent: true,
-          sessionId: sessionId || void 0
+          sessionId: sessionId || void 0,
+          traceId
         });
         this.redirectAfterRequestSent({
           returnStrategy,
           twaReturnUrl,
-          sessionId: sessionId || void 0
+          sessionId: sessionId || void 0,
+          traceId
         });
         let firstClick = true;
         const redirectToWallet2 = () => __async(this, null, function* () {
@@ -12820,10 +13044,11 @@ class TonConnectUI {
             returnStrategy,
             twaReturnUrl,
             forceRedirect,
-            sessionId: sessionId || void 0
+            sessionId: sessionId || void 0,
+            traceId
           });
         });
-        (_a2 = options == null ? void 0 : options.onRequestSent) == null ? void 0 : _a2.call(options, redirectToWallet2);
+        (_a3 = options == null ? void 0 : options.onRequestSent) == null ? void 0 : _a3.call(options, redirectToWallet2);
       };
       const unsubscribe = this.onTransactionModalStateChange((action2) => {
         if (action2 == null ? void 0 : action2.openModal) {
@@ -12838,7 +13063,8 @@ class TonConnectUI {
         const result = yield this.waitForSendTransaction(
           {
             transaction: tx,
-            signal: abortController.signal
+            signal: abortController.signal,
+            traceId
           },
           onRequestSent
         );
@@ -12846,19 +13072,21 @@ class TonConnectUI {
         widgetController.setAction({
           name: "transaction-sent",
           showNotification: notifications2.includes("success"),
-          openModal: modals.includes("success")
+          openModal: modals.includes("success"),
+          traceId
         });
         return result;
       } catch (e2) {
         if (e2 instanceof WalletNotSupportFeatureError) {
           widgetController.clearAction();
-          widgetController.openWalletNotSupportFeatureModal(e2.cause);
+          widgetController.openWalletNotSupportFeatureModal(e2.cause, { traceId });
           throw e2;
         }
         widgetController.setAction({
           name: "transaction-canceled",
           showNotification: notifications2.includes("error"),
-          openModal: modals.includes("error")
+          openModal: modals.includes("error"),
+          traceId
         });
         if (e2 instanceof TonConnectError) {
           throw e2;
@@ -12877,6 +13105,8 @@ class TonConnectUI {
    */
   signData(data, options) {
     return __async(this, null, function* () {
+      var _a2;
+      const traceId = (_a2 = options == null ? void 0 : options.traceId) != null ? _a2 : UUIDv7();
       this.tracker.trackDataSentForSignature(this.wallet, data);
       if (!this.connected) {
         this.tracker.trackDataSigningFailed(this.wallet, data, "Wallet was not connected");
@@ -12892,11 +13122,12 @@ class TonConnectUI {
         showNotification: notifications2.includes("before"),
         openModal: modals.includes("before"),
         signed: false,
-        sessionId: sessionId || void 0
+        sessionId: sessionId || void 0,
+        traceId
       });
       const abortController = new AbortController();
       const onRequestSent = () => {
-        var _a2;
+        var _a3;
         if (abortController.signal.aborted) {
           return;
         }
@@ -12905,12 +13136,14 @@ class TonConnectUI {
           showNotification: notifications2.includes("before"),
           openModal: modals.includes("before"),
           signed: true,
-          sessionId: sessionId || void 0
+          sessionId: sessionId || void 0,
+          traceId
         });
         this.redirectAfterRequestSent({
           returnStrategy,
           twaReturnUrl,
-          sessionId: sessionId || void 0
+          sessionId: sessionId || void 0,
+          traceId
         });
         let firstClick = true;
         const redirectToWallet2 = () => {
@@ -12923,10 +13156,11 @@ class TonConnectUI {
             returnStrategy,
             twaReturnUrl,
             forceRedirect,
-            sessionId: sessionId || void 0
+            sessionId: sessionId || void 0,
+            traceId
           });
         };
-        (_a2 = options == null ? void 0 : options.onRequestSent) == null ? void 0 : _a2.call(options, redirectToWallet2);
+        (_a3 = options == null ? void 0 : options.onRequestSent) == null ? void 0 : _a3.call(options, redirectToWallet2);
       };
       const unsubscribe = this.onTransactionModalStateChange((action2) => {
         if (action2 == null ? void 0 : action2.openModal) {
@@ -12941,7 +13175,8 @@ class TonConnectUI {
         const result = yield this.waitForSignData(
           {
             data,
-            signal: new AbortController().signal
+            signal: new AbortController().signal,
+            traceId
           },
           onRequestSent
         );
@@ -12949,19 +13184,21 @@ class TonConnectUI {
         widgetController.setAction({
           name: "data-signed",
           showNotification: notifications2.includes("success"),
-          openModal: modals.includes("success")
+          openModal: modals.includes("success"),
+          traceId
         });
         return result;
       } catch (e2) {
         if (e2 instanceof WalletNotSupportFeatureError) {
           widgetController.clearAction();
-          widgetController.openWalletNotSupportFeatureModal(e2.cause);
+          widgetController.openWalletNotSupportFeatureModal(e2.cause, { traceId });
           throw e2;
         }
         widgetController.setAction({
           name: "sign-data-canceled",
           showNotification: notifications2.includes("error"),
-          openModal: modals.includes("error")
+          openModal: modals.includes("error"),
+          traceId
         });
         if (e2 instanceof TonConnectError) {
           throw e2;
@@ -12981,9 +13218,6 @@ class TonConnectUI {
   getSessionId() {
     return __async(this, null, function* () {
       var _a2, _b2;
-      if (!this.connected) {
-        return null;
-      }
       try {
         const storage = (_a2 = this.connector.dappSettings) == null ? void 0 : _a2.storage;
         if (storage) {
@@ -13010,13 +13244,14 @@ class TonConnectUI {
     returnStrategy,
     twaReturnUrl,
     forceRedirect,
-    sessionId
+    sessionId,
+    traceId
   }) {
     if (this.walletInfo && "universalLink" in this.walletInfo && (this.walletInfo.openMethod === "universal-link" || this.walletInfo.openMethod === "custom-deeplink")) {
-      const linkWithSessionId = addSessionIdToUniversalLink(
-        this.walletInfo.universalLink,
-        sessionId
-      );
+      const linkWithSessionId = enrichUniversalLink(this.walletInfo.universalLink, {
+        sessionId,
+        traceId
+      });
       if (isTelegramUrl(this.walletInfo.universalLink)) {
         redirectToTelegram(linkWithSessionId, {
           returnStrategy,
@@ -13044,11 +13279,13 @@ class TonConnectUI {
    * @throws Error if the connection process fails.
    * @internal
    */
-  connectEmbeddedWallet(embeddedWallet) {
+  connectEmbeddedWallet(embeddedWallet, options) {
     return __async(this, null, function* () {
       const connect = (parameters) => {
         setLastSelectedWalletInfo(embeddedWallet);
-        this.connector.connect({ jsBridgeKey: embeddedWallet.jsBridgeKey }, parameters);
+        this.connector.connect({ jsBridgeKey: embeddedWallet.jsBridgeKey }, parameters, {
+          traceId: options.traceId
+        });
       };
       const additionalRequest = appState.connectRequestParameters;
       if ((additionalRequest == null ? void 0 : additionalRequest.state) === "loading") {
@@ -13057,7 +13294,8 @@ class TonConnectUI {
         connect(additionalRequest == null ? void 0 : additionalRequest.value);
       }
       return yield this.waitForWalletConnection({
-        ignoreErrors: false
+        ignoreErrors: false,
+        traceId: options.traceId
       });
     });
   }
@@ -13068,10 +13306,10 @@ class TonConnectUI {
    * @throws Error if the user cancels the connection process or if the connection process fails.
    * @internal
    */
-  connectExternalWallet() {
+  connectExternalWallet(options) {
     return __async(this, null, function* () {
       const abortController = new AbortController();
-      widgetController.openWalletsModal();
+      widgetController.openWalletsModal({ traceId: options.traceId });
       const unsubscribe = this.onModalStateChange((state) => {
         const { status, closeReason } = state;
         if (status === "opened") {
@@ -13084,7 +13322,8 @@ class TonConnectUI {
       });
       return yield this.waitForWalletConnection({
         ignoreErrors: true,
-        signal: abortController.signal
+        signal: abortController.signal,
+        traceId: options.traceId
       });
     });
   }
@@ -13182,7 +13421,11 @@ class TonConnectUI {
           reject(new TonConnectUIError("Transaction was not sent"));
         };
         signal.addEventListener("abort", onCanceledHandler, { once: true });
-        this.connector.sendTransaction(transaction, { onRequestSent, signal }).then((result) => {
+        this.connector.sendTransaction(transaction, {
+          onRequestSent,
+          signal,
+          traceId: options.traceId
+        }).then((result) => {
           signal.removeEventListener("abort", onCanceledHandler);
           return onTransactionHandler(result);
         }).catch((reason) => {