From d1d1192cc39899f37058f4a2d392dc11b8f71778 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 25 Aug 2024 09:20:30 +0200
Subject: [PATCH] Handle activities of excluded accounts

---
 .../activities-table/activities-table.component.html   |  8 +++-----
 .../lib/activities-table/activities-table.component.ts | 10 +++++-----
 2 files changed, 8 insertions(+), 10 deletions(-)

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 679f44790..1d21f030a 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.html
+++ b/libs/ui/src/lib/activities-table/activities-table.component.html
@@ -466,11 +466,9 @@
       [ngClass]="{
         'cursor-pointer':
           hasPermissionToOpenDetails &&
-          !row.isDraft &&
-          row.type !== 'FEE' &&
-          row.type !== 'INTEREST' &&
-          row.type !== 'ITEM' &&
-          row.type !== 'LIABILITY'
+          row.Account?.isExcluded !== true &&
+          row.isDraft === false &&
+          (row.type === 'BUY' || row.type === 'DIVIDEND' || row.type === 'SELL')
       }"
       (click)="onClickActivity(row)"
     ></tr>
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 2531e9142..fdf6e8abe 100644
--- a/libs/ui/src/lib/activities-table/activities-table.component.ts
+++ b/libs/ui/src/lib/activities-table/activities-table.component.ts
@@ -199,11 +199,11 @@ export class GfActivitiesTableComponent
       }
     } else if (
       this.hasPermissionToOpenDetails &&
-      !activity.isDraft &&
-      activity.type !== 'FEE' &&
-      activity.type !== 'INTEREST' &&
-      activity.type !== 'ITEM' &&
-      activity.type !== 'LIABILITY'
+      activity.Account?.isExcluded !== true &&
+      activity.isDraft === false &&
+      (activity.type === 'BUY' ||
+        activity.type === 'DIVIDEND' ||
+        activity.type === 'SELL')
     ) {
       this.onOpenPositionDialog({
         dataSource: activity.SymbolProfile.dataSource,