diff --git a/CHANGELOG.md b/CHANGELOG.md index 41807c011..1e814cfcd 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 + +- Improved the usability of the benchmarks in the markets overview + ### Fixed - Fixed a missing value in the activities table on mobile diff --git a/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html b/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html index ec49b7021..5dcaa0cf7 100644 --- a/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html +++ b/apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html @@ -24,9 +24,9 @@

- Ghostfolio manages currencies automatically based on all the recored - activities. If you need an additional currency, you can manually - enter it. + Ghostfolio manages currencies automatically based on all the + recorded activities. If you need an additional currency, you can + manually enter it.

  1. Go to the Admin Control panel
  2. diff --git a/libs/common/src/lib/helper.ts b/libs/common/src/lib/helper.ts index c6a15e22e..e55800628 100644 --- a/libs/common/src/lib/helper.ts +++ b/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 }; } } diff --git a/libs/ui/src/lib/benchmark/benchmark.component.html b/libs/ui/src/lib/benchmark/benchmark.component.html index 2e5c819e7..9497c63f4 100644 --- a/libs/ui/src/lib/benchmark/benchmark.component.html +++ b/libs/ui/src/lib/benchmark/benchmark.component.html @@ -102,7 +102,7 @@ @if (element?.marketCondition) { -
    +
    {{ resolveMarketCondition(element.marketCondition).emoji }}
    } diff --git a/libs/ui/src/lib/benchmark/benchmark.component.ts b/libs/ui/src/lib/benchmark/benchmark.component.ts index 5509886af..032c131bf 100644 --- a/libs/ui/src/lib/benchmark/benchmark.component.ts +++ b/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() {} diff --git a/libs/ui/src/lib/i18n.ts b/libs/ui/src/lib/i18n.ts index 53c2d3a77..9687f461c 100644 --- a/libs/ui/src/lib/i18n.ts +++ b/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`,