fix(notification): wait for sync to complete

Author: rhahao

src/features/app_notification/container/useContainer.tsx

@@ -6,6 +6,7 @@ import {
   encryptedAccessCodeState,
   encryptedMasterKeyState,
   featureFlagsState,
+  isAppDataSyncingState,
   speakersKeyState,
   userIDState,
 } from '@states/app';
@@ -68,11 +69,13 @@ const useContainer = () => {
   const accountType = useAtomValue(accountTypeState);
   const userID = useAtomValue(userIDState);
   const FEATURE_FLAGS = useAtomValue(featureFlagsState);
+  const isAppSyncing = useAtomValue(isAppDataSyncingState);
 
   const { data, isFetching } = useQuery({
     enabled:
       userID?.length > 0 &&
       accountType === 'vip' &&
+      !isAppSyncing &&
       isElder &&
       congAccountConnected,
     queryKey: ['congregation_updates'],

src/wrapper/web_worker/useWebWorker.tsx

@@ -1,9 +1,13 @@
 import { useEffect, useState } from 'react';
 import { useLocation } from 'react-router';
-import { useAtomValue } from 'jotai';
-import { setIsAppDataSyncing, setLastAppDataSync } from '@services/states/app';
+import { useAtomValue, useSetAtom } from 'jotai';
+import { setLastAppDataSync } from '@services/states/app';
 import { isTest, LANGUAGE_LIST } from '@constants/index';
-import { congAccountConnectedState, isOnlineState } from '@states/app';
+import {
+  congAccountConnectedState,
+  isAppDataSyncingState,
+  isOnlineState,
+} from '@states/app';
 import {
   backupAutoState,
   backupIntervalState,
@@ -27,6 +31,8 @@ const useWebWorker = () => {
 
   const { isMeetingEditor } = useCurrentUser();
 
+  const setIsAppDataSyncing = useSetAtom(isAppDataSyncingState);
+
   const isOnline = useAtomValue(isOnlineState);
   const isConnected = useAtomValue(congAccountConnectedState);
   const backupAuto = useAtomValue(backupAutoState);
@@ -79,7 +85,7 @@ const useWebWorker = () => {
         }
       };
     }
-  }, [isMeetingEditor, sourceLang]);
+  }, [isMeetingEditor, sourceLang, setIsAppDataSyncing]);
 
   useEffect(() => {
     const runBackupTimer = setInterval(async () => {