Updated on 2026-08-14

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

@@ -120,16 +120,14 @@ internal class LegacyScanProcessor @Inject constructor(
             }
     }
 
-    private fun sendAnalytics(analyticsEvent: AnalyticsEvent?, scanResponse: ScanResponse) {
-        analyticsEvent?.let { event ->
-            // this workaround needed to send CardWasScannedEvent without adding a context
-            val interceptor = CardContextInterceptor(scanResponse)
-            val params = event.params.toMutableMap()
-            interceptor.intercept(params)
-            event.params = params.toMap()
+    private fun sendAnalytics(analyticsEvent: AnalyticsEvent, scanResponse: ScanResponse) {
+        // this workaround needed to send CardWasScannedEvent without adding a context
+        val interceptor = CardContextInterceptor(scanResponse)
+        val params = analyticsEvent.params.toMutableMap()
+        interceptor.intercept(params)
+        analyticsEvent.params = params.toMap()
 
-            Analytics.send(event)
-        }
+        Analytics.send(analyticsEvent)
     }
 
     // TODO: [REDACTED_JIRA]

app/src/main/java/com/tangem/tap/domain/sdk/impl/DefaultTangemSdkManager.kt

@@ -23,11 +23,7 @@ import com.tangem.domain.card.repository.CardSdkConfigRepository
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.models.wallet.UserWalletId
-import com.tangem.domain.visa.model.TangemPayInitialCredentials
-import com.tangem.domain.visa.model.VisaActivationInput
-import com.tangem.domain.visa.model.VisaDataForApprove
-import com.tangem.domain.visa.model.VisaSignedDataByCustomerWallet
-import com.tangem.domain.visa.model.sign
+import com.tangem.domain.visa.model.*
 import com.tangem.domain.wallets.derivations.derivationStyleProvider
 import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.operations.ScanTask
@@ -82,13 +78,12 @@ internal class DefaultTangemSdkManager(
             secureStorage = tangemSdk.secureStorage,
         )
     }
+    override val needEnrollBiometrics: Boolean
+        get() = tangemSdk.authenticationManager.needEnrollBiometrics
 
     override val canUseBiometry: Boolean
         get() = tangemSdk.authenticationManager.canAuthenticate || needEnrollBiometrics
 
-    override val needEnrollBiometrics: Boolean
-        get() = tangemSdk.authenticationManager.needEnrollBiometrics
-
     override val keystoreManager: KeystoreManager
         get() = tangemSdk.keystoreManager
 

app/src/main/java/com/tangem/tap/domain/tasks/visa/VisaCardActivationTask.kt

@@ -177,7 +177,7 @@ class VisaCardActivationTask @AssistedInject constructor(
             .getOrElse { raise(it.tangemError) }
 
         if (remoteState !is VisaActivationRemoteState.CardWalletSignatureRequired) {
-            return raise(VisaActivationError.WrongRemoteState.tangemError)
+            raise(VisaActivationError.WrongRemoteState.tangemError)
         }
 
         visaActivationRepository.getCardWalletAcceptanceData(

app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/BiometricUserWalletsListManager.kt

@@ -36,11 +36,6 @@ internal class BiometricUserWalletsListManager(
             .mapLatest { it.userWallets }
             .distinctUntilChanged()
 
-    override val savedWalletsCount: Flow<Int>
-        get() = state
-            .mapLatest { walletsCount }
-            .distinctUntilChanged()
-
     override val userWalletsSync: List<UserWallet>
         get() = state.value.userWallets
 
@@ -71,6 +66,11 @@ internal class BiometricUserWalletsListManager(
     override val walletsCount: Int
         get() = state.value.userWallets.size
 
+    override val savedWalletsCount: Flow<Int>
+        get() = state
+            .mapLatest { walletsCount }
+            .distinctUntilChanged()
+
     override suspend fun unlock(type: UnlockType): CompletionResult<UserWallet> {
         return unlockAndSetSelectedUserWallet(type)
             .mapFailure { error ->

app/src/main/java/com/tangem/tap/domain/userWalletList/implementation/RuntimeUserWalletsListManager.kt

@@ -20,11 +20,6 @@ internal class RuntimeUserWalletsListManager : UserWalletsListManager {
             .mapLatest { listOfNotNull(it.userWallet) }
             .distinctUntilChanged()
 
-    override val savedWalletsCount: Flow<Int>
-        get() = state
-            .mapLatest { walletsCount }
-            .distinctUntilChanged()
-
     override val selectedUserWallet: Flow<UserWallet>
         get() = state
             .mapLatest { it.userWallet }
@@ -46,6 +41,11 @@ internal class RuntimeUserWalletsListManager : UserWalletsListManager {
     override val walletsCount: Int
         get() = if (hasUserWallets) 1 else 0
 
+    override val savedWalletsCount: Flow<Int>
+        get() = state
+            .mapLatest { walletsCount }
+            .distinctUntilChanged()
+
     override suspend fun select(userWalletId: UserWalletId): CompletionResult<UserWallet> = catching {
         state.value.userWallet
             ?.takeIf { it.walletId == userWalletId }