github-starred/actual
2
0
Fork 0
mirror of https://github.com/actualbudget/actual.git synced 2026-07-15 22:54:03 -05:00
Code Issues 3.0k Packages Projects Releases 58 Wiki Activity

[PR #7057] [MERGED] Fix skipping schedules that move before weekend #37104

New Issue
Closed
opened 2026-04-20 23:54:22 -05:00 by GiteaMirror · 0 comments
GiteaMirror commented 2026-04-20 23:54:22 -05:00
Owner
Copy Link

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/7057
Author: @Triscal
Created: 2/23/2026
Status: ✅ Merged
Merged: 3/4/2026
Merged by: @youngcw

Base: master ← Head: fix-before-weekend-skip

📝 Commits (10+)

  • 27e00aa Pushing before weekend to Monday
  • d512741 release notes
  • 5962ca5 lint
  • e9d52b4 Guard against null
  • 855050c fixing AI commit and addressing second comment
  • ff46be1 addressing nitpicks
  • 8dffc5e Merge branch 'master' into fix-before-weekend-skip
  • cb97c34 first attempt at a test
  • ffbc210 [autofix.ci] apply automated fixes
  • 284859a refactor to use condition and fix tests

📊 Changes

3 files changed (+146 additions, -2 deletions)

View changed files

📝 packages/loot-core/src/server/schedules/app.test.ts (+119 -0)
📝 packages/loot-core/src/server/schedules/app.ts (+21 -2)
➕ upcoming-release-notes/7057.md (+6 -0)

📄 Description

Description

In short the current logic moves the day forward by one, but then during the getDateWithSkippedWeekend function if it is a move before weekend schedule the date is pushed back to Friday. Then causing the resulting setNextDate to do nothing, since the two dates are the same. Example:

  1. Scheduled date is supposed to be 15th, but this month 15th is Saturday, schedule is set to move before weekend. So schedule date is 14th.
  2. User wants to skip the occurrence. So the hit skip button.
  3. The skip function adds one day, pushing the 14th to the 15th. Pushing the date back to Saturday the 15th.
  4. When looking for future or activate occurrences, the next one is the current one (because the 15th matches the 15th
  5. Then to ensure the new next date follows the move before weekend the date is moved back to the 14th (because the 15th is a Saturday).
  6. Lastly during the comparison of the processed date and the current schedule date both values are the same so the schedule isn't skipped.

The fix leaves the original behaviour for all schedules except ones that move before the weekend and only when coming from the skip path. It pushes the days past the weekend, so when looking for future occurrences it doesn't find itself.

Related issue(s)

Fixes #6270

Testing

Reproduction steps are in issue#6270. In short make a repeating schedule that moves days before the weekend and then try to skip that schedule it fails on master but succeeds here.

I also added some tests to ensure skipping works properly, so you could copy just the test changes to validate the failures on main.

Test File:
schedule-skipping-before-weekend-test.zip

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 27 14.85 MB 0%
loot-core 1 5.82 MB → 5.82 MB (+1.08 kB) +0.02%
api 1 4.43 MB → 4.43 MB (+957 B) +0.02%
View detailed bundle stats

desktop-client

Total

Files count Total bundle size % Changed
27 14.85 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
static/js/index.js 9.54 MB 0%
static/js/indexeddb-main-thread-worker-e59fee74.js 12.94 kB 0%
static/js/workbox-window.prod.es5.js 5.64 kB 0%
static/js/ca.js 188.15 kB 0%
static/js/da.js 106.35 kB 0%
static/js/de.js 180.07 kB 0%
static/js/en-GB.js 7.18 kB 0%
static/js/en.js 170.37 kB 0%
static/js/es.js 174.55 kB 0%
static/js/fr.js 179.6 kB 0%
static/js/it.js 171.16 kB 0%
static/js/nb-NO.js 156.96 kB 0%
static/js/nl.js 106.37 kB 0%
static/js/pl.js 88.37 kB 0%
static/js/pt-BR.js 154.22 kB 0%
static/js/th.js 181.87 kB 0%
static/js/uk.js 214.74 kB 0%
static/js/resize-observer.js 18.37 kB 0%
static/js/BackgroundImage.js 120.54 kB 0%
static/js/ReportRouter.js 1.16 MB 0%
static/js/narrow.js 637.77 kB 0%
static/js/TransactionList.js 106.22 kB 0%
static/js/wide.js 164.15 kB 0%
static/js/AppliedFilters.js 9.71 kB 0%
static/js/usePayeeRuleCounts.js 10.04 kB 0%
static/js/useTransactionBatchActions.js 13.23 kB 0%
static/js/FormulaEditor.js 1.04 MB 0%

loot-core

Total

Files count Total bundle size % Changed
1 5.82 MB → 5.82 MB (+1.08 kB) +0.02%
Changeset
File Δ Size
node_modules/date-fns/isFriday.js 🆕 +603 B 0 B → 603 B
home/runner/work/actual/actual/packages/loot-core/src/server/schedules/app.ts 📈 +498 B (+3.83%) 12.71 kB → 13.19 kB
View detailed bundle breakdown

Added

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

Removed

Asset File Size % Changed
kcab.worker.BwrdDDMW.js 5.82 MB → 0 B (-5.82 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
1 4.43 MB → 4.43 MB (+957 B) +0.02%
Changeset
File Δ Size
node_modules/date-fns/isFriday.js 🆕 +507 B 0 B → 507 B
src/server/schedules/app.ts 📈 +450 B (+4.00%) 11 kB → 11.44 kB
View detailed bundle breakdown

Added
No assets were added

Removed
No assets were removed

Bigger

Asset File Size % Changed
bundle.api.js 4.43 MB → 4.43 MB (+957 B) +0.02%

Smaller
No assets were smaller

Unchanged
No assets were unchanged

🔄 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/7057 **Author:** [@Triscal](https://github.com/Triscal) **Created:** 2/23/2026 **Status:** ✅ Merged **Merged:** 3/4/2026 **Merged by:** [@youngcw](https://github.com/youngcw) **Base:** `master` ← **Head:** `fix-before-weekend-skip` --- ### 📝 Commits (10+) - [`27e00aa`](https://github.com/actualbudget/actual/commit/27e00aa51d38f80c13d53b53aea3ae47c93b1f79) Pushing before weekend to Monday - [`d512741`](https://github.com/actualbudget/actual/commit/d512741785333b7c2bf1c47f37f9b5d400a9b5df) release notes - [`5962ca5`](https://github.com/actualbudget/actual/commit/5962ca5a7a275cb36863b2562ce992578cedb9e6) lint - [`e9d52b4`](https://github.com/actualbudget/actual/commit/e9d52b440c7c8128df7e924e012eafb14aa7a1d3) Guard against null - [`855050c`](https://github.com/actualbudget/actual/commit/855050c003825742cb151b37cce5f93c93e970db) fixing AI commit and addressing second comment - [`ff46be1`](https://github.com/actualbudget/actual/commit/ff46be123e880fa1f67027fa91a8bb96bd8ef96b) addressing nitpicks - [`8dffc5e`](https://github.com/actualbudget/actual/commit/8dffc5ec78cb28acebdfeab2fa06b5bc5f7bc9a0) Merge branch 'master' into fix-before-weekend-skip - [`cb97c34`](https://github.com/actualbudget/actual/commit/cb97c34ce32e5b560601fbef70da4aac47108068) first attempt at a test - [`ffbc210`](https://github.com/actualbudget/actual/commit/ffbc210d9baf6433344ed57832e9d70d706c27c6) [autofix.ci] apply automated fixes - [`284859a`](https://github.com/actualbudget/actual/commit/284859afc2c3349498bfc9f5937e94daa41c5ef5) refactor to use condition and fix tests ### 📊 Changes **3 files changed** (+146 additions, -2 deletions) <details> <summary>View changed files</summary> 📝 `packages/loot-core/src/server/schedules/app.test.ts` (+119 -0) 📝 `packages/loot-core/src/server/schedules/app.ts` (+21 -2) ➕ `upcoming-release-notes/7057.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 In short the current logic moves the day forward by one, but then during the getDateWithSkippedWeekend function if it is a move before weekend schedule the date is pushed back to Friday. Then causing the resulting setNextDate to do nothing, since the two dates are the same. Example: 1. Scheduled date is supposed to be 15th, but this month 15th is Saturday, schedule is set to move before weekend. So schedule date is 14th. 2. User wants to skip the occurrence. So the hit skip button. 3. The [skip function adds one day, pushing the 14th to the 15th](https://github.com/actualbudget/actual/blob/master/packages/loot-core/src/server/schedules/app.ts#L331). Pushing the date back to Saturday the 15th. 4. When [looking for future or activate occurrences, the next one is the current one (because the 15th matches the 15th](https://github.com/actualbudget/actual/blob/master/packages/loot-core/src/shared/schedules.ts#L358) 5. Then to ensure the `new next` date follows the move before weekend the [date is moved back to the 14th (because the 15th is a Saturday)](https://github.com/actualbudget/actual/blob/master/packages/loot-core/src/shared/schedules.ts#L388). 6. Lastly [during the comparison of the `processed date` and the `current schedule date`](https://github.com/actualbudget/actual/blob/master/packages/loot-core/src/server/schedules/app.ts#L141) both values are the same so the schedule isn't skipped. The fix leaves the original behaviour for all schedules except ones that move before the weekend and only when coming from the skip path. It pushes the days past the weekend, so when looking for future occurrences it doesn't find itself. ## Related issue(s) Fixes #6270 ## Testing Reproduction steps are in [issue#6270](https://github.com/actualbudget/actual/issues/6270). In short make a repeating schedule that moves days before the weekend and then try to skip that schedule it fails on master but succeeds here. I also added some tests to ensure skipping works properly, so you could copy just the test changes to validate the failures on main. Test File: [schedule-skipping-before-weekend-test.zip](https://github.com/user-attachments/files/25475822/schedule-skipping-before-weekend-test.zip) ## 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 | 27 | 14.85 MB | 0% loot-core | 1 | 5.82 MB → 5.82 MB (+1.08 kB) | +0.02% api | 1 | 4.43 MB → 4.43 MB (+957 B) | +0.02% <details> <summary>View detailed bundle stats</summary> #### desktop-client **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 27 | 14.85 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 ----- | --------- | --------- static/js/index.js | 9.54 MB | 0% static/js/indexeddb-main-thread-worker-e59fee74.js | 12.94 kB | 0% static/js/workbox-window.prod.es5.js | 5.64 kB | 0% static/js/ca.js | 188.15 kB | 0% static/js/da.js | 106.35 kB | 0% static/js/de.js | 180.07 kB | 0% static/js/en-GB.js | 7.18 kB | 0% static/js/en.js | 170.37 kB | 0% static/js/es.js | 174.55 kB | 0% static/js/fr.js | 179.6 kB | 0% static/js/it.js | 171.16 kB | 0% static/js/nb-NO.js | 156.96 kB | 0% static/js/nl.js | 106.37 kB | 0% static/js/pl.js | 88.37 kB | 0% static/js/pt-BR.js | 154.22 kB | 0% static/js/th.js | 181.87 kB | 0% static/js/uk.js | 214.74 kB | 0% static/js/resize-observer.js | 18.37 kB | 0% static/js/BackgroundImage.js | 120.54 kB | 0% static/js/ReportRouter.js | 1.16 MB | 0% static/js/narrow.js | 637.77 kB | 0% static/js/TransactionList.js | 106.22 kB | 0% static/js/wide.js | 164.15 kB | 0% static/js/AppliedFilters.js | 9.71 kB | 0% static/js/usePayeeRuleCounts.js | 10.04 kB | 0% static/js/useTransactionBatchActions.js | 13.23 kB | 0% static/js/FormulaEditor.js | 1.04 MB | 0% </div> </details> --- #### loot-core **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 5.82 MB → 5.82 MB (+1.08 kB) | +0.02% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `node_modules/date-fns/isFriday.js` | 🆕 +603 B | 0 B → 603 B `home/runner/work/actual/actual/packages/loot-core/src/server/schedules/app.ts` | 📈 +498 B (+3.83%) | 12.71 kB → 13.19 kB </details> <details> <summary>View detailed bundle breakdown</summary> <div> **Added** Asset | File Size | % Changed ----- | --------- | --------- kcab.worker.Di5cUOmw.js | 0 B → 5.82 MB (+5.82 MB) | - **Removed** Asset | File Size | % Changed ----- | --------- | --------- kcab.worker.BwrdDDMW.js | 5.82 MB → 0 B (-5.82 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 ----------- | ----------------- | --------- 1 | 4.43 MB → 4.43 MB (+957 B) | +0.02% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `node_modules/date-fns/isFriday.js` | 🆕 +507 B | 0 B → 507 B `src/server/schedules/app.ts` | 📈 +450 B (+4.00%) | 11 kB → 11.44 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 ----- | --------- | --------- bundle.api.js | 4.43 MB → 4.43 MB (+957 B) | +0.02% **Smaller** No assets were smaller **Unchanged** No assets were unchanged </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-04-20 23:54:22 -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
tech-support
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#37104
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?