diff --git a/packages/app/components/week.component.tsx b/packages/app/components/week.component.tsx index a69500fad..3ae92693e 100644 --- a/packages/app/components/week.component.tsx +++ b/packages/app/components/week.component.tsx @@ -10,7 +10,7 @@ import React from 'react' import moment from 'moment' import { StyleSheet, View } from 'react-native' import { useMenu, useTimetable } from '@skolplattformen/api-hooks' -import { TimetableEntry, Child } from '@skolplattformen/embedded-api' +import { TimetableEntry, Child, MenuItem } from '@skolplattformen/embedded-api' import { LanguageService } from '../services/languageService' import { translate } from '../utils/translation' @@ -25,7 +25,7 @@ interface LessonListProps { interface DayProps { weekDay: string - lunch?: string + lunch?: MenuItem lessons: TimetableEntry[] } @@ -65,7 +65,7 @@ export const Day = ({ weekDay, lunch, lessons }: DayProps) => {translate('schedule.lunch', { defaultValue: 'Lunch' })} - {lunch} + {lunch?.description} {translate('schedule.end', { defaultValue: 'Slutar' })} @@ -125,15 +125,11 @@ export const Week = ({ child }: WeekProps) => { style={styles.pager} onSelect={(index) => setSelectedIndex(index)} > - {days.map((weekDay) => ( + {days.map((weekDay, index) => ( m.title.toLowerCase().includes(weekDay)) - .pop() - ?.description.split('
') - .join('\n')} + lunch={menu[index] || {}} lessons={lessons .filter((lesson) => days[lesson.dayOfWeek - 1] === weekDay) .sort((a, b) => a.dateStart.localeCompare(b.dateStart))}