Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Change group notifications unread markers to only be cleared when focusing/navigating again (#31325)

Browse source
This commit is contained in:
Claire 2024-08-07 13:12:42 +02:00 • committed by GitHub
parent af2aec1a82
commit 6f285bb2a6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
app/javascript/mastodon/features/notifications_v2/index.tsx
View file

@ -26,6 +26,7 @@ import type { NotificationGap } from 'mastodon/reducers/notification_groups';
import {
selectUnreadNotificationGroupsCount,
selectPendingNotificationGroupsCount,
selectAnyPendingNotification,
} from 'mastodon/selectors/notifications';
import {
selectNeedsNotificationPermission,
@ -95,7 +96,7 @@ export const Notifications: React.FC<{
const lastReadId = useAppSelector((s) =>
selectSettingsNotificationsShowUnread(s)
? s.notificationGroups.lastReadId
? s.notificationGroups.readMarkerId
: '0',
);
@ -105,11 +106,13 @@ export const Notifications: React.FC<{
selectUnreadNotificationGroupsCount,
);
const anyPendingNotification = useAppSelector(selectAnyPendingNotification);
const isUnread = unreadNotificationsCount > 0;
const canMarkAsRead =
useAppSelector(selectSettingsNotificationsShowUnread) &&
unreadNotificationsCount > 0;
anyPendingNotification;
const needsNotificationPermission = useAppSelector(
selectNeedsNotificationPermission,