hamptonmoore
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix issue checking for last unread notification when there are gaps

signup-info-prompt
Thibaut Girka 2020-10-08 21:45:50 +02:00 committed by ThibG
parent b5edf30160
commit cd861c051c
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/reducers/notifications.js
View File

@ -206,7 +206,8 @@ const shouldCountUnreadNotifications = (state) => {
const isOnTop = state.get('top'); const isOnTop = state.get('top');
const isMounted = state.get('mounted') > 0; const isMounted = state.get('mounted') > 0;
const lastReadId = state.get('lastReadId'); const lastReadId = state.get('lastReadId');
const lastItemReached = !state.get('hasMore') || lastReadId === '0' || (!state.get('items').isEmpty() && compareId(state.get('items').last().get('id'), lastReadId) <= 0); const lastItem = state.get('items').findLast(item => item !== null);
const lastItemReached = !state.get('hasMore') || lastReadId === '0' || (lastItem && compareId(lastItem.get('id'), lastReadId) <= 0);
return !(isTabVisible && isOnTop && isMounted && lastItemReached); return !(isTabVisible && isOnTop && isMounted && lastItemReached);
}; };