From 2de117d365c0b920cdad23a02aaef10f5d82e79e Mon Sep 17 00:00:00 2001
From: Tangem <git@tangem.com>
Date: Thu, 23 Oct 2025 13:47:54 +0300
Subject: [PATCH] Updated on 2026-08-14

---
 .../organizetokens/OrganizeTokensScreen.kt    | 24 +++++++++++++------
 gradle/dependencies.toml                      |  4 ++--
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt
index fab2288352..84a19cc5e5 100644
--- a/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt
+++ b/features/wallet/impl/src/main/java/com/tangem/feature/wallet/presentation/organizetokens/OrganizeTokensScreen.kt
@@ -123,6 +123,14 @@ private fun TokenList(
             end = TangemTheme.dimens.spacing16,
         )
 
+        // workaround to force recomposition of list items when the list is updated
+        // because sometimes items disappear after reordering in 1.7.4+ compose-runtime version
+        // check removing after update to compose-runtime 1.8.0+
+        val forceRecompose = remember { mutableIntStateOf(0) }
+        LaunchedEffect(state.items) {
+            forceRecompose.intValue++
+        }
+
         LazyColumn(
             modifier = Modifier
                 .align(Alignment.TopCenter)
@@ -143,13 +151,15 @@ private fun TokenList(
                     }
                 }
 
-                DraggableItem(
-                    index = index,
-                    item = item,
-                    reorderableState = reorderableListState,
-                    onDragStart = onDragStart,
-                    isBalanceHidden = isBalanceHidden,
-                )
+                key(forceRecompose.intValue) {
+                    DraggableItem(
+                        index = index,
+                        item = item,
+                        reorderableState = reorderableListState,
+                        onDragStart = onDragStart,
+                        isBalanceHidden = isBalanceHidden,
+                    )
+                }
             }
         }
 
diff --git a/gradle/dependencies.toml b/gradle/dependencies.toml
index 35e4b6fd2f..03743696e3 100644
--- a/gradle/dependencies.toml
+++ b/gradle/dependencies.toml
@@ -34,8 +34,8 @@ androidxWorkManager = "2.9.0"
 # endregion AndroidX
 
 # region Compose
-compose-runtime = "1.7.4"
-compose-foundation = "1.7.4"
+compose-runtime = "1.7.8"
+compose-foundation = "1.7.8"
 compose-material3 = "1.3.1"
 compose-constraint = "1.0.1"
 compose-navigation = "2.7.7"