From 4081a6f5e54269c43daa942ea57329aef8d70085 Mon Sep 17 00:00:00 2001 From: Matiss Janis Aboltins Date: Sat, 22 Nov 2025 16:20:11 +0000 Subject: [PATCH] Fix typechecker - update mismatched type in DiscoverScheduleEntity (#6227) * Fix typechecker - update mismatched type in DiscoverScheduleEntity * Add merge_group to GitHub Actions workflows for better concurrency management --- .github/workflows/build.yml | 1 + .github/workflows/check.yml | 1 + packages/loot-core/src/types/models/schedule.ts | 2 +- upcoming-release-notes/6227.md | 6 ++++++ 4 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 upcoming-release-notes/6227.md diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 04fa4ec798..2cfe3a4aa8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,6 +12,7 @@ on: branches: - master pull_request: + merge_group: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index b28bc76180..9c32fcbec6 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -5,6 +5,7 @@ on: branches: - master pull_request: + merge_group: concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} diff --git a/packages/loot-core/src/types/models/schedule.ts b/packages/loot-core/src/types/models/schedule.ts index f1a9850421..1c5682d17e 100644 --- a/packages/loot-core/src/types/models/schedule.ts +++ b/packages/loot-core/src/types/models/schedule.ts @@ -43,7 +43,7 @@ export type DiscoverScheduleEntity = { id: ScheduleEntity['id']; account: AccountEntity['id']; payee: PayeeEntity['id']; - date: ScheduleEntity['_date']; + date: RecurConfig; amount: ScheduleEntity['_amount']; _conditions: ScheduleEntity['_conditions']; }; diff --git a/upcoming-release-notes/6227.md b/upcoming-release-notes/6227.md new file mode 100644 index 0000000000..a77fd30af3 --- /dev/null +++ b/upcoming-release-notes/6227.md @@ -0,0 +1,6 @@ +--- +category: Bugfix +authors: [MatissJanis] +--- + +Fix typechecker - update mismatched type