Updated on 2026-08-14

app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt

@@ -164,7 +164,7 @@ internal class LegacyScanProcessor @Inject constructor(
     ) {
         if (error is TangemSdkError.CardVerificationFailed) {
             analyticsEventHandler.send(
-                event = OnboardingAnalyticsEvent.Onboarding.OfflineAttestationFailed(
+                event = OnboardingAnalyticsEvent.Error.OfflineAttestationFailed(
                     analyticsSource,
                 ),
             )

app/src/main/java/com/tangem/tap/domain/userWalletList/di/UserWalletsListManagerModule.kt

@@ -7,8 +7,10 @@ import com.tangem.common.authentication.storage.AuthenticatedStorage
 import com.tangem.common.json.TangemSdkAdapter
 import com.tangem.common.services.secure.SecureStorage
 import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.analytics.utils.TrackingContextProxy
 import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.domain.common.wallets.UserWalletsListRepository
+import com.tangem.domain.hotwallet.repository.HotWalletRepository
 import com.tangem.domain.models.scan.serialization.*
 import com.tangem.domain.visa.model.VisaActivationRemoteState
 import com.tangem.domain.visa.model.VisaCardActivationStatus
@@ -125,6 +127,9 @@ internal object UserWalletsListManagerModule {
         appPreferencesStore: AppPreferencesStore,
         hotWalletAccessCodeAttemptsRepository: HotWalletAccessCodeAttemptsRepository,
         tangemHotSdk: TangemHotSdk,
+        trackingContextProxy: TrackingContextProxy,
+        analyticsEventHandler: AnalyticsEventHandler,
+        hotWalletRepository: HotWalletRepository,
     ): UserWalletsListRepository {
         val moshi = buildMoshi()
         val secureStorage = buildSecureStorage(applicationContext = applicationContext)
@@ -172,6 +177,9 @@ internal object UserWalletsListManagerModule {
             savePersistentInformation = ProviderSuspend { true }, // Always save persistent information for now
             hotWalletAccessCodeAttemptsRepository = hotWalletAccessCodeAttemptsRepository,
             tangemHotSdk = tangemHotSdk,
+            trackingContextProxy = trackingContextProxy,
+            analyticsEventHandler = analyticsEventHandler,
+            hotWalletRepository = hotWalletRepository,
         )
     }
 

app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt

@@ -7,12 +7,16 @@ import arrow.core.raise.either
 import arrow.core.right
 import com.tangem.common.*
 import com.tangem.common.core.TangemSdkError
+import com.tangem.core.analytics.api.AnalyticsEventHandler
+import com.tangem.core.analytics.models.Basic
+import com.tangem.core.analytics.utils.TrackingContextProxy
 import com.tangem.datasource.local.preferences.AppPreferencesStore
 import com.tangem.datasource.local.preferences.PreferencesKeys
 import com.tangem.datasource.local.preferences.utils.getSyncOrDefault
 import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.common.wallets.UserWalletsListRepository.LockMethod
 import com.tangem.domain.common.wallets.error.*
+import com.tangem.domain.hotwallet.repository.HotWalletRepository
 import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.isLocked
@@ -50,6 +54,9 @@ internal class DefaultUserWalletsListRepository(
     private val appPreferencesStore: AppPreferencesStore,
     private val hotWalletAccessCodeAttemptsRepository: HotWalletAccessCodeAttemptsRepository,
     private val tangemHotSdk: TangemHotSdk,
+    private val trackingContextProxy: TrackingContextProxy,
+    private val analyticsEventHandler: AnalyticsEventHandler,
+    private val hotWalletRepository: HotWalletRepository,
 ) : UserWalletsListRepository {
 
     override val userWallets = MutableStateFlow<List<UserWallet>?>(null)
@@ -204,7 +211,7 @@ internal class DefaultUserWalletsListRepository(
 
         userWalletEncryptionKeysRepository.delete(userWalletIds)
 
-        removeHotWalletsFromSDK(userWalletIds)
+        removeHotWalletsFromSDKAndRepos(userWalletIds)
 
         userWallets.update { currentWallets ->
             val updatedWallets = currentWallets?.filter { userWalletIds.contains(it.walletId).not() }
@@ -235,6 +242,7 @@ internal class DefaultUserWalletsListRepository(
         when (unlockMethod) {
             UserWalletsListRepository.UnlockMethod.Biometric -> {
                 unlockAllWallets().bind()
+                trackSignInEvent(userWallet, Basic.SignedIn.SignInType.Biometric)
                 select(userWalletId)
             }
             UserWalletsListRepository.UnlockMethod.AccessCode -> {
@@ -263,7 +271,10 @@ internal class DefaultUserWalletsListRepository(
                 removePasswordAttempts(userWallet)
 
                 sensitiveInformationRepository.getAll(listOf(encryptionKey))
-                    .doOnSuccess { sensitiveInfo -> updateWallets { it?.updateWith(sensitiveInfo) } }
+                    .doOnSuccess { sensitiveInfo ->
+                        updateWallets { it?.updateWith(sensitiveInfo) }
+                        trackSignInEvent(userWallet, Basic.SignedIn.SignInType.AccessCode)
+                    }
                     .doOnFailure { error -> raise(UnlockWalletError.UnableToUnlock.RawException(error)) }
             }
             is UserWalletsListRepository.UnlockMethod.Scan -> {
@@ -291,7 +302,10 @@ internal class DefaultUserWalletsListRepository(
                 )
 
                 sensitiveInformationRepository.getAll(listOf(encryptionKey))
-                    .doOnSuccess { sensitiveInfo -> updateWallets { it?.updateWith(sensitiveInfo) } }
+                    .doOnSuccess { sensitiveInfo ->
+                        updateWallets { it?.updateWith(sensitiveInfo) }
+                        trackSignInEvent(userWallet, Basic.SignedIn.SignInType.Card)
+                    }
                     .doOnFailure { error -> raise(UnlockWalletError.UnableToUnlock.RawException(error)) }
             }
         }
@@ -332,6 +346,9 @@ internal class DefaultUserWalletsListRepository(
         sensitiveInformationRepository.getAll(allKeys)
             .doOnSuccess { sensitiveInfo ->
                 updateWallets { wallets -> wallets?.updateWith(sensitiveInfo) }
+                selectedUserWallet.value?.let {
+                    trackSignInEvent(it, Basic.SignedIn.SignInType.Biometric)
+                }
             }
             .doOnFailure { error -> raise(UnlockWalletError.UnableToUnlock.RawException(error)) }
     }
@@ -373,7 +390,7 @@ internal class DefaultUserWalletsListRepository(
         if (newUserWallet.walletId == oldUserWallet.walletId &&
             oldUserWallet is UserWallet.Hot && newUserWallet is UserWallet.Cold
         ) {
-            removeHotWalletsFromSDK(walletIds = listOf(oldUserWallet.walletId))
+            removeHotWalletsFromSDKAndRepos(walletIds = listOf(oldUserWallet.walletId))
             // When upgrading from Hot to Cold, if biometric lock is available, set it
             if (hasBiometry()) {
                 setLock(newUserWallet.walletId, LockMethod.Biometric, changeUnsecured = true)
@@ -384,13 +401,14 @@ internal class DefaultUserWalletsListRepository(
         }
     }
 
-    private suspend fun removeHotWalletsFromSDK(walletIds: List<UserWalletId>) {
+    private suspend fun removeHotWalletsFromSDKAndRepos(walletIds: List<UserWalletId>) {
         val hotWalletsToDelete = userWalletsSync()
             .filterIsInstance<UserWallet.Hot>()
             .filter { walletIds.contains(it.walletId) }
 
-        hotWalletsToDelete.forEach {
-            tangemHotSdk.delete(it.hotWalletId)
+        hotWalletsToDelete.forEach { wallet ->
+            hotWalletRepository.setAccessCodeSkipped(wallet.walletId, false) // In case the wallet is added again
+            tangemHotSdk.delete(wallet.hotWalletId)
         }
     }
 
@@ -508,4 +526,14 @@ internal class DefaultUserWalletsListRepository(
 
         return lastOrNull()
     }
+
+    private fun trackSignInEvent(userWallet: UserWallet, type: Basic.SignedIn.SignInType) {
+        trackingContextProxy.addContext(userWallet)
+        analyticsEventHandler.send(
+            event = Basic.SignedIn(
+                signInType = type,
+                walletsCount = userWallets.value?.size ?: 0,
+            ),
+        )
+    }
 }

app/src/main/java/com/tangem/tap/domain/userWalletList/repository/UserWalletEncryptionKeysRepository.kt

@@ -4,6 +4,7 @@ import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.Types
 import com.tangem.common.authentication.storage.AuthenticatedStorage
+import com.tangem.common.core.TangemSdkError
 import com.tangem.common.services.secure.SecureStorage
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.hot.sdk.android.crypto.AESEncryptionProtocol
@@ -96,7 +97,13 @@ internal class UserWalletEncryptionKeysRepository(
             StorageKey.UserWalletEncryptionKey(userWalletId).name
         }
 
-        authenticatedStorage.get(keys).mapNotNull {
+        val result = authenticatedStorage.get(keys)
+
+        if (keys.isNotEmpty() && result.isEmpty()) {
+            throw TangemSdkError.KeystoreInvalidated(Exception("Keys is empty"))
+        }
+
+        result.mapNotNull {
             it.value.decodeToKey()
         }
     }