From 9208c0bc59cd20f989d16699190c59101c712662 Mon Sep 17 00:00:00 2001
From: Georgi 7DIGIT <georgi@7digit.io>
Date: Thu, 9 May 2024 12:11:26 +0300
Subject: [PATCH] Fix: Articles fetching to be consistent

---
 src/blocks/Articles/Articles.jsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/blocks/Articles/Articles.jsx b/src/blocks/Articles/Articles.jsx
index e30232a..6dea97f 100644
--- a/src/blocks/Articles/Articles.jsx
+++ b/src/blocks/Articles/Articles.jsx
@@ -43,6 +43,8 @@ export const Articles = () => {
   const [hasMore, setHasMore] = useState(true);
   const [startFrom, setStartFrom] = useState(0);
 
+  console.log(startFrom, "startFRom");
+
   //--------------------- Articles ----------------------//
   const getArticles = async () => {
     // Request Articles ids from the master DB
@@ -77,19 +79,16 @@ export const Articles = () => {
   } = useQuery(["articles", i18n.language, startFrom], getArticles, {
     onSuccess: (data) => {
       setNumberOfArticles(data.numberOfArticles);
+      console.log("hasMore in Query", hasMore);
       if (hasMore) {
         setStartFrom((prev) => prev + data.formattedData.length);
       }
       setDataToDisplay([...dataToDisplay, ...data.formattedData]);
+      const newHasMore = data.numberOfArticles > dataToDisplay.length;
+      setHasMore(newHasMore);
     },
   });
 
-  useEffect(() => {
-    if (articlesData && articlesData.formattedData) {
-      setHasMore(numberOfArticles > dataToDisplay.length);
-    }
-  }, [articlesData]);
-
   const handleSelectArticle = async (id, newValue) => {
     let newData = JSON.parse(JSON.stringify(dataToDisplay));
     const index = newData.indexOf(newData.find((x) => x.id === id));