Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/improve wording of X-ray page to use neutral form (#7600)
Thomas Kaul5aa9bb135df3
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 06cac690fe..c9d3a91f31 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Changed+- Improved the wording of the _X-ray_ page to use a neutral form- Moved the support to clone an activity in the account detail dialog from experimental to general availability- Moved the support to clone an activity in the holding detail dialog from experimental to general availability- Moved the support to edit an activity in the account detail dialog from experimental to general availabilitydiff --git a/apps/client/src/app/pages/i18n/i18n-page.html b/apps/client/src/app/pages/i18n/i18n-page.htmlindex a685074ee5..3c2558ec56 100644--- a/apps/client/src/app/pages/i18n/i18n-page.html+++ b/apps/client/src/app/pages/i18n/i18n-page.html@@ -14,70 +14,70 @@<li i18n="@@rule.accountClusterRisk.category">Account Cluster Risks</li><li i18n="@@rule.accountClusterRiskCurrentInvestment">Investment</li><li i18n="@@rule.accountClusterRiskCurrentInvestment.false">- Over ${thresholdMax}% of your current investment is at+ Over ${thresholdMax}% of the current investment is at${maxAccountName} (${maxInvestmentRatio}%)</li><li i18n="@@rule.accountClusterRiskCurrentInvestment.false.invalid">No accounts have been set up</li><li i18n="@@rule.accountClusterRiskCurrentInvestment.true">- The major part of your current investment is at+ The major part of the current investment is at${maxAccountName} (${maxInvestmentRatio}%) and doesnot exceed ${thresholdMax}%</li><li i18n="@@rule.accountClusterRiskSingleAccount">Single Account</li><li i18n="@@rule.accountClusterRiskSingleAccount.false">- Your net worth is managed by a single account+ The net worth is managed by a single account</li><li i18n="@@rule.accountClusterRiskSingleAccount.false.invalid">- Your net worth is managed by 0 accounts+ The net worth is managed by 0 accounts</li><li i18n="@@rule.accountClusterRiskSingleAccount.true">- Your net worth is managed by ${accountsLength} accounts+ The net worth is managed by ${accountsLength} accounts</li><li i18n="@@rule.assetClassClusterRisk.category">Asset Class Cluster Risks</li><li i18n="@@rule.assetClassClusterRiskEquity">Equity</li><li i18n="@@rule.assetClassClusterRiskEquity.false.max">- The equity contribution of your current investment+ The equity contribution of the current investment(${equityValueRatio}%) exceeds ${thresholdMax}%</li><li i18n="@@rule.assetClassClusterRiskEquity.false.min">- The equity contribution of your current investment+ The equity contribution of the current investment(${equityValueRatio}%) is below ${thresholdMin}%</li><li i18n="@@rule.assetClassClusterRiskEquity.true">- The equity contribution of your current investment+ The equity contribution of the current investment(${equityValueRatio}%) is within the range of${thresholdMin}% and ${thresholdMax}%</li><li i18n="@@rule.assetClassClusterRiskFixedIncome">Fixed Income</li><li i18n="@@rule.assetClassClusterRiskFixedIncome.false.max">- The fixed income contribution of your current investment+ The fixed income contribution of the current investment(${fixedIncomeValueRatio}%) exceeds ${thresholdMax}%</li><li i18n="@@rule.assetClassClusterRiskFixedIncome.false.min">- The fixed income contribution of your current investment+ The fixed income contribution of the current investment(${fixedIncomeValueRatio}%) is below${thresholdMin}%</li><li i18n="@@rule.assetClassClusterRiskFixedIncome.true">- The fixed income contribution of your current investment+ The fixed income contribution of the current investment(${fixedIncomeValueRatio}%) is within the range of${thresholdMin}% and ${thresholdMax}%</li><li i18n="@@rule.liquidity.category">Liquidity</li><li i18n="@@rule.liquidityBuyingPower">Buying Power</li><li i18n="@@rule.liquidityBuyingPower.false.min">- Your buying power is below ${thresholdMin}+ The buying power is below ${thresholdMin}${baseCurrency}</li><li i18n="@@rule.liquidityBuyingPower.false.zero">- Your buying power is 0 ${baseCurrency}+ The buying power is 0 ${baseCurrency}</li><li i18n="@@rule.liquidityBuyingPower.true">- Your buying power exceeds ${thresholdMin}+ The buying power exceeds ${thresholdMin}${baseCurrency}</li><li i18n="@@rule.currencyClusterRisk.category">Currency Cluster Risks</li>@@ -85,20 +85,20 @@Investment: Base Currency</li><li i18n="@@rule.currencyClusterRiskBaseCurrencyCurrentInvestment.false">- The major part of your current investment is not in your base currency+ The major part of the current investment is not in the base currency(${baseCurrencyValueRatio}% in ${baseCurrency})</li><li i18n="@@rule.currencyClusterRiskBaseCurrencyCurrentInvestment.true">- The major part of your current investment is in your base currency+ The major part of the current investment is in the base currency(${baseCurrencyValueRatio}% in ${baseCurrency})</li><li i18n="@@rule.currencyClusterRiskCurrentInvestment">Investment</li><li i18n="@@rule.currencyClusterRiskCurrentInvestment.false">- Over ${thresholdMax}% of your current investment is in+ Over ${thresholdMax}% of the current investment is in${currency} (${maxValueRatio}%)</li><li i18n="@@rule.currencyClusterRiskCurrentInvestment.true">- The major part of your current investment is in ${currency}+ The major part of the current investment is in ${currency}(${maxValueRatio}%) and does not exceed${thresholdMax}%</li>@@ -109,17 +109,17 @@Developed Markets</li><li i18n="@@rule.economicMarketClusterRiskDevelopedMarkets.false.max">- The developed markets contribution of your current investment+ The developed markets contribution of the current investment(${developedMarketsValueRatio}%) exceeds${thresholdMax}%</li><li i18n="@@rule.economicMarketClusterRiskDevelopedMarkets.false.min">- The developed markets contribution of your current investment+ The developed markets contribution of the current investment(${developedMarketsValueRatio}%) is below${thresholdMin}%</li><li i18n="@@rule.economicMarketClusterRiskDevelopedMarkets.true">- The developed markets contribution of your current investment+ The developed markets contribution of the current investment(${developedMarketsValueRatio}%) is within the range of${thresholdMin}% and ${thresholdMax}%</li>@@ -127,35 +127,35 @@Emerging Markets</li><li i18n="@@rule.economicMarketClusterRiskEmergingMarkets.false.max">- The emerging markets contribution of your current investment+ The emerging markets contribution of the current investment(${emergingMarketsValueRatio}%) exceeds${thresholdMax}%</li><li i18n="@@rule.economicMarketClusterRiskEmergingMarkets.false.min">- The emerging markets contribution of your current investment+ The emerging markets contribution of the current investment(${emergingMarketsValueRatio}%) is below${thresholdMin}%</li><li i18n="@@rule.economicMarketClusterRiskEmergingMarkets.true">- The emerging markets contribution of your current investment+ The emerging markets contribution of the current investment(${emergingMarketsValueRatio}%) is within the range of${thresholdMin}% and ${thresholdMax}%</li><li i18n="@@rule.emergencyFund.category">Emergency Fund</li><li i18n="@@rule.emergencyFundCoverage">Coverage</li><li i18n="@@rule.emergencyFundCoverage.false.over">- The assets tagged as emergency fund exceed your emergency fund of+ The assets tagged as emergency fund exceed the emergency fund of${emergencyFund} ${baseCurrency}</li><li i18n="@@rule.emergencyFundCoverage.false.under">- Your emergency fund of ${emergencyFund}+ The emergency fund of ${emergencyFund}${baseCurrency} is not covered</li><li i18n="@@rule.emergencyFundCoverage.false.unset">No emergency fund amount has been set to determine the coverage</li><li i18n="@@rule.emergencyFundCoverage.true">- Your emergency fund of ${emergencyFund}+ The emergency fund of ${emergencyFund}${baseCurrency} is covered</li><li i18n="@@rule.emergencyFundSetup">Setup</li>@@ -167,11 +167,11 @@</li><li i18n="@@rule.feeRatioTotalInvestmentVolume">Fee Ratio</li><li i18n="@@rule.feeRatioTotalInvestmentVolume.false">- The fees do exceed ${thresholdMax}% of your total investment+ The fees do exceed ${thresholdMax}% of the total investmentvolume (${feeRatio}%)</li><li i18n="@@rule.feeRatioTotalInvestmentVolume.true">- The fees do not exceed ${thresholdMax}% of your total+ The fees do not exceed ${thresholdMax}% of the totalinvestment volume (${feeRatio}%)</li><li i18n="@@rule.fees.category">Fees</li>@@ -180,15 +180,15 @@</li><li i18n="@@rule.regionalMarketClusterRiskAsiaPacific">Asia-Pacific</li><li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.max">- The Asia-Pacific market contribution of your current investment+ The Asia-Pacific market contribution of the current investment(${valueRatio}%) exceeds ${thresholdMax}%</li><li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.false.min">- The Asia-Pacific market contribution of your current investment+ The Asia-Pacific market contribution of the current investment(${valueRatio}%) is below ${thresholdMin}%</li><li i18n="@@rule.regionalMarketClusterRiskAsiaPacific.true">- The Asia-Pacific market contribution of your current investment+ The Asia-Pacific market contribution of the current investment(${valueRatio}%) is within the range of${thresholdMin}% and ${thresholdMax}%</li>@@ -196,57 +196,57 @@Emerging Markets</li><li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.max">- The Emerging Markets contribution of your current investment+ The Emerging Markets contribution of the current investment(${valueRatio}%) exceeds ${thresholdMax}%</li><li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.false.min">- The Emerging Markets contribution of your current investment+ The Emerging Markets contribution of the current investment(${valueRatio}%) is below ${thresholdMin}%</li><li i18n="@@rule.regionalMarketClusterRiskEmergingMarkets.true">- The Emerging Markets contribution of your current investment+ The Emerging Markets contribution of the current investment(${valueRatio}%) is within the range of${thresholdMin}% and ${thresholdMax}%</li><li i18n="@@rule.regionalMarketClusterRiskEurope">Europe</li><li i18n="@@rule.regionalMarketClusterRiskEurope.false.max">- The Europe market contribution of your current investment+ The Europe market contribution of the current investment(${valueRatio}%) exceeds ${thresholdMax}%</li><li i18n="@@rule.regionalMarketClusterRiskEurope.false.min">- The Europe market contribution of your current investment+ The Europe market contribution of the current investment(${valueRatio}%) is below ${thresholdMin}%</li><li i18n="@@rule.regionalMarketClusterRiskEurope.true">- The Europe market contribution of your current investment+ The Europe market contribution of the current investment(${valueRatio}%) is within the range of${thresholdMin}% and ${thresholdMax}%</li><li i18n="@@rule.regionalMarketClusterRiskJapan">Japan</li><li i18n="@@rule.regionalMarketClusterRiskJapan.false.max">- The Japan market contribution of your current investment+ The Japan market contribution of the current investment(${valueRatio}%) exceeds ${thresholdMax}%</li><li i18n="@@rule.regionalMarketClusterRiskJapan.false.min">- The Japan market contribution of your current investment+ The Japan market contribution of the current investment(${valueRatio}%) is below ${thresholdMin}%</li><li i18n="@@rule.regionalMarketClusterRiskJapan.true">- The Japan market contribution of your current investment+ The Japan market contribution of the current investment(${valueRatio}%) is within the range of${thresholdMin}% and ${thresholdMax}%</li><li i18n="@@rule.regionalMarketClusterRiskNorthAmerica">North America</li><li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.max">- The North America market contribution of your current investment+ The North America market contribution of the current investment(${valueRatio}%) exceeds ${thresholdMax}%</li><li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.false.min">- The North America market contribution of your current investment+ The North America market contribution of the current investment(${valueRatio}%) is below ${thresholdMin}%</li><li i18n="@@rule.regionalMarketClusterRiskNorthAmerica.true">- The North America market contribution of your current investment+ The North America market contribution of the current investment(${valueRatio}%) is within the range of${thresholdMin}% and ${thresholdMax}%</li>diff --git a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.htmlindex eb6462cfa1..52bfa75912 100644--- a/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html+++ b/apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html@@ -2,10 +2,17 @@<div class="row"><div class="col"><h2 class="d-none d-sm-block h3 mb-3 text-center">X-ray</h2>- <p i18n>- Ghostfolio X-ray uses static analysis to uncover potential issues and- risks in your portfolio. Adjust the rules below and set custom- thresholds to align with your personal investment strategy.+ <p>+ <ng-container i18n+ >Ghostfolio X-ray uses static analysis to uncover potential issues and+ risks in the portfolio.</ng-container+ >+ @if (!hasImpersonationId && hasPermissionToUpdateUserSettings) {+ <ng-container i18n+ >Adjust the rules below and set custom thresholds to align with a+ personal investment strategy.</ng-container+ >+ }</p><div class="d-flex pb-3">@if (isLoading) {@@ -55,7 +62,7 @@<ng-container>{{ statistics?.rulesFulfilledCount }} </ng-container><ng-container i18n>out of</ng-container>{{ statistics?.rulesActiveCount }}- <ng-container i18n>rules align with your portfolio.</ng-container>+ <ng-container i18n>rules align with the portfolio.</ng-container></div>}</div>