From 89754ad371d9131bb7607cb8d8b773eb993dad0e Mon Sep 17 00:00:00 2001 From: Luca Pezzolla Date: Fri, 13 Oct 2023 15:51:39 +0200 Subject: [PATCH] Merge branch 'feature/places' # Conflicts: # assets/translations/en.json # assets/translations/it.json # ios/Podfile.lock # package-lock.json # package.json --- package-lock.json | 6 +++--- src/core/contexts/PreferencesContext.ts | 1 + src/core/queries/courseHooks.ts | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 999baa80..ab34b108 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2038,9 +2038,9 @@ } }, "node_modules/@commitlint/is-ignored/node_modules/semver": { - "version": "7.5.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", - "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", + "version": "7.3.7", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz", + "integrity": "sha512-QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" diff --git a/src/core/contexts/PreferencesContext.ts b/src/core/contexts/PreferencesContext.ts index 65bff762..ecb54c16 100644 --- a/src/core/contexts/PreferencesContext.ts +++ b/src/core/contexts/PreferencesContext.ts @@ -32,6 +32,7 @@ export type CoursesPreferences = { }; export interface PreferencesContextBase { + lastInstalledVersion: string | null; username: string; campusId?: string; colorScheme: 'light' | 'dark' | 'system'; diff --git a/src/core/queries/courseHooks.ts b/src/core/queries/courseHooks.ts index e5de366c..57eb8cd6 100644 --- a/src/core/queries/courseHooks.ts +++ b/src/core/queries/courseHooks.ts @@ -43,7 +43,7 @@ const setupCourses = ( updatePreference: ReturnType< typeof usePreferencesContext >['updatePreference'], -) : CourseOverview[] => { +): CourseOverview[] => { let hasNewPreferences = false; // Associate each course with a set of preferences, if missing