From f7a4e4ddbbf59054825254216164d61cc367b8ea Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 17 Jul 2023 19:37:30 +0400 Subject: [PATCH] Updated on 2026-08-14 --- .../walletconnect2/domain/WalletConnectInteractor.kt | 8 ++++++++ .../redux/walletconnect/WalletConnectMiddleware.kt | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) 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 5bd6d8f0a1..e37d7c2949 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 @@ -227,7 +227,15 @@ class WalletConnectInteractor( } } + fun isWalletConnectUri(uri: String): Boolean { + return uri.lowercase().startsWith(WC_SCHEME) + } + private suspend fun prepareRequestData(sessionRequest: WalletConnectEvents.SessionRequest): WcPreparedRequest? { return sessionRequestConverter.prepareRequest(sessionRequest, userWalletId) } + + companion object { + private const val WC_SCHEME = "wc" + } } \ No newline at end of file diff --git a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt index 802ad1b140..b3b5057a76 100644 --- a/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt +++ b/app/src/main/java/com/tangem/tap/features/details/redux/walletconnect/WalletConnectMiddleware.kt @@ -70,7 +70,7 @@ class WalletConnectMiddleware { } is WalletConnectAction.StartWalletConnect -> { val uri = action.copiedUri - if (uri != null && WalletConnectManager.isCorrectWcUri(uri)) { + if (uri != null && isWalletConnectUri(uri)) { store.dispatchOnMain(WalletConnectAction.ShowClipboardOrScanQrDialog(uri)) } else { store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.QrScan)) @@ -442,4 +442,8 @@ class WalletConnectMiddleware { ) return walletState.getWalletManager(blockchainNetwork) } + + private fun isWalletConnectUri(uri: String): Boolean { + return WalletConnectManager.isCorrectWcUri(uri) || walletConnectInteractor.isWalletConnectUri(uri) + } } \ No newline at end of file