Release 1.158.0 (#1009 )

Feature/expose the environment variable host (#1007 )
* Expose environment variable: HOST * Update changelog
2022-06-12 17:53:09 +02:00 · 2022-06-12 17:51:26 +02:00 · 2022-06-12 17:50:45 +02:00 · 2022-06-12 17:39:55 +02:00 · 2022-06-12 17:39:02 +02:00 · 2022-06-12 17:30:26 +02:00
209 changed files with 14446 additions and 3172 deletions
--- a/.env
+++ b/.env
@ -3,14 +3,14 @@ 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=password
+POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>

-ACCESS_TOKEN_SALT=GHOSTFOLIO
+ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
 ALPHA_VANTAGE_API_KEY=
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer
-JWT_SECRET_KEY=123456
-PORT=3333
+JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -5,6 +5,266 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## 1.158.0 - 12.06.2022
+
+### Added
+
+- Extended the queue jobs view in the admin control panel by a data dialog
+
+### Changed
+
+- Exposed the environment variable `HOST`
+- Decreased the number of attempts of queue jobs from `20` to `10` (fail earlier)
+- Improved the message for data provider errors in the client
+- Changed the label from _Balance_ to _Cash Balance_ in the account dialog
+- Restructured the documentation for self-hosting
+
+## 1.157.0 - 11.06.2022
+
+### Added
+
+- Extended the queue jobs view in the admin control panel by the number of attempts and the status
+
+### Changed
+
+- Migrated the historical market data gathering to the queue design pattern
+- Refreshed the cryptocurrencies list to support more coins by default
+- Increased the historical data chart of the _Fear & Greed Index_ (market mood) to 180 days
+- Upgraded `chart.js` from version `3.7.0` to `3.8.0`
+- Upgraded `envalid` from version `7.2.1` to `7.3.1`
+
+### Fixed
+
+- Reloaded the accounts of a user after creating, editing or deleting one
+- Excluded empty items in the activities filter
+
+## 1.156.0 - 05.06.2022
+
+### Added
+
+- Added the user id to the account page
+- Added a new view with jobs of the queue to the admin control panel
+
+### Changed
+
+- Simplified the features page
+- Restructured the _FIRE_ section
+- Upgraded `@simplewebauthn/browser` and `@simplewebauthn/server` from version `4.1.0` to `5.2.1`
+
+### Fixed
+
+- Fixed the `docker-compose` files to resolve variables correctly
+
+## 1.155.0 - 29.05.2022
+
+### Added
+
+- Added `EOD_HISTORICAL_DATA` as a new data source type
+
+### Changed
+
+- Exposed the environment variable `REDIS_PASSWORD`
+
+### Fixed
+
+- Fixed the empty state of the portfolio proportion chart component (with 2 levels)
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.154.0 - 28.05.2022
+
+### Added
+
+- Added a vertical hover line to inspect data points in the line chart component
+
+### Changed
+
+- Improved the tooltips of the chart components (content and style)
+- Simplified the pricing page
+- Improved the rounding numbers in the twitter bot service
+- Removed the dependency `round-to`
+
+## 1.153.0 - 27.05.2022
+
+### Added
+
+- Extended the benchmarks of the markets overview by the current market condition (bear and bull market)
+- Extended the twitter bot service by benchmarks
+- Added value redaction for the impersonation mode in the API response as an interceptor
+
+### Changed
+
+- Changed the twitter bot service to rest on the weekend
+- Upgraded `prisma` from version `3.12.0` to `3.14.0`
+
+### Fixed
+
+- Fixed a styling issue in the benchmark component on mobile
+
+## 1.152.0 - 26.05.2022
+
+### Added
+
+- Added the _Ghostfolio_ trailer to the landing page
+- Extended the markets overview by benchmarks (current change to the all time high)
+
+## 1.151.0 - 24.05.2022
+
+### Added
+
+- Added support to set the base currency as an environment variable (`BASE_CURRENCY`)
+
+### Fixed
+
+- Fixed an issue with the missing conversion of countries in the symbol profile overrides
+
+## 1.150.0 - 21.05.2022
+
+### Changed
+
+- Skipped data enhancer (_Trackinsight_) if data is inaccurate
+
+### Fixed
+
+- Fixed an issue with the currency conversion in the account calculations
+- Fixed an issue with countries in the symbol profile overrides
+
+## 1.149.0 - 16.05.2022
+
+### Added
+
+- Added groups to the activities filter component
+- Added support for filtering by asset class on the allocations page
+
+## 1.148.0 - 14.05.2022
+
+### Added
+
+- Supported enter key press to submit the form of the create or edit transaction dialog
+- Added a _Report Data Glitch_ button to the position detail dialog
+
+### Fixed
+
+- Fixed the date format of the date picker and support manual changes
+- Fixed the state of the account delete button (disable if account contains activities)
+- Fixed an issue in the activities filter component (typing a search term)
+
+## 1.147.0 - 10.05.2022
+
+### Changed
+
+- Improved the allocations page with no filtering (include cash positions)
+
+## 1.146.3 - 08.05.2022
+
+### Added
+
+- Set up a queue for the data gathering jobs
+- Set up _Nx Cloud_
+
+### Changed
+
+- Migrated the asset profile data gathering to the queue design pattern
+- Improved the allocations page with no filtering
+- Harmonized the _No data available_ label in the portfolio proportion chart component
+- Improved the _FIRE_ calculator for the _Live Demo_
+- Simplified the about page
+- Upgraded `angular` from version `13.2.2` to `13.3.6`
+- Upgraded `Nx` from version `13.8.5` to `14.1.4`
+- Upgraded `storybook` from version `6.4.18` to `6.4.22`
+
+### Fixed
+
+- Eliminated the circular dependencies in the `@ghostfolio/common` library
+
+## 1.145.0 - 07.05.2022
+
+### Added
+
+- Added support for filtering by accounts on the allocations page
+- Added support for private equity
+- Extended the form to set the asset and asset sub class for (wealth) items
+
+### Changed
+
+- Refactored the filtering (activities table and allocations page)
+
+### Fixed
+
+- Fixed the tooltip update in the portfolio proportion chart component
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.144.0 - 30.04.2022
+
+### Added
+
+- Added support for commodities (via futures)
+- Added support for real estate
+
+### Changed
+
+- Improved the layout of the position detail dialog
+- Upgraded `yahoo-finance2` from version `2.3.1` to `2.3.2`
+
+### Fixed
+
+- Fixed the import validation for numbers equal 0
+- Fixed the color of the spinner in the activities filter component (dark mode)
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.143.0 - 26.04.2022
+
+### Changed
+
+- Improved the filtering by tags
+
+## 1.142.0 - 25.04.2022
+
+### Added
+
+- Added the tags to the create or edit transaction dialog
+- Added the tags to the position detail dialog
+
+### Changed
+
+- Changed the date to UTC in the data gathering service
+- Reused the value component in the users table of the admin control panel
+
+## 1.141.1 - 24.04.2022
+
+### Added
+
+- Added the database migration
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.141.0 - 24.04.2022
+
+### Added
+
+- Added a tagging system for activities
+
+### Changed
+
+- Extracted the activities table filter to a dedicated component
+- Changed the url of the _Get Started_ link to `https://ghostfol.io` on the public page
+- Simplified `@@id` using multiple fields with `@id` in the database schema of (`Access`, `Order`, `Subscription`)
+- Upgraded `prisma` from version `3.11.1` to `3.12.0`
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
 ## 1.140.2 - 22.04.2022

 ### Added
@ -329,7 +589,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ### Changed

- Upgraded `angular` from version `13.1.2` to `13.2.3`
+- Upgraded `angular` from version `13.1.2` to `13.2.2`
 - Upgraded `Nx` from version `13.4.1` to `13.8.1`
 - Upgraded `storybook` from version `6.4.9` to `6.4.18`

--- a/4
+++ b/4
@ -22,8 +22,8 @@ RUN node decorate-angular-cli.js
 COPY ./angular.json angular.json
 COPY ./nx.json nx.json
 COPY ./replace.build.js replace.build.js
-COPY ./jest.preset.js jest.preset.js
-COPY ./jest.config.js jest.config.js
+COPY ./jest.preset.ts jest.preset.ts
+COPY ./jest.config.ts jest.config.ts
 COPY ./tsconfig.base.json tsconfig.base.json
 COPY ./libs libs
 COPY ./apps apps
--- a/README.md
+++ b/README.md
@ -9,7 +9,7 @@

  <h1>Ghostfolio</h1>
  <p>
-    <strong>Open Source Wealth Management Software made for Humans</strong>
+    <strong>Open Source Wealth Management Software</strong>
  </p>
  <p>
    <a href="https://ghostfol.io"><strong>Live Demo</strong></a> | <a href="https://ghostfol.io/pricing"><strong>Ghostfolio Premium</strong></a> | <a href="https://ghostfol.io/blog"><strong>Blog</strong></a> | <a href="https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg"><strong>Slack</strong></a> | <a href="https://twitter.com/ghostfolio_"><strong>Twitter</strong></a>
@ -24,10 +24,11 @@
  </p>
 </div>

-**Ghostfolio** is an open source wealth management software built with web technology. The application empowers busy people to keep track of their wealth like stocks, ETFs or cryptocurrencies and make solid, data-driven investment decisions.
+**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.

-<div align="center">
-  <img src="./apps/client/src/assets/images/screenshot.png" width="300">
+<div align="center" style="margin-top: 1rem; margin-bottom: 1rem;">
+  <a href="https://www.youtube.com/watch?v=yY6ObSQVJZk">
+    <img src="./apps/client/src/assets/images/video-preview.jpg" width="600"></a>
 </div>

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

 ## Features
@ -62,6 +63,10 @@ Ghostfolio is for you if you are...
 - ✅ Zen Mode
 - ✅ Mobile-first design

+<div align="center" style="margin-top: 1rem; margin-bottom: 1rem;">
+  <img src="./apps/client/src/assets/images/screenshot.png" width="300">
+</div>
+
 ## Technology Stack

 Ghostfolio is a modern web application written in [TypeScript](https://www.typescriptlang.org) and organized as an [Nx](https://nx.dev) workspace.
@ -74,47 +79,50 @@ The backend is based on [NestJS](https://nestjs.com) using [PostgreSQL](https://

 The frontend is built with [Angular](https://angular.io) and uses [Angular Material](https://material.angular.io) with utility classes from [Bootstrap](https://getbootstrap.com).

-## Run with Docker (self-hosting)
+## Self-hosting

-### Prerequisites
+### Run with Docker Compose

- [Docker](https://www.docker.com/products/docker-desktop)
- A local copy of this Git repository (clone)
+#### Prerequisites

-### a. Run environment
+- Basic knowledge of Docker
+- Installation of [Docker](https://www.docker.com/products/docker-desktop)
+- Local copy of this Git repository (clone)
+
+#### a. Run environment

 Run the following command to start the Docker images from [Docker Hub](https://hub.docker.com/r/ghostfolio/ghostfolio):

 ```bash
-docker-compose -f docker/docker-compose.yml up -d
+docker-compose --env-file ./.env -f docker/docker-compose.yml up -d
 ```

-#### Setup Database
+##### Setup Database

 Run the following command to setup the database once Ghostfolio is running:

 ```bash
-docker-compose -f docker/docker-compose.yml exec ghostfolio yarn database:setup
+docker-compose --env-file ./.env -f docker/docker-compose.yml exec ghostfolio yarn database:setup
 ```

-### b. Build and run environment
+#### b. Build and run environment

 Run the following commands to build and start the Docker images:

 ```bash
-docker-compose -f docker/docker-compose.build.yml build
-docker-compose -f docker/docker-compose.build.yml up -d
+docker-compose --env-file ./.env -f docker/docker-compose.build.yml build
+docker-compose --env-file ./.env -f docker/docker-compose.build.yml up -d
 ```

-#### Setup Database
+##### Setup Database

 Run the following command to setup the database once Ghostfolio is running:

 ```bash
-docker-compose -f docker/docker-compose.build.yml exec ghostfolio yarn database:setup
+docker-compose --env-file ./.env -f docker/docker-compose.build.yml exec ghostfolio yarn database:setup
 ```

-### Fetch Historical Data
+#### Fetch Historical Data

 Open http://localhost:3333 in your browser and accomplish these steps:

@ -122,11 +130,15 @@ Open http://localhost:3333 in your browser and accomplish these steps:
 1. Go to the _Admin Control Panel_ and click _Gather All Data_ to fetch historical data
 1. Click _Sign out_ and check out the _Live Demo_

-### Upgrade Version
+#### Upgrade Version

 1. Increase the version of the `ghostfolio/ghostfolio` Docker image in `docker/docker-compose.yml`
-1. Run the following command to start the new Docker image: `docker-compose -f docker/docker-compose.yml up -d`
-1. Then, run the following command to keep your database schema in sync: `docker-compose -f docker/docker-compose.yml exec ghostfolio yarn database:migrate`
+1. Run the following command to start the new Docker image: `docker-compose --env-file ./.env -f docker/docker-compose.yml up -d`
+1. Then, run the following command to keep your database schema in sync: `docker-compose --env-file ./.env -f docker/docker-compose.yml exec ghostfolio yarn database:migrate`
+
+### Run with _Unraid_ (unofficial)
+
+Please follow the instructions of the Ghostfolio [Unraid Community App](https://unraid.net/community/apps?q=ghostfolio).

 ## Development

@ -140,7 +152,7 @@ Open http://localhost:3333 in your browser and accomplish these steps:
 ### Setup

 1. Run `yarn install`
-1. Run `docker-compose -f docker/docker-compose.dev.yml up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
+1. Run `docker-compose --env-file ./.env -f docker/docker-compose.dev.yml up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
 1. Run `yarn database:setup` to initialize the database schema and populate your database with (example) data
 1. Start the server and the client (see [_Development_](#Development))
 1. Create a new user via _Get Started_ (this first user will get the role `ADMIN`)
--- a/angular.json
+++ b/angular.json
@ -47,7 +47,7 @@
        "test": {
          "builder": "@nrwl/jest:jest",
          "options": {
-            "jestConfig": "apps/api/jest.config.js",
+            "jestConfig": "apps/api/jest.config.ts",
            "passWithNoTests": true
          },
          "outputs": ["coverage/apps/api"]
@ -180,7 +180,7 @@
        "test": {
          "builder": "@nrwl/jest:jest",
          "options": {
-            "jestConfig": "apps/client/jest.config.js",
+            "jestConfig": "apps/client/jest.config.ts",
            "passWithNoTests": true
          },
          "outputs": ["coverage/apps/client"]
@ -225,7 +225,7 @@
          "builder": "@nrwl/jest:jest",
          "outputs": ["coverage/libs/common"],
          "options": {
-            "jestConfig": "libs/common/jest.config.js",
+            "jestConfig": "libs/common/jest.config.ts",
            "passWithNoTests": true
          }
        }
@ -247,7 +247,7 @@
          "builder": "@nrwl/jest:jest",
          "outputs": ["coverage/libs/ui"],
          "options": {
-            "jestConfig": "libs/ui/jest.config.js",
+            "jestConfig": "libs/ui/jest.config.ts",
            "passWithNoTests": true
          }
        },
--- a/apps/api/jest.config.ts
+++ b/apps/api/jest.config.ts
@ -1,6 +1,6 @@
 module.exports = {
  displayName: 'api',
-  preset: '../../jest.preset.js',
+
  globals: {
    'ts-jest': {
      tsconfig: '<rootDir>/tsconfig.spec.json'
@ -12,5 +12,6 @@ module.exports = {
  moduleFileExtensions: ['ts', 'js', 'html'],
  coverageDirectory: '../../coverage/apps/api',
  testTimeout: 10000,
-  testEnvironment: 'node'
+  testEnvironment: 'node',
+  preset: '../../jest.preset.ts'
 };
--- a/apps/api/src/app/access/access.controller.ts
+++ b/apps/api/src/app/access/access.controller.ts
@ -78,8 +78,12 @@ export class AccessController {
  @Delete(':id')
  @UseGuards(AuthGuard('jwt'))
  public async deleteAccess(@Param('id') id: string): Promise<AccessModule> {
+    const access = await this.accessService.access({ id });
+
    if (
-      !hasPermission(this.request.user.permissions, permissions.deleteAccess)
+      !hasPermission(this.request.user.permissions, permissions.deleteAccess) ||
+      !access ||
+      access.userId !== this.request.user.id
    ) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.FORBIDDEN),
@ -88,10 +92,7 @@ export class AccessController {
    }

    return this.accessService.deleteAccess({
-      id_userId: {
-        id,
-        userId: this.request.user.id
-      }
+      id
    });
  }
 }
--- a/apps/api/src/app/account/account.service.ts
+++ b/apps/api/src/app/account/account.service.ts
@ -1,8 +1,10 @@
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
+import { Filter } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';
 import { Account, Order, Platform, Prisma } from '@prisma/client';
 import Big from 'big.js';
+import { groupBy } from 'lodash';

 import { CashDetails } from './interfaces/cash-details.interface';

@ -102,22 +104,43 @@ export class AccountService {
    });
  }

-  public async getCashDetails(
-    aUserId: string,
-    aCurrency: string
-  ): Promise<CashDetails> {
+  public async getCashDetails({
+    currency,
+    filters = [],
+    userId
+  }: {
+    currency: string;
+    filters?: Filter[];
+    userId: string;
+  }): Promise<CashDetails> {
    let totalCashBalanceInBaseCurrency = new Big(0);

-    const accounts = await this.accounts({
-      where: { userId: aUserId }
+    const where: Prisma.AccountWhereInput = { userId };
+
+    const {
+      ACCOUNT: filtersByAccount,
+      ASSET_CLASS: filtersByAssetClass,
+      TAG: filtersByTag
+    } = groupBy(filters, (filter) => {
+      return filter.type;
    });

+    if (filtersByAccount?.length > 0) {
+      where.id = {
+        in: filtersByAccount.map(({ id }) => {
+          return id;
+        })
+      };
+    }
+
+    const accounts = await this.accounts({ where });
+
    for (const account of accounts) {
      totalCashBalanceInBaseCurrency = totalCashBalanceInBaseCurrency.plus(
        this.exchangeRateDataService.toCurrency(
          account.balance,
          account.currency,
-          aCurrency
+          currency
        )
      );
    }
--- a/apps/api/src/app/admin/admin.controller.ts
+++ b/apps/api/src/app/admin/admin.controller.ts
@ -1,6 +1,10 @@
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
 import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';
+import {
+  GATHER_ASSET_PROFILE_PROCESS,
+  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
+} from '@ghostfolio/common/config';
 import {
  AdminData,
  AdminMarketData,
@ -56,6 +60,24 @@ export class AdminController {
    return this.adminService.get();
  }

+  @Post('gather')
+  @UseGuards(AuthGuard('jwt'))
+  public async gather7Days(): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    this.dataGatheringService.gather7Days();
+  }
+
  @Post('gather/max')
  @UseGuards(AuthGuard('jwt'))
  public async gatherMax(): Promise<void> {
@ -71,10 +93,20 @@ export class AdminController {
      );
    }

-    await this.dataGatheringService.gatherProfileData();
-    this.dataGatheringService.gatherMax();
+    const uniqueAssets = await this.dataGatheringService.getUniqueAssets();

-    return;
+    for (const { dataSource, symbol } of uniqueAssets) {
+      await this.dataGatheringService.addJobToQueue(
+        GATHER_ASSET_PROFILE_PROCESS,
+        {
+          dataSource,
+          symbol
+        },
+        GATHER_ASSET_PROFILE_PROCESS_OPTIONS
+      );
+    }
+
+    this.dataGatheringService.gatherMax();
  }

  @Post('gather/profile-data')
@ -92,9 +124,18 @@ export class AdminController {
      );
    }

-    this.dataGatheringService.gatherProfileData();
+    const uniqueAssets = await this.dataGatheringService.getUniqueAssets();

-    return;
+    for (const { dataSource, symbol } of uniqueAssets) {
+      await this.dataGatheringService.addJobToQueue(
+        GATHER_ASSET_PROFILE_PROCESS,
+        {
+          dataSource,
+          symbol
+        },
+        GATHER_ASSET_PROFILE_PROCESS_OPTIONS
+      );
+    }
  }

  @Post('gather/profile-data/:dataSource/:symbol')
@ -115,9 +156,14 @@ export class AdminController {
      );
    }

-    this.dataGatheringService.gatherProfileData([{ dataSource, symbol }]);
-
-    return;
+    await this.dataGatheringService.addJobToQueue(
+      GATHER_ASSET_PROFILE_PROCESS,
+      {
+        dataSource,
+        symbol
+      },
+      GATHER_ASSET_PROFILE_PROCESS_OPTIONS
+    );
  }

  @Post('gather/:dataSource/:symbol')
--- a/apps/api/src/app/admin/admin.module.ts
+++ b/apps/api/src/app/admin/admin.module.ts
@ -11,6 +11,7 @@ import { Module } from '@nestjs/common';

 import { AdminController } from './admin.controller';
 import { AdminService } from './admin.service';
+import { QueueModule } from './queue/queue.module';

@Module({
  imports: [
@ -21,6 +22,7 @@ import { AdminService } from './admin.service';
    MarketDataModule,
    PrismaModule,
    PropertyModule,
+    QueueModule,
    SubscriptionModule,
    SymbolProfileModule
  ],
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@ -6,7 +6,7 @@ import { MarketDataService } from '@ghostfolio/api/services/market-data.service'
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import { PROPERTY_CURRENCIES, baseCurrency } from '@ghostfolio/common/config';
+import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';
 import {
  AdminData,
  AdminMarketData,
@ -15,11 +15,13 @@ import {
  UniqueAsset
 } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';
-import { DataSource, Property } from '@prisma/client';
+import { Property } from '@prisma/client';
 import { differenceInDays } from 'date-fns';

@Injectable()
 export class AdminService {
+  private baseCurrency: string;
+
  public constructor(
    private readonly configurationService: ConfigurationService,
    private readonly dataGatheringService: DataGatheringService,
@ -29,7 +31,9 @@ export class AdminService {
    private readonly propertyService: PropertyService,
    private readonly subscriptionService: SubscriptionService,
    private readonly symbolProfileService: SymbolProfileService
-  ) {}
+  ) {
+    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
+  }

  public async deleteProfileData({ dataSource, symbol }: UniqueAsset) {
    await this.marketDataService.deleteMany({ dataSource, symbol });
@ -38,25 +42,22 @@ export class AdminService {

  public async get(): Promise<AdminData> {
    return {
-      dataGatheringProgress:
-        await this.dataGatheringService.getDataGatheringProgress(),
      exchangeRates: this.exchangeRateDataService
        .getCurrencies()
        .filter((currency) => {
-          return currency !== baseCurrency;
+          return currency !== this.baseCurrency;
        })
        .map((currency) => {
          return {
-            label1: baseCurrency,
+            label1: this.baseCurrency,
            label2: currency,
            value: this.exchangeRateDataService.toCurrency(
              1,
-              baseCurrency,
+              this.baseCurrency,
              currency
            )
          };
        }),
-      lastDataGathering: await this.getLastDataGathering(),
      settings: await this.propertyService.get(),
      transactionCount: await this.prismaService.order.count(),
      userCount: await this.prismaService.user.count(),
@ -157,30 +158,11 @@ export class AdminService {

    if (key === PROPERTY_CURRENCIES) {
      await this.exchangeRateDataService.initialize();
-      await this.dataGatheringService.reset();
    }

    return response;
  }

-  private async getLastDataGathering() {
-    const lastDataGathering =
-      await this.dataGatheringService.getLastDataGathering();
-
-    if (lastDataGathering) {
-      return lastDataGathering;
-    }
-
-    const dataGatheringInProgress =
-      await this.dataGatheringService.getIsInProgress();
-
-    if (dataGatheringInProgress) {
-      return 'IN_PROGRESS';
-    }
-
-    return undefined;
-  }
-
  private async getUsersWithAnalytics(): Promise<AdminData['users']> {
    const usersWithAnalytics = await this.prismaService.user.findMany({
      orderBy: {
--- a/apps/api/src/app/admin/queue/queue.controller.ts
+++ b/apps/api/src/app/admin/queue/queue.controller.ts
@ -0,0 +1,87 @@
+import { AdminJobs } from '@ghostfolio/common/interfaces';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
+import {
+  Controller,
+  Delete,
+  Get,
+  HttpException,
+  Inject,
+  Param,
+  Query,
+  UseGuards
+} from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
+import { AuthGuard } from '@nestjs/passport';
+import { JobStatus } from 'bull';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
+
+import { QueueService } from './queue.service';
+
+@Controller('admin/queue')
+export class QueueController {
+  public constructor(
+    private readonly queueService: QueueService,
+    @Inject(REQUEST) private readonly request: RequestWithUser
+  ) {}
+
+  @Delete('job')
+  @UseGuards(AuthGuard('jwt'))
+  public async deleteJobs(
+    @Query('status') filterByStatus?: string
+  ): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const status = <JobStatus[]>filterByStatus?.split(',') ?? undefined;
+    return this.queueService.deleteJobs({ status });
+  }
+
+  @Get('job')
+  @UseGuards(AuthGuard('jwt'))
+  public async getJobs(
+    @Query('status') filterByStatus?: string
+  ): Promise<AdminJobs> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const status = <JobStatus[]>filterByStatus?.split(',') ?? undefined;
+    return this.queueService.getJobs({ status });
+  }
+
+  @Delete('job/:id')
+  @UseGuards(AuthGuard('jwt'))
+  public async deleteJob(@Param('id') id: string): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.queueService.deleteJob(id);
+  }
+}
--- a/apps/api/src/app/admin/queue/queue.module.ts
+++ b/apps/api/src/app/admin/queue/queue.module.ts
@ -0,0 +1,12 @@
+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
+import { Module } from '@nestjs/common';
+
+import { QueueController } from './queue.controller';
+import { QueueService } from './queue.service';
+
+@Module({
+  controllers: [QueueController],
+  imports: [DataGatheringModule],
+  providers: [QueueService]
+})
+export class QueueModule {}
--- a/apps/api/src/app/admin/queue/queue.service.ts
+++ b/apps/api/src/app/admin/queue/queue.service.ts
@ -0,0 +1,65 @@
+import {
+  DATA_GATHERING_QUEUE,
+  QUEUE_JOB_STATUS_LIST
+} from '@ghostfolio/common/config';
+import { AdminJobs } from '@ghostfolio/common/interfaces';
+import { InjectQueue } from '@nestjs/bull';
+import { Injectable, Logger } from '@nestjs/common';
+import { JobStatus, Queue } from 'bull';
+
+@Injectable()
+export class QueueService {
+  public constructor(
+    @InjectQueue(DATA_GATHERING_QUEUE)
+    private readonly dataGatheringQueue: Queue
+  ) {}
+
+  public async deleteJob(aId: string) {
+    return (await this.dataGatheringQueue.getJob(aId))?.remove();
+  }
+
+  public async deleteJobs({
+    status = QUEUE_JOB_STATUS_LIST
+  }: {
+    status?: JobStatus[];
+  }) {
+    const jobs = await this.dataGatheringQueue.getJobs(status);
+
+    for (const job of jobs) {
+      try {
+        await job.remove();
+      } catch (error) {
+        Logger.warn(error, 'QueueService');
+      }
+    }
+  }
+
+  public async getJobs({
+    limit = 1000,
+    status = QUEUE_JOB_STATUS_LIST
+  }: {
+    limit?: number;
+    status?: JobStatus[];
+  }): Promise<AdminJobs> {
+    const jobs = await this.dataGatheringQueue.getJobs(status);
+
+    const jobsWithState = await Promise.all(
+      jobs.slice(0, limit).map(async (job) => {
+        return {
+          attemptsMade: job.attemptsMade + 1,
+          data: job.data,
+          finishedOn: job.finishedOn,
+          id: job.id,
+          name: job.name,
+          stacktrace: job.stacktrace,
+          state: await job.getState(),
+          timestamp: job.timestamp
+        };
+      })
+    );
+
+    return {
+      jobs: jobsWithState
+    };
+  }
+}
--- a/apps/api/src/app/app.controller.ts
+++ b/apps/api/src/app/app.controller.ts
@ -1,26 +1,6 @@
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { Controller } from '@nestjs/common';

-import { RedisCacheService } from './redis-cache/redis-cache.service';
-
@Controller()
 export class AppController {
-  public constructor(
-    private readonly dataGatheringService: DataGatheringService,
-    private readonly redisCacheService: RedisCacheService
-  ) {
-    this.initialize();
-  }
-
-  private async initialize() {
-    this.redisCacheService.reset();
-
-    const isDataGatheringInProgress =
-      await this.dataGatheringService.getIsInProgress();
-
-    if (isDataGatheringInProgress) {
-      // Prepare for automatical data gathering, if hung up in progress state
-      await this.dataGatheringService.reset();
-    }
-  }
+  public constructor() {}
 }
--- a/apps/api/src/app/app.module.ts
+++ b/apps/api/src/app/app.module.ts
@ -9,6 +9,7 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { TwitterBotModule } from '@ghostfolio/api/services/twitter-bot/twitter-bot.module';
+import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
@ -19,6 +20,7 @@ import { AccountModule } from './account/account.module';
 import { AdminModule } from './admin/admin.module';
 import { AppController } from './app.controller';
 import { AuthModule } from './auth/auth.module';
+import { BenchmarkModule } from './benchmark/benchmark.module';
 import { CacheModule } from './cache/cache.module';
 import { ExportModule } from './export/export.module';
 import { ImportModule } from './import/import.module';
@ -36,6 +38,14 @@ import { UserModule } from './user/user.module';
    AccountModule,
    AuthDeviceModule,
    AuthModule,
+    BenchmarkModule,
+    BullModule.forRoot({
+      redis: {
+        host: process.env.REDIS_HOST,
+        port: parseInt(process.env.REDIS_PORT, 10),
+        password: process.env.REDIS_PASSWORD
+      }
+    }),
    CacheModule,
    ConfigModule.forRoot(),
    ConfigurationModule,
--- a/apps/api/src/app/benchmark/benchmark.controller.ts
+++ b/apps/api/src/app/benchmark/benchmark.controller.ts
@ -0,0 +1,32 @@
+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 { PropertyService } from '@ghostfolio/api/services/property/property.service';
+import { PROPERTY_BENCHMARKS } from '@ghostfolio/common/config';
+import { BenchmarkResponse, UniqueAsset } from '@ghostfolio/common/interfaces';
+import { Controller, Get, UseGuards, UseInterceptors } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+
+import { BenchmarkService } from './benchmark.service';
+
+@Controller('benchmark')
+export class BenchmarkController {
+  public constructor(
+    private readonly benchmarkService: BenchmarkService,
+    private readonly propertyService: PropertyService
+  ) {}
+
+  @Get()
+  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(TransformDataSourceInRequestInterceptor)
+  @UseInterceptors(TransformDataSourceInResponseInterceptor)
+  public async getBenchmark(): Promise<BenchmarkResponse> {
+    const benchmarkAssets: UniqueAsset[] =
+      ((await this.propertyService.getByKey(
+        PROPERTY_BENCHMARKS
+      )) as UniqueAsset[]) ?? [];
+
+    return {
+      benchmarks: await this.benchmarkService.getBenchmarks(benchmarkAssets)
+    };
+  }
+}
--- a/apps/api/src/app/benchmark/benchmark.module.ts
+++ b/apps/api/src/app/benchmark/benchmark.module.ts
@ -0,0 +1,25 @@
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
+import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
+import { MarketDataModule } from '@ghostfolio/api/services/market-data.module';
+import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
+import { Module } from '@nestjs/common';
+
+import { BenchmarkController } from './benchmark.controller';
+import { BenchmarkService } from './benchmark.service';
+
+@Module({
+  controllers: [BenchmarkController],
+  exports: [BenchmarkService],
+  imports: [
+    ConfigurationModule,
+    DataProviderModule,
+    MarketDataModule,
+    PropertyModule,
+    RedisCacheModule,
+    SymbolProfileModule
+  ],
+  providers: [BenchmarkService]
+})
+export class BenchmarkModule {}
--- a/apps/api/src/app/benchmark/benchmark.service.ts
+++ b/apps/api/src/app/benchmark/benchmark.service.ts
@ -0,0 +1,84 @@
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
+import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
+import { BenchmarkResponse, UniqueAsset } from '@ghostfolio/common/interfaces';
+import { Injectable } from '@nestjs/common';
+import Big from 'big.js';
+
+@Injectable()
+export class BenchmarkService {
+  private readonly CACHE_KEY_BENCHMARKS = 'BENCHMARKS';
+
+  public constructor(
+    private readonly dataProviderService: DataProviderService,
+    private readonly marketDataService: MarketDataService,
+    private readonly redisCacheService: RedisCacheService,
+    private readonly symbolProfileService: SymbolProfileService
+  ) {}
+
+  public async getBenchmarks(
+    benchmarkAssets: UniqueAsset[]
+  ): Promise<BenchmarkResponse['benchmarks']> {
+    let benchmarks: BenchmarkResponse['benchmarks'];
+
+    try {
+      benchmarks = JSON.parse(
+        await this.redisCacheService.get(this.CACHE_KEY_BENCHMARKS)
+      );
+
+      if (benchmarks) {
+        return benchmarks;
+      }
+    } catch {}
+
+    const promises: Promise<number>[] = [];
+
+    const [quotes, assetProfiles] = await Promise.all([
+      this.dataProviderService.getQuotes(benchmarkAssets),
+      this.symbolProfileService.getSymbolProfiles(benchmarkAssets)
+    ]);
+
+    for (const benchmarkAsset of benchmarkAssets) {
+      promises.push(this.marketDataService.getMax(benchmarkAsset));
+    }
+
+    const allTimeHighs = await Promise.all(promises);
+
+    benchmarks = allTimeHighs.map((allTimeHigh, index) => {
+      const { marketPrice } = quotes[benchmarkAssets[index].symbol];
+
+      const performancePercentFromAllTimeHigh = new Big(marketPrice)
+        .div(allTimeHigh)
+        .minus(1);
+
+      return {
+        marketCondition: this.getMarketCondition(
+          performancePercentFromAllTimeHigh
+        ),
+        name: assetProfiles.find(({ dataSource, symbol }) => {
+          return (
+            dataSource === benchmarkAssets[index].dataSource &&
+            symbol === benchmarkAssets[index].symbol
+          );
+        })?.name,
+        performances: {
+          allTimeHigh: {
+            performancePercent: performancePercentFromAllTimeHigh.toNumber()
+          }
+        }
+      };
+    });
+
+    await this.redisCacheService.set(
+      this.CACHE_KEY_BENCHMARKS,
+      JSON.stringify(benchmarks)
+    );
+
+    return benchmarks;
+  }
+
+  private getMarketCondition(aPerformanceInPercent: Big) {
+    return aPerformanceInPercent.lte(-0.2) ? 'BEAR_MARKET' : 'NEUTRAL_MARKET';
+  }
+}
--- a/apps/api/src/app/cache/cache.controller.ts
+++ b/apps/api/src/app/cache/cache.controller.ts
@ -1,25 +1,39 @@
-import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
 import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
-import { Controller, Inject, Post, UseGuards } from '@nestjs/common';
+import {
+  Controller,
+  HttpException,
+  Inject,
+  Post,
+  UseGuards
+} from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';

@Controller('cache')
 export class CacheController {
  public constructor(
-    private readonly cacheService: CacheService,
    private readonly redisCacheService: RedisCacheService,
    @Inject(REQUEST) private readonly request: RequestWithUser
-  ) {
-    this.redisCacheService.reset();
-  }
+  ) {}

  @Post('flush')
  @UseGuards(AuthGuard('jwt'))
  public async flushCache(): Promise<void> {
-    this.redisCacheService.reset();
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }

-    return this.cacheService.flush();
+    return this.redisCacheService.reset();
  }
 }
--- a/apps/api/src/app/cache/cache.module.ts
+++ b/apps/api/src/app/cache/cache.module.ts
@ -1,4 +1,3 @@
-import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
@ -11,7 +10,6 @@ import { Module } from '@nestjs/common';
 import { CacheController } from './cache.controller';

@Module({
-  exports: [CacheService],
  controllers: [CacheController],
  imports: [
    ConfigurationModule,
@ -21,7 +19,6 @@ import { CacheController } from './cache.controller';
    PrismaModule,
    RedisCacheModule,
    SymbolProfileModule
-  ],
-  providers: [CacheService]
+  ]
 })
 export class CacheModule {}
--- a/apps/api/src/app/cache/cache.service.ts
+++ b/apps/api/src/app/cache/cache.service.ts
@ -1,15 +0,0 @@
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class CacheService {
-  public constructor(
-    private readonly dataGaterhingService: DataGatheringService
-  ) {}
-
-  public async flush(): Promise<void> {
-    await this.dataGaterhingService.reset();
-
-    return;
-  }
-}
--- a/apps/api/src/app/info/info.module.ts
+++ b/apps/api/src/app/info/info.module.ts
@ -6,6 +6,7 @@ import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-d
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
+import { TagModule } from '@ghostfolio/api/services/tag/tag.module';
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';

@ -26,7 +27,8 @@ import { InfoService } from './info.service';
    PrismaModule,
    PropertyModule,
    RedisCacheModule,
-    SymbolProfileModule
+    SymbolProfileModule,
+    TagModule
  ],
  providers: [InfoService]
 })
--- a/apps/api/src/app/info/info.service.ts
+++ b/apps/api/src/app/info/info.service.ts
@ -4,6 +4,7 @@ import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.se
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
+import { TagService } from '@ghostfolio/api/services/tag/tag.service';
 import {
  DEMO_USER_ID,
  PROPERTY_IS_READ_ONLY_MODE,
@ -33,7 +34,8 @@ export class InfoService {
    private readonly jwtService: JwtService,
    private readonly prismaService: PrismaService,
    private readonly propertyService: PropertyService,
-    private readonly redisCacheService: RedisCacheService
+    private readonly redisCacheService: RedisCacheService,
+    private readonly tagService: TagService
  ) {}

  public async get(): Promise<InfoItem> {
@ -101,11 +103,12 @@ export class InfoService {
      isReadOnlyMode,
      platforms,
      systemMessage,
+      baseCurrency: this.configurationService.get('BASE_CURRENCY'),
      currencies: this.exchangeRateDataService.getCurrencies(),
      demoAuthToken: this.getDemoAuthToken(),
-      lastDataGathering: await this.getLastDataGathering(),
      statistics: await this.getStatistics(),
-      subscriptions: await this.getSubscriptions()
+      subscriptions: await this.getSubscriptions(),
+      tags: await this.tagService.get()
    };
  }

@ -211,13 +214,6 @@ export class InfoService {
    });
  }

-  private async getLastDataGathering() {
-    const lastDataGathering =
-      await this.dataGatheringService.getLastDataGathering();
-
-    return lastDataGathering ?? null;
-  }
-
  private async getStatistics() {
    if (!this.configurationService.get('ENABLE_FEATURE_STATISTICS')) {
      return undefined;
--- a/apps/api/src/app/order/create-order.dto.ts
+++ b/apps/api/src/app/order/create-order.dto.ts
@ -1,4 +1,4 @@
-import { DataSource, Type } from '@prisma/client';
+import { AssetClass, AssetSubClass, DataSource, Type } from '@prisma/client';
 import {
  IsEnum,
  IsISO8601,
@ -10,14 +10,22 @@ import {
 export class CreateOrderDto {
  @IsString()
  @IsOptional()
-  accountId: string;
+  accountId?: string;
+
+  @IsEnum(AssetClass, { each: true })
+  @IsOptional()
+  assetClass?: AssetClass;
+
+  @IsEnum(AssetSubClass, { each: true })
+  @IsOptional()
+  assetSubClass?: AssetSubClass;

  @IsString()
  currency: string;

  @IsEnum(DataSource, { each: true })
  @IsOptional()
-  dataSource: DataSource;
+  dataSource?: DataSource;

  @IsISO8601()
  date: string;
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@ -1,5 +1,6 @@
 import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { nullifyValuesInObjects } from '@ghostfolio/api/helper/object.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 { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
@ -42,8 +43,12 @@ export class OrderController {
  @Delete(':id')
  @UseGuards(AuthGuard('jwt'))
  public async deleteOrder(@Param('id') id: string): Promise<OrderModel> {
+    const order = await this.orderService.order({ id });
+
    if (
-      !hasPermission(this.request.user.permissions, permissions.deleteOrder)
+      !hasPermission(this.request.user.permissions, permissions.deleteOrder) ||
+      !order ||
+      order.userId !== this.request.user.id
    ) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.FORBIDDEN),
@ -52,15 +57,13 @@ export class OrderController {
    }

    return this.orderService.deleteOrder({
-      id_userId: {
-        id,
-        userId: this.request.user.id
-      }
+      id
    });
  }

  @Get()
  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(RedactValuesInResponseInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getAllOrders(
    @Headers('impersonation-id') impersonationId
@ -135,23 +138,15 @@ export class OrderController {
  @UseGuards(AuthGuard('jwt'))
  @UseInterceptors(TransformDataSourceInRequestInterceptor)
  public async update(@Param('id') id: string, @Body() data: UpdateOrderDto) {
-    if (
-      !hasPermission(this.request.user.permissions, permissions.updateOrder)
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
    const originalOrder = await this.orderService.order({
-      id_userId: {
-        id,
-        userId: this.request.user.id
-      }
+      id
    });

-    if (!originalOrder) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.updateOrder) ||
+      !originalOrder ||
+      originalOrder.userId !== this.request.user.id
+    ) {
      throw new HttpException(
        getReasonPhrase(StatusCodes.FORBIDDEN),
        StatusCodes.FORBIDDEN
@ -178,15 +173,17 @@ export class OrderController {
              dataSource: data.dataSource,
              symbol: data.symbol
            }
+          },
+          update: {
+            assetClass: data.assetClass,
+            assetSubClass: data.assetSubClass,
+            name: data.symbol
          }
        },
        User: { connect: { id: this.request.user.id } }
      },
      where: {
-        id_userId: {
-          id,
-          userId: this.request.user.id
-        }
+        id
      }
    });
  }
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@ -1,14 +1,26 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
-import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
+import {
+  GATHER_ASSET_PROFILE_PROCESS,
+  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
+} from '@ghostfolio/common/config';
+import { Filter } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
-import { DataSource, Order, Prisma, Type as TypeOfOrder } from '@prisma/client';
+import {
+  AssetClass,
+  AssetSubClass,
+  DataSource,
+  Order,
+  Prisma,
+  Type as TypeOfOrder
+} from '@prisma/client';
 import Big from 'big.js';
 import { endOfToday, isAfter } from 'date-fns';
+import { groupBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';

 import { Activity } from './interfaces/activities.interface';
@ -17,9 +29,8 @@ import { Activity } from './interfaces/activities.interface';
 export class OrderService {
  public constructor(
    private readonly accountService: AccountService,
-    private readonly cacheService: CacheService,
-    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly dataGatheringService: DataGatheringService,
+    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly prismaService: PrismaService,
    private readonly symbolProfileService: SymbolProfileService
  ) {}
@ -55,6 +66,8 @@ export class OrderService {
  public async createOrder(
    data: Prisma.OrderCreateInput & {
      accountId?: string;
+      assetClass?: AssetClass;
+      assetSubClass?: AssetSubClass;
      currency?: string;
      dataSource?: DataSource;
      symbol?: string;
@ -77,6 +90,8 @@ export class OrderService {
    };

    if (data.type === 'ITEM') {
+      const assetClass = data.assetClass;
+      const assetSubClass = data.assetSubClass;
      const currency = data.SymbolProfile.connectOrCreate.create.currency;
      const dataSource: DataSource = 'MANUAL';
      const id = uuidv4();
@ -84,6 +99,8 @@ export class OrderService {

      Account = undefined;
      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;
@ -97,12 +114,14 @@ export class OrderService {
        data.SymbolProfile.connectOrCreate.create.symbol.toUpperCase();
    }

-    await this.dataGatheringService.gatherProfileData([
+    await this.dataGatheringService.addJobToQueue(
+      GATHER_ASSET_PROFILE_PROCESS,
      {
        dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
        symbol: data.SymbolProfile.connectOrCreate.create.symbol
-      }
-    ]);
+      },
+      GATHER_ASSET_PROFILE_PROCESS_OPTIONS
+    );

    const isDraft = isAfter(data.date as Date, endOfToday());

@ -117,9 +136,9 @@ export class OrderService {
      ]);
    }

-    await this.cacheService.flush();
-
    delete data.accountId;
+    delete data.assetClass;
+    delete data.assetSubClass;
    delete data.currency;
    delete data.dataSource;
    delete data.symbol;
@ -151,11 +170,13 @@ export class OrderService {
  }

  public async getOrders({
+    filters,
    includeDrafts = false,
    types,
    userCurrency,
    userId
  }: {
+    filters?: Filter[];
    includeDrafts?: boolean;
    types?: TypeOfOrder[];
    userCurrency: string;
@ -163,10 +184,64 @@ export class OrderService {
  }): Promise<Activity[]> {
    const where: Prisma.OrderWhereInput = { userId };

+    const {
+      ACCOUNT: filtersByAccount,
+      ASSET_CLASS: filtersByAssetClass,
+      TAG: filtersByTag
+    } = groupBy(filters, (filter) => {
+      return filter.type;
+    });
+
+    if (filtersByAccount?.length > 0) {
+      where.accountId = {
+        in: filtersByAccount.map(({ id }) => {
+          return id;
+        })
+      };
+    }
+
    if (includeDrafts === false) {
      where.isDraft = false;
    }

+    if (filtersByAssetClass?.length > 0) {
+      where.SymbolProfile = {
+        OR: [
+          {
+            AND: [
+              {
+                OR: filtersByAssetClass.map(({ id }) => {
+                  return { assetClass: AssetClass[id] };
+                })
+              },
+              {
+                SymbolProfileOverrides: {
+                  is: null
+                }
+              }
+            ]
+          },
+          {
+            SymbolProfileOverrides: {
+              OR: filtersByAssetClass.map(({ id }) => {
+                return { assetClass: AssetClass[id] };
+              })
+            }
+          }
+        ]
+      };
+    }
+
+    if (filtersByTag?.length > 0) {
+      where.tags = {
+        some: {
+          OR: filtersByTag.map(({ id }) => {
+            return { id };
+          })
+        }
+      };
+    }
+
    if (types) {
      where.OR = types.map((type) => {
        return {
@ -188,7 +263,8 @@ export class OrderService {
            }
          },
          // eslint-disable-next-line @typescript-eslint/naming-convention
-          SymbolProfile: true
+          SymbolProfile: true,
+          tags: true
        },
        orderBy: { date: 'asc' }
      })
@ -217,6 +293,8 @@ export class OrderService {
    where
  }: {
    data: Prisma.OrderUpdateInput & {
+      assetClass?: AssetClass;
+      assetSubClass?: AssetSubClass;
      currency?: string;
      dataSource?: DataSource;
      symbol?: string;
@ -230,10 +308,10 @@ export class OrderService {
    let isDraft = false;

    if (data.type === 'ITEM') {
-      const name = data.SymbolProfile.connect.dataSource_symbol.symbol;
-
-      data.SymbolProfile = { update: { name } };
+      delete data.SymbolProfile.connect;
    } else {
+      delete data.SymbolProfile.update;
+
      isDraft = isAfter(data.date as Date, endOfToday());

      if (!isDraft) {
@ -248,8 +326,8 @@ export class OrderService {
      }
    }

-    await this.cacheService.flush();
-
+    delete data.assetClass;
+    delete data.assetSubClass;
    delete data.currency;
    delete data.dataSource;
    delete data.symbol;
--- a/apps/api/src/app/order/update-order.dto.ts
+++ b/apps/api/src/app/order/update-order.dto.ts
@ -1,10 +1,24 @@
-import { DataSource, Type } from '@prisma/client';
-import { IsISO8601, IsNumber, IsOptional, IsString } from 'class-validator';
+import { AssetClass, AssetSubClass, DataSource, Type } from '@prisma/client';
+import {
+  IsEnum,
+  IsISO8601,
+  IsNumber,
+  IsOptional,
+  IsString
+} from 'class-validator';

 export class UpdateOrderDto {
  @IsOptional()
  @IsString()
-  accountId: string;
+  accountId?: string;
+
+  @IsEnum(AssetClass, { each: true })
+  @IsOptional()
+  assetClass?: AssetClass;
+
+  @IsEnum(AssetSubClass, { each: true })
+  @IsOptional()
+  assetSubClass?: AssetSubClass;

  @IsString()
  currency: string;
--- a/apps/api/src/app/portfolio/current-rate.service.mock.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.mock.ts
@ -1,6 +1,7 @@
 import { parseDate, resetHours } from '@ghostfolio/common/helper';
 import { addDays, endOfDay, isBefore, isSameDay } from 'date-fns';

+import { GetValueObject } from './interfaces/get-value-object.interface';
 import { GetValuesParams } from './interfaces/get-values-params.interface';

 function mockGetValue(symbol: string, date: Date) {
@ -33,8 +34,11 @@ function mockGetValue(symbol: string, date: Date) {
 }

 export const CurrentRateServiceMock = {
-  getValues: ({ dataGatheringItems, dateQuery }: GetValuesParams) => {
-    const result = [];
+  getValues: ({
+    dataGatheringItems,
+    dateQuery
+  }: GetValuesParams): Promise<GetValueObject[]> => {
+    const result: GetValueObject[] = [];
    if (dateQuery.lt) {
      for (
        let date = resetHours(dateQuery.gte);
@ -44,8 +48,10 @@ export const CurrentRateServiceMock = {
        for (const dataGatheringItem of dataGatheringItems) {
          result.push({
            date,
-            marketPrice: mockGetValue(dataGatheringItem.symbol, date)
-              .marketPrice,
+            marketPriceInBaseCurrency: mockGetValue(
+              dataGatheringItem.symbol,
+              date
+            ).marketPrice,
            symbol: dataGatheringItem.symbol
          });
        }
@ -55,8 +61,10 @@ export const CurrentRateServiceMock = {
        for (const dataGatheringItem of dataGatheringItems) {
          result.push({
            date,
-            marketPrice: mockGetValue(dataGatheringItem.symbol, date)
-              .marketPrice,
+            marketPriceInBaseCurrency: mockGetValue(
+              dataGatheringItem.symbol,
+              date
+            ).marketPrice,
            symbol: dataGatheringItem.symbol
          });
        }
--- a/apps/api/src/app/portfolio/current-rate.service.spec.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.spec.ts
@ -4,6 +4,7 @@ import { MarketDataService } from '@ghostfolio/api/services/market-data.service'
 import { DataSource, MarketData } from '@prisma/client';

 import { CurrentRateService } from './current-rate.service';
+import { GetValueObject } from './interfaces/get-value-object.interface';

 jest.mock('@ghostfolio/api/services/market-data.service', () => {
  return {
@ -73,7 +74,12 @@ describe('CurrentRateService', () => {

  beforeAll(async () => {
    dataProviderService = new DataProviderService(null, [], null);
-    exchangeRateDataService = new ExchangeRateDataService(null, null, null);
+    exchangeRateDataService = new ExchangeRateDataService(
+      null,
+      null,
+      null,
+      null
+    );
    marketDataService = new MarketDataService(null);

    await exchangeRateDataService.initialize();
@ -96,15 +102,15 @@ describe('CurrentRateService', () => {
        },
        userCurrency: 'CHF'
      })
-    ).toMatchObject([
+    ).toMatchObject<GetValueObject[]>([
      {
        date: undefined,
-        marketPrice: 1841.823902,
+        marketPriceInBaseCurrency: 1841.823902,
        symbol: 'AMZN'
      },
      {
        date: undefined,
-        marketPrice: 1847.839966,
+        marketPriceInBaseCurrency: 1847.839966,
        symbol: 'AMZN'
      }
    ]);
--- a/apps/api/src/app/portfolio/current-rate.service.ts
+++ b/apps/api/src/app/portfolio/current-rate.service.ts
@ -28,13 +28,7 @@ export class CurrentRateService {
      (!dateQuery.gte || isBefore(dateQuery.gte, new Date())) &&
      (!dateQuery.in || this.containsToday(dateQuery.in));

-    const promises: Promise<
-      {
-        date: Date;
-        marketPrice: number;
-        symbol: string;
-      }[]
-    >[] = [];
+    const promises: Promise<GetValueObject[]>[] = [];

    if (includeToday) {
      const today = resetHours(new Date());
@ -42,16 +36,17 @@ export class CurrentRateService {
        this.dataProviderService
          .getQuotes(dataGatheringItems)
          .then((dataResultProvider) => {
-            const result = [];
+            const result: GetValueObject[] = [];
            for (const dataGatheringItem of dataGatheringItems) {
              result.push({
                date: today,
-                marketPrice: this.exchangeRateDataService.toCurrency(
-                  dataResultProvider?.[dataGatheringItem.symbol]?.marketPrice ??
-                    0,
-                  dataResultProvider?.[dataGatheringItem.symbol]?.currency,
-                  userCurrency
-                ),
+                marketPriceInBaseCurrency:
+                  this.exchangeRateDataService.toCurrency(
+                    dataResultProvider?.[dataGatheringItem.symbol]
+                      ?.marketPrice ?? 0,
+                    dataResultProvider?.[dataGatheringItem.symbol]?.currency,
+                    userCurrency
+                  ),
                symbol: dataGatheringItem.symbol
              });
            }
@ -74,11 +69,12 @@ export class CurrentRateService {
          return data.map((marketDataItem) => {
            return {
              date: marketDataItem.date,
-              marketPrice: this.exchangeRateDataService.toCurrency(
-                marketDataItem.marketPrice,
-                currencies[marketDataItem.symbol],
-                userCurrency
-              ),
+              marketPriceInBaseCurrency:
+                this.exchangeRateDataService.toCurrency(
+                  marketDataItem.marketPrice,
+                  currencies[marketDataItem.symbol],
+                  userCurrency
+                ),
              symbol: marketDataItem.symbol
            };
          });
--- a/apps/api/src/app/portfolio/interfaces/get-value-object.interface.ts
+++ b/apps/api/src/app/portfolio/interfaces/get-value-object.interface.ts
@ -1,5 +1,5 @@
 export interface GetValueObject {
  date: Date;
-  marketPrice: number;
+  marketPriceInBaseCurrency: number;
  symbol: string;
 }
--- 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,5 +1,9 @@
-import { EnhancedSymbolProfile } from '@ghostfolio/api/services/interfaces/symbol-profile.interface';
+import {
+  EnhancedSymbolProfile,
+  HistoricalDataItem
+} from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
+import { Tag } from '@prisma/client';

 export interface PortfolioPositionDetail {
  averagePrice: number;
@ -16,6 +20,7 @@ export interface PortfolioPositionDetail {
  orders: OrderWithAccount[];
  quantity: number;
  SymbolProfile: EnhancedSymbolProfile;
+  tags: Tag[];
  transactionCount: number;
  value: number;
 }
@ -25,10 +30,3 @@ export interface HistoricalDataContainer {
  isAllTimeLow: boolean;
  items: HistoricalDataItem[];
 }
-
-export interface HistoricalDataItem {
-  averagePrice?: number;
-  date: string;
-  grossPerformancePercent?: number;
-  value: number;
-}
--- a/apps/api/src/app/portfolio/portfolio-calculator.ts
+++ b/apps/api/src/app/portfolio/portfolio-calculator.ts
@ -56,7 +56,7 @@ export class PortfolioCalculator {
    this.currentRateService = currentRateService;
    this.orders = orders;

-    this.orders.sort((a, b) => a.date.localeCompare(b.date));
+    this.orders.sort((a, b) => a.date?.localeCompare(b.date));
  }

  public computeTransactionPoints() {
@ -125,7 +125,7 @@ export class PortfolioCalculator {
        (transactionPointItem) => transactionPointItem.symbol !== order.symbol
      );
      newItems.push(currentTransactionPointItem);
-      newItems.sort((a, b) => a.symbol.localeCompare(b.symbol));
+      newItems.sort((a, b) => a.symbol?.localeCompare(b.symbol));
      if (lastDate !== currentDate || lastTransactionPoint === null) {
        lastTransactionPoint = {
          date: currentDate,
@ -231,9 +231,9 @@ export class PortfolioCalculator {
      if (!marketSymbolMap[date]) {
        marketSymbolMap[date] = {};
      }
-      if (marketSymbol.marketPrice) {
+      if (marketSymbol.marketPriceInBaseCurrency) {
        marketSymbolMap[date][marketSymbol.symbol] = new Big(
-          marketSymbol.marketPrice
+          marketSymbol.marketPriceInBaseCurrency
        );
      }
    }
@ -548,9 +548,9 @@ export class PortfolioCalculator {
        if (!marketSymbolMap[date]) {
          marketSymbolMap[date] = {};
        }
-        if (marketSymbol.marketPrice) {
+        if (marketSymbol.marketPriceInBaseCurrency) {
          marketSymbolMap[date][marketSymbol.symbol] = new Big(
-            marketSymbol.marketPrice
+            marketSymbol.marketPriceInBaseCurrency
          );
        }
      }
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@ -4,13 +4,14 @@ import {
  hasNotDefinedValuesInObject,
  nullifyValuesInObject
 } from '@ghostfolio/api/helper/object.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 { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { baseCurrency } from '@ghostfolio/common/config';
 import { parseDate } from '@ghostfolio/common/helper';
 import {
+  Filter,
  PortfolioChart,
  PortfolioDetails,
  PortfolioInvestments,
@ -19,7 +20,7 @@ import {
  PortfolioReport,
  PortfolioSummary
 } from '@ghostfolio/common/interfaces';
-import type { RequestWithUser } from '@ghostfolio/common/types';
+import type { DateRange, RequestWithUser } from '@ghostfolio/common/types';
 import {
  Controller,
  Get,
@ -42,6 +43,8 @@ import { PortfolioService } from './portfolio.service';

@Controller('portfolio')
 export class PortfolioController {
+  private baseCurrency: string;
+
  public constructor(
    private readonly accessService: AccessService,
    private readonly configurationService: ConfigurationService,
@ -49,7 +52,9 @@ export class PortfolioController {
    private readonly portfolioService: PortfolioService,
    @Inject(REQUEST) private readonly request: RequestWithUser,
    private readonly userService: UserService
-  ) {}
+  ) {
+    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
+  }

  @Get('chart')
  @UseGuards(AuthGuard('jwt'))
@ -102,18 +107,48 @@ export class PortfolioController {

  @Get('details')
  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(RedactValuesInResponseInterceptor)
  @UseInterceptors(TransformDataSourceInResponseInterceptor)
  public async getDetails(
    @Headers('impersonation-id') impersonationId: string,
-    @Query('range') range
+    @Query('accounts') filterByAccounts?: string,
+    @Query('assetClasses') filterByAssetClasses?: string,
+    @Query('range') range?: DateRange,
+    @Query('tags') filterByTags?: string
  ): Promise<PortfolioDetails & { hasError: boolean }> {
    let hasError = false;

+    const accountIds = filterByAccounts?.split(',') ?? [];
+    const assetClasses = filterByAssetClasses?.split(',') ?? [];
+    const tagIds = filterByTags?.split(',') ?? [];
+
+    const filters: Filter[] = [
+      ...accountIds.map((accountId) => {
+        return <Filter>{
+          id: accountId,
+          type: 'ACCOUNT'
+        };
+      }),
+      ...assetClasses.map((assetClass) => {
+        return <Filter>{
+          id: assetClass,
+          type: 'ASSET_CLASS'
+        };
+      }),
+      ...tagIds.map((tagId) => {
+        return <Filter>{
+          id: tagId,
+          type: 'TAG'
+        };
+      })
+    ];
+
    const { accounts, holdings, hasErrors } =
      await this.portfolioService.getDetails(
        impersonationId,
        this.request.user.id,
-        range
+        range,
+        filters
      );

    if (hasErrors || hasNotDefinedValuesInObject(holdings)) {
@ -159,7 +194,11 @@ export class PortfolioController {
      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
      this.request.user.subscription.type === 'Basic';

-    return { accounts, hasError, holdings: isBasicUser ? {} : holdings };
+    return {
+      accounts,
+      hasError,
+      holdings: isBasicUser ? {} : holdings
+    };
  }

  @Get('investments')
@ -293,7 +332,7 @@ export class PortfolioController {
        return this.exchangeRateDataService.toCurrency(
          portfolioPosition.quantity * portfolioPosition.marketPrice,
          portfolioPosition.currency,
-          this.request.user?.Settings?.currency ?? baseCurrency
+          this.request.user?.Settings?.currency ?? this.baseCurrency
        );
      })
      .reduce((a, b) => a + b, 0);
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@ -15,20 +15,21 @@ import { CurrencyClusterRiskBaseCurrencyInitialInvestment } from '@ghostfolio/ap
 import { CurrencyClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/current-investment';
 import { CurrencyClusterRiskInitialInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/initial-investment';
 import { FeeRatioInitialInvestment } from '@ghostfolio/api/models/rules/fees/fee-ratio-initial-investment';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
-import { MarketState } from '@ghostfolio/api/services/interfaces/interfaces';
-import { EnhancedSymbolProfile } from '@ghostfolio/api/services/interfaces/symbol-profile.interface';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
 import {
  ASSET_SUB_CLASS_EMERGENCY_FUND,
-  UNKNOWN_KEY,
-  baseCurrency
+  UNKNOWN_KEY
 } from '@ghostfolio/common/config';
 import { DATE_FORMAT, parseDate } from '@ghostfolio/common/helper';
 import {
  Accounts,
+  EnhancedSymbolProfile,
+  Filter,
+  HistoricalDataItem,
  PortfolioDetails,
  PortfolioPerformanceResponse,
  PortfolioReport,
@ -46,7 +47,12 @@ import type {
 } from '@ghostfolio/common/types';
 import { Inject, Injectable } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
-import { AssetClass, DataSource, Type as TypeOfOrder } from '@prisma/client';
+import {
+  AssetClass,
+  DataSource,
+  Tag,
+  Type as TypeOfOrder
+} from '@prisma/client';
 import Big from 'big.js';
 import {
  differenceInDays,
@ -62,11 +68,10 @@ import {
  subDays,
  subYears
 } from 'date-fns';
-import { isEmpty, sortBy } from 'lodash';
+import { isEmpty, sortBy, uniq, uniqBy } from 'lodash';

 import {
  HistoricalDataContainer,
-  HistoricalDataItem,
  PortfolioPositionDetail
 } from './interfaces/portfolio-position-detail.interface';
 import { PortfolioCalculator } from './portfolio-calculator';
@ -77,8 +82,11 @@ const emergingMarkets = require('../../assets/countries/emerging-markets.json');

@Injectable()
 export class PortfolioService {
+  private baseCurrency: string;
+
  public constructor(
    private readonly accountService: AccountService,
+    private readonly configurationService: ConfigurationService,
    private readonly currentRateService: CurrentRateService,
    private readonly dataProviderService: DataProviderService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
@ -88,7 +96,9 @@ export class PortfolioService {
    private readonly rulesService: RulesService,
    private readonly symbolProfileService: SymbolProfileService,
    private readonly userService: UserService
-  ) {}
+  ) {
+    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
+  }

  public async getAccounts(aUserId: string): Promise<AccountWithValue[]> {
    const [accounts, details] = await Promise.all([
@ -303,7 +313,8 @@ export class PortfolioService {
  public async getDetails(
    aImpersonationId: string,
    aUserId: string,
-    aDateRange: DateRange = 'max'
+    aDateRange: DateRange = 'max',
+    aFilters?: Filter[]
  ): Promise<PortfolioDetails & { hasErrors: boolean }> {
    const userId = await this.getUserId(aImpersonationId, aUserId);
    const user = await this.userService.user({ id: userId });
@ -312,13 +323,14 @@ export class PortfolioService {
      (user.Settings?.settings as UserSettings)?.emergencyFund ?? 0
    );
    const userCurrency =
-      this.request.user?.Settings?.currency ??
      user.Settings?.currency ??
-      baseCurrency;
+      this.request.user?.Settings?.currency ??
+      this.baseCurrency;

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

    const portfolioCalculator = new PortfolioCalculator({
@ -337,10 +349,11 @@ export class PortfolioService {
      startDate
    );

-    const cashDetails = await this.accountService.getCashDetails(
+    const cashDetails = await this.accountService.getCashDetails({
      userId,
-      userCurrency
-    );
+      currency: userCurrency,
+      filters: aFilters
+    });

    const holdings: PortfolioDetails['holdings'] = {};
    const totalInvestment = currentPositions.totalInvestment.plus(
@ -362,7 +375,7 @@ export class PortfolioService {

    const [dataProviderResponses, symbolProfiles] = await Promise.all([
      this.dataProviderService.getQuotes(dataGatheringItems),
-      this.symbolProfileService.getSymbolProfiles(symbols)
+      this.symbolProfileService.getSymbolProfilesBySymbols(symbols)
    ]);

    const symbolProfileMap: { [symbol: string]: EnhancedSymbolProfile } = {};
@ -433,24 +446,32 @@ export class PortfolioService {
      };
    }

-    const cashPositions = await this.getCashPositions({
-      cashDetails,
-      emergencyFund,
-      userCurrency,
-      investment: totalInvestment,
-      value: totalValue
-    });
+    if (
+      aFilters?.length === 0 ||
+      (aFilters?.length === 1 &&
+        aFilters[0].type === 'ASSET_CLASS' &&
+        aFilters[0].id === 'CASH')
+    ) {
+      const cashPositions = await this.getCashPositions({
+        cashDetails,
+        emergencyFund,
+        userCurrency,
+        investment: totalInvestment,
+        value: totalValue
+      });

-    for (const symbol of Object.keys(cashPositions)) {
-      holdings[symbol] = cashPositions[symbol];
+      for (const symbol of Object.keys(cashPositions)) {
+        holdings[symbol] = cashPositions[symbol];
+      }
    }

-    const accounts = await this.getValueOfAccounts(
+    const accounts = await this.getValueOfAccounts({
      orders,
      portfolioItemsNow,
      userCurrency,
-      userId
-    );
+      userId,
+      filters: aFilters
+    });

    return { accounts, holdings, hasErrors: currentPositions.hasErrors };
  }
@ -472,8 +493,11 @@ export class PortfolioService {
      );
    });

+    let tags: Tag[] = [];
+
    if (orders.length <= 0) {
      return {
+        tags,
        averagePrice: undefined,
        firstBuyDate: undefined,
        grossPerformance: undefined,
@ -494,12 +518,13 @@ export class PortfolioService {
    }

    const positionCurrency = orders[0].SymbolProfile.currency;
-    const [SymbolProfile] = await this.symbolProfileService.getSymbolProfiles([
-      aSymbol
-    ]);
+    const [SymbolProfile] =
+      await this.symbolProfileService.getSymbolProfilesBySymbols([aSymbol]);

    const portfolioOrders: PortfolioOrder[] = orders
      .filter((order) => {
+        tags = tags.concat(order.tags);
+
        return order.type === 'BUY' || order.type === 'SELL';
      })
      .map((order) => ({
@ -514,6 +539,8 @@ export class PortfolioService {
        unitPrice: new Big(order.unitPrice)
      }));

+    tags = uniqBy(tags, 'id');
+
    const portfolioCalculator = new PortfolioCalculator({
      currency: positionCurrency,
      currentRateService: this.currentRateService,
@ -622,6 +649,7 @@ export class PortfolioService {
        netPerformance,
        orders,
        SymbolProfile,
+        tags,
        transactionCount,
        averagePrice: averagePrice.toNumber(),
        grossPerformancePercent:
@ -678,6 +706,7 @@ export class PortfolioService {
        minPrice,
        orders,
        SymbolProfile,
+        tags,
        averagePrice: 0,
        firstBuyDate: undefined,
        grossPerformance: undefined,
@ -738,7 +767,7 @@ export class PortfolioService {

    const [dataProviderResponses, symbolProfiles] = await Promise.all([
      this.dataProviderService.getQuotes(dataGatheringItem),
-      this.symbolProfileService.getSymbolProfiles(symbols)
+      this.symbolProfileService.getSymbolProfilesBySymbols(symbols)
    ]);

    const symbolProfileMap: { [symbol: string]: EnhancedSymbolProfile } = {};
@ -758,8 +787,7 @@ export class PortfolioService {
            position.grossPerformancePercentage?.toNumber() ?? null,
          investment: new Big(position.investment).toNumber(),
          marketState:
-            dataProviderResponses[position.symbol]?.marketState ??
-            MarketState.delayed,
+            dataProviderResponses[position.symbol]?.marketState ?? 'delayed',
          name: symbolProfileMap[position.symbol].name,
          netPerformance: position.netPerformance?.toNumber() ?? null,
          netPerformancePercentage:
@ -873,12 +901,12 @@ export class PortfolioService {
    for (const position of currentPositions.positions) {
      portfolioItemsNow[position.symbol] = position;
    }
-    const accounts = await this.getValueOfAccounts(
+    const accounts = await this.getValueOfAccounts({
      orders,
      portfolioItemsNow,
-      currency,
-      userId
-    );
+      userId,
+      userCurrency: currency
+    });
    return {
      rules: {
        accountClusterRisk: await this.rulesService.evaluate(
@ -940,10 +968,10 @@ export class PortfolioService {

    const performanceInformation = await this.getPerformance(aImpersonationId);

-    const { balanceInBaseCurrency } = await this.accountService.getCashDetails(
+    const { balanceInBaseCurrency } = await this.accountService.getCashDetails({
      userId,
-      userCurrency
-    );
+      currency: userCurrency
+    });
    const orders = await this.orderService.getOrders({
      userCurrency,
      userId
@ -1043,7 +1071,7 @@ export class PortfolioService {
          grossPerformancePercent: 0,
          investment: convertedBalance,
          marketPrice: 0,
-          marketState: MarketState.open,
+          marketState: 'open',
          name: account.currency,
          netPerformance: 0,
          netPerformancePercent: 0,
@ -1177,9 +1205,11 @@ export class PortfolioService {
  }

  private async getTransactionPoints({
+    filters,
    includeDrafts = false,
    userId
  }: {
+    filters?: Filter[];
    includeDrafts?: boolean;
    userId: string;
  }): Promise<{
@ -1187,9 +1217,11 @@ export class PortfolioService {
    orders: OrderWithAccount[];
    portfolioOrders: PortfolioOrder[];
  }> {
-    const userCurrency = this.request.user?.Settings?.currency ?? baseCurrency;
+    const userCurrency =
+      this.request.user?.Settings?.currency ?? this.baseCurrency;

    const orders = await this.orderService.getOrders({
+      filters,
      includeDrafts,
      userCurrency,
      userId,
@ -1233,21 +1265,42 @@ export class PortfolioService {
    portfolioCalculator.computeTransactionPoints();

    return {
-      transactionPoints: portfolioCalculator.getTransactionPoints(),
      orders,
-      portfolioOrders
+      portfolioOrders,
+      transactionPoints: portfolioCalculator.getTransactionPoints()
    };
  }

-  private async getValueOfAccounts(
-    orders: OrderWithAccount[],
-    portfolioItemsNow: { [p: string]: TimelinePosition },
-    userCurrency: string,
-    userId: string
-  ) {
+  private async getValueOfAccounts({
+    filters = [],
+    orders,
+    portfolioItemsNow,
+    userCurrency,
+    userId
+  }: {
+    filters?: Filter[];
+    orders: OrderWithAccount[];
+    portfolioItemsNow: { [p: string]: TimelinePosition };
+    userCurrency: string;
+    userId: string;
+  }) {
    const accounts: PortfolioDetails['accounts'] = {};

-    const currentAccounts = await this.accountService.getAccounts(userId);
+    let currentAccounts = [];
+
+    if (filters.length === 0) {
+      currentAccounts = await this.accountService.getAccounts(userId);
+    } else {
+      const accountIds = uniq(
+        orders.map(({ accountId }) => {
+          return accountId;
+        })
+      );
+
+      currentAccounts = await this.accountService.accounts({
+        where: { id: { in: accountIds } }
+      });
+    }

    for (const account of currentAccounts) {
      const ordersByAccount = orders.filter(({ accountId }) => {
@ -1257,34 +1310,47 @@ export class PortfolioService {
      accounts[account.id] = {
        balance: account.balance,
        currency: account.currency,
-        current: account.balance,
+        current: this.exchangeRateDataService.toCurrency(
+          account.balance,
+          account.currency,
+          userCurrency
+        ),
        name: account.name,
-        original: account.balance
+        original: this.exchangeRateDataService.toCurrency(
+          account.balance,
+          account.currency,
+          userCurrency
+        )
      };

      for (const order of ordersByAccount) {
-        let currentValueOfSymbol =
+        let currentValueOfSymbolInBaseCurrency =
          order.quantity *
          portfolioItemsNow[order.SymbolProfile.symbol].marketPrice;
-        let originalValueOfSymbol = order.quantity * order.unitPrice;
+        let originalValueOfSymbolInBaseCurrency =
+          this.exchangeRateDataService.toCurrency(
+            order.quantity * order.unitPrice,
+            order.SymbolProfile.currency,
+            userCurrency
+          );

        if (order.type === 'SELL') {
-          currentValueOfSymbol *= -1;
-          originalValueOfSymbol *= -1;
+          currentValueOfSymbolInBaseCurrency *= -1;
+          originalValueOfSymbolInBaseCurrency *= -1;
        }

        if (accounts[order.Account?.id || UNKNOWN_KEY]?.current) {
          accounts[order.Account?.id || UNKNOWN_KEY].current +=
-            currentValueOfSymbol;
+            currentValueOfSymbolInBaseCurrency;
          accounts[order.Account?.id || UNKNOWN_KEY].original +=
-            originalValueOfSymbol;
+            originalValueOfSymbolInBaseCurrency;
        } else {
          accounts[order.Account?.id || UNKNOWN_KEY] = {
            balance: 0,
            currency: order.Account?.currency,
-            current: currentValueOfSymbol,
+            current: currentValueOfSymbolInBaseCurrency,
            name: account.name,
-            original: originalValueOfSymbol
+            original: originalValueOfSymbolInBaseCurrency
          };
        }
      }
--- a/apps/api/src/app/redis-cache/redis-cache.module.ts
+++ b/apps/api/src/app/redis-cache/redis-cache.module.ts
@ -14,6 +14,7 @@ import { RedisCacheService } from './redis-cache.service';
      useFactory: async (configurationService: ConfigurationService) => ({
        host: configurationService.get('REDIS_HOST'),
        max: configurationService.get('MAX_ITEM_IN_CACHE'),
+        password: configurationService.get('REDIS_PASSWORD'),
        port: configurationService.get('REDIS_PORT'),
        store: redisStore,
        ttl: configurationService.get('CACHE_TTL')
--- a/apps/api/src/app/symbol/interfaces/symbol-item.interface.ts
+++ b/apps/api/src/app/symbol/interfaces/symbol-item.interface.ts
@ -1,9 +1,7 @@
-import { HistoricalDataItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position-detail.interface';
-import { DataSource } from '@prisma/client';
+import { HistoricalDataItem, UniqueAsset } from '@ghostfolio/common/interfaces';

-export interface SymbolItem {
+export interface SymbolItem extends UniqueAsset {
  currency: string;
-  dataSource: DataSource;
  historicalData: HistoricalDataItem[];
  marketPrice: number;
 }
--- a/apps/api/src/app/symbol/symbol.service.ts
+++ b/apps/api/src/app/symbol/symbol.service.ts
@ -1,4 +1,3 @@
-import { HistoricalDataItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position-detail.interface';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import {
  IDataGatheringItem,
@ -6,6 +5,7 @@ import {
 } from '@ghostfolio/api/services/interfaces/interfaces';
 import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
 import { DATE_FORMAT } from '@ghostfolio/common/helper';
+import { HistoricalDataItem } from '@ghostfolio/common/interfaces';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
 import { format, subDays } from 'date-fns';
@ -55,7 +55,8 @@ export class SymbolService {
        currency,
        historicalData,
        marketPrice,
-        dataSource: dataGatheringItem.dataSource
+        dataSource: dataGatheringItem.dataSource,
+        symbol: dataGatheringItem.symbol
      };
    }

--- a/apps/api/src/app/user/interfaces/access.interface.ts
+++ b/apps/api/src/app/user/interfaces/access.interface.ts
@ -1,4 +0,0 @@
-export interface Access {
-  alias?: string;
-  id: string;
-}
--- a/apps/api/src/app/user/user.controller.ts
+++ b/apps/api/src/app/user/user.controller.ts
@ -34,7 +34,7 @@ import { UserService } from './user.service';
 export class UserController {
  public constructor(
    private readonly configurationService: ConfigurationService,
-    private jwtService: JwtService,
+    private readonly jwtService: JwtService,
    private readonly propertyService: PropertyService,
    @Inject(REQUEST) private readonly request: RequestWithUser,
    private readonly userService: UserService
--- a/apps/api/src/app/user/user.module.ts
+++ b/apps/api/src/app/user/user.module.ts
@ -2,6 +2,7 @@ import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscriptio
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
+import { TagModule } from '@ghostfolio/api/services/tag/tag.module';
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';

@ -19,7 +20,8 @@ import { UserService } from './user.service';
    }),
    PrismaModule,
    PropertyModule,
-    SubscriptionModule
+    SubscriptionModule,
+    TagModule
  ],
  providers: [UserService]
 })
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@ -2,20 +2,17 @@ import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscripti
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import {
-  PROPERTY_IS_READ_ONLY_MODE,
-  baseCurrency,
-  locale
-} from '@ghostfolio/common/config';
+import { TagService } from '@ghostfolio/api/services/tag/tag.service';
+import { PROPERTY_IS_READ_ONLY_MODE, locale } from '@ghostfolio/common/config';
 import { User as IUser, UserWithSettings } from '@ghostfolio/common/interfaces';
 import {
  getPermissions,
  hasRole,
  permissions
 } from '@ghostfolio/common/permissions';
-import { SubscriptionType } from '@ghostfolio/common/types/subscription.type';
 import { Injectable } from '@nestjs/common';
 import { Prisma, Role, User, ViewMode } from '@prisma/client';
+import { sortBy } from 'lodash';

 import { UserSettingsParams } from './interfaces/user-settings-params.interface';
 import { UserSettings } from './interfaces/user-settings.interface';
@ -26,12 +23,17 @@ const crypto = require('crypto');
 export class UserService {
  public static DEFAULT_CURRENCY = 'USD';

+  private baseCurrency: string;
+
  public constructor(
    private readonly configurationService: ConfigurationService,
    private readonly prismaService: PrismaService,
    private readonly propertyService: PropertyService,
-    private readonly subscriptionService: SubscriptionService
-  ) {}
+    private readonly subscriptionService: SubscriptionService,
+    private readonly tagService: TagService
+  ) {
+    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
+  }

  public async getUser(
    {
@ -51,12 +53,21 @@ export class UserService {
      orderBy: { User: { alias: 'asc' } },
      where: { GranteeUser: { id } }
    });
+    let tags = await this.tagService.getByUser(id);
+
+    if (
+      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
+      subscription.type === 'Basic'
+    ) {
+      tags = [];
+    }

    return {
      alias,
      id,
      permissions,
      subscription,
+      tags,
      access: access.map((accessItem) => {
        return {
          alias: accessItem.User.alias,
@ -92,19 +103,69 @@ export class UserService {
  public async user(
    userWhereUniqueInput: Prisma.UserWhereUniqueInput
  ): Promise<UserWithSettings | null> {
-    const userFromDatabase = await this.prismaService.user.findUnique({
+    const {
+      accessToken,
+      Account,
+      alias,
+      authChallenge,
+      createdAt,
+      id,
+      provider,
+      role,
+      Settings,
+      Subscription,
+      thirdPartyId,
+      updatedAt
+    } = await this.prismaService.user.findUnique({
      include: { Account: true, Settings: true, Subscription: true },
      where: userWhereUniqueInput
    });

-    const user: UserWithSettings = userFromDatabase;
+    const user: UserWithSettings = {
+      accessToken,
+      Account,
+      alias,
+      authChallenge,
+      createdAt,
+      id,
+      provider,
+      role,
+      Settings,
+      thirdPartyId,
+      updatedAt
+    };

-    let currentPermissions = getPermissions(userFromDatabase.role);
+    if (user?.Settings) {
+      if (!user.Settings.currency) {
+        // Set default currency if needed
+        user.Settings.currency = UserService.DEFAULT_CURRENCY;
+      }
+    } else if (user) {
+      // Set default settings if needed
+      user.Settings = {
+        currency: UserService.DEFAULT_CURRENCY,
+        settings: null,
+        updatedAt: new Date(),
+        userId: user?.id,
+        viewMode: ViewMode.DEFAULT
+      };
+    }
+
+    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+      user.subscription =
+        this.subscriptionService.getSubscription(Subscription);
+    }
+
+    let currentPermissions = getPermissions(user.role);

    if (this.configurationService.get('ENABLE_FEATURE_FEAR_AND_GREED_INDEX')) {
      currentPermissions.push(permissions.accessFearAndGreedIndex);
    }

+    if (user.subscription?.type === 'Premium') {
+      currentPermissions.push(permissions.reportDataGlitch);
+    }
+
    if (this.configurationService.get('ENABLE_FEATURE_READ_ONLY_MODE')) {
      if (hasRole(user, Role.ADMIN)) {
        currentPermissions.push(permissions.toggleReadOnlyMode);
@ -125,29 +186,10 @@ export class UserService {
      }
    }

-    user.permissions = currentPermissions;
-
-    if (userFromDatabase?.Settings) {
-      if (!userFromDatabase.Settings.currency) {
-        // Set default currency if needed
-        userFromDatabase.Settings.currency = UserService.DEFAULT_CURRENCY;
-      }
-    } else if (userFromDatabase) {
-      // Set default settings if needed
-      userFromDatabase.Settings = {
-        currency: UserService.DEFAULT_CURRENCY,
-        settings: null,
-        updatedAt: new Date(),
-        userId: userFromDatabase?.id,
-        viewMode: ViewMode.DEFAULT
-      };
-    }
-
-    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-      user.subscription = this.subscriptionService.getSubscription(
-        userFromDatabase?.Subscription
-      );
-    }
+    user.Account = sortBy(user.Account, (account) => {
+      return account.name;
+    });
+    user.permissions = currentPermissions.sort();

    return user;
  }
@ -186,14 +228,14 @@ export class UserService {
        ...data,
        Account: {
          create: {
-            currency: baseCurrency,
+            currency: this.baseCurrency,
            isDefault: true,
            name: 'Default Account'
          }
        },
        Settings: {
          create: {
-            currency: baseCurrency
+            currency: this.baseCurrency
          }
        }
      }
--- a/apps/api/src/assets/.gitkeep
+++ b/apps/api/src/assets/.gitkeep
--- a/apps/api/src/assets/cryptocurrencies/cryptocurrencies.json
+++ b/apps/api/src/assets/cryptocurrencies/cryptocurrencies.json
--- a/apps/api/src/assets/cryptocurrencies/custom.json
+++ b/apps/api/src/assets/cryptocurrencies/custom.json
@ -0,0 +1,4 @@
+{
+  "LUNA1": "Terra",
+  "UNI1": "Uniswap"
+}
--- a/apps/api/src/interceptors/redact-values-in-response.interceptor.ts
+++ b/apps/api/src/interceptors/redact-values-in-response.interceptor.ts
@ -0,0 +1,50 @@
+import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
+import {
+  CallHandler,
+  ExecutionContext,
+  Injectable,
+  NestInterceptor
+} from '@nestjs/common';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+
+@Injectable()
+export class RedactValuesInResponseInterceptor<T>
+  implements NestInterceptor<T, any>
+{
+  public constructor() {}
+
+  public intercept(
+    context: ExecutionContext,
+    next: CallHandler<T>
+  ): Observable<any> {
+    return next.handle().pipe(
+      map((data: any) => {
+        const request = context.switchToHttp().getRequest();
+        const hasImpersonationId = !!request.headers?.['impersonation-id'];
+
+        if (hasImpersonationId) {
+          if (data.accounts) {
+            for (const accountId of Object.keys(data.accounts)) {
+              if (data.accounts[accountId]?.balance !== undefined) {
+                data.accounts[accountId].balance = null;
+              }
+            }
+          }
+
+          if (data.activities) {
+            data.activities = data.activities.map((activity: Activity) => {
+              if (activity.Account?.balance !== undefined) {
+                activity.Account.balance = null;
+              }
+
+              return activity;
+            });
+          }
+        }
+
+        return data;
+      })
+    );
+  }
+}
--- a/apps/api/src/main.ts
+++ b/apps/api/src/main.ts
@ -20,10 +20,11 @@ async function bootstrap() {
    })
  );

+  const host = process.env.HOST || 'localhost';
  const port = process.env.PORT || 3333;
-  await app.listen(port, () => {
+  await app.listen(port, host, () => {
    logLogo();
-    Logger.log(`Listening at http://localhost:${port}`);
+    Logger.log(`Listening at http://${host}:${port}`);
    Logger.log('');
  });
 }
--- a/apps/api/src/services/configuration.service.ts
+++ b/apps/api/src/services/configuration.service.ts
@ -12,6 +12,7 @@ export class ConfigurationService {
    this.environmentConfiguration = cleanEnv(process.env, {
      ACCESS_TOKEN_SALT: str(),
      ALPHA_VANTAGE_API_KEY: str({ default: '' }),
+      BASE_CURRENCY: str({ default: 'USD' }),
      CACHE_TTL: num({ default: 1 }),
      DATA_SOURCE_PRIMARY: str({ default: DataSource.YAHOO }),
      DATA_SOURCES: json({ default: JSON.stringify([DataSource.YAHOO]) }),
@ -24,17 +25,20 @@ export class ConfigurationService {
      ENABLE_FEATURE_STATISTICS: bool({ default: false }),
      ENABLE_FEATURE_SUBSCRIPTION: bool({ default: false }),
      ENABLE_FEATURE_SYSTEM_MESSAGE: bool({ default: false }),
+      EOD_HISTORICAL_DATA_API_KEY: str({ default: '' }),
      GOOGLE_CLIENT_ID: str({ default: 'dummyClientId' }),
      GOOGLE_SECRET: str({ default: 'dummySecret' }),
      GOOGLE_SHEETS_ACCOUNT: str({ default: '' }),
      GOOGLE_SHEETS_ID: str({ default: '' }),
      GOOGLE_SHEETS_PRIVATE_KEY: str({ default: '' }),
+      HOST: host({ default: 'localhost' }),
      JWT_SECRET_KEY: str({}),
      MAX_ITEM_IN_CACHE: num({ default: 9999 }),
      MAX_ORDERS_TO_IMPORT: num({ default: Number.MAX_SAFE_INTEGER }),
      PORT: port({ default: 3333 }),
      RAKUTEN_RAPID_API_KEY: str({ default: '' }),
-      REDIS_HOST: str({ default: 'localhost' }),
+      REDIS_HOST: host({ default: 'localhost' }),
+      REDIS_PASSWORD: str({ default: '' }),
      REDIS_PORT: port({ default: 6379 }),
      ROOT_URL: str({ default: 'http://localhost:4200' }),
      STRIPE_PUBLIC_KEY: str({ default: '' }),
--- a/apps/api/src/services/cron.service.ts
+++ b/apps/api/src/services/cron.service.ts
@ -1,3 +1,7 @@
+import {
+  GATHER_ASSET_PROFILE_PROCESS,
+  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
+} from '@ghostfolio/common/config';
 import { Injectable } from '@nestjs/common';
 import { Cron, CronExpression } from '@nestjs/schedule';

@ -13,8 +17,8 @@ export class CronService {
    private readonly twitterBotService: TwitterBotService
  ) {}

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

@ -30,6 +34,17 @@ export class CronService {

  @Cron(CronExpression.EVERY_WEEKEND)
  public async runEveryWeekend() {
-    await this.dataGatheringService.gatherProfileData();
+    const uniqueAssets = await this.dataGatheringService.getUniqueAssets();
+
+    for (const { dataSource, symbol } of uniqueAssets) {
+      await this.dataGatheringService.addJobToQueue(
+        GATHER_ASSET_PROFILE_PROCESS,
+        {
+          dataSource,
+          symbol
+        },
+        GATHER_ASSET_PROFILE_PROCESS_OPTIONS
+      );
+    }
  }
 }
--- a/apps/api/src/services/cryptocurrency/cryptocurrency.service.ts
+++ b/apps/api/src/services/cryptocurrency/cryptocurrency.service.ts
@ -1,8 +1,7 @@
 import { Injectable } from '@nestjs/common';

-const cryptocurrencies = require('cryptocurrencies');
-
-const customCryptocurrencies = require('./custom-cryptocurrencies.json');
+const cryptocurrencies = require('../../assets/cryptocurrencies/cryptocurrencies.json');
+const customCryptocurrencies = require('../../assets/cryptocurrencies/custom.json');

@Injectable()
 export class CryptocurrencyService {
@ -18,7 +17,7 @@ export class CryptocurrencyService {
  private getCryptocurrencies() {
    if (!this.combinedCryptocurrencies) {
      this.combinedCryptocurrencies = [
-        ...cryptocurrencies.symbols(),
+        ...Object.keys(cryptocurrencies),
        ...Object.keys(customCryptocurrencies)
      ];
    }
--- a/apps/api/src/services/cryptocurrency/custom-cryptocurrencies.json
+++ b/apps/api/src/services/cryptocurrency/custom-cryptocurrencies.json
@ -1,14 +0,0 @@
-{
-  "1INCH": "1inch",
-  "ALGO": "Algorand",
-  "ATOM": "Cosmos",
-  "AVAX": "Avalanche",
-  "DOT": "Polkadot",
-  "LUNA1": "Terra",
-  "MATIC": "Polygon",
-  "MINA": "Mina Protocol",
-  "RUNE": "THORChain",
-  "SHIB": "Shiba Inu",
-  "SOL": "Solana",
-  "UNI3": "Uniswap"
-}
--- a/apps/api/src/services/data-gathering.module.ts
+++ b/apps/api/src/services/data-gathering.module.ts
@ -3,13 +3,24 @@ import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.se
 import { DataEnhancerModule } from '@ghostfolio/api/services/data-provider/data-enhancer/data-enhancer.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
+import { DATA_GATHERING_QUEUE } from '@ghostfolio/common/config';
+import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';
+import ms from 'ms';

+import { DataGatheringProcessor } from './data-gathering.processor';
 import { ExchangeRateDataModule } from './exchange-rate-data.module';
 import { SymbolProfileModule } from './symbol-profile.module';

@Module({
  imports: [
+    BullModule.registerQueue({
+      limiter: {
+        duration: ms('5 seconds'),
+        max: 1
+      },
+      name: DATA_GATHERING_QUEUE
+    }),
    ConfigurationModule,
    DataEnhancerModule,
    DataProviderModule,
@ -17,7 +28,7 @@ import { SymbolProfileModule } from './symbol-profile.module';
    PrismaModule,
    SymbolProfileModule
  ],
-  providers: [DataGatheringService],
-  exports: [DataEnhancerModule, DataGatheringService]
+  providers: [DataGatheringProcessor, DataGatheringService],
+  exports: [BullModule, DataEnhancerModule, DataGatheringService]
 })
 export class DataGatheringModule {}
--- a/apps/api/src/services/data-gathering.processor.ts
+++ b/apps/api/src/services/data-gathering.processor.ts
@ -0,0 +1,128 @@
+import {
+  DATA_GATHERING_QUEUE,
+  GATHER_ASSET_PROFILE_PROCESS,
+  GATHER_HISTORICAL_MARKET_DATA_PROCESS
+} from '@ghostfolio/common/config';
+import { DATE_FORMAT } from '@ghostfolio/common/helper';
+import { UniqueAsset } from '@ghostfolio/common/interfaces';
+import { Process, Processor } from '@nestjs/bull';
+import { Injectable, Logger } from '@nestjs/common';
+import { Job } from 'bull';
+import {
+  format,
+  getDate,
+  getMonth,
+  getYear,
+  isBefore,
+  parseISO
+} from 'date-fns';
+
+import { DataGatheringService } from './data-gathering.service';
+import { DataProviderService } from './data-provider/data-provider.service';
+import { IDataGatheringItem } from './interfaces/interfaces';
+import { PrismaService } from './prisma.service';
+
+@Injectable()
+@Processor(DATA_GATHERING_QUEUE)
+export class DataGatheringProcessor {
+  public constructor(
+    private readonly dataGatheringService: DataGatheringService,
+    private readonly dataProviderService: DataProviderService,
+    private readonly prismaService: PrismaService
+  ) {}
+
+  @Process(GATHER_ASSET_PROFILE_PROCESS)
+  public async gatherAssetProfile(job: Job<UniqueAsset>) {
+    try {
+      await this.dataGatheringService.gatherAssetProfiles([job.data]);
+    } catch (error) {
+      Logger.error(
+        error,
+        `DataGatheringProcessor (${GATHER_ASSET_PROFILE_PROCESS})`
+      );
+
+      throw new Error(error);
+    }
+  }
+
+  @Process(GATHER_HISTORICAL_MARKET_DATA_PROCESS)
+  public async gatherHistoricalMarketData(job: Job<IDataGatheringItem>) {
+    try {
+      const { dataSource, date, symbol } = job.data;
+
+      const historicalData = await this.dataProviderService.getHistoricalRaw(
+        [{ dataSource, symbol }],
+        parseISO(<string>(<unknown>date)),
+        new Date()
+      );
+
+      let currentDate = parseISO(<string>(<unknown>date));
+      let lastMarketPrice: number;
+
+      while (
+        isBefore(
+          currentDate,
+          new Date(
+            Date.UTC(
+              getYear(new Date()),
+              getMonth(new Date()),
+              getDate(new Date()),
+              0
+            )
+          )
+        )
+      ) {
+        if (
+          historicalData[symbol]?.[format(currentDate, DATE_FORMAT)]
+            ?.marketPrice
+        ) {
+          lastMarketPrice =
+            historicalData[symbol]?.[format(currentDate, DATE_FORMAT)]
+              ?.marketPrice;
+        }
+
+        if (lastMarketPrice) {
+          try {
+            await this.prismaService.marketData.create({
+              data: {
+                dataSource,
+                symbol,
+                date: new Date(
+                  Date.UTC(
+                    getYear(currentDate),
+                    getMonth(currentDate),
+                    getDate(currentDate),
+                    0
+                  )
+                ),
+                marketPrice: lastMarketPrice
+              }
+            });
+          } catch {}
+        }
+
+        // Count month one up for iteration
+        currentDate = new Date(
+          Date.UTC(
+            getYear(currentDate),
+            getMonth(currentDate),
+            getDate(currentDate) + 1,
+            0
+          )
+        );
+      }
+
+      Logger.log(
+        `Historical market data gathering has been completed for ${symbol} (${dataSource}).`,
+        `DataGatheringProcessor (${GATHER_HISTORICAL_MARKET_DATA_PROCESS})`
+      );
+    } catch (error) {
+      Logger.error(
+        error,
+        `DataGatheringProcessor (${GATHER_HISTORICAL_MARKET_DATA_PROCESS})`
+      );
+
+      throw new Error(error);
+    }
+  }
+}
--- a/apps/api/src/services/data-gathering.service.ts
+++ b/apps/api/src/services/data-gathering.service.ts
@ -1,21 +1,17 @@
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
 import {
-  PROPERTY_LAST_DATA_GATHERING,
-  PROPERTY_LOCKED_DATA_GATHERING
+  DATA_GATHERING_QUEUE,
+  GATHER_HISTORICAL_MARKET_DATA_PROCESS,
+  GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS,
+  QUEUE_JOB_STATUS_LIST
 } from '@ghostfolio/common/config';
 import { DATE_FORMAT, resetHours } from '@ghostfolio/common/helper';
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
+import { InjectQueue } from '@nestjs/bull';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
-import {
-  differenceInHours,
-  format,
-  getDate,
-  getMonth,
-  getYear,
-  isBefore,
-  subDays
-} from 'date-fns';
+import { JobOptions, Queue } from 'bull';
+import { format, subDays } from 'date-fns';

 import { DataProviderService } from './data-provider/data-provider.service';
 import { DataEnhancerInterface } from './data-provider/interfaces/data-enhancer.interface';
@ -25,167 +21,48 @@ import { PrismaService } from './prisma.service';

@Injectable()
 export class DataGatheringService {
-  private dataGatheringProgress: number;
-
  public constructor(
    @Inject('DataEnhancers')
    private readonly dataEnhancers: DataEnhancerInterface[],
+    @InjectQueue(DATA_GATHERING_QUEUE)
+    private readonly dataGatheringQueue: Queue,
    private readonly dataProviderService: DataProviderService,
    private readonly exchangeRateDataService: ExchangeRateDataService,
    private readonly prismaService: PrismaService,
    private readonly symbolProfileService: SymbolProfileService
  ) {}

-  public async gather7Days() {
-    const isDataGatheringNeeded = await this.isDataGatheringNeeded();
-
-    if (isDataGatheringNeeded) {
-      Logger.log('7d data gathering has been started.', 'DataGatheringService');
-      console.time('data-gathering-7d');
-
-      await this.prismaService.property.create({
-        data: {
-          key: PROPERTY_LOCKED_DATA_GATHERING,
-          value: new Date().toISOString()
-        }
-      });
-
-      const symbols = await this.getSymbols7D();
-
-      try {
-        await this.gatherSymbols(symbols);
-
-        await this.prismaService.property.upsert({
-          create: {
-            key: PROPERTY_LAST_DATA_GATHERING,
-            value: new Date().toISOString()
-          },
-          update: { value: new Date().toISOString() },
-          where: { key: PROPERTY_LAST_DATA_GATHERING }
-        });
-      } catch (error) {
-        Logger.error(error, 'DataGatheringService');
-      }
-
-      await this.prismaService.property.delete({
-        where: {
-          key: PROPERTY_LOCKED_DATA_GATHERING
-        }
-      });
+  public async addJobToQueue(name: string, data: any, options?: JobOptions) {
+    const hasJob = await this.hasJob(name, data);

+    if (hasJob) {
      Logger.log(
-        '7d data gathering has been completed.',
+        `Job ${name} with data ${JSON.stringify(data)} already exists.`,
        'DataGatheringService'
      );
-      console.timeEnd('data-gathering-7d');
+    } else {
+      return this.dataGatheringQueue.add(name, data, options);
    }
  }

+  public async gather7Days() {
+    const dataGatheringItems = await this.getSymbols7D();
+    await this.gatherSymbols(dataGatheringItems);
+  }
+
  public async gatherMax() {
-    const isDataGatheringLocked = await this.prismaService.property.findUnique({
-      where: { key: PROPERTY_LOCKED_DATA_GATHERING }
-    });
-
-    if (!isDataGatheringLocked) {
-      Logger.log(
-        'Max data gathering has been started.',
-        'DataGatheringService'
-      );
-      console.time('data-gathering-max');
-
-      await this.prismaService.property.create({
-        data: {
-          key: PROPERTY_LOCKED_DATA_GATHERING,
-          value: new Date().toISOString()
-        }
-      });
-
-      const symbols = await this.getSymbolsMax();
-
-      try {
-        await this.gatherSymbols(symbols);
-
-        await this.prismaService.property.upsert({
-          create: {
-            key: PROPERTY_LAST_DATA_GATHERING,
-            value: new Date().toISOString()
-          },
-          update: { value: new Date().toISOString() },
-          where: { key: PROPERTY_LAST_DATA_GATHERING }
-        });
-      } catch (error) {
-        Logger.error(error, 'DataGatheringService');
-      }
-
-      await this.prismaService.property.delete({
-        where: {
-          key: PROPERTY_LOCKED_DATA_GATHERING
-        }
-      });
-
-      Logger.log(
-        'Max data gathering has been completed.',
-        'DataGatheringService'
-      );
-      console.timeEnd('data-gathering-max');
-    }
+    const dataGatheringItems = await this.getSymbolsMax();
+    await this.gatherSymbols(dataGatheringItems);
  }

  public async gatherSymbol({ dataSource, symbol }: UniqueAsset) {
-    const isDataGatheringLocked = await this.prismaService.property.findUnique({
-      where: { key: PROPERTY_LOCKED_DATA_GATHERING }
+    const symbols = (await this.getSymbolsMax()).filter((dataGatheringItem) => {
+      return (
+        dataGatheringItem.dataSource === dataSource &&
+        dataGatheringItem.symbol === symbol
+      );
    });
-
-    if (!isDataGatheringLocked) {
-      Logger.log(
-        `Symbol data gathering for ${symbol} has been started.`,
-        'DataGatheringService'
-      );
-      console.time('data-gathering-symbol');
-
-      await this.prismaService.property.create({
-        data: {
-          key: PROPERTY_LOCKED_DATA_GATHERING,
-          value: new Date().toISOString()
-        }
-      });
-
-      const symbols = (await this.getSymbolsMax()).filter(
-        (dataGatheringItem) => {
-          return (
-            dataGatheringItem.dataSource === dataSource &&
-            dataGatheringItem.symbol === symbol
-          );
-        }
-      );
-
-      try {
-        await this.gatherSymbols(symbols);
-
-        await this.prismaService.property.upsert({
-          create: {
-            key: PROPERTY_LAST_DATA_GATHERING,
-            value: new Date().toISOString()
-          },
-          update: { value: new Date().toISOString() },
-          where: { key: PROPERTY_LAST_DATA_GATHERING }
-        });
-      } catch (error) {
-        Logger.error(error, 'DataGatheringService');
-      }
-
-      await this.prismaService.property.delete({
-        where: {
-          key: PROPERTY_LOCKED_DATA_GATHERING
-        }
-      });
-
-      Logger.log(
-        `Symbol data gathering for ${symbol} has been completed.`,
-        'DataGatheringService'
-      );
-      console.timeEnd('data-gathering-symbol');
-    }
+    await this.gatherSymbols(symbols);
  }

  public async gatherSymbolForDate({
@ -226,31 +103,24 @@ export class DataGatheringService {
    }
  }

-  public async gatherProfileData(aDataGatheringItems?: IDataGatheringItem[]) {
-    Logger.log(
-      'Profile data gathering has been started.',
-      'DataGatheringService'
-    );
-    console.time('data-gathering-profile');
+  public async gatherAssetProfiles(aUniqueAssets?: UniqueAsset[]) {
+    let uniqueAssets = aUniqueAssets?.filter((dataGatheringItem) => {
+      return dataGatheringItem.dataSource !== 'MANUAL';
+    });

-    let dataGatheringItems = aDataGatheringItems?.filter(
-      (dataGatheringItem) => {
-        return dataGatheringItem.dataSource !== 'MANUAL';
-      }
-    );
-
-    if (!dataGatheringItems) {
-      dataGatheringItems = await this.getSymbolsProfileData();
+    if (!uniqueAssets) {
+      uniqueAssets = await this.getUniqueAssets();
    }

    const assetProfiles = await this.dataProviderService.getAssetProfiles(
-      dataGatheringItems
-    );
-    const symbolProfiles = await this.symbolProfileService.getSymbolProfiles(
-      dataGatheringItems.map(({ symbol }) => {
-        return symbol;
-      })
+      uniqueAssets
    );
+    const symbolProfiles =
+      await this.symbolProfileService.getSymbolProfilesBySymbols(
+        uniqueAssets.map(({ symbol }) => {
+          return symbol;
+        })
+      );

    for (const [symbol, assetProfile] of Object.entries(assetProfiles)) {
      const symbolMapping = symbolProfiles.find((symbolProfile) => {
@ -322,136 +192,31 @@ export class DataGatheringService {
    }

    Logger.log(
-      'Profile data gathering has been completed.',
+      `Asset profile data gathering has been completed for ${uniqueAssets
+        .map(({ dataSource, symbol }) => {
+          return `${symbol} (${dataSource})`;
+        })
+        .join(',')}.`,
      'DataGatheringService'
    );
-    console.timeEnd('data-gathering-profile');
  }

  public async gatherSymbols(aSymbolsWithStartDate: IDataGatheringItem[]) {
-    let hasError = false;
-    let symbolCounter = 0;
-
    for (const { dataSource, date, symbol } of aSymbolsWithStartDate) {
      if (dataSource === 'MANUAL') {
        continue;
      }

-      this.dataGatheringProgress = symbolCounter / aSymbolsWithStartDate.length;
-
-      try {
-        const historicalData = await this.dataProviderService.getHistoricalRaw(
-          [{ dataSource, symbol }],
+      await this.addJobToQueue(
+        GATHER_HISTORICAL_MARKET_DATA_PROCESS,
+        {
+          dataSource,
          date,
-          new Date()
-        );
-
-        let currentDate = date;
-        let lastMarketPrice: number;
-
-        while (
-          isBefore(
-            currentDate,
-            new Date(
-              Date.UTC(
-                getYear(new Date()),
-                getMonth(new Date()),
-                getDate(new Date()),
-                0
-              )
-            )
-          )
-        ) {
-          if (
-            historicalData[symbol]?.[format(currentDate, DATE_FORMAT)]
-              ?.marketPrice
-          ) {
-            lastMarketPrice =
-              historicalData[symbol]?.[format(currentDate, DATE_FORMAT)]
-                ?.marketPrice;
-          }
-
-          if (lastMarketPrice) {
-            try {
-              await this.prismaService.marketData.create({
-                data: {
-                  dataSource,
-                  symbol,
-                  date: currentDate,
-                  marketPrice: lastMarketPrice
-                }
-              });
-            } catch {}
-          } else {
-            Logger.warn(
-              `Failed to gather data for symbol ${symbol} from ${dataSource} at ${format(
-                currentDate,
-                DATE_FORMAT
-              )}.`,
-              'DataGatheringService'
-            );
-          }
-
-          // Count month one up for iteration
-          currentDate = new Date(
-            Date.UTC(
-              getYear(currentDate),
-              getMonth(currentDate),
-              getDate(currentDate) + 1,
-              0
-            )
-          );
-        }
-      } catch (error) {
-        hasError = true;
-        Logger.error(error, 'DataGatheringService');
-      }
-
-      if (symbolCounter > 0 && symbolCounter % 100 === 0) {
-        Logger.log(
-          `Data gathering progress: ${(
-            this.dataGatheringProgress * 100
-          ).toFixed(2)}%`,
-          'DataGatheringService'
-        );
-      }
-
-      symbolCounter += 1;
+          symbol
+        },
+        GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS
+      );
    }
-
-    await this.exchangeRateDataService.initialize();
-
-    if (hasError) {
-      throw '';
-    }
-  }
-
-  public async getDataGatheringProgress() {
-    const isInProgress = await this.getIsInProgress();
-
-    if (isInProgress) {
-      return this.dataGatheringProgress;
-    }
-
-    return undefined;
-  }
-
-  public async getIsInProgress() {
-    return await this.prismaService.property.findUnique({
-      where: { key: PROPERTY_LOCKED_DATA_GATHERING }
-    });
-  }
-
-  public async getLastDataGathering() {
-    const lastDataGathering = await this.prismaService.property.findUnique({
-      where: { key: PROPERTY_LAST_DATA_GATHERING }
-    });
-
-    if (lastDataGathering?.value) {
-      return new Date(lastDataGathering.value);
-    }
-
-    return undefined;
  }

  public async getSymbolsMax(): Promise<IDataGatheringItem[]> {
@ -501,17 +266,25 @@ export class DataGatheringService {
    return [...currencyPairsToGather, ...symbolProfilesToGather];
  }

-  public async reset() {
-    Logger.log('Data gathering has been reset.', 'DataGatheringService');
-
-    await this.prismaService.property.deleteMany({
-      where: {
-        OR: [
-          { key: PROPERTY_LAST_DATA_GATHERING },
-          { key: PROPERTY_LOCKED_DATA_GATHERING }
-        ]
-      }
+  public async getUniqueAssets(): Promise<UniqueAsset[]> {
+    const symbolProfiles = await this.prismaService.symbolProfile.findMany({
+      orderBy: [{ symbol: 'asc' }]
    });
+
+    return symbolProfiles
+      .filter(({ dataSource }) => {
+        return (
+          dataSource !== DataSource.GHOSTFOLIO &&
+          dataSource !== DataSource.MANUAL &&
+          dataSource !== DataSource.RAKUTEN
+        );
+      })
+      .map(({ dataSource, symbol }) => {
+        return {
+          dataSource,
+          symbol
+        };
+      });
  }

  private async getSymbols7D(): Promise<IDataGatheringItem[]> {
@ -537,6 +310,7 @@ export class DataGatheringService {
      await this.prismaService.marketData.groupBy({
        _count: true,
        by: ['symbol'],
+        orderBy: [{ symbol: 'asc' }],
        where: {
          date: { gt: startDate }
        }
@ -576,36 +350,17 @@ export class DataGatheringService {
    return [...currencyPairsToGather, ...symbolProfilesToGather];
  }

-  private async getSymbolsProfileData(): Promise<IDataGatheringItem[]> {
-    const symbolProfiles = await this.prismaService.symbolProfile.findMany({
-      orderBy: [{ symbol: 'asc' }]
-    });
-
-    return symbolProfiles
-      .filter((symbolProfile) => {
-        return (
-          symbolProfile.dataSource !== DataSource.GHOSTFOLIO &&
-          symbolProfile.dataSource !== DataSource.MANUAL &&
-          symbolProfile.dataSource !== DataSource.RAKUTEN
-        );
+  private async hasJob(name: string, data: any) {
+    const jobs = await this.dataGatheringQueue.getJobs(
+      QUEUE_JOB_STATUS_LIST.filter((status) => {
+        return status !== 'completed';
      })
-      .map((symbolProfile) => {
-        return {
-          dataSource: symbolProfile.dataSource,
-          symbol: symbolProfile.symbol
-        };
-      });
-  }
+    );

-  private async isDataGatheringNeeded() {
-    const lastDataGathering = await this.getLastDataGathering();
-
-    const isDataGatheringLocked = await this.prismaService.property.findUnique({
-      where: { key: PROPERTY_LOCKED_DATA_GATHERING }
+    return jobs.some((job) => {
+      return (
+        job.name === name && JSON.stringify(job.data) === JSON.stringify(data)
+      );
    });
-
-    const diffInHours = differenceInHours(new Date(), lastDataGathering);
-
-    return (diffInHours >= 1 || !lastDataGathering) && !isDataGatheringLocked;
  }
 }
--- a/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts
+++ b/apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts
@ -9,7 +9,7 @@ import { DATE_FORMAT } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import { isAfter, isBefore, parse } from 'date-fns';
+import { format, isAfter, isBefore, parse } from 'date-fns';

 import { IAlphaVantageHistoricalResponse } from './interfaces/interfaces';

@ -76,9 +76,12 @@ export class AlphaVantageService implements DataProviderInterface {

      return response;
    } catch (error) {
-      Logger.error(error, 'AlphaVantageService');
-
-      return {};
+      throw new Error(
+        `Could not get historical market data for ${aSymbol} (${this.getName()}) from ${format(
+          from,
+          DATE_FORMAT
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
+      );
    }
  }

--- a/apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts
+++ b/apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts
@ -32,7 +32,7 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
      return response;
    }

-    const holdings = await getJSON(
+    const result = await getJSON(
      `${TrackinsightDataEnhancerService.baseUrl}/${symbol}.json`
    ).catch(() => {
      return getJSON(
@ -42,12 +42,17 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
      );
    });

+    if (result.weight < 0.95) {
+      // Skip if data is inaccurate
+      return response;
+    }
+
    if (
      !response.countries ||
      (response.countries as unknown as Country[]).length === 0
    ) {
      response.countries = [];
-      for (const [name, value] of Object.entries<any>(holdings.countries)) {
+      for (const [name, value] of Object.entries<any>(result.countries)) {
        let countryCode: string;

        for (const [key, country] of Object.entries<any>(
@ -75,7 +80,7 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
      (response.sectors as unknown as Sector[]).length === 0
    ) {
      response.sectors = [];
-      for (const [name, value] of Object.entries<any>(holdings.sectors)) {
+      for (const [name, value] of Object.entries<any>(result.sectors)) {
        response.sectors.push({
          name: TrackinsightDataEnhancerService.sectorsMapping[name] ?? name,
          weight: value.weight
--- a/apps/api/src/services/data-provider/data-provider.module.ts
+++ b/apps/api/src/services/data-provider/data-provider.module.ts
@ -1,5 +1,7 @@
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { CryptocurrencyModule } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.module';
+import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { EodHistoricalDataService } from '@ghostfolio/api/services/data-provider/eod-historical-data/eod-historical-data.service';
 import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
 import { GoogleSheetsService } from '@ghostfolio/api/services/data-provider/google-sheets/google-sheets.service';
 import { ManualService } from '@ghostfolio/api/services/data-provider/manual/manual.service';
@ -9,7 +11,6 @@ import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
 import { Module } from '@nestjs/common';

-import { AlphaVantageService } from './alpha-vantage/alpha-vantage.service';
 import { DataProviderService } from './data-provider.service';

@Module({
@ -22,6 +23,7 @@ import { DataProviderService } from './data-provider.service';
  providers: [
    AlphaVantageService,
    DataProviderService,
+    EodHistoricalDataService,
    GhostfolioScraperApiService,
    GoogleSheetsService,
    ManualService,
@ -30,6 +32,7 @@ import { DataProviderService } from './data-provider.service';
    {
      inject: [
        AlphaVantageService,
+        EodHistoricalDataService,
        GhostfolioScraperApiService,
        GoogleSheetsService,
        ManualService,
@ -39,6 +42,7 @@ import { DataProviderService } from './data-provider.service';
      provide: 'DataProviderInterfaces',
      useFactory: (
        alphaVantageService,
+        eodHistoricalDataService,
        ghostfolioScraperApiService,
        googleSheetsService,
        manualService,
@ -46,6 +50,7 @@ import { DataProviderService } from './data-provider.service';
        yahooFinanceService
      ) => [
        alphaVantageService,
+        eodHistoricalDataService,
        ghostfolioScraperApiService,
        googleSheetsService,
        manualService,
--- 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
@ -0,0 +1,141 @@
+import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
+import {
+  IDataProviderHistoricalResponse,
+  IDataProviderResponse
+} from '@ghostfolio/api/services/interfaces/interfaces';
+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
+import { DATE_FORMAT } from '@ghostfolio/common/helper';
+import { Granularity } from '@ghostfolio/common/types';
+import { Injectable, Logger } from '@nestjs/common';
+import { DataSource, SymbolProfile } from '@prisma/client';
+import bent from 'bent';
+import { format } from 'date-fns';
+
+@Injectable()
+export class EodHistoricalDataService implements DataProviderInterface {
+  private apiKey: string;
+  private readonly URL = 'https://eodhistoricaldata.com/api';
+
+  public constructor(
+    private readonly configurationService: ConfigurationService,
+    private readonly symbolProfileService: SymbolProfileService
+  ) {
+    this.apiKey = this.configurationService.get('EOD_HISTORICAL_DATA_API_KEY');
+  }
+
+  public canHandle(symbol: string) {
+    return true;
+  }
+
+  public async getAssetProfile(
+    aSymbol: string
+  ): Promise<Partial<SymbolProfile>> {
+    return {
+      dataSource: this.getName()
+    };
+  }
+
+  public async getHistorical(
+    aSymbol: string,
+    aGranularity: Granularity = 'day',
+    from: Date,
+    to: Date
+  ): Promise<{
+    [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
+  }> {
+    try {
+      const get = bent(
+        `${this.URL}/eod/${aSymbol}?api_token=${
+          this.apiKey
+        }&fmt=json&from=${format(from, DATE_FORMAT)}&to=${format(
+          to,
+          DATE_FORMAT
+        )}&period={aGranularity}`,
+        'GET',
+        'json',
+        200
+      );
+
+      const response = await get();
+
+      return response.reduce(
+        (result, historicalItem, index, array) => {
+          result[aSymbol][historicalItem.date] = {
+            marketPrice: historicalItem.close,
+            performance: historicalItem.open - historicalItem.close
+          };
+
+          return result;
+        },
+        { [aSymbol]: {} }
+      );
+    } catch (error) {
+      throw new Error(
+        `Could not get historical market data for ${aSymbol} (${this.getName()}) from ${format(
+          from,
+          DATE_FORMAT
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
+      );
+    }
+  }
+
+  public getName(): DataSource {
+    return DataSource.EOD_HISTORICAL_DATA;
+  }
+
+  public async getQuotes(
+    aSymbols: string[]
+  ): Promise<{ [symbol: string]: IDataProviderResponse }> {
+    if (aSymbols.length <= 0) {
+      return {};
+    }
+
+    try {
+      const get = bent(
+        `${this.URL}/real-time/${aSymbols[0]}?api_token=${
+          this.apiKey
+        }&fmt=json&s=${aSymbols.join(',')}`,
+        'GET',
+        'json',
+        200
+      );
+
+      const [response, symbolProfiles] = await Promise.all([
+        get(),
+        this.symbolProfileService.getSymbolProfiles(
+          aSymbols.map((symbol) => {
+            return {
+              symbol,
+              dataSource: DataSource.EOD_HISTORICAL_DATA
+            };
+          })
+        )
+      ]);
+
+      const quotes = aSymbols.length === 1 ? [response] : response;
+
+      return quotes.reduce((result, item, index, array) => {
+        result[item.code] = {
+          currency: symbolProfiles.find((symbolProfile) => {
+            return symbolProfile.symbol === item.code;
+          })?.currency,
+          dataSource: DataSource.EOD_HISTORICAL_DATA,
+          marketPrice: item.close,
+          marketState: 'delayed'
+        };
+
+        return result;
+      }, {});
+    } catch (error) {
+      Logger.error(error, 'EodHistoricalDataService');
+    }
+
+    return {};
+  }
+
+  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+    return { items: [] };
+  }
+}
--- a/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts
+++ b/apps/api/src/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service.ts
@ -2,8 +2,7 @@ import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.in
 import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
 import {
  IDataProviderHistoricalResponse,
-  IDataProviderResponse,
-  MarketState
+  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
@ -11,7 +10,7 @@ import { DATE_FORMAT, getYesterday } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import * as bent from 'bent';
+import bent from 'bent';
 import * as cheerio from 'cheerio';
 import { addDays, format, isBefore } from 'date-fns';

@ -47,9 +46,8 @@ export class GhostfolioScraperApiService implements DataProviderInterface {
    try {
      const symbol = aSymbol;

-      const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles(
-        [symbol]
-      );
+      const [symbolProfile] =
+        await this.symbolProfileService.getSymbolProfilesBySymbols([symbol]);
      const { defaultMarketPrice, selector, url } =
        symbolProfile.scraperConfiguration;

@ -89,10 +87,13 @@ export class GhostfolioScraperApiService implements DataProviderInterface {
        }
      };
    } catch (error) {
-      Logger.error(error, 'GhostfolioScraperApiService');
+      throw new Error(
+        `Could not get historical market data for ${aSymbol} (${this.getName()}) from ${format(
+          from,
+          DATE_FORMAT
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
+      );
    }
-
-    return {};
  }

  public getName(): DataSource {
@ -109,9 +110,8 @@ export class GhostfolioScraperApiService implements DataProviderInterface {
    }

    try {
-      const symbolProfiles = await this.symbolProfileService.getSymbolProfiles(
-        aSymbols
-      );
+      const symbolProfiles =
+        await this.symbolProfileService.getSymbolProfilesBySymbols(aSymbols);

      const marketData = await this.prismaService.marketData.findMany({
        distinct: ['symbol'],
@ -133,7 +133,7 @@ export class GhostfolioScraperApiService implements DataProviderInterface {
          marketPrice: marketData.find((marketDataItem) => {
            return marketDataItem.symbol === symbolProfile.symbol;
          }).marketPrice,
-          marketState: MarketState.delayed
+          marketState: 'delayed'
        };
      }

--- a/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts
+++ b/apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts
@ -3,8 +3,7 @@ import { ConfigurationService } from '@ghostfolio/api/services/configuration.ser
 import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
 import {
  IDataProviderHistoricalResponse,
-  IDataProviderResponse,
-  MarketState
+  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
@ -72,10 +71,13 @@ export class GoogleSheetsService implements DataProviderInterface {
        [symbol]: historicalData
      };
    } catch (error) {
-      Logger.error(error, 'GoogleSheetsService');
+      throw new Error(
+        `Could not get historical market data for ${aSymbol} (${this.getName()}) from ${format(
+          from,
+          DATE_FORMAT
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
+      );
    }
-
-    return {};
  }

  public getName(): DataSource {
@ -92,9 +94,8 @@ export class GoogleSheetsService implements DataProviderInterface {
    try {
      const response: { [symbol: string]: IDataProviderResponse } = {};

-      const symbolProfiles = await this.symbolProfileService.getSymbolProfiles(
-        aSymbols
-      );
+      const symbolProfiles =
+        await this.symbolProfileService.getSymbolProfilesBySymbols(aSymbols);

      const sheet = await this.getSheet({
        sheetId: this.configurationService.get('GOOGLE_SHEETS_ID'),
@ -114,7 +115,7 @@ export class GoogleSheetsService implements DataProviderInterface {
              return symbolProfile.symbol === symbol;
            })?.currency,
            dataSource: this.getName(),
-            marketState: MarketState.delayed
+            marketState: 'delayed'
          };
        }
      }
--- a/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts
+++ b/apps/api/src/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service.ts
@ -3,8 +3,7 @@ import { ConfigurationService } from '@ghostfolio/api/services/configuration.ser
 import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
 import {
  IDataProviderHistoricalResponse,
-  IDataProviderResponse,
-  MarketState
+  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { ghostfolioFearAndGreedIndexSymbol } from '@ghostfolio/common/config';
@ -12,7 +11,7 @@ import { DATE_FORMAT, getToday, getYesterday } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import * as bent from 'bent';
+import bent from 'bent';
 import { format, subMonths, subWeeks, subYears } from 'date-fns';

@Injectable()
@ -91,7 +90,14 @@ export class RakutenRapidApiService implements DataProviderInterface {
          }
        };
      }
-    } catch (error) {}
+    } catch (error) {
+      throw new Error(
+        `Could not get historical market data for ${aSymbol} (${this.getName()}) from ${format(
+          from,
+          DATE_FORMAT
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
+      );
+    }

    return {};
  }
@ -118,7 +124,7 @@ export class RakutenRapidApiService implements DataProviderInterface {
            currency: undefined,
            dataSource: this.getName(),
            marketPrice: fgi.now.value,
-            marketState: MarketState.open
+            marketState: 'open'
          }
        };
      }
--- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.spec.ts
+++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.spec.ts
@ -1,3 +1,4 @@
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';

 import { YahooFinanceService } from './yahoo-finance.service';
@ -25,13 +26,18 @@ jest.mock(
 );

 describe('YahooFinanceService', () => {
+  let configurationService: ConfigurationService;
  let cryptocurrencyService: CryptocurrencyService;
  let yahooFinanceService: YahooFinanceService;

  beforeAll(async () => {
+    configurationService = new ConfigurationService();
    cryptocurrencyService = new CryptocurrencyService();

-    yahooFinanceService = new YahooFinanceService(cryptocurrencyService);
+    yahooFinanceService = new YahooFinanceService(
+      configurationService,
+      cryptocurrencyService
+    );
  });

  it('convertFromYahooFinanceSymbol', async () => {
--- a/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
+++ b/apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts
@ -1,12 +1,11 @@
 import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { CryptocurrencyService } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.service';
 import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
 import {
  IDataProviderHistoricalResponse,
-  IDataProviderResponse,
-  MarketState
+  IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
-import { baseCurrency } from '@ghostfolio/common/config';
 import { DATE_FORMAT, isCurrency } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
@ -20,16 +19,18 @@ import Big from 'big.js';
 import { countries } from 'countries-list';
 import { addDays, format, isSameDay } from 'date-fns';
 import yahooFinance from 'yahoo-finance2';
-import type {
-  Price,
-  QuoteSummaryResult
-} from 'yahoo-finance2/dist/esm/src/modules/quoteSummary-iface';
+import type { Price } from 'yahoo-finance2/dist/esm/src/modules/quoteSummary-iface';

@Injectable()
 export class YahooFinanceService implements DataProviderInterface {
+  private baseCurrency: string;
+
  public constructor(
+    private readonly configurationService: ConfigurationService,
    private readonly cryptocurrencyService: CryptocurrencyService
-  ) {}
+  ) {
+    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
+  }

  public canHandle(symbol: string) {
    return true;
@ -37,8 +38,8 @@ export class YahooFinanceService implements DataProviderInterface {

  public convertFromYahooFinanceSymbol(aYahooFinanceSymbol: string) {
    const symbol = aYahooFinanceSymbol.replace(
-      new RegExp(`-${baseCurrency}$`),
-      baseCurrency
+      new RegExp(`-${this.baseCurrency}$`),
+      this.baseCurrency
    );
    return symbol.replace('=X', '');
  }
@ -51,12 +52,15 @@ export class YahooFinanceService implements DataProviderInterface {
   *                  DOGEUSD -> DOGE-USD
   */
  public convertToYahooFinanceSymbol(aSymbol: string) {
-    if (aSymbol.includes(baseCurrency) && aSymbol.length >= 6) {
+    if (aSymbol.includes(this.baseCurrency) && aSymbol.length >= 6) {
      if (isCurrency(aSymbol.substring(0, aSymbol.length - 3))) {
        return `${aSymbol}=X`;
      } else if (
        this.cryptocurrencyService.isCryptocurrency(
-          aSymbol.replace(new RegExp(`-${baseCurrency}$`), baseCurrency)
+          aSymbol.replace(
+            new RegExp(`-${this.baseCurrency}$`),
+            this.baseCurrency
+          )
        )
      ) {
        // Add a dash before the last three characters
@ -64,8 +68,8 @@ export class YahooFinanceService implements DataProviderInterface {
        // DOGEUSD -> DOGE-USD
        // SOL1USD -> SOL1-USD
        return aSymbol.replace(
-          new RegExp(`-?${baseCurrency}$`),
-          `-${baseCurrency}`
+          new RegExp(`-?${this.baseCurrency}$`),
+          `-${this.baseCurrency}`
        );
      }
    }
@ -92,7 +96,12 @@ export class YahooFinanceService implements DataProviderInterface {
      response.assetSubClass = assetSubClass;
      response.currency = assetProfile.price.currency;
      response.dataSource = this.getName();
-      response.name = this.formatName(assetProfile);
+      response.name = this.formatName({
+        longName: assetProfile.price.longName,
+        quoteType: assetProfile.price.quoteType,
+        shortName: assetProfile.price.shortName,
+        symbol: assetProfile.price.symbol
+      });
      response.symbol = aSymbol;

      if (
@ -122,7 +131,13 @@ export class YahooFinanceService implements DataProviderInterface {
      if (url) {
        response.url = url;
      }
-    } catch {}
+    } catch (error) {
+      throw new Error(
+        `Could not get asset profile for ${aSymbol} (${this.getName()}): [${
+          error.name
+        }] ${error.message}`
+      );
+    }

    return response;
  }
@ -176,12 +191,12 @@ export class YahooFinanceService implements DataProviderInterface {

      return response;
    } catch (error) {
-      Logger.warn(
-        `Skipping yahooFinance2.getHistorical("${aSymbol}"): [${error.name}] ${error.message}`,
-        'YahooFinanceService'
+      throw new Error(
+        `Could not get historical market data for ${aSymbol} (${this.getName()}) from ${format(
+          from,
+          DATE_FORMAT
+        )} to ${format(to, DATE_FORMAT)}: [${error.name}] ${error.message}`
      );
-
-      return {};
    }
  }

@ -214,8 +229,8 @@ export class YahooFinanceService implements DataProviderInterface {
          marketState:
            quote.marketState === 'REGULAR' ||
            this.cryptocurrencyService.isCryptocurrency(symbol)
-              ? MarketState.open
-              : MarketState.closed,
+              ? 'open'
+              : 'closed',
          marketPrice: quote.regularMarketPrice || 0
        };

@ -247,23 +262,29 @@ export class YahooFinanceService implements DataProviderInterface {

      const quotes = searchResult.quotes
        .filter((quote) => {
-          // filter out undefined symbols
+          // Filter out undefined symbols
          return quote.symbol;
        })
        .filter(({ quoteType, symbol }) => {
          return (
            (quoteType === 'CRYPTOCURRENCY' &&
              this.cryptocurrencyService.isCryptocurrency(
-                symbol.replace(new RegExp(`-${baseCurrency}$`), baseCurrency)
+                symbol.replace(
+                  new RegExp(`-${this.baseCurrency}$`),
+                  this.baseCurrency
+                )
              )) ||
-            ['EQUITY', 'ETF', 'MUTUALFUND'].includes(quoteType)
+            ['EQUITY', 'ETF', 'FUTURE', 'MUTUALFUND'].includes(quoteType)
          );
        })
        .filter(({ quoteType, symbol }) => {
          if (quoteType === 'CRYPTOCURRENCY') {
            // Only allow cryptocurrencies in base currency to avoid having redundancy in the database.
            // Transactions need to be converted manually to the base currency before
-            return symbol.includes(baseCurrency);
+            return symbol.includes(this.baseCurrency);
+          } else if (quoteType === 'FUTURE') {
+            // Allow GC=F, but not MGC=F
+            return symbol.length === 4;
          }

          return true;
@ -288,7 +309,12 @@ export class YahooFinanceService implements DataProviderInterface {
          symbol,
          currency: marketDataItem.currency,
          dataSource: this.getName(),
-          name: quote?.longname || quote?.shortname || symbol
+          name: this.formatName({
+            longName: quote.longname,
+            quoteType: quote.quoteType,
+            shortName: quote.shortname,
+            symbol: quote.symbol
+          })
        });
      }
    } catch (error) {
@ -298,8 +324,18 @@ export class YahooFinanceService implements DataProviderInterface {
    return { items };
  }

-  private formatName(aAssetProfile: QuoteSummaryResult) {
-    let name = aAssetProfile.price.longName;
+  private formatName({
+    longName,
+    quoteType,
+    shortName,
+    symbol
+  }: {
+    longName: Price['longName'];
+    quoteType: Price['quoteType'];
+    shortName: Price['shortName'];
+    symbol: Price['symbol'];
+  }) {
+    let name = longName;

    if (name) {
      name = name.replace('iShares ETF (CH) - ', '');
@ -314,7 +350,12 @@ export class YahooFinanceService implements DataProviderInterface {
      name = name.replace('Xtrackers (IE) Plc - ', '');
    }

-    return name || aAssetProfile.price.shortName || aAssetProfile.price.symbol;
+    if (quoteType === 'FUTURE') {
+      // "Gold Jun 22" -> "Gold"
+      name = shortName?.slice(0, -6);
+    }
+
+    return name || shortName || symbol;
  }

  private parseAssetClass(aPrice: Price): {
@ -336,6 +377,20 @@ export class YahooFinanceService implements DataProviderInterface {
      case 'etf':
        assetClass = AssetClass.EQUITY;
        assetSubClass = AssetSubClass.ETF;
+        break;
+      case 'future':
+        assetClass = AssetClass.COMMODITY;
+        assetSubClass = AssetSubClass.COMMODITY;
+
+        if (
+          aPrice?.shortName?.toLowerCase()?.startsWith('gold') ||
+          aPrice?.shortName?.toLowerCase()?.startsWith('palladium') ||
+          aPrice?.shortName?.toLowerCase()?.startsWith('platinum') ||
+          aPrice?.shortName?.toLowerCase()?.startsWith('silver')
+        ) {
+          assetSubClass = AssetSubClass.PRECIOUS_METAL;
+        }
+
        break;
      case 'mutualfund':
        assetClass = AssetClass.EQUITY;
--- a/apps/api/src/services/exchange-rate-data.module.ts
+++ b/apps/api/src/services/exchange-rate-data.module.ts
@ -1,12 +1,18 @@
+import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
+import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { Module } from '@nestjs/common';

 import { PrismaModule } from './prisma.module';
-import { PropertyModule } from './property/property.module';

@Module({
-  imports: [DataProviderModule, PrismaModule, PropertyModule],
+  imports: [
+    ConfigurationModule,
+    DataProviderModule,
+    PrismaModule,
+    PropertyModule
+  ],
  providers: [ExchangeRateDataService],
  exports: [ExchangeRateDataService]
 })
--- a/apps/api/src/services/exchange-rate-data.service.ts
+++ b/apps/api/src/services/exchange-rate-data.service.ts
@ -1,9 +1,10 @@
-import { PROPERTY_CURRENCIES, baseCurrency } from '@ghostfolio/common/config';
+import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';
 import { DATE_FORMAT, getYesterday } from '@ghostfolio/common/helper';
 import { Injectable, Logger } from '@nestjs/common';
 import { format } from 'date-fns';
 import { isNumber, uniq } from 'lodash';

+import { ConfigurationService } from './configuration.service';
 import { DataProviderService } from './data-provider/data-provider.service';
 import { IDataGatheringItem } from './interfaces/interfaces';
 import { PrismaService } from './prisma.service';
@ -11,11 +12,13 @@ import { PropertyService } from './property/property.service';

@Injectable()
 export class ExchangeRateDataService {
+  private baseCurrency: string;
  private currencies: string[] = [];
  private currencyPairs: IDataGatheringItem[] = [];
  private exchangeRates: { [currencyPair: string]: number } = {};

  public constructor(
+    private readonly configurationService: ConfigurationService,
    private readonly dataProviderService: DataProviderService,
    private readonly prismaService: PrismaService,
    private readonly propertyService: PropertyService
@ -24,7 +27,7 @@ export class ExchangeRateDataService {
  }

  public getCurrencies() {
-    return this.currencies?.length > 0 ? this.currencies : [baseCurrency];
+    return this.currencies?.length > 0 ? this.currencies : [this.baseCurrency];
  }

  public getCurrencyPairs() {
@ -32,6 +35,7 @@ export class ExchangeRateDataService {
  }

  public async initialize() {
+    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
    this.currencies = await this.prepareCurrencies();
    this.currencyPairs = [];
    this.exchangeRates = {};
@ -212,14 +216,14 @@ export class ExchangeRateDataService {
  private prepareCurrencyPairs(aCurrencies: string[]) {
    return aCurrencies
      .filter((currency) => {
-        return currency !== baseCurrency;
+        return currency !== this.baseCurrency;
      })
      .map((currency) => {
        return {
-          currency1: baseCurrency,
+          currency1: this.baseCurrency,
          currency2: currency,
          dataSource: this.dataProviderService.getPrimaryDataSource(),
-          symbol: `${baseCurrency}${currency}`
+          symbol: `${this.baseCurrency}${currency}`
        };
      });
  }
--- a/apps/api/src/services/interfaces/environment.interface.ts
+++ b/apps/api/src/services/interfaces/environment.interface.ts
@ -3,6 +3,7 @@ import { CleanedEnvAccessors } from 'envalid';
 export interface Environment extends CleanedEnvAccessors {
  ACCESS_TOKEN_SALT: string;
  ALPHA_VANTAGE_API_KEY: string;
+  BASE_CURRENCY: string;
  CACHE_TTL: number;
  DATA_SOURCE_PRIMARY: string;
  DATA_SOURCES: string | string[]; // string is not correct, error in envalid?
@ -15,6 +16,7 @@ export interface Environment extends CleanedEnvAccessors {
  ENABLE_FEATURE_STATISTICS: boolean;
  ENABLE_FEATURE_SUBSCRIPTION: boolean;
  ENABLE_FEATURE_SYSTEM_MESSAGE: boolean;
+  EOD_HISTORICAL_DATA_API_KEY: string;
  GOOGLE_CLIENT_ID: string;
  GOOGLE_SECRET: string;
  GOOGLE_SHEETS_ACCOUNT: string;
@ -26,6 +28,7 @@ export interface Environment extends CleanedEnvAccessors {
  PORT: number;
  RAKUTEN_RAPID_API_KEY: string;
  REDIS_HOST: string;
+  REDIS_PASSWORD: string;
  REDIS_PORT: number;
  ROOT_URL: string;
  STRIPE_PUBLIC_KEY: string;
--- a/apps/api/src/services/interfaces/interfaces.ts
+++ b/apps/api/src/services/interfaces/interfaces.ts
@ -1,18 +1,12 @@
+import { UniqueAsset } from '@ghostfolio/common/interfaces';
+import { MarketState } from '@ghostfolio/common/types';
 import {
  Account,
-  AssetClass,
-  AssetSubClass,
  DataSource,
  SymbolProfile,
  Type as TypeOfOrder
 } from '@prisma/client';

-export const MarketState = {
-  closed: 'closed',
-  delayed: 'delayed',
-  open: 'open'
-};
-
 export interface IOrder {
  account: Account;
  currency: string;
@ -39,10 +33,6 @@ export interface IDataProviderResponse {
  marketState: MarketState;
 }

-export interface IDataGatheringItem {
-  dataSource: DataSource;
+export interface IDataGatheringItem extends UniqueAsset {
  date?: Date;
-  symbol: string;
 }
-
-export type MarketState = typeof MarketState[keyof typeof MarketState];
--- a/apps/api/src/services/market-data.service.ts
+++ b/apps/api/src/services/market-data.service.ts
@ -34,6 +34,20 @@ export class MarketDataService {
    });
  }

+  public async getMax({ dataSource, symbol }: UniqueAsset): Promise<number> {
+    const aggregations = await this.prismaService.marketData.aggregate({
+      _max: {
+        marketPrice: true
+      },
+      where: {
+        dataSource,
+        symbol
+      }
+    });
+
+    return aggregations._max.marketPrice;
+  }
+
  public async getRange({
    dateQuery,
    symbols
--- a/apps/api/src/services/symbol-profile.service.ts
+++ b/apps/api/src/services/symbol-profile.service.ts
@ -1,6 +1,10 @@
-import { EnhancedSymbolProfile } from '@ghostfolio/api/services/interfaces/symbol-profile.interface';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { UNKNOWN_KEY } from '@ghostfolio/common/config';
+import {
+  EnhancedSymbolProfile,
+  ScraperConfiguration,
+  UniqueAsset
+} from '@ghostfolio/common/interfaces';
 import { Country } from '@ghostfolio/common/interfaces/country.interface';
 import { Sector } from '@ghostfolio/common/interfaces/sector.interface';
 import { Injectable } from '@nestjs/common';
@ -12,8 +16,6 @@ import {
 } from '@prisma/client';
 import { continents, countries } from 'countries-list';

-import { ScraperConfiguration } from './data-provider/ghostfolio-scraper-api/interfaces/scraper-configuration.interface';
-
@Injectable()
 export class SymbolProfileService {
  public constructor(private readonly prismaService: PrismaService) {}
@ -37,6 +39,35 @@ export class SymbolProfileService {
  }

  public async getSymbolProfiles(
+    aUniqueAssets: UniqueAsset[]
+  ): Promise<EnhancedSymbolProfile[]> {
+    return this.prismaService.symbolProfile
+      .findMany({
+        include: { SymbolProfileOverrides: true },
+        where: {
+          AND: [
+            {
+              dataSource: {
+                in: aUniqueAssets.map(({ dataSource }) => {
+                  return dataSource;
+                })
+              },
+              symbol: {
+                in: aUniqueAssets.map(({ symbol }) => {
+                  return symbol;
+                })
+              }
+            }
+          ]
+        }
+      })
+      .then((symbolProfiles) => this.getSymbols(symbolProfiles));
+  }
+
+  /**
+   * @deprecated
+   */
+  public async getSymbolProfilesBySymbols(
    symbols: string[]
  ): Promise<EnhancedSymbolProfile[]> {
    return this.prismaService.symbolProfile
@ -59,7 +90,9 @@ export class SymbolProfileService {
    return symbolProfiles.map((symbolProfile) => {
      const item = {
        ...symbolProfile,
-        countries: this.getCountries(symbolProfile),
+        countries: this.getCountries(
+          symbolProfile?.countries as unknown as Prisma.JsonArray
+        ),
        scraperConfiguration: this.getScraperConfiguration(symbolProfile),
        sectors: this.getSectors(symbolProfile),
        symbolMapping: this.getSymbolMapping(symbolProfile)
@ -70,9 +103,17 @@ export class SymbolProfileService {
          item.SymbolProfileOverrides.assetClass ?? item.assetClass;
        item.assetSubClass =
          item.SymbolProfileOverrides.assetSubClass ?? item.assetSubClass;
-        item.countries =
-          (item.SymbolProfileOverrides.sectors as unknown as Country[]) ??
-          item.countries;
+
+        if (
+          (item.SymbolProfileOverrides.countries as unknown as Prisma.JsonArray)
+            ?.length > 0
+        ) {
+          item.countries = this.getCountries(
+            item.SymbolProfileOverrides
+              ?.countries as unknown as Prisma.JsonArray
+          );
+        }
+
        item.name = item.SymbolProfileOverrides?.name ?? item.name;
        item.sectors =
          (item.SymbolProfileOverrides.sectors as unknown as Sector[]) ??
@ -85,20 +126,22 @@ export class SymbolProfileService {
    });
  }

-  private getCountries(symbolProfile: SymbolProfile): Country[] {
-    return ((symbolProfile?.countries as Prisma.JsonArray) ?? []).map(
-      (country) => {
-        const { code, weight } = country as Prisma.JsonObject;
+  private getCountries(aCountries: Prisma.JsonArray = []): Country[] {
+    if (aCountries === null) {
+      return [];
+    }

-        return {
-          code: code as string,
-          continent:
-            continents[countries[code as string]?.continent] ?? UNKNOWN_KEY,
-          name: countries[code as string]?.name ?? UNKNOWN_KEY,
-          weight: weight as number
-        };
-      }
-    );
+    return aCountries.map((country: Pick<Country, 'code' | 'weight'>) => {
+      const { code, weight } = country;
+
+      return {
+        code,
+        weight,
+        continent:
+          continents[countries[code as string]?.continent] ?? UNKNOWN_KEY,
+        name: countries[code as string]?.name ?? UNKNOWN_KEY
+      };
+    });
  }

  private getScraperConfiguration(
--- a/apps/api/src/services/tag/tag.module.ts
+++ b/apps/api/src/services/tag/tag.module.ts
@ -0,0 +1,11 @@
+import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
+import { Module } from '@nestjs/common';
+
+import { TagService } from './tag.service';
+
+@Module({
+  exports: [TagService],
+  imports: [PrismaModule],
+  providers: [TagService]
+})
+export class TagModule {}
--- a/apps/api/src/services/tag/tag.service.ts
+++ b/apps/api/src/services/tag/tag.service.ts
@ -0,0 +1,30 @@
+import { PrismaService } from '@ghostfolio/api/services/prisma.service';
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class TagService {
+  public constructor(private readonly prismaService: PrismaService) {}
+
+  public async get() {
+    return this.prismaService.tag.findMany({
+      orderBy: {
+        name: 'asc'
+      }
+    });
+  }
+
+  public async getByUser(userId: string) {
+    return this.prismaService.tag.findMany({
+      orderBy: {
+        name: 'asc'
+      },
+      where: {
+        orders: {
+          some: {
+            userId
+          }
+        }
+      }
+    });
+  }
+}
--- a/apps/api/src/services/twitter-bot/twitter-bot.module.ts
+++ b/apps/api/src/services/twitter-bot/twitter-bot.module.ts
@ -1,11 +1,13 @@
+import { BenchmarkModule } from '@ghostfolio/api/app/benchmark/benchmark.module';
 import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
+import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { TwitterBotService } from '@ghostfolio/api/services/twitter-bot/twitter-bot.service';
 import { Module } from '@nestjs/common';

@Module({
  exports: [TwitterBotService],
-  imports: [ConfigurationModule, SymbolModule],
+  imports: [BenchmarkModule, ConfigurationModule, PropertyModule, SymbolModule],
  providers: [TwitterBotService]
 })
 export class TwitterBotModule {}
--- a/apps/api/src/services/twitter-bot/twitter-bot.service.ts
+++ b/apps/api/src/services/twitter-bot/twitter-bot.service.ts
@ -1,12 +1,19 @@
+import { BenchmarkService } from '@ghostfolio/api/app/benchmark/benchmark.service';
 import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import {
+  PROPERTY_BENCHMARKS,
  ghostfolioFearAndGreedIndexDataSource,
  ghostfolioFearAndGreedIndexSymbol
 } from '@ghostfolio/common/config';
-import { resolveFearAndGreedIndex } from '@ghostfolio/common/helper';
+import {
+  resolveFearAndGreedIndex,
+  resolveMarketCondition
+} from '@ghostfolio/common/helper';
+import { UniqueAsset } from '@ghostfolio/common/interfaces';
 import { Injectable, Logger } from '@nestjs/common';
-import { isSunday } from 'date-fns';
+import { isWeekend } from 'date-fns';
 import { TwitterApi, TwitterApiReadWrite } from 'twitter-api-v2';

@Injectable()
@ -14,7 +21,9 @@ export class TwitterBotService {
  private twitterClient: TwitterApiReadWrite;

  public constructor(
+    private readonly benchmarkService: BenchmarkService,
    private readonly configurationService: ConfigurationService,
+    private readonly propertyService: PropertyService,
    private readonly symbolService: SymbolService
  ) {
    this.twitterClient = new TwitterApi({
@ -30,7 +39,7 @@ export class TwitterBotService {
  public async tweetFearAndGreedIndex() {
    if (
      !this.configurationService.get('ENABLE_FEATURE_FEAR_AND_GREED_INDEX') ||
-      isSunday(new Date())
+      isWeekend(new Date())
    ) {
      return;
    }
@ -48,7 +57,16 @@ export class TwitterBotService {
          symbolItem.marketPrice
        );

-        const status = `Current Market Mood: ${emoji} ${text} (${symbolItem.marketPrice}/100)\n\n#FearAndGreed #Markets #ServiceTweet`;
+        let status = `Current Market Mood: ${emoji} ${text} (${symbolItem.marketPrice}/100)`;
+
+        const benchmarkListing = await this.getBenchmarkListing(3);
+
+        if (benchmarkListing?.length > 1) {
+          status += '\n\n';
+          status += '±% from ATH\n';
+          status += benchmarkListing;
+        }
+
        const { data: createdTweet } = await this.twitterClient.v2.tweet(
          status
        );
@ -62,4 +80,35 @@ export class TwitterBotService {
      Logger.error(error, 'TwitterBotService');
    }
  }
+
+  private async getBenchmarkListing(aMax: number) {
+    const benchmarkAssets: UniqueAsset[] =
+      ((await this.propertyService.getByKey(
+        PROPERTY_BENCHMARKS
+      )) as UniqueAsset[]) ?? [];
+
+    const benchmarks = await this.benchmarkService.getBenchmarks(
+      benchmarkAssets
+    );
+
+    const benchmarkListing: string[] = [];
+
+    for (const [index, benchmark] of benchmarks.entries()) {
+      if (index > aMax - 1) {
+        break;
+      }
+
+      benchmarkListing.push(
+        `${benchmark.name} ${(
+          benchmark.performances.allTimeHigh.performancePercent * 100
+        ).toFixed(1)}%${
+          benchmark.marketCondition !== 'NEUTRAL_MARKET'
+            ? ' ' + resolveMarketCondition(benchmark.marketCondition).emoji
+            : ''
+        }`
+      );
+    }
+
+    return benchmarkListing.join('\n');
+  }
 }
--- a/apps/api/tsconfig.app.json
+++ b/apps/api/tsconfig.app.json
@ -6,6 +6,6 @@
    "emitDecoratorMetadata": true,
    "target": "es2015"
  },
-  "exclude": ["**/*.spec.ts", "**/*.test.ts"],
+  "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
  "include": ["**/*.ts"]
 }
--- a/apps/api/tsconfig.spec.json
+++ b/apps/api/tsconfig.spec.json
@ -5,5 +5,5 @@
    "module": "commonjs",
    "types": ["jest", "node"]
  },
-  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts"]
+  "include": ["**/*.spec.ts", "**/*.test.ts", "**/*.d.ts", "jest.config.ts"]
 }
--- a/apps/client/jest.config.ts
+++ b/apps/client/jest.config.ts
@ -1,6 +1,6 @@
 module.exports = {
  displayName: 'client',
-  preset: '../../jest.preset.js',
+
  setupFilesAfterEnv: ['<rootDir>/src/test-setup.ts'],
  globals: {
    'ts-jest': {
@ -17,5 +17,6 @@ module.exports = {
  transform: {
    '^.+.(ts|mjs|js|html)$': 'jest-preset-angular'
  },
-  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)']
+  transformIgnorePatterns: ['node_modules/(?!.*.mjs$)'],
+  preset: '../../jest.preset.ts'
 };
--- a/apps/client/src/app/adapter/custom-date-adapter.ts
+++ b/apps/client/src/app/adapter/custom-date-adapter.ts
@ -1,20 +1,28 @@
 import { Platform } from '@angular/cdk/platform';
 import { Inject, forwardRef } from '@angular/core';
 import { MAT_DATE_LOCALE, NativeDateAdapter } from '@angular/material/core';
-import { format, isValid } from 'date-fns';
-import * as deDateFnsLocale from 'date-fns/locale/de/index';
+import { getDateFormatString } from '@ghostfolio/common/helper';
+import { format, parse } from 'date-fns';

 export class CustomDateAdapter extends NativeDateAdapter {
  /**
   * @constructor
   */
  public constructor(
+    @Inject(MAT_DATE_LOCALE) public locale: string,
    @Inject(forwardRef(() => MAT_DATE_LOCALE)) matDateLocale: string,
    platform: Platform
  ) {
    super(matDateLocale, platform);
  }

+  /**
+   * Formats a date as a string
+   */
+  public format(aDate: Date, aParseFormat: string): string {
+    return format(aDate, getDateFormatString(this.locale));
+  }
+
  /**
   * Sets the first day of the week to Monday
   */
@ -22,44 +30,10 @@ export class CustomDateAdapter extends NativeDateAdapter {
    return 1;
  }

-  /**
-   * Formats a date as a string according to the given format
-   */
-  public format(aDate: Date, aParseFormat: string): string {
-    return format(aDate, aParseFormat, {
-      locale: <any>deDateFnsLocale
-    });
-  }
-
  /**
   * Parses a date from a provided value
   */
-  public parse(aValue: any): Date {
-    let date: Date;
-
-    try {
-      // TODO
-      // Native date parser from the following formats:
-      // - 'd.M.yyyy'
-      // - 'dd.MM.yyyy'
-      // https://github.com/you-dont-need/You-Dont-Need-Momentjs#string--date-format
-      const datePattern = /^(\d{1,2}).(\d{1,2}).(\d{4})$/;
-      const [, day, month, year] = datePattern.exec(aValue);
-
-      date = new Date(
-        parseInt(year, 10),
-        parseInt(month, 10) - 1, // monthIndex
-        parseInt(day, 10)
-      );
-    } catch (error) {
-    } finally {
-      const isDateValid = date && isValid(date);
-
-      if (isDateValid) {
-        return date;
-      }
-
-      return null;
-    }
+  public parse(aValue: string): Date {
+    return parse(aValue, getDateFormatString(this.locale), new Date());
  }
 }
--- a/apps/client/src/app/components/accounts-table/accounts-table.component.html
+++ b/apps/client/src/app/components/accounts-table/accounts-table.component.html
@ -200,7 +200,7 @@
        </button>
        <button
          mat-menu-item
-          [disabled]="element.isDefault || element.Order?.length > 0"
+          [disabled]="element.isDefault || element.transactionCount > 0"
          (click)="onDeleteAccount(element.id)"
        >
          <ion-icon class="mr-2" name="trash-outline"></ion-icon>
--- a/apps/client/src/app/components/admin-jobs/admin-jobs.component.ts
+++ b/apps/client/src/app/components/admin-jobs/admin-jobs.component.ts
@ -0,0 +1,116 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  OnDestroy,
+  OnInit
+} from '@angular/core';
+import { FormBuilder, FormGroup } from '@angular/forms';
+import { AdminService } from '@ghostfolio/client/services/admin.service';
+import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { QUEUE_JOB_STATUS_LIST } from '@ghostfolio/common/config';
+import { getDateWithTimeFormatString } from '@ghostfolio/common/helper';
+import { AdminJobs, User } from '@ghostfolio/common/interfaces';
+import { JobStatus } from 'bull';
+import { Subject } from 'rxjs';
+import { takeUntil } from 'rxjs/operators';
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  selector: 'gf-admin-jobs',
+  styleUrls: ['./admin-jobs.scss'],
+  templateUrl: './admin-jobs.html'
+})
+export class AdminJobsComponent implements OnDestroy, OnInit {
+  public defaultDateTimeFormat: string;
+  public filterForm: FormGroup;
+  public jobs: AdminJobs['jobs'] = [];
+  public statusFilterOptions = QUEUE_JOB_STATUS_LIST;
+  public user: User;
+
+  private unsubscribeSubject = new Subject<void>();
+
+  /**
+   * @constructor
+   */
+  public constructor(
+    private adminService: AdminService,
+    private changeDetectorRef: ChangeDetectorRef,
+    private formBuilder: FormBuilder,
+    private userService: UserService
+  ) {
+    this.userService.stateChanged
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((state) => {
+        if (state?.user) {
+          this.user = state.user;
+
+          this.defaultDateTimeFormat = getDateWithTimeFormatString(
+            this.user.settings.locale
+          );
+        }
+      });
+  }
+
+  /**
+   * Initializes the controller
+   */
+  public ngOnInit() {
+    this.filterForm = this.formBuilder.group({
+      status: []
+    });
+
+    this.filterForm.valueChanges
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        const currentFilter = this.filterForm.get('status').value;
+        this.fetchJobs(currentFilter ? [currentFilter] : undefined);
+      });
+
+    this.fetchJobs();
+  }
+
+  public onDeleteJob(aId: string) {
+    this.adminService
+      .deleteJob(aId)
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        this.fetchJobs();
+      });
+  }
+
+  public onDeleteJobs() {
+    const currentFilter = this.filterForm.get('status').value;
+
+    this.adminService
+      .deleteJobs({ status: currentFilter ? [currentFilter] : undefined })
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        this.fetchJobs(currentFilter ? [currentFilter] : undefined);
+      });
+  }
+
+  public onViewData(aData: AdminJobs['jobs'][0]['data']) {
+    alert(JSON.stringify(aData, null, '  '));
+  }
+
+  public onViewStacktrace(aStacktrace: AdminJobs['jobs'][0]['stacktrace']) {
+    alert(JSON.stringify(aStacktrace, null, '  '));
+  }
+
+  public ngOnDestroy() {
+    this.unsubscribeSubject.next();
+    this.unsubscribeSubject.complete();
+  }
+
+  private fetchJobs(aStatus?: JobStatus[]) {
+    this.adminService
+      .fetchJobs({ status: aStatus })
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(({ jobs }) => {
+        this.jobs = jobs;
+
+        this.changeDetectorRef.markForCheck();
+      });
+  }
+}
--- a/apps/client/src/app/components/admin-jobs/admin-jobs.html
+++ b/apps/client/src/app/components/admin-jobs/admin-jobs.html
@ -0,0 +1,130 @@
+<div class="container">
+  <div class="row">
+    <div class="col">
+      <form class="align-items-center d-flex" [formGroup]="filterForm">
+        <mat-form-field appearance="outline" class="flex-grow-1">
+          <mat-select formControlName="status">
+            <mat-option></mat-option>
+            <mat-option
+              *ngFor="let statusFilterOption of statusFilterOptions"
+              [value]="statusFilterOption"
+              >{{ statusFilterOption }}</mat-option
+            >
+          </mat-select>
+        </mat-form-field>
+        <button
+          class="ml-1"
+          color="warn"
+          mat-flat-button
+          (click)="onDeleteJobs()"
+        >
+          <span i18n>Delete Jobs</span>
+        </button>
+      </form>
+      <table class="gf-table w-100">
+        <thead>
+          <tr class="mat-header-row">
+            <th class="mat-header-cell px-1 py-2 text-right" i18n>#</th>
+            <th class="mat-header-cell px-1 py-2" i18n>Type</th>
+            <th class="mat-header-cell px-1 py-2" i18n>Symbol</th>
+            <th class="mat-header-cell px-1 py-2" i18n>Data Source</th>
+            <th class="mat-header-cell px-1 py-2 text-right" i18n>Attempts</th>
+            <th class="mat-header-cell px-1 py-2" i18n>Created</th>
+            <th class="mat-header-cell px-1 py-2" i18n>Finished</th>
+            <th class="mat-header-cell px-1 py-2" i18n>Status</th>
+            <th class="mat-header-cell px-1 py-2"></th>
+          </tr>
+        </thead>
+        <tbody>
+          <ng-container *ngFor="let job of jobs">
+            <tr class="mat-row">
+              <td class="mat-cell px-1 py-2 text-right">{{ job.id }}</td>
+              <td class="mat-cell px-1 py-2">
+                <span class="align-items-center d-flex">
+                  <ion-icon
+                    class="mr-1"
+                    name="arrow-down-circle-outline"
+                  ></ion-icon>
+                  <ng-container *ngIf="job.name === 'GATHER_ASSET_PROFILE'">
+                    <span i18n>Asset Profile</span>
+                  </ng-container>
+                  <ng-container
+                    *ngIf="job.name === 'GATHER_HISTORICAL_MARKET_DATA'"
+                  >
+                    <span i18n>Historical Market Data</span>
+                  </ng-container>
+                </span>
+              </td>
+              <td class="mat-cell px-1 py-2">{{ job.data?.symbol }}</td>
+              <td class="mat-cell px-1 py-2">{{ job.data?.dataSource }}</td>
+              <td class="mat-cell px-1 py-2 text-right">
+                {{ job.attemptsMade }}
+              </td>
+              <td class="mat-cell px-1 py-2">
+                {{ job.timestamp | date: defaultDateTimeFormat }}
+              </td>
+              <td class="mat-cell px-1 py-2">
+                {{ job.finishedOn | date: defaultDateTimeFormat }}
+              </td>
+              <td class="mat-cell px-1 py-2">
+                <ion-icon
+                  *ngIf="job.state === 'active'"
+                  name="play-outline"
+                ></ion-icon>
+                <ion-icon
+                  *ngIf="job.state === 'completed'"
+                  class="text-success"
+                  name="checkmark-circle-outline"
+                ></ion-icon>
+                <ion-icon
+                  *ngIf="job.state === 'delayed'"
+                  name="time-outline"
+                  [ngClass]="{ 'text-danger': job.stacktrace?.length > 0 }"
+                ></ion-icon>
+                <ion-icon
+                  *ngIf="job.state === 'failed'"
+                  class="text-danger"
+                  name="alert-circle-outline"
+                ></ion-icon>
+                <ion-icon
+                  *ngIf="job.state === 'paused'"
+                  name="pause-outline"
+                ></ion-icon>
+                <ion-icon
+                  *ngIf="job.state === 'waiting'"
+                  name="cafe-outline"
+                ></ion-icon>
+              </td>
+              <td class="mat-cell px-1 py-2">
+                <button
+                  class="mx-1 no-min-width px-2"
+                  mat-button
+                  [matMenuTriggerFor]="accountMenu"
+                  (click)="$event.stopPropagation()"
+                >
+                  <ion-icon name="ellipsis-vertical"></ion-icon>
+                </button>
+                <mat-menu #accountMenu="matMenu" xPosition="before">
+                  <button i18n mat-menu-item (click)="onViewData(job.data)">
+                    View Data
+                  </button>
+                  <button
+                    i18n
+                    mat-menu-item
+                    [disabled]="job.stacktrace?.length <= 0"
+                    (click)="onViewStacktrace(job.stacktrace)"
+                  >
+                    View Stacktrace
+                  </button>
+                  <button i18n mat-menu-item (click)="onDeleteJob(job.id)">
+                    Delete Job
+                  </button>
+                </mat-menu>
+              </td>
+            </tr>
+          </ng-container>
+        </tbody>
+      </table>
+    </div>
+  </div>
+</div>
--- a/apps/client/src/app/components/admin-jobs/admin-jobs.module.ts
+++ b/apps/client/src/app/components/admin-jobs/admin-jobs.module.ts
@ -0,0 +1,22 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatMenuModule } from '@angular/material/menu';
+import { MatSelectModule } from '@angular/material/select';
+
+import { AdminJobsComponent } from './admin-jobs.component';
+
+@NgModule({
+  declarations: [AdminJobsComponent],
+  imports: [
+    CommonModule,
+    FormsModule,
+    MatButtonModule,
+    MatMenuModule,
+    MatSelectModule,
+    ReactiveFormsModule
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class GfAdminJobsModule {}
--- a/apps/client/src/app/components/admin-jobs/admin-jobs.scss
+++ b/apps/client/src/app/components/admin-jobs/admin-jobs.scss
@ -0,0 +1,5 @@
+@import '~apps/client/src/styles/ghostfolio-style';
+
+:host {
+  display: block;
+}
--- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html
+++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.html
@ -2,8 +2,10 @@
  <gf-line-chart
    class="mb-4"
    [historicalDataItems]="historicalDataItems"
+    [locale]="locale"
    [showXAxis]="true"
    [showYAxis]="true"
+    [symbol]="symbol"
  ></gf-line-chart>
  <div *ngFor="let itemByMonth of marketDataByMonth | keyvalue" class="d-flex">
    <div class="date px-1 text-nowrap">{{ itemByMonth.key }}</div>
--- a/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts
+++ b/apps/client/src/app/components/admin-market-data-detail/admin-market-data-detail.component.ts
@ -8,11 +8,13 @@ import {
  Output
 } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
+import { UserService } from '@ghostfolio/client/services/user/user.service';
 import {
  DATE_FORMAT,
  getDateFormatString,
  getLocale
 } from '@ghostfolio/common/helper';
+import { User } from '@ghostfolio/common/interfaces';
 import { LineChartItem } from '@ghostfolio/ui/line-chart/interfaces/line-chart.interface';
 import { DataSource, MarketData } from '@prisma/client';
 import {
@ -53,14 +55,24 @@ export class AdminMarketDataDetailComponent implements OnChanges, OnInit {
      [day: string]: Pick<MarketData, 'date' | 'marketPrice'> & { day: number };
    };
  } = {};
+  public user: User;

  private unsubscribeSubject = new Subject<void>();

  public constructor(
    private deviceService: DeviceDetectorService,
-    private dialog: MatDialog
+    private dialog: MatDialog,
+    private userService: UserService
  ) {
    this.deviceType = this.deviceService.getDeviceInfo().deviceType;
+
+    this.userService.stateChanged
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((state) => {
+        if (state?.user) {
+          this.user = state.user;
+        }
+      });
  }

  public ngOnInit() {}
@ -145,7 +157,8 @@ export class AdminMarketDataDetailComponent implements OnChanges, OnInit {
        date,
        marketPrice,
        dataSource: this.dataSource,
-        symbol: this.symbol
+        symbol: this.symbol,
+        user: this.user
      },
      height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',
      width: this.deviceType === 'mobile' ? '100vw' : '50rem'
--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/interfaces/interfaces.ts
+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/interfaces/interfaces.ts
@ -1,3 +1,4 @@
+import { User } from '@ghostfolio/common/interfaces';
 import { DataSource } from '@prisma/client';

 export interface MarketDataDetailDialogParams {
@ -5,4 +6,5 @@ export interface MarketDataDetailDialogParams {
  date: Date;
  marketPrice: number;
  symbol: string;
+  user: User;
 }
--- a/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.component.ts
+++ b/apps/client/src/app/components/admin-market-data-detail/market-data-detail-dialog/market-data-detail-dialog.component.ts
@ -5,6 +5,7 @@ import {
  Inject,
  OnDestroy
 } from '@angular/core';
+import { DateAdapter, MAT_DATE_LOCALE } from '@angular/material/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { Subject, takeUntil } from 'rxjs';
@ -24,11 +25,16 @@ export class MarketDataDetailDialog implements OnDestroy {
  public constructor(
    private adminService: AdminService,
    private changeDetectorRef: ChangeDetectorRef,
+    @Inject(MAT_DIALOG_DATA) public data: MarketDataDetailDialogParams,
+    private dateAdapter: DateAdapter<any>,
    public dialogRef: MatDialogRef<MarketDataDetailDialog>,
-    @Inject(MAT_DIALOG_DATA) public data: MarketDataDetailDialogParams
+    @Inject(MAT_DATE_LOCALE) private locale: string
  ) {}

-  public ngOnInit() {}
+  public ngOnInit() {
+    this.locale = this.data.user?.settings?.locale;
+    this.dateAdapter.setLocale(this.locale);
+  }

  public onCancel(): void {
    this.dialogRef.close({ withRefresh: false });
--- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts
+++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts
@ -15,7 +15,6 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import {
  differenceInSeconds,
  formatDistanceToNowStrict,
-  isValid,
  parseISO
 } from 'date-fns';
 import { uniq } from 'lodash';
@ -32,14 +31,11 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
  public couponDuration: StringValue = '30 days';
  public coupons: Coupon[];
  public customCurrencies: string[];
-  public dataGatheringInProgress: boolean;
-  public dataGatheringProgress: number;
  public exchangeRates: { label1: string; label2: string; value: number }[];
  public hasPermissionForSubscription: boolean;
  public hasPermissionForSystemMessage: boolean;
  public hasPermissionToToggleReadOnlyMode: boolean;
  public info: InfoItem;
-  public lastDataGathering: string;
  public transactionCount: number;
  public userCount: number;
  public user: User;
@ -128,7 +124,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
  public onDeleteCoupon(aCouponCode: string) {
    const confirmation = confirm('Do you really want to delete this coupon?');

-    if (confirmation) {
+    if (confirmation === true) {
      const coupons = this.coupons.filter((coupon) => {
        return coupon.code !== aCouponCode;
      });
@ -139,7 +135,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
  public onDeleteCurrency(aCurrency: string) {
    const confirmation = confirm('Do you really want to delete this currency?');

-    if (confirmation) {
+    if (confirmation === true) {
      const currencies = this.customCurrencies.filter((currency) => {
        return currency !== aCurrency;
      });
@ -152,8 +148,23 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
  }

  public onFlushCache() {
-    this.cacheService
-      .flush()
+    const confirmation = confirm('Do you really want to flush the cache?');
+
+    if (confirmation === true) {
+      this.cacheService
+        .flush()
+        .pipe(takeUntil(this.unsubscribeSubject))
+        .subscribe(() => {
+          setTimeout(() => {
+            window.location.reload();
+          }, 300);
+        });
+    }
+  }
+
+  public onGather7Days() {
+    this.adminService
+      .gather7Days()
      .pipe(takeUntil(this.unsubscribeSubject))
      .subscribe(() => {
        setTimeout(() => {
@ -163,20 +174,14 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
  }

  public onGatherMax() {
-    const confirmation = confirm(
-      'This action may take some time. Do you want to proceed?'
-    );
-
-    if (confirmation === true) {
-      this.adminService
-        .gatherMax()
-        .pipe(takeUntil(this.unsubscribeSubject))
-        .subscribe(() => {
-          setTimeout(() => {
-            window.location.reload();
-          }, 300);
-        });
-    }
+    this.adminService
+      .gatherMax()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(() => {
+        setTimeout(() => {
+          window.location.reload();
+        }, 300);
+      });
  }

  public onGatherProfileData() {
@ -207,39 +212,15 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
    this.dataService
      .fetchAdminData()
      .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(
-        ({
-          dataGatheringProgress,
-          exchangeRates,
-          lastDataGathering,
-          settings,
-          transactionCount,
-          userCount
-        }) => {
-          this.coupons = (settings[PROPERTY_COUPONS] as Coupon[]) ?? [];
-          this.customCurrencies = settings[PROPERTY_CURRENCIES] as string[];
-          this.dataGatheringProgress = dataGatheringProgress;
-          this.exchangeRates = exchangeRates;
+      .subscribe(({ exchangeRates, settings, transactionCount, userCount }) => {
+        this.coupons = (settings[PROPERTY_COUPONS] as Coupon[]) ?? [];
+        this.customCurrencies = settings[PROPERTY_CURRENCIES] as string[];
+        this.exchangeRates = exchangeRates;
+        this.transactionCount = transactionCount;
+        this.userCount = userCount;

-          if (isValid(parseISO(lastDataGathering?.toString()))) {
-            this.lastDataGathering = formatDistanceToNowStrict(
-              new Date(lastDataGathering),
-              {
-                addSuffix: true
-              }
-            );
-          } else if (lastDataGathering === 'IN_PROGRESS') {
-            this.dataGatheringInProgress = true;
-          } else {
-            this.lastDataGathering = 'Starting soon...';
-          }
-
-          this.transactionCount = transactionCount;
-          this.userCount = userCount;
-
-          this.changeDetectorRef.markForCheck();
-        }
-      );
+        this.changeDetectorRef.markForCheck();
+      });
  }

  private generateCouponCode(aLength: number) {
--- a/apps/client/src/app/components/admin-overview/admin-overview.html
+++ b/apps/client/src/app/components/admin-overview/admin-overview.html
@ -19,37 +19,30 @@
          <div class="d-flex my-3">
            <div class="w-50" i18n>Data Gathering</div>
            <div class="w-50">
-              <div>
-                <ng-container *ngIf="lastDataGathering"
-                  >{{ lastDataGathering }}</ng-container
-                >
-                <ng-container *ngIf="dataGatheringInProgress" i18n
-                  >In Progress ({{ dataGatheringProgress | percent : '1.2-2'
-                  }})</ng-container
-                >
-              </div>
-              <div class="mt-2 overflow-hidden">
+              <div class="overflow-hidden">
                <div class="mb-2">
                  <button
                    color="accent"
                    mat-flat-button
-                    (click)="onFlushCache()"
+                    (click)="onGather7Days()"
                  >
                    <ion-icon
                      class="mr-1"
-                      name="close-circle-outline"
+                      name="cloud-download-outline"
                    ></ion-icon>
-                    <span i18n>Reset Data Gathering</span>
+                    <span i18n>Gather Recent Data</span>
                  </button>
                </div>
                <div class="mb-2">
                  <button
-                    color="warn"
+                    color="accent"
                    mat-flat-button
-                    [disabled]="dataGatheringInProgress"
                    (click)="onGatherMax()"
                  >
-                    <ion-icon class="mr-1" name="warning-outline"></ion-icon>
+                    <ion-icon
+                      class="mr-1"
+                      name="cloud-download-outline"
+                    ></ion-icon>
                    <span i18n>Gather All Data</span>
                  </button>
                </div>
@ -58,7 +51,6 @@
                    class="mb-2 mr-2"
                    color="accent"
                    mat-flat-button
-                    [disabled]="dataGatheringInProgress"
                    (click)="onGatherProfileData()"
                  >
                    <ion-icon
@ -97,7 +89,6 @@
                      *ngIf="customCurrencies.includes(exchangeRate.label2)"
                      class="mini-icon mx-1 no-min-width px-2"
                      mat-button
-                      [disabled]="dataGatheringInProgress"
                      (click)="onDeleteCurrency(exchangeRate.label2)"
                    >
                      <ion-icon name="trash-outline"></ion-icon>
@ -109,7 +100,6 @@
                <button
                  color="primary"
                  mat-flat-button
-                  [disabled]="dataGatheringInProgress"
                  (click)="onAddCurrency()"
                >
                  <ion-icon class="mr-1" name="add-outline"></ion-icon>
@ -126,7 +116,6 @@
                <button
                  class="mini-icon mx-1 no-min-width px-2"
                  mat-button
-                  [disabled]="dataGatheringInProgress"
                  (click)="onDeleteSystemMessage()"
                >
                  <ion-icon name="trash-outline"></ion-icon>
@ -197,6 +186,15 @@
              </div>
            </div>
          </div>
+          <div class="d-flex my-3">
+            <div class="w-50" i18n>Housekeeping</div>
+            <div class="w-50">
+              <button color="warn" mat-flat-button (click)="onFlushCache()">
+                <ion-icon class="mr-1" name="close-circle-outline"></ion-icon>
+                <span i18n>Flush Cache</span>
+              </button>
+            </div>
+          </div>
        </mat-card-content>
      </mat-card>
    </div>
--- a/apps/client/src/app/components/admin-users/admin-users.component.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.component.ts
@ -1,6 +1,7 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { DataService } from '@ghostfolio/client/services/data.service';
-import { AdminData } from '@ghostfolio/common/interfaces';
+import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { AdminData, User } from '@ghostfolio/common/interfaces';
 import {
  differenceInSeconds,
  formatDistanceToNowStrict,
@ -15,6 +16,7 @@ import { takeUntil } from 'rxjs/operators';
  templateUrl: './admin-users.html'
 })
 export class AdminUsersComponent implements OnDestroy, OnInit {
+  public user: User;
  public users: AdminData['users'];

  private unsubscribeSubject = new Subject<void>();
@ -24,8 +26,17 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
   */
  public constructor(
    private changeDetectorRef: ChangeDetectorRef,
-    private dataService: DataService
-  ) {}
+    private dataService: DataService,
+    private userService: UserService
+  ) {
+    this.userService.stateChanged
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((state) => {
+        if (state?.user) {
+          this.user = state.user;
+        }
+      });
+  }

  /**
   * Initializes the controller
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@ -45,14 +45,27 @@
              <td class="mat-cell px-1 py-2 text-right">
                {{ formatDistanceToNow(userItem.createdAt) }}
              </td>
-              <td class="mat-cell px-1 py-2 text-right">
-                {{ userItem.accountCount }}
+              <td class="mat-cell px-1 py-2">
+                <gf-value
+                  class="align-items-end"
+                  [locale]="user?.settings?.locale"
+                  [value]="userItem.accountCount"
+                ></gf-value>
              </td>
-              <td class="mat-cell px-1 py-2 text-right">
-                {{ userItem.transactionCount }}
+              <td class="mat-cell px-1 py-2">
+                <gf-value
+                  class="align-items-end"
+                  [locale]="user?.settings?.locale"
+                  [value]="userItem.transactionCount"
+                ></gf-value>
              </td>
-              <td class="mat-cell px-1 py-2 text-right">
-                {{ userItem.engagement | number: '1.0-0' }}
+              <td class="mat-cell px-1 py-2">
+                <gf-value
+                  class="align-items-end"
+                  [locale]="user?.settings?.locale"
+                  [precision]="0"
+                  [value]="userItem.engagement"
+                ></gf-value>
              </td>
              <td class="mat-cell px-1 py-2">
                {{ formatDistanceToNow(userItem.lastActivity) }}
--- a/apps/client/src/app/components/admin-users/admin-users.module.ts
+++ b/apps/client/src/app/components/admin-users/admin-users.module.ts
@ -2,13 +2,14 @@ import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatMenuModule } from '@angular/material/menu';
+import { GfValueModule } from '@ghostfolio/ui/value';

 import { AdminUsersComponent } from './admin-users.component';

@NgModule({
  declarations: [AdminUsersComponent],
  exports: [],
-  imports: [CommonModule, MatButtonModule, MatMenuModule],
+  imports: [CommonModule, GfValueModule, MatButtonModule, MatMenuModule],
  schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
 export class GfAdminUsersModule {}
--- a/apps/client/src/app/components/home-holdings/home-holdings.component.ts
+++ b/apps/client/src/app/components/home-holdings/home-holdings.component.ts
@ -18,6 +18,8 @@ import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';

+import { PositionDetailDialogParams } from '../position/position-detail-dialog/interfaces/interfaces';
+
@Component({
  selector: 'gf-home-holdings',
  styleUrls: ['./home-holdings.scss'],
@ -126,12 +128,16 @@ export class HomeHoldingsComponent implements OnDestroy, OnInit {

        const dialogRef = this.dialog.open(PositionDetailDialog, {
          autoFocus: false,
-          data: {
+          data: <PositionDetailDialogParams>{
            dataSource,
            symbol,
            baseCurrency: this.user?.settings?.baseCurrency,
            deviceType: this.deviceType,
            hasImpersonationId: this.hasImpersonationId,
+            hasPermissionToReportDataGlitch: hasPermission(
+              this.user?.permissions,
+              permissions.reportDataGlitch
+            ),
            locale: this.user?.settings?.locale
          },
          height: this.deviceType === 'mobile' ? '97.5vh' : '80vh',
--- a/apps/client/src/app/components/home-market/home-market.component.ts
+++ b/apps/client/src/app/components/home-market/home-market.component.ts
@ -1,10 +1,14 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
-import { HistoricalDataItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position-detail.interface';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { ghostfolioFearAndGreedIndexSymbol } from '@ghostfolio/common/config';
 import { resetHours } from '@ghostfolio/common/helper';
-import { InfoItem, User } from '@ghostfolio/common/interfaces';
+import {
+  Benchmark,
+  HistoricalDataItem,
+  InfoItem,
+  User
+} from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';
@ -15,12 +19,13 @@ import { takeUntil } from 'rxjs/operators';
  templateUrl: './home-market.html'
 })
 export class HomeMarketComponent implements OnDestroy, OnInit {
+  public benchmarks: Benchmark[];
  public fearAndGreedIndex: number;
  public hasPermissionToAccessFearAndGreedIndex: boolean;
  public historicalData: HistoricalDataItem[];
  public info: InfoItem;
  public isLoading = true;
-  public readonly numberOfDays = 90;
+  public readonly numberOfDays = 180;
  public user: User;

  private unsubscribeSubject = new Subject<void>();
@ -70,6 +75,15 @@ export class HomeMarketComponent implements OnDestroy, OnInit {
              });
          }

+          this.dataService
+            .fetchBenchmarks()
+            .pipe(takeUntil(this.unsubscribeSubject))
+            .subscribe(({ benchmarks }) => {
+              this.benchmarks = benchmarks;
+
+              this.changeDetectorRef.markForCheck();
+            });
+
          this.changeDetectorRef.markForCheck();
        }
      });
--- a/apps/client/src/app/components/home-market/home-market.html
+++ b/apps/client/src/app/components/home-market/home-market.html
@ -1,18 +1,19 @@
-<div
-  class="align-items-center container d-flex flex-grow-1 h-100 justify-content-center w-100"
->
-  <div class="no-gutters row w-100">
+<div class="container">
+  <h3 class="mb-3 text-center" i18n>Markets</h3>
+  <div class="mb-5 row">
    <div class="col-xs-12 col-md-8 offset-md-2">
      <div class="mb-2 text-center text-muted">
        <small i18n>Last {{ numberOfDays }} Days</small>
      </div>
      <gf-line-chart
-        class="mb-5"
+        class="mb-3"
+        symbol="Fear & Greed Index"
        yMax="100"
        yMaxLabel="Greed"
        yMin="0"
        yMinLabel="Fear"
        [historicalDataItems]="historicalData"
+        [locale]="user?.settings?.locale"
        [showXAxis]="true"
        [showYAxis]="true"
      ></gf-line-chart>
@ -23,4 +24,20 @@
      ></gf-fear-and-greed-index>
    </div>
  </div>
+
+  <div class="mb-3 row">
+    <div class="col-xs-12 col-md-8 offset-md-2">
+      <gf-benchmark
+        *ngFor="let benchmark of benchmarks"
+        class="py-2"
+        [benchmark]="benchmark"
+        [locale]="user?.settings?.locale"
+      ></gf-benchmark>
+      <gf-benchmark
+        *ngIf="!benchmarks"
+        class="py-2"
+        [benchmark]="undefined"
+      ></gf-benchmark>
+    </div>
+  </div>
 </div>
--- a/apps/client/src/app/components/home-market/home-market.module.ts
+++ b/apps/client/src/app/components/home-market/home-market.module.ts
@ -1,6 +1,7 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
 import { GfFearAndGreedIndexModule } from '@ghostfolio/client/components/fear-and-greed-index/fear-and-greed-index.module';
+import { GfBenchmarkModule } from '@ghostfolio/ui/benchmark/benchmark.module';
 import { GfLineChartModule } from '@ghostfolio/ui/line-chart/line-chart.module';

 import { HomeMarketComponent } from './home-market.component';
@ -8,7 +9,12 @@ import { HomeMarketComponent } from './home-market.component';
@NgModule({
  declarations: [HomeMarketComponent],
  exports: [],
-  imports: [CommonModule, GfFearAndGreedIndexModule, GfLineChartModule],
+  imports: [
+    CommonModule,
+    GfBenchmarkModule,
+    GfFearAndGreedIndexModule,
+    GfLineChartModule
+  ],
  providers: [],
  schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })
--- a/apps/client/src/app/components/home-overview/home-overview.html
+++ b/apps/client/src/app/components/home-overview/home-overview.html
@ -6,6 +6,7 @@
      <gf-line-chart
        symbol="Performance"
        [historicalDataItems]="historicalDataItems"
+        [locale]="user?.settings?.locale"
        [ngClass]="{ 'pr-3': deviceType === 'mobile' }"
        [showGradient]="true"
        [showLoader]="false"
--- a/apps/client/src/app/components/investment-chart/investment-chart.component.ts
+++ b/apps/client/src/app/components/investment-chart/investment-chart.component.ts
@ -6,11 +6,18 @@ import {
  Input,
  OnChanges,
  OnDestroy,
-  OnInit,
  ViewChild
 } from '@angular/core';
+import {
+  getTooltipOptions,
+  getTooltipPositionerMapTop,
+  getVerticalHoverLinePlugin
+} from '@ghostfolio/common/chart-helper';
 import { primaryColorRgb } from '@ghostfolio/common/config';
 import {
+  getBackgroundColor,
+  getDateFormatString,
+  getTextColor,
  parseDate,
  transformTickToAbbreviation
 } from '@ghostfolio/common/helper';
@ -21,7 +28,8 @@ import {
  LineElement,
  LinearScale,
  PointElement,
-  TimeScale
+  TimeScale,
+  Tooltip
 } from 'chart.js';
 import { addDays, isAfter, parseISO, subDays } from 'date-fns';

@ -32,9 +40,11 @@ import { addDays, isAfter, parseISO, subDays } from 'date-fns';
  styleUrls: ['./investment-chart.component.scss']
 })
 export class InvestmentChartComponent implements OnChanges, OnDestroy {
+  @Input() currency: string;
  @Input() daysInMarket: number;
  @Input() investments: InvestmentItem[];
  @Input() isInPercent = false;
+  @Input() locale: string;

  @ViewChild('chartCanvas') chartCanvas;

@ -47,8 +57,12 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
      LineController,
      LineElement,
      PointElement,
-      TimeScale
+      TimeScale,
+      Tooltip
    );
+
+    Tooltip.positioners['top'] = (elements, position) =>
+      getTooltipPositionerMapTop(this.chart, position);
  }

  public ngOnChanges() {
@ -98,6 +112,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
          data: this.investments.map((position) => {
            return position.investment;
          }),
+          label: 'Investment',
          segment: {
            borderColor: (context: unknown) =>
              this.isInFuture(
@ -114,6 +129,9 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
    if (this.chartCanvas) {
      if (this.chart) {
        this.chart.data = data;
+        this.chart.options.plugins.tooltip = <unknown>(
+          this.getTooltipPluginConfiguration()
+        );
        this.chart.update();
      } else {
        this.chart = new Chart(this.chartCanvas.nativeElement, {
@ -124,13 +142,20 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
                tension: 0
              },
              point: {
+                hoverBackgroundColor: getBackgroundColor(),
+                hoverRadius: 2,
                radius: 0
              }
            },
+            interaction: { intersect: false, mode: 'index' },
            maintainAspectRatio: true,
-            plugins: {
+            plugins: <unknown>{
              legend: {
                display: false
+              },
+              tooltip: this.getTooltipPluginConfiguration(),
+              verticalHoverLine: {
+                color: `rgba(${getTextColor()}, 0.1)`
              }
            },
            responsive: true,
@ -138,16 +163,21 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
              x: {
                display: true,
                grid: {
+                  borderColor: `rgba(${getTextColor()}, 0.1)`,
+                  color: `rgba(${getTextColor()}, 0.8)`,
                  display: false
                },
                type: 'time',
                time: {
+                  tooltipFormat: getDateFormatString(this.locale),
                  unit: 'year'
                }
              },
              y: {
                display: !this.isInPercent,
                grid: {
+                  borderColor: `rgba(${getTextColor()}, 0.1)`,
+                  color: `rgba(${getTextColor()}, 0.8)`,
                  display: false
                },
                ticks: {
@ -161,6 +191,7 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
              }
            }
          },
+          plugins: [getVerticalHoverLinePlugin(this.chartCanvas)],
          type: 'line'
        });

@ -169,6 +200,19 @@ export class InvestmentChartComponent implements OnChanges, OnDestroy {
    }
  }

+  private getTooltipPluginConfiguration() {
+    return {
+      ...getTooltipOptions(
+        this.isInPercent ? undefined : this.currency,
+        this.isInPercent ? undefined : this.locale
+      ),
+      mode: 'index',
+      position: <unknown>'top',
+      xAlign: 'center',
+      yAlign: 'bottom'
+    };
+  }
+
  private isInFuture<T>(aContext: any, aValue: T) {
    return isAfter(new Date(aContext?.p1?.parsed?.x), new Date())
      ? aValue
--- a/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.ts
+++ b/apps/client/src/app/components/portfolio-performance/portfolio-performance.component.ts
@ -81,9 +81,11 @@ export class PortfolioPerformanceComponent implements OnChanges, OnInit {
  }

  public onShowErrors() {
-    const errorMessageParts = this.errors.map((error) => {
-      return `${error.symbol} (${error.dataSource})`;
-    });
+    const errorMessageParts = ['Data Provider Errors for'];
+
+    for (const error of this.errors) {
+      errorMessageParts.push(`${error.symbol} (${error.dataSource})`);
+    }

    alert(errorMessageParts.join('\n'));
  }
--- a/apps/client/src/app/components/position/position-detail-dialog/interfaces/interfaces.ts
+++ b/apps/client/src/app/components/position/position-detail-dialog/interfaces/interfaces.ts
@ -5,6 +5,7 @@ export interface PositionDetailDialogParams {
  dataSource: DataSource;
  deviceType: string;
  hasImpersonationId: boolean;
+  hasPermissionToReportDataGlitch: boolean;
  locale: string;
  symbol: string;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Kaul	03b050d1ac	Release 1.158.0 (#1009 )	2022-06-12 17:53:09 +02:00
Thomas Kaul	58eeff7001	Feature/expose the environment variable host (#1007 ) * Expose environment variable: HOST * Update changelog	2022-06-12 17:51:26 +02:00
Thomas Kaul	76fb8825e4	Feature/restructure self hosting documentation (#1008 ) * Restructure self-hosting documentation * Update changelog	2022-06-12 17:50:45 +02:00
Thomas Kaul	0f9d142afe	Feature/decrease number of attempts of queue jobs (#1006 ) * Decrease number of attempts * Update changelog	2022-06-12 17:39:55 +02:00
Thomas Kaul	bd33855a27	Feature/improve message for data provider errors (#1003 ) * Add title * Update changelog	2022-06-12 17:39:02 +02:00
Thomas Kaul	5329e45e2c	Feature/add data dialog to queue jobs view (#1005 ) * Add data dialog * Update changelog	2022-06-12 17:30:26 +02:00
Thomas Kaul	e990ecd12c	Feature/improve cash balance label (#1002 ) * Improve label * Update changelog	2022-06-12 10:06:18 +02:00
Thomas Kaul	a4fcf64f13	Release 1.157.0 (#1000 )	2022-06-11 13:41:39 +02:00
Thomas Kaul	557e3a0676	Feature/migrate historical market data gathering to queue design pattern (#991 ) * Migrate historical market data gathering to queue * Filter and delete jobs * Detect duplicate jobs * Update changelog	2022-06-11 13:40:15 +02:00
Thomas Kaul	2abe399ebd	Bugfix/force reload accounts of user after change (#994 ) * Force reload of accounts after change * Update changelog	2022-06-11 12:56:34 +02:00
Thomas Kaul	74fe90906a	Bugfix/exclude emtpy items in activities filter (#999 ) * Exclude empty items * Update changelog	2022-06-11 12:55:32 +02:00
Thomas Kaul	4cb9a3b142	Feature/refresh cryptocurrencies list (#998 ) * Use cryptocurrencies list instead of outdated npm package * Update changelog	2022-06-11 12:54:58 +02:00
Thomas Kaul	0da9368e0c	Fix date (#992 )	2022-06-10 17:42:56 +02:00
Thomas Kaul	d2f8e3d645	Feature/increase fear and greed index to 180 days (#993 ) * Increase number of days to 180 * Update changelog	2022-06-09 18:56:29 +02:00
Thomas Kaul	5263fba64e	Feature/upgrade envalid to version 7.3.1 (#990 ) * Upgrade envalid to version 7.3.1 * Update changelog	2022-06-06 17:42:32 +02:00
Thomas Kaul	e3689c48f8	Feature/upgrade chart.js to version 3.8.0 (#989 ) * Upgrade chart.js to version 3.8.0 * Update changelog	2022-06-06 08:27:34 +02:00
Thomas Kaul	787efdb33b	Release 1.156.0 (#988 )	2022-06-05 19:03:11 +02:00
Thomas Kaul	e63578d8ce	Feature/add guards to local comparison (#986 ) * Add guards * Improve labels	2022-06-05 19:00:45 +02:00
Thomas Kaul	7cf0cdc4ce	Feature/add jobs of queue to admin control panel (#987 ) * Add jobs of queue to admin control panel * Update changelog	2022-06-05 19:00:20 +02:00
Thomas Kaul	14a0eeab29	Bugfix/fix docker compose files to resolve variables correctly (#983 ) * Fix variable resolving * Update changelog	2022-06-04 10:02:38 +02:00
Thomas Kaul	6774c48dff	Feature/restructure fire page (#982 ) * Restructure fire page * Update changelog	2022-06-04 09:06:53 +02:00
Thomas Kaul	565947e752	Feature/upgrade simplewebauthn browser and server to version 5.2.1 (#981 ) * Upgrade @simplewebauthn/browser and @simplewebauthn/server * Update changelog	2022-06-03 18:44:53 +02:00
Thomas Kaul	2cc7c6fa1c	Feature/add user id to account page (#980 ) * Add user id * Update changelog	2022-06-03 06:51:08 +02:00
Thomas Kaul	023a7147e2	Feature/simplify feature page (#978 ) * Simplify page * Update changelog	2022-05-31 18:01:29 +02:00
Thomas Kaul	a96e89a86e	Release 1.155.0 (#977 )	2022-05-29 15:39:57 +02:00
Thomas Kaul	b9c9443899	Bugfix/fix empty state of proportion chart (#976 ) * Fix empty state (chart with two levels) * Update changelog	2022-05-29 15:38:13 +02:00
Thomas Kaul	f1e06347d3	Feature/add data source eod historical data (#974 ) * Add EOD Historical Data as a data source * Update changelog	2022-05-29 15:37:40 +02:00
Thomas Kaul	697e92f818	Feature/finalize exposing redis password env variable (#975 ) * Add hints * Update changelog	2022-05-29 14:54:53 +02:00
willyp713	b678998801	Feature/add-redis-password (#947 ) * Expose REDIS_PASSWORD	2022-05-29 14:18:57 +02:00
Thomas Kaul	de53cf1884	Release 1.154.0 (#973 )	2022-05-28 21:12:42 +02:00
Thomas Kaul	bbe30218bd	Feature/remove dependency round to (#972 ) * Remove round-to dependency * Update changelog	2022-05-28 21:10:45 +02:00
Thomas Kaul	15dda886a0	Feature/add vertical hover line to line chart component (#963 ) * Add vertical hover line * Improve tooltips of charts * Update changelog	2022-05-28 20:53:54 +02:00
Thomas Kaul	34d4212f55	Feature/modernize pricing page (#967 ) * Simplify pricing page * Update changelog	2022-05-28 18:52:30 +02:00
Thomas Kaul	f7060230b7	Update dates (#966 )	2022-05-28 18:46:22 +02:00
Thomas Kaul	0fdafcb7e4	Release 1.153.0 (#962 )	2022-05-27 11:53:18 +02:00
Thomas Kaul	e79be9f2d6	Feature/do not tweet on weekend (#961 ) * Do not tweet on the weekend * Update changelog	2022-05-27 11:37:48 +02:00
Thomas Kaul	69088b93a6	Feature/add value redaction as interceptor (#960 ) * Add value redaction as interceptor * Update changelog	2022-05-27 11:21:47 +02:00
Thomas Kaul	c3768a882d	Feature/add benchmarks to twitter bot service (#959 ) * Extend benchmarks with market condition and adapt twitter bot service * Update changelog	2022-05-27 10:03:37 +02:00
Thomas Kaul	3498ed8549	Feature/upgrade prisma to version 3.14.0 (#958 ) * Upgrade prisma dependencies to version 3.14.0 * Update changelog	2022-05-27 09:50:38 +02:00
Thomas Kaul	c07c300fef	Move @simplewebauthn/typescript-types to devDependencies (#957 )	2022-05-27 09:49:57 +02:00
Thomas Kaul	c62a5af9eb	Bugfix/fix width of skeleton loader in benchmark component (#956 ) * Fix width * Update changelog	2022-05-27 09:49:37 +02:00
Thomas Kaul	0c04f10e19	Release 1.152.0 (#955 )	2022-05-26 19:01:08 +02:00
Thomas Kaul	2c4c16ec99	Feature/extend markets overview by benchmarks (#953 ) * Add benchmarks to markets overview * Update changelog	2022-05-26 18:59:29 +02:00
Thomas Kaul	4711b0d1ed	Improve instructions for Unraid (#954 )	2022-05-26 17:59:09 +02:00
zenkraker	a8521e0ecf	Update README.md (#943 ) * Update README.md for Unraid users	2022-05-26 17:52:14 +02:00
Thomas Kaul	424748ae90	Feature/add ghostfolio trailer to landing page (#952 ) * Add link to Ghostfolio trailer * Update changelog	2022-05-26 10:30:13 +02:00
Thomas Kaul	9c4d8bdf4b	Release 1.151.0 (#949 )	2022-05-24 20:58:24 +02:00
Thomas Kaul	332203b9e2	Feature/add support to set the base currency via env variable (#948 ) * Set base currency via environment variable * Update changelog	2022-05-24 20:55:55 +02:00
Thomas Kaul	f48832c671	Bugfix/add missing conversion of countries (#941 ) * Add missing conversion of countries for SymbolProfileOverrides * Update changelog	2022-05-23 18:04:09 +02:00
Thomas Kaul	ae8a203526	Add type (#939 )	2022-05-22 21:14:22 +02:00
Thomas Kaul	d0c1506ded	Release 1.150.0 (#940 )	2022-05-21 20:00:34 +02:00
Thomas Kaul	af0863d193	Bugfix/fix currency conversion in accounts (#937 ) * Fix currency conversion in accounts * Update changelog	2022-05-21 19:58:47 +02:00
Thomas Kaul	f5819cc399	Bugfix/fix countries in symbol profile overrides (#936 ) * Fix countries * Update changelog	2022-05-20 20:16:23 +02:00
Thomas Kaul	977c5a9544	Feature/skip data enhancement if data is inaccurate (#935 ) * Skip data enhancer if data is inaccurate * Update changelog	2022-05-20 20:15:19 +02:00
Thomas Kaul	b9cd42cd53	Move dependencies to devDependencies (#934 )	2022-05-20 20:14:33 +02:00
Thomas Kaul	379977008d	Simplify intro text (#933 )	2022-05-19 21:05:14 +02:00
Thomas Kaul	38f9d54705	Release 1.149.0 (#927 )	2022-05-16 21:50:43 +02:00
Thomas Kaul	5cb6e5dec6	Feature/support filtering by asset class on the allocations page (#926 ) * Support filtering by asset class * Update changelog	2022-05-16 21:49:22 +02:00
Thomas Kaul	4a123c38f2	Refactor placeholder (#925 )	2022-05-16 21:17:58 +02:00
Thomas Kaul	160335302a	Feature/group filters by type (#922 ) * Add groups to activities filter component * Update changelog	2022-05-15 21:51:31 +02:00
Thomas Kaul	f1483569a2	Release 1.148.0 (#921 )	2022-05-14 13:55:25 +02:00
Thomas Kaul	5391b88c42	Feature/add report data glitch button (#920 ) * Add report data glitch button * Update changelog	2022-05-14 13:53:43 +02:00
Thomas Kaul	2b63f7e707	Feature/support enter to submit create or update transaction dialog form (#913 ) * Support enter key press to submit form * Update changelog	2022-05-14 10:56:07 +02:00
Thomas Kaul	d5c96d1cb7	Bugfix/fix date picker date format (#912 ) * Fix date picker date format * Update changelog	2022-05-14 10:55:09 +02:00
Thomas Kaul	1a4dc51825	Bugfix/fix state of delete account button (#911 ) * Fix disable state * Update changelog	2022-05-13 06:48:40 +02:00
Thomas Kaul	d094bae7de	Bugfix/fix issue in activities filter component with typing (#910 ) * Handle filter (selecting) or search term (typing) * Update changelog	2022-05-12 07:48:12 +02:00
Thomas Kaul	57bf10e7e7	Release 1.147.0 (#904 )	2022-05-10 21:25:25 +02:00
Thomas Kaul	c1d460cead	Improve filtering (#901 )	2022-05-10 21:24:36 +02:00
Thomas Kaul	dfa67b275c	Feature/improve filtering on allocations page (#900 ) * Include cash positions on allocations page (with no filtering) * Update changelog	2022-05-10 19:22:57 +02:00
Thomas Kaul	80862e5c2a	Release 1.146.3 (#899 )	2022-05-08 22:54:07 +02:00
Thomas Kaul	904d4db219	Refactor build:all and build:dev scripts (#898 )	2022-05-08 22:52:46 +02:00
Thomas Kaul	10f13eec48	Release 1.146.2 (#897 )	2022-05-08 22:18:00 +02:00
Thomas Kaul	ea3a9d3b79	Feature/eliminate circular dependencies in common library (#896 ) * Eliminate circular dependencies * Update changelog	2022-05-08 22:16:47 +02:00
Thomas Kaul	e55b05fe3d	Release 1.146.1 (#895 )	2022-05-08 16:57:23 +02:00
Thomas Kaul	32dd76be5f	Fix path to jest files (#894 )	2022-05-08 16:55:14 +02:00
Thomas Kaul	ff9b6bb4df	Release 1.146.0 (#893 )	2022-05-08 16:04:43 +02:00
Thomas Kaul	5be95b7b63	Feature/simplify about page (#892 ) * Simplify about page * Update changelog	2022-05-08 16:02:44 +02:00
Thomas Kaul	b3e07c8446	Feature/support permissions in fire calculator (#891 ) * Support hasPermissionToUpdateUserSettings * Update changelog	2022-05-08 15:59:19 +02:00
Thomas Kaul	eb9cece4e4	Update browserslist database (#890 )	2022-05-08 15:56:39 +02:00
Thomas Kaul	b331f5f04d	Feature/setup nx cloud (#889 ) * Upgrade angular, Nx and storybook * Setup Nx Cloud * Update changelog	2022-05-08 15:52:21 +02:00
Thomas Kaul	34cbdd7c2a	Upgrade angular, Nx and storybook (#888 ) * Upgrade angular, Nx and storybook * Update changelog	2022-05-08 09:26:33 +02:00
Thomas Kaul	57314d62ee	Feature/improve allocations page with no filter (#887 ) * Improve accounts for no filters * Update changelog	2022-05-07 22:33:57 +02:00
Thomas Kaul	40380346e6	Feature/setup bull queue system (#886 ) * Setup @nestjs/bull and asset profile data gathering job * Update changelog	2022-05-07 20:00:51 +02:00
Thomas Kaul	5622c4cf7e	Feature/harmonize no data available label (#885 ) * Harmonize label for UNKNOWN_KEY * Update changelog	2022-05-07 14:11:42 +02:00
Thomas Kaul	21173bed21	Release 1.145.0 (#884 )	2022-05-07 11:47:28 +02:00
Thomas Kaul	16dd8f7652	Feature/refactor filters with interface (#883 ) * Refactor filtering with an interface * Filter by accounts * Update changelog	2022-05-07 11:44:29 +02:00
Thomas Kaul	ce6b5fb7cb	Bugfix/fix tooltip in proportion chart after update (#882 ) * Keep tooltip configuration up to date * Update changelog	2022-05-01 08:38:57 +02:00
Thomas Kaul	f6f62db830	Feature/add support for private equity (#881 ) * Add support for private equity * Update changelog	2022-04-30 22:16:13 +02:00
Thomas Kaul	01103f3db4	Feature/add asset and asset sub class to wealth items form (#880 ) * Add asset and asset sub class * Update changelog	2022-04-30 21:47:10 +02:00
Thomas Kaul	e9e9f1a124	Release 1.144.0 (#879 )	2022-04-30 11:51:49 +02:00
Thomas Kaul	751256f158	Feature/add support for real estate and precious metal (#878 ) * Add support for real estate and precious metal * Update changelog	2022-04-30 11:49:58 +02:00
Thomas Kaul	c2a1cbd20f	Feature/improve layout of position detail dialog (#877 ) * Improve layout * Update changelog	2022-04-30 10:48:02 +02:00
Thomas Kaul	04044f8720	Support futures (#845 ) * Support futures * Upgrade yahoo-finance2 to version 2.3.2 * Update changelog	2022-04-30 09:55:24 +02:00
Thomas Kaul	4dc76817ce	Bugfix/fix import validation for numbers equal zero (#875 ) * Fix import validation for numbers equal 0 * Update changelog	2022-04-29 13:10:45 +02:00
Thomas Kaul	1f0bd5a7db	Bugfix/fix color of spinner in filter component (#873 ) * Fix color for dark mode * Update changelog	2022-04-27 17:30:57 +02:00
Thomas Kaul	b6cd007ad4	Release/1.143.0 (#871 ) * Release 1.143.0 * Improve filtering by tags	2022-04-26 22:31:53 +02:00
Thomas Kaul	b4bc72c6f9	Release 1.142.0 (#869 )	2022-04-25 22:41:02 +02:00
Thomas Kaul	899fa0370e	Feature/improve users table of admin control panel (#866 ) * Improve users table * Update changelog	2022-04-25 22:39:08 +02:00
Thomas Kaul	da27504aa1	Add orderBy statement to make debugging easier (#868 )	2022-04-25 22:37:56 +02:00
Thomas Kaul	b7bbc029ac	Feature/render tags in dialogs (#864 ) * Render tags * Update changelog	2022-04-25 22:37:34 +02:00
Thomas Kaul	c61a415fb2	Bugfix/change date to utc in data gathering service (#867 ) * Change date to UTC * Update changelog	2022-04-25 18:12:42 +02:00
Thomas Kaul	8ff811ed28	Release/1.141.1 (#863 )	2022-04-24 17:27:00 +02:00
Thomas Kaul	9a2ea0a4ed	Release 1.141.0 (#862 )	2022-04-24 16:24:21 +02:00
Thomas Kaul	bad9d17c44	Setup allocations page and endpoint (#859 ) * Setup tagging system * Update changelog	2022-04-24 16:23:03 +02:00
Thomas Kaul	ea89ca5734	Feature/simplify ids in database schema (#861 ) * Simplify ids in database schema * Access * Order * Subscription * Update changelog	2022-04-24 09:35:01 +02:00
Thomas Kaul	8f61f7c169	Feature/extract activities table filter component (#858 ) * Extract activities table component * Update changelog	2022-04-23 19:22:20 +02:00
Thomas Kaul	edca05f542	Feature/change get started url of public page (#857 ) * Change url * Update changelog	2022-04-23 16:48:23 +02:00
Thomas Kaul	283f054ee2	Feature/upgrade prisma to version 3.12.0 (#856 ) * Upgrade prisma to version 3.12.0 * Update changelog	2022-04-23 13:38:41 +02:00