From 60eebc6cc4d62479b23c2148c76172c0b3458629 Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Tue, 15 Sep 2020 23:43:36 +0200 Subject: Fix crashes when connection drops --- app/javascript/flavours/glitch/reducers/notifications.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'app/javascript/flavours/glitch/reducers') diff --git a/app/javascript/flavours/glitch/reducers/notifications.js b/app/javascript/flavours/glitch/reducers/notifications.js index 122fd009c..7820f524f 100644 --- a/app/javascript/flavours/glitch/reducers/notifications.js +++ b/app/javascript/flavours/glitch/reducers/notifications.js @@ -110,8 +110,8 @@ const expandNormalizedNotifications = (state, notifications, next, isLoadingRece if (shouldCountUnreadNotifications(state)) { mutable.update('unread', unread => unread + items.count(item => compareId(item.get('id'), lastReadId) > 0)); } else { - const mostRecentId = items.first().get('id'); - if (compareId(lastReadId, mostRecentId) < 0) { + const mostRecent = items.find(item => item !== null); + if (mostRecent && compareId(lastReadId, mostRecent.get('id')) < 0) { mutable.set('lastReadId', mostRecentId); } } @@ -299,7 +299,8 @@ export default function notifications(state = initialState, action) { return markAllForDelete(st, action.yes); case NOTIFICATIONS_MARK_AS_READ: - return recountUnread(state, state.get('items').first().get('id')); + const lastNotification = state.get('items').find(item => item !== null); + return lastNotification ? recountUnread(state, lastNotification.get('id')) : state; default: return state; -- cgit