[PR #6925] [MERGED] fix(schedules): prevent past missed schedule dates from being marked as upcoming #37016

Closed
opened 2026-04-20 23:50:12 -05:00 by GiteaMirror · 0 comments
Owner

📋 Pull Request Information

Original PR: https://github.com/actualbudget/actual/pull/6925
Author: @rznn7
Created: 2/10/2026
Status: Merged
Merged: 2/11/2026
Merged by: @matt-fidd

Base: masterHead: fix/6872-upcoming-status-not-updated-multiple-missed


📝 Commits (1)

  • 83039ab fix(schedules): prevent past missed schedule dates from being marked as upcoming

📊 Changes

12 files changed (+237 additions, -103 deletions)

View changed files

📝 packages/desktop-client/src/components/mobile/schedules/SchedulesList.tsx (+1 -1)
📝 packages/desktop-client/src/components/mobile/schedules/SchedulesListItem.tsx (+1 -1)
📝 packages/desktop-client/src/components/rules/RuleEditor.tsx (+1 -1)
📝 packages/desktop-client/src/components/schedules/SchedulesTable.tsx (+4 -5)
📝 packages/desktop-client/src/components/schedules/StatusBadge.tsx (+1 -2)
📝 packages/desktop-client/src/hooks/useCategoryScheduleGoalTemplateIndicator.ts (+1 -1)
📝 packages/desktop-client/src/hooks/useCategoryScheduleGoalTemplates.ts (+2 -1)
📝 packages/desktop-client/src/hooks/usePreviewTransactions.ts (+6 -88)
📝 packages/desktop-client/src/hooks/useSchedules.ts (+1 -3)
📝 packages/loot-core/src/shared/schedules.test.ts (+123 -0)
📝 packages/loot-core/src/shared/schedules.ts (+90 -0)
upcoming-release-notes/6925.md (+6 -0)

📄 Description

Fixes a bug where past missed recurring schedule dates were incorrectly shown as "upcoming" in preview transactions. Added a date check so only future dates can be forced to upcoming status.

Also moved the preview transaction logic from usePreviewTransactions into a shared computeSchedulePreviewTransactions function in loot-core so it can be tested, and added tests for the forceUpcoming flag behavior.

Fixes #6872.


Bundle Stats

Bundle Files count Total bundle size % Changed
desktop-client 27 14.64 MB → 14.64 MB (+70 B) +0.00%
loot-core 1 5.86 MB 0%
api 1 4.39 MB 0%
View detailed bundle stats

desktop-client

Total

Files count Total bundle size % Changed
27 14.64 MB → 14.64 MB (+70 B) +0.00%
Changeset
File Δ Size
home/runner/work/actual/actual/packages/loot-core/src/shared/schedules.ts 📈 +1.81 kB (+17.43%) 10.4 kB → 12.22 kB
src/hooks/usePreviewTransactions.ts 📉 -1.75 kB (-37.13%) 4.7 kB → 2.96 kB
View detailed bundle breakdown

Added
No assets were added

Removed
No assets were removed

Bigger

Asset File Size % Changed
static/js/index.js 9.48 MB → 9.48 MB (+1.81 kB) +0.02%

Smaller

Asset File Size % Changed
static/js/usePayeeRuleCounts.js 11.79 kB → 10.05 kB (-1.75 kB) -14.80%

Unchanged

Asset File Size % Changed
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/da.js 106.62 kB 0%
static/js/de.js 178.39 kB 0%
static/js/en-GB.js 7.18 kB 0%
static/js/en.js 164.55 kB 0%
static/js/es.js 173.83 kB 0%
static/js/fr.js 179.62 kB 0%
static/js/it.js 171.44 kB 0%
static/js/nb-NO.js 157.23 kB 0%
static/js/nl.js 106.65 kB 0%
static/js/pl.js 88.64 kB 0%
static/js/pt-BR.js 154.57 kB 0%
static/js/sv.js 78.2 kB 0%
static/js/th.js 182.35 kB 0%
static/js/uk.js 215.11 kB 0%
static/js/resize-observer.js 18.37 kB 0%
static/js/BackgroundImage.js 120.54 kB 0%
static/js/ReportRouter.js 1.12 MB 0%
static/js/narrow.js 640.46 kB 0%
static/js/TransactionList.js 105.97 kB 0%
static/js/wide.js 160.07 kB 0%
static/js/AppliedFilters.js 9.71 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.86 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
kcab.worker.BmGAOUic.js 5.86 MB 0%

api

Total

Files count Total bundle size % Changed
1 4.39 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
bundle.api.js 4.39 MB 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/6925 **Author:** [@rznn7](https://github.com/rznn7) **Created:** 2/10/2026 **Status:** ✅ Merged **Merged:** 2/11/2026 **Merged by:** [@matt-fidd](https://github.com/matt-fidd) **Base:** `master` ← **Head:** `fix/6872-upcoming-status-not-updated-multiple-missed` --- ### 📝 Commits (1) - [`83039ab`](https://github.com/actualbudget/actual/commit/83039ab93d267b0e639143d23a0f8b9698280bfd) fix(schedules): prevent past missed schedule dates from being marked as upcoming ### 📊 Changes **12 files changed** (+237 additions, -103 deletions) <details> <summary>View changed files</summary> 📝 `packages/desktop-client/src/components/mobile/schedules/SchedulesList.tsx` (+1 -1) 📝 `packages/desktop-client/src/components/mobile/schedules/SchedulesListItem.tsx` (+1 -1) 📝 `packages/desktop-client/src/components/rules/RuleEditor.tsx` (+1 -1) 📝 `packages/desktop-client/src/components/schedules/SchedulesTable.tsx` (+4 -5) 📝 `packages/desktop-client/src/components/schedules/StatusBadge.tsx` (+1 -2) 📝 `packages/desktop-client/src/hooks/useCategoryScheduleGoalTemplateIndicator.ts` (+1 -1) 📝 `packages/desktop-client/src/hooks/useCategoryScheduleGoalTemplates.ts` (+2 -1) 📝 `packages/desktop-client/src/hooks/usePreviewTransactions.ts` (+6 -88) 📝 `packages/desktop-client/src/hooks/useSchedules.ts` (+1 -3) 📝 `packages/loot-core/src/shared/schedules.test.ts` (+123 -0) 📝 `packages/loot-core/src/shared/schedules.ts` (+90 -0) ➕ `upcoming-release-notes/6925.md` (+6 -0) </details> ### 📄 Description Fixes a bug where past missed recurring schedule dates were incorrectly shown as "upcoming" in preview transactions. Added a date check so only future dates can be forced to upcoming status. Also moved the preview transaction logic from `usePreviewTransactions` into a shared `computeSchedulePreviewTransactions` function in loot-core so it can be tested, and added tests for the `forceUpcoming` flag behavior. Fixes #6872. <!-- 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. --> <!--- actual-bot-sections ---> <hr /> <!--- bundlestats-action-comment key:combined start ---> ### Bundle Stats Bundle | Files count | Total bundle size | % Changed ------ | ----------- | ----------------- | --------- desktop-client | 27 | 14.64 MB → 14.64 MB (+70 B) | +0.00% loot-core | 1 | 5.86 MB | 0% api | 1 | 4.39 MB | 0% <details> <summary>View detailed bundle stats</summary> #### desktop-client **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 27 | 14.64 MB → 14.64 MB (+70 B) | +0.00% <details> <summary>Changeset</summary> File | Δ | Size ---- | - | ---- `home/runner/work/actual/actual/packages/loot-core/src/shared/schedules.ts` | 📈 +1.81 kB (+17.43%) | 10.4 kB → 12.22 kB `src/hooks/usePreviewTransactions.ts` | 📉 -1.75 kB (-37.13%) | 4.7 kB → 2.96 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 ----- | --------- | --------- static/js/index.js | 9.48 MB → 9.48 MB (+1.81 kB) | +0.02% **Smaller** Asset | File Size | % Changed ----- | --------- | --------- static/js/usePayeeRuleCounts.js | 11.79 kB → 10.05 kB (-1.75 kB) | -14.80% **Unchanged** Asset | File Size | % Changed ----- | --------- | --------- 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/da.js | 106.62 kB | 0% static/js/de.js | 178.39 kB | 0% static/js/en-GB.js | 7.18 kB | 0% static/js/en.js | 164.55 kB | 0% static/js/es.js | 173.83 kB | 0% static/js/fr.js | 179.62 kB | 0% static/js/it.js | 171.44 kB | 0% static/js/nb-NO.js | 157.23 kB | 0% static/js/nl.js | 106.65 kB | 0% static/js/pl.js | 88.64 kB | 0% static/js/pt-BR.js | 154.57 kB | 0% static/js/sv.js | 78.2 kB | 0% static/js/th.js | 182.35 kB | 0% static/js/uk.js | 215.11 kB | 0% static/js/resize-observer.js | 18.37 kB | 0% static/js/BackgroundImage.js | 120.54 kB | 0% static/js/ReportRouter.js | 1.12 MB | 0% static/js/narrow.js | 640.46 kB | 0% static/js/TransactionList.js | 105.97 kB | 0% static/js/wide.js | 160.07 kB | 0% static/js/AppliedFilters.js | 9.71 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.86 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 ----- | --------- | --------- kcab.worker.BmGAOUic.js | 5.86 MB | 0% </div> </details> --- #### api **Total** Files count | Total bundle size | % Changed ----------- | ----------------- | --------- 1 | 4.39 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 ----- | --------- | --------- bundle.api.js | 4.39 MB | 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-04-20 23:50:12 -05:00
Sign in to join this conversation.
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: github-starred/actual#37016