Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 14 additions & 10 deletions src/features/workouts/WorkoutSessionPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -149,29 +149,33 @@ export function WorkoutSessionPage() {
)
}
}
return { previous }
},
onSuccess: (data, variables) => {
setActiveExerciseId(variables.exerciseId)
const onLogId = logIdCallbackRef.current
logIdCallbackRef.current = null
const fromTimerMode = !!onLogId
if (onLogId) onLogId(data.id)
const transition = transitionQueueRef.current.shift() ?? false
// Auto-start rest timer from checklist mode (timer mode handles its own rest)

// Start rest timer immediately (checklist mode only — timer mode handles its own)
const fromTimerMode = !!logIdCallbackRef.current
if (!(isCompleteSession || fromTimerMode)) {
const transition = transitionQueueRef.current.shift() ?? false
if (transition) {
storeRecordTransition()
} else {
const rest = getRestDuration(variables.exerciseId, variables.reps, variables.setType ?? 'working')
storeStartRest(rest, variables.setType ?? 'working')
}
}

return { previous }
},
onSuccess: (data, variables) => {
setActiveExerciseId(variables.exerciseId)
const onLogId = logIdCallbackRef.current
logIdCallbackRef.current = null
if (onLogId) onLogId(data.id)
},
onError: (_err, _variables, context) => {
if (context?.previous) {
utils.workout.getSession.setData({ id: effectiveSessionId! }, context.previous)
}
// Clear optimistic rest timer on failure
useWorkoutSessionStore.getState().dismissRest()
},
onSettled: () => utils.workout.getSession.invalidate({ id: effectiveSessionId! })
})
Expand Down
Loading