From: ThibG <thib@sitedethib.com>
Date: Fri, 9 Oct 2020 15:12:52 +0000 (+0200)
Subject: Fix issue checking for last unread notification when there are gaps (#14960)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=dc52a778e111a67a5275dd4afecf3991e279e005;p=mastodon.git

Fix issue checking for last unread notification when there are gaps (#14960)
---

diff --git a/app/javascript/mastodon/reducers/notifications.js b/app/javascript/mastodon/reducers/notifications.js
index 98c91ebb2..216876134 100644
--- a/app/javascript/mastodon/reducers/notifications.js
+++ b/app/javascript/mastodon/reducers/notifications.js
@@ -172,7 +172,8 @@ const shouldCountUnreadNotifications = (state, ignoreScroll = false) => {
   const isOnTop        = state.get('top');
   const isMounted      = state.get('mounted') > 0;
   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 && (ignoreScroll || isOnTop) && isMounted && lastItemReached);
 };