From 8245e567473601b76ef20545d748810074439458 Mon Sep 17 00:00:00 2001
From: Paul Frazee <pfrazee@gmail.com>
Date: Wed, 13 Dec 2023 12:17:14 -0800
Subject: [PATCH] Feed bugfixes (#2204)

* Dont show both an error and empty message in the feed

* Add a sanity check when attempting to fill the first 30
---
 src/state/queries/notifications/feed.ts | 8 +++++++-
 src/state/queries/post-feed.ts          | 8 +++++++-
 src/view/com/posts/Feed.tsx             | 3 +--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/state/queries/notifications/feed.ts b/src/state/queries/notifications/feed.ts
index 82eda06eaf..dc206df79a 100644
--- a/src/state/queries/notifications/feed.ts
+++ b/src/state/queries/notifications/feed.ts
@@ -114,7 +114,13 @@ export function useNotificationFeedQuery(opts?: {enabled?: boolean}) {
       count += page.items.length
     }
 
-    if (!isFetching && hasNextPage && count < PAGE_SIZE && numEmpties < 3) {
+    if (
+      !isFetching &&
+      hasNextPage &&
+      count < PAGE_SIZE &&
+      numEmpties < 3 &&
+      (data?.pages.length || 0) < 6
+    ) {
       query.fetchNextPage()
     }
   }, [query])
diff --git a/src/state/queries/post-feed.ts b/src/state/queries/post-feed.ts
index 7847c72021..efdb42dd2b 100644
--- a/src/state/queries/post-feed.ts
+++ b/src/state/queries/post-feed.ts
@@ -291,7 +291,13 @@ export function usePostFeedQuery(
       }
     }
 
-    if (!isFetching && hasNextPage && count < PAGE_SIZE && numEmpties < 3) {
+    if (
+      !isFetching &&
+      hasNextPage &&
+      count < PAGE_SIZE &&
+      numEmpties < 3 &&
+      (data?.pages.length || 0) < 6
+    ) {
       query.fetchNextPage()
     }
   }, [query])
diff --git a/src/view/com/posts/Feed.tsx b/src/view/com/posts/Feed.tsx
index c4f859e041..24a7f5b42a 100644
--- a/src/view/com/posts/Feed.tsx
+++ b/src/view/com/posts/Feed.tsx
@@ -167,8 +167,7 @@ let Feed = ({
     if (isFetched) {
       if (isError && isEmpty) {
         arr = arr.concat([ERROR_ITEM])
-      }
-      if (isEmpty) {
+      } else if (isEmpty) {
         arr = arr.concat([EMPTY_FEED_ITEM])
       } else if (data) {
         for (const page of data?.pages) {