From 2d057cfe0565c9d2a3212d20dae8f3a3aa425793 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 2 Oct 2026 21:24:15 +0200
Subject: [PATCH] Improve label of cash positions

---
 libs/common/src/lib/helper.spec.ts                | 11 +++++++++++
 libs/common/src/lib/helper.ts                     |  2 +-
 .../holdings-table/holdings-table.component.html  | 15 ++++++++++-----
 .../holdings-table/holdings-table.component.ts    |  9 ++++++++-
 4 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/libs/common/src/lib/helper.spec.ts b/libs/common/src/lib/helper.spec.ts
index 4e2ddf8401..71b934628c 100644
--- a/libs/common/src/lib/helper.spec.ts
+++ b/libs/common/src/lib/helper.spec.ts
@@ -156,6 +156,17 @@ describe('Helper', () => {
       ).toEqual('Cash (CHF)');
     });
 
+    it('Cash position without asset sub class label', () => {
+      expect(
+        getHoldingName({
+          assetSubClass: 'CASH',
+          assetSubClassLabel: undefined,
+          name: 'CHF',
+          symbol: 'CHF'
+        })
+      ).toEqual('CHF');
+    });
+
     it('Holding with name', () => {
       expect(
         getHoldingName({
diff --git a/libs/common/src/lib/helper.ts b/libs/common/src/lib/helper.ts
index 4c82a08116..7e4e13de7e 100644
--- a/libs/common/src/lib/helper.ts
+++ b/libs/common/src/lib/helper.ts
@@ -462,7 +462,7 @@ export function getHoldingName({
   PortfolioPosition['assetProfile'],
   'assetSubClass' | 'assetSubClassLabel' | 'name' | 'symbol'
 >) {
-  if (isCashPosition({ assetSubClass })) {
+  if (isCashPosition({ assetSubClass }) && assetSubClassLabel) {
     return `${assetSubClassLabel} (${symbol})`;
   }
 
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.html b/libs/ui/src/lib/holdings-table/holdings-table.component.html
index 688aac75e8..e1c012ab15 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.html
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.html
@@ -40,11 +40,16 @@
         mat-cell
         [class.w-100]="mode() === 'simple'"
       >
-        <div
-          class="text-truncate"
-          [title]="getHoldingName(element.assetProfile)"
-        >
-          {{ getHoldingName(element.assetProfile) }}
+        @let holdingName = getHoldingName(element.assetProfile);
+
+        <div class="text-truncate" [title]="holdingName">
+          {{ holdingName }}
+          @if (
+            !isCashPosition(element.assetProfile) &&
+            element.assetProfile.name === element.assetProfile.symbol
+          ) {
+            <span>({{ element.assetProfile.assetSubClassLabel }})</span>
+          }
         </div>
         @if (mode() === 'default') {
           <div>
diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.ts b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
index 5eed45950f..1894260b78 100644
--- a/libs/ui/src/lib/holdings-table/holdings-table.component.ts
+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.ts
@@ -91,6 +91,7 @@ export class GfHoldingsTableComponent {
   });
 
   protected readonly getHoldingName = getHoldingName;
+  protected readonly isCashPosition = isCashPosition;
 
   protected readonly isLoading = computed(() => {
     return !this.holdings();
@@ -107,7 +108,13 @@ export class GfHoldingsTableComponent {
   });
 
   public constructor() {
-    this.dataSource.sortingDataAccessor = getLowercase;
+    this.dataSource.sortingDataAccessor = (holding, path) => {
+      if (path === 'assetProfile.name') {
+        return getHoldingName(holding.assetProfile).toLocaleLowerCase();
+      }
+
+      return getLowercase(holding, path) as number | string;
+    };
 
     // Reactive data update
     effect(() => {