From fe4e2b94181f55a62b45bf3b2de8dff75eab6423 Mon Sep 17 00:00:00 2001
From: Krille <c.kussowski@famedly.com>
Date: Tue, 28 May 2024 09:50:09 +0200
Subject: [PATCH] chore: Follow up open event from search

---
 lib/pages/chat/chat.dart | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index 2872f9b17..4c0405bb8 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -68,7 +68,7 @@ class ChatPage extends StatelessWidget {
     }
 
     return ChatPageWithRoom(
-      key: Key('chat_page_$roomId'),
+      key: Key('chat_page_${roomId}_$eventId'),
       room: room,
       shareText: shareText,
       eventId: eventId,
@@ -278,10 +278,12 @@ class ChatController extends State<ChatPageWithRoom>
   }
 
   void _tryLoadTimeline() async {
-    readMarkerEventId = widget.eventId;
-    loadTimelineFuture = _getTimeline(eventContextId: readMarkerEventId);
+    final initialEventId = widget.eventId;
+    loadTimelineFuture = _getTimeline();
     try {
       await loadTimelineFuture;
+      if (initialEventId != null) scrollToEventId(initialEventId);
+
       final fullyRead = room.fullyRead;
       if (fullyRead.isEmpty) {
         setReadMarker();