Skip to content

Commit

Permalink
Merge branch 'feature/places'
Browse files Browse the repository at this point in the history
# Conflicts:
#	assets/translations/en.json
#	assets/translations/it.json
#	ios/Podfile.lock
#	package-lock.json
#	package.json
  • Loading branch information
lpezzolla committed Oct 13, 2023
1 parent a12e548 commit 89754ad
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions src/core/contexts/PreferencesContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export type CoursesPreferences = {
};

export interface PreferencesContextBase {
lastInstalledVersion: string | null;
username: string;
campusId?: string;
colorScheme: 'light' | 'dark' | 'system';
Expand Down
2 changes: 1 addition & 1 deletion src/core/queries/courseHooks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 89754ad

Please sign in to comment.