From ddbf26d9fd46021a55d40ad6a6f2f18035145b5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= <git@mkljczk.pl>
Date: Wed, 25 Feb 2026 21:33:25 +0100
Subject: [PATCH] nicolium: possibly improve notifications behavior
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
---
 packages/pl-fe/src/columns/notifications.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/pl-fe/src/columns/notifications.tsx b/packages/pl-fe/src/columns/notifications.tsx
index 5be3e9db6..47dda7c5d 100644
--- a/packages/pl-fe/src/columns/notifications.tsx
+++ b/packages/pl-fe/src/columns/notifications.tsx
@@ -225,6 +225,7 @@ const NotificationsColumn: React.FC<INotificationsColumn> = ({ multiColumn }) =>
   }, [notifications, topNotification]);
   const hasMore = hasNextPage ?? false;
 
+  const isFirstRender = useRef(true);
   const node = useRef<VirtuosoHandle | null>(null);
   const scrollableContentRef = useRef<Array<React.JSX.Element> | null>(null);
 
@@ -266,7 +267,7 @@ const NotificationsColumn: React.FC<INotificationsColumn> = ({ multiColumn }) =>
   };
 
   const handleDequeueNotifications = useCallback(() => {
-    setTopNotification(undefined);
+    setTopNotification(notifications[0]?.most_recent_notification_id);
 
     markNotificationsRead(notifications[0]?.most_recent_notification_id);
   }, [notifications, markNotificationsRead]);
@@ -296,6 +297,10 @@ const NotificationsColumn: React.FC<INotificationsColumn> = ({ multiColumn }) =>
   }, []);
 
   useEffect(() => {
+    if (isFirstRender.current) {
+      isFirstRender.current = false;
+      return;
+    }
     setTopNotification(undefined);
   }, [activeFilter]);