Refactoring

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts

@@ -8,17 +8,16 @@ import {
 } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { DataService } from '@ghostfolio/client/services/data.service';
+import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { downloadAsFile } from '@ghostfolio/common/helper';
-import { User, HistoricalDataItem } from '@ghostfolio/common/interfaces';
+import { HistoricalDataItem, User } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
-import { translate } from '@ghostfolio/ui/i18n';
 import Big from 'big.js';
-import { format, parseISO, differenceInDays } from 'date-fns';
+import { format, parseISO } from 'date-fns';
 import { isNumber } from 'lodash';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
-import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 
 import { AccountDetailDialogParams } from './interfaces/interfaces';
 
@@ -32,13 +31,12 @@ import { AccountDetailDialogParams } from './interfaces/interfaces';
 export class AccountDetailDialog implements OnDestroy, OnInit {
   public balance: number;
   public currency: string;
-  public daysInMarket: number;
   public equity: number;
   public hasImpersonationId: boolean;
-  public isLoadingBenchmarkComparator: boolean;
+  public historicalDataItems: HistoricalDataItem[];
+  public isLoadingChart: boolean;
   public name: string;
   public orders: OrderWithAccount[];
-  public historicalDataItems: HistoricalDataItem[];
   public platformName: string;
   public transactionCount: number;
   public user: User;
@@ -65,13 +63,8 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
       });
   }
 
-  public ngOnInit(): void {
+  public ngOnInit() {
-    this.impersonationStorageService
+    this.isLoadingChart = true;
-      .onChangeHasImpersonation()
-      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe((impersonationId) => {
-        this.hasImpersonationId = !!impersonationId;
-      });
 
     this.dataService
       .fetchAccount(this.data.accountId)
@@ -126,23 +119,33 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
         range: 'max'
       })
       .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(({ chart, firstOrderDate }) => {
+      .subscribe(({ chart }) => {
-        this.daysInMarket = differenceInDays(new Date(), firstOrderDate);
+        this.historicalDataItems = chart.map(
+          ({ date, value, valueInPercentage }) => {
+            return {
+              date,
+              value:
+                this.hasImpersonationId || this.user.settings.isRestrictedView
+                  ? valueInPercentage
+                  : value
+            };
+          }
+        );
 
-        this.historicalDataItems = [];
+        this.isLoadingChart = false;
 
-        chart.forEach(({ date, value, valueInPercentage }) => {
+        this.changeDetectorRef.markForCheck();
-          this.historicalDataItems.push({
-            date,
-            value: this.hasImpersonationId ? valueInPercentage : value
-          });
       });
 
-        this.changeDetectorRef.markForCheck();
+    this.impersonationStorageService
+      .onChangeHasImpersonation()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((impersonationId) => {
+        this.hasImpersonationId = !!impersonationId;
       });
   }
 
-  public onClose(): void {
+  public onClose() {
     this.dialogRef.close();
   }
 

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

@@ -20,18 +20,18 @@
       </div>
     </div>
 
-    <div class="chart-container">
+    <div class="chart-container mb-3">
       <gf-investment-chart
         class="h-100"
         [currency]="user?.settings?.baseCurrency"
         [historicalDataItems]="historicalDataItems"
         [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
-        [isLoading]="isLoadingBenchmarkComparator"
+        [isLoading]="isLoadingChart"
         [locale]="user?.settings?.locale"
       ></gf-investment-chart>
     </div>
 
-    <div class="row mt-4">
+    <div class="row">
       <div class="col-6 mb-3">
         <gf-value
           i18n

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts

@@ -4,9 +4,9 @@ import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
 import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module';
 import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module';
+import { GfInvestmentChartModule } from '@ghostfolio/client/components/investment-chart/investment-chart.module';
 import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module';
 import { GfValueModule } from '@ghostfolio/ui/value';
-import { GfInvestmentChartModule } from '@ghostfolio/client/components/investment-chart/investment-chart.module';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { AccountDetailDialog } from './account-detail-dialog.component';