From 406eeaf7a738ca8fc0fc2bf9367ad6e4db7eae77 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 3 Apr 2026 09:30:43 +0200
Subject: [PATCH] Refactoring

---
 apps/api/src/app/export/export.service.ts                  | 2 +-
 .../portfolio/activities/activities-page.component.ts      | 4 ++--
 .../lib/activities-table/activities-table.component.html   | 2 +-
 .../src/lib/activities-table/activities-table.component.ts | 7 +++++--
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/apps/api/src/app/export/export.service.ts b/apps/api/src/app/export/export.service.ts
index 267adcd37..4da942cd7 100644
--- a/apps/api/src/app/export/export.service.ts
+++ b/apps/api/src/app/export/export.service.ts
@@ -43,10 +43,10 @@ export class ExportService {
     let { activities } = await this.activitiesService.getActivities({
       filters,
       userId,
-      types: activityTypes,
       includeDrafts: true,
       sortColumn: 'date',
       sortDirection: 'asc',
+      types: activityTypes,
       userCurrency: userSettings?.baseCurrency,
       withExcludedAccountsAndActivities: 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 4c1d26b70..faadef54f 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
@@ -327,8 +327,8 @@ export class GfActivitiesPageComponent implements OnInit {
     this.fetchActivities();
   }
 
-  public onTypesFilterChanged(types: string[]) {
-    this.activityTypesFilter = types;
+  public onTypesFilterChanged(aTypes: string[]) {
+    this.activityTypesFilter = aTypes;
     this.pageIndex = 0;
 
     this.fetchActivities();
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.html b/libs/ui/src/lib/activities-table/activities-table.component.html
index 18a78cef4..b8fe962d7 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -5,7 +5,7 @@
         <mat-label i18n>Type</mat-label>
         <mat-select multiple [formControl]="typesFilter">
           @for (
-            activityType of activityTypes | keyvalue;
+            activityType of activityTypesTranslationMap | keyvalue;
             track activityType.key
           ) {
             <mat-option [value]="activityType.key">
diff --git a/libs/ui/src/lib/activities-table/activities-table.component.ts b/libs/ui/src/lib/activities-table/activities-table.component.ts
index 2c5c08976..4d88960b9 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -139,7 +139,7 @@ export class GfActivitiesTableComponent
   @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
-  public readonly activityTypes = new Map<ActivityType, string>();
+  public activityTypesTranslationMap = new Map<ActivityType, string>();
   public hasDrafts = false;
   public hasErrors = false;
   public isUUID = isUUID;
@@ -202,7 +202,10 @@ export class GfActivitiesTableComponent
 
   public constructor() {
     for (const type of Object.keys(ActivityType) as ActivityType[]) {
-      this.activityTypes.set(ActivityType[type], translate(ActivityType[type]));
+      this.activityTypesTranslationMap.set(
+        ActivityType[type],
+        translate(ActivityType[type])
+      );
     }
 
     addIcons({