fix: 🐛 Better fix for the isoWeek bug in Timetable

Zingo21 · Jan 14, 2023 · ea6b385 · ea6b385
1 parent 3acd27c
commit ea6b385
Showing 1 changed file with 5 additions and 8 deletions.
diff --git a/apps/skolplattformen-app/components/week.component.tsx b/apps/skolplattformen-app/components/week.component.tsx
@@ -107,13 +107,7 @@ export const Day = ({ weekDay, lunch, lessons }: DayProps) => {
 }
 
 export const Week = ({ child }: WeekProps) => {
-  const locale = LanguageService.getLocale()
-  moment.updateLocale(locale, {
-    week: {
-      dow: 1, // Monday is the first day of the week.
-    },
-  })
-  moment.locale(locale)
+  moment.locale(LanguageService.getLocale())
   const days = moment.weekdaysShort().slice(1, 6)
   const displayDate = getMeaningfulStartingDate(moment())
 
@@ -165,7 +159,10 @@ export const Week = ({ child }: WeekProps) => {
                 <>
                   <Text style={styles.tabTitle}>{weekDay}</Text>
                   <Text style={styles.tabTitleDate}>
-                    {displayDate.startOf('week').add(index, 'day').format('D')}
+                    {displayDate
+                      .startOf('isoWeek')
+                      .add(index, 'day')
+                      .format('D')}
                   </Text>
                 </>
               )}