Updated on 2026-08-14

app/src/main/java/com/tangem/tap/features/demo/DemoHelper.kt

@@ -49,6 +49,8 @@ object DemoHelper {
 
     fun isDemoCard(scanResponse: ScanResponse): Boolean = isDemoCardId(scanResponse.card.cardId)
 
+    fun isTestDemoCard(scanResponse: ScanResponse): Boolean = config.isTestDemoCardId(scanResponse.card.cardId)
+
     fun isDemoCardId(cardId: String): Boolean = config.isDemoCardId(cardId)
 
     fun tryHandle(appState: () -> AppState?, action: Action): Boolean {
@@ -108,6 +110,8 @@ class DemoConfig {
 
     fun isDemoCardId(cardId: String): Boolean = demoCardIds.contains(cardId)
 
+    fun isTestDemoCardId(cardId: String): Boolean = testDemoCardIds.contains(cardId)
+
     fun getBalance(blockchain: Blockchain): Amount = walletBalances[blockchain]?.copy()
         ?: Amount(BigDecimal.ZERO, blockchain).copy()
 
@@ -489,17 +493,19 @@ class DemoConfig {
 
 class DemoTransactionSender(
     private val walletManager: WalletManager,
-    private val sender: TransactionSender = walletManager as TransactionSender
+    private val sender: TransactionSender = walletManager as TransactionSender,
 ) : TransactionSender {
 
     override suspend fun getFee(amount: Amount, destination: String): Result<List<Amount>> {
         val blockchain = walletManager.wallet.blockchain
         return when (walletManager) {
-            is BitcoinWalletManager -> Result.Success(listOf(
-                Amount(0.0001.toBigDecimal(), blockchain),
-                Amount(0.0003.toBigDecimal(), blockchain),
-                Amount(0.00055.toBigDecimal(), blockchain),
-            ))
+            is BitcoinWalletManager -> Result.Success(
+                listOf(
+                    Amount(0.0001.toBigDecimal(), blockchain),
+                    Amount(0.0003.toBigDecimal(), blockchain),
+                    Amount(0.00055.toBigDecimal(), blockchain),
+                ),
+            )
             else -> sender.getFee(amount, destination)
         }
     }
@@ -508,7 +514,7 @@ class DemoTransactionSender(
         val dataToSign = randomString(32).toByteArray()
         val signerResponse = signer.sign(
             hash = dataToSign,
-            publicKey = walletManager.wallet.publicKey
+            publicKey = walletManager.wallet.publicKey,
         )
         return when (signerResponse) {
             is CompletionResult.Success -> SimpleResult.Failure(Exception(ID).toBlockchainSdkError())
@@ -529,5 +535,4 @@ class DemoTransactionSender(
     companion object {
         val ID = DemoTransactionSender::class.java.simpleName
     }
-
 }

app/src/main/java/com/tangem/tap/features/home/HomeFragment.kt

@@ -29,7 +29,7 @@ class HomeFragment : Fragment(), StoreSubscriber<HomeState> {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Analytics.send(IntroductionProcess.ScreenOpened())
+        store.dispatch(HomeAction.OnCreate)
         store.dispatch(HomeAction.Init)
     }
 

app/src/main/java/com/tangem/tap/features/home/redux/HomeAction.kt

@@ -7,6 +7,7 @@ import org.rekotlin.Action
 
 sealed class HomeAction : Action {
 
+    object OnCreate : HomeAction()
     object Init : HomeAction()
 
     data class ReadCard(

app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt

@@ -5,10 +5,12 @@ import com.tangem.common.doOnResult
 import com.tangem.common.doOnSuccess
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.analytics.AnalyticsEvent
+import com.tangem.tap.common.analytics.events.IntroductionProcess
 import com.tangem.tap.common.analytics.events.Shop
 import com.tangem.tap.common.entities.IndeterminateProgressButton
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.dispatchOpenUrl
+import com.tangem.tap.common.extensions.eraseCardContext
 import com.tangem.tap.common.extensions.onCardScanned
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
@@ -51,6 +53,10 @@ private val homeMiddleware: Middleware<AppState> = { _, _ ->
 
 private fun handleHomeAction(action: Action) {
     when (action) {
+        is HomeAction.OnCreate -> {
+            Analytics.eraseCardContext()
+            Analytics.send(IntroductionProcess.ScreenOpened())
+        }
         is HomeAction.Init -> {
             store.dispatch(GlobalAction.RestoreAppCurrency)
             store.dispatch(GlobalAction.ExchangeManager.Init)

app/src/main/java/com/tangem/tap/features/walletSelector/redux/WalletSelectorMiddleware.kt

@@ -10,7 +10,7 @@ import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.ScanResponse
 import com.tangem.domain.common.util.UserWalletId
 import com.tangem.tap.common.analytics.events.MyWallets
-import com.tangem.tap.common.analytics.paramsInterceptor.BatchIdParamsInterceptor
+import com.tangem.tap.common.extensions.addCardContext
 import com.tangem.tap.common.extensions.dispatchOnMain
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
@@ -197,8 +197,7 @@ internal class WalletSelectorMiddleware {
                 .doOnSuccess {
                     val selectedUserWallet = userWalletsListManager.selectedUserWalletSync
                     if (selectedUserWallet != null) {
-                        val batchId = selectedUserWallet.scanResponse.card.batchId
-                        Analytics.addParamsInterceptor(BatchIdParamsInterceptor(batchId))
+                        Analytics.addCardContext(selectedUserWallet.scanResponse)
 
                         store.dispatchOnMain(NavigationAction.PopBackTo(AppScreen.Wallet))
                         store.onUserWalletSelected(selectedUserWallet)

app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeAction.kt

@@ -5,6 +5,7 @@ import com.tangem.common.core.TangemError
 import org.rekotlin.Action
 
 internal sealed interface WelcomeAction : Action {
+    object OnCreate: WelcomeAction
     object ProceedWithBiometrics : WelcomeAction {
         object Success : WelcomeAction
         data class Error(val error: TangemError) : WelcomeAction

app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt

@@ -4,9 +4,12 @@ import android.content.Intent
 import com.tangem.common.core.TangemSdkError
 import com.tangem.common.doOnFailure
 import com.tangem.common.doOnSuccess
+import com.tangem.core.analytics.Analytics
 import com.tangem.domain.common.ScanResponse
 import com.tangem.tap.common.analytics.events.SignIn
+import com.tangem.tap.common.extensions.addCardContext
 import com.tangem.tap.common.extensions.dispatchOnMain
+import com.tangem.tap.common.extensions.eraseCardContext
 import com.tangem.tap.common.extensions.onUserWalletSelected
 import com.tangem.tap.common.redux.AppState
 import com.tangem.tap.common.redux.navigation.AppScreen
@@ -38,6 +41,10 @@ internal class WelcomeMiddleware {
 
     private fun handleAction(action: WelcomeAction, state: WelcomeState) {
         when (action) {
+            is WelcomeAction.OnCreate -> {
+                Analytics.eraseCardContext()
+                Analytics.send(SignIn.ScreenOpened())
+            }
             is WelcomeAction.ProceedWithBiometrics -> {
                 proceedWithBiometry(state)
             }
@@ -62,6 +69,7 @@ internal class WelcomeMiddleware {
                 }
                 .doOnSuccess { selectedUserWallet ->
                     if (selectedUserWallet != null) {
+                        Analytics.addCardContext(selectedUserWallet.scanResponse)
                         store.dispatchOnMain(NavigationAction.NavigateTo(AppScreen.Wallet))
                         store.dispatchOnMain(WelcomeAction.ProceedWithBiometrics.Success)
                         store.onUserWalletSelected(selectedUserWallet)

app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeReducer.kt

@@ -26,6 +26,7 @@ internal object WelcomeReducer {
             is WelcomeAction.ProceedWithBiometrics.Success -> state.copy(isUnlockWithBiometricsInProgress = false)
             is WelcomeAction.ProceedWithCard.Success -> state.copy(isUnlockWithCardInProgress = false)
             is WelcomeAction.CloseError -> state.copy(error = null)
+            else -> state
         }
     }
 }

app/src/main/java/com/tangem/tap/features/welcome/ui/WelcomeFragment.kt

@@ -19,13 +19,13 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.colorResource
 import androidx.fragment.app.viewModels
-import com.tangem.core.analytics.Analytics
 import com.tangem.core.ui.components.SystemBarsEffect
 import com.tangem.core.ui.fragments.ComposeFragment
 import com.tangem.core.ui.res.TangemTheme
-import com.tangem.tap.common.analytics.events.SignIn
 import com.tangem.tap.features.details.ui.cardsettings.resolveReference
+import com.tangem.tap.features.welcome.redux.WelcomeAction
 import com.tangem.tap.features.welcome.ui.components.WelcomeScreenContent
+import com.tangem.tap.store
 import com.tangem.wallet.R
 
 internal class WelcomeFragment : ComposeFragment<WelcomeScreenState>() {
@@ -33,7 +33,7 @@ internal class WelcomeFragment : ComposeFragment<WelcomeScreenState>() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        Analytics.send(SignIn.ScreenOpened())
+        store.dispatch(WelcomeAction.OnCreate)
     }
 
     @Composable