From c49b3a91768c07039bd46e9c770680505ba4d875 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Mon, 20 Oct 2025 15:36:13 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../data/markets/converters/TokenMarketListConverter.kt  | 1 +
 .../main/kotlin/com/tangem/domain/markets/TokenMarket.kt | 1 +
 .../impl/model/converters/MarketsTokenItemConverter.kt   | 1 +
 .../impl/ui/components/MarketsListLazyColumn.kt          | 4 ++--
 .../ui/preview/MarketChartListItemPreviewDataProvider.kt | 6 ++++++
 .../markets/tokenlist/impl/ui/state/MarketsListItemUM.kt | 9 +++++++++
 6 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/data/markets/src/main/java/com/tangem/data/markets/converters/TokenMarketListConverter.kt b/data/markets/src/main/java/com/tangem/data/markets/converters/TokenMarketListConverter.kt
index f8e13d53fc..067f886293 100644
--- a/data/markets/src/main/java/com/tangem/data/markets/converters/TokenMarketListConverter.kt
+++ b/data/markets/src/main/java/com/tangem/data/markets/converters/TokenMarketListConverter.kt
@@ -41,6 +41,7 @@ internal object TokenMarketListConverter : Converter<TokenMarketListResponse, To
                 ),
                 tokenCharts = TokenMarket.Charts(h24 = null, week = null, month = null),
                 stakingRate = stakingRate,
+                updateTimestamp = value.timestamp,
             )
         }
         return TokenMarketListWithMaxApy(tokens, value.summary?.maxApy)
diff --git a/domain/markets/models/src/main/kotlin/com/tangem/domain/markets/TokenMarket.kt b/domain/markets/models/src/main/kotlin/com/tangem/domain/markets/TokenMarket.kt
index d2a80e71cf..36b179897a 100644
--- a/domain/markets/models/src/main/kotlin/com/tangem/domain/markets/TokenMarket.kt
+++ b/domain/markets/models/src/main/kotlin/com/tangem/domain/markets/TokenMarket.kt
@@ -13,6 +13,7 @@ data class TokenMarket(
     val tokenQuotesShort: TokenQuotesShort,
     val tokenCharts: Charts,
     val stakingRate: BigDecimal?,
+    val updateTimestamp: Long?,
     private val imageHost: String,
 ) {
 
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/converters/MarketsTokenItemConverter.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/converters/MarketsTokenItemConverter.kt
index 0256ce0fd1..ec31aac834 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/converters/MarketsTokenItemConverter.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/model/converters/MarketsTokenItemConverter.kt
@@ -41,6 +41,7 @@ internal class MarketsTokenItemConverter(
             stakingRate = value.stakingRate?.format { percent() }?.let {
                 resourceReference(R.string.markets_apy_placeholder, wrappedList(it))
             },
+            updateTimestamp = value.updateTimestamp,
         )
     }
 
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/components/MarketsListLazyColumn.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/components/MarketsListLazyColumn.kt
index bc0f3aea6d..b74e9a3d29 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/components/MarketsListLazyColumn.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/components/MarketsListLazyColumn.kt
@@ -23,11 +23,11 @@ import com.tangem.core.ui.test.MarketsTestTags
 import com.tangem.domain.models.currency.CryptoCurrency
 import com.tangem.features.markets.impl.R
 import com.tangem.features.markets.tokenlist.impl.ui.state.ListUM
+import com.tangem.features.markets.tokenlist.impl.ui.state.MarketsListItemUM.Companion.TOKEN_LAZY_LIST_ID_SEPARATOR
 import kotlinx.coroutines.launch
 
 private const val LOAD_NEXT_PAGE_ON_END_INDEX = 50
 private const val LOAD_NEXT_PAGE_ON_END_INDEX_SEARCH = 25
-private const val TOKEN_LAZY_LIST_ID_SEPARATOR = "***"
 
 @Composable
 @Suppress("LongMethod")
@@ -92,7 +92,7 @@ internal fun MarketsListLazyColumn(
                 is ListUM.Content -> {
                     items(
                         items = state.items,
-                        key = { it.id.value + TOKEN_LAZY_LIST_ID_SEPARATOR + it.marketCap.toString() },
+                        key = { it.getComposeKey() },
                     ) { item ->
                         MarketsListItem(
                             model = item,
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/preview/MarketChartListItemPreviewDataProvider.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/preview/MarketChartListItemPreviewDataProvider.kt
index 3371a2f40d..16d1279d95 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/preview/MarketChartListItemPreviewDataProvider.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/preview/MarketChartListItemPreviewDataProvider.kt
@@ -27,6 +27,7 @@ internal class MarketChartListItemPreviewDataProvider : CollectionPreviewParamet
             ),
             isUnder100kMarketCap = false,
             stakingRate = stringReference("APY 12.34%"),
+            updateTimestamp = 0,
         ),
         MarketsListItemUM(
             id = CryptoCurrency.RawID("1"),
@@ -41,6 +42,7 @@ internal class MarketChartListItemPreviewDataProvider : CollectionPreviewParamet
             chartData = null,
             isUnder100kMarketCap = false,
             stakingRate = stringReference("APY 12.34%"),
+            updateTimestamp = 0,
         ),
         MarketsListItemUM(
             id = CryptoCurrency.RawID("1"),
@@ -57,6 +59,7 @@ internal class MarketChartListItemPreviewDataProvider : CollectionPreviewParamet
             ),
             isUnder100kMarketCap = false,
             stakingRate = stringReference("APY 12.34%"),
+            updateTimestamp = 0,
         ),
         MarketsListItemUM(
             id = CryptoCurrency.RawID("1"),
@@ -73,6 +76,7 @@ internal class MarketChartListItemPreviewDataProvider : CollectionPreviewParamet
             ),
             isUnder100kMarketCap = false,
             stakingRate = stringReference("APY 12.34%"),
+            updateTimestamp = 0,
         ),
         MarketsListItemUM(
             id = CryptoCurrency.RawID("1"),
@@ -89,6 +93,7 @@ internal class MarketChartListItemPreviewDataProvider : CollectionPreviewParamet
             ),
             isUnder100kMarketCap = false,
             stakingRate = stringReference("APY 12.34%"),
+            updateTimestamp = 0,
         ),
         MarketsListItemUM(
             id = CryptoCurrency.RawID("1"),
@@ -105,6 +110,7 @@ internal class MarketChartListItemPreviewDataProvider : CollectionPreviewParamet
             ),
             isUnder100kMarketCap = false,
             stakingRate = stringReference("APY 12.34%"),
+            updateTimestamp = 0,
         ),
     ),
 )
\ No newline at end of file
diff --git a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/state/MarketsListItemUM.kt b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/state/MarketsListItemUM.kt
index 5f29995bff..a83ea2e7d6 100644
--- a/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/state/MarketsListItemUM.kt
+++ b/features/markets/impl/src/main/kotlin/com/tangem/features/markets/tokenlist/impl/ui/state/MarketsListItemUM.kt
@@ -21,6 +21,7 @@ data class MarketsListItemUM(
     val chartData: MarketChartRawData?,
     val isUnder100kMarketCap: Boolean,
     val stakingRate: TextReference?,
+    val updateTimestamp: Long?,
 ) {
     val chartType: MarketChartLook.Type = when (trendType) {
         PriceChangeType.UP -> MarketChartLook.Type.Growing
@@ -33,4 +34,12 @@ data class MarketsListItemUM(
         val text: String,
         val changeType: PriceChangeType? = null,
     )
+
+    fun getComposeKey(): String {
+        return id.value + TOKEN_LAZY_LIST_ID_SEPARATOR + marketCap.toString() + updateTimestamp
+    }
+
+    companion object {
+        const val TOKEN_LAZY_LIST_ID_SEPARATOR = "@"
+    }
 }
\ No newline at end of file