From 0bfeea6bc6106087d603294ee241ed3a2254aae0 Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Tue, 27 Jan 2026 20:24:44 +0100
Subject: [PATCH] Updated on 2026-08-14

---
 .../com/tangem/common/ui/news/ArticleCard.kt  | 98 ++++++++++++-------
 1 file changed, 64 insertions(+), 34 deletions(-)

diff --git a/common/ui/src/main/java/com/tangem/common/ui/news/ArticleCard.kt b/common/ui/src/main/java/com/tangem/common/ui/news/ArticleCard.kt
index 06cf750dac..e0086f9b0c 100644
--- a/common/ui/src/main/java/com/tangem/common/ui/news/ArticleCard.kt
+++ b/common/ui/src/main/java/com/tangem/common/ui/news/ArticleCard.kt
@@ -1,18 +1,15 @@
 package com.tangem.common.ui.news
 
 import android.content.res.Configuration
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.background
+import androidx.compose.foundation.*
 import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.CardColors
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.text.style.TextAlign
@@ -21,6 +18,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.tangem.core.ui.R
 import com.tangem.core.ui.components.SpacerH
+import com.tangem.core.ui.components.SpacerHMax
 import com.tangem.core.ui.components.block.BlockCard
 import com.tangem.core.ui.components.block.TangemBlockCardColors
 import com.tangem.core.ui.components.label.Label
@@ -43,23 +41,36 @@ fun ArticleCard(
     modifier: Modifier = Modifier,
     colors: CardColors = TangemBlockCardColors,
 ) {
-    BlockCard(
-        modifier = modifier,
-        onClick = onArticleClick,
-        colors = colors,
-    ) {
-        if (articleConfigUM.isTrending) {
-            TrendingArticle(articleConfigUM = articleConfigUM)
-        } else {
-            DefaultArticle(articleConfigUM = articleConfigUM)
-        }
+    if (articleConfigUM.isTrending) {
+        TrendingArticle(
+            articleConfigUM = articleConfigUM,
+            modifier = modifier,
+            onArticleClick = onArticleClick,
+            colors = colors,
+        )
+    } else {
+        DefaultArticle(
+            articleConfigUM = articleConfigUM,
+            modifier = modifier,
+            onArticleClick = onArticleClick,
+            colors = colors,
+        )
     }
 }
 
 @Composable
-private fun TrendingArticle(articleConfigUM: ArticleConfigUM) {
+private fun TrendingArticle(
+    articleConfigUM: ArticleConfigUM,
+    onArticleClick: () -> Unit,
+    colors: CardColors,
+    modifier: Modifier = Modifier,
+) {
     Column(
-        modifier = Modifier.padding(vertical = 24.dp, horizontal = 16.dp),
+        modifier = modifier
+            .clip(TangemTheme.shapes.roundedCornersXMedium)
+            .background(colors.containerColor)
+            .clickable { onArticleClick() }
+            .padding(vertical = 24.dp, horizontal = 16.dp),
         horizontalAlignment = Alignment.CenterHorizontally,
     ) {
         Text(
@@ -141,8 +152,19 @@ fun ShowMoreArticlesCard(modifier: Modifier = Modifier, onClick: () -> Unit) {
 }
 
 @Composable
-private fun DefaultArticle(articleConfigUM: ArticleConfigUM) {
-    Column(modifier = Modifier.padding(12.dp)) {
+private fun DefaultArticle(
+    articleConfigUM: ArticleConfigUM,
+    onArticleClick: () -> Unit,
+    colors: CardColors,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .clip(TangemTheme.shapes.roundedCornersXMedium)
+            .background(colors.containerColor)
+            .clickable { onArticleClick() }
+            .padding(12.dp),
+    ) {
         ArticleInfo(
             score = articleConfigUM.score,
             createdAt = articleConfigUM.createdAt.resolveReference(),
@@ -162,18 +184,34 @@ private fun DefaultArticle(articleConfigUM: ArticleConfigUM) {
             overflow = TextOverflow.Ellipsis,
         )
 
-        SpacerH(16.dp)
+        SpacerHMax(modifier = Modifier.padding(bottom = 16.dp))
 
         Tags(tags = articleConfigUM.tags.toImmutableList())
     }
 }
 
-@OptIn(ExperimentalLayoutApi::class)
 @Composable
 private fun Tags(tags: ImmutableList<LabelUM>, modifier: Modifier = Modifier) {
-    val expandIndicator = remember {
-        ContextualFlowRowOverflow.expandIndicator {
-            val remainingItems = tags.size - shownItemCount
+    FlowRow(
+        modifier = modifier,
+        horizontalArrangement = Arrangement.spacedBy(4.dp),
+        verticalArrangement = Arrangement.spacedBy(8.dp),
+        maxItemsInEachRow = MAX_TAGS_COUNT_TO_SHOW + 1,
+        maxLines = 1,
+        itemVerticalAlignment = Alignment.Bottom,
+    ) {
+        val displayedTags = if (tags.size > MAX_TAGS_COUNT_TO_SHOW) {
+            tags.take(MAX_TAGS_COUNT_TO_SHOW)
+        } else {
+            tags
+        }
+
+        displayedTags.forEach { tag ->
+            Label(state = tag)
+        }
+
+        if (tags.size > MAX_TAGS_COUNT_TO_SHOW) {
+            val remainingItems = tags.size - MAX_TAGS_COUNT_TO_SHOW
             Label(
                 state = LabelUM(
                     text = TextReference.Str("${StringsSigns.PLUS}$remainingItems"),
@@ -182,18 +220,10 @@ private fun Tags(tags: ImmutableList<LabelUM>, modifier: Modifier = Modifier) {
             )
         }
     }
-    ContextualFlowRow(
-        itemCount = tags.size,
-        modifier = modifier,
-        horizontalArrangement = Arrangement.spacedBy(4.dp),
-        verticalArrangement = Arrangement.spacedBy(8.dp),
-        maxLines = 1,
-        overflow = expandIndicator,
-    ) { index ->
-        Label(state = tags[index])
-    }
 }
 
+private const val MAX_TAGS_COUNT_TO_SHOW = 3
+
 @Preview(showBackground = true, widthDp = 360)
 @Preview(showBackground = true, widthDp = 360, uiMode = Configuration.UI_MODE_NIGHT_YES)
 @Composable