Updated on 2026-08-14

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

@@ -23,7 +23,6 @@ class BasicEventsPreChecker {
     fun tryToSend(converterData: BasicEventsSourceData) {
         if (!isReadyToSend(converterData)) return
 
-        BasicSignInEventConverter().convert(converterData)?.let { Analytics.send(it) }
         BasicTopUpEventConverter().convert(converterData)?.let { Analytics.send(it) }
     }
 
@@ -99,12 +98,8 @@ data class BasicEventsSourceData(
     val walletState: WalletState,
     val biometricsWalletDataModels: List<WalletDataModel>?,
 ) {
-    val batchId: String by lazy { scanResponse.card.batchId }
-
     val userWalletIdStringValue: String? by lazy {
-        UserWalletIdBuilder.scanResponse(scanResponse)
-            .build()
-            ?.stringValue
+        UserWalletIdBuilder.scanResponse(scanResponse).build()?.stringValue
     }
 
     val paramCardCurrency: AnalyticsParam.CardCurrency? by lazy {
@@ -164,21 +159,6 @@ private class BalanceCalculator(
     }
 }
 
-class BasicSignInEventConverter : Converter<BasicEventsSourceData, Basic.SignedIn?> {
-
-    override fun convert(value: BasicEventsSourceData): Basic.SignedIn? {
-        if (value.paramCardCurrency == null || value.userWalletIdStringValue == null) return null
-
-        return Basic.SignedIn(
-            state = value.paramCardBalanceState,
-            currency = value.paramCardCurrency!!,
-            batch = value.batchId,
-        ).apply {
-            filterData = value.userWalletIdStringValue
-        }
-    }
-}
-
 class BasicTopUpEventConverter : Converter<BasicEventsSourceData, Basic.ToppedUp?> {
 
     override fun convert(value: BasicEventsSourceData): Basic.ToppedUp? {

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

@@ -21,17 +21,21 @@ sealed class Basic(
     )
 
     class SignedIn(
-        state: AnalyticsParam.CardBalanceState,
         currency: AnalyticsParam.CardCurrency,
         batch: String,
+        signInType: SignInType,
     ) : Basic(
         event = "Signed in",
         params = mapOf(
-            "State" to state.value,
             AnalyticsParam.Currency to currency.value,
             AnalyticsParam.Batch to batch,
+            "Sign in type" to signInType.name,
         ),
-    )
+    ) {
+        enum class SignInType {
+            Card, Biometric
+        }
+    }
 
     class ToppedUp(currency: AnalyticsParam.CardCurrency) : Basic(
         event = "Topped up",

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

@@ -58,7 +58,7 @@ sealed class Settings(
     sealed class AppSettings(
         event: String,
         params: Map<String, String> = mapOf(),
-    ) : Settings("Settings / App Settings", event, params) {
+    ) : Settings(category = "Settings / App Settings", event = event, params = params) {
 
         class SaveWalletSwitcherChanged(state: AnalyticsParam.OnOffState) : CardSettings(
             event = "Save Wallet Switcher Changed",

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

@@ -52,6 +52,11 @@ sealed class Token(
         params = mapOf("Token" to type.value),
     )
 
+    object ShowWalletAddress : Token(
+        category = "Token",
+        event = "Button - Show the Wallet Address"
+    )
+
     sealed class Receive(
         event: String,
         params: Map<String, String> = mapOf(),

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

@@ -1,27 +0,0 @@
-package com.tangem.tap.common.analytics.filters
-
-import com.tangem.core.analytics.api.AnalyticsEventFilter
-import com.tangem.core.analytics.api.AnalyticsHandler
-import com.tangem.core.analytics.AnalyticsEvent
-import com.tangem.tap.common.analytics.events.Basic
-
-/**
-[REDACTED_AUTHOR]
- */
-class BasicSignInFilter : AnalyticsEventFilter {
-
-    private val alreadySignedIn = mutableSetOf<String>()
-
-    override fun canBeAppliedTo(event: AnalyticsEvent): Boolean = event is Basic.SignedIn
-
-    override fun canBeSent(event: AnalyticsEvent): Boolean {
-        val userWalletId = event.filterData as? String ?: return false
-
-        val canBeSent = !alreadySignedIn.contains(userWalletId)
-        alreadySignedIn.add(userWalletId)
-
-        return canBeSent
-    }
-
-    override fun canBeConsumedByHandler(handler: AnalyticsHandler, event: AnalyticsEvent): Boolean = true
-}

app/src/main/java/com/tangem/tap/common/redux/AppReducer.kt

@@ -13,6 +13,7 @@ import com.tangem.tap.features.onboarding.products.wallet.redux.OnboardingWallet
 import com.tangem.tap.features.saveWallet.redux.SaveWalletReducer
 import com.tangem.tap.features.send.redux.reducers.SendScreenReducer
 import com.tangem.tap.features.shop.redux.ShopReducer
+import com.tangem.tap.features.signin.redux.SignInReducer
 import com.tangem.tap.features.sprinklr.redux.SprinklrReducer
 import com.tangem.tap.features.tokens.redux.TokensReducer
 import com.tangem.tap.features.wallet.redux.reducers.WalletReducer
@@ -44,6 +45,7 @@ fun appReducer(action: Action, state: AppState?, appStateHolder: AppStateHolder)
         saveWalletState = SaveWalletReducer.reduce(action, state),
         walletSelectorState = WalletSelectorReducer.reduce(action, state),
         sprinklrState = SprinklrReducer.reduce(action, state),
+        signInState = SignInReducer.reduce(action, state),
     )
 }
 

app/src/main/java/com/tangem/tap/common/redux/AppState.kt

@@ -31,6 +31,8 @@ import com.tangem.tap.features.send.redux.middlewares.SendMiddleware
 import com.tangem.tap.features.send.redux.states.SendState
 import com.tangem.tap.features.shop.redux.ShopMiddleware
 import com.tangem.tap.features.shop.redux.ShopState
+import com.tangem.tap.features.signin.redux.SignInMiddleware
+import com.tangem.tap.features.signin.redux.SignInState
 import com.tangem.tap.features.sprinklr.redux.SprinklrMiddleware
 import com.tangem.tap.features.sprinklr.redux.SprinklrState
 import com.tangem.tap.features.tokens.redux.TokensMiddleware
@@ -64,6 +66,7 @@ data class AppState(
     val saveWalletState: SaveWalletState = SaveWalletState(),
     val walletSelectorState: WalletSelectorState = WalletSelectorState(),
     val sprinklrState: SprinklrState = SprinklrState(),
+    val signInState: SignInState = SignInState()
 ) : StateType {
 
     val domainState: DomainState
@@ -105,6 +108,7 @@ data class AppState(
                 LockUserWalletsTimerMiddleware().middleware,
                 AccessCodeRequestPolicyMiddleware().middleware,
                 SprinklrMiddleware().middleware,
+                SignInMiddleware.middleware
             )
         }
     }