diff --git a/src/components/layout/AppVersionCheck.tsx b/src/components/layout/AppVersionCheck.tsx index 79e2102..afd6b31 100644 --- a/src/components/layout/AppVersionCheck.tsx +++ b/src/components/layout/AppVersionCheck.tsx @@ -20,19 +20,22 @@ export const AppVersionCheck = () => { ); const { refreshAll, modules } = useModuleBankStore((state) => state); useEffect(() => { - if ( - appVersion != APP_VERSION || - (appVersion == "development" && TURN_ON_REFRESH) - ) { - Logger.log("Version:", appVersion, true); - Logger.log("New version detected, refreshing data...", true); - if (appVersion != "development") { - refreshAll(); + const refresh = async () => { + if ( + appVersion != APP_VERSION || + (appVersion == "development" && TURN_ON_REFRESH) + ) { + Logger.log("Version:", appVersion, true); + Logger.log("New version detected, refreshing data...", true); + if (appVersion != "development") { + await refreshAll(); + } + refreshBanners(); + changeAppVersion(APP_VERSION); } - refreshBanners(); - changeAppVersion(APP_VERSION); - } - updateMultiplePlanner(modules); + updateMultiplePlanner(modules); + }; + refresh(); }, [ appVersion, refreshAll, diff --git a/src/stores/config/index.ts b/src/stores/config/index.ts index b61a5fd..02a979d 100644 --- a/src/stores/config/index.ts +++ b/src/stores/config/index.ts @@ -4,7 +4,6 @@ import { createJSONStorage, persist } from "zustand/middleware"; import type { AcademicYear, Banner } from "@/config"; import type { TimetableThemeName } from "@/utils/timetable/colours"; import { APP_CONFIG } from "@/config"; -import { env } from "@/env"; import { Logger } from "@/utils/Logger"; export type ISyncRecord = { @@ -36,7 +35,7 @@ export type ConfigStore = { matriculationYear: AcademicYear; banners: BannerState[]; warningDismissedTime: number; - appVersion: string; + appVersion: string | null; navigationPopupDismissed: boolean; } & ConfigAction; @@ -57,7 +56,7 @@ export const createConfigBank = ( matriculationYear: defaultAcademicYear, banners: defaultBanners, warningDismissedTime: Date.now() - 1000 * 60 * 60 * 24 * 7, - appVersion: env.NEXT_PUBLIC_VERCEL_GIT_COMMIT_SHA, + appVersion: null, navigationPopupDismissed: false, changeISyncLatestRecord: (newRecord) => { set({ iSyncLatestRecord: newRecord });