Updated on 2026-08-14

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

@@ -6,8 +6,9 @@ import com.arkivanov.decompose.defaultComponentContext
 import com.tangem.core.decompose.context.AppComponentContext
 import com.tangem.core.decompose.context.DefaultAppComponentContext
 import com.tangem.core.decompose.di.DecomposeComponent
+import com.tangem.core.decompose.di.GlobalUiMessageSender
 import com.tangem.core.decompose.di.RootAppComponentContext
-import com.tangem.core.ui.UiDependencies
+import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -27,13 +28,13 @@ internal object RootAppComponentContextModule {
         @ActivityContext context: Context,
         dispatchers: CoroutineDispatcherProvider,
         componentBuilder: DecomposeComponent.Builder,
-        uiDependencies: UiDependencies,
+        @GlobalUiMessageSender messageSender: UiMessageSender,
     ): AppComponentContext {
         return DefaultAppComponentContext(
             componentContext = (context as AppCompatActivity).defaultComponentContext(),
-            messageHandler = uiDependencies.eventMessageHandler,
             dispatchers = dispatchers,
             hiltComponentBuilder = componentBuilder,
+            messageSender = messageSender,
         )
     }
 }

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

@@ -1,6 +1,9 @@
 package com.tangem.tap.di
 
 import androidx.compose.material3.SnackbarHostState
+import com.tangem.core.decompose.di.GlobalUiMessageSender
+import com.tangem.core.decompose.ui.DefaultUiMessageSender
+import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.ui.UiDependencies
 import com.tangem.core.ui.haptic.VibratorHapticManager
 import com.tangem.core.ui.message.EventMessageHandler
@@ -28,4 +31,11 @@ internal object UiDependenciesModule {
             override val eventMessageHandler: EventMessageHandler = EventMessageHandler()
         }
     }
+
+    @Provides
+    @Singleton
+    @GlobalUiMessageSender
+    fun provideUiMessageSender(uiDependencies: UiDependencies): UiMessageSender {
+        return DefaultUiMessageSender(uiDependencies.eventMessageHandler)
+    }
 }

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

@@ -0,0 +1,36 @@
+package com.tangem.tap.di.domain
+
+import com.tangem.domain.promo.PromoRepository
+import com.tangem.domain.promo.ShouldShowRingPromoUseCase
+import com.tangem.domain.promo.ShouldShowSwapPromoTokenUseCase
+import com.tangem.domain.promo.ShouldShowSwapPromoWalletUseCase
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import javax.inject.Singleton
+
+@Module
+@InstallIn(SingletonComponent::class)
+internal object PromoDomainModule {
+
+    @Provides
+    @Singleton
+    fun provideShouldShowSwapPromoWalletUseCase(
+        promoSettingsRepository: PromoRepository,
+    ): ShouldShowSwapPromoWalletUseCase {
+        return ShouldShowSwapPromoWalletUseCase(promoSettingsRepository)
+    }
+
+    @Provides
+    @Singleton
+    fun provideShouldShowRingPromoUseCase(promoRepository: PromoRepository): ShouldShowRingPromoUseCase {
+        return ShouldShowRingPromoUseCase(promoRepository)
+    }
+
+    @Provides
+    @Singleton
+    fun provideShouldShowSwapPromoTokenUseCase(promoRepository: PromoRepository): ShouldShowSwapPromoTokenUseCase {
+        return ShouldShowSwapPromoTokenUseCase(promoRepository)
+    }
+}

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

@@ -8,7 +8,6 @@ import com.tangem.domain.balancehiding.repositories.BalanceHidingRepository
 import com.tangem.domain.settings.*
 import com.tangem.domain.settings.repositories.AppRatingRepository
 import com.tangem.domain.settings.repositories.PermissionRepository
-import com.tangem.domain.settings.repositories.PromoSettingsRepository
 import com.tangem.domain.settings.repositories.SettingsRepository
 import com.tangem.domain.settings.usercountry.FetchUserCountryUseCase
 import com.tangem.domain.settings.usercountry.GetUserCountryUseCase
@@ -117,30 +116,6 @@ internal object SettingsDomainModule {
         return IsWalletsScrollPreviewEnabled(settingsRepository = settingsRepository)
     }
 
-    @Provides
-    @Singleton
-    fun provideShouldShowSwapPromoWalletUseCase(
-        promoSettingsRepository: PromoSettingsRepository,
-    ): ShouldShowSwapPromoWalletUseCase {
-        return ShouldShowSwapPromoWalletUseCase(promoSettingsRepository)
-    }
-
-    @Provides
-    @Singleton
-    fun provideShouldShowRingPromoUseCase(
-        promoSettingsRepository: PromoSettingsRepository,
-    ): ShouldShowRingPromoUseCase {
-        return ShouldShowRingPromoUseCase(promoSettingsRepository)
-    }
-
-    @Provides
-    @Singleton
-    fun provideShouldShowSwapPromoTokenUseCase(
-        promoSettingsRepository: PromoSettingsRepository,
-    ): ShouldShowSwapPromoTokenUseCase {
-        return ShouldShowSwapPromoTokenUseCase(promoSettingsRepository)
-    }
-
     @Provides
     @Singleton
     fun provideDeleteDeprecatedLogsUseCase(settingsRepository: SettingsRepository): DeleteDeprecatedLogsUseCase {

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

@@ -1,12 +1,10 @@
 package com.tangem.tap.di.domain
 
 import com.tangem.domain.exchange.RampStateManager
-import com.tangem.domain.settings.ShouldShowSwapPromoTokenUseCase
 import com.tangem.domain.staking.repositories.StakingRepository
 import com.tangem.domain.tokens.*
 import com.tangem.domain.tokens.repository.*
 import com.tangem.domain.walletmanager.WalletManagersFacade
-import com.tangem.feature.swap.domain.api.SwapRepository
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import dagger.Module
 import dagger.Provides
@@ -118,13 +116,9 @@ internal object TokensDomainModule {
         currenciesRepository: CurrenciesRepository,
         quotesRepository: QuotesRepository,
         networksRepository: NetworksRepository,
-        swapRepository: SwapRepository,
         currencyChecksRepository: CurrencyChecksRepository,
-        showSwapPromoTokenUseCase: ShouldShowSwapPromoTokenUseCase,
-        promoRepository: PromoRepository,
         stakingRepository: StakingRepository,
         dispatchers: CoroutineDispatcherProvider,
-        rampStateManager: RampStateManager,
     ): GetCurrencyWarningsUseCase {
         return GetCurrencyWarningsUseCase(
             walletManagersFacade = walletManagersFacade,
@@ -132,12 +126,8 @@ internal object TokensDomainModule {
             quotesRepository = quotesRepository,
             networksRepository = networksRepository,
             currencyChecksRepository = currencyChecksRepository,
-            swapRepository = swapRepository,
-            showSwapPromoTokenUseCase = showSwapPromoTokenUseCase,
-            promoRepository = promoRepository,
             stakingRepository = stakingRepository,
             dispatchers = dispatchers,
-            rampStateManager = rampStateManager,
         )
     }
 

app/src/main/java/com/tangem/tap/di/routing/RoutingComponentModule.kt

@@ -1,7 +1,7 @@
 package com.tangem.tap.di.routing
 
-import com.tangem.tap.routing.RoutingComponent
-import com.tangem.tap.routing.impl.DefaultRoutingComponent
+import com.tangem.tap.routing.component.RoutingComponent
+import com.tangem.tap.routing.component.impl.DefaultRoutingComponent
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn