From 0910d6d20954da2d6619713cb49430c6ff99fb48 Mon Sep 17 00:00:00 2001
From: Lyndros <38167685+Lyndros@users.noreply.github.com>
Date: Tue, 1 Sep 2026 19:23:18 +0200
Subject: [PATCH 1/2] Task/refactor double ternary in portfolio proportion
 chart (#7785)

Refactoring
---
 .../portfolio-proportion-chart.component.ts          | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
index b50f89a8eb..9a215ee5b3 100644
--- a/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
+++ b/libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts
@@ -397,11 +397,13 @@ export class GfPortfolioProportionChartComponent
                         context.dataIndex
                       ] as string;
 
-                      return value > 0
-                        ? isUUID(symbol)
-                          ? (this.data[symbol]?.name ?? symbol)
-                          : symbol
-                        : '';
+                      if (value <= 0) {
+                        return '';
+                      }
+
+                      return isUUID(symbol)
+                        ? (this.data[symbol]?.name ?? symbol)
+                        : symbol;
                     },
                     offset: 8
                   }

From c5139e9ab3633c5b36ac5f374aca67d00702326c Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 1 Sep 2026 20:06:04 +0200
Subject: [PATCH 2/2] Bugfix/loading state of accounts table on accounts page
 (#7787)

* Fix loading state of accounts table

* Update changelog
---
 CHANGELOG.md                                               | 6 ++++++
 apps/client/src/app/pages/accounts/accounts-page.html      | 2 +-
 libs/ui/src/lib/accounts-table/accounts-table.component.ts | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bf8ec7c268..646c59ecb9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Fixed
+
+- Fixed the loading state of the accounts table on the accounts page
+
 ## 3.65.0 - 2026-08-31
 
 ### Added
diff --git a/apps/client/src/app/pages/accounts/accounts-page.html b/apps/client/src/app/pages/accounts/accounts-page.html
index e3f625ac1b..55a8f65345 100644
--- a/apps/client/src/app/pages/accounts/accounts-page.html
+++ b/apps/client/src/app/pages/accounts/accounts-page.html
@@ -3,7 +3,7 @@
     <div class="col">
       <h1 class="d-none d-sm-block h3 mb-4 text-center" i18n>Accounts</h1>
       <gf-accounts-table
-        [accounts]="accounts ?? []"
+        [accounts]="accounts"
         [activitiesCount]="activitiesCount"
         [baseCurrency]="user?.settings?.baseCurrency"
         [hasPermissionToDeleteAccount]="hasPermissionToDeleteAccount"
diff --git a/libs/ui/src/lib/accounts-table/accounts-table.component.ts b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
index 93b3949512..48eb99d51c 100644
--- a/libs/ui/src/lib/accounts-table/accounts-table.component.ts
+++ b/libs/ui/src/lib/accounts-table/accounts-table.component.ts
@@ -56,7 +56,7 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
   templateUrl: './accounts-table.component.html'
 })
 export class GfAccountsTableComponent {
-  public readonly accounts = input.required<AccountWithValue[]>();
+  public readonly accounts = input.required<AccountWithValue[] | undefined>();
   public readonly activitiesCount = input<number>();
   public readonly baseCurrency = input<string>();
   public readonly hasPermissionToDeleteAccount = input<boolean>();
@@ -159,7 +159,7 @@ export class GfAccountsTableComponent {
 
     // Reactive data update
     effect(() => {
-      this.dataSource.data = this.accounts();
+      this.dataSource.data = this.accounts() ?? [];
     });
 
     // Reactive view connection