refactor: move status text out of markup

guildxyz · Nov 22, 2024 · 9ea202c · 9ea202c
1 parent 107df80
commit 9ea202c
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/src/app/explorer/components/InfiniteScrollGuilds.tsx b/src/app/explorer/components/InfiniteScrollGuilds.tsx
@@ -43,6 +43,15 @@ export const InfiniteScrollGuilds = () => {
 
   const guilds = data?.pages.flatMap((page) => page.items) || [];
 
+  let statusResponse: string | undefined;
+  if (isFetchingNextPage) {
+    statusResponse = "Loading more...";
+  } else if (!hasNextPage && guilds.length) {
+    statusResponse = "No More Data";
+  } else if (search && !isLoading) {
+    statusResponse = `No results for "${search}"`;
+  }
+
   return (
     <section className="grid gap-2">
       <div className="grid gap-4 sm:grid-cols-2 lg:grid-cols-3">
@@ -61,18 +70,9 @@ export const InfiniteScrollGuilds = () => {
         )}
         aria-hidden
       />
-
-      {guilds.length === 0 && !isLoading && search ? (
-        <p className="mt-6 text-center text-foreground-secondary">
-          `No results for "${search}"`
-        </p>
-      ) : (
-        <p className="mt-6 text-center text-foreground-secondary">
-          {isFetchingNextPage
-            ? "Loading more..."
-            : hasNextPage || "No More Data"}
-        </p>
-      )}
+      <p className="mt-6 text-center text-foreground-secondary">
+        {statusResponse}
+      </p>
     </section>
   );
 };