Refactoring

apps/client/src/app/services/data.service.ts

@@ -138,16 +138,16 @@ export class DataService {
     return this.http.get<AccountWithValue>(`/api/v1/account/${aAccountId}`);
   }
 
-  public fetchAccounts() {
+  public fetchAccountBalances(aAccountId: string) {
-    return this.http.get<Accounts>('/api/v1/account');
-  }
-
-  public fetchAccountBalances(accountId: string) {
     return this.http.get<AccountBalancesResponse>(
-      `/api/v1/account/${accountId}/balances`
+      `/api/v1/account/${aAccountId}/balances`
     );
   }
 
+  public fetchAccounts() {
+    return this.http.get<Accounts>('/api/v1/account');
+  }
+
   public fetchActivities({
     filters
   }: {

libs/common/src/lib/interfaces/account-balance.interface.ts

@@ -1,5 +0,0 @@
-export interface AccountBalance {
-  date: Date;
-  id: string;
-  value: number;
-}

libs/common/src/lib/interfaces/index.ts

@@ -1,5 +1,4 @@
 import type { Access } from './access.interface';
-import type { AccountBalance } from './account-balance.interface';
 import type { Accounts } from './accounts.interface';
 import type { AdminData } from './admin-data.interface';
 import type { AdminJobs } from './admin-jobs.interface';
@@ -52,7 +51,6 @@ import type { User } from './user.interface';
 
 export {
   Access,
-  AccountBalance,
   AccountBalancesResponse,
   Accounts,
   AdminData,

libs/ui/src/lib/account-balances/account-balances.component.ts

@@ -10,7 +10,7 @@ import {
 import { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { DataService } from '@ghostfolio/client/services/data.service';
-import { AccountBalance } from '@ghostfolio/common/interfaces';
+import { AccountBalancesResponse } from '@ghostfolio/common/interfaces';
 import { get } from 'lodash';
 import { Subject, takeUntil } from 'rxjs';
 
@@ -26,8 +26,9 @@ export class AccountBalancesComponent implements OnDestroy, OnInit {
 
   @ViewChild(MatSort) sort: MatSort;
 
-  public dataSource: MatTableDataSource<AccountBalance> =
+  public dataSource: MatTableDataSource<
-    new MatTableDataSource();
+    AccountBalancesResponse['balances'][0]
+  > = new MatTableDataSource();
   public displayedColumns: string[] = ['date', 'value'];
 
   private unsubscribeSubject = new Subject<void>();