Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript đ€
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/remove toggle on allocations page (#1620)
Thomas Kaul271001f523ec
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 11653d69cf..1fb5bf6978 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0## Unreleased+### Changed++- Removed the toggle _Original Shares_ vs. _Current Shares_ on the allocations page+### Fixed- Fixed the value of the active (emergency fund) filter in percentage on the allocations pagediff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.tsindex 3a1fa98985..7879fa4a50 100644--- a/apps/api/src/app/portfolio/portfolio.controller.ts+++ b/apps/api/src/app/portfolio/portfolio.controller.ts@@ -441,7 +441,7 @@ export class PortfolioController {for (const [symbol, portfolioPosition] of Object.entries(holdings)) {portfolioPublicDetails.holdings[symbol] = {- allocationCurrent: portfolioPosition.value / totalValue,+ allocationInPercentage: portfolioPosition.value / totalValue,countries: hasDetails ? portfolioPosition.countries : [],currency: hasDetails ? portfolioPosition.currency : undefined,dataSource: portfolioPosition.dataSource,diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.tsindex 5b7a8386f8..558a988ecf 100644--- a/apps/api/src/app/portfolio/portfolio.service.ts+++ b/apps/api/src/app/portfolio/portfolio.service.ts@@ -537,12 +537,9 @@ export class PortfolioService {holdings[item.symbol] = {markets,- allocationCurrent: filteredValueInBaseCurrency.eq(0)+ allocationInPercentage: filteredValueInBaseCurrency.eq(0)? 0: value.div(filteredValueInBaseCurrency).toNumber(),- allocationInvestment: item.investment- .div(totalInvestmentInBaseCurrency)- .toNumber(),assetClass: symbolProfile.assetClass,assetSubClass: symbolProfile.assetSubClass,countries: symbolProfile.countries,@@ -1260,12 +1257,9 @@ export class PortfolioService {for (const symbol of Object.keys(cashPositions)) {// Calculate allocations for each currency- cashPositions[symbol].allocationCurrent = value.gt(0)+ cashPositions[symbol].allocationInPercentage = value.gt(0)? new Big(cashPositions[symbol].value).div(value).toNumber(): 0;- cashPositions[symbol].allocationInvestment = investment.gt(0)- ? new Big(cashPositions[symbol].investment).div(investment).toNumber()- : 0;}return cashPositions;@@ -1432,8 +1426,7 @@ export class PortfolioService {}): PortfolioPosition {return {currency,- allocationCurrent: 0,- allocationInvestment: 0,+ allocationInPercentage: 0,assetClass: AssetClass.CASH,assetSubClass: AssetClass.CASH,countries: [],diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.tsindex 6a5a57c823..910629a3e0 100644--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts@@ -18,7 +18,7 @@ import {User} from '@ghostfolio/common/interfaces';import { hasPermission, permissions } from '@ghostfolio/common/permissions';-import { Market, ToggleOption } from '@ghostfolio/common/types';+import { Market } from '@ghostfolio/common/types';import { translate } from '@ghostfolio/ui/i18n';import { Account, AssetClass, DataSource } from '@prisma/client';import { DeviceDetectorService } from 'ngx-device-detector';@@ -53,11 +53,6 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {public markets: {[key in Market]: { name: string; value: number };};- public period = 'current';- public periodOptions: ToggleOption[] = [- { label: $localize`Initial`, value: 'original' },- { label: $localize`Current`, value: 'current' }- ];public placeholder = '';public portfolioDetails: PortfolioDetails;public positions: {@@ -146,7 +141,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {.subscribe((portfolioDetails) => {this.portfolioDetails = portfolioDetails;- this.initializeAnalysisData(this.period);+ this.initializeAnalysisData();this.isLoading = false;@@ -248,7 +243,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {};}- public initializeAnalysisData(aPeriod: string) {+ public initializeAnalysisData() {this.initialize();for (const [id, { current, name, original }] of Object.entries(@@ -257,7 +252,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {this.accounts[id] = {id,name,- value: aPeriod === 'original' ? original : current+ value: current};}@@ -266,18 +261,10 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {)) {let value = 0;- if (aPeriod === 'original') {- if (this.hasImpersonationId) {- value = position.allocationInvestment;- } else {- value = position.investment;- }+ if (this.hasImpersonationId) {+ value = position.allocationInPercentage;} else {- if (this.hasImpersonationId) {- value = position.allocationCurrent;- } else {- value = position.value;- }+ value = position.value;}this.positions[symbol] = {@@ -294,14 +281,11 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {if (position.countries.length > 0) {this.markets.developedMarkets.value +=- position.markets.developedMarkets *- (aPeriod === 'original' ? position.investment : position.value);+ position.markets.developedMarkets * position.value;this.markets.emergingMarkets.value +=- position.markets.emergingMarkets *- (aPeriod === 'original' ? position.investment : position.value);+ position.markets.emergingMarkets * position.value;this.markets.otherMarkets.value +=- position.markets.otherMarkets *- (aPeriod === 'original' ? position.investment : position.value);+ position.markets.otherMarkets * position.value;for (const country of position.countries) {const { code, continent, name, weight } = country;@@ -311,11 +295,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {} else {this.continents[continent] = {name: continent,- value:- weight *- (aPeriod === 'original'- ? this.portfolioDetails.holdings[symbol].investment- : this.portfolioDetails.holdings[symbol].value)+ value: weight * this.portfolioDetails.holdings[symbol].value};}@@ -324,24 +304,16 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {} else {this.countries[code] = {name,- value:- weight *- (aPeriod === 'original'- ? this.portfolioDetails.holdings[symbol].investment- : this.portfolioDetails.holdings[symbol].value)+ value: weight * this.portfolioDetails.holdings[symbol].value};}}} else {this.continents[UNKNOWN_KEY].value +=- aPeriod === 'original'- ? this.portfolioDetails.holdings[symbol].investment- : this.portfolioDetails.holdings[symbol].value;+ this.portfolioDetails.holdings[symbol].value;this.countries[UNKNOWN_KEY].value +=- aPeriod === 'original'- ? this.portfolioDetails.holdings[symbol].investment- : this.portfolioDetails.holdings[symbol].value;+ this.portfolioDetails.holdings[symbol].value;}if (position.sectors.length > 0) {@@ -353,19 +325,13 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {} else {this.sectors[name] = {name,- value:- weight *- (aPeriod === 'original'- ? this.portfolioDetails.holdings[symbol].investment- : this.portfolioDetails.holdings[symbol].value)+ value: weight * this.portfolioDetails.holdings[symbol].value};}}} else {this.sectors[UNKNOWN_KEY].value +=- aPeriod === 'original'- ? this.portfolioDetails.holdings[symbol].investment- : this.portfolioDetails.holdings[symbol].value;+ this.portfolioDetails.holdings[symbol].value;}}@@ -373,7 +339,7 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {dataSource: position.dataSource,name: position.name,symbol: prettifySymbol(symbol),- value: aPeriod === 'original' ? position.investment : position.value+ value: position.value};}@@ -398,12 +364,6 @@ export class AllocationsPageComponent implements OnDestroy, OnInit {}}- public onChangePeriod(aValue: string) {- this.period = aValue;-- this.initializeAnalysisData(this.period);- }-public onSymbolChartClicked({ dataSource, symbol }: UniqueAsset) {if (dataSource && symbol) {this.router.navigate([], {diff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html b/apps/client/src/app/pages/portfolio/allocations/allocations-page.htmlindex 78d86d182d..5ee7deb330 100644--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.html+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.html@@ -39,12 +39,6 @@<mat-card class="mb-3"><mat-card-header class="overflow-hidden w-100"><mat-card-title class="text-truncate" i18n>By Account</mat-card-title>- <gf-toggle- [defaultValue]="period"- [isLoading]="false"- [options]="periodOptions"- (change)="onChangePeriod($event.value)"- ></gf-toggle></mat-card-header><mat-card-content><gf-portfolio-proportion-chart@@ -70,12 +64,6 @@class="ml-1"></gf-premium-indicator></mat-card-title>- <gf-toggle- [defaultValue]="period"- [isLoading]="false"- [options]="periodOptions"- (change)="onChangePeriod($event.value)"- ></gf-toggle></mat-card-header><mat-card-content><gf-portfolio-proportion-chart@@ -99,12 +87,6 @@class="ml-1"></gf-premium-indicator></mat-card-title>- <gf-toggle- [defaultValue]="period"- [isLoading]="false"- [options]="periodOptions"- (change)="onChangePeriod($event.value)"- ></gf-toggle></mat-card-header><mat-card-content><gf-portfolio-proportion-chart@@ -124,12 +106,6 @@<mat-card-title class="align-items-center d-flex text-truncate"><ng-container i18n>By Holding</ng-container></mat-card-title>- <gf-toggle- [defaultValue]="period"- [isLoading]="false"- [options]="periodOptions"- (change)="onChangePeriod($event.value)"- ></gf-toggle></mat-card-header><mat-card-content><gf-portfolio-proportion-chart@@ -157,12 +133,6 @@class="ml-1"></gf-premium-indicator></mat-card-title>- <gf-toggle- [defaultValue]="period"- [isLoading]="false"- [options]="periodOptions"- (change)="onChangePeriod($event.value)"- ></gf-toggle></mat-card-header><mat-card-content><gf-portfolio-proportion-chart@@ -187,12 +157,6 @@class="ml-1"></gf-premium-indicator></mat-card-title>- <gf-toggle- [defaultValue]="period"- [isLoading]="false"- [options]="periodOptions"- (change)="onChangePeriod($event.value)"- ></gf-toggle></mat-card-header><mat-card-content><gf-portfolio-proportion-chart@@ -216,12 +180,6 @@class="ml-1"></gf-premium-indicator></mat-card-title>- <gf-toggle- [defaultValue]="period"- [isLoading]="false"- [options]="periodOptions"- (change)="onChangePeriod($event.value)"- ></gf-toggle></mat-card-header><mat-card-content><gf-portfolio-proportion-chart@@ -248,12 +206,6 @@class="ml-1"></gf-premium-indicator></mat-card-title>- <gf-toggle- [defaultValue]="period"- [isLoading]="false"- [options]="periodOptions"- (change)="onChangePeriod($event.value)"- ></gf-toggle></mat-card-header><mat-card-content><gf-world-map-chartdiff --git a/apps/client/src/app/pages/portfolio/allocations/allocations-page.module.ts b/apps/client/src/app/pages/portfolio/allocations/allocations-page.module.tsindex fdfd65d344..44ac94a6f9 100644--- a/apps/client/src/app/pages/portfolio/allocations/allocations-page.module.ts+++ b/apps/client/src/app/pages/portfolio/allocations/allocations-page.module.ts@@ -3,7 +3,6 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';import { MatCardModule } from '@angular/material/card';import { MatDialogModule } from '@angular/material/dialog';import { MatProgressBarModule } from '@angular/material/progress-bar';-import { GfToggleModule } from '@ghostfolio/client/components/toggle/toggle.module';import { GfWorldMapChartModule } from '@ghostfolio/client/components/world-map-chart/world-map-chart.module';import { GfActivitiesFilterModule } from '@ghostfolio/ui/activities-filter/activities-filter.module';import { GfPortfolioProportionChartModule } from '@ghostfolio/ui/portfolio-proportion-chart/portfolio-proportion-chart.module';@@ -21,7 +20,6 @@ import { AllocationsPageComponent } from './allocations-page.component';GfActivitiesFilterModule,GfPortfolioProportionChartModule,GfPremiumIndicatorModule,- GfToggleModule,GfWorldMapChartModule,GfValueModule,MatCardModule,diff --git a/apps/client/src/app/pages/public/public-page.component.ts b/apps/client/src/app/pages/public/public-page.component.tsindex e4243a1fe2..fface38161 100644--- a/apps/client/src/app/pages/public/public-page.component.ts+++ b/apps/client/src/app/pages/public/public-page.component.ts@@ -131,7 +131,7 @@ export class PublicPageComponent implements OnInit {for (const [symbol, position] of Object.entries(this.portfolioPublicDetails.holdings)) {- const value = position.allocationCurrent;+ const value = position.allocationInPercentage;this.positions[symbol] = {value,diff --git a/apps/client/src/locales/messages.de.xlf b/apps/client/src/locales/messages.de.xlfindex 3e49d90dd3..ec563d409b 100644--- a/apps/client/src/locales/messages.de.xlf+++ b/apps/client/src/locales/messages.de.xlf@@ -1694,7 +1694,7 @@<target state="translated">Nach WĂ€hrung</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">67</context>+ <context context-type="linenumber">61</context></context-group></trans-unit><trans-unit id="8288ff761f2d259625d2e5a3d96db727926d9cd4" datatype="html">@@ -1702,7 +1702,7 @@<target state="translated">Nach Anlageklasse</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">96</context>+ <context context-type="linenumber">84</context></context-group></trans-unit><trans-unit id="b64539bb7815eb3275b55ad723d3897fc6ba8d23" datatype="html">@@ -1710,7 +1710,7 @@<target state="translated">Nach Position</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">125</context>+ <context context-type="linenumber">107</context></context-group></trans-unit><trans-unit id="9f86714c9a6b74e13c96ab02102ce40c34fe13b9" datatype="html">@@ -1718,7 +1718,7 @@<target state="translated">Nach Sektor</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">154</context>+ <context context-type="linenumber">130</context></context-group></trans-unit><trans-unit id="7017e0e26b53ef322c3e3bbf95f06a85487a12b2" datatype="html">@@ -1726,7 +1726,7 @@<target state="translated">Nach Kontinent</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">184</context>+ <context context-type="linenumber">154</context></context-group></trans-unit><trans-unit id="f27e9dd8de80176286e02312e694cb8d1e485a5d" datatype="html">@@ -1734,7 +1734,7 @@<target state="translated">Nach Land</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">213</context>+ <context context-type="linenumber">177</context></context-group></trans-unit><trans-unit id="85780db87ac6c9f202615ac63754551c061e7236" datatype="html">@@ -1742,7 +1742,7 @@<target state="translated">Regionen</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">245</context>+ <context context-type="linenumber">203</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2370,7 +2370,7 @@<target state="translated">Entwickelte LĂ€nder</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">272</context>+ <context context-type="linenumber">224</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2382,7 +2382,7 @@<target state="translated">SchwellenlĂ€nder</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">233</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2394,7 +2394,7 @@<target state="translated">Andere LĂ€nder</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">290</context>+ <context context-type="linenumber">242</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2417,22 +2417,6 @@<context context-type="linenumber">44</context></context-group></trans-unit>- <trans-unit id="2937311350146031865" datatype="html">- <source>Initial</source>- <target state="translated">Beginn</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">58</context>- </context-group>- </trans-unit>- <trans-unit id="6603000223840533819" datatype="html">- <source>Current</source>- <target state="translated">Aktuell</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">59</context>- </context-group>- </trans-unit><trans-unit id="6762743264882388498" datatype="html"><source>Monthly</source><target state="translated">Monatlich</target>@@ -2454,7 +2438,7 @@</context-group><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">283</context></context-group></trans-unit><trans-unit id="3441715041566940420" datatype="html">@@ -2462,7 +2446,7 @@<target state="translated">Verzinsung</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">291</context>+ <context context-type="linenumber">293</context></context-group></trans-unit><trans-unit id="1054498214311181686" datatype="html">@@ -2470,7 +2454,7 @@<target state="translated">Ersparnisse</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">301</context>+ <context context-type="linenumber">303</context></context-group></trans-unit><trans-unit id="aad5320acd7453f912bc8714e72c2fa71e8ab18e" datatype="html">@@ -2518,7 +2502,7 @@<target state="translated">Filtern nach Konto oder Tag...</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">137</context>+ <context context-type="linenumber">132</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>@@ -2666,7 +2650,7 @@<target state="translated">Gesamtbetrag</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">178</context>+ <context context-type="linenumber">181</context></context-group></trans-unit><trans-unit id="f1a355a1af2e818050a3af693ac8b521fa7edc5f" datatype="html">@@ -2682,7 +2666,7 @@<target state="translated">Sparrate</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">242</context>+ <context context-type="linenumber">245</context></context-group></trans-unit><trans-unit id="4086606389696938932" datatype="html">diff --git a/apps/client/src/locales/messages.es.xlf b/apps/client/src/locales/messages.es.xlfindex 453c70bc42..b590c22d14 100644--- a/apps/client/src/locales/messages.es.xlf+++ b/apps/client/src/locales/messages.es.xlf@@ -1695,7 +1695,7 @@<target state="translated">Por divisa</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">67</context>+ <context context-type="linenumber">61</context></context-group></trans-unit><trans-unit id="8288ff761f2d259625d2e5a3d96db727926d9cd4" datatype="html">@@ -1703,7 +1703,7 @@<target state="translated">Por tipo de activo</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">96</context>+ <context context-type="linenumber">84</context></context-group></trans-unit><trans-unit id="b64539bb7815eb3275b55ad723d3897fc6ba8d23" datatype="html">@@ -1711,7 +1711,7 @@<target state="translated">Por participaciĂłn</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">125</context>+ <context context-type="linenumber">107</context></context-group></trans-unit><trans-unit id="9f86714c9a6b74e13c96ab02102ce40c34fe13b9" datatype="html">@@ -1719,7 +1719,7 @@<target state="translated">Por sector</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">154</context>+ <context context-type="linenumber">130</context></context-group></trans-unit><trans-unit id="7017e0e26b53ef322c3e3bbf95f06a85487a12b2" datatype="html">@@ -1727,7 +1727,7 @@<target state="translated">Por continente</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">184</context>+ <context context-type="linenumber">154</context></context-group></trans-unit><trans-unit id="f27e9dd8de80176286e02312e694cb8d1e485a5d" datatype="html">@@ -1735,7 +1735,7 @@<target state="translated">Por paĂs</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">213</context>+ <context context-type="linenumber">177</context></context-group></trans-unit><trans-unit id="85780db87ac6c9f202615ac63754551c061e7236" datatype="html">@@ -1743,7 +1743,7 @@<target state="translated">Regiones</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">245</context>+ <context context-type="linenumber">203</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2295,7 +2295,7 @@<target state="translated">Mercados desarrollados</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">272</context>+ <context context-type="linenumber">224</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2343,7 +2343,7 @@<target state="translated">Otros mercados</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">290</context>+ <context context-type="linenumber">242</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2355,7 +2355,7 @@<target state="translated">Mercados emergentes</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">233</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2423,15 +2423,7 @@<target state="translated">Ahorros</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">301</context>- </context-group>- </trans-unit>- <trans-unit id="2937311350146031865" datatype="html">- <source>Initial</source>- <target state="translated">Inicial</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">58</context>+ <context context-type="linenumber">303</context></context-group></trans-unit><trans-unit id="3441715041566940420" datatype="html">@@ -2439,7 +2431,7 @@<target state="translated">InterĂ©s</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">291</context>+ <context context-type="linenumber">293</context></context-group></trans-unit><trans-unit id="5213771062241898526" datatype="html">@@ -2455,15 +2447,7 @@</context-group><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">281</context>- </context-group>- </trans-unit>- <trans-unit id="6603000223840533819" datatype="html">- <source>Current</source>- <target state="translated">Actual</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">59</context>+ <context context-type="linenumber">283</context></context-group></trans-unit><trans-unit id="6762743264882388498" datatype="html">@@ -2511,7 +2495,7 @@<target state="translated">Filtrar por cuenta o etiqueta...</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">137</context>+ <context context-type="linenumber">132</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>@@ -2667,7 +2651,7 @@<target state="translated">Importe total</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">178</context>+ <context context-type="linenumber">181</context></context-group></trans-unit><trans-unit id="f1a355a1af2e818050a3af693ac8b521fa7edc5f" datatype="html">@@ -2683,7 +2667,7 @@<target state="translated">Tasa de ahorro</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">242</context>+ <context context-type="linenumber">245</context></context-group></trans-unit><trans-unit id="4086606389696938932" datatype="html">diff --git a/apps/client/src/locales/messages.fr.xlf b/apps/client/src/locales/messages.fr.xlfindex 286de30615..a37146092b 100644--- a/apps/client/src/locales/messages.fr.xlf+++ b/apps/client/src/locales/messages.fr.xlf@@ -1218,7 +1218,7 @@<target state="translated">Montant Total</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">178</context>+ <context context-type="linenumber">181</context></context-group></trans-unit><trans-unit id="8192718423057883427" datatype="html">@@ -1226,7 +1226,7 @@<target state="translated">Taux d'Ăpargne</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">242</context>+ <context context-type="linenumber">245</context></context-group></trans-unit><trans-unit id="6a95e051c4fd80012488effb15d2842b2155ae5e" datatype="html">@@ -2209,28 +2209,12 @@<context context-type="linenumber">12</context></context-group></trans-unit>- <trans-unit id="2937311350146031865" datatype="html">- <source>Initial</source>- <target state="translated">Initial</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">58</context>- </context-group>- </trans-unit>- <trans-unit id="6603000223840533819" datatype="html">- <source>Current</source>- <target state="translated">Actuel</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">59</context>- </context-group>- </trans-unit><trans-unit id="2078421919111943467" datatype="html"><source>Filter by account or tag...</source><target state="translated">Filtrer par compte ou Ă©tiquette...</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">137</context>+ <context context-type="linenumber">132</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>@@ -2270,7 +2254,7 @@<target state="translated">Par Devise</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">67</context>+ <context context-type="linenumber">61</context></context-group></trans-unit><trans-unit id="8288ff761f2d259625d2e5a3d96db727926d9cd4" datatype="html">@@ -2278,7 +2262,7 @@<target state="translated">Par Classe d'Actifs</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">96</context>+ <context context-type="linenumber">84</context></context-group></trans-unit><trans-unit id="b64539bb7815eb3275b55ad723d3897fc6ba8d23" datatype="html">@@ -2286,7 +2270,7 @@<target state="translated">Par Position</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">125</context>+ <context context-type="linenumber">107</context></context-group></trans-unit><trans-unit id="9f86714c9a6b74e13c96ab02102ce40c34fe13b9" datatype="html">@@ -2294,7 +2278,7 @@<target state="translated">Par Secteur</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">154</context>+ <context context-type="linenumber">130</context></context-group></trans-unit><trans-unit id="7017e0e26b53ef322c3e3bbf95f06a85487a12b2" datatype="html">@@ -2302,7 +2286,7 @@<target state="translated">Par Continent</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">184</context>+ <context context-type="linenumber">154</context></context-group></trans-unit><trans-unit id="f27e9dd8de80176286e02312e694cb8d1e485a5d" datatype="html">@@ -2310,7 +2294,7 @@<target state="translated">Par Pays</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">213</context>+ <context context-type="linenumber">177</context></context-group></trans-unit><trans-unit id="85780db87ac6c9f202615ac63754551c061e7236" datatype="html">@@ -2318,7 +2302,7 @@<target state="translated">RĂ©gions</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">245</context>+ <context context-type="linenumber">203</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2330,7 +2314,7 @@<target state="translated">MarchĂ©s DĂ©veloppĂ©s</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">272</context>+ <context context-type="linenumber">224</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2342,7 +2326,7 @@<target state="translated">MarchĂ©s Ămergents</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">233</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2354,7 +2338,7 @@<target state="translated">Autres marchĂ©s</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">290</context>+ <context context-type="linenumber">242</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2390,7 +2374,7 @@</context-group><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">283</context></context-group></trans-unit><trans-unit id="6762743264882388498" datatype="html">@@ -2790,7 +2774,7 @@<target state="translated">IntĂ©rĂȘt</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">291</context>+ <context context-type="linenumber">293</context></context-group></trans-unit><trans-unit id="1054498214311181686" datatype="html">@@ -2798,7 +2782,7 @@<target state="translated">Ăpargne</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">301</context>+ <context context-type="linenumber">303</context></context-group></trans-unit><trans-unit id="2ee26d58f2707416e636887111d5603b35346c4a" datatype="html">diff --git a/apps/client/src/locales/messages.it.xlf b/apps/client/src/locales/messages.it.xlfindex 4c5b0f1e2f..3556e46d8e 100644--- a/apps/client/src/locales/messages.it.xlf+++ b/apps/client/src/locales/messages.it.xlf@@ -1695,7 +1695,7 @@<target state="translated">Per valuta</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">67</context>+ <context context-type="linenumber">61</context></context-group></trans-unit><trans-unit id="8288ff761f2d259625d2e5a3d96db727926d9cd4" datatype="html">@@ -1703,7 +1703,7 @@<target state="translated">Per asset class</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">96</context>+ <context context-type="linenumber">84</context></context-group></trans-unit><trans-unit id="b64539bb7815eb3275b55ad723d3897fc6ba8d23" datatype="html">@@ -1711,7 +1711,7 @@<target state="translated">Per partecipazione</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">125</context>+ <context context-type="linenumber">107</context></context-group></trans-unit><trans-unit id="9f86714c9a6b74e13c96ab02102ce40c34fe13b9" datatype="html">@@ -1719,7 +1719,7 @@<target state="translated">Per settore</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">154</context>+ <context context-type="linenumber">130</context></context-group></trans-unit><trans-unit id="7017e0e26b53ef322c3e3bbf95f06a85487a12b2" datatype="html">@@ -1727,7 +1727,7 @@<target state="translated">Per continente</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">184</context>+ <context context-type="linenumber">154</context></context-group></trans-unit><trans-unit id="f27e9dd8de80176286e02312e694cb8d1e485a5d" datatype="html">@@ -1735,7 +1735,7 @@<target state="translated">Per paese</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">213</context>+ <context context-type="linenumber">177</context></context-group></trans-unit><trans-unit id="85780db87ac6c9f202615ac63754551c061e7236" datatype="html">@@ -1743,7 +1743,7 @@<target state="translated">Regioni</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">245</context>+ <context context-type="linenumber">203</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2295,7 +2295,7 @@<target state="translated">Mercati sviluppati</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">272</context>+ <context context-type="linenumber">224</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2343,7 +2343,7 @@<target state="translated">Altri mercati</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">290</context>+ <context context-type="linenumber">242</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2355,7 +2355,7 @@<target state="translated">Mercati emergenti</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">233</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2423,15 +2423,7 @@<target state="translated">Risparmio</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">301</context>- </context-group>- </trans-unit>- <trans-unit id="2937311350146031865" datatype="html">- <source>Initial</source>- <target state="translated">Iniziale</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">58</context>+ <context context-type="linenumber">303</context></context-group></trans-unit><trans-unit id="3441715041566940420" datatype="html">@@ -2439,7 +2431,7 @@<target state="translated">Interesse</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">291</context>+ <context context-type="linenumber">293</context></context-group></trans-unit><trans-unit id="5213771062241898526" datatype="html">@@ -2455,15 +2447,7 @@</context-group><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">281</context>- </context-group>- </trans-unit>- <trans-unit id="6603000223840533819" datatype="html">- <source>Current</source>- <target state="translated">Attuale</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">59</context>+ <context context-type="linenumber">283</context></context-group></trans-unit><trans-unit id="6762743264882388498" datatype="html">@@ -2511,7 +2495,7 @@<target state="translated">Filtra per account o tag...</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">137</context>+ <context context-type="linenumber">132</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>@@ -2667,7 +2651,7 @@<target state="new">Total Amount</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">178</context>+ <context context-type="linenumber">181</context></context-group></trans-unit><trans-unit id="f1a355a1af2e818050a3af693ac8b521fa7edc5f" datatype="html">@@ -2683,7 +2667,7 @@<target state="translated">Tasso di risparmio</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">242</context>+ <context context-type="linenumber">245</context></context-group></trans-unit><trans-unit id="4086606389696938932" datatype="html">diff --git a/apps/client/src/locales/messages.nl.xlf b/apps/client/src/locales/messages.nl.xlfindex 24df5019c4..2b14a8b8b7 100644--- a/apps/client/src/locales/messages.nl.xlf+++ b/apps/client/src/locales/messages.nl.xlf@@ -1694,7 +1694,7 @@<target state="translated">Per valuta</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">67</context>+ <context context-type="linenumber">61</context></context-group></trans-unit><trans-unit id="8288ff761f2d259625d2e5a3d96db727926d9cd4" datatype="html">@@ -1702,7 +1702,7 @@<target state="translated">Per activaklasse</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">96</context>+ <context context-type="linenumber">84</context></context-group></trans-unit><trans-unit id="b64539bb7815eb3275b55ad723d3897fc6ba8d23" datatype="html">@@ -1710,7 +1710,7 @@<target state="translated">Per participatie</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">125</context>+ <context context-type="linenumber">107</context></context-group></trans-unit><trans-unit id="9f86714c9a6b74e13c96ab02102ce40c34fe13b9" datatype="html">@@ -1718,7 +1718,7 @@<target state="translated">Per Sector</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">154</context>+ <context context-type="linenumber">130</context></context-group></trans-unit><trans-unit id="7017e0e26b53ef322c3e3bbf95f06a85487a12b2" datatype="html">@@ -1726,7 +1726,7 @@<target state="translated">Per continent</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">184</context>+ <context context-type="linenumber">154</context></context-group></trans-unit><trans-unit id="f27e9dd8de80176286e02312e694cb8d1e485a5d" datatype="html">@@ -1734,7 +1734,7 @@<target state="translated">Per land</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">213</context>+ <context context-type="linenumber">177</context></context-group></trans-unit><trans-unit id="85780db87ac6c9f202615ac63754551c061e7236" datatype="html">@@ -1742,7 +1742,7 @@<target state="translated">Regio's</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">245</context>+ <context context-type="linenumber">203</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2294,7 +2294,7 @@<target state="translated">Ontwikkelde markten</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">272</context>+ <context context-type="linenumber">224</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2342,7 +2342,7 @@<target state="translated">Andere markten</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">290</context>+ <context context-type="linenumber">242</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2354,7 +2354,7 @@<target state="translated">Opkomende markten</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">233</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2422,15 +2422,7 @@<target state="translated">Besparingen</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">301</context>- </context-group>- </trans-unit>- <trans-unit id="2937311350146031865" datatype="html">- <source>Initial</source>- <target state="translated">Aanvankelijk</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">58</context>+ <context context-type="linenumber">303</context></context-group></trans-unit><trans-unit id="3441715041566940420" datatype="html">@@ -2438,7 +2430,7 @@<target state="translated">Rente</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">291</context>+ <context context-type="linenumber">293</context></context-group></trans-unit><trans-unit id="5213771062241898526" datatype="html">@@ -2454,15 +2446,7 @@</context-group><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">281</context>- </context-group>- </trans-unit>- <trans-unit id="6603000223840533819" datatype="html">- <source>Current</source>- <target state="translated">Huidige</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">59</context>+ <context context-type="linenumber">283</context></context-group></trans-unit><trans-unit id="6762743264882388498" datatype="html">@@ -2510,7 +2494,7 @@<target state="translated">Filter op account of tag...</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">137</context>+ <context context-type="linenumber">132</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>@@ -2666,7 +2650,7 @@<target state="translated">Totaalbedrag</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">178</context>+ <context context-type="linenumber">181</context></context-group></trans-unit><trans-unit id="f1a355a1af2e818050a3af693ac8b521fa7edc5f" datatype="html">@@ -2682,7 +2666,7 @@<target state="translated">Spaarquote</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">242</context>+ <context context-type="linenumber">245</context></context-group></trans-unit><trans-unit id="4086606389696938932" datatype="html">diff --git a/apps/client/src/locales/messages.pt.xlf b/apps/client/src/locales/messages.pt.xlfindex 7ac806d282..aa0037b3d9 100644--- a/apps/client/src/locales/messages.pt.xlf+++ b/apps/client/src/locales/messages.pt.xlf@@ -1114,7 +1114,7 @@</context-group><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">283</context></context-group></trans-unit><trans-unit id="112783260724635106" datatype="html">@@ -1122,7 +1122,7 @@<target state="new">Total Amount</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">178</context>+ <context context-type="linenumber">181</context></context-group></trans-unit><trans-unit id="8192718423057883427" datatype="html">@@ -1130,7 +1130,7 @@<target state="new">Savings Rate</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">242</context>+ <context context-type="linenumber">245</context></context-group></trans-unit><trans-unit id="6a95e051c4fd80012488effb15d2842b2155ae5e" datatype="html">@@ -2153,28 +2153,12 @@<context context-type="linenumber">12</context></context-group></trans-unit>- <trans-unit id="2937311350146031865" datatype="html">- <source>Initial</source>- <target state="new">Initial</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">58</context>- </context-group>- </trans-unit>- <trans-unit id="6603000223840533819" datatype="html">- <source>Current</source>- <target state="new">Current</target>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">59</context>- </context-group>- </trans-unit><trans-unit id="2078421919111943467" datatype="html"><source>Filter by account or tag...</source><target state="new">Filter by account or tag...</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">137</context>+ <context context-type="linenumber">132</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>@@ -2214,7 +2198,7 @@<target state="new">By Currency</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">67</context>+ <context context-type="linenumber">61</context></context-group></trans-unit><trans-unit id="8288ff761f2d259625d2e5a3d96db727926d9cd4" datatype="html">@@ -2222,7 +2206,7 @@<target state="new">By Asset Class</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">96</context>+ <context context-type="linenumber">84</context></context-group></trans-unit><trans-unit id="b64539bb7815eb3275b55ad723d3897fc6ba8d23" datatype="html">@@ -2230,7 +2214,7 @@<target state="new">By Holding</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">125</context>+ <context context-type="linenumber">107</context></context-group></trans-unit><trans-unit id="9f86714c9a6b74e13c96ab02102ce40c34fe13b9" datatype="html">@@ -2238,7 +2222,7 @@<target state="new">By Sector</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">154</context>+ <context context-type="linenumber">130</context></context-group></trans-unit><trans-unit id="7017e0e26b53ef322c3e3bbf95f06a85487a12b2" datatype="html">@@ -2246,7 +2230,7 @@<target state="new">By Continent</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">184</context>+ <context context-type="linenumber">154</context></context-group></trans-unit><trans-unit id="f27e9dd8de80176286e02312e694cb8d1e485a5d" datatype="html">@@ -2254,7 +2238,7 @@<target state="new">By Country</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">213</context>+ <context context-type="linenumber">177</context></context-group></trans-unit><trans-unit id="85780db87ac6c9f202615ac63754551c061e7236" datatype="html">@@ -2262,7 +2246,7 @@<target state="new">Regions</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">245</context>+ <context context-type="linenumber">203</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2274,7 +2258,7 @@<target state="new">Developed Markets</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">272</context>+ <context context-type="linenumber">224</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2286,7 +2270,7 @@<target state="new">Emerging Markets</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">233</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2298,7 +2282,7 @@<target state="new">Other Markets</target><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">290</context>+ <context context-type="linenumber">242</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2706,7 +2690,7 @@<target state="new">Interest</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">291</context>+ <context context-type="linenumber">293</context></context-group></trans-unit><trans-unit id="1054498214311181686" datatype="html">@@ -2714,7 +2698,7 @@<target state="new">Savings</target><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">301</context>+ <context context-type="linenumber">303</context></context-group></trans-unit><trans-unit id="4086606389696938932" datatype="html">diff --git a/apps/client/src/locales/messages.xlf b/apps/client/src/locales/messages.xlfindex e7c9e1acad..8270e5505d 100644--- a/apps/client/src/locales/messages.xlf+++ b/apps/client/src/locales/messages.xlf@@ -1529,49 +1529,49 @@<source>By Currency</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">67</context>+ <context context-type="linenumber">61</context></context-group></trans-unit><trans-unit id="8288ff761f2d259625d2e5a3d96db727926d9cd4" datatype="html"><source>By Asset Class</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">96</context>+ <context context-type="linenumber">84</context></context-group></trans-unit><trans-unit id="b64539bb7815eb3275b55ad723d3897fc6ba8d23" datatype="html"><source>By Holding</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">125</context>+ <context context-type="linenumber">107</context></context-group></trans-unit><trans-unit id="9f86714c9a6b74e13c96ab02102ce40c34fe13b9" datatype="html"><source>By Sector</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">154</context>+ <context context-type="linenumber">130</context></context-group></trans-unit><trans-unit id="7017e0e26b53ef322c3e3bbf95f06a85487a12b2" datatype="html"><source>By Continent</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">184</context>+ <context context-type="linenumber">154</context></context-group></trans-unit><trans-unit id="f27e9dd8de80176286e02312e694cb8d1e485a5d" datatype="html"><source>By Country</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">213</context>+ <context context-type="linenumber">177</context></context-group></trans-unit><trans-unit id="85780db87ac6c9f202615ac63754551c061e7236" datatype="html"><source>Regions</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">245</context>+ <context context-type="linenumber">203</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2062,7 +2062,7 @@<source>Developed Markets</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">272</context>+ <context context-type="linenumber">224</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2106,7 +2106,7 @@<source>Other Markets</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">290</context>+ <context context-type="linenumber">242</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2117,7 +2117,7 @@<source>Emerging Markets</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.html</context>- <context context-type="linenumber">281</context>+ <context context-type="linenumber">233</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/public/public-page.html</context>@@ -2178,21 +2178,14 @@<source>Savings</source><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">301</context>- </context-group>- </trans-unit>- <trans-unit id="2937311350146031865" datatype="html">- <source>Initial</source>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">58</context>+ <context context-type="linenumber">303</context></context-group></trans-unit><trans-unit id="3441715041566940420" datatype="html"><source>Interest</source><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">291</context>+ <context context-type="linenumber">293</context></context-group></trans-unit><trans-unit id="5213771062241898526" datatype="html">@@ -2207,14 +2200,7 @@</context-group><context-group purpose="location"><context context-type="sourcefile">libs/ui/src/lib/fire-calculator/fire-calculator.component.ts</context>- <context context-type="linenumber">281</context>- </context-group>- </trans-unit>- <trans-unit id="6603000223840533819" datatype="html">- <source>Current</source>- <context-group purpose="location">- <context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">59</context>+ <context context-type="linenumber">283</context></context-group></trans-unit><trans-unit id="6762743264882388498" datatype="html">@@ -2256,7 +2242,7 @@<source>Filter by account or tag...</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/allocations/allocations-page.component.ts</context>- <context context-type="linenumber">137</context>+ <context context-type="linenumber">132</context></context-group><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts</context>@@ -2394,7 +2380,7 @@<source>Total Amount</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">178</context>+ <context context-type="linenumber">181</context></context-group></trans-unit><trans-unit id="f1a355a1af2e818050a3af693ac8b521fa7edc5f" datatype="html">@@ -2408,7 +2394,7 @@<source>Savings Rate</source><context-group purpose="location"><context context-type="sourcefile">apps/client/src/app/components/investment-chart/investment-chart.component.ts</context>- <context context-type="linenumber">242</context>+ <context context-type="linenumber">245</context></context-group></trans-unit><trans-unit id="1270654249046226808" datatype="html">diff --git a/libs/common/src/lib/interfaces/portfolio-position.interface.ts b/libs/common/src/lib/interfaces/portfolio-position.interface.tsindex c0c0dd6fba..126ffdab7b 100644--- a/libs/common/src/lib/interfaces/portfolio-position.interface.ts+++ b/libs/common/src/lib/interfaces/portfolio-position.interface.ts@@ -5,8 +5,7 @@ import { Country } from './country.interface';import { Sector } from './sector.interface';export interface PortfolioPosition {- allocationCurrent: number;- allocationInvestment: number;+ allocationInPercentage: number;assetClass?: AssetClass;assetSubClass?: AssetSubClass | 'CASH';countries: Country[];diff --git a/libs/common/src/lib/interfaces/portfolio-public-details.interface.ts b/libs/common/src/lib/interfaces/portfolio-public-details.interface.tsindex 52dddae3c4..2ba22a3d2c 100644--- a/libs/common/src/lib/interfaces/portfolio-public-details.interface.ts+++ b/libs/common/src/lib/interfaces/portfolio-public-details.interface.ts@@ -6,7 +6,7 @@ export interface PortfolioPublicDetails {holdings: {[symbol: string]: Pick<PortfolioPosition,- | 'allocationCurrent'+ | 'allocationInPercentage'| 'countries'| 'currency'| 'dataSource'diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.html b/libs/ui/src/lib/holdings-table/holdings-table.component.htmlindex cc76cd687b..b994ba129e 100644--- a/libs/ui/src/lib/holdings-table/holdings-table.component.html+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.html@@ -3,7 +3,7 @@class="gf-table w-100"mat-tablematSort- matSortActive="allocationCurrent"+ matSortActive="allocationInPercentage"matSortDirection="desc"[dataSource]="dataSource">@@ -85,7 +85,7 @@</td></ng-container>- <ng-container matColumnDef="allocationCurrent">+ <ng-container matColumnDef="allocationInPercentage"><th*matHeaderCellDefclass="justify-content-end px-1"@@ -99,7 +99,7 @@<gf-value[isPercent]="true"[locale]="locale"- [value]="isLoading ? undefined : element.allocationCurrent"+ [value]="isLoading ? undefined : element.allocationInPercentage"></gf-value></div></td>diff --git a/libs/ui/src/lib/holdings-table/holdings-table.component.ts b/libs/ui/src/lib/holdings-table/holdings-table.component.tsindex 6ff3c1c7f1..a4aee77102 100644--- a/libs/ui/src/lib/holdings-table/holdings-table.component.ts+++ b/libs/ui/src/lib/holdings-table/holdings-table.component.ts@@ -58,7 +58,7 @@ export class HoldingsTableComponent implements OnChanges, OnDestroy, OnInit {this.displayedColumns.push('value');}- this.displayedColumns.push('allocationCurrent');+ this.displayedColumns.push('allocationInPercentage');this.displayedColumns.push('performance');this.isLoading = true;