Refactoring

apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts

@@ -309,7 +309,6 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
   }
 
   private update() {
-    this.isLoadingBenchmarkComparator = true;
     this.isLoadingInvestmentChart = true;
 
     this.dataService
@@ -386,10 +385,8 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
 
   private updateBenchmarkDataItems() {
     this.benchmarkDataItems = [];
-    this.isLoadingBenchmarkComparator = false;
-
-    if (!this.user.settings.benchmark) return;
 
+    if (this.user.settings.benchmark) {
       const { dataSource, symbol } =
         this.benchmarks.find(({ id }) => {
           return id === this.user.settings.benchmark;
@@ -397,6 +394,7 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
 
       if (dataSource && symbol) {
         this.isLoadingBenchmarkComparator = true;
+
         this.dataService
           .fetchBenchmarkBySymbol({
             dataSource,
@@ -413,7 +411,10 @@ export class AnalysisPageComponent implements OnDestroy, OnInit {
             });
 
             this.isLoadingBenchmarkComparator = false;
+
+            this.changeDetectorRef.markForCheck();
           });
       }
     }
+  }
 }

apps/client/src/app/pages/portfolio/analysis/analysis-page.html

@@ -3,7 +3,7 @@
   <div *ngIf="user?.settings?.viewMode !== 'ZEN'" class="my-4 text-center">
     <gf-toggle
       [defaultValue]="user?.settings?.dateRange"
-      [isLoading]="isLoadingBenchmarkComparator"
+      [isLoading]="isLoadingBenchmarkComparator || isLoadingInvestmentChart"
       [options]="dateRangeOptions"
       (change)="onChangeDateRange($event.value)"
     ></gf-toggle>
@@ -23,7 +23,7 @@
         [benchmarks]="benchmarks"
         [colorScheme]="user?.settings?.colorScheme"
         [daysInMarket]="daysInMarket"
-        [isLoading]="isLoadingBenchmarkComparator"
+        [isLoading]="isLoadingBenchmarkComparator || isLoadingInvestmentChart"
         [locale]="user?.settings?.locale"
         [performanceDataItems]="performanceDataItemsInPercentage"
         [user]="user"
@@ -149,7 +149,7 @@
           [daysInMarket]="daysInMarket"
           [historicalDataItems]="performanceDataItems"
           [isInPercent]="hasImpersonationId || user.settings.isRestrictedView"
-          [isLoading]="isLoadingBenchmarkComparator"
+          [isLoading]="isLoadingInvestmentChart"
           [locale]="user?.settings?.locale"
           [range]="user?.settings?.dateRange"
         ></gf-investment-chart>