Updated on 2026-08-14

app/src/main/java/com/tangem/tap/ApplicationEntryPoint.kt

@@ -32,11 +32,10 @@ import com.tangem.domain.onboarding.SaveTwinsOnboardingShownUseCase
 import com.tangem.domain.onboarding.WasTwinsOnboardingShownUseCase
 import com.tangem.domain.onboarding.repository.OnboardingRepository
 import com.tangem.domain.settings.repositories.SettingsRepository
-import com.tangem.domain.settings.usercountry.GetUserCountryUseCase
 import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.repository.WalletsRepository
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.features.onramp.OnrampFeatureToggles
 import com.tangem.operations.attestation.OnlineCardVerifier
@@ -95,8 +94,6 @@ interface ApplicationEntryPoint {
 
     fun getSaveTwinsOnboardingShownUseCase(): SaveTwinsOnboardingShownUseCase
 
-    fun getWalletNameGenerateUseCase(): GenerateWalletNameUseCase
-
     fun getCardRepository(): CardRepository
 
     fun getTangemSdkLogger(): TangemSdkLogger
@@ -119,8 +116,6 @@ interface ApplicationEntryPoint {
 
     fun getTransactionSignerFactory(): TransactionSignerFactory
 
-    fun getGetUserCountryCodeUseCase(): GetUserCountryUseCase
-
     fun getOnrampFeatureToggles(): OnrampFeatureToggles
 
     fun getOnboardingV2FeatureToggles(): OnboardingV2FeatureToggles
@@ -145,4 +140,6 @@ interface ApplicationEntryPoint {
     fun getWorkerFactory(): HiltWorkerFactory
 
     fun getOnlineCardVerifier(): OnlineCardVerifier
+
+    fun getUserWalletBuilderFactory(): UserWalletBuilder.Factory
 }

app/src/main/java/com/tangem/tap/TangemApplication.kt

@@ -46,11 +46,10 @@ import com.tangem.domain.onboarding.SaveTwinsOnboardingShownUseCase
 import com.tangem.domain.onboarding.WasTwinsOnboardingShownUseCase
 import com.tangem.domain.onboarding.repository.OnboardingRepository
 import com.tangem.domain.settings.repositories.SettingsRepository
-import com.tangem.domain.settings.usercountry.GetUserCountryUseCase
 import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.repository.WalletsRepository
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.features.onramp.OnrampFeatureToggles
 import com.tangem.operations.attestation.OnlineCardVerifier
@@ -147,9 +146,6 @@ abstract class TangemApplication : Application(), ImageLoaderFactory, Configurat
     private val saveTwinsOnboardingShownUseCase: SaveTwinsOnboardingShownUseCase
         get() = entryPoint.getSaveTwinsOnboardingShownUseCase()
 
-    private val generateWalletNameUseCase: GenerateWalletNameUseCase
-        get() = entryPoint.getWalletNameGenerateUseCase()
-
     private val cardRepository: CardRepository
         get() = entryPoint.getCardRepository()
 
@@ -183,9 +179,6 @@ abstract class TangemApplication : Application(), ImageLoaderFactory, Configurat
     private val transactionSignerFactory: TransactionSignerFactory
         get() = entryPoint.getTransactionSignerFactory()
 
-    private val getUserCountryUseCase: GetUserCountryUseCase
-        get() = entryPoint.getGetUserCountryCodeUseCase()
-
     private val onrampFeatureToggles: OnrampFeatureToggles
         get() = entryPoint.getOnrampFeatureToggles()
 
@@ -224,6 +217,8 @@ abstract class TangemApplication : Application(), ImageLoaderFactory, Configurat
     private val onlineCardVerifier: OnlineCardVerifier
         get() = entryPoint.getOnlineCardVerifier()
 
+    private val userWalletBuilderFactory: UserWalletBuilder.Factory
+        get() = entryPoint.getUserWalletBuilderFactory()
     // endregion
 
     override fun onCreate() {
@@ -305,7 +300,6 @@ abstract class TangemApplication : Application(), ImageLoaderFactory, Configurat
                     generalUserWalletsListManager = generalUserWalletsListManager,
                     wasTwinsOnboardingShownUseCase = wasTwinsOnboardingShownUseCase,
                     saveTwinsOnboardingShownUseCase = saveTwinsOnboardingShownUseCase,
-                    generateWalletNameUseCase = generateWalletNameUseCase,
                     cardRepository = cardRepository,
                     settingsRepository = settingsRepository,
                     blockchainSDKFactory = blockchainSDKFactory,
@@ -316,7 +310,6 @@ abstract class TangemApplication : Application(), ImageLoaderFactory, Configurat
                     shareManager = shareManager,
                     appRouter = appRouter,
                     transactionSignerFactory = transactionSignerFactory,
-                    getUserCountryUseCase = getUserCountryUseCase,
                     onrampFeatureToggles = onrampFeatureToggles,
                     environmentConfigStorage = environmentConfigStorage,
                     onboardingV2FeatureToggles = onboardingV2FeatureToggles,
@@ -327,6 +320,7 @@ abstract class TangemApplication : Application(), ImageLoaderFactory, Configurat
                     settingsManager = settingsManager,
                     uiMessageSender = uiMessageSender,
                     onlineCardVerifier = onlineCardVerifier,
+                    userWalletBuilderFactory = userWalletBuilderFactory,
                 ),
             ),
         )

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

@@ -11,6 +11,7 @@ import com.tangem.domain.wallets.repository.WalletNamesMigrationRepository
 import com.tangem.domain.wallets.repository.WalletsRepository
 import com.tangem.domain.wallets.usecase.*
 import com.tangem.feature.wallet.presentation.wallet.domain.WalletNameMigrationUseCase
+import com.tangem.operations.attestation.OnlineCardVerifier
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -18,6 +19,7 @@ import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
 
+@Suppress("TooManyFunctions")
 @Module
 @InstallIn(SingletonComponent::class)
 internal object WalletsDomainModule {
@@ -165,4 +167,10 @@ internal object WalletsDomainModule {
     fun providesSeedPhraseNotificationUseCase(walletsRepository: WalletsRepository): SeedPhraseNotificationUseCase {
         return SeedPhraseNotificationUseCase(walletsRepository = walletsRepository)
     }
+
+    @Provides
+    @Singleton
+    fun provideGetCardImageUseCase(onlineCardVerifier: OnlineCardVerifier): GetCardImageUseCase {
+        return GetCardImageUseCase(verifier = onlineCardVerifier)
+    }
 }

app/src/main/java/com/tangem/tap/features/home/HomeModel.kt

@@ -19,7 +19,6 @@ import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.domain.tokens.TokensAction
 import com.tangem.domain.wallets.builder.UserWalletBuilder
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.domain.wallets.usecase.SaveWalletUseCase
 import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter
 import com.tangem.tap.common.analytics.events.IntroductionProcess
@@ -44,12 +43,12 @@ import javax.inject.Inject
 internal class HomeModel @Inject constructor(
     override val dispatchers: CoroutineDispatcherProvider,
     private val scanCardProcessor: ScanCardProcessor,
-    private val generateWalletNameUseCase: GenerateWalletNameUseCase,
     private val saveWalletUseCase: SaveWalletUseCase,
     private val cardSdkConfigRepository: CardSdkConfigRepository,
     private val settingsRepository: SettingsRepository,
     private val urlOpener: UrlOpener,
     private val analyticsEventHandler: AnalyticsEventHandler,
+    private val userWalletBuilderFactory: UserWalletBuilder.Factory,
 ) : Model() {
 
     private val tangemErrorHandler = TangemTangemErrorsHandler(store)
@@ -100,10 +99,7 @@ internal class HomeModel @Inject constructor(
     }
 
     private suspend fun proceedWithScanResponse(scanResponse: ScanResponse) {
-        val userWallet = UserWalletBuilder(
-            scanResponse = scanResponse,
-            generateWalletNameUseCase = generateWalletNameUseCase,
-        ).build()
+        val userWallet = userWalletBuilderFactory.create(scanResponse = scanResponse).build()
 
         if (userWallet == null) {
             Timber.e("User wallet not created")

app/src/main/java/com/tangem/tap/features/home/redux/HomeMiddleware.kt

@@ -10,7 +10,6 @@ import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.analytics.models.Basic
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter
 import com.tangem.tap.common.analytics.events.IntroductionProcess
 import com.tangem.tap.common.extensions.dispatchNavigationAction
@@ -91,8 +90,9 @@ private suspend fun readCard() {
 }
 
 private fun proceedWithScanResponse(scanResponse: ScanResponse) = scope.launch {
-    val walletNameGenerateUseCase = store.inject(DaggerGraphState::generateWalletNameUseCase)
-    val userWallet = UserWalletBuilder(scanResponse, walletNameGenerateUseCase).build().guard {
+    val userWalletBuilder = store.inject(DaggerGraphState::userWalletBuilderFactory).create(scanResponse)
+
+    val userWallet = userWalletBuilder.build().guard {
         Timber.e("User wallet not created")
         return@launch
     }

app/src/main/java/com/tangem/tap/features/onboarding/OnboardingHelper.kt

@@ -14,7 +14,6 @@ import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ProductType
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.visa.model.VisaCardActivationStatus
-import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.builder.UserWalletIdBuilder
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.tap.common.analytics.converters.ParamCardCurrencyConverter
@@ -255,8 +254,9 @@ object OnboardingHelper {
         hasBackupError: Boolean,
         alreadyCreatedWallet: UserWallet? = null,
     ) {
-        val walletNameGenerateUseCase = store.inject(DaggerGraphState::generateWalletNameUseCase)
-        val userWallet = alreadyCreatedWallet ?: UserWalletBuilder(scanResponse, walletNameGenerateUseCase)
+        val userWalletBuilderFactory = store.inject(DaggerGraphState::userWalletBuilderFactory)
+
+        val userWallet = alreadyCreatedWallet ?: userWalletBuilderFactory.create(scanResponse)
             .hasBackupError(hasBackupError)
             .backupCardsIds(backupCardsIds?.toSet())
             .build()

app/src/main/java/com/tangem/tap/features/onboarding/products/wallet/redux/OnboardingWalletMiddleware.kt

@@ -24,7 +24,6 @@ import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.CardDTO.Companion.RING_BATCH_IDS
 import com.tangem.domain.models.scan.CardDTO.Companion.RING_BATCH_PREFIX
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.builder.UserWalletIdBuilder
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.Artwork
@@ -782,9 +781,10 @@ private suspend fun updateWallet(
 }
 
 private suspend fun createUserWallet(scanResponse: ScanResponse, backupState: BackupState): UserWallet {
-    val walletNameGenerateUseCase = store.inject(DaggerGraphState::generateWalletNameUseCase)
+    val userWalletBuilder = store.inject(DaggerGraphState::userWalletBuilderFactory).create(scanResponse)
+
     return requireNotNull(
-        value = UserWalletBuilder(scanResponse, walletNameGenerateUseCase)
+        value = userWalletBuilder
             .backupCardsIds(backupState.backupCardIds.toSet())
             .hasBackupError(backupState.hasBackupError)
             .build(),

app/src/main/java/com/tangem/tap/features/saveWallet/redux/SaveWalletMiddleware.kt

@@ -6,7 +6,6 @@ import com.tangem.common.extensions.guard
 import com.tangem.common.routing.AppRoute
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.analytics.models.event.MainScreenAnalyticsEvent
-import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.tap.common.analytics.events.AnalyticsParam
 import com.tangem.tap.common.analytics.events.Onboarding
@@ -70,8 +69,10 @@ internal class SaveWalletMiddleware {
         scope.launch {
             val backupInfo = state.backupInfo ?: error("Backup info is null")
 
-            val walletNameGenerateUseCase = store.inject(DaggerGraphState::generateWalletNameUseCase)
-            val userWallet = UserWalletBuilder(backupInfo.scanResponse, walletNameGenerateUseCase)
+            val userWalletBuilder = store.inject(DaggerGraphState::userWalletBuilderFactory)
+                .create(scanResponse = backupInfo.scanResponse)
+
+            val userWallet = userWalletBuilder
                 .backupCardsIds(state.backupInfo.backupCardsIds)
                 .hasBackupError(hasBackupError)
                 .build()

app/src/main/java/com/tangem/tap/features/welcome/redux/WelcomeMiddleware.kt

@@ -11,10 +11,8 @@ import com.tangem.common.routing.utils.popTo
 import com.tangem.core.analytics.Analytics
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.analytics.models.Basic
-
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.legacy.UserWalletsListManager.Lockable.UnlockType
 import com.tangem.domain.wallets.legacy.unlockIfLockable
 import com.tangem.tap.backupService
@@ -118,9 +116,9 @@ internal class WelcomeMiddleware {
         )
 
         scanCardInternal { scanResponse ->
-            val walletNameGenerateUseCase = store.inject(DaggerGraphState::generateWalletNameUseCase)
-            val userWallet = UserWalletBuilder(scanResponse, walletNameGenerateUseCase).build()
-                ?: return@scanCardInternal
+            val userWalletBuilder = store.inject(DaggerGraphState::userWalletBuilderFactory).create(scanResponse)
+
+            val userWallet = userWalletBuilder.build() ?: return@scanCardInternal
 
             val userWalletsListManager = store.inject(DaggerGraphState::generalUserWalletsListManager)
             userWalletsListManager.save(userWallet, canOverride = true)

app/src/main/java/com/tangem/tap/proxy/redux/DaggerGraphState.kt

@@ -26,11 +26,10 @@ import com.tangem.domain.onboarding.SaveTwinsOnboardingShownUseCase
 import com.tangem.domain.onboarding.WasTwinsOnboardingShownUseCase
 import com.tangem.domain.onboarding.repository.OnboardingRepository
 import com.tangem.domain.settings.repositories.SettingsRepository
-import com.tangem.domain.settings.usercountry.GetUserCountryUseCase
 import com.tangem.domain.walletmanager.WalletManagersFacade
+import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.repository.WalletsRepository
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
 import com.tangem.features.onramp.OnrampFeatureToggles
 import com.tangem.operations.attestation.OnlineCardVerifier
@@ -57,7 +56,6 @@ data class DaggerGraphState(
     val generalUserWalletsListManager: UserWalletsListManager? = null,
     val wasTwinsOnboardingShownUseCase: WasTwinsOnboardingShownUseCase? = null,
     val saveTwinsOnboardingShownUseCase: SaveTwinsOnboardingShownUseCase? = null,
-    val generateWalletNameUseCase: GenerateWalletNameUseCase? = null,
     val cardRepository: CardRepository? = null,
     val settingsRepository: SettingsRepository? = null,
     val blockchainSDKFactory: BlockchainSDKFactory? = null,
@@ -68,7 +66,6 @@ data class DaggerGraphState(
     val shareManager: ShareManager? = null,
     val appRouter: AppRouter? = null,
     val transactionSignerFactory: TransactionSignerFactory? = null,
-    val getUserCountryUseCase: GetUserCountryUseCase? = null,
     val onrampFeatureToggles: OnrampFeatureToggles? = null,
     val environmentConfigStorage: EnvironmentConfigStorage? = null,
     val onboardingV2FeatureToggles: OnboardingV2FeatureToggles? = null,
@@ -79,4 +76,5 @@ data class DaggerGraphState(
     val settingsManager: SettingsManager? = null,
     val uiMessageSender: UiMessageSender? = null,
     val onlineCardVerifier: OnlineCardVerifier? = null,
+    val userWalletBuilderFactory: UserWalletBuilder.Factory? = null,
 ) : StateType

domain/wallets/build.gradle.kts

@@ -1,6 +1,8 @@
 plugins {
     alias(deps.plugins.android.library)
     alias(deps.plugins.kotlin.android)
+    alias(deps.plugins.kotlin.kapt)
+    alias(deps.plugins.hilt.android)
     id("configuration")
 }
 
@@ -19,6 +21,7 @@ dependencies {
     api(projects.domain.core)
     implementation(projects.domain.legacy)
     implementation(projects.libs.blockchainSdk)
+    implementation(projects.libs.tangemSdkApi)
     implementation(projects.domain.models)
     implementation(projects.domain.tokens)
     implementation(projects.domain.tokens.models)
@@ -29,4 +32,9 @@ dependencies {
     implementation(tangemDeps.blockchain) // android-library
     implementation(tangemDeps.card.core)
     // endregion
+
+    // region DI
+    implementation(deps.hilt.android)
+    kapt(deps.hilt.kapt)
+    // end
 }

domain/wallets/src/main/java/com/tangem/domain/wallets/builder/UserWalletBuilder.kt

@@ -3,14 +3,17 @@ package com.tangem.domain.wallets.builder
 import com.tangem.domain.common.util.cardTypesResolver
 import com.tangem.domain.models.scan.CardDTO
 import com.tangem.domain.models.scan.ScanResponse
-import com.tangem.domain.wallets.usecase.GetCardImageUseCase
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
+import com.tangem.domain.wallets.usecase.GetCardImageUseCase
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
 
-class UserWalletBuilder(
-    private val scanResponse: ScanResponse,
+class UserWalletBuilder @AssistedInject constructor(
+    @Assisted private val scanResponse: ScanResponse,
     private val generateWalletNameUseCase: GenerateWalletNameUseCase,
-    private val getCardImageUseCase: GetCardImageUseCase = GetCardImageUseCase(),
+    private val getCardImageUseCase: GetCardImageUseCase,
 ) {
     private var backupCardsIds: Set<String> = emptySet()
     private var hasBackupError: Boolean = false
@@ -56,4 +59,10 @@ class UserWalletBuilder(
                 }
         }
     }
+
+    @AssistedFactory
+    interface Factory {
+
+        fun create(scanResponse: ScanResponse): UserWalletBuilder
+    }
 }

domain/wallets/src/main/java/com/tangem/domain/wallets/usecase/GetCardImageUseCase.kt

@@ -10,11 +10,11 @@ import com.tangem.operations.attestation.OnlineCardVerifier
 /**
  * Use case for getting card image url
  *
- * @property verifier REST API
+ * @property verifier online card verifier
  *
 [REDACTED_AUTHOR]
  */
-class GetCardImageUseCase(private val verifier: OnlineCardVerifier = OnlineCardVerifier()) {
+class GetCardImageUseCase(private val verifier: OnlineCardVerifier) {
 
     /**
      * Get card image url

features/details/impl/src/main/kotlin/com/tangem/features/details/utils/UserWalletSaver.kt

@@ -23,7 +23,6 @@ import com.tangem.domain.redux.ReduxStateHolder
 import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.models.SaveWalletError
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.domain.wallets.usecase.SaveWalletUseCase
 import com.tangem.domain.wallets.usecase.ShouldSaveUserWalletsSyncUseCase
 import com.tangem.features.details.impl.R
@@ -38,7 +37,7 @@ import kotlin.coroutines.resume
 internal class UserWalletSaver @Inject constructor(
     private val scanCardProcessor: ScanCardProcessor,
     private val saveWalletUseCase: SaveWalletUseCase,
-    private val generateWalletNameUseCase: GenerateWalletNameUseCase,
+    private val userWalletBuilderFactory: UserWalletBuilder.Factory,
     private val shouldSaveUserWalletsSyncUseCase: ShouldSaveUserWalletsSyncUseCase,
     private val reduxStateHolder: ReduxStateHolder,
     private val messageSender: UiMessageSender,
@@ -56,17 +55,20 @@ internal class UserWalletSaver @Inject constructor(
                 }
             },
             ifRight = { scanResponse ->
-                recover(block = {
-                    scanResponse ?: return
-                    val userWallet = createUserWallet(scanResponse)
-                    saveWallet(userWallet)
-                }, recover = {
+                recover(
+                    block = {
+                        scanResponse ?: return
+                        val userWallet = createUserWallet(scanResponse)
+                        saveWallet(userWallet)
+                    },
+                    recover = {
                         val message = it.message
 
                         if (!message.isNullOrEmpty()) {
                             messageSender.send(SnackbarMessage(message))
                         }
-                    },)
+                    },
+                )
             },
         )
     }
@@ -110,7 +112,7 @@ internal class UserWalletSaver @Inject constructor(
     }
 
     private suspend fun Raise<Error>.createUserWallet(response: ScanResponse): UserWallet {
-        val userWallet = UserWalletBuilder(response, generateWalletNameUseCase).build()
+        val userWallet = userWalletBuilderFactory.create(scanResponse = response).build()
 
         return ensureNotNull(userWallet) { Error.Unknown }
     }

features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/chooseoption/model/Wallet1ChooseOptionModel.kt

@@ -10,7 +10,6 @@ import com.tangem.domain.common.TapWorkarounds.canSkipBackup
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.domain.wallets.usecase.SaveWalletUseCase
 import com.tangem.features.onboarding.v2.multiwallet.impl.analytics.OnboardingEvent
 import com.tangem.features.onboarding.v2.multiwallet.impl.child.MultiWalletChildParams
@@ -25,7 +24,7 @@ import javax.inject.Inject
 internal class Wallet1ChooseOptionModel @Inject constructor(
     override val dispatchers: CoroutineDispatcherProvider,
     paramsContainer: ParamsContainer,
-    private val generateWalletNameUseCase: GenerateWalletNameUseCase,
+    private val userWalletBuilderFactory: UserWalletBuilder.Factory,
     private val cardRepository: CardRepository,
     private val saveWalletUseCase: SaveWalletUseCase,
     private val analyticsHandler: AnalyticsEventHandler,
@@ -67,7 +66,7 @@ internal class Wallet1ChooseOptionModel @Inject constructor(
 
     private suspend fun createUserWallet(scanResponse: ScanResponse): UserWallet {
         return requireNotNull(
-            value = UserWalletBuilder(scanResponse, generateWalletNameUseCase).build(),
+            value = userWalletBuilderFactory.create(scanResponse = scanResponse).build(),
             lazyMessage = { "User wallet not created" },
         )
     }

features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/createwallet/model/MultiWalletCreateWalletModel.kt

@@ -15,7 +15,6 @@ import com.tangem.domain.feedback.models.FeedbackEmailType
 import com.tangem.domain.models.scan.ScanResponse
 import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.domain.wallets.usecase.SaveWalletUseCase
 import com.tangem.features.onboarding.v2.impl.R
 import com.tangem.features.onboarding.v2.multiwallet.impl.analytics.OnboardingEvent
@@ -43,7 +42,7 @@ internal class MultiWalletCreateWalletModel @Inject constructor(
     private val getCardInfoUseCase: GetCardInfoUseCase,
     private val cardRepository: CardRepository,
     private val analyticsHandler: AnalyticsEventHandler,
-    private val generateWalletNameUseCase: GenerateWalletNameUseCase,
+    private val userWalletBuilderFactory: UserWalletBuilder.Factory,
     private val saveWalletUseCase: SaveWalletUseCase,
 ) : Model() {
 
@@ -146,7 +145,7 @@ internal class MultiWalletCreateWalletModel @Inject constructor(
 
     private suspend fun createUserWallet(scanResponse: ScanResponse): UserWallet {
         return requireNotNull(
-            value = UserWalletBuilder(scanResponse, generateWalletNameUseCase).build(),
+            value = userWalletBuilderFactory.create(scanResponse = scanResponse).build(),
             lazyMessage = { "User wallet not created" },
         )
     }

features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/child/finalize/model/MultiWalletFinalizeModel.kt

@@ -19,7 +19,6 @@ import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.domain.wallets.repository.WalletsRepository
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.features.onboarding.v2.impl.R
 import com.tangem.features.onboarding.v2.multiwallet.api.OnboardingMultiWalletComponent
 import com.tangem.features.onboarding.v2.multiwallet.impl.child.MultiWalletChildParams
@@ -47,7 +46,7 @@ internal class MultiWalletFinalizeModel @Inject constructor(
     private val tangemSdkManager: TangemSdkManager,
     private val getCardInfoUseCase: GetCardInfoUseCase,
     private val sendFeedbackEmailUseCase: SendFeedbackEmailUseCase,
-    private val generateWalletNameUseCase: GenerateWalletNameUseCase,
+    private val userWalletBuilderFactory: UserWalletBuilder.Factory,
     private val userWalletsListManager: UserWalletsListManager,
     private val cardRepository: CardRepository,
     private val onboardingRepository: OnboardingRepository,
@@ -276,7 +275,7 @@ internal class MultiWalletFinalizeModel @Inject constructor(
 
     private suspend fun createUserWallet(scanResponse: ScanResponse): UserWallet {
         return requireNotNull(
-            value = UserWalletBuilder(scanResponse, generateWalletNameUseCase)
+            value = userWalletBuilderFactory.create(scanResponse = scanResponse)
                 .backupCardsIds(backupCardIds.toSet())
                 .hasBackupError(walletHasBackupError)
                 .build(),

features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/model/OnboardingMultiWalletModel.kt

@@ -19,21 +19,25 @@ import com.tangem.features.onboarding.v2.multiwallet.impl.ui.state.OnboardingMul
 import com.tangem.operations.backup.BackupService
 import com.tangem.sdk.api.BackupServiceHolder
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
+@Suppress("LongParameterList")
 @ModelScoped
 internal class OnboardingMultiWalletModel @Inject constructor(
     paramsContainer: ParamsContainer,
+    analyticsHandler: AnalyticsEventHandler,
     override val dispatchers: CoroutineDispatcherProvider,
     private val router: Router,
-    private val analyticsHandler: AnalyticsEventHandler,
     private val backupServiceHolder: BackupServiceHolder,
     private val appPreferencesStore: AppPreferencesStore,
+    private val getCardImageUseCase: GetCardImageUseCase,
 ) : Model() {
     private val params = paramsContainer.require<OnboardingMultiWalletComponent.Params>()
-    private val getCardImageUseCase = GetCardImageUseCase()
     private val _uiState = MutableStateFlow(OnboardingMultiWalletUM())
 
     val state = MutableStateFlow(

features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/inprogress/model/OnboardingVisaInProgressModel.kt

@@ -14,7 +14,6 @@ import com.tangem.domain.visa.repository.VisaAuthRepository
 import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.features.onboarding.v2.visa.impl.child.inprogress.OnboardingVisaInProgressComponent.Config
 import com.tangem.features.onboarding.v2.visa.impl.child.inprogress.OnboardingVisaInProgressComponent.Params
 import com.tangem.features.onboarding.v2.visa.impl.route.OnboardingVisaRoute
@@ -35,7 +34,7 @@ internal class OnboardingVisaInProgressModel @Inject constructor(
     private val visaAuthRepository: VisaAuthRepository,
     private val visaAuthTokenStorage: VisaAuthTokenStorage,
     private val otpStorage: VisaOTPStorage,
-    private val generateWalletNameUseCase: GenerateWalletNameUseCase,
+    private val userWalletBuilderFactory: UserWalletBuilder.Factory,
     private val userWalletsListManager: UserWalletsListManager,
 ) : Model() {
 
@@ -110,9 +109,8 @@ internal class OnboardingVisaInProgressModel @Inject constructor(
             val newActivationStatus = VisaCardActivationStatus.Activated(visaAuthTokens = authTokens)
 
             requireNotNull(
-                value = UserWalletBuilder(
-                    scanResponse.copy(visaCardActivationStatus = newActivationStatus),
-                    generateWalletNameUseCase,
+                value = userWalletBuilderFactory.create(
+                    scanResponse = scanResponse.copy(visaCardActivationStatus = newActivationStatus),
                 ).build(),
                 lazyMessage = { "User wallet not created" },
             )

features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/visa/impl/child/pincode/model/OnboardingVisaPinCodeModel.kt

@@ -14,7 +14,6 @@ import com.tangem.domain.visa.model.VisaCardId
 import com.tangem.domain.wallets.builder.UserWalletBuilder
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.domain.wallets.models.UserWallet
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.features.onboarding.v2.visa.impl.child.pincode.OnboardingVisaPinCodeComponent
 import com.tangem.features.onboarding.v2.visa.impl.child.pincode.ui.state.OnboardingVisaPinCodeUM
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -32,7 +31,7 @@ import javax.inject.Inject
 internal class OnboardingVisaPinCodeModel @Inject constructor(
     paramsContainer: ParamsContainer,
     override val dispatchers: CoroutineDispatcherProvider,
-    private val generateWalletNameUseCase: GenerateWalletNameUseCase,
+    private val userWalletBuilderFactory: UserWalletBuilder.Factory,
     private val userWalletsListManager: UserWalletsListManager,
     private val authTokenStorage: VisaAuthTokenStorage,
     private val otpStorage: VisaAuthTokenStorage,
@@ -112,9 +111,8 @@ internal class OnboardingVisaPinCodeModel @Inject constructor(
         )
 
         requireNotNull(
-            value = UserWalletBuilder(
-                scanResponse.copy(visaCardActivationStatus = newActivationStatus),
-                generateWalletNameUseCase,
+            value = userWalletBuilderFactory.create(
+                scanResponse = scanResponse.copy(visaCardActivationStatus = newActivationStatus),
             ).build(),
             lazyMessage = { "User wallet not created" },
         )

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/ScanCardToUnlockWalletClickHandler.kt

@@ -8,7 +8,6 @@ import com.tangem.common.core.TangemSdkError
 import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.domain.card.ScanCardProcessor
 import com.tangem.domain.wallets.builder.UserWalletBuilder
-import com.tangem.domain.wallets.usecase.GenerateWalletNameUseCase
 import com.tangem.domain.wallets.models.UserWalletId
 import com.tangem.domain.wallets.usecase.SaveWalletUseCase
 import javax.inject.Inject
@@ -16,7 +15,7 @@ import javax.inject.Inject
 internal class ScanCardToUnlockWalletClickHandler @Inject constructor(
     private val scanCardProcessor: ScanCardProcessor,
     private val saveWalletUseCase: SaveWalletUseCase,
-    private val generateWalletNameUseCase: GenerateWalletNameUseCase,
+    private val userWalletBuilderFactory: UserWalletBuilder.Factory,
 ) {
 
     private var scanFailsCounter = 0
@@ -34,7 +33,7 @@ internal class ScanCardToUnlockWalletClickHandler @Inject constructor(
                     scanFailsCounter = 0
 
                     // If card's public key is null then user wallet will be null
-                    val scannedWallet = UserWalletBuilder(result.data, generateWalletNameUseCase).build()
+                    val scannedWallet = userWalletBuilderFactory.create(scanResponse = result.data).build()
 
                     ensure(walletId == scannedWallet?.walletId) {
                         ScanCardToUnlockWalletError.WrongCardIsScanned