From 7ad1d1cecf5e1c9f9daa99765d3a5b280269dacb Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Wed, 1 Nov 2023 21:49:09 +0800
Subject: [PATCH] Updated on 2026-08-14

---
 .../impl/presentation/ui/TokensListScreen.kt       | 14 ++++++++++----
 .../wallet/domain/WalletImageResolver.kt           |  3 +++
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt
index 7c6a1285bf..3dff613b36 100644
--- a/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt
+++ b/app/src/main/java/com/tangem/tap/features/tokens/impl/presentation/ui/TokensListScreen.kt
@@ -36,6 +36,8 @@ import com.tangem.tap.features.tokens.impl.presentation.states.TokenItemState
 import com.tangem.tap.features.tokens.impl.presentation.states.TokensListStateHolder
 import com.tangem.tap.features.tokens.impl.presentation.states.TokensListToolbarState
 import com.tangem.wallet.R
+import kotlinx.coroutines.flow.collectLatest
+import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.emptyFlow
 import kotlinx.coroutines.flow.flowOf
 
@@ -114,12 +116,9 @@ private fun TokensListContent(
 ) {
     val state = rememberLazyListState()
 
-    if (state.isScrollInProgress) {
-        LocalSoftwareKeyboardController.current?.hide()
-    }
-
     LazyColumn(
         modifier = Modifier
+            .imePadding()
             .fillMaxSize()
             .padding(scaffoldPadding),
         state = state,
@@ -139,6 +138,13 @@ private fun TokensListContent(
             TokenItem(model = it)
         }
     }
+
+    val keyboardController = LocalSoftwareKeyboardController.current
+    LaunchedEffect(key1 = state) {
+        snapshotFlow(state::isScrollInProgress)
+            .distinctUntilChanged()
+            .collectLatest { if (it) keyboardController?.hide() }
+    }
 }
 
 @Composable
diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletImageResolver.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletImageResolver.kt
index 22f2970ea8..6bcb1dfe7b 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletImageResolver.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/domain/WalletImageResolver.kt
@@ -3,6 +3,7 @@ package com.tangem.feature.wallet.presentation.wallet.domain
 import androidx.annotation.DrawableRes
 import com.tangem.blockchain.common.Blockchain
 import com.tangem.domain.common.util.cardTypesResolver
+import com.tangem.domain.demo.DemoConfig
 import com.tangem.domain.wallets.models.UserWallet
 import com.tangem.feature.wallet.impl.R
 
@@ -42,6 +43,8 @@ internal object WalletImageResolver {
         @DrawableRes twoBackupResId: Int = R.drawable.ill_wallet2_cards3_120_106,
     ): Int? {
         return resolveWalletWithBackups { count ->
+            if (DemoConfig().isDemoCardId(cardId)) return@resolveWalletWithBackups oneBackupResId
+
             when (count) {
                 WALLET_WITH_ONE_BACKUP_COUNT -> oneBackupResId
                 WALLET_WITH_TWO_BACKUPS_COUNT -> twoBackupResId