Skip to content

Timer: Finish did nothing on the open-session screen #176

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
nessed merged 1 commit into from
Oct 3, 2026
Merged

Timer: Finish did nothing on the open-session screen #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 34 additions & 25 deletions app/timer/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,6 +857,38 @@ export default function TimerPage() {
</div>
);

/* Finish and Discard ask through these. Both layouts (the block screen and
the night one) render them, since both carry the buttons. */
const confirmSheets = (
<>
<ConfirmSheet
open={asking === 'finish'}
title="Finish this sitting?"
body="The clock stops and you'll log it next."
confirmLabel="Finish"
cancelLabel="Keep going"
onCancel={() => setAsking(null)}
onConfirm={() => {
setAsking(null);
handleStop();
}}
/>
<ConfirmSheet
open={asking === 'discard'}
title="Discard this sitting?"
body="The time so far won't be saved."
confirmLabel="Discard"
cancelLabel="Keep going"
onCancel={() => setAsking(null)}
onConfirm={() => {
setAsking(null);
cancel();
router.replace('/dashboard');
}}
/>
</>
);

/* Open mode goes to the night paper and lets the fan fill the whole screen.
It is the one place in the app that inverts, and it does it because a
long sitting in a dark room is what the mode is for. */
Expand Down Expand Up @@ -1035,6 +1067,7 @@ export default function TimerPage() {
<div>{controls}</div>
</div>
</div>
{confirmSheets}
<PendingSessionLogSheet />
{pictureSheet}
</div>
Expand Down Expand Up @@ -1230,31 +1263,7 @@ export default function TimerPage() {
</p>
</div>

<ConfirmSheet
open={asking === 'finish'}
title="Finish this sitting?"
body="The clock stops and you'll log it next."
confirmLabel="Finish"
cancelLabel="Keep going"
onCancel={() => setAsking(null)}
onConfirm={() => {
setAsking(null);
handleStop();
}}
/>
<ConfirmSheet
open={asking === 'discard'}
title="Discard this sitting?"
body="The time so far won't be saved."
confirmLabel="Discard"
cancelLabel="Keep going"
onCancel={() => setAsking(null)}
onConfirm={() => {
setAsking(null);
cancel();
router.replace('/dashboard');
}}
/>
{confirmSheets}
<PendingSessionLogSheet />
{pictureSheet}
</div>
Expand Down
Loading