From 7b3e90d648a4a4d30ea2f90545dc57f3fc47fbec Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 10 Oct 2026 20:39:21 +0200
Subject: [PATCH] Fix value of accounts filtered by asset class

---
 .../src/app/activities/activities.service.ts  | 22 ++++++++++++++-----
 .../src/app/portfolio/portfolio.service.ts    | 10 ++-------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/apps/api/src/app/activities/activities.service.ts b/apps/api/src/app/activities/activities.service.ts
index c592a44e76..0de3f7c3c4 100644
--- a/apps/api/src/app/activities/activities.service.ts
+++ b/apps/api/src/app/activities/activities.service.ts
@@ -83,7 +83,6 @@ export class ActivitiesService {
 
   public areCashActivitiesExcludedByFilters(filters: Filter[] = []) {
     const {
-      ASSET_CLASS: filtersByAssetClass = [],
       DATA_SOURCE: [filterByDataSource] = [],
       SYMBOL: [filterBySymbol] = [],
       TAG: filtersByTag = []
@@ -92,10 +91,7 @@ export class ActivitiesService {
     });
 
     const isFilteredByAssetClassOtherThanLiquidity =
-      filtersByAssetClass.length > 0 &&
-      !filtersByAssetClass.some(({ id }) => {
-        return id === AssetClass.LIQUIDITY;
-      });
+      this.isFilteredByAssetClassOtherThanLiquidity(filters);
 
     const isFilteredByAssetProfile = !!(filterByDataSource || filterBySymbol);
     const isFilteredByTag = filtersByTag.length > 0;
@@ -875,6 +871,22 @@ export class ActivitiesService {
     });
   }
 
+  public isFilteredByAssetClassOtherThanLiquidity(filters: Filter[] = []) {
+    const { ASSET_CLASS: filtersByAssetClass = [] } = groupBy(
+      filters,
+      ({ type }) => {
+        return type;
+      }
+    );
+
+    return (
+      filtersByAssetClass.length > 0 &&
+      !filtersByAssetClass.some(({ id }) => {
+        return id === AssetClass.LIQUIDITY;
+      })
+    );
+  }
+
   public async order(
     orderWhereUniqueInput: Prisma.OrderWhereUniqueInput
   ): Promise<Order | null> {
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 48f0886481..343da076fa 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -2434,18 +2434,12 @@ export class PortfolioService {
     const accounts: PortfolioDetails['accounts'] = {};
     const platforms: PortfolioDetails['platforms'] = {};
 
-    const {
-      ASSET_CLASS: filtersByAssetClass = [],
-      SYMBOL: [filterBySymbol] = []
-    } = groupBy(filters, ({ type }) => {
+    const { SYMBOL: [filterBySymbol] = [] } = groupBy(filters, ({ type }) => {
       return type;
     });
 
     const isFilteredByAssetClassOtherThanLiquidity =
-      filtersByAssetClass.length > 0 &&
-      !filtersByAssetClass.some(({ id }) => {
-        return id === AssetClass.LIQUIDITY;
-      });
+      this.activitiesService.isFilteredByAssetClassOtherThanLiquidity(filters);
 
     let currentAccounts: (AccountWithBalance & {
       Order?: Order[];