Release 1.230.0 (#1639 )

Feature/add sourceforge logo to landing page (#1638 )
* Add SourceForge * Update changelog
2023-01-29 10:00:28 +01:00 · 2023-01-29 09:58:53 +01:00 · 2023-01-29 09:58:05 +01:00 · 2023-01-28 09:42:15 +01:00 · 2023-01-28 09:41:33 +01:00 · 2023-01-27 08:49:31 +01:00
183 changed files with 7770 additions and 2116 deletions
--- a/.github/workflows/build-code.yml
+++ b/.github/workflows/build-code.yml
@ -10,7 +10,7 @@ jobs:
    strategy:
      matrix:
        node_version:
-          - 16
+          - 18
    steps:
      - name: Checkout code
        uses: actions/checkout@v3
--- a/.nvmrc
+++ b/.nvmrc
@ -0,0 +1 @@
+v16
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,133 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## 1.230.0 - 2023-01-29
+
+### Added
+
+- Added an interstitial for the subscription
+- Added _SourceForge_ to the _As seen in_ section on the landing page
+- Added a quote to the blog post _Ghostfolio auf Sackgeld.com vorgestellt_
+
+### Changed
+
+- Improved the unit format (`%`) in the global heat map component of the public page
+- Improved the pricing page
+- Upgraded `Node.js` from version `16` to `18` (`Dockerfile`)
+- Upgraded `prisma` from version `4.8.0` to `4.9.0`
+
+### Fixed
+
+- Fixed the click of unknown accounts in the portfolio proportion chart component
+- Fixed an issue with `value` in the value redaction interceptor for the impersonation mode
+
+## 1.229.0 - 2023-01-21
+
+### Added
+
+- Added a blog post: _Ghostfolio auf Sackgeld.com vorgestellt_
+- Added _Sackgeld.com_ to the _As seen in_ section on the landing page
+
+### Changed
+
+- Removed the toggle _Original Shares_ vs. _Current Shares_ on the allocations page
+- Hid error messages related to no current investment in the client
+- Refactored the value redaction interceptor for the impersonation mode
+
+### Fixed
+
+- Fixed the value of the active (emergency fund) filter in percentage on the allocations page
+
+## 1.228.1 - 2023-01-18
+
+### Added
+
+- Extended the hints in user settings
+
+### Changed
+
+- Improved the date formatting in the tooltip of the dividend timeline grouped by month / year
+- Improved the date formatting in the tooltip of the investment timeline grouped by month / year
+- Reduced the execution interval of the data gathering to every 4 hours
+- Removed emergency fund as an asset class
+
+## 1.227.1 - 2023-01-14
+
+### Changed
+
+- Improved the language localization for German (`de`)
+
+### Fixed
+
+- Fixed the create or edit activity dialog
+
+## 1.227.0 - 2023-01-14
+
+### Added
+
+- Added support for assets other than cash in emergency fund (affecting buying power)
+- Added support for translated tags
+
+### Changed
+
+- Improved the logo alignment
+
+### Fixed
+
+- Fixed the grouping by month / year of the dividend and investment timeline
+
+## 1.226.0 - 2023-01-11
+
+### Added
+
+- Added the language localization for Français (`fr`)
+- Extended the landing page by a global heat map of subscribers
+- Added support for the thousand separator in the global heat map component
+
+### Changed
+
+- Improved the form of the import dividends dialog (disable while loading)
+- Removed the deprecated `~` in _Sass_ imports
+
+### Fixed
+
+- Fixed an exception in the _X-ray_ section
+
+## 1.225.0 - 2023-01-07
+
+### Added
+
+- Added support for importing dividends from a data provider
+
+### Changed
+
+- Extended the Frequently Asked Questions (FAQ) page
+
+## 1.224.0 - 2023-01-04
+
+### Added
+
+- Added support for the dividend timeline grouped by year
+- Added support for the investment timeline grouped by year
+- Set up the language localization for Français (`fr`)
+- Set up the language localization for Português (`pt`)
+
+### Changed
+
+- Improved the language localization for Dutch (`nl`)
+
+## 1.223.0 - 2023-01-01
+
+### Added
+
+- Added a student discount to the pricing page
+- Added a prefix to the codes of the coupon system
+
+### Changed
+
+- Optimized the page titles in the header for mobile
+- Extended the asset profile details dialog in the admin control panel
+
 ## 1.222.0 - 2022-12-29

 ### Added
--- a/4
+++ b/4
@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM node:16-slim as builder
+FROM --platform=$BUILDPLATFORM node:18-slim as builder

 # Build application and add additional files
 WORKDIR /ghostfolio
@ -50,7 +50,7 @@ COPY package.json /ghostfolio/dist/apps/api
 RUN yarn database:generate-typings

 # Image to run, copy everything needed from builder
-FROM node:16-slim
+FROM node:18-slim
 RUN apt update && apt install -y \
    openssl \
    && rm -rf /var/lib/apt/lists/*
--- a/README.md
+++ b/README.md
@ -1,34 +1,26 @@
 <div align="center">
-  <a href="https://ghostfol.io">
-    <img
-      alt="Ghostfolio Logo"
-      src="https://avatars.githubusercontent.com/u/82473144?s=200"
-      width="100"
-    />
-  </a>

-  <h1>Ghostfolio</h1>
-  <p>
-    <strong>Open Source Wealth Management Software</strong>
-  </p>
-  <p>
-    <a href="https://ghostfol.io"><strong>Ghostfol.io</strong></a> | <a href="https://ghostfol.io/en/demo"><strong>Live Demo</strong></a> | <a href="https://ghostfol.io/en/pricing"><strong>Ghostfolio Premium</strong></a> | <a href="https://ghostfol.io/en/faq"><strong>FAQ</strong></a> | <a href="https://ghostfol.io/en/blog"><strong>Blog</strong></a> | <a href="https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg"><strong>Slack</strong></a> | <a href="https://twitter.com/ghostfolio_"><strong>Twitter</strong></a>
-  </p>
-  <p>
-    <a href="https://www.buymeacoffee.com/ghostfolio">
-      <img src="https://img.shields.io/badge/Buy%20me%20a%20coffee-Support-yellow?logo=buymeacoffee"/></a>
-    <a href="#contributing">
-      <img src="https://img.shields.io/badge/Contributions-Welcome-orange.svg"/></a>
-    <a href="https://www.gnu.org/licenses/agpl-3.0" rel="nofollow">
-      <img src="https://img.shields.io/badge/License-AGPL%20v3-blue.svg" alt="License: AGPL v3"/></a>
-  </p>
+[<img src="https://avatars.githubusercontent.com/u/82473144?s=200" width="100" alt="Ghostfolio logo">](https://ghostfol.io)
+
+# Ghostfolio
+
+**Open Source Wealth Management Software**
+
+[**Ghostfol.io**](https://ghostfol.io) | [**Live Demo**](https://ghostfol.io/en/demo) | [**Ghostfolio Premium**](https://ghostfol.io/en/pricing) | [**FAQ**](https://ghostfol.io/en/faq) |
+[**Blog**](https://ghostfol.io/en/blog) | [**Slack**](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) | [**Twitter**](https://twitter.com/ghostfolio_)
+
+[![Shield: Buy me a coffee](https://img.shields.io/badge/Buy%20me%20a%20coffee-Support-yellow?logo=buymeacoffee)](https://www.buymeacoffee.com/ghostfolio)
+[![Shield: Contributions Welcome](https://img.shields.io/badge/Contributions-Welcome-orange.svg)](#contributing)
+[![Shield: License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
+
 </div>

 **Ghostfolio** is an open source wealth management software built with web technology. The application empowers busy people to keep track of stocks, ETFs or cryptocurrencies and make solid, data-driven investment decisions. The software is designed for personal use in continuous operation.

-<div align="center" style="margin-top: 1rem; margin-bottom: 1rem;">
-  <a href="https://www.youtube.com/watch?v=yY6ObSQVJZk">
-    <img src="./apps/client/src/assets/images/video-preview.jpg" width="600"></a>
+<div align="center">
+
+[<img src="./apps/client/src/assets/images/video-preview.jpg" width="600" alt="Preview image of the Ghostfolio video trailer">](https://www.youtube.com/watch?v=yY6ObSQVJZk)
+
 </div>

 ## Ghostfolio Premium
@ -48,7 +40,7 @@ Ghostfolio is for you if you are...
 - 🧘 into minimalism
 - 🧺 caring about diversifying your financial resources
 - 🆓 interested in financial independence
- 🙅 saying no to spreadsheets in 2022
+- 🙅 saying no to spreadsheets in 2023
 - 😎 still reading this list

 ## Features
@ -63,8 +55,10 @@ Ghostfolio is for you if you are...
 - ✅ Zen Mode
 - ✅ Progressive Web App (PWA) with a mobile-first design

-<div align="center" style="margin-top: 1rem; margin-bottom: 1rem;">
-  <img src="./apps/client/src/assets/images/screenshot.png" width="300">
+<div align="center">
+
+<img src="./apps/client/src/assets/images/screenshot.png" width="300" alt="Image of a phone showing the Ghostfolio app open">
+
 </div>

 ## Technology Stack
@ -84,13 +78,9 @@ The frontend is built with [Angular](https://angular.io) and uses [Angular Mater
 We provide official container images hosted on [Docker Hub](https://hub.docker.com/r/ghostfolio/ghostfolio) for `linux/amd64` and `linux/arm64`.

 <div align="center">
-  <a href="https://www.buymeacoffee.com/ghostfolio">
-    <img
-      alt="Buy me a coffee button"
-      src="./apps/client/src/assets/images/button-buy-me-a-coffee.png"
-      width="150"
-    />
-  </a>
+
+[<img src="./apps/client/src/assets/images/button-buy-me-a-coffee.png" width="150" alt="Buy me a coffee button"/>](https://www.buymeacoffee.com/ghostfolio)
+
 </div>

 ### Supported Environment Variables
@ -158,7 +148,7 @@ Please follow the instructions of the Ghostfolio [Unraid Community App](https://
 ### Prerequisites

 - [Docker](https://www.docker.com/products/docker-desktop)
- [Node.js](https://nodejs.org/en/download) (version 16+)
+- [Node.js](https://nodejs.org/en/download) (version 16)
 - [Yarn](https://yarnpkg.com/en/docs/install)
 - A local copy of this Git repository (clone)

@ -175,10 +165,13 @@ Please follow the instructions of the Ghostfolio [Unraid Community App](https://

 ### Start Server

-<ol type="a">
-  <li>Debug: Run <code>yarn watch:server</code> and click "Launch Program" in <a href="https://code.visualstudio.com">Visual Studio Code</a></li>
-  <li>Serve: Run <code>yarn start:server</code></li>
-</ol>
+#### Debug
+
+Run `yarn watch:server` and click _Launch Program_ in [Visual Studio Code](https://code.visualstudio.com)
+
+#### Serve
+
+Run `yarn start:server`

 ### Start Client

@ -276,12 +269,12 @@ You can get the _Bearer Token_ via `GET http://localhost:3333/api/v1/auth/anonym

 Ghostfolio is **100% free** and **open source**. We encourage and support an active and healthy community that accepts contributions from the public - including you.

-Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Slack channel](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg), tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_) or send an e-mail to hi@ghostfol.io. We would love to hear from you.
+Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Slack channel](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) or tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_). We would love to hear from you.

-If you like to support this project, get **[Ghostfolio Premium](https://ghostfol.io/en/pricing)** or **[Buy me a coffee](https://www.buymeacoffee.com/ghostfolio)**.
+If you like to support this project, get [**Ghostfolio Premium**](https://ghostfol.io/en/pricing) or [**Buy me a coffee**](https://www.buymeacoffee.com/ghostfolio).

 ## License

-© 2022 [Ghostfolio](https://ghostfol.io)
+© 2023 [Ghostfolio](https://ghostfol.io)

 Licensed under the [AGPLv3 License](https://www.gnu.org/licenses/agpl-3.0.html).
--- a/apps/api/src/app/account/account.controller.ts
+++ b/apps/api/src/app/account/account.controller.ts
@ -1,9 +1,6 @@
 import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
 import { UserService } from '@ghostfolio/api/app/user/user.service';
-import {
-  nullifyValuesInObject,
-  nullifyValuesInObjects
-} from '@ghostfolio/api/helper/object.helper';
+import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
 import { Accounts } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
@ -22,7 +19,8 @@ import {
  Param,
  Post,
  Put,
-  UseGuards
+  UseGuards,
+  UseInterceptors
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
@ -85,6 +83,7 @@ export class AccountController {

  @Get()
  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(RedactValuesInResponseInterceptor)
  public async getAllAccounts(
    @Headers('impersonation-id') impersonationId
  ): Promise<Accounts> {
@ -94,39 +93,15 @@ export class AccountController {
        this.request.user.id
      );

-    let accountsWithAggregations =
-      await this.portfolioService.getAccountsWithAggregations({
-        userId: impersonationUserId || this.request.user.id,
-        withExcludedAccounts: true
-      });
-
-    if (
-      impersonationUserId ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      accountsWithAggregations = {
-        ...nullifyValuesInObject(accountsWithAggregations, [
-          'totalBalanceInBaseCurrency',
-          'totalValueInBaseCurrency'
-        ]),
-        accounts: nullifyValuesInObjects(accountsWithAggregations.accounts, [
-          'balance',
-          'balanceInBaseCurrency',
-          'convertedBalance',
-          'fee',
-          'quantity',
-          'unitPrice',
-          'value',
-          'valueInBaseCurrency'
-        ])
-      };
-    }
-
-    return accountsWithAggregations;
+    return this.portfolioService.getAccountsWithAggregations({
+      userId: impersonationUserId || this.request.user.id,
+      withExcludedAccounts: true
+    });
  }

  @Get(':id')
  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(RedactValuesInResponseInterceptor)
  public async getAccountById(
    @Headers('impersonation-id') impersonationId,
    @Param('id') id: string
@ -137,35 +112,13 @@ export class AccountController {
        this.request.user.id
      );

-    let accountsWithAggregations =
+    const accountsWithAggregations =
      await this.portfolioService.getAccountsWithAggregations({
        filters: [{ id, type: 'ACCOUNT' }],
        userId: impersonationUserId || this.request.user.id,
        withExcludedAccounts: true
      });

-    if (
-      impersonationUserId ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      accountsWithAggregations = {
-        ...nullifyValuesInObject(accountsWithAggregations, [
-          'totalBalanceInBaseCurrency',
-          'totalValueInBaseCurrency'
-        ]),
-        accounts: nullifyValuesInObjects(accountsWithAggregations.accounts, [
-          'balance',
-          'balanceInBaseCurrency',
-          'convertedBalance',
-          'fee',
-          'quantity',
-          'unitPrice',
-          'value',
-          'valueInBaseCurrency'
-        ])
-      };
-    }
-
    return accountsWithAggregations.accounts[0];
  }

--- a/apps/api/src/app/frontend.middleware.ts
+++ b/apps/api/src/app/frontend.middleware.ts
@ -14,8 +14,10 @@ export class FrontendMiddleware implements NestMiddleware {
  public indexHtmlDe = '';
  public indexHtmlEn = '';
  public indexHtmlEs = '';
+  public indexHtmlFr = '';
  public indexHtmlIt = '';
  public indexHtmlNl = '';
+  public indexHtmlPt = '';
  public isProduction: boolean;

  public constructor(
@ -41,6 +43,10 @@ export class FrontendMiddleware implements NestMiddleware {
        this.getPathOfIndexHtmlFile('es'),
        'utf8'
      );
+      this.indexHtmlFr = fs.readFileSync(
+        this.getPathOfIndexHtmlFile('fr'),
+        'utf8'
+      );
      this.indexHtmlIt = fs.readFileSync(
        this.getPathOfIndexHtmlFile('it'),
        'utf8'
@ -49,6 +55,10 @@ export class FrontendMiddleware implements NestMiddleware {
        this.getPathOfIndexHtmlFile('nl'),
        'utf8'
      );
+      this.indexHtmlPt = fs.readFileSync(
+        this.getPathOfIndexHtmlFile('pt'),
+        'utf8'
+      );
    } catch {}
  }

@ -73,6 +83,13 @@ export class FrontendMiddleware implements NestMiddleware {
    ) {
      featureGraphicPath = 'assets/images/blog/20221226.jpg';
      title = `The importance of tracking your personal finances - ${title}`;
+    } else if (
+      request.path.startsWith(
+        '/de/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt'
+      )
+    ) {
+      featureGraphicPath = 'assets/images/blog/ghostfolio-x-sackgeld.png';
+      title = `Ghostfolio auf Sackgeld.com vorgestellt - ${title}`;
    }

    if (
@ -104,6 +121,15 @@ export class FrontendMiddleware implements NestMiddleware {
          rootUrl: this.configurationService.get('ROOT_URL')
        })
      );
+    } else if (request.path === '/fr' || request.path.startsWith('/fr/')) {
+      response.send(
+        this.interpolate(this.indexHtmlFr, {
+          featureGraphicPath,
+          languageCode: 'fr',
+          path: request.path,
+          rootUrl: this.configurationService.get('ROOT_URL')
+        })
+      );
    } else if (request.path === '/it' || request.path.startsWith('/it/')) {
      response.send(
        this.interpolate(this.indexHtmlIt, {
@ -126,6 +152,15 @@ export class FrontendMiddleware implements NestMiddleware {
          rootUrl: this.configurationService.get('ROOT_URL')
        })
      );
+    } else if (request.path === '/pt' || request.path.startsWith('/pt/')) {
+      response.send(
+        this.interpolate(this.indexHtmlPt, {
+          featureGraphicPath,
+          languageCode: 'pt',
+          path: request.path,
+          rootUrl: this.configurationService.get('ROOT_URL')
+        })
+      );
    } else {
      response.send(
        this.interpolate(this.indexHtmlEn, {
--- a/apps/api/src/app/import/import.controller.ts
+++ b/apps/api/src/app/import/import.controller.ts
@ -1,18 +1,24 @@
+import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
+import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { ImportResponse } from '@ghostfolio/common/interfaces';
 import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
  Body,
  Controller,
+  Get,
  HttpException,
  Inject,
  Logger,
+  Param,
  Post,
  Query,
-  UseGuards
+  UseGuards,
+  UseInterceptors
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
+import { DataSource } from '@prisma/client';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';

 import { ImportDataDto } from './import-data.dto';
@ -74,4 +80,23 @@ export class ImportController {
      );
    }
  }
+
+  @Get('dividends/:dataSource/:symbol')
+  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(TransformDataSourceInRequestInterceptor)
+  @UseInterceptors(TransformDataSourceInResponseInterceptor)
+  public async gatherDividends(
+    @Param('dataSource') dataSource: DataSource,
+    @Param('symbol') symbol: string
+  ): Promise<ImportResponse> {
+    const userCurrency = this.request.user.Settings.settings.baseCurrency;
+
+    const activities = await this.importService.getDividends({
+      dataSource,
+      symbol,
+      userCurrency
+    });
+
+    return { activities };
+  }
 }
--- a/apps/api/src/app/import/import.module.ts
+++ b/apps/api/src/app/import/import.module.ts
@ -1,12 +1,14 @@
 import { AccountModule } from '@ghostfolio/api/app/account/account.module';
 import { CacheModule } from '@ghostfolio/api/app/cache/cache.module';
 import { OrderModule } from '@ghostfolio/api/app/order/order.module';
+import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
 import { Module } from '@nestjs/common';

 import { ImportController } from './import.controller';
@ -22,8 +24,10 @@ import { ImportService } from './import.service';
    DataProviderModule,
    ExchangeRateDataModule,
    OrderModule,
+    PortfolioModule,
    PrismaModule,
-    RedisCacheModule
+    RedisCacheModule,
+    SymbolProfileModule
  ],
  providers: [ImportService]
 })
--- a/apps/api/src/app/import/import.service.ts
+++ b/apps/api/src/app/import/import.service.ts
@ -2,9 +2,16 @@ import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
+import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { OrderWithAccount } from '@ghostfolio/common/types';
+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
+import { parseDate } from '@ghostfolio/common/helper';
+import { UniqueAsset } from '@ghostfolio/common/interfaces';
+import {
+  AccountWithPlatform,
+  OrderWithAccount
+} from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
 import { SymbolProfile } from '@prisma/client';
 import Big from 'big.js';
@ -17,9 +24,81 @@ export class ImportService {
    private readonly accountService: AccountService,
    private readonly dataProviderService: DataProviderService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly orderService: OrderService
+    private readonly orderService: OrderService,
+    private readonly portfolioService: PortfolioService,
+    private readonly symbolProfileService: SymbolProfileService
  ) {}

+  public async getDividends({
+    dataSource,
+    symbol,
+    userCurrency
+  }: UniqueAsset & { userCurrency: string }): Promise<Activity[]> {
+    try {
+      const { firstBuyDate, historicalData, orders } =
+        await this.portfolioService.getPosition(dataSource, undefined, symbol);
+
+      const [[assetProfile], dividends] = await Promise.all([
+        this.symbolProfileService.getSymbolProfiles([
+          {
+            dataSource,
+            symbol
+          }
+        ]),
+        await this.dataProviderService.getDividends({
+          dataSource,
+          symbol,
+          from: parseDate(firstBuyDate),
+          granularity: 'day',
+          to: new Date()
+        })
+      ]);
+
+      const accounts = orders.map((order) => {
+        return order.Account;
+      });
+
+      const Account = this.isUniqueAccount(accounts) ? accounts[0] : undefined;
+
+      return Object.entries(dividends).map(([dateString, { marketPrice }]) => {
+        const quantity =
+          historicalData.find((historicalDataItem) => {
+            return historicalDataItem.date === dateString;
+          })?.quantity ?? 0;
+
+        const value = new Big(quantity).mul(marketPrice).toNumber();
+
+        return {
+          Account,
+          quantity,
+          value,
+          accountId: Account?.id,
+          accountUserId: undefined,
+          comment: undefined,
+          createdAt: undefined,
+          date: parseDate(dateString),
+          fee: 0,
+          feeInBaseCurrency: 0,
+          id: assetProfile.id,
+          isDraft: false,
+          SymbolProfile: <SymbolProfile>(<unknown>assetProfile),
+          symbolProfileId: assetProfile.id,
+          type: 'DIVIDEND',
+          unitPrice: marketPrice,
+          updatedAt: undefined,
+          userId: Account?.userId,
+          valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
+            value,
+            assetProfile.currency,
+            userCurrency
+          )
+        };
+      });
+    } catch {
+      return [];
+    }
+  }
+
  public async import({
    activitiesDto,
    isDryRun = false,
@ -161,6 +240,16 @@ export class ImportService {
    return activities;
  }

+  private isUniqueAccount(accounts: AccountWithPlatform[]) {
+    const uniqueAccountIds = new Set<string>();
+
+    for (const account of accounts) {
+      uniqueAccountIds.add(account.id);
+    }
+
+    return uniqueAccountIds.size === 1;
+  }
+
  private async validateActivities({
    activitiesDto,
    maxActivitiesToImport,
--- a/apps/api/src/app/info/info.service.ts
+++ b/apps/api/src/app/info/info.service.ts
@ -7,6 +7,7 @@ import { PropertyService } from '@ghostfolio/api/services/property/property.serv
 import { TagService } from '@ghostfolio/api/services/tag/tag.service';
 import {
  DEMO_USER_ID,
+  PROPERTY_COUNTRIES_OF_SUBSCRIBERS,
  PROPERTY_IS_READ_ONLY_MODE,
  PROPERTY_SLACK_COMMUNITY_USERS,
  PROPERTY_STRIPE_CONFIG,
@ -92,6 +93,10 @@ export class InfoService {
    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
      globalPermissions.push(permissions.enableSubscription);

+      info.countriesOfSubscribers =
+        ((await this.propertyService.getByKey(
+          PROPERTY_COUNTRIES_OF_SUBSCRIBERS
+        )) as string[]) ?? [];
      info.stripePublicKey = this.configurationService.get('STRIPE_PUBLIC_KEY');
    }

--- a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-baln-buy-and-sell.spec.ts
@ -64,7 +64,8 @@ describe('PortfolioCalculator', () => {

      const investments = portfolioCalculator.getInvestments();

-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
+      const investmentsByMonth =
+        portfolioCalculator.getInvestmentsByGroup('month');

      spy.mockRestore();

--- a/apps/api/src/app/portfolio/portfolio-calculator-baln-buy.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-baln-buy.spec.ts
@ -53,7 +53,8 @@ describe('PortfolioCalculator', () => {

      const investments = portfolioCalculator.getInvestments();

-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
+      const investmentsByMonth =
+        portfolioCalculator.getInvestmentsByGroup('month');

      spy.mockRestore();

--- a/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
@ -64,7 +64,8 @@ describe('PortfolioCalculator', () => {

      const investments = portfolioCalculator.getInvestments();

-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
+      const investmentsByMonth =
+        portfolioCalculator.getInvestmentsByGroup('month');

      spy.mockRestore();

--- a/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts
@ -41,7 +41,8 @@ describe('PortfolioCalculator', () => {

      const investments = portfolioCalculator.getInvestments();

-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
+      const investmentsByMonth =
+        portfolioCalculator.getInvestmentsByGroup('month');

      spy.mockRestore();

--- a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
@ -64,7 +64,8 @@ describe('PortfolioCalculator', () => {

      const investments = portfolioCalculator.getInvestments();

-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
+      const investmentsByMonth =
+        portfolioCalculator.getInvestmentsByGroup('month');

      spy.mockRestore();

--- a/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts
@ -68,7 +68,8 @@ describe('PortfolioCalculator', () => {

      const investments = portfolioCalculator.getInvestments();

-      const investmentsByMonth = portfolioCalculator.getInvestmentsByMonth();
+      const investmentsByMonth =
+        portfolioCalculator.getInvestmentsByGroup('month');

      spy.mockRestore();

--- a/apps/api/src/app/portfolio/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts
@ -2,6 +2,7 @@ import { TimelineInfoInterface } from '@ghostfolio/api/app/portfolio/interfaces/
 import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
 import { DATE_FORMAT, parseDate, resetHours } from '@ghostfolio/common/helper';
 import { ResponseError, TimelinePosition } from '@ghostfolio/common/interfaces';
+import { GroupBy } from '@ghostfolio/common/types';
 import { Logger } from '@nestjs/common';
 import { Type as TypeOfOrder } from '@prisma/client';
 import Big from 'big.js';
@ -446,7 +447,7 @@ export class PortfolioCalculator {
        transactionCount: item.transactionCount
      });

-      if (hasErrors) {
+      if (hasErrors && item.investment.gt(0)) {
        errors.push({ dataSource: item.dataSource, symbol: item.symbol });
      }
    }
@ -478,46 +479,60 @@ export class PortfolioCalculator {
    });
  }

-  public getInvestmentsByMonth(): { date: string; investment: Big }[] {
+  public getInvestmentsByGroup(
+    groupBy: GroupBy
+  ): { date: string; investment: Big }[] {
    if (this.orders.length === 0) {
      return [];
    }

    const investments = [];
    let currentDate: Date;
-    let investmentByMonth = new Big(0);
+    let investmentByGroup = new Big(0);

    for (const [index, order] of this.orders.entries()) {
      if (
-        isSameMonth(parseDate(order.date), currentDate) &&
-        isSameYear(parseDate(order.date), currentDate)
+        isSameYear(parseDate(order.date), currentDate) &&
+        (groupBy === 'year' || isSameMonth(parseDate(order.date), currentDate))
      ) {
-        // Same month: Add up investments
+        // Same group: Add up investments

-        investmentByMonth = investmentByMonth.plus(
+        investmentByGroup = investmentByGroup.plus(
          order.quantity.mul(order.unitPrice).mul(this.getFactor(order.type))
        );
      } else {
-        // New month: Store previous month and reset
+        // New group: Store previous group and reset

        if (currentDate) {
          investments.push({
-            date: format(set(currentDate, { date: 1 }), DATE_FORMAT),
-            investment: investmentByMonth
+            date: format(
+              set(currentDate, {
+                date: 1,
+                month: groupBy === 'year' ? 0 : currentDate.getMonth()
+              }),
+              DATE_FORMAT
+            ),
+            investment: investmentByGroup
          });
        }

        currentDate = parseDate(order.date);
-        investmentByMonth = order.quantity
+        investmentByGroup = order.quantity
          .mul(order.unitPrice)
          .mul(this.getFactor(order.type));
      }

      if (index === this.orders.length - 1) {
-        // Store current month (latest order)
+        // Store current group (latest order)
        investments.push({
-          date: format(set(currentDate, { date: 1 }), DATE_FORMAT),
-          investment: investmentByMonth
+          date: format(
+            set(currentDate, {
+              date: 1,
+              month: groupBy === 'year' ? 0 : currentDate.getMonth()
+            }),
+            DATE_FORMAT
+          ),
+          investment: investmentByGroup
        });
      }
    }
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@ -131,7 +131,8 @@ export class PortfolioController {
          portfolioPosition.investment / totalInvestment;
        portfolioPosition.netPerformance = null;
        portfolioPosition.quantity = null;
-        portfolioPosition.value = portfolioPosition.value / totalValue;
+        portfolioPosition.valueInPercentage =
+          portfolioPosition.value / totalValue;
      }

      for (const [name, { current, original }] of Object.entries(accounts)) {
@ -322,7 +323,7 @@ export class PortfolioController {
            totalInvestment: new Big(totalInvestment)
              .div(performanceInformation.performance.totalInvestment)
              .toNumber(),
-            value: new Big(value)
+            valueInPercentage: new Big(value)
              .div(performanceInformation.performance.currentValue)
              .toNumber()
          };
@ -356,6 +357,7 @@ export class PortfolioController {

  @Get('positions')
  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(RedactValuesInResponseInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getPositions(
    @Headers('impersonation-id') impersonationId: string,
@ -370,27 +372,11 @@ export class PortfolioController {
      filterByTags
    });

-    const result = await this.portfolioService.getPositions({
+    return this.portfolioService.getPositions({
      dateRange,
      filters,
      impersonationId
    });
-
-    if (
-      impersonationId ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      result.positions = result.positions.map((position) => {
-        return nullifyValuesInObject(position, [
-          'grossPerformance',
-          'investment',
-          'netPerformance',
-          'quantity'
-        ]);
-      });
-    }
-
-    return result;
  }

  @Get('public/:accessId')
@ -441,7 +427,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,
@ -452,7 +438,7 @@ export class PortfolioController {
        sectors: hasDetails ? portfolioPosition.sectors : [],
        symbol: portfolioPosition.symbol,
        url: portfolioPosition.url,
-        value: portfolioPosition.value / totalValue
+        valueInPercentage: portfolioPosition.value / totalValue
      };
    }

@ -460,6 +446,7 @@ export class PortfolioController {
  }

  @Get('position/:dataSource/:symbol')
+  @UseInterceptors(RedactValuesInResponseInterceptor)
  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  @UseGuards(AuthGuard('jwt'))
@ -468,27 +455,13 @@ export class PortfolioController {
    @Param('dataSource') dataSource,
    @Param('symbol') symbol
  ): Promise<PortfolioPositionDetail> {
-    let position = await this.portfolioService.getPosition(
+    const position = await this.portfolioService.getPosition(
      dataSource,
      impersonationId,
      symbol
    );

    if (position) {
-      if (
-        impersonationId ||
-        this.userService.isRestrictedView(this.request.user)
-      ) {
-        position = nullifyValuesInObject(position, [
-          'grossPerformance',
-          'investment',
-          'netPerformance',
-          'orders',
-          'quantity',
-          'value'
-        ]);
-      }
-
      return position;
    }

--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@ -1,5 +1,6 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { CashDetails } from '@ghostfolio/api/app/account/interfaces/cash-details.interface';
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
 import { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order.interface';
@ -19,7 +20,7 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
 import {
-  ASSET_SUB_CLASS_EMERGENCY_FUND,
+  EMERGENCY_FUND_TAG_ID,
  MAX_CHART_ITEMS,
  UNKNOWN_KEY
 } from '@ghostfolio/common/config';
@ -235,8 +236,8 @@ export class PortfolioService {
      };
    });

-    if (groupBy === 'month') {
-      dividends = this.getDividendsByMonth(dividends);
+    if (groupBy) {
+      dividends = this.getDividendsByGroup({ dividends, groupBy });
    }

    const startDate = this.getStartDate(
@ -282,26 +283,31 @@ export class PortfolioService {

    let investments: InvestmentItem[];

-    if (groupBy === 'month') {
-      investments = portfolioCalculator.getInvestmentsByMonth().map((item) => {
-        return {
-          date: item.date,
-          investment: item.investment.toNumber()
-        };
-      });
+    if (groupBy) {
+      investments = portfolioCalculator
+        .getInvestmentsByGroup(groupBy)
+        .map((item) => {
+          return {
+            date: item.date,
+            investment: item.investment.toNumber()
+          };
+        });

-      // Add investment of current month
-      const dateOfCurrentMonth = format(
-        set(new Date(), { date: 1 }),
+      // Add investment of current group
+      const dateOfCurrentGroup = format(
+        set(new Date(), {
+          date: 1,
+          month: groupBy === 'year' ? 0 : new Date().getMonth()
+        }),
        DATE_FORMAT
      );
-      const investmentOfCurrentMonth = investments.filter(({ date }) => {
-        return date === dateOfCurrentMonth;
+      const investmentOfCurrentGroup = investments.filter(({ date }) => {
+        return date === dateOfCurrentGroup;
      });

-      if (investmentOfCurrentMonth.length <= 0) {
+      if (investmentOfCurrentGroup.length <= 0) {
        investments.push({
-          date: dateOfCurrentMonth,
+          date: dateOfCurrentGroup,
          investment: 0
        });
      }
@ -531,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,
@ -569,7 +572,6 @@ export class PortfolioService {
    ) {
      const cashPositions = await this.getCashPositions({
        cashDetails,
-        emergencyFund,
        userCurrency,
        investment: totalInvestmentInBaseCurrency,
        value: filteredValueInBaseCurrency
@ -589,10 +591,52 @@ export class PortfolioService {
      withExcludedAccounts
    });

+    if (
+      filters?.length === 1 &&
+      filters[0].id === EMERGENCY_FUND_TAG_ID &&
+      filters[0].type === 'TAG'
+    ) {
+      const cashPositions = await this.getCashPositions({
+        cashDetails,
+        userCurrency,
+        investment: totalInvestmentInBaseCurrency,
+        value: filteredValueInBaseCurrency
+      });
+
+      const emergencyFundInCash = emergencyFund
+        .minus(
+          this.getEmergencyFundPositionsValueInBaseCurrency({
+            activities: orders
+          })
+        )
+        .toNumber();
+
+      filteredValueInBaseCurrency = emergencyFund;
+
+      accounts[UNKNOWN_KEY] = {
+        balance: 0,
+        currency: userCurrency,
+        current: emergencyFundInCash,
+        name: UNKNOWN_KEY,
+        original: emergencyFundInCash
+      };
+
+      holdings[userCurrency] = {
+        ...cashPositions[userCurrency],
+        investment: emergencyFundInCash,
+        value: emergencyFundInCash
+      };
+    }
+
    const summary = await this.getSummary({
      impersonationId,
      userCurrency,
-      userId
+      userId,
+      balanceInBaseCurrency: cashDetails.balanceInBaseCurrency,
+      emergencyFundPositionsValueInBaseCurrency:
+        this.getEmergencyFundPositionsValueInBaseCurrency({
+          activities: orders
+        })
    });

    return {
@ -655,8 +699,9 @@ export class PortfolioService {
    }

    const positionCurrency = orders[0].SymbolProfile.currency;
-    const [SymbolProfile] =
-      await this.symbolProfileService.getSymbolProfilesBySymbols([aSymbol]);
+    const [SymbolProfile] = await this.symbolProfileService.getSymbolProfiles([
+      { dataSource: aDataSource, symbol: aSymbol }
+    ]);

    const portfolioOrders: PortfolioOrder[] = orders
      .filter((order) => {
@ -740,7 +785,8 @@ export class PortfolioService {
        historicalDataArray.push({
          averagePrice: orders[0].unitPrice,
          date: firstBuyDate,
-          value: orders[0].unitPrice
+          marketPrice: orders[0].unitPrice,
+          quantity: orders[0].quantity
        });
      }

@ -756,6 +802,7 @@ export class PortfolioService {
            j++;
          }
          let currentAveragePrice = 0;
+          let currentQuantity = 0;
          const currentSymbol = transactionPoints[j].items.find(
            (item) => item.symbol === aSymbol
          );
@ -763,12 +810,14 @@ export class PortfolioService {
            currentAveragePrice = currentSymbol.quantity.eq(0)
              ? 0
              : currentSymbol.investment.div(currentSymbol.quantity).toNumber();
+            currentQuantity = currentSymbol.quantity.toNumber();
          }

          historicalDataArray.push({
            date,
+            marketPrice,
            averagePrice: currentAveragePrice,
-            value: marketPrice
+            quantity: currentQuantity
          });

          maxPrice = Math.max(marketPrice ?? 0, maxPrice);
@ -900,12 +949,14 @@ export class PortfolioService {
    const positions = currentPositions.positions.filter(
      (item) => !item.quantity.eq(0)
    );
+
    const dataGatheringItem = positions.map((position) => {
      return {
        dataSource: position.dataSource,
        symbol: position.symbol
      };
    });
+
    const symbols = positions.map((position) => position.symbol);

    const [dataProviderResponses, symbolProfiles] = await Promise.all([
@ -988,29 +1039,21 @@ export class PortfolioService {

    const portfolioStart = parseDate(transactionPoints[0].date);
    const startDate = this.getStartDate(dateRange, portfolioStart);
-    const currentPositions = await portfolioCalculator.getCurrentPositions(
-      startDate
-    );
+    const {
+      currentValue,
+      errors,
+      grossPerformance,
+      grossPerformancePercentage,
+      hasErrors,
+      netPerformance,
+      netPerformancePercentage,
+      totalInvestment
+    } = await portfolioCalculator.getCurrentPositions(startDate);

-    const hasErrors = currentPositions.hasErrors;
-    const currentValue = currentPositions.currentValue.toNumber();
-    const currentGrossPerformance = currentPositions.grossPerformance;
-    const currentGrossPerformancePercent =
-      currentPositions.grossPerformancePercentage;
-    let currentNetPerformance = currentPositions.netPerformance;
-    let currentNetPerformancePercent =
-      currentPositions.netPerformancePercentage;
-    const totalInvestment = currentPositions.totalInvestment;
-
-    // if (currentGrossPerformance.mul(currentGrossPerformancePercent).lt(0)) {
-    //   // If algebraic sign is different, harmonize it
-    //   currentGrossPerformancePercent = currentGrossPerformancePercent.mul(-1);
-    // }
-
-    // if (currentNetPerformance.mul(currentNetPerformancePercent).lt(0)) {
-    //   // If algebraic sign is different, harmonize it
-    //   currentNetPerformancePercent = currentNetPerformancePercent.mul(-1);
-    // }
+    const currentGrossPerformance = grossPerformance;
+    const currentGrossPerformancePercent = grossPerformancePercentage;
+    let currentNetPerformance = netPerformance;
+    let currentNetPerformancePercent = netPerformancePercentage;

    const historicalDataContainer = await this.getChart({
      dateRange,
@ -1032,28 +1075,28 @@ export class PortfolioService {
    }

    return {
+      errors,
+      hasErrors,
      chart: historicalDataContainer.items.map(
        ({
          date,
-          netPerformance,
+          netPerformance: netPerformanceOfItem,
          netPerformanceInPercentage,
-          totalInvestment,
+          totalInvestment: totalInvestmentOfItem,
          value
        }) => {
          return {
            date,
-            netPerformance,
            netPerformanceInPercentage,
-            totalInvestment,
-            value
+            value,
+            netPerformance: netPerformanceOfItem,
+            totalInvestment: totalInvestmentOfItem
          };
        }
      ),
-      errors: currentPositions.errors,
      firstOrderDate: parseDate(historicalDataContainer.items[0]?.date),
-      hasErrors: currentPositions.hasErrors || hasErrors,
      performance: {
-        currentValue,
+        currentValue: currentValue.toNumber(),
        currentGrossPerformance: currentGrossPerformance.toNumber(),
        currentGrossPerformancePercent:
          currentGrossPerformancePercent.toNumber(),
@ -1093,16 +1136,23 @@ export class PortfolioService {
      portfolioStart
    );

+    const positions = currentPositions.positions.filter(
+      (item) => !item.quantity.eq(0)
+    );
+
    const portfolioItemsNow: { [symbol: string]: TimelinePosition } = {};
-    for (const position of currentPositions.positions) {
+
+    for (const position of positions) {
      portfolioItemsNow[position.symbol] = position;
    }
+
    const accounts = await this.getValueOfAccounts({
      orders,
      portfolioItemsNow,
-      userId,
-      userCurrency
+      userCurrency,
+      userId
    });
+
    return {
      rules: {
        accountClusterRisk: await this.rulesService.evaluate(
@ -1126,19 +1176,19 @@ export class PortfolioService {
          [
            new CurrencyClusterRiskBaseCurrencyInitialInvestment(
              this.exchangeRateDataService,
-              currentPositions
+              positions
            ),
            new CurrencyClusterRiskBaseCurrencyCurrentInvestment(
              this.exchangeRateDataService,
-              currentPositions
+              positions
            ),
            new CurrencyClusterRiskInitialInvestment(
              this.exchangeRateDataService,
-              currentPositions
+              positions
            ),
            new CurrencyClusterRiskCurrentInvestment(
              this.exchangeRateDataService,
-              currentPositions
+              positions
            )
          ],
          <UserSettings>this.request.user.Settings.settings
@ -1148,7 +1198,7 @@ export class PortfolioService {
            new FeeRatioInitialInvestment(
              this.exchangeRateDataService,
              currentPositions.totalInvestment.toNumber(),
-              this.getFees({ orders, userCurrency }).toNumber()
+              this.getFees({ userCurrency, activities: orders }).toNumber()
            )
          ],
          <UserSettings>this.request.user.Settings.settings
@ -1159,16 +1209,14 @@ export class PortfolioService {

  private async getCashPositions({
    cashDetails,
-    emergencyFund,
    investment,
    userCurrency,
    value
  }: {
    cashDetails: CashDetails;
-    emergencyFund: Big;
    investment: Big;
-    value: Big;
    userCurrency: string;
+    value: Big;
  }) {
    const cashPositions: PortfolioDetails['holdings'] = {
      [userCurrency]: this.getInitialCashPosition({
@ -1199,62 +1247,38 @@ export class PortfolioService {
      }
    }

-    if (emergencyFund.gt(0)) {
-      cashPositions[ASSET_SUB_CLASS_EMERGENCY_FUND] = {
-        ...cashPositions[userCurrency],
-        assetSubClass: ASSET_SUB_CLASS_EMERGENCY_FUND,
-        investment: emergencyFund.toNumber(),
-        name: ASSET_SUB_CLASS_EMERGENCY_FUND,
-        symbol: ASSET_SUB_CLASS_EMERGENCY_FUND,
-        value: emergencyFund.toNumber()
-      };
-
-      cashPositions[userCurrency].investment = new Big(
-        cashPositions[userCurrency].investment
-      )
-        .minus(emergencyFund)
-        .toNumber();
-      cashPositions[userCurrency].value = new Big(
-        cashPositions[userCurrency].value
-      )
-        .minus(emergencyFund)
-        .toNumber();
-    }
-
    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;
  }

  private getDividend({
+    activities,
    date = new Date(0),
-    orders,
    userCurrency
  }: {
+    activities: OrderWithAccount[];
    date?: Date;
-    orders: OrderWithAccount[];
+
    userCurrency: string;
  }) {
-    return orders
-      .filter((order) => {
-        // Filter out all orders before given date and type dividend
+    return activities
+      .filter((activity) => {
+        // Filter out all activities before given date and type dividend
        return (
-          isBefore(date, new Date(order.date)) &&
-          order.type === TypeOfOrder.DIVIDEND
+          isBefore(date, new Date(activity.date)) &&
+          activity.type === TypeOfOrder.DIVIDEND
        );
      })
-      .map((order) => {
+      .map(({ quantity, SymbolProfile, unitPrice }) => {
        return this.exchangeRateDataService.toCurrency(
-          new Big(order.quantity).mul(order.unitPrice).toNumber(),
-          order.SymbolProfile.currency,
+          new Big(quantity).mul(unitPrice).toNumber(),
+          SymbolProfile.currency,
          userCurrency
        );
      })
@ -1264,67 +1288,118 @@ export class PortfolioService {
      );
  }

-  private getDividendsByMonth(aDividends: InvestmentItem[]): InvestmentItem[] {
-    if (aDividends.length === 0) {
+  private getDividendsByGroup({
+    dividends,
+    groupBy
+  }: {
+    dividends: InvestmentItem[];
+    groupBy: GroupBy;
+  }): InvestmentItem[] {
+    if (dividends.length === 0) {
      return [];
    }

-    const dividends = [];
+    const dividendsByGroup: InvestmentItem[] = [];
    let currentDate: Date;
-    let investmentByMonth = new Big(0);
+    let investmentByGroup = new Big(0);

-    for (const [index, dividend] of aDividends.entries()) {
+    for (const [index, dividend] of dividends.entries()) {
      if (
-        isSameMonth(parseDate(dividend.date), currentDate) &&
-        isSameYear(parseDate(dividend.date), currentDate)
+        isSameYear(parseDate(dividend.date), currentDate) &&
+        (groupBy === 'year' ||
+          isSameMonth(parseDate(dividend.date), currentDate))
      ) {
-        // Same month: Add up divididends
+        // Same group: Add up dividends

-        investmentByMonth = investmentByMonth.plus(dividend.investment);
+        investmentByGroup = investmentByGroup.plus(dividend.investment);
      } else {
-        // New month: Store previous month and reset
+        // New group: Store previous group and reset

        if (currentDate) {
-          dividends.push({
-            date: format(set(currentDate, { date: 1 }), DATE_FORMAT),
-            investment: investmentByMonth
+          dividendsByGroup.push({
+            date: format(
+              set(currentDate, {
+                date: 1,
+                month: groupBy === 'year' ? 0 : currentDate.getMonth()
+              }),
+              DATE_FORMAT
+            ),
+            investment: investmentByGroup.toNumber()
          });
        }

        currentDate = parseDate(dividend.date);
-        investmentByMonth = new Big(dividend.investment);
+        investmentByGroup = new Big(dividend.investment);
      }

-      if (index === aDividends.length - 1) {
+      if (index === dividends.length - 1) {
        // Store current month (latest order)
-        dividends.push({
-          date: format(set(currentDate, { date: 1 }), DATE_FORMAT),
-          investment: investmentByMonth
+        dividendsByGroup.push({
+          date: format(
+            set(currentDate, {
+              date: 1,
+              month: groupBy === 'year' ? 0 : currentDate.getMonth()
+            }),
+            DATE_FORMAT
+          ),
+          investment: investmentByGroup.toNumber()
        });
      }
    }

-    return dividends;
+    return dividendsByGroup;
+  }
+
+  private getEmergencyFundPositionsValueInBaseCurrency({
+    activities
+  }: {
+    activities: Activity[];
+  }) {
+    const emergencyFundOrders = activities.filter((activity) => {
+      return (
+        activity.tags?.some(({ id }) => {
+          return id === EMERGENCY_FUND_TAG_ID;
+        }) ?? false
+      );
+    });
+
+    let valueInBaseCurrencyOfEmergencyFundPositions = new Big(0);
+
+    for (const order of emergencyFundOrders) {
+      if (order.type === 'BUY') {
+        valueInBaseCurrencyOfEmergencyFundPositions =
+          valueInBaseCurrencyOfEmergencyFundPositions.plus(
+            order.valueInBaseCurrency
+          );
+      } else if (order.type === 'SELL') {
+        valueInBaseCurrencyOfEmergencyFundPositions =
+          valueInBaseCurrencyOfEmergencyFundPositions.minus(
+            order.valueInBaseCurrency
+          );
+      }
+    }
+
+    return valueInBaseCurrencyOfEmergencyFundPositions.toNumber();
  }

  private getFees({
+    activities,
    date = new Date(0),
-    orders,
    userCurrency
  }: {
+    activities: OrderWithAccount[];
    date?: Date;
-    orders: OrderWithAccount[];
    userCurrency: string;
  }) {
-    return orders
-      .filter((order) => {
-        // Filter out all orders before given date
-        return isBefore(date, new Date(order.date));
+    return activities
+      .filter((activity) => {
+        // Filter out all activities before given date
+        return isBefore(date, new Date(activity.date));
      })
-      .map((order) => {
+      .map(({ fee, SymbolProfile }) => {
        return this.exchangeRateDataService.toCurrency(
-          order.fee,
-          order.SymbolProfile.currency,
+          fee,
+          SymbolProfile.currency,
          userCurrency
        );
      })
@ -1343,8 +1418,7 @@ export class PortfolioService {
  }): PortfolioPosition {
    return {
      currency,
-      allocationCurrent: 0,
-      allocationInvestment: 0,
+      allocationInPercentage: 0,
      assetClass: AssetClass.CASH,
      assetSubClass: AssetClass.CASH,
      countries: [],
@ -1391,26 +1465,42 @@ export class PortfolioService {
  private getStartDate(aDateRange: DateRange, portfolioStart: Date) {
    switch (aDateRange) {
      case '1d':
-        portfolioStart = max([portfolioStart, subDays(new Date(), 1)]);
+        portfolioStart = max([
+          portfolioStart,
+          subDays(new Date().setHours(0, 0, 0, 0), 1)
+        ]);
        break;
      case 'ytd':
-        portfolioStart = max([portfolioStart, setDayOfYear(new Date(), 1)]);
+        portfolioStart = max([
+          portfolioStart,
+          setDayOfYear(new Date().setHours(0, 0, 0, 0), 1)
+        ]);
        break;
      case '1y':
-        portfolioStart = max([portfolioStart, subYears(new Date(), 1)]);
+        portfolioStart = max([
+          portfolioStart,
+          subYears(new Date().setHours(0, 0, 0, 0), 1)
+        ]);
        break;
      case '5y':
-        portfolioStart = max([portfolioStart, subYears(new Date(), 5)]);
+        portfolioStart = max([
+          portfolioStart,
+          subYears(new Date().setHours(0, 0, 0, 0), 5)
+        ]);
        break;
    }
    return portfolioStart;
  }

  private async getSummary({
+    balanceInBaseCurrency,
+    emergencyFundPositionsValueInBaseCurrency,
    impersonationId,
    userCurrency,
    userId
  }: {
+    balanceInBaseCurrency: number;
+    emergencyFundPositionsValueInBaseCurrency: number;
    impersonationId: string;
    userCurrency: string;
    userId: string;
@ -1423,11 +1513,7 @@ export class PortfolioService {
      userId
    });

-    const { balanceInBaseCurrency } = await this.accountService.getCashDetails({
-      userId,
-      currency: userCurrency
-    });
-    const orders = await this.orderService.getOrders({
+    const activities = await this.orderService.getOrders({
      userCurrency,
      userId
    });
@ -1442,18 +1528,24 @@ export class PortfolioService {
      return account?.isExcluded ?? false;
    });

-    const dividend = this.getDividend({ orders, userCurrency }).toNumber();
+    const dividend = this.getDividend({
+      activities,
+      userCurrency
+    }).toNumber();
    const emergencyFund = new Big(
      (user.Settings?.settings as UserSettings)?.emergencyFund ?? 0
    );
-    const fees = this.getFees({ orders, userCurrency }).toNumber();
-    const firstOrderDate = orders[0]?.date;
-    const items = this.getItems(orders).toNumber();
+    const fees = this.getFees({ activities, userCurrency }).toNumber();
+    const firstOrderDate = activities[0]?.date;
+    const items = this.getItems(activities).toNumber();

-    const totalBuy = this.getTotalByType(orders, userCurrency, 'BUY');
-    const totalSell = this.getTotalByType(orders, userCurrency, 'SELL');
+    const totalBuy = this.getTotalByType(activities, userCurrency, 'BUY');
+    const totalSell = this.getTotalByType(activities, userCurrency, 'SELL');

-    const cash = new Big(balanceInBaseCurrency).minus(emergencyFund).toNumber();
+    const cash = new Big(balanceInBaseCurrency)
+      .minus(emergencyFund)
+      .plus(emergencyFundPositionsValueInBaseCurrency)
+      .toNumber();
    const committedFunds = new Big(totalBuy).minus(totalSell);
    const totalOfExcludedActivities = new Big(
      this.getTotalByType(excludedActivities, userCurrency, 'BUY')
@ -1509,8 +1601,8 @@ export class PortfolioService {
      totalSell,
      committedFunds: committedFunds.toNumber(),
      emergencyFund: emergencyFund.toNumber(),
-      ordersCount: orders.filter((order) => {
-        return order.type === 'BUY' || order.type === 'SELL';
+      ordersCount: activities.filter(({ type }) => {
+        return type === 'BUY' || type === 'SELL';
      }).length
    };
  }
@ -1527,7 +1619,7 @@ export class PortfolioService {
    withExcludedAccounts?: boolean;
  }): Promise<{
    transactionPoints: TransactionPoint[];
-    orders: OrderWithAccount[];
+    orders: Activity[];
    portfolioOrders: PortfolioOrder[];
  }> {
    const userCurrency =
@ -1653,7 +1745,7 @@ export class PortfolioService {
      for (const order of ordersByAccount) {
        let currentValueOfSymbolInBaseCurrency =
          order.quantity *
-          portfolioItemsNow[order.SymbolProfile.symbol].marketPrice;
+            portfolioItemsNow[order.SymbolProfile.symbol]?.marketPrice ?? 0;
        let originalValueOfSymbolInBaseCurrency =
          this.exchangeRateDataService.toCurrency(
            order.quantity * order.unitPrice,
--- a/apps/api/src/app/user/user.controller.ts
+++ b/apps/api/src/app/user/user.controller.ts
@ -1,6 +1,4 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { PROPERTY_IS_USER_SIGNUP_ENABLED } from '@ghostfolio/common/config';
 import { User, UserSettings } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
@ -31,7 +29,6 @@ import { UserService } from './user.service';
@Controller('user')
 export class UserController {
  public constructor(
-    private readonly configurationService: ConfigurationService,
    private readonly jwtService: JwtService,
    private readonly propertyService: PropertyService,
    @Inject(REQUEST) private readonly request: RequestWithUser,
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@ -97,6 +97,7 @@ export class UserService {
    const {
      accessToken,
      Account,
+      Analytics,
      authChallenge,
      createdAt,
      id,
@ -107,7 +108,12 @@ export class UserService {
      thirdPartyId,
      updatedAt
    } = await this.prismaService.user.findUnique({
-      include: { Account: true, Settings: true, Subscription: true },
+      include: {
+        Account: true,
+        Analytics: true,
+        Settings: true,
+        Subscription: true
+      },
      where: userWhereUniqueInput
    });

@ -121,7 +127,8 @@ export class UserService {
      role,
      Settings,
      thirdPartyId,
-      updatedAt
+      updatedAt,
+      activityCount: Analytics?.activityCount
    };

    if (user?.Settings) {
@ -154,15 +161,22 @@ export class UserService {
      (user.Settings.settings as UserSettings).viewMode = 'DEFAULT';
    }

+    let currentPermissions = getPermissions(user.role);
+
    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
      user.subscription =
        this.subscriptionService.getSubscription(Subscription);
-    }

-    let currentPermissions = getPermissions(user.role);
+      if (
+        Analytics?.activityCount % 25 === 0 &&
+        user.subscription?.type === 'Basic'
+      ) {
+        currentPermissions.push(permissions.enableSubscriptionInterstitial);
+      }

-    if (user.subscription?.type === 'Premium') {
-      currentPermissions.push(permissions.reportDataGlitch);
+      if (user.subscription?.type === 'Premium') {
+        currentPermissions.push(permissions.reportDataGlitch);
+      }
    }

    if (this.configurationService.get('ENABLE_FEATURE_READ_ONLY_MODE')) {
--- a/apps/api/src/helper/object.helper.ts
+++ b/apps/api/src/helper/object.helper.ts
@ -1,4 +1,4 @@
-import { cloneDeep, isObject } from 'lodash';
+import { cloneDeep, isArray, isObject } from 'lodash';

 export function hasNotDefinedValuesInObject(aObject: Object): boolean {
  for (const key in aObject) {
@ -27,3 +27,48 @@ export function nullifyValuesInObjects<T>(aObjects: T[], keys: string[]): T[] {
    return nullifyValuesInObject(object, keys);
  });
 }
+
+export function redactAttributes({
+  object,
+  options
+}: {
+  object: any;
+  options: { attribute: string; valueMap: { [key: string]: any } }[];
+}): any {
+  if (!object || !options || !options.length) {
+    return object;
+  }
+
+  const redactedObject = cloneDeep(object);
+
+  for (const option of options) {
+    if (redactedObject.hasOwnProperty(option.attribute)) {
+      if (option.valueMap['*'] || option.valueMap['*'] === null) {
+        redactedObject[option.attribute] = option.valueMap['*'];
+      } else if (option.valueMap[redactedObject[option.attribute]]) {
+        redactedObject[option.attribute] =
+          option.valueMap[redactedObject[option.attribute]];
+      }
+    } else {
+      // If the attribute is not present on the current object,
+      // check if it exists on any nested objects
+      for (const property in redactedObject) {
+        if (isArray(redactedObject[property])) {
+          redactedObject[property] = redactedObject[property].map(
+            (currentObject) => {
+              return redactAttributes({ options, object: currentObject });
+            }
+          );
+        } else if (isObject(redactedObject[property])) {
+          // Recursively call the function on the nested object
+          redactedObject[property] = redactAttributes({
+            options,
+            object: redactedObject[property]
+          });
+        }
+      }
+    }
+  }
+
+  return redactedObject;
+}
--- a/apps/api/src/interceptors/redact-values-in-response.interceptor.ts
+++ b/apps/api/src/interceptors/redact-values-in-response.interceptor.ts
@ -1,5 +1,5 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import { UserService } from '@ghostfolio/api/app/user/user.service';
+import { redactAttributes } from '@ghostfolio/api/helper/object.helper';
 import {
  CallHandler,
  ExecutionContext,
@ -28,59 +28,35 @@ export class RedactValuesInResponseInterceptor<T>
          hasImpersonationId ||
          this.userService.isRestrictedView(request.user)
        ) {
-          if (data.accounts) {
-            for (const accountId of Object.keys(data.accounts)) {
-              if (data.accounts[accountId]?.balance !== undefined) {
-                data.accounts[accountId].balance = null;
-              }
-            }
-          }
-
-          if (data.activities) {
-            data.activities = data.activities.map((activity: Activity) => {
-              if (activity.Account?.balance !== undefined) {
-                activity.Account.balance = null;
-              }
-
-              if (activity.comment !== undefined) {
-                activity.comment = null;
-              }
-
-              if (activity.fee !== undefined) {
-                activity.fee = null;
-              }
-
-              if (activity.feeInBaseCurrency !== undefined) {
-                activity.feeInBaseCurrency = null;
-              }
-
-              if (activity.quantity !== undefined) {
-                activity.quantity = null;
-              }
-
-              if (activity.unitPrice !== undefined) {
-                activity.unitPrice = null;
-              }
-
-              if (activity.value !== undefined) {
-                activity.value = null;
-              }
-
-              if (activity.valueInBaseCurrency !== undefined) {
-                activity.valueInBaseCurrency = null;
-              }
-
-              return activity;
-            });
-          }
-
-          if (data.filteredValueInBaseCurrency) {
-            data.filteredValueInBaseCurrency = null;
-          }
-
-          if (data.totalValueInBaseCurrency) {
-            data.totalValueInBaseCurrency = null;
-          }
+          data = redactAttributes({
+            object: data,
+            options: [
+              'balance',
+              'balanceInBaseCurrency',
+              'comment',
+              'convertedBalance',
+              'fee',
+              'feeInBaseCurrency',
+              'filteredValueInBaseCurrency',
+              'grossPerformance',
+              'investment',
+              'netPerformance',
+              'quantity',
+              'symbolMapping',
+              'totalBalanceInBaseCurrency',
+              'totalValueInBaseCurrency',
+              'unitPrice',
+              'value',
+              'valueInBaseCurrency'
+            ].map((attribute) => {
+              return {
+                attribute,
+                valueMap: {
+                  '*': null
+                }
+              };
+            })
+          });
        }

        return data;
--- a/apps/api/src/interceptors/transform-data-source-in-response.interceptor.ts
+++ b/apps/api/src/interceptors/transform-data-source-in-response.interceptor.ts
@ -1,3 +1,4 @@
+import { redactAttributes } from '@ghostfolio/api/helper/object.helper';
 import { encodeDataSource } from '@ghostfolio/common/helper';
 import {
  CallHandler,
@ -5,7 +6,7 @@ import {
  Injectable,
  NestInterceptor
 } from '@nestjs/common';
-import { isArray } from 'lodash';
+import { DataSource } from '@prisma/client';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';

@ -28,63 +29,23 @@ export class TransformDataSourceInResponseInterceptor<T>
        if (
          this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') === true
        ) {
-          if (data.activities) {
-            data.activities.map((activity) => {
-              activity.SymbolProfile.dataSource = encodeDataSource(
-                activity.SymbolProfile.dataSource
-              );
-              return activity;
-            });
-          }
-
-          if (isArray(data.benchmarks)) {
-            data.benchmarks.map((benchmark) => {
-              benchmark.dataSource = encodeDataSource(benchmark.dataSource);
-              return benchmark;
-            });
-          }
-
-          if (data.dataSource) {
-            data.dataSource = encodeDataSource(data.dataSource);
-          }
-
-          if (data.errors) {
-            for (const error of data.errors) {
-              if (error.dataSource) {
-                error.dataSource = encodeDataSource(error.dataSource);
+          data = redactAttributes({
+            options: [
+              {
+                attribute: 'dataSource',
+                valueMap: Object.keys(DataSource).reduce(
+                  (valueMap, dataSource) => {
+                    valueMap[dataSource] = encodeDataSource(
+                      DataSource[dataSource]
+                    );
+                    return valueMap;
+                  },
+                  {}
+                )
              }
-            }
-          }
-
-          if (data.holdings) {
-            for (const symbol of Object.keys(data.holdings)) {
-              if (data.holdings[symbol].dataSource) {
-                data.holdings[symbol].dataSource = encodeDataSource(
-                  data.holdings[symbol].dataSource
-                );
-              }
-            }
-          }
-
-          if (data.items) {
-            data.items.map((item) => {
-              item.dataSource = encodeDataSource(item.dataSource);
-              return item;
-            });
-          }
-
-          if (data.positions) {
-            data.positions.map((position) => {
-              position.dataSource = encodeDataSource(position.dataSource);
-              return position;
-            });
-          }
-
-          if (data.SymbolProfile) {
-            data.SymbolProfile.dataSource = encodeDataSource(
-              data.SymbolProfile.dataSource
-            );
-          }
+            ],
+            object: data
+          });
        }

        return data;
--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts
@ -1,14 +1,13 @@
-import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { UserSettings } from '@ghostfolio/common/interfaces';
+import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';

 import { Rule } from '../../rule';

 export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Settings> {
  public constructor(
    protected exchangeRateDataService: ExchangeRateDataService,
-    private currentPositions: CurrentPositions
+    private positions: TimelinePosition[]
  ) {
    super(exchangeRateDataService, {
      name: 'Current Investment: Base Currency'
@ -17,7 +16,7 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti

  public evaluate(ruleSettings: Settings) {
    const positionsGroupedByCurrency = this.groupCurrentPositionsByAttribute(
-      this.currentPositions.positions,
+      this.positions,
      'currency',
      ruleSettings.baseCurrency
    );
--- a/apps/api/src/models/rules/currency-cluster-risk/base-currency-initial-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/base-currency-initial-investment.ts
@ -1,14 +1,13 @@
-import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { UserSettings } from '@ghostfolio/common/interfaces';
+import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';

 import { Rule } from '../../rule';

 export class CurrencyClusterRiskBaseCurrencyInitialInvestment extends Rule<Settings> {
  public constructor(
    protected exchangeRateDataService: ExchangeRateDataService,
-    private currentPositions: CurrentPositions
+    private positions: TimelinePosition[]
  ) {
    super(exchangeRateDataService, {
      name: 'Initial Investment: Base Currency'
@ -17,7 +16,7 @@ export class CurrencyClusterRiskBaseCurrencyInitialInvestment extends Rule<Setti

  public evaluate(ruleSettings: Settings) {
    const positionsGroupedByCurrency = this.groupCurrentPositionsByAttribute(
-      this.currentPositions.positions,
+      this.positions,
      'currency',
      ruleSettings.baseCurrency
    );
--- a/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/current-investment.ts
@ -1,14 +1,13 @@
-import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { UserSettings } from '@ghostfolio/common/interfaces';
+import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';

 import { Rule } from '../../rule';

 export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
  public constructor(
-    public exchangeRateDataService: ExchangeRateDataService,
-    private currentPositions: CurrentPositions
+    protected exchangeRateDataService: ExchangeRateDataService,
+    private positions: TimelinePosition[]
  ) {
    super(exchangeRateDataService, {
      name: 'Current Investment'
@ -17,7 +16,7 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {

  public evaluate(ruleSettings: Settings) {
    const positionsGroupedByCurrency = this.groupCurrentPositionsByAttribute(
-      this.currentPositions.positions,
+      this.positions,
      'currency',
      ruleSettings.baseCurrency
    );
--- a/apps/api/src/models/rules/currency-cluster-risk/initial-investment.ts
+++ b/apps/api/src/models/rules/currency-cluster-risk/initial-investment.ts
@ -1,14 +1,13 @@
-import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { UserSettings } from '@ghostfolio/common/interfaces';
+import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';

 import { Rule } from '../../rule';

 export class CurrencyClusterRiskInitialInvestment extends Rule<Settings> {
  public constructor(
    protected exchangeRateDataService: ExchangeRateDataService,
-    private currentPositions: CurrentPositions
+    private positions: TimelinePosition[]
  ) {
    super(exchangeRateDataService, {
      name: 'Initial Investment'
@ -17,7 +16,7 @@ export class CurrencyClusterRiskInitialInvestment extends Rule<Settings> {

  public evaluate(ruleSettings: Settings) {
    const positionsGroupedByCurrency = this.groupCurrentPositionsByAttribute(
-      this.currentPositions.positions,
+      this.positions,
      'currency',
      ruleSettings.baseCurrency
    );
--- a/apps/api/src/services/cron.service.ts
+++ b/apps/api/src/services/cron.service.ts
@ -19,8 +19,8 @@ export class CronService {
    private readonly twitterBotService: TwitterBotService
  ) {}

-  @Cron(CronExpression.EVERY_HOUR)
-  public async runEveryHour() {
+  @Cron(CronExpression.EVERY_4_HOURS)
+  public async runEveryFourHours() {
    await this.dataGatheringService.gather7Days();
  }

--- a/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts
+++ b/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts
@ -37,6 +37,20 @@ export class AlphaVantageService implements DataProviderInterface {
    };
  }

+  public async getDividends({
+    from,
+    granularity = 'day',
+    symbol,
+    to
+  }: {
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }) {
+    return {};
+  }
+
  public async getHistorical(
    aSymbol: string,
    aGranularity: Granularity = 'day',
--- a/apps/api/src/services/data-provider/data-provider.module.ts
+++ b/apps/api/src/services/data-provider/data-provider.module.ts
@ -59,6 +59,10 @@ import { DataProviderService } from './data-provider.service';
      ]
    }
  ],
-  exports: [DataProviderService, GhostfolioScraperApiService]
+  exports: [
+    DataProviderService,
+    GhostfolioScraperApiService,
+    YahooFinanceService
+  ]
 })
 export class DataProviderModule {}
--- a/apps/api/src/services/data-provider/data-provider.service.ts
+++ b/apps/api/src/services/data-provider/data-provider.service.ts
@ -23,6 +23,27 @@ export class DataProviderService {
    private readonly prismaService: PrismaService
  ) {}

+  public async getDividends({
+    dataSource,
+    from,
+    granularity = 'day',
+    symbol,
+    to
+  }: {
+    dataSource: DataSource;
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }) {
+    return this.getDataProvider(DataSource[dataSource]).getDividends({
+      from,
+      granularity,
+      symbol,
+      to
+    });
+  }
+
  public async getHistorical(
    aItems: IDataGatheringItem[],
    aGranularity: Granularity = 'month',
--- a/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts
+++ b/apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts
@ -37,6 +37,20 @@ export class EodHistoricalDataService implements DataProviderInterface {
    };
  }

+  public async getDividends({
+    from,
+    granularity = 'day',
+    symbol,
+    to
+  }: {
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }) {
+    return {};
+  }
+
  public async getHistorical(
    aSymbol: string,
    aGranularity: Granularity = 'day',
--- a/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts
+++ b/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts
@ -37,6 +37,20 @@ export class GhostfolioScraperApiService implements DataProviderInterface {
    };
  }

+  public async getDividends({
+    from,
+    granularity = 'day',
+    symbol,
+    to
+  }: {
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }) {
+    return {};
+  }
+
  public async getHistorical(
    aSymbol: string,
    aGranularity: Granularity = 'day',
--- a/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts
+++ b/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts
@ -34,6 +34,20 @@ export class GoogleSheetsService implements DataProviderInterface {
    };
  }

+  public async getDividends({
+    from,
+    granularity = 'day',
+    symbol,
+    to
+  }: {
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }) {
+    return {};
+  }
+
  public async getHistorical(
    aSymbol: string,
    aGranularity: Granularity = 'day',
--- a/apps/api/src/services/data-provider/interfaces/data-provider.interface.ts
+++ b/apps/api/src/services/data-provider/interfaces/data-provider.interface.ts
@ -11,6 +11,18 @@ export interface DataProviderInterface {

  getAssetProfile(aSymbol: string): Promise<Partial<SymbolProfile>>;

+  getDividends({
+    from,
+    granularity,
+    symbol,
+    to
+  }: {
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }): Promise<{ [date: string]: IDataProviderHistoricalResponse }>;
+
  getHistorical(
    aSymbol: string,
    aGranularity: Granularity,
--- a/apps/api/src/services/data-provider/manual/manual.service.ts
+++ b/apps/api/src/services/data-provider/manual/manual.service.ts
@ -29,6 +29,20 @@ export class ManualService implements DataProviderInterface {
    };
  }

+  public async getDividends({
+    from,
+    granularity = 'day',
+    symbol,
+    to
+  }: {
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }) {
+    return {};
+  }
+
  public async getHistorical(
    aSymbol: string,
    aGranularity: Granularity = 'day',
--- a/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts
+++ b/apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts
@ -31,6 +31,20 @@ export class RapidApiService implements DataProviderInterface {
    };
  }

+  public async getDividends({
+    from,
+    granularity = 'day',
+    symbol,
+    to
+  }: {
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }) {
+    return {};
+  }
+
  public async getHistorical(
    aSymbol: string,
    aGranularity: Granularity = 'day',
--- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
@ -160,6 +160,59 @@ export class YahooFinanceService implements DataProviderInterface {
    return response;
  }

+  public async getDividends({
+    from,
+    granularity = 'day',
+    symbol,
+    to
+  }: {
+    from: Date;
+    granularity: Granularity;
+    symbol: string;
+    to: Date;
+  }) {
+    if (isSameDay(from, to)) {
+      to = addDays(to, 1);
+    }
+
+    try {
+      const historicalResult = await yahooFinance.historical(
+        this.convertToYahooFinanceSymbol(symbol),
+        {
+          events: 'dividends',
+          interval: granularity === 'month' ? '1mo' : '1d',
+          period1: format(from, DATE_FORMAT),
+          period2: format(to, DATE_FORMAT)
+        }
+      );
+
+      const response: {
+        [date: string]: IDataProviderHistoricalResponse;
+      } = {};
+
+      for (const historicalItem of historicalResult) {
+        response[format(historicalItem.date, DATE_FORMAT)] = {
+          marketPrice: this.getConvertedValue({
+            symbol,
+            value: historicalItem.dividends
+          })
+        };
+      }
+
+      return response;
+    } catch (error) {
+      Logger.error(
+        `Could not get dividends for ${symbol} (${this.getName()}) from ${format(
+          from,
+          DATE_FORMAT
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`,
+        'YahooFinanceService'
+      );
+
+      return {};
+    }
+  }
+
  public async getHistorical(
    aSymbol: string,
    aGranularity: Granularity = 'day',
@ -172,11 +225,9 @@ export class YahooFinanceService implements DataProviderInterface {
      to = addDays(to, 1);
    }

-    const yahooFinanceSymbol = this.convertToYahooFinanceSymbol(aSymbol);
-
    try {
      const historicalResult = await yahooFinance.historical(
-        yahooFinanceSymbol,
+        this.convertToYahooFinanceSymbol(aSymbol),
        {
          interval: '1d',
          period1: format(from, DATE_FORMAT),
@ -188,27 +239,14 @@ export class YahooFinanceService implements DataProviderInterface {
        [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
      } = {};

-      // Convert symbol back
-      const symbol = this.convertFromYahooFinanceSymbol(yahooFinanceSymbol);
-
-      response[symbol] = {};
+      response[aSymbol] = {};

      for (const historicalItem of historicalResult) {
-        let marketPrice = historicalItem.close;
-
-        if (symbol === `${this.baseCurrency}GBp`) {
-          // Convert GPB to GBp (pence)
-          marketPrice = new Big(marketPrice).mul(100).toNumber();
-        } else if (symbol === `${this.baseCurrency}ILA`) {
-          // Convert ILS to ILA
-          marketPrice = new Big(marketPrice).mul(100).toNumber();
-        } else if (symbol === `${this.baseCurrency}ZAc`) {
-          // Convert ZAR to ZAc (cents)
-          marketPrice = new Big(marketPrice).mul(100).toNumber();
-        }
-
-        response[symbol][format(historicalItem.date, DATE_FORMAT)] = {
-          marketPrice,
+        response[aSymbol][format(historicalItem.date, DATE_FORMAT)] = {
+          marketPrice: this.getConvertedValue({
+            symbol: aSymbol,
+            value: historicalItem.close
+          }),
          performance: historicalItem.open - historicalItem.close
        };
      }
@ -423,6 +461,27 @@ export class YahooFinanceService implements DataProviderInterface {
    return name || shortName || symbol;
  }

+  private getConvertedValue({
+    symbol,
+    value
+  }: {
+    symbol: string;
+    value: number;
+  }) {
+    if (symbol === `${this.baseCurrency}GBp`) {
+      // Convert GPB to GBp (pence)
+      return new Big(value).mul(100).toNumber();
+    } else if (symbol === `${this.baseCurrency}ILA`) {
+      // Convert ILS to ILA
+      return new Big(value).mul(100).toNumber();
+    } else if (symbol === `${this.baseCurrency}ZAc`) {
+      // Convert ZAR to ZAc (cents)
+      return new Big(value).mul(100).toNumber();
+    }
+
+    return value;
+  }
+
  private parseAssetClass(aPrice: Price): {
    assetClass: AssetClass;
    assetSubClass: AssetSubClass;
--- a/apps/client/project.json
+++ b/apps/client/project.json
@ -89,6 +89,10 @@
          "baseHref": "/es/",
          "localize": ["es"]
        },
+        "development-fr": {
+          "baseHref": "/fr/",
+          "localize": ["fr"]
+        },
        "development-it": {
          "baseHref": "/it/",
          "localize": ["it"]
@ -97,6 +101,10 @@
          "baseHref": "/nl/",
          "localize": ["nl"]
        },
+        "development-pt": {
+          "baseHref": "/pt/",
+          "localize": ["pt"]
+        },
        "production": {
          "fileReplacements": [
            {
@ -144,12 +152,18 @@
        "development-es": {
          "browserTarget": "client:build:development-es"
        },
+        "development-fr": {
+          "browserTarget": "client:build:development-fr"
+        },
        "development-it": {
          "browserTarget": "client:build:development-it"
        },
        "development-nl": {
          "browserTarget": "client:build:development-nl"
        },
+        "development-pt": {
+          "browserTarget": "client:build:development-pt"
+        },
        "production": {
          "browserTarget": "client:build:production"
        }
@ -164,8 +178,10 @@
        "targetFiles": [
          "messages.de.xlf",
          "messages.es.xlf",
+          "messages.fr.xlf",
          "messages.it.xlf",
-          "messages.nl.xlf"
+          "messages.nl.xlf",
+          "messages.pt.xlf"
        ]
      }
    },
@ -194,6 +210,10 @@
        "baseHref": "/es/",
        "translation": "apps/client/src/locales/messages.es.xlf"
      },
+      "fr": {
+        "baseHref": "/fr/",
+        "translation": "apps/client/src/locales/messages.fr.xlf"
+      },
      "it": {
        "baseHref": "/it/",
        "translation": "apps/client/src/locales/messages.it.xlf"
@ -201,6 +221,10 @@
      "nl": {
        "baseHref": "/nl/",
        "translation": "apps/client/src/locales/messages.nl.xlf"
+      },
+      "pt": {
+        "baseHref": "/pt/",
+        "translation": "apps/client/src/locales/messages.pt.xlf"
      }
    },
    "sourceLocale": "en"
--- a/apps/client/src/app/app-routing.module.ts
+++ b/apps/client/src/app/app-routing.module.ts
@ -116,6 +116,13 @@ const routes: Routes = [
        './pages/blog/2022/12/the-importance-of-tracking-your-personal-finances/the-importance-of-tracking-your-personal-finances-page.module'
      ).then((m) => m.TheImportanceOfTrackingYourPersonalFinancesPageModule)
  },
+  {
+    path: 'blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt',
+    loadChildren: () =>
+      import(
+        './pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.module'
+      ).then((m) => m.GhostfolioAufSackgeldVorgestelltPageModule)
+  },
  {
    path: 'demo',
    loadChildren: () =>
--- a/apps/client/src/app/app.component.html
+++ b/apps/client/src/app/app.component.html
@ -3,6 +3,7 @@
    class="position-fixed w-100"
    [currentRoute]="currentRoute"
    [info]="info"
+    [pageTitle]="pageTitle"
    [user]="user"
    (signOut)="onSignOut()"
  ></gf-header>
--- a/apps/client/src/app/app.component.scss
+++ b/apps/client/src/app/app.component.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@ -5,7 +5,13 @@ import {
  OnDestroy,
  OnInit
 } from '@angular/core';
-import { NavigationEnd, PRIMARY_OUTLET, Router } from '@angular/router';
+import { Title } from '@angular/platform-browser';
+import {
+  ActivatedRoute,
+  NavigationEnd,
+  PRIMARY_OUTLET,
+  Router
+} from '@angular/router';
 import {
  primaryColorHex,
  secondaryColorHex,
@ -36,6 +42,7 @@ export class AppComponent implements OnDestroy, OnInit {
  public currentYear = new Date().getFullYear();
  public deviceType: string;
  public info: InfoItem;
+  public pageTitle: string;
  public user: User;
  public version = environment.version;

@ -47,6 +54,7 @@ export class AppComponent implements OnDestroy, OnInit {
    private deviceService: DeviceDetectorService,
    private materialCssVarsService: MaterialCssVarsService,
    private router: Router,
+    private title: Title,
    private tokenStorageService: TokenStorageService,
    private userService: UserService
  ) {
@ -66,6 +74,19 @@ export class AppComponent implements OnDestroy, OnInit {
        this.currentRoute = urlSegments[0].path;

        this.info = this.dataService.fetchInfo();
+
+        if (this.deviceType === 'mobile') {
+          setTimeout(() => {
+            const index = this.title.getTitle().indexOf('–');
+            const title =
+              index === -1
+                ? ''
+                : this.title.getTitle().substring(0, index).trim();
+            this.pageTitle = title.length <= 15 ? title : 'Ghostfolio';
+
+            this.changeDetectorRef.markForCheck();
+          });
+        }
      });

    this.userService.stateChanged
--- a/apps/client/src/app/app.module.ts
+++ b/apps/client/src/app/app.module.ts
@ -25,6 +25,7 @@ import { DateFormats } from './adapter/date-formats';
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { GfHeaderModule } from './components/header/header.module';
+import { GfSubscriptionInterstitialDialogModule } from './components/subscription-interstitial-dialog/subscription-interstitial-dialog.module';
 import { authInterceptorProviders } from './core/auth.interceptor';
 import { httpResponseInterceptorProviders } from './core/http-response.interceptor';
 import { LanguageService } from './core/language.service';
@ -40,6 +41,7 @@ export function NgxStripeFactory(): string {
    BrowserAnimationsModule,
    BrowserModule,
    GfHeaderModule,
+    GfSubscriptionInterstitialDialogModule,
    HttpClientModule,
    MarkdownModule.forRoot(),
    MatAutocompleteModule,
--- a/apps/client/src/app/components/access-table/access-table.component.scss
+++ b/apps/client/src/app/components/access-table/access-table.component.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/accounts-table/accounts-table.component.scss
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/admin-jobs/admin-jobs.scss
+++ b/apps/client/src/app/components/admin-jobs/admin-jobs.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.scss
+++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts
+++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts
@ -20,7 +20,6 @@ import {
  addDays,
  format,
  isBefore,
-  isDate,
  isSameDay,
  isToday,
  isValid,
@ -31,6 +30,7 @@ import { last } from 'lodash';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject, takeUntil } from 'rxjs';

+import { MarketDataDetailDialogParams } from './market-data-detail-dialog/interfaces/interfaces';
 import { MarketDataDetailDialog } from './market-data-detail-dialog/market-data-detail-dialog.component';

@Component({
@ -40,6 +40,7 @@ import { MarketDataDetailDialog } from './market-data-detail-dialog/market-data-
  templateUrl: './admin-market-data-detail.component.html'
 })
 export class AdminMarketDataDetailComponent implements OnChanges, OnInit {
+  @Input() currency: string;
  @Input() dataSource: DataSource;
  @Input() dateOfFirstActivity: string;
  @Input() locale = getLocale();
@ -161,9 +162,10 @@ export class AdminMarketDataDetailComponent implements OnChanges, OnInit {
    }

    const dialogRef = this.dialog.open(MarketDataDetailDialog, {
-      data: {
+      data: <MarketDataDetailDialogParams>{
        date,
        marketPrice,
+        currency: this.currency,
        dataSource: this.dataSource,
        symbol: this.symbol,
        user: this.user
--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/interfaces/interfaces.ts
+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/interfaces/interfaces.ts
@ -2,6 +2,7 @@ import { User } from '@ghostfolio/common/interfaces';
 import { DataSource } from '@prisma/client';

 export interface MarketDataDetailDialogParams {
+  currency: string;
  dataSource: DataSource;
  date: Date;
  marketPrice: number;
--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.component.ts
+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.component.ts
@ -36,7 +36,7 @@ export class MarketDataDetailDialog implements OnDestroy {
    this.dateAdapter.setLocale(this.locale);
  }

-  public onCancel(): void {
+  public onCancel() {
    this.dialogRef.close({ withRefresh: false });
  }

--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.html
+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.html
@ -1,5 +1,5 @@
 <form class="d-flex flex-column h-100">
-  <h1 mat-dialog-title i18n>Details for {{ data.symbol }}</h1>
+  <h1 i18n mat-dialog-title>Details for {{ data.symbol }}</h1>
  <div class="flex-grow-1" mat-dialog-content>
    <div class="mb-3">
      <mat-form-field appearance="outline" class="w-100">
@ -30,6 +30,7 @@
          type="number"
          [(ngModel)]="data.marketPrice"
        />
+        <span class="ml-2" matSuffix>{{ data.currency }}</span>
        <button
          mat-icon-button
          matSuffix
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.scss
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts
@ -14,6 +14,7 @@ import {
  EnhancedSymbolProfile,
  UniqueAsset
 } from '@ghostfolio/common/interfaces';
+import { translate } from '@ghostfolio/ui/i18n';
 import { MarketData } from '@prisma/client';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@ -28,11 +29,13 @@ import { AssetProfileDialogParams } from './interfaces/interfaces';
  styleUrls: ['./asset-profile-dialog.component.scss']
 })
 export class AssetProfileDialog implements OnDestroy, OnInit {
+  public assetClass: string;
  public assetProfile: EnhancedSymbolProfile;
  public assetProfileForm = this.formBuilder.group({
    comment: '',
    symbolMapping: ''
  });
+  public assetSubClass: string;
  public countries: {
    [code: string]: { name: string; value: number };
  };
@ -64,6 +67,9 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
      .pipe(takeUntil(this.unsubscribeSubject))
      .subscribe(({ assetProfile, marketData }) => {
        this.assetProfile = assetProfile;
+
+        this.assetClass = translate(this.assetProfile?.assetClass);
+        this.assetSubClass = translate(this.assetProfile?.assetSubClass);
        this.countries = {};
        this.marketDataDetails = marketData;
        this.sectors = {};
--- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html
@ -43,6 +43,7 @@
  <div class="flex-grow-1" mat-dialog-content>
    <gf-admin-market-data-detail
      class="mb-3"
+      [currency]="assetProfile?.currency"
      [dataSource]="data.dataSource"
      [dateOfFirstActivity]="assetProfile?.dateOfFirstActivity"
      [locale]="data.locale"
@ -51,6 +52,16 @@
      (marketDataChanged)="onMarketDataChanged($event)"
    ></gf-admin-market-data-detail>
    <div class="row">
+      <div class="col-6 mb-3">
+        <gf-value i18n size="medium" [value]="assetProfile?.symbol"
+          >Symbol</gf-value
+        >
+      </div>
+      <div class="col-6 mb-3">
+        <gf-value i18n size="medium" [value]="assetProfile?.currency"
+          >Currency</gf-value
+        >
+      </div>
      <div class="col-6 mb-3">
        <gf-value
          i18n
@ -71,11 +82,7 @@
        >
      </div>
      <div class="col-6 mb-3">
-        <gf-value
-          i18n
-          size="medium"
-          [hidden]="!assetProfile?.assetClass"
-          [value]="assetProfile?.assetClass"
+        <gf-value i18n size="medium" [hidden]="!assetClass" [value]="assetClass"
          >Asset Class</gf-value
        >
      </div>
@ -83,8 +90,8 @@
        <gf-value
          i18n
          size="medium"
-          [hidden]="!assetProfile?.assetSubClass"
-          [value]="assetProfile?.assetSubClass"
+          [hidden]="!assetSubClass"
+          [value]="assetSubClass"
          >Asset Sub Class</gf-value
        >
      </div>
--- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts
+++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts
@ -8,7 +8,8 @@ import {
  PROPERTY_CURRENCIES,
  PROPERTY_IS_READ_ONLY_MODE,
  PROPERTY_IS_USER_SIGNUP_ENABLED,
-  PROPERTY_SYSTEM_MESSAGE
+  PROPERTY_SYSTEM_MESSAGE,
+  ghostfolioPrefix
 } from '@ghostfolio/common/config';
 import { Coupon, InfoItem, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
@ -97,7 +98,10 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
  public onAddCoupon() {
    const coupons = [
      ...this.coupons,
-      { code: this.generateCouponCode(16), duration: this.couponDuration }
+      {
+        code: `${ghostfolioPrefix}${this.generateCouponCode(14)}`,
+        duration: this.couponDuration
+      }
    ];
    this.putAdminSetting({ key: PROPERTY_COUPONS, value: coupons });
  }
--- a/apps/client/src/app/components/admin-overview/admin-overview.scss
+++ b/apps/client/src/app/components/admin-overview/admin-overview.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/admin-users/admin-users.scss
+++ b/apps/client/src/app/components/admin-users/admin-users.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/header/header.component.html
+++ b/apps/client/src/app/components/header/header.component.html
@ -5,7 +5,7 @@
      mat-button
      [routerLink]="['/']"
    >
-      <gf-logo></gf-logo>
+      <gf-logo [label]="pageTitle"></gf-logo>
    </a>
    <span class="spacer"></span>
    <a
@ -231,7 +231,10 @@
      mat-button
      [routerLink]="['/']"
    >
-      <gf-logo [hideName]="currentRoute === 'register'"></gf-logo>
+      <gf-logo
+        [label]="pageTitle"
+        [showLabel]="currentRoute !== 'register'"
+      ></gf-logo>
    </a>
    <span class="spacer"></span>
    <a
--- a/apps/client/src/app/components/header/header.component.scss
+++ b/apps/client/src/app/components/header/header.component.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/header/header.component.ts
+++ b/apps/client/src/app/components/header/header.component.ts
@ -30,6 +30,7 @@ import { catchError, takeUntil } from 'rxjs/operators';
 export class HeaderComponent implements OnChanges {
  @Input() currentRoute: string;
  @Input() info: InfoItem;
+  @Input() pageTitle: string;
  @Input() user: User;

  @Output() signOut = new EventEmitter<void>();
--- a/apps/client/src/app/components/home-holdings/home-holdings.scss
+++ b/apps/client/src/app/components/home-holdings/home-holdings.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/home-market/home-market.html
+++ b/apps/client/src/app/components/home-market/home-market.html
@ -1,5 +1,5 @@
 <div class="container">
-  <h3 class="mb-3 text-center" i18n>Markets</h3>
+  <h3 class="d-none d-sm-block mb-3 text-center" i18n>Markets</h3>
  <div class="mb-5 row">
    <div class="col-xs-12 col-md-8 offset-md-2">
      <div class="mb-2 text-center text-muted">
--- a/apps/client/src/app/components/home-market/home-market.scss
+++ b/apps/client/src/app/components/home-market/home-market.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/home-overview/home-overview.component.ts
+++ b/apps/client/src/app/components/home-overview/home-overview.component.ts
@ -110,13 +110,12 @@ export class HomeOverviewComponent implements OnDestroy, OnInit {
        range: this.user?.settings?.dateRange
      })
      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe((response) => {
-        this.errors = response.errors;
-        this.hasError = response.hasErrors;
-        this.performance = response.performance;
+      .subscribe(({ chart, errors, performance }) => {
+        this.errors = errors;
+        this.performance = performance;
        this.isLoadingPerformance = false;

-        this.historicalDataItems = response.chart.map(
+        this.historicalDataItems = chart.map(
          ({ date, netPerformanceInPercentage }) => {
            return {
              date,
--- a/apps/client/src/app/components/home-overview/home-overview.html
+++ b/apps/client/src/app/components/home-overview/home-overview.html
@ -37,7 +37,6 @@
        [baseCurrency]="user?.settings?.baseCurrency"
        [deviceType]="deviceType"
        [errors]="errors"
-        [hasError]="hasError"
        [isAllTimeHigh]="isAllTimeHigh"
        [isAllTimeLow]="isAllTimeLow"
        [isLoading]="isLoadingPerformance"
--- a/apps/client/src/app/components/home-overview/home-overview.scss
+++ b/apps/client/src/app/components/home-overview/home-overview.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/home-summary/home-summary.html
+++ b/apps/client/src/app/components/home-summary/home-summary.html
@ -1,10 +1,8 @@
 <div class="container pb-3 px-3">
+  <h3 class="d-none d-sm-block mb-3 text-center" i18n>Summary</h3>
  <div class="row">
    <div class="col-xs-12 col-md-8 offset-md-2">
      <mat-card class="h-100">
-        <mat-card-header>
-          <mat-card-title i18n>Summary</mat-card-title>
-        </mat-card-header>
        <mat-card-content>
          <gf-portfolio-summary
            [baseCurrency]="user?.settings?.baseCurrency"
--- a/apps/client/src/app/components/home-summary/home-summary.scss
+++ b/apps/client/src/app/components/home-summary/home-summary.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts
+++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts
@ -11,7 +11,8 @@ import {
 import {
  getTooltipOptions,
  getTooltipPositionerMapTop,
-  getVerticalHoverLinePlugin
+  getVerticalHoverLinePlugin,
+  transformTickToAbbreviation
 } from '@ghostfolio/common/chart-helper';
 import { primaryColorRgb, secondaryColorRgb } from '@ghostfolio/common/config';
 import {
@ -19,8 +20,7 @@ import {
  getBackgroundColor,
  getDateFormatString,
  getTextColor,
-  parseDate,
-  transformTickToAbbreviation
+  parseDate
 } from '@ghostfolio/common/helper';
 import { LineChartItem } from '@ghostfolio/common/interfaces';
 import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
@ -136,10 +136,13 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
        date,
        investment: last(this.investments).investment
      });
-      this.values.push({ date, value: last(this.values).value });
+      this.values.push({
+        date,
+        value: last(this.values).value
+      });
    }

-    const data = {
+    const chartData = {
      labels: this.historicalDataItems.map(({ date }) => {
        return parseDate(date);
      }),
@ -191,17 +194,29 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {

    if (this.chartCanvas) {
      if (this.chart) {
-        this.chart.data = data;
+        this.chart.data = chartData;
        this.chart.options.plugins.tooltip = <unknown>(
          this.getTooltipPluginConfiguration()
        );
        this.chart.options.scales.x.min = this.daysInMarket
-          ? subDays(new Date(), this.daysInMarket).toISOString()
+          ? subDays(
+              new Date().setHours(0, 0, 0, 0),
+              this.daysInMarket
+            ).toISOString()
          : undefined;
+
+        if (
+          this.savingsRate &&
+          this.chart.options.plugins.annotation.annotations.savingsRate
+        ) {
+          this.chart.options.plugins.annotation.annotations.savingsRate.value =
+            this.savingsRate;
+        }
+
        this.chart.update();
      } else {
        this.chart = new Chart(this.chartCanvas.nativeElement, {
-          data,
+          data: chartData,
          options: {
            animation: false,
            elements: {
@ -316,6 +331,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
      ...getTooltipOptions({
        colorScheme: this.colorScheme,
        currency: this.isInPercent ? undefined : this.currency,
+        groupBy: this.groupBy,
        locale: this.isInPercent ? undefined : this.locale,
        unit: this.isInPercent ? '%' : undefined
      }),
--- a/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.html
+++ b/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.html
@ -3,14 +3,14 @@
    <div
      class="flex-grow-1 status text-muted text-right"
      [title]="
-        hasError && !isLoading
+        errors?.length > 0 && !isLoading
          ? 'Sorry! Our data provider partner is experiencing the hiccups.'
          : ''
      "
      (click)="errors?.length > 0 && onShowErrors()"
    >
      <ion-icon
-        *ngIf="hasError && !isLoading"
+        *ngIf="errors?.length > 0 && !isLoading"
        name="alert-circle-outline"
      ></ion-icon>
    </div>
--- a/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.ts
+++ b/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.ts
@ -28,7 +28,6 @@ export class PortfolioPerformanceComponent implements OnChanges, OnInit {
  @Input() baseCurrency: string;
  @Input() deviceType: string;
  @Input() errors: ResponseError['errors'];
-  @Input() hasError: boolean;
  @Input() isAllTimeHigh: boolean;
  @Input() isAllTimeLow: boolean;
  @Input() isLoading: boolean;
--- a/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts
+++ b/apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts
@ -111,7 +111,7 @@ export class PositionDetailDialog implements OnDestroy, OnInit {

              return {
                date: historicalDataItem.date,
-                value: historicalDataItem.value
+                value: historicalDataItem.marketPrice
              };
            }
          );
@ -125,7 +125,12 @@ export class PositionDetailDialog implements OnDestroy, OnInit {
          this.quantity = quantity;
          this.sectors = {};
          this.SymbolProfile = SymbolProfile;
-          this.tags = tags;
+          this.tags = tags.map(({ id, name }) => {
+            return {
+              id,
+              name: translate(name)
+            };
+          });
          this.transactionCount = transactionCount;
          this.value = value;

--- a/apps/client/src/app/components/positions/positions.component.scss
+++ b/apps/client/src/app/components/positions/positions.component.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  display: block;
--- a/apps/client/src/app/components/subscription-interstitial-dialog/interfaces/interfaces.ts
+++ b/apps/client/src/app/components/subscription-interstitial-dialog/interfaces/interfaces.ts
@ -0,0 +1 @@
+export interface SubscriptionInterstitialDialogParams {}
--- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts
+++ b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.component.ts
@ -0,0 +1,22 @@
+import { ChangeDetectionStrategy, Component, Inject } from '@angular/core';
+import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+
+import { SubscriptionInterstitialDialogParams } from './interfaces/interfaces';
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  host: { class: 'd-flex flex-column flex-grow-1 h-100' },
+  selector: 'gf-subscription-interstitial-dialog',
+  styleUrls: ['./subscription-interstitial-dialog.scss'],
+  templateUrl: 'subscription-interstitial-dialog.html'
+})
+export class SubscriptionInterstitialDialog {
+  public constructor(
+    @Inject(MAT_DIALOG_DATA) public data: SubscriptionInterstitialDialogParams,
+    public dialogRef: MatDialogRef<SubscriptionInterstitialDialog>
+  ) {}
+
+  public onCancel() {
+    this.dialogRef.close({});
+  }
+}
--- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html
+++ b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.html
@ -0,0 +1,42 @@
+<h1 class="align-items-center d-flex" mat-dialog-title>
+  <span>Ghostfolio Premium</span>
+  <gf-premium-indicator class="ml-1"></gf-premium-indicator>
+</h1>
+<div class="flex-grow-1" mat-dialog-content>
+  <p class="h5" i18n>
+    Are you an ambitious investor who needs the full picture?
+  </p>
+  <p i18n>
+    By upgrading to Ghostfolio Premium, you will get these additional features:
+  </p>
+  <ul class="list-unstyled mb-3">
+    <li class="align-items-center d-flex mb-1">
+      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+      <span i18n>Portfolio Summary</span>
+    </li>
+    <li class="align-items-center d-flex mb-1">
+      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+      <span i18n>Performance Benchmarks</span>
+    </li>
+    <li class="align-items-center d-flex mb-1">
+      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+      <span i18n>Allocations</span>
+    </li>
+    <li class="align-items-center d-flex mb-1">
+      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+      <span i18n>FIRE Calculator</span>
+    </li>
+    <li class="align-items-center d-flex mb-1">
+      <ion-icon class="mr-1" name="checkmark-circle-outline"></ion-icon>
+      <a i18n [routerLink]="['/features']">and more Features...</a>
+    </li>
+  </ul>
+  <p>Refine your personal investment strategy now.</p>
+</div>
+<div class="justify-content-end" mat-dialog-actions>
+  <button i18n mat-button (click)="onCancel()">Skip</button>
+  <a color="primary" mat-flat-button [routerLink]="['/pricing']">
+    <span i18n>Upgrade Plan</span>
+    <ion-icon class="ml-1" name="arrow-forward-outline"></ion-icon>
+  </a>
+</div>
--- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.module.ts
+++ b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.module.ts
@ -0,0 +1,21 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { RouterModule } from '@angular/router';
+import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
+
+import { SubscriptionInterstitialDialog } from './subscription-interstitial-dialog.component';
+
+@NgModule({
+  declarations: [SubscriptionInterstitialDialog],
+  imports: [
+    CommonModule,
+    GfPremiumIndicatorModule,
+    MatButtonModule,
+    MatDialogModule,
+    RouterModule
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class GfSubscriptionInterstitialDialogModule {}
--- a/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.scss
+++ b/apps/client/src/app/components/subscription-interstitial-dialog/subscription-interstitial-dialog.scss
@ -0,0 +1,11 @@
+:host {
+  display: block;
+
+  .mat-dialog-content {
+    max-height: unset;
+
+    ion-icon[name='checkmark-circle-outline'] {
+      color: rgba(var(--palette-accent-500), 1);
+    }
+  }
+}
--- a/apps/client/src/app/components/world-map-chart/world-map-chart.component.ts
+++ b/apps/client/src/app/components/world-map-chart/world-map-chart.component.ts
@ -7,6 +7,7 @@ import {
  OnDestroy,
  OnInit
 } from '@angular/core';
+import { getNumberFormatGroup } from '@ghostfolio/common/helper';
 import svgMap from 'svgmap';

@Component({
@ -16,9 +17,10 @@ import svgMap from 'svgmap';
  styleUrls: ['./world-map-chart.component.scss']
 })
 export class WorldMapChartComponent implements OnChanges, OnDestroy, OnInit {
-  @Input() baseCurrency: string;
-  @Input() countries: { [code: string]: { name: string; value: number } };
+  @Input() countries: { [code: string]: { name?: string; value: number } };
+  @Input() format: string;
  @Input() isInPercent = false;
+  @Input() locale: string;

  public isLoading = true;
  public svgMapElement;
@ -71,7 +73,8 @@ export class WorldMapChartComponent implements OnChanges, OnDestroy, OnInit {
        applyData: 'value',
        data: {
          value: {
-            format: this.isInPercent ? `{0}%` : `{0} ${this.baseCurrency}`
+            format: this.format,
+            thousandSeparator: getNumberFormatGroup(this.locale)
          }
        },
        values: this.countries
--- a/apps/client/src/app/pages/about/about-page.html
+++ b/apps/client/src/app/pages/about/about-page.html
@ -1,7 +1,7 @@
 <div class="container">
  <div class="mb-5 row">
    <div class="col">
-      <h3 class="d-flex justify-content-center mb-3">About Ghostfolio</h3>
+      <h3 class="d-none d-sm-block mb-3 text-center">About Ghostfolio</h3>
      <div class="about-container">
        <p>
          Ghostfolio is a lightweight wealth management application for
@ -42,9 +42,11 @@
            href="https://twitter.com/ghostfolio_"
            title="Tweet to Ghostfolio on Twitter"
            >@ghostfolio_</a
-          >, send an e-mail to
-          <a href="mailto:hi@ghostfol.io" title="Send an e-mail"
-            >hi@ghostfol.io</a
+          ><ng-container *ngIf="hasPermissionForSubscription"
+            >, send an e-mail to
+            <a href="mailto:hi@ghostfol.io" title="Send an e-mail"
+              >hi@ghostfol.io</a
+            ></ng-container
          >
          or open an issue at
          <a
--- a/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.html
+++ b/apps/client/src/app/pages/about/privacy-policy/privacy-policy-page.html
@ -1,7 +1,7 @@
 <div class="container">
  <div class="mb-5 row">
    <div class="col">
-      <h3 class="mb-3 text-center" i18n>Privacy Policy</h3>
+      <h3 class="d-none d-sm-block mb-3 text-center" i18n>Privacy Policy</h3>
      <markdown [src]="'../assets/privacy-policy.md'"></markdown>
    </div>
  </div>
--- a/apps/client/src/app/pages/account/account-page.component.ts
+++ b/apps/client/src/app/pages/account/account-page.component.ts
@ -55,7 +55,17 @@ export class AccountPageComponent implements OnDestroy, OnInit {
  public hasPermissionToUpdateViewMode: boolean;
  public hasPermissionToUpdateUserSettings: boolean;
  public language = document.documentElement.lang;
-  public locales = ['de', 'de-CH', 'en-GB', 'en-US', 'es', 'it', 'nl'];
+  public locales = [
+    'de',
+    'de-CH',
+    'en-GB',
+    'en-US',
+    'es',
+    'fr',
+    'it',
+    'nl',
+    'pt'
+  ];
  public price: number;
  public priceId: string;
  public snackBarRef: MatSnackBarRef<TextOnlySnackBar>;
--- a/apps/client/src/app/pages/account/account-page.html
+++ b/apps/client/src/app/pages/account/account-page.html
@ -1,7 +1,7 @@
 <div class="container">
  <div class="row">
    <div class="col">
-      <h3 class="d-flex justify-content-center mb-3" i18n>Account</h3>
+      <h3 class="mb-3 text-center" i18n>Account</h3>
    </div>
  </div>
  <div *ngIf="user?.settings" class="mb-5 row">
@ -24,8 +24,8 @@
                ></gf-premium-indicator>
              </div>
              <div *ngIf="user?.subscription?.type === 'Premium'">
-                Valid until {{ user?.subscription?.expiresAt | date:
-                defaultDateFormat }}
+                <ng-container i18n>Valid until</ng-container> {{
+                user?.subscription?.expiresAt | date: defaultDateFormat }}
              </div>
              <div *ngIf="user?.subscription?.type === 'Basic'">
                <ng-container *ngIf="hasPermissionForSubscription">
@ -74,8 +74,8 @@
            <div class="pr-1 w-50">
              <div i18n>Presenter View</div>
              <div class="hint-text text-muted" i18n>
-                Hides sensitive values such as absolute performances and
-                quantities.
+                Protection for sensitive information like absolute performances
+                and quantity values
              </div>
            </div>
            <div class="pl-1 w-50">
@ -135,6 +135,10 @@
                        >Español (<ng-container i18n>Community</ng-container
                        >)</mat-option
                      >
+                      <mat-option value="fr"
+                        >Français (<ng-container i18n>Community</ng-container
+                        >)</mat-option
+                      >
                      <mat-option value="it"
                        >Italiano (<ng-container i18n>Community</ng-container
                        >)</mat-option
@ -143,6 +147,10 @@
                        >Nederlands (<ng-container i18n>Community</ng-container
                        >)</mat-option
                      >
+                      <!--<mat-option value="pt"
+                        >Português (<ng-container i18n>Community</ng-container
+                        >)</mat-option
+                      >-->
                    </mat-select>
                  </mat-form-field>
                </div>
@ -202,8 +210,11 @@
            </form>
          </div>
          <div class="d-flex mt-4 py-1">
-            <div class="align-items-center d-flex pr-1 pt-1 w-50">
-              <ng-container i18n>Zen Mode</ng-container>
+            <div class="pr-1 w-50">
+              <div i18n>Zen Mode</div>
+              <div class="hint-text text-muted" i18n>
+                Distraction-free experience for turbulent times
+              </div>
            </div>
            <div class="pl-1 w-50">
              <mat-slide-toggle
@ -231,6 +242,9 @@
          >
            <div class="pr-1 w-50">
              <div i18n>Experimental Features</div>
+              <div class="hint-text text-muted" i18n>
+                Sneak peek at upcoming functionality
+              </div>
            </div>
            <div class="pl-1 w-50">
              <mat-slide-toggle
--- a/apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.component.ts
+++ b/apps/client/src/app/pages/account/create-or-update-access-dialog/create-or-update-access-dialog.component.ts
@ -26,7 +26,7 @@ export class CreateOrUpdateAccessDialog implements OnDestroy {

  ngOnInit() {}

-  public onCancel(): void {
+  public onCancel() {
    this.dialogRef.close();
  }

--- a/apps/client/src/app/pages/accounts/accounts-page.html
+++ b/apps/client/src/app/pages/accounts/accounts-page.html
@ -1,7 +1,7 @@
 <div class="container">
  <div class="row">
    <div class="col">
-      <h3 class="d-flex justify-content-center mb-3" i18n>Accounts</h3>
+      <h3 class="d-none d-sm-block mb-3 text-center" i18n>Accounts</h3>
      <div class="accounts">
        <gf-accounts-table
          [accounts]="accounts"
@ -27,8 +27,8 @@
      class="align-items-center d-flex justify-content-center"
      color="primary"
      mat-fab
-      [routerLink]="[]"
      [queryParams]="{ createDialog: true }"
+      [routerLink]="[]"
    >
      <ion-icon name="add-outline" size="large"></ion-icon>
    </a>
--- a/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts
+++ b/apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.component.ts
@ -36,7 +36,7 @@ export class CreateOrUpdateAccountDialog implements OnDestroy {
    this.platforms = platforms;
  }

-  public onCancel(): void {
+  public onCancel() {
    this.dialogRef.close();
  }

--- a/apps/client/src/app/pages/admin/admin-page-routing.module.ts
+++ b/apps/client/src/app/pages/admin/admin-page-routing.module.ts
@ -13,14 +13,21 @@ const routes: Routes = [
    canActivate: [AuthGuard],
    children: [
      { path: '', redirectTo: 'overview', pathMatch: 'full' },
-      { path: 'jobs', component: AdminJobsComponent },
-      { path: 'market-data', component: AdminMarketDataComponent },
-      { path: 'overview', component: AdminOverviewComponent },
-      { path: 'users', component: AdminUsersComponent }
+      { path: 'jobs', component: AdminJobsComponent, title: $localize`Jobs` },
+      {
+        path: 'market-data',
+        component: AdminMarketDataComponent,
+        title: $localize`Market Data`
+      },
+      {
+        path: 'overview',
+        component: AdminOverviewComponent,
+        title: $localize`Admin Control`
+      },
+      { path: 'users', component: AdminUsersComponent, title: $localize`Users` }
    ],
    component: AdminPageComponent,
-    path: '',
-    title: $localize`Admin Control`
+    path: ''
  }
 ];

--- a/apps/client/src/app/pages/admin/admin-page.scss
+++ b/apps/client/src/app/pages/admin/admin-page.scss
@ -1,4 +1,4 @@
-@import '~apps/client/src/styles/ghostfolio-style';
+@import 'apps/client/src/styles/ghostfolio-style';

 :host {
  color: rgb(var(--dark-primary-text));
--- a/apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html
+++ b/apps/client/src/app/pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.html
@ -125,7 +125,7 @@
            feedback, bug reports, feature requests and of course contributions!
          </p>
          <p>
-            You can reach me by email at
+            You can reach me by e-mail at
            <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or on Twitter
            <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a>.
          </p>
--- a/apps/client/src/app/pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.html
+++ b/apps/client/src/app/pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.html
@ -99,7 +99,7 @@
            >
            of users. In the future, I would like to involve more contributors
            to further extend the functionality of Ghostfolio (e.g. with new
-            reports). Get in touch with me by email at
+            reports). Get in touch with me by e-mail at
            <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or on Twitter
            <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a> if you
            are interested, I’m happy to discuss ideas.
--- a/apps/client/src/app/pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.html
+++ b/apps/client/src/app/pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.html
@ -7,7 +7,7 @@
          <div class="mb-3 text-muted"><small>2022-07-23</small></div>
          <img
            alt="Ghostfolio meets Internet Identity Teaser"
-            class="rounded w-100"
+            class="border rounded w-100"
            src="../assets/images/blog/ghostfolio-meets-internet-identity.png"
            title="Ghostfolio meets Internet Identity"
          />
@ -64,15 +64,15 @@
          <p>
            When you authenticate with <i>Internet Identity</i>, the service
            only gets a dedicated pseudonym rather than sensitive user data like
-            the email address or phone number. This preserves your anonymity and
-            prevents you being tracked on the Internet.
+            the e-mail address or phone number. This preserves your anonymity
+            and prevents you being tracked on the Internet.
          </p>
        </section>
        <section class="mb-4">
          <h2 class="h4">The key benefits in a nutshell</h2>
          <ul>
            <li>
-              Authenticate yourself securely without the need of an email
+              Authenticate yourself securely without the need of an e-mail
              address, username, or a password: all you need is your device to
              log in.
            </li>
@ -89,7 +89,7 @@
        <section class="mb-4">
          <p>
            If you would like to provide feedback or get involved in further
-            development of Ghostfolio, please get in touch by email via
+            development of Ghostfolio, please get in touch by e-mail via
            <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or on Twitter
            <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a>.
          </p>
--- a/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html
+++ b/apps/client/src/app/pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.html
@ -62,7 +62,7 @@
            new and better Internet based on decentralized blockchains to give
            power back to the users. <i>Internet Identity</i> created by the
            <a href="https://dfinity.org">Dfinity Foundation</a> enables you to
-            sign in securely and anonymously to Ghostfolio without an email
+            sign in securely and anonymously to Ghostfolio without an e-mail
            address, username, or a password. All you need is your device with
            built-in biometric authentication.
          </p>
@ -90,7 +90,7 @@
            onboard more contributors who are actively involved in software
            engineering to realize the full potential of open source software.
            If you are a web developer and interested in personal finance,
-            please get in touch by email via
+            please get in touch by e-mail via
            <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a> or on Twitter
            <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a>. We are
            happy to discuss ideas.
--- a/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html
+++ b/apps/client/src/app/pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.html
@ -83,7 +83,7 @@
            <a href="https://ghostfolio.slack.com">Slack community</a> or get in
            touch on Twitter
            <a href="https://twitter.com/ghostfolio_">@ghostfolio_</a> or by
-            email via <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a>.
+            e-mail via <a href="mailto:hi@ghostfol.io">hi@ghostfol.io</a>.
          </p>
          <p>
            We look forward to hearing from you.<br />
--- a/apps/client/src/app/pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page-routing.module.ts
+++ b/apps/client/src/app/pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page-routing.module.ts
@ -0,0 +1,20 @@
+import { NgModule } from '@angular/core';
+import { RouterModule, Routes } from '@angular/router';
+import { AuthGuard } from '@ghostfolio/client/core/auth.guard';
+
+import { GhostfolioAufSackgeldVorgestelltPageComponent } from './ghostfolio-auf-sackgeld-vorgestellt-page.component';
+
+const routes: Routes = [
+  {
+    canActivate: [AuthGuard],
+    component: GhostfolioAufSackgeldVorgestelltPageComponent,
+    path: '',
+    title: 'Ghostfolio auf Sackgeld.com vorgestellt'
+  }
+];
+
+@NgModule({
+  imports: [RouterModule.forChild(routes)],
+  exports: [RouterModule]
+})
+export class GhostfolioAufSackgeldVorgestelltPageRoutingModule {}
--- a/apps/client/src/app/pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.component.ts
+++ b/apps/client/src/app/pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.component.ts
@ -0,0 +1,9 @@
+import { Component } from '@angular/core';
+
+@Component({
+  host: { class: 'page' },
+  selector: 'gf-ghostfolio-auf-sackgeld-vorgestellt-page',
+  styleUrls: ['./ghostfolio-auf-sackgeld-vorgestellt-page.scss'],
+  templateUrl: './ghostfolio-auf-sackgeld-vorgestellt-page.html'
+})
+export class GhostfolioAufSackgeldVorgestelltPageComponent {}
--- a/apps/client/src/app/pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.html
+++ b/apps/client/src/app/pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.html
@ -0,0 +1,178 @@
+<div class="blog container">
+  <div class="row">
+    <div class="col-md-8 offset-md-2">
+      <article>
+        <div class="mb-4 text-center">
+          <h1 class="mb-1">Ghostfolio auf Sackgeld.com vorgestellt</h1>
+          <div class="mb-3 text-muted"><small>2023-01-21</small></div>
+          <img
+            alt="Ghostfolio auf Sackgeld.com vorgestellt Teaser"
+            class="border rounded w-100"
+            src="../assets/images/blog/ghostfolio-x-sackgeld.png"
+            title="Ghostfolio auf Sackgeld.com vorgestellt"
+          />
+        </div>
+        <section class="mb-4">
+          <p>
+            Wir freuen uns darüber, dass unsere Open Source Portfolio Tracking
+            Software <a href="https://ghostfol.io">Ghostfolio</a> auf dem
+            FinTech Newsportal <i>Sackgeld.com</i> vorgestellt wurde.
+          </p>
+          <div class="container my-4">
+            <div class="row">
+              <div class="col-md-10 offset-md-1">
+                <blockquote class="blockquote m-0">
+                  <p class="mb-0">
+                    «Ghostfolio ist ein umfassender Portfolio Performance
+                    Tracker der einfach zu bedienen ist, mit einigen sehr
+                    innovativen Features aufwartet und echten Mehrwert für den
+                    Investor bringt.»
+                  </p>
+                </blockquote>
+              </div>
+            </div>
+          </div>
+          <p>
+            Im ausführlichen Bericht wird die Funktionsweise von Ghostfolio
+            erläutert, die unterstützten Assets aufgeführt sowie die
+            Preisstruktur im Vergleich zu anderen Anbietern dargelegt.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">
+            Ghostfolio – Open Source Wealth Management Software
+          </h2>
+          <p>
+            Ghostfolio ermöglicht es dir, dein Portfolio einfach zu verfolgen
+            und zu analysieren. Es bietet dir detaillierte Informationen über
+            deine Positionen, historische Entwicklung, Performance und die
+            Zusammenstellung deines Portfolios. Durch die Open Source-Lizenz (<a
+              href="https://github.com/ghostfolio/ghostfolio/blob/main/LICENSE"
+              target="_blank"
+              >GNU Affero General Public License v3.0</a
+            >) wird die Software ständig weiterentwickelt, verbessert und du
+            hast sogar selbst die Möglichkeit, dich daran zu beteiligen. Wir
+            sind davon überzeugt, mit diesem Open-Source-Ansatz von Ghostfolio
+            das Finanzwissen und Investieren für alle zugänglicher zu machen.
+          </p>
+        </section>
+        <section class="mb-4">
+          <h2 class="h4">Sackgeld.com – App für ein höheres Sackgeld</h2>
+          <p>
+            Das Schweizer FinTech Nachrichtenportal
+            <a href="https://www.sackgeld.com" target="_blank">Sackgeld.com</a>
+            informiert über die neuesten Entwicklungen und Innovationen im
+            Bereich FinTech. Dazu gehören News, Artikel und persönliche
+            Erfahrungen aus der Welt der digitalen Finanz Apps, Säule 3a, P2P
+            und Immobilien.
+          </p>
+        </section>
+        <section class="mb-4">
+          <p>
+            Wenn du mehr über Ghostfolio erfahren möchtest, kannst du hier den
+            ganzen Artikel nachlesen:
+            <a
+              href="https://www.sackgeld.com/was-taugt-ghostfolio-als-portfolio-performance-tracking-tool"
+              target="_blank"
+              >Was taugt Ghostfolio als Portfolio Performance Tracking-Tool?</a
+            >
+          </p>
+        </section>
+        <section class="mb-4">
+          <ul class="list-inline">
+            <li class="list-inline-item">
+              <span class="badge badge-light">AGPL-3.0</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Aktie</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Altersvorsorge</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Anlage</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">App</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Asset</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Feedback</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Finanzwissen</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Fintech</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Ghostfolio</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Immobilien</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Innovation</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Investieren</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Lizenz</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Media</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Open Source</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">OSS</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">P2P</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Performance</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Portfolio</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Presse</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Sackgeld</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Säule 3a</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Schweiz</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Software</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Taschengeld</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Tool</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Vermögen</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Vorsorge</span>
+            </li>
+            <li class="list-inline-item">
+              <span class="badge badge-light">Wealth Management</span>
+            </li>
+          </ul>
+        </section>
+      </article>
+    </div>
+  </div>
+</div>
--- a/apps/client/src/app/pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.module.ts
+++ b/apps/client/src/app/pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.module.ts
@ -0,0 +1,17 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+
+import { GhostfolioAufSackgeldVorgestelltPageRoutingModule } from './ghostfolio-auf-sackgeld-vorgestellt-page-routing.module';
+import { GhostfolioAufSackgeldVorgestelltPageComponent } from './ghostfolio-auf-sackgeld-vorgestellt-page.component';
+
+@NgModule({
+  declarations: [GhostfolioAufSackgeldVorgestelltPageComponent],
+  imports: [
+    CommonModule,
+    GhostfolioAufSackgeldVorgestelltPageRoutingModule,
+    RouterModule
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class GhostfolioAufSackgeldVorgestelltPageModule {}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Kaul	69ac3408f1	Release 1.230.0 (#1639 )	2023-01-29 10:00:28 +01:00
Thomas Kaul	e1806b4bd8	Feature/add sourceforge logo to landing page (#1638 ) * Add SourceForge * Update changelog	2023-01-29 09:58:53 +01:00
Thomas Kaul	6aae0cc1e4	Bugfix/fix issue with value in value redaction interceptor (#1627 ) * Fix issue with value in value redaction interceptor * Fix format of world map * Update changelog	2023-01-29 09:58:05 +01:00
Thomas Kaul	5d8a50a80d	Feature/add interstitial for subscription (#1637 ) * Add interstitial * Improve pricing page * Update changelog	2023-01-28 09:42:15 +01:00
Thomas Kaul	662231e830	Feature/upgrade prisma to version 4.9.0 (#1630 ) * Upgrade prisma to version 4.9.0 * Update changelog	2023-01-28 09:41:33 +01:00
Thomas Kaul	4d84459b5b	Clean up imports (#1632 )	2023-01-27 08:49:31 +01:00
Thomas Kaul	efba7429c1	Bugfix/fix click of unknown accounts (#1629 ) * Check for unknown key * Update changelog	2023-01-25 12:00:52 +01:00
Thomas Kaul	9cae5a3e79	Feature/improve sackgeld.com blog post (#1628 ) * Improve blog post and add quote * Update changelog	2023-01-24 08:11:21 +01:00
Thomas Kaul	c2ed0a436f	Downgrade to Node.js 16 (for development) (#1633 )	2023-01-23 21:52:46 +01:00
Leon Stoldt	8486c02575	Update Node to version 18.x (#1595 ) * Update Node to version 18.x * Add .nvmrc * Update changelog Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	2023-01-23 08:28:19 +01:00
Thomas Kaul	5122ef3456	Release 1.229.0 (#1626 )	2023-01-21 16:10:04 +01:00
Thomas Kaul	579b86665e	Feature/add sackgeld.com blog post (#1625 ) * Add blog post: Ghostfolio auf Sackgeld.com vorgestellt * Update changelog	2023-01-21 16:07:32 +01:00
Thomas Kaul	52b3ad6dc3	Feature/refactor value redaction interceptor (#1624 ) * Reuse redactAttributes() * Update changelog	2023-01-21 11:46:56 +01:00
Thomas Kaul	bf9b60aa74	Feature/add sackgeld.com to as seen in section (#1622 ) * Add Sackgeld.com * Update changelog	2023-01-21 11:31:52 +01:00
Thomas Kaul	6cd51fb044	Feature/hide irrelevant errors in client (#1623 ) * Hide irrelevant errors in client * Update changelog	2023-01-21 11:30:53 +01:00
Thomas Kaul	271001f523	Feature/remove toggle on allocations page (#1620 ) * Rename allocationCurrent, remove allocationInvestment * Update changelog	2023-01-21 09:52:58 +01:00
Thomas Kaul	a7e513a6d1	Bugfix/fix filtered value for emergency fund (#1619 ) * Fix filtered value * Update changelog	2023-01-20 20:51:08 +01:00
Thomas Kaul	b5f256be95	Remove mail address (#1621 )	2023-01-20 20:50:32 +01:00
Thomas Kaul	a834ef6b4c	Release 1.228.1 (#1617 )	2023-01-18 22:01:59 +01:00
Thomas Kaul	e5bd0d1bfa	Release 1.228.0 (#1616 )	2023-01-18 21:39:11 +01:00
Thomas Kaul	7fa6eda45d	Feature/remove emergency fund as asset class (#1615 ) * Remove emergency fund as asset class * Update changelog	2023-01-18 21:37:22 +01:00
Thomas Kaul	f47e4d3b04	Clean up imports (#1613 )	2023-01-17 20:10:08 +01:00
Thomas Kaul	0300c6f3b7	Feature/extend hints on account page (#1609 ) * Extend hints * Update changelog	2023-01-17 20:09:50 +01:00
Thomas Kaul	4865c45fd4	Feature/reduce data gathering interval to every four hours (#1611 ) * Reduce execution interval * Update changelog	2023-01-17 10:04:03 +01:00
Martin Vandenbussche	2beceb36cf	Overriding tooltip title for graphs where grouping is defined (#1605 ) * Overriding tooltip title for graphs where grouping is defined * Update changelog Co-authored-by: Thomas <4159106+dtslvr@users.noreply.github.com>	2023-01-16 10:46:48 +01:00
Thomas Kaul	cd64601482	Release 1.227.1 (#1608 )	2023-01-14 19:12:18 +01:00
Thomas Kaul	efac39eb51	Feature/extract locales 20230114 (#1607 ) * Extract locales * Update changelog	2023-01-14 19:11:14 +01:00
Thomas Kaul	4da8a547ca	Bugfix/fix create activity dialog caused by missing tags (#1606 ) * Add guard * Update changelog	2023-01-14 19:10:28 +01:00
Thomas Kaul	9e8a9e4670	Release 1.227.0 (#1603 )	2023-01-14 13:37:06 +01:00
Yash Solanki	bb99141e9c	Fix group by month/year not working for YTD (#1598 ) * Set time to 00:00:00 when getting current timestamp * Update changelog	2023-01-14 13:30:51 +01:00
Thomas Kaul	d147c2313f	Feature/support assets in emergency fund (#1601 ) * Support assets in emergency fund * Update changelog	2023-01-14 13:13:26 +01:00
Thomas Kaul	0878941c4f	Feature/support translated tags (#1600 ) * Support translated tags * Update changelog	2023-01-14 12:36:30 +01:00
Thomas Kaul	69a9e77820	Feature/improve logo alignment (#1599 ) * Improve logo alignment * Update changelog	2023-01-14 12:22:52 +01:00
Martin Vandenbussche	104cca069f	New Translations (#1597 )	2023-01-13 16:19:48 +01:00
Thomas Kaul	7ad58b1a62	Add i18n (#1594 )	2023-01-13 08:58:13 +01:00
Thomas Kaul	e88dbb0181	Fix wording (#1593 )	2023-01-12 20:14:00 +01:00
Thomas Kaul	152fd4fdf8	Release 1.226.0 (#1592 )	2023-01-11 20:12:45 +01:00
Thomas Kaul	6b022b8de8	Extract locales (#1591 )	2023-01-11 20:10:57 +01:00
Thomas Kaul	7ab699e5fe	Feature/uncover french translation feature (#1590 ) * Uncover Français * Update changelog	2023-01-11 19:59:41 +01:00
Thomas Kaul	a7e5a316be	Bugfix/fix big.js exception in report endpoint (#1586 ) * Fix exception with missing marketPrice * Update changelog	2023-01-11 19:59:13 +01:00
Thomas Kaul	3f2d3a2da9	Minor improvements (#1589 )	2023-01-11 19:45:44 +01:00
Martin Vandenbussche	0208bd0923	Feature/French translation (#1583 ) * Finished the French translation	2023-01-11 19:38:46 +01:00
Thomas Kaul	aeba6e1f03	Feature/configure thousand separator in world map chart (#1588 ) * Set thousandSeparator * Update changelog	2023-01-11 07:47:44 +01:00
Martin Vandenbussche	1b899da9ff	Minor tweaks to README.md (#1585 ) * Minor tweaks to README.md - Reduced reliance on HTML in the README.md file. - Added alt text on images for improved accessibility - Very minor formatting tweaks Signed-off-by: Martin Vandenbussche <vandenbusschemartin@gmail.com>	2023-01-10 20:59:32 +01:00
Thomas Kaul	90a7a84ac5	Feature/add global heat map to landing page (#1584 ) * Add global heat map * Update changelog	2023-01-10 20:52:05 +01:00
Thomas Kaul	fc8e23a9c8	Feature/improve form of import dividends dialog (#1582 ) * Disable while loading * Update changelog	2023-01-10 20:43:48 +01:00
Thomas Kaul	f3c8ec27cb	Feature/improve deprecated sass imports (#1581 ) * Improve deprecated Sass imports * Update changelog	2023-01-10 20:06:42 +01:00
Thomas Kaul	38474f54b0	Release 1.225.0 (#1580 )	2023-01-07 18:26:38 +01:00
Thomas Kaul	18d25fb6c2	Feature/extend faq page (#1577 ) * Extend FAQ page * Update changelog	2023-01-07 18:21:09 +01:00
Thomas Kaul	a850e8ca22	Import dividend (#1560 ) * Import dividend * Update changelog	2023-01-07 18:20:02 +01:00
Thomas Kaul	b5f565c054	Simplify data source transformation (#1578 )	2023-01-07 17:06:42 +01:00
Thomas Kaul	aa6d0a4533	Update dates (#1575 )	2023-01-07 08:48:06 +01:00
Thomas Kaul	25e9028a41	Release 1.224.0 (#1573 )	2023-01-04 20:15:29 +01:00
Yash Solanki	925d38703e	Feature/add group by year option on analysis page (#1568 ) * Add group by year option	2023-01-04 20:13:13 +01:00
Ronald Konjer	158bb00b8a	Add missing dutch translations (#1572 ) * Add missing dutch translations * Update changelog	2023-01-03 21:12:01 +01:00
Thomas Kaul	b17111e6f1	Feature/setup fr (#1571 ) * Setup fr * Update changelog	2023-01-02 21:19:19 +01:00
Thomas Kaul	c4765e31cd	Feature/setup pt (#1439 ) * Setup pt * Update changelog	2023-01-02 20:52:48 +01:00
Thomas Kaul	d321d56dee	Release 1.223.0 (#1566 )	2023-01-01 18:53:10 +01:00
Thomas Kaul	07dd22f7fe	Feature/extend asset profile details dialog by currency and symbol (#1565 ) * Extend asset profile details dialog * Update changelog	2023-01-01 12:05:28 +01:00
Thomas Kaul	eb4d088a80	Feature/optimize page title for mobile (#1564 ) * Optimize page title for mobile * Update changelog	2023-01-01 09:57:27 +01:00
Thomas Kaul	0509f0101f	Feature/add student discount (#1563 ) * Add student discount * Update changelog	2023-01-01 09:22:38 +01:00
Thomas Kaul	8818e09be8	Feature/add prefix to coupon codes (#1562 ) * Add prefix * Update changelog	2022-12-31 17:06:15 +01:00
				`@ -0,0 +1 @@`
				`export interface SubscriptionInterstitialDialogParams {}`