fix: Ensure users can stop cardio timer

There was a bug where since the cardio timer updates two fields with two callbacks, the second update clobbered the first. This change ensures that the calback always gets the latest version of the exercise.

This is not the first time this has happened with this new model, it may not be the best way to go about it.

fixes: #861

Author: LiamMorrow

app/src/components/presentation/workout/cardio/cardio-exercise.tsx

@@ -44,7 +44,9 @@ interface CardioExerciseProps {
   isReadonly: boolean;
   showPreviousButton: boolean;
 
-  updateExercise: (ex: RecordedCardioExercise) => void;
+  updateExercise: (
+    cb: (ex: RecordedCardioExercise) => RecordedCardioExercise,
+  ) => void;
   onEditExercise: () => void;
   onRemoveExercise: () => void;
 }
@@ -59,8 +61,8 @@ export function CardioExercise(props: CardioExerciseProps) {
       setIndex: number,
     ): CardioExerciseSetCallback<T> =>
     (val) =>
-      props.updateExercise(
-        props.recordedExercise.withSet(setIndex, (s) =>
+      props.updateExercise((ex) =>
+        ex.withSet(setIndex, (s) =>
           s
             .with({ [key]: val })
             .withCompletionTimeIfCompleted(OffsetDateTime.now()),
@@ -73,7 +75,7 @@ export function CardioExercise(props: CardioExerciseProps) {
       toStartNext={props.toStartNext}
       isReadonly={props.isReadonly}
       showPreviousButton={props.showPreviousButton}
-      updateExercise={props.updateExercise}
+      updateExercise={(x) => props.updateExercise(() => x)}
       onEditExercise={props.onEditExercise}
       onRemoveExercise={props.onRemoveExercise}
     >

app/src/components/smart/session-component.tsx

@@ -183,7 +183,12 @@ export default function SessionComponent(props: {
         <CardioExercise
           recordedExercise={item}
           updateExercise={(ex) =>
-            updateSession((s) => s.withExercise(index, ex))
+            updateSession((s) =>
+              s.withExercise(
+                index,
+                ex(s.recordedExercises[index] as RecordedCardioExercise),
+              ),
+            )
           }
           toStartNext={session.nextExercise === item}
           onEditExercise={() => {