From a1208b7e40c008956a107bb7d4f0dcd327d805d1 Mon Sep 17 00:00:00 2001 From: Tangem Date: Mon, 1 Jun 2026 22:27:46 +0200 Subject: [PATCH] Updated on 2026-08-14 --- .../wallet/presentation/wallet/ui/WalletScreen2.kt | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen2.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen2.kt index e50d478aac..eaaa3ee797 100644 --- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen2.kt +++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/wallet/ui/WalletScreen2.kt @@ -50,6 +50,7 @@ import com.tangem.core.ui.components.background.northernlights.NorthernLightsBac import com.tangem.core.ui.components.bottomsheets.sheet.TangemBottomSheetDraggableHeader import com.tangem.core.ui.components.bottomsheets.state.BottomSheetState import com.tangem.core.ui.components.containers.pullToRefresh.TangemPullToRefreshSlidingContainer +import com.tangem.core.ui.components.containers.pullToRefresh.getPullToRefreshIndicatorOffset import com.tangem.core.ui.components.haze.hazeEffectTangem import com.tangem.core.ui.components.haze.hazeSourceTangem import com.tangem.core.ui.components.rememberIsKeyboardVisible @@ -286,6 +287,11 @@ private fun WalletContent2( val pageSlideAlpha by rememberPageAlpha(walletsPagerState, currentWalletIndex) + val pullToRefreshContentOffset = getPullToRefreshIndicatorOffset( + pullToRefreshConfig = currentWallet.pullToRefreshConfig, + pullToRefreshState = pullToRefreshState, + ) + TangemSharedTransitionLayout( modifier = Modifier .fillMaxSize() @@ -307,7 +313,9 @@ private fun WalletContent2( buttons = currentWallet.buttons, isBalanceHidden = state.isHidingMode, onSubtitleBottomChange = { newValue -> - if (newValue > subtitleBottom) subtitleBottom = maxOf(subtitleBottom, newValue) + if (pullToRefreshContentOffset == 0.dp && newValue > subtitleBottom) { + subtitleBottom = newValue + } }, ) },