From 86d6cde478795daea4c70f3ad931e30dc755f8d4 Mon Sep 17 00:00:00 2001 From: eddy Date: Mon, 20 Jul 2026 18:40:26 +0200 Subject: [PATCH] fix: plaats voorlaatste meting boven laatste, fix MeasurementRow onPress in History --- src/components/LatestMeasurementCard.tsx | 26 ++++++++++++------------ src/screens/HistoryScreen.tsx | 7 ++++--- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/components/LatestMeasurementCard.tsx b/src/components/LatestMeasurementCard.tsx index 8cb3ed3..04976d4 100644 --- a/src/components/LatestMeasurementCard.tsx +++ b/src/components/LatestMeasurementCard.tsx @@ -30,6 +30,19 @@ export default function LatestMeasurementCard({ measurements }: Props) { return ( + {previous && ( + + Voorlaatste meting + + {new Date(previous.measuredAt).toLocaleDateString('nl-NL')} — {previous.weight.toFixed(1)} kg + + + Verschil {diff !== null && (diff > 0 ? '+' : '')}{diff?.toFixed(1)} kg + + + + )} + Laatste meting {new Date(latest.measuredAt).toLocaleDateString('nl-NL')} {rows.map(r => ( @@ -43,19 +56,6 @@ export default function LatestMeasurementCard({ measurements }: Props) { ))} - - {previous && ( - - - Voorlaatste meting - - {new Date(previous.measuredAt).toLocaleDateString('nl-NL')} — {previous.weight.toFixed(1)} kg - - - Verschil {diff !== null && (diff > 0 ? '+' : '')}{diff?.toFixed(1)} kg - - - )} ) } diff --git a/src/screens/HistoryScreen.tsx b/src/screens/HistoryScreen.tsx index a2f87af..30fc38b 100644 --- a/src/screens/HistoryScreen.tsx +++ b/src/screens/HistoryScreen.tsx @@ -85,9 +85,10 @@ export default function HistoryScreen({ navigation }: Props) { data={measurements} keyExtractor={item => item.id} renderItem={({ item }) => ( - navigation.navigate('MeasurementDetail', { measurementId: item.id })}> - - + navigation.navigate('MeasurementDetail', { measurementId: item.id })} + /> )} contentContainerStyle={measurements.length === 0 ? styles.empty : undefined} ListEmptyComponent={Nog geen metingen}