Updated on 2026-08-14

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

@@ -62,7 +62,6 @@ import com.tangem.domain.tokens.GetPolkadotCheckHasResetUseCase
 import com.tangem.domain.wallets.legacy.UserWalletsListManager
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.features.onboarding.v2.OnboardingV2FeatureToggles
-import com.tangem.features.pushnotifications.api.navigation.PushNotificationsRouter
 import com.tangem.features.pushnotifications.api.utils.PUSH_PERMISSION
 import com.tangem.features.wallet.navigation.WalletRouter
 import com.tangem.google.GoogleServicesHelper
@@ -176,9 +175,6 @@ class MainActivity : AppCompatActivity(), SnackbarHandler, ActivityResultCallbac
     @Inject
     internal lateinit var routingComponentFactory: RoutingComponent.Factory
 
-    @Inject
-    lateinit var pushNotificationsRouter: PushNotificationsRouter
-
     @Inject
     lateinit var cardRepository: CardRepository
 

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

@@ -33,7 +33,6 @@ 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.features.pushnotifications.api.navigation.PushNotificationsRouter
 import com.tangem.tap.domain.scanCard.CardScanningFeatureToggles
 import com.tangem.tap.domain.walletconnect2.domain.LegacyWalletConnectRepository
 import com.tangem.tap.domain.walletconnect2.domain.WalletConnectInteractor
@@ -67,7 +66,6 @@ data class DaggerGraphState(
     val urlOpener: UrlOpener? = null,
     val shareManager: ShareManager? = null,
     val appRouter: AppRouter? = null,
-    val pushNotificationsRouter: PushNotificationsRouter? = null,
     val transactionSignerFactory: TransactionSignerFactory? = null,
     val getUserCountryUseCase: GetUserCountryUseCase? = null,
     val onrampFeatureToggles: OnrampFeatureToggles? = null,

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

@@ -13,7 +13,7 @@ import com.tangem.features.managetokens.component.ManageTokensSource
 import com.tangem.features.markets.details.MarketsTokenDetailsComponent
 import com.tangem.features.onboarding.v2.entry.OnboardingEntryComponent
 import com.tangem.features.onramp.component.*
-import com.tangem.features.pushnotifications.api.navigation.PushNotificationsRouter
+import com.tangem.features.pushnotifications.api.PushNotificationsComponent
 import com.tangem.features.send.api.SendComponent
 import com.tangem.features.swap.SwapComponent
 import com.tangem.features.staking.api.StakingComponent
@@ -72,9 +72,9 @@ internal class ChildFactory @Inject constructor(
     private val securityModeComponentFactory: SecurityModeComponent.Factory,
     private val resetCardComponentFactory: ResetCardComponent.Factory,
     private val referralComponentFactory: ReferralComponent.Factory,
+    private val pushNotificationsComponentFactory: PushNotificationsComponent.Factory,
     private val walletRouter: WalletRouter,
     private val testerRouter: TesterRouter,
-    private val pushNotificationRouter: PushNotificationsRouter,
     private val routingFeatureToggles: RoutingFeatureToggles,
 ) {
 
@@ -350,13 +350,19 @@ internal class ChildFactory @Inject constructor(
                     componentFactory = referralComponentFactory,
                 )
             }
+            is AppRoute.PushNotification -> {
+                createComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = pushNotificationsComponentFactory,
+                )
+            }
             is AppRoute.SaveWallet,
             is AppRoute.OnboardingNote,
             is AppRoute.OnboardingOther,
             is AppRoute.OnboardingTwins,
             is AppRoute.OnboardingWallet,
             is AppRoute.Wallet,
-            is AppRoute.PushNotification,
             -> error("Unsupported route: $route")
         }
         // endregion
@@ -551,7 +557,11 @@ internal class ChildFactory @Inject constructor(
                 )
             }
             is AppRoute.PushNotification -> {
-                route.asFragmentChild(Provider { pushNotificationRouter.entryFragment() })
+                route.asComponentChild(
+                    contextProvider = contextProvider(route, contextFactory),
+                    params = Unit,
+                    componentFactory = pushNotificationsComponentFactory,
+                )
             }
             is AppRoute.WalletSettings -> {
                 route.asComponentChild(

features/onboarding-v2/impl/src/main/kotlin/com/tangem/features/onboarding/v2/multiwallet/impl/ui/WalletArtwork.kt

@@ -2,10 +2,12 @@
 
 package com.tangem.features.onboarding.v2.multiwallet.impl.ui
 
+import android.content.res.Configuration
 import androidx.compose.animation.core.Transition
 import androidx.compose.animation.core.animateFloat
 import androidx.compose.animation.core.updateTransition
 import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.material3.Button
 import androidx.compose.material3.Text
@@ -106,7 +108,7 @@ fun WalletArtworks(
             }
         }
 
-        val circleColor = TangemTheme.colors.background.secondary
+        val circleColor = TangemTheme.colors.button.secondary
 
         Canvas(
             modifier = Modifier
@@ -451,11 +453,14 @@ private fun WalletArtworksState.toTransitionSetState(maxWidthDp: Float, maxHeigh
     }
 
 @Preview(showBackground = true, widthDp = 360, heightDp = 640)
+@Preview(showBackground = true, widthDp = 360, heightDp = 640, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable
 private fun Preview() {
     TangemThemePreview {
         Box(
-            modifier = Modifier.fillMaxSize(),
+            modifier = Modifier
+                .background(TangemTheme.colors.background.primary)
+                .fillMaxSize(),
             contentAlignment = Alignment.Center,
         ) {
             var state: WalletArtworksState by remember { mutableStateOf(WalletArtworksState.Folded) }

features/push-notifications/api/build.gradle.kts

@@ -9,10 +9,11 @@ android {
 }
 
 dependencies {
-
     /** AndroidX */
     implementation(deps.androidx.fragment.ktx)
 
     /** Core */
+    implementation(projects.core.decompose)
+    implementation(projects.core.ui)
     implementation(projects.core.analytics.models)
 }

features/push-notifications/api/src/main/java/com/tangem/features/pushnotifications/api/PushNotificationsComponent.kt

@@ -0,0 +1,9 @@
+package com.tangem.features.pushnotifications.api
+
+import com.tangem.core.decompose.factory.ComponentFactory
+import com.tangem.core.ui.decompose.ComposableContentComponent
+
+interface PushNotificationsComponent : ComposableContentComponent {
+
+    interface Factory : ComponentFactory<Unit, PushNotificationsComponent>
+}

features/push-notifications/api/src/main/java/com/tangem/features/pushnotifications/api/navigation/PushNotificationsRouter.kt

@@ -1,8 +0,0 @@
-package com.tangem.features.pushnotifications.api.navigation
-
-import androidx.fragment.app.Fragment
-
-interface PushNotificationsRouter {
-
-    fun entryFragment(): Fragment
-}

features/push-notifications/impl/build.gradle.kts

@@ -26,6 +26,7 @@ dependencies {
     implementation(deps.kotlin.immutable.collections)
 
     /** Core modules */
+    implementation(projects.core.decompose)
     implementation(projects.core.ui)
     implementation(projects.core.configToggles)
     implementation(projects.core.navigation)

features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/DefaultPushNotificationsComponent.kt

@@ -0,0 +1,42 @@
+package com.tangem.features.pushnotifications.impl
+
+import androidx.activity.compose.BackHandler
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import com.tangem.core.decompose.context.AppComponentContext
+import com.tangem.core.decompose.model.getOrCreateModel
+import com.tangem.core.ui.components.NavigationBar3ButtonsScrim
+import com.tangem.core.ui.utils.findActivity
+import com.tangem.features.pushnotifications.api.PushNotificationsComponent
+import com.tangem.features.pushnotifications.impl.model.PushNotificationsModel
+import com.tangem.features.pushnotifications.impl.presentation.ui.PushNotificationsScreen
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+
+internal class DefaultPushNotificationsComponent @AssistedInject constructor(
+    @Assisted appComponentContext: AppComponentContext,
+    @Assisted params: Unit,
+) : PushNotificationsComponent, AppComponentContext by appComponentContext {
+
+    private val model: PushNotificationsModel = getOrCreateModel(params)
+
+    @Composable
+    override fun Content(modifier: Modifier) {
+        val activity = LocalContext.current.findActivity()
+        BackHandler(onBack = { activity.finish() })
+        NavigationBar3ButtonsScrim()
+        PushNotificationsScreen(
+            onRequest = model::onRequest,
+            onNeverRequest = model::onNeverRequest,
+            onAllowPermission = model::onAllowPermission,
+            onDenyPermission = model::onDenyPermission,
+        )
+    }
+
+    @AssistedFactory
+    interface Factory : PushNotificationsComponent.Factory {
+        override fun create(context: AppComponentContext, params: Unit): DefaultPushNotificationsComponent
+    }
+}

features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/PushNotificationsFragment.kt

@@ -1,39 +0,0 @@
-package com.tangem.features.pushnotifications.impl
-
-import androidx.activity.compose.BackHandler
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.fragment.app.viewModels
-import com.tangem.core.ui.UiDependencies
-import com.tangem.core.ui.components.NavigationBar3ButtonsScrim
-import com.tangem.core.ui.screen.ComposeFragment
-import com.tangem.features.pushnotifications.impl.presentation.ui.PushNotificationsScreen
-import com.tangem.features.pushnotifications.impl.presentation.viewmodel.PushNotificationViewModel
-import dagger.hilt.android.AndroidEntryPoint
-import javax.inject.Inject
-
-@AndroidEntryPoint
-internal class PushNotificationsFragment : ComposeFragment() {
-
-    @Inject
-    override lateinit var uiDependencies: UiDependencies
-
-    private val viewModel by viewModels<PushNotificationViewModel>()
-
-    @Composable
-    override fun ScreenContent(modifier: Modifier) {
-        BackHandler(onBack = requireActivity()::finish)
-        NavigationBar3ButtonsScrim()
-        PushNotificationsScreen(
-            onRequest = viewModel::onRequest,
-            onNeverRequest = viewModel::onNeverRequest,
-            onAllowPermission = viewModel::onAllowPermission,
-            onDenyPermission = viewModel::onDenyPermission,
-        )
-    }
-
-    companion object {
-        /** Create push notifications fragment instance */
-        fun create(): PushNotificationsFragment = PushNotificationsFragment()
-    }
-}

features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/di/PushNotificationsModule.kt

@@ -1,24 +1,25 @@
 package com.tangem.features.pushnotifications.impl.di
 
-import com.tangem.common.routing.AppRouter
-import com.tangem.features.pushnotifications.api.navigation.PushNotificationsRouter
-import com.tangem.features.pushnotifications.impl.navigation.DefaultPushNotificationsRouter
+import com.tangem.core.decompose.model.Model
+import com.tangem.features.pushnotifications.api.PushNotificationsComponent
+import com.tangem.features.pushnotifications.impl.DefaultPushNotificationsComponent
+import com.tangem.features.pushnotifications.impl.model.PushNotificationsModel
+import dagger.Binds
 import dagger.Module
-import dagger.Provides
 import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ActivityComponent
-import dagger.hilt.android.scopes.ActivityScoped
+import dagger.hilt.components.SingletonComponent
+import dagger.multibindings.ClassKey
+import dagger.multibindings.IntoMap
 
-/**
- * DI module provides implementation of [PushNotificationsRouter]
- */
 @Module
-@InstallIn(ActivityComponent::class)
-object PushNotificationsModule {
+@InstallIn(SingletonComponent::class)
+internal interface PushNotificationsModule {
 
-    @Provides
-    @ActivityScoped
-    fun provideDisclaimerRouter(appRouter: AppRouter): PushNotificationsRouter {
-        return DefaultPushNotificationsRouter(appRouter)
-    }
+    @Binds
+    fun bindComponentFactory(impl: DefaultPushNotificationsComponent.Factory): PushNotificationsComponent.Factory
+
+    @Binds
+    @IntoMap
+    @ClassKey(PushNotificationsModel::class)
+    fun bindModel(model: PushNotificationsModel): Model
 }

features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsClickIntents.kt

@@ -1,4 +1,4 @@
-package com.tangem.features.pushnotifications.impl.presentation.viewmodel
+package com.tangem.features.pushnotifications.impl.model
 
 internal interface PushNotificationsClickIntents {
     fun onRequest()

features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/model/PushNotificationsModel.kt

@@ -1,26 +1,29 @@
-package com.tangem.features.pushnotifications.impl.presentation.viewmodel
+package com.tangem.features.pushnotifications.impl.model
 
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
+import androidx.compose.runtime.Stable
+import com.tangem.common.routing.AppRoute
+import com.tangem.common.routing.AppRouter
 import com.tangem.core.analytics.api.AnalyticsEventHandler
 import com.tangem.core.analytics.models.AnalyticsParam
+import com.tangem.core.decompose.di.ComponentScoped
+import com.tangem.core.decompose.model.Model
 import com.tangem.domain.settings.NeverRequestPermissionUseCase
 import com.tangem.domain.settings.NeverToInitiallyAskPermissionUseCase
 import com.tangem.features.pushnotifications.api.analytics.PushNotificationAnalyticEvents
 import com.tangem.features.pushnotifications.api.utils.PUSH_PERMISSION
-import com.tangem.features.pushnotifications.impl.navigation.DefaultPushNotificationsRouter
-import dagger.hilt.android.lifecycle.HiltViewModel
+import com.tangem.utils.coroutines.CoroutineDispatcherProvider
 import kotlinx.coroutines.launch
 import javax.inject.Inject
 
-@Suppress("LongParameterList")
-@HiltViewModel
-internal class PushNotificationViewModel @Inject constructor(
+@Stable
+@ComponentScoped
+class PushNotificationsModel @Inject constructor(
+    override val dispatchers: CoroutineDispatcherProvider,
     private val neverRequestPermissionUseCase: NeverRequestPermissionUseCase,
     private val neverToInitiallyAskPermissionUseCase: NeverToInitiallyAskPermissionUseCase,
-    private val router: DefaultPushNotificationsRouter,
+    private val appRouter: AppRouter,
     private val analyticHandler: AnalyticsEventHandler,
-) : ViewModel(), PushNotificationsClickIntents {
+) : Model(), PushNotificationsClickIntents {
 
     override fun onRequest() {
         analyticHandler.send(
@@ -32,10 +35,10 @@ internal class PushNotificationViewModel @Inject constructor(
         analyticHandler.send(
             PushNotificationAnalyticEvents.ButtonLater(AnalyticsParam.ScreensSources.Stories),
         )
-        viewModelScope.launch {
+        modelScope.launch {
             neverRequestPermissionUseCase(PUSH_PERMISSION)
             neverToInitiallyAskPermissionUseCase(PUSH_PERMISSION)
-            router.openHome()
+            appRouter.push(AppRoute.Home)
         }
     }
 
@@ -43,10 +46,10 @@ internal class PushNotificationViewModel @Inject constructor(
         analyticHandler.send(
             PushNotificationAnalyticEvents.PermissionStatus(isAllowed = true),
         )
-        viewModelScope.launch {
+        modelScope.launch {
             neverRequestPermissionUseCase(PUSH_PERMISSION)
             neverToInitiallyAskPermissionUseCase(PUSH_PERMISSION)
-            router.openHome()
+            appRouter.push(AppRoute.Home)
         }
     }
 
@@ -54,10 +57,10 @@ internal class PushNotificationViewModel @Inject constructor(
         analyticHandler.send(
             PushNotificationAnalyticEvents.PermissionStatus(isAllowed = false),
         )
-        viewModelScope.launch {
+        modelScope.launch {
             neverRequestPermissionUseCase(PUSH_PERMISSION)
             neverToInitiallyAskPermissionUseCase(PUSH_PERMISSION)
-            router.openHome()
+            appRouter.push(AppRoute.Home)
         }
     }
 }

features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/navigation/DefaultPushNotificationsRouter.kt

@@ -1,18 +0,0 @@
-package com.tangem.features.pushnotifications.impl.navigation
-
-import androidx.fragment.app.Fragment
-import com.tangem.common.routing.AppRoute
-import com.tangem.common.routing.AppRouter
-import com.tangem.features.pushnotifications.impl.PushNotificationsFragment
-import javax.inject.Inject
-
-internal class DefaultPushNotificationsRouter @Inject constructor(
-    private val appRouter: AppRouter,
-) : InnerPushNotificationsRouter {
-
-    override fun entryFragment(): Fragment = PushNotificationsFragment.create()
-
-    override fun openHome() {
-        appRouter.push(AppRoute.Home)
-    }
-}

features/push-notifications/impl/src/main/java/com/tangem/features/pushnotifications/impl/navigation/InnerPushNotificationsRouter.kt

@@ -1,8 +0,0 @@
-package com.tangem.features.pushnotifications.impl.navigation
-
-import com.tangem.features.pushnotifications.api.navigation.PushNotificationsRouter
-
-interface InnerPushNotificationsRouter : PushNotificationsRouter {
-
-    fun openHome()
-}