github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-05-21 06:31:58 -05:00
Code Issues 2.1k Packages Projects Releases 57 Wiki Activity

[PR #5861] [CLOSED] [WIP] Fix merging split transactions (#5781) #83852

New Issue
Closed
opened 2026-05-19 08:48:32 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-19 08:48:32 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/5861
Author: @willkell
Created: 10/6/2025
Status: ❌ Closed

Base: master ← Head: fix-merging-with-splits

📝 Commits (5)

  • a56e274 correctly merge transactions with splits
  • 4459baa add release notes
  • 145dbcf Mobile rules - refactor to use react-aria GridList component (#5804)
  • b722da5 Mobile payees - add loading indicator to rules count label (#5842)
  • 3737876 [autofix.ci] apply automated fixes

📊 Changes

14 files changed (+283 additions, -237 deletions)

View changed files

📝 packages/desktop-client/e2e/page-models/mobile-rules-page.ts (+3 -6)
📝 packages/desktop-client/src/components/mobile/payees/MobilePayeesPage.tsx (+4 -12)
📝 packages/desktop-client/src/components/mobile/payees/PayeesList.tsx (+4 -0)
📝 packages/desktop-client/src/components/mobile/payees/PayeesListItem.tsx (+7 -1)
📝 packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx (+3 -17)
📝 packages/desktop-client/src/components/mobile/rules/RulesList.tsx (+18 -29)
📝 packages/desktop-client/src/components/mobile/rules/RulesListItem.tsx (+136 -146)
📝 packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx (+5 -17)
📝 packages/desktop-client/src/components/payees/PayeeRuleCountLabel.tsx (+9 -1)
➕ packages/desktop-client/src/hooks/usePayeeRuleCounts.ts (+33 -0)
📝 packages/loot-core/src/server/transactions/merge.ts (+43 -8)
➕ upcoming-release-notes/5804.md (+6 -0)
➕ upcoming-release-notes/5842.md (+6 -0)
➕ upcoming-release-notes/5861.md (+6 -0)

📄 Description

Fixes #5781

This bug fixes an issue where, during transaction merging, if the transaction that is dropped has split transactions and the transaction that was kept does not then the dropped transaction's splits disappear and don't get re-parented to the kept transaction.

Now, the behavior is:

  • If the dropped transaction is a split transaction and the kept transaction does not, the dropped transaction's splits are re-parented to the kept transaction
  • If both the dropped and kept transaction are split transactions the dropped transaction's splits are properly deleted and just the kept transaction's splits are kept around

This is my first time doing this, so please feel free to let me know if anything needs to be changed. Thanks!

🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.

## 📋 Pull Request Information **Original PR:** https://github.com/actualbudget/actual/pull/5861 **Author:** [@willkell](https://github.com/willkell) **Created:** 10/6/2025 **Status:** ❌ Closed **Base:** `master` ← **Head:** `fix-merging-with-splits` --- ### 📝 Commits (5) - [`a56e274`](https://github.com/actualbudget/actual/commit/a56e27418d22fc350bea225b3c4e2ea6d18590e7) correctly merge transactions with splits - [`4459baa`](https://github.com/actualbudget/actual/commit/4459baad0ff91cec14a53d3a187d6982c30fafbe) add release notes - [`145dbcf`](https://github.com/actualbudget/actual/commit/145dbcf894c80e70c27da5f9cff67ee78f911d40) Mobile rules - refactor to use react-aria GridList component (#5804) - [`b722da5`](https://github.com/actualbudget/actual/commit/b722da59128a19231c537caf6c1e8671c726f496) Mobile payees - add loading indicator to rules count label (#5842) - [`3737876`](https://github.com/actualbudget/actual/commit/37378761aa2406c6373084a951aa421810a18708) [autofix.ci] apply automated fixes ### 📊 Changes **14 files changed** (+283 additions, -237 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/e2e/page-models/mobile-rules-page.ts` (+3 -6) 📝 `packages/desktop-client/src/components/mobile/payees/MobilePayeesPage.tsx` (+4 -12) 📝 `packages/desktop-client/src/components/mobile/payees/PayeesList.tsx` (+4 -0) 📝 `packages/desktop-client/src/components/mobile/payees/PayeesListItem.tsx` (+7 -1) 📝 `packages/desktop-client/src/components/mobile/rules/MobileRulesPage.tsx` (+3 -17) 📝 `packages/desktop-client/src/components/mobile/rules/RulesList.tsx` (+18 -29) 📝 `packages/desktop-client/src/components/mobile/rules/RulesListItem.tsx` (+136 -146) 📝 `packages/desktop-client/src/components/payees/ManagePayeesWithData.tsx` (+5 -17) 📝 `packages/desktop-client/src/components/payees/PayeeRuleCountLabel.tsx` (+9 -1) ➕ `packages/desktop-client/src/hooks/usePayeeRuleCounts.ts` (+33 -0) 📝 `packages/loot-core/src/server/transactions/merge.ts` (+43 -8) ➕ `upcoming-release-notes/5804.md` (+6 -0) ➕ `upcoming-release-notes/5842.md` (+6 -0) ➕ `upcoming-release-notes/5861.md` (+6 -0) </details> ### 📄 Description Fixes #5781 This bug fixes an issue where, during transaction merging, if the transaction that is dropped has split transactions and the transaction that was kept does not then the dropped transaction's splits disappear and don't get re-parented to the kept transaction. Now, the behavior is: - If the dropped transaction is a split transaction and the kept transaction does not, the dropped transaction's splits are re-parented to the kept transaction - If both the dropped and kept transaction are split transactions the dropped transaction's splits are properly deleted and just the kept transaction's splits are kept around This is my first time doing this, so please feel free to let me know if anything needs to be changed. Thanks! --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>
GiteaMirror added the pull-request label 2026-05-19 08:48:32 -05:00
Sign in to join this conversation.
No Branch/Tag Specified
Branches Tags
Labels
Clear labels
AI generated
API
bank sync
budgeting
bug
can’t replicate
dependencies
docker
documentation
electron
experimental feature
feature
feedback
goal templates
good first issue
help wanted
importers
maintenance
needs info
needs testing
needs triage
needs votes
openid
payees
pull-request
Mirrored from GitHub Pull Request
 regression
reports
responsive
rules
schedules
server
✨ merged
split transactions
tech debt
theme
transaction import
transaction reconciliation
transactions
translations
upstream
user interface
✅ approved
wontfix
No Label pull-request
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
GiteaMirror ninjasurge
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#83852
Delete Branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?