From 720ad531a1cce98590867e853c1c00c91b8d86c7 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 29 Sep 2026 20:25:50 +0200
Subject: [PATCH] Bugfix/endless loading state of values (#7971)

* Fix value column of top holdings in Presenter View

* Fix projected sustainable retirement income for projected total amount of zero

* Fix emergency fund in portfolio summary for redacted values

* Update changelog
---
 CHANGELOG.md                                      |  6 ++++++
 .../portfolio-summary.component.html              |  4 +++-
 .../portfolio/allocations/allocations-page.html   |  1 +
 .../pages/portfolio/fire/fire-page.component.ts   |  4 +++-
 .../lib/top-holdings/top-holdings.component.ts    | 15 ++++++++++-----
 5 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e3529e9e6..998d9fe239 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Extended the emergency fund dialog in the portfolio summary to include the currency suffix
 - Migrated the client to the code generated by the new `prisma-client` generator of _Prisma_
 
+### Fixed
+
+- Fixed the value column of the top holdings on the allocations page in the _Presenter View_
+- Fixed the projected sustainable retirement income on the _FIRE_ page for a projected total amount of zero (experimental)
+- Fixed the emergency fund in the portfolio summary for redacted values
+
 ## 3.75.0 - 2026-09-28
 
 ### Changed
diff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
index 2130493f03..0a0beba910 100644
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
@@ -486,7 +486,9 @@
         [locale]="locale"
         [precision]="precision"
         [unit]="displayedCurrency"
-        [value]="summary?.emergencyFund?.total"
+        [value]="
+          summary?.emergencyFund === null ? null : summary?.emergencyFund?.total
+        "
       />
     </div>
   </div>
diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
index adb4f188d7..79f5e4ecbf 100644
--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html
@@ -341,6 +341,7 @@
         <mat-card-content>
           <gf-top-holdings
             [baseCurrency]="user?.settings?.baseCurrency"
+            [hasPermissionToShowValues]="!showValuesInPercentage()"
             [locale]="user?.settings?.locale"
             [pageSize]="10"
             [topHoldings]="topHoldings"
diff --git a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
index b7ef8b302b..dc787ae26a 100644
--- a/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/fire/fire-page.component.ts
@@ -27,6 +27,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { FormControl } from '@angular/forms';
 import { Big } from 'big.js';
+import { isFinite, isNumber } from 'lodash';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
@@ -256,7 +257,8 @@ export class GfFirePageComponent implements OnInit {
   private calculateWithdrawalRatesProjected() {
     if (
       this.fireWealth &&
-      this.projectedTotalAmount &&
+      isNumber(this.projectedTotalAmount) &&
+      isFinite(this.projectedTotalAmount) &&
       this.user?.settings?.safeWithdrawalRate
     ) {
       this.withdrawalRatePerYearProjected = new Big(
diff --git a/libs/ui/src/lib/top-holdings/top-holdings.component.ts b/libs/ui/src/lib/top-holdings/top-holdings.component.ts
index 5ee8813a1f..03e7f6cc46 100644
--- a/libs/ui/src/lib/top-holdings/top-holdings.component.ts
+++ b/libs/ui/src/lib/top-holdings/top-holdings.component.ts
@@ -39,6 +39,7 @@ import { GfValueComponent } from '../value/value.component';
 })
 export class GfTopHoldingsComponent implements OnChanges {
   @Input() baseCurrency: string;
+  @Input() hasPermissionToShowValues = true;
   @Input() locale = getLocale();
   @Input() pageSize = Number.MAX_SAFE_INTEGER;
   @Input() topHoldings: HoldingWithParents[];
@@ -48,14 +49,18 @@ export class GfTopHoldingsComponent implements OnChanges {
   @ViewChild(MatPaginator) paginator: MatPaginator;
 
   public dataSource = new MatTableDataSource<HoldingWithParents>();
-  public displayedColumns: string[] = [
-    'name',
-    'valueInBaseCurrency',
-    'allocationInPercentage'
-  ];
+  public displayedColumns: string[] = [];
   public isLoading = true;
 
   public ngOnChanges() {
+    this.displayedColumns = ['name'];
+
+    if (this.hasPermissionToShowValues) {
+      this.displayedColumns.push('valueInBaseCurrency');
+    }
+
+    this.displayedColumns.push('allocationInPercentage');
+
     this.isLoading = true;
 
     this.dataSource = new MatTableDataSource(this.topHoldings);