Skip to content

Hide rest timer immediately on expiry instead of showing expired state #30

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willchan merged 2 commits into from
Mar 19, 2026
Merged

Hide rest timer immediately on expiry instead of showing expired state #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f705bfc
Hide rest timer immediately on expiry instead of showing expired state
claude Mar 19, 2026
c22311f
Reconcile timer expiry behavior between notification and attention tests
claude Mar 19, 2026
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
4 changes: 2 additions & 2 deletions workout-tracker/e2e/timer-notification.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ test.describe('Rest Timer Notification Reliability', () => {
const vibrateCount = await page.evaluate(() => (window as any).__vibrateCount);
expect(vibrateCount).toBe(1);

// Timer should be hidden
await expect(page.locator('#rest-timer')).toBeHidden();
// Timer should show expired state (active countdown stopped)
await expect(page.locator('[data-testid="timer-expired"]')).toBeVisible();
});
});
4 changes: 1 addition & 3 deletions workout-tracker/src/ui/workout.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,6 @@ export async function renderWorkout(container: HTMLElement): Promise<void> {
el.dataset.testid = 'timer-expired';
const timerValue = document.getElementById('timer-value');
if (timerValue) timerValue.textContent = "Time's Up!";
// Hide skip button during expired state
const skipBtn = document.getElementById('skip-timer-btn');
if (skipBtn) skipBtn.classList.add('hidden');

Expand All @@ -386,7 +385,6 @@ export async function renderWorkout(container: HTMLElement): Promise<void> {
};

el.addEventListener('click', dismiss);
// Auto-dismiss after 10 seconds
setTimeout(dismiss, 10000);
}

Expand Down Expand Up @@ -586,7 +584,7 @@ export async function renderWorkout(container: HTMLElement): Promise<void> {
await putTimerState(null);
cancelBackgroundTimerNotification();
fireTimerNotification();
showTimerExpired(timerEl);
timerEl.classList.add('hidden');
}
}

Expand Down
Loading