From 081a67eeaa3fb1c7d338d1e06af6f6faca452b9c Mon Sep 17 00:00:00 2001
From: Usman Baig <mubaig@pm.me>
Date: Thu, 12 Feb 2026 08:59:45 +0100
Subject: [PATCH] fix: reorganize data loading and auto-refresh logic in
 SiteDashboardPage for improved clarity and maintainability

---
 app/sites/[id]/page.tsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/sites/[id]/page.tsx b/app/sites/[id]/page.tsx
index 85710cb..89ea7db 100644
--- a/app/sites/[id]/page.tsx
+++ b/app/sites/[id]/page.tsx
@@ -127,15 +127,6 @@ export default function SiteDashboardPage() {
     localStorage.setItem('pulse_dashboard_settings', JSON.stringify(settings))
   }, [todayInterval, multiDayInterval, isSettingsLoaded]) // dateRange is handled in saveSettings/onChange
 
-  useEffect(() => {
-    if (isSettingsLoaded) loadData()
-    const interval = setInterval(() => {
-      loadData(true)
-      loadRealtime()
-    }, 30000)
-    return () => clearInterval(interval)
-  }, [siteId, dateRange, todayInterval, multiDayInterval, isSettingsLoaded, loadData, loadRealtime])
-
   // * Tick every 1s so "Live · Xs ago" counts in real time
   useEffect(() => {
     const interval = setInterval(() => setTick((t) => t + 1), 1000)
@@ -215,6 +206,15 @@ export default function SiteDashboardPage() {
     }
   }, [siteId])
 
+  useEffect(() => {
+    if (isSettingsLoaded) loadData()
+    const interval = setInterval(() => {
+      loadData(true)
+      loadRealtime()
+    }, 30000)
+    return () => clearInterval(interval)
+  }, [siteId, dateRange, todayInterval, multiDayInterval, isSettingsLoaded, loadData, loadRealtime])
+
   if (loading) {
     return <LoadingOverlay logoSrc="/pulse_icon_no_margins.png" title="Pulse" />
   }