Updated on 2026-08-14

2026-02-26 21:35:53 +07:00 · 2026-02-26 21:35:53 +07:00 · 1806ddc31d
commit 1806ddc31d
parent d349739524
18 changed files with 55 additions and 11 deletions
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/DefaultScanCardProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/DefaultScanCardProcessor.kt
@ -20,6 +20,7 @@ internal class DefaultScanCardProcessor(
        cardId: String?,
        allowsRequestAccessCodeFromRepository: Boolean,
        analyticsSource: AnalyticsParam.ScreensSources,
+        shouldCheckIsAlreadyActivated: Boolean,
    ): CompletionResult<ScanResponse> {
        return if (isNewCardScanningEnabled) {
            UseCaseScanProcessor.scan(cardId, allowsRequestAccessCodeFromRepository)
@ -28,6 +29,7 @@ internal class DefaultScanCardProcessor(
                analyticsSource = analyticsSource,
                cardId = cardId,
                allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
+                shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
            )
        }
    }
@ -35,6 +37,7 @@ internal class DefaultScanCardProcessor(
    @Suppress("LongParameterList")
    override suspend fun scan(
        analyticsSource: AnalyticsParam.ScreensSources,
+        shouldCheckIsAlreadyActivated: Boolean,
        cardId: String?,
        onProgressStateChange: suspend (showProgress: Boolean) -> Unit,
        onWalletNotCreated: suspend () -> Unit,
@ -56,6 +59,7 @@ internal class DefaultScanCardProcessor(
        } else {
            legacyScanProcessor.scan(
                analyticsSource = analyticsSource,
+                shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
                cardId = cardId,
                onProgressStateChange = onProgressStateChange,
                onWalletNotCreated = onWalletNotCreated,
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/LegacyScanProcessor.kt
@ -55,10 +55,12 @@ internal class LegacyScanProcessor @Inject constructor(
        cardId: String? = null,
        allowsRequestAccessCodeFromRepository: Boolean = false,
        analyticsSource: AnalyticsParam.ScreensSources,
+        shouldCheckIsAlreadyActivated: Boolean,
    ): CompletionResult<ScanResponse> {
        return tangemSdkManager.scanProduct(
            cardId = cardId,
            allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
+            shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
        )
            .doOnFailure { error ->
                onScanFailure(analyticsSource = analyticsSource, error = error, onFailure = {}, onCancel = {})
@ -68,6 +70,7 @@ internal class LegacyScanProcessor @Inject constructor(
    @Suppress("LongParameterList")
    suspend fun scan(
        analyticsSource: AnalyticsParam.ScreensSources,
+        shouldCheckIsAlreadyActivated: Boolean,
        cardId: String?,
        onProgressStateChange: suspend (showProgress: Boolean) -> Unit,
        onWalletNotCreated: suspend () -> Unit,
@ -80,7 +83,10 @@ internal class LegacyScanProcessor @Inject constructor(

        tangemSdkManager.changeDisplayedCardIdNumbersCount(null)

-        val result = tangemSdkManager.scanProduct(cardId)
+        val result = tangemSdkManager.scanProduct(
+            cardId = cardId,
+            shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
+        )

        val analyticsEvent = Basic.CardWasScanned(analyticsSource)
        store.dispatchOnMain(GlobalAction.ScanFailsCounter.ChooseBehavior(result, analyticsSource))
--- a/app/src/main/java/com/tangem/tap/domain/scanCard/repository/DefaultScanCardRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/scanCard/repository/DefaultScanCardRepository.kt
@ -13,11 +13,16 @@ internal class DefaultScanCardRepository(

    private val exceptionConverter = ScanCardExceptionConverter()

-    override suspend fun scanCard(cardId: String?, allowRequestAccessCodeFromStorage: Boolean): ScanResponse {
+    override suspend fun scanCard(
+        cardId: String?,
+        allowRequestAccessCodeFromStorage: Boolean,
+        shouldCheckIsAlreadyActivated: Boolean,
+    ): ScanResponse {
        return when (
            val result = tangemSdkManager.scanProduct(
                cardId = cardId,
                allowsRequestAccessCodeFromRepository = allowRequestAccessCodeFromStorage,
+                shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
            )
        ) {
            is CompletionResult.Success -> result.data
--- a/app/src/main/java/com/tangem/tap/domain/sdk/impl/DefaultTangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/impl/DefaultTangemSdkManager.kt
@ -166,6 +166,7 @@ internal class DefaultTangemSdkManager(
        cardId: String?,
        messageRes: Int?,
        allowsRequestAccessCodeFromRepository: Boolean,
+        shouldCheckIsAlreadyActivated: Boolean,
    ): CompletionResult<ScanResponse> {
        val message = Message(resources.getStringSafe(messageRes ?: R.string.initial_message_scan_header))
        return coroutineScope {
@ -176,7 +177,7 @@ internal class DefaultTangemSdkManager(
                    allowsRequestAccessCodeFromRepository = allowsRequestAccessCodeFromRepository,
                    visaCardScanHandler = visaCardScanHandler,
                    visaCoroutineScope = this,
-                    shouldCheckIsAlreadyActivated = true,
+                    shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
                    onboardingV2FeatureToggles = onboardingV2FeatureToggles,
                ),
                cardId = cardId,
--- a/app/src/main/java/com/tangem/tap/domain/sdk/impl/MockTangemSdkManager.kt
+++ b/app/src/main/java/com/tangem/tap/domain/sdk/impl/MockTangemSdkManager.kt
@ -59,6 +59,7 @@ class MockTangemSdkManager(
        cardId: String?,
        messageRes: Int?,
        allowsRequestAccessCodeFromRepository: Boolean,
+        shouldCheckIsAlreadyActivated: Boolean,
    ): CompletionResult<ScanResponse> {
        return MockProvider.getScanResponse()
    }
--- a/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt
+++ b/app/src/main/java/com/tangem/tap/domain/userWalletList/repository/DefaultUserWalletsListRepository.kt
@ -296,7 +296,9 @@ internal class DefaultUserWalletsListRepository(
                }

                val scanResponse = unlockMethod.scanResponse ?: run {
-                    when (val res = tangemSdkManagerProvider().scanProduct()) {
+                    when (val res = tangemSdkManagerProvider().scanProduct(
+                        shouldCheckIsAlreadyActivated = false,
+                    )) {
                        is CompletionResult.Failure -> raise(UnlockWalletError.UserCancelled)
                        is CompletionResult.Success -> res.data
                    }
--- a/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/model/CardSettingsModel.kt
+++ b/app/src/main/java/com/tangem/tap/features/details/ui/cardsettings/model/CardSettingsModel.kt
@ -107,6 +107,7 @@ internal class CardSettingsModel @Inject constructor(
    private fun scanCard() = modelScope.launch {
        scanCardProcessor.scan(
            analyticsSource = com.tangem.core.analytics.models.AnalyticsParam.ScreensSources.Settings,
+            shouldCheckIsAlreadyActivated = false,
            allowsRequestAccessCodeFromRepository = true,
        )
            .doOnSuccess { scanResponse ->
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardProcessor.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardProcessor.kt
@ -11,10 +11,12 @@ interface ScanCardProcessor {
        cardId: String? = null,
        allowsRequestAccessCodeFromRepository: Boolean = false,
        analyticsSource: AnalyticsParam.ScreensSources,
+        shouldCheckIsAlreadyActivated: Boolean,
    ): CompletionResult<ScanResponse>

    suspend fun scan(
        analyticsSource: AnalyticsParam.ScreensSources,
+        shouldCheckIsAlreadyActivated: Boolean,
        cardId: String? = null,
        onProgressStateChange: suspend (showProgress: Boolean) -> Unit = {},
        onWalletNotCreated: suspend () -> Unit = {},
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardUseCase.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/ScanCardUseCase.kt
@ -49,8 +49,13 @@ class ScanCardUseCase(
        cardId: String?,
        allowRequestAccessCodeFromStorage: Boolean,
    ): Either<ScanCardException, ScanResponse> {
-        return Either.catch { scanCardRepository.scanCard(cardId, allowRequestAccessCodeFromStorage) }
-            .mapLeft { e ->
+        return Either.catch {
+            scanCardRepository.scanCard(
+                cardId = cardId,
+                allowRequestAccessCodeFromStorage = allowRequestAccessCodeFromStorage,
+                shouldCheckIsAlreadyActivated = true, // TODO use correct when enable NEW_CARD_SCANNING_ENABLED
+            )
+        }.mapLeft { e ->
            e as? ScanCardException ?: ScanCardException.UnknownException(e)
        }
    }
--- a/domain/card/src/main/kotlin/com/tangem/domain/card/repository/ScanCardRepository.kt
+++ b/domain/card/src/main/kotlin/com/tangem/domain/card/repository/ScanCardRepository.kt
@ -17,5 +17,9 @@ interface ScanCardRepository {
     * @return a [ScanResponse] object with the result of the scan.
     * @throws [ScanCardException] if the scan process fails.
     */
-    suspend fun scanCard(cardId: String?, allowRequestAccessCodeFromStorage: Boolean): ScanResponse
+    suspend fun scanCard(
+        cardId: String?,
+        allowRequestAccessCodeFromStorage: Boolean,
+        shouldCheckIsAlreadyActivated: Boolean,
+    ): ScanResponse
 }
--- a/features/create-wallet-start/impl/src/main/kotlin/com/tangem/features/createwalletstart/CreateWalletStartModel.kt
+++ b/features/create-wallet-start/impl/src/main/kotlin/com/tangem/features/createwalletstart/CreateWalletStartModel.kt
@ -186,6 +186,7 @@ internal class CreateWalletStartModel @Inject constructor(

            scanCardProcessor.scan(
                analyticsSource = analyticsSource,
+                shouldCheckIsAlreadyActivated = true,
                onProgressStateChange = { showProgress ->
                    if (!showProgress) {
                        delay(HIDE_PROGRESS_DELAY)
--- a/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/UserWalletSaver.kt
+++ b/features/details/impl/src/main/kotlin/com/tangem/features/details/utils/UserWalletSaver.kt
@ -120,6 +120,7 @@ internal class UserWalletSaver @Inject constructor(
        scope.launch {
            scanCardProcessor.scan(
                analyticsSource = AnalyticsParam.ScreensSources.Settings,
+                shouldCheckIsAlreadyActivated = true,
                onWalletNotCreated = {
                    continuation.resume(Either.Right(null))
                },
--- a/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt
+++ b/features/home/impl/src/main/kotlin/com/tangem/features/home/impl/model/HomeModel.kt
@ -171,6 +171,7 @@ internal class HomeModel @Inject constructor(

            scanCardProcessor.scan(
                analyticsSource = analyticsSource,
+                shouldCheckIsAlreadyActivated = true,
                onProgressStateChange = { showProgress ->
                    if (!showProgress) {
                        delay(HIDE_PROGRESS_DELAY)
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createhardwarewallet/CreateHardwareWalletModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/createhardwarewallet/CreateHardwareWalletModel.kt
@ -104,6 +104,7 @@ internal class CreateHardwareWalletModel @Inject constructor(

            scanCardProcessor.scan(
                analyticsSource = analyticsSource,
+                shouldCheckIsAlreadyActivated = true,
                onProgressStateChange = { showProgress ->
                    if (!showProgress) {
                        delay(HIDE_PROGRESS_DELAY)
--- a/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/upgradewallet/UpgradeWalletModel.kt
+++ b/features/hot-wallet/impl/src/main/kotlin/com/tangem/features/hotwallet/upgradewallet/UpgradeWalletModel.kt
@ -115,7 +115,7 @@ internal class UpgradeWalletModel @Inject constructor(
            )

            tangemSdkManager
-                .scanProduct()
+                .scanProduct(shouldCheckIsAlreadyActivated = true)
                .doOnSuccess { scanResponse ->
                    checkIsWalletSuitableToBeUsedAsUpgrade(scanResponse = scanResponse) {
                        delay(DELAY_SDK_DIALOG_CLOSE)
--- a/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/model/WelcomeModel.kt
+++ b/features/welcome/impl/src/main/kotlin/com/tangem/features/welcome/impl/model/WelcomeModel.kt
@ -192,6 +192,7 @@ internal class WelcomeModel @Inject constructor(
        modelScope.launch {
            scanCardProcessor.scan(
                analyticsSource = AnalyticsParam.ScreensSources.SignIn,
+                shouldCheckIsAlreadyActivated = true,
                onWalletNotCreated = {},
                disclaimerWillShow = { router.pop() },
                onSuccess = { scanResponse ->
--- a/gradle/tangem_dependencies.toml
+++ b/gradle/tangem_dependencies.toml
@ -7,7 +7,7 @@

 tangemBlockchainSdk = "releases-5.34-1430"
 #tangemBlockchainSdk = "0.0.1" # Keep it! - used for local builds
-tangemCardSdk = "releases-5.34-581"
+tangemCardSdk = "releases-5.34-584"
 #tangemCardSdk = "0.0.1" # Keep it! - used for local builds ^
 tangemVico = "2.0.0-alpha.25-tangem12"
 #tangemVico = "0.0.1" # Keep it! - used for local builds ^
--- a/libs/tangem-sdk-api/src/main/kotlin/com/tangem/sdk/api/TangemSdkManager.kt
+++ b/libs/tangem-sdk-api/src/main/kotlin/com/tangem/sdk/api/TangemSdkManager.kt
@ -45,10 +45,18 @@ interface TangemSdkManager {

    suspend fun checkNeedEnrollBiometrics(awaitInitialization: Boolean = true): Boolean

+    /**
+     * Scans the card and returns [ScanResponse] with the card information.
+     * If [cardId] is provided, it will try to find the card with this ID in the card reader's range.
+     * If [allowsRequestAccessCodeFromRepository] is true, it will try to request access code from the repository
+     * if the card is protected by access code and the access code is not saved in the repository.
+     * If [shouldCheckIsAlreadyActivated] is true, it will check if the card is already activated and return an error if it is.
+     */
    suspend fun scanProduct(
        cardId: String? = null,
        messageRes: Int? = null,
        allowsRequestAccessCodeFromRepository: Boolean = false,
+        shouldCheckIsAlreadyActivated: Boolean,
    ): CompletionResult<ScanResponse>

    suspend fun createProductWallet(