Updated on 2026-08-14

app/build.gradle.kts

@@ -191,6 +191,7 @@ dependencies {
     implementation(projects.libs.tangemSdkApi)
 
     implementation(projects.data.account)
+    implementation(projects.data.addressBook)
     implementation(projects.data.appCurrency)
     implementation(projects.data.appTheme)
     implementation(projects.data.balanceHiding)

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

@@ -1,11 +1,18 @@
 package com.tangem.tap.di.domain
 
 import com.tangem.domain.addressbook.crypto.AddressBookCipher
+import com.tangem.domain.addressbook.interactor.GetVerifiedContactsInteractor
+import com.tangem.domain.addressbook.interactor.SaveContactInteractor
+import com.tangem.domain.addressbook.repository.AddressBookRepository
 import com.tangem.domain.addressbook.time.DefaultIsoTimestampProvider
 import com.tangem.domain.addressbook.time.IsoTimestampProvider
+import com.tangem.domain.addressbook.usecase.DeleteContactUseCase
+import com.tangem.domain.addressbook.usecase.GetContactsUseCase
 import com.tangem.domain.addressbook.usecase.ValidateContactAddressUseCase
-import com.tangem.domain.addressbook.usecase.VerifyAddressEntriesUseCase
+import com.tangem.domain.addressbook.usecase.ValidateContactNameUseCase
+import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.tokens.GetNetworkAddressesUseCase
+import com.tangem.domain.transaction.usecase.SignUseCase
 import com.tangem.domain.transaction.usecase.ValidateWalletAddressUseCase
 import com.tangem.domain.transaction.usecase.VerifySecp256k1MessagesUseCase
 import dagger.Module
@@ -32,10 +39,50 @@ object AddressBookDomainModule {
 
     @Provides
     @Singleton
-    fun provideVerifyAddressEntriesUseCase(
+    fun provideValidateContactNameUseCase(repository: AddressBookRepository): ValidateContactNameUseCase {
+        return ValidateContactNameUseCase(repository = repository)
+    }
+
+    @Provides
+    @Singleton
+    fun provideGetContactsUseCase(repository: AddressBookRepository): GetContactsUseCase {
+        return GetContactsUseCase(repository = repository)
+    }
+
+    @Provides
+    @Singleton
+    fun provideGetVerifiedContactsInteractor(
+        getContactsUseCase: GetContactsUseCase,
         verifyMessagesUseCase: VerifySecp256k1MessagesUseCase,
-    ): VerifyAddressEntriesUseCase {
-        return VerifyAddressEntriesUseCase(verifyMessagesUseCase = verifyMessagesUseCase)
+        userWalletsListRepository: UserWalletsListRepository,
+    ): GetVerifiedContactsInteractor {
+        return GetVerifiedContactsInteractor(
+            getContacts = getContactsUseCase,
+            verifyMessages = verifyMessagesUseCase,
+            userWalletsListRepository = userWalletsListRepository,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideSaveContactInteractor(
+        repository: AddressBookRepository,
+        validateContactNameUseCase: ValidateContactNameUseCase,
+        signUseCase: SignUseCase,
+        timestampProvider: IsoTimestampProvider,
+    ): SaveContactInteractor {
+        return SaveContactInteractor(
+            repository = repository,
+            validateContactName = validateContactNameUseCase,
+            signUseCase = signUseCase,
+            timestampProvider = timestampProvider,
+        )
+    }
+
+    @Provides
+    @Singleton
+    fun provideDeleteContactUseCase(repository: AddressBookRepository): DeleteContactUseCase {
+        return DeleteContactUseCase(repository = repository)
     }
 
     @Provides

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

@@ -4,13 +4,11 @@ import com.tangem.domain.swap.SwapErrorResolver
 import com.tangem.domain.swap.SwapRepositoryV2
 import com.tangem.domain.swap.SwapTransactionRepository
 import com.tangem.domain.swap.usecase.*
-import com.tangem.feature.swap.domain.GetAvailablePairsUseCase
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
-import com.tangem.feature.swap.domain.api.SwapRepository as OldSwapRepository
 
 /**
 [REDACTED_AUTHOR]
@@ -19,12 +17,6 @@ import com.tangem.feature.swap.domain.api.SwapRepository as OldSwapRepository
 @InstallIn(SingletonComponent::class)
 internal object SwapDomainModule {
 
-    @Provides
-    @Singleton
-    fun provideGetAvailablePairsUseCase(swapRepository: OldSwapRepository): GetAvailablePairsUseCase {
-        return GetAvailablePairsUseCase(swapRepository = swapRepository)
-    }
-
     @Provides
     @Singleton
     fun provideGetSwapSupportedPairsUseCase(

app/src/main/java/com/tangem/tap/routing/utils/ChildFactory.kt

@@ -21,7 +21,6 @@ import com.tangem.features.feed.entry.components.FeedEntryRoute
 import com.tangem.features.home.api.HomeComponent
 import com.tangem.features.hotwallet.*
 import com.tangem.features.kyc.KycComponent
-import com.tangem.features.survey.SurveyComponent
 import com.tangem.features.managetokens.component.ChooseManagedTokensComponent
 import com.tangem.features.managetokens.component.ManageTokensComponent
 import com.tangem.features.managetokens.component.ManageTokensMode
@@ -37,9 +36,10 @@ import com.tangem.features.send.api.NFTSendComponent
 import com.tangem.features.send.api.SendComponent
 import com.tangem.features.send.api.SendEntryPointComponent
 import com.tangem.features.staking.api.StakingComponent
+import com.tangem.features.survey.SurveyComponent
 import com.tangem.features.swap.SwapComponent
-import com.tangem.features.tangempay.components.TangemPayHotWalletOnboardingComponent
 import com.tangem.features.tangempay.components.TangemPayDetailsContainerComponent
+import com.tangem.features.tangempay.components.TangemPayHotWalletOnboardingComponent
 import com.tangem.features.tangempay.components.TangemPayOnboardingComponent
 import com.tangem.features.tangempay.components.TangemPayOnboardingComponent.Params.*
 import com.tangem.features.tokendetails.TokenDetailsComponent
@@ -71,7 +71,6 @@ internal class ChildFactory @Inject constructor(
     private val onrampSuccessComponentFactory: OnrampSuccessComponent.Factory,
     private val buyCryptoComponentFactory: BuyCryptoComponent.Factory,
     private val sellCryptoComponentFactory: SellCryptoComponent.Factory,
-    private val swapSelectTokensComponentFactory: SwapSelectTokensComponent.Factory,
     private val onboardingEntryComponentFactory: OnboardingEntryComponent.Factory,
     private val newWelcomeComponentFactory: NewWelcomeComponent.Factory,
     private val storiesComponentFactory: StoriesComponent.Factory,
@@ -253,13 +252,6 @@ internal class ChildFactory @Inject constructor(
                     componentFactory = sellCryptoComponentFactory,
                 )
             }
-            is AppRoute.SwapCrypto -> {
-                createComponentChild(
-                    context = context,
-                    params = SwapSelectTokensComponent.Params(userWalletId = route.userWalletId),
-                    componentFactory = swapSelectTokensComponentFactory,
-                )
-            }
             is AppRoute.Onboarding -> {
                 createComponentChild(
                     context = context,
@@ -759,7 +751,7 @@ internal class ChildFactory @Inject constructor(
             is AppRoute.AddressBook -> {
                 createComponentChild(
                     context = context,
-                    params = AddressBookComponent.Params(route.predefinedAddress),
+                    params = AddressBookComponent.Params(addressBookOpenMode = route.addressBookOpenMode),
                     componentFactory = addressBookComponentFactory,
                 )
             }

app/src/test/kotlin/com/tangem/tap/common/pushes/TokenDetailsPushHandlerTest.kt

@@ -14,7 +14,7 @@ import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
 import com.tangem.domain.models.wallet.isLocked
 import com.tangem.domain.models.wallet.isMultiCurrency
-import com.tangem.domain.wallets.models.GetUserWalletError
+import com.tangem.domain.wallets.models.errors.GetUserWalletError
 import com.tangem.domain.wallets.usecase.GetSelectedWalletSyncUseCase
 import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.utils.coroutines.AppCoroutineScope