github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-05-07 12:28:57 -05:00
Code Issues 1.6k Packages Projects Releases 55 Wiki Activity

[PR #7600] Improve merge functionality with transfers #56584

New Issue
Open
opened 2026-05-01 04:32:40 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-05-01 04:32:40 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/7600
Author: @alecbakholdin
Created: 4/23/2026
Status: 🔄 Open

Base: master ← Head: merge-transfers

📝 Commits (10+)

  • 0453e30 fix: merging transfer with non transfer now always keeps transfer
  • cd0d951 updated canMerge logic to limit to transactions from the same account
  • 2c66eb3 release notes
  • eaefe5d Merge branch 'master' into merge-transfers
  • 5f526b3 added missing imports
  • 064c662 formatting
  • 5a613fa removed console.log
  • bccf6b1 [autofix.ci] apply automated fixes
  • 4f125ee [autofix.ci] apply automated fixes (attempt 2/3)
  • f655eff release note update

📊 Changes

7 files changed (+250 additions, -14 deletions)

View changed files

📝 packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx (+2 -2)
📝 packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx (+2 -2)
📝 packages/loot-core/src/server/transactions/merge.test.ts (+77 -3)
📝 packages/loot-core/src/server/transactions/merge.ts (+88 -7)
➕ packages/loot-core/src/shared/merge.test.ts (+42 -0)
➕ packages/loot-core/src/shared/merge.ts (+33 -0)
➕ upcoming-release-notes/7600.md (+6 -0)

📄 Description

Description

This PR seeks to address an issue with the existing merge implementation. It has been requested that transfers be prioritized when merging transactions.

It also further limits the types of transactions that can be merged. Transactions from different accounts and transfers that transfer to different accounts cannot be merged. (This might be removed, it's opinionated but I think makes sense?)

Related issue(s)

Fixes #5000

Testing

Attempted Merge with different types of transactions.

Checklist

  • Release notes added (see link above)
  • No obvious regressions in affected areas
  • Self-review has been performed - I understand what each change in the code does and why it is needed

Bundle Stats

Bundle Files count Total bundle size % Changed
desktop-client 34 13.88 MB → 13.88 MB (+848 B) +0.01%
loot-core 1 5.27 MB → 5.27 MB (+2.2 kB) +0.04%
api 2 3.89 MB → 3.89 MB (+2.16 kB) +0.05%
cli 1 7.91 MB 0%
crdt 1 41.83 kB 0%
View detailed bundle stats

desktop-client

Total

Files count Total bundle size % Changed
34 13.88 MB → 13.88 MB (+848 B) +0.01%
Changeset
File Δ Size
home/runner/work/actual/actual/packages/loot-core/src/shared/merge.ts 🆕 +727 B 0 B → 727 B
node_modules/react-is/index.js 📈 +23 B (+11.79%) 195 B → 218 B
src/components/transactions/SelectedTransactionsButton.tsx 📈 +123 B (+0.71%) 16.8 kB → 16.92 kB
src/components/mobile/transactions/TransactionList.tsx 📉 -2 B (-0.01%) 18.04 kB → 18.04 kB
node_modules/react-is/cjs/react-is.production.min.js 📉 -1.33 kB (-76.18%) 1.74 kB → 425 B
View detailed bundle breakdown

Added

Asset File Size % Changed
static/js/merge.js 0 B → 4.94 MB (+4.94 MB) -

Removed

Asset File Size % Changed
static/js/Value.js 4.94 MB → 0 B (-4.94 MB) -100%

Bigger

Asset File Size % Changed
static/js/index.js 1.86 MB → 1.87 MB (+123 B) +0.01%

Smaller

Asset File Size % Changed
static/js/TransactionList.js 85.81 kB → 85.81 kB (-2 B) -0.00%

Unchanged

Asset File Size % Changed
static/js/BackgroundImage.js 121.09 kB 0%
static/js/FormulaEditor.js 962.55 kB 0%
static/js/PayeeRuleCountLabel.js 52.52 kB 0%
static/js/ReportRouter.js 1.22 MB 0%
static/js/ScheduleEditForm.js 145.68 kB 0%
static/js/TransactionEdit.js 186.56 kB 0%
static/js/ca.js 191.49 kB 0%
static/js/chart-theme.js 796.5 kB 0%
static/js/client.js 451.37 kB 0%
static/js/da.js 104.22 kB 0%
static/js/de.js 173.88 kB 0%
static/js/en-GB.js 8.2 kB 0%
static/js/en.js 176.76 kB 0%
static/js/es.js 181.86 kB 0%
static/js/extends.js 518.66 kB 0%
static/js/fr.js 182.5 kB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 13.46 kB 0%
static/js/it.js 168.33 kB 0%
static/js/narrow.js 364.31 kB 0%
static/js/nb-NO.js 151.39 kB 0%
static/js/nl.js 108.46 kB 0%
static/js/pl.js 88.14 kB 0%
static/js/pt-BR.js 193.27 kB 0%
static/js/resize-observer.js 18.06 kB 0%
static/js/th.js 178.63 kB 0%
static/js/theme.js 31.67 kB 0%
static/js/uk.js 212.03 kB 0%
static/js/useFormatList.js 8.63 kB 0%
static/js/wide.js 453 B 0%
static/js/workbox-window.prod.es5.js 7.33 kB 0%
static/js/zh-Hans.js 119.73 kB 0%

loot-core

Total

Files count Total bundle size % Changed
1 5.27 MB → 5.27 MB (+2.2 kB) +0.04%
Changeset
File Δ Size
home/runner/work/actual/actual/packages/loot-core/src/shared/merge.ts 🆕 +606 B 0 B → 606 B
home/runner/work/actual/actual/packages/loot-core/src/server/transactions/merge.ts 📈 +1.61 kB (+54.91%) 2.93 kB → 4.55 kB
View detailed bundle breakdown

Added

Asset File Size % Changed
kcab.worker.DVLth7EW.js 0 B → 5.27 MB (+5.27 MB) -

Removed

Asset File Size % Changed
kcab.worker.JKo6NKKa.js 5.27 MB → 0 B (-5.27 MB) -100%

Bigger
No assets were bigger

Smaller
No assets were smaller

Unchanged
No assets were unchanged

api

Total

Files count Total bundle size % Changed
2 3.89 MB → 3.89 MB (+2.16 kB) +0.05%
Changeset
File Δ Size
home/runner/work/actual/actual/packages/loot-core/src/shared/merge.ts 🆕 +609 B 0 B → 609 B
home/runner/work/actual/actual/packages/loot-core/src/server/transactions/merge.ts 📈 +1.56 kB (+54.32%) 2.87 kB → 4.43 kB
View detailed bundle breakdown

Added
No assets were added

Removed
No assets were removed

Bigger

Asset File Size % Changed
index.js 3.89 MB → 3.89 MB (+2.16 kB) +0.05%

Smaller
No assets were smaller

Unchanged

Asset File Size % Changed
models.js 0 B 0%

cli

Total

Files count Total bundle size % Changed
1 7.91 MB 0%
View detailed bundle breakdown

Added
No assets were added

Removed
No assets were removed

Bigger
No assets were bigger

Smaller
No assets were smaller

Unchanged

Asset File Size % Changed
cli.js 7.91 MB 0%

crdt

Total

Files count Total bundle size % Changed
1 41.83 kB 0%
View detailed bundle breakdown

Added
No assets were added

Removed
No assets were removed

Bigger
No assets were bigger

Smaller
No assets were smaller

Unchanged

Asset File Size % Changed
index.js 41.83 kB 0%

🔄 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/7600 **Author:** [@alecbakholdin](https://github.com/alecbakholdin) **Created:** 4/23/2026 **Status:** 🔄 Open **Base:** `master` ← **Head:** `merge-transfers` --- ### 📝 Commits (10+) - [`0453e30`](https://github.com/actualbudget/actual/commit/0453e3000f572fa5df326a8a0ff2f65e82b1774f) fix: merging transfer with non transfer now always keeps transfer - [`cd0d951`](https://github.com/actualbudget/actual/commit/cd0d951ec1b88fd61ee38f697f201446cc7b339b) updated canMerge logic to limit to transactions from the same account - [`2c66eb3`](https://github.com/actualbudget/actual/commit/2c66eb3ea1516381d60327e4c2b52d8fd8de9b5a) release notes - [`eaefe5d`](https://github.com/actualbudget/actual/commit/eaefe5dea441ec6396b95d3e31b0d3b5a7da197a) Merge branch 'master' into merge-transfers - [`5f526b3`](https://github.com/actualbudget/actual/commit/5f526b37c50ec8e10939a023cdc435f213bb163c) added missing imports - [`064c662`](https://github.com/actualbudget/actual/commit/064c66252b7df4e1a79b60ee075612db8da8241b) formatting - [`5a613fa`](https://github.com/actualbudget/actual/commit/5a613fafdd29d72686ee968b25cca3780828cf71) removed console.log - [`bccf6b1`](https://github.com/actualbudget/actual/commit/bccf6b15c41779d9828c8f92c9c9678aad557c20) [autofix.ci] apply automated fixes - [`4f125ee`](https://github.com/actualbudget/actual/commit/4f125ee652f7a223d451b27e115aa4c32278704e) [autofix.ci] apply automated fixes (attempt 2/3) - [`f655eff`](https://github.com/actualbudget/actual/commit/f655eff560ada64a3f5eb0ac3fce8d179ea718cb) release note update ### 📊 Changes **7 files changed** (+250 additions, -14 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/src/components/mobile/transactions/TransactionList.tsx` (+2 -2) 📝 `packages/desktop-client/src/components/transactions/SelectedTransactionsButton.tsx` (+2 -2) 📝 `packages/loot-core/src/server/transactions/merge.test.ts` (+77 -3) 📝 `packages/loot-core/src/server/transactions/merge.ts` (+88 -7) ➕ `packages/loot-core/src/shared/merge.test.ts` (+42 -0) ➕ `packages/loot-core/src/shared/merge.ts` (+33 -0) ➕ `upcoming-release-notes/7600.md` (+6 -0) </details> ### 📄 Description <!-- Thank you for submitting a pull request! Make sure to follow the instructions to write release notes for your PR — it should only take a minute or two: https://github.com/actualbudget/docs#writing-good-release-notes. Try running yarn generate:release-notes *before* pushing your PR for an interactive experience. --> ## Description This PR seeks to address an issue with the existing merge implementation. It has been requested that transfers be prioritized when merging transactions. It also further limits the types of transactions that can be merged. Transactions from different accounts and transfers that transfer to different accounts cannot be merged. (This might be removed, it's opinionated but I think makes sense?) ## Related issue(s) Fixes #5000 ## Testing Attempted Merge with different types of transactions. ## Checklist - [x] Release notes added (see link above) - [x] No obvious regressions in affected areas - [x] Self-review has been performed - I understand what each change in the code does and why it is needed <!--- actual-bot-sections ---> <!--- bundlestats-action-comment key:combined start ---> ### Bundle Stats Bundle | Files count | Total bundle size | % Changed ------ | ----------- | ----------------- | --------- desktop-client | 34 | 13.88 MB → 13.88 MB (+848 B) | +0.01% loot-core | 1 | 5.27 MB → 5.27 MB (+2.2 kB) | +0.04% api | 2 | 3.89 MB → 3.89 MB (+2.16 kB) | +0.05% cli | 1 | 7.91 MB | 0% crdt | 1 | 41.83 kB | 0% <details> <summary>View detailed bundle stats</summary> #### desktop-client **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 34 | 13.88 MB → 13.88 MB (+848 B) | +0.01% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `home/runner/work/actual/actual/packages/loot-core/src/shared/merge.ts` | 🆕 +727 B | 0 B → 727 B `node_modules/react-is/index.js` | 📈 +23 B (+11.79%) | 195 B → 218 B `src/components/transactions/SelectedTransactionsButton.tsx` | 📈 +123 B (+0.71%) | 16.8 kB → 16.92 kB `src/components/mobile/transactions/TransactionList.tsx` | 📉 -2 B (-0.01%) | 18.04 kB → 18.04 kB `node_modules/react-is/cjs/react-is.production.min.js` | 📉 -1.33 kB (-76.18%) | 1.74 kB → 425 B </details> <details> <summary>View detailed bundle breakdown</summary> <div> **Added** Asset | File Size | % Changed ----- | --------- | --------- static/js/merge.js | 0 B → 4.94 MB (+4.94 MB) | - **Removed** Asset | File Size | % Changed ----- | --------- | --------- static/js/Value.js | 4.94 MB → 0 B (-4.94 MB) | -100% **Bigger** Asset | File Size | % Changed ----- | --------- | --------- static/js/index.js | 1.86 MB → 1.87 MB (+123 B) | +0.01% **Smaller** Asset | File Size | % Changed ----- | --------- | --------- static/js/TransactionList.js | 85.81 kB → 85.81 kB (-2 B) | -0.00% **Unchanged** Asset | File Size | % Changed ----- | --------- | --------- static/js/BackgroundImage.js | 121.09 kB | 0% static/js/FormulaEditor.js | 962.55 kB | 0% static/js/PayeeRuleCountLabel.js | 52.52 kB | 0% static/js/ReportRouter.js | 1.22 MB | 0% static/js/ScheduleEditForm.js | 145.68 kB | 0% static/js/TransactionEdit.js | 186.56 kB | 0% static/js/ca.js | 191.49 kB | 0% static/js/chart-theme.js | 796.5 kB | 0% static/js/client.js | 451.37 kB | 0% static/js/da.js | 104.22 kB | 0% static/js/de.js | 173.88 kB | 0% static/js/en-GB.js | 8.2 kB | 0% static/js/en.js | 176.76 kB | 0% static/js/es.js | 181.86 kB | 0% static/js/extends.js | 518.66 kB | 0% static/js/fr.js | 182.5 kB | 0% static/js/indexeddb-main-thread-worker-e59fee74.js | 13.46 kB | 0% static/js/it.js | 168.33 kB | 0% static/js/narrow.js | 364.31 kB | 0% static/js/nb-NO.js | 151.39 kB | 0% static/js/nl.js | 108.46 kB | 0% static/js/pl.js | 88.14 kB | 0% static/js/pt-BR.js | 193.27 kB | 0% static/js/resize-observer.js | 18.06 kB | 0% static/js/th.js | 178.63 kB | 0% static/js/theme.js | 31.67 kB | 0% static/js/uk.js | 212.03 kB | 0% static/js/useFormatList.js | 8.63 kB | 0% static/js/wide.js | 453 B | 0% static/js/workbox-window.prod.es5.js | 7.33 kB | 0% static/js/zh-Hans.js | 119.73 kB | 0% </div> </details> --- #### loot-core **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 5.27 MB → 5.27 MB (+2.2 kB) | +0.04% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `home/runner/work/actual/actual/packages/loot-core/src/shared/merge.ts` | 🆕 +606 B | 0 B → 606 B `home/runner/work/actual/actual/packages/loot-core/src/server/transactions/merge.ts` | 📈 +1.61 kB (+54.91%) | 2.93 kB → 4.55 kB </details> <details> <summary>View detailed bundle breakdown</summary> <div> **Added** Asset | File Size | % Changed ----- | --------- | --------- kcab.worker.DVLth7EW.js | 0 B → 5.27 MB (+5.27 MB) | - **Removed** Asset | File Size | % Changed ----- | --------- | --------- kcab.worker.JKo6NKKa.js | 5.27 MB → 0 B (-5.27 MB) | -100% **Bigger** No assets were bigger **Smaller** No assets were smaller **Unchanged** No assets were unchanged </div> </details> --- #### api **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 2 | 3.89 MB → 3.89 MB (+2.16 kB) | +0.05% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `home/runner/work/actual/actual/packages/loot-core/src/shared/merge.ts` | 🆕 +609 B | 0 B → 609 B `home/runner/work/actual/actual/packages/loot-core/src/server/transactions/merge.ts` | 📈 +1.56 kB (+54.32%) | 2.87 kB → 4.43 kB </details> <details> <summary>View detailed bundle breakdown</summary> <div> **Added** No assets were added **Removed** No assets were removed **Bigger** Asset | File Size | % Changed ----- | --------- | --------- index.js | 3.89 MB → 3.89 MB (+2.16 kB) | +0.05% **Smaller** No assets were smaller **Unchanged** Asset | File Size | % Changed ----- | --------- | --------- models.js | 0 B | 0% </div> </details> --- #### cli **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 7.91 MB | 0% <details> <summary>View detailed bundle breakdown</summary> <div> **Added** No assets were added **Removed** No assets were removed **Bigger** No assets were bigger **Smaller** No assets were smaller **Unchanged** Asset | File Size | % Changed ----- | --------- | --------- cli.js | 7.91 MB | 0% </div> </details> --- #### crdt **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 41.83 kB | 0% <details> <summary>View detailed bundle breakdown</summary> <div> **Added** No assets were added **Removed** No assets were removed **Bigger** No assets were bigger **Smaller** No assets were smaller **Unchanged** Asset | File Size | % Changed ----- | --------- | --------- index.js | 41.83 kB | 0% </div> </details> </details> <!--- bundlestats-action-comment key:combined end ---> --- <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-01 04:32:40 -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#56584
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?