Updated on 2026-08-14

features/wallet/impl/src/main/java/com/tangem/feature/wallet/child/wallet/model/intents/WalletWarningsClickIntents.kt

@@ -11,9 +11,7 @@ import com.tangem.core.analytics.models.AnalyticsParam
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.decompose.ui.UiMessageSender
 import com.tangem.core.navigation.url.UrlOpener
-import com.tangem.core.ui.components.bottomsheets.message.*
 import com.tangem.core.ui.extensions.resourceReference
-import com.tangem.core.ui.message.bottomSheetMessage
 import com.tangem.domain.card.SetCardWasScannedUseCase
 import com.tangem.domain.common.wallets.UserWalletsListRepository
 import com.tangem.domain.feedback.GetWalletMetaInfoUseCase
@@ -40,7 +38,6 @@ import com.tangem.domain.tokens.model.analytics.PromoAnalyticsEvent.PromotionBan
 import com.tangem.domain.wallets.legacy.UserWalletsListManager.Lockable.UnlockType
 import com.tangem.domain.wallets.models.UnlockWalletsError
 import com.tangem.domain.wallets.usecase.*
-import com.tangem.feature.wallet.child.wallet.model.WalletActivationBannerType
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent
 import com.tangem.feature.wallet.presentation.wallet.analytics.WalletScreenAnalyticsEvent.Basic
@@ -106,7 +103,7 @@ internal interface WalletWarningsClickIntents {
 
     fun onDenyPermissions()
 
-    fun onFinishWalletActivationClick(bannerType: WalletActivationBannerType, isBackupExists: Boolean)
+    fun onFinishWalletActivationClick(isBackupExists: Boolean)
 }
 
 @Suppress("LargeClass", "LongParameterList", "TooManyFunctions")
@@ -138,7 +135,6 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
     private val userWalletsListRepository: UserWalletsListRepository,
     private val setShouldShowNotificationUseCase: SetShouldShowNotificationUseCase,
     private val notificationsRepository: NotificationsRepository,
-    private val messageSender: UiMessageSender,
     private val setNotificationsEnabledUseCase: SetNotificationsEnabledUseCase,
     private val getWalletsListForEnablingUseCase: GetWalletsForAutomaticallyPushEnablingUseCase,
     private val uiMessageSender: UiMessageSender,
@@ -461,40 +457,9 @@ internal class WalletWarningsClickIntentsImplementor @Inject constructor(
         }
     }
 
-    override fun onFinishWalletActivationClick(bannerType: WalletActivationBannerType, isBackupExists: Boolean) {
-        when (bannerType) {
-            WalletActivationBannerType.Attention -> {
-                val userWallet = getSelectedUserWallet() ?: return
-                appRouter.push(WalletActivation(userWallet.walletId, isBackupExists))
-            }
-            WalletActivationBannerType.Warning -> {
-                val message = bottomSheetMessage {
-                    infoBlock {
-                        icon(R.drawable.img_knight_shield_32) {
-                            type = MessageBottomSheetUMV2.Icon.Type.Warning
-                            backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.SameAsTint
-                        }
-                        title = resourceReference(R.string.hw_activation_need_title)
-                        body = resourceReference(R.string.hw_activation_need_description)
-                    }
-                    secondaryButton {
-                        text = resourceReference(R.string.common_later)
-                        onClick {
-                            closeBs()
-                        }
-                    }
-                    primaryButton {
-                        text = resourceReference(R.string.hw_activation_need_backup)
-                        onClick {
-                            val userWallet = getSelectedUserWallet() ?: return@onClick
-                            appRouter.push(WalletActivation(userWallet.walletId, isBackupExists))
-                            closeBs()
-                        }
-                    }
-                }
-                messageSender.send(message)
-            }
-        }
+    override fun onFinishWalletActivationClick(isBackupExists: Boolean) {
+        val userWalletId = stateHolder.getSelectedWalletId()
+        appRouter.push(WalletActivation(userWalletId, isBackupExists))
     }
 
     override fun onAllowPermissions() {

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/common/preview/WalletScreenPreviewData.kt

@@ -3,7 +3,6 @@ package com.tangem.feature.wallet.presentation.common.preview
 import com.tangem.core.ui.components.containers.pullToRefresh.PullToRefreshConfig
 import com.tangem.core.ui.components.currency.icon.CurrencyIconState
 import com.tangem.core.ui.components.marketprice.PriceChangeType
-import com.tangem.core.ui.components.notifications.NotificationConfig
 import com.tangem.core.ui.components.notifications.NotificationConfig.ButtonsState
 import com.tangem.core.ui.components.token.AccountItemPreviewData
 import com.tangem.core.ui.components.token.state.TokenItemState
@@ -14,6 +13,7 @@ import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.stringReference
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.feature.wallet.child.wallet.model.WalletActivationBannerType
 import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.common.WalletPreviewData.topBarConfig
 import com.tangem.feature.wallet.presentation.wallet.state.model.*
@@ -167,7 +167,7 @@ internal object WalletScreenPreviewData {
             warnings = persistentListOf(
                 WalletNotification.Warning.SomeNetworksUnreachable,
                 WalletNotification.FinishWalletActivation(
-                    iconTint = NotificationConfig.IconTint.Attention,
+                    type = WalletActivationBannerType.Attention,
                     buttonsState = ButtonsState.SecondaryButtonConfig(
                         text = resourceReference(R.string.hw_activation_need_finish),
                         onClick = { },

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/analytics/utils/WalletWarningsSingleEventSender.kt

@@ -1,8 +1,24 @@
 package com.tangem.feature.wallet.presentation.wallet.analytics.utils
 
+import arrow.atomic.AtomicBoolean
+import com.tangem.common.routing.AppRoute.WalletActivation
 import com.tangem.core.decompose.di.ModelScoped
+import com.tangem.core.decompose.navigation.Router
+import com.tangem.core.decompose.ui.UiMessageSender
+import com.tangem.core.ui.components.bottomsheets.message.MessageBottomSheetUMV2
+import com.tangem.core.ui.components.bottomsheets.message.icon
+import com.tangem.core.ui.components.bottomsheets.message.infoBlock
+import com.tangem.core.ui.components.bottomsheets.message.onClick
+import com.tangem.core.ui.components.bottomsheets.message.primaryButton
+import com.tangem.core.ui.components.bottomsheets.message.secondaryButton
+import com.tangem.core.ui.extensions.resourceReference
+import com.tangem.core.ui.message.bottomSheetMessage
+import com.tangem.domain.models.wallet.UserWallet
 import com.tangem.domain.models.wallet.UserWalletId
+import com.tangem.domain.wallets.usecase.GetUserWalletUseCase
 import com.tangem.domain.wallets.usecase.SeedPhraseNotificationUseCase
+import com.tangem.feature.wallet.child.wallet.model.WalletActivationBannerType
+import com.tangem.feature.wallet.impl.R
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletNotification
 import com.tangem.feature.wallet.presentation.wallet.state.model.WalletState
 import com.tangem.feature.wallet.presentation.wallet.utils.ScreenLifecycleProvider
@@ -12,8 +28,13 @@ import javax.inject.Inject
 internal class WalletWarningsSingleEventSender @Inject constructor(
     private val seedPhraseNotificationUseCase: SeedPhraseNotificationUseCase,
     private val screenLifecycleProvider: ScreenLifecycleProvider,
+    private val uiMessageSender: UiMessageSender,
+    private val getUserWalletUseCase: GetUserWalletUseCase,
+    private val router: Router,
 ) {
 
+    private val isActivationBottomSheetShown: AtomicBoolean = AtomicBoolean(false)
+
     suspend fun send(
         userWalletId: UserWalletId,
         displayedUiState: WalletState?,
@@ -26,9 +47,49 @@ internal class WalletWarningsSingleEventSender @Inject constructor(
         val events = newWarnings.filter { it !in displayedUiState.warnings }
 
         events.forEach { event ->
-            if (event is WalletNotification.Critical.SeedPhraseNotification) {
-                seedPhraseNotificationUseCase.notified(userWalletId = userWalletId)
+            when (event) {
+                is WalletNotification.Critical.SeedPhraseNotification -> {
+                    seedPhraseNotificationUseCase.notified(userWalletId = userWalletId)
+                }
+                is WalletNotification.FinishWalletActivation -> {
+                    if (event.type == WalletActivationBannerType.Warning && !isActivationBottomSheetShown.get()) {
+                        showFinishActivationBottomSheet(userWalletId)
+                        isActivationBottomSheetShown.set(true)
+                    }
+                }
+                else -> Unit
             }
         }
     }
+
+    private fun showFinishActivationBottomSheet(userWalletId: UserWalletId) {
+        val userWallet = getUserWalletUseCase(userWalletId).getOrNull() ?: return
+        if (userWallet !is UserWallet.Hot) return
+
+        val message = bottomSheetMessage {
+            infoBlock {
+                icon(R.drawable.img_knight_shield_32) {
+                    type = MessageBottomSheetUMV2.Icon.Type.Warning
+                    backgroundType = MessageBottomSheetUMV2.Icon.BackgroundType.SameAsTint
+                }
+                title = resourceReference(R.string.hw_activation_need_title)
+                body = resourceReference(R.string.hw_activation_need_description)
+            }
+            secondaryButton {
+                text = resourceReference(R.string.common_later)
+                onClick {
+                    closeBs()
+                }
+            }
+            primaryButton {
+                text = resourceReference(R.string.hw_activation_need_backup)
+                onClick {
+                    router.push(WalletActivation(userWallet.walletId, userWallet.backedUp))
+                    closeBs()
+                }
+            }
+        }
+
+        uiMessageSender.send(message)
+    }
 }

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

@@ -7,7 +7,6 @@ import com.tangem.common.ui.notifications.NotificationId
 import com.tangem.common.ui.userwallet.ext.walletInterationIcon
 import com.tangem.core.decompose.di.ModelScoped
 import com.tangem.core.ui.components.notifications.NotificationConfig.ButtonsState
-import com.tangem.core.ui.components.notifications.NotificationConfig.IconTint
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.domain.account.status.producer.SingleAccountStatusListProducer
 import com.tangem.domain.card.CardTypesResolver
@@ -465,22 +464,17 @@ internal class GetMultiWalletWarningsFactory @Inject constructor(
             ifError = { WalletActivationBannerType.Attention },
         )
 
-        val tint = when (type) {
-            WalletActivationBannerType.Attention -> IconTint.Attention
-            WalletActivationBannerType.Warning -> IconTint.Warning
-        }
-
         addIf(
             element = WalletNotification.FinishWalletActivation(
-                iconTint = tint,
+                type = type,
                 buttonsState = when (type) {
                     WalletActivationBannerType.Warning -> ButtonsState.PrimaryButtonConfig(
                         text = resourceReference(R.string.hw_activation_need_finish),
-                        onClick = { clickIntents.onFinishWalletActivationClick(type, isBackupExists) },
+                        onClick = { clickIntents.onFinishWalletActivationClick(isBackupExists) },
                     )
                     else -> ButtonsState.SecondaryButtonConfig(
                         text = resourceReference(R.string.hw_activation_need_finish),
-                        onClick = { clickIntents.onFinishWalletActivationClick(type, isBackupExists) },
+                        onClick = { clickIntents.onFinishWalletActivationClick(isBackupExists) },
                     )
                 },
             ),

features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/state/model/WalletNotification.kt

@@ -10,6 +10,7 @@ import com.tangem.core.ui.extensions.TextReference
 import com.tangem.core.ui.extensions.pluralReference
 import com.tangem.core.ui.extensions.resourceReference
 import com.tangem.core.ui.extensions.wrappedList
+import com.tangem.feature.wallet.child.wallet.model.WalletActivationBannerType
 import com.tangem.feature.wallet.impl.R
 import org.joda.time.DateTime
 
@@ -287,14 +288,17 @@ sealed class WalletNotification(val config: NotificationConfig) {
     )
 
     data class FinishWalletActivation(
-        val iconTint: IconTint,
+        val type: WalletActivationBannerType,
         val buttonsState: ButtonsState,
     ) : WalletNotification(
         config = NotificationConfig(
             title = resourceReference(R.string.hw_activation_need_title),
             subtitle = resourceReference(R.string.hw_activation_need_description),
             iconResId = R.drawable.img_knight_shield_32,
-            iconTint = iconTint,
+            iconTint = when (type) {
+                WalletActivationBannerType.Attention -> IconTint.Attention
+                WalletActivationBannerType.Warning -> IconTint.Warning
+            },
             buttonsState = buttonsState,
         ),
     )