fix(app): add hotfixes

src/RootWrap.tsx

@@ -21,20 +21,7 @@ import WaitingLoader from '@components/waiting_loader';
 
 const Migration = lazy(() => import('./migration'));
 
-const getFont = () => {
-  const cookiesConsent = Boolean(localStorage.getItem('userConsent'));
-
-  if (cookiesConsent) {
-    return localStorage.getItem('app_font') || 'Inter';
-  }
-
-  const hash = new URL(window.location.href).hash;
-  const params = new URLSearchParams(hash.substring(2));
-
-  return params.get('font') || 'Inter';
-};
-
-const font = getFont();
+const font = localStorage.getItem('app_font') || 'Inter';
 
 const cache = createCache({
   key: 'css',

src/constants/index.ts

@@ -19,7 +19,7 @@ export const LANGUAGE_LIST = [
   { code: 't', locale: 'pt-BR', name: 'Português (Brasil)' },
   { code: 'u', locale: 'ru-RU', name: 'русский' },
   { code: 'm', locale: 'ro-RO', name: 'Română' },
-  { code: 'tg', locale: 'tl-PH', name: 'Tagalog' },
+  { code: 'tg', locale: 'tl-PH', name: 'Tagalog', identifier: 'tgl' },
   {
     code: 'tnd',
     locale: 'mg-TND',
@@ -65,7 +65,7 @@ export const LANGUAGE_LIST = [
   { code: 'cv', locale: 'ceb-PH', name: 'Cebuano' },
   { code: 'kha', locale: 'mn-MN', name: 'монгол' },
   { code: 'rea', locale: 'hy-AM', name: 'Հայերեն' },
-  { code: 'h', locale: 'hy-HU', name: 'magyar' },
+  { code: 'h', locale: 'hu-HU', name: 'magyar' },
   { code: 'tpo', locale: 'pt-PT', name: 'Português (Portugal)' },
   { code: 'fi', locale: 'fi-FI', name: 'suomi' },
   { code: 'st', locale: 'et-EE', name: 'eesti' },

src/definition/ministry.ts

@@ -24,7 +24,6 @@ export type APRecordType = {
 };
 
 export type IncomingReport = {
-  report_id: string;
   person_uid: string;
   bible_studies: number;
   comments: string;

src/features/app_notification/container/useContainer.tsx

@@ -20,11 +20,7 @@ import {
   dbVisitingSpeakersUpdateRemote,
   decryptVisitingSpeakers,
 } from '@services/dexie/visiting_speakers';
-import {
-  accountTypeState,
-  congAccessCodeState,
-  congMasterKeyState,
-} from '@states/settings';
+import { accountTypeState } from '@states/settings';
 import { decryptData, decryptObject } from '@services/encryption';
 import { displaySnackNotification } from '@services/recoil/app';
 import { getMessageByCode } from '@services/i18n/translation';
@@ -37,6 +33,7 @@ import usePendingRequests from './usePendingRequests';
 import useRemoteNotifications from './useRemoteNotifications';
 import useUnverifiedReports from './useUnverifiedReports';
 import { apiFetchNotifications } from '@services/api/notification';
+import appDb from '@db/appDb';
 
 const useContainer = () => {
   const { t } = useAppTranslation();
@@ -61,12 +58,11 @@ const useContainer = () => {
   const congregationsNotDisapproved = useRecoilValue(
     congregationsNotDisapprovedState
   );
-  const congMasterKey = useRecoilValue(congMasterKeyState);
-  const congAccessCode = useRecoilValue(congAccessCodeState);
+
   const accountType = useRecoilValue(accountTypeState);
   const userID = useRecoilValue(userIDState);
 
-  const { data, isPending } = useQuery({
+  const { data, isFetching } = useQuery({
     enabled:
       userID.length > 0 &&
       accountType === 'vip' &&
@@ -160,6 +156,9 @@ const useContainer = () => {
           );
 
           if (foundCong) {
+            const settings = await appDb.app_settings.get(1);
+            const congMasterKey = settings.cong_settings.cong_master_key;
+
             const masterKey = decryptData(
               data.result.cong_master_key,
               congMasterKey
@@ -184,14 +183,7 @@ const useContainer = () => {
         severity: 'error',
       });
     }
-  }, [
-    data,
-    pendingRequests,
-    setNotifications,
-    t,
-    congregationRemotes,
-    congMasterKey,
-  ]);
+  }, [data, pendingRequests, setNotifications, t, congregationRemotes]);
 
   const handleRejectedRequests = useCallback(async () => {
     try {
@@ -276,6 +268,9 @@ const useContainer = () => {
 
       if (!incoming) return;
 
+      const settings = await appDb.app_settings.get(1);
+      const congAccessCode = settings.cong_settings.cong_access_code;
+
       const remoteAccessCode = data.result.cong_access_code;
       const accessCode = decryptData(remoteAccessCode, congAccessCode);
 
@@ -295,7 +290,7 @@ const useContainer = () => {
         severity: 'error',
       });
     }
-  }, [data, congAccessCode, setApplications]);
+  }, [data, setApplications]);
 
   const handleUnauthorized = useCallback(async () => {
     const status = data?.status;
@@ -311,6 +306,9 @@ const useContainer = () => {
 
       if (!incoming) return;
 
+      const settings = await appDb.app_settings.get(1);
+      const congAccessCode = settings.cong_settings.cong_access_code;
+
       const remoteAccessCode = data.result.cong_access_code;
       const accessCode = decryptData(remoteAccessCode, congAccessCode);
 
@@ -330,10 +328,10 @@ const useContainer = () => {
         severity: 'error',
       });
     }
-  }, [data, congAccessCode]);
+  }, [data]);
 
   useEffect(() => {
-    if (!isPending) {
+    if (!isFetching) {
       handleUnauthorized();
 
       handlePendingSpeakersRequests();
@@ -349,7 +347,8 @@ const useContainer = () => {
       checkUnverifiedReports();
     }
   }, [
-    isPending,
+    data,
+    isFetching,
     handleUnauthorized,
     handlePendingSpeakersRequests,
     handleRemoteCongregations,

src/features/app_start/shared/hooks/useFeedback.tsx

@@ -14,7 +14,9 @@ const useFeedback = () => {
     document.querySelector<HTMLElement>('#onboarding-error');
 
   const hideMessage = () => {
-    onboardingError.style.animation = 'fade-out 0.15s forwards';
+    if (onboardingError) {
+      onboardingError.style.animation = 'fade-out 0.15s forwards';
+    }
   };
 
   const showMessage = () => {

src/features/app_start/vip/congregation_create/congregation_access_code/useCongregationAccessCode.tsx

@@ -60,6 +60,7 @@ const useCongregationAccessCode = () => {
 
       await dbAppSettingsUpdate({
         'cong_settings.cong_access_code': tmpAccessCode,
+        'cong_settings.cong_new': true,
       });
 
       setIsSetup(false);

src/features/app_start/vip/congregation_create/congregation_details/useCongregationDetails.tsx

@@ -136,6 +136,7 @@ const useCongregationDetails = () => {
         'cong_settings.cong_circuit': result.cong_settings.cong_circuit,
         'cong_settings.midweek_meeting': midweekMeeting,
         'cong_settings.weekend_meeting': weekendMeeting,
+        'cong_settings.cong_new': true,
       });
 
       await setIsNewCongregation(true);

src/features/app_start/vip/congregation_create/congregation_master_key/useCongregationMasterKey.tsx

@@ -58,6 +58,7 @@ const useCongregationMasterKey = () => {
 
       await dbAppSettingsUpdate({
         'cong_settings.cong_master_key': tmpMasterKey,
+        'cong_settings.cong_new': true,
       });
 
       setCurrentStep(2);

src/features/app_start/vip/startup/index.tsx

@@ -27,13 +27,25 @@ const VipStartup = () => {
       {!isCongCreate && !isEncryptionCodeOpen && isLoading && (
         <WaitingLoader type="lottie" variant="standard" />
       )}
-      {isUserSignIn && <Signin />}
-      {isUserMfaVerify && <VerifyMFA />}
-      {isUserAccountCreated && <UserAccountCreated />}
-      {isCongCreate && <CongregationCreate />}
-      {isEmailAuth && <EmailAuth />}
-      {isEmailLinkAuth && <EmailLinkAuthentication />}
-      {isEncryptionCodeOpen && <CongregationEncryption />}
+
+      {!isLoading && (
+        <>
+          {isUserSignIn && <Signin />}
+
+          {!isUserSignIn && (
+            <>
+              {isUserMfaVerify && <VerifyMFA />}
+              {isUserAccountCreated && <UserAccountCreated />}
+              {isCongCreate && <CongregationCreate />}
+              {isEmailAuth && <EmailAuth />}
+              {isEmailLinkAuth && <EmailLinkAuthentication />}
+              {!isCongCreate && isEncryptionCodeOpen && (
+                <CongregationEncryption />
+              )}
+            </>
+          )}
+        </>
+      )}
     </>
   );
 };

src/features/app_start/vip/startup/useStartup.tsx

@@ -169,7 +169,7 @@ const useStartup = () => {
         return;
       }
 
-      if (congAccessCode.length === 0) {
+      if (congAccessCode.length === 0 && congName.length > 0) {
         setIsStart(false);
         setIsEncryptionCodeOpen(true);
       }

src/features/language_switcher/useLanguage.tsx

@@ -1,28 +1,19 @@
 import { useEffect, useState } from 'react';
-import { useSearchParams } from 'react-router-dom';
 import { useRecoilValue } from 'recoil';
 import { useBreakpoints } from '@hooks/index';
-import { cookiesConsentState, isAppLoadState } from '@states/app';
+import { isAppLoadState } from '@states/app';
 import { LANGUAGE_LIST } from '@constants/index';
 import { getTranslation } from '@services/i18n/translation';
 import { FullnameOption } from '@definition/settings';
 import { dbAppSettingsUpdate } from '@services/dexie/settings';
-import {
-  accountTypeState,
-  settingsState,
-  userDataViewState,
-} from '@states/settings';
+import { settingsState, userDataViewState } from '@states/settings';
 
 const useLanguage = () => {
   const { tabletDown } = useBreakpoints();
 
-  const [, setParams] = useSearchParams();
-
   const isAppLoad = useRecoilValue(isAppLoadState);
   const dataView = useRecoilValue(userDataViewState);
   const settings = useRecoilValue(settingsState);
-  const cookiesConsent = useRecoilValue(cookiesConsentState);
-  const accountType = useRecoilValue(accountTypeState);
 
   const [anchorEl, setAnchorEl] = useState(null);
   const isMenuOpen = Boolean(anchorEl);
@@ -45,18 +36,8 @@ const useLanguage = () => {
     const font =
       LANGUAGE_LIST.find((lang) => lang.locale === ui_lang)?.font || 'Inter';
 
-    if (cookiesConsent || accountType === 'pocket') {
-      localStorage.setItem('ui_lang', ui_lang);
-      localStorage.setItem('app_font', font);
-    }
-
-    if (!cookiesConsent && accountType !== 'pocket') {
-      setParams((params) => {
-        params.set('locale', ui_lang);
-        params.set('font', font);
-        return params;
-      });
-    }
+    localStorage.setItem('ui_lang', ui_lang);
+    localStorage.setItem('app_font', font);
 
     handleClose();
     window.location.reload();

src/features/meetings/weekly_schedules/midweek_meeting/useMidweekMeeting.tsx

@@ -2,9 +2,10 @@ import { useMemo, useState } from 'react';
 import { useRecoilValue } from 'recoil';
 import { useAppTranslation, useIntersectionObserver } from '@hooks/index';
 import { schedulesState } from '@states/schedules';
-import { addMonths, getWeekDate } from '@utils/date';
+import { addMonths, generateDateFromTime, getWeekDate } from '@utils/date';
 import { formatDate } from '@services/dateformat';
 import {
+  hour24FormatState,
   midweekMeetingClassCountState,
   midweekMeetingOpeningPrayerAutoAssign,
   midweekMeetingTimeState,
@@ -38,6 +39,7 @@ const useMidweekMeeting = () => {
   const userUID = useRecoilValue(userLocalUIDState);
   const pgmStart = useRecoilValue(midweekMeetingTimeState);
   const lang = useRecoilValue(JWLangState);
+  const use24 = useRecoilValue(hour24FormatState);
   const openingPrayerAuto = useRecoilValue(
     midweekMeetingOpeningPrayerAutoAssign
   );
@@ -168,16 +170,23 @@ const useMidweekMeeting = () => {
   const partTimings = useMemo(() => {
     if (!schedule && !source) return;
 
+    let meetingStart = pgmStart;
+
+    if (!use24) {
+      const date = generateDateFromTime(pgmStart);
+      meetingStart = formatDate(date, 'h:mm');
+    }
+
     const result = schedulesMidweekGetTiming({
       schedule,
       dataView,
-      pgmStart,
+      pgmStart: meetingStart,
       source,
       lang,
     });
 
     return result;
-  }, [schedule, source, dataView, pgmStart, lang]);
+  }, [schedule, source, dataView, pgmStart, lang, use24]);
 
   const handleGoCurrent = () => {
     const now = getWeekDate();

src/features/meetings/weekly_schedules/weekend_meeting/useWeekendMeeting.tsx

@@ -2,9 +2,15 @@ import { useMemo, useState } from 'react';
 import { useRecoilValue } from 'recoil';
 import { useAppTranslation, useIntersectionObserver } from '@hooks/index';
 import { schedulesState } from '@states/schedules';
-import { addMonths, getWeekDate, timeAddMinutes } from '@utils/date';
+import {
+  addMonths,
+  generateDateFromTime,
+  getWeekDate,
+  timeAddMinutes,
+} from '@utils/date';
 import { formatDate } from '@services/dateformat';
 import {
+  hour24FormatState,
   userDataViewState,
   userLocalUIDState,
   weekendMeetingOpeningPrayerAutoAssignState,
@@ -39,6 +45,7 @@ const useWeekendMeeting = () => {
   const sources = useRecoilValue(sourcesState);
   const userUID = useRecoilValue(userLocalUIDState);
   const pgmStart = useRecoilValue(weekendMeetingTimeState);
+  const use24 = useRecoilValue(hour24FormatState);
   const openingPrayerAuto = useRecoilValue(
     weekendMeetingOpeningPrayerAutoAssignState
   );
@@ -179,7 +186,14 @@ const useWeekendMeeting = () => {
   const partTimings = useMemo(() => {
     const timings = {} as WeekendMeetingTimingsType;
 
-    timings.pgm_start = timeAddMinutes(pgmStart, 0);
+    let meetingStart = pgmStart;
+
+    if (!use24) {
+      const date = generateDateFromTime(pgmStart);
+      meetingStart = formatDate(date, 'h:mm');
+    }
+
+    timings.pgm_start = timeAddMinutes(meetingStart, 0);
     timings.public_talk = timeAddMinutes(timings.pgm_start, 5);
     timings.middle_song = timeAddMinutes(timings.public_talk, 30);
     timings.w_study = timeAddMinutes(timings.middle_song, 5);
@@ -194,7 +208,7 @@ const useWeekendMeeting = () => {
     }
 
     return timings;
-  }, [pgmStart, weekType]);
+  }, [pgmStart, weekType, use24]);
 
   const handleGoCurrent = () => {
     const now = getWeekDate();