Release 1.234.0 (#1703 )

Revert import (#1702 )
Feature/improve usability of import activities action (#1695 )
2023-02-15 10:52:02 +01:00 · 2023-02-15 10:50:19 +01:00 · 2023-02-15 10:07:25 +01:00 · 2023-02-15 10:01:35 +01:00 · 2023-02-15 10:00:04 +01:00 · 2023-02-15 09:52:09 +01:00
285 changed files with 16637 additions and 5434 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,231 @@ 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.234.0 - 2023-02-15
+
+### Added
+
+- Added the data import and export feature to the pricing page
+
+### Changed
+
+- Copy the logic of `GhostfolioScraperApiService` to `ManualService`
+- Improved the content of the landing page
+- Improved the content of the Frequently Asked Questions (FAQ) page
+- Improved the usability of the _Import Activities..._ action
+- Eliminated the permission `enableImport`
+- Set the exposed port as an environment variable (`PORT`) in `Dockerfile`
+- Migrated the style of `AboutPageModule` to `@angular/material` `15` (mdc)
+- Migrated the style of `BlogPageModule` to `@angular/material` `15` (mdc)
+- Migrated the style of `ChangelogPageModule` to `@angular/material` `15` (mdc)
+- Migrated the style of `ResourcesPageModule` to `@angular/material` `15` (mdc)
+- Upgraded `chart.js` from version `4.0.1` to `4.2.0`
+- Upgraded `ionicons` from version `6.0.4` to `6.1.2`
+- Upgraded `prettier` from version `2.8.1` to `2.8.4`
+- Upgraded `prisma` from version `4.9.0` to `4.10.1`
+
+### Fixed
+
+- Fixed an issue on the landing page caused by the global heat map of subscribers
+- Fixed the links in the interstitial for the subscription
+
+### Todo
+
+- Remove the environment variable `ENABLE_FEATURE_IMPORT`
+- Rename the `dataSource` from `GHOSTFOLIO` to `MANUAL`
+- Eliminate `GhostfolioScraperApiService`
+
+## 1.233.0 - 2023-02-09
+
+### Added
+
+- Added support to export accounts
+- Added suport to import accounts
+
+### Changed
+
+- Improved the styling in the admin control panel
+- Removed the _Google Play_ badge from the landing page
+- Upgraded `eslint` dependencies
+
+## 1.232.0 - 2023-02-05
+
+### Changed
+
+- Improved the language localization for German (`de`)
+- Migrated the style of `ActivitiesPageModule` to `@angular/material` `15` (mdc)
+- Migrated the style of `GfCreateOrUpdateActivityDialogModule` to `@angular/material` `15` (mdc)
+- Migrated the style of `GfMarketDataDetailDialogModule` to `@angular/material` `15` (mdc)
+- Upgraded `ng-extract-i18n-merge` from version `2.1.2` to `2.5.0`
+- Upgraded `ngx-markdown` from version `14.0.1` to `15.1.0`
+
+### Fixed
+
+- Fixed the `Upgrade Plan` button of the interstitial for the subscription
+
+## 1.231.0 - 2023-02-04
+
+### Added
+
+- Added the dividend and fees to the position detail dialog
+- Added support to link a (wealth) item to an account
+
+### Changed
+
+- Relaxed the validation rule of the _Redis_ host environment variable (`REDIS_HOST`)
+- Improved the language localization for German (`de`)
+- Eliminated `angular-material-css-vars`
+- Upgraded `angular` from version `14.2.0` to `15.1.2`
+- Upgraded `Nx` from version `15.0.13` to `15.6.3`
+
+## 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
+
+- Added support for filtering on the analysis page
+- Added the price to the `Subscription` database schema
+
+### Changed
+
+- Changed the execution time of the asset profile data gathering to every Sunday at lunch time
+- Improved the activities import by providing asset profile details
+- Upgraded `@codewithdan/observable-store` from version `2.2.11` to `2.2.15`
+- Upgraded `bull` from version `4.8.5` to `4.10.2`
+- Upgraded `countup.js` from version `2.0.7` to `2.3.2`
+- Upgraded the _Internet Identity_ dependencies from version `0.12.1` to `0.15.1`
+- Upgraded `prisma` from version `4.7.1` to `4.8.0`
+
+### Fixed
+
+- Fixed the language localization of the account type
+
 ## 1.221.0 - 2022-12-26

 ### Added
--- a/6
+++ b/6
@ -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,12 +50,12 @@ 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/*

 COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
 WORKDIR /ghostfolio/apps/api
-EXPOSE 3333
+EXPOSE ${PORT:-3333}
 CMD [  "yarn", "start:prod" ]
--- 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
 - 😎 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,14 +165,17 @@ 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

-Run `yarn start:client`
+Run `yarn start:client` and open http://localhost:4200/en in your browser

 ### Start _Storybook_

@ -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/.gitkeep
+++ b/apps/api/src/app/.gitkeep
--- a/apps/api/src/app/account/account.controller.ts
+++ b/apps/api/src/app/account/account.controller.ts
@ -1,9 +1,5 @@
 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 +18,8 @@ import {
  Param,
  Post,
  Put,
-  UseGuards
+  UseGuards,
+  UseInterceptors
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
@ -39,8 +36,7 @@ export class AccountController {
    private readonly accountService: AccountService,
    private readonly impersonationService: ImpersonationService,
    private readonly portfolioService: PortfolioService,
-    @Inject(REQUEST) private readonly request: RequestWithUser,
-    private readonly userService: UserService
+    @Inject(REQUEST) private readonly request: RequestWithUser
  ) {}

  @Delete(':id')
@ -85,6 +81,7 @@ export class AccountController {

  @Get()
  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(RedactValuesInResponseInterceptor)
  public async getAllAccounts(
    @Headers('impersonation-id') impersonationId
  ): Promise<Accounts> {
@ -94,39 +91,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 +110,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/account/create-account.dto.ts
+++ b/apps/api/src/app/account/create-account.dto.ts
@ -17,6 +17,10 @@ export class CreateAccountDto {
  @IsString()
  currency: string;

+  @IsOptional()
+  @IsString()
+  id?: string;
+
  @IsBoolean()
  @IsOptional()
  isExcluded?: boolean;
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@ -244,6 +244,7 @@ export class AdminService {
        Analytics: {
          select: {
            activityCount: true,
+            country: true,
            updatedAt: true
          }
        },
@ -277,6 +278,7 @@ export class AdminService {
          id,
          subscription,
          accountCount: _count.Account || 0,
+          country: Analytics.country,
          lastActivity: Analytics.updatedAt,
          transactionCount: _count.Order || 0
        };
--- a/apps/api/src/app/app.module.ts
+++ b/apps/api/src/app/app.module.ts
@ -1,24 +1,23 @@
 import { join } from 'path';

-import { AuthDeviceModule } from '@ghostfolio/api/app/auth-device/auth-device.module';
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { CronService } from '@ghostfolio/api/services/cron.service';
-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 { TwitterBotModule } from '@ghostfolio/api/services/twitter-bot/twitter-bot.module';
 import { BullModule } from '@nestjs/bull';
 import { MiddlewareConsumer, Module, RequestMethod } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ServeStaticModule } from '@nestjs/serve-static';

+import { ConfigurationModule } from '../services/configuration.module';
+import { CronService } from '../services/cron.service';
+import { DataGatheringModule } from '../services/data-gathering.module';
+import { DataProviderModule } from '../services/data-provider/data-provider.module';
+import { ExchangeRateDataModule } from '../services/exchange-rate-data.module';
+import { PrismaModule } from '../services/prisma.module';
+import { TwitterBotModule } from '../services/twitter-bot/twitter-bot.module';
 import { AccessModule } from './access/access.module';
 import { AccountModule } from './account/account.module';
 import { AdminModule } from './admin/admin.module';
 import { AppController } from './app.controller';
+import { AuthDeviceModule } from './auth-device/auth-device.module';
 import { AuthModule } from './auth/auth.module';
 import { BenchmarkModule } from './benchmark/benchmark.module';
 import { CacheModule } from './cache/cache.module';
@ -30,6 +29,7 @@ import { InfoModule } from './info/info.module';
 import { LogoModule } from './logo/logo.module';
 import { OrderModule } from './order/order.module';
 import { PortfolioModule } from './portfolio/portfolio.module';
+import { RedisCacheModule } from './redis-cache/redis-cache.module';
 import { SubscriptionModule } from './subscription/subscription.module';
 import { SymbolModule } from './symbol/symbol.module';
 import { UserModule } from './user/user.module';
@ -45,7 +45,7 @@ import { UserModule } from './user/user.module';
    BullModule.forRoot({
      redis: {
        host: process.env.REDIS_HOST,
-        port: parseInt(process.env.REDIS_PORT, 10),
+        port: parseInt(process.env.REDIS_PORT ?? '6379', 10),
        password: process.env.REDIS_PASSWORD
      }
    }),
--- a/apps/api/src/app/auth/auth.service.ts
+++ b/apps/api/src/app/auth/auth.service.ts
@ -61,8 +61,10 @@ export class AuthService {

        // Create new user if not found
        user = await this.userService.createUser({
-          provider,
-          thirdPartyId: principalId
+          data: {
+            provider,
+            thirdPartyId: principalId
+          }
        });
      }

@ -96,8 +98,10 @@ export class AuthService {

        // Create new user if not found
        user = await this.userService.createUser({
-          provider,
-          thirdPartyId
+          data: {
+            provider,
+            thirdPartyId
+          }
        });
      }

--- a/apps/api/src/app/export/export.service.ts
+++ b/apps/api/src/app/export/export.service.ts
@ -14,6 +14,22 @@ export class ExportService {
    activityIds?: string[];
    userId: string;
  }): Promise<Export> {
+    const accounts = await this.prismaService.account.findMany({
+      orderBy: {
+        name: 'asc'
+      },
+      select: {
+        accountType: true,
+        balance: true,
+        currency: true,
+        id: true,
+        isExcluded: true,
+        name: true,
+        platformId: true
+      },
+      where: { userId }
+    });
+
    let activities = await this.prismaService.order.findMany({
      orderBy: { date: 'desc' },
      select: {
@ -38,6 +54,7 @@ export class ExportService {

    return {
      meta: { date: new Date().toISOString(), version: environment.version },
+      accounts,
      activities: activities.map(
        ({
          accountId,
--- 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-data.dto.ts
+++ b/apps/api/src/app/import/import-data.dto.ts
@ -1,8 +1,15 @@
+import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto';
 import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { Type } from 'class-transformer';
-import { IsArray, ValidateNested } from 'class-validator';
+import { IsArray, IsOptional, ValidateNested } from 'class-validator';

 export class ImportDataDto {
+  @IsOptional()
+  @IsArray()
+  @Type(() => CreateAccountDto)
+  @ValidateNested({ each: true })
+  accounts: CreateAccountDto[];
+
  @IsArray()
  @Type(() => CreateOrderDto)
  @ValidateNested({ each: true })
--- a/apps/api/src/app/import/import.controller.ts
+++ b/apps/api/src/app/import/import.controller.ts
@ -1,18 +1,25 @@
+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 { hasPermission, permissions } from '@ghostfolio/common/permissions';
 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';
@ -32,7 +39,13 @@ export class ImportController {
    @Body() importData: ImportDataDto,
    @Query('dryRun') isDryRun?: boolean
  ): Promise<ImportResponse> {
-    if (!this.configurationService.get('ENABLE_FEATURE_IMPORT')) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.createAccount
+      ) ||
+      !hasPermission(this.request.user.permissions, permissions.createOrder)
+    ) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.FORBIDDEN),
        StatusCodes.FORBIDDEN
@ -54,9 +67,10 @@ export class ImportController {

    try {
      const activities = await this.importService.import({
-        maxActivitiesToImport,
        isDryRun,
+        maxActivitiesToImport,
        userCurrency,
+        accountsDto: importData.accounts ?? [],
        activitiesDto: importData.activities,
        userId: this.request.user.id
      });
@ -74,4 +88,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
@ -1,11 +1,20 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
+import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto';
 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';
 import { endOfToday, isAfter, isSameDay, parseISO } from 'date-fns';
 import { v4 as uuidv4 } from 'uuid';
@ -16,22 +25,151 @@ 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({
+    accountsDto,
    activitiesDto,
    isDryRun = false,
    maxActivitiesToImport,
    userCurrency,
    userId
  }: {
+    accountsDto: Partial<CreateAccountDto>[];
    activitiesDto: Partial<CreateOrderDto>[];
    isDryRun?: boolean;
    maxActivitiesToImport: number;
    userCurrency: string;
    userId: string;
  }): Promise<Activity[]> {
+    const accountIdMapping: { [oldAccountId: string]: string } = {};
+
+    if (!isDryRun && accountsDto?.length) {
+      const existingAccounts = await this.accountService.accounts({
+        where: {
+          id: {
+            in: accountsDto.map(({ id }) => {
+              return id;
+            })
+          }
+        }
+      });
+
+      for (const account of accountsDto) {
+        // Check if there is any existing account with the same ID
+        const accountWithSameId = existingAccounts.find(
+          (existingAccount) => existingAccount.id === account.id
+        );
+
+        // If there is no account or if the account belongs to a different user then create a new account
+        if (!accountWithSameId || accountWithSameId.userId !== userId) {
+          let oldAccountId: string;
+          const platformId = account.platformId;
+
+          delete account.platformId;
+
+          if (accountWithSameId) {
+            oldAccountId = account.id;
+            delete account.id;
+          }
+
+          const newAccountObject = {
+            ...account,
+            User: { connect: { id: userId } }
+          };
+
+          if (platformId) {
+            Object.assign(newAccountObject, {
+              Platform: { connect: { id: platformId } }
+            });
+          }
+
+          const newAccount = await this.accountService.createAccount(
+            newAccountObject,
+            userId
+          );
+
+          // Store the new to old account ID mappings for updating activities
+          if (accountWithSameId && oldAccountId) {
+            accountIdMapping[oldAccountId] = newAccount.id;
+          }
+        }
+      }
+    }
+
    for (const activity of activitiesDto) {
      if (!activity.dataSource) {
        if (activity.type === 'ITEM') {
@ -40,20 +178,33 @@ export class ImportService {
          activity.dataSource = this.dataProviderService.getPrimaryDataSource();
        }
      }
+
+      // If a new account is created, then update the accountId in all activities
+      if (!isDryRun) {
+        if (Object.keys(accountIdMapping).includes(activity.accountId)) {
+          activity.accountId = accountIdMapping[activity.accountId];
+        }
+      }
    }

-    await this.validateActivities({
+    const assetProfiles = await this.validateActivities({
      activitiesDto,
      maxActivitiesToImport,
      userId
    });

-    const accountIds = (await this.accountService.getAccounts(userId)).map(
+    const accounts = (await this.accountService.getAccounts(userId)).map(
      (account) => {
-        return account.id;
+        return { id: account.id, name: account.name };
      }
    );

+    if (isDryRun) {
+      accountsDto.forEach(({ id, name }) => {
+        accounts.push({ id, name });
+      });
+    }
+
    const activities: Activity[] = [];

    for (const {
@ -69,11 +220,15 @@ export class ImportService {
      unitPrice
    } of activitiesDto) {
      const date = parseISO(<string>(<unknown>dateString));
-      const validatedAccountId = accountIds.includes(accountId)
-        ? accountId
-        : undefined;
+      const validatedAccount = accounts.find(({ id }) => {
+        return id === accountId;
+      });

-      let order: OrderWithAccount;
+      let order:
+        | OrderWithAccount
+        | (Omit<OrderWithAccount, 'Account'> & {
+            Account?: { id: string; name: string };
+          });

      if (isDryRun) {
        order = {
@ -84,7 +239,7 @@ export class ImportService {
          type,
          unitPrice,
          userId,
-          accountId: validatedAccountId,
+          accountId: validatedAccount?.id,
          accountUserId: undefined,
          createdAt: new Date(),
          id: uuidv4(),
@ -104,8 +259,10 @@ export class ImportService {
            sectors: null,
            symbolMapping: null,
            updatedAt: undefined,
-            url: null
+            url: null,
+            ...assetProfiles[symbol]
          },
+          Account: validatedAccount,
          symbolProfileId: undefined,
          updatedAt: new Date()
        };
@ -118,7 +275,7 @@ export class ImportService {
          type,
          unitPrice,
          userId,
-          accountId: validatedAccountId,
+          accountId: validatedAccount?.id,
          SymbolProfile: {
            connectOrCreate: {
              create: {
@ -140,6 +297,7 @@ export class ImportService {

      const value = new Big(quantity).mul(unitPrice).toNumber();

+      //@ts-ignore
      activities.push({
        ...order,
        value,
@ -159,6 +317,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,
@ -172,6 +340,9 @@ export class ImportService {
      throw new Error(`Too many activities (${maxActivitiesToImport} at most)`);
    }

+    const assetProfiles: {
+      [symbol: string]: Partial<SymbolProfile>;
+    } = {};
    const existingActivities = await this.orderService.orders({
      include: { SymbolProfile: true },
      orderBy: { date: 'desc' },
@ -200,22 +371,28 @@ export class ImportService {
      }

      if (dataSource !== 'MANUAL') {
-        const quotes = await this.dataProviderService.getQuotes([
-          { dataSource, symbol }
-        ]);
+        const assetProfile = (
+          await this.dataProviderService.getAssetProfiles([
+            { dataSource, symbol }
+          ])
+        )?.[symbol];

-        if (quotes[symbol] === undefined) {
+        if (assetProfile === undefined) {
          throw new Error(
            `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
          );
        }

-        if (quotes[symbol].currency !== currency) {
+        if (assetProfile.currency !== currency) {
          throw new Error(
-            `activities.${index}.currency ("${currency}") does not match with "${quotes[symbol].currency}"`
+            `activities.${index}.currency ("${currency}") does not match with "${assetProfile.currency}"`
          );
        }
+
+        assetProfiles[symbol] = assetProfile;
      }
    }
+
+    return assetProfiles;
  }
 }
--- a/apps/api/src/app/info/info.service.ts
+++ b/apps/api/src/app/info/info.service.ts
@ -7,8 +7,8 @@ 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_IS_USER_SIGNUP_ENABLED,
  PROPERTY_SLACK_COMMUNITY_USERS,
  PROPERTY_STRIPE_CONFIG,
  PROPERTY_SYSTEM_MESSAGE,
@ -72,10 +72,6 @@ export class InfoService {
      globalPermissions.push(permissions.enableFearAndGreedIndex);
    }

-    if (this.configurationService.get('ENABLE_FEATURE_IMPORT')) {
-      globalPermissions.push(permissions.enableImport);
-    }
-
    if (this.configurationService.get('ENABLE_FEATURE_READ_ONLY_MODE')) {
      isReadOnlyMode = (await this.propertyService.getByKey(
        PROPERTY_IS_READ_ONLY_MODE
@ -93,6 +89,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');
    }

@ -303,14 +303,14 @@ export class InfoService {
      return undefined;
    }

-    const stripeConfig = await this.prismaService.property.findUnique({
+    let subscriptions: Subscription[] = [];
+
+    const stripeConfig = (await this.prismaService.property.findUnique({
      where: { key: PROPERTY_STRIPE_CONFIG }
-    });
+    })) ?? { value: '{}' };

-    if (stripeConfig) {
-      return [JSON.parse(stripeConfig.value)];
-    }
+    subscriptions = [JSON.parse(stripeConfig.value)];

-    return [];
+    return subscriptions;
  }
 }
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@ -76,23 +76,21 @@ export class OrderService {
      userId: string;
    }
  ): Promise<Order> {
-    const defaultAccount = (
-      await this.accountService.getAccounts(data.userId)
-    ).find((account) => {
-      return account.isDefault === true;
-    });
+    let Account;
+
+    if (data.accountId) {
+      Account = {
+        connect: {
+          id_userId: {
+            userId: data.userId,
+            id: data.accountId
+          }
+        }
+      };
+    }

    const tags = data.tags ?? [];

-    let Account = {
-      connect: {
-        id_userId: {
-          userId: data.userId,
-          id: data.accountId ?? defaultAccount?.id
-        }
-      }
-    };
-
    if (data.type === 'ITEM') {
      const assetClass = data.assetClass;
      const assetSubClass = data.assetSubClass;
@ -101,7 +99,6 @@ export class OrderService {
      const id = uuidv4();
      const name = data.SymbolProfile.connectOrCreate.create.symbol;

-      Account = undefined;
      data.id = id;
      data.SymbolProfile.connectOrCreate.create.assetClass = assetClass;
      data.SymbolProfile.connectOrCreate.create.assetSubClass = assetSubClass;
--- a/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts
@ -7,6 +7,8 @@ import { Tag } from '@prisma/client';

 export interface PortfolioPositionDetail {
  averagePrice: number;
+  dividendInBaseCurrency: number;
+  feeInBaseCurrency: number;
  firstBuyDate: string;
  grossPerformance: number;
  grossPerformancePercent: number;
--- 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();

@ -81,6 +82,7 @@ describe('PortfolioCalculator', () => {
            averagePrice: new Big('0'),
            currency: 'CHF',
            dataSource: 'YAHOO',
+            fee: new Big('3.2'),
            firstBuyDate: '2021-11-22',
            grossPerformance: new Big('-12.6'),
            grossPerformancePercentage: new Big('-0.0440867739678096571'),
--- 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();

@ -70,6 +71,7 @@ describe('PortfolioCalculator', () => {
            averagePrice: new Big('136.6'),
            currency: 'CHF',
            dataSource: 'YAHOO',
+            fee: new Big('1.55'),
            firstBuyDate: '2021-11-30',
            grossPerformance: new Big('24.6'),
            grossPerformancePercentage: new Big('0.09004392386530014641'),
--- 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();

@ -81,6 +82,7 @@ describe('PortfolioCalculator', () => {
            averagePrice: new Big('320.43'),
            currency: 'CHF',
            dataSource: 'YAHOO',
+            fee: new Big('0'),
            firstBuyDate: '2015-01-01',
            grossPerformance: new Big('27172.74'),
            grossPerformancePercentage: new Big('42.40043067128546016291'),
--- 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();

@ -81,6 +82,7 @@ describe('PortfolioCalculator', () => {
            averagePrice: new Big('75.80'),
            currency: 'CHF',
            dataSource: 'YAHOO',
+            fee: new Big('4.25'),
            firstBuyDate: '2022-03-07',
            grossPerformance: new Big('21.93'),
            grossPerformancePercentage: new Big('0.14465699208443271768'),
--- 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();

@ -101,6 +102,7 @@ describe('PortfolioCalculator', () => {
            averagePrice: new Big('0'),
            currency: 'CHF',
            dataSource: 'YAHOO',
+            fee: new Big('0'),
            firstBuyDate: '2022-03-07',
            grossPerformance: new Big('19.86'),
            grossPerformancePercentage: new Big('0.13100263852242744063'),
--- 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';
@ -430,6 +431,7 @@ export class PortfolioCalculator {
          : item.investment.div(item.quantity),
        currency: item.currency,
        dataSource: item.dataSource,
+        fee: item.fee,
        firstBuyDate: item.firstBuyDate,
        grossPerformance: !hasErrors ? grossPerformance ?? null : null,
        grossPerformancePercentage: !hasErrors
@ -446,7 +448,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 +480,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
@ -18,7 +18,6 @@ import {
  PortfolioPublicDetails,
  PortfolioReport
 } from '@ghostfolio/common/interfaces';
-import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
 import type {
  DateRange,
  GroupBy,
@ -132,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)) {
@ -190,23 +190,24 @@ export class PortfolioController {
  @UseGuards(AuthGuard('jwt'))
  public async getDividends(
    @Headers('impersonation-id') impersonationId: string,
+    @Query('accounts') filterByAccounts?: string,
+    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('groupBy') groupBy?: GroupBy,
    @Query('range') dateRange: DateRange = 'max',
-    @Query('groupBy') groupBy?: GroupBy
+    @Query('tags') filterByTags?: string
  ): Promise<PortfolioDividends> {
-    let dividends: InvestmentItem[];
+    const filters = this.apiService.buildFiltersFromQueryParams({
+      filterByAccounts,
+      filterByAssetClasses,
+      filterByTags
+    });

-    if (groupBy === 'month') {
-      dividends = await this.portfolioService.getDividends({
-        dateRange,
-        groupBy,
-        impersonationId
-      });
-    } else {
-      dividends = await this.portfolioService.getDividends({
-        dateRange,
-        impersonationId
-      });
-    }
+    let dividends = await this.portfolioService.getDividends({
+      dateRange,
+      filters,
+      groupBy,
+      impersonationId
+    });

    if (
      impersonationId ||
@ -239,23 +240,24 @@ export class PortfolioController {
  @UseGuards(AuthGuard('jwt'))
  public async getInvestments(
    @Headers('impersonation-id') impersonationId: string,
+    @Query('accounts') filterByAccounts?: string,
+    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('groupBy') groupBy?: GroupBy,
    @Query('range') dateRange: DateRange = 'max',
-    @Query('groupBy') groupBy?: GroupBy
+    @Query('tags') filterByTags?: string
  ): Promise<PortfolioInvestments> {
-    let investments: InvestmentItem[];
+    const filters = this.apiService.buildFiltersFromQueryParams({
+      filterByAccounts,
+      filterByAssetClasses,
+      filterByTags
+    });

-    if (groupBy === 'month') {
-      investments = await this.portfolioService.getInvestments({
-        dateRange,
-        groupBy,
-        impersonationId
-      });
-    } else {
-      investments = await this.portfolioService.getInvestments({
-        dateRange,
-        impersonationId
-      });
-    }
+    let investments = await this.portfolioService.getInvestments({
+      dateRange,
+      filters,
+      groupBy,
+      impersonationId
+    });

    if (
      impersonationId ||
@ -290,10 +292,20 @@ export class PortfolioController {
  @Version('2')
  public async getPerformanceV2(
    @Headers('impersonation-id') impersonationId: string,
-    @Query('range') dateRange: DateRange = 'max'
+    @Query('accounts') filterByAccounts?: string,
+    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('range') dateRange: DateRange = 'max',
+    @Query('tags') filterByTags?: string
  ): Promise<PortfolioPerformanceResponse> {
+    const filters = this.apiService.buildFiltersFromQueryParams({
+      filterByAccounts,
+      filterByAssetClasses,
+      filterByTags
+    });
+
    const performanceInformation = await this.portfolioService.getPerformance({
      dateRange,
+      filters,
      impersonationId,
      userId: this.request.user.id
    });
@ -311,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()
          };
@ -345,31 +357,26 @@ export class PortfolioController {

  @Get('positions')
  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(RedactValuesInResponseInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getPositions(
    @Headers('impersonation-id') impersonationId: string,
-    @Query('range') dateRange: DateRange = 'max'
+    @Query('accounts') filterByAccounts?: string,
+    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('range') dateRange: DateRange = 'max',
+    @Query('tags') filterByTags?: string
  ): Promise<PortfolioPositions> {
-    const result = await this.portfolioService.getPositions(
-      impersonationId,
-      dateRange
-    );
+    const filters = this.apiService.buildFiltersFromQueryParams({
+      filterByAccounts,
+      filterByAssetClasses,
+      filterByTags
+    });

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

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

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

  @Get('position/:dataSource/:symbol')
+  @UseInterceptors(RedactValuesInResponseInterceptor)
  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  @UseGuards(AuthGuard('jwt'))
@ -447,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,11 +20,11 @@ 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';
-import { DATE_FORMAT, parseDate } from '@ghostfolio/common/helper';
+import { DATE_FORMAT, getSum, parseDate } from '@ghostfolio/common/helper';
 import {
  Accounts,
  EnhancedSymbolProfile,
@ -210,16 +211,19 @@ export class PortfolioService {

  public async getDividends({
    dateRange,
-    impersonationId,
-    groupBy
+    filters,
+    groupBy,
+    impersonationId
  }: {
    dateRange: DateRange;
-    impersonationId: string;
+    filters?: Filter[];
    groupBy?: GroupBy;
+    impersonationId: string;
  }): Promise<InvestmentItem[]> {
    const userId = await this.getUserId(impersonationId, this.request.user.id);

    const activities = await this.orderService.getOrders({
+      filters,
      userId,
      types: ['DIVIDEND'],
      userCurrency: this.request.user.Settings.settings.baseCurrency
@ -232,8 +236,8 @@ export class PortfolioService {
      };
    });

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

    const startDate = this.getStartDate(
@ -248,17 +252,20 @@ export class PortfolioService {

  public async getInvestments({
    dateRange,
-    impersonationId,
-    groupBy
+    filters,
+    groupBy,
+    impersonationId
  }: {
    dateRange: DateRange;
-    impersonationId: string;
+    filters?: Filter[];
    groupBy?: GroupBy;
+    impersonationId: string;
  }): Promise<InvestmentItem[]> {
    const userId = await this.getUserId(impersonationId, this.request.user.id);

    const { portfolioOrders, transactionPoints } =
      await this.getTransactionPoints({
+        filters,
        userId,
        includeDrafts: true
      });
@ -276,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
        });
      }
@ -343,11 +355,13 @@ export class PortfolioService {

  public async getChart({
    dateRange = 'max',
+    filters,
    impersonationId,
    userCurrency,
    userId
  }: {
    dateRange?: DateRange;
+    filters?: Filter[];
    impersonationId: string;
    userCurrency: string;
    userId: string;
@ -356,6 +370,7 @@ export class PortfolioService {

    const { portfolioOrders, transactionPoints } =
      await this.getTransactionPoints({
+        filters,
        userId
      });

@ -397,15 +412,15 @@ export class PortfolioService {
  }

  public async getDetails({
-    impersonationId,
    dateRange = 'max',
    filters,
+    impersonationId,
    userId,
    withExcludedAccounts = false
  }: {
-    impersonationId: string;
    dateRange?: DateRange;
    filters?: Filter[];
+    impersonationId: string;
    userId: string;
    withExcludedAccounts?: boolean;
  }): Promise<PortfolioDetails & { hasErrors: boolean }> {
@ -522,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,
@ -560,9 +572,7 @@ export class PortfolioService {
    ) {
      const cashPositions = await this.getCashPositions({
        cashDetails,
-        emergencyFund,
        userCurrency,
-        investment: totalInvestmentInBaseCurrency,
        value: filteredValueInBaseCurrency
      });

@ -580,10 +590,51 @@ 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,
+        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 {
@ -627,6 +678,8 @@ export class PortfolioService {
      return {
        tags,
        averagePrice: undefined,
+        dividendInBaseCurrency: undefined,
+        feeInBaseCurrency: undefined,
        firstBuyDate: undefined,
        grossPerformance: undefined,
        grossPerformancePercent: undefined,
@ -646,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) => {
@ -692,12 +746,23 @@ export class PortfolioService {
        averagePrice,
        currency,
        dataSource,
+        fee,
        firstBuyDate,
        marketPrice,
        quantity,
        transactionCount
      } = position;

+      const dividendInBaseCurrency = getSum(
+        orders
+          .filter(({ type }) => {
+            return type === 'DIVIDEND';
+          })
+          .map(({ valueInBaseCurrency }) => {
+            return new Big(valueInBaseCurrency);
+          })
+      );
+
      // Convert investment, gross and net performance to currency of user
      const investment = this.exchangeRateDataService.toCurrency(
        position.investment?.toNumber(),
@ -731,7 +796,8 @@ export class PortfolioService {
        historicalDataArray.push({
          averagePrice: orders[0].unitPrice,
          date: firstBuyDate,
-          value: orders[0].unitPrice
+          marketPrice: orders[0].unitPrice,
+          quantity: orders[0].quantity
        });
      }

@ -747,6 +813,7 @@ export class PortfolioService {
            j++;
          }
          let currentAveragePrice = 0;
+          let currentQuantity = 0;
          const currentSymbol = transactionPoints[j].items.find(
            (item) => item.symbol === aSymbol
          );
@ -754,12 +821,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);
@ -780,6 +849,12 @@ export class PortfolioService {
        tags,
        transactionCount,
        averagePrice: averagePrice.toNumber(),
+        dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),
+        feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
+          fee.toNumber(),
+          SymbolProfile.currency,
+          userCurrency
+        ),
        grossPerformancePercent:
          position.grossPerformancePercentage?.toNumber(),
        historicalData: historicalDataArray,
@ -836,6 +911,8 @@ export class PortfolioService {
        SymbolProfile,
        tags,
        averagePrice: 0,
+        dividendInBaseCurrency: 0,
+        feeInBaseCurrency: 0,
        firstBuyDate: undefined,
        grossPerformance: undefined,
        grossPerformancePercent: undefined,
@ -850,14 +927,20 @@ export class PortfolioService {
    }
  }

-  public async getPositions(
-    aImpersonationId: string,
-    aDateRange: DateRange = 'max'
-  ): Promise<{ hasErrors: boolean; positions: Position[] }> {
-    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
+  public async getPositions({
+    dateRange = 'max',
+    filters,
+    impersonationId
+  }: {
+    dateRange?: DateRange;
+    filters?: Filter[];
+    impersonationId: string;
+  }): Promise<{ hasErrors: boolean; positions: Position[] }> {
+    const userId = await this.getUserId(impersonationId, this.request.user.id);

    const { portfolioOrders, transactionPoints } =
      await this.getTransactionPoints({
+        filters,
        userId
      });

@ -877,7 +960,7 @@ export class PortfolioService {
    portfolioCalculator.setTransactionPoints(transactionPoints);

    const portfolioStart = parseDate(transactionPoints[0].date);
-    const startDate = this.getStartDate(aDateRange, portfolioStart);
+    const startDate = this.getStartDate(dateRange, portfolioStart);
    const currentPositions = await portfolioCalculator.getCurrentPositions(
      startDate
    );
@ -885,12 +968,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([
@ -928,10 +1013,12 @@ export class PortfolioService {

  public async getPerformance({
    dateRange = 'max',
+    filters,
    impersonationId,
    userId
  }: {
    dateRange?: DateRange;
+    filters?: Filter[];
    impersonationId: string;
    userId: string;
  }): Promise<PortfolioPerformanceResponse> {
@ -941,6 +1028,7 @@ export class PortfolioService {

    const { portfolioOrders, transactionPoints } =
      await this.getTransactionPoints({
+        filters,
        userId
      });

@ -970,32 +1058,25 @@ 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,
+      filters,
      impersonationId,
      userCurrency,
      userId
@ -1013,28 +1094,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(),
@ -1074,16 +1155,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(
@ -1107,19 +1195,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
@ -1129,7 +1217,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
@ -1140,16 +1228,12 @@ 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({
@ -1180,62 +1264,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
        );
      })
@ -1245,67 +1305,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
        );
      })
@ -1324,8 +1435,7 @@ export class PortfolioService {
  }): PortfolioPosition {
    return {
      currency,
-      allocationCurrent: 0,
-      allocationInvestment: 0,
+      allocationInPercentage: 0,
      assetClass: AssetClass.CASH,
      assetSubClass: AssetClass.CASH,
      countries: [],
@ -1372,26 +1482,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;
@ -1404,11 +1530,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
    });
@ -1423,18 +1545,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')
@ -1490,8 +1618,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
    };
  }
@ -1508,7 +1636,7 @@ export class PortfolioService {
    withExcludedAccounts?: boolean;
  }): Promise<{
    transactionPoints: TransactionPoint[];
-    orders: OrderWithAccount[];
+    orders: Activity[];
    portfolioOrders: PortfolioOrder[];
  }> {
    const userCurrency =
@ -1581,6 +1709,14 @@ export class PortfolioService {
    userId: string;
    withExcludedAccounts?: boolean;
  }) {
+    const ordersOfTypeItem = await this.orderService.getOrders({
+      filters,
+      userCurrency,
+      userId,
+      withExcludedAccounts,
+      types: ['ITEM']
+    });
+
    const accounts: PortfolioDetails['accounts'] = {};

    let currentAccounts: (Account & {
@ -1611,10 +1747,18 @@ export class PortfolioService {
    });

    for (const account of currentAccounts) {
-      const ordersByAccount = orders.filter(({ accountId }) => {
+      let ordersByAccount = orders.filter(({ accountId }) => {
        return accountId === account.id;
      });

+      const ordersOfTypeItemByAccount = ordersOfTypeItem.filter(
+        ({ accountId }) => {
+          return accountId === account.id;
+        }
+      );
+
+      ordersByAccount = ordersByAccount.concat(ordersOfTypeItemByAccount);
+
      accounts[account.id] = {
        balance: account.balance,
        currency: account.currency,
@ -1634,7 +1778,9 @@ export class PortfolioService {
      for (const order of ordersByAccount) {
        let currentValueOfSymbolInBaseCurrency =
          order.quantity *
-          portfolioItemsNow[order.SymbolProfile.symbol].marketPrice;
+          (portfolioItemsNow[order.SymbolProfile.symbol]?.marketPrice ??
+            order.unitPrice ??
+            0);
        let originalValueOfSymbolInBaseCurrency =
          this.exchangeRateDataService.toCurrency(
            order.quantity * order.unitPrice,
--- a/apps/api/src/app/subscription/subscription.controller.ts
+++ b/apps/api/src/app/subscription/subscription.controller.ts
@ -63,6 +63,7 @@ export class SubscriptionController {

    await this.subscriptionService.createSubscription({
      duration: coupon.duration,
+      price: 0,
      userId: this.request.user.id
    });

--- a/apps/api/src/app/subscription/subscription.service.ts
+++ b/apps/api/src/app/subscription/subscription.service.ts
@ -1,6 +1,10 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
+import {
+  DEFAULT_LANGUAGE_CODE,
+  PROPERTY_STRIPE_CONFIG
+} from '@ghostfolio/common/config';
+import { Subscription as SubscriptionInterface } from '@ghostfolio/common/interfaces/subscription.interface';
 import { SubscriptionType } from '@ghostfolio/common/types/subscription.type';
 import { Injectable, Logger } from '@nestjs/common';
 import { Subscription } from '@prisma/client';
@ -70,13 +74,16 @@ export class SubscriptionService {

  public async createSubscription({
    duration = '1 year',
+    price,
    userId
  }: {
    duration?: StringValue;
+    price: number;
    userId: string;
  }) {
    await this.prismaService.subscription.create({
      data: {
+        price,
        expiresAt: addMilliseconds(new Date(), ms(duration)),
        User: {
          connect: {
@ -93,7 +100,21 @@ export class SubscriptionService {
        aCheckoutSessionId
      );

-      await this.createSubscription({ userId: session.client_reference_id });
+      let subscriptions: SubscriptionInterface[] = [];
+
+      const stripeConfig = (await this.prismaService.property.findUnique({
+        where: { key: PROPERTY_STRIPE_CONFIG }
+      })) ?? { value: '{}' };
+
+      subscriptions = [JSON.parse(stripeConfig.value)];
+
+      const coupon = subscriptions[0]?.coupon ?? 0;
+      const price = subscriptions[0]?.price ?? 0;
+
+      await this.createSubscription({
+        price: price - coupon,
+        userId: session.client_reference_id
+      });

      await this.stripe.customers.update(session.customer as string, {
        description: session.client_reference_id
--- a/apps/api/src/app/user/create-user.dto.ts
+++ b/apps/api/src/app/user/create-user.dto.ts
@ -0,0 +1,7 @@
+import { IsOptional, IsString } from 'class-validator';
+
+export class CreateUserDto {
+  @IsString()
+  @IsOptional()
+  country?: string;
+}
--- 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';
@ -24,6 +22,7 @@ import { User as UserModel } from '@prisma/client';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 import { size } from 'lodash';

+import { CreateUserDto } from './create-user.dto';
 import { UserItem } from './interfaces/user-item.interface';
 import { UpdateUserSettingDto } from './update-user-setting.dto';
 import { UserService } from './user.service';
@ -31,7 +30,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,
@ -68,7 +66,7 @@ export class UserController {
  }

  @Post()
-  public async signupUser(): Promise<UserItem> {
+  public async signupUser(@Body() data: CreateUserDto): Promise<UserItem> {
    const isUserSignupEnabled =
      await this.propertyService.isUserSignupEnabled();

@ -82,7 +80,8 @@ export class UserController {
    const hasAdmin = await this.userService.hasAdmin();

    const { accessToken, id, role } = await this.userService.createUser({
-      role: hasAdmin ? 'USER' : 'ADMIN'
+      country: data.country,
+      data: { role: hasAdmin ? 'USER' : 'ADMIN' }
    });

    return {
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@ -18,6 +18,8 @@ import { Injectable } from '@nestjs/common';
 import { Prisma, Role, User } from '@prisma/client';
 import { sortBy } from 'lodash';

+import { CreateUserDto } from './create-user.dto';
+
 const crypto = require('crypto');

@Injectable()
@ -97,6 +99,7 @@ export class UserService {
    const {
      accessToken,
      Account,
+      Analytics,
      authChallenge,
      createdAt,
      id,
@ -107,7 +110,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 +129,8 @@ export class UserService {
      role,
      Settings,
      thirdPartyId,
-      updatedAt
+      updatedAt,
+      activityCount: Analytics?.activityCount
    };

    if (user?.Settings) {
@ -154,15 +163,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')) {
@ -217,7 +233,10 @@ export class UserService {
    return hash.digest('hex');
  }

-  public async createUser(data: Prisma.UserCreateInput): Promise<User> {
+  public async createUser({
+    country,
+    data
+  }: CreateUserDto & { data: Prisma.UserCreateInput }): Promise<User> {
    if (!data?.provider) {
      data.provider = 'ANONYMOUS';
    }
@ -242,6 +261,15 @@ export class UserService {
      }
    });

+    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+      await this.prismaService.analytics.create({
+        data: {
+          country,
+          User: { connect: { id: user.id } }
+        }
+      });
+    }
+
    if (data.provider === 'ANONYMOUS') {
      const accessToken = this.createAccessToken(
        user.id,
--- 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,36 @@ 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',
+              'dividendInBaseCurrency',
+              '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/configuration.service.ts
+++ b/apps/api/src/services/configuration.service.ts
@ -24,7 +24,6 @@ export class ConfigurationService {
      ENABLE_FEATURE_BLOG: bool({ default: false }),
      ENABLE_FEATURE_CUSTOM_SYMBOLS: bool({ default: false }),
      ENABLE_FEATURE_FEAR_AND_GREED_INDEX: bool({ default: false }),
-      ENABLE_FEATURE_IMPORT: bool({ default: true }),
      ENABLE_FEATURE_READ_ONLY_MODE: bool({ default: false }),
      ENABLE_FEATURE_SOCIAL_LOGIN: bool({ default: false }),
      ENABLE_FEATURE_STATISTICS: bool({ default: false }),
@ -42,7 +41,7 @@ export class ConfigurationService {
      MAX_ITEM_IN_CACHE: num({ default: 9999 }),
      PORT: port({ default: 3333 }),
      RAPID_API_API_KEY: str({ default: '' }),
-      REDIS_HOST: host({ default: 'localhost' }),
+      REDIS_HOST: str({ default: 'localhost' }),
      REDIS_PASSWORD: str({ default: '' }),
      REDIS_PORT: port({ default: 6379 }),
      ROOT_URL: str({ default: 'http://localhost:4200' }),
--- a/apps/api/src/services/cron.service.ts
+++ b/apps/api/src/services/cron.service.ts
@ -11,14 +11,16 @@ import { TwitterBotService } from './twitter-bot/twitter-bot.service';

@Injectable()
 export class CronService {
+  private static readonly EVERY_SUNDAY_AT_LUNCH_TIME = '0 12 * * 0';
+
  public constructor(
    private readonly dataGatheringService: DataGatheringService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly twitterBotService: TwitterBotService
  ) {}

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

@ -28,12 +30,12 @@ export class CronService {
  }

  @Cron(CronExpression.EVERY_DAY_AT_5PM)
-  public async runEveryDayAtFivePM() {
+  public async runEveryDayAtFivePm() {
    this.twitterBotService.tweetFearAndGreedIndex();
  }

-  @Cron(CronExpression.EVERY_WEEKEND)
-  public async runEveryWeekend() {
+  @Cron(CronService.EVERY_SUNDAY_AT_LUNCH_TIME)
+  public async runEverySundayAtTwelvePm() {
    const uniqueAssets = await this.dataGatheringService.getUniqueAssets();

    for (const { dataSource, symbol } of uniqueAssets) {
--- 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',
@ -51,7 +65,7 @@ export class GhostfolioScraperApiService implements DataProviderInterface {
      const [symbolProfile] =
        await this.symbolProfileService.getSymbolProfilesBySymbols([symbol]);
      const { defaultMarketPrice, selector, url } =
-        symbolProfile.scraperConfiguration;
+        symbolProfile.scraperConfiguration ?? {};

      if (defaultMarketPrice) {
        const historical: {
@ -134,7 +148,7 @@ export class GhostfolioScraperApiService implements DataProviderInterface {
          dataSource: this.getName(),
          marketPrice: marketData.find((marketDataItem) => {
            return marketDataItem.symbol === symbolProfile.symbol;
-          }).marketPrice,
+          })?.marketPrice,
          marketState: 'delayed'
        };
      }
--- 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
@ -6,9 +6,17 @@ import {
 } from '@ghostfolio/api/services/interfaces/interfaces';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
+import {
+  DATE_FORMAT,
+  extractNumberFromString,
+  getYesterday
+} from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
+import bent from 'bent';
+import * as cheerio from 'cheerio';
+import { addDays, format, isBefore } from 'date-fns';

@Injectable()
 export class ManualService implements DataProviderInterface {
@ -18,7 +26,7 @@ export class ManualService implements DataProviderInterface {
  ) {}

  public canHandle(symbol: string) {
-    return false;
+    return true;
  }

  public async getAssetProfile(
@ -29,6 +37,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',
@ -37,7 +59,57 @@ export class ManualService implements DataProviderInterface {
  ): Promise<{
    [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
  }> {
-    return {};
+    try {
+      const symbol = aSymbol;
+
+      const [symbolProfile] =
+        await this.symbolProfileService.getSymbolProfilesBySymbols([symbol]);
+      const { defaultMarketPrice, selector, url } =
+        symbolProfile.scraperConfiguration ?? {};
+
+      if (defaultMarketPrice) {
+        const historical: {
+          [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
+        } = {
+          [symbol]: {}
+        };
+        let date = from;
+
+        while (isBefore(date, to)) {
+          historical[symbol][format(date, DATE_FORMAT)] = {
+            marketPrice: defaultMarketPrice
+          };
+
+          date = addDays(date, 1);
+        }
+
+        return historical;
+      } else if (selector === undefined || url === undefined) {
+        return {};
+      }
+
+      const get = bent(url, 'GET', 'string', 200, {});
+
+      const html = await get();
+      const $ = cheerio.load(html);
+
+      const value = extractNumberFromString($(selector).text());
+
+      return {
+        [symbol]: {
+          [format(getYesterday(), DATE_FORMAT)]: {
+            marketPrice: value
+          }
+        }
+      };
+    } catch (error) {
+      throw new Error(
+        `Could not get historical market data for ${aSymbol} (${this.getName()}) from ${format(
+          from,
+          DATE_FORMAT
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
+      );
+    }
  }

  public getName(): DataSource {
@ -74,10 +146,9 @@ export class ManualService implements DataProviderInterface {
        response[symbolProfile.symbol] = {
          currency: symbolProfile.currency,
          dataSource: this.getName(),
-          marketPrice:
-            marketData.find((marketDataItem) => {
-              return marketDataItem.symbol === symbolProfile.symbol;
-            })?.marketPrice ?? 0,
+          marketPrice: marketData.find((marketDataItem) => {
+            return marketDataItem.symbol === symbolProfile.symbol;
+          })?.marketPrice,
          marketState: 'delayed'
        };
      }
--- 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
@ -154,16 +154,65 @@ export class YahooFinanceService implements DataProviderInterface {
        response.url = url;
      }
    } catch (error) {
-      throw new Error(
-        `Could not get asset profile for ${aSymbol} (${this.getName()}): [${
-          error.name
-        }] ${error.message}`
-      );
+      Logger.error(error, 'YahooFinanceService');
    }

    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',
@ -176,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),
@ -192,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
        };
      }
@ -427,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/api/src/services/interfaces/environment.interface.ts
+++ b/apps/api/src/services/interfaces/environment.interface.ts
@ -10,7 +10,6 @@ export interface Environment extends CleanedEnvAccessors {
  ENABLE_FEATURE_BLOG: boolean;
  ENABLE_FEATURE_CUSTOM_SYMBOLS: boolean;
  ENABLE_FEATURE_FEAR_AND_GREED_INDEX: boolean;
-  ENABLE_FEATURE_IMPORT: boolean;
  ENABLE_FEATURE_READ_ONLY_MODE: boolean;
  ENABLE_FEATURE_SOCIAL_LOGIN: boolean;
  ENABLE_FEATURE_STATISTICS: boolean;
--- a/apps/client/.browserslistrc
+++ b/apps/client/.browserslistrc
@ -1,18 +0,0 @@
-# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
-# For additional information regarding the format and rule options, please see:
-# https://github.com/browserslist/browserslist#queries
-
-# For the full list of supported browsers by the Angular framework, please see:
-# https://angular.io/guide/browser-support
-
-# You can see what browsers were selected by your queries by running:
-#   npx browserslist
-
-last 1 Chrome version
-last 1 Firefox version
-last 2 Edge major versions
-last 2 Safari major versions
-last 2 iOS major versions
-Firefox ESR
-not IE 9-10 # Angular support for IE 9-10 has been deprecated and will be removed as of Angular v11. To opt-in, remove the 'not' prefix on this line.
-not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
--- a/apps/client/project.json
+++ b/apps/client/project.json
@ -65,7 +65,10 @@
            "output": "./../assets/"
          }
        ],
-        "styles": ["apps/client/src/styles.scss"],
+        "styles": [
+          "apps/client/src/styles/theme.scss",
+          "apps/client/src/styles.scss"
+        ],
        "scripts": ["node_modules/marked/marked.min.js"],
        "vendorChunk": true,
        "extractLicenses": false,
@ -89,6 +92,10 @@
          "baseHref": "/es/",
          "localize": ["es"]
        },
+        "development-fr": {
+          "baseHref": "/fr/",
+          "localize": ["fr"]
+        },
        "development-it": {
          "baseHref": "/it/",
          "localize": ["it"]
@ -97,6 +104,10 @@
          "baseHref": "/nl/",
          "localize": ["nl"]
        },
+        "development-pt": {
+          "baseHref": "/pt/",
+          "localize": ["pt"]
+        },
        "production": {
          "fileReplacements": [
            {
@ -144,12 +155,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 +181,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 +213,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 +224,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: () =>
@ -215,9 +222,8 @@ const routes: Routes = [
      // Preload all lazy loaded modules with the attribute preload === true
      {
        anchorScrolling: 'enabled',
-        preloadingStrategy: ModulePreloadService,
+        preloadingStrategy: ModulePreloadService
        // enableTracing: true // <-- debugging purposes only
-        relativeLinkResolution: 'legacy'
      }
    )
  ],
--- 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
@ -1,20 +1,17 @@
+import { DOCUMENT } from '@angular/common';
 import {
  ChangeDetectionStrategy,
  ChangeDetectorRef,
  Component,
+  Inject,
  OnDestroy,
  OnInit
 } from '@angular/core';
+import { Title } from '@angular/platform-browser';
 import { NavigationEnd, PRIMARY_OUTLET, Router } from '@angular/router';
-import {
-  primaryColorHex,
-  secondaryColorHex,
-  warnColorHex
-} from '@ghostfolio/common/config';
 import { InfoItem, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { ColorScheme } from '@ghostfolio/common/types';
-import { MaterialCssVarsService } from 'angular-material-css-vars';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject } from 'rxjs';
 import { filter, takeUntil } from 'rxjs/operators';
@ -36,6 +33,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;

@ -45,8 +43,9 @@ export class AppComponent implements OnDestroy, OnInit {
    private changeDetectorRef: ChangeDetectorRef,
    private dataService: DataService,
    private deviceService: DeviceDetectorService,
-    private materialCssVarsService: MaterialCssVarsService,
+    @Inject(DOCUMENT) private document: Document,
    private router: Router,
+    private title: Title,
    private tokenStorageService: TokenStorageService,
    private userService: UserService
  ) {
@ -66,6 +65,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
@ -105,16 +117,20 @@ export class AppComponent implements OnDestroy, OnInit {
      ? userPreferredColorScheme === 'DARK'
      : window.matchMedia('(prefers-color-scheme: dark)').matches;

-    this.materialCssVarsService.setDarkTheme(isDarkTheme);
+    this.toggleThemeStyleClass(isDarkTheme);

    window.matchMedia('(prefers-color-scheme: dark)').addListener((event) => {
      if (!this.user?.settings.colorScheme) {
-        this.materialCssVarsService.setDarkTheme(event.matches);
+        this.toggleThemeStyleClass(event.matches);
      }
    });
+  }

-    this.materialCssVarsService.setPrimaryColor(primaryColorHex);
-    this.materialCssVarsService.setAccentColor(secondaryColorHex);
-    this.materialCssVarsService.setWarnColor(warnColorHex);
+  private toggleThemeStyleClass(isDarkTheme: boolean) {
+    if (isDarkTheme) {
+      this.document.body.classList.add('is-dark-theme');
+    } else {
+      this.document.body.classList.remove('is-dark-theme');
+    }
  }
 }
--- a/apps/client/src/app/app.module.ts
+++ b/apps/client/src/app/app.module.ts
@ -1,20 +1,19 @@
 import { Platform } from '@angular/cdk/platform';
 import { HttpClientModule } from '@angular/common/http';
 import { NgModule } from '@angular/core';
-import { MatAutocompleteModule } from '@angular/material/autocomplete';
-import { MatChipsModule } from '@angular/material/chips';
 import {
  DateAdapter,
  MAT_DATE_FORMATS,
  MAT_DATE_LOCALE,
  MatNativeDateModule
 } from '@angular/material/core';
-import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { MatTooltipModule } from '@angular/material/tooltip';
+import { MatLegacyAutocompleteModule as MatAutocompleteModule } from '@angular/material/legacy-autocomplete';
+import { MatLegacyChipsModule as MatChipsModule } from '@angular/material/legacy-chips';
+import { MatLegacySnackBarModule as MatSnackBarModule } from '@angular/material/legacy-snack-bar';
+import { MatLegacyTooltipModule as MatTooltipModule } from '@angular/material/legacy-tooltip';
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { ServiceWorkerModule } from '@angular/service-worker';
-import { MaterialCssVarsModule } from 'angular-material-css-vars';
 import { MarkdownModule } from 'ngx-markdown';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 import { NgxStripeModule, STRIPE_PUBLISHABLE_KEY } from 'ngx-stripe';
@ -25,6 +24,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,15 +40,11 @@ export function NgxStripeFactory(): string {
    BrowserAnimationsModule,
    BrowserModule,
    GfHeaderModule,
+    GfSubscriptionInterstitialDialogModule,
    HttpClientModule,
    MarkdownModule.forRoot(),
    MatAutocompleteModule,
    MatChipsModule,
-    MaterialCssVarsModule.forRoot({
-      darkThemeClass: 'is-dark-theme',
-      isAutoContrast: true,
-      lightThemeClass: 'is-light-theme'
-    }),
    MatNativeDateModule,
    MatSnackBarModule,
    MatTooltipModule,
--- 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/access-table/access-table.component.ts
+++ b/apps/client/src/app/components/access-table/access-table.component.ts
@ -7,7 +7,7 @@ import {
  OnInit,
  Output
 } from '@angular/core';
-import { MatTableDataSource } from '@angular/material/table';
+import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table';
 import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
 import { Access } from '@ghostfolio/common/interfaces';

--- a/apps/client/src/app/components/access-table/access-table.module.ts
+++ b/apps/client/src/app/components/access-table/access-table.module.ts
@ -1,8 +1,8 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatTableModule } from '@angular/material/table';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
+import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table';

 import { AccessTableComponent } from './access-table.component';

--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.component.ts
@ -6,13 +6,16 @@ import {
  OnDestroy,
  OnInit
 } from '@angular/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import {
+  MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
+  MatLegacyDialogRef as MatDialogRef
+} from '@angular/material/legacy-dialog';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { downloadAsFile } from '@ghostfolio/common/helper';
 import { User } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
-import { AccountType } from '@prisma/client';
+import { translate } from '@ghostfolio/ui/i18n';
 import { format, parseISO } from 'date-fns';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@ -27,7 +30,7 @@ import { AccountDetailDialogParams } from './interfaces/interfaces';
  styleUrls: ['./account-detail-dialog.component.scss']
 })
 export class AccountDetailDialog implements OnDestroy, OnInit {
-  public accountType: AccountType;
+  public accountType: string;
  public name: string;
  public orders: OrderWithAccount[];
  public platformName: string;
@ -59,7 +62,7 @@ export class AccountDetailDialog implements OnDestroy, OnInit {
      .fetchAccount(this.data.accountId)
      .pipe(takeUntil(this.unsubscribeSubject))
      .subscribe(({ accountType, name, Platform, valueInBaseCurrency }) => {
-        this.accountType = accountType;
+        this.accountType = translate(accountType);
        this.name = name;
        this.platformName = Platform?.name ?? '-';
        this.valueInBaseCurrency = valueInBaseCurrency;
--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html
@ -40,7 +40,6 @@
          [hasPermissionToCreateActivity]="false"
          [hasPermissionToExportActivities]="true"
          [hasPermissionToFilter]="false"
-          [hasPermissionToImportActivities]="false"
          [hasPermissionToOpenDetails]="false"
          [locale]="user?.settings?.locale"
          [showActions]="false"
--- a/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts
+++ b/apps/client/src/app/components/account-detail-dialog/account-detail-dialog.module.ts
@ -1,7 +1,7 @@
 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 { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
 import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module';
 import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module';
 import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module';
--- 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/accounts-table/accounts-table.component.ts
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.ts
@ -9,8 +9,8 @@ import {
  Output,
  ViewChild
 } from '@angular/core';
+import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table';
 import { MatSort } from '@angular/material/sort';
-import { MatTableDataSource } from '@angular/material/table';
 import { Router } from '@angular/router';
 import { Account as AccountModel } from '@prisma/client';
 import { get } from 'lodash';
--- a/apps/client/src/app/components/accounts-table/accounts-table.module.ts
+++ b/apps/client/src/app/components/accounts-table/accounts-table.module.ts
@ -1,10 +1,9 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
-import { MatInputModule } from '@angular/material/input';
-import { MatMenuModule } from '@angular/material/menu';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
+import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table';
 import { MatSortModule } from '@angular/material/sort';
-import { MatTableModule } from '@angular/material/table';
 import { RouterModule } from '@angular/router';
 import { GfSymbolIconModule } from '@ghostfolio/client/components/symbol-icon/symbol-icon.module';
 import { GfValueModule } from '@ghostfolio/ui/value';
@ -20,7 +19,6 @@ import { AccountsTableComponent } from './accounts-table.component';
    GfSymbolIconModule,
    GfValueModule,
    MatButtonModule,
-    MatInputModule,
    MatMenuModule,
    MatSortModule,
    MatTableModule,
--- a/apps/client/src/app/components/admin-jobs/admin-jobs.module.ts
+++ b/apps/client/src/app/components/admin-jobs/admin-jobs.module.ts
@ -1,9 +1,9 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule } from '@angular/material/button';
-import { MatMenuModule } from '@angular/material/menu';
-import { MatSelectModule } from '@angular/material/select';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
+import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';

 import { AdminJobsComponent } from './admin-jobs.component';

--- 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
@ -7,7 +7,7 @@ import {
  OnInit,
  Output
 } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import {
  DATE_FORMAT,
@ -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
@ -6,7 +6,10 @@ import {
  OnDestroy
 } from '@angular/core';
 import { DateAdapter, MAT_DATE_LOCALE } from '@angular/material/core';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import {
+  MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
+  MatLegacyDialogRef as MatDialogRef
+} from '@angular/material/legacy-dialog';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { Subject, takeUntil } from 'rxjs';

@ -36,7 +39,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,6 +1,6 @@
 <form class="d-flex flex-column h-100">
-  <h1 mat-dialog-title i18n>Details for {{ data.symbol }}</h1>
-  <div class="flex-grow-1" mat-dialog-content>
+  <h1 i18n mat-dialog-title>Details for {{ data.symbol }}</h1>
+  <div class="flex-grow-1 pt-3" mat-dialog-content>
    <div class="mb-3">
      <mat-form-field appearance="outline" class="w-100">
        <mat-label i18n>Date</mat-label>
@ -11,7 +11,7 @@
          [matDatepicker]="date"
          [(ngModel)]="data.date"
        />
-        <mat-datepicker-toggle matSuffix [for]="date">
+        <mat-datepicker-toggle class="mr-2" matSuffix [for]="date">
          <ion-icon
            class="text-muted"
            matDatepickerToggleIcon
@ -21,7 +21,7 @@
        <mat-datepicker #date disabled="true"></mat-datepicker>
      </mat-form-field>
    </div>
-    <div>
+    <div class="align-items-start d-flex">
      <mat-form-field appearance="outline" class="w-100">
        <mat-label i18n>Market Price</mat-label>
        <input
@ -30,15 +30,16 @@
          type="number"
          [(ngModel)]="data.marketPrice"
        />
-        <button
-          mat-icon-button
-          matSuffix
-          title="Fetch market price"
-          (click)="onFetchSymbolForDate()"
-        >
-          <ion-icon class="text-muted" name="refresh-outline"></ion-icon>
-        </button>
+        <span class="ml-2" matTextSuffix>{{ data.currency }}</span>
      </mat-form-field>
+      <button
+        class="apply-current-market-price ml-2 no-min-width"
+        mat-button
+        title="Fetch market price"
+        (click)="onFetchSymbolForDate()"
+      >
+        <ion-icon class="text-muted" name="refresh-outline"></ion-icon>
+      </button>
    </div>
  </div>
  <div class="justify-content-end" mat-dialog-actions>
--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.module.ts
+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.module.ts
@ -1,9 +1,9 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule } from '@angular/material/button';
 import { MatDatepickerModule } from '@angular/material/datepicker';
-import { MatDialogModule } from '@angular/material/dialog';
+import { MatButtonModule } from '@angular/material/button';
+import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
 import { MatFormFieldModule } from '@angular/material/form-field';
 import { MatInputModule } from '@angular/material/input';

--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.scss
+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.scss
@ -4,19 +4,9 @@
  .mat-dialog-content {
    max-height: unset;

-    .mat-form-field-appearance-outline {
-      ::ng-deep {
-        .mat-form-field-suffix {
-          top: -0.3rem;
-        }
-
-        .mat-form-field-wrapper {
-          padding-bottom: 0;
-        }
-      }
-
-      ion-icon {
-        font-size: 130%;
+    .mat-mdc-button {
+      &.apply-current-market-price {
+        height: 56px;
      }
    }
  }
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.component.ts
@ -6,9 +6,9 @@ import {
  OnInit,
  ViewChild
 } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
+import { MatLegacyTableDataSource as MatTableDataSource } from '@angular/material/legacy-table';
 import { MatSort } from '@angular/material/sort';
-import { MatTableDataSource } from '@angular/material/table';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.module.ts
@ -1,13 +1,13 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
-import { MatMenuModule } from '@angular/material/menu';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
+import { MatLegacyTableModule as MatTableModule } from '@angular/material/legacy-table';
 import { MatSortModule } from '@angular/material/sort';
-import { MatTableModule } from '@angular/material/table';
 import { GfActivitiesFilterModule } from '@ghostfolio/ui/activities-filter/activities-filter.module';

 import { AdminMarketDataComponent } from './admin-market-data.component';
-import { GfAssetProfileDialogModule } from './asset-profile-dialog/assset-profile-dialog.module';
+import { GfAssetProfileDialogModule } from './asset-profile-dialog/asset-profile-dialog.module';

@NgModule({
  declarations: [AdminMarketDataComponent],
--- 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
@ -7,13 +7,17 @@ import {
  OnInit
 } from '@angular/core';
 import { FormBuilder } from '@angular/forms';
-import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import {
+  MAT_LEGACY_DIALOG_DATA as MAT_DIALOG_DATA,
+  MatLegacyDialogRef as MatDialogRef
+} from '@angular/material/legacy-dialog';
 import { UpdateAssetProfileDto } from '@ghostfolio/api/app/admin/update-asset-profile.dto';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
 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 +32,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 +70,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-market-data/asset-profile-dialog/assset-profile-dialog.module.ts
+++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/assset-profile-dialog.module.ts
@ -2,10 +2,10 @@ import { TextFieldModule } from '@angular/cdk/text-field';
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule } from '@angular/material/button';
-import { MatDialogModule } from '@angular/material/dialog';
-import { MatInputModule } from '@angular/material/input';
-import { MatMenuModule } from '@angular/material/menu';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatLegacyDialogModule as MatDialogModule } from '@angular/material/legacy-dialog';
+import { MatLegacyInputModule as MatInputModule } from '@angular/material/legacy-input';
+import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
 import { GfAdminMarketDataDetailModule } from '@ghostfolio/client/components/admin-market-data-detail/admin-market-data-detail.module';
 import { GfPortfolioProportionChartModule } from '@ghostfolio/ui/portfolio-proportion-chart/portfolio-proportion-chart.module';
 import { GfValueModule } from '@ghostfolio/ui/value';
--- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts
+++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts
@ -1,5 +1,5 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { MatSlideToggleChange } from '@angular/material/slide-toggle';
+import { MatLegacySlideToggleChange as MatSlideToggleChange } from '@angular/material/legacy-slide-toggle';
 import { CacheService } from '@ghostfolio/client/services/cache.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
@ -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';
@ -28,7 +29,7 @@ import { takeUntil } from 'rxjs/operators';
  templateUrl: './admin-overview.html'
 })
 export class AdminOverviewComponent implements OnDestroy, OnInit {
-  public couponDuration: StringValue = '30 days';
+  public couponDuration: StringValue = '14 days';
  public coupons: Coupon[];
  public customCurrencies: string[];
  public exchangeRates: { label1: string; label2: string; value: number }[];
@ -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.html
+++ b/apps/client/src/app/components/admin-overview/admin-overview.html
@ -151,16 +151,23 @@
          >
            <div class="w-50" i18n>Coupons</div>
            <div class="w-50">
-              <div *ngFor="let coupon of coupons">
-                <span>{{ coupon.code }} ({{ coupon.duration }})</span>
-                <button
-                  class="mini-icon mx-1 no-min-width px-2"
-                  mat-button
-                  (click)="onDeleteCoupon(coupon.code)"
-                >
-                  <ion-icon name="trash-outline"></ion-icon>
-                </button>
-              </div>
+              <table>
+                <tr *ngFor="let coupon of coupons">
+                  <td class="text-monospace">{{ coupon.code }}</td>
+                  <td class="d-flex justify-content-end pl-2">
+                    {{ coupon.duration }}
+                  </td>
+                  <td>
+                    <button
+                      class="mini-icon mx-1 no-min-width px-2"
+                      mat-button
+                      (click)="onDeleteCoupon(coupon.code)"
+                    >
+                      <ion-icon name="trash-outline"></ion-icon>
+                    </button>
+                  </td>
+                </tr>
+              </table>
              <div class="mt-2">
                <form #couponForm="ngForm" class="align-items-center d-flex">
                  <mat-form-field
--- a/apps/client/src/app/components/admin-overview/admin-overview.module.ts
+++ b/apps/client/src/app/components/admin-overview/admin-overview.module.ts
@ -1,10 +1,10 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatButtonModule } from '@angular/material/button';
-import { MatCardModule } from '@angular/material/card';
-import { MatSelectModule } from '@angular/material/select';
-import { MatSlideToggleModule } from '@angular/material/slide-toggle';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatLegacyCardModule as MatCardModule } from '@angular/material/legacy-card';
+import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
+import { MatLegacySlideToggleModule as MatSlideToggleModule } from '@angular/material/legacy-slide-toggle';
 import { CacheService } from '@ghostfolio/client/services/cache.service';
 import { GfValueModule } from '@ghostfolio/ui/value';

--- 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.component.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.component.ts
@ -1,7 +1,9 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
-import { AdminData, User } from '@ghostfolio/common/interfaces';
+import { getEmojiFlag } from '@ghostfolio/common/helper';
+import { AdminData, InfoItem, User } from '@ghostfolio/common/interfaces';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import {
  differenceInSeconds,
  formatDistanceToNowStrict,
@ -16,6 +18,9 @@ import { takeUntil } from 'rxjs/operators';
  templateUrl: './admin-users.html'
 })
 export class AdminUsersComponent implements OnDestroy, OnInit {
+  public getEmojiFlag = getEmojiFlag;
+  public hasPermissionForSubscription: boolean;
+  public info: InfoItem;
  public user: User;
  public users: AdminData['users'];

@ -26,6 +31,13 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
    private dataService: DataService,
    private userService: UserService
  ) {
+    this.info = this.dataService.fetchInfo();
+
+    this.hasPermissionForSubscription = hasPermission(
+      this.info?.globalPermissions,
+      permissions.enableSubscription
+    );
+
    this.userService.stateChanged
      .pipe(takeUntil(this.unsubscribeSubject))
      .subscribe((state) => {
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@ -7,7 +7,13 @@
            <tr class="mat-header-row">
              <th class="mat-header-cell px-1 py-2 text-right">#</th>
              <th class="mat-header-cell px-1 py-2" i18n>User</th>
-              <th class="mat-header-cell px-1 py-2 text-right">
+              <th
+                *ngIf="hasPermissionForSubscription"
+                class="mat-header-cell px-1 py-2"
+              >
+                <ng-container i18n>Country</ng-container>
+              </th>
+              <th class="mat-header-cell px-1 py-2">
                <ng-container i18n>Registration</ng-container>
              </th>
              <th class="mat-header-cell px-1 py-2 text-right">
@ -16,7 +22,10 @@
              <th class="mat-header-cell px-1 py-2 text-right">
                <ng-container i18n>Activities</ng-container>
              </th>
-              <th class="mat-header-cell px-1 py-2 text-right">
+              <th
+                *ngIf="hasPermissionForSubscription"
+                class="mat-header-cell px-1 py-2 text-right"
+              >
                <ng-container i18n>Engagement per Day</ng-container>
              </th>
              <th class="mat-header-cell px-1 py-2" i18n>Last Request</th>
@ -28,10 +37,10 @@
              <td class="mat-cell px-1 py-2 text-right">{{ i + 1 }}</td>
              <td class="mat-cell px-1 py-2">
                <div class="d-flex align-items-center">
-                  <span class="d-none d-sm-inline-block"
+                  <span class="d-none d-sm-inline-block text-monospace"
                    >{{ userItem.id }}</span
                  >
-                  <span class="d-inline-block d-sm-none"
+                  <span class="d-inline-block d-sm-none text-monospace"
                    >{{ (userItem.id | slice:0:5) + '...' }}</span
                  >
                  <gf-premium-indicator
@ -41,7 +50,15 @@
                  ></gf-premium-indicator>
                </div>
              </td>
-              <td class="mat-cell px-1 py-2 text-right">
+              <td
+                *ngIf="hasPermissionForSubscription"
+                class="mat-cell px-1 py-2"
+              >
+                <span class="h5" [title]="userItem.country"
+                  >{{ getEmojiFlag(userItem.country) }}</span
+                >
+              </td>
+              <td class="mat-cell px-1 py-2">
                {{ formatDistanceToNow(userItem.createdAt) }}
              </td>
              <td class="mat-cell px-1 py-2 text-right">
@ -58,7 +75,10 @@
                  [value]="userItem.transactionCount"
                ></gf-value>
              </td>
-              <td class="mat-cell px-1 py-2 text-right">
+              <td
+                *ngIf="hasPermissionForSubscription"
+                class="mat-cell px-1 py-2 text-right"
+              >
                <gf-value
                  class="d-inline-block justify-content-end"
                  [locale]="user?.settings?.locale"
--- a/apps/client/src/app/components/admin-users/admin-users.module.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.module.ts
@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
-import { MatMenuModule } from '@angular/material/menu';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';
+import { MatLegacyMenuModule as MatMenuModule } from '@angular/material/legacy-menu';
 import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
 import { GfValueModule } from '@ghostfolio/ui/value';

--- 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/benchmark-comparator/benchmark-comparator.component.ts
+++ b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.component.ts
@ -27,6 +27,7 @@ import { ColorScheme } from '@ghostfolio/common/types';
 import { SymbolProfile } from '@prisma/client';
 import {
  Chart,
+  ChartData,
  LineController,
  LineElement,
  LinearScale,
@ -57,7 +58,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {

  @ViewChild('chartCanvas') chartCanvas;

-  public chart: Chart<any>;
+  public chart: Chart<'line'>;

  public constructor() {
    Chart.register(
@ -89,14 +90,14 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
  }

  private initialize() {
-    const data = {
+    const data: ChartData<'line'> = {
      datasets: [
        {
          backgroundColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
          borderColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
          borderWidth: 2,
          data: this.performanceDataItems.map(({ date, value }) => {
-            return { x: parseDate(date), y: value };
+            return { x: parseDate(date).getTime(), y: value };
          }),
          label: $localize`Portfolio`
        },
@ -105,7 +106,7 @@ export class BenchmarkComparatorComponent implements OnChanges, OnDestroy {
          borderColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
          borderWidth: 2,
          data: this.benchmarkDataItems.map(({ date, value }) => {
-            return { x: parseDate(date), y: value };
+            return { x: parseDate(date).getTime(), y: value };
          }),
          label: $localize`Benchmark`
        }
--- a/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.module.ts
+++ b/apps/client/src/app/components/benchmark-comparator/benchmark-comparator.module.ts
@ -1,7 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
-import { MatSelectModule } from '@angular/material/select';
+import { MatLegacySelectModule as MatSelectModule } from '@angular/material/legacy-select';
 import { GfPremiumIndicatorModule } from '@ghostfolio/ui/premium-indicator';
 import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';

--- a/apps/client/src/app/components/dialog-footer/dialog-footer.module.ts
+++ b/apps/client/src/app/components/dialog-footer/dialog-footer.module.ts
@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';

 import { DialogFooterComponent } from './dialog-footer.component';

--- a/apps/client/src/app/components/dialog-header/dialog-header.module.ts
+++ b/apps/client/src/app/components/dialog-header/dialog-header.module.ts
@ -1,6 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
-import { MatButtonModule } from '@angular/material/button';
+import { MatLegacyButtonModule as MatButtonModule } from '@angular/material/legacy-button';

 import { DialogHeaderComponent } from './dialog-header.component';

--- 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
@ -6,7 +6,7 @@ import {
  OnChanges,
  Output
 } from '@angular/core';
-import { MatDialog } from '@angular/material/dialog';
+import { MatLegacyDialog as MatDialog } from '@angular/material/legacy-dialog';
 import { Router } from '@angular/router';
 import { LoginWithAccessTokenDialog } from '@ghostfolio/client/components/login-with-access-token-dialog/login-with-access-token-dialog.component';
 import { DataService } from '@ghostfolio/client/services/data.service';
@ -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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Kaul	0ec50819f5	Release 1.234.0 (#1703 )	2023-02-15 10:52:02 +01:00
Thomas Kaul	c9abe818bc	Revert import (#1702 )	2023-02-15 10:50:19 +01:00
Thomas Kaul	bfa32537a8	Feature/improve usability of import activities action (#1695 ) * Improve usability of import activities action * Update changelog	2023-02-15 10:07:25 +01:00
Thomas Kaul	cef15afab8	Add styling (#1701 )	2023-02-15 10:01:35 +01:00
Thomas Kaul	1b9587c454	Update default coupon duration (#1700 )	2023-02-15 10:00:04 +01:00
Thomas Kaul	de76b0d8c3	Feature/add data import and export to pricing page (#1697 ) * Add data import and export * Update changelog	2023-02-15 09:52:09 +01:00
Thomas Kaul	e62989c981	Feature/copy logic of ghostfolio scraper api service to manual service (#1691 ) * Copy logic of GhostfolioScraperApiService to ManualService * Update changelog	2023-02-15 09:50:31 +01:00
Thomas Kaul	d6b71e6314	Bugfix/fix links in subscription interstitial dialog (#1696 ) * Fix links * Update changelog	2023-02-14 18:25:12 +01:00
Thomas Kaul	8c59bfd6d7	Feature/upgrade prisma to version 4.10.1 (#1688 ) * Upgrade prisma to version 4.10.1 * Update changelog	2023-02-14 11:35:04 +01:00
Thomas Kaul	f32df73256	Feature/migrate pages to angular material 15 (#1689 ) * Migrate to Angular Material 15 * Update changelog	2023-02-14 10:04:22 +01:00
Thomas Kaul	9d03a8002c	Feature/improve content of faq and landing page (#1687 ) * Conditionally show content * Update changelog	2023-02-13 09:41:25 +01:00
Thomas Kaul	3c36ca29af	Feature/upgrade ionicons to version 6.1.2 (#1676 ) * Upgrade ionicons to version 6.1.2 * Update changelog	2023-02-12 10:08:04 +01:00
BeauAgst	efed7e3c2b	Modify default exposed port (#1681 ) * Modify default exposed port * Update changelog	2023-02-11 10:37:44 +01:00
Johannes Herforth	b09d3cea95	Fix landing page by setting a default value for countriesOfSubscribers * Set default value for countriesOfSubscribers * Update changelog	2023-02-11 09:57:27 +01:00
Thomas Kaul	eabd2f3934	Add url (#1683 )	2023-02-11 09:55:03 +01:00
Thomas Kaul	cc184c2827	Feature/upgrade prettier to version 2.8.4 (#1675 ) * Upgrade prettier to version 2.8.4 * Update changelog	2023-02-10 09:27:26 +01:00
Thomas Kaul	436f791fa4	Feature/upgrade chart.js to version 4.2.0 (#1567 ) * Upgrade chart.js to version 4.2.0 * Update changelog	2023-02-09 21:22:55 +01:00
Thomas Kaul	e935a57dec	Release 1.233.0 (#1678 )	2023-02-09 20:30:53 +01:00
Thomas Kaul	203909d917	Feature/upgrade eslint dependencies (#1674 ) * Upgrade eslint dependencies * Update changelog	2023-02-09 10:22:50 +01:00
Thomas Kaul	eed4f57f30	Clean up (#1669 )	2023-02-09 09:59:29 +01:00
Thomas Kaul	7878036bac	Feature/remove google play badge from landing page (#1672 ) * Remove Google Play badge * Update changelog	2023-02-08 14:17:49 +01:00
Thomas Kaul	75d140b436	Harmonize file name (#1662 )	2023-02-07 08:44:22 +01:00
Yash Solanki	a79f31b006	Feature/add accounts import export (#1635 ) * Add accounts to activities export * Add logic for importing accounts * Update changelog	2023-02-06 21:59:59 +01:00
Thomas Kaul	45cfd61dbb	Feature/improve styling in admin control panel (#1665 ) * Improve styling * Update changelog	2023-02-06 11:35:56 +01:00
Thomas Kaul	7fcfca952e	Release 1.232.0 (#1664 )	2023-02-05 19:46:18 +01:00
Thomas Kaul	279f16cc67	Feature/extract locales 20230205 (#1663 ) * Extract locales * Update changelog	2023-02-05 19:44:33 +01:00
Thomas Kaul	e7b1d8a5d3	Feature/upgrade ngx markdown to version 15.1.0 (#1657 ) * Upgrade ngx-markdown to version 15.1.0 * Update changelog	2023-02-05 18:57:35 +01:00
Thomas Kaul	1b2f8e5586	Feature/extend analytics by country (#1661 ) * Extend analytics by country * Fix Upgrade Plan button of subscription interstitial * Update changelog	2023-02-05 18:57:12 +01:00
Thomas Kaul	e4468252c6	Feature/upgrade ng extract i18n merge to version 2.5.0 (#1656 ) * Upgrade ng-extract-i18n-merge to version 2.5.0 * Update changelog	2023-02-05 11:44:06 +01:00
Thomas Kaul	ad3ebd42bb	Feature/migrate mat suffix to angular material 15 (#1655 ) * Migrate matSuffix to @angular/material 15 * Update changelog	2023-02-05 09:49:37 +01:00
Thomas Kaul	55b03733f4	Release 1.231.0 (#1654 )	2023-02-04 11:28:48 +01:00
Thomas Kaul	0000317041	Upgrade Nx and Angular (#1646 ) * Upgrade Nx and Angular * Update changelog * Feature/eliminate angular material css vars (#1648) * Eliminate angular-material-css-vars * Update changelog	2023-02-04 11:26:06 +01:00
Thomas Kaul	e5f2a3865d	Update types of node and papaparse (#1650 )	2023-02-03 13:27:59 +01:00
BeauAgst	c61561664f	Relax validation for REDIS_HOST (#1652 ) * Relax validation for REDIS_HOST * Update changelog	2023-02-02 13:39:13 +01:00
Thomas Kaul	a7d8a63ab8	Remove year (#1649 )	2023-02-01 08:58:17 +01:00
Thomas Kaul	5c51c1e825	Reorder features (#1644 )	2023-01-30 20:22:03 +01:00
Thomas Kaul	3a67bf9bb4	Add /de/pricing and /de/blog (#1645 )	2023-01-30 20:21:37 +01:00
Thomas Kaul	f7597c213d	Feature/add dividend and fees to position detail dialog (#1643 ) * Add dividend and fees to position detail dialog * Update changelog	2023-01-30 20:21:16 +01:00
Thomas Kaul	2e7f46ad78	Feature/allow account for activity of type item (#1641 ) * Support linking wealth items to account * Update changelog	2023-01-30 20:00:07 +01:00
Thomas Kaul	cfffb99f52	Feature/extract locales 20230129 (#1642 ) * Improve translations * Update changelog	2023-01-30 19:45:27 +01:00
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
Thomas Kaul	d97fe4da9c	Release 1.222.0 (#1561 )	2022-12-29 18:11:26 +01:00
Thomas Kaul	b20fa55b79	Feature/add filters to analytics page (#1559 ) * Add filters to analysis page * Update changelog	2022-12-29 10:31:21 +01:00
Thomas Kaul	dd7a6f1562	Bugfix/fix i18n for account type (#1554 ) * Translate account type * Update changelog	2022-12-29 10:20:23 +01:00
Thomas Kaul	15357bd5b5	Feature/add asset profile details to activities import (#1552 ) * Add asset profile details * Update changelog	2022-12-29 10:19:30 +01:00
Thomas Kaul	52c7adc266	Feature/upgrade internet identity dependencies to version 0.15.1 (#1549 ) * Upgrade Internet Identity dependencies to version 0.15.1 * Update changelog	2022-12-28 20:08:30 +01:00
Thomas Kaul	1ae8970045	Feature/add price to subscription (#1551 ) * Add price * Update changelog	2022-12-28 13:57:15 +01:00
Thomas Kaul	7c4c047140	Remove .gitkeep (#1553 )	2022-12-28 13:45:30 +01:00
Thomas Kaul	527f7e4faf	Feature/upgrade observable store to version 2.2.15 (#1550 ) * Upgrade observable-store to version 2.2.15 * Update changelog	2022-12-28 13:43:28 +01:00
Thomas Kaul	50160eb9dc	Feature/upgrade countup.js to version 2.3.2 (#1548 ) * Upgrade countup.js to version 2.3.2 * Update changelog	2022-12-28 13:22:19 +01:00
Thomas Kaul	58dff8a1e0	Feature/upgrade prisma to version 4.8.0 (#1547 ) * Upgrade prisma to version 4.8.0 * Update changelog	2022-12-28 10:40:34 +01:00
Thomas Kaul	2cd41615b2	Feature/change execution time of asset profile data gathering (#1544 ) * Change execution time * Update changelog	2022-12-28 09:31:46 +01:00
Thomas Kaul	66d5793528	Refactoring (#1545 )	2022-12-27 10:05:26 +01:00
Thomas Kaul	e8d65e1c85	Feature/upgrade bull to version 4.10.2 (#1542 ) * Upgrade bull to version 4.10.2 * Update changelog	2022-12-27 09:12:44 +01:00