Updated on 2026-08-14

app/src/main/java/com/tangem/tap/common/analytics/DefaultTrackingContextProxy.kt

@@ -25,8 +25,6 @@ internal class DefaultTrackingContextProxy(private val abTestsManager: ABTestsMa
     override fun setContext(scanResponse: ScanResponse) {
         val userWalletId = UserWalletIdBuilder.scanResponse(scanResponse).build()
 
-        Analytics.setContext(userWalletId, scanResponse)
-
         abTestsManager.setUserProperties(
             userId = calculateUserIdHash(userWalletId),
             batch = scanResponse.card.batchId,
@@ -73,6 +71,12 @@ internal class DefaultTrackingContextProxy(private val abTestsManager: ABTestsMa
         Analytics.removeContext()
     }
 
+    override fun proceedWithContext(userWallet: UserWallet, action: () -> Unit) {
+        setContext(userWallet)
+        action()
+        eraseContext()
+    }
+
     private fun calculateUserIdHash(userWalletId: UserWalletId?): String? {
         return userWalletId?.value
             ?.calculateSha256()

app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/CardContextInterceptor.kt

@@ -30,6 +30,7 @@ class CardContextInterceptor(
 
     override fun canBeAppliedTo(event: AnalyticsEvent): Boolean {
         return when (event) {
+            is IntroductionProcess.ButtonScanCardLegacy -> false
             is IntroductionProcess.ButtonScanCard -> false
             else -> true
         }

app/src/main/java/com/tangem/tap/common/analytics/paramsInterceptor/HotWalletContextInterceptor.kt

@@ -14,6 +14,9 @@ class HotWalletContextInterceptor(
 
     override fun intercept(params: MutableMap<String, String>) {
         params[AnalyticsParam.PRODUCT_TYPE] = AnalyticsParam.ProductType.MobileWallet.value
+        params.remove(AnalyticsParam.BATCH)
+        params.remove(AnalyticsParam.FIRMWARE)
+        params.remove(AnalyticsParam.CURRENCY)
     }
 
     companion object {