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
zio/stable
Paul Frazee 2023-12-13 12:17:14 -08:00 committed by GitHub
parent e3ba014be0
commit 8245e56747
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 4 deletions

View File

@ -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])

View File

@ -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])

View File

@ -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) {