Release 2.78.0 (#3361 )

Feature/improve inactive user role (#3360 )
* Improve inactive role * Update changelog
2024-05-02 20:32:47 +02:00 · 2024-05-02 20:31:20 +02:00 · 2024-05-02 19:16:59 +02:00 · 2024-05-02 17:53:34 +02:00 · 2024-05-02 17:52:39 +02:00 · 2024-04-30 14:08:14 +02:00
364 changed files with 26541 additions and 7443 deletions
--- a/.env.dev
+++ b/.env.dev
@ -0,0 +1,25 @@
+COMPOSE_PROJECT_NAME=ghostfolio-development
+
+# CACHE
+REDIS_HOST=localhost
+REDIS_PORT=6379
+REDIS_PASSWORD=<INSERT_REDIS_PASSWORD>
+
+# POSTGRES
+POSTGRES_DB=ghostfolio-db
+POSTGRES_USER=user
+POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
+
+# VARIOUS
+ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
+DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
+JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
+
+# DEVELOPMENT
+
+# Nx 18 enables using plugins to infer targets by default
+# This is disabled for existing workspaces to maintain compatibility
+# For more info, see: https://nx.dev/concepts/inferred-tasks
+NX_ADD_PLUGINS=false
+
+NX_NATIVE_COMMAND_RUNNER=false
--- a/.env.example
+++ b/.env.example
@ -1,4 +1,4 @@
-COMPOSE_PROJECT_NAME=ghostfolio-development
+COMPOSE_PROJECT_NAME=ghostfolio

 # CACHE
 REDIS_HOST=localhost
@ -10,6 +10,7 @@ POSTGRES_DB=ghostfolio-db
 POSTGRES_USER=user
 POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>

+# VARIOUS
 ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
 JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,7 +5,261 @@ 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).

-## 2.63.1 - 2024-03-11
+## 2.78.0 - 2024-05-02
+
+### Added
+
+- Added a form validation against the DTO in the create or update access dialog
+- Added a form validation against the DTO in the asset profile details dialog of the admin control
+- Added a form validation against the DTO in the platform management of the admin control panel
+- Added a form validation against the DTO in the tag management of the admin control panel
+
+### Changed
+
+- Set the performance column of the holdings table to stick at the end
+- Skipped the caching in the portfolio calculator if there are active filters (experimental)
+- Improved the `INACTIVE` user role
+
+### Fixed
+
+- Fixed an issue in the calculation of the portfolio summary caused by future liabilities
+- Fixed a division by zero error in the dividend yield calculation (experimental)
+
+## 2.77.1 - 2024-04-27
+
+### Added
+
+- Extended the content of the _Self-Hosting_ section by the custom asset instructions on the Frequently Asked Questions (FAQ) page
+- Added the caching to the portfolio calculator (experimental)
+
+### Changed
+
+- Migrated the `@ghostfolio/ui` components to control flow
+- Updated the browserslist database
+- Upgraded `prisma` from version `5.12.1` to `5.13.0`
+
+### Fixed
+
+- Fixed the form submit in the asset profile details dialog of the admin control due to the `url` validation
+- Fixed the historical market data gathering for asset profiles with `MANUAL` data source
+
+## 2.76.0 - 2024-04-23
+
+### Changed
+
+- Changed `CASH` to `LIQUIDITY` in the asset class enum
+
+## 2.75.1 - 2024-04-21
+
+### Added
+
+- Added `accountId` and `date` as a unique constraint to the `AccountBalance` database schema
+
+### Changed
+
+- Improved the chart in the account detail dialog
+- Improved the account balance management
+
+### Fixed
+
+- Fixed an issue with `totalValueInBaseCurrency` in the value redaction interceptor for the impersonation mode
+
+## 2.74.0 - 2024-04-20
+
+### Added
+
+- Added the date range support to the portfolio holdings page
+- Added support to create an account balance
+
+### Changed
+
+- Removed the date range support in the activities table on the portfolio activities page (experimental)
+- Improved the language localization for German (`de`)
+- Upgraded `angular` from version `17.3.3` to `17.3.5`
+- Upgraded `Nx` from version `18.2.3` to `18.3.3`
+
+### Fixed
+
+- Fixed gaps in the portfolio performance charts by considering `BUY` and `SELL` activities
+
+## 2.73.0 - 2024-04-17
+
+### Added
+
+- Added a form validation against the DTO in the create or update account dialog
+- Added a form validation against the DTO in the create or update activity dialog
+
+### Changed
+
+- Moved the dividend calculations into the portfolio calculator
+- Moved the fee calculations into the portfolio calculator
+- Moved the interest calculations into the portfolio calculator
+- Moved the liability calculations into the portfolio calculator
+- Moved the (wealth) item calculations into the portfolio calculator
+- Let queue jobs for asset profile data gathering fail by throwing an error
+- Let queue jobs for historical market data gathering fail by throwing an error
+- Upgraded `yahoo-finance2` from version `2.11.1` to `2.11.2`
+
+## 2.72.0 - 2024-04-13
+
+### Added
+
+- Added support to immediately execute a queue job from the admin control panel
+- Added a priority column to the queue jobs view in the admin control panel
+
+### Changed
+
+- Adapted the priorities of queue jobs
+- Upgraded `angular` from version `17.2.4` to `17.3.3`
+- Upgraded `Nx` from version `18.1.2` to `18.2.3`
+- Upgraded `prisma` from version `5.11.0` to `5.12.1`
+- Upgraded `yahoo-finance2` from version `2.11.0` to `2.11.1`
+
+### Fixed
+
+- Fixed an issue in the public page
+
+## 2.71.0 - 2024-04-07
+
+### Added
+
+- Added the dividend yield to the position detail dialog (experimental)
+- Added support to override the asset class of an asset profile in the asset profile details dialog of the admin control
+- Added support to override the asset sub class of an asset profile in the asset profile details dialog of the admin control
+- Added support to override the url of an asset profile in the asset profile details dialog of the admin control
+- Added the asset profile icon to the asset profile details dialog of the admin control
+- Added the platform icon to the create or update platform dialog of the admin control
+- Extended the rules in the _X-ray_ section by a `key`
+- Added `currency` to the `Order` database schema as a preparation to set a custom currency
+- Extended the content of the _Self-Hosting_ section by the data providers on the Frequently Asked Questions (FAQ) page
+
+### Changed
+
+- Optimized the calculation of allocations by market
+- Improved the url validation in the create and update platform endpoint
+- Improved the language localization for German (`de`)
+
+### Fixed
+
+- Fixed the missing tags in the portfolio calculations
+
+## 2.70.0 - 2024-04-02
+
+### Added
+
+- Set up the language localization for Chinese (`zh`)
+- Added `init: true` to the `docker-compose` files (`docker-compose.yml` and `docker-compose.build.yml`) to avoid zombie processes
+- Set up _Webpack Bundle Analyzer_
+
+### Changed
+
+- Disabled the option to update the cash balance of an account if date is not today
+- Improved the usability of the date range support by specific years (`2023`, `2022`, `2021`, etc.) in the assistant (experimental)
+- Introduced a factory for the portfolio calculations to support different algorithms in future
+
+### Fixed
+
+- Fixed the duplicated tags in the position detail dialog
+- Removed `Tini` from the docker image
+
+## 2.69.0 - 2024-03-30
+
+### Added
+
+- Added the date range support in the activities table on the portfolio activities page (experimental)
+- Extended the date range support by specific years (`2021`, `2022`, `2023`, etc.) in the assistant (experimental)
+- Set up `Tini` to avoid zombie processes and perform signal forwarding in docker image
+
+### Changed
+
+- Improved the usability to delete an asset profile in the historical market data table and the asset profile details dialog of the admin control
+
+### Fixed
+
+- Added missing dates to edit historical market data in the asset profile details dialog of the admin control panel
+
+## 2.68.0 - 2024-03-29
+
+### Added
+
+- Extended the export functionality by the user account’s currency
+- Added support to override the name of an asset profile in the asset profile details dialog of the admin control
+
+### Changed
+
+- Optimized the portfolio calculations
+
+### Fixed
+
+- Fixed the chart tooltip of the benchmark comparator
+- Fixed an issue with names in the activities table on the portfolio activities page while using symbol profile overrides
+
+## 2.67.0 - 2024-03-26
+
+### Added
+
+- Added support for the cryptocurrency _Toncoin_ (`TON11419-USD`)
+
+### Changed
+
+- Replaced `Math.random()` with `crypto.randomBytes()` for generating cryptographically secure random strings
+- Upgraded `ionicons` from version `7.1.0` to `7.3.0`
+- Upgraded `yahoo-finance2` from version `2.10.0` to `2.11.0`
+- Upgraded `zone.js` from version `0.14.3` to `0.14.4`
+
+## 2.66.3 - 2024-03-23
+
+### Added
+
+- Extended the content of the _SaaS_ and _Self-Hosting_ sections by the backup strategy on the Frequently Asked Questions (FAQ) page
+- Added an index for `dataSource` / `symbol` to the market data database table
+
+### Changed
+
+- Improved the chart tooltip of the benchmark comparator by adding the benchmark name
+- Upgraded `angular` from version `17.1.3` to `17.2.4`
+- Upgraded `Nx` from version `18.0.4` to `18.1.2`
+
+### Fixed
+
+- Fixed the missing portfolio performance chart in the _Presenter View_ / _Zen Mode_
+
+## 2.65.0 - 2024-03-19
+
+### Added
+
+- Added the symbol and ISIN number to the position detail dialog
+- Added support to delete an asset profile in the asset profile details dialog of the admin control
+
+### Changed
+
+- Moved the support to grant private access with permissions from experimental to general availability
+- Set the meta theme color dynamically to respect the appearance (dark mode)
+- Improved the usability to edit market data in the admin control panel
+
+## 2.64.0 - 2024-03-16
+
+### Added
+
+- Added a toggle to switch between active and closed holdings on the portfolio holdings page
+- Added support to update the cash balance of an account when adding a fee activity
+- Added support to update the cash balance of an account when adding an interest activity
+- Extended the content of the _General_ section by the product roadmap on the Frequently Asked Questions (FAQ) page
+
+### Changed
+
+- Improved the usability of the platform management in the admin control panel
+- Improved the usability of the tag management in the admin control panel
+- Improved the exception handling of various rules in the _X-ray_ section
+- Increased the timeout to load benchmarks
+- Upgraded `prisma` from version `5.10.2` to `5.11.0`
+
+### Fixed
+
+- Fixed an issue in the dividend calculation of the portfolio holdings
+- Fixed the date conversion of the import of historical market data in the admin control panel
+
+## 2.63.2 - 2024-03-12

 ### Added

--- a/3
+++ b/3
@ -57,6 +57,7 @@ RUN apt update && apt install -y \
    && rm -rf /var/lib/apt/lists/*

 COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
+COPY ./docker/entrypoint.sh /ghostfolio/entrypoint.sh
 WORKDIR /ghostfolio/apps/api
 EXPOSE ${PORT:-3333}
-CMD [ "yarn", "start:production" ]
+CMD [ "/ghostfolio/entrypoint.sh" ]
--- a/README.md
+++ b/README.md
@ -7,14 +7,12 @@
 **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_)
+[**Blog**](https://ghostfol.io/en/blog) | [**Slack**](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) | [**X**](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)

-New: [Ghostfolio 2.0](https://ghostfol.io/en/blog/2023/09/ghostfolio-2)
-
 </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.
@ -87,23 +85,23 @@ We provide official container images hosted on [Docker Hub](https://hub.docker.c

 ### Supported Environment Variables

-| Name                     | Default Value | Description                                                                                                                         |
-| ------------------------ | ------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `ACCESS_TOKEN_SALT`      |               | A random string used as salt for access tokens                                                                                      |
-| `API_KEY_COINGECKO_DEMO` |               | The _CoinGecko_ Demo API key                                                                                                        |
-| `API_KEY_COINGECKO_PRO`  |               | The _CoinGecko_ Pro API                                                                                                             |
-| `DATABASE_URL`           |               | The database connection URL, e.g. `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer` |
-| `HOST`                   | `0.0.0.0`     | The host where the Ghostfolio application will run on                                                                               |
-| `JWT_SECRET_KEY`         |               | A random string used for _JSON Web Tokens_ (JWT)                                                                                    |
-| `PORT`                   | `3333`        | The port where the Ghostfolio application will run on                                                                               |
-| `POSTGRES_DB`            |               | The name of the _PostgreSQL_ database                                                                                               |
-| `POSTGRES_PASSWORD`      |               | The password of the _PostgreSQL_ database                                                                                           |
-| `POSTGRES_USER`          |               | The user of the _PostgreSQL_ database                                                                                               |
-| `REDIS_DB`               | `0`           | The database index of _Redis_                                                                                                       |
-| `REDIS_HOST`             |               | The host where _Redis_ is running                                                                                                   |
-| `REDIS_PASSWORD`         |               | The password of _Redis_                                                                                                             |
-| `REDIS_PORT`             |               | The port where _Redis_ is running                                                                                                   |
-| `REQUEST_TIMEOUT`        | `2000`        | The timeout of network requests to data providers in milliseconds                                                                   |
+| Name                     | Type                | Default Value | Description                                                                                                                         |
+| ------------------------ | ------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| `ACCESS_TOKEN_SALT`      | string              |               | A random string used as salt for access tokens                                                                                      |
+| `API_KEY_COINGECKO_DEMO` | string (`optional`) |               | The _CoinGecko_ Demo API key                                                                                                        |
+| `API_KEY_COINGECKO_PRO`  | string (`optional`) |               | The _CoinGecko_ Pro API                                                                                                             |
+| `DATABASE_URL`           | string              |               | The database connection URL, e.g. `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer` |
+| `HOST`                   | string (`optional`) | `0.0.0.0`     | The host where the Ghostfolio application will run on                                                                               |
+| `JWT_SECRET_KEY`         | string              |               | A random string used for _JSON Web Tokens_ (JWT)                                                                                    |
+| `PORT`                   | number (`optional`) | `3333`        | The port where the Ghostfolio application will run on                                                                               |
+| `POSTGRES_DB`            | string              |               | The name of the _PostgreSQL_ database                                                                                               |
+| `POSTGRES_PASSWORD`      | string              |               | The password of the _PostgreSQL_ database                                                                                           |
+| `POSTGRES_USER`          | string              |               | The user of the _PostgreSQL_ database                                                                                               |
+| `REDIS_DB`               | number (`optional`) | `0`           | The database index of _Redis_                                                                                                       |
+| `REDIS_HOST`             | string              |               | The host where _Redis_ is running                                                                                                   |
+| `REDIS_PASSWORD`         | string              |               | The password of _Redis_                                                                                                             |
+| `REDIS_PORT`             | number              |               | The port where _Redis_ is running                                                                                                   |
+| `REQUEST_TIMEOUT`        | number (`optional`) | `2000`        | The timeout of network requests to data providers in milliseconds                                                                   |

 ### Run with Docker Compose

@ -144,7 +142,7 @@ docker compose --env-file ./.env -f docker/docker-compose.build.yml up -d

 ### Home Server Systems (Community)

-Ghostfolio is available for various home server systems, including [CasaOS](https://github.com/bigbeartechworld/big-bear-casaos), [Runtipi](https://www.runtipi.io/docs/apps-available), [TrueCharts](https://truecharts.org/charts/stable/ghostfolio), [Umbrel](https://apps.umbrel.com/app/ghostfolio), and [Unraid](https://unraid.net/community/apps?q=ghostfolio).
+Ghostfolio is available for various home server systems, including [CasaOS](https://github.com/bigbeartechworld/big-bear-casaos), Home Assistant, [Runtipi](https://www.runtipi.io/docs/apps-available), [TrueCharts](https://truecharts.org/charts/stable/ghostfolio), [Umbrel](https://apps.umbrel.com/app/ghostfolio), and [Unraid](https://unraid.net/community/apps?q=ghostfolio).

 ## Development

@ -154,7 +152,7 @@ Ghostfolio is available for various home server systems, including [CasaOS](http
 - [Node.js](https://nodejs.org/en/download) (version 18+)
 - [Yarn](https://yarnpkg.com/en/docs/install)
 - Create a local copy of this Git repository (clone)
- Copy the file `.env.example` to `.env` and populate it with your data (`cp .env.example .env`)
+- Copy the file `.env.dev` to `.env` and populate it with your data (`cp .env.dev .env`)

 ### Setup

@ -206,7 +204,7 @@ Set the header for each request as follows:
 "Authorization": "Bearer eyJh..."
 ```

-You can get the _Bearer Token_ via `POST http://localhost:3333/api/v1/auth/anonymous` (Body: `{ accessToken: <INSERT_SECURITY_TOKEN_OF_ACCOUNT> }`)
+You can get the _Bearer Token_ via `POST http://localhost:3333/api/v1/auth/anonymous` (Body: `{ "accessToken": "<INSERT_SECURITY_TOKEN_OF_ACCOUNT>" }`)

 Deprecated: `GET http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TOKEN_OF_ACCOUNT>` or `curl -s http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TOKEN_OF_ACCOUNT>`.

--- a/apps/api/src/app/access/access.controller.ts
+++ b/apps/api/src/app/access/access.controller.ts
@ -83,7 +83,7 @@ export class AccessController {
    }

    try {
-      return await this.accessService.createAccess({
+      return this.accessService.createAccess({
        alias: data.alias || undefined,
        GranteeUser: data.granteeUserId
          ? { connect: { id: data.granteeUserId } }
--- a/apps/api/src/app/account-balance/account-balance.controller.ts
+++ b/apps/api/src/app/account-balance/account-balance.controller.ts
@ -1,3 +1,4 @@
+import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { permissions } from '@ghostfolio/common/permissions';
@ -5,6 +6,8 @@ import type { RequestWithUser } from '@ghostfolio/common/types';

 import {
  Controller,
+  Body,
+  Post,
  Delete,
  HttpException,
  Inject,
@ -17,14 +20,44 @@ import { AccountBalance } from '@prisma/client';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';

 import { AccountBalanceService } from './account-balance.service';
+import { CreateAccountBalanceDto } from './create-account-balance.dto';

@Controller('account-balance')
 export class AccountBalanceController {
  public constructor(
    private readonly accountBalanceService: AccountBalanceService,
+    private readonly accountService: AccountService,
    @Inject(REQUEST) private readonly request: RequestWithUser
  ) {}

+  @HasPermission(permissions.createAccountBalance)
+  @Post()
+  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  public async createAccountBalance(
+    @Body() data: CreateAccountBalanceDto
+  ): Promise<AccountBalance> {
+    const account = await this.accountService.account({
+      id_userId: {
+        id: data.accountId,
+        userId: this.request.user.id
+      }
+    });
+
+    if (!account) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.accountBalanceService.createOrUpdateAccountBalance({
+      accountId: account.id,
+      balance: data.balance,
+      date: data.date,
+      userId: account.userId
+    });
+  }
+
  @HasPermission(permissions.deleteAccountBalance)
  @Delete(':id')
  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
@ -32,10 +65,11 @@ export class AccountBalanceController {
    @Param('id') id: string
  ): Promise<AccountBalance> {
    const accountBalance = await this.accountBalanceService.accountBalance({
-      id
+      id,
+      userId: this.request.user.id
    });

-    if (!accountBalance || accountBalance.userId !== this.request.user.id) {
+    if (!accountBalance) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.FORBIDDEN),
        StatusCodes.FORBIDDEN
@ -43,7 +77,8 @@ export class AccountBalanceController {
    }

    return this.accountBalanceService.deleteAccountBalance({
-      id
+      id: accountBalance.id,
+      userId: accountBalance.userId
    });
  }
 }
--- a/apps/api/src/app/account-balance/account-balance.module.ts
+++ b/apps/api/src/app/account-balance/account-balance.module.ts
@ -1,3 +1,4 @@
+import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';

@ -10,6 +11,6 @@ import { AccountBalanceService } from './account-balance.service';
  controllers: [AccountBalanceController],
  exports: [AccountBalanceService],
  imports: [ExchangeRateDataModule, PrismaModule],
-  providers: [AccountBalanceService]
+  providers: [AccountBalanceService, AccountService]
 })
 export class AccountBalanceModule {}
--- a/apps/api/src/app/account-balance/account-balance.service.ts
+++ b/apps/api/src/app/account-balance/account-balance.service.ts
@ -1,14 +1,21 @@
+import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
+import { resetHours } from '@ghostfolio/common/helper';
 import { AccountBalancesResponse, Filter } from '@ghostfolio/common/interfaces';
 import { UserWithSettings } from '@ghostfolio/common/types';

 import { Injectable } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
 import { AccountBalance, Prisma } from '@prisma/client';
+import { parseISO } from 'date-fns';
+
+import { CreateAccountBalanceDto } from './create-account-balance.dto';

@Injectable()
 export class AccountBalanceService {
  public constructor(
+    private readonly eventEmitter: EventEmitter2,
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly prismaService: PrismaService
  ) {}
@ -24,20 +31,63 @@ export class AccountBalanceService {
    });
  }

-  public async createAccountBalance(
-    data: Prisma.AccountBalanceCreateInput
-  ): Promise<AccountBalance> {
-    return this.prismaService.accountBalance.create({
-      data
+  public async createOrUpdateAccountBalance({
+    accountId,
+    balance,
+    date,
+    userId
+  }: CreateAccountBalanceDto & {
+    userId: string;
+  }): Promise<AccountBalance> {
+    const accountBalance = await this.prismaService.accountBalance.upsert({
+      create: {
+        Account: {
+          connect: {
+            id_userId: {
+              userId,
+              id: accountId
+            }
+          }
+        },
+        date: resetHours(parseISO(date)),
+        value: balance
+      },
+      update: {
+        value: balance
+      },
+      where: {
+        accountId_date: {
+          accountId,
+          date: resetHours(parseISO(date))
+        }
+      }
    });
+
+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId
+      })
+    );
+
+    return accountBalance;
  }

  public async deleteAccountBalance(
    where: Prisma.AccountBalanceWhereUniqueInput
  ): Promise<AccountBalance> {
-    return this.prismaService.accountBalance.delete({
+    const accountBalance = await this.prismaService.accountBalance.delete({
      where
    });
+
+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId: <string>where.userId
+      })
+    );
+
+    return accountBalance;
  }

  public async getAccountBalances({
--- a/apps/api/src/app/account-balance/create-account-balance.dto.ts
+++ b/apps/api/src/app/account-balance/create-account-balance.dto.ts
@ -0,0 +1,12 @@
+import { IsISO8601, IsNumber, IsUUID } from 'class-validator';
+
+export class CreateAccountBalanceDto {
+  @IsUUID()
+  accountId: string;
+
+  @IsNumber()
+  balance: number;
+
+  @IsISO8601()
+  date: string;
+}
--- a/apps/api/src/app/account/account.service.ts
+++ b/apps/api/src/app/account/account.service.ts
@ -1,11 +1,15 @@
 import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';
+import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
+import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import { Filter } from '@ghostfolio/common/interfaces';

 import { Injectable } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Account, Order, Platform, Prisma } from '@prisma/client';
-import Big from 'big.js';
+import { Big } from 'big.js';
+import { format } from 'date-fns';
 import { groupBy } from 'lodash';

 import { CashDetails } from './interfaces/cash-details.interface';
@ -14,6 +18,7 @@ import { CashDetails } from './interfaces/cash-details.interface';
 export class AccountService {
  public constructor(
    private readonly accountBalanceService: AccountBalanceService,
+    private readonly eventEmitter: EventEmitter2,
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly prismaService: PrismaService
  ) {}
@ -85,17 +90,20 @@ export class AccountService {
      data
    });

-    await this.prismaService.accountBalance.create({
-      data: {
-        Account: {
-          connect: {
-            id_userId: { id: account.id, userId: aUserId }
-          }
-        },
-        value: data.balance
-      }
+    await this.accountBalanceService.createOrUpdateAccountBalance({
+      accountId: account.id,
+      balance: data.balance,
+      date: format(new Date(), DATE_FORMAT),
+      userId: aUserId
    });

+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId: account.userId
+      })
+    );
+
    return account;
  }

@ -103,9 +111,18 @@ export class AccountService {
    where: Prisma.AccountWhereUniqueInput,
    aUserId: string
  ): Promise<Account> {
-    return this.prismaService.account.delete({
+    const account = await this.prismaService.account.delete({
      where
    });
+
+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId: account.userId
+      })
+    );
+
+    return account;
  }

  public async getAccounts(aUserId: string): Promise<Account[]> {
@ -196,21 +213,26 @@ export class AccountService {
  ): Promise<Account> {
    const { data, where } = params;

-    await this.prismaService.accountBalance.create({
-      data: {
-        Account: {
-          connect: {
-            id_userId: where.id_userId
-          }
-        },
-        value: <number>data.balance
-      }
+    await this.accountBalanceService.createOrUpdateAccountBalance({
+      accountId: <string>data.id,
+      balance: <number>data.balance,
+      date: format(new Date(), DATE_FORMAT),
+      userId: aUserId
    });

-    return this.prismaService.account.update({
+    const account = await this.prismaService.account.update({
      data,
      where
    });
+
+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId: account.userId
+      })
+    );
+
+    return account;
  }

  public async updateAccountBalance({
@ -242,17 +264,11 @@ export class AccountService {
      );

    if (amountInCurrencyOfAccount) {
-      await this.accountBalanceService.createAccountBalance({
-        date,
-        Account: {
-          connect: {
-            id_userId: {
-              userId,
-              id: accountId
-            }
-          }
-        },
-        value: new Big(balance).plus(amountInCurrencyOfAccount).toNumber()
+      await this.accountBalanceService.createOrUpdateAccountBalance({
+        accountId,
+        userId,
+        balance: new Big(balance).plus(amountInCurrencyOfAccount).toNumber(),
+        date: date.toISOString()
      });
    }
  }
--- a/apps/api/src/app/admin/admin.controller.ts
+++ b/apps/api/src/app/admin/admin.controller.ts
@ -7,13 +7,12 @@ import { ManualService } from '@ghostfolio/api/services/data-provider/manual/man
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';
 import {
+  DATA_GATHERING_QUEUE_PRIORITY_HIGH,
+  DATA_GATHERING_QUEUE_PRIORITY_MEDIUM,
  GATHER_ASSET_PROFILE_PROCESS,
  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
-import {
-  getAssetProfileIdentifier,
-  resetHours
-} from '@ghostfolio/common/helper';
+import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import {
  AdminData,
  AdminMarketData,
@ -94,7 +93,8 @@ export class AdminController {
          name: GATHER_ASSET_PROFILE_PROCESS,
          opts: {
            ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: getAssetProfileIdentifier({ dataSource, symbol })
+            jobId: getAssetProfileIdentifier({ dataSource, symbol }),
+            priority: DATA_GATHERING_QUEUE_PRIORITY_MEDIUM
          }
        };
      })
@ -119,7 +119,8 @@ export class AdminController {
          name: GATHER_ASSET_PROFILE_PROCESS,
          opts: {
            ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: getAssetProfileIdentifier({ dataSource, symbol })
+            jobId: getAssetProfileIdentifier({ dataSource, symbol }),
+            priority: DATA_GATHERING_QUEUE_PRIORITY_MEDIUM
          }
        };
      })
@ -141,7 +142,8 @@ export class AdminController {
      name: GATHER_ASSET_PROFILE_PROCESS,
      opts: {
        ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-        jobId: getAssetProfileIdentifier({ dataSource, symbol })
+        jobId: getAssetProfileIdentifier({ dataSource, symbol }),
+        priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
      }
    });
  }
@ -339,6 +341,6 @@ export class AdminController {
    @Param('key') key: string,
    @Body() data: PropertyDto
  ) {
-    return await this.adminService.putSetting(key, data.value);
+    return this.adminService.putSetting(key, data.value);
  }
 }
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@ -25,6 +25,7 @@ import { MarketDataPreset } from '@ghostfolio/common/types';

 import { BadRequestException, Injectable } from '@nestjs/common';
 import {
+  AssetClass,
  AssetSubClass,
  DataSource,
  Prisma,
@ -71,7 +72,7 @@ export class AdminService {
        );
      }

-      return await this.symbolProfileService.add(
+      return this.symbolProfileService.add(
        assetProfiles[symbol] as Prisma.SymbolProfileCreateInput
      );
    } catch (error) {
@ -212,6 +213,7 @@ export class AdminService {
          countries: true,
          currency: true,
          dataSource: true,
+          id: true,
          name: true,
          Order: {
            orderBy: [{ date: 'asc' }],
@ -235,6 +237,7 @@ export class AdminService {
        countries,
        currency,
        dataSource,
+        id,
        name,
        Order,
        sectors,
@ -257,6 +260,7 @@ export class AdminService {
          currency,
          countriesCount,
          dataSource,
+          id,
          name,
          symbol,
          marketDataItemCount,
@ -329,21 +333,39 @@ export class AdminService {
    scraperConfiguration,
    sectors,
    symbol,
-    symbolMapping
+    symbolMapping,
+    url
  }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
-    await this.symbolProfileService.updateSymbolProfile({
-      assetClass,
-      assetSubClass,
-      comment,
-      countries,
-      currency,
-      dataSource,
-      name,
-      scraperConfiguration,
-      sectors,
-      symbol,
-      symbolMapping
-    });
+    const symbolProfileOverrides = {
+      assetClass: assetClass as AssetClass,
+      assetSubClass: assetSubClass as AssetSubClass,
+      name: name as string,
+      url: url as string
+    };
+
+    const updatedSymbolProfile: Prisma.SymbolProfileUpdateInput & UniqueAsset =
+      {
+        comment,
+        countries,
+        currency,
+        dataSource,
+        scraperConfiguration,
+        sectors,
+        symbol,
+        symbolMapping,
+        ...(dataSource === 'MANUAL'
+          ? { assetClass, assetSubClass, name, url }
+          : {
+              SymbolProfileOverrides: {
+                upsert: {
+                  create: symbolProfileOverrides,
+                  update: symbolProfileOverrides
+                }
+              }
+            })
+      };
+
+    await this.symbolProfileService.updateSymbolProfile(updatedSymbolProfile);

    const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles([
      {
@ -394,9 +416,10 @@ export class AdminService {
          dataSource,
          marketDataItemCount,
          symbol,
-          assetClass: 'CASH',
+          assetClass: AssetClass.LIQUIDITY,
          countriesCount: 0,
          currency: symbol.replace(DEFAULT_CURRENCY, ''),
+          id: undefined,
          name: symbol,
          sectorsCount: 0
        };
--- a/apps/api/src/app/admin/queue/queue.controller.ts
+++ b/apps/api/src/app/admin/queue/queue.controller.ts
@ -46,4 +46,11 @@ export class QueueController {
  public async deleteJob(@Param('id') id: string): Promise<void> {
    return this.queueService.deleteJob(id);
  }
+
+  @Get('job/:id/execute')
+  @HasPermission(permissions.accessAdminControl)
+  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  public async executeJob(@Param('id') id: string): Promise<void> {
+    return this.queueService.executeJob(id);
+  }
 }
--- a/apps/api/src/app/admin/queue/queue.service.ts
+++ b/apps/api/src/app/admin/queue/queue.service.ts
@ -32,6 +32,10 @@ export class QueueService {
    }
  }

+  public async executeJob(aId: string) {
+    return (await this.dataGatheringQueue.getJob(aId))?.promote();
+  }
+
  public async getJobs({
    limit = 1000,
    status = QUEUE_JOB_STATUS_LIST
@ -54,6 +58,7 @@ export class QueueService {
            finishedOn: job.finishedOn,
            id: job.id,
            name: job.name,
+            opts: job.opts,
            stacktrace: job.stacktrace,
            state: await job.getState(),
            timestamp: job.timestamp
--- a/apps/api/src/app/admin/update-asset-profile.dto.ts
+++ b/apps/api/src/app/admin/update-asset-profile.dto.ts
@ -5,7 +5,8 @@ import {
  IsISO4217CurrencyCode,
  IsObject,
  IsOptional,
-  IsString
+  IsString,
+  IsUrl
 } from 'class-validator';

 export class UpdateAssetProfileDto {
@ -46,4 +47,11 @@ export class UpdateAssetProfileDto {
  symbolMapping?: {
    [dataProvider: string]: string;
  };
+
+  @IsOptional()
+  @IsUrl({
+    protocols: ['https'],
+    require_protocol: true
+  })
+  url?: string;
 }
--- a/apps/api/src/app/app.module.ts
+++ b/apps/api/src/app/app.module.ts
@ -1,3 +1,4 @@
+import { EventsModule } from '@ghostfolio/api/events/events.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { CronService } from '@ghostfolio/api/services/cron.service';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
@ -14,6 +15,7 @@ import {
 import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
+import { EventEmitterModule } from '@nestjs/event-emitter';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { StatusCodes } from 'http-status-codes';
@ -44,6 +46,7 @@ import { TagModule } from './tag/tag.module';
 import { UserModule } from './user/user.module';

@Module({
+  controllers: [AppController],
  imports: [
    AdminModule,
    AccessModule,
@ -64,6 +67,8 @@ import { UserModule } from './user/user.module';
    ConfigurationModule,
    DataGatheringModule,
    DataProviderModule,
+    EventEmitterModule.forRoot(),
+    EventsModule,
    ExchangeRateModule,
    ExchangeRateDataModule,
    ExportModule,
@ -109,7 +114,6 @@ import { UserModule } from './user/user.module';
    TwitterBotModule,
    UserModule
  ],
-  controllers: [AppController],
  providers: [CronService]
 })
 export class AppModule {}
--- a/apps/api/src/app/auth/jwt.strategy.ts
+++ b/apps/api/src/app/auth/jwt.strategy.ts
@ -2,10 +2,12 @@ import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { HEADER_KEY_TIMEZONE } from '@ghostfolio/common/config';
+import { hasRole } from '@ghostfolio/common/permissions';

-import { Injectable, UnauthorizedException } from '@nestjs/common';
+import { HttpException, Injectable } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import * as countriesAndTimezones from 'countries-and-timezones';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 import { ExtractJwt, Strategy } from 'passport-jwt';

@Injectable()
@ -29,6 +31,13 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {

      if (user) {
        if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+          if (hasRole(user, 'INACTIVE')) {
+            throw new HttpException(
+              getReasonPhrase(StatusCodes.TOO_MANY_REQUESTS),
+              StatusCodes.TOO_MANY_REQUESTS
+            );
+          }
+
          const country =
            countriesAndTimezones.getCountryForTimezone(timezone)?.id;

@ -45,10 +54,20 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {

        return user;
      } else {
-        throw '';
+        throw new HttpException(
+          getReasonPhrase(StatusCodes.NOT_FOUND),
+          StatusCodes.NOT_FOUND
+        );
+      }
+    } catch (error) {
+      if (error?.getStatus() === StatusCodes.TOO_MANY_REQUESTS) {
+        throw error;
+      } else {
+        throw new HttpException(
+          getReasonPhrase(StatusCodes.UNAUTHORIZED),
+          StatusCodes.UNAUTHORIZED
+        );
      }
-    } catch (err) {
-      throw new UnauthorizedException('unauthorized', err.message);
    }
  }
 }
--- a/apps/api/src/app/benchmark/benchmark.controller.ts
+++ b/apps/api/src/app/benchmark/benchmark.controller.ts
@ -1,5 +1,6 @@
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
+import { getInterval } from '@ghostfolio/api/helper/portfolio.helper';
 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 type {
@ -8,7 +9,7 @@ import type {
  UniqueAsset
 } from '@ghostfolio/common/interfaces';
 import { permissions } from '@ghostfolio/common/permissions';
-import type { RequestWithUser } from '@ghostfolio/common/types';
+import type { DateRange, RequestWithUser } from '@ghostfolio/common/types';

 import {
  Body,
@ -19,6 +20,7 @@ import {
  Inject,
  Param,
  Post,
+  Query,
  UseGuards,
  UseInterceptors
 } from '@nestjs/common';
@ -106,13 +108,18 @@ export class BenchmarkController {
  public async getBenchmarkMarketDataBySymbol(
    @Param('dataSource') dataSource: DataSource,
    @Param('startDateString') startDateString: string,
-    @Param('symbol') symbol: string
+    @Param('symbol') symbol: string,
+    @Query('range') dateRange: DateRange = 'max'
  ): Promise<BenchmarkMarketDataDetails> {
-    const startDate = new Date(startDateString);
+    const { endDate, startDate } = getInterval(
+      dateRange,
+      new Date(startDateString)
+    );
    const userCurrency = this.request.user.Settings.settings.baseCurrency;

    return this.benchmarkService.getMarketDataBySymbol({
      dataSource,
+      endDate,
      startDate,
      symbol,
      userCurrency
--- a/apps/api/src/app/benchmark/benchmark.service.ts
+++ b/apps/api/src/app/benchmark/benchmark.service.ts
@ -13,7 +13,8 @@ import {
 import {
  DATE_FORMAT,
  calculateBenchmarkTrend,
-  parseDate
+  parseDate,
+  resetHours
 } from '@ghostfolio/common/helper';
 import {
  Benchmark,
@ -26,8 +27,14 @@ import { BenchmarkTrend } from '@ghostfolio/common/types';

 import { Injectable, Logger } from '@nestjs/common';
 import { SymbolProfile } from '@prisma/client';
-import Big from 'big.js';
-import { format, isSameDay, subDays } from 'date-fns';
+import { Big } from 'big.js';
+import {
+  differenceInDays,
+  eachDayOfInterval,
+  format,
+  isSameDay,
+  subDays
+} from 'date-fns';
 import { isNumber, last, uniqBy } from 'lodash';
 import ms from 'ms';

@ -110,7 +117,9 @@ export class BenchmarkService {
    const quotes = await this.dataProviderService.getQuotes({
      items: benchmarkAssetProfiles.map(({ dataSource, symbol }) => {
        return { dataSource, symbol };
-      })
+      }),
+      requestTimeout: ms('30 seconds'),
+      useCache: false
    });

    for (const { dataSource, symbol } of benchmarkAssetProfiles) {
@ -163,7 +172,7 @@ export class BenchmarkService {
      await this.redisCacheService.set(
        this.CACHE_KEY_BENCHMARKS,
        JSON.stringify(benchmarks),
-        ms('4 hours') / 1000
+        ms('2 hours') / 1000
      );
    }

@ -206,15 +215,28 @@ export class BenchmarkService {

  public async getMarketDataBySymbol({
    dataSource,
+    endDate = new Date(),
    startDate,
    symbol,
    userCurrency
  }: {
+    endDate?: Date;
    startDate: Date;
    userCurrency: string;
  } & UniqueAsset): Promise<BenchmarkMarketDataDetails> {
    const marketData: { date: string; value: number }[] = [];

+    const days = differenceInDays(endDate, startDate) + 1;
+    const dates = eachDayOfInterval(
+      {
+        start: startDate,
+        end: endDate
+      },
+      { step: Math.round(days / Math.min(days, MAX_CHART_ITEMS)) }
+    ).map((date) => {
+      return resetHours(date);
+    });
+
    const [currentSymbolItem, marketDataItems] = await Promise.all([
      this.symbolService.get({
        dataGatheringItem: {
@ -230,7 +252,7 @@ export class BenchmarkService {
          dataSource,
          symbol,
          date: {
-            gte: startDate
+            in: dates
          }
        }
      })
@ -264,17 +286,7 @@ export class BenchmarkService {
      return { marketData };
    }

-    const step = Math.round(
-      marketDataItems.length / Math.min(marketDataItems.length, MAX_CHART_ITEMS)
-    );
-
-    let i = 0;
-
    for (let marketDataItem of marketDataItems) {
-      if (i % step !== 0) {
-        continue;
-      }
-
      const exchangeRate =
        exchangeRates[`${currentSymbolItem.currency}${userCurrency}`]?.[
          format(marketDataItem.date, DATE_FORMAT)
@ -297,15 +309,15 @@ export class BenchmarkService {
      });
    }

-    const includesToday = isSameDay(
+    const includesEndDate = isSameDay(
      parseDate(last(marketData).date),
-      new Date()
+      endDate
    );

-    if (currentSymbolItem?.marketPrice && !includesToday) {
+    if (currentSymbolItem?.marketPrice && !includesEndDate) {
      const exchangeRate =
        exchangeRates[`${currentSymbolItem.currency}${userCurrency}`]?.[
-          format(new Date(), DATE_FORMAT)
+          format(endDate, DATE_FORMAT)
        ];

      const exchangeRateFactor =
@ -314,7 +326,7 @@ export class BenchmarkService {
          : 1;

      marketData.push({
-        date: format(new Date(), DATE_FORMAT),
+        date: format(endDate, DATE_FORMAT),
        value:
          this.calculateChangeInPercentage(
            marketPriceAtStartDate,
--- a/apps/api/src/app/export/export.service.ts
+++ b/apps/api/src/app/export/export.service.ts
@ -95,7 +95,10 @@ export class ExportService {
                : SymbolProfile.symbol
          };
        }
-      )
+      ),
+      user: {
+        settings: { currency: userCurrency }
+      }
    };
  }
 }
--- a/apps/api/src/app/import/import.service.ts
+++ b/apps/api/src/app/import/import.service.ts
@ -13,6 +13,10 @@ import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/da
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
+import {
+  DATA_GATHERING_QUEUE_PRIORITY_HIGH,
+  DATA_GATHERING_QUEUE_PRIORITY_MEDIUM
+} from '@ghostfolio/common/config';
 import {
  DATE_FORMAT,
  getAssetProfileIdentifier,
@ -27,7 +31,7 @@ import {

 import { Injectable } from '@nestjs/common';
 import { DataSource, Prisma, SymbolProfile } from '@prisma/client';
-import Big from 'big.js';
+import { Big } from 'big.js';
 import { endOfToday, format, isAfter, isSameSecond, parseISO } from 'date-fns';
 import { uniqBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
@ -112,12 +116,13 @@ export class ImportService {
          accountId: Account?.id,
          accountUserId: undefined,
          comment: undefined,
+          currency: undefined,
          createdAt: undefined,
          fee: 0,
          feeInBaseCurrency: 0,
          id: assetProfile.id,
          isDraft: false,
-          SymbolProfile: <SymbolProfile>(<unknown>assetProfile),
+          SymbolProfile: assetProfile,
          symbolProfileId: assetProfile.id,
          type: 'DIVIDEND',
          unitPrice: marketPrice,
@ -261,6 +266,7 @@ export class ImportService {
      {
        accountId,
        comment,
+        currency,
        date,
        error,
        fee,
@ -285,7 +291,6 @@ export class ImportService {
        assetSubClass,
        countries,
        createdAt,
-        currency,
        dataSource,
        figi,
        figiComposite,
@ -342,6 +347,7 @@ export class ImportService {
      if (isDryRun) {
        order = {
          comment,
+          currency,
          date,
          fee,
          quantity,
@ -357,7 +363,6 @@ export class ImportService {
            assetSubClass,
            countries,
            createdAt,
-            currency,
            dataSource,
            figi,
            figiComposite,
@ -371,6 +376,7 @@ export class ImportService {
            symbolMapping,
            updatedAt,
            url,
+            currency: assetProfile.currency,
            comment: assetProfile.comment
          },
          Account: validatedAccount,
@ -394,9 +400,9 @@ export class ImportService {
          SymbolProfile: {
            connectOrCreate: {
              create: {
-                currency,
                dataSource,
-                symbol
+                symbol,
+                currency: assetProfile.currency
              },
              where: {
                dataSource_symbol: {
@ -410,6 +416,11 @@ export class ImportService {
          User: { connect: { id: user.id } },
          userId: user.id
        });
+
+        if (order.SymbolProfile?.symbol) {
+          // Update symbol that may have been assigned in createOrder()
+          assetProfile.symbol = order.SymbolProfile.symbol;
+        }
      }

      const value = new Big(quantity).mul(unitPrice).toNumber();
@ -420,14 +431,14 @@ export class ImportService {
        value,
        feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
          fee,
-          currency,
+          assetProfile.currency,
          userCurrency
        ),
        // @ts-ignore
        SymbolProfile: assetProfile,
        valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
          value,
-          currency,
+          assetProfile.currency,
          userCurrency
        )
      });
@ -446,15 +457,16 @@ export class ImportService {
        });
      });

-      this.dataGatheringService.gatherSymbols(
-        uniqueActivities.map(({ date, SymbolProfile }) => {
+      this.dataGatheringService.gatherSymbols({
+        dataGatheringItems: uniqueActivities.map(({ date, SymbolProfile }) => {
          return {
            date,
            dataSource: SymbolProfile.dataSource,
            symbol: SymbolProfile.symbol
          };
-        })
-      );
+        }),
+        priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
+      });
    }

    return activities;
@ -521,22 +533,14 @@ export class ImportService {
            currency,
            dataSource,
            symbol,
-            assetClass: null,
-            assetSubClass: null,
-            comment: null,
-            countries: null,
+            activitiesCount: undefined,
+            assetClass: undefined,
+            assetSubClass: undefined,
+            countries: undefined,
            createdAt: undefined,
-            figi: null,
-            figiComposite: null,
-            figiShareClass: null,
            id: undefined,
-            isin: null,
-            name: null,
-            scraperConfiguration: null,
-            sectors: null,
-            symbolMapping: null,
-            updatedAt: undefined,
-            url: null
+            sectors: undefined,
+            updatedAt: undefined
          }
        };
      }
--- a/apps/api/src/app/order/create-order.dto.ts
+++ b/apps/api/src/app/order/create-order.dto.ts
@ -42,6 +42,10 @@ export class CreateOrderDto {
  @IsISO4217CurrencyCode()
  currency: string;

+  @IsISO4217CurrencyCode()
+  @IsOptional()
+  customCurrency?: string;
+
  @IsOptional()
  @IsEnum(DataSource, { each: true })
  dataSource?: DataSource;
--- a/apps/api/src/app/order/interfaces/activities.interface.ts
+++ b/apps/api/src/app/order/interfaces/activities.interface.ts
@ -1,13 +1,19 @@
-import { OrderWithAccount } from '@ghostfolio/common/types';
+import { EnhancedSymbolProfile } from '@ghostfolio/common/interfaces';
+import { AccountWithPlatform } from '@ghostfolio/common/types';
+
+import { Order, Tag } from '@prisma/client';

 export interface Activities {
  activities: Activity[];
  count: number;
 }

-export interface Activity extends OrderWithAccount {
+export interface Activity extends Order {
+  Account?: AccountWithPlatform;
  error?: ActivityError;
  feeInBaseCurrency: number;
+  SymbolProfile?: EnhancedSymbolProfile;
+  tags?: Tag[];
  updateAccountBalance?: boolean;
  value: number;
  valueInBaseCurrency: number;
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@ -1,14 +1,18 @@
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
+import { getInterval } from '@ghostfolio/api/helper/portfolio.helper';
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
 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 { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';
-import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';
+import {
+  DATA_GATHERING_QUEUE_PRIORITY_HIGH,
+  HEADER_KEY_IMPERSONATION
+} from '@ghostfolio/common/config';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type { RequestWithUser } from '@ghostfolio/common/types';
+import type { DateRange, RequestWithUser } from '@ghostfolio/common/types';

 import {
  Body,
@ -56,15 +60,15 @@ export class OrderController {
  }

  @Delete(':id')
+  @HasPermission(permissions.deleteOrder)
  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
  public async deleteOrder(@Param('id') id: string): Promise<OrderModel> {
-    const order = await this.orderService.order({ id });
+    const order = await this.orderService.order({
+      id,
+      userId: this.request.user.id
+    });

-    if (
-      !hasPermission(this.request.user.permissions, permissions.deleteOrder) ||
-      !order ||
-      order.userId !== this.request.user.id
-    ) {
+    if (!order) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.FORBIDDEN),
        StatusCodes.FORBIDDEN
@ -84,12 +88,20 @@ export class OrderController {
    @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId,
    @Query('accounts') filterByAccounts?: string,
    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('range') dateRange?: DateRange,
    @Query('skip') skip?: number,
    @Query('sortColumn') sortColumn?: string,
    @Query('sortDirection') sortDirection?: Prisma.SortOrder,
    @Query('tags') filterByTags?: string,
    @Query('take') take?: number
  ): Promise<Activities> {
+    let endDate: Date;
+    let startDate: Date;
+
+    if (dateRange) {
+      ({ endDate, startDate } = getInterval(dateRange));
+    }
+
    const filters = this.apiService.buildFiltersFromQueryParams({
      filterByAccounts,
      filterByAssetClasses,
@ -101,9 +113,11 @@ export class OrderController {
    const userCurrency = this.request.user.Settings.settings.baseCurrency;

    const { activities, count } = await this.orderService.getOrders({
+      endDate,
      filters,
      sortColumn,
      sortDirection,
+      startDate,
      userCurrency,
      includeDrafts: true,
      skip: isNaN(skip) ? undefined : skip,
@ -120,13 +134,22 @@ export class OrderController {
  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  public async createOrder(@Body() data: CreateOrderDto): Promise<OrderModel> {
+    const currency = data.currency;
+    const customCurrency = data.customCurrency;
+
+    if (customCurrency) {
+      data.currency = customCurrency;
+
+      delete data.customCurrency;
+    }
+
    const order = await this.orderService.createOrder({
      ...data,
      date: parseISO(data.date),
      SymbolProfile: {
        connectOrCreate: {
          create: {
-            currency: data.currency,
+            currency,
            dataSource: data.dataSource,
            symbol: data.symbol
          },
@ -145,13 +168,16 @@ export class OrderController {
    if (data.dataSource && !order.isDraft) {
      // Gather symbol data in the background, if data source is set
      // (not MANUAL) and not draft
-      this.dataGatheringService.gatherSymbols([
-        {
-          dataSource: data.dataSource,
-          date: order.date,
-          symbol: data.symbol
-        }
-      ]);
+      this.dataGatheringService.gatherSymbols({
+        dataGatheringItems: [
+          {
+            dataSource: data.dataSource,
+            date: order.date,
+            symbol: data.symbol
+          }
+        ],
+        priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
+      });
    }

    return order;
@ -176,8 +202,16 @@ export class OrderController {
    const date = parseISO(data.date);

    const accountId = data.accountId;
+    const customCurrency = data.customCurrency;
+
    delete data.accountId;

+    if (customCurrency) {
+      data.currency = customCurrency;
+
+      delete data.customCurrency;
+    }
+
    return this.orderService.updateOrder({
      data: {
        ...data,
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@ -1,9 +1,11 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
+import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
+  DATA_GATHERING_QUEUE_PRIORITY_HIGH,
  GATHER_ASSET_PROFILE_PROCESS,
  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
@ -12,6 +14,7 @@ import { Filter, UniqueAsset } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';

 import { Injectable } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
 import {
  AssetClass,
  AssetSubClass,
@ -21,9 +24,9 @@ import {
  Tag,
  Type as ActivityType
 } from '@prisma/client';
-import Big from 'big.js';
+import { Big } from 'big.js';
 import { endOfToday, isAfter } from 'date-fns';
-import { groupBy } from 'lodash';
+import { groupBy, uniqBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';

 import { Activities } from './interfaces/activities.interface';
@ -33,6 +36,7 @@ export class OrderService {
  public constructor(
    private readonly accountService: AccountService,
    private readonly dataGatheringService: DataGatheringService,
+    private readonly eventEmitter: EventEmitter2,
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly prismaService: PrismaService,
    private readonly symbolProfileService: SymbolProfileService
@ -65,7 +69,6 @@ export class OrderService {
    }

    const accountId = data.accountId;
-    let currency = data.currency;
    const tags = data.tags ?? [];
    const updateAccountBalance = data.updateAccountBalance ?? false;
    const userId = data.userId;
@ -73,7 +76,6 @@ export class OrderService {
    if (['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(data.type)) {
      const assetClass = data.assetClass;
      const assetSubClass = data.assetSubClass;
-      currency = data.SymbolProfile.connectOrCreate.create.currency;
      const dataSource: DataSource = 'MANUAL';
      const id = uuidv4();
      const name = data.SymbolProfile.connectOrCreate.create.symbol;
@ -81,7 +83,6 @@ export class OrderService {
      data.id = id;
      data.SymbolProfile.connectOrCreate.create.assetClass = assetClass;
      data.SymbolProfile.connectOrCreate.create.assetSubClass = assetSubClass;
-      data.SymbolProfile.connectOrCreate.create.currency = currency;
      data.SymbolProfile.connectOrCreate.create.dataSource = dataSource;
      data.SymbolProfile.connectOrCreate.create.name = name;
      data.SymbolProfile.connectOrCreate.create.symbol = id;
@ -103,7 +104,8 @@ export class OrderService {
          jobId: getAssetProfileIdentifier({
            dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
            symbol: data.SymbolProfile.connectOrCreate.create.symbol
-          })
+          }),
+          priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
        }
      });
    }
@ -116,7 +118,6 @@ export class OrderService {
      delete data.comment;
    }

-    delete data.currency;
    delete data.dataSource;
    delete data.symbol;
    delete data.tags;
@ -139,7 +140,8 @@ export class OrderService {
            return { id };
          })
        }
-      }
+      },
+      include: { SymbolProfile: true }
    });

    if (updateAccountBalance === true) {
@ -148,19 +150,26 @@ export class OrderService {
        .plus(data.fee)
        .toNumber();

-      if (data.type === 'BUY') {
+      if (['BUY', 'FEE'].includes(data.type)) {
        amount = new Big(amount).mul(-1).toNumber();
      }

      await this.accountService.updateAccountBalance({
        accountId,
        amount,
-        currency,
        userId,
+        currency: data.SymbolProfile.connectOrCreate.create.currency,
        date: data.date as Date
      });
    }

+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId: order.userId
+      })
+    );
+
    return order;
  }

@ -175,6 +184,13 @@ export class OrderService {
      await this.symbolProfileService.deleteById(order.symbolProfileId);
    }

+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId: order.userId
+      })
+    );
+
    return order;
  }

@ -183,6 +199,13 @@ export class OrderService {
      where
    });

+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId: <string>where.userId
+      })
+    );
+
    return count;
  }

@ -198,22 +221,26 @@ export class OrderService {
  }

  public async getOrders({
+    endDate,
    filters,
    includeDrafts = false,
    skip,
    sortColumn,
    sortDirection,
+    startDate,
    take = Number.MAX_SAFE_INTEGER,
    types,
    userCurrency,
    userId,
    withExcludedAccounts = false
  }: {
+    endDate?: Date;
    filters?: Filter[];
    includeDrafts?: boolean;
    skip?: number;
    sortColumn?: string;
    sortDirection?: Prisma.SortOrder;
+    startDate?: Date;
    take?: number;
    types?: ActivityType[];
    userCurrency: string;
@ -225,6 +252,18 @@ export class OrderService {
    ];
    const where: Prisma.OrderWhereInput = { userId };

+    if (endDate || startDate) {
+      where.AND = [];
+
+      if (endDate) {
+        where.AND.push({ date: { lte: endDate } });
+      }
+
+      if (startDate) {
+        where.AND.push({ date: { gt: startDate } });
+      }
+    }
+
    const {
      ACCOUNT: filtersByAccount,
      ASSET_CLASS: filtersByAssetClass,
@ -320,7 +359,32 @@ export class OrderService {
      this.prismaService.order.count({ where })
    ]);

+    const uniqueAssets = uniqBy(
+      orders.map(({ SymbolProfile }) => {
+        return {
+          dataSource: SymbolProfile.dataSource,
+          symbol: SymbolProfile.symbol
+        };
+      }),
+      ({ dataSource, symbol }) => {
+        return getAssetProfileIdentifier({
+          dataSource,
+          symbol
+        });
+      }
+    );
+
+    const assetProfiles =
+      await this.symbolProfileService.getSymbolProfiles(uniqueAssets);
+
    const activities = orders.map((order) => {
+      const assetProfile = assetProfiles.find(({ dataSource, symbol }) => {
+        return (
+          dataSource === order.SymbolProfile.dataSource &&
+          symbol === order.SymbolProfile.symbol
+        );
+      });
+
      const value = new Big(order.quantity).mul(order.unitPrice).toNumber();

      return {
@ -332,6 +396,7 @@ export class OrderService {
          order.SymbolProfile.currency,
          userCurrency
        ),
+        SymbolProfile: assetProfile,
        // TODO: Use exchange rate of date
        valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
          value,
@ -388,19 +453,22 @@ export class OrderService {

      if (!isDraft) {
        // Gather symbol data of order in the background, if not draft
-        this.dataGatheringService.gatherSymbols([
-          {
-            dataSource: data.SymbolProfile.connect.dataSource_symbol.dataSource,
-            date: <Date>data.date,
-            symbol: data.SymbolProfile.connect.dataSource_symbol.symbol
-          }
-        ]);
+        this.dataGatheringService.gatherSymbols({
+          dataGatheringItems: [
+            {
+              dataSource:
+                data.SymbolProfile.connect.dataSource_symbol.dataSource,
+              date: <Date>data.date,
+              symbol: data.SymbolProfile.connect.dataSource_symbol.symbol
+            }
+          ],
+          priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
+        });
      }
    }

    delete data.assetClass;
    delete data.assetSubClass;
-    delete data.currency;
    delete data.dataSource;
    delete data.symbol;
    delete data.tags;
@ -411,7 +479,7 @@ export class OrderService {
      where
    });

-    return this.prismaService.order.update({
+    const order = await this.prismaService.order.update({
      data: {
        ...data,
        isDraft,
@ -423,6 +491,15 @@ export class OrderService {
      },
      where
    });
+
+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId: order.userId
+      })
+    );
+
+    return order;
  }

  private async orders(params: {
--- a/apps/api/src/app/order/update-order.dto.ts
+++ b/apps/api/src/app/order/update-order.dto.ts
@ -41,6 +41,10 @@ export class UpdateOrderDto {
  @IsISO4217CurrencyCode()
  currency: string;

+  @IsISO4217CurrencyCode()
+  @IsOptional()
+  customCurrency?: string;
+
  @IsString()
  dataSource: DataSource;

--- a/apps/api/src/app/platform/create-platform.dto.ts
+++ b/apps/api/src/app/platform/create-platform.dto.ts
@ -1,9 +1,12 @@
-import { IsString } from 'class-validator';
+import { IsString, IsUrl } from 'class-validator';

 export class CreatePlatformDto {
  @IsString()
  name: string;

-  @IsString()
+  @IsUrl({
+    protocols: ['https'],
+    require_protocol: true
+  })
  url: string;
 }
--- a/apps/api/src/app/platform/update-platform.dto.ts
+++ b/apps/api/src/app/platform/update-platform.dto.ts
@ -1,4 +1,4 @@
-import { IsString } from 'class-validator';
+import { IsString, IsUrl } from 'class-validator';

 export class UpdatePlatformDto {
  @IsString()
@ -7,6 +7,9 @@ export class UpdatePlatformDto {
  @IsString()
  name: string;

-  @IsString()
+  @IsUrl({
+    protocols: ['https'],
+    require_protocol: true
+  })
  url: string;
 }
--- a/apps/api/src/app/portfolio/calculator/mwr/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/mwr/portfolio-calculator.ts
@ -0,0 +1,33 @@
+import { PortfolioCalculator } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator';
+import { SymbolMetrics, UniqueAsset } from '@ghostfolio/common/interfaces';
+import { PortfolioSnapshot, TimelinePosition } from '@ghostfolio/common/models';
+
+export class MWRPortfolioCalculator extends PortfolioCalculator {
+  protected calculateOverallPerformance(
+    positions: TimelinePosition[]
+  ): PortfolioSnapshot {
+    throw new Error('Method not implemented.');
+  }
+
+  protected getSymbolMetrics({
+    dataSource,
+    end,
+    exchangeRates,
+    isChartMode = false,
+    marketSymbolMap,
+    start,
+    step = 1,
+    symbol
+  }: {
+    end: Date;
+    exchangeRates: { [dateString: string]: number };
+    isChartMode?: boolean;
+    marketSymbolMap: {
+      [date: string]: { [symbol: string]: Big };
+    };
+    start: Date;
+    step?: number;
+  } & UniqueAsset): SymbolMetrics {
+    throw new Error('Method not implemented.');
+  }
+}
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.ts
@ -0,0 +1,30 @@
+export const activityDummyData = {
+  accountId: undefined,
+  accountUserId: undefined,
+  comment: undefined,
+  createdAt: new Date(),
+  currency: undefined,
+  feeInBaseCurrency: undefined,
+  id: undefined,
+  isDraft: false,
+  symbolProfileId: undefined,
+  updatedAt: new Date(),
+  userId: undefined,
+  value: undefined,
+  valueInBaseCurrency: undefined
+};
+
+export const symbolProfileDummyData = {
+  activitiesCount: undefined,
+  assetClass: undefined,
+  assetSubClass: undefined,
+  countries: [],
+  createdAt: undefined,
+  id: undefined,
+  sectors: [],
+  updatedAt: undefined
+};
+
+export const userDummyData = {
+  id: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
+};
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.factory.ts
@ -0,0 +1,81 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { HistoricalDataItem } from '@ghostfolio/common/interfaces';
+import { DateRange, UserWithSettings } from '@ghostfolio/common/types';
+
+import { Injectable } from '@nestjs/common';
+
+import { MWRPortfolioCalculator } from './mwr/portfolio-calculator';
+import { PortfolioCalculator } from './portfolio-calculator';
+import { TWRPortfolioCalculator } from './twr/portfolio-calculator';
+
+export enum PerformanceCalculationType {
+  MWR = 'MWR', // Money-Weighted Rate of Return
+  TWR = 'TWR' // Time-Weighted Rate of Return
+}
+
+@Injectable()
+export class PortfolioCalculatorFactory {
+  public constructor(
+    private readonly configurationService: ConfigurationService,
+    private readonly currentRateService: CurrentRateService,
+    private readonly exchangeRateDataService: ExchangeRateDataService,
+    private readonly redisCacheService: RedisCacheService
+  ) {}
+
+  public createCalculator({
+    accountBalanceItems = [],
+    activities,
+    calculationType,
+    currency,
+    dateRange = 'max',
+    hasFilters,
+    isExperimentalFeatures = false,
+    userId
+  }: {
+    accountBalanceItems?: HistoricalDataItem[];
+    activities: Activity[];
+    calculationType: PerformanceCalculationType;
+    currency: string;
+    dateRange?: DateRange;
+    hasFilters: boolean;
+    isExperimentalFeatures?: boolean;
+    userId: string;
+  }): PortfolioCalculator {
+    const useCache = !hasFilters && isExperimentalFeatures;
+
+    switch (calculationType) {
+      case PerformanceCalculationType.MWR:
+        return new MWRPortfolioCalculator({
+          accountBalanceItems,
+          activities,
+          currency,
+          dateRange,
+          useCache,
+          userId,
+          configurationService: this.configurationService,
+          currentRateService: this.currentRateService,
+          exchangeRateDataService: this.exchangeRateDataService,
+          redisCacheService: this.redisCacheService
+        });
+      case PerformanceCalculationType.TWR:
+        return new TWRPortfolioCalculator({
+          accountBalanceItems,
+          activities,
+          currency,
+          currentRateService: this.currentRateService,
+          dateRange,
+          useCache,
+          userId,
+          configurationService: this.configurationService,
+          exchangeRateDataService: this.exchangeRateDataService,
+          redisCacheService: this.redisCacheService
+        });
+      default:
+        throw new Error('Invalid calculation type');
+    }
+  }
+}
--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts
@ -1,11 +1,22 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PortfolioCalculatorFactory,
+  PerformanceCalculationType
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { parseDate } from '@ghostfolio/common/helper';

-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { Big } from 'big.js';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -16,11 +27,25 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
  let currentRateService: CurrentRateService;
  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;

  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
    currentRateService = new CurrentRateService(null, null, null, null);

    exchangeRateDataService = new ExchangeRateDataService(
@ -29,62 +54,84 @@ describe('PortfolioCalculator', () => {
      null,
      null
    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
  });

  describe('get current positions', () => {
    it.only('with BALN.SW buy and sell in two activities', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        exchangeRateDataService,
-        currency: 'CHF',
-        orders: [
-          {
-            currency: 'CHF',
-            date: '2021-11-22',
-            dataSource: 'YAHOO',
-            fee: new Big(1.55),
-            name: 'Bâloise Holding AG',
-            quantity: new Big(2),
-            symbol: 'BALN.SW',
-            type: 'BUY',
-            unitPrice: new Big(142.9)
-          },
-          {
-            currency: 'CHF',
-            date: '2021-11-30',
-            dataSource: 'YAHOO',
-            fee: new Big(1.65),
-            name: 'Bâloise Holding AG',
-            quantity: new Big(1),
-            symbol: 'BALN.SW',
-            type: 'SELL',
-            unitPrice: new Big(136.6)
-          },
-          {
-            currency: 'CHF',
-            date: '2021-11-30',
-            dataSource: 'YAHOO',
-            fee: new Big(0),
-            name: 'Bâloise Holding AG',
-            quantity: new Big(1),
-            symbol: 'BALN.SW',
-            type: 'SELL',
-            unitPrice: new Big(136.6)
-          }
-        ]
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2021-12-18').getTime());

+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2021-11-22'),
+          fee: 1.55,
+          quantity: 2,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Bâloise Holding AG',
+            symbol: 'BALN.SW'
+          },
+          type: 'BUY',
+          unitPrice: 142.9
+        },
+        {
+          ...activityDummyData,
+          date: new Date('2021-11-30'),
+          fee: 1.65,
+          quantity: 1,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Bâloise Holding AG',
+            symbol: 'BALN.SW'
+          },
+          type: 'SELL',
+          unitPrice: 136.6
+        },
+        {
+          ...activityDummyData,
+          date: new Date('2021-11-30'),
+          fee: 0,
+          quantity: 1,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Bâloise Holding AG',
+            symbol: 'BALN.SW'
+          },
+          type: 'SELL',
+          unitPrice: 136.6
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'CHF',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
      const chartData = await portfolioCalculator.getChartData({
        start: parseDate('2021-11-22')
      });

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
        parseDate('2021-11-22')
      );

@ -97,7 +144,7 @@ describe('PortfolioCalculator', () => {

      spy.mockRestore();

-      expect(currentPositions).toEqual({
+      expect(portfolioSnapshot).toEqual({
        currentValueInBaseCurrency: new Big('0'),
        errors: [],
        grossPerformance: new Big('-12.6'),
@ -140,6 +187,7 @@ describe('PortfolioCalculator', () => {
            marketPriceInBaseCurrency: 148.9,
            quantity: new Big('0'),
            symbol: 'BALN.SW',
+            tags: [],
            timeWeightedInvestment: new Big('285.80000000000000396627'),
            timeWeightedInvestmentWithCurrencyEffect: new Big(
              '285.80000000000000396627'
@ -148,8 +196,12 @@ describe('PortfolioCalculator', () => {
            valueInBaseCurrency: new Big('0')
          }
        ],
+        totalFeesWithCurrencyEffect: new Big('3.2'),
+        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('0'),
-        totalInvestmentWithCurrencyEffect: new Big('0')
+        totalInvestmentWithCurrencyEffect: new Big('0'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy-and-sell.spec.ts
@ -1,11 +1,22 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PerformanceCalculationType,
+  PortfolioCalculatorFactory
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { parseDate } from '@ghostfolio/common/helper';

-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { Big } from 'big.js';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -16,11 +27,25 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
  let currentRateService: CurrentRateService;
  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;

  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
    currentRateService = new CurrentRateService(null, null, null, null);

    exchangeRateDataService = new ExchangeRateDataService(
@ -29,51 +54,69 @@ describe('PortfolioCalculator', () => {
      null,
      null
    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
  });

  describe('get current positions', () => {
    it.only('with BALN.SW buy and sell', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        exchangeRateDataService,
-        currency: 'CHF',
-        orders: [
-          {
-            currency: 'CHF',
-            date: '2021-11-22',
-            dataSource: 'YAHOO',
-            fee: new Big(1.55),
-            name: 'Bâloise Holding AG',
-            quantity: new Big(2),
-            symbol: 'BALN.SW',
-            type: 'BUY',
-            unitPrice: new Big(142.9)
-          },
-          {
-            currency: 'CHF',
-            date: '2021-11-30',
-            dataSource: 'YAHOO',
-            fee: new Big(1.65),
-            name: 'Bâloise Holding AG',
-            quantity: new Big(2),
-            symbol: 'BALN.SW',
-            type: 'SELL',
-            unitPrice: new Big(136.6)
-          }
-        ]
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2021-12-18').getTime());

+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2021-11-22'),
+          fee: 1.55,
+          quantity: 2,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Bâloise Holding AG',
+            symbol: 'BALN.SW'
+          },
+          type: 'BUY',
+          unitPrice: 142.9
+        },
+        {
+          ...activityDummyData,
+          date: new Date('2021-11-30'),
+          fee: 1.65,
+          quantity: 2,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Bâloise Holding AG',
+            symbol: 'BALN.SW'
+          },
+          type: 'SELL',
+          unitPrice: 136.6
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'CHF',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
      const chartData = await portfolioCalculator.getChartData({
        start: parseDate('2021-11-22')
      });

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
        parseDate('2021-11-22')
      );

@ -86,7 +129,7 @@ describe('PortfolioCalculator', () => {

      spy.mockRestore();

-      expect(currentPositions).toEqual({
+      expect(portfolioSnapshot).toEqual({
        currentValueInBaseCurrency: new Big('0'),
        errors: [],
        grossPerformance: new Big('-12.6'),
@ -129,14 +172,19 @@ describe('PortfolioCalculator', () => {
            marketPriceInBaseCurrency: 148.9,
            quantity: new Big('0'),
            symbol: 'BALN.SW',
+            tags: [],
            timeWeightedInvestment: new Big('285.8'),
            timeWeightedInvestmentWithCurrencyEffect: new Big('285.8'),
            transactionCount: 2,
            valueInBaseCurrency: new Big('0')
          }
        ],
+        totalFeesWithCurrencyEffect: new Big('3.2'),
+        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('0'),
-        totalInvestmentWithCurrencyEffect: new Big('0')
+        totalInvestmentWithCurrencyEffect: new Big('0'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-baln-buy.spec.ts
@ -1,11 +1,22 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PortfolioCalculatorFactory,
+  PerformanceCalculationType
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { parseDate } from '@ghostfolio/common/helper';

-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { Big } from 'big.js';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -16,11 +27,25 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
  let currentRateService: CurrentRateService;
  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;

  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
    currentRateService = new CurrentRateService(null, null, null, null);

    exchangeRateDataService = new ExchangeRateDataService(
@ -29,40 +54,54 @@ describe('PortfolioCalculator', () => {
      null,
      null
    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
  });

  describe('get current positions', () => {
    it.only('with BALN.SW buy', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        exchangeRateDataService,
-        currency: 'CHF',
-        orders: [
-          {
-            currency: 'CHF',
-            date: '2021-11-30',
-            dataSource: 'YAHOO',
-            fee: new Big(1.55),
-            name: 'Bâloise Holding AG',
-            quantity: new Big(2),
-            symbol: 'BALN.SW',
-            type: 'BUY',
-            unitPrice: new Big(136.6)
-          }
-        ]
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2021-12-18').getTime());

+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2021-11-30'),
+          fee: 1.55,
+          quantity: 2,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Bâloise Holding AG',
+            symbol: 'BALN.SW'
+          },
+          type: 'BUY',
+          unitPrice: 136.6
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'CHF',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
      const chartData = await portfolioCalculator.getChartData({
        start: parseDate('2021-11-30')
      });

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
        parseDate('2021-11-30')
      );

@ -75,7 +114,7 @@ describe('PortfolioCalculator', () => {

      spy.mockRestore();

-      expect(currentPositions).toEqual({
+      expect(portfolioSnapshot).toEqual({
        currentValueInBaseCurrency: new Big('297.8'),
        errors: [],
        grossPerformance: new Big('24.6'),
@ -118,14 +157,19 @@ describe('PortfolioCalculator', () => {
            marketPriceInBaseCurrency: 148.9,
            quantity: new Big('2'),
            symbol: 'BALN.SW',
+            tags: [],
            timeWeightedInvestment: new Big('273.2'),
            timeWeightedInvestmentWithCurrencyEffect: new Big('273.2'),
            transactionCount: 1,
            valueInBaseCurrency: new Big('297.8')
          }
        ],
+        totalFeesWithCurrencyEffect: new Big('1.55'),
+        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('273.2'),
-        totalInvestmentWithCurrencyEffect: new Big('273.2')
+        totalInvestmentWithCurrencyEffect: new Big('273.2'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts
@ -1,12 +1,23 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PortfolioCalculatorFactory,
+  PerformanceCalculationType
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';
 import { parseDate } from '@ghostfolio/common/helper';

-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { Big } from 'big.js';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -17,6 +28,15 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
 jest.mock(
  '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service',
  () => {
@ -30,10 +50,15 @@ jest.mock(
 );

 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
  let currentRateService: CurrentRateService;
  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;

  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
    currentRateService = new CurrentRateService(null, null, null, null);

    exchangeRateDataService = new ExchangeRateDataService(
@ -42,51 +67,69 @@ describe('PortfolioCalculator', () => {
      null,
      null
    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
  });

  describe('get current positions', () => {
    it.only('with BTCUSD buy and sell partially', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        exchangeRateDataService,
-        currency: 'CHF',
-        orders: [
-          {
-            currency: 'USD',
-            date: '2015-01-01',
-            dataSource: 'YAHOO',
-            fee: new Big(0),
-            name: 'Bitcoin USD',
-            quantity: new Big(2),
-            symbol: 'BTCUSD',
-            type: 'BUY',
-            unitPrice: new Big(320.43)
-          },
-          {
-            currency: 'USD',
-            date: '2017-12-31',
-            dataSource: 'YAHOO',
-            fee: new Big(0),
-            name: 'Bitcoin USD',
-            quantity: new Big(1),
-            symbol: 'BTCUSD',
-            type: 'SELL',
-            unitPrice: new Big(14156.4)
-          }
-        ]
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2018-01-01').getTime());

+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2015-01-01'),
+          fee: 0,
+          quantity: 2,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'USD',
+            dataSource: 'YAHOO',
+            name: 'Bitcoin USD',
+            symbol: 'BTCUSD'
+          },
+          type: 'BUY',
+          unitPrice: 320.43
+        },
+        {
+          ...activityDummyData,
+          date: new Date('2017-12-31'),
+          fee: 0,
+          quantity: 1,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'USD',
+            dataSource: 'YAHOO',
+            name: 'Bitcoin USD',
+            symbol: 'BTCUSD'
+          },
+          type: 'SELL',
+          unitPrice: 14156.4
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'CHF',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
      const chartData = await portfolioCalculator.getChartData({
        start: parseDate('2015-01-01')
      });

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
        parseDate('2015-01-01')
      );

@ -99,7 +142,7 @@ describe('PortfolioCalculator', () => {

      spy.mockRestore();

-      expect(currentPositions).toEqual({
+      expect(portfolioSnapshot).toEqual({
        currentValueInBaseCurrency: new Big('13298.425356'),
        errors: [],
        grossPerformance: new Big('27172.74'),
@ -146,7 +189,7 @@ describe('PortfolioCalculator', () => {
            ),
            quantity: new Big('1'),
            symbol: 'BTCUSD',
-            tags: undefined,
+            tags: [],
            timeWeightedInvestment: new Big('640.56763686131386861314'),
            timeWeightedInvestmentWithCurrencyEffect: new Big(
              '636.79469348020066587024'
@ -155,8 +198,12 @@ describe('PortfolioCalculator', () => {
            valueInBaseCurrency: new Big('13298.425356')
          }
        ],
+        totalFeesWithCurrencyEffect: new Big('0'),
+        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('320.43'),
-        totalInvestmentWithCurrencyEffect: new Big('318.542667299999967957')
+        totalInvestmentWithCurrencyEffect: new Big('318.542667299999967957'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-fee.spec.ts
@ -0,0 +1,157 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PortfolioCalculatorFactory,
+  PerformanceCalculationType
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { parseDate } from '@ghostfolio/common/helper';
+
+import { Big } from 'big.js';
+
+jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    CurrentRateService: jest.fn().mockImplementation(() => {
+      return CurrentRateServiceMock;
+    })
+  };
+});
+
+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
+describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
+  let currentRateService: CurrentRateService;
+  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;
+
+  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
+    currentRateService = new CurrentRateService(null, null, null, null);
+
+    exchangeRateDataService = new ExchangeRateDataService(
+      null,
+      null,
+      null,
+      null
+    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
+  });
+
+  describe('compute portfolio snapshot', () => {
+    it.only('with fee activity', async () => {
+      const spy = jest
+        .spyOn(Date, 'now')
+        .mockImplementation(() => parseDate('2021-12-18').getTime());
+
+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2021-09-01'),
+          fee: 49,
+          quantity: 0,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'USD',
+            dataSource: 'MANUAL',
+            name: 'Account Opening Fee',
+            symbol: '2c463fb3-af07-486e-adb0-8301b3d72141'
+          },
+          type: 'FEE',
+          unitPrice: 0
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'USD',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
+        parseDate('2021-11-30')
+      );
+
+      spy.mockRestore();
+
+      expect(portfolioSnapshot).toEqual({
+        currentValueInBaseCurrency: new Big('0'),
+        errors: [],
+        grossPerformance: new Big('0'),
+        grossPerformancePercentage: new Big('0'),
+        grossPerformancePercentageWithCurrencyEffect: new Big('0'),
+        grossPerformanceWithCurrencyEffect: new Big('0'),
+        hasErrors: true,
+        netPerformance: new Big('0'),
+        netPerformancePercentage: new Big('0'),
+        netPerformancePercentageWithCurrencyEffect: new Big('0'),
+        netPerformanceWithCurrencyEffect: new Big('0'),
+        positions: [
+          {
+            averagePrice: new Big('0'),
+            currency: 'USD',
+            dataSource: 'MANUAL',
+            dividend: new Big('0'),
+            dividendInBaseCurrency: new Big('0'),
+            fee: new Big('49'),
+            firstBuyDate: '2021-09-01',
+            grossPerformance: null,
+            grossPerformancePercentage: null,
+            grossPerformancePercentageWithCurrencyEffect: null,
+            grossPerformanceWithCurrencyEffect: null,
+            investment: new Big('0'),
+            investmentWithCurrencyEffect: new Big('0'),
+            marketPrice: null,
+            marketPriceInBaseCurrency: 0,
+            netPerformance: null,
+            netPerformancePercentage: null,
+            netPerformancePercentageWithCurrencyEffect: null,
+            netPerformanceWithCurrencyEffect: null,
+            quantity: new Big('0'),
+            symbol: '2c463fb3-af07-486e-adb0-8301b3d72141',
+            tags: [],
+            timeWeightedInvestment: new Big('0'),
+            timeWeightedInvestmentWithCurrencyEffect: new Big('0'),
+            transactionCount: 1,
+            valueInBaseCurrency: new Big('0')
+          }
+        ],
+        totalFeesWithCurrencyEffect: new Big('49'),
+        totalInterestWithCurrencyEffect: new Big('0'),
+        totalInvestment: new Big('0'),
+        totalInvestmentWithCurrencyEffect: new Big('0'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
+      });
+    });
+  });
+});
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-googl-buy.spec.ts
@ -1,12 +1,23 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PortfolioCalculatorFactory,
+  PerformanceCalculationType
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';
 import { parseDate } from '@ghostfolio/common/helper';

-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { Big } from 'big.js';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -17,6 +28,15 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
 jest.mock(
  '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service',
  () => {
@ -30,10 +50,15 @@ jest.mock(
 );

 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
  let currentRateService: CurrentRateService;
  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;

  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
    currentRateService = new CurrentRateService(null, null, null, null);

    exchangeRateDataService = new ExchangeRateDataService(
@ -42,40 +67,54 @@ describe('PortfolioCalculator', () => {
      null,
      null
    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
  });

  describe('get current positions', () => {
    it.only('with GOOGL buy', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        exchangeRateDataService,
-        currency: 'CHF',
-        orders: [
-          {
-            currency: 'USD',
-            date: '2023-01-03',
-            dataSource: 'YAHOO',
-            fee: new Big(1),
-            name: 'Alphabet Inc.',
-            quantity: new Big(1),
-            symbol: 'GOOGL',
-            type: 'BUY',
-            unitPrice: new Big(89.12)
-          }
-        ]
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2023-07-10').getTime());

+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2023-01-03'),
+          fee: 1,
+          quantity: 1,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'USD',
+            dataSource: 'YAHOO',
+            name: 'Alphabet Inc.',
+            symbol: 'GOOGL'
+          },
+          type: 'BUY',
+          unitPrice: 89.12
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'CHF',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
      const chartData = await portfolioCalculator.getChartData({
        start: parseDate('2023-01-03')
      });

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
        parseDate('2023-01-03')
      );

@ -88,7 +127,7 @@ describe('PortfolioCalculator', () => {

      spy.mockRestore();

-      expect(currentPositions).toEqual({
+      expect(portfolioSnapshot).toEqual({
        currentValueInBaseCurrency: new Big('103.10483'),
        errors: [],
        grossPerformance: new Big('27.33'),
@ -131,15 +170,19 @@ describe('PortfolioCalculator', () => {
            marketPriceInBaseCurrency: 103.10483,
            quantity: new Big('1'),
            symbol: 'GOOGL',
-            tags: undefined,
+            tags: [],
            timeWeightedInvestment: new Big('89.12'),
            timeWeightedInvestmentWithCurrencyEffect: new Big('82.329056'),
            transactionCount: 1,
            valueInBaseCurrency: new Big('103.10483')
          }
        ],
+        totalFeesWithCurrencyEffect: new Big('1'),
+        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('89.12'),
-        totalInvestmentWithCurrencyEffect: new Big('82.329056')
+        totalInvestmentWithCurrencyEffect: new Big('82.329056'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-item.spec.ts
@ -0,0 +1,157 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PortfolioCalculatorFactory,
+  PerformanceCalculationType
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { parseDate } from '@ghostfolio/common/helper';
+
+import { Big } from 'big.js';
+
+jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    CurrentRateService: jest.fn().mockImplementation(() => {
+      return CurrentRateServiceMock;
+    })
+  };
+});
+
+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
+describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
+  let currentRateService: CurrentRateService;
+  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;
+
+  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
+    currentRateService = new CurrentRateService(null, null, null, null);
+
+    exchangeRateDataService = new ExchangeRateDataService(
+      null,
+      null,
+      null,
+      null
+    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
+  });
+
+  describe('compute portfolio snapshot', () => {
+    it.only('with item activity', async () => {
+      const spy = jest
+        .spyOn(Date, 'now')
+        .mockImplementation(() => parseDate('2022-01-31').getTime());
+
+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2022-01-01'),
+          fee: 0,
+          quantity: 1,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'USD',
+            dataSource: 'MANUAL',
+            name: 'Penthouse Apartment',
+            symbol: 'dac95060-d4f2-4653-a253-2c45e6fb5cde'
+          },
+          type: 'ITEM',
+          unitPrice: 500000
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'USD',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
+        parseDate('2022-01-01')
+      );
+
+      spy.mockRestore();
+
+      expect(portfolioSnapshot).toEqual({
+        currentValueInBaseCurrency: new Big('0'),
+        errors: [],
+        grossPerformance: new Big('0'),
+        grossPerformancePercentage: new Big('0'),
+        grossPerformancePercentageWithCurrencyEffect: new Big('0'),
+        grossPerformanceWithCurrencyEffect: new Big('0'),
+        hasErrors: true,
+        netPerformance: new Big('0'),
+        netPerformancePercentage: new Big('0'),
+        netPerformancePercentageWithCurrencyEffect: new Big('0'),
+        netPerformanceWithCurrencyEffect: new Big('0'),
+        positions: [
+          {
+            averagePrice: new Big('500000'),
+            currency: 'USD',
+            dataSource: 'MANUAL',
+            dividend: new Big('0'),
+            dividendInBaseCurrency: new Big('0'),
+            fee: new Big('0'),
+            firstBuyDate: '2022-01-01',
+            grossPerformance: null,
+            grossPerformancePercentage: null,
+            grossPerformancePercentageWithCurrencyEffect: null,
+            grossPerformanceWithCurrencyEffect: null,
+            investment: new Big('0'),
+            investmentWithCurrencyEffect: new Big('0'),
+            marketPrice: null,
+            marketPriceInBaseCurrency: 500000,
+            netPerformance: null,
+            netPerformancePercentage: null,
+            netPerformancePercentageWithCurrencyEffect: null,
+            netPerformanceWithCurrencyEffect: null,
+            quantity: new Big('0'),
+            symbol: 'dac95060-d4f2-4653-a253-2c45e6fb5cde',
+            tags: [],
+            timeWeightedInvestment: new Big('0'),
+            timeWeightedInvestmentWithCurrencyEffect: new Big('0'),
+            transactionCount: 1,
+            valueInBaseCurrency: new Big('0')
+          }
+        ],
+        totalFeesWithCurrencyEffect: new Big('0'),
+        totalInterestWithCurrencyEffect: new Big('0'),
+        totalInvestment: new Big('0'),
+        totalInvestmentWithCurrencyEffect: new Big('0'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
+      });
+    });
+  });
+});
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-liability.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-liability.spec.ts
@ -0,0 +1,108 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PortfolioCalculatorFactory,
+  PerformanceCalculationType
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { parseDate } from '@ghostfolio/common/helper';
+
+import { Big } from 'big.js';
+
+jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    CurrentRateService: jest.fn().mockImplementation(() => {
+      return CurrentRateServiceMock;
+    })
+  };
+});
+
+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
+describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
+  let currentRateService: CurrentRateService;
+  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;
+
+  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
+    currentRateService = new CurrentRateService(null, null, null, null);
+
+    exchangeRateDataService = new ExchangeRateDataService(
+      null,
+      null,
+      null,
+      null
+    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
+  });
+
+  describe('compute portfolio snapshot', () => {
+    it.only('with liability activity', async () => {
+      const spy = jest
+        .spyOn(Date, 'now')
+        .mockImplementation(() => parseDate('2022-01-31').getTime());
+
+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2023-01-01'), // Date in future
+          fee: 0,
+          quantity: 1,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'USD',
+            dataSource: 'MANUAL',
+            name: 'Loan',
+            symbol: '55196015-1365-4560-aa60-8751ae6d18f8'
+          },
+          type: 'LIABILITY',
+          unitPrice: 3000
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'USD',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
+      spy.mockRestore();
+
+      const liabilitiesInBaseCurrency =
+        await portfolioCalculator.getLiabilitiesInBaseCurrency();
+
+      expect(liabilitiesInBaseCurrency).toEqual(new Big(3000));
+    });
+  });
+});
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-msft-buy-with-dividend.spec.ts
@ -0,0 +1,165 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PerformanceCalculationType,
+  PortfolioCalculatorFactory
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';
+import { parseDate } from '@ghostfolio/common/helper';
+
+import { Big } from 'big.js';
+
+jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    CurrentRateService: jest.fn().mockImplementation(() => {
+      return CurrentRateServiceMock;
+    })
+  };
+});
+
+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
+jest.mock(
+  '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service',
+  () => {
+    return {
+      // eslint-disable-next-line @typescript-eslint/naming-convention
+      ExchangeRateDataService: jest.fn().mockImplementation(() => {
+        return ExchangeRateDataServiceMock;
+      })
+    };
+  }
+);
+
+describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
+  let currentRateService: CurrentRateService;
+  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;
+
+  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
+    currentRateService = new CurrentRateService(null, null, null, null);
+
+    exchangeRateDataService = new ExchangeRateDataService(
+      null,
+      null,
+      null,
+      null
+    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
+  });
+
+  describe('get current positions', () => {
+    it.only('with MSFT buy', async () => {
+      const spy = jest
+        .spyOn(Date, 'now')
+        .mockImplementation(() => parseDate('2023-07-10').getTime());
+
+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2021-09-16'),
+          fee: 19,
+          quantity: 1,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'USD',
+            dataSource: 'YAHOO',
+            name: 'Microsoft Inc.',
+            symbol: 'MSFT'
+          },
+          type: 'BUY',
+          unitPrice: 298.58
+        },
+        {
+          ...activityDummyData,
+          date: new Date('2021-11-16'),
+          fee: 0,
+          quantity: 1,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'USD',
+            dataSource: 'YAHOO',
+            name: 'Microsoft Inc.',
+            symbol: 'MSFT'
+          },
+          type: 'DIVIDEND',
+          unitPrice: 0.62
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'USD',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
+        parseDate('2023-07-10')
+      );
+
+      spy.mockRestore();
+
+      expect(portfolioSnapshot).toMatchObject({
+        errors: [],
+        hasErrors: false,
+        positions: [
+          {
+            averagePrice: new Big('298.58'),
+            currency: 'USD',
+            dataSource: 'YAHOO',
+            dividend: new Big('0.62'),
+            dividendInBaseCurrency: new Big('0.62'),
+            fee: new Big('19'),
+            firstBuyDate: '2021-09-16',
+            investment: new Big('298.58'),
+            investmentWithCurrencyEffect: new Big('298.58'),
+            marketPrice: 331.83,
+            marketPriceInBaseCurrency: 331.83,
+            quantity: new Big('1'),
+            symbol: 'MSFT',
+            tags: [],
+            transactionCount: 2
+          }
+        ],
+        totalFeesWithCurrencyEffect: new Big('19'),
+        totalInterestWithCurrencyEffect: new Big('0'),
+        totalInvestment: new Big('298.58'),
+        totalInvestmentWithCurrencyEffect: new Big('298.58'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
+      });
+    });
+  });
+});
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts
@ -0,0 +1,124 @@
+import { userDummyData } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PerformanceCalculationType,
+  PortfolioCalculatorFactory
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { parseDate } from '@ghostfolio/common/helper';
+
+import { Big } from 'big.js';
+import { subDays } from 'date-fns';
+
+jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    CurrentRateService: jest.fn().mockImplementation(() => {
+      return CurrentRateServiceMock;
+    })
+  };
+});
+
+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
+describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
+  let currentRateService: CurrentRateService;
+  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;
+
+  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
+    currentRateService = new CurrentRateService(null, null, null, null);
+
+    exchangeRateDataService = new ExchangeRateDataService(
+      null,
+      null,
+      null,
+      null
+    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
+  });
+
+  describe('get current positions', () => {
+    it('with no orders', async () => {
+      const spy = jest
+        .spyOn(Date, 'now')
+        .mockImplementation(() => parseDate('2021-12-18').getTime());
+
+      const portfolioCalculator = factory.createCalculator({
+        activities: [],
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'CHF',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
+      const start = subDays(new Date(Date.now()), 10);
+
+      const chartData = await portfolioCalculator.getChartData({ start });
+
+      const portfolioSnapshot =
+        await portfolioCalculator.computeSnapshot(start);
+
+      const investments = portfolioCalculator.getInvestments();
+
+      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
+        data: chartData,
+        groupBy: 'month'
+      });
+
+      spy.mockRestore();
+
+      expect(portfolioSnapshot).toEqual({
+        currentValueInBaseCurrency: new Big(0),
+        grossPerformance: new Big(0),
+        grossPerformancePercentage: new Big(0),
+        grossPerformancePercentageWithCurrencyEffect: new Big(0),
+        grossPerformanceWithCurrencyEffect: new Big(0),
+        hasErrors: false,
+        netPerformance: new Big(0),
+        netPerformancePercentage: new Big(0),
+        netPerformancePercentageWithCurrencyEffect: new Big(0),
+        netPerformanceWithCurrencyEffect: new Big(0),
+        positions: [],
+        totalFeesWithCurrencyEffect: new Big('0'),
+        totalInterestWithCurrencyEffect: new Big('0'),
+        totalInvestment: new Big(0),
+        totalInvestmentWithCurrencyEffect: new Big(0),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
+      });
+
+      expect(investments).toEqual([]);
+
+      expect(investmentsByMonth).toEqual([
+        {
+          date: '2021-12-01',
+          investment: 0
+        }
+      ]);
+    });
+  });
+});
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell-partially.spec.ts
@ -1,11 +1,22 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PerformanceCalculationType,
+  PortfolioCalculatorFactory
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { parseDate } from '@ghostfolio/common/helper';

-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { Big } from 'big.js';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -16,11 +27,25 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
  let currentRateService: CurrentRateService;
  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;

  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
    currentRateService = new CurrentRateService(null, null, null, null);

    exchangeRateDataService = new ExchangeRateDataService(
@ -29,51 +54,69 @@ describe('PortfolioCalculator', () => {
      null,
      null
    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
  });

  describe('get current positions', () => {
    it.only('with NOVN.SW buy and sell partially', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        exchangeRateDataService,
-        currency: 'CHF',
-        orders: [
-          {
-            currency: 'CHF',
-            date: '2022-03-07',
-            dataSource: 'YAHOO',
-            fee: new Big(1.3),
-            name: 'Novartis AG',
-            quantity: new Big(2),
-            symbol: 'NOVN.SW',
-            type: 'BUY',
-            unitPrice: new Big(75.8)
-          },
-          {
-            currency: 'CHF',
-            date: '2022-04-08',
-            dataSource: 'YAHOO',
-            fee: new Big(2.95),
-            name: 'Novartis AG',
-            quantity: new Big(1),
-            symbol: 'NOVN.SW',
-            type: 'SELL',
-            unitPrice: new Big(85.73)
-          }
-        ]
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2022-04-11').getTime());

+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2022-03-07'),
+          fee: 1.3,
+          quantity: 2,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Novartis AG',
+            symbol: 'NOVN.SW'
+          },
+          type: 'BUY',
+          unitPrice: 75.8
+        },
+        {
+          ...activityDummyData,
+          date: new Date('2022-04-08'),
+          fee: 2.95,
+          quantity: 1,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Novartis AG',
+            symbol: 'NOVN.SW'
+          },
+          type: 'SELL',
+          unitPrice: 85.73
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'CHF',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
      const chartData = await portfolioCalculator.getChartData({
        start: parseDate('2022-03-07')
      });

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
        parseDate('2022-03-07')
      );

@ -86,7 +129,7 @@ describe('PortfolioCalculator', () => {

      spy.mockRestore();

-      expect(currentPositions).toEqual({
+      expect(portfolioSnapshot).toEqual({
        currentValueInBaseCurrency: new Big('87.8'),
        errors: [],
        grossPerformance: new Big('21.93'),
@ -129,6 +172,7 @@ describe('PortfolioCalculator', () => {
            marketPriceInBaseCurrency: 87.8,
            quantity: new Big('1'),
            symbol: 'NOVN.SW',
+            tags: [],
            timeWeightedInvestment: new Big('145.10285714285714285714'),
            timeWeightedInvestmentWithCurrencyEffect: new Big(
              '145.10285714285714285714'
@ -137,8 +181,12 @@ describe('PortfolioCalculator', () => {
            valueInBaseCurrency: new Big('87.8')
          }
        ],
+        totalFeesWithCurrencyEffect: new Big('4.25'),
+        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('75.80'),
-        totalInvestmentWithCurrencyEffect: new Big('75.80')
+        totalInvestmentWithCurrencyEffect: new Big('75.80'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-novn-buy-and-sell.spec.ts
@ -1,11 +1,22 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  activityDummyData,
+  symbolProfileDummyData,
+  userDummyData
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
+import {
+  PerformanceCalculationType,
+  PortfolioCalculatorFactory
+} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
 import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { RedisCacheServiceMock } from '@ghostfolio/api/app/redis-cache/redis-cache.service.mock';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { parseDate } from '@ghostfolio/common/helper';

-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
+import { Big } from 'big.js';

 jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  return {
@ -16,11 +27,25 @@ jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
  };
 });

+jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
+  return {
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    RedisCacheService: jest.fn().mockImplementation(() => {
+      return RedisCacheServiceMock;
+    })
+  };
+});
+
 describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
  let currentRateService: CurrentRateService;
  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;

  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
    currentRateService = new CurrentRateService(null, null, null, null);

    exchangeRateDataService = new ExchangeRateDataService(
@ -29,51 +54,69 @@ describe('PortfolioCalculator', () => {
      null,
      null
    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
  });

  describe('get current positions', () => {
    it.only('with NOVN.SW buy and sell', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        exchangeRateDataService,
-        currency: 'CHF',
-        orders: [
-          {
-            currency: 'CHF',
-            date: '2022-03-07',
-            dataSource: 'YAHOO',
-            fee: new Big(0),
-            name: 'Novartis AG',
-            quantity: new Big(2),
-            symbol: 'NOVN.SW',
-            type: 'BUY',
-            unitPrice: new Big(75.8)
-          },
-          {
-            currency: 'CHF',
-            date: '2022-04-08',
-            dataSource: 'YAHOO',
-            fee: new Big(0),
-            name: 'Novartis AG',
-            quantity: new Big(2),
-            symbol: 'NOVN.SW',
-            type: 'SELL',
-            unitPrice: new Big(85.73)
-          }
-        ]
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
      const spy = jest
        .spyOn(Date, 'now')
        .mockImplementation(() => parseDate('2022-04-11').getTime());

+      const activities: Activity[] = [
+        {
+          ...activityDummyData,
+          date: new Date('2022-03-07'),
+          fee: 0,
+          quantity: 2,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Novartis AG',
+            symbol: 'NOVN.SW'
+          },
+          type: 'BUY',
+          unitPrice: 75.8
+        },
+        {
+          ...activityDummyData,
+          date: new Date('2022-04-08'),
+          fee: 0,
+          quantity: 2,
+          SymbolProfile: {
+            ...symbolProfileDummyData,
+            currency: 'CHF',
+            dataSource: 'YAHOO',
+            name: 'Novartis AG',
+            symbol: 'NOVN.SW'
+          },
+          type: 'SELL',
+          unitPrice: 85.73
+        }
+      ];
+
+      const portfolioCalculator = factory.createCalculator({
+        activities,
+        calculationType: PerformanceCalculationType.TWR,
+        currency: 'CHF',
+        hasFilters: false,
+        userId: userDummyData.id
+      });
+
      const chartData = await portfolioCalculator.getChartData({
        start: parseDate('2022-03-07')
      });

-      const currentPositions = await portfolioCalculator.getCurrentPositions(
+      const portfolioSnapshot = await portfolioCalculator.computeSnapshot(
        parseDate('2022-03-07')
      );

@ -93,6 +136,8 @@ describe('PortfolioCalculator', () => {
        netPerformanceInPercentage: 0,
        netPerformanceInPercentageWithCurrencyEffect: 0,
        netPerformanceWithCurrencyEffect: 0,
+        netWorth: 151.6,
+        totalAccountBalance: 0,
        totalInvestment: 151.6,
        totalInvestmentValueWithCurrencyEffect: 151.6,
        value: 151.6,
@ -106,13 +151,15 @@ describe('PortfolioCalculator', () => {
        netPerformanceInPercentage: 13.100263852242744,
        netPerformanceInPercentageWithCurrencyEffect: 13.100263852242744,
        netPerformanceWithCurrencyEffect: 19.86,
+        netWorth: 0,
+        totalAccountBalance: 0,
        totalInvestment: 0,
        totalInvestmentValueWithCurrencyEffect: 0,
        value: 0,
        valueWithCurrencyEffect: 0
      });

-      expect(currentPositions).toEqual({
+      expect(portfolioSnapshot).toEqual({
        currentValueInBaseCurrency: new Big('0'),
        errors: [],
        grossPerformance: new Big('19.86'),
@ -155,14 +202,19 @@ describe('PortfolioCalculator', () => {
            marketPriceInBaseCurrency: 87.8,
            quantity: new Big('0'),
            symbol: 'NOVN.SW',
+            tags: [],
            timeWeightedInvestment: new Big('151.6'),
            timeWeightedInvestmentWithCurrencyEffect: new Big('151.6'),
            transactionCount: 2,
            valueInBaseCurrency: new Big('0')
          }
        ],
+        totalFeesWithCurrencyEffect: new Big('0'),
+        totalInterestWithCurrencyEffect: new Big('0'),
        totalInvestment: new Big('0'),
-        totalInvestmentWithCurrencyEffect: new Big('0')
+        totalInvestmentWithCurrencyEffect: new Big('0'),
+        totalLiabilitiesWithCurrencyEffect: new Big('0'),
+        totalValuablesWithCurrencyEffect: new Big('0')
      });

      expect(investments).toEqual([
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.spec.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.spec.ts
@ -0,0 +1,37 @@
+import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+
+describe('PortfolioCalculator', () => {
+  let configurationService: ConfigurationService;
+  let currentRateService: CurrentRateService;
+  let exchangeRateDataService: ExchangeRateDataService;
+  let factory: PortfolioCalculatorFactory;
+  let redisCacheService: RedisCacheService;
+
+  beforeEach(() => {
+    configurationService = new ConfigurationService();
+
+    currentRateService = new CurrentRateService(null, null, null, null);
+
+    exchangeRateDataService = new ExchangeRateDataService(
+      null,
+      null,
+      null,
+      null
+    );
+
+    redisCacheService = new RedisCacheService(null, null);
+
+    factory = new PortfolioCalculatorFactory(
+      configurationService,
+      currentRateService,
+      exchangeRateDataService,
+      redisCacheService
+    );
+  });
+
+  test.skip('Skip empty test', () => 1);
+});
--- a/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts
--- a/apps/api/src/app/portfolio/current-rate.service.mock.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.mock.ts
@ -8,6 +8,13 @@ import { GetValuesParams } from './interfaces/get-values-params.interface';

 function mockGetValue(symbol: string, date: Date) {
  switch (symbol) {
+    case '55196015-1365-4560-aa60-8751ae6d18f8':
+      if (isSameDay(parseDate('2022-01-31'), date)) {
+        return { marketPrice: 3000 };
+      }
+
+      return { marketPrice: 0 };
+
    case 'BALN.SW':
      if (isSameDay(parseDate('2021-11-12'), date)) {
        return { marketPrice: 146 };
--- a/apps/api/src/app/portfolio/current-rate.service.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.ts
@ -34,7 +34,7 @@ export class CurrentRateService {
  }: GetValuesParams): Promise<GetValuesObject> {
    const dataProviderInfos: DataProviderInfo[] = [];

-    const includeToday =
+    const includesToday =
      (!dateQuery.lt || isBefore(new Date(), dateQuery.lt)) &&
      (!dateQuery.gte || isBefore(dateQuery.gte, new Date())) &&
      (!dateQuery.in || this.containsToday(dateQuery.in));
@ -43,7 +43,7 @@ export class CurrentRateService {
    const quoteErrors: ResponseError['errors'] = [];
    const today = resetHours(new Date());

-    if (includeToday) {
+    if (includesToday) {
      promises.push(
        this.dataProviderService
          .getQuotes({ items: dataGatheringItems, user: this.request?.user })
--- a/apps/api/src/app/portfolio/interfaces/current-positions.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/current-positions.interface.ts
@ -1,19 +0,0 @@
-import { ResponseError, TimelinePosition } from '@ghostfolio/common/interfaces';
-
-import Big from 'big.js';
-
-export interface CurrentPositions extends ResponseError {
-  currentValueInBaseCurrency: Big;
-  grossPerformance: Big;
-  grossPerformanceWithCurrencyEffect: Big;
-  grossPerformancePercentage: Big;
-  grossPerformancePercentageWithCurrencyEffect: Big;
-  netAnnualizedPerformance?: Big;
-  netAnnualizedPerformanceWithCurrencyEffect?: Big;
-  netPerformance: Big;
-  netPerformanceWithCurrencyEffect: Big;
-  netPerformancePercentage: Big;
-  netPerformancePercentageWithCurrencyEffect: Big;
-  positions: TimelinePosition[];
-  totalInvestment: Big;
-}
--- a/apps/api/src/app/portfolio/interfaces/portfolio-order-item.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/portfolio-order-item.interface.ts
@ -1,4 +1,4 @@
-import Big from 'big.js';
+import { Big } from 'big.js';

 import { PortfolioOrder } from './portfolio-order.interface';

--- a/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts
@ -1,15 +1,12 @@
-import { DataSource, Tag, Type as ActivityType } from '@prisma/client';
-import Big from 'big.js';
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';

-export interface PortfolioOrder {
-  currency: string;
+export interface PortfolioOrder extends Pick<Activity, 'tags' | 'type'> {
  date: string;
-  dataSource: DataSource;
  fee: Big;
-  name: string;
  quantity: Big;
-  symbol: string;
-  tags?: Tag[];
-  type: ActivityType;
+  SymbolProfile: Pick<
+    Activity['SymbolProfile'],
+    'currency' | 'dataSource' | 'name' | 'symbol'
+  >;
  unitPrice: Big;
 }
--- a/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts
@ -1,9 +1,9 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
  DataProviderInfo,
  EnhancedSymbolProfile,
  HistoricalDataItem
 } from '@ghostfolio/common/interfaces';
-import { OrderWithAccount } from '@ghostfolio/common/types';

 import { Account, Tag } from '@prisma/client';

@ -12,6 +12,8 @@ export interface PortfolioPositionDetail {
  averagePrice: number;
  dataProviderInfo: DataProviderInfo;
  dividendInBaseCurrency: number;
+  dividendYieldPercent: number;
+  dividendYieldPercentWithCurrencyEffect: number;
  feeInBaseCurrency: number;
  firstBuyDate: string;
  grossPerformance: number;
@ -27,16 +29,10 @@ export interface PortfolioPositionDetail {
  netPerformancePercent: number;
  netPerformancePercentWithCurrencyEffect: number;
  netPerformanceWithCurrencyEffect: number;
-  orders: OrderWithAccount[];
+  orders: Activity[];
  quantity: number;
  SymbolProfile: EnhancedSymbolProfile;
  tags: Tag[];
  transactionCount: number;
  value: number;
 }
-
-export interface HistoricalDataContainer {
-  isAllTimeHigh: boolean;
-  isAllTimeLow: boolean;
-  items: HistoricalDataItem[];
-}
--- a/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts
@ -1,5 +1,5 @@
 import { DataSource, Tag } from '@prisma/client';
-import Big from 'big.js';
+import { Big } from 'big.js';

 export interface TransactionPointSymbol {
  averagePrice: Big;
--- a/apps/api/src/app/portfolio/interfaces/transaction-point.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/transaction-point.interface.ts
@ -1,6 +1,12 @@
+import { Big } from 'big.js';
+
 import { TransactionPointSymbol } from './transaction-point-symbol.interface';

 export interface TransactionPoint {
  date: string;
+  fees: Big;
+  interest: Big;
  items: TransactionPointSymbol[];
+  liabilities: Big;
+  valuables: Big;
 }
--- a/apps/api/src/app/portfolio/portfolio-calculator-msft-buy-with-dividend.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-msft-buy-with-dividend.spec.ts
@ -1,118 +0,0 @@
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-jest.mock(
-  '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service',
-  () => {
-    return {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      ExchangeRateDataService: jest.fn().mockImplementation(() => {
-        return ExchangeRateDataServiceMock;
-      })
-    };
-  }
-);
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-  });
-
-  describe('get current positions', () => {
-    it.only('with MSFT buy', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        exchangeRateDataService,
-        currency: 'USD',
-        orders: [
-          {
-            currency: 'USD',
-            date: '2021-09-16',
-            dataSource: 'YAHOO',
-            fee: new Big(19),
-            name: 'Microsoft Inc.',
-            quantity: new Big(1),
-            symbol: 'MSFT',
-            type: 'BUY',
-            unitPrice: new Big(298.58)
-          },
-          {
-            currency: 'USD',
-            date: '2021-11-16',
-            dataSource: 'YAHOO',
-            fee: new Big(0),
-            name: 'Microsoft Inc.',
-            quantity: new Big(1),
-            symbol: 'MSFT',
-            type: 'DIVIDEND',
-            unitPrice: new Big(0.62)
-          }
-        ]
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2023-07-10').getTime());
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2023-07-10')
-      );
-
-      spy.mockRestore();
-
-      expect(currentPositions).toMatchObject({
-        errors: [],
-        hasErrors: false,
-        positions: [
-          {
-            averagePrice: new Big('298.58'),
-            currency: 'USD',
-            dataSource: 'YAHOO',
-            dividend: new Big('0.62'),
-            dividendInBaseCurrency: new Big('0.62'),
-            fee: new Big('19'),
-            firstBuyDate: '2021-09-16',
-            investment: new Big('298.58'),
-            investmentWithCurrencyEffect: new Big('298.58'),
-            marketPrice: 331.83,
-            marketPriceInBaseCurrency: 331.83,
-            quantity: new Big('1'),
-            symbol: 'MSFT',
-            tags: undefined,
-            transactionCount: 2
-          }
-        ],
-        totalInvestment: new Big('298.58'),
-        totalInvestmentWithCurrencyEffect: new Big('298.58')
-      });
-    });
-  });
-});
--- a/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator-no-orders.spec.ts
@ -1,86 +0,0 @@
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import Big from 'big.js';
-
-import { CurrentRateServiceMock } from './current-rate.service.mock';
-import { PortfolioCalculator } from './portfolio-calculator';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-  });
-
-  describe('get current positions', () => {
-    it('with no orders', async () => {
-      const portfolioCalculator = new PortfolioCalculator({
-        currentRateService,
-        exchangeRateDataService,
-        currency: 'CHF',
-        orders: []
-      });
-
-      portfolioCalculator.computeTransactionPoints();
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2021-12-18').getTime());
-
-      const chartData = await portfolioCalculator.getChartData({
-        start: new Date()
-      });
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        new Date()
-      );
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
-        data: chartData,
-        groupBy: 'month'
-      });
-
-      spy.mockRestore();
-
-      expect(currentPositions).toEqual({
-        currentValueInBaseCurrency: new Big(0),
-        grossPerformance: new Big(0),
-        grossPerformancePercentage: new Big(0),
-        grossPerformancePercentageWithCurrencyEffect: new Big(0),
-        grossPerformanceWithCurrencyEffect: new Big(0),
-        hasErrors: false,
-        netPerformance: new Big(0),
-        netPerformancePercentage: new Big(0),
-        netPerformancePercentageWithCurrencyEffect: new Big(0),
-        netPerformanceWithCurrencyEffect: new Big(0),
-        positions: [],
-        totalInvestment: new Big(0)
-      });
-
-      expect(investments).toEqual([]);
-
-      expect(investmentsByMonth).toEqual([]);
-    });
-  });
-});
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@ -6,6 +6,7 @@ import {
  hasNotDefinedValuesInObject,
  nullifyValuesInObject
 } from '@ghostfolio/api/helper/object.helper';
+import { getInterval } from '@ghostfolio/api/helper/portfolio.helper';
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
@ -46,7 +47,8 @@ import {
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
-import Big from 'big.js';
+import { AssetClass, AssetSubClass } from '@prisma/client';
+import { Big } from 'big.js';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';

 import { PortfolioPositionDetail } from './interfaces/portfolio-position-detail.interface';
@ -77,9 +79,9 @@ export class PortfolioController {
    @Query('assetClasses') filterByAssetClasses?: string,
    @Query('range') dateRange: DateRange = 'max',
    @Query('tags') filterByTags?: string,
-    @Query('withLiabilities') withLiabilitiesParam = 'false'
+    @Query('withMarkets') withMarketsParam = 'false'
  ): Promise<PortfolioDetails & { hasError: boolean }> {
-    const withLiabilities = withLiabilitiesParam === 'true';
+    const withMarkets = withMarketsParam === 'true';

    let hasDetails = true;
    let hasError = false;
@ -104,7 +106,7 @@ export class PortfolioController {
        dateRange,
        filters,
        impersonationId,
-        withLiabilities,
+        withMarkets,
        userId: this.request.user.id,
        withSummary: true
      });
@ -127,14 +129,19 @@ export class PortfolioController {

      const totalValue = Object.values(holdings)
        .filter(({ assetClass, assetSubClass }) => {
-          return assetClass !== 'CASH' && assetSubClass !== 'CASH';
+          return (
+            assetClass !== AssetClass.LIQUIDITY &&
+            assetSubClass !== AssetSubClass.CASH
+          );
        })
        .map(({ valueInBaseCurrency }) => {
          return valueInBaseCurrency;
        })
-        .reduce((a, b) => a + b, 0);
+        .reduce((a, b) => {
+          return a + b;
+        }, 0);

-      for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
+      for (const [, portfolioPosition] of Object.entries(holdings)) {
        portfolioPosition.investment =
          portfolioPosition.investment / totalInvestment;
        portfolioPosition.valueInPercentage =
@ -184,11 +191,11 @@ export class PortfolioController {
      holdings[symbol] = {
        ...portfolioPosition,
        assetClass:
-          hasDetails || portfolioPosition.assetClass === 'CASH'
+          hasDetails || portfolioPosition.assetClass === AssetClass.LIQUIDITY
            ? portfolioPosition.assetClass
            : undefined,
        assetSubClass:
-          hasDetails || portfolioPosition.assetSubClass === 'CASH'
+          hasDetails || portfolioPosition.assetSubClass === AssetSubClass.CASH
            ? portfolioPosition.assetSubClass
            : undefined,
        countries: hasDetails ? portfolioPosition.countries : [],
@ -236,8 +243,12 @@ export class PortfolioController {
      await this.impersonationService.validateImpersonationId(impersonationId);
    const userCurrency = this.request.user.Settings.settings.baseCurrency;

+    const { endDate, startDate } = getInterval(dateRange);
+
    const { activities } = await this.orderService.getOrders({
+      endDate,
      filters,
+      startDate,
      userCurrency,
      userId: impersonationUserId || this.request.user.id,
      types: ['DIVIDEND']
@ -245,7 +256,6 @@ export class PortfolioController {

    let dividends = await this.portfolioService.getDividends({
      activities,
-      dateRange,
      groupBy
    });

@ -284,17 +294,21 @@ export class PortfolioController {
    @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId: string,
    @Query('accounts') filterByAccounts?: string,
    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('holdingType') filterByHoldingType?: string,
    @Query('query') filterBySearchQuery?: string,
+    @Query('range') dateRange: DateRange = 'max',
    @Query('tags') filterByTags?: string
  ): Promise<PortfolioHoldingsResponse> {
    const filters = this.apiService.buildFiltersFromQueryParams({
      filterByAccounts,
      filterByAssetClasses,
+      filterByHoldingType,
      filterBySearchQuery,
      filterByTags
    });

    const { holdings } = await this.portfolioService.getDetails({
+      dateRange,
      filters,
      impersonationId,
      userId: this.request.user.id
@ -380,11 +394,9 @@ export class PortfolioController {
    @Query('assetClasses') filterByAssetClasses?: string,
    @Query('range') dateRange: DateRange = 'max',
    @Query('tags') filterByTags?: string,
-    @Query('withExcludedAccounts') withExcludedAccountsParam = 'false',
-    @Query('withItems') withItemsParam = 'false'
+    @Query('withExcludedAccounts') withExcludedAccountsParam = 'false'
  ): Promise<PortfolioPerformanceResponse> {
    const withExcludedAccounts = withExcludedAccountsParam === 'true';
-    const withItems = withItemsParam === 'true';

    const hasReadRestrictedAccessPermission =
      this.userService.hasReadRestrictedAccessPermission({
@ -403,7 +415,6 @@ export class PortfolioController {
      filters,
      impersonationId,
      withExcludedAccounts,
-      withItems,
      userId: this.request.user.id
    });

@ -416,6 +427,7 @@ export class PortfolioController {
        ({
          date,
          netPerformanceInPercentage,
+          netPerformanceInPercentageWithCurrencyEffect,
          netWorth,
          totalInvestment,
          value
@ -423,6 +435,7 @@ export class PortfolioController {
          return {
            date,
            netPerformanceInPercentage,
+            netPerformanceInPercentageWithCurrencyEffect,
            netWorthInPercentage:
              performanceInformation.performance.currentNetWorth === 0
                ? 0
@ -528,7 +541,8 @@ export class PortfolioController {
    const { holdings } = await this.portfolioService.getDetails({
      filters: [{ id: 'EQUITY', type: 'ASSET_CLASS' }],
      impersonationId: access.userId,
-      userId: user.id
+      userId: user.id,
+      withMarkets: true
    });

    const portfolioPublicDetails: PortfolioPublicDetails = {
--- a/apps/api/src/app/portfolio/portfolio.module.ts
+++ b/apps/api/src/app/portfolio/portfolio.module.ts
@ -2,6 +2,7 @@ import { AccessModule } from '@ghostfolio/api/app/access/access.module';
 import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { OrderModule } from '@ghostfolio/api/app/order/order.module';
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
@ -15,6 +16,7 @@ import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/sym

 import { Module } from '@nestjs/common';

+import { PortfolioCalculatorFactory } from './calculator/portfolio-calculator.factory';
 import { CurrentRateService } from './current-rate.service';
 import { PortfolioController } from './portfolio.controller';
 import { PortfolioService } from './portfolio.service';
@ -34,6 +36,7 @@ import { RulesService } from './rules.service';
    MarketDataModule,
    OrderModule,
    PrismaModule,
+    RedisCacheModule,
    SymbolProfileModule,
    UserModule
  ],
@ -41,6 +44,7 @@ import { RulesService } from './rules.service';
    AccountBalanceService,
    AccountService,
    CurrentRateService,
+    PortfolioCalculatorFactory,
    PortfolioService,
    RulesService
  ]
--- a/apps/api/src/app/portfolio/portfolio-calculator.spec.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.spec.ts
@ -1,18 +1,19 @@
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
+import { Big } from 'big.js';

-import Big from 'big.js';
+import { PortfolioService } from './portfolio.service';

-import { CurrentRateService } from './current-rate.service';
-import { PortfolioCalculator } from './portfolio-calculator';
+describe('PortfolioService', () => {
+  let portfolioService: PortfolioService;

-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
+  beforeAll(async () => {
+    portfolioService = new PortfolioService(
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
+      null,
      null,
      null,
      null,
@ -21,16 +22,9 @@ describe('PortfolioCalculator', () => {
  });

  describe('annualized performance percentage', () => {
-    const portfolioCalculator = new PortfolioCalculator({
-      currentRateService,
-      exchangeRateDataService,
-      currency: 'USD',
-      orders: []
-    });
-
    it('Get annualized performance', async () => {
      expect(
-        portfolioCalculator
+        portfolioService
          .getAnnualizedPerformancePercent({
            daysInMarket: NaN, // differenceInDays of date-fns returns NaN for the same day
            netPerformancePercent: new Big(0)
@ -39,7 +33,7 @@ describe('PortfolioCalculator', () => {
      ).toEqual(0);

      expect(
-        portfolioCalculator
+        portfolioService
          .getAnnualizedPerformancePercent({
            daysInMarket: 0,
            netPerformancePercent: new Big(0)
@ -51,7 +45,7 @@ describe('PortfolioCalculator', () => {
       * Source: https://www.readyratios.com/reference/analysis/annualized_rate.html
       */
      expect(
-        portfolioCalculator
+        portfolioService
          .getAnnualizedPerformancePercent({
            daysInMarket: 65, // < 1 year
            netPerformancePercent: new Big(0.1025)
@ -60,7 +54,7 @@ describe('PortfolioCalculator', () => {
      ).toBeCloseTo(0.729705);

      expect(
-        portfolioCalculator
+        portfolioService
          .getAnnualizedPerformancePercent({
            daysInMarket: 365, // 1 year
            netPerformancePercent: new Big(0.05)
@ -72,7 +66,7 @@ describe('PortfolioCalculator', () => {
       * Source: https://www.investopedia.com/terms/a/annualized-total-return.asp#annualized-return-formula-and-calculation
       */
      expect(
-        portfolioCalculator
+        portfolioService
          .getAnnualizedPerformancePercent({
            daysInMarket: 575, // > 1 year
            netPerformancePercent: new Big(0.2374)
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
--- a/apps/api/src/app/portfolio/rules.service.ts
+++ b/apps/api/src/app/portfolio/rules.service.ts
@ -17,8 +17,16 @@ export class RulesService {
        return rule.getSettings(aUserSettings)?.isActive;
      })
      .map((rule) => {
-        const evaluationResult = rule.evaluate(rule.getSettings(aUserSettings));
-        return { ...evaluationResult, name: rule.getName() };
+        const { evaluation, value } = rule.evaluate(
+          rule.getSettings(aUserSettings)
+        );
+
+        return {
+          evaluation,
+          value,
+          key: rule.getKey(),
+          name: rule.getName()
+        };
      });
  }
 }
--- a/apps/api/src/app/redis-cache/redis-cache.service.mock.ts
+++ b/apps/api/src/app/redis-cache/redis-cache.service.mock.ts
@ -0,0 +1,13 @@
+import { RedisCacheService } from './redis-cache.service';
+
+export const RedisCacheServiceMock = {
+  get: (key: string): Promise<string> => {
+    return Promise.resolve(null);
+  },
+  getPortfolioSnapshotKey: (userId: string): string => {
+    return `portfolio-snapshot-${userId}`;
+  },
+  set: (key: string, value: string, ttlInSeconds?: number): Promise<string> => {
+    return Promise.resolve(value);
+  }
+};
--- a/apps/api/src/app/redis-cache/redis-cache.service.ts
+++ b/apps/api/src/app/redis-cache/redis-cache.service.ts
@ -21,7 +21,11 @@ export class RedisCacheService {
  }

  public async get(key: string): Promise<string> {
-    return await this.cache.get(key);
+    return this.cache.get(key);
+  }
+
+  public getPortfolioSnapshotKey({ userId }: { userId: string }) {
+    return `portfolio-snapshot-${userId}`;
  }

  public getQuoteKey({ dataSource, symbol }: UniqueAsset) {
@ -29,15 +33,15 @@ export class RedisCacheService {
  }

  public async remove(key: string) {
-    await this.cache.del(key);
+    return this.cache.del(key);
  }

  public async reset() {
-    await this.cache.reset();
+    return this.cache.reset();
  }

  public async set(key: string, value: string, ttlInSeconds?: number) {
-    await this.cache.set(
+    return this.cache.set(
      key,
      value,
      ttlInSeconds ?? this.configurationService.get('CACHE_TTL')
--- a/apps/api/src/app/subscription/subscription.controller.ts
+++ b/apps/api/src/app/subscription/subscription.controller.ts
@ -116,7 +116,7 @@ export class SubscriptionController {
    @Body() { couponId, priceId }: { couponId: string; priceId: string }
  ) {
    try {
-      return await this.subscriptionService.createCheckoutSession({
+      return this.subscriptionService.createCheckoutSession({
        couponId,
        priceId,
        user: this.request.user
--- a/apps/api/src/app/symbol/symbol.service.ts
+++ b/apps/api/src/app/symbol/symbol.service.ts
@ -74,11 +74,21 @@ export class SymbolService {
    date = new Date(),
    symbol
  }: IDataGatheringItem): Promise<IDataProviderHistoricalResponse> {
-    const historicalData = await this.dataProviderService.getHistoricalRaw(
-      [{ dataSource, symbol }],
-      date,
-      date
-    );
+    let historicalData: {
+      [symbol: string]: {
+        [date: string]: IDataProviderHistoricalResponse;
+      };
+    } = {
+      [symbol]: {}
+    };
+
+    try {
+      historicalData = await this.dataProviderService.getHistoricalRaw({
+        dataGatheringItems: [{ dataSource, symbol }],
+        from: date,
+        to: date
+      });
+    } catch {}

    return {
      marketPrice:
--- a/apps/api/src/app/user/update-user-setting.dto.ts
+++ b/apps/api/src/app/user/update-user-setting.dto.ts
@ -14,6 +14,7 @@ import {
  IsOptional,
  IsString
 } from 'class-validator';
+import { eachYearOfInterval, format } from 'date-fns';

 export class UpdateUserSettingDto {
  @IsNumber()
@ -32,7 +33,20 @@ export class UpdateUserSettingDto {
  @IsOptional()
  colorScheme?: ColorScheme;

-  @IsIn(<DateRange[]>['1d', '1y', '5y', 'max', 'mtd', 'wtd', 'ytd'])
+  @IsIn(<DateRange[]>[
+    '1d',
+    '1y',
+    '5y',
+    'max',
+    'mtd',
+    'wtd',
+    'ytd',
+    ...eachYearOfInterval({ end: new Date(), start: new Date(0) }).map(
+      (date) => {
+        return format(date, 'yyyy');
+      }
+    )
+  ])
  @IsOptional()
  dateRange?: DateRange;

--- a/apps/api/src/app/user/user.controller.ts
+++ b/apps/api/src/app/user/user.controller.ts
@ -2,11 +2,7 @@ import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorat
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { User, UserSettings } from '@ghostfolio/common/interfaces';
-import {
-  hasPermission,
-  hasRole,
-  permissions
-} from '@ghostfolio/common/permissions';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';

 import {
@ -63,13 +59,6 @@ export class UserController {
  public async getUser(
    @Headers('accept-language') acceptLanguage: string
  ): Promise<User> {
-    if (hasRole(this.request.user, 'INACTIVE')) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.TOO_MANY_REQUESTS),
-        StatusCodes.TOO_MANY_REQUESTS
-      );
-    }
-
    return this.userService.getUser(
      this.request.user,
      acceptLanguage?.split(',')?.[0]
@ -135,7 +124,7 @@ export class UserController {
      }
    }

-    return await this.userService.updateUserSetting({
+    return this.userService.updateUserSetting({
      userSettings,
      userId: this.request.user.id
    });
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@ -1,5 +1,6 @@
 import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
 import { environment } from '@ghostfolio/api/environments/environment';
+import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
@ -25,6 +26,7 @@ import {
 import { UserWithSettings } from '@ghostfolio/common/types';

 import { Injectable } from '@nestjs/common';
+import { EventEmitter2 } from '@nestjs/event-emitter';
 import { Prisma, Role, User } from '@prisma/client';
 import { differenceInDays } from 'date-fns';
 import { sortBy, without } from 'lodash';
@ -37,6 +39,7 @@ export class UserService {

  public constructor(
    private readonly configurationService: ConfigurationService,
+    private readonly eventEmitter: EventEmitter2,
    private readonly prismaService: PrismaService,
    private readonly propertyService: PropertyService,
    private readonly subscriptionService: SubscriptionService,
@ -51,13 +54,22 @@ export class UserService {
    { Account, id, permissions, Settings, subscription }: UserWithSettings,
    aLocale = locale
  ): Promise<IUser> {
-    const access = await this.prismaService.access.findMany({
-      include: {
-        User: true
-      },
-      orderBy: { alias: 'asc' },
-      where: { GranteeUser: { id } }
-    });
+    let [access, firstActivity, tags] = await Promise.all([
+      this.prismaService.access.findMany({
+        include: {
+          User: true
+        },
+        orderBy: { alias: 'asc' },
+        where: { GranteeUser: { id } }
+      }),
+      this.prismaService.order.findFirst({
+        orderBy: {
+          date: 'asc'
+        },
+        where: { userId: id }
+      }),
+      this.tagService.getByUser(id)
+    ]);

    let systemMessage: SystemMessage;

@ -69,8 +81,6 @@ export class UserService {
      systemMessage = systemMessageProperty;
    }

-    let tags = await this.tagService.getByUser(id);
-
    if (
      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
      subscription.type === 'Basic'
@ -91,6 +101,7 @@ export class UserService {
        };
      }),
      accounts: Account,
+      dateOfFirstActivity: firstActivity?.date ?? new Date(),
      settings: {
        ...(<UserSettings>Settings.settings),
        locale: (<UserSettings>Settings.settings)?.locale ?? aLocale
@ -429,11 +440,9 @@ export class UserService {
    userId: string;
    userSettings: UserSettings;
  }) {
-    const settings = userSettings as unknown as Prisma.JsonObject;
-
-    await this.prismaService.settings.upsert({
+    const { settings } = await this.prismaService.settings.upsert({
      create: {
-        settings,
+        settings: userSettings as unknown as Prisma.JsonObject,
        User: {
          connect: {
            id: userId
@ -441,25 +450,33 @@ export class UserService {
        }
      },
      update: {
-        settings
+        settings: userSettings as unknown as Prisma.JsonObject
      },
      where: {
        userId
      }
    });

-    return;
+    this.eventEmitter.emit(
+      PortfolioChangedEvent.getName(),
+      new PortfolioChangedEvent({
+        userId
+      })
+    );
+
+    return settings;
  }

  private getRandomString(length: number) {
+    const bytes = crypto.randomBytes(length);
    const characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
    const result = [];

    for (let i = 0; i < length; i++) {
-      result.push(
-        characters.charAt(Math.floor(Math.random() * characters.length))
-      );
+      const randomByte = bytes[i];
+      result.push(characters[randomByte % characters.length]);
    }
+
    return result.join('');
  }
 }
--- a/apps/api/src/assets/cryptocurrencies/custom.json
+++ b/apps/api/src/assets/cryptocurrencies/custom.json
@ -5,6 +5,7 @@
  "LUNA2": "Terra",
  "SGB1": "Songbird",
  "SMURFCAT": "Real Smurf Cat",
+  "TON11419": "Toncoin",
  "UNI1": "Uniswap",
  "UNI7083": "Uniswap",
  "UST": "TerraUSD"
--- a/apps/api/src/assets/sitemap.xml
+++ b/apps/api/src/assets/sitemap.xml
@ -1232,10 +1232,12 @@
    <loc>https://ghostfol.io/nl/veelgestelde-vragen</loc>
    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
  </url>
+  <!--
  <url>
    <loc>https://ghostfol.io/pl</loc>
    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
  </url>
+  -->
  <url>
    <loc>https://ghostfol.io/pt</loc>
    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
@ -1296,4 +1298,10 @@
    <loc>https://ghostfol.io/tr</loc>
    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
  </url>
+  <!--
+  <url>
+    <loc>https://ghostfol.io/zh</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  -->
 </urlset>
--- a/apps/api/src/events/events.module.ts
+++ b/apps/api/src/events/events.module.ts
@ -0,0 +1,11 @@
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
+
+import { Module } from '@nestjs/common';
+
+import { PortfolioChangedListener } from './portfolio-changed.listener';
+
+@Module({
+  imports: [RedisCacheModule],
+  providers: [PortfolioChangedListener]
+})
+export class EventsModule {}
--- a/apps/api/src/events/portfolio-changed.event.ts
+++ b/apps/api/src/events/portfolio-changed.event.ts
@ -0,0 +1,15 @@
+export class PortfolioChangedEvent {
+  private userId: string;
+
+  public constructor({ userId }: { userId: string }) {
+    this.userId = userId;
+  }
+
+  public static getName() {
+    return 'portfolio.changed';
+  }
+
+  public getUserId() {
+    return this.userId;
+  }
+}
--- a/apps/api/src/events/portfolio-changed.listener.ts
+++ b/apps/api/src/events/portfolio-changed.listener.ts
@ -0,0 +1,25 @@
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+
+import { Injectable, Logger } from '@nestjs/common';
+import { OnEvent } from '@nestjs/event-emitter';
+
+import { PortfolioChangedEvent } from './portfolio-changed.event';
+
+@Injectable()
+export class PortfolioChangedListener {
+  public constructor(private readonly redisCacheService: RedisCacheService) {}
+
+  @OnEvent(PortfolioChangedEvent.getName())
+  handlePortfolioChangedEvent(event: PortfolioChangedEvent) {
+    Logger.log(
+      `Portfolio of user with id ${event.getUserId()} has changed`,
+      'PortfolioChangedListener'
+    );
+
+    this.redisCacheService.remove(
+      this.redisCacheService.getPortfolioSnapshotKey({
+        userId: event.getUserId()
+      })
+    );
+  }
+}
--- a/apps/api/src/helper/object.helper.ts
+++ b/apps/api/src/helper/object.helper.ts
@ -1,4 +1,4 @@
-import Big from 'big.js';
+import { Big } from 'big.js';
 import { cloneDeep, isArray, isObject } from 'lodash';

 export function hasNotDefinedValuesInObject(aObject: Object): boolean {
--- a/apps/api/src/helper/portfolio.helper.ts
+++ b/apps/api/src/helper/portfolio.helper.ts
@ -1,14 +1,25 @@
+import { resetHours } from '@ghostfolio/common/helper';
+import { DateRange } from '@ghostfolio/common/types';
+
 import { Type as ActivityType } from '@prisma/client';
+import {
+  endOfDay,
+  max,
+  subDays,
+  startOfMonth,
+  startOfWeek,
+  startOfYear,
+  subYears,
+  endOfYear
+} from 'date-fns';

 export function getFactor(activityType: ActivityType) {
  let factor: number;

  switch (activityType) {
    case 'BUY':
-    case 'ITEM':
      factor = 1;
      break;
-    case 'LIABILITY':
    case 'SELL':
      factor = -1;
      break;
@ -19,3 +30,61 @@ export function getFactor(activityType: ActivityType) {

  return factor;
 }
+
+export function getInterval(
+  aDateRange: DateRange,
+  portfolioStart = new Date(0)
+) {
+  let endDate = endOfDay(new Date(Date.now()));
+  let startDate = portfolioStart;
+
+  switch (aDateRange) {
+    case '1d':
+      startDate = max([
+        startDate,
+        subDays(resetHours(new Date(Date.now())), 1)
+      ]);
+      break;
+    case 'mtd':
+      startDate = max([
+        startDate,
+        subDays(startOfMonth(resetHours(new Date(Date.now()))), 1)
+      ]);
+      break;
+    case 'wtd':
+      startDate = max([
+        startDate,
+        subDays(
+          startOfWeek(resetHours(new Date(Date.now())), { weekStartsOn: 1 }),
+          1
+        )
+      ]);
+      break;
+    case 'ytd':
+      startDate = max([
+        startDate,
+        subDays(startOfYear(resetHours(new Date(Date.now()))), 1)
+      ]);
+      break;
+    case '1y':
+      startDate = max([
+        startDate,
+        subYears(resetHours(new Date(Date.now())), 1)
+      ]);
+      break;
+    case '5y':
+      startDate = max([
+        startDate,
+        subYears(resetHours(new Date(Date.now())), 5)
+      ]);
+      break;
+    case 'max':
+      break;
+    default:
+      // '2024', '2023', '2022', etc.
+      endDate = endOfYear(new Date(aDateRange));
+      startDate = max([startDate, new Date(aDateRange)]);
+  }
+
+  return { endDate, startDate };
+}
--- a/apps/api/src/interceptors/redact-values-in-response.interceptor.ts
+++ b/apps/api/src/interceptors/redact-values-in-response.interceptor.ts
@ -57,6 +57,7 @@ export class RedactValuesInResponseInterceptor<T>
              'quantity',
              'symbolMapping',
              'totalBalanceInBaseCurrency',
+              'totalValueInBaseCurrency',
              'unitPrice',
              'value',
              'valueInBaseCurrency'
--- a/apps/api/src/models/rule.ts
+++ b/apps/api/src/models/rule.ts
@ -1,25 +1,34 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { groupBy } from '@ghostfolio/common/helper';
-import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';
+import { UserSettings } from '@ghostfolio/common/interfaces';
+import { TimelinePosition } from '@ghostfolio/common/models';

 import { EvaluationResult } from './interfaces/evaluation-result.interface';
 import { RuleInterface } from './interfaces/rule.interface';

 export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
+  private key: string;
  private name: string;

  public constructor(
    protected exchangeRateDataService: ExchangeRateDataService,
    {
+      key,
      name
    }: {
+      key: string;
      name: string;
    }
  ) {
+    this.key = key;
    this.name = name;
  }

+  public getKey() {
+    return this.key;
+  }
+
  public getName() {
    return this.name;
  }
--- a/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/current-investment.ts
@ -15,6 +15,7 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
    accounts: PortfolioDetails['accounts']
  ) {
    super(exchangeRateDataService, {
+      key: AccountClusterRiskCurrentInvestment.name,
      name: 'Investment'
    });

@ -35,7 +36,7 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
      };
    }

-    let maxItem;
+    let maxItem: (typeof accounts)[0];
    let totalInvestment = 0;

    for (const account of Object.values(accounts)) {
@ -52,7 +53,7 @@ export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
      }
    }

-    const maxInvestmentRatio = maxItem.investment / totalInvestment;
+    const maxInvestmentRatio = maxItem?.investment / totalInvestment || 0;

    if (maxInvestmentRatio > ruleSettings.threshold) {
      return {
--- a/apps/api/src/models/rules/account-cluster-risk/single-account.ts
+++ b/apps/api/src/models/rules/account-cluster-risk/single-account.ts
@ -11,6 +11,7 @@ export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
    accounts: PortfolioDetails['accounts']
  ) {
    super(exchangeRateDataService, {
+      key: AccountClusterRiskSingleAccount.name,
      name: 'Single Account'
    });

--- 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,7 +1,8 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { Rule } from '@ghostfolio/api/models/rule';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';
+import { UserSettings } from '@ghostfolio/common/interfaces';
+import { TimelinePosition } from '@ghostfolio/common/models';

 export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Settings> {
  private positions: TimelinePosition[];
@ -11,6 +12,7 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
    positions: TimelinePosition[]
  ) {
    super(exchangeRateDataService, {
+      key: CurrencyClusterRiskBaseCurrencyCurrentInvestment.name,
      name: 'Investment: Base Currency'
    });

@ -43,7 +45,7 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti

    const baseCurrencyValueRatio = baseCurrencyItem?.value / totalValue || 0;

-    if (maxItem.groupKey !== ruleSettings.baseCurrency) {
+    if (maxItem?.groupKey !== ruleSettings.baseCurrency) {
      return {
        evaluation: `The major part of your current investment is not in your base currency (${(
          baseCurrencyValueRatio * 100
--- 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,7 +1,8 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { Rule } from '@ghostfolio/api/models/rule';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { TimelinePosition, UserSettings } from '@ghostfolio/common/interfaces';
+import { UserSettings } from '@ghostfolio/common/interfaces';
+import { TimelinePosition } from '@ghostfolio/common/models';

 export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
  private positions: TimelinePosition[];
@ -11,6 +12,7 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
    positions: TimelinePosition[]
  ) {
    super(exchangeRateDataService, {
+      key: CurrencyClusterRiskCurrentInvestment.name,
      name: 'Investment'
    });

@ -37,7 +39,7 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
      }
    });

-    const maxValueRatio = maxItem.value / totalValue;
+    const maxValueRatio = maxItem?.value / totalValue || 0;

    if (maxValueRatio > ruleSettings.threshold) {
      return {
@ -52,7 +54,7 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {

    return {
      evaluation: `The major part of your current investment is in ${
-        maxItem.groupKey
+        maxItem?.groupKey ?? ruleSettings.baseCurrency
      } (${(maxValueRatio * 100).toPrecision(3)}%) and does not exceed ${
        ruleSettings.threshold * 100
      }%`,
--- a/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
+++ b/apps/api/src/models/rules/emergency-fund/emergency-fund-setup.ts
@ -11,6 +11,7 @@ export class EmergencyFundSetup extends Rule<Settings> {
    emergencyFund: number
  ) {
    super(exchangeRateDataService, {
+      key: EmergencyFundSetup.name,
      name: 'Emergency Fund: Set up'
    });

--- a/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts
+++ b/apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts
@ -13,6 +13,7 @@ export class FeeRatioInitialInvestment extends Rule<Settings> {
    fees: number
  ) {
    super(exchangeRateDataService, {
+      key: FeeRatioInitialInvestment.name,
      name: 'Fee Ratio'
    });

--- a/apps/api/src/services/api/api.service.ts
+++ b/apps/api/src/services/api/api.service.ts
@ -10,18 +10,21 @@ export class ApiService {
    filterByAccounts,
    filterByAssetClasses,
    filterByAssetSubClasses,
+    filterByHoldingType,
    filterBySearchQuery,
    filterByTags
  }: {
    filterByAccounts?: string;
    filterByAssetClasses?: string;
    filterByAssetSubClasses?: string;
+    filterByHoldingType?: string;
    filterBySearchQuery?: string;
    filterByTags?: string;
  }): Filter[] {
    const accountIds = filterByAccounts?.split(',') ?? [];
    const assetClasses = filterByAssetClasses?.split(',') ?? [];
    const assetSubClasses = filterByAssetSubClasses?.split(',') ?? [];
+    const holdingType = filterByHoldingType;
    const searchQuery = filterBySearchQuery?.toLowerCase();
    const tagIds = filterByTags?.split(',') ?? [];

@ -52,6 +55,13 @@ export class ApiService {
      })
    ];

+    if (holdingType) {
+      filters.push({
+        id: holdingType,
+        type: 'HOLDING_TYPE'
+      });
+    }
+
    if (searchQuery) {
      filters.push({
        id: searchQuery,
--- a/apps/api/src/services/cron.service.ts
+++ b/apps/api/src/services/cron.service.ts
@ -1,4 +1,5 @@
 import {
+  DATA_GATHERING_QUEUE_PRIORITY_LOW,
  GATHER_ASSET_PROFILE_PROCESS,
  GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
  PROPERTY_IS_DATA_GATHERING_ENABLED
@ -56,7 +57,8 @@ export class CronService {
            name: GATHER_ASSET_PROFILE_PROCESS,
            opts: {
              ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-              jobId: getAssetProfileIdentifier({ dataSource, symbol })
+              jobId: getAssetProfileIdentifier({ dataSource, symbol }),
+              priority: DATA_GATHERING_QUEUE_PRIORITY_LOW
            }
          };
        })
--- a/apps/api/src/services/data-gathering/data-gathering.processor.ts
+++ b/apps/api/src/services/data-gathering/data-gathering.processor.ts
@ -37,7 +37,17 @@ export class DataGatheringProcessor {
  @Process({ concurrency: 1, name: GATHER_ASSET_PROFILE_PROCESS })
  public async gatherAssetProfile(job: Job<UniqueAsset>) {
    try {
+      Logger.log(
+        `Asset profile data gathering has been started for ${job.data.symbol} (${job.data.dataSource})`,
+        `DataGatheringProcessor (${GATHER_ASSET_PROFILE_PROCESS})`
+      );
+
      await this.dataGatheringService.gatherAssetProfiles([job.data]);
+
+      Logger.log(
+        `Asset profile data gathering has been completed for ${job.data.symbol} (${job.data.dataSource})`,
+        `DataGatheringProcessor (${GATHER_ASSET_PROFILE_PROCESS})`
+      );
    } catch (error) {
      Logger.error(
        error,
@ -62,11 +72,11 @@ export class DataGatheringProcessor {
        `DataGatheringProcessor (${GATHER_HISTORICAL_MARKET_DATA_PROCESS})`
      );

-      const historicalData = await this.dataProviderService.getHistoricalRaw(
-        [{ dataSource, symbol }],
-        currentDate,
-        new Date()
-      );
+      const historicalData = await this.dataProviderService.getHistoricalRaw({
+        dataGatheringItems: [{ dataSource, symbol }],
+        from: currentDate,
+        to: new Date()
+      });

      const data: Prisma.MarketDataUpdateInput[] = [];
      let lastMarketPrice: number;
--- a/apps/api/src/services/data-gathering/data-gathering.service.ts
+++ b/apps/api/src/services/data-gathering/data-gathering.service.ts
@ -8,6 +8,8 @@ import { PropertyService } from '@ghostfolio/api/services/property/property.serv
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
  DATA_GATHERING_QUEUE,
+  DATA_GATHERING_QUEUE_PRIORITY_HIGH,
+  DATA_GATHERING_QUEUE_PRIORITY_LOW,
  GATHER_HISTORICAL_MARKET_DATA_PROCESS,
  GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS,
  PROPERTY_BENCHMARKS
@ -61,24 +63,35 @@ export class DataGatheringService {

  public async gather7Days() {
    const dataGatheringItems = await this.getSymbols7D();
-    await this.gatherSymbols(dataGatheringItems);
+    await this.gatherSymbols({
+      dataGatheringItems,
+      priority: DATA_GATHERING_QUEUE_PRIORITY_LOW
+    });
  }

  public async gatherMax() {
    const dataGatheringItems = await this.getSymbolsMax();
-    await this.gatherSymbols(dataGatheringItems);
+    await this.gatherSymbols({
+      dataGatheringItems,
+      priority: DATA_GATHERING_QUEUE_PRIORITY_LOW
+    });
  }

  public async gatherSymbol({ dataSource, symbol }: UniqueAsset) {
    await this.marketDataService.deleteMany({ dataSource, symbol });

-    const symbols = (await this.getSymbolsMax()).filter((dataGatheringItem) => {
-      return (
-        dataGatheringItem.dataSource === dataSource &&
-        dataGatheringItem.symbol === symbol
-      );
+    const dataGatheringItems = (await this.getSymbolsMax()).filter(
+      (dataGatheringItem) => {
+        return (
+          dataGatheringItem.dataSource === dataSource &&
+          dataGatheringItem.symbol === symbol
+        );
+      }
+    );
+    await this.gatherSymbols({
+      dataGatheringItems,
+      priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
    });
-    await this.gatherSymbols(symbols);
  }

  public async gatherSymbolForDate({
@ -91,11 +104,11 @@ export class DataGatheringService {
    symbol: string;
  }) {
    try {
-      const historicalData = await this.dataProviderService.getHistoricalRaw(
-        [{ dataSource, symbol }],
-        date,
-        date
-      );
+      const historicalData = await this.dataProviderService.getHistoricalRaw({
+        dataGatheringItems: [{ dataSource, symbol }],
+        from: date,
+        to: date
+      });

      const marketPrice =
        historicalData[symbol][format(date, DATE_FORMAT)].marketPrice;
@ -217,22 +230,23 @@ export class DataGatheringService {
          error,
          'DataGatheringService'
        );
+
+        if (uniqueAssets.length === 1) {
+          throw error;
+        }
      }
    }
-
-    Logger.log(
-      `Asset profile data gathering has been completed for ${uniqueAssets
-        .map(({ dataSource, symbol }) => {
-          return `${symbol} (${dataSource})`;
-        })
-        .join(',')}.`,
-      'DataGatheringService'
-    );
  }

-  public async gatherSymbols(aSymbolsWithStartDate: IDataGatheringItem[]) {
+  public async gatherSymbols({
+    dataGatheringItems,
+    priority
+  }: {
+    dataGatheringItems: IDataGatheringItem[];
+    priority: number;
+  }) {
    await this.addJobsToQueue(
-      aSymbolsWithStartDate.map(({ dataSource, date, symbol }) => {
+      dataGatheringItems.map(({ dataSource, date, symbol }) => {
        return {
          data: {
            dataSource,
@ -242,6 +256,7 @@ export class DataGatheringService {
          name: GATHER_HISTORICAL_MARKET_DATA_PROCESS,
          opts: {
            ...GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS,
+            priority,
            jobId: `${getAssetProfileIdentifier({
              dataSource,
              symbol
--- a/apps/api/src/services/data-provider/coingecko/coingecko.service.ts
+++ b/apps/api/src/services/data-provider/coingecko/coingecko.service.ts
@ -59,7 +59,7 @@ export class CoinGeckoService implements DataProviderInterface {
  }): Promise<Partial<SymbolProfile>> {
    const response: Partial<SymbolProfile> = {
      symbol,
-      assetClass: AssetClass.CASH,
+      assetClass: AssetClass.LIQUIDITY,
      assetSubClass: AssetSubClass.CRYPTOCURRENCY,
      currency: DEFAULT_CURRENCY,
      dataSource: this.getName()
@ -243,7 +243,7 @@ export class CoinGeckoService implements DataProviderInterface {
        return {
          name,
          symbol,
-          assetClass: AssetClass.CASH,
+          assetClass: AssetClass.LIQUIDITY,
          assetSubClass: AssetSubClass.CRYPTOCURRENCY,
          currency: DEFAULT_CURRENCY,
          dataProviderInfo: this.getDataProviderInfo(),
--- a/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts
@ -266,7 +266,7 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {

    switch (quoteType?.toLowerCase()) {
      case 'cryptocurrency':
-        assetClass = AssetClass.CASH;
+        assetClass = AssetClass.LIQUIDITY;
        assetSubClass = AssetSubClass.CRYPTOCURRENCY;
        break;
      case 'equity':
--- a/apps/api/src/services/data-provider/data-provider.service.ts
+++ b/apps/api/src/services/data-provider/data-provider.service.ts
@ -20,7 +20,7 @@ import type { Granularity, UserWithSettings } from '@ghostfolio/common/types';

 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { DataSource, MarketData, SymbolProfile } from '@prisma/client';
-import Big from 'big.js';
+import { Big } from 'big.js';
 import { eachDayOfInterval, format, isValid } from 'date-fns';
 import { groupBy, isEmpty, isNumber, uniqWith } from 'lodash';
 import ms from 'ms';
@ -204,13 +204,14 @@ export class DataProviderService {
    });

    try {
-      const queryRaw = `SELECT *
-                        FROM "MarketData"
-                        WHERE "dataSource" IN ('${dataSources.join(`','`)}')
-                          AND "symbol" IN ('${symbols.join(
-                            `','`
-                          )}') ${granularityQuery} ${rangeQuery}
-                        ORDER BY date;`;
+      const queryRaw = `
+        SELECT *
+        FROM "MarketData"
+        WHERE "dataSource" IN ('${dataSources.join(`','`)}')
+          AND "symbol" IN ('${symbols.join(
+            `','`
+          )}') ${granularityQuery} ${rangeQuery}
+        ORDER BY date;`;

      const marketDataByGranularity: MarketData[] =
        await this.prismaService.$queryRawUnsafe(queryRaw);
@ -232,15 +233,17 @@ export class DataProviderService {
    }
  }

-  public async getHistoricalRaw(
-    aDataGatheringItems: UniqueAsset[],
-    from: Date,
-    to: Date
-  ): Promise<{
+  public async getHistoricalRaw({
+    dataGatheringItems,
+    from,
+    to
+  }: {
+    dataGatheringItems: UniqueAsset[];
+    from: Date;
+    to: Date;
+  }): Promise<{
    [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
  }> {
-    let dataGatheringItems = aDataGatheringItems;
-
    for (const { currency, rootCurrency } of DERIVED_CURRENCIES) {
      if (
        this.hasCurrency({
@ -329,6 +332,8 @@ export class DataProviderService {
      }
    } catch (error) {
      Logger.error(error, 'DataProviderService');
+
+      throw error;
    }

    return result;
@ -394,7 +399,8 @@ export class DataProviderService {
          numberOfItemsInCache > 1 ? 's' : ''
        } from cache in ${((performance.now() - startTimeTotal) / 1000).toFixed(
          3
-        )} seconds`
+        )} seconds`,
+        'DataProviderService'
      );
    }

@ -500,7 +506,8 @@ export class DataProviderService {
              } from ${dataSource} in ${(
                (performance.now() - startTimeDataSource) /
                1000
-              ).toFixed(3)} seconds`
+              ).toFixed(3)} seconds`,
+              'DataProviderService'
            );

            try {
@ -530,14 +537,15 @@ export class DataProviderService {

    await Promise.all(promises);

-    Logger.debug('------------------------------------------------');
+    Logger.debug('--------------------------------------------------------');
    Logger.debug(
      `Fetched ${items.length} quote${items.length > 1 ? 's' : ''} in ${(
        (performance.now() - startTimeTotal) /
        1000
-      ).toFixed(3)} seconds`
+      ).toFixed(3)} seconds`,
+      'DataProviderService'
    );
-    Logger.debug('================================================');
+    Logger.debug('========================================================');

    return response;
  }
--- 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
@ -11,6 +11,7 @@ import {
  IDataProviderHistoricalResponse,
  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
  DEFAULT_CURRENCY,
  REPLACE_NAME_PARTS
@ -35,7 +36,8 @@ export class EodHistoricalDataService implements DataProviderInterface {
  private readonly URL = 'https://eodhistoricaldata.com/api';

  public constructor(
-    private readonly configurationService: ConfigurationService
+    private readonly configurationService: ConfigurationService,
+    private readonly symbolProfileService: SymbolProfileService
  ) {
    this.apiKey = this.configurationService.get('API_KEY_EOD_HISTORICAL_DATA');
  }
@ -230,42 +232,54 @@ export class EodHistoricalDataService implements DataProviderInterface {
          ? [realTimeResponse]
          : realTimeResponse;

-      response = quotes.reduce(
-        async (
-          result: { [symbol: string]: IDataProviderResponse },
-          { close, code, timestamp }
-        ) => {
-          let currency: string;
-
-          if (symbols.length === 1) {
-            const { items } = await this.search({ query: symbols[0] });
-
-            if (items.length === 1) {
-              currency = items[0].currency;
-            }
-          }
-
-          if (isNumber(close)) {
-            result[this.convertFromEodSymbol(code)] = {
-              currency,
-              dataSource: this.getName(),
-              marketPrice: close,
-              marketState: isToday(new Date(timestamp * 1000))
-                ? 'open'
-                : 'closed'
-            };
-          } else {
-            Logger.error(
-              `Could not get quote for ${this.convertFromEodSymbol(code)} (${this.getName()})`,
-              'EodHistoricalDataService'
-            );
-          }
-
-          return result;
-        },
-        {}
+      const symbolProfiles = await this.symbolProfileService.getSymbolProfiles(
+        symbols.map((symbol) => {
+          return {
+            symbol,
+            dataSource: this.getName()
+          };
+        })
      );

+      for (const { close, code, timestamp } of quotes) {
+        let currency: string;
+
+        if (code.endsWith('.FOREX')) {
+          currency = this.convertFromEodSymbol(code)?.replace(
+            DEFAULT_CURRENCY,
+            ''
+          );
+        }
+
+        if (!currency) {
+          currency = symbolProfiles.find(({ symbol }) => {
+            return symbol === code;
+          })?.currency;
+        }
+
+        if (!currency) {
+          const { items } = await this.search({ query: code });
+
+          if (items.length === 1) {
+            currency = items[0].currency;
+          }
+        }
+
+        if (isNumber(close)) {
+          response[this.convertFromEodSymbol(code)] = {
+            currency,
+            dataSource: this.getName(),
+            marketPrice: close,
+            marketState: isToday(new Date(timestamp * 1000)) ? 'open' : 'closed'
+          };
+        } else {
+          Logger.error(
+            `Could not get quote for ${this.convertFromEodSymbol(code)} (${this.getName()})`,
+            'EodHistoricalDataService'
+          );
+        }
+      }
+
      return response;
    } catch (error) {
      let message = error;
@ -454,7 +468,7 @@ export class EodHistoricalDataService implements DataProviderInterface {
        assetSubClass = AssetSubClass.STOCK;
        break;
      case 'currency':
-        assetClass = AssetClass.CASH;
+        assetClass = AssetClass.LIQUIDITY;

        if (Exchange?.toLowerCase() === 'cc') {
          assetSubClass = AssetSubClass.CRYPTOCURRENCY;
--- a/apps/api/src/services/data-provider/manual/manual.service.ts
+++ b/apps/api/src/services/data-provider/manual/manual.service.ts
@ -91,7 +91,7 @@ export class ManualService implements DataProviderInterface {
        headers = {},
        selector,
        url
-      } = symbolProfile.scraperConfiguration ?? {};
+      } = symbolProfile?.scraperConfiguration ?? {};

      if (defaultMarketPrice) {
        const historical: {
--- a/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
+++ b/apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts
@ -449,13 +449,16 @@ export class ExchangeRateDataService {
              factors[format(date, DATE_FORMAT)] = factor;
            }
          } catch {
-            Logger.error(
-              `No exchange rate has been found for ${currencyFrom}${currencyTo} at ${format(
-                date,
-                DATE_FORMAT
-              )}. Please complement market data for ${DEFAULT_CURRENCY}${currencyFrom} and ${DEFAULT_CURRENCY}${currencyTo}.`,
-              'ExchangeRateDataService'
-            );
+            let errorMessage = `No exchange rate has been found for ${currencyFrom}${currencyTo} at ${format(
+              date,
+              DATE_FORMAT
+            )}. Please complement market data for ${DEFAULT_CURRENCY}${currencyFrom}`;
+
+            if (DEFAULT_CURRENCY !== currencyTo) {
+              errorMessage = `${errorMessage} and ${DEFAULT_CURRENCY}${currencyTo}`;
+            }
+
+            Logger.error(`${errorMessage}.`, 'ExchangeRateDataService');
          }
        }
      }
--- a/apps/api/src/services/symbol-profile/symbol-profile.service.ts
+++ b/apps/api/src/services/symbol-profile/symbol-profile.service.ts
@ -97,7 +97,9 @@ export class SymbolProfileService {
    scraperConfiguration,
    sectors,
    symbol,
-    symbolMapping
+    symbolMapping,
+    SymbolProfileOverrides,
+    url
  }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
    return this.prismaService.symbolProfile.update({
      data: {
@ -109,7 +111,9 @@ export class SymbolProfileService {
        name,
        scraperConfiguration,
        sectors,
-        symbolMapping
+        symbolMapping,
+        SymbolProfileOverrides,
+        url
      },
      where: { dataSource_symbol: { dataSource, symbol } }
    });
--- a/apps/client/project.json
+++ b/apps/client/project.json
@ -72,6 +72,10 @@
          "baseHref": "/tr/",
          "localize": ["tr"]
        },
+        "development-zh": {
+          "baseHref": "/zh/",
+          "localize": ["zh"]
+        },
        "production": {
          "fileReplacements": [
            {
@ -190,6 +194,9 @@
        "development-tr": {
          "buildTarget": "client:build:development-tr"
        },
+        "development-zh": {
+          "buildTarget": "client:build:development-zh"
+        },
        "production": {
          "buildTarget": "client:build:production"
        }
@ -209,7 +216,8 @@
          "messages.nl.xlf",
          "messages.pl.xlf",
          "messages.pt.xlf",
-          "messages.tr.xlf"
+          "messages.tr.xlf",
+          "messages.zh.xlf"
        ]
      }
    },
@ -260,6 +268,10 @@
      "tr": {
        "baseHref": "/tr/",
        "translation": "apps/client/src/locales/messages.tr.xlf"
+      },
+      "zh": {
+        "baseHref": "/zh/",
+        "translation": "apps/client/src/locales/messages.zh.xlf"
      }
    },
    "sourceLocale": "en"
--- a/apps/client/src/app/app.component.html
+++ b/apps/client/src/app/app.component.html
@ -163,6 +163,11 @@
              <a href="../tr" title="Ghostfolio in Türkçe">Türkçe</a>
            </li>
          -->
+          <!--
+            <li>
+              <a href="../zh" title="Ghostfolio in Chinese">Chinese</a>
+            </li>
+          -->
        </ul>
      </div>
    </div>
--- a/apps/client/src/app/app.component.scss
+++ b/apps/client/src/app/app.component.scss
@ -1,5 +1,3 @@
-@import 'apps/client/src/styles/ghostfolio-style';
-
 :host {
  display: block;
  min-height: 100svh;
--- a/apps/client/src/app/app.component.ts
+++ b/apps/client/src/app/app.component.ts
@ -1,3 +1,4 @@
+import { getCssVariable } from '@ghostfolio/common/helper';
 import { InfoItem, User } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { ColorScheme } from '@ghostfolio/common/types';
@ -187,20 +188,28 @@ export class AppComponent implements OnDestroy, OnInit {
      ? userPreferredColorScheme === 'DARK'
      : window.matchMedia('(prefers-color-scheme: dark)').matches;

-    this.toggleThemeStyleClass(isDarkTheme);
+    this.toggleTheme(isDarkTheme);

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

-  private toggleThemeStyleClass(isDarkTheme: boolean) {
+  private toggleTheme(isDarkTheme: boolean) {
+    const themeColor = getCssVariable(
+      isDarkTheme ? '--dark-background' : '--light-background'
+    );
+
    if (isDarkTheme) {
      this.document.body.classList.add('is-dark-theme');
    } else {
      this.document.body.classList.remove('is-dark-theme');
    }
+
+    this.document
+      .querySelector('meta[name="theme-color"]')
+      .setAttribute('content', themeColor);
  }
 }
--- a/apps/client/src/app/app.module.ts
+++ b/apps/client/src/app/app.module.ts
@ -1,4 +1,4 @@
-import { GfLogoModule } from '@ghostfolio/ui/logo';
+import { GfLogoComponent } from '@ghostfolio/ui/logo';

 import { Platform } from '@angular/cdk/platform';
 import { HttpClientModule } from '@angular/common/http';
@ -43,7 +43,7 @@ export function NgxStripeFactory(): string {
    BrowserAnimationsModule,
    BrowserModule,
    GfHeaderModule,
-    GfLogoModule,
+    GfLogoComponent,
    GfSubscriptionInterstitialDialogModule,
    HttpClientModule,
    MarkdownModule.forRoot(),
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Kaul	d9c07456cd	Release 2.78.0 (#3361 )	2024-05-02 20:32:47 +02:00
Thomas Kaul	0a53df4293	Feature/improve inactive user role (#3360 ) * Improve inactive role * Update changelog	2024-05-02 20:31:20 +02:00
Thomas Kaul	4416ba0c88	Feature/set performance column of holdings table to stick at end (#3353 ) * Set up stickyEnd in performance column * Update changelog	2024-05-02 19:16:59 +02:00
Thomas Kaul	486de968a2	Bugfix/fix division by zero error in dividend yield calculation (#3354 ) * Handle division by zero * Update changelog	2024-05-02 17:53:34 +02:00
Thomas Kaul	a5833566a8	Feature/skip caching in portfolio calculator if active filters (#3348 ) * Skip caching if active filters * Update changelog	2024-05-02 17:52:39 +02:00
Thomas Kaul	261f5844dd	Add type column to README.md (#3295 )	2024-04-30 14:08:14 +02:00
Fedron	2173c418a7	Feature/validate forms using DTO for access, asset profile, tag and platform management (#3337 ) * Validate forms using DTO for access, asset profile, tag and platform management * Update changelog	2024-04-30 08:04:45 +02:00
Thomas Kaul	4efd5cefd8	Bugfix/calculation of portfolio summary caused by future liabilities (#3342 ) * Adapt date of future activities * Update changelog	2024-04-29 20:12:12 +02:00
Thomas Kaul	d735e4db75	Release 2.77.1 (#3340 )	2024-04-27 19:25:23 +02:00
Thomas Kaul	e10707fde4	Add missing guard to fix public page (#3339 )	2024-04-27 19:24:08 +02:00
Thomas Kaul	ac953df809	Release 2.77.0 (#3338 )	2024-04-27 15:37:48 +02:00
Thomas Kaul	bb4ee50738	Feature/update browserslist database 20240417 (#3288 ) * Update the browserslist database * Update changelog	2024-04-27 15:35:57 +02:00
Thomas Kaul	4f41bac328	Feature/set up caching in portfolio calculator (#3335 ) * Set up caching * Update changelog	2024-04-27 15:35:28 +02:00
Thomas Kaul	cd07802400	Bugfix/fix historical market data gathering for asset profiles with manual data source (#3336 ) * Fix historical market data gathering for asset profiles with MANUAL data source * Update changelog	2024-04-27 15:29:32 +02:00
Thomas Kaul	b692b7432c	Feature/set up event system for portfolio changes (#3333 ) * Set up event system for portfolio changes * Update changelog	2024-04-26 20:13:53 +02:00
Thomas Kaul	a4efbc0131	Feature/migrate UI components to control flow (#3324 ) * Migrate to control flow * Update changelog	2024-04-26 17:40:00 +02:00
Thomas Kaul	55b0fe232c	Bugfix/reset form values to null if empty string (#3327 ) * Reset form values to null if empty string * Update changelog	2024-04-25 19:04:28 +02:00
Thomas Kaul	46432edce9	Feature/extend faq by custom asset instructions (#3326 ) * Add instructions for custom asset * Update changelog	2024-04-24 20:35:39 +02:00
Thomas Kaul	990028316e	Refactor form controls to form getter (#3325 )	2024-04-24 20:20:56 +02:00
Thomas Kaul	37871fbabc	Feature/upgrade prisma to version 5.13.0 (#3323 ) * Upgrade prisma to version 5.13.0 * Update changelog	2024-04-24 20:20:09 +02:00
Thomas Kaul	0fdeef7953	Release 2.76.0 (#3322 )	2024-04-23 18:58:43 +02:00
Thomas Kaul	cdbe6eedeb	Feature/change cash to liquidity in asset class enum (#3321 ) * Change CASH to LIQUIDITY in asset class enum * Update changelog	2024-04-23 18:55:37 +02:00
Thomas Kaul	a6dde8ad43	Release 2.75.1 (#3317 )	2024-04-21 17:14:35 +02:00
Thomas Kaul	39bd4a349b	Feature/improve chart in account detail dialog (#3314 ) * Improve net worth calculation in portfolio performance chart * Improve account balance management * Update changelog	2024-04-21 17:11:53 +02:00
Thomas Kaul	ab59eb5c92	Release 2.75.0 (#3316 )	2024-04-21 10:30:14 +02:00
Thomas Kaul	1132dc9bdd	Feature/add unique constraint to account balance database schema (#3315 ) * Add accountId and date as unique constraint to AccountBalance schema * Update changelog	2024-04-21 10:28:51 +02:00
Thomas Kaul	2d70b18593	Remove links (#3306 )	2024-04-21 10:08:22 +02:00
Thomas Kaul	b6ea7d23fa	Bugfix/add total value in base currency to redacted values (#3313 ) * Add totalValueInBaseCurrency * Update changelog	2024-04-21 08:33:38 +02:00
Thomas Kaul	95382581f1	Release 2.74.0 (#3312 )	2024-04-20 15:43:03 +02:00
Thomas Kaul	551b83a6e3	Bugfix/fix gaps in portfolio performance charts (#3311 ) * Fix gaps in charts * Update changelog	2024-04-20 15:40:59 +02:00
Thomas Kaul	895c4fe299	Improve style on mobile (#3310 )	2024-04-20 12:54:23 +02:00
Thomas Kaul	ccb1bf881e	Feature/improve language localization for de 20240420 (#3309 ) * Update translations * Update changelog	2024-04-20 12:54:06 +02:00
Thomas Kaul	7788b5a987	Improve messages (#3308 )	2024-04-20 12:53:51 +02:00
Thomas Kaul	47fd029e0c	Clean up styles (#3305 )	2024-04-20 12:15:21 +02:00
Thomas Kaul	458ee159e1	Feature/upgrade nx to version 18.3.3 (#3307 ) * Upgrade angular and Nx dependencies * Update changelog	2024-04-20 12:14:50 +02:00
Bastien Jeannelle	dfacbed66d	Feature/add support to create account cash balances (#3260 ) * Add support to create account cash balances * Update changelog --------- Co-authored-by: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>	2024-04-20 11:00:00 +02:00
Thomas Kaul	22d63c6102	Improve logging (#3304 ) * Improve logging	2024-04-20 10:49:18 +02:00
Thomas Kaul	212aa6a63b	Feature/add date range support to portfolio holdings page (#3303 ) * Add date range support * Update changelog	2024-04-20 09:51:12 +02:00
Thomas Kaul	bed9ae916c	Migrate UI components to standalone (#3302 )	2024-04-19 20:57:47 +02:00
Thomas Kaul	b6ad362850	Feature/remove date range support in activities table on portfolio activities page (#3301 ) * Remove date range support * Update changelog	2024-04-19 20:44:28 +02:00
Thomas Kaul	ab86dd5318	Add Home Assistant (#3291 )	2024-04-19 20:43:52 +02:00
Thomas Kaul	dba73d80a3	Improve logging (#3300 )	2024-04-19 20:31:38 +02:00
Thomas Kaul	92fb05320a	Migrate UI components to standalone (#3296 )	2024-04-19 18:31:35 +02:00
Thomas Kaul	73d62bb51f	Migrate UI components to standalone (#3290 )	2024-04-18 20:46:12 +02:00
Bastien Jeannelle	127b7d4f25	Make pre-commit executable by default (#3283 )	2024-04-18 18:39:20 +02:00
Thomas Kaul	e79d607ab8	Release 2.73.0 (#3287 )	2024-04-17 17:42:28 +02:00
Thomas Kaul	5f7d083f7c	Feature/upgrade yahoo finance2 to version 2.11.2 (#3286 ) * Upgrade yahoo-finance2 to version 2.11.2 * Update changelog	2024-04-17 17:40:58 +02:00
Thomas Kaul	15857118fe	Feature/let data gathering queue jobs fail by throwing errors (#3281 ) * Let data gathering queue jobs fail by throwing errors * Update changelog	2024-04-17 17:35:51 +02:00
Thomas Kaul	ff91ed21df	Upgrade @types/lodash to version 4.17.0 (#3227 )	2024-04-15 19:25:46 +02:00
Fedron	9241c04d5a	Feature/add form validation against DTO for activity and account (#3230 ) * Add form validation against DTO for activity and account * Update changelog	2024-04-14 19:52:41 +02:00
Thomas Kaul	5d4e2fba8c	Feature/move wealth item and liability calculations to portfolio calculator (#3272 ) * Move (wealth) item calculations to portfolio calculator * Move liability calculations to portfolio calculator * Update changelog	2024-04-14 08:12:32 +02:00
Thomas Kaul	6c57609db8	Feature/move dividend fee and interest calculation to portfolio calculator (#3267 ) * Move dividend, feee and interest calculation to portfolio calculator * Update changelog	2024-04-13 11:07:18 +02:00
Thomas Kaul	b31bbbe2d1	Release 2.72.0 (#3270 )	2024-04-13 09:31:07 +02:00
Thomas Kaul	7d308917dd	Feature/upgrade yahoo finance2 to version 2.11.1 (#3254 ) * Upgrade yahoo-finance2 to version 2.11.1 * Update changelog	2024-04-13 09:28:38 +02:00
Thomas Kaul	4e7d93db13	Feature/adapt priorities of data gathering jobs (#3262 ) * Adapt priorities of data gathering jobs * Update changelog	2024-04-13 09:28:14 +02:00
Thomas Kaul	45340b581f	Bugfix/fix public page by including markets data (#3263 ) * Include markets data * Update changelog	2024-04-12 15:13:34 +02:00
Thomas Kaul	6f8fe45fc2	Update OSS Friends (#3258 )	2024-04-11 19:14:56 +02:00
Thomas Kaul	34d9ceb009	Feature/add support to immediately execute queue job (#3259 ) * Add support to immediately execute queue job * Update changelog	2024-04-11 19:14:03 +02:00
Thomas Kaul	2b97bbd05d	Move getChart() to portfolio calculator (#3255 )	2024-04-09 13:44:23 +02:00
Thomas Kaul	3bf7ac76a0	Feature/upgrade nx to version 18.2.3 (#3256 ) * Upgrade Nx to version 17.3.3 * Update changelog	2024-04-08 08:07:00 +02:00
Thomas Kaul	71892e67b2	Feature/upgrade prisma to version 5.12.1 (#3253 ) * Upgrade prisma to version 5.12.1 * Update changelog	2024-04-07 20:27:38 +02:00
Thomas Kaul	6e2885ed20	Release 2.71.0 (#3252 )	2024-04-07 11:32:55 +02:00
Thomas Kaul	07c0e5a612	Feature/add currency to order database schema (#3251 ) * Add currency to Order database schema * Update changelog	2024-04-07 11:30:32 +02:00
Thomas Kaul	719bbe156e	Feature/optimize calculation of allocations by market (#3249 ) * Optimize calculation of allocations by market * Update changelog	2024-04-07 09:26:30 +02:00
Thomas Kaul	b51255a543	Feature/add key to x ray rule (#3248 ) * Add key * Update changelog	2024-04-07 09:25:14 +02:00
Thomas Kaul	50dbbf0569	Feature/refactor symbol icon module to asset profile icon component (#3245 ) * Refactor symbol icon module to asset profile icon component (standalone)	2024-04-06 21:15:19 +02:00
Thomas Kaul	ca2e748c56	Bugfix/add missing tags in portfolio calculator (#3243 ) * Add missing tags * Update changelog	2024-04-06 20:03:16 +02:00
sylis	5c480109d5	Feature/add quotes in README.md for API auth documentation (#3246 )	2024-04-06 20:00:56 +02:00
Thomas Kaul	6152ff4b44	Remove condition (#3242 )	2024-04-06 12:50:35 +02:00
Thomas Kaul	c6641fde36	Feature/add icon to create or update platform dialog (#3241 ) * Add platform icon * Update changelog	2024-04-06 09:11:15 +02:00
Thomas Kaul	4ae7e9fcbe	Feature/add icon to asset profile dialog (#3240 ) * Add asset profile icon * Update changelog	2024-04-06 08:42:06 +02:00
Thomas Kaul	c10ae431a2	Feature/extend faq by data providers (#3239 ) * Add data providers * Update changelog	2024-04-06 08:40:44 +02:00
Thomas Kaul	883e30e451	Feature/improve language localization for de 20240403 (#3236 ) * Update translations * Update changelog	2024-04-05 19:38:10 +02:00
Thomas Kaul	f1f4f6247d	Feature/validate url in create and update platform dto (#3235 ) * Validate url * Update changelog	2024-04-04 09:08:37 +02:00
Fedron	82fe1de1a7	Feature/add support to override asset (sub) class and url in admin control panel (#3218 ) * Add support to override asset (sub) class and url in admin control panel * Update changelog	2024-04-03 20:24:38 +02:00
Arshad Jamal	371c999fbc	Feature/Add dividend yield to position detail dialog (#2636 ) * Add dividend yield to position detail dialog * Update changelog --------- Co-authored-by: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>	2024-04-03 19:47:53 +02:00
Thomas Kaul	26b9660e11	Release 2.70.0 (#3234 )	2024-04-02 20:29:47 +02:00
Bastien Jeannelle	ca7717f9c5	Bugfix/Enable tini in docker compose files instead of adding it to the Dockerfile (#3232 ) * Enable tini in docker compose files instead of adding it to the Dockerfile * Update changelog	2024-04-02 20:26:14 +02:00
Thomas Kaul	6f3cce1c5f	Feature/disable option to update cash balance if date is not today (#3229 ) * Disable option to update cash balance if date is not today * Update changelog	2024-04-02 20:17:16 +02:00
Thomas Kaul	efdc9b387f	Eliminate ghostfolio-style.scss (#3228 )	2024-04-01 13:24:00 +02:00
Thomas Kaul	d7b579e3e8	Feature/refactor getAnnualizedPerformancePercent to portfolio calculator (#3226 ) * Move getAnnualizedPerformancePercent() to portfolio calculator	2024-04-01 10:42:15 +02:00
Thomas Kaul	b8533050b0	Bugfix/fix duplicated tags in position detail dialog (#3224 ) * Fix duplicated tags * Update changelog	2024-04-01 09:22:35 +02:00
Thomas Kaul	1b81409b35	Add OpenAlternative logo (#3225 )	2024-04-01 09:02:10 +02:00
Francisco Silva	8cd6c34ed8	Feature/introduce portfolio calculator factory (#3214 ) * Introduce portfolio calculator factory * Update changelog	2024-03-31 20:07:58 +02:00
Thomas Kaul	0c68474802	Extract locales (#3223 )	2024-03-31 11:41:44 +02:00
Thomas Kaul	34997f91db	Feature/setup webpack bundle analyzer (#3222 ) * Set up Webpack Bundle Analyzer * Update changelog	2024-03-31 11:38:09 +02:00
Thomas Kaul	084467ee9a	Feature/reverse order of specific years in date range selector of assistant (#3221 ) * Reverse order * Update changelog	2024-03-31 11:24:50 +02:00
qiaoy	af47889d65	Add Chinese translations (#3215 ) * Add Chinese translations	2024-03-31 11:24:32 +02:00
Thomas Kaul	51203ec96e	Feature/setup chinese (#3220 ) * Set up chinese * Update changelog	2024-03-31 10:46:30 +02:00
Thomas Kaul	a2277dea2c	Release 2.69.0 (#3212 )	2024-03-30 13:43:43 +01:00
Bastien Jeannelle	debd233c32	Feature/set up Tini to avoid zombie processes (#3195 ) * Set up Tini to avoid zombie processes * Update changelog	2024-03-30 13:42:02 +01:00
Thomas Kaul	f1eeee0525	Feature/extend date range support by specific years (#3190 ) * Extend date range support by specific years * Support date range in benchmark endpoint * Support date range in activities endpoint * Update changelog	2024-03-30 13:06:42 +01:00
Thomas Kaul	5ffc39c32f	Feature/improve usability to delete asset profile (#3208 ) * Disable delete button for benchmarks * Update changelog	2024-03-30 11:23:59 +01:00
Fedron	a668a66e84	Feature/add missing dates to edit historical market data in asset profile details dialog (#3206 ) * Add missing dates to edit historical market data in asset profile details dialog * Update changelog	2024-03-30 08:50:06 +01:00
Thomas Kaul	0581b8b9ec	Release 2.68.0 (#3205 )	2024-03-29 17:54:17 +01:00
Thomas Kaul	63a61fb492	Move portfolio calculator (#3204 ) * Move portfolio calculator	2024-03-29 17:47:44 +01:00
Thomas Kaul	5788c6474e	Refactor portfolio calculator (#3203 ) * Refactor portfolio calculator * Consume Activity[] * Change computeTransactionPoints() to private * Eliminate getTransactionPoints() * Update changelog	2024-03-29 17:34:22 +01:00
Thomas Kaul	5529fdc0ee	Move transaction points to constructor (#3202 )	2024-03-29 13:50:24 +01:00
Thomas Kaul	88a9b518f6	Bugfix/fix issue with overridden names in activities table (#3200 ) * Fix issue with overridden names * Update changelog	2024-03-29 09:50:04 +01:00
Fedron	98de2355c4	Feature/Support overriding name of asset profile dialog (#3199 ) * Support overriding name of asset profile dialog * Update changelog	2024-03-29 09:35:41 +01:00
helgehatt	b41eb60348	Fix chart tooltip of benchmark comparator (#3167 ) * Fix chart tooltip of benchmark comparator * Update changelog	2024-03-28 18:23:56 +01:00
Christoph Califice	0edebe30e1	Feature/Add user account currency to export (#3194 ) * Add user account currency to export * Update changelog	2024-03-27 18:08:34 +01:00
Thomas Kaul	e3abe4feee	Release 2.67.0 (#3197 )	2024-03-26 17:45:32 +01:00
Thomas Kaul	50391e199a	Feature/improve generation of random strings (#3196 ) * Replace Math.random() with crypto.randomBytes() * Update changelog	2024-03-26 17:43:42 +01:00
Thomas Kaul	a33f8d5bed	Upgrade @types/big.js to version 6.2.2 (#3191 ) * Upgrade @types/big.js to version 6.2.2 * Refactor imports	2024-03-25 08:34:30 +01:00
Thomas Kaul	636be8441e	Feature/upgrade zone.js to version 0.14.4 (#3184 ) * Upgrade zone.js to version 0.14.4 * Update changelog	2024-03-24 10:30:06 +01:00
Thomas Kaul	654dc2ba32	Feature/upgrade yahoo finance2 to version 2.11.0 (#3183 ) * Upgrade yahoo-finance2 to version 2.11.0 * Update changelog	2024-03-24 09:50:45 +01:00
Thomas Kaul	458ef169f4	Feature/add support for toncoin cryptocurrency (#3189 ) * Add Toincoin * Update changelog	2024-03-24 09:50:00 +01:00
Thomas Kaul	5bb01bb03c	Feature/upgrade ionicons to version 7.3.0 (#3182 ) * Upgrade ionicons to version 7.3.0 * Update changelog	2024-03-24 09:09:09 +01:00
Thomas Kaul	43e9528d8c	Release 2.66.3 (#3188 )	2024-03-23 20:56:22 +01:00
Thomas Kaul	522c54c9b4	Release 2.66.2 (#3187 )	2024-03-23 20:40:09 +01:00
Thomas Kaul	0004ced4e1	Release 2.66.1 (#3186 )	2024-03-23 20:26:10 +01:00
Thomas Kaul	274c60e961	Release 2.66.0 (#3185 )	2024-03-23 19:55:17 +01:00
Bastien Jeannelle	754e98099c	Feature/Set up tini (#3168 ) * Set up tini to avoid zombie processes and perform signal forwarding in docker image * Update changelog	2024-03-23 19:53:27 +01:00
Thomas Kaul	87bf8df1c3	Bugfix/missing performance chart in presenter view (#3181 ) * Fix missing performance chart in presenter view * Update changelog	2024-03-23 19:41:28 +01:00
Thomas Kaul	3f7d6b25c7	Feature/extend faq by backup strategy (#3180 ) * Add backup strategy * Update changelog	2024-03-23 19:10:23 +01:00
Thomas Kaul	8a062e03ab	Feature/add benchmark name to tooltip of benchmark comparator (#3177 ) * Add benchmark name to chart tooltip * Update changelog	2024-03-23 09:38:35 +01:00
Thomas Kaul	a70f45cbf3	Feature/add index for data source symbol to market data table (#3179 ) * Add index * Update changelog	2024-03-23 09:23:59 +01:00
Thomas Kaul	f268264c46	Feature/upgrade nx to version 18.1.2 (#3174 ) * Upgrade angular and Nx dependencies * Update changelog	2024-03-23 09:09:10 +01:00
Thomas Kaul	bbe5d70720	Rename Twitter to X (#3009 )	2024-03-21 15:10:35 +01:00
Thomas Kaul	f1d2a52cba	Release 2.65.0 (#3170 )	2024-03-19 20:13:22 +01:00
Miguel Coxo	87cc887865	Feature/Set meta theme color dynamically to respect appearance (#3129 ) * Set meta theme color dynamically to respect appearance (dark mode) * Update changelog	2024-03-19 20:11:34 +01:00
Thomas Kaul	61ecd15f1d	Feature/change edit button to a in admin market data page (#3164 ) * Change edit button to a * Update changelog	2024-03-19 19:55:08 +01:00
Thomas Kaul	eb853f05ae	Feature/add support to delete asset profile from dialog (#3165 ) * Add support to delete asset profile from dialog * Update changelog	2024-03-19 19:27:16 +01:00
Thomas Kaul	6285417903	Feature/change grant private access with permissions to general availability (#3169 ) * Change grant private access with permissions from experimental to general availability * Update changelog	2024-03-19 19:25:43 +01:00
Thomas Kaul	ca674a654e	Feature/add symbol and isin to position detail dialog (#3163 ) * Add symbol and ISIN * Update translations * Update changelog	2024-03-18 13:58:46 +01:00
Thomas Kaul	2729c5651f	Release 2.64.0 (#3161 )	2024-03-16 19:00:50 +01:00
Thomas Kaul	7e28e42995	Feature/exclude fees from holdings (#3160 )	2024-03-16 18:59:23 +01:00
Thomas Kaul	e21563d903	Feature/increase timeout to load benchmarks (#3158 ) * Increase request timeout * Update changelog	2024-03-16 18:15:34 +01:00
Thomas Kaul	3ede69650c	Feature/upgrade prisma to version 5.11.0 (#3159 ) * Upgrade prisma to version 5.11.0 * Update changelog	2024-03-16 16:51:07 +01:00
Gerard Du Pre	c289793c6d	Feature/switch between active and closed holdings (#3146 ) * Switch between active and closed holdings on the portfolio holdings page * Update changelog --------- Co-authored-by: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>	2024-03-16 14:20:58 +01:00
Thomas Kaul	a90c067da0	Clean up (#3157 )	2024-03-16 13:40:23 +01:00
Thomas Kaul	38c2baf943	Feature/improve exception handling of current investments in various rules (#3156 ) * Improve exception handling * Update changelog	2024-03-16 12:29:21 +01:00
Thomas Kaul	82c78cad6b	Format (#3155 )	2024-03-16 12:28:58 +01:00
Thomas Kaul	bffe6060bd	Pass portfolio calculator to getChart() (#3153 )	2024-03-16 10:05:16 +01:00
Thomas Kaul	841bd5c33f	Bugfix/fix dividend accumulation in symbol metrics (#3152 ) * Fix total dividend calculation * Update changelog	2024-03-16 10:04:57 +01:00
rodriguestiago0	3b895afc9e	Enable account balance update for fee and interest activities (#3145 ) * Enable account balance update for fee and interest activities * Update changelog	2024-03-15 18:56:17 +01:00
Thomas Kaul	00c2ede85e	Feature/improve usability of platform and tag management (#3144 ) * Improve usability * Update changelog	2024-03-15 08:37:41 +01:00
Thomas Kaul	8420cb830c	Feature/add product roadmap to faq (#3143 ) * Add product roadmap * Update changelog	2024-03-14 14:09:20 +01:00
helgehatt	a0ddd1f9b9	Fix date conversion in import of historical market data (#3117 ) * Fix date conversion in import of historical market data * Update changelog	2024-03-13 20:44:33 +01:00
Thomas Kaul	40d93066ff	Introduce .env.dev (#3120 )	2024-03-13 20:21:54 +01:00
Thomas Kaul	671e4e316b	Release 2.63.2 (#3138 )	2024-03-12 20:50:32 +01:00