From 8dacac702e25dc143a52098210b49c20741348be Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 31 Jul 2026 20:37:43 +0200
Subject: [PATCH] Respect activity type and date range filter

---
 .../portfolio/activities/activities-page.component.ts    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
index 05119bf088..edf380df9f 100644
--- a/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/activities/activities-page.component.ts
@@ -316,8 +316,13 @@ export class GfActivitiesPageComponent implements OnInit {
   private getDateRange() {
     const dateRange = this.user?.settings?.dateRange;
 
-    // Omit 'max' as it would exclude drafts, which are dated in the future
-    return dateRange === 'max' ? undefined : dateRange;
+    // Omit the date ranges which do not apply to activities: '1d' spans today
+    // only, while 'max' would exclude drafts, which are dated in the future
+    if (!dateRange || ['1d', 'max'].includes(dateRange)) {
+      return undefined;
+    }
+
+    return dateRange;
   }
 
   private updateUser(aUser: User) {