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

---
 apps/client/src/app/app.component.ts           |  5 ++++-
 .../activities/activities-page.component.ts    | 18 +++++-------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/apps/client/src/app/app.component.ts b/apps/client/src/app/app.component.ts
index ff67daf5e6..fd17bcd6ec 100644
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@@ -135,7 +135,10 @@ export class GfAppComponent implements OnInit {
               this.currentSubRoute ===
                 internalRoutes.home.subRoutes?.holdings.path) ||
             (this.currentRoute === internalRoutes.portfolio.path &&
-              !this.currentSubRoute)) &&
+              !this.currentSubRoute) ||
+            (this.currentRoute === internalRoutes.portfolio.path &&
+              this.currentSubRoute ===
+                internalRoutes.portfolio.subRoutes?.activities.path)) &&
           this.user?.settings?.viewMode !== 'ZEN'
         ) {
           this.hasPermissionToChangeDateRange = true;
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 21704ffaf7..ed9cb9490e 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
@@ -10,7 +10,6 @@ import {
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { internalRoutes } from '@ghostfolio/common/routes/routes';
-import { DateRange } from '@ghostfolio/common/types';
 import { GfActivitiesTableComponent } from '@ghostfolio/ui/activities-table';
 import { GfFabComponent } from '@ghostfolio/ui/fab';
 import { DataService } from '@ghostfolio/ui/services';
@@ -124,7 +123,7 @@ export class GfActivitiesPageComponent implements OnInit {
           ? this.activityTypesFilter
           : undefined,
         filters: this.userService.getFilters(),
-        range: this.getCalendarYearRange()
+        range: this.getDateRange()
       })
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe(() => {
@@ -287,7 +286,7 @@ export class GfActivitiesPageComponent implements OnInit {
           ? this.activityTypesFilter
           : undefined,
         filters: this.userService.getFilters(),
-        range: this.getCalendarYearRange(),
+        range: this.getDateRange(),
         skip: this.pageIndex * this.pageSize,
         sortColumn: this.sortColumn,
         sortDirection: this.sortDirection,
@@ -312,18 +311,11 @@ export class GfActivitiesPageComponent implements OnInit {
       });
   }
 
-  private getCalendarYearRange() {
+  private getDateRange() {
     const dateRange = this.user?.settings?.dateRange;
 
-    return this.isCalendarYear(dateRange) ? dateRange : undefined;
-  }
-
-  private isCalendarYear(dateRange?: DateRange) {
-    if (!dateRange) {
-      return false;
-    }
-
-    return /^\d{4}$/.test(dateRange);
+    // Omit 'max' as it would exclude drafts, which are dated in the future
+    return dateRange === 'max' ? undefined : dateRange;
   }
 
   private updateUser(aUser: User) {