Merge branch 'main' into bugfix/readd-value-in-base-currency-to-activity

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Improved the usability of the benchmarks in the markets overview
+
 ### Fixed
 
 - Fixed a missing value in the activities table on mobile

apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html

@@ -24,9 +24,9 @@
         </mat-card-header>
         <mat-card-content>
           <p>
-            Ghostfolio manages currencies automatically based on all the recored
+            Ghostfolio manages currencies automatically based on all the
-            activities. If you need an additional currency, you can manually
+            recorded activities. If you need an additional currency, you can
-            enter it.
+            manually enter it.
           </p>
           <ol>
             <li>Go to the <i>Admin Control</i> panel</li>

libs/common/src/lib/helper.ts

@@ -393,6 +393,6 @@ export function resolveMarketCondition(
   } else if (aMarketCondition === 'BEAR_MARKET') {
     return { emoji: '🐻' };
   } else {
-    return { emoji: '⚪' };
+    return { emoji: undefined };
   }
 }

libs/ui/src/lib/benchmark/benchmark.component.html

@@ -102,7 +102,7 @@
     <th *matHeaderCellDef mat-header-cell></th>
     <td *matCellDef="let element" class="px-0" mat-cell>
       @if (element?.marketCondition) {
-        <div class="text-center" [title]="element?.marketCondition">
+        <div class="text-center" [title]="translate(element.marketCondition)">
           {{ resolveMarketCondition(element.marketCondition).emoji }}
         </div>
       }

libs/ui/src/lib/benchmark/benchmark.component.ts

@@ -1,5 +1,6 @@
 import { getLocale, resolveMarketCondition } from '@ghostfolio/common/helper';
 import { Benchmark, User } from '@ghostfolio/common/interfaces';
+import { translate } from '@ghostfolio/ui/i18n';
 
 import {
   ChangeDetectionStrategy,
@@ -21,6 +22,7 @@ export class BenchmarkComponent implements OnChanges {
 
   public displayedColumns = ['name', 'date', 'change', 'marketCondition'];
   public resolveMarketCondition = resolveMarketCondition;
+  public translate = translate;
 
   public constructor() {}
 

libs/ui/src/lib/i18n.ts

@@ -35,14 +35,14 @@ const locales = {
   LIABILITY: $localize`Liability`,
   SELL: $localize`Sell`,
 
-  // enum AssetClass
+  // AssetClass (enum)
   CASH: $localize`Cash`,
   COMMODITY: $localize`Commodity`,
   EQUITY: $localize`Equity`,
   FIXED_INCOME: $localize`Fixed Income`,
   REAL_ESTATE: $localize`Real Estate`,
 
-  // enum AssetSubClass
+  // AssetSubClass (enum)
   BOND: $localize`Bond`,
   CRYPTOCURRENCY: $localize`Cryptocurrency`,
   ETF: $localize`ETF`,
@@ -51,6 +51,10 @@ const locales = {
   PRIVATE_EQUITY: $localize`Private Equity`,
   STOCK: $localize`Stock`,
 
+  // Benchmark
+  ALL_TIME_HIGH: 'All time high',
+  BEAR_MARKET: 'Bear market',
+
   // Continents
   Africa: $localize`Africa`,
   Asia: $localize`Asia`,