From d2383415e3f50bf318d6fb4177840c2275fec90e Mon Sep 17 00:00:00 2001
From: denis0001-dev <denis0001.dev@ya.ru>
Date: Tue, 16 Dec 2025 18:05:35 +0300
Subject: [PATCH] Fix wrong message order and avatars

---
 .../kotlin/ru/fromchat/ui/chat/ChatScreen.kt  |  3 +--
 .../kotlin/ru/fromchat/ui/chat/MessageItem.kt | 19 +++++++------------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/composeApp/src/commonMain/kotlin/ru/fromchat/ui/chat/ChatScreen.kt b/composeApp/src/commonMain/kotlin/ru/fromchat/ui/chat/ChatScreen.kt
index 5d21804..68e08b7 100644
--- a/composeApp/src/commonMain/kotlin/ru/fromchat/ui/chat/ChatScreen.kt
+++ b/composeApp/src/commonMain/kotlin/ru/fromchat/ui/chat/ChatScreen.kt
@@ -329,8 +329,7 @@ fun ChatScreen(
                 LazyColumn(
                     state = listState,
                     modifier = Modifier.fillMaxSize(), // Fill the entire space of the Box
-                    verticalArrangement = Arrangement.spacedBy(4.dp, alignment = Alignment.Bottom),
-                    reverseLayout = true // Display messages from bottom to top
+                    verticalArrangement = Arrangement.spacedBy(4.dp, alignment = Alignment.Bottom)
                 ) {
                     item { Spacer(Modifier.height(innerPadding.calculateBottomPadding())) } // Spacer for chat input
                     items(
diff --git a/composeApp/src/commonMain/kotlin/ru/fromchat/ui/chat/MessageItem.kt b/composeApp/src/commonMain/kotlin/ru/fromchat/ui/chat/MessageItem.kt
index f003b91..4dbca3b 100644
--- a/composeApp/src/commonMain/kotlin/ru/fromchat/ui/chat/MessageItem.kt
+++ b/composeApp/src/commonMain/kotlin/ru/fromchat/ui/chat/MessageItem.kt
@@ -81,6 +81,13 @@ fun MessageItem(
             verticalAlignment = Alignment.Bottom
         ) {
             if (!isAuthor) {
+                // Avatar at bottom
+                Avatar(
+                    profilePictureUrl = message.profile_picture,
+                    displayName = message.username,
+                    size = 32.dp
+                )
+
                 Spacer(modifier = Modifier.width(8.dp))
             }
 
@@ -196,18 +203,6 @@ fun MessageItem(
                     }
                 }
             }
-
-            if (!isAuthor) {
-                Spacer(modifier = Modifier.width(8.dp))
-                // Avatar at bottom
-                Avatar(
-                    profilePictureUrl = message.profile_picture,
-                    displayName = message.username,
-                    size = 32.dp
-                )
-            } else {
-                Spacer(modifier = Modifier.width(8.dp))
-            }
         }
     }
 }