From e7f147d4cac51cb8f995bbf8a4a22a59db846bff Mon Sep 17 00:00:00 2001
From: miloschwartz <mschwartz10612@gmail.com>
Date: Wed, 29 Jul 2026 17:52:55 -0400
Subject: [PATCH] fix site status stuck loading sometimes

---
 src/components/SitesTable.tsx | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/components/SitesTable.tsx b/src/components/SitesTable.tsx
index 2c4ecd1e5..5af07d112 100644
--- a/src/components/SitesTable.tsx
+++ b/src/components/SitesTable.tsx
@@ -114,7 +114,7 @@ export default function SitesTable({
     const [isRefreshing, startTransition] = useTransition();
     const [isNavigatingToAddPage, startNavigation] = useTransition();
 
-    const siteIds = sites.map((s) => s.id);
+    const siteIds = useMemo(() => sites.map((s) => s.id), [sites]);
 
     const statusHistoryQuery = useQuery({
         ...orgQueries.batchedSiteStatusHistory({
@@ -638,7 +638,14 @@ export default function SitesTable({
         ];
 
         return cols;
-    }, [orgId, t, searchParams, latestNewtVersion]);
+    }, [
+        orgId,
+        t,
+        searchParams,
+        latestNewtVersion,
+        statusHistoryQuery.data,
+        statusHistoryQuery.isLoading
+    ]);
 
     function toggleSort(column: string) {
         const newSearch = getNextSortOrder(column, searchParams);