From: unarist <m.unarist@gmail.com>
Date: Wed, 5 Jul 2017 12:51:53 +0000 (+0900)
Subject: Show LoadMore button on Notifications even if all items are filtered (#4077)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=b52a5e6bd60be3f9548cf59eb313b1e6c2f5920e;p=mastodon.git

Show LoadMore button on Notifications even if all items are filtered (#4077)
---

diff --git a/app/javascript/mastodon/features/notifications/index.js b/app/javascript/mastodon/features/notifications/index.js
index ed4b3ad98..2f545fa4a 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 = <LoadMore onClick={this.handleLoadMore} />;
     }
 
@@ -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 = (
         <div className='scrollable' onScroll={this.handleScroll} ref={this.setRef}>
           {unread}