github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-03-09 11:42:54 -05:00
Code Issues 250 Packages Projects Releases 53 Wiki Activity

[PR #1789] [MERGED] Lock transactions after reconcilliation #3959

New Issue
Closed
opened 2026-02-28 20:49:27 -06:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-02-28 20:49:27 -06:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/1789
Author: @zachwhelchel
Created: 10/12/2023
Status: ✅ Merged
Merged: 11/22/2023
Merged by: @MatissJanis

Base: master ← Head: zach/lock-transactions

📝 Commits (10+)

  • 84eb1e9 Initial work for locking transactions.
  • 3094f66 Changed language for test.
  • c6bb9a2 Merge branch 'actualbudget:master' into master
  • 9accd18 Merge branch 'zach/lock-transactions' into master
  • 5040c80 Merge pull request #1 from zachwhelchel/master
  • 55fd5e6 Locked transactions on web working.
  • 171d21a Locked transactions working on mobile.
  • 690e934 Cleaned up confirm language for various cases when editing reconciled transactions.
  • 44590f7 Scope calls to correct account.
  • da7af9d Clean up for locked transactions PR.

📊 Changes

19 files changed (+757 additions, -228 deletions)

View changed files

📝 packages/desktop-client/src/components/Modals.tsx (+10 -0)
📝 packages/desktop-client/src/components/accounts/Account.js (+174 -54)
📝 packages/desktop-client/src/components/mobile/MobileForms.js (+2 -1)
➕ packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx (+87 -0)
📝 packages/desktop-client/src/components/schedules/StatusBadge.tsx (+8 -1)
📝 packages/desktop-client/src/components/transactions/MobileTransaction.js (+112 -53)
📝 packages/desktop-client/src/components/transactions/TransactionList.js (+1 -0)
📝 packages/desktop-client/src/components/transactions/TransactionsTable.js (+82 -36)
➕ packages/desktop-client/src/icons/v2/LockClosed.tsx (+19 -0)
📝 packages/desktop-client/src/icons/v2/index.ts (+1 -0)
➕ packages/desktop-client/src/icons/v2/lock-closed.svg (+1 -0)
➕ packages/loot-core/migrations/1697046240000_add_reconciled.sql (+5 -0)
📝 packages/loot-core/src/server/__snapshots__/main.test.ts.snap (+7 -5)
📝 packages/loot-core/src/server/accounts/__snapshots__/parse-file.test.ts.snap (+40 -0)
📝 packages/loot-core/src/server/accounts/__snapshots__/sync.test.ts.snap (+143 -38)
📝 packages/loot-core/src/server/accounts/__snapshots__/transfer.test.ts.snap (+57 -40)
📝 packages/loot-core/src/server/aql/schema/index.ts (+1 -0)
📝 packages/loot-core/src/types/models/transaction.d.ts (+1 -0)
➕ upcoming-release-notes/1789.md (+6 -0)

📄 Description

Reconciliation now locks cleared transactions to address this feature request.

  • Reconciling with correct amount locks all cleared (non-reconciled) transactions.
  • Reconciling with adjustment locks all cleared (non-reconciled) transactions and the adjustment transaction.
  • Reconciled transactions now show a "lock".
  • Clicking on the "lock" doesn't change anything.
  • Inline edits to certain fields (payee & amount) result in a warning before saving.
  • Bulk edits to certain fields (payee & amount) results in a warning if a reconciled transaction is involved.
  • Bulk deletes results in a warning if a reconciled transaction is involved.
  • Bulk duplicate actions results in a warning if a reconciled transaction is involved.
  • Saving changes on mobile results in a warning for a reconciled transaction.
  • Deleting a reconciled transaction on mobile results in a warning.
  • Ability to toggle cleared removed on mobile after reconciled (button is inactive and title is changed).
Screenshot 2023-10-12 at 3 55 35 PM

Simulator Screenshot - iPhone 14 Pro Max - 2023-10-12 at 15 55 48

🔄 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/1789 **Author:** [@zachwhelchel](https://github.com/zachwhelchel) **Created:** 10/12/2023 **Status:** ✅ Merged **Merged:** 11/22/2023 **Merged by:** [@MatissJanis](https://github.com/MatissJanis) **Base:** `master` ← **Head:** `zach/lock-transactions` --- ### 📝 Commits (10+) - [`84eb1e9`](https://github.com/actualbudget/actual/commit/84eb1e91d49b458ee7f284a22aa880b679d00f21) Initial work for locking transactions. - [`3094f66`](https://github.com/actualbudget/actual/commit/3094f665f75ea2824e3afdb4fea32371efd2c3c1) Changed language for test. - [`c6bb9a2`](https://github.com/actualbudget/actual/commit/c6bb9a239fb7a967592df3f7d2ec88a701aaa5f8) Merge branch 'actualbudget:master' into master - [`9accd18`](https://github.com/actualbudget/actual/commit/9accd18aa19d5fa6dca51b7630d9624d241a7a00) Merge branch 'zach/lock-transactions' into master - [`5040c80`](https://github.com/actualbudget/actual/commit/5040c80e817ff56737f07b3a78f83f7a4422b81d) Merge pull request #1 from zachwhelchel/master - [`55fd5e6`](https://github.com/actualbudget/actual/commit/55fd5e6a90f8823eb7e292451611837fa8bf8646) Locked transactions on web working. - [`171d21a`](https://github.com/actualbudget/actual/commit/171d21a08d7dfa29783afa7fca7adff0888c043d) Locked transactions working on mobile. - [`690e934`](https://github.com/actualbudget/actual/commit/690e934f50237905533379ed0f79cc1a2a9a0e89) Cleaned up confirm language for various cases when editing reconciled transactions. - [`44590f7`](https://github.com/actualbudget/actual/commit/44590f750976ece571eb588f28c35cb9b154cfa0) Scope calls to correct account. - [`da7af9d`](https://github.com/actualbudget/actual/commit/da7af9d06e201627437e7f90eabf98f6f4a8dfef) Clean up for locked transactions PR. ### 📊 Changes **19 files changed** (+757 additions, -228 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/src/components/Modals.tsx` (+10 -0) 📝 `packages/desktop-client/src/components/accounts/Account.js` (+174 -54) 📝 `packages/desktop-client/src/components/mobile/MobileForms.js` (+2 -1) ➕ `packages/desktop-client/src/components/modals/ConfirmTransactionEdit.tsx` (+87 -0) 📝 `packages/desktop-client/src/components/schedules/StatusBadge.tsx` (+8 -1) 📝 `packages/desktop-client/src/components/transactions/MobileTransaction.js` (+112 -53) 📝 `packages/desktop-client/src/components/transactions/TransactionList.js` (+1 -0) 📝 `packages/desktop-client/src/components/transactions/TransactionsTable.js` (+82 -36) ➕ `packages/desktop-client/src/icons/v2/LockClosed.tsx` (+19 -0) 📝 `packages/desktop-client/src/icons/v2/index.ts` (+1 -0) ➕ `packages/desktop-client/src/icons/v2/lock-closed.svg` (+1 -0) ➕ `packages/loot-core/migrations/1697046240000_add_reconciled.sql` (+5 -0) 📝 `packages/loot-core/src/server/__snapshots__/main.test.ts.snap` (+7 -5) 📝 `packages/loot-core/src/server/accounts/__snapshots__/parse-file.test.ts.snap` (+40 -0) 📝 `packages/loot-core/src/server/accounts/__snapshots__/sync.test.ts.snap` (+143 -38) 📝 `packages/loot-core/src/server/accounts/__snapshots__/transfer.test.ts.snap` (+57 -40) 📝 `packages/loot-core/src/server/aql/schema/index.ts` (+1 -0) 📝 `packages/loot-core/src/types/models/transaction.d.ts` (+1 -0) ➕ `upcoming-release-notes/1789.md` (+6 -0) </details> ### 📄 Description Reconciliation now locks cleared transactions to address this [feature request](https://github.com/actualbudget/actual/issues/558). - Reconciling with correct amount locks all cleared (non-reconciled) transactions. - Reconciling with adjustment locks all cleared (non-reconciled) transactions and the adjustment transaction. - Reconciled transactions now show a "lock". - Clicking on the "lock" doesn't change anything. - Inline edits to certain fields (payee & amount) result in a warning before saving. - Bulk edits to certain fields (payee & amount) results in a warning if a reconciled transaction is involved. - Bulk deletes results in a warning if a reconciled transaction is involved. - Bulk duplicate actions results in a warning if a reconciled transaction is involved. - Saving changes on mobile results in a warning for a reconciled transaction. - Deleting a reconciled transaction on mobile results in a warning. - Ability to toggle cleared removed on mobile after reconciled (button is inactive and title is changed). <img width="1420" alt="Screenshot 2023-10-12 at 3 55 35 PM" src="https://github.com/actualbudget/actual/assets/869446/2ed902d7-0922-41d2-91b5-db431e25df4a"> ![Simulator Screenshot - iPhone 14 Pro Max - 2023-10-12 at 15 55 48](https://github.com/actualbudget/actual/assets/869446/8e731602-366b-4b2e-ba39-dbcadb5ddbee) --- <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-02-28 20:49:27 -06: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#3959
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?