@tonconnect/ui 2.0.0-beta.1 → 2.0.0-beta.10

package/lib/{index.js → index.mjs}

@@ -41,8 +41,8 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-var _a;
-import { TonConnectError, isTelegramUrl, encodeTelegramUrlParameters, isWalletInfoCurrentlyInjected, toUserFriendlyAddress, CHAIN, TonConnect, isWalletInfoRemote, isWalletInfoCurrentlyEmbedded } from "@tonconnect/sdk";
+var _a, _b, _c, _d, _e, _f, _g, _h;
+import { TonConnectError, isWalletInfoCurrentlyInjected, toUserFriendlyAddress, CHAIN, TonConnect, isTelegramUrl, encodeTelegramUrlParameters, isWalletInfoRemote, isWalletInfoCurrentlyEmbedded } from "@tonconnect/sdk";
 export * from "@tonconnect/sdk";
 import UAParser from "ua-parser-js";
 import deepmerge from "deepmerge";
@@ -1706,6 +1706,43 @@ function rgba(color, opacity) {
 function toPx(value) {
   return value.toString() + "px";
 }
+const _InMemoryStorage = class {
+  constructor() {
+    __publicField(this, "storage", {});
+  }
+  static getInstance() {
+    if (!_InMemoryStorage.instance) {
+      _InMemoryStorage.instance = new _InMemoryStorage();
+    }
+    return _InMemoryStorage.instance;
+  }
+  get length() {
+    return Object.keys(this.storage).length;
+  }
+  clear() {
+    this.storage = {};
+  }
+  getItem(key) {
+    var _a2;
+    return (_a2 = this.storage[key]) != null ? _a2 : null;
+  }
+  key(index) {
+    var _a2;
+    const keys = Object.keys(this.storage);
+    if (index < 0 || index >= keys.length) {
+      return null;
+    }
+    return (_a2 = keys[index]) != null ? _a2 : null;
+  }
+  removeItem(key) {
+    delete this.storage[key];
+  }
+  setItem(key, value) {
+    this.storage[key] = value;
+  }
+};
+let InMemoryStorage = _InMemoryStorage;
+__publicField(InMemoryStorage, "instance");
 class TonConnectUIError extends TonConnectError {
   constructor(...args) {
     super(...args);
@@ -1713,11 +1750,22 @@ class TonConnectUIError extends TonConnectError {
   }
 }
 function openLink(href, target = "_self") {
-  return window.open(href, target, "noreferrer noopener");
+  window.open(href, target, "noopener noreferrer");
 }
 function openLinkBlank(href) {
   openLink(href, "_blank");
 }
+function openDeeplinkWithFallback(href, fallback) {
+  const doFallback = () => {
+    if (isBrowser("safari")) {
+      return;
+    }
+    fallback();
+  };
+  const fallbackTimeout = setTimeout(() => doFallback(), 200);
+  window.addEventListener("blur", () => clearTimeout(fallbackTimeout), { once: true });
+  openLink(href, "_self");
+}
 function getSystemTheme() {
   if (window.matchMedia && window.matchMedia("(prefers-color-scheme: light)").matches) {
     return THEME.LIGHT;
@@ -1729,25 +1777,6 @@ function subscribeToThemeChange(callback) {
   window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change", handler);
   return () => window.matchMedia("(prefers-color-scheme: dark)").removeEventListener("change", handler);
 }
-function addQueryParameter(url, key, value) {
-  const parsed = new URL(url);
-  parsed.searchParams.append(key, value);
-  return parsed.toString();
-}
-function addReturnStrategy(url, strategy) {
-  let returnStrategy;
-  if (typeof strategy === "string") {
-    returnStrategy = strategy;
-  } else {
-    returnStrategy = isInTWA() ? strategy.twaReturnUrl || strategy.returnStrategy : "none";
-  }
-  const newUrl = addQueryParameter(url, "ret", returnStrategy);
-  if (!isTelegramUrl(url)) {
-    return newUrl;
-  }
-  const lastParam = newUrl.slice(newUrl.lastIndexOf("&") + 1);
-  return newUrl.slice(0, newUrl.lastIndexOf("&")) + "-" + encodeTelegramUrlParameters(lastParam);
-}
 function disableScroll() {
   if (document.documentElement.scrollHeight === document.documentElement.clientHeight) {
     return;
@@ -1766,22 +1795,25 @@ function fixMobileSafariActiveTransition() {
   }
 }
 function defineStylesRoot() {
-  customElements.define(globalStylesTag, class TcRootElement extends HTMLDivElement {
-  }, {
-    extends: "div"
+  customElements.define(globalStylesTag, class TcRootElement extends HTMLElement {
   });
 }
-function preloadImages(images) {
-  images.forEach((img) => {
-    const node = new window.Image();
-    node.src = img;
+function createMacrotask(callback) {
+  return __async(this, null, function* () {
+    yield new Promise((resolve) => requestAnimationFrame(resolve));
+    callback();
   });
 }
-function checkLocalStorageExists() {
-  if (typeof localStorage === "undefined") {
-    throw new TonConnectUIError(
-      "window.localStorage is undefined. localStorage is required for TonConnectUI"
-    );
+function preloadImages(images) {
+  if (document.readyState !== "complete") {
+    window.addEventListener("load", () => createMacrotask(() => preloadImages(images)), {
+      once: true
+    });
+  } else {
+    images.forEach((img) => {
+      const node = new window.Image();
+      node.src = img;
+    });
   }
 }
 function getWindow$1() {
@@ -1790,8 +1822,29 @@ function getWindow$1() {
   }
   return void 0;
 }
+function tryGetLocalStorage() {
+  if (isLocalStorageAvailable()) {
+    return localStorage;
+  }
+  if (isNodeJs()) {
+    throw new TonConnectUIError(
+      "`localStorage` is unavailable, but it is required for TonConnect. For more details, see https://github.com/ton-connect/sdk/tree/main/packages/sdk#init-connector"
+    );
+  }
+  return InMemoryStorage.getInstance();
+}
+function isLocalStorageAvailable() {
+  try {
+    return typeof localStorage !== "undefined";
+  } catch (e2) {
+    return false;
+  }
+}
+function isNodeJs() {
+  return typeof process !== "undefined" && process.versions != null && process.versions.node != null;
+}
 function getUserAgent() {
-  var _a2, _b;
+  var _a2, _b2;
   const results = new UAParser().getResult();
   const osName = (_a2 = results.os.name) == null ? void 0 : _a2.toLowerCase();
   let os;
@@ -1812,7 +1865,7 @@ function getUserAgent() {
       os = "windows";
       break;
   }
-  const browserName = (_b = results.browser.name) == null ? void 0 : _b.toLowerCase();
+  const browserName = (_b2 = results.browser.name) == null ? void 0 : _b2.toLowerCase();
   let browser;
   switch (true) {
     case browserName === "chrome":
@@ -1830,21 +1883,21 @@ function getUserAgent() {
     browser
   };
 }
-function redirectToTelegram(universalLink, options) {
-  const url = new URL(universalLink);
-  url.searchParams.append("startattach", "tonconnect");
-  openLinkBlank(addReturnStrategy(url.toString(), options));
+function isOS(...os) {
+  return os.includes(getUserAgent().os);
 }
-function isInTWA() {
-  var _a2;
-  return !!((_a2 = getWindow$1()) == null ? void 0 : _a2.TelegramWebviewProxy);
+function isBrowser(...browser) {
+  return browser.includes(getUserAgent().browser);
+}
+function toDeeplink(universalLink, deeplink) {
+  const url = new URL(universalLink);
+  return deeplink + url.search;
 }
 class WalletInfoStorage {
   constructor() {
     __publicField(this, "localStorage");
     __publicField(this, "storageKey", "ton-connect-ui_wallet-info");
-    checkLocalStorageExists();
-    this.localStorage = localStorage;
+    this.localStorage = tryGetLocalStorage();
   }
   setWalletInfo(walletInfo) {
     this.localStorage.setItem(this.storageKey, JSON.stringify(walletInfo));
@@ -1864,8 +1917,7 @@ class PreferredWalletStorage {
   constructor() {
     __publicField(this, "localStorage");
     __publicField(this, "storageKey", "ton-connect-ui_preferred-wallet");
-    checkLocalStorageExists();
-    this.localStorage = localStorage;
+    this.localStorage = tryGetLocalStorage();
   }
   setPreferredWalletAppName(name) {
     this.localStorage.setItem(this.storageKey, name);
@@ -1878,8 +1930,7 @@ class LastSelectedWalletInfoStorage {
   constructor() {
     __publicField(this, "localStorage");
     __publicField(this, "storageKey", "ton-connect-ui_last-selected-wallet-info");
-    checkLocalStorageExists();
-    this.localStorage = localStorage;
+    this.localStorage = tryGetLocalStorage();
   }
   setLastSelectedWalletInfo(walletInfo) {
     this.localStorage.setItem(this.storageKey, JSON.stringify(walletInfo));
@@ -1895,10 +1946,17 @@ class LastSelectedWalletInfoStorage {
     this.localStorage.removeItem(this.storageKey);
   }
 }
-const [walletsModalOpen, setWalletsModalOpen] = createSignal(false);
-const lastSelectedWalletInfoStorage = new LastSelectedWalletInfoStorage();
-const [lastSelectedWalletInfo, _setLastSelectedWalletInfo] = createSignal(lastSelectedWalletInfoStorage.getLastSelectedWalletInfo());
+const [walletsModalState, setWalletsModalState] = createSignal({
+  status: "closed",
+  closeReason: null
+});
+const getWalletsModalIsOpened = createMemo(() => walletsModalState().status === "opened");
+let lastSelectedWalletInfoStorage = typeof window !== "undefined" ? new LastSelectedWalletInfoStorage() : void 0;
+const [lastSelectedWalletInfo, _setLastSelectedWalletInfo] = createSignal((lastSelectedWalletInfoStorage == null ? void 0 : lastSelectedWalletInfoStorage.getLastSelectedWalletInfo()) || null);
 const setLastSelectedWalletInfo = (walletInfo) => {
+  if (!lastSelectedWalletInfoStorage) {
+    lastSelectedWalletInfoStorage = new LastSelectedWalletInfoStorage();
+  }
   if (walletInfo) {
     lastSelectedWalletInfoStorage.setLastSelectedWalletInfo(walletInfo);
   } else {
@@ -1952,8 +2010,8 @@ const walletModal$1 = {
   wallets: "Wallets",
   mobileUniversalModal: {
     connectYourWallet: "Connect your wallet",
-    openWalletOnTelegramOrSelect: "Open Wallet on Telegram or\xA0select your\xA0wallet\xA0to\xA0connect",
-    openWalletOnTelegram: "Open Wallet on Telegram",
+    openWalletOnTelegramOrSelect: "Open Wallet in Telegram or select your wallet to connect",
+    openWalletOnTelegram: "Open Wallet in Telegram",
     openLink: "Open Link",
     scan: "Scan with your mobile wallet"
   },
@@ -1974,7 +2032,7 @@ const walletModal$1 = {
     dontHaveExtension: "Seems you don't have installed {{ name }}\xA0browser\xA0extension",
     getWallet: "Get {{ name }}",
     continueOnDesktop: "Continue in\xA0{{ name }} on desktop\u2026",
-    openWalletOnTelegram: "Open Wallet on Telegram on desktop",
+    openWalletOnTelegram: "Open Wallet in Telegram on desktop",
     connectionDeclined: "Connection declined"
   },
   infoModal: {
@@ -2554,6 +2612,169 @@ const Image = (props) => {
     }
   })];
 };
+function logError(...args) {
+  {
+    try {
+      console.error("[TON_CONNECT_UI]", ...args);
+    } catch (e2) {
+    }
+  }
+}
+function logWarning(...args) {
+  {
+    try {
+      console.warn("[TON_CONNECT_UI]", ...args);
+    } catch (e2) {
+    }
+  }
+}
+let initParams = {};
+try {
+  let locationHash = location.hash.toString();
+  initParams = urlParseHashParams(locationHash);
+} catch (e2) {
+}
+let tmaPlatform = "unknown";
+if (initParams == null ? void 0 : initParams.tgWebAppPlatform) {
+  tmaPlatform = (_a = initParams.tgWebAppPlatform) != null ? _a : "unknown";
+}
+if (tmaPlatform === "unknown") {
+  const window2 = getWindow$1();
+  tmaPlatform = (_d = (_c = (_b = window2 == null ? void 0 : window2.Telegram) == null ? void 0 : _b.WebApp) == null ? void 0 : _c.platform) != null ? _d : "unknown";
+}
+let webAppVersion = "6.0";
+if (initParams == null ? void 0 : initParams.tgWebAppVersion) {
+  webAppVersion = initParams.tgWebAppVersion;
+}
+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";
+}
+function isTmaPlatform(...platforms) {
+  return platforms.includes(tmaPlatform);
+}
+function isInTMA() {
+  var _a2;
+  return tmaPlatform !== "unknown" || !!((_a2 = getWindow$1()) == null ? void 0 : _a2.TelegramWebviewProxy);
+}
+function sendExpand() {
+  postEvent("web_app_expand", {});
+}
+function sendOpenTelegramLink(link) {
+  const url = new URL(link);
+  if (url.protocol !== "http:" && url.protocol !== "https:") {
+    throw new TonConnectUIError(`Url protocol is not supported: ${url}`);
+  }
+  if (url.hostname !== "t.me") {
+    throw new TonConnectUIError(`Url host is not supported: ${url}`);
+  }
+  const pathFull = url.pathname + url.search;
+  if (isIframe() || versionAtLeast("6.1")) {
+    postEvent("web_app_open_tg_link", { path_full: pathFull });
+  } else {
+    openLinkBlank("https://t.me" + pathFull);
+  }
+}
+function isIframe() {
+  try {
+    const window2 = getWindow$1();
+    if (!window2) {
+      return false;
+    }
+    return window2.parent != null && window2 !== window2.parent;
+  } catch (e2) {
+    return false;
+  }
+}
+function postEvent(eventType, eventData) {
+  try {
+    const window2 = getWindow$1();
+    if (!window2) {
+      throw new TonConnectUIError(`Can't post event to parent window: window is not defined`);
+    }
+    if (window2.TelegramWebviewProxy !== void 0) {
+      window2.TelegramWebviewProxy.postEvent(eventType, JSON.stringify(eventData));
+    } else if (window2.external && "notify" in window2.external) {
+      window2.external.notify(JSON.stringify({ eventType, eventData }));
+    } else if (isIframe()) {
+      const trustedTarget = "*";
+      const message = JSON.stringify({ eventType, eventData });
+      window2.parent.postMessage(message, trustedTarget);
+    } else {
+      throw new TonConnectUIError(`Can't post event to TMA`);
+    }
+  } catch (e2) {
+    logError(`Can't post event to parent window: ${e2}`);
+  }
+}
+function urlParseHashParams(locationHash) {
+  locationHash = locationHash.replace(/^#/, "");
+  let params = {};
+  if (!locationHash.length) {
+    return params;
+  }
+  if (locationHash.indexOf("=") < 0 && locationHash.indexOf("?") < 0) {
+    params._path = urlSafeDecode(locationHash);
+    return params;
+  }
+  let qIndex = locationHash.indexOf("?");
+  if (qIndex >= 0) {
+    let pathParam = locationHash.substr(0, qIndex);
+    params._path = urlSafeDecode(pathParam);
+    locationHash = locationHash.substr(qIndex + 1);
+  }
+  let query_params = urlParseQueryString(locationHash);
+  for (let k in query_params) {
+    params[k] = query_params[k];
+  }
+  return params;
+}
+function urlSafeDecode(urlencoded) {
+  try {
+    urlencoded = urlencoded.replace(/\+/g, "%20");
+    return decodeURIComponent(urlencoded);
+  } catch (e2) {
+    return urlencoded;
+  }
+}
+function urlParseQueryString(queryString) {
+  let params = {};
+  if (!queryString.length) {
+    return params;
+  }
+  let queryStringParams = queryString.split("&");
+  let i2, param, paramName, paramValue;
+  for (i2 = 0; i2 < queryStringParams.length; i2++) {
+    param = queryStringParams[i2].split("=");
+    paramName = urlSafeDecode(param[0]);
+    paramValue = param[1] == null ? null : urlSafeDecode(param[1]);
+    params[paramName] = paramValue;
+  }
+  return params;
+}
+function versionCompare(v1, v2) {
+  if (typeof v1 !== "string")
+    v1 = "";
+  if (typeof v2 !== "string")
+    v2 = "";
+  let v1List = v1.replace(/^\s+|\s+$/g, "").split(".");
+  let v2List = v2.replace(/^\s+|\s+$/g, "").split(".");
+  let a2, i2, p1, p2;
+  a2 = Math.max(v1List.length, v2List.length);
+  for (i2 = 0; i2 < a2; i2++) {
+    p1 = parseInt(v1List[i2]) || 0;
+    p2 = parseInt(v2List[i2]) || 0;
+    if (p1 === p2)
+      continue;
+    if (p1 > p2)
+      return 1;
+    return -1;
+  }
+  return 0;
+}
+function versionAtLeast(ver) {
+  return versionCompare(webAppVersion, ver) >= 0;
+}
 const maxWidth = {
   mobile: 440,
   tablet: 1020
@@ -2563,6 +2784,9 @@ function isDevice(device) {
   if (!window2) {
     return device === "desktop";
   }
+  if (isTmaPlatform("weba")) {
+    return true;
+  }
   const width = window2.innerWidth;
   switch (device) {
     case "desktop":
@@ -2985,15 +3209,49 @@ function clickOutside$1(el, accessor) {
 }
 function escPressed(_, accessor) {
   const onKeyPress = (e2) => {
-    var _a2, _b;
+    var _a2, _b2;
     if (e2.key === "Escape") {
       (_a2 = document.activeElement) == null ? void 0 : _a2.blur();
-      (_b = accessor()) == null ? void 0 : _b();
+      (_b2 = accessor()) == null ? void 0 : _b2();
     }
   };
   document.body.addEventListener("keydown", onKeyPress);
   onCleanup(() => document.body.removeEventListener("keydown", onKeyPress));
 }
+function androidBackHandler$1(_, config) {
+  const {
+    isEnabled,
+    onClose
+  } = config();
+  if (!isEnabled) {
+    return;
+  }
+  const userOSIsAndroid = getUserAgent().os === "android";
+  if (!userOSIsAndroid) {
+    return;
+  }
+  window.history.pushState(ROUTE_STATE, "");
+  const popstateHandler = (event) => {
+    event.preventDefault();
+    onClose();
+  };
+  window.addEventListener("popstate", popstateHandler, {
+    once: true
+  });
+  onCleanup(() => {
+    window.removeEventListener("popstate", popstateHandler);
+    createMacrotask(() => {
+      var _a2;
+      if (((_a2 = window.history.state) == null ? void 0 : _a2[ROUTE_STATE_KEY]) === true) {
+        window.history.back();
+      }
+    });
+  });
+}
+const ROUTE_STATE_KEY = "androidBackHandler";
+const ROUTE_STATE = {
+  [ROUTE_STATE_KEY]: true
+};
 const _tmpl$$v = /* @__PURE__ */ template$1(`<svg><path fill-rule="evenodd" clip-rule="evenodd" d="M10.2122 14.3407C10.5384 14.0854 10.5959 13.614 10.3406 13.2878L6.20237 8.00003L10.3406 2.71227C10.5959 2.38607 10.5384 1.91469 10.2122 1.6594C9.88604 1.40412 9.41465 1.46161 9.15937 1.7878L4.65937 7.5378C4.44688 7.80932 4.44688 8.19074 4.65937 8.46226L9.15937 14.2123C9.41465 14.5385 9.88604 14.5959 10.2122 14.3407Z"></path></svg>`, 4, true);
 const rotationDegrees = {
   left: 0,
@@ -3201,9 +3459,73 @@ const ModalFooterStyled = styled.div`
 const QuestionButtonStyled = styled(IconButton)`
     background-color: ${(props) => rgba(props.theme.colors.icon.secondary, 0.12)};
 `;
+class AnimationTimelineNoop {
+  constructor() {
+    __publicField(this, "currentTime", 0);
+  }
+}
+const _AnimationNoop = class {
+  constructor() {
+    __publicField(this, "currentTime", 0);
+    __publicField(this, "playbackRate", 1);
+    __publicField(this, "startTime", null);
+    __publicField(this, "timeline", new AnimationTimelineNoop());
+    __publicField(this, "finished", Promise.resolve(this));
+    __publicField(this, "effect", null);
+    __publicField(this, "id", "");
+    __publicField(this, "pending", false);
+    __publicField(this, "playState", "finished");
+    __publicField(this, "replaceState", "active");
+    __publicField(this, "ready", Promise.resolve(this));
+    __publicField(this, "oncancel", null);
+    __publicField(this, "onfinish", null);
+    __publicField(this, "onremove", null);
+  }
+  static create() {
+    if (!_AnimationNoop._instance) {
+      logWarning(
+        "Animation is not supported in this environment: please consider using the `web-animations-js` polyfill to provide a fallback implementation of the Web Animations API."
+      );
+      _AnimationNoop._instance = new _AnimationNoop();
+    }
+    return _AnimationNoop._instance;
+  }
+  cancel() {
+  }
+  finish() {
+  }
+  pause() {
+  }
+  play() {
+  }
+  reverse() {
+  }
+  addEventListener(_type, _listener, _options) {
+  }
+  dispatchEvent(_event) {
+    return false;
+  }
+  removeEventListener(_type, _callback, _options) {
+  }
+  updatePlaybackRate(_playbackRate) {
+  }
+  commitStyles() {
+  }
+  persist() {
+  }
+};
+let AnimationNoop = _AnimationNoop;
+__publicField(AnimationNoop, "_instance", null);
+function animate(element, keyframes, options) {
+  if ("animate" in element) {
+    return element.animate(keyframes, options);
+  }
+  return AnimationNoop.create();
+}
 const _tmpl$$t = /* @__PURE__ */ template$1(`<div></div>`);
 const clickOutside = clickOutside$1;
 const keyPressed = escPressed;
+const androidBackHandler = androidBackHandler$1;
 const Modal = (props) => {
   const theme = useTheme();
   const dataAttrs = useDataAttributes(props);
@@ -3217,7 +3539,7 @@ const Modal = (props) => {
   return createComponent(Transition, {
     onBeforeEnter: (el) => {
       const duration = isDevice("mobile") ? 200 : 100;
-      el.animate([{
+      animate(el, [{
         opacity: 0
       }, {
         opacity: 1
@@ -3225,7 +3547,7 @@ const Modal = (props) => {
         duration
       });
       if (isDevice("mobile")) {
-        el.firstElementChild.animate([{
+        animate(el.firstElementChild, [{
           transform: "translateY(390px)"
         }, {
           transform: "translateY(0)"
@@ -3236,7 +3558,7 @@ const Modal = (props) => {
     },
     onExit: (el, done) => {
       const duration = isDevice("mobile") ? 200 : 100;
-      const backgroundAnimation = el.animate([{
+      const backgroundAnimation = animate(el, [{
         opacity: 1
       }, {
         opacity: 0
@@ -3244,7 +3566,7 @@ const Modal = (props) => {
         duration
       });
       if (isDevice("mobile")) {
-        const contentAnimation = el.firstElementChild.animate([{
+        const contentAnimation = animate(el.firstElementChild, [{
           transform: "translateY(0)"
         }, {
           transform: "translateY(390px)"
@@ -3267,6 +3589,10 @@ const Modal = (props) => {
           }, dataAttrs, {
             get children() {
               const _el$ = _tmpl$$t.cloneNode(true);
+              use(androidBackHandler, _el$, () => ({
+                isEnabled: props.enableAndroidBackHandler,
+                onClose: () => props.onClose()
+              }));
               use(keyPressed, _el$, () => () => props.onClose());
               use(clickOutside, _el$, () => () => props.onClose());
               insert(_el$, createComponent(ModalBodyStyled, {
@@ -3300,6 +3626,7 @@ const Modal = (props) => {
               createRenderEffect(() => className(_el$, cn(ModalWrapperClass, u`
                                 border-radius: ${borders$4[theme.borderRadius]};
                                 background-color: ${theme.colors.background.tint};
+
                                 ${media("mobile")} {
                                     border-radius: ${borders$4[theme.borderRadius]}
                                         ${borders$4[theme.borderRadius]} 0 0;
@@ -5182,11 +5509,16 @@ var qrcode$1 = { exports: {} };
 })(qrcode$1);
 const qrcode = qrcode$1.exports;
 function copyToClipboard(text) {
-  if (navigator == null ? void 0 : navigator.clipboard) {
-    return navigator.clipboard.writeText(text);
-  }
-  fallbackCopyTextToClipboard(text);
-  return Promise.resolve();
+  return __async(this, null, function* () {
+    try {
+      if (!(navigator == null ? void 0 : navigator.clipboard)) {
+        throw new TonConnectUIError("Clipboard API not available");
+      }
+      return yield navigator.clipboard.writeText(text);
+    } catch (e2) {
+    }
+    fallbackCopyTextToClipboard(text);
+  });
 }
 function fallbackCopyTextToClipboard(text) {
   const textArea = document.createElement("textarea");
@@ -5283,7 +5615,7 @@ const QRCode = (props) => {
         }
       }), createComponent(Transition, {
         onBeforeEnter: (el) => {
-          el.animate([{
+          animate(el, [{
             opacity: 0,
             transform: "translate(-50%, 44px)"
           }, {
@@ -5295,7 +5627,7 @@ const QRCode = (props) => {
           });
         },
         onExit: (el, done) => {
-          el.animate([{
+          animate(el, [{
             opacity: 1,
             transform: "translate(-50%, 0)"
           }, {
@@ -6186,13 +6518,15 @@ const ScrollDivider = styled.div`
         margin: 0;
     }
 `;
-const [windowHeight, setWindowHeight] = createSignal(((_a = getWindow$1()) == null ? void 0 : _a.innerHeight) || 0);
+const [windowHeight, setWindowHeight] = createSignal(((_h = getWindow$1()) == null ? void 0 : _h.innerHeight) || 0);
 if (getWindow$1()) {
   window.addEventListener("resize", () => setWindowHeight(window.innerHeight));
 }
 const [isMobile, setIsMobile] = createSignal(isDevice("mobile"));
+const updateIsMobile = () => setIsMobile(isDevice("mobile"));
 if (getWindow$1()) {
-  window.addEventListener("resize", () => setIsMobile(isDevice("mobile")));
+  window.addEventListener("resize", () => updateIsMobile());
+  window.addEventListener("load", () => updateIsMobile(), { once: true });
 }
 const ScrollContainer = (props) => {
   const [scrolled, setScrolled] = createSignal(false);
@@ -6549,31 +6883,50 @@ const NotificationClass = u`
     transform: translateY(-8px);
     margin-bottom: 12px;
 `;
-const _tmpl$$4 = /* @__PURE__ */ template$1(`<div data-tc-list-notifications="true"></div>`);
-const Notifications = (props) => {
-  const timeouts = [];
+const defaultConfig = {
+  timeout: 4500
+};
+const [latestAction, setLatestAction] = createSignal(null);
+function useOpenedNotifications(config) {
+  const { timeout } = __spreadValues(__spreadValues({}, defaultConfig), config);
   const [openedNotifications, setOpenedNotifications] = createSignal([]);
-  let lastId = -1;
-  const liveTimeoutMs = 4500;
-  createEffect(on(action, (action2) => {
-    if (action2 && action2.showNotification) {
-      lastId++;
-      const id = lastId;
-      setOpenedNotifications((notifications2) => notifications2.filter((notification) => notification.action !== "confirm-transaction").concat({
-        id,
-        action: action2.name
-      }));
-      timeouts.push(setTimeout(() => setOpenedNotifications((notifications2) => notifications2.filter((notification) => notification.id !== id)), liveTimeoutMs));
-    }
-  }));
+  const [timeoutIds, setTimeoutIds] = createSignal([]);
+  createEffect(
+    on(action, (action2) => {
+      if (!action2 || !action2.showNotification) {
+        return;
+      }
+      if (latestAction() === action2) {
+        return;
+      }
+      setLatestAction(action2);
+      setOpenedNotifications(
+        (openedNotifications2) => openedNotifications2.filter((n2) => n2.action !== "confirm-transaction")
+      );
+      const notification = { action: action2.name };
+      setOpenedNotifications((openedNotifications2) => [...openedNotifications2, notification]);
+      const timeoutId = setTimeout(() => {
+        setOpenedNotifications(
+          (openedNotifications2) => openedNotifications2.filter((n2) => n2 !== notification)
+        );
+        setTimeoutIds((timeoutIds2) => timeoutIds2.filter((id) => id !== timeoutId));
+      }, timeout);
+      setTimeoutIds((timeoutIds2) => [...timeoutIds2, timeoutId]);
+    })
+  );
   onCleanup(() => {
-    timeouts.forEach(clearTimeout);
+    timeoutIds().forEach((id) => clearTimeout(id));
   });
+  return openedNotifications;
+}
+const _tmpl$$4 = /* @__PURE__ */ template$1(`<div data-tc-list-notifications="true"></div>`);
+const Notifications = (props) => {
+  const openedNotifications = useOpenedNotifications();
   return (() => {
     const _el$ = _tmpl$$4.cloneNode(true);
     insert(_el$, createComponent(TransitionGroup, {
       onBeforeEnter: (el) => {
-        el.animate([{
+        animate(el, [{
           opacity: 0,
           transform: "translateY(0)"
         }, {
@@ -6584,7 +6937,7 @@ const Notifications = (props) => {
         });
       },
       onExit: (el, done) => {
-        const a2 = el.animate([{
+        const a2 = animate(el, [{
           opacity: 1,
           transform: "translateY(-8px)"
         }, {
@@ -7508,7 +7861,7 @@ const AccountButton = () => {
             },
             get children() {
               return createComponent(AccountButtonStyled, {
-                onClick: () => tonConnectUI.connectWallet(),
+                onClick: () => tonConnectUI.openModal(),
                 "data-tc-connect-button": "true",
                 scale: "s",
                 get children() {
@@ -7561,7 +7914,7 @@ const AccountButton = () => {
                       _el$._$owner = getOwner();
                       insert(_el$, createComponent(Transition, {
                         onBeforeEnter: (el) => {
-                          el.animate([{
+                          animate(el, [{
                             opacity: 0,
                             transform: "translateY(-8px)"
                           }, {
@@ -7572,7 +7925,7 @@ const AccountButton = () => {
                           });
                         },
                         onExit: (el, done) => {
-                          const a2 = el.animate([{
+                          const a2 = animate(el, [{
                             opacity: 1,
                             transform: "translateY(0)"
                           }, {
@@ -7605,8 +7958,8 @@ const AccountButton = () => {
                       }), null);
                       insert(_el$, createComponent(NotificationsStyled, {}), null);
                       createRenderEffect((_p$) => {
-                        var _a2, _b;
-                        const _v$ = position.strategy, _v$2 = `${(_a2 = position.y) != null ? _a2 : 0}px`, _v$3 = `${(_b = position.x) != null ? _b : 0}px`;
+                        var _a2, _b2;
+                        const _v$ = position.strategy, _v$2 = `${(_a2 = position.y) != null ? _a2 : 0}px`, _v$3 = `${(_b2 = position.x) != null ? _b2 : 0}px`;
                         _v$ !== _p$._v$ && _el$.style.setProperty("position", _p$._v$ = _v$);
                         _v$2 !== _p$._v$2 && _el$.style.setProperty("top", _p$._v$2 = _v$2);
                         _v$3 !== _p$._v$3 && _el$.style.setProperty("left", _p$._v$3 = _v$3);
@@ -7672,7 +8025,8 @@ const [appState, setAppState] = createStore({
   language: "en",
   returnStrategy: "back",
   twaReturnUrl: void 0,
-  walletsListConfiguration: {}
+  walletsListConfiguration: {},
+  enableAndroidBackHandler: true
 });
 function uniq(array) {
   return [...new Set(array)];
@@ -7902,10 +8256,87 @@ const Translation = (props) => {
     return t2(props.translationKey, props.translationValues, (_a2 = props.children) == null ? void 0 : _a2.toString());
   });
 };
+function addReturnStrategy(url, strategy) {
+  let returnStrategy;
+  if (typeof strategy === "string") {
+    returnStrategy = strategy;
+  } else {
+    returnStrategy = isInTMA() ? strategy.twaReturnUrl || strategy.returnStrategy : "none";
+  }
+  const newUrl = addQueryParameter(url, "ret", returnStrategy);
+  if (!isTelegramUrl(url)) {
+    return newUrl;
+  }
+  const lastParam = newUrl.slice(newUrl.lastIndexOf("&") + 1);
+  return newUrl.slice(0, newUrl.lastIndexOf("&")) + "-" + encodeTelegramUrlParameters(lastParam);
+}
+function redirectToTelegram(universalLink, options) {
+  options = __spreadValues({}, options);
+  const directLink = convertToTGDirectLink(universalLink);
+  const directLinkUrl = new URL(directLink);
+  if (!directLinkUrl.searchParams.has("startapp")) {
+    directLinkUrl.searchParams.append("startapp", "tonconnect");
+  }
+  if (isInTMA()) {
+    if (isTmaPlatform("ios", "android")) {
+      options.returnStrategy = "back";
+      options.twaReturnUrl = void 0;
+      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
+    } else if (isTmaPlatform("macos", "tdesktop")) {
+      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
+    } else if (isTmaPlatform("weba")) {
+      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
+    } else if (isTmaPlatform("web")) {
+      options.returnStrategy = "back";
+      options.twaReturnUrl = void 0;
+      sendOpenTelegramLink(addReturnStrategy(directLinkUrl.toString(), options));
+    } else {
+      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
+    }
+  } else {
+    if (isOS("ios", "android")) {
+      options.returnStrategy = "none";
+      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options.returnStrategy));
+    } else if (isOS("macos", "windows", "linux")) {
+      options.returnStrategy = "none";
+      options.twaReturnUrl = void 0;
+      if (options.forceRedirect) {
+        openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
+      } else {
+        const link = addReturnStrategy(directLinkUrl.toString(), options);
+        const deepLink = convertToTGDeepLink(link);
+        openDeeplinkWithFallback(deepLink, () => openLinkBlank(link));
+      }
+    } else {
+      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
+    }
+  }
+}
+function addQueryParameter(url, key, value) {
+  const parsed = new URL(url);
+  parsed.searchParams.append(key, value);
+  return parsed.toString();
+}
+function convertToTGDirectLink(universalLink) {
+  const url = new URL(universalLink);
+  if (url.searchParams.has("attach")) {
+    url.searchParams.delete("attach");
+    url.pathname += "/start";
+  }
+  return url.toString();
+}
+function convertToTGDeepLink(directLink) {
+  const parsed = new URL(directLink);
+  const [, domain, appname] = parsed.pathname.split("/");
+  const startapp = parsed.searchParams.get("startapp");
+  return `tg://resolve?domain=${domain}&appname=${appname}&startapp=${startapp}`;
+}
+let openDesktopDeeplinkAttempts = 0;
 const DesktopConnectionModal = (props) => {
   const [mode, setMode] = createSignal("mobile");
   const [connectionErrored, setConnectionErrored] = createSignal(false);
   const [universalLink, setUniversalLink] = createSignal();
+  const [firstClick, setFirstClick] = createSignal(true);
   const connector = useContext(ConnectorContext);
   const unsubscribe = connector.onStatusChange(() => {
   }, () => {
@@ -7941,19 +8372,37 @@ const DesktopConnectionModal = (props) => {
       generateUniversalLink();
     }
     setMode("desktop");
-    setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
-      openMethod: "universal-link"
-    }));
-    openLinkBlank(addReturnStrategy(universalLink(), appState.returnStrategy));
+    const linkWithStrategy = addReturnStrategy(universalLink(), appState.returnStrategy);
+    const haveTriedToOpenDeeplinkInSafari = isBrowser("safari") && openDesktopDeeplinkAttempts >= 1;
+    if (props.wallet.deepLink && !haveTriedToOpenDeeplinkInSafari) {
+      openDesktopDeeplinkAttempts++;
+      setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
+        openMethod: "custom-deeplink"
+      }));
+      openDeeplinkWithFallback(toDeeplink(linkWithStrategy, props.wallet.deepLink), () => {
+        setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
+          openMethod: "universal-link"
+        }));
+        openLinkBlank(linkWithStrategy);
+      });
+    } else {
+      setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
+        openMethod: "universal-link"
+      }));
+      openLinkBlank(linkWithStrategy);
+    }
   };
   const onClickTelegram = () => {
+    const forceRedirect = !firstClick();
+    setFirstClick(false);
     setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
       openMethod: "universal-link"
     }));
-    openLinkBlank(addReturnStrategy(universalLink(), {
+    redirectToTelegram(universalLink(), {
       returnStrategy: appState.returnStrategy,
-      twaReturnUrl: appState.twaReturnUrl
-    }));
+      twaReturnUrl: appState.twaReturnUrl,
+      forceRedirect
+    });
   };
   const onClickExtension = () => {
     setConnectionErrored(false);
@@ -8219,7 +8668,7 @@ const DesktopConnectionModal = (props) => {
             get children() {
               return createComponent(Translation, {
                 translationKey: "walletModal.desktopConnectionModal.openWalletOnTelegram",
-                children: "Open Wallet on Telegram on desktop"
+                children: "Open Wallet in Telegram on desktop"
               });
             }
           });
@@ -8856,13 +9305,14 @@ const MobileUniversalQR = (props) => {
 const _tmpl$$1 = /* @__PURE__ */ template$1(`<li></li>`), _tmpl$2 = /* @__PURE__ */ template$1(`<div data-tc-wallets-modal-universal-mobile="true"></div>`);
 const MobileUniversalModal = (props) => {
   const [showQR, setShowQR] = createSignal(false);
+  const [firstClick, setFirstClick] = createSignal(true);
   const connector = appState.connector;
   const walletsList = () => props.walletsList.filter((w) => supportsMobile(w) && w.appName !== AT_WALLET_APP_NAME);
   const shouldShowMoreButton = () => walletsList().length > 7;
   const walletsBridges = () => [...new Set(props.walletsList.filter(isWalletInfoRemote).map((item) => item.bridgeUrl)).values()].map((bridgeUrl) => ({
     bridgeUrl
   }));
-  const universalLink = createMemo(() => connector.connect(walletsBridges(), props.additionalRequest));
+  const getUniversalLink = () => connector.connect(walletsBridges(), props.additionalRequest);
   setLastSelectedWalletInfo({
     openMethod: "universal-link"
   });
@@ -8871,12 +9321,12 @@ const MobileUniversalModal = (props) => {
     if (isCopiedShown() !== void 0) {
       clearTimeout(isCopiedShown());
     }
-    yield copyToClipboard(universalLink());
+    yield copyToClipboard(getUniversalLink());
     const timeoutId = setTimeout(() => setIsCopiedShown(void 0), 1500);
     setIsCopiedShown(timeoutId);
   });
   const onSelectUniversal = () => {
-    openLinkBlank(addReturnStrategy(universalLink(), appState.returnStrategy));
+    openLinkBlank(addReturnStrategy(getUniversalLink(), appState.returnStrategy));
   };
   const onSelectTelegram = () => {
     const atWallet = props.walletsList.find((wallet) => wallet.appName === AT_WALLET_APP_NAME);
@@ -8887,10 +9337,13 @@ const MobileUniversalModal = (props) => {
       bridgeUrl: atWallet.bridgeUrl,
       universalLink: atWallet.universalLink
     }, props.additionalRequest);
-    openLinkBlank(addReturnStrategy(walletLink, {
+    const forceRedirect = !firstClick();
+    setFirstClick(false);
+    redirectToTelegram(walletLink, {
       returnStrategy: appState.returnStrategy,
-      twaReturnUrl: appState.twaReturnUrl
-    }));
+      twaReturnUrl: appState.twaReturnUrl,
+      forceRedirect
+    });
   };
   const onOpenQR = () => {
     setShowQR(true);
@@ -8916,7 +9369,7 @@ const MobileUniversalModal = (props) => {
           onClick: onCloseQR
         }), createComponent(MobileUniversalQR, {
           get universalLink() {
-            return universalLink();
+            return getUniversalLink();
           }
         })];
       }
@@ -8936,7 +9389,7 @@ const MobileUniversalModal = (props) => {
           children: "Connect your wallet"
         }), createComponent(H2Styled$2, {
           translationKey: "walletModal.mobileUniversalModal.openWalletOnTelegramOrSelect",
-          children: "Open Wallet on Telegram or select your wallet to connect"
+          children: "Open Wallet in Telegram or select your wallet to connect"
         }), createComponent(TelegramButtonStyled, {
           get leftIcon() {
             return createComponent(AtWalletIcon, {});
@@ -8953,7 +9406,7 @@ const MobileUniversalModal = (props) => {
           get children() {
             return createComponent(Translation, {
               translationKey: "walletModal.mobileUniversalModal.openWalletOnTelegram",
-              children: "Open Wallet on Telegram"
+              children: "Open Wallet in Telegram"
             });
           }
         }), createComponent(UlStyled, {
@@ -9200,6 +9653,11 @@ const WalletsModal = () => {
     locale
   } = useI18n()[1];
   createEffect(() => locale(appState.language));
+  createEffect(() => {
+    if (getWalletsModalIsOpened()) {
+      updateIsMobile();
+    }
+  });
   const connector = useContext(ConnectorContext);
   const tonConnectUI = useContext(TonConnectUiContext);
   const [fetchedWalletsList] = createResource(() => tonConnectUI.getWallets());
@@ -9239,22 +9697,28 @@ const WalletsModal = () => {
     }
     return (_a2 = appState.connectRequestParameters) == null ? void 0 : _a2.value;
   });
-  const onClose = () => {
-    setWalletsModalOpen(false);
+  const onClose = (closeReason) => {
+    setWalletsModalState({
+      status: "closed",
+      closeReason
+    });
     setSelectedWalletInfo(null);
     setInfoTab(false);
   };
   const unsubscribe = connector.onStatusChange((wallet) => {
     if (wallet) {
-      onClose();
+      onClose("wallet-selected");
     }
   });
   onCleanup(unsubscribe);
   return createComponent(StyledModal, {
     get opened() {
-      return walletsModalOpen();
+      return getWalletsModalIsOpened();
     },
-    onClose,
+    get enableAndroidBackHandler() {
+      return appState.enableAndroidBackHandler;
+    },
+    onClose: () => onClose("action-cancelled"),
     onClickQuestion: () => setInfoTab((v) => !v),
     "data-tc-wallets-modal-container": "true",
     get children() {
@@ -9379,17 +9843,21 @@ const ButtonStyled = styled(Button)`
 const ActionModal = (props) => {
   const dataAttrs = useDataAttributes(props);
   const tonConnectUI = useContext(TonConnectUiContext);
+  const [firstClick, setFirstClick] = createSignal(true);
   let universalLink;
-  if ((tonConnectUI == null ? void 0 : tonConnectUI.wallet) && "universalLink" in tonConnectUI.wallet && (tonConnectUI.wallet.openMethod === "universal-link" || isTelegramUrl(tonConnectUI.wallet.universalLink) && isInTWA())) {
+  if ((tonConnectUI == null ? void 0 : tonConnectUI.wallet) && "universalLink" in tonConnectUI.wallet && (tonConnectUI.wallet.openMethod === "universal-link" || isTelegramUrl(tonConnectUI.wallet.universalLink) && isInTMA())) {
     universalLink = tonConnectUI.wallet.universalLink;
   }
   const onOpenWallet = () => {
     const currentAction = action();
     const returnStrategy = "returnStrategy" in currentAction ? currentAction.returnStrategy : appState.returnStrategy;
     if (isTelegramUrl(universalLink)) {
+      const forceRedirect = !firstClick();
+      setFirstClick(false);
       redirectToTelegram(universalLink, {
         returnStrategy,
-        twaReturnUrl: "twaReturnUrl" in currentAction ? currentAction.twaReturnUrl : appState.twaReturnUrl
+        twaReturnUrl: "twaReturnUrl" in currentAction ? currentAction.twaReturnUrl : appState.twaReturnUrl,
+        forceRedirect
       });
     } else {
       openLinkBlank(addReturnStrategy(universalLink, returnStrategy));
@@ -9499,6 +9967,9 @@ const ActionsModal = () => {
       var _a2;
       return createMemo(() => action() !== null)() && ((_a2 = action()) == null ? void 0 : _a2.openModal) === true;
     },
+    get enableAndroidBackHandler() {
+      return appState.enableAndroidBackHandler;
+    },
     onClose: () => setAction(null),
     "data-tc-actions-modal-container": "true",
     get children() {
@@ -9587,8 +10058,14 @@ const App = (props) => {
   });
 };
 const widgetController = {
-  openWalletsModal: () => void setTimeout(() => setWalletsModalOpen(true)),
-  closeWalletsModal: () => void setTimeout(() => setWalletsModalOpen(false)),
+  openWalletsModal: () => void setTimeout(() => setWalletsModalState({
+    status: "opened",
+    closeReason: null
+  })),
+  closeWalletsModal: (reason) => void setTimeout(() => setWalletsModalState({
+    status: "closed",
+    closeReason: reason
+  })),
   setAction: (action2) => void setTimeout(() => setAction(action2)),
   clearAction: () => void setTimeout(() => setAction(null)),
   getSelectedWalletInfo: () => lastSelectedWalletInfo(),
@@ -9597,16 +10074,99 @@ const widgetController = {
     tonConnectUI
   }), document.getElementById(root))
 };
+class WalletsModalManager {
+  constructor(options) {
+    __publicField(this, "connector");
+    __publicField(this, "setConnectRequestParametersCallback");
+    __publicField(this, "consumers", []);
+    __publicField(this, "state", walletsModalState());
+    this.connector = options.connector;
+    this.setConnectRequestParametersCallback = options.setConnectRequestParametersCallback;
+    createEffect(() => {
+      const state = walletsModalState();
+      this.state = state;
+      this.consumers.forEach((consumer) => consumer(state));
+    });
+  }
+  open() {
+    return __async(this, null, function* () {
+      const walletsList = yield this.connector.getWallets();
+      const embeddedWallet = walletsList.find(isWalletInfoCurrentlyEmbedded);
+      if (embeddedWallet) {
+        return this.connectEmbeddedWallet(embeddedWallet);
+      } else {
+        return this.connectExternalWallet();
+      }
+    });
+  }
+  close() {
+    widgetController.closeWalletsModal("action-cancelled");
+  }
+  onStateChange(onChange) {
+    this.consumers.push(onChange);
+    return () => {
+      this.consumers = this.consumers.filter((consumer) => consumer !== onChange);
+    };
+  }
+  connectEmbeddedWallet(embeddedWallet) {
+    const connect = (parameters) => {
+      setLastSelectedWalletInfo(embeddedWallet);
+      this.connector.connect({ jsBridgeKey: embeddedWallet.jsBridgeKey }, parameters);
+    };
+    const additionalRequest = appState.connectRequestParameters;
+    if ((additionalRequest == null ? void 0 : additionalRequest.state) === "loading") {
+      this.setConnectRequestParametersCallback(connect);
+    } else {
+      connect(additionalRequest == null ? void 0 : additionalRequest.value);
+    }
+  }
+  connectExternalWallet() {
+    return __async(this, null, function* () {
+      if (isInTMA()) {
+        sendExpand();
+      }
+      widgetController.openWalletsModal();
+      return new Promise((resolve) => {
+        const unsubscribe = this.onStateChange((state) => {
+          const { status } = state;
+          if (status === "opened") {
+            unsubscribe();
+            resolve();
+          }
+        });
+      });
+    });
+  }
+}
+class TransactionModalManager {
+  constructor(options) {
+    __publicField(this, "connector");
+    __publicField(this, "consumers", []);
+    this.connector = options.connector;
+    createEffect(() => {
+      const _ = action();
+      this.consumers.forEach((consumer) => consumer(_));
+    });
+  }
+  onStateChange(consumer) {
+    this.consumers.push(consumer);
+    return () => {
+      this.consumers = this.consumers.filter((c2) => c2 !== consumer);
+    };
+  }
+}
 class TonConnectUI {
   constructor(options) {
     __publicField(this, "walletInfoStorage", new WalletInfoStorage());
     __publicField(this, "preferredWalletStorage", new PreferredWalletStorage());
-    __publicField(this, "connector");
     __publicField(this, "walletInfo", null);
     __publicField(this, "systemThemeChangeUnsubscribe", null);
     __publicField(this, "actionsConfiguration");
     __publicField(this, "walletsList");
     __publicField(this, "connectRequestParametersCallback");
+    __publicField(this, "connector");
+    __publicField(this, "modal");
+    __publicField(this, "transactionModal");
     __publicField(this, "connectionRestored", Promise.resolve(false));
     if (options && "connector" in options && options.connector) {
       this.connector = options.connector;
@@ -9617,6 +10177,15 @@ class TonConnectUI {
         "You have to specify a `manifestUrl` or a `connector` in the options."
       );
     }
+    this.modal = new WalletsModalManager({
+      connector: this.connector,
+      setConnectRequestParametersCallback: (callback) => {
+        this.connectRequestParametersCallback = callback;
+      }
+    });
+    this.transactionModal = new TransactionModalManager({
+      connector: this.connector
+    });
     this.walletsList = this.getWallets();
     this.walletsList.then((list) => preloadImages(uniq(list.map((item) => item.imageUrl))));
     const rootId = this.normalizeWidgetRoot(options == null ? void 0 : options.widgetRootId);
@@ -9654,12 +10223,12 @@ class TonConnectUI {
     return __spreadValues(__spreadValues({}, this.connector.wallet), this.walletInfo);
   }
   set uiOptions(options) {
-    var _a2, _b, _c, _d, _e;
+    var _a2, _b2, _c2, _d2, _e2;
     this.checkButtonRootExist(options.buttonRootId);
     this.actionsConfiguration = options.actionsConfiguration;
     if ((_a2 = options.uiPreferences) == null ? void 0 : _a2.theme) {
-      if (((_b = options.uiPreferences) == null ? void 0 : _b.theme) !== "SYSTEM") {
-        (_c = this.systemThemeChangeUnsubscribe) == null ? void 0 : _c.call(this);
+      if (((_b2 = options.uiPreferences) == null ? void 0 : _b2.theme) !== "SYSTEM") {
+        (_c2 = this.systemThemeChangeUnsubscribe) == null ? void 0 : _c2.call(this);
         setTheme(options.uiPreferences.theme, options.uiPreferences.colorsSet);
       } else {
         setTheme(getSystemTheme(), options.uiPreferences.colorsSet);
@@ -9668,19 +10237,19 @@ class TonConnectUI {
         }
       }
     } else {
-      if ((_d = options.uiPreferences) == null ? void 0 : _d.colorsSet) {
+      if ((_d2 = options.uiPreferences) == null ? void 0 : _d2.colorsSet) {
         setColors(options.uiPreferences.colorsSet);
       }
     }
-    if ((_e = options.uiPreferences) == null ? void 0 : _e.borderRadius) {
+    if ((_e2 = options.uiPreferences) == null ? void 0 : _e2.borderRadius) {
       setBorderRadius(options.uiPreferences.borderRadius);
     }
     setAppState((state) => {
-      var _a3, _b2;
+      var _a3, _b3;
       const merged = mergeOptions(
         __spreadValues(__spreadValues(__spreadValues(__spreadValues({}, options.language && { language: options.language }), !!((_a3 = options.actionsConfiguration) == null ? void 0 : _a3.returnStrategy) && {
           returnStrategy: options.actionsConfiguration.returnStrategy
-        }), !!((_b2 = options.actionsConfiguration) == null ? void 0 : _b2.twaReturnUrl) && {
+        }), !!((_b3 = options.actionsConfiguration) == null ? void 0 : _b3.twaReturnUrl) && {
           twaReturnUrl: options.actionsConfiguration.twaReturnUrl
         }), !!options.walletsListConfiguration && {
           walletsListConfiguration: options.walletsListConfiguration
@@ -9690,6 +10259,9 @@ class TonConnectUI {
       if (options.buttonRootId !== void 0) {
         merged.buttonRootId = options.buttonRootId;
       }
+      if (options.enableAndroidBackHandler !== void 0) {
+        merged.enableAndroidBackHandler = options.enableAndroidBackHandler;
+      }
       return merged;
     });
   }
@@ -9715,35 +10287,29 @@ class TonConnectUI {
       }
     }), errorsHandler);
   }
+  openModal() {
+    return __async(this, null, function* () {
+      return this.modal.open();
+    });
+  }
+  closeModal() {
+    this.modal.close();
+  }
+  onModalStateChange(onChange) {
+    return this.modal.onStateChange(onChange);
+  }
+  get modalState() {
+    return this.modal.state;
+  }
   connectWallet() {
     return __async(this, null, function* () {
       const walletsList = yield this.getWallets();
       const embeddedWallet = walletsList.find(isWalletInfoCurrentlyEmbedded);
       if (embeddedWallet) {
-        const connect = (parameters) => {
-          setLastSelectedWalletInfo(embeddedWallet);
-          this.connector.connect({ jsBridgeKey: embeddedWallet.jsBridgeKey }, parameters);
-        };
-        const additionalRequest = appState.connectRequestParameters;
-        if ((additionalRequest == null ? void 0 : additionalRequest.state) === "loading") {
-          this.connectRequestParametersCallback = connect;
-        } else {
-          connect(additionalRequest == null ? void 0 : additionalRequest.value);
-        }
+        return yield this.connectEmbeddedWallet(embeddedWallet);
       } else {
-        widgetController.openWalletsModal();
+        return yield this.connectExternalWallet();
       }
-      return new Promise((resolve, reject) => {
-        const unsubscribe = this.connector.onStatusChange((wallet) => __async(this, null, function* () {
-          unsubscribe();
-          if (wallet) {
-            const lastSelectedWalletInfo2 = yield this.getSelectedWalletInfo(wallet);
-            resolve(__spreadValues(__spreadValues({}, wallet), lastSelectedWalletInfo2 || this.walletInfoStorage.getWalletInfo()));
-          } else {
-            reject(new TonConnectUIError("Wallet was not connected"));
-          }
-        }), reject);
-      });
     });
   }
   disconnect() {
@@ -9757,23 +10323,48 @@ class TonConnectUI {
       if (!this.connected) {
         throw new TonConnectUIError("Connect wallet to send a transaction.");
       }
-      const { notifications: notifications2, modals, returnStrategy, twaReturnUrl, skipRedirectToWallet } = this.getModalsAndNotificationsConfiguration(options);
-      const userOSIsIos = getUserAgent().os === "ios";
-      const shouldSkipRedirectToWallet = skipRedirectToWallet === "ios" && userOSIsIos || skipRedirectToWallet === "always";
-      if (this.walletInfo && "universalLink" in this.walletInfo && this.walletInfo.openMethod === "universal-link" && !shouldSkipRedirectToWallet) {
-        if (isTelegramUrl(this.walletInfo.universalLink)) {
-          redirectToTelegram(this.walletInfo.universalLink, { returnStrategy, twaReturnUrl });
-        } else {
-          openLinkBlank(addReturnStrategy(this.walletInfo.universalLink, returnStrategy));
-        }
+      if (isInTMA()) {
+        sendExpand();
       }
+      const { notifications: notifications2, modals, returnStrategy, twaReturnUrl, skipRedirectToWallet } = this.getModalsAndNotificationsConfiguration(options);
       widgetController.setAction({
         name: "confirm-transaction",
         showNotification: notifications2.includes("before"),
         openModal: modals.includes("before")
       });
+      const onRequestSent = () => {
+        const userOSIsIos = getUserAgent().os === "ios";
+        const shouldSkipRedirectToWallet = skipRedirectToWallet === "ios" && userOSIsIos || skipRedirectToWallet === "always";
+        if (this.walletInfo && "universalLink" in this.walletInfo && this.walletInfo.openMethod === "universal-link" && !shouldSkipRedirectToWallet) {
+          if (isTelegramUrl(this.walletInfo.universalLink)) {
+            redirectToTelegram(this.walletInfo.universalLink, {
+              returnStrategy,
+              twaReturnUrl: twaReturnUrl || appState.twaReturnUrl,
+              forceRedirect: false
+            });
+          } else {
+            openLinkBlank(addReturnStrategy(this.walletInfo.universalLink, returnStrategy));
+          }
+        }
+      };
+      const abortController = new AbortController();
+      const unsubscribe = this.onTransactionModalStateChange((action2) => {
+        if (action2 == null ? void 0 : action2.openModal) {
+          return;
+        }
+        unsubscribe();
+        if (!action2) {
+          abortController.abort();
+        }
+      });
       try {
-        const result = yield this.connector.sendTransaction(tx);
+        const result = yield this.waitForSendTransaction(
+          {
+            transaction: tx,
+            abortSignal: abortController.signal
+          },
+          onRequestSent
+        );
         widgetController.setAction({
           name: "transaction-sent",
           showNotification: notifications2.includes("success"),
@@ -9792,9 +10383,110 @@ class TonConnectUI {
           console.error(e2);
           throw new TonConnectUIError("Unhandled error:" + e2);
         }
+      } finally {
+        unsubscribe();
+      }
+    });
+  }
+  connectEmbeddedWallet(embeddedWallet) {
+    return __async(this, null, function* () {
+      const connect = (parameters) => {
+        setLastSelectedWalletInfo(embeddedWallet);
+        this.connector.connect({ jsBridgeKey: embeddedWallet.jsBridgeKey }, parameters);
+      };
+      const additionalRequest = appState.connectRequestParameters;
+      if ((additionalRequest == null ? void 0 : additionalRequest.state) === "loading") {
+        this.connectRequestParametersCallback = connect;
+      } else {
+        connect(additionalRequest == null ? void 0 : additionalRequest.value);
       }
+      return yield this.waitForWalletConnection({
+        ignoreErrors: false
+      });
     });
   }
+  connectExternalWallet() {
+    return __async(this, null, function* () {
+      const abortController = new AbortController();
+      widgetController.openWalletsModal();
+      const unsubscribe = this.onModalStateChange((state) => {
+        const { status, closeReason } = state;
+        if (status === "opened") {
+          return;
+        }
+        unsubscribe();
+        if (closeReason === "action-cancelled") {
+          abortController.abort();
+        }
+      });
+      return yield this.waitForWalletConnection({
+        ignoreErrors: true,
+        abortSignal: abortController.signal
+      });
+    });
+  }
+  waitForWalletConnection(options) {
+    return __async(this, null, function* () {
+      return new Promise((resolve, reject) => {
+        const { ignoreErrors = false, abortSignal = null } = options;
+        if (abortSignal && abortSignal.aborted) {
+          return reject(new TonConnectUIError("Wallet was not connected"));
+        }
+        const onStatusChangeHandler = (wallet) => __async(this, null, function* () {
+          if (!wallet) {
+            if (ignoreErrors) {
+              return;
+            }
+            unsubscribe();
+            reject(new TonConnectUIError("Wallet was not connected"));
+          } else {
+            unsubscribe();
+            resolve(wallet);
+          }
+        });
+        const onErrorsHandler = (reason) => {
+          if (ignoreErrors) {
+            return;
+          }
+          unsubscribe();
+          reject(reason);
+        };
+        const unsubscribe = this.onStatusChange(
+          (wallet) => onStatusChangeHandler(wallet),
+          (reason) => onErrorsHandler(reason)
+        );
+        if (abortSignal) {
+          abortSignal.addEventListener("abort", () => {
+            unsubscribe();
+            reject(new TonConnectUIError("Wallet was not connected"));
+          });
+        }
+      });
+    });
+  }
+  waitForSendTransaction(options, onRequestSent) {
+    return __async(this, null, function* () {
+      return new Promise((resolve, reject) => {
+        const { transaction, abortSignal } = options;
+        if (abortSignal.aborted) {
+          return reject(new TonConnectUIError("Transaction was not sent"));
+        }
+        const onTransactionHandler = (transaction2) => __async(this, null, function* () {
+          resolve(transaction2);
+        });
+        const onErrorsHandler = (reason) => {
+          reject(reason);
+        };
+        this.connector.sendTransaction(transaction, onRequestSent).then((result) => onTransactionHandler(result)).catch((reason) => onErrorsHandler(reason));
+        abortSignal.addEventListener("abort", () => {
+          reject(new TonConnectUIError("Transaction was not sent"));
+        });
+      });
+    });
+  }
+  onTransactionModalStateChange(onChange) {
+    return this.transactionModal.onStateChange(onChange);
+  }
   subscribeToWalletChange() {
     this.connector.onStatusChange((wallet) => __async(this, null, function* () {
       var _a2;
@@ -9871,14 +10563,14 @@ class TonConnectUI {
     }
   }
   getModalsAndNotificationsConfiguration(options) {
-    var _a2, _b, _c, _d, _e, _f;
+    var _a2, _b2, _c2, _d2, _e2, _f2;
     const allActions = [
       "before",
       "success",
       "error"
     ];
     let notifications2 = allActions;
-    if (((_a2 = this.actionsConfiguration) == null ? void 0 : _a2.notifications) && ((_b = this.actionsConfiguration) == null ? void 0 : _b.notifications) !== "all") {
+    if (((_a2 = this.actionsConfiguration) == null ? void 0 : _a2.notifications) && ((_b2 = this.actionsConfiguration) == null ? void 0 : _b2.notifications) !== "all") {
       notifications2 = this.actionsConfiguration.notifications;
     }
     if (options == null ? void 0 : options.notifications) {
@@ -9889,7 +10581,7 @@ class TonConnectUI {
       }
     }
     let modals = ["before"];
-    if ((_c = this.actionsConfiguration) == null ? void 0 : _c.modals) {
+    if ((_c2 = this.actionsConfiguration) == null ? void 0 : _c2.modals) {
       if (this.actionsConfiguration.modals === "all") {
         modals = allActions;
       } else {
@@ -9903,9 +10595,12 @@ class TonConnectUI {
         modals = options.modals;
       }
     }
-    const returnStrategy = (options == null ? void 0 : options.returnStrategy) || ((_d = this.actionsConfiguration) == null ? void 0 : _d.returnStrategy) || "back";
-    const twaReturnUrl = (options == null ? void 0 : options.twaReturnUrl) || ((_e = this.actionsConfiguration) == null ? void 0 : _e.twaReturnUrl);
-    const skipRedirectToWallet = (options == null ? void 0 : options.skipRedirectToWallet) || ((_f = this.actionsConfiguration) == null ? void 0 : _f.skipRedirectToWallet) || "ios";
+    const returnStrategy = (options == null ? void 0 : options.returnStrategy) || ((_d2 = this.actionsConfiguration) == null ? void 0 : _d2.returnStrategy) || "back";
+    const twaReturnUrl = (options == null ? void 0 : options.twaReturnUrl) || ((_e2 = this.actionsConfiguration) == null ? void 0 : _e2.twaReturnUrl);
+    let skipRedirectToWallet = (options == null ? void 0 : options.skipRedirectToWallet) || ((_f2 = this.actionsConfiguration) == null ? void 0 : _f2.skipRedirectToWallet) || "ios";
+    if (isInTMA()) {
+      skipRedirectToWallet = "never";
+    }
     return {
       notifications: notifications2,
       modals,
@@ -9920,4 +10615,4 @@ export {
   TonConnectUI,
   TonConnectUIError
 };
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.mjs.map