From 1b2c087d0858b0c973bdac26963a9b85ae8f57fc Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 31 Oct 2022 15:49:34 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../ui/walletconnect/WalletConnectScreen.kt        | 14 ++++++++++++--
 .../ui/walletconnect/WalletConnectViewModel.kt     |  8 +-------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt
index 168bd4a024..499f31ddcf 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectScreen.kt
@@ -30,6 +30,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.compose.TangemTypography
 import com.tangem.tap.common.extensions.getFromClipboard
 import com.tangem.tap.features.details.ui.common.SettingsScreensScaffold
@@ -53,7 +55,12 @@ fun WalletConnectScreen(
         },
         fab = {
             if (!state.isLoading) {
-                AddSessionFab(onAddSession = { state.onAddSession(context.getFromClipboard()?.toString()) })
+                AddSessionFab(
+                    onAddSession = {
+                        Analytics.send(Settings.ButtonStartWalletConnectSession())
+                        state.onAddSession(context.getFromClipboard()?.toString())
+                    },
+                )
             }
         },
         titleRes = R.string.wallet_connect_title,
@@ -147,7 +154,10 @@ private fun WalletConnectSessions(
                     modifier = modifier.weight(1f),
                 )
                 IconButton(
-                    onClick = { state.onRemoveSession(session.sessionId) },
+                    onClick = {
+                        Analytics.send(Settings.ButtonStopWalletConnectSession())
+                        state.onRemoveSession(session.sessionId)
+                    },
                 ) {
                     Icon(
                         painter = painterResource(id = R.drawable.ic_cross_rounded_24),
diff --git a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectViewModel.kt b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectViewModel.kt
index 9f4c8dd659..6bbde4c1ae 100644
--- a/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectViewModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/walletconnect/WalletConnectViewModel.kt
@@ -1,7 +1,5 @@
 package com.tangem.tap.features.details.ui.walletconnect
 
-import com.tangem.tap.common.analytics.Analytics
-import com.tangem.tap.common.analytics.events.Settings
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectAction
 import com.tangem.tap.features.details.redux.walletconnect.WalletConnectSession
@@ -14,10 +12,7 @@ class WalletConnectViewModel(private val store: Store<AppState>) {
             state.sessions.map { wcSession -> WcSessionForScreen.fromSession(wcSession) },
             isLoading = state.loading,
             onRemoveSession = { sessionUri -> onRemoveSession(sessionUri, state.sessions) },
-            onAddSession = { copiedUri ->
-                Analytics.send(Settings.ButtonStartWalletConnectSession())
-                store.dispatch(WalletConnectAction.StartWalletConnect(copiedUri))
-            },
+            onAddSession = { copiedUri -> store.dispatch(WalletConnectAction.StartWalletConnect(copiedUri)) },
         )
     }
 
@@ -25,7 +20,6 @@ class WalletConnectViewModel(private val store: Store<AppState>) {
         sessions
             .firstOrNull { it.session.toUri() == sessionUri }
             ?.let { baseSession ->
-                Analytics.send(Settings.ButtonStopWalletConnectSession())
                 store.dispatch(WalletConnectAction.DisconnectSession(baseSession.session))
             }
     }