From da17214a0b3dde0fe4530a5388717824329fd558 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 22 Apr 2022 13:05:40 -0500
Subject: [PATCH] Fix Notifications pagination

---
 app/soapbox/features/notifications/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/notifications/index.js b/app/soapbox/features/notifications/index.js
index 69c698274..4437e47f8 100644
--- a/app/soapbox/features/notifications/index.js
+++ b/app/soapbox/features/notifications/index.js
@@ -156,16 +156,18 @@ class Notifications extends React.PureComponent {
       ? (<FilterBarContainer />)
       : null;
 
+    const showLoading = isLoading && !notifications || notifications.isEmpty();
+
     const scrollContainer  = (
       <PullToRefresh onRefresh={this.handleRefresh}>
         <Virtuoso
           useWindowScroll
-          data={isLoading ? Array(20).fill() : notifications.toArray()}
+          data={showLoading ? Array(20).fill() : notifications.toArray()}
           startReached={this.handleScrollToTop}
           endReached={this.handleLoadOlder}
           isScrolling={isScrolling => isScrolling && this.handleScroll()}
           itemContent={(_index, notification) => (
-            isLoading ? (
+            showLoading ? (
               <PlaceholderNotification />
             ) : (
               <NotificationContainer