From d58897ea3824d2dc12ec2dce730cde2590f63dbe Mon Sep 17 00:00:00 2001
From: k1ngsterr1 <swerss564@gmail.com>
Date: Fri, 16 Jan 2026 05:44:16 +0500
Subject: [PATCH] feat: Reset highlighted message before scrolling and improve
 logging for message search in ChatDetailScreen

---
 .../com/rosetta/messenger/ui/chats/ChatDetailScreen.kt     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
index 5fac30a..758a780 100644
--- a/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
+++ b/app/src/main/java/com/rosetta/messenger/ui/chats/ChatDetailScreen.kt
@@ -448,6 +448,10 @@ fun ChatDetailScreen(
         android.util.Log.d("ChatDetail", "🔍 scrollToMessage called for: $messageId")
         android.util.Log.d("ChatDetail", "  - Total messages: ${messagesWithDates.size}")
         scope.launch {
+            // 🔥 Сбрасываем текущую подсветку перед новым скроллом
+            highlightedMessageId = null
+            delay(50) // Небольшая задержка для сброса анимации
+            
             // Находим индекс сообщения в списке
             val messageIndex = messagesWithDates.indexOfFirst { it.first.id == messageId }
             android.util.Log.d("ChatDetail", "  - Found at index: $messageIndex")
@@ -455,12 +459,13 @@ fun ChatDetailScreen(
                 // Скроллим к сообщению
                 listState.animateScrollToItem(messageIndex)
                 android.util.Log.d("ChatDetail", "  ✅ Scrolled to message")
+                
                 // Подсвечиваем на 2 секунды
                 highlightedMessageId = messageId
                 delay(2000)
                 highlightedMessageId = null
             } else {
-                android.util.Log.d("ChatDetail", "  ❌ Message not found")
+                android.util.Log.d("ChatDetail", "  ❌ Message not found in list")
             }
         }
     }