From 90865f242ae39c1e1d6f6ae94ff89f1631252ecb Mon Sep 17 00:00:00 2001 From: unarist Date: Wed, 5 Jul 2017 21:51:53 +0900 Subject: [PATCH] Show LoadMore button on Notifications even if all items are filtered (#4077) --- app/javascript/mastodon/features/notifications/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js index ed4b3ad982..2f545fa4a3 100644 --- a/app/javascript/mastodon/features/notifications/index.js +++ b/app/javascript/mastodon/features/notifications/index.js @@ -122,7 +122,7 @@ export default class Notifications extends React.PureComponent { let unread = ''; let scrollContainer = ''; - if (!isLoading && notifications.size > 0 && hasMore) { + if (!isLoading && hasMore) { loadMore = ; } @@ -132,7 +132,7 @@ export default class Notifications extends React.PureComponent { if (isLoading && this.scrollableArea) { scrollableArea = this.scrollableArea; - } else if (notifications.size > 0) { + } else if (notifications.size > 0 || hasMore) { scrollableArea = (
{unread}