From 86207e7bd7d229feb2fcf26587f80b2ee268f17e Mon Sep 17 00:00:00 2001 From: Morten Kolstad Date: Sat, 12 Oct 2024 19:30:27 +0200 Subject: [PATCH 1/2] remove unused syncResistanceIfActive --- apps/frontend/src/context/ActiveWorkoutContext.tsx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/apps/frontend/src/context/ActiveWorkoutContext.tsx b/apps/frontend/src/context/ActiveWorkoutContext.tsx index 93845cf8..96b6fc64 100644 --- a/apps/frontend/src/context/ActiveWorkoutContext.tsx +++ b/apps/frontend/src/context/ActiveWorkoutContext.tsx @@ -14,7 +14,6 @@ export const ActiveWorkoutContext = React.createContext<{ setActiveFtp: (ftp: number) => void; changeActivePart: (partNumber: number, addLap: () => void) => void; syncResistance: () => void; - syncResistanceIfActive: () => void; } | null>(null); interface IncreasePartElapsedTimeAction { @@ -205,17 +204,6 @@ export const ActiveWorkoutContextProvider = ({ dispatchActiveWorkoutAction({ type: 'PAUSE', setResistance, activeFtp }); }; - const syncResistanceIfActive = () => { - if (!isConnected) return; - - const { status, workout } = activeWorkout; - if (status !== 'active' || !workout) { - setResistance(0); - } else { - syncResistance(); - } - }; - const syncResistance = () => { const { workout } = activeWorkout; if (!isConnected || !workout) return; @@ -266,7 +254,6 @@ export const ActiveWorkoutContextProvider = ({ setActiveFtp, changeActivePart, syncResistance, - syncResistanceIfActive, }} > {children} From f44c1afcf4cfa72450967860011f13fee8947912 Mon Sep 17 00:00:00 2001 From: Morten Kolstad Date: Sat, 12 Oct 2024 20:28:04 +0200 Subject: [PATCH 2/2] skip resetting resistance when starting without workout --- apps/frontend/src/context/ActiveWorkoutContext.tsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/frontend/src/context/ActiveWorkoutContext.tsx b/apps/frontend/src/context/ActiveWorkoutContext.tsx index 96b6fc64..0cbf9867 100644 --- a/apps/frontend/src/context/ActiveWorkoutContext.tsx +++ b/apps/frontend/src/context/ActiveWorkoutContext.tsx @@ -169,7 +169,9 @@ export const ActiveWorkoutContextProvider = ({ const status = activeWorkout.status; const workout = activeWorkout.workout; - if (status !== 'active' || !workout) { + if (status === 'active' && !workout) { + return; + } else if (status !== 'active' || !workout) { setResistance(0); } else { const activeWorkoutPart = workout.parts[activeWorkout.activePart];