Merge branch 'main' into feat/filter-by-state

Author: setchy

package.json

@@ -181,7 +181,7 @@
     "tailwind-merge": "3.0.2",
     "tailwindcss": "4.0.8",
     "terser-webpack-plugin": "5.3.11",
-    "ts-jest": "29.2.5",
+    "ts-jest": "29.2.6",
     "ts-loader": "9.5.2",
     "ts-node": "10.9.2",
     "typescript": "5.7.3",

pnpm-lock.yaml

@@ -14,23 +14,31 @@ export function filterNotifications(
   settings: SettingsState,
 ): Notification[] {
   return notifications.filter((notification) => {
+    let passesFilters = true;
+
     if (settings.detailedNotifications) {
       if (hasUserTypeFilters(settings)) {
-        return settings.filterUserTypes.some((userType) =>
-          filterNotificationByUserType(notification, userType),
-        );
+        passesFilters =
+          passesFilters &&
+          settings.filterUserTypes.some((userType) =>
+            filterNotificationByUserType(notification, userType),
+          );
       }
 
       if (hasIncludeHandleFilters(settings)) {
-        return settings.filterIncludeHandles.some((handle) =>
-          filterNotificationByHandle(notification, handle),
-        );
+        passesFilters =
+          passesFilters &&
+          settings.filterIncludeHandles.some((handle) =>
+            filterNotificationByHandle(notification, handle),
+          );
       }
 
       if (hasExcludeHandleFilters(settings)) {
-        return !settings.filterExcludeHandles.some((handle) =>
-          filterNotificationByHandle(notification, handle),
-        );
+        passesFilters =
+          passesFilters &&
+          !settings.filterExcludeHandles.some((handle) =>
+            filterNotificationByHandle(notification, handle),
+          );
       }
 
       if (hasStateFilters(settings)) {
@@ -41,12 +49,14 @@ export function filterNotifications(
     }
 
     if (hasReasonFilters(settings)) {
-      return settings.filterReasons.some((reason) =>
-        filterNotificationByReason(notification, reason),
-      );
+      passesFilters =
+        passesFilters &&
+        settings.filterReasons.some((reason) =>
+          filterNotificationByReason(notification, reason),
+        );
     }
 
-    return true;
+    return passesFilters;
   });
 }