diff --git a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html index e41d3415c..54e786734 100644 --- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html +++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html @@ -24,7 +24,7 @@ class="h-100" [currency]="user?.settings?.baseCurrency" [historicalDataItems]="historicalDataItems" - [isInPercent]=" + [isInPercentage]=" data.hasImpersonationId || user.settings.isRestrictedView " [isLoading]="isLoadingChart" diff --git a/apps/client/src/app/components/investment-chart/investment-chart.component.ts b/apps/client/src/app/components/investment-chart/investment-chart.component.ts index 53d4f5693..21a7ac85a 100644 --- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts +++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts @@ -61,7 +61,7 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy { @Input() currency: string; @Input() groupBy: GroupBy; @Input() historicalDataItems: LineChartItem[] = []; - @Input() isInPercent = false; + @Input() isInPercentage = false; @Input() isLoading = false; @Input() locale = getLocale(); @Input() savingsRate = 0; @@ -119,7 +119,7 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy { data: this.investments.map(({ date, investment }) => { return { x: parseDate(date).getTime(), - y: this.isInPercent ? investment * 100 : investment + y: this.isInPercentage ? investment * 100 : investment }; }), label: this.benchmarkDataLabel, @@ -139,7 +139,7 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy { data: this.values.map(({ date, value }) => { return { x: parseDate(date).getTime(), - y: this.isInPercent ? value * 100 : value + y: this.isInPercentage ? value * 100 : value }; }), fill: false, @@ -251,7 +251,7 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy { border: { display: false }, - display: !this.isInPercent, + display: !this.isInPercentage, grid: { color: ({ scale, tick }) => { if ( @@ -292,10 +292,10 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy { return { ...getTooltipOptions({ colorScheme: this.colorScheme, - currency: this.isInPercent ? undefined : this.currency, + currency: this.isInPercentage ? undefined : this.currency, groupBy: this.groupBy, - locale: this.isInPercent ? undefined : this.locale, - unit: this.isInPercent ? '%' : undefined + locale: this.isInPercentage ? undefined : this.locale, + unit: this.isInPercentage ? '%' : undefined }), mode: 'index', position: 'top', diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html index 517ad7101..c4e8f610b 100644 --- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.html +++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.html @@ -417,7 +417,9 @@ [benchmarkDataLabel]="portfolioEvolutionDataLabel" [currency]="user?.settings?.baseCurrency" [historicalDataItems]="performanceDataItems" - [isInPercent]="hasImpersonationId || user.settings.isRestrictedView" + [isInPercentage]=" + hasImpersonationId || user.settings.isRestrictedView + " [isLoading]="isLoadingInvestmentChart" [locale]="user?.settings?.locale" /> @@ -473,7 +475,9 @@ [benchmarkDataLabel]="investmentTimelineDataLabel" [currency]="user?.settings?.baseCurrency" [groupBy]="mode" - [isInPercent]="hasImpersonationId || user.settings.isRestrictedView" + [isInPercentage]=" + hasImpersonationId || user.settings.isRestrictedView + " [isLoading]="isLoadingInvestmentTimelineChart" [locale]="user?.settings?.locale" [savingsRate]="savingsRate" @@ -508,7 +512,9 @@ [benchmarkDataLabel]="dividendTimelineDataLabel" [currency]="user?.settings?.baseCurrency" [groupBy]="mode" - [isInPercent]="hasImpersonationId || user.settings.isRestrictedView" + [isInPercentage]=" + hasImpersonationId || user.settings.isRestrictedView + " [isLoading]="isLoadingDividendTimelineChart" [locale]="user?.settings?.locale" />