Merge pull request #35 from game-node-app/dev

Fix for unnecessary fetches when no more results exist for /explore
game-node-app · Mar 16, 2024 · 39e9831 · 39e9831
2 parents 8f48ca1 + faca912
commit 39e9831
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/pages/explore/index.tsx b/src/pages/explore/index.tsx
@@ -151,7 +151,16 @@ const Index = () => {
     }, []);
 
     useEffect(() => {
-        const canFetchNextPage = !isError && !isFetching && !isLoading;
+        const lastElement =
+            trendingGamesQuery.data?.pages[
+                trendingGamesQuery.data?.pages.length - 1
+            ];
+        const canFetchNextPage =
+            !isError &&
+            !isFetching &&
+            !isLoading &&
+            lastElement != undefined &&
+            lastElement.pagination.hasNextPage;
         if (canFetchNextPage && entry?.isIntersecting) {
             trendingGamesQuery.fetchNextPage({ cancelRefetch: false });
         }