Updated on 2026-08-14

app/src/main/java/com/tangem/tap/di/TangemSdkManagerModule.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.tangem.core.analytics.api.AnalyticsErrorHandler
 import com.tangem.domain.card.BuildConfig
 import com.tangem.domain.card.repository.CardSdkConfigRepository
+import com.tangem.domain.dynamicaddresses.DynamicAddressesFeatureToggles
 import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.sdk.api.TangemSdkManager
 import com.tangem.tap.domain.sdk.impl.DefaultTangemSdkManager
@@ -32,6 +33,7 @@ internal class TangemSdkManagerModule {
         visaCardActivationTaskFactory: VisaCardActivationTask.Factory,
         tangemPayChallengeTaskFactory: TangemPayGenerateAddressAndSignChallengeTask.Factory,
         onboardingV2FeatureToggles: OnboardingV2FeatureToggles,
+        dynamicAddressesFeatureToggles: DynamicAddressesFeatureToggles,
         blockchainToDeriveFinder: BlockchainToDeriveFinder,
         analyticsErrorHandler: AnalyticsErrorHandler,
     ): TangemSdkManager {
@@ -45,6 +47,7 @@ internal class TangemSdkManagerModule {
                 visaCardActivationTaskFactory = visaCardActivationTaskFactory,
                 tangemPayChallengeTaskFactory = tangemPayChallengeTaskFactory,
                 onboardingV2FeatureToggles = onboardingV2FeatureToggles,
+                dynamicAddressesFeatureToggles = dynamicAddressesFeatureToggles,
                 blockchainToDeriveFinder = blockchainToDeriveFinder,
                 analyticsErrorHandler = analyticsErrorHandler,
             )

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

@@ -30,6 +30,7 @@ import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.pay.WithdrawalSignatureResult
 import com.tangem.domain.visa.model.*
 import com.tangem.domain.wallets.derivations.derivationStyleProvider
+import com.tangem.domain.dynamicaddresses.DynamicAddressesFeatureToggles
 import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.operations.ScanTask
 import com.tangem.operations.derivation.DerivationTaskResponse
@@ -68,6 +69,7 @@ internal class DefaultTangemSdkManager(
     private val visaCardActivationTaskFactory: VisaCardActivationTask.Factory,
     private val tangemPayChallengeTaskFactory: TangemPayGenerateAddressAndSignChallengeTask.Factory,
     private val onboardingV2FeatureToggles: OnboardingV2FeatureToggles,
+    private val dynamicAddressesFeatureToggles: DynamicAddressesFeatureToggles,
     private val blockchainToDeriveFinder: BlockchainToDeriveFinder,
     private val analyticsErrorHandler: AnalyticsErrorHandler,
 ) : TangemSdkManager {
@@ -142,6 +144,7 @@ internal class DefaultTangemSdkManager(
                     visaCardScanHandler = visaCardScanHandler,
                     visaCoroutineScope = this,
                     shouldCheckIsAlreadyActivated = shouldCheckIsAlreadyActivated,
+                    isDynamicAddressesEnabled = dynamicAddressesFeatureToggles.isDynamicAddressesEnabled,
                     onboardingV2FeatureToggles = onboardingV2FeatureToggles,
                 ),
                 cardId = cardId,
@@ -446,7 +449,11 @@ internal class DefaultTangemSdkManager(
         initialMessage: Message,
     ): CompletionResult<ScanResponse> {
         return runTaskAsync(
-            runnable = FinalizeTwinTask(secondCardPublicKey, issuerKeyPair),
+            runnable = FinalizeTwinTask(
+                twinPublicKey = secondCardPublicKey,
+                issuerKeys = issuerKeyPair,
+                isDynamicAddressesEnabled = dynamicAddressesFeatureToggles.isDynamicAddressesEnabled,
+            ),
             cardId = cardId,
             initialMessage = initialMessage,
             preflightReadFilter = null,

app/src/main/java/com/tangem/tap/domain/tasks/product/ScanProductTask.kt

@@ -44,6 +44,7 @@ import com.tangem.tap.store
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
+@Suppress("LongParameterList")
 internal class ScanProductTask(
     private val card: Card?,
     private val blockchainToDeriveFinder: BlockchainToDeriveFinder?,
@@ -51,6 +52,7 @@ internal class ScanProductTask(
     private val visaCoroutineScope: CoroutineScope?,
     private val onboardingV2FeatureToggles: OnboardingV2FeatureToggles?,
     private val shouldCheckIsAlreadyActivated: Boolean,
+    private val isDynamicAddressesEnabled: Boolean,
     override val allowsRequestAccessCodeFromRepository: Boolean = false,
 ) : CardSessionRunnable<ScanResponse> {
 
@@ -78,7 +80,7 @@ internal class ScanProductTask(
             readVisaCard(
                 session = session,
                 cardDto = cardDto,
-                scanWalletProcessor = ScanWalletProcessor(blockchainToDeriveFinder),
+                scanWalletProcessor = ScanWalletProcessor(blockchainToDeriveFinder, isDynamicAddressesEnabled),
                 callback = callback,
             )
             return
@@ -86,7 +88,7 @@ internal class ScanProductTask(
 
         val commandProcessor = when {
             cardDto.isTangemTwins -> ScanTwinProcessor()
-            else -> ScanWalletProcessor(blockchainToDeriveFinder)
+            else -> ScanWalletProcessor(blockchainToDeriveFinder, isDynamicAddressesEnabled)
         }
         commandProcessor.proceed(cardDto, session) { processorResult ->
             when (processorResult) {
@@ -168,6 +170,7 @@ internal class ScanProductTask(
 
 private class ScanWalletProcessor(
     private val blockchainToDeriveFinder: BlockchainToDeriveFinder?,
+    private val isDynamicAddressesEnabled: Boolean,
 ) : ProductCommandProcessor<ScanResponse> {
 
     var primaryCard: PrimaryCard? = null
@@ -333,7 +336,7 @@ private class ScanWalletProcessor(
             ?.find(card)
             ?: return emptyMap()
 
-        return MissedDerivationsFinder(scanResponse).findByBlockchainsToDerive(blockchains)
+        return MissedDerivationsFinder(scanResponse, isDynamicAddressesEnabled).findByBlockchainsToDerive(blockchains)
     }
 }
 

app/src/main/java/com/tangem/tap/domain/twins/FinalizeTwinTask.kt

@@ -12,6 +12,7 @@ import com.tangem.tap.domain.tasks.product.ScanProductTask
 class FinalizeTwinTask(
     private val twinPublicKey: ByteArray,
     private val issuerKeys: KeyPair,
+    private val isDynamicAddressesEnabled: Boolean,
 ) : CardSessionRunnable<ScanResponse> {
 
     override val allowsRequestAccessCodeFromRepository: Boolean = false
@@ -32,6 +33,7 @@ class FinalizeTwinTask(
                                     visaCardScanHandler = null,
                                     visaCoroutineScope = null,
                                     shouldCheckIsAlreadyActivated = false,
+                                    isDynamicAddressesEnabled = false,
                                     onboardingV2FeatureToggles = null,
                                 ).run(session, callback)
                             is CompletionResult.Failure ->