From 62183ecb5864c0ed4f00d172264ef381ba2c27f0 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Tue, 30 Dec 2025 13:59:52 -0800
Subject: [PATCH] adjust analytics to wait for server before track

---
 .../analytics/hooks/use-app-tracker.ts        | 35 +++++++++++++++++--
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/renderer/features/analytics/hooks/use-app-tracker.ts b/src/renderer/features/analytics/hooks/use-app-tracker.ts
index 1d879bb09..07de7d154 100644
--- a/src/renderer/features/analytics/hooks/use-app-tracker.ts
+++ b/src/renderer/features/analytics/hooks/use-app-tracker.ts
@@ -208,8 +208,21 @@ const getSettingsProperties = (): SettingsProperties => {
 
 const getServer = (): 'unknown' | ServerType => {
     const auth = useAuthStore.getState();
+
     const currentServer = auth.currentServer;
-    return currentServer?.type || 'unknown';
+
+    if (currentServer) {
+        return currentServer.type;
+    }
+
+    const serverList = auth.serverList;
+    const server = Object.values(serverList)[0];
+
+    if (server) {
+        return server.type;
+    }
+
+    return 'unknown';
 };
 
 export const useAppTracker = () => {
@@ -222,6 +235,18 @@ export const useAppTracker = () => {
             return;
         }
 
+        const waitForServer = async (): Promise<void> => {
+            if (useAuthStore.getState().currentServer) {
+                return;
+            }
+
+            const pollInterval = 1000 * 60;
+
+            while (!useAuthStore.getState().currentServer) {
+                await new Promise((resolve) => setTimeout(resolve, pollInterval));
+            }
+        };
+
         const getProperties = () => {
             const platform = getPlatform();
             const version = getVersion();
@@ -285,8 +310,10 @@ export const useAppTracker = () => {
 
         // Check immediately on mount
         if (!hasRunOnMountRef.current) {
+            waitForServer().then(() => {
+                checkAndTrack();
+            });
             hasRunOnMountRef.current = true;
-            checkAndTrack();
         }
 
         const interval = setInterval(checkAndTrack, 1000 * 60 * 60);
@@ -300,9 +327,11 @@ const appTrackerMutation = mutationOptions({
     mutationFn: (properties: AppTrackerProperties) => {
         try {
             window.umami?.track((props) => ({
-                ...props,
                 data: properties,
+                language: props.language,
                 name: 'app',
+                screen: props.screen,
+                website: props.website,
             }));
             return Promise.resolve();
         } catch (error) {