diff --git a/apps/skolplattformen-app/components/childListItem.component.tsx b/apps/skolplattformen-app/components/childListItem.component.tsx index bd8af4c67..8ca199f5e 100644 --- a/apps/skolplattformen-app/components/childListItem.component.tsx +++ b/apps/skolplattformen-app/components/childListItem.component.tsx @@ -18,7 +18,7 @@ import { } from '@ui-kitten/components' import moment, { Moment } from 'moment' import React, { useEffect } from 'react' -import { TouchableOpacity, useColorScheme, View, Pressable } from 'react-native' +import { TouchableOpacity, useColorScheme, View } from 'react-native' import { useTranslation } from '../hooks/useTranslation' import { Colors, Layout, Sizing } from '../styles' import { getMeaningfulStartingDate } from '../utils/calendarHelpers' @@ -162,81 +162,46 @@ export const ChildListItem = ({ > - [ - styles.cardHeader || {}, - { opacity: pressed ? 0.5 : 1 }, - ]} - onPress={() => - navigation.navigate('Child', { - child, - color, - }) - } - > - - - - {studentName(child.name)} - {className ? {className} : null} - - - - + + + + {studentName(child.name)} + {className ? {className} : null} - + + + + - ['' || {}, { opacity: pressed ? 0.5 : 1 }]} - onPress={() => - navigation.navigate('Child', { - child, - color, - initialRouteName: 'Calendar', - }) - } - > - + - {scheduleAndCalendarThisWeek.slice(0, 3).map((calendarItem, i) => ( - - {`${calendarItem.title} (${displayDate(calendarItem.startDate)})`} - - ))} - + {scheduleAndCalendarThisWeek.slice(0, 3).map((calendarItem, i) => ( + + {`${calendarItem.title} (${displayDate(calendarItem.startDate)})`} + + ))} - ['' || {}, { opacity: pressed ? 0.5 : 1 }]} - onPress={() => - navigation.navigate('Child', { - child, - color, - initialRouteName: 'News', - }) - } - > - - {t('navigation.news')} + + {t('navigation.news')} + + {notificationsThisWeek.slice(0, 3).map((notification, i) => ( + + {notification.message} - {notificationsThisWeek.slice(0, 3).map((notification, i) => ( - - {notification.message} - - ))} + ))} - {newsThisWeek.slice(0, 3).map((newsItem, i) => ( - - {newsItem.header ?? ''} - - ))} - + {newsThisWeek.slice(0, 3).map((newsItem, i) => ( + + {newsItem.header ?? ''} + + ))} {scheduleAndCalendarThisWeek.length || notificationsThisWeek.length || @@ -246,16 +211,7 @@ export const ChildListItem = ({ )} {shouldShowLunchMenu ? ( - ['' || {}, { opacity: pressed ? 0.5 : 1 }]} - onPress={() => - navigation.navigate('Child', { - child, - color, - initialRouteName: 'Menu', - }) - } - > + <> {meaningfulStartingDate.format( '[' + t('schedule.lunch') + '] dddd' @@ -264,7 +220,7 @@ export const ChildListItem = ({ {menu[meaningfulStartingDate.isoWeekday() - 1]?.description} - + ) : null}