Skip to content

Conversation

@zensgit
Copy link
Owner

@zensgit zensgit commented Sep 28, 2025

Design proposal for Phase B: filters (text/date/type/account/category/tag/amount), grouping (date/category/account) with subtotals, provider/state changes, and phased rollout.

…nce.share/shareXFiles in QR + ShareService; remove local stub
…ignores; fix template onCancel and batch dialogs snackbars
…rs (accounts/dashboard types, const-eval, family settings void, email Address stub); wire A/B/C entrances
…oup toggle in TransactionList; optional filter icon in RecentTransactions
…sactions; finalize TransactionList search bar impl
- Fixed lines 180 and 183 which had ASCII SOH (0x01) control characters
- Added proper parameters to updateFamilySettings and deleteFamilySettings calls
- Now uses change.entityId and change.data! as required by the API methods

Fixes build_runner failure: 'Illegal character 1' at lines 180:57 and 183:57
zensgit added a commit that referenced this pull request Oct 8, 2025
Resolved git merge conflicts that were polluting all feature branches:
- theme_management_screen.dart: 5 conflicts (ScaffoldMessenger patterns)
- transaction_provider.dart: 2 conflicts (duplicate enum & method definitions)
- family_activity_log_screen.dart: 1 conflict (statistics loading)

All conflicts resolved by:
- Preferring messenger variable pattern over repeated ScaffoldMessenger.of()
- Removing duplicate enum and method definitions
- Using direct stats return instead of _parseActivityStatistics()

Added comprehensive PR fix report documenting all 5 PRs analyzed.

This fix will automatically benefit all PRs (#65, #66, #68, #69, #70) as they
rebase/merge from main.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
Resolved 15 file conflicts by accepting main's clean version.
Same pattern as PR #65 - duplicate variable declarations removed.
@zensgit zensgit merged commit 6e1d35f into main Oct 11, 2025
8 of 9 checks passed
@zensgit zensgit deleted the docs/tx-filters-grouping-design branch October 11, 2025 17:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant