diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx index 079daa09..1749a2f3 100644 --- a/web/src/pages/Explore.tsx +++ b/web/src/pages/Explore.tsx @@ -24,6 +24,7 @@ const Explore = () => { useEffect(() => { nextPageTokenRef.current = undefined; + memoList.reset(); fetchMemos(); }, [tagQuery, textQuery]); @@ -58,8 +59,9 @@ const Explore = () => { ))} {isRequesting ? ( -
-

{t("memo.fetching-data")}

+
+ +

{t("memo.fetching-data")}

) : !nextPageTokenRef.current ? ( sortedMemos.length === 0 && ( diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx index 9481291a..45751ffe 100644 --- a/web/src/pages/Home.tsx +++ b/web/src/pages/Home.tsx @@ -34,6 +34,7 @@ const Home = () => { useEffect(() => { nextPageTokenRef.current = undefined; + memoList.reset(); fetchMemos(); }, [tagQuery, textQuery]); @@ -75,8 +76,9 @@ const Home = () => { ))} {isRequesting ? ( -
-

{t("memo.fetching-data")}

+
+ +

{t("memo.fetching-data")}

) : !nextPageTokenRef.current ? ( sortedMemos.length === 0 && ( diff --git a/web/src/pages/Timeline.tsx b/web/src/pages/Timeline.tsx index e8f5cf6a..2f344905 100644 --- a/web/src/pages/Timeline.tsx +++ b/web/src/pages/Timeline.tsx @@ -60,6 +60,7 @@ const Timeline = () => { useEffect(() => { nextPageTokenRef.current = undefined; + memoList.reset(); fetchMemos(); }, [selectedDay, tagQuery, textQuery]); @@ -180,8 +181,9 @@ const Timeline = () => { ))} {isRequesting ? ( -
-

{t("memo.fetching-data")}

+
+ +

{t("memo.fetching-data")}

) : !nextPageTokenRef.current ? ( sortedMemos.length === 0 && ( diff --git a/web/src/pages/UserProfile.tsx b/web/src/pages/UserProfile.tsx index 80d61943..ee5477e0 100644 --- a/web/src/pages/UserProfile.tsx +++ b/web/src/pages/UserProfile.tsx @@ -55,6 +55,7 @@ const UserProfile = () => { } nextPageTokenRef.current = undefined; + memoList.reset(); fetchMemos(); }, [user, tagQuery, textQuery]); @@ -109,8 +110,9 @@ const UserProfile = () => { ))} {isRequesting ? ( -
-

{t("memo.fetching-data")}

+
+ +

{t("memo.fetching-data")}

) : !nextPageTokenRef.current ? ( sortedMemos.length === 0 && (