Release 1.300.0 (#2232)

* Migrate requests from bent to got

* Update changelog

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,7 +6,7 @@ labels: ''
 assignees: ''
 ---
 
-The Issue tracker is **ONLY** used for reporting bugs. New features should be discussed on our [Slack channel](https://ghostfolio.slack.com) or in [Discussions](https://github.com/ghostfolio/ghostfolio/discussions).
+The Issue tracker is **ONLY** used for reporting bugs. New features should be discussed in our [Slack](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) community or in [Discussions](https://github.com/ghostfolio/ghostfolio/discussions).
 
 **Bug Description**
 
@@ -36,9 +36,7 @@ The Issue tracker is **ONLY** used for reporting bugs. New features should be di
 
 <!-- Please complete the following information -->
 
-- [ ] Cloud
-- [ ] Self-hosted
-
+- Cloud or Self-hosted
 - Ghostfolio Version X.Y.Z
 - Browser
 - OS

.github/workflows/build-code.yml

@@ -33,4 +33,4 @@ jobs:
         run: yarn test
 
       - name: Build application
-        run: yarn build:all
+        run: yarn build:production

CHANGELOG.md

@@ -5,6 +5,240 @@ 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.300.0 - 2023-08-11
+
+### Added
+
+- Added more durations in the coupon system
+
+### Changed
+
+- Migrated the remaining requests from `bent` to `got`
+
+## 1.299.1 - 2023-08-10
+
+### Changed
+
+- Optimized the activities import by allowing a different currency than the asset's official one
+- Added a timeout to the _EOD Historical Data_ requests
+- Migrated the requests from `bent` to `got` in the _EOD Historical Data_ service
+
+### Fixed
+
+- Fixed the editing of the emergency fund
+- Fixed the historical data gathering interval for asset profiles used as benchmarks having activities
+
+## 1.298.0 - 2023-08-06
+
+### Changed
+
+- Improved the language localization for German (`de`)
+- Upgraded `ng-extract-i18n-merge` from version `2.6.0` to `2.7.0`
+- Upgraded `Nx` from version `16.5.5` to `16.6.0`
+
+### Fixed
+
+- Fixed the styles of various components (card, progress, tab) after the upgrade to `@angular/material` `16`
+
+## 1.297.4 - 2023-08-05
+
+### Added
+
+- Added the footer to the public page
+- Added a `copy-assets` `Nx` target to the client build
+
+### Changed
+
+- Improved the alignment of the region percentages on the allocations page
+- Improved the alignment of the region percentages on the public page
+- Improved the redirection of the home page to the localized home page
+- Improved the language localization for German (`de`)
+- Upgraded `angular` from version `15.2.5` to `16.1.8`
+- Upgraded `nestjs` from version `9.1.4` to `10.1.3`
+- Upgraded `Nx` from version `16.0.3` to `16.5.5`
+
+## 1.296.0 - 2023-08-01
+
+### Changed
+
+- Optimized the validation in the activities import by reducing the list to unique asset profiles
+- Optimized the data gathering in the activities import
+
+## 1.295.0 - 2023-07-30
+
+### Added
+
+- Added a step by step introduction for new users
+
+### Fixed
+
+- Removed the _Stay signed in_ setting on _Sign in with fingerprint_ activation
+
+## 1.294.0 - 2023-07-29
+
+### Changed
+
+- Extended the allocations by market chart on the allocations page by unavailable data
+
+### Fixed
+
+- Considered liabilities in the total account value calculation
+
+## 1.293.0 - 2023-07-26
+
+### Added
+
+- Added error handling for the _Redis_ connections to keep the app running if the connection fails
+
+### Changed
+
+- Set the `lastmod` dates of `sitemap.xml` dynamically
+
+### Fixed
+
+- Fixed the missing values in the holdings table
+- Fixed the `no such file or directory` error caused by the missing `favicon.ico` file
+
+## 1.292.0 - 2023-07-24
+
+### Added
+
+- Introduced the allocations by market chart on the allocations page
+
+### Changed
+
+- Upgraded `yahoo-finance2` from version `2.4.2` to `2.4.3`
+
+### Fixed
+
+- Fixed an issue in the public page
+
+## 1.291.0 - 2023-07-23
+
+### Added
+
+- Broken down the emergency fund by cash and assets
+- Added support for account balance time series
+
+### Changed
+
+- Renamed queries to presets in the historical market data table of the admin control panel
+
+## 1.290.0 - 2023-07-16
+
+### Added
+
+- Added hints to the activity types in the create or edit activity dialog
+- Added queries to the historical market data table of the admin control panel
+
+### Changed
+
+- Improved the usability of the login dialog
+- Disabled the caching in the health check endpoints for data providers
+- Improved the content of the Frequently Asked Questions (FAQ) page
+- Upgraded `prisma` from version `4.15.0` to `4.16.2`
+
+## 1.289.0 - 2023-07-14
+
+### Changed
+
+- Upgraded `yahoo-finance2` from version `2.4.1` to `2.4.2`
+
+## 1.288.0 - 2023-07-12
+
+### Changed
+
+- Improved the loading state during filtering on the allocations page
+- Beautified the names with ampersand (`&`) in the asset profile
+- Improved the language localization for German (`de`)
+
+## 1.287.0 - 2023-07-09
+
+### Changed
+
+- Hid the average buy price in the position detail chart if there is no holding
+- Improved the language localization for French (`fr`)
+- Refactored the blog articles to standalone components
+
+### Fixed
+
+- Fixed the sorting by currency in the activities table
+
+## 1.286.0 - 2023-07-03
+
+### Fixed
+
+- Fixed the creation of (wealth) items and liabilities
+
+## 1.285.0 - 2023-07-01
+
+### Added
+
+- Added a blog post: _Exploring the Path to Financial Independence and Retiring Early (FIRE)_
+- Added pagination to the historical market data table of the admin control panel
+- Added the attribute `headers` to the scraper configuration
+
+### Changed
+
+- Extended the asset profile details dialog in the admin control panel by the scraper configuration
+- Improved the language localization for German (`de`)
+
+## 1.284.0 - 2023-06-27
+
+### Added
+
+- Added the currency to the cash balance in the create or update account dialog
+- Added the ability to add an index for benchmarks as an asset profile in the admin control panel
+
+### Changed
+
+- Upgraded the _Internet Identity_ dependencies from version `0.15.1` to `0.15.7`
+
+### Fixed
+
+- Fixed an issue with the clone functionality of a transaction caused by the symbol search component
+
+## 1.283.5 - 2023-06-25
+
+### Added
+
+- Added the caching for current market prices
+- Added a loading indicator to the import dividends dialog
+- Set up the `helmet` middleware to protect the app from web vulnerabilities by setting HTTP headers
+
+### Changed
+
+- Improved the selected item of the holding selector in the import dividends dialog
+- Extended the symbol search component by asset sub classes
+
+## 1.282.0 - 2023-06-19
+
+### Added
+
+- Added an icon to the external links in the footer navigation
+- Added the ability to add an asset profile in the admin control panel
+
+### Changed
+
+- Harmonized the use of permissions on the about page
+- Harmonized the use of permissions on the landing page
+- Improved the language localization for German (`de`)
+- Improved the language localization for Portuguese (`pt`)
+- Updated the binary targets of `linux-arm64-openssl` for `prisma`
+
+## 1.281.0 - 2023-06-17
+
+### Added
+
+- Extended the feature overview page by liabilities
+- Set up the language localization for Portuguese (`pt`)
+
+### Changed
+
+- Extracted the symbol search to a dedicated component
+- Improved the column headers in the holdings table for mobile
+- Upgraded `prisma` from version `4.14.1` to `4.15.0`
+
 ## 1.280.1 - 2023-06-10
 
 ### Added
@@ -799,7 +1033,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Added support for the dividend timeline grouped by year
 - Added support for the investment timeline grouped by year
 - Set up the language localization for Français (`fr`)
-- Set up the language localization for Português (`pt`)
 
 ### Changed
 
@@ -1079,7 +1312,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Added support to change the appearance (dark mode) in user settings
 - Added the total amount chart to the investment timeline
-- Setup the `prettier` plugin `prettier-plugin-organize-attributes`
+- Set up the `prettier` plugin `prettier-plugin-organize-attributes`
 
 ### Changed
 

Dockerfile

@@ -33,7 +33,7 @@ COPY ./tsconfig.base.json tsconfig.base.json
 COPY ./libs libs
 COPY ./apps apps
 
-RUN yarn build:all
+RUN yarn build:production
 
 # Prepare the dist image with additional node_modules
 WORKDIR /ghostfolio/dist/apps/api
@@ -58,4 +58,4 @@ RUN apt update && apt install -y \
 COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
 WORKDIR /ghostfolio/apps/api
 EXPOSE ${PORT:-3333}
-CMD [  "yarn", "start:prod" ]
+CMD [ "yarn", "start:production" ]

README.md

@@ -153,7 +153,6 @@ Please follow the instructions of the Ghostfolio [Unraid Community App](https://
 ### Setup
 
 1. Run `yarn install`
-1. Run `yarn build:dev` to build the source code including the assets
 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
 1. Start the server and the client (see [_Development_](#Development))
@@ -263,7 +262,9 @@ Deprecated: `GET http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TO
 
 ## Community Projects
 
-- [ghostfolio-cli](https://github.com/DerAndereJohannes/ghostfolio-cli): Command-line interface to access your portfolio
+Discover a variety of community projects for Ghostfolio: https://github.com/topics/ghostfolio
+
+Are you building your own project? Add the `ghostfolio` topic to your _GitHub_ repository to get listed as well. [Learn more →](https://docs.github.com/en/articles/classifying-your-repository-with-topics)
 
 ## Contributing
 

apps/api/project.json

@@ -33,7 +33,7 @@
       "outputs": ["{options.outputPath}"]
     },
     "serve": {
-      "executor": "@nx/node:node",
+      "executor": "@nx/js:node",
       "options": {
         "buildTarget": "api:build"
       }

apps/api/src/app/account/account.module.ts

@@ -1,6 +1,7 @@
 import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
+import { AccountBalanceModule } from '@ghostfolio/api/services/account-balance/account-balance.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
@@ -15,6 +16,7 @@ import { AccountService } from './account.service';
   controllers: [AccountController],
   exports: [AccountService],
   imports: [
+    AccountBalanceModule,
     ConfigurationModule,
     DataProviderModule,
     ExchangeRateDataModule,

apps/api/src/app/account/account.service.ts

@@ -1,3 +1,4 @@
+import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { Filter } from '@ghostfolio/common/interfaces';
@@ -11,16 +12,21 @@ import { CashDetails } from './interfaces/cash-details.interface';
 @Injectable()
 export class AccountService {
   public constructor(
+    private readonly accountBalanceService: AccountBalanceService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly prismaService: PrismaService
   ) {}
 
-  public async account(
-    accountWhereUniqueInput: Prisma.AccountWhereUniqueInput
-  ): Promise<Account | null> {
-    return this.prismaService.account.findUnique({
-      where: accountWhereUniqueInput
+  public async account({
+    id_userId
+  }: Prisma.AccountWhereUniqueInput): Promise<Account | null> {
+    const { id, userId } = id_userId;
+
+    const [account] = await this.accounts({
+      where: { id, userId }
     });
+
+    return account;
   }
 
   public async accountWithOrders(
@@ -50,9 +56,11 @@ export class AccountService {
       Platform?: Platform;
     })[]
   > {
-    const { include, skip, take, cursor, where, orderBy } = params;
+    const { include = {}, skip, take, cursor, where, orderBy } = params;
 
-    return this.prismaService.account.findMany({
+    include.balances = { orderBy: { date: 'desc' }, take: 1 };
+
+    const accounts = await this.prismaService.account.findMany({
       cursor,
       include,
       orderBy,
@@ -60,15 +68,36 @@ export class AccountService {
       take,
       where
     });
+
+    return accounts.map((account) => {
+      account = { ...account, balance: account.balances[0]?.value ?? 0 };
+
+      delete account.balances;
+
+      return account;
+    });
   }
 
   public async createAccount(
     data: Prisma.AccountCreateInput,
     aUserId: string
   ): Promise<Account> {
-    return this.prismaService.account.create({
+    const account = await this.prismaService.account.create({
       data
     });
+
+    await this.prismaService.accountBalance.create({
+      data: {
+        Account: {
+          connect: {
+            id_userId: { id: account.id, userId: aUserId }
+          }
+        },
+        value: data.balance
+      }
+    });
+
+    return account;
   }
 
   public async deleteAccount(
@@ -167,6 +196,18 @@ export class AccountService {
     aUserId: string
   ): Promise<Account> {
     const { data, where } = params;
+
+    await this.prismaService.accountBalance.create({
+      data: {
+        Account: {
+          connect: {
+            id_userId: where.id_userId
+          }
+        },
+        value: <number>data.balance
+      }
+    });
+
     return this.prismaService.account.update({
       data,
       where
@@ -202,16 +243,17 @@ export class AccountService {
       );
 
     if (amountInCurrencyOfAccount) {
-      await this.prismaService.account.update({
-        data: {
-          balance: new Big(balance).plus(amountInCurrencyOfAccount).toNumber()
-        },
-        where: {
-          id_userId: {
-            userId,
-            id: accountId
+      await this.accountBalanceService.createAccountBalance({
+        date,
+        Account: {
+          connect: {
+            id_userId: {
+              userId,
+              id: accountId
+            }
           }
-        }
+        },
+        value: new Big(balance).plus(amountInCurrencyOfAccount).toNumber()
       });
     }
   }

apps/api/src/app/admin/admin.controller.ts

@@ -1,10 +1,13 @@
+import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';
 import {
+  DEFAULT_PAGE_SIZE,
   GATHER_ASSET_PROFILE_PROCESS,
   GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
+import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import {
   AdminData,
   AdminMarketData,
@@ -13,7 +16,10 @@ import {
   Filter
 } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type { RequestWithUser } from '@ghostfolio/common/types';
+import type {
+  MarketDataPreset,
+  RequestWithUser
+} from '@ghostfolio/common/types';
 import {
   Body,
   Controller,
@@ -26,11 +32,12 @@ import {
   Post,
   Put,
   Query,
-  UseGuards
+  UseGuards,
+  UseInterceptors
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
-import { DataSource, MarketData } from '@prisma/client';
+import { DataSource, MarketData, Prisma, SymbolProfile } from '@prisma/client';
 import { isDate } from 'date-fns';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
@@ -110,7 +117,7 @@ export class AdminController {
           name: GATHER_ASSET_PROFILE_PROCESS,
           opts: {
             ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: `${dataSource}-${symbol}`
+            jobId: getAssetProfileIdentifier({ dataSource, symbol })
           }
         };
       })
@@ -146,7 +153,7 @@ export class AdminController {
           name: GATHER_ASSET_PROFILE_PROCESS,
           opts: {
             ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: `${dataSource}-${symbol}`
+            jobId: getAssetProfileIdentifier({ dataSource, symbol })
           }
         };
       })
@@ -179,7 +186,7 @@ export class AdminController {
       name: GATHER_ASSET_PROFILE_PROCESS,
       opts: {
         ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-        jobId: `${dataSource}-${symbol}`
+        jobId: getAssetProfileIdentifier({ dataSource, symbol })
       }
     });
   }
@@ -245,7 +252,12 @@ export class AdminController {
   @Get('market-data')
   @UseGuards(AuthGuard('jwt'))
   public async getMarketData(
-    @Query('assetSubClasses') filterByAssetSubClasses?: string
+    @Query('assetSubClasses') filterByAssetSubClasses?: string,
+    @Query('presetId') presetId?: MarketDataPreset,
+    @Query('skip') skip?: number,
+    @Query('sortColumn') sortColumn?: string,
+    @Query('sortDirection') sortDirection?: Prisma.SortOrder,
+    @Query('take') take?: number
   ): Promise<AdminMarketData> {
     if (
       !hasPermission(
@@ -270,7 +282,14 @@ export class AdminController {
       })
     ];
 
-    return this.adminService.getMarketData(filters);
+    return this.adminService.getMarketData({
+      filters,
+      presetId,
+      sortColumn,
+      sortDirection,
+      skip: isNaN(skip) ? undefined : skip,
+      take: isNaN(take) ? undefined : take
+    });
   }
 
   @Get('market-data/:dataSource/:symbol')
@@ -328,6 +347,28 @@ export class AdminController {
     });
   }
 
+  @Post('profile-data/:dataSource/:symbol')
+  @UseGuards(AuthGuard('jwt'))
+  @UseInterceptors(TransformDataSourceInRequestInterceptor)
+  public async addProfileData(
+    @Param('dataSource') dataSource: DataSource,
+    @Param('symbol') symbol: string
+  ): Promise<SymbolProfile | never> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.adminService.addAssetProfile({ dataSource, symbol });
+  }
+
   @Delete('profile-data/:dataSource/:symbol')
   @UseGuards(AuthGuard('jwt'))
   public async deleteProfileData(

apps/api/src/app/admin/admin.service.ts

@@ -1,21 +1,25 @@
 import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
-import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';
+import {
+  DEFAULT_PAGE_SIZE,
+  PROPERTY_CURRENCIES
+} from '@ghostfolio/common/config';
 import {
   AdminData,
   AdminMarketData,
   AdminMarketDataDetails,
-  AdminMarketDataItem,
   Filter,
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
-import { Injectable } from '@nestjs/common';
-import { AssetSubClass, Prisma, Property } from '@prisma/client';
+import { MarketDataPreset } from '@ghostfolio/common/types';
+import { BadRequestException, Injectable } from '@nestjs/common';
+import { AssetSubClass, Prisma, Property, SymbolProfile } from '@prisma/client';
 import { differenceInDays } from 'date-fns';
 import { groupBy } from 'lodash';
 
@@ -25,6 +29,7 @@ export class AdminService {
 
   public constructor(
     private readonly configurationService: ConfigurationService,
+    private readonly dataProviderService: DataProviderService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly marketDataService: MarketDataService,
     private readonly prismaService: PrismaService,
@@ -35,6 +40,38 @@ export class AdminService {
     this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
   }
 
+  public async addAssetProfile({
+    dataSource,
+    symbol
+  }: UniqueAsset): Promise<SymbolProfile | never> {
+    try {
+      const assetProfiles = await this.dataProviderService.getAssetProfiles([
+        { dataSource, symbol }
+      ]);
+
+      if (!assetProfiles[symbol]?.currency) {
+        throw new BadRequestException(
+          `Asset profile not found for ${symbol} (${dataSource})`
+        );
+      }
+
+      return await this.symbolProfileService.add(
+        assetProfiles[symbol] as Prisma.SymbolProfileCreateInput
+      );
+    } catch (error) {
+      if (
+        error instanceof Prisma.PrismaClientKnownRequestError &&
+        error.code === 'P2002'
+      ) {
+        throw new BadRequestException(
+          `Asset profile of ${symbol} (${dataSource}) already exists`
+        );
+      }
+
+      throw error;
+    }
+  }
+
   public async deleteProfileData({ dataSource, symbol }: UniqueAsset) {
     await this.marketDataService.deleteMany({ dataSource, symbol });
     await this.symbolProfileService.delete({ dataSource, symbol });
@@ -65,9 +102,32 @@ export class AdminService {
     };
   }
 
-  public async getMarketData(filters?: Filter[]): Promise<AdminMarketData> {
+  public async getMarketData({
+    filters,
+    presetId,
+    sortColumn,
+    sortDirection,
+    skip,
+    take = Number.MAX_SAFE_INTEGER
+  }: {
+    filters?: Filter[];
+    presetId?: MarketDataPreset;
+    skip?: number;
+    sortColumn?: string;
+    sortDirection?: Prisma.SortOrder;
+    take?: number;
+  }): Promise<AdminMarketData> {
+    let orderBy: Prisma.Enumerable<Prisma.SymbolProfileOrderByWithRelationInput> =
+      [{ symbol: 'asc' }];
     const where: Prisma.SymbolProfileWhereInput = {};
 
+    if (
+      presetId === 'ETF_WITHOUT_COUNTRIES' ||
+      presetId === 'ETF_WITHOUT_SECTORS'
+    ) {
+      filters = [{ id: 'ETF', type: 'ASSET_SUB_CLASS' }];
+    }
+
     const { ASSET_SUB_CLASS: filtersByAssetSubClass } = groupBy(
       filters,
       (filter) => {
@@ -75,42 +135,33 @@ export class AdminService {
       }
     );
 
-    const marketData = await this.prismaService.marketData.groupBy({
+    const marketDataItems = await this.prismaService.marketData.groupBy({
       _count: true,
       by: ['dataSource', 'symbol']
     });
 
-    let currencyPairsToGather: AdminMarketDataItem[] = [];
-
     if (filtersByAssetSubClass) {
       where.assetSubClass = AssetSubClass[filtersByAssetSubClass[0].id];
-    } else {
-      currencyPairsToGather = this.exchangeRateDataService
-        .getCurrencyPairs()
-        .map(({ dataSource, symbol }) => {
-          const marketDataItemCount =
-            marketData.find((marketDataItem) => {
-              return (
-                marketDataItem.dataSource === dataSource &&
-                marketDataItem.symbol === symbol
-              );
-            })?._count ?? 0;
-
-          return {
-            dataSource,
-            marketDataItemCount,
-            symbol,
-            assetClass: 'CASH',
-            countriesCount: 0,
-            sectorsCount: 0
-          };
-        });
     }
 
-    const symbolProfilesToGather: AdminMarketDataItem[] = (
-      await this.prismaService.symbolProfile.findMany({
+    if (sortColumn) {
+      orderBy = [{ [sortColumn]: sortDirection }];
+
+      if (sortColumn === 'activitiesCount') {
+        orderBy = {
+          Order: {
+            _count: sortDirection
+          }
+        };
+      }
+    }
+
+    let [assetProfiles, count] = await Promise.all([
+      this.prismaService.symbolProfile.findMany({
+        orderBy,
+        skip,
+        take,
         where,
-        orderBy: [{ symbol: 'asc' }],
         select: {
           _count: {
             select: { Order: true }
@@ -129,38 +180,64 @@ export class AdminService {
           sectors: true,
           symbol: true
         }
-      })
-    ).map((symbolProfile) => {
-      const countriesCount = symbolProfile.countries
-        ? Object.keys(symbolProfile.countries).length
-        : 0;
-      const marketDataItemCount =
-        marketData.find((marketDataItem) => {
-          return (
-            marketDataItem.dataSource === symbolProfile.dataSource &&
-            marketDataItem.symbol === symbolProfile.symbol
-          );
-        })?._count ?? 0;
-      const sectorsCount = symbolProfile.sectors
-        ? Object.keys(symbolProfile.sectors).length
-        : 0;
+      }),
+      this.prismaService.symbolProfile.count({ where })
+    ]);
 
-      return {
-        countriesCount,
-        marketDataItemCount,
-        sectorsCount,
-        activitiesCount: symbolProfile._count.Order,
-        assetClass: symbolProfile.assetClass,
-        assetSubClass: symbolProfile.assetSubClass,
-        comment: symbolProfile.comment,
-        dataSource: symbolProfile.dataSource,
-        date: symbolProfile.Order?.[0]?.date,
-        symbol: symbolProfile.symbol
-      };
-    });
+    let marketData = assetProfiles.map(
+      ({
+        _count,
+        assetClass,
+        assetSubClass,
+        comment,
+        countries,
+        dataSource,
+        Order,
+        sectors,
+        symbol
+      }) => {
+        const countriesCount = countries ? Object.keys(countries).length : 0;
+        const marketDataItemCount =
+          marketDataItems.find((marketDataItem) => {
+            return (
+              marketDataItem.dataSource === dataSource &&
+              marketDataItem.symbol === symbol
+            );
+          })?._count ?? 0;
+        const sectorsCount = sectors ? Object.keys(sectors).length : 0;
+
+        return {
+          assetClass,
+          assetSubClass,
+          comment,
+          countriesCount,
+          dataSource,
+          symbol,
+          marketDataItemCount,
+          sectorsCount,
+          activitiesCount: _count.Order,
+          date: Order?.[0]?.date
+        };
+      }
+    );
+
+    if (presetId) {
+      if (presetId === 'ETF_WITHOUT_COUNTRIES') {
+        marketData = marketData.filter(({ countriesCount }) => {
+          return countriesCount === 0;
+        });
+      } else if (presetId === 'ETF_WITHOUT_SECTORS') {
+        marketData = marketData.filter(({ sectorsCount }) => {
+          return sectorsCount === 0;
+        });
+      }
+
+      count = marketData.length;
+    }
 
     return {
-      marketData: [...currencyPairsToGather, ...symbolProfilesToGather]
+      count,
+      marketData
     };
   }
 
@@ -198,12 +275,14 @@ export class AdminService {
   public async patchAssetProfileData({
     comment,
     dataSource,
+    scraperConfiguration,
     symbol,
     symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
     await this.symbolProfileService.updateSymbolProfile({
       comment,
       dataSource,
+      scraperConfiguration,
       symbol,
       symbolMapping
     });

apps/api/src/app/admin/update-asset-profile.dto.ts

@@ -1,3 +1,4 @@
+import { Prisma } from '@prisma/client';
 import { IsObject, IsOptional, IsString } from 'class-validator';
 
 export class UpdateAssetProfileDto {
@@ -5,6 +6,10 @@ export class UpdateAssetProfileDto {
   @IsOptional()
   comment?: string;
 
+  @IsObject()
+  @IsOptional()
+  scraperConfiguration?: Prisma.InputJsonObject;
+
   @IsObject()
   @IsOptional()
   symbolMapping?: {

apps/api/src/app/app.module.ts

@@ -7,11 +7,16 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { TwitterBotModule } from '@ghostfolio/api/services/twitter-bot/twitter-bot.module';
+import {
+  DEFAULT_LANGUAGE_CODE,
+  SUPPORTED_LANGUAGE_CODES
+} from '@ghostfolio/common/config';
 import { BullModule } from '@nestjs/bull';
 import { MiddlewareConsumer, Module, RequestMethod } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ServeStaticModule } from '@nestjs/serve-static';
+import { StatusCodes } from 'http-status-codes';
 
 import { AccessModule } from './access/access.module';
 import { AccountModule } from './account/account.module';
@@ -32,6 +37,7 @@ import { OrderModule } from './order/order.module';
 import { PlatformModule } from './platform/platform.module';
 import { PortfolioModule } from './portfolio/portfolio.module';
 import { RedisCacheModule } from './redis-cache/redis-cache.module';
+import { SitemapModule } from './sitemap/sitemap.module';
 import { SubscriptionModule } from './subscription/subscription.module';
 import { SymbolModule } from './symbol/symbol.module';
 import { UserModule } from './user/user.module';
@@ -69,20 +75,37 @@ import { UserModule } from './user/user.module';
     PrismaModule,
     RedisCacheModule,
     ScheduleModule.forRoot(),
-    ServeStaticModule.forRoot({
-      serveStaticOptions: {
-        /*etag: false // Disable etag header to fix PWA
-        setHeaders: (res, path) => {
-          if (path.includes('ngsw.json')) {
-            // Disable cache (https://stackoverflow.com/questions/22632593/how-to-disable-webpage-caching-in-expressjs-nodejs/39775595)
-            // https://gertjans.home.xs4all.nl/javascript/cache-control.html#no-cache
-            res.set('Cache-Control', 'no-cache, no-store, must-revalidate');
-          }
-        }*/
-      },
-      rootPath: join(__dirname, '..', 'client'),
-      exclude: ['/api*']
+    ...SUPPORTED_LANGUAGE_CODES.map((languageCode) => {
+      return ServeStaticModule.forRoot({
+        rootPath: join(__dirname, '..', 'client', languageCode),
+        serveRoot: `/${languageCode}`
+      });
     }),
+    ServeStaticModule.forRoot({
+      exclude: ['/api*', '/sitemap.xml'],
+      rootPath: join(__dirname, '..', 'client'),
+      serveStaticOptions: {
+        setHeaders: (res) => {
+          if (res.req?.path === '/') {
+            let languageCode = DEFAULT_LANGUAGE_CODE;
+
+            try {
+              const code = res.req.headers['accept-language']
+                .split(',')[0]
+                .split('-')[0];
+
+              if (SUPPORTED_LANGUAGE_CODES.includes(code)) {
+                languageCode = code;
+              }
+            } catch {}
+
+            res.set('Location', `/${languageCode}`);
+            res.statusCode = StatusCodes.MOVED_PERMANENTLY;
+          }
+        }
+      }
+    }),
+    SitemapModule,
     SubscriptionModule,
     SymbolModule,
     TwitterBotModule,

apps/api/src/app/benchmark/benchmark.service.ts

@@ -66,11 +66,11 @@ export class BenchmarkService {
 
     const promises: Promise<number>[] = [];
 
-    const quotes = await this.dataProviderService.getQuotes(
-      benchmarkAssetProfiles.map(({ dataSource, symbol }) => {
+    const quotes = await this.dataProviderService.getQuotes({
+      items: benchmarkAssetProfiles.map(({ dataSource, symbol }) => {
         return { dataSource, symbol };
       })
-    );
+    });
 
     for (const { dataSource, symbol } of benchmarkAssetProfiles) {
       promises.push(this.marketDataService.getMax({ dataSource, symbol }));

apps/api/src/app/export/export.module.ts

@@ -1,8 +1,9 @@
+import { AccountModule } from '@ghostfolio/api/app/account/account.module';
+import { OrderModule } from '@ghostfolio/api/app/order/order.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { Module } from '@nestjs/common';
 
 import { ExportController } from './export.controller';
@@ -10,10 +11,11 @@ import { ExportService } from './export.service';
 
 @Module({
   imports: [
+    AccountModule,
     ConfigurationModule,
     DataGatheringModule,
     DataProviderModule,
-    PrismaModule,
+    OrderModule,
     RedisCacheModule
   ],
   controllers: [ExportController],

apps/api/src/app/export/export.service.ts

@@ -1,11 +1,15 @@
+import { AccountService } from '@ghostfolio/api/app/account/account.service';
+import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { environment } from '@ghostfolio/api/environments/environment';
-import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { Export } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
 export class ExportService {
-  public constructor(private readonly prismaService: PrismaService) {}
+  public constructor(
+    private readonly accountService: AccountService,
+    private readonly orderService: OrderService
+  ) {}
 
   public async export({
     activityIds,
@@ -14,36 +18,40 @@ export class ExportService {
     activityIds?: string[];
     userId: string;
   }): Promise<Export> {
-    const accounts = await this.prismaService.account.findMany({
-      orderBy: {
-        name: 'asc'
-      },
-      select: {
-        accountType: true,
-        balance: true,
-        comment: true,
-        currency: true,
-        id: true,
-        isExcluded: true,
-        name: true,
-        platformId: true
-      },
-      where: { userId }
-    });
+    const accounts = (
+      await this.accountService.accounts({
+        orderBy: {
+          name: 'asc'
+        },
+        where: { userId }
+      })
+    ).map(
+      ({
+        accountType,
+        balance,
+        comment,
+        currency,
+        id,
+        isExcluded,
+        name,
+        platformId
+      }) => {
+        return {
+          accountType,
+          balance,
+          comment,
+          currency,
+          id,
+          isExcluded,
+          name,
+          platformId
+        };
+      }
+    );
 
-    let activities = await this.prismaService.order.findMany({
+    let activities = await this.orderService.orders({
+      include: { SymbolProfile: true },
       orderBy: { date: 'desc' },
-      select: {
-        accountId: true,
-        comment: true,
-        date: true,
-        fee: true,
-        id: true,
-        quantity: true,
-        SymbolProfile: true,
-        type: true,
-        unitPrice: true
-      },
       where: { userId }
     });
 

apps/api/src/app/frontend.middleware.ts

@@ -4,7 +4,7 @@ import * as path from 'path';
 import { environment } from '@ghostfolio/api/environments/environment';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
-import { DATE_FORMAT } from '@ghostfolio/common/helper';
+import { DATE_FORMAT, interpolate } from '@ghostfolio/common/helper';
 import { Injectable, NestMiddleware } from '@nestjs/common';
 import { format } from 'date-fns';
 import { NextFunction, Request, Response } from 'express';
@@ -104,6 +104,11 @@ export class FrontendMiddleware implements NestMiddleware {
     ) {
       featureGraphicPath = 'assets/images/blog/20230520.jpg';
       title = `Unlock your Financial Potential with Ghostfolio - ${title}`;
+    } else if (
+      request.path.startsWith('/en/blog/2023/07/exploring-the-path-to-fire')
+    ) {
+      featureGraphicPath = 'assets/images/blog/20230701.jpg';
+      title = `Exploring the Path to FIRE - ${title}`;
     }
 
     if (
@@ -115,7 +120,7 @@ export class FrontendMiddleware implements NestMiddleware {
       next();
     } else if (request.path === '/de' || request.path.startsWith('/de/')) {
       response.send(
-        this.interpolate(this.indexHtmlDe, {
+        interpolate(this.indexHtmlDe, {
           currentDate,
           featureGraphicPath,
           title,
@@ -128,7 +133,7 @@ export class FrontendMiddleware implements NestMiddleware {
       );
     } else if (request.path === '/es' || request.path.startsWith('/es/')) {
       response.send(
-        this.interpolate(this.indexHtmlEs, {
+        interpolate(this.indexHtmlEs, {
           currentDate,
           featureGraphicPath,
           title,
@@ -141,7 +146,7 @@ export class FrontendMiddleware implements NestMiddleware {
       );
     } else if (request.path === '/fr' || request.path.startsWith('/fr/')) {
       response.send(
-        this.interpolate(this.indexHtmlFr, {
+        interpolate(this.indexHtmlFr, {
           currentDate,
           featureGraphicPath,
           title,
@@ -154,7 +159,7 @@ export class FrontendMiddleware implements NestMiddleware {
       );
     } else if (request.path === '/it' || request.path.startsWith('/it/')) {
       response.send(
-        this.interpolate(this.indexHtmlIt, {
+        interpolate(this.indexHtmlIt, {
           currentDate,
           featureGraphicPath,
           title,
@@ -167,7 +172,7 @@ export class FrontendMiddleware implements NestMiddleware {
       );
     } else if (request.path === '/nl' || request.path.startsWith('/nl/')) {
       response.send(
-        this.interpolate(this.indexHtmlNl, {
+        interpolate(this.indexHtmlNl, {
           currentDate,
           featureGraphicPath,
           title,
@@ -180,7 +185,7 @@ export class FrontendMiddleware implements NestMiddleware {
       );
     } else if (request.path === '/pt' || request.path.startsWith('/pt/')) {
       response.send(
-        this.interpolate(this.indexHtmlPt, {
+        interpolate(this.indexHtmlPt, {
           currentDate,
           featureGraphicPath,
           title,
@@ -193,7 +198,7 @@ export class FrontendMiddleware implements NestMiddleware {
       );
     } else {
       response.send(
-        this.interpolate(this.indexHtmlEn, {
+        interpolate(this.indexHtmlEn, {
           currentDate,
           featureGraphicPath,
           title,
@@ -210,20 +215,15 @@ export class FrontendMiddleware implements NestMiddleware {
     return path.join(__dirname, '..', 'client', aLocale, 'index.html');
   }
 
-  private interpolate(template: string, context: any) {
-    return template.replace(/[$]{([^}]+)}/g, (_, objectPath) => {
-      const properties = objectPath.split('.');
-      return properties.reduce(
-        (previous, current) => previous?.[current],
-        context
-      );
-    });
-  }
-
   private isFileRequest(filename: string) {
     if (filename === '/assets/LICENSE') {
       return true;
-    } else if (filename.includes('auth/ey')) {
+    } else if (
+      filename.includes('auth/ey') ||
+      filename.includes(
+        'personal-finance-tools/open-source-alternative-to-markets.sh'
+      )
+    ) {
       return false;
     }
 

apps/api/src/app/import/import.service.ts

@@ -8,10 +8,15 @@ import {
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { PlatformService } from '@ghostfolio/api/app/platform/platform.service';
 import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
-import { parseDate } from '@ghostfolio/common/helper';
+import {
+  DATE_FORMAT,
+  getAssetProfileIdentifier,
+  parseDate
+} from '@ghostfolio/common/helper';
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
 import {
   AccountWithPlatform,
@@ -20,13 +25,15 @@ import {
 import { Injectable } from '@nestjs/common';
 import { DataSource, Prisma, SymbolProfile } from '@prisma/client';
 import Big from 'big.js';
-import { endOfToday, isAfter, isSameDay, parseISO } from 'date-fns';
+import { endOfToday, format, isAfter, isSameDay, parseISO } from 'date-fns';
+import { uniqBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 
 @Injectable()
 export class ImportService {
   public constructor(
     private readonly accountService: AccountService,
+    private readonly dataGatheringService: DataGatheringService,
     private readonly dataProviderService: DataProviderService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly orderService: OrderService,
@@ -220,8 +227,7 @@ export class ImportService {
 
     const assetProfiles = await this.validateActivities({
       activitiesDto,
-      maxActivitiesToImport,
-      userId
+      maxActivitiesToImport
     });
 
     const activitiesExtendedWithErrors = await this.extendActivitiesWithErrors({
@@ -243,17 +249,47 @@ export class ImportService {
 
     const activities: Activity[] = [];
 
-    for (const {
-      accountId,
-      comment,
-      date,
-      error,
-      fee,
-      quantity,
-      SymbolProfile: assetProfile,
-      type,
-      unitPrice
-    } of activitiesExtendedWithErrors) {
+    for (let [
+      index,
+      {
+        accountId,
+        comment,
+        date,
+        error,
+        fee,
+        quantity,
+        SymbolProfile,
+        type,
+        unitPrice
+      }
+    ] of activitiesExtendedWithErrors.entries()) {
+      const assetProfile = assetProfiles[
+        getAssetProfileIdentifier({
+          dataSource: SymbolProfile.dataSource,
+          symbol: SymbolProfile.symbol
+        })
+      ] ?? {
+        currency: SymbolProfile.currency,
+        dataSource: SymbolProfile.dataSource,
+        symbol: SymbolProfile.symbol
+      };
+      const {
+        assetClass,
+        assetSubClass,
+        countries,
+        createdAt,
+        currency,
+        dataSource,
+        id,
+        isin,
+        name,
+        scraperConfiguration,
+        sectors,
+        symbol,
+        symbolMapping,
+        url,
+        updatedAt
+      } = assetProfile;
       const validatedAccount = accounts.find(({ id }) => {
         return id === accountId;
       });
@@ -264,6 +300,35 @@ export class ImportService {
             Account?: { id: string; name: string };
           });
 
+      if (SymbolProfile.currency !== assetProfile.currency) {
+        // Convert the unit price and fee to the asset currency if the imported
+        // activity is in a different currency
+        unitPrice = await this.exchangeRateDataService.toCurrencyAtDate(
+          unitPrice,
+          SymbolProfile.currency,
+          assetProfile.currency,
+          date
+        );
+
+        if (!unitPrice) {
+          throw new Error(
+            `activities.${index} historical exchange rate at ${format(
+              date,
+              DATE_FORMAT
+            )} is not available from "${SymbolProfile.currency}" to "${
+              assetProfile.currency
+            }"`
+          );
+        }
+
+        fee = await this.exchangeRateDataService.toCurrencyAtDate(
+          fee,
+          SymbolProfile.currency,
+          assetProfile.currency,
+          date
+        );
+      }
+
       if (isDryRun) {
         order = {
           comment,
@@ -279,23 +344,22 @@ export class ImportService {
           id: uuidv4(),
           isDraft: isAfter(date, endOfToday()),
           SymbolProfile: {
-            assetClass: assetProfile.assetClass,
-            assetSubClass: assetProfile.assetSubClass,
-            comment: assetProfile.comment,
-            countries: assetProfile.countries,
-            createdAt: assetProfile.createdAt,
-            currency: assetProfile.currency,
-            dataSource: assetProfile.dataSource,
-            id: assetProfile.id,
-            isin: assetProfile.isin,
-            name: assetProfile.name,
-            scraperConfiguration: assetProfile.scraperConfiguration,
-            sectors: assetProfile.sectors,
-            symbol: assetProfile.currency,
-            symbolMapping: assetProfile.symbolMapping,
-            updatedAt: assetProfile.updatedAt,
-            url: assetProfile.url,
-            ...assetProfiles[assetProfile.symbol]
+            assetClass,
+            assetSubClass,
+            countries,
+            createdAt,
+            currency,
+            dataSource,
+            id,
+            isin,
+            name,
+            scraperConfiguration,
+            sectors,
+            symbol,
+            symbolMapping,
+            updatedAt,
+            url,
+            comment: assetProfile.comment
           },
           Account: validatedAccount,
           symbolProfileId: undefined,
@@ -318,14 +382,14 @@ export class ImportService {
           SymbolProfile: {
             connectOrCreate: {
               create: {
-                currency: assetProfile.currency,
-                dataSource: assetProfile.dataSource,
-                symbol: assetProfile.symbol
+                currency,
+                dataSource,
+                symbol
               },
               where: {
                 dataSource_symbol: {
-                  dataSource: assetProfile.dataSource,
-                  symbol: assetProfile.symbol
+                  dataSource,
+                  symbol
                 }
               }
             }
@@ -337,24 +401,49 @@ export class ImportService {
 
       const value = new Big(quantity).mul(unitPrice).toNumber();
 
-      //@ts-ignore
       activities.push({
         ...order,
         error,
         value,
         feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
           fee,
-          assetProfile.currency,
+          currency,
           userCurrency
         ),
+        //@ts-ignore
+        SymbolProfile: assetProfile,
         valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
           value,
-          assetProfile.currency,
+          currency,
           userCurrency
         )
       });
     }
 
+    activities.sort((activity1, activity2) => {
+      return Number(activity1.date) - Number(activity2.date);
+    });
+
+    if (!isDryRun) {
+      // Gather symbol data in the background, if not dry run
+      const uniqueActivities = uniqBy(activities, ({ SymbolProfile }) => {
+        return getAssetProfileIdentifier({
+          dataSource: SymbolProfile.dataSource,
+          symbol: SymbolProfile.symbol
+        });
+      });
+
+      this.dataGatheringService.gatherSymbols(
+        uniqueActivities.map(({ date, SymbolProfile }) => {
+          return {
+            date,
+            dataSource: SymbolProfile.dataSource,
+            symbol: SymbolProfile.symbol
+          };
+        })
+      );
+    }
+
     return activities;
   }
 
@@ -446,25 +535,30 @@ export class ImportService {
 
   private async validateActivities({
     activitiesDto,
-    maxActivitiesToImport,
-    userId
+    maxActivitiesToImport
   }: {
     activitiesDto: Partial<CreateOrderDto>[];
     maxActivitiesToImport: number;
-    userId: string;
   }) {
     if (activitiesDto?.length > maxActivitiesToImport) {
       throw new Error(`Too many activities (${maxActivitiesToImport} at most)`);
     }
 
     const assetProfiles: {
-      [symbol: string]: Partial<SymbolProfile>;
+      [assetProfileIdentifier: string]: Partial<SymbolProfile>;
     } = {};
 
+    const uniqueActivitiesDto = uniqBy(
+      activitiesDto,
+      ({ dataSource, symbol }) => {
+        return getAssetProfileIdentifier({ dataSource, symbol });
+      }
+    );
+
     for (const [
       index,
       { currency, dataSource, symbol }
-    ] of activitiesDto.entries()) {
+    ] of uniqueActivitiesDto.entries()) {
       if (dataSource !== 'MANUAL') {
         const assetProfile = (
           await this.dataProviderService.getAssetProfiles([
@@ -472,19 +566,26 @@ export class ImportService {
           ])
         )?.[symbol];
 
-        if (assetProfile === undefined) {
+        if (!assetProfile) {
           throw new Error(
             `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
           );
         }
 
-        if (assetProfile.currency !== currency) {
+        if (
+          assetProfile.currency !== currency &&
+          !this.exchangeRateDataService.hasCurrencyPair(
+            currency,
+            assetProfile.currency
+          )
+        ) {
           throw new Error(
-            `activities.${index}.currency ("${currency}") does not match with "${assetProfile.currency}"`
+            `activities.${index}.currency ("${currency}") does not match with "${assetProfile.currency}" and no exchange rate is available from "${currency}" to "${assetProfile.currency}"`
           );
         }
 
-        assetProfiles[symbol] = assetProfile;
+        assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })] =
+          assetProfile;
       }
     }
 

apps/api/src/app/info/info.service.ts

@@ -30,9 +30,9 @@ import { permissions } from '@ghostfolio/common/permissions';
 import { SubscriptionOffer } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import * as bent from 'bent';
 import * as cheerio from 'cheerio';
 import { format, subDays } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class InfoService {
@@ -172,17 +172,13 @@ export class InfoService {
 
   private async countDockerHubPulls(): Promise<number> {
     try {
-      const get = bent(
+      const { pull_count } = await got(
         `https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio`,
-        'GET',
-        'json',
-        200,
         {
-          'User-Agent': 'request'
+          headers: { 'User-Agent': 'request' }
         }
-      );
+      ).json<any>();
 
-      const { pull_count } = await get();
       return pull_count;
     } catch (error) {
       Logger.error(error, 'InfoService');
@@ -193,16 +189,9 @@ export class InfoService {
 
   private async countGitHubContributors(): Promise<number> {
     try {
-      const get = bent(
-        'https://github.com/ghostfolio/ghostfolio',
-        'GET',
-        'string',
-        200,
-        {}
-      );
+      const { body } = await got('https://github.com/ghostfolio/ghostfolio');
 
-      const html = await get();
-      const $ = cheerio.load(html);
+      const $ = cheerio.load(body);
 
       return extractNumberFromString(
         $(
@@ -218,17 +207,13 @@ export class InfoService {
 
   private async countGitHubStargazers(): Promise<number> {
     try {
-      const get = bent(
+      const { stargazers_count } = await got(
         `https://api.github.com/repos/ghostfolio/ghostfolio`,
-        'GET',
-        'json',
-        200,
         {
-          'User-Agent': 'request'
+          headers: { 'User-Agent': 'request' }
         }
-      );
+      ).json<any>();
 
-      const { stargazers_count } = await get();
       return stargazers_count;
     } catch (error) {
       Logger.error(error, 'InfoService');
@@ -346,22 +331,21 @@ export class InfoService {
           PROPERTY_BETTER_UPTIME_MONITOR_ID
         )) as string;
 
-        const get = bent(
+        const { data } = await got(
           `https://betteruptime.com/api/v2/monitors/${monitorId}/sla?from=${format(
             subDays(new Date(), 90),
             DATE_FORMAT
           )}&to${format(new Date(), DATE_FORMAT)}`,
-          'GET',
-          'json',
-          200,
-          {
-            Authorization: `Bearer ${this.configurationService.get(
-              'BETTER_UPTIME_API_KEY'
-            )}`
-          }
-        );
 
-        const { data } = await get();
+          {
+            headers: {
+              Authorization: `Bearer ${this.configurationService.get(
+                'BETTER_UPTIME_API_KEY'
+              )}`
+            }
+          }
+        ).json<any>();
+
         return data.attributes.availability / 100;
       } catch (error) {
         Logger.error(error, 'InfoService');

apps/api/src/app/logo/logo.service.ts

@@ -2,7 +2,7 @@ import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/sy
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
 import { HttpException, Injectable } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
-import * as bent from 'bent';
+import got from 'got';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 @Injectable()
@@ -41,15 +41,11 @@ export class LogoService {
   }
 
   private getBuffer(aUrl: string) {
-    const get = bent(
+    return got(
       `https://t0.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${aUrl}&size=64`,
-      'GET',
-      'buffer',
-      200,
       {
-        'User-Agent': 'request'
+        headers: { 'User-Agent': 'request' }
       }
-    );
-    return get();
+    ).buffer();
   }
 }

apps/api/src/app/order/order.controller.ts

@@ -2,6 +2,7 @@ import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import { ApiService } from '@ghostfolio/api/services/api/api.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';
 import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
@@ -36,6 +37,7 @@ import { UpdateOrderDto } from './update-order.dto';
 export class OrderController {
   public constructor(
     private readonly apiService: ApiService,
+    private readonly dataGatheringService: DataGatheringService,
     private readonly impersonationService: ImpersonationService,
     private readonly orderService: OrderService,
     @Inject(REQUEST) private readonly request: RequestWithUser
@@ -123,7 +125,7 @@ export class OrderController {
       );
     }
 
-    return this.orderService.createOrder({
+    const order = await this.orderService.createOrder({
       ...data,
       date: parseISO(data.date),
       SymbolProfile: {
@@ -144,6 +146,19 @@ export class OrderController {
       User: { connect: { id: this.request.user.id } },
       userId: this.request.user.id
     });
+
+    if (!order.isDraft) {
+      // Gather symbol data in the background, if not draft
+      this.dataGatheringService.gatherSymbols([
+        {
+          dataSource: data.dataSource,
+          date: order.date,
+          symbol: data.symbol
+        }
+      ]);
+    }
+
+    return order;
   }
 
   @Put(':id')

apps/api/src/app/order/order.module.ts

@@ -2,6 +2,7 @@ import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { CacheModule } from '@ghostfolio/api/app/cache/cache.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
+import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
@@ -31,6 +32,6 @@ import { OrderService } from './order.service';
     SymbolProfileModule,
     UserModule
   ],
-  providers: [AccountService, OrderService]
+  providers: [AccountBalanceService, AccountService, OrderService]
 })
 export class OrderModule {}

apps/api/src/app/order/order.service.ts

@@ -7,6 +7,7 @@ import {
   GATHER_ASSET_PROFILE_PROCESS,
   GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
+import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import { Filter } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
@@ -117,7 +118,7 @@ export class OrderService {
       };
     }
 
-    await this.dataGatheringService.addJobToQueue({
+    this.dataGatheringService.addJobToQueue({
       data: {
         dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
         symbol: data.SymbolProfile.connectOrCreate.create.symbol
@@ -125,26 +126,13 @@ export class OrderService {
       name: GATHER_ASSET_PROFILE_PROCESS,
       opts: {
         ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-        jobId: `${data.SymbolProfile.connectOrCreate.create.dataSource}-${data.SymbolProfile.connectOrCreate.create.symbol}`
+        jobId: getAssetProfileIdentifier({
+          dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
+          symbol: data.SymbolProfile.connectOrCreate.create.symbol
+        })
       }
     });
 
-    const isDraft =
-      data.type === 'LIABILITY'
-        ? false
-        : isAfter(data.date as Date, endOfToday());
-
-    if (!isDraft) {
-      // Gather symbol data of order in the background, if not draft
-      this.dataGatheringService.gatherSymbols([
-        {
-          dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
-          date: <Date>data.date,
-          symbol: data.SymbolProfile.connectOrCreate.create.symbol
-        }
-      ]);
-    }
-
     delete data.accountId;
     delete data.assetClass;
     delete data.assetSubClass;
@@ -162,6 +150,11 @@ export class OrderService {
 
     const orderData: Prisma.OrderCreateInput = data;
 
+    const isDraft =
+      data.type === 'LIABILITY'
+        ? false
+        : isAfter(data.date as Date, endOfToday());
+
     const order = await this.prismaService.order.create({
       data: {
         ...orderData,

apps/api/src/app/portfolio/current-rate.service.spec.ts

@@ -98,7 +98,8 @@ describe('CurrentRateService', () => {
       [],
       null,
       null,
-      propertyService
+      propertyService,
+      null
     );
     exchangeRateDataService = new ExchangeRateDataService(
       null,

apps/api/src/app/portfolio/current-rate.service.ts

@@ -38,7 +38,7 @@ export class CurrentRateService {
     if (includeToday) {
       promises.push(
         this.dataProviderService
-          .getQuotes(dataGatheringItems)
+          .getQuotes({ items: dataGatheringItems })
           .then((dataResultProvider) => {
             const result: GetValueObject[] = [];
             for (const dataGatheringItem of dataGatheringItems) {

apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts

@@ -1,4 +1,4 @@
-import { DataSource, Type as TypeOfOrder } from '@prisma/client';
+import { DataSource, Tag, Type as TypeOfOrder } from '@prisma/client';
 import Big from 'big.js';
 
 export interface PortfolioOrder {
@@ -9,6 +9,7 @@ export interface PortfolioOrder {
   name: string;
   quantity: Big;
   symbol: string;
+  tags?: Tag[];
   type: TypeOfOrder;
   unitPrice: Big;
 }

apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts

@@ -1,4 +1,4 @@
-import { DataSource } from '@prisma/client';
+import { DataSource, Tag } from '@prisma/client';
 import Big from 'big.js';
 
 export interface TransactionPointSymbol {
@@ -9,5 +9,6 @@ export interface TransactionPointSymbol {
   investment: Big;
   quantity: Big;
   symbol: string;
+  tags?: Tag[];
   transactionCount: number;
 }

apps/api/src/app/portfolio/portfolio-calculator.ts

@@ -114,6 +114,7 @@ export class PortfolioCalculator {
           firstBuyDate: oldAccumulatedSymbol.firstBuyDate,
           quantity: newQuantity,
           symbol: order.symbol,
+          tags: order.tags,
           transactionCount: oldAccumulatedSymbol.transactionCount + 1
         };
       } else {
@@ -125,6 +126,7 @@ export class PortfolioCalculator {
           investment: unitPrice.mul(order.quantity).mul(factor),
           quantity: order.quantity.mul(factor),
           symbol: order.symbol,
+          tags: order.tags,
           transactionCount: 1
         };
       }
@@ -492,6 +494,7 @@ export class PortfolioCalculator {
           : null,
         quantity: item.quantity,
         symbol: item.symbol,
+        tags: item.tags,
         transactionCount: item.transactionCount
       });
 

apps/api/src/app/portfolio/portfolio.controller.ts

@@ -134,7 +134,7 @@ export class PortfolioController {
         portfolioPosition.netPerformance = null;
         portfolioPosition.quantity = null;
         portfolioPosition.valueInPercentage =
-          portfolioPosition.value / totalValue;
+          portfolioPosition.valueInBaseCurrency / totalValue;
       }
 
       for (const [name, { valueInBaseCurrency }] of Object.entries(accounts)) {
@@ -161,10 +161,12 @@ export class PortfolioController {
         'emergencyFund',
         'excludedAccountsAndActivities',
         'fees',
+        'fireWealth',
         'items',
         'liabilities',
         'netWorth',
         'totalBuy',
+        'totalInvestment',
         'totalSell'
       ]);
     }
@@ -177,6 +179,9 @@ export class PortfolioController {
         countries: hasDetails ? portfolioPosition.countries : [],
         currency: hasDetails ? portfolioPosition.currency : undefined,
         markets: hasDetails ? portfolioPosition.markets : undefined,
+        marketsAdvanced: hasDetails
+          ? portfolioPosition.marketsAdvanced
+          : undefined,
         sectors: hasDetails ? portfolioPosition.sectors : []
       };
     }
@@ -445,7 +450,8 @@ export class PortfolioController {
 
     for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
       portfolioPublicDetails.holdings[symbol] = {
-        allocationInPercentage: portfolioPosition.value / totalValue,
+        allocationInPercentage:
+          portfolioPosition.valueInBaseCurrency / totalValue,
         countries: hasDetails ? portfolioPosition.countries : [],
         currency: hasDetails ? portfolioPosition.currency : undefined,
         dataSource: portfolioPosition.dataSource,
@@ -456,7 +462,7 @@ export class PortfolioController {
         sectors: hasDetails ? portfolioPosition.sectors : [],
         symbol: portfolioPosition.symbol,
         url: portfolioPosition.url,
-        valueInPercentage: portfolioPosition.value / totalValue
+        valueInPercentage: portfolioPosition.valueInBaseCurrency / totalValue
       };
     }
 

apps/api/src/app/portfolio/portfolio.module.ts

@@ -2,6 +2,7 @@ import { AccessModule } from '@ghostfolio/api/app/access/access.module';
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { OrderModule } from '@ghostfolio/api/app/order/order.module';
 import { UserModule } from '@ghostfolio/api/app/user/user.module';
+import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service';
 import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
@@ -36,6 +37,7 @@ import { RulesService } from './rules.service';
     UserModule
   ],
   providers: [
+    AccountBalanceService,
     AccountService,
     CurrentRateService,
     PortfolioService,

apps/api/src/app/portfolio/portfolio.service.ts

@@ -42,7 +42,6 @@ import type {
   AccountWithValue,
   DateRange,
   GroupBy,
-  Market,
   OrderWithAccount,
   RequestWithUser,
   UserWithSettings
@@ -84,8 +83,10 @@ import {
 import { PortfolioCalculator } from './portfolio-calculator';
 import { RulesService } from './rules.service';
 
+const asiaPacificMarkets = require('../../assets/countries/asia-pacific-markets.json');
 const developedMarkets = require('../../assets/countries/developed-markets.json');
 const emergingMarkets = require('../../assets/countries/emerging-markets.json');
+const europeMarkets = require('../../assets/countries/europe-markets.json');
 
 @Injectable()
 export class PortfolioService {
@@ -504,15 +505,17 @@ export class PortfolioService {
       );
     }
 
-    const dataGatheringItems = currentPositions.positions.map((position) => {
-      return {
-        dataSource: position.dataSource,
-        symbol: position.symbol
-      };
-    });
+    const dataGatheringItems = currentPositions.positions.map(
+      ({ dataSource, symbol }) => {
+        return {
+          dataSource,
+          symbol
+        };
+      }
+    );
 
     const [dataProviderResponses, symbolProfiles] = await Promise.all([
-      this.dataProviderService.getQuotes(dataGatheringItems),
+      this.dataProviderService.getQuotes({ items: dataGatheringItems }),
       this.symbolProfileService.getSymbolProfiles(dataGatheringItems)
     ]);
 
@@ -536,30 +539,79 @@ export class PortfolioService {
       const symbolProfile = symbolProfileMap[item.symbol];
       const dataProviderResponse = dataProviderResponses[item.symbol];
 
-      const markets: { [key in Market]: number } = {
+      const markets: PortfolioPosition['markets'] = {
+        [UNKNOWN_KEY]: 0,
         developedMarkets: 0,
         emergingMarkets: 0,
         otherMarkets: 0
       };
+      const marketsAdvanced: PortfolioPosition['marketsAdvanced'] = {
+        [UNKNOWN_KEY]: 0,
+        asiaPacific: 0,
+        emergingMarkets: 0,
+        europe: 0,
+        japan: 0,
+        northAmerica: 0,
+        otherMarkets: 0
+      };
 
-      for (const country of symbolProfile.countries) {
-        if (developedMarkets.includes(country.code)) {
-          markets.developedMarkets = new Big(markets.developedMarkets)
-            .plus(country.weight)
-            .toNumber();
-        } else if (emergingMarkets.includes(country.code)) {
-          markets.emergingMarkets = new Big(markets.emergingMarkets)
-            .plus(country.weight)
-            .toNumber();
-        } else {
-          markets.otherMarkets = new Big(markets.otherMarkets)
-            .plus(country.weight)
-            .toNumber();
+      if (symbolProfile.countries.length > 0) {
+        for (const country of symbolProfile.countries) {
+          if (developedMarkets.includes(country.code)) {
+            markets.developedMarkets = new Big(markets.developedMarkets)
+              .plus(country.weight)
+              .toNumber();
+          } else if (emergingMarkets.includes(country.code)) {
+            markets.emergingMarkets = new Big(markets.emergingMarkets)
+              .plus(country.weight)
+              .toNumber();
+          } else {
+            markets.otherMarkets = new Big(markets.otherMarkets)
+              .plus(country.weight)
+              .toNumber();
+          }
+
+          if (country.code === 'JP') {
+            marketsAdvanced.japan = new Big(marketsAdvanced.japan)
+              .plus(country.weight)
+              .toNumber();
+          } else if (country.code === 'CA' || country.code === 'US') {
+            marketsAdvanced.northAmerica = new Big(marketsAdvanced.northAmerica)
+              .plus(country.weight)
+              .toNumber();
+          } else if (asiaPacificMarkets.includes(country.code)) {
+            marketsAdvanced.asiaPacific = new Big(marketsAdvanced.asiaPacific)
+              .plus(country.weight)
+              .toNumber();
+          } else if (emergingMarkets.includes(country.code)) {
+            marketsAdvanced.emergingMarkets = new Big(
+              marketsAdvanced.emergingMarkets
+            )
+              .plus(country.weight)
+              .toNumber();
+          } else if (europeMarkets.includes(country.code)) {
+            marketsAdvanced.europe = new Big(marketsAdvanced.europe)
+              .plus(country.weight)
+              .toNumber();
+          } else {
+            marketsAdvanced.otherMarkets = new Big(marketsAdvanced.otherMarkets)
+              .plus(country.weight)
+              .toNumber();
+          }
         }
+      } else {
+        markets[UNKNOWN_KEY] = new Big(markets[UNKNOWN_KEY])
+          .plus(value)
+          .toNumber();
+
+        marketsAdvanced[UNKNOWN_KEY] = new Big(marketsAdvanced[UNKNOWN_KEY])
+          .plus(value)
+          .toNumber();
       }
 
       holdings[item.symbol] = {
         markets,
+        marketsAdvanced,
         allocationInPercentage: filteredValueInBaseCurrency.eq(0)
           ? 0
           : value.div(filteredValueInBaseCurrency).toNumber(),
@@ -581,9 +633,10 @@ export class PortfolioService {
         quantity: item.quantity.toNumber(),
         sectors: symbolProfile.sectors,
         symbol: item.symbol,
+        tags: item.tags,
         transactionCount: item.transactionCount,
         url: symbolProfile.url,
-        value: value.toNumber()
+        valueInBaseCurrency: value.toNumber()
       };
     }
 
@@ -626,7 +679,7 @@ export class PortfolioService {
       const emergencyFundInCash = emergencyFund
         .minus(
           this.getEmergencyFundPositionsValueInBaseCurrency({
-            activities: orders
+            holdings
           })
         )
         .toNumber();
@@ -643,7 +696,7 @@ export class PortfolioService {
       holdings[userCurrency] = {
         ...emergencyFundCashPositions[userCurrency],
         investment: emergencyFundInCash,
-        value: emergencyFundInCash
+        valueInBaseCurrency: emergencyFundInCash
       };
     }
 
@@ -654,7 +707,7 @@ export class PortfolioService {
       balanceInBaseCurrency: cashDetails.balanceInBaseCurrency,
       emergencyFundPositionsValueInBaseCurrency:
         this.getEmergencyFundPositionsValueInBaseCurrency({
-          activities: orders
+          holdings
         })
     });
 
@@ -740,6 +793,7 @@ export class PortfolioService {
         name: order.SymbolProfile?.name,
         quantity: new Big(order.quantity),
         symbol: order.SymbolProfile.symbol,
+        tags: order.tags,
         type: order.type,
         unitPrice: new Big(order.unitPrice)
       }));
@@ -897,9 +951,9 @@ export class PortfolioService {
         )
       };
     } else {
-      const currentData = await this.dataProviderService.getQuotes([
-        { dataSource: DataSource.YAHOO, symbol: aSymbol }
-      ]);
+      const currentData = await this.dataProviderService.getQuotes({
+        items: [{ dataSource: DataSource.YAHOO, symbol: aSymbol }]
+      });
       const marketPrice = currentData[aSymbol]?.marketPrice;
 
       let historicalData = await this.dataProviderService.getHistorical(
@@ -1000,15 +1054,15 @@ export class PortfolioService {
       (item) => !item.quantity.eq(0)
     );
 
-    const dataGatheringItem = positions.map((position) => {
+    const dataGatheringItems = positions.map(({ dataSource, symbol }) => {
       return {
-        dataSource: position.dataSource,
-        symbol: position.symbol
+        dataSource,
+        symbol
       };
     });
 
     const [dataProviderResponses, symbolProfiles] = await Promise.all([
-      this.dataProviderService.getQuotes(dataGatheringItem),
+      this.dataProviderService.getQuotes({ items: dataGatheringItems }),
       this.symbolProfileService.getSymbolProfiles(
         positions.map(({ dataSource, symbol }) => {
           return { dataSource, symbol };
@@ -1276,7 +1330,7 @@ export class PortfolioService {
 
       if (cashPositions[account.currency]) {
         cashPositions[account.currency].investment += convertedBalance;
-        cashPositions[account.currency].value += convertedBalance;
+        cashPositions[account.currency].valueInBaseCurrency += convertedBalance;
       } else {
         cashPositions[account.currency] = this.getInitialCashPosition({
           balance: convertedBalance,
@@ -1288,7 +1342,9 @@ export class PortfolioService {
     for (const symbol of Object.keys(cashPositions)) {
       // Calculate allocations for each currency
       cashPositions[symbol].allocationInPercentage = value.gt(0)
-        ? new Big(cashPositions[symbol].value).div(value).toNumber()
+        ? new Big(cashPositions[symbol].valueInBaseCurrency)
+            .div(value)
+            .toNumber()
         : 0;
     }
 
@@ -1388,13 +1444,13 @@ export class PortfolioService {
   }
 
   private getEmergencyFundPositionsValueInBaseCurrency({
-    activities
+    holdings
   }: {
-    activities: Activity[];
+    holdings: PortfolioDetails['holdings'];
   }) {
-    const emergencyFundOrders = activities.filter((activity) => {
+    const emergencyFundHoldings = Object.values(holdings).filter(({ tags }) => {
       return (
-        activity.tags?.some(({ id }) => {
+        tags?.some(({ id }) => {
           return id === EMERGENCY_FUND_TAG_ID;
         }) ?? false
       );
@@ -1402,18 +1458,9 @@ export class PortfolioService {
 
     let valueInBaseCurrencyOfEmergencyFundPositions = new Big(0);
 
-    for (const order of emergencyFundOrders) {
-      if (order.type === 'BUY') {
-        valueInBaseCurrencyOfEmergencyFundPositions =
-          valueInBaseCurrencyOfEmergencyFundPositions.plus(
-            order.valueInBaseCurrency
-          );
-      } else if (order.type === 'SELL') {
-        valueInBaseCurrencyOfEmergencyFundPositions =
-          valueInBaseCurrencyOfEmergencyFundPositions.minus(
-            order.valueInBaseCurrency
-          );
-      }
+    for (const { valueInBaseCurrency } of emergencyFundHoldings) {
+      valueInBaseCurrencyOfEmergencyFundPositions =
+        valueInBaseCurrencyOfEmergencyFundPositions.plus(valueInBaseCurrency);
     }
 
     return valueInBaseCurrencyOfEmergencyFundPositions.toNumber();
@@ -1472,8 +1519,9 @@ export class PortfolioService {
       quantity: 0,
       sectors: [],
       symbol: currency,
+      tags: [],
       transactionCount: 0,
-      value: balance
+      valueInBaseCurrency: balance
     };
   }
 
@@ -1499,7 +1547,13 @@ export class PortfolioService {
       );
   }
 
-  private getLiabilities(activities: OrderWithAccount[]) {
+  private getLiabilities({
+    activities,
+    userCurrency
+  }: {
+    activities: OrderWithAccount[];
+    userCurrency: string;
+  }) {
     return activities
       .filter(({ type }) => {
         return type === TypeOfOrder.LIABILITY;
@@ -1508,7 +1562,7 @@ export class PortfolioService {
         return this.exchangeRateDataService.toCurrency(
           new Big(quantity).mul(unitPrice).toNumber(),
           SymbolProfile.currency,
-          this.request.user.Settings.settings.baseCurrency
+          userCurrency
         );
       })
       .reduce(
@@ -1618,7 +1672,10 @@ export class PortfolioService {
     const fees = this.getFees({ activities, userCurrency }).toNumber();
     const firstOrderDate = activities[0]?.date;
     const items = this.getItems(activities).toNumber();
-    const liabilities = this.getLiabilities(activities).toNumber();
+    const liabilities = this.getLiabilities({
+      activities,
+      userCurrency
+    }).toNumber();
 
     const totalBuy = this.getTotalByType(activities, userCurrency, 'BUY');
     const totalSell = this.getTotalByType(activities, userCurrency, 'SELL');
@@ -1683,7 +1740,16 @@ export class PortfolioService {
       totalBuy,
       totalSell,
       committedFunds: committedFunds.toNumber(),
-      emergencyFund: emergencyFund.toNumber(),
+      emergencyFund: {
+        assets: emergencyFundPositionsValueInBaseCurrency,
+        cash: emergencyFund
+          .minus(emergencyFundPositionsValueInBaseCurrency)
+          .toNumber(),
+        total: emergencyFund.toNumber()
+      },
+      fireWealth: new Big(performanceInformation.performance.currentValue)
+        .minus(emergencyFundPositionsValueInBaseCurrency)
+        .toNumber(),
       ordersCount: activities.filter(({ type }) => {
         return type === 'BUY' || type === 'SELL';
       }).length
@@ -1735,6 +1801,7 @@ export class PortfolioService {
       name: order.SymbolProfile?.name,
       quantity: new Big(order.quantity),
       symbol: order.SymbolProfile.symbol,
+      tags: order.tags,
       type: order.type,
       unitPrice: new Big(
         this.exchangeRateDataService.toCurrency(
@@ -1775,12 +1842,12 @@ export class PortfolioService {
     userId: string;
     withExcludedAccounts?: boolean;
   }) {
-    const ordersOfTypeItem = await this.orderService.getOrders({
+    const ordersOfTypeItemOrLiability = await this.orderService.getOrders({
       filters,
       userCurrency,
       userId,
       withExcludedAccounts,
-      types: ['ITEM']
+      types: ['ITEM', 'LIABILITY']
     });
 
     const accounts: PortfolioDetails['accounts'] = {};
@@ -1820,13 +1887,14 @@ export class PortfolioService {
         return accountId === account.id;
       });
 
-      const ordersOfTypeItemByAccount = ordersOfTypeItem.filter(
-        ({ accountId }) => {
+      const ordersOfTypeItemOrLiabilityByAccount =
+        ordersOfTypeItemOrLiability.filter(({ accountId }) => {
           return accountId === account.id;
-        }
-      );
+        });
 
-      ordersByAccount = ordersByAccount.concat(ordersOfTypeItemByAccount);
+      ordersByAccount = ordersByAccount.concat(
+        ordersOfTypeItemOrLiabilityByAccount
+      );
 
       accounts[account.id] = {
         balance: account.balance,
@@ -1866,7 +1934,7 @@ export class PortfolioService {
             order.unitPrice ??
             0);
 
-        if (order.type === 'SELL') {
+        if (order.type === 'LIABILITY' || order.type === 'SELL') {
           currentValueOfSymbolInBaseCurrency *= -1;
         }
 

apps/api/src/app/redis-cache/interfaces/redis-cache.interface.ts

@@ -0,0 +1,7 @@
+import { Cache } from 'cache-manager';
+
+import type { RedisStore } from './redis-store.interface';
+
+export interface RedisCache extends Cache {
+  store: RedisStore;
+}

apps/api/src/app/redis-cache/interfaces/redis-store.interface.ts

@@ -0,0 +1,8 @@
+import { Store } from 'cache-manager';
+import { createClient } from 'redis';
+
+export interface RedisStore extends Store {
+  getClient: () => ReturnType<typeof createClient>;
+  isCacheableValue: (value: any) => boolean;
+  name: 'redis';
+}

apps/api/src/app/redis-cache/redis-cache.module.ts

@@ -1,7 +1,9 @@
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
-import { CacheManagerOptions, CacheModule, Module } from '@nestjs/common';
+import { CacheModule } from '@nestjs/cache-manager';
+import { Module } from '@nestjs/common';
 import * as redisStore from 'cache-manager-redis-store';
+import type { RedisClientOptions } from 'redis';
 
 import { RedisCacheService } from './redis-cache.service';
 
@@ -11,7 +13,7 @@ import { RedisCacheService } from './redis-cache.service';
       imports: [ConfigurationModule],
       inject: [ConfigurationService],
       useFactory: async (configurationService: ConfigurationService) => {
-        return <CacheManagerOptions>{
+        return <RedisClientOptions>{
           host: configurationService.get('REDIS_HOST'),
           max: configurationService.get('MAX_ITEM_IN_CACHE'),
           password: configurationService.get('REDIS_PASSWORD'),

apps/api/src/app/redis-cache/redis-cache.service.ts

@@ -1,18 +1,32 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
-import { CACHE_MANAGER, Inject, Injectable } from '@nestjs/common';
-import { Cache } from 'cache-manager';
+import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
+import { UniqueAsset } from '@ghostfolio/common/interfaces';
+import { CACHE_MANAGER } from '@nestjs/cache-manager';
+import { Inject, Injectable, Logger } from '@nestjs/common';
+
+import type { RedisCache } from './interfaces/redis-cache.interface';
 
 @Injectable()
 export class RedisCacheService {
   public constructor(
-    @Inject(CACHE_MANAGER) private readonly cache: Cache,
+    @Inject(CACHE_MANAGER) private readonly cache: RedisCache,
     private readonly configurationService: ConfigurationService
-  ) {}
+  ) {
+    const client = cache.store.getClient();
+
+    client.on('error', (error) => {
+      Logger.error(error, 'RedisCacheService');
+    });
+  }
 
   public async get(key: string): Promise<string> {
     return await this.cache.get(key);
   }
 
+  public getQuoteKey({ dataSource, symbol }: UniqueAsset) {
+    return `quote-${getAssetProfileIdentifier({ dataSource, symbol })}`;
+  }
+
   public async remove(key: string) {
     await this.cache.del(key);
   }
@@ -22,8 +36,10 @@ export class RedisCacheService {
   }
 
   public async set(key: string, value: string, ttlInSeconds?: number) {
-    await this.cache.set(key, value, {
-      ttl: ttlInSeconds ?? this.configurationService.get('CACHE_TTL')
-    });
+    await this.cache.set(
+      key,
+      value,
+      ttlInSeconds ?? this.configurationService.get('CACHE_TTL')
+    );
   }
 }

apps/api/src/app/sitemap/sitemap.controller.ts

@@ -0,0 +1,36 @@
+import * as fs from 'fs';
+import * as path from 'path';
+
+import {
+  DATE_FORMAT,
+  getYesterday,
+  interpolate
+} from '@ghostfolio/common/helper';
+import { Controller, Get, Res, VERSION_NEUTRAL, Version } from '@nestjs/common';
+import { format } from 'date-fns';
+import { Response } from 'express';
+
+@Controller('sitemap.xml')
+export class SitemapController {
+  public sitemapXml = '';
+
+  public constructor() {
+    try {
+      this.sitemapXml = fs.readFileSync(
+        path.join(__dirname, 'assets', 'sitemap.xml'),
+        'utf8'
+      );
+    } catch {}
+  }
+
+  @Get()
+  @Version(VERSION_NEUTRAL)
+  public async flushCache(@Res() response: Response): Promise<void> {
+    response.setHeader('content-type', 'application/xml');
+    response.send(
+      interpolate(this.sitemapXml, {
+        currentDate: format(getYesterday(), DATE_FORMAT)
+      })
+    );
+  }
+}

apps/api/src/app/sitemap/sitemap.module.ts

@@ -0,0 +1,24 @@
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
+import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
+import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
+import { Module } from '@nestjs/common';
+
+import { SitemapController } from './sitemap.controller';
+
+@Module({
+  controllers: [SitemapController],
+  imports: [
+    ConfigurationModule,
+    DataGatheringModule,
+    DataProviderModule,
+    ExchangeRateDataModule,
+    PrismaModule,
+    RedisCacheModule,
+    SymbolProfileModule
+  ]
+})
+export class SitemapModule {}

apps/api/src/app/symbol/symbol.controller.ts

@@ -36,10 +36,12 @@ export class SymbolController {
   @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async lookupSymbol(
-    @Query() { query = '' }
+    @Query('includeIndices') includeIndices: boolean = false,
+    @Query('query') query = ''
   ): Promise<{ items: LookupItem[] }> {
     try {
       return this.symbolService.lookup({
+        includeIndices,
         query: query.toLowerCase(),
         user: this.request.user
       });

apps/api/src/app/symbol/symbol.service.ts

@@ -27,9 +27,9 @@ export class SymbolService {
     dataGatheringItem: IDataGatheringItem;
     includeHistoricalData?: number;
   }): Promise<SymbolItem> {
-    const quotes = await this.dataProviderService.getQuotes([
-      dataGatheringItem
-    ]);
+    const quotes = await this.dataProviderService.getQuotes({
+      items: [dataGatheringItem]
+    });
     const { currency, marketPrice } = quotes[dataGatheringItem.symbol] ?? {};
 
     if (dataGatheringItem.dataSource && marketPrice >= 0) {
@@ -81,9 +81,11 @@ export class SymbolService {
   }
 
   public async lookup({
+    includeIndices = false,
     query,
     user
   }: {
+    includeIndices?: boolean;
     query: string;
     user: UserWithSettings;
   }): Promise<{ items: LookupItem[] }> {
@@ -95,6 +97,7 @@ export class SymbolService {
 
     try {
       const { items } = await this.dataProviderService.search({
+        includeIndices,
         query,
         user
       });

apps/api/src/app/user/user.service.ts

@@ -14,6 +14,7 @@ import {
 import { UserWithSettings } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
 import { Prisma, Role, User } from '@prisma/client';
+import { differenceInDays } from 'date-fns';
 import { sortBy } from 'lodash';
 
 const crypto = require('crypto');
@@ -123,7 +124,7 @@ export class UserService {
       id,
       provider,
       role,
-      Settings,
+      Settings: Settings as UserWithSettings['Settings'],
       thirdPartyId,
       updatedAt,
       activityCount: Analytics?.activityCount
@@ -165,11 +166,26 @@ export class UserService {
       user.subscription =
         this.subscriptionService.getSubscription(Subscription);
 
-      if (
-        Analytics?.activityCount % 20 === 0 &&
-        user.subscription?.type === 'Basic'
-      ) {
-        currentPermissions.push(permissions.enableSubscriptionInterstitial);
+      if (user.subscription?.type === 'Basic') {
+        const daysSinceRegistration = differenceInDays(
+          new Date(),
+          user.createdAt
+        );
+        let frequency = 20;
+
+        if (daysSinceRegistration > 180) {
+          frequency = 3;
+        } else if (daysSinceRegistration > 60) {
+          frequency = 5;
+        } else if (daysSinceRegistration > 30) {
+          frequency = 10;
+        } else if (daysSinceRegistration > 15) {
+          frequency = 15;
+        }
+
+        if (Analytics?.activityCount % frequency === 1) {
+          currentPermissions.push(permissions.enableSubscriptionInterstitial);
+        }
       }
 
       if (user.subscription?.type === 'Premium') {

apps/api/src/assets/countries/asia-pacific-markets.json

@@ -0,0 +1 @@
+["AU", "HK", "NZ", "SG"]

apps/api/src/assets/countries/europe-markets.json

@@ -0,0 +1,19 @@
+[
+  "AT",
+  "BE",
+  "CH",
+  "DE",
+  "DK",
+  "ES",
+  "FI",
+  "FR",
+  "GB",
+  "IE",
+  "IL",
+  "IT",
+  "LU",
+  "NL",
+  "NO",
+  "PT",
+  "SE"
+]

apps/api/src/assets/sitemap.xml

@@ -0,0 +1,519 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset
+      xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.sitemaps.org/schemas/sitemap/0.9
+            http://www.sitemaps.org/schemas/sitemap/0.9/sitemap.xsd">
+  <url>
+    <loc>https://ghostfol.io/de</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/blog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/blog/2021/07/hallo-ghostfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/features</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/haeufig-gestellte-fragen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/maerkte</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/preise</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/registrierung</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ressourcen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ueber-uns</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ueber-uns/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ueber-uns/datenschutzbestimmungen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/de/ueber-uns/lizenz</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/about</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/about/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/about/license</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2021/07/hello-ghostfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/01/ghostfolio-first-months-in-open-source</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/07/ghostfolio-meets-internet-identity</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/07/how-do-i-get-my-finances-in-order</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/08/500-stars-on-github</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/10/hacktoberfest-2022</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/11/black-friday-2022</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2022/12/the-importance-of-tracking-your-personal-finances</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/02/ghostfolio-meets-umbrel</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/03/ghostfolio-reaches-1000-stars-on-github</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/05/unlock-your-financial-potential-with-ghostfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/blog/2023/07/exploring-the-path-to-fire</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/faq</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/features</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/markets</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/pricing</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/register</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-altoo</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-copilot-money</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-delta</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-divvydiary</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-exirio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-folishare</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-getquin</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-gospatz</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-justetf</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-kubera</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-markets.sh</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-maybe-finance</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-monse</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-parqet</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-plannix</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-portfolio-dividend-tracker</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-portseido</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-projectionlab</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-seeking-alpha</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-sharesight</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-simple-portfolio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-snowball-analytics</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-sumio</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-utluna</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/en/resources/personal-finance-tools/open-source-alternative-to-yeekatee</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/funcionalidades</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/mercados</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/precios</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/preguntas-mas-frecuentes</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/recursos</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/registro</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/sobre</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/sobre/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/sobre/licencia</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/es/sobre/politica-de-privacidad</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/a-propos</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/a-propos/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/a-propos/licence</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/a-propos/politique-de-confidentialite</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/enregistrement</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/fonctionnalites</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/foire-aux-questions</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/marches</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/prix</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/fr/ressources</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/domande-piu-frequenti</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/funzionalita</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/informazioni-su</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/informazioni-su/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/informazioni-su/licenza</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/informazioni-su/informativa-sulla-privacy</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/iscrizione</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/mercati</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/prezzi</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/it/risorse</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/bronnen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/kenmerken</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/markten</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/open</loc>
+    <changefreq>daily</changefreq>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/over</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/over/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/over/licentie</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/over/privacybeleid</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/prijzen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/registratie</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/nl/vaak-gestelde-vragen</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/blog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/funcionalidades</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/mercados</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/open</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/perguntas-mais-frequentes</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/precos</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/recursos</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/registo</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/sobre</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/sobre/changelog</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/sobre/licenca</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+  <url>
+    <loc>https://ghostfol.io/pt/sobre/politica-de-privacidade</loc>
+    <lastmod>${currentDate}T00:00:00+00:00</lastmod>
+  </url>
+</urlset>

apps/api/src/main.ts

@@ -1,7 +1,9 @@
 import { Logger, ValidationPipe, VersioningType } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { NestFactory } from '@nestjs/core';
+import type { NestExpressApplication } from '@nestjs/platform-express';
 import * as bodyParser from 'body-parser';
+import helmet from 'helmet';
 
 import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
@@ -10,17 +12,18 @@ async function bootstrap() {
   const configApp = await NestFactory.create(AppModule);
   const configService = configApp.get<ConfigService>(ConfigService);
 
-  const app = await NestFactory.create(AppModule, {
+  const app = await NestFactory.create<NestExpressApplication>(AppModule, {
     logger: environment.production
       ? ['error', 'log', 'warn']
       : ['debug', 'error', 'log', 'verbose', 'warn']
   });
+
   app.enableCors();
   app.enableVersioning({
     defaultVersion: '1',
     type: VersioningType.URI
   });
-  app.setGlobalPrefix('api');
+  app.setGlobalPrefix('api', { exclude: ['sitemap.xml'] });
   app.useGlobalPipes(
     new ValidationPipe({
       forbidNonWhitelisted: true,
@@ -32,6 +35,23 @@ async function bootstrap() {
   // Support 10mb csv/json files for importing activities
   app.use(bodyParser.json({ limit: '10mb' }));
 
+  if (configService.get<string>('ENABLE_FEATURE_SUBSCRIPTION') === 'true') {
+    app.use(
+      helmet({
+        contentSecurityPolicy: {
+          directives: {
+            connectSrc: ["'self'", 'https://js.stripe.com'], // Allow connections to Stripe
+            frameSrc: ["'self'", 'https://js.stripe.com'], // Allow loading frames from Stripe
+            scriptSrc: ["'self'", "'unsafe-inline'", 'https://js.stripe.com'], // Allow inline scripts and scripts from Stripe
+            scriptSrcAttr: ["'self'", "'unsafe-inline'"], // Allow inline event handlers
+            styleSrc: ["'self'", "'unsafe-inline'"] // Allow inline styles
+          }
+        },
+        crossOriginOpenerPolicy: false // Disable Cross-Origin-Opener-Policy header (for Internet Identity)
+      })
+    );
+  }
+
   const BASE_CURRENCY = configService.get<string>('BASE_CURRENCY');
   const HOST = configService.get<string>('HOST') || '0.0.0.0';
   const PORT = configService.get<number>('PORT') || 3333;

apps/api/src/services/account-balance/account-balance.module.ts

@@ -0,0 +1,10 @@
+import { AccountBalanceService } from '@ghostfolio/api/services/account-balance/account-balance.service';
+import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
+import { Module } from '@nestjs/common';
+
+@Module({
+  exports: [AccountBalanceService],
+  imports: [PrismaModule],
+  providers: [AccountBalanceService]
+})
+export class AccountBalanceModule {}

apps/api/src/services/account-balance/account-balance.service.ts

@@ -0,0 +1,16 @@
+import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
+import { Injectable } from '@nestjs/common';
+import { AccountBalance, Prisma } from '@prisma/client';
+
+@Injectable()
+export class AccountBalanceService {
+  public constructor(private readonly prismaService: PrismaService) {}
+
+  public async createAccountBalance(
+    data: Prisma.AccountBalanceCreateInput
+  ): Promise<AccountBalance> {
+    return this.prismaService.accountBalance.create({
+      data
+    });
+  }
+}

apps/api/src/services/configuration/configuration.service.ts

@@ -16,6 +16,7 @@ export class ConfigurationService {
         default: 'USD'
       }),
       BETTER_UPTIME_API_KEY: str({ default: '' }),
+      CACHE_QUOTES_TTL: num({ default: 1 }),
       CACHE_TTL: num({ default: 1 }),
       DATA_SOURCE_EXCHANGE_RATES: str({ default: DataSource.YAHOO }),
       DATA_SOURCE_IMPORT: str({ default: DataSource.YAHOO }),

apps/api/src/services/cron.service.ts

@@ -2,6 +2,7 @@ import {
   GATHER_ASSET_PROFILE_PROCESS,
   GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
+import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import { Injectable } from '@nestjs/common';
 import { Cron, CronExpression } from '@nestjs/schedule';
 
@@ -48,7 +49,7 @@ export class CronService {
           name: GATHER_ASSET_PROFILE_PROCESS,
           opts: {
             ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: `${dataSource}-${symbol}`
+            jobId: getAssetProfileIdentifier({ dataSource, symbol })
           }
         };
       })

apps/api/src/services/data-gathering/data-gathering.module.ts

@@ -5,6 +5,7 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
+import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
 import { DATA_GATHERING_QUEUE } from '@ghostfolio/common/config';
 import { BullModule } from '@nestjs/bull';
@@ -28,6 +29,7 @@ import { DataGatheringProcessor } from './data-gathering.processor';
     ExchangeRateDataModule,
     MarketDataModule,
     PrismaModule,
+    PropertyModule,
     SymbolProfileModule
   ],
   providers: [DataGatheringProcessor, DataGatheringService],

apps/api/src/services/data-gathering/data-gathering.service.ts

@@ -4,14 +4,20 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
+import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
   DATA_GATHERING_QUEUE,
   GATHER_HISTORICAL_MARKET_DATA_PROCESS,
-  GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS
+  GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS,
+  PROPERTY_BENCHMARKS
 } from '@ghostfolio/common/config';
-import { DATE_FORMAT, resetHours } from '@ghostfolio/common/helper';
-import { UniqueAsset } from '@ghostfolio/common/interfaces';
+import {
+  DATE_FORMAT,
+  getAssetProfileIdentifier,
+  resetHours
+} from '@ghostfolio/common/helper';
+import { BenchmarkProperty, UniqueAsset } from '@ghostfolio/common/interfaces';
 import { InjectQueue } from '@nestjs/bull';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
@@ -30,6 +36,7 @@ export class DataGatheringService {
     private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly marketDataService: MarketDataService,
     private readonly prismaService: PrismaService,
+    private readonly propertyService: PropertyService,
     private readonly symbolProfileService: SymbolProfileService
   ) {}
 
@@ -221,7 +228,10 @@ export class DataGatheringService {
           name: GATHER_HISTORICAL_MARKET_DATA_PROCESS,
           opts: {
             ...GATHER_HISTORICAL_MARKET_DATA_PROCESS_OPTIONS,
-            jobId: `${dataSource}-${symbol}-${format(date, DATE_FORMAT)}`
+            jobId: `${getAssetProfileIdentifier({
+              dataSource,
+              symbol
+            })}-${format(date, DATE_FORMAT)}`
           }
         };
       })
@@ -248,6 +258,10 @@ export class DataGatheringService {
       });
   }
 
+  private getEarliestDate(aStartDate: Date) {
+    return min([aStartDate, subYears(new Date(), 10)]);
+  }
+
   private async getSymbols7D(): Promise<IDataGatheringItem[]> {
     const startDate = subDays(resetHours(new Date()), 7);
 
@@ -314,6 +328,14 @@ export class DataGatheringService {
   }
 
   private async getSymbolsMax(): Promise<IDataGatheringItem[]> {
+    const benchmarkAssetProfileIdMap: { [key: string]: boolean } = {};
+    (
+      ((await this.propertyService.getByKey(
+        PROPERTY_BENCHMARKS
+      )) as BenchmarkProperty[]) ?? []
+    ).forEach(({ symbolProfileId }) => {
+      benchmarkAssetProfileIdMap[symbolProfileId] = true;
+    });
     const startDate =
       (
         await this.prismaService.order.findFirst({
@@ -327,7 +349,7 @@ export class DataGatheringService {
         return {
           dataSource,
           symbol,
-          date: min([startDate, subYears(new Date(), 10)])
+          date: this.getEarliestDate(startDate)
         };
       });
 
@@ -336,6 +358,7 @@ export class DataGatheringService {
         orderBy: [{ symbol: 'asc' }],
         select: {
           dataSource: true,
+          id: true,
           Order: {
             orderBy: [{ date: 'asc' }],
             select: { date: true },
@@ -357,9 +380,15 @@ export class DataGatheringService {
         );
       })
       .map((symbolProfile) => {
+        let date = symbolProfile.Order?.[0]?.date ?? startDate;
+
+        if (benchmarkAssetProfileIdMap[symbolProfile.id]) {
+          date = this.getEarliestDate(startDate);
+        }
+
         return {
           ...symbolProfile,
-          date: symbolProfile.Order?.[0]?.date ?? startDate
+          date
         };
       });
 

apps/api/src/services/data-provider/alpha-vantage/alpha-vantage.service.ts

@@ -114,8 +114,14 @@ export class AlphaVantageService implements DataProviderInterface {
     return undefined;
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
-    const result = await this.alphaVantage.data.search(aQuery);
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
+    const result = await this.alphaVantage.data.search(query);
 
     return {
       items: result?.bestMatches?.map((bestMatch) => {

apps/api/src/services/data-provider/coingecko/coingecko.service.ts

@@ -15,8 +15,8 @@ import {
   DataSource,
   SymbolProfile
 } from '@prisma/client';
-import bent from 'bent';
 import { format, fromUnixTime, getUnixTime } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class CoinGeckoService implements DataProviderInterface {
@@ -45,8 +45,7 @@ export class CoinGeckoService implements DataProviderInterface {
     };
 
     try {
-      const get = bent(`${this.URL}/coins/${aSymbol}`, 'GET', 'json', 200);
-      const { name } = await get();
+      const { name } = await got(`${this.URL}/coins/${aSymbol}`).json<any>();
 
       response.name = name;
     } catch (error) {
@@ -79,17 +78,13 @@ export class CoinGeckoService implements DataProviderInterface {
     [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
   }> {
     try {
-      const get = bent(
+      const { prices } = await got(
         `${
           this.URL
         }/coins/${aSymbol}/market_chart/range?vs_currency=${this.baseCurrency.toLowerCase()}&from=${getUnixTime(
           from
-        )}&to=${getUnixTime(to)}`,
-        'GET',
-        'json',
-        200
-      );
-      const { prices } = await get();
+        )}&to=${getUnixTime(to)}`
+      ).json<any>();
 
       const result: {
         [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
@@ -132,15 +127,11 @@ export class CoinGeckoService implements DataProviderInterface {
     }
 
     try {
-      const get = bent(
+      const response = await got(
         `${this.URL}/simple/price?ids=${aSymbols.join(
           ','
-        )}&vs_currencies=${this.baseCurrency.toLowerCase()}`,
-        'GET',
-        'json',
-        200
-      );
-      const response = await get();
+        )}&vs_currencies=${this.baseCurrency.toLowerCase()}`
+      ).json<any>();
 
       for (const symbol in response) {
         if (Object.prototype.hasOwnProperty.call(response, symbol)) {
@@ -164,17 +155,19 @@ export class CoinGeckoService implements DataProviderInterface {
     return 'bitcoin';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     let items: LookupItem[] = [];
 
     try {
-      const get = bent(
-        `${this.URL}/search?query=${aQuery}`,
-        'GET',
-        'json',
-        200
-      );
-      const { coins } = await get();
+      const { coins } = await got(
+        `${this.URL}/search?query=${query}`
+      ).json<any>();
 
       items = coins.map(({ id: symbol, name }) => {
         return {

apps/api/src/services/data-provider/data-enhancer/trackinsight/trackinsight.service.ts

@@ -3,9 +3,7 @@ import { Country } from '@ghostfolio/common/interfaces/country.interface';
 import { Sector } from '@ghostfolio/common/interfaces/sector.interface';
 import { Injectable } from '@nestjs/common';
 import { SymbolProfile } from '@prisma/client';
-import bent from 'bent';
-
-const getJSON = bent('json');
+import got from 'got';
 
 @Injectable()
 export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
@@ -34,11 +32,13 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
       return response;
     }
 
-    const profile = await getJSON(
+    const profile = await got(
       `${TrackinsightDataEnhancerService.baseUrl}/data-api/funds/${symbol}.json`
-    ).catch(() => {
-      return {};
-    });
+    )
+      .json<any>()
+      .catch(() => {
+        return {};
+      });
 
     const isin = profile.isin?.split(';')?.[0];
 
@@ -46,15 +46,17 @@ export class TrackinsightDataEnhancerService implements DataEnhancerInterface {
       response.isin = isin;
     }
 
-    const holdings = await getJSON(
+    const holdings = await got(
       `${TrackinsightDataEnhancerService.baseUrl}/holdings/${symbol}.json`
-    ).catch(() => {
-      return getJSON(
-        `${TrackinsightDataEnhancerService.baseUrl}/holdings/${
-          symbol.split('.')?.[0]
-        }.json`
-      );
-    });
+    )
+      .json<any>()
+      .catch(() => {
+        return got(
+          `${TrackinsightDataEnhancerService.baseUrl}/holdings/${
+            symbol.split('.')?.[0]
+          }.json`
+        );
+      });
 
     if (holdings?.weight < 0.95) {
       // Skip if data is inaccurate

apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts

@@ -135,6 +135,8 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
     let name = longName;
 
     if (name) {
+      name = name.replace('&', '&');
+
       name = name.replace('Amundi Index Solutions - ', '');
       name = name.replace('iShares ETF (CH) - ', '');
       name = name.replace('iShares III Public Limited Company - ', '');

apps/api/src/services/data-provider/data-provider.module.ts

@@ -1,3 +1,4 @@
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { CryptocurrencyModule } from '@ghostfolio/api/services/cryptocurrency/cryptocurrency.module';
 import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
@@ -26,6 +27,7 @@ import { DataProviderService } from './data-provider.service';
     MarketDataModule,
     PrismaModule,
     PropertyModule,
+    RedisCacheModule,
     SymbolProfileModule
   ],
   providers: [

apps/api/src/services/data-provider/data-provider.service.ts

@@ -1,8 +1,8 @@
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
 import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DataProviderInterface } from '@ghostfolio/api/services/data-provider/interfaces/data-provider.interface';
 import {
-  IDataGatheringItem,
   IDataProviderHistoricalResponse,
   IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
@@ -11,6 +11,7 @@ import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { PROPERTY_DATA_SOURCE_MAPPING } from '@ghostfolio/common/config';
 import { DATE_FORMAT, getStartOfUtcDate } from '@ghostfolio/common/helper';
+import { UniqueAsset } from '@ghostfolio/common/interfaces';
 import type { Granularity, UserWithSettings } from '@ghostfolio/common/types';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { DataSource, MarketData, SymbolProfile } from '@prisma/client';
@@ -27,7 +28,8 @@ export class DataProviderService {
     private readonly dataProviderInterfaces: DataProviderInterface[],
     private readonly marketDataService: MarketDataService,
     private readonly prismaService: PrismaService,
-    private readonly propertyService: PropertyService
+    private readonly propertyService: PropertyService,
+    private readonly redisCacheService: RedisCacheService
   ) {
     this.initialize();
   }
@@ -43,12 +45,15 @@ export class DataProviderService {
     const dataProvider = this.getDataProvider(dataSource);
     const symbol = dataProvider.getTestSymbol();
 
-    const quotes = await this.getQuotes([
-      {
-        dataSource,
-        symbol
-      }
-    ]);
+    const quotes = await this.getQuotes({
+      items: [
+        {
+          dataSource,
+          symbol
+        }
+      ],
+      useCache: false
+    });
 
     if (quotes[symbol]?.marketPrice > 0) {
       return true;
@@ -57,14 +62,16 @@ export class DataProviderService {
     return false;
   }
 
-  public async getAssetProfiles(items: IDataGatheringItem[]): Promise<{
+  public async getAssetProfiles(items: UniqueAsset[]): Promise<{
     [symbol: string]: Partial<SymbolProfile>;
   }> {
     const response: {
       [symbol: string]: Partial<SymbolProfile>;
     } = {};
 
-    const itemsGroupedByDataSource = groupBy(items, (item) => item.dataSource);
+    const itemsGroupedByDataSource = groupBy(items, ({ dataSource }) => {
+      return dataSource;
+    });
 
     const promises = [];
 
@@ -125,7 +132,7 @@ export class DataProviderService {
   }
 
   public async getHistorical(
-    aItems: IDataGatheringItem[],
+    aItems: UniqueAsset[],
     aGranularity: Granularity = 'month',
     from: Date,
     to: Date
@@ -153,11 +160,11 @@ export class DataProviderService {
           )}'`
         : '';
 
-    const dataSources = aItems.map((item) => {
-      return item.dataSource;
+    const dataSources = aItems.map(({ dataSource }) => {
+      return dataSource;
     });
-    const symbols = aItems.map((item) => {
-      return item.symbol;
+    const symbols = aItems.map(({ symbol }) => {
+      return symbol;
     });
 
     try {
@@ -190,7 +197,7 @@ export class DataProviderService {
   }
 
   public async getHistoricalRaw(
-    aDataGatheringItems: IDataGatheringItem[],
+    aDataGatheringItems: UniqueAsset[],
     from: Date,
     to: Date
   ): Promise<{
@@ -227,7 +234,13 @@ export class DataProviderService {
     return result;
   }
 
-  public async getQuotes(items: IDataGatheringItem[]): Promise<{
+  public async getQuotes({
+    items,
+    useCache = true
+  }: {
+    items: UniqueAsset[];
+    useCache?: boolean;
+  }): Promise<{
     [symbol: string]: IDataProviderResponse;
   }> {
     const response: {
@@ -235,9 +248,44 @@ export class DataProviderService {
     } = {};
     const startTimeTotal = performance.now();
 
-    const itemsGroupedByDataSource = groupBy(items, (item) => item.dataSource);
+    // Get items from cache
+    const itemsToFetch: UniqueAsset[] = [];
 
-    const promises = [];
+    for (const { dataSource, symbol } of items) {
+      if (useCache) {
+        const quoteString = await this.redisCacheService.get(
+          this.redisCacheService.getQuoteKey({ dataSource, symbol })
+        );
+
+        if (quoteString) {
+          try {
+            const cachedDataProviderResponse = JSON.parse(quoteString);
+            response[symbol] = cachedDataProviderResponse;
+            continue;
+          } catch {}
+        }
+      }
+
+      itemsToFetch.push({ dataSource, symbol });
+    }
+
+    const numberOfItemsInCache = Object.keys(response)?.length;
+
+    if (numberOfItemsInCache) {
+      Logger.debug(
+        `Fetched ${numberOfItemsInCache} quote${
+          numberOfItemsInCache > 1 ? 's' : ''
+        } from cache in ${((performance.now() - startTimeTotal) / 1000).toFixed(
+          3
+        )} seconds`
+      );
+    }
+
+    const itemsGroupedByDataSource = groupBy(itemsToFetch, ({ dataSource }) => {
+      return dataSource;
+    });
+
+    const promises: Promise<any>[] = [];
 
     for (const [dataSource, dataGatheringItems] of Object.entries(
       itemsGroupedByDataSource
@@ -271,6 +319,15 @@ export class DataProviderService {
               result
             )) {
               response[symbol] = dataProviderResponse;
+
+              this.redisCacheService.set(
+                this.redisCacheService.getQuoteKey({
+                  dataSource: DataSource[dataSource],
+                  symbol
+                }),
+                JSON.stringify(dataProviderResponse),
+                this.configurationService.get('CACHE_QUOTES_TTL')
+              );
             }
 
             Logger.debug(
@@ -283,7 +340,7 @@ export class DataProviderService {
             );
 
             try {
-              await this.marketDataService.updateMany({
+              this.marketDataService.updateMany({
                 data: Object.keys(response)
                   .filter((symbol) => {
                     return (
@@ -322,9 +379,11 @@ export class DataProviderService {
   }
 
   public async search({
+    includeIndices = false,
     query,
     user
   }: {
+    includeIndices?: boolean;
     query: string;
     user: UserWithSettings;
   }): Promise<{ items: LookupItem[] }> {
@@ -347,7 +406,12 @@ export class DataProviderService {
     }
 
     for (const dataSource of dataSources) {
-      promises.push(this.getDataProvider(DataSource[dataSource]).search(query));
+      promises.push(
+        this.getDataProvider(DataSource[dataSource]).search({
+          includeIndices,
+          query
+        })
+      );
     }
 
     const searchResults = await Promise.all(promises);

apps/api/src/services/data-provider/eod-historical-data/eod-historical-data.service.ts

@@ -5,6 +5,7 @@ import {
   IDataProviderHistoricalResponse,
   IDataProviderResponse
 } from '@ghostfolio/api/services/interfaces/interfaces';
+import { DEFAULT_REQUEST_TIMEOUT } from '@ghostfolio/common/config';
 import { DATE_FORMAT, isCurrency } from '@ghostfolio/common/helper';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
@@ -14,9 +15,10 @@ import {
   DataSource,
   SymbolProfile
 } from '@prisma/client';
-import bent from 'bent';
 import Big from 'big.js';
 import { format, isToday } from 'date-fns';
+import got from 'got';
+import ms from 'ms';
 
 @Injectable()
 export class EodHistoricalDataService implements DataProviderInterface {
@@ -76,19 +78,19 @@ export class EodHistoricalDataService implements DataProviderInterface {
     const symbol = this.convertToEodSymbol(aSymbol);
 
     try {
-      const get = bent(
+      const response = await got(
         `${this.URL}/eod/${symbol}?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();
+        {
+          timeout: {
+            request: DEFAULT_REQUEST_TIMEOUT
+          }
+        }
+      ).json<any>();
 
       return response.reduce(
         (result, historicalItem, index, array) => {
@@ -136,16 +138,16 @@ export class EodHistoricalDataService implements DataProviderInterface {
     }
 
     try {
-      const get = bent(
+      const realTimeResponse = await got(
         `${this.URL}/real-time/${symbols[0]}?api_token=${
           this.apiKey
         }&fmt=json&s=${symbols.join(',')}`,
-        'GET',
-        'json',
-        200
-      );
-
-      const realTimeResponse = await get();
+        {
+          timeout: {
+            request: DEFAULT_REQUEST_TIMEOUT
+          }
+        }
+      ).json<any>();
 
       const quotes =
         symbols.length === 1 ? [realTimeResponse] : realTimeResponse;
@@ -156,7 +158,7 @@ export class EodHistoricalDataService implements DataProviderInterface {
             return !symbol.endsWith('.FOREX');
           })
           .map((symbol) => {
-            return this.search(symbol);
+            return this.search({ query: symbol });
           })
       );
 
@@ -219,8 +221,14 @@ export class EodHistoricalDataService implements DataProviderInterface {
     return 'AAPL.US';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
-    const searchResult = await this.getSearchResult(aQuery);
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
+    const searchResult = await this.getSearchResult(query);
 
     return {
       items: searchResult
@@ -323,13 +331,14 @@ export class EodHistoricalDataService implements DataProviderInterface {
     let searchResult = [];
 
     try {
-      const get = bent(
+      const response = await got(
         `${this.URL}/search/${aQuery}?api_token=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const response = await get();
+        {
+          timeout: {
+            request: DEFAULT_REQUEST_TIMEOUT
+          }
+        }
+      ).json<any>();
 
       searchResult = response.map(
         ({ Code, Currency, Exchange, ISIN: isin, Name: name, Type }) => {

apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts

@@ -10,8 +10,8 @@ import { DataProviderInfo } from '@ghostfolio/common/interfaces';
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import bent from 'bent';
 import { format, isAfter, isBefore, isSameDay } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class FinancialModelingPrepService implements DataProviderInterface {
@@ -64,13 +64,9 @@ export class FinancialModelingPrepService implements DataProviderInterface {
     [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
   }> {
     try {
-      const get = bent(
-        `${this.URL}/historical-price-full/${aSymbol}?apikey=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const { historical } = await get();
+      const { historical } = await got(
+        `${this.URL}/historical-price-full/${aSymbol}?apikey=${this.apiKey}`
+      ).json<any>();
 
       const result: {
         [symbol: string]: { [date: string]: IDataProviderHistoricalResponse };
@@ -115,13 +111,9 @@ export class FinancialModelingPrepService implements DataProviderInterface {
     }
 
     try {
-      const get = bent(
-        `${this.URL}/quote/${aSymbols.join(',')}?apikey=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const response = await get();
+      const response = await got(
+        `${this.URL}/quote/${aSymbols.join(',')}?apikey=${this.apiKey}`
+      ).json<any>();
 
       for (const { price, symbol } of response) {
         results[symbol] = {
@@ -143,17 +135,19 @@ export class FinancialModelingPrepService implements DataProviderInterface {
     return 'AAPL';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     let items: LookupItem[] = [];
 
     try {
-      const get = bent(
-        `${this.URL}/search?query=${aQuery}&apikey=${this.apiKey}`,
-        'GET',
-        'json',
-        200
-      );
-      const result = await get();
+      const result = await got(
+        `${this.URL}/search?query=${query}&apikey=${this.apiKey}`
+      ).json<any>();
 
       items = result.map(({ currency, name, symbol }) => {
         return {

apps/api/src/services/data-provider/google-sheets/google-sheets.service.ts

@@ -153,7 +153,13 @@ export class GoogleSheetsService implements DataProviderInterface {
     return 'INDEXSP:.INX';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     const items = await this.prismaService.symbolProfile.findMany({
       select: {
         assetClass: true,
@@ -169,14 +175,14 @@ export class GoogleSheetsService implements DataProviderInterface {
             dataSource: this.getName(),
             name: {
               mode: 'insensitive',
-              startsWith: aQuery
+              startsWith: query
             }
           },
           {
             dataSource: this.getName(),
             symbol: {
               mode: 'insensitive',
-              startsWith: aQuery
+              startsWith: query
             }
           }
         ]

apps/api/src/services/data-provider/interfaces/data-provider.interface.ts

@@ -42,5 +42,11 @@ export interface DataProviderInterface {
 
   getTestSymbol(): string;
 
-  search(aQuery: string): Promise<{ items: LookupItem[] }>;
+  search({
+    includeIndices,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }>;
 }

apps/api/src/services/data-provider/manual/manual.service.ts

@@ -14,10 +14,10 @@ import {
 import { Granularity } from '@ghostfolio/common/types';
 import { Injectable, Logger } from '@nestjs/common';
 import { DataSource, SymbolProfile } from '@prisma/client';
-import bent from 'bent';
 import * as cheerio from 'cheerio';
 import { isUUID } from 'class-validator';
 import { addDays, format, isBefore } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class ManualService implements DataProviderInterface {
@@ -67,8 +67,12 @@ export class ManualService implements DataProviderInterface {
       const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles(
         [{ symbol, dataSource: this.getName() }]
       );
-      const { defaultMarketPrice, selector, url } =
-        symbolProfile.scraperConfiguration ?? {};
+      const {
+        defaultMarketPrice,
+        headers = {},
+        selector,
+        url
+      } = symbolProfile.scraperConfiguration ?? {};
 
       if (defaultMarketPrice) {
         const historical: {
@@ -91,10 +95,9 @@ export class ManualService implements DataProviderInterface {
         return {};
       }
 
-      const get = bent(url, 'GET', 'string', 200, {});
+      const { body } = await got(url, { headers });
 
-      const html = await get();
-      const $ = cheerio.load(html);
+      const $ = cheerio.load(body);
 
       const value = extractNumberFromString($(selector).text());
 
@@ -171,7 +174,13 @@ export class ManualService implements DataProviderInterface {
     return undefined;
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     let items = await this.prismaService.symbolProfile.findMany({
       select: {
         assetClass: true,
@@ -187,14 +196,14 @@ export class ManualService implements DataProviderInterface {
             dataSource: this.getName(),
             name: {
               mode: 'insensitive',
-              startsWith: aQuery
+              startsWith: query
             }
           },
           {
             dataSource: this.getName(),
             symbol: {
               mode: 'insensitive',
-              startsWith: aQuery
+              startsWith: query
             }
           }
         ]

apps/api/src/services/data-provider/rapid-api/rapid-api.service.ts

@@ -10,8 +10,8 @@ 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 bent from 'bent';
 import { format } from 'date-fns';
+import got from 'got';
 
 @Injectable()
 export class RapidApiService implements DataProviderInterface {
@@ -117,7 +117,13 @@ export class RapidApiService implements DataProviderInterface {
     return undefined;
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     return { items: [] };
   }
 
@@ -129,19 +135,17 @@ export class RapidApiService implements DataProviderInterface {
     oneYearAgo: { value: number; valueText: string };
   }> {
     try {
-      const get = bent(
+      const { fgi } = await got(
         `https://fear-and-greed-index.p.rapidapi.com/v1/fgi`,
-        'GET',
-        'json',
-        200,
         {
-          useQueryString: true,
-          'x-rapidapi-host': 'fear-and-greed-index.p.rapidapi.com',
-          'x-rapidapi-key': this.configurationService.get('RAPID_API_API_KEY')
+          headers: {
+            useQueryString: 'true',
+            'x-rapidapi-host': 'fear-and-greed-index.p.rapidapi.com',
+            'x-rapidapi-key': this.configurationService.get('RAPID_API_API_KEY')
+          }
         }
-      );
+      ).json<any>();
 
-      const { fgi } = await get();
       return fgi;
     } catch (error) {
       Logger.error(error, 'RapidApiService');

apps/api/src/services/data-provider/yahoo-finance/yahoo-finance.service.ts

@@ -275,11 +275,23 @@ export class YahooFinanceService implements DataProviderInterface {
     return 'AAPL';
   }
 
-  public async search(aQuery: string): Promise<{ items: LookupItem[] }> {
+  public async search({
+    includeIndices = false,
+    query
+  }: {
+    includeIndices?: boolean;
+    query: string;
+  }): Promise<{ items: LookupItem[] }> {
     const items: LookupItem[] = [];
 
     try {
-      const searchResult = await yahooFinance.search(aQuery);
+      const quoteTypes = ['EQUITY', 'ETF', 'FUTURE', 'MUTUALFUND'];
+
+      if (includeIndices) {
+        quoteTypes.push('INDEX');
+      }
+
+      const searchResult = await yahooFinance.search(query);
 
       const quotes = searchResult.quotes
         .filter((quote) => {
@@ -295,7 +307,7 @@ export class YahooFinanceService implements DataProviderInterface {
                   this.baseCurrency
                 )
               )) ||
-            ['EQUITY', 'ETF', 'FUTURE', 'MUTUALFUND'].includes(quoteType)
+            quoteTypes.includes(quoteType)
           );
         })
         .filter(({ quoteType, symbol }) => {

apps/api/src/services/exchange-rate-data/exchange-rate-data.service.ts

@@ -33,6 +33,15 @@ export class ExchangeRateDataService {
     return this.currencyPairs;
   }
 
+  public hasCurrencyPair(currency1: string, currency2: string) {
+    return this.currencyPairs.some(({ symbol }) => {
+      return (
+        symbol === `${currency1}${currency2}` ||
+        symbol === `${currency2}${currency1}`
+      );
+    });
+  }
+
   public async initialize() {
     this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
     this.currencies = await this.prepareCurrencies();
@@ -64,11 +73,11 @@ export class ExchangeRateDataService {
     if (Object.keys(result).length !== this.currencyPairs.length) {
       // Load currencies directly from data provider as a fallback
       // if historical data is not fully available
-      const quotes = await this.dataProviderService.getQuotes(
-        this.currencyPairs.map(({ dataSource, symbol }) => {
+      const quotes = await this.dataProviderService.getQuotes({
+        items: this.currencyPairs.map(({ dataSource, symbol }) => {
           return { dataSource, symbol };
         })
-      );
+      });
 
       for (const symbol of Object.keys(quotes)) {
         if (isNumber(quotes[symbol].marketPrice)) {
@@ -125,9 +134,11 @@ export class ExchangeRateDataService {
       return 0;
     }
 
-    let factor = 1;
+    let factor: number;
 
-    if (aFromCurrency !== aToCurrency) {
+    if (aFromCurrency === aToCurrency) {
+      factor = 1;
+    } else {
       if (this.exchangeRates[`${aFromCurrency}${aToCurrency}`]) {
         factor = this.exchangeRates[`${aFromCurrency}${aToCurrency}`];
       } else {
@@ -171,7 +182,9 @@ export class ExchangeRateDataService {
 
     let factor: number;
 
-    if (aFromCurrency !== aToCurrency) {
+    if (aFromCurrency === aToCurrency) {
+      factor = 1;
+    } else {
       const dataSource =
         this.dataProviderService.getDataSourceForExchangeRates();
       const symbol = `${aFromCurrency}${aToCurrency}`;

apps/api/src/services/interfaces/environment.interface.ts

@@ -5,6 +5,7 @@ export interface Environment extends CleanedEnvAccessors {
   ALPHA_VANTAGE_API_KEY: string;
   BASE_CURRENCY: string;
   BETTER_UPTIME_API_KEY: string;
+  CACHE_QUOTES_TTL: number;
   CACHE_TTL: number;
   DATA_SOURCE_EXCHANGE_RATES: string;
   DATA_SOURCE_IMPORT: string;

apps/api/src/services/symbol-profile/symbol-profile.service.ts

@@ -15,6 +15,12 @@ import { continents, countries } from 'countries-list';
 export class SymbolProfileService {
   public constructor(private readonly prismaService: PrismaService) {}
 
+  public async add(
+    assetProfile: Prisma.SymbolProfileCreateInput
+  ): Promise<SymbolProfile | never> {
+    return this.prismaService.symbolProfile.create({ data: assetProfile });
+  }
+
   public async delete({ dataSource, symbol }: UniqueAsset) {
     return this.prismaService.symbolProfile.delete({
       where: { dataSource_symbol: { dataSource, symbol } }
@@ -90,11 +96,12 @@ export class SymbolProfileService {
   public updateSymbolProfile({
     comment,
     dataSource,
+    scraperConfiguration,
     symbol,
     symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
     return this.prismaService.symbolProfile.update({
-      data: { comment, symbolMapping },
+      data: { comment, scraperConfiguration, symbolMapping },
       where: { dataSource_symbol: { dataSource, symbol } }
     });
   }
@@ -189,6 +196,8 @@ export class SymbolProfileService {
     if (scraperConfiguration) {
       return {
         defaultMarketPrice: scraperConfiguration.defaultMarketPrice as number,
+        headers:
+          scraperConfiguration.headers as ScraperConfiguration['headers'],
         selector: scraperConfiguration.selector as string,
         url: scraperConfiguration.url as string
       };

apps/api/tsconfig.app.json

@@ -4,7 +4,7 @@
     "outDir": "../../dist/out-tsc",
     "types": ["node"],
     "emitDecoratorMetadata": true,
-    "target": "es2015"
+    "target": "es2021"
   },
   "exclude": ["**/*.spec.ts", "**/*.test.ts", "jest.config.ts"],
   "include": ["**/*.ts"]

apps/client/project.json

@@ -11,60 +11,15 @@
   "prefix": "gf",
   "targets": {
     "build": {
-      "executor": "@angular-devkit/build-angular:browser",
+      "executor": "@nx/angular:webpack-browser",
       "options": {
+        "localize": true,
         "outputPath": "dist/apps/client",
         "index": "apps/client/src/index.html",
         "main": "apps/client/src/main.ts",
         "polyfills": "apps/client/src/polyfills.ts",
         "tsConfig": "apps/client/tsconfig.app.json",
-        "assets": [
-          {
-            "glob": "assetlinks.json",
-            "input": "apps/client/src/assets",
-            "output": "./../.well-known"
-          },
-          {
-            "glob": "CHANGELOG.md",
-            "input": "",
-            "output": "./../assets"
-          },
-          {
-            "glob": "LICENSE",
-            "input": "",
-            "output": "./../assets"
-          },
-          {
-            "glob": "robots.txt",
-            "input": "apps/client/src/assets",
-            "output": "./../"
-          },
-          {
-            "glob": "sitemap.xml",
-            "input": "apps/client/src/assets",
-            "output": "./../"
-          },
-          {
-            "glob": "site.webmanifest",
-            "input": "apps/client/src/assets",
-            "output": "./../"
-          },
-          {
-            "glob": "**/*",
-            "input": "node_modules/ionicons/dist/ionicons",
-            "output": "./../ionicons"
-          },
-          {
-            "glob": "**/*.js",
-            "input": "node_modules/ionicons/dist/",
-            "output": "./../"
-          },
-          {
-            "glob": "**/*",
-            "input": "apps/client/src/assets",
-            "output": "./../assets/"
-          }
-        ],
+        "assets": [],
         "styles": [
           "apps/client/src/styles/theme.scss",
           "apps/client/src/styles.scss"
@@ -139,8 +94,51 @@
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": ""
     },
+    "copy-assets": {
+      "executor": "nx:run-commands",
+      "options": {
+        "commands": [
+          {
+            "command": "mkdir -p dist/apps/client"
+          },
+          {
+            "command": "cp -r apps/client/src/assets dist/apps/client"
+          },
+          {
+            "command": "cp -r apps/client/src/assets/.well-known dist/apps/client"
+          },
+          {
+            "command": "cp apps/client/src/assets/favicon.ico dist/apps/client"
+          },
+          {
+            "command": "cp apps/client/src/assets/index.html dist/apps/client"
+          },
+          {
+            "command": "cp apps/client/src/assets/robots.txt dist/apps/client"
+          },
+          {
+            "command": "cp apps/client/src/assets/site.webmanifest dist/apps/client"
+          },
+          {
+            "command": "cp node_modules/ionicons/dist/index.js dist/apps/client"
+          },
+          {
+            "command": "cp node_modules/ionicons/dist/ionicons.js dist/apps/client"
+          },
+          {
+            "command": "cp -r node_modules/ionicons/dist/ionicons dist/apps/client/ionicons"
+          },
+          {
+            "command": "cp CHANGELOG.md dist/apps/client/assets"
+          },
+          {
+            "command": "cp LICENSE dist/apps/client/assets"
+          }
+        ]
+      }
+    },
     "serve": {
-      "executor": "@angular-devkit/build-angular:dev-server",
+      "executor": "@nx/angular:webpack-dev-server",
       "options": {
         "browserTarget": "client:build",
         "proxyConfig": "apps/client/proxy.conf.json"

apps/client/src/app/app-routing.module.ts

@@ -18,36 +18,6 @@ const routes: Routes = [
     loadChildren: () =>
       import('./pages/about/about-page.module').then((m) => m.AboutPageModule)
   })),
-  ...[
-    'about/changelog',
-    /////
-    'a-propos/changelog',
-    'informazioni-su/changelog',
-    'over/changelog',
-    'sobre/changelog',
-    'ueber-uns/changelog'
-  ].map((path) => ({
-    path,
-    loadChildren: () =>
-      import('./pages/about/changelog/changelog-page.module').then(
-        (m) => m.ChangelogPageModule
-      )
-  })),
-  ...[
-    'about/privacy-policy',
-    /////
-    'a-propos/politique-de-confidentialite',
-    'informazioni-su/informativa-sulla-privacy',
-    'over/privacybeleid',
-    'sobre/politica-de-privacidad',
-    'ueber-uns/datenschutzbestimmungen'
-  ].map((path) => ({
-    path,
-    loadChildren: () =>
-      import('./pages/about/privacy-policy/privacy-policy-page.module').then(
-        (m) => m.PrivacyPolicyPageModule
-      )
-  })),
   {
     path: 'account',
     loadChildren: () =>
@@ -77,97 +47,6 @@ const routes: Routes = [
     loadChildren: () =>
       import('./pages/blog/blog-page.module').then((m) => m.BlogPageModule)
   })),
-  {
-    path: 'blog/2021/07/hallo-ghostfolio',
-    loadChildren: () =>
-      import(
-        './pages/blog/2021/07/hallo-ghostfolio/hallo-ghostfolio-page.module'
-      ).then((m) => m.HalloGhostfolioPageModule)
-  },
-  {
-    path: 'blog/2021/07/hello-ghostfolio',
-    loadChildren: () =>
-      import(
-        './pages/blog/2021/07/hello-ghostfolio/hello-ghostfolio-page.module'
-      ).then((m) => m.HelloGhostfolioPageModule)
-  },
-  {
-    path: 'blog/2022/01/ghostfolio-first-months-in-open-source',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/01/first-months-in-open-source/first-months-in-open-source-page.module'
-      ).then((m) => m.FirstMonthsInOpenSourcePageModule)
-  },
-  {
-    path: 'blog/2022/07/ghostfolio-meets-internet-identity',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/07/ghostfolio-meets-internet-identity/ghostfolio-meets-internet-identity-page.module'
-      ).then((m) => m.GhostfolioMeetsInternetIdentityPageModule)
-  },
-  {
-    path: 'blog/2022/07/how-do-i-get-my-finances-in-order',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/07/how-do-i-get-my-finances-in-order/how-do-i-get-my-finances-in-order-page.module'
-      ).then((m) => m.HowDoIGetMyFinancesInOrderPageModule)
-  },
-  {
-    path: 'blog/2022/08/500-stars-on-github',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/08/500-stars-on-github/500-stars-on-github-page.module'
-      ).then((m) => m.FiveHundredStarsOnGitHubPageModule)
-  },
-  {
-    path: 'blog/2022/10/hacktoberfest-2022',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/10/hacktoberfest-2022/hacktoberfest-2022-page.module'
-      ).then((m) => m.Hacktoberfest2022PageModule)
-  },
-  {
-    path: 'blog/2022/11/black-friday-2022',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/11/black-friday-2022/black-friday-2022-page.module'
-      ).then((m) => m.BlackFriday2022PageModule)
-  },
-  {
-    path: 'blog/2022/12/the-importance-of-tracking-your-personal-finances',
-    loadChildren: () =>
-      import(
-        './pages/blog/2022/12/the-importance-of-tracking-your-personal-finances/the-importance-of-tracking-your-personal-finances-page.module'
-      ).then((m) => m.TheImportanceOfTrackingYourPersonalFinancesPageModule)
-  },
-  {
-    path: 'blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt',
-    loadChildren: () =>
-      import(
-        './pages/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt/ghostfolio-auf-sackgeld-vorgestellt-page.module'
-      ).then((m) => m.GhostfolioAufSackgeldVorgestelltPageModule)
-  },
-  {
-    path: 'blog/2023/02/ghostfolio-meets-umbrel',
-    loadChildren: () =>
-      import(
-        './pages/blog/2023/02/ghostfolio-meets-umbrel/ghostfolio-meets-umbrel-page.module'
-      ).then((m) => m.GhostfolioMeetsUmbrelPageModule)
-  },
-  {
-    path: 'blog/2023/03/ghostfolio-reaches-1000-stars-on-github',
-    loadChildren: () =>
-      import(
-        './pages/blog/2023/03/1000-stars-on-github/1000-stars-on-github-page.module'
-      ).then((m) => m.ThousandStarsOnGitHubPageModule)
-  },
-  {
-    path: 'blog/2023/05/unlock-your-financial-potential-with-ghostfolio',
-    loadChildren: () =>
-      import(
-        './pages/blog/2023/05/unlock-your-financial-potential-with-ghostfolio/unlock-your-financial-potential-with-ghostfolio-page.module'
-      ).then((m) => m.UnlockYourFinancialPotentialWithGhostfolioPageModule)
-  },
   {
     path: 'demo',
     loadChildren: () =>
@@ -179,6 +58,7 @@ const routes: Routes = [
     'domande-piu-frequenti',
     'foire-aux-questions',
     'haeufig-gestellte-fragen',
+    'perguntas-mais-frequentes',
     'preguntas-mas-frecuentes',
     'vaak-gestelde-vragen'
   ].map((path) => ({
@@ -243,6 +123,7 @@ const routes: Routes = [
     'pricing',
     /////
     'precios',
+    'precos',
     'preise',
     'prezzi',
     'prijzen',
@@ -259,6 +140,7 @@ const routes: Routes = [
     /////
     'enregistrement',
     'iscrizione',
+    'registo',
     'registratie',
     'registrierung',
     'registro'

apps/client/src/app/app.component.html

@@ -50,6 +50,7 @@
       currentRoute === 'features' ||
       currentRoute === 'markets' ||
       currentRoute === 'open' ||
+      currentRoute === 'p' ||
       currentRoute === 'pricing' ||
       currentRoute === 'resources' ||
       currentRoute === 'register' ||
@@ -89,7 +90,7 @@
           <li>
             <a i18n [routerLink]="['/about', 'license']">License</a>
           </li>
-          <li *ngIf="hasPermissionForSubscription">
+          <li *ngIf="hasPermissionForStatistics">
             <a [routerLink]="['/open']">Open Startup</a>
           </li>
           <li *ngIf="hasPermissionForSubscription">
@@ -101,9 +102,13 @@
             >
           </li>
           <li *ngIf="hasPermissionForSubscription">
-            <a href="https://status.ghostfol.io" title="Ghostfolio Status"
-              >Status</a
-            >
+            <a
+              class="align-items-baseline d-flex"
+              href="https://status.ghostfol.io"
+              target="_blank"
+              title="Ghostfolio Status"
+              >Status<ion-icon class="ml-1" name="open-outline"></ion-icon
+            ></a>
           </li>
         </ul>
       </div>
@@ -112,24 +117,30 @@
         <ul class="list-unstyled">
           <li>
             <a
+              class="align-items-baseline d-flex"
               href="https://github.com/ghostfolio/ghostfolio"
+              target="_blank"
               title="Find Ghostfolio on GitHub"
-              >GitHub</a
-            >
+              >GitHub<ion-icon class="ml-1" name="open-outline"></ion-icon
+            ></a>
           </li>
           <li>
             <a
+              class="align-items-baseline d-flex"
               href="https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg"
+              target="_blank"
               title="Join the Ghostfolio Slack community"
-              >Slack</a
-            >
+              >Slack<ion-icon class="ml-1" name="open-outline"></ion-icon
+            ></a>
           </li>
           <li>
             <a
+              class="align-items-baseline d-flex"
               href="https://twitter.com/ghostfolio_"
+              target="_blank"
               title="Follow Ghostfolio on Twitter"
-              >Twitter</a
-            >
+              >Twitter<ion-icon class="ml-1" name="open-outline"></ion-icon
+            ></a>
           </li>
           <li>&nbsp;</li>
           <li>
@@ -150,6 +161,9 @@
           <li>
             <a href="../nl" title="Ghostfolio in Nederlands">Nederlands</a>
           </li>
+          <li>
+            <a href="../pt" title="Ghostfolio in Português">Português</a>
+          </li>
         </ul>
       </div>
     </div>

apps/client/src/app/app.component.ts

@@ -33,6 +33,7 @@ export class AppComponent implements OnDestroy, OnInit {
   public currentYear = new Date().getFullYear();
   public deviceType: string;
   public hasPermissionForBlog: boolean;
+  public hasPermissionForStatistics: boolean;
   public hasPermissionForSubscription: boolean;
   public hasPermissionToAccessFearAndGreedIndex: boolean;
   public info: InfoItem;
@@ -70,6 +71,11 @@ export class AppComponent implements OnDestroy, OnInit {
       permissions.enableSubscription
     );
 
+    this.hasPermissionForStatistics = hasPermission(
+      this.info?.globalPermissions,
+      permissions.enableStatistics
+    );
+
     this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
       this.info?.globalPermissions,
       permissions.enableFearAndGreedIndex

apps/client/src/app/components/admin-market-data/admin-market-data.component.ts

@@ -1,4 +1,5 @@
 import {
+  AfterViewInit,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -7,23 +8,26 @@ import {
   ViewChild
 } from '@angular/core';
 import { MatDialog } from '@angular/material/dialog';
-import { MatSort } from '@angular/material/sort';
+import { MatPaginator, PageEvent } from '@angular/material/paginator';
+import { MatSort, Sort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { ActivatedRoute, Router } from '@angular/router';
 import { AdminService } from '@ghostfolio/client/services/admin.service';
-import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
+import { DEFAULT_PAGE_SIZE } from '@ghostfolio/common/config';
 import { getDateFormatString } from '@ghostfolio/common/helper';
 import { Filter, UniqueAsset, User } from '@ghostfolio/common/interfaces';
 import { AdminMarketDataItem } from '@ghostfolio/common/interfaces/admin-market-data.interface';
 import { translate } from '@ghostfolio/ui/i18n';
-import { AssetSubClass, DataSource } from '@prisma/client';
+import { AssetSubClass, DataSource, Prisma } from '@prisma/client';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import { Subject } from 'rxjs';
 import { distinctUntilChanged, switchMap, takeUntil } from 'rxjs/operators';
 
 import { AssetProfileDialog } from './asset-profile-dialog/asset-profile-dialog.component';
 import { AssetProfileDialogParams } from './asset-profile-dialog/interfaces/interfaces';
+import { CreateAssetProfileDialog } from './create-asset-profile-dialog/create-asset-profile-dialog.component';
+import { CreateAssetProfileDialogParams } from './create-asset-profile-dialog/interfaces/interfaces';
 
 @Component({
   changeDetection: ChangeDetectionStrategy.OnPush,
@@ -31,7 +35,10 @@ import { AssetProfileDialogParams } from './asset-profile-dialog/interfaces/inte
   styleUrls: ['./admin-market-data.scss'],
   templateUrl: './admin-market-data.html'
 })
-export class AdminMarketDataComponent implements OnDestroy, OnInit {
+export class AdminMarketDataComponent
+  implements AfterViewInit, OnDestroy, OnInit
+{
+  @ViewChild(MatPaginator) paginator: MatPaginator;
   @ViewChild(MatSort) sort: MatSort;
 
   public activeFilters: Filter[] = [];
@@ -44,13 +51,26 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
     AssetSubClass.PRECIOUS_METAL,
     AssetSubClass.PRIVATE_EQUITY,
     AssetSubClass.STOCK
-  ].map((assetSubClass) => {
-    return {
-      id: assetSubClass,
-      label: translate(assetSubClass),
-      type: 'ASSET_SUB_CLASS'
-    };
-  });
+  ]
+    .map((assetSubClass) => {
+      return {
+        id: assetSubClass.toString(),
+        label: translate(assetSubClass),
+        type: <Filter['type']>'ASSET_SUB_CLASS'
+      };
+    })
+    .concat([
+      {
+        id: 'ETF_WITHOUT_COUNTRIES',
+        label: $localize`ETFs without Countries`,
+        type: <Filter['type']>'PRESET_ID'
+      },
+      {
+        id: 'ETF_WITHOUT_SECTORS',
+        label: $localize`ETFs without Sectors`,
+        type: <Filter['type']>'PRESET_ID'
+      }
+    ]);
   public currentDataSource: DataSource;
   public currentSymbol: string;
   public dataSource: MatTableDataSource<AdminMarketDataItem> =
@@ -73,6 +93,8 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
   public filters$ = new Subject<Filter[]>();
   public isLoading = false;
   public placeholder = '';
+  public pageSize = DEFAULT_PAGE_SIZE;
+  public totalItems = 0;
   public user: User;
 
   private unsubscribeSubject = new Subject<void>();
@@ -80,7 +102,6 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
   public constructor(
     private adminService: AdminService,
     private changeDetectorRef: ChangeDetectorRef,
-    private dataService: DataService,
     private deviceService: DeviceDetectorService,
     private dialog: MatDialog,
     private route: ActivatedRoute,
@@ -99,6 +120,8 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
             dataSource: params['dataSource'],
             symbol: params['symbol']
           });
+        } else if (params['createAssetProfileDialog']) {
+          this.openCreateAssetProfileDialog();
         }
       });
 
@@ -113,34 +136,40 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
           );
         }
       });
+
+    this.filters$
+      .pipe(distinctUntilChanged(), takeUntil(this.unsubscribeSubject))
+      .subscribe((filters) => {
+        this.activeFilters = filters;
+
+        this.loadData();
+      });
+  }
+
+  public ngAfterViewInit() {
+    this.sort.sortChange.subscribe(
+      ({ active: sortColumn, direction }: Sort) => {
+        this.paginator.pageIndex = 0;
+
+        this.loadData({
+          sortColumn,
+          sortDirection: <Prisma.SortOrder>direction,
+          pageIndex: this.paginator.pageIndex
+        });
+      }
+    );
   }
 
   public ngOnInit() {
     this.deviceType = this.deviceService.getDeviceInfo().deviceType;
+  }
 
-    this.filters$
-      .pipe(
-        distinctUntilChanged(),
-        switchMap((filters) => {
-          this.isLoading = true;
-          this.activeFilters = filters;
-          this.placeholder =
-            this.activeFilters.length <= 0 ? $localize`Filter by...` : '';
-
-          return this.dataService.fetchAdminMarketData({
-            filters: this.activeFilters
-          });
-        }),
-        takeUntil(this.unsubscribeSubject)
-      )
-      .subscribe(({ marketData }) => {
-        this.dataSource = new MatTableDataSource(marketData);
-        this.dataSource.sort = this.sort;
-
-        this.isLoading = false;
-
-        this.changeDetectorRef.markForCheck();
-      });
+  public onChangePage(page: PageEvent) {
+    this.loadData({
+      pageIndex: page.pageIndex,
+      sortColumn: this.sort.active,
+      sortDirection: <Prisma.SortOrder>this.sort.direction
+    });
   }
 
   public onDeleteProfileData({ dataSource, symbol }: UniqueAsset) {
@@ -208,6 +237,53 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
     this.unsubscribeSubject.complete();
   }
 
+  private loadData(
+    {
+      pageIndex,
+      sortColumn,
+      sortDirection
+    }: {
+      pageIndex: number;
+      sortColumn?: string;
+      sortDirection?: Prisma.SortOrder;
+    } = { pageIndex: 0 }
+  ) {
+    this.isLoading = true;
+
+    this.pageSize =
+      this.activeFilters.length === 1 &&
+      this.activeFilters[0].type === 'PRESET_ID'
+        ? undefined
+        : DEFAULT_PAGE_SIZE;
+
+    if (pageIndex === 0 && this.paginator) {
+      this.paginator.pageIndex = 0;
+    }
+
+    this.placeholder =
+      this.activeFilters.length <= 0 ? $localize`Filter by...` : '';
+
+    this.adminService
+      .fetchAdminMarketData({
+        sortColumn,
+        sortDirection,
+        filters: this.activeFilters,
+        skip: pageIndex * this.pageSize,
+        take: this.pageSize
+      })
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe(({ count, marketData }) => {
+        this.totalItems = count;
+
+        this.dataSource = new MatTableDataSource(marketData);
+        this.dataSource.sort = this.sort;
+
+        this.isLoading = false;
+
+        this.changeDetectorRef.markForCheck();
+      });
+  }
+
   private openAssetProfileDialog({
     dataSource,
     symbol
@@ -241,4 +317,53 @@ export class AdminMarketDataComponent implements OnDestroy, OnInit {
           });
       });
   }
+
+  private openCreateAssetProfileDialog() {
+    this.userService
+      .get()
+      .pipe(takeUntil(this.unsubscribeSubject))
+      .subscribe((user) => {
+        this.user = user;
+
+        const dialogRef = this.dialog.open(CreateAssetProfileDialog, {
+          autoFocus: false,
+          data: <CreateAssetProfileDialogParams>{
+            deviceType: this.deviceType,
+            locale: this.user?.settings?.locale
+          },
+          width: this.deviceType === 'mobile' ? '100vw' : '50rem'
+        });
+
+        dialogRef
+          .afterClosed()
+          .pipe(takeUntil(this.unsubscribeSubject))
+          .subscribe(({ dataSource, symbol }) => {
+            if (dataSource && symbol) {
+              this.adminService
+                .addAssetProfile({ dataSource, symbol })
+                .pipe(
+                  switchMap(() => {
+                    this.isLoading = true;
+                    this.changeDetectorRef.markForCheck();
+
+                    return this.adminService.fetchAdminMarketData({
+                      filters: this.activeFilters,
+                      take: this.pageSize
+                    });
+                  }),
+                  takeUntil(this.unsubscribeSubject)
+                )
+                .subscribe(({ marketData }) => {
+                  this.dataSource = new MatTableDataSource(marketData);
+                  this.dataSource.sort = this.sort;
+                  this.isLoading = false;
+
+                  this.changeDetectorRef.markForCheck();
+                });
+            }
+
+            this.router.navigate(['.'], { relativeTo: this.route });
+          });
+      });
+  }
 }

apps/client/src/app/components/admin-market-data/admin-market-data.html

@@ -56,7 +56,7 @@
         </ng-container>
 
         <ng-container matColumnDef="date">
-          <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
+          <th *matHeaderCellDef class="px-1" mat-header-cell>
             <ng-container i18n>First Activity</ng-container>
           </th>
           <td *matCellDef="let element" class="px-1" mat-cell>
@@ -74,7 +74,7 @@
         </ng-container>
 
         <ng-container matColumnDef="marketDataItemCount">
-          <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
+          <th *matHeaderCellDef class="px-1" mat-header-cell>
             <ng-container i18n>Historical Data</ng-container>
           </th>
           <td *matCellDef="let element" class="px-1 text-right" mat-cell>
@@ -83,7 +83,7 @@
         </ng-container>
 
         <ng-container matColumnDef="sectorsCount">
-          <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
+          <th *matHeaderCellDef class="px-1" mat-header-cell>
             <ng-container i18n>Sectors Count</ng-container>
           </th>
           <td *matCellDef="let element" class="px-1 text-right" mat-cell>
@@ -92,7 +92,7 @@
         </ng-container>
 
         <ng-container matColumnDef="countriesCount">
-          <th *matHeaderCellDef class="px-1" mat-header-cell mat-sort-header>
+          <th *matHeaderCellDef class="px-1" mat-header-cell>
             <ng-container i18n>Countries Count</ng-container>
           </th>
           <td *matCellDef="let element" class="px-1 text-right" mat-cell>
@@ -162,6 +162,40 @@
           (click)="onOpenAssetProfileDialog({ dataSource: row.dataSource, symbol: row.symbol })"
         ></tr>
       </table>
+
+      <mat-paginator
+        [length]="totalItems"
+        [ngClass]="{
+          'd-none':
+            (isLoading && totalItems === 0) ||
+            totalItems <= pageSize
+        }"
+        [pageSize]="pageSize"
+        [showFirstLastButtons]="true"
+        (page)="onChangePage($event)"
+      ></mat-paginator>
+
+      <ngx-skeleton-loader
+        *ngIf="isLoading && totalItems === 0"
+        animation="pulse"
+        class="px-4 py-3"
+        [theme]="{
+          height: '1.5rem',
+          width: '100%'
+        }"
+      ></ngx-skeleton-loader>
     </div>
   </div>
+
+  <div class="fab-container">
+    <a
+      class="align-items-center d-flex justify-content-center"
+      color="primary"
+      mat-fab
+      [queryParams]="{ createAssetProfileDialog: true }"
+      [routerLink]="[]"
+    >
+      <ion-icon name="add-outline" size="large"></ion-icon>
+    </a>
+  </div>
 </div>

apps/client/src/app/components/admin-market-data/admin-market-data.module.ts

@@ -2,12 +2,16 @@ 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 { MatPaginatorModule } from '@angular/material/paginator';
 import { MatSortModule } from '@angular/material/sort';
 import { MatTableModule } from '@angular/material/table';
+import { RouterModule } from '@angular/router';
 import { GfActivitiesFilterModule } from '@ghostfolio/ui/activities-filter/activities-filter.module';
+import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 
 import { AdminMarketDataComponent } from './admin-market-data.component';
 import { GfAssetProfileDialogModule } from './asset-profile-dialog/asset-profile-dialog.module';
+import { GfCreateAssetProfileDialogModule } from './create-asset-profile-dialog/create-asset-profile-dialog.module';
 
 @NgModule({
   declarations: [AdminMarketDataComponent],
@@ -15,10 +19,14 @@ import { GfAssetProfileDialogModule } from './asset-profile-dialog/asset-profile
     CommonModule,
     GfActivitiesFilterModule,
     GfAssetProfileDialogModule,
+    GfCreateAssetProfileDialogModule,
     MatButtonModule,
     MatMenuModule,
+    MatPaginatorModule,
     MatSortModule,
-    MatTableModule
+    MatTableModule,
+    NgxSkeletonLoaderModule,
+    RouterModule
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]
 })

apps/client/src/app/components/admin-market-data/admin-market-data.scss

@@ -2,4 +2,11 @@
 
 :host {
   display: block;
+
+  .fab-container {
+    bottom: 2rem;
+    position: fixed;
+    right: 2rem;
+    z-index: 999;
+  }
 }

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.component.ts

@@ -13,6 +13,7 @@ import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import {
   AdminMarketDataDetails,
+  ScraperConfiguration,
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
 import { translate } from '@ghostfolio/ui/i18n';
@@ -34,6 +35,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
   public assetProfile: AdminMarketDataDetails['assetProfile'];
   public assetProfileForm = this.formBuilder.group({
     comment: '',
+    scraperConfiguration: '',
     symbolMapping: ''
   });
   public assetSubClass: string;
@@ -103,6 +105,9 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
 
         this.assetProfileForm.setValue({
           comment: this.assetProfile?.comment ?? '',
+          scraperConfiguration: JSON.stringify(
+            this.assetProfile?.scraperConfiguration ?? {}
+          ),
           symbolMapping: JSON.stringify(this.assetProfile?.symbolMapping ?? {})
         });
 
@@ -148,8 +153,15 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
   }
 
   public onSubmit() {
+    let scraperConfiguration = {};
     let symbolMapping = {};
 
+    try {
+      scraperConfiguration = JSON.parse(
+        this.assetProfileForm.controls['scraperConfiguration'].value
+      );
+    } catch {}
+
     try {
       symbolMapping = JSON.parse(
         this.assetProfileForm.controls['symbolMapping'].value
@@ -157,6 +169,7 @@ export class AssetProfileDialog implements OnDestroy, OnInit {
     } catch {}
 
     const assetProfileData: UpdateAssetProfileDto = {
+      scraperConfiguration,
       symbolMapping,
       comment: this.assetProfileForm.controls['comment'].value ?? null
     };

apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.html

@@ -162,6 +162,17 @@
         ></textarea>
       </mat-form-field>
     </div>
+    <div *ngIf="assetProfile?.dataSource === 'MANUAL'">
+      <mat-form-field appearance="outline" class="w-100">
+        <mat-label i18n>Scraper Configuration</mat-label>
+        <textarea
+          cdkTextareaAutosize
+          formControlName="scraperConfiguration"
+          matInput
+          type="text"
+        ></textarea>
+      </mat-form-field>
+    </div>
     <div>
       <mat-form-field appearance="outline" class="w-100">
         <mat-label i18n>Note</mat-label>

apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.component.ts

@@ -0,0 +1,53 @@
+import {
+  ChangeDetectionStrategy,
+  ChangeDetectorRef,
+  Component,
+  Inject,
+  OnDestroy,
+  OnInit
+} from '@angular/core';
+import {
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  Validators
+} from '@angular/forms';
+import { MatDialogRef } from '@angular/material/dialog';
+import { AdminService } from '@ghostfolio/client/services/admin.service';
+
+@Component({
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  host: { class: 'h-100' },
+  selector: 'gf-create-asset-profile-dialog',
+  templateUrl: 'create-asset-profile-dialog.html'
+})
+export class CreateAssetProfileDialog implements OnInit, OnDestroy {
+  public createAssetProfileForm: FormGroup;
+
+  public constructor(
+    public readonly adminService: AdminService,
+    public readonly changeDetectorRef: ChangeDetectorRef,
+    public readonly dialogRef: MatDialogRef<CreateAssetProfileDialog>,
+    public readonly formBuilder: FormBuilder
+  ) {}
+
+  public ngOnInit() {
+    this.createAssetProfileForm = this.formBuilder.group({
+      searchSymbol: new FormControl(null, [Validators.required])
+    });
+  }
+
+  public onCancel() {
+    this.dialogRef.close();
+  }
+
+  public onSubmit() {
+    this.dialogRef.close({
+      dataSource:
+        this.createAssetProfileForm.controls['searchSymbol'].value.dataSource,
+      symbol: this.createAssetProfileForm.controls['searchSymbol'].value.symbol
+    });
+  }
+
+  public ngOnDestroy() {}
+}

apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.html

@@ -0,0 +1,28 @@
+<form
+  class="d-flex flex-column h-100"
+  [formGroup]="createAssetProfileForm"
+  (keyup.enter)="createAssetProfileForm.valid && onSubmit()"
+  (ngSubmit)="onSubmit()"
+>
+  <h1 i18n mat-dialog-title>Add Asset Profile</h1>
+  <div class="flex-grow-1 py-3" mat-dialog-content>
+    <mat-form-field appearance="outline" class="w-100">
+      <mat-label i18n>Name, symbol or ISIN</mat-label>
+      <gf-symbol-autocomplete
+        formControlName="searchSymbol"
+        [includeIndices]="true"
+      />
+    </mat-form-field>
+  </div>
+  <div class="d-flex justify-content-end" mat-dialog-actions>
+    <button i18n mat-button type="button" (click)="onCancel()">Cancel</button>
+    <button
+      color="primary"
+      mat-flat-button
+      type="submit"
+      [disabled]="!createAssetProfileForm.valid"
+    >
+      <ng-container i18n>Save</ng-container>
+    </button>
+  </div>
+</form>

apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/create-asset-profile-dialog.module.ts

@@ -0,0 +1,24 @@
+import { CommonModule } from '@angular/common';
+import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatDialogModule } from '@angular/material/dialog';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { GfSymbolAutocompleteModule } from '@ghostfolio/ui/symbol-autocomplete';
+
+import { CreateAssetProfileDialog } from './create-asset-profile-dialog.component';
+
+@NgModule({
+  declarations: [CreateAssetProfileDialog],
+  imports: [
+    CommonModule,
+    FormsModule,
+    GfSymbolAutocompleteModule,
+    MatDialogModule,
+    MatButtonModule,
+    MatFormFieldModule,
+    ReactiveFormsModule
+  ],
+  schemas: [CUSTOM_ELEMENTS_SCHEMA]
+})
+export class GfCreateAssetProfileDialogModule {}

apps/client/src/app/components/admin-market-data/create-asset-profile-dialog/interfaces/interfaces.ts

@@ -0,0 +1,4 @@
+export interface CreateAssetProfileDialogParams {
+  deviceType: string;
+  locale: string;
+}

apps/client/src/app/components/admin-overview/admin-overview.component.ts

@@ -1,5 +1,6 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
 import { MatCheckboxChange } from '@angular/material/checkbox';
+import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { CacheService } from '@ghostfolio/client/services/cache.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
@@ -45,6 +46,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
   private unsubscribeSubject = new Subject<void>();
 
   public constructor(
+    private adminService: AdminService,
     private cacheService: CacheService,
     private changeDetectorRef: ChangeDetectorRef,
     private dataService: DataService,
@@ -197,7 +199,7 @@ export class AdminOverviewComponent implements OnDestroy, OnInit {
   }
 
   private fetchAdminData() {
-    this.dataService
+    this.adminService
       .fetchAdminData()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ exchangeRates, settings, transactionCount, userCount }) => {

apps/client/src/app/components/admin-overview/admin-overview.html

@@ -169,6 +169,8 @@
                       <mat-option value="7 days">7 Days</mat-option>
                       <mat-option value="14 days">14 Days</mat-option>
                       <mat-option value="30 days">30 Days</mat-option>
+                      <mat-option value="90 days">90 Days</mat-option>
+                      <mat-option value="180 days">180 Days</mat-option>
                       <mat-option value="1 year">1 Year</mat-option>
                     </mat-select>
                   </mat-form-field>

apps/client/src/app/components/admin-users/admin-users.component.ts

@@ -1,4 +1,5 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
+import { AdminService } from '@ghostfolio/client/services/admin.service';
 import { DataService } from '@ghostfolio/client/services/data.service';
 import { ImpersonationStorageService } from '@ghostfolio/client/services/impersonation-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
@@ -30,6 +31,7 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
   private unsubscribeSubject = new Subject<void>();
 
   public constructor(
+    private adminService: AdminService,
     private changeDetectorRef: ChangeDetectorRef,
     private dataService: DataService,
     private impersonationStorageService: ImpersonationStorageService,
@@ -112,7 +114,7 @@ export class AdminUsersComponent implements OnDestroy, OnInit {
   }
 
   private fetchAdminData() {
-    this.dataService
+    this.adminService
       .fetchAdminData()
       .pipe(takeUntil(this.unsubscribeSubject))
       .subscribe(({ users }) => {

apps/client/src/app/components/home-overview/home-overview.html

@@ -1,57 +1,110 @@
 <div
   class="align-items-center container d-flex flex-column h-100 justify-content-center overview p-0 position-relative"
 >
-  <div class="row w-100">
-    <div class="col p-0">
-      <div class="chart-container mx-auto position-relative">
-        <div
-          *ngIf="hasPermissionToCreateOrder && historicalDataItems?.length === 0"
-          class="align-items-center d-flex h-100 justify-content-center w-100"
+  <div
+    *ngIf="hasPermissionToCreateOrder && historicalDataItems?.length === 0; else isUserActive"
+    class="justify-content-center row w-100"
+  >
+    <div class="col introduction">
+      <h4 i18n>Welcome to Ghostfolio</h4>
+      <p i18n>Ready to take control of your personal finances?</p>
+      <ol class="font-weight-bold">
+        <li
+          class="mb-2"
+          [ngClass]="{ 'text-muted': user?.accounts?.length > 1 }"
         >
-          <div class="d-flex justify-content-center">
-            <gf-no-transactions-info-indicator></gf-no-transactions-info-indicator>
-          </div>
+          <a class="d-block" [routerLink]="['/accounts']"
+            ><span i18n>Setup your accounts</span><br />
+            <span class="font-weight-normal" i18n
+              >Get a comprehensive financial overview by adding your bank and
+              brokerage accounts.</span
+            ></a
+          >
+        </li>
+        <li class="mb-2">
+          <a class="d-block" [routerLink]="['/portfolio', 'activities']">
+            <span i18n>Capture your activities</span><br />
+            <span class="font-weight-normal" i18n
+              >Record your investment activities to keep your portfolio up to
+              date.</span
+            ></a
+          >
+        </li>
+        <li class="mb-2">
+          <a class="d-block" [routerLink]="['/portfolio']">
+            <span i18n>Monitor and analyze your portfolio</span><br />
+            <span class="font-weight-normal" i18n
+              >Track your progress in real-time with comprehensive analysis and
+              insights.</span
+            >
+          </a>
+        </li>
+      </ol>
+      <div class="d-flex justify-content-center">
+        <a
+          *ngIf="user?.accounts?.length === 1"
+          color="primary"
+          mat-flat-button
+          [routerLink]="['/accounts']"
+        >
+          <ng-container i18n>Setup accounts</ng-container>
+        </a>
+        <a
+          *ngIf="user?.accounts?.length > 1"
+          color="primary"
+          mat-flat-button
+          [routerLink]="['/portfolio', 'activities']"
+        >
+          <ng-container i18n>Add activity</ng-container>
+        </a>
+      </div>
+    </div>
+  </div>
+  <ng-template #isUserActive>
+    <div class="row w-100">
+      <div class="col p-0">
+        <div class="chart-container mx-auto position-relative">
+          <gf-line-chart
+            class="position-absolute"
+            symbol="Performance"
+            unit="%"
+            [colorScheme]="user?.settings?.colorScheme"
+            [hidden]="historicalDataItems?.length === 0"
+            [historicalDataItems]="historicalDataItems"
+            [isAnimated]="user?.settings?.dateRange === '1d' ? false : true"
+            [locale]="user?.settings?.locale"
+            [ngClass]="{ 'pr-3': deviceType === 'mobile' }"
+            [showGradient]="true"
+            [showLoader]="false"
+            [showXAxis]="false"
+            [showYAxis]="false"
+          ></gf-line-chart>
         </div>
-        <gf-line-chart
-          class="position-absolute"
-          symbol="Performance"
-          unit="%"
-          [colorScheme]="user?.settings?.colorScheme"
-          [hidden]="historicalDataItems?.length === 0"
-          [historicalDataItems]="historicalDataItems"
-          [isAnimated]="user?.settings?.dateRange === '1d' ? false : true"
-          [locale]="user?.settings?.locale"
-          [ngClass]="{ 'pr-3': deviceType === 'mobile' }"
-          [showGradient]="true"
-          [showLoader]="false"
-          [showXAxis]="false"
-          [showYAxis]="false"
-        ></gf-line-chart>
       </div>
     </div>
-  </div>
-  <div class="overview-container row mt-1">
-    <div class="col">
-      <gf-portfolio-performance
-        class="pb-4"
-        [baseCurrency]="user?.settings?.baseCurrency"
-        [deviceType]="deviceType"
-        [errors]="errors"
-        [isAllTimeHigh]="isAllTimeHigh"
-        [isAllTimeLow]="isAllTimeLow"
-        [isLoading]="isLoadingPerformance"
-        [locale]="user?.settings?.locale"
-        [performance]="performance"
-        [showDetails]="showDetails"
-      ></gf-portfolio-performance>
-      <div *ngIf="showDetails" class="text-center">
-        <gf-toggle
-          [defaultValue]="user?.settings?.dateRange"
+    <div class="overview-container row mt-1">
+      <div class="col">
+        <gf-portfolio-performance
+          class="pb-4"
+          [baseCurrency]="user?.settings?.baseCurrency"
+          [deviceType]="deviceType"
+          [errors]="errors"
+          [isAllTimeHigh]="isAllTimeHigh"
+          [isAllTimeLow]="isAllTimeLow"
           [isLoading]="isLoadingPerformance"
-          [options]="dateRangeOptions"
-          (change)="onChangeDateRange($event.value)"
-        ></gf-toggle>
+          [locale]="user?.settings?.locale"
+          [performance]="performance"
+          [showDetails]="showDetails"
+        ></gf-portfolio-performance>
+        <div *ngIf="showDetails" class="text-center">
+          <gf-toggle
+            [defaultValue]="user?.settings?.dateRange"
+            [isLoading]="isLoadingPerformance"
+            [options]="dateRangeOptions"
+            (change)="onChangeDateRange($event.value)"
+          ></gf-toggle>
+        </div>
       </div>
     </div>
-  </div>
+  </ng-template>
 </div>

apps/client/src/app/components/home-overview/home-overview.module.ts

@@ -1,5 +1,6 @@
 import { CommonModule } from '@angular/common';
 import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
+import { MatButtonModule } from '@angular/material/button';
 import { RouterModule } from '@angular/router';
 import { GfPortfolioPerformanceModule } from '@ghostfolio/client/components/portfolio-performance/portfolio-performance.module';
 import { GfToggleModule } from '@ghostfolio/client/components/toggle/toggle.module';
@@ -16,6 +17,7 @@ import { HomeOverviewComponent } from './home-overview.component';
     GfNoTransactionsInfoModule,
     GfPortfolioPerformanceModule,
     GfToggleModule,
+    MatButtonModule,
     RouterModule
   ],
   schemas: [CUSTOM_ELEMENTS_SCHEMA]

apps/client/src/app/components/home-overview/home-overview.scss

@@ -31,4 +31,8 @@
       top: 0;
     }
   }
+
+  .introduction {
+    max-width: 50rem;
+  }
 }

apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.component.ts

@@ -16,6 +16,8 @@ import { TokenStorageService } from '@ghostfolio/client/services/token-storage.s
   templateUrl: 'login-with-access-token-dialog.html'
 })
 export class LoginWithAccessTokenDialog {
+  public isAccessTokenHidden = true;
+
   public constructor(
     @Inject(MAT_DIALOG_DATA) public data: any,
     public dialogRef: MatDialogRef<LoginWithAccessTokenDialog>,
@@ -38,6 +40,12 @@ export class LoginWithAccessTokenDialog {
     this.dialogRef.close();
   }
 
+  public onLoginWithAccessToken() {
+    if (this.data.accessToken) {
+      this.dialogRef.close(this.data);
+    }
+  }
+
   public async onLoginWithInternetIdentity() {
     try {
       const { authToken } = await this.internetIdentityService.login();

apps/client/src/app/components/login-with-access-token-dialog/login-with-access-token-dialog.html

@@ -6,15 +6,27 @@
 
 <div class="py-3" mat-dialog-content>
   <div class="align-items-center d-flex flex-column">
-    <mat-form-field appearance="outline" class="without-hint w-100">
-      <mat-label i18n>Security Token</mat-label>
-      <textarea
-        cdkTextareaAutosize
-        matInput
-        type="text"
-        [(ngModel)]="data.accessToken"
-      ></textarea>
-    </mat-form-field>
+    <form class="w-100" (ngSubmit)="onLoginWithAccessToken()">
+      <mat-form-field appearance="outline" class="without-hint w-100">
+        <mat-label i18n>Security Token</mat-label>
+        <input
+          matInput
+          name="password"
+          [type]="isAccessTokenHidden ? 'password' : 'text'"
+          [(ngModel)]="data.accessToken"
+        />
+        <button
+          mat-button
+          matSuffix
+          type="button"
+          (click)="isAccessTokenHidden = !isAccessTokenHidden"
+        >
+          <ion-icon
+            [name]="isAccessTokenHidden ? 'eye-outline' : 'eye-off-outline'"
+          ></ion-icon>
+        </button>
+      </mat-form-field>
+    </form>
     <ng-container *ngIf="data.hasPermissionToUseSocialLogin">
       <div class="my-3 text-center text-muted" i18n>or</div>
       <div class="d-flex flex-column">

apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html

@@ -163,7 +163,33 @@
         [isCurrency]="true"
         [locale]="locale"
         [unit]="baseCurrency"
-        [value]="isLoading ? undefined : summary?.emergencyFund"
+        [value]="isLoading ? undefined : summary?.emergencyFund?.total"
+      ></gf-value>
+    </div>
+  </div>
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 ml-3 text-truncate" i18n>Cash</div>
+    <div class="flex-column flex-wrap justify-content-end">
+      <gf-value
+        class="justify-content-end"
+        position="end"
+        [isCurrency]="true"
+        [locale]="locale"
+        [unit]="baseCurrency"
+        [value]="isLoading ? undefined : summary?.emergencyFund?.cash"
+      ></gf-value>
+    </div>
+  </div>
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 ml-3 text-truncate" i18n>Assets</div>
+    <div class="flex-column flex-wrap justify-content-end">
+      <gf-value
+        class="justify-content-end"
+        position="end"
+        [isCurrency]="true"
+        [locale]="locale"
+        [unit]="baseCurrency"
+        [value]="isLoading ? undefined : summary?.emergencyFund?.assets"
       ></gf-value>
     </div>
   </div>

apps/client/src/app/components/portfolio-summary/portfolio-summary.component.ts

@@ -50,7 +50,7 @@ export class PortfolioSummaryComponent implements OnChanges, OnInit {
   public onEditEmergencyFund() {
     const emergencyFundInput = prompt(
       $localize`Please enter the amount of your emergency fund:`,
-      this.summary.emergencyFund?.toString() ?? '0'
+      this.summary.emergencyFund?.total?.toString() ?? '0'
     );
     const emergencyFund = parseFloat(emergencyFundInput?.trim());
 

apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.component.ts

@@ -215,6 +215,15 @@ export class PositionDetailDialog implements OnDestroy, OnInit {
             this.benchmarkDataItems[0].value = this.averagePrice;
           }
 
+          this.benchmarkDataItems = this.benchmarkDataItems.map(
+            ({ date, value }) => {
+              return {
+                date,
+                value: value === 0 ? null : value
+              };
+            }
+          );
+
           if (Number.isInteger(this.quantity)) {
             this.quantityPrecision = 0;
           } else if (this.SymbolProfile?.assetSubClass === 'CRYPTOCURRENCY') {

apps/client/src/app/core/auth.guard.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@angular/core';
 import {
   ActivatedRouteSnapshot,
-  CanActivate,
   Router,
   RouterStateSnapshot
 } from '@angular/router';
@@ -12,7 +11,7 @@ import { EMPTY } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
 @Injectable({ providedIn: 'root' })
-export class AuthGuard implements CanActivate {
+export class AuthGuard {
   private static PUBLIC_PAGE_ROUTES = [
     '/about',
     '/about/changelog',

apps/client/src/app/core/http-response.interceptor.ts

@@ -62,7 +62,7 @@ export class HttpResponseInterceptor implements HttpInterceptor {
                 undefined,
                 { duration: 6000 }
               );
-            } else {
+            } else if (!error.url.endsWith('auth/anonymous')) {
               this.snackBarRef = this.snackBar.open(
                 $localize`This feature requires a subscription.`,
                 this.hasPermissionForSubscription

apps/client/src/app/pages/about/about-page-routing.module.ts

@@ -25,6 +25,7 @@ const routes: Routes = [
       ...[
         'license',
         /////
+        'licenca',
         'licence',
         'licencia',
         'licentie',
@@ -37,13 +38,22 @@ const routes: Routes = [
             (m) => m.LicensePageModule
           )
       })),
-      {
-        path: 'privacy-policy',
+      ...[
+        'privacy-policy',
+        /////
+        'datenschutzbestimmungen',
+        'informativa-sulla-privacy',
+        'politique-de-confidentialite',
+        'politica-de-privacidad',
+        'politica-de-privacidade',
+        'privacybeleid'
+      ].map((path) => ({
+        path,
         loadChildren: () =>
           import('./privacy-policy/privacy-policy-page.module').then(
             (m) => m.PrivacyPolicyPageModule
           )
-      }
+      }))
     ],
     component: AboutPageComponent,
     path: '',

apps/client/src/app/pages/about/about-page.scss

@@ -11,14 +11,9 @@
   padding-bottom: constant(safe-area-inset-bottom);
 
   ::ng-deep {
-    gf-about-page,
-    gf-changelog-page,
-    gf-privacy-policy-page {
-      flex: 1 1 auto;
-      overflow-y: auto;
-    }
-
     .mat-mdc-tab-link-container {
+      --mat-tab-header-active-focus-indicator-color: transparent;
+      --mat-tab-header-active-hover-indicator-color: transparent;
       --mdc-tab-indicator-active-indicator-color: transparent;
 
       .mat-mdc-tab-link {

apps/client/src/app/pages/about/overview/about-overview-page.component.ts

@@ -15,6 +15,7 @@ import { takeUntil } from 'rxjs/operators';
 })
 export class AboutOverviewPageComponent implements OnDestroy, OnInit {
   public hasPermissionForBlog: boolean;
+  public hasPermissionForStatistics: boolean;
   public hasPermissionForSubscription: boolean;
   public isLoggedIn: boolean;
   public user: User;
@@ -34,6 +35,11 @@ export class AboutOverviewPageComponent implements OnDestroy, OnInit {
       permissions.enableBlog
     );
 
+    this.hasPermissionForStatistics = hasPermission(
+      globalPermissions,
+      permissions.enableStatistics
+    );
+
     this.hasPermissionForSubscription = hasPermission(
       globalPermissions,
       permissions.enableSubscription

apps/client/src/app/pages/about/overview/about-overview-page.html

@@ -19,9 +19,11 @@
             title="GNU Affero General Public License"
             >AGPL-3.0 license</a
           >
-          and we share aggregated
-          <a title="Open Startup" [routerLink]="['/open']">key metrics</a>
-          of the platform’s performance. The project has been initiated by
+          <ng-container *ngIf="hasPermissionForStatistics">
+            and we share aggregated
+            <a title="Open Startup" [routerLink]="['/open']">key metrics</a>
+            of the platform’s performance</ng-container
+          >. The project has been initiated by
           <a href="https://dotsilver.ch" title="Website of Thomas Kaul"
             >Thomas Kaul</a
           >

apps/client/src/app/pages/account/account-page.component.ts

@@ -15,6 +15,10 @@ import {
 import { ActivatedRoute, Router } from '@angular/router';
 import { CreateAccessDto } from '@ghostfolio/api/app/access/create-access.dto';
 import { DataService } from '@ghostfolio/client/services/data.service';
+import {
+  STAY_SIGNED_IN,
+  SettingsStorageService
+} from '@ghostfolio/client/services/settings-storage.service';
 import { UserService } from '@ghostfolio/client/services/user/user.service';
 import { WebAuthnService } from '@ghostfolio/client/services/web-authn.service';
 import { getDateFormatString } from '@ghostfolio/common/helper';
@@ -80,6 +84,7 @@ export class AccountPageComponent implements OnDestroy, OnInit {
     private snackBar: MatSnackBar,
     private route: ActivatedRoute,
     private router: Router,
+    private settingsStorageService: SettingsStorageService,
     private stripeService: StripeService,
     private userService: UserService,
     public webAuthnService: WebAuthnService
@@ -397,6 +402,8 @@ export class AccountPageComponent implements OnDestroy, OnInit {
         })
       )
       .subscribe(() => {
+        this.settingsStorageService.removeSetting(STAY_SIGNED_IN);
+
         this.update();
       });
   }

apps/client/src/app/pages/account/account-page.html

@@ -156,10 +156,10 @@
                         >Nederlands (<ng-container i18n>Community</ng-container
                         >)</mat-option
                       >
-                      <!--<mat-option value="pt"
+                      <mat-option value="pt"
                         >Português (<ng-container i18n>Community</ng-container
                         >)</mat-option
-                      >-->
+                      >
                     </mat-select>
                   </mat-form-field>
                 </div>
@@ -235,7 +235,12 @@
             </div>
           </div>
           <div class="align-items-center d-flex mt-4 py-1">
-            <div class="pr-1 w-50" i18n>Sign in with fingerprint</div>
+            <div class="pr-1 w-50">
+              <div i18n>Biometric Authentication</div>
+              <div class="hint-text text-muted" i18n>
+                Sign in with fingerprint
+              </div>
+            </div>
             <div class="pl-1 w-50">
               <mat-checkbox
                 #toggleSignInWithFingerprintEnabledElement

apps/client/src/app/pages/accounts/create-or-update-account-dialog/create-or-update-account-dialog.html

@@ -37,6 +37,7 @@
           type="number"
           [(ngModel)]="data.account.balance"
         />
+        <span class="ml-2" matTextSuffix>{{ data.account.currency }}</span>
       </mat-form-field>
     </div>
     <div [ngClass]="{ 'd-none': platforms?.length < 1 }">