From 9a9d7efe656e277f3d634245529f58fcf980026c Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 1 Nov 2022 20:49:56 +0500
Subject: [PATCH] Updated on 2026-08-14

---
 .../main/java/com/tangem/tap/common/DialogManager.kt   |  3 +--
 .../wallet/redux/middlewares/TradeCryptoMiddleware.kt  | 10 +++++++---
 .../RussianCardholdersWarningBottomSheetDialog.kt      |  3 +++
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/common/DialogManager.kt b/app/src/main/java/com/tangem/tap/common/DialogManager.kt
index 5ae8d9ce04..ed8d4542b9 100644
--- a/app/src/main/java/com/tangem/tap/common/DialogManager.kt
+++ b/app/src/main/java/com/tangem/tap/common/DialogManager.kt
@@ -152,8 +152,7 @@ class DialogManager : StoreSubscriber<GlobalState> {
                 primaryButtonRes = state.dialog.primaryButtonRes,
                 primaryButtonAction = state.dialog.onOk,
             )
-            is WalletDialog.RussianCardholdersWarningDialog ->
-                RussianCardholdersWarningBottomSheetDialog(context)
+            is WalletDialog.RussianCardholdersWarningDialog -> RussianCardholdersWarningBottomSheetDialog(context)
             else -> null
         }
         dialog?.show()
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
index 182c75c9bd..8a951b246c 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/redux/middlewares/TradeCryptoMiddleware.kt
@@ -7,6 +7,7 @@ import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.dispatchDebugErrorNotification
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.dispatchOpenUrl
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.navigation.AppScreen
 import com.tangem.tap.common.redux.navigation.NavigationAction
@@ -77,7 +78,10 @@ class TradeCryptoMiddleware {
             cryptoCurrencyName = currency.currencySymbol,
             fiatCurrencyName = appCurrency.code,
             walletAddress = addresses[0].address,
-        )?.let { store.dispatchOnMain(NavigationAction.OpenUrl(it)) }
+        )?.let {
+            store.dispatchOpenUrl(it)
+            Analytics.send(Token.Topup.ScreenOpened())
+        }
     }
 
     private fun proceedSellAction() {
@@ -96,7 +100,7 @@ class TradeCryptoMiddleware {
             cryptoCurrencyName = currency.currencySymbol,
             fiatCurrencyName = appCurrency.code,
             walletAddress = addresses[0].address,
-        )?.let { store.dispatchOnMain(NavigationAction.OpenUrl(it)) }
+        )?.let { store.dispatchOpenUrl(it) }
     }
 
     private fun preconfigureAndOpenSendScreen(action: WalletAction.TradeCryptoAction.SendCrypto) {
@@ -127,6 +131,6 @@ class TradeCryptoMiddleware {
         store.state.globalState.exchangeManager.getSellCryptoReceiptUrl(
             action = CurrencyExchangeManager.Action.Sell,
             transactionId = transactionId,
-        )?.let { store.dispatchOnMain(NavigationAction.OpenUrl(it)) }
+        )?.let { store.dispatchOpenUrl(it) }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt
index a41dce9228..526b991006 100644
--- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt
+++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt
@@ -4,6 +4,8 @@ import android.content.Context
 import android.os.Bundle
 import android.view.LayoutInflater
 import com.google.android.material.bottomsheet.BottomSheetDialog
+import com.tangem.tap.common.analytics.Analytics
+import com.tangem.tap.common.analytics.events.Token
 import com.tangem.tap.common.extensions.dispatchDialogHide
 import com.tangem.tap.common.redux.navigation.NavigationAction
 import com.tangem.tap.features.wallet.redux.WalletAction
@@ -16,6 +18,7 @@ class RussianCardholdersWarningBottomSheetDialog(context: Context) : BottomSheet
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        Analytics.send(Token.Topup.P2PScreenOpened())
         binding = DialogRussiansCardholdersWarningBinding
             .inflate(LayoutInflater.from(context))
             .also { setContentView(it.root) }