From 251b00f7a4d8304dbb60b27b49e6ce662315ede7 Mon Sep 17 00:00:00 2001
From: Quentin Jaccarino <quentin.jaccarino@ledger.fr>
Date: Tue, 13 Feb 2024 11:46:29 +0100
Subject: [PATCH] Merge pull request #6175 from LedgerHQ/bugfix/LIVE-11270

fix: LLD wallet connect deep link handling for requests [LIVE-11270]
---
 .changeset/fair-adults-marry.md                     |  5 +++++
 .../src/renderer/hooks/useDeeplinking.ts            | 13 ++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 .changeset/fair-adults-marry.md

diff --git a/.changeset/fair-adults-marry.md b/.changeset/fair-adults-marry.md
new file mode 100644
index 000000000000..20400f02feee
--- /dev/null
+++ b/.changeset/fair-adults-marry.md
@@ -0,0 +1,5 @@
+---
+"ledger-live-desktop": patch
+---
+
+fix: LLD wallet connect deeplink handling for requests [LIVE-11270]
diff --git a/apps/ledger-live-desktop/src/renderer/hooks/useDeeplinking.ts b/apps/ledger-live-desktop/src/renderer/hooks/useDeeplinking.ts
index ee307d3f33e7..8613db07adfc 100644
--- a/apps/ledger-live-desktop/src/renderer/hooks/useDeeplinking.ts
+++ b/apps/ledger-live-desktop/src/renderer/hooks/useDeeplinking.ts
@@ -306,6 +306,17 @@ export function useDeepLinkHandler() {
           }
           break;
         case "wc": {
+          // Only prevent requests if already on the wallet connect live-app
+          if (location.pathname === "/platform/ledger-wallet-connect") {
+            try {
+              // Prevent a request from updating the live-app url and reloading it
+              if (query.uri && new URL(query.uri).searchParams.get("requestId")) {
+                return;
+              }
+            } catch {
+              // Fall back on navigation to the live-app in case of an invalid URL
+            }
+          }
           setTrackingSource("deeplink");
           navigate("/platform/ledger-wallet-connect", query);
 
@@ -329,7 +340,7 @@ export function useDeepLinkHandler() {
           break;
       }
     },
-    [accounts, dispatch, navigate, setUrl],
+    [accounts, dispatch, location.pathname, navigate, setUrl],
   );
   return {
     handler,