From b3913ff6b8b1c1251c7eb636dd37595d1f417d35 Mon Sep 17 00:00:00 2001 From: Tangem Date: Tue, 31 Oct 2023 20:45:14 +0300 Subject: [PATCH 1/3] Updated on 2026-08-14 --- .../main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt index 6a9a2abf90..74fce7b587 100644 --- a/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt +++ b/app/src/main/java/com/tangem/tap/proxy/UserWalletManagerImpl.kt @@ -154,7 +154,7 @@ class UserWalletManagerImpl( val walletManager = getActualWalletManager(blockchain, derivationPath) return walletManager.wallet.recentTransactions .lastOrNull { it.hash?.isNotEmpty() == true } - ?.hash?.let { HEX_PREFIX + it } + ?.hash } override suspend fun getCurrentWalletTokensBalance( @@ -242,10 +242,6 @@ class UserWalletManagerImpl( "No wallet manager found" } } - - companion object { - private const val HEX_PREFIX = "0x" - } } private fun NonNativeToken.toSdkToken(): Token { From 44343a08a0582c5c1a82bea98b28c4faf21bc900 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 1 Nov 2023 16:11:48 +0300 Subject: [PATCH 2/3] Updated on 2026-08-14 --- .../ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt index 185c5e366a..f4f2a4c143 100644 --- a/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt +++ b/app/src/main/java/com/tangem/tap/features/wallet/ui/dialogs/RussianCardholdersWarningBottomSheetDialog.kt @@ -39,6 +39,7 @@ class RussianCardholdersWarningBottomSheetDialog( binding?.btnYes?.setOnClickListener { if (dialogData != null) { store.dispatchOpenUrl(dialogData.topUpUrl) + Analytics.send(Token.Topup.ScreenOpened()) } else { store.dispatch(TradeCryptoAction.Buy(checkUserLocation = false)) } From 7ad1d1cecf5e1c9f9daa99765d3a5b280269dacb Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 1 Nov 2023 21:49:09 +0800 Subject: [PATCH 3/3] 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