@tonconnect/ui 2.0.1 → 2.0.2-beta.0

package/lib/index.mjs

@@ -6932,12 +6932,16 @@ function useOpenedNotifications(config) {
   const [timeoutIds, setTimeoutIds] = createSignal([]);
   createEffect(
     on(action, (action2) => {
+      var _a2;
       if (!action2 || !action2.showNotification) {
         return;
       }
       if (latestAction() === action2) {
         return;
       }
+      if (((_a2 = latestAction()) == null ? void 0 : _a2.name) === "confirm-transaction" && action2.name === "confirm-transaction") {
+        return;
+      }
       setLatestAction(action2);
       setOpenedNotifications(
         (openedNotifications2) => openedNotifications2.filter((n2) => n2.action !== "confirm-transaction")
@@ -8337,7 +8341,17 @@ function redirectToTelegram(universalLink, options) {
   } else {
     if (isOS("ios")) {
       if (options.returnStrategy === "back") {
-        options.returnStrategy = location.href;
+        if (isBrowser("safari")) {
+          options.returnStrategy = "back";
+        } 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 isChrome = isBrowser("chrome");
       const isFirefox = isBrowser("firefox");
@@ -8377,7 +8391,17 @@ function redirectToTelegram(universalLink, options) {
       }
     } else if (isOS("ipad")) {
       if (options.returnStrategy === "back") {
-        options.returnStrategy = "back";
+        if (isBrowser("safari")) {
+          options.returnStrategy = "back";
+        } 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 isChrome = isBrowser("chrome");
       const isFirefox = isBrowser("firefox");
@@ -8501,7 +8525,7 @@ function redirectToWallet(universalLink, deepLink, options, setOpenMethod) {
     if (isOS("ios")) {
       if (options.returnStrategy === "back") {
         if (isBrowser("safari")) {
-          options.returnStrategy = location.href;
+          options.returnStrategy = "none";
         } else if (isBrowser("chrome")) {
           options.returnStrategy = "googlechrome://";
         } else if (isBrowser("firefox")) {
@@ -8535,7 +8559,17 @@ function redirectToWallet(universalLink, deepLink, options, setOpenMethod) {
       openLinkBlank(addReturnStrategy(universalLink, options.returnStrategy));
     } else if (isOS("ipad")) {
       if (options.returnStrategy === "back") {
-        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 = location.href;
+        }
       }
       if (isBrowser("chrome")) {
         setOpenMethod("universal-link");
@@ -10201,7 +10235,7 @@ const ActionModal = (props) => {
         }
       }), createComponent(Show, {
         get when() {
-          return !sent();
+          return !sent() && (props.showButton === "open-wallet" && universalLink || props.showButton !== "open-wallet");
         },
         get children() {
           return createComponent(LoaderButtonStyled, {
@@ -10598,8 +10632,8 @@ class TransactionModalManager {
     __publicField(this, "consumers", []);
     this.connector = options.connector;
     createEffect(() => {
-      const _ = action();
-      this.consumers.forEach((consumer) => consumer(_));
+      const currentAction = action();
+      this.consumers.forEach((consumer) => consumer(currentAction));
     });
   }
   onStateChange(consumer) {
@@ -10892,9 +10926,7 @@ class TonConnectUI {
           openModal: modals.includes("before"),
           sent: true
         });
-        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 (this.walletInfo && "universalLink" in this.walletInfo && (this.walletInfo.openMethod === "universal-link" || this.walletInfo.openMethod === "custom-deeplink")) {
           if (isTelegramUrl(this.walletInfo.universalLink)) {
             redirectToTelegram(this.walletInfo.universalLink, {
               returnStrategy,
@@ -10902,7 +10934,16 @@ class TonConnectUI {
               forceRedirect: false
             });
           } else {
-            openLinkBlank(addReturnStrategy(this.walletInfo.universalLink, returnStrategy));
+            redirectToWallet(
+              this.walletInfo.universalLink,
+              this.walletInfo.deepLink,
+              {
+                returnStrategy,
+                forceRedirect: false
+              },
+              () => {
+              }
+            );
           }
         }
       };