Append note tag filters

actualbudget · Apr 29, 2024 · 6f1b66f · 6f1b66f
1 parent eea961a
commit 6f1b66f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/packages/desktop-client/src/components/accounts/Account.jsx b/packages/desktop-client/src/components/accounts/Account.jsx
@@ -1304,7 +1304,7 @@ class AccountInternal extends PureComponent {
     }
   };
 
-  applyFilters = async conditions => {
+  applyFilters = async (conditions, append = false) => {
     if (conditions.length > 0) {
       const customQueryFilters = conditions
         .filter(cond => !!cond.customName)
@@ -1320,9 +1320,16 @@ class AccountInternal extends PureComponent {
         [conditionsOpKey]: [...queryFilters, ...customQueryFilters],
       });
 
-      this.setState({ filterConditions: conditions }, () => {
-        this.updateQuery(this.currentQuery, true);
-      });
+      this.setState(
+        prevState => ({
+          filterConditions: append
+            ? [...prevState.filterConditions, ...conditions]
+            : conditions,
+        }),
+        () => {
+          this.updateQuery(this.currentQuery, true);
+        },
+      );
     } else {
       this.setState(
         {
@@ -1652,7 +1659,7 @@ class AccountInternal extends PureComponent {
                     this.setState({ isAdding: false })
                   }
                   onCreatePayee={this.onCreatePayee}
-                  onApplyFilters={conditions => this.applyFilters(conditions)}
+                  onApplyFilters={this.applyFilters}
                 />
               </View>
             </View>

diff --git a/packages/desktop-client/src/components/transactions/TransactionList.jsx b/packages/desktop-client/src/components/transactions/TransactionList.jsx
@@ -171,7 +171,7 @@ export function TransactionList({
     const filterConditions = [
       { field: 'notes', op: 'contains', value: noteTag, type: 'string' },
     ];
-    onApplyFilters(filterConditions);
+    onApplyFilters(filterConditions, true);
   });
 
   return (