wait for store hydration

ChatGPTNextWeb · Oct 22, 2024 · 02ce968 · 02ce968
1 parent 7869f7c
commit 02ce968
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/components/home.tsx b/app/components/home.tsx
@@ -154,10 +154,18 @@ export function WindowContent(props: { children: React.ReactNode }) {
 
 function useSyncOnStart() {
   const syncStore = useSyncStore();
+  const storeHasHydrated = useSyncStore((s) => s._hasHydrated);
   useEffect(() => {
     let running = true;
     setTimeout(async () => {
-      if (!(running && syncStore.cloudSync() && syncStore.autoSync.onStart)) {
+      if (
+        !(
+          storeHasHydrated &&
+          running &&
+          syncStore.cloudSync() &&
+          syncStore.autoSync.onStart
+        )
+      ) {
         return;
       }
       const dismissSyncingToast = showToast(Locale.Settings.Sync.IsSyncing);
@@ -175,7 +183,7 @@ function useSyncOnStart() {
       running = false;
     };
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [storeHasHydrated]);
 }
 
 function Screen() {