@tonconnect/ui 2.0.1-beta.1 → 2.0.1-beta.3

package/lib/index.cjs

@@ -1754,7 +1754,32 @@ class TonConnectUIError extends sdk.TonConnectError {
     Object.setPrototypeOf(this, TonConnectUIError.prototype);
   }
 }
+function logDebug(...args) {
+  {
+    try {
+      console.debug("[TON_CONNECT_UI]", ...args);
+    } catch (e2) {
+    }
+  }
+}
+function logError(...args) {
+  {
+    try {
+      console.error("[TON_CONNECT_UI]", ...args);
+    } catch (e2) {
+    }
+  }
+}
+function logWarning(...args) {
+  {
+    try {
+      console.warn("[TON_CONNECT_UI]", ...args);
+    } catch (e2) {
+    }
+  }
+}
 function openLink(href, target = "_self") {
+  logDebug("openLink", href, target);
   window.open(href, target, "noopener noreferrer");
 }
 function openLinkBlank(href) {
@@ -1762,7 +1787,7 @@ function openLinkBlank(href) {
 }
 function openDeeplinkWithFallback(href, fallback) {
   const doFallback = () => {
-    if (isBrowser("safari")) {
+    if (isBrowser("safari") || isOS("android") && isBrowser("firefox")) {
       return;
     }
     fallback();
@@ -1882,6 +1907,9 @@ function getUserAgent() {
     case (browserName == null ? void 0 : browserName.includes("safari")):
       browser = "safari";
       break;
+    case (browserName == null ? void 0 : browserName.includes("opera")):
+      browser = "opera";
+      break;
   }
   return {
     os,
@@ -2631,22 +2659,6 @@ 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();
@@ -2679,12 +2691,18 @@ function isInTMA() {
 function sendExpand() {
   postEvent("web_app_expand", {});
 }
-function sendOpenTelegramLink(link) {
+function sendOpenTelegramLink(link, fallback) {
   const url = new URL(link);
   if (url.protocol !== "http:" && url.protocol !== "https:") {
+    if (fallback) {
+      return fallback();
+    }
     throw new TonConnectUIError(`Url protocol is not supported: ${url}`);
   }
   if (url.hostname !== "t.me") {
+    if (fallback) {
+      return fallback();
+    }
     throw new TonConnectUIError(`Url host is not supported: ${url}`);
   }
   const pathFull = url.pathname + url.search;
@@ -2712,12 +2730,15 @@ function postEvent(eventType, eventData) {
       throw new TonConnectUIError(`Can't post event to parent window: window is not defined`);
     }
     if (window2.TelegramWebviewProxy !== void 0) {
+      logDebug("postEvent", eventType, eventData);
       window2.TelegramWebviewProxy.postEvent(eventType, JSON.stringify(eventData));
     } else if (window2.external && "notify" in window2.external) {
+      logDebug("postEvent", eventType, eventData);
       window2.external.notify(JSON.stringify({ eventType, eventData }));
     } else if (isIframe()) {
       const trustedTarget = "*";
       const message = JSON.stringify({ eventType, eventData });
+      logDebug("postEvent", eventType, eventData);
       window2.parent.postMessage(message, trustedTarget);
     } else {
       throw new TonConnectUIError(`Can't post event to TMA`);
@@ -8313,9 +8334,46 @@ function redirectToTelegram(universalLink, options) {
       openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options));
     }
   } else {
-    if (isOS("ios", "android")) {
-      options.returnStrategy = location.href;
-      openLinkBlank(addReturnStrategy(directLinkUrl.toString(), options.returnStrategy));
+    if (isOS("ios")) {
+      if (options.returnStrategy === "back") {
+        options.returnStrategy = location.href;
+      }
+      const isChrome = isBrowser("chrome");
+      const isFirefox = isBrowser("firefox");
+      const useDeepLink = (isChrome || isFirefox) && !options.forceRedirect;
+      if (useDeepLink) {
+        const linkWithStrategy = addReturnStrategy(
+          directLinkUrl.toString(),
+          options.returnStrategy
+        );
+        const deepLink = convertToTGDeepLink(linkWithStrategy);
+        openDeeplinkWithFallback(deepLink, () => openLinkBlank(linkWithStrategy));
+      } else {
+        const linkWithStrategy = addReturnStrategy(
+          directLinkUrl.toString(),
+          options.returnStrategy
+        );
+        openLinkBlank(linkWithStrategy);
+      }
+    } else if (isOS("android")) {
+      options.returnStrategy = "none";
+      const isChrome = isBrowser("chrome");
+      const isFirefox = isBrowser("firefox");
+      const useDeepLink = (isChrome || isFirefox) && !options.forceRedirect;
+      if (useDeepLink) {
+        const linkWithStrategy = addReturnStrategy(
+          directLinkUrl.toString(),
+          options.returnStrategy
+        );
+        const deepLink = convertToTGDeepLink(linkWithStrategy);
+        openDeeplinkWithFallback(deepLink, () => openLinkBlank(linkWithStrategy));
+      } else {
+        const linkWithStrategy = addReturnStrategy(
+          directLinkUrl.toString(),
+          options.returnStrategy
+        );
+        openLinkBlank(linkWithStrategy);
+      }
     } else if (isOS("macos", "windows", "linux")) {
       options.returnStrategy = "none";
       options.twaReturnUrl = void 0;
@@ -8331,6 +8389,160 @@ function redirectToTelegram(universalLink, options) {
     }
   }
 }
+function redirectToWallet(universalLink, deepLink, options, setOpenMethod) {
+  options = __spreadValues({}, options);
+  if (isInTMA()) {
+    if (isTmaPlatform("ios", "android")) {
+      if (options.returnStrategy === "back") {
+        options.returnStrategy = "tg://resolve";
+      }
+      setOpenMethod("universal-link");
+      const linkWitStrategy = addReturnStrategy(universalLink, options.returnStrategy);
+      sendOpenTelegramLink(linkWitStrategy, () => {
+        setOpenMethod("universal-link");
+        openLinkBlank(linkWitStrategy);
+      });
+    } else if (isTmaPlatform("macos", "tdesktop")) {
+      if (options.returnStrategy === "back") {
+        options.returnStrategy = "tg://resolve";
+      }
+      const linkWitStrategy = addReturnStrategy(universalLink, options.returnStrategy);
+      const useDeepLink = !!deepLink && !options.forceRedirect;
+      if (useDeepLink) {
+        setOpenMethod("custom-deeplink");
+        openDeeplinkWithFallback(toDeeplink(linkWitStrategy, deepLink), () => {
+          setOpenMethod("universal-link");
+          openLinkBlank(linkWitStrategy);
+        });
+      } else {
+        setOpenMethod("universal-link");
+        openLinkBlank(linkWitStrategy);
+      }
+    } else if (isTmaPlatform("weba")) {
+      if (options.returnStrategy === "back") {
+        if (isBrowser("safari")) {
+          options.returnStrategy = location.href;
+        } else if (isBrowser("chrome")) {
+          options.returnStrategy = "googlechrome://";
+        } else if (isBrowser("firefox")) {
+          options.returnStrategy = "firefox://";
+        } else if (isBrowser("opera")) {
+          options.returnStrategy = "opera-http://";
+        } else {
+          options.returnStrategy = location.href;
+        }
+      }
+      const linkWitStrategy = addReturnStrategy(universalLink, options.returnStrategy);
+      const useDeepLink = !!deepLink && !options.forceRedirect;
+      if (useDeepLink) {
+        setOpenMethod("custom-deeplink");
+        openDeeplinkWithFallback(toDeeplink(linkWitStrategy, deepLink), () => {
+          setOpenMethod("universal-link");
+          openLinkBlank(linkWitStrategy);
+        });
+      } else {
+        setOpenMethod("universal-link");
+        openLinkBlank(linkWitStrategy);
+      }
+    } else if (isTmaPlatform("web")) {
+      if (options.returnStrategy === "back") {
+        if (isBrowser("safari")) {
+          options.returnStrategy = location.href;
+        } else if (isBrowser("chrome")) {
+          options.returnStrategy = "googlechrome://";
+        } else if (isBrowser("firefox")) {
+          options.returnStrategy = "firefox://";
+        } else if (isBrowser("opera")) {
+          options.returnStrategy = "opera-http://";
+        } else {
+          options.returnStrategy = location.href;
+        }
+      }
+      const linkWitStrategy = addReturnStrategy(universalLink, options.returnStrategy);
+      const useDeepLink = !!deepLink && !options.forceRedirect;
+      if (useDeepLink) {
+        setOpenMethod("custom-deeplink");
+        openDeeplinkWithFallback(toDeeplink(linkWitStrategy, deepLink), () => {
+          setOpenMethod("universal-link");
+          openLinkBlank(linkWitStrategy);
+        });
+      } else {
+        setOpenMethod("universal-link");
+        openLinkBlank(linkWitStrategy);
+      }
+    } else {
+      setOpenMethod("universal-link");
+      const linkWitStrategy = addReturnStrategy(universalLink, options.returnStrategy);
+      openLinkBlank(linkWitStrategy);
+    }
+  } else {
+    if (isOS("ios")) {
+      if (options.returnStrategy === "back") {
+        if (isBrowser("safari")) {
+          options.returnStrategy = location.href;
+        } else if (isBrowser("chrome")) {
+          options.returnStrategy = "googlechrome://";
+        } else if (isBrowser("firefox")) {
+          options.returnStrategy = "firefox://";
+        } else if (isBrowser("opera")) {
+          options.returnStrategy = "opera-http://";
+        } else {
+          options.returnStrategy = location.href;
+        }
+      }
+      if (isBrowser("chrome")) {
+        setOpenMethod("universal-link");
+        openLink(addReturnStrategy(universalLink, options.returnStrategy), "_self");
+      } else {
+        setOpenMethod("universal-link");
+        openLinkBlank(addReturnStrategy(universalLink, options.returnStrategy));
+      }
+    } else if (isOS("android")) {
+      if (options.returnStrategy === "back") {
+        if (isBrowser("chrome")) {
+          options.returnStrategy = "googlechrome://";
+        } else if (isBrowser("firefox")) {
+          options.returnStrategy = "firefox://";
+        } else if (isBrowser("opera")) {
+          options.returnStrategy = "opera-http://";
+        } else {
+          options.returnStrategy = location.href;
+        }
+      }
+      setOpenMethod("universal-link");
+      openLinkBlank(addReturnStrategy(universalLink, options.returnStrategy));
+    } else if (isOS("macos", "windows", "linux")) {
+      if (options.returnStrategy === "back") {
+        if (isBrowser("safari")) {
+          options.returnStrategy = "none";
+        } else if (isBrowser("chrome")) {
+          options.returnStrategy = "googlechrome://";
+        } else if (isBrowser("firefox")) {
+          options.returnStrategy = "firefox://";
+        } else if (isBrowser("opera")) {
+          options.returnStrategy = "opera-http://";
+        } else {
+          options.returnStrategy = "none";
+        }
+      }
+      const linkWitStrategy = addReturnStrategy(universalLink, options.returnStrategy);
+      const useDeepLink = !!deepLink && !options.forceRedirect;
+      if (useDeepLink) {
+        setOpenMethod("custom-deeplink");
+        openDeeplinkWithFallback(toDeeplink(linkWitStrategy, deepLink), () => {
+          setOpenMethod("universal-link");
+          openLinkBlank(linkWitStrategy);
+        });
+      } else {
+        setOpenMethod("universal-link");
+        openLinkBlank(linkWitStrategy);
+      }
+    } else {
+      setOpenMethod("universal-link");
+      openLinkBlank(addReturnStrategy(universalLink, options.returnStrategy));
+    }
+  }
+}
 function addQueryParameter(url, key, value) {
   const parsed = new URL(url);
   parsed.searchParams.append(key, value);
@@ -8350,7 +8562,6 @@ function convertToTGDeepLink(directLink) {
   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);
@@ -8391,25 +8602,16 @@ const DesktopConnectionModal = (props) => {
       generateUniversalLink();
     }
     setMode("desktop");
-    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 {
+    const forceRedirect = !firstClick();
+    setFirstClick(false);
+    redirectToWallet(universalLink(), props.wallet.deepLink, {
+      returnStrategy: appState.returnStrategy,
+      forceRedirect
+    }, (method) => {
       setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
-        openMethod: "universal-link"
+        openMethod: method
       }));
-      openLinkBlank(linkWithStrategy);
-    }
+    });
   };
   const onClickTelegram = () => {
     const forceRedirect = !firstClick();
@@ -8979,6 +9181,7 @@ const MobileConnectionQR = (props) => {
 };
 const MobileConnectionModal = (props) => {
   const theme = useTheme();
+  const [firstClick, setFirstClick] = createSignal(true);
   const [showQR, setShowQR] = createSignal(false);
   const [connectionErrored, setConnectionErrored] = createSignal(false);
   const connector = useContext(ConnectorContext);
@@ -9007,10 +9210,16 @@ const MobileConnectionModal = (props) => {
       return onClickTelegram();
     }
     setConnectionErrored(false);
-    setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
-      openMethod: "universal-link"
-    }));
-    openLinkBlank(addReturnStrategy(universalLink(), appState.returnStrategy));
+    const forceRedirect = !firstClick();
+    setFirstClick(false);
+    redirectToWallet(universalLink(), props.wallet.deepLink, {
+      returnStrategy: appState.returnStrategy,
+      forceRedirect
+    }, (method) => {
+      setLastSelectedWalletInfo(__spreadProps(__spreadValues({}, props.wallet), {
+        openMethod: method
+      }));
+    });
   };
   const onOpenQR = () => {
     setConnectionErrored(false);
@@ -9374,7 +9583,16 @@ const MobileUniversalModal = (props) => {
     setIsCopiedShown(timeoutId);
   });
   const onSelectUniversal = () => {
-    openLinkBlank(addReturnStrategy(getUniversalLink(), appState.returnStrategy));
+    const forceRedirect = !firstClick();
+    setFirstClick(false);
+    redirectToWallet(getUniversalLink(), void 0, {
+      returnStrategy: appState.returnStrategy,
+      forceRedirect
+    }, (method) => {
+      setLastSelectedWalletInfo({
+        openMethod: method
+      });
+    });
   };
   const onSelectTelegram = () => {
     const atWallet = props.walletsList.find((wallet) => wallet.appName === AT_WALLET_APP_NAME);
@@ -9896,19 +10114,27 @@ const ActionModal = (props) => {
   if ((tonConnectUI == null ? void 0 : tonConnectUI.wallet) && "universalLink" in tonConnectUI.wallet && (tonConnectUI.wallet.openMethod === "universal-link" || sdk.isTelegramUrl(tonConnectUI.wallet.universalLink) && isInTMA())) {
     universalLink = tonConnectUI.wallet.universalLink;
   }
+  let deepLink;
+  if ((tonConnectUI == null ? void 0 : tonConnectUI.wallet) && "deepLink" in tonConnectUI.wallet && (tonConnectUI.wallet.openMethod === "custom-deeplink" || sdk.isTelegramUrl(tonConnectUI.wallet.deepLink) && isInTMA())) {
+    deepLink = tonConnectUI.wallet.deepLink;
+  }
   const onOpenWallet = () => {
     const currentAction = action();
     const returnStrategy = "returnStrategy" in currentAction ? currentAction.returnStrategy : appState.returnStrategy;
+    const forceRedirect = !firstClick();
+    setFirstClick(false);
     if (sdk.isTelegramUrl(universalLink)) {
-      const forceRedirect = !firstClick();
-      setFirstClick(false);
       redirectToTelegram(universalLink, {
         returnStrategy,
         twaReturnUrl: "twaReturnUrl" in currentAction ? currentAction.twaReturnUrl : appState.twaReturnUrl,
         forceRedirect
       });
     } else {
-      openLinkBlank(addReturnStrategy(universalLink, returnStrategy));
+      redirectToWallet(universalLink, deepLink, {
+        returnStrategy,
+        forceRedirect
+      }, () => {
+      });
     }
   };
   return createComponent(ActionModalStyled, mergeProps(dataAttrs, {