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

7 years ago · 90865f242a
parent 560b6e861c
commit 90865f242a
1 changed files with 2 additions and 2 deletions
--- 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}