Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/handle activities of excluded accounts (#3697)

Thomas Kaule4074f95c9c6
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 679f447900..cb8115d3e2 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 &&
+ ['BUY', 'DIVIDEND', 'SELL'].includes(row.type)
}"
(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 2531e91420..482305bb7a 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,9 @@ 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 &&
+ ['BUY', 'DIVIDEND', 'SELL'].includes(activity.type)
) {
this.onOpenPositionDialog({
dataSource: activity.SymbolProfile.dataSource,