From e58529ffc769267307cedb7b685da23421981ab4 Mon Sep 17 00:00:00 2001
From: avashilling <165050625+avashilling@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:31:05 -0400
Subject: [PATCH] 3607 pinned message highlight persists after unpinning
 (#3611)

* fix: unhighlight messages on unpin

* remove unnecessary setState

* reset scroll marker when unpinned to remove highlight
---
 lib/pages/chat/chat.dart | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/lib/pages/chat/chat.dart b/lib/pages/chat/chat.dart
index b58f7294a..1f7c661b9 100644
--- a/lib/pages/chat/chat.dart
+++ b/lib/pages/chat/chat.dart
@@ -1795,6 +1795,13 @@ class ChatController extends State<ChatPageWithRoom>
     if (response == OkCancelResult.ok) {
       final events = room.pinnedEventIds
         ..removeWhere((oldEvent) => oldEvent == eventId);
+      // #Pangea
+      if (scrollToEventIdMarker == eventId) {
+        setState(() {
+          scrollToEventIdMarker = null;
+        });
+      }
+      // Pangea#
       showFutureLoadingDialog(
         context: context,
         future: () => room.setPinnedEvents(events),