Merge branch 'master' into colorsCleanup

actualbudget · Nov 8, 2023 · 287a5c0 · 287a5c0
2 parents c0c1625 + 1c68c3f
commit 287a5c0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/packages/loot-core/src/client/queries.ts b/packages/loot-core/src/client/queries.ts
@@ -14,13 +14,17 @@ export function getAccountFilter(accountId, field = 'account') {
   if (accountId) {
     if (accountId === 'budgeted') {
       return {
-        [`${field}.offbudget`]: false,
-        [`${field}.closed`]: false,
+        $and: [
+          { [`${field}.offbudget`]: false },
+          { [`${field}.closed`]: false },
+        ],
       };
     } else if (accountId === 'offbudget') {
       return {
-        [`${field}.offbudget`]: true,
-        [`${field}.closed`]: false,
+        $and: [
+          { [`${field}.offbudget`]: true },
+          { [`${field}.closed`]: false },
+        ],
       };
     } else if (accountId === 'uncategorized') {
       return {

diff --git a/upcoming-release-notes/1867.md b/upcoming-release-notes/1867.md
@@ -0,0 +1,6 @@
+---
+category: Bugfix
+authors: [sreetamdas]
+---
+
+Fix account filter for budgeted and offbudget accounts, fixes #1577