From e6d7bee87a5cd50c03570e06dd19394b4ae6876b Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 25 Jul 2024 13:21:11 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../DefaultLegacyWalletConnectRepository.kt   |  3 ++-
 .../domain/LegacyWalletConnectRepository.kt   |  2 ++
 .../domain/WalletConnectInteractor.kt         | 20 +++++++++++++++++--
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt
index acee05571c..4f9055bfb4 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/data/DefaultLegacyWalletConnectRepository.kt
@@ -35,7 +35,8 @@ internal class DefaultLegacyWalletConnectRepository(
     private val _activeSessions: MutableSharedFlow<List<WalletConnectSession>> = MutableSharedFlow()
     override val activeSessions: Flow<List<WalletConnectSession>> = _activeSessions
 
-    private var currentSessions: List<WalletConnectSession> = emptyList()
+    override var currentSessions: List<WalletConnectSession> = emptyList()
+        private set
 
     /**
      * @param projectId Project ID at https://cloud.walletconnect.com/
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/LegacyWalletConnectRepository.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/LegacyWalletConnectRepository.kt
index 9096e879e0..616643a960 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/LegacyWalletConnectRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/LegacyWalletConnectRepository.kt
@@ -9,6 +9,8 @@ interface LegacyWalletConnectRepository {
 
     val activeSessions: Flow<List<WalletConnectSession>>
 
+    val currentSessions: List<WalletConnectSession>
+
     fun init(projectId: String)
 
     fun setUserNamespaces(userNamespaces: Map<NetworkNamespace, List<Account>>)
diff --git a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt
index 66f8b5d16c..ae9d50d6cf 100644
--- a/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/walletconnect2/domain/WalletConnectInteractor.kt
@@ -1,5 +1,6 @@
 package com.tangem.tap.domain.walletconnect2.domain
 
+import android.net.Uri
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.blockchainsdk.utils.toNetworkId
 import com.tangem.domain.tokens.model.CryptoCurrency
@@ -132,6 +133,7 @@ class WalletConnectInteractor(
         runCatching {
             if (accounts.isEmpty()) return
             isWalletConnectReadyForDeepLinks = true
+            if (deeplinkStack.empty()) return
             val lastDeeplink = deeplinkStack.pop()
             store.dispatchOnMain(WalletConnectAction.OpenSession(lastDeeplink))
         }.onFailure {
@@ -361,6 +363,18 @@ class WalletConnectInteractor(
      * @param deeplink deeplink to handle
      */
     fun addDeeplink(deeplink: String) {
+        val deeplinkQueries = deeplink.split(WC_SPLIT_CHAR).lastOrNull()
+        val sessionTopic = deeplinkQueries?.let { Uri.parse(it).getQueryParameter(WC_TOPIC_QUERY_NAME) }
+
+        val isAlreadyActiveSessionTopic = walletConnectRepository.currentSessions.any { session ->
+            session.topic == sessionTopic
+        }
+
+        if (isAlreadyActiveSessionTopic && deeplinkQueries != null) {
+            Timber.i("WC already has an active session topic: $deeplink")
+            return
+        }
+
         if (isWalletConnectReadyForDeepLinks) {
             store.dispatchOnMain(WalletConnectAction.OpenSession(deeplink))
         } else {
@@ -406,7 +420,9 @@ class WalletConnectInteractor(
         return sessionRequestConverter.prepareRequest(sessionRequest, userWalletId)
     }
 
-    companion object {
-        private const val WC_SCHEME = "wc"
+    private companion object {
+        const val WC_SCHEME = "wc"
+        const val WC_TOPIC_QUERY_NAME = "sessionTopic"
+        const val WC_SPLIT_CHAR = "/"
     }
 }
\ No newline at end of file