Stack the add/edit expense screen so back pops it like Cancel - #22
Merged
Conversation
The add/edit form was an inline `view.mode` swap inside LedgerManager, so the native/hardware back button and back-swipe gesture couldn't pop it — they'd exit the app or navigate away instead of returning to the ledger. Extract the form into its own stacked route (`/entry`, `?id=` to edit): - EntryManager (pure, DB-injected): create / update / soft-delete + the "last used currency" default; renders a Back button that mirrors Cancel. - EntryScreen (route wrapper): resolves the entry + categories, owns navigation (router.back on save/cancel/delete). - LedgerManager now navigates via onAddEntry / onEditEntry; duplicate and row-delete stay inline. A tiny toastStore carries the confirming snackbar — including the delete Undo (data safety, §6.7) — back to the ledger across the pop, drained on its next render. Tests: form flows (create/edit/tags/delete/cancel) move to entryManager.test.tsx; ledgerManager.test.tsx keeps list/delete/duplicate and asserts the new navigation wiring. 228 pass; lint/typecheck/format clean. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Problem
The add/edit expense form was rendered inline inside
LedgerManager(aview.modestate swap), not as a navigation route. So the phone's hardware/nav back button (and the iOS back-swipe / browser back) didn't return to the list — it would exit the app or navigate away. The only way back was the on-screen Cancel button.Fix
Extract the form into its own stacked route so back / swipe pops it, exactly like Cancel:
app/entry.tsx— new route. No params = add;?id=<entryId>= edit.EntryManager(pure, DB-injected) — owns create / update / soft-delete and the "last used currency" default (§7.3); renders a‹ Backbutton whose action equals Cancel.EntryScreen(route wrapper) — resolves the entry + picker categories, owns navigation (router.back()on save / cancel / delete), and pops back to a since-deleted entry gracefully.LedgerManagernow just navigates (onAddEntry/onEditEntry); duplicate and row delete + Undo stay inline as before.toastStore(tiny Zustand singleton) carries the confirming snackbar — crucially the delete Undo (data safety, §6.7) — from the popping entry screen back to the ledger, drained on its next render. The ledger re-reads on focus, so the new/updated/removed row is live on return (web included).Tests
entryManager.test.tsx, driven against real in-memory SQLite.ledgerManager.test.tsxkeeps list / delete+Undo / duplicate / per-day totals / empty-state, and now asserts the navigation wiring (FAB + empty CTA →onAddEntry; row tap →onEditEntry(entry)).No version bump here — a release of this would be a separate 1.1.4.
🤖 Generated with Claude Code