diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-05-22 15:16:21 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-22 15:16:21 +0200 |
| commit | 2024aef0f9b52297d814811f5825678a563f78ff (patch) | |
| tree | 5014b9fa72ae4704d61ae7ffc8e992f0b67b6a25 /app/javascript/flavours/glitch/reducers | |
| parent | 03952c7d4980a008f6711d7f14b8808229d73524 (diff) | |
| parent | 8027d921ab174b35bcf08bf96b69676a4515435f (diff) | |
Merge pull request #1542 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch/reducers')
| -rw-r--r-- | app/javascript/flavours/glitch/reducers/notifications.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js index b4c5ef71a..859a8b3a1 100644 --- a/app/javascript/flavours/glitch/reducers/notifications.js +++ b/app/javascript/flavours/glitch/reducers/notifications.js @@ -112,7 +112,7 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingRece } if (shouldCountUnreadNotifications(state)) { - mutable.update('unread', unread => unread + items.count(item => compareId(item.get('id'), lastReadId) > 0)); + mutable.set('unread', mutable.get('pendingItems').count(item => item !== null) + mutable.get('items').count(item => item && compareId(item.get('id'), lastReadId) > 0)); } else { const mostRecent = items.find(item => item !== null); if (mostRecent && compareId(lastReadId, mostRecent.get('id')) < 0) { |