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 = ({ multiColumn }) => }, [notifications, topNotification]); const hasMore = hasNextPage ?? false; + const isFirstRender = useRef(true); const node = useRef(null); const scrollableContentRef = useRef | null>(null); @@ -266,7 +267,7 @@ const NotificationsColumn: React.FC = ({ 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 = ({ multiColumn }) => }, []); useEffect(() => { + if (isFirstRender.current) { + isFirstRender.current = false; + return; + } setTopNotification(undefined); }, [activeFilter]);