Browse Source

Merge branch 'main' into bugfix/loading-state-of-holdings-table-on-portfolio-holdings-page

pull/7788/head
Thomas Kaul 1 month ago
committed by GitHub
parent
commit
d9f486ce0e
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 1
      CHANGELOG.md
  2. 2
      apps/client/src/app/pages/accounts/accounts-page.html
  3. 4
      libs/ui/src/lib/accounts-table/accounts-table.component.ts
  4. 12
      libs/ui/src/lib/portfolio-proportion-chart/portfolio-proportion-chart.component.ts

1
CHANGELOG.md

@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Fixed
- Fixed the loading state of the accounts table on the accounts page
- Fixed the loading state of the holdings table on the portfolio holdings page
## 3.65.0 - 2026-08-31

2
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"

4
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

12
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
}

Loading…
Cancel
Save