Updated on 2026-08-14

core/decompose/src/main/kotlin/com/tangem/core/decompose/context/DefaultAppComponentContext.kt

@@ -7,8 +7,6 @@ import com.tangem.core.decompose.navigation.AppNavigationProvider
 import com.tangem.core.decompose.navigation.DefaultAppNavigationProvider
 import com.tangem.core.decompose.navigation.DefaultRouter
 import com.tangem.core.decompose.navigation.Router
-import com.tangem.core.decompose.ui.DefaultUiMessageSender
-import com.tangem.core.decompose.ui.UiMessageHandler
 import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.decompose.utils.ComponentCoroutineScope
 import com.tangem.utils.coroutines.CoroutineDispatcherProvider
@@ -16,9 +14,9 @@ import kotlinx.coroutines.CoroutineScope
 
 class DefaultAppComponentContext(
     componentContext: ComponentContext,
-    messageHandler: UiMessageHandler,
     override val dispatchers: CoroutineDispatcherProvider,
     override val hiltComponentBuilder: DecomposeComponent.Builder,
+    override val messageSender: UiMessageSender,
     private val replaceRouter: Router? = null,
 ) : AppComponentContext, ComponentContext by componentContext {
 
@@ -26,8 +24,6 @@ class DefaultAppComponentContext(
 
     override val componentScope: CoroutineScope = ComponentCoroutineScope(lifecycle, dispatchers)
 
-    override val messageSender: UiMessageSender = DefaultUiMessageSender(messageHandler)
-
     override val navigationProvider: AppNavigationProvider
         get() = instanceKeeper.getOrCreate { DefaultAppNavigationProvider() }
 

core/decompose/src/main/kotlin/com/tangem/core/decompose/di/RootAppComponentContext.kt

@@ -3,4 +3,7 @@ package com.tangem.core.decompose.di
 import javax.inject.Qualifier
 
 @Qualifier
-annotation class RootAppComponentContext
+annotation class RootAppComponentContext
+
+@Qualifier
+annotation class GlobalUiMessageSender

core/decompose/src/main/kotlin/com/tangem/core/decompose/ui/DefaultUiMessageSender.kt

@@ -1,6 +1,6 @@
 package com.tangem.core.decompose.ui
 
-internal class DefaultUiMessageSender(
+class DefaultUiMessageSender(
     private val handler: UiMessageHandler,
 ) : UiMessageSender {