From 2f5a31d3cb37d92e334534f4096acb7e527f11a2 Mon Sep 17 00:00:00 2001
From: M57 <41645758+Hy4ri@users.noreply.github.com>
Date: Sun, 21 Jun 2026 19:16:32 +0300
Subject: [PATCH] fix(#213): scroll-to-bottom FAB now targets absolute list
 bottom (#245)

---
 .../main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
index d3f678c4..2af6b913 100644
--- a/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
+++ b/app/src/main/java/com/m57/hermescontrol/ui/chat/ChatScreen.kt
@@ -524,7 +524,13 @@ fun ChatScreen(
                     FloatingActionButton(
                         onClick = {
                             scrollScope.launch {
-                                listState.animateScrollToItem(state.messages.lastIndex)
+                                val totalItems =
+                                    state.messages.size +
+                                        (if (state.streamingMessage != null) 1 else 0) +
+                                        (if (state.isThinking) 1 else 0)
+                                if (totalItems > 0) {
+                                    listState.animateScrollToItem(totalItems - 1)
+                                }
                             }
                         },
                         modifier = Modifier.size(40.dp),