Merge branch 'main' into bugfix/date-ranges-in-time-zones-other-than-utc

CHANGELOG.md

@@ -7,17 +7,33 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Changed
+
+- Extended the access to share the portfolio with the Model Context Protocol (MCP) to support the _View_ and the _View and manage_ permissions (experimental)
+- Improved the performance of getting the historical market data by selecting only the required columns
+
+### Fixed
+
+- Fixed the start date of the date ranges in the portfolio performance calculation for instances in time zones with a negative UTC offset
+
+## 3.83.0 - 2026-10-10
+
 ### Added
 
+- Added the performance timeline grouped by year to the analysis page (experimental)
 - Extended the `GET api/v2/portfolio/performance` endpoint by the `groupBy` query parameter (`year`)
 
 ### Changed
 
+- Extended the benchmark comparator to support benchmarks whose market data starts later than the portfolio
+- Harmonized the colors in the investment chart component
+- Improved the performance of getting the historical market data by loading only the requested asset profiles
 - Improved the language localization for Chinese (`zh`)
 
 ### Fixed
 
-- Fixed the start date of the date ranges in the portfolio performance calculation for instances in time zones with a negative UTC offset
+- Fixed an issue where a user could create a custom asset profile with a symbol of the prefix `GF_`
+- Fixed the horizontal overflow on the overview tab of the home page on mobile
 
 ## 3.82.0 - 2026-10-09
 

README.md

@@ -407,7 +407,7 @@ The _Model Context Protocol_ (MCP) server lets an AI client read your portfolio
 - Set `ROOT_URL` to the public URL of your instance if a client calls the endpoint from a browser page. The host name of `ROOT_URL` is the only accepted origin.
 - Grant an access of the type _MCP_ in _My Ghostfolio_ under _Access_ and copy its token
 
-An _MCP_ access has (restricted) read scopes and never reads the monetary values. Grant the _Restricted view and manage_ permission to let the client also import activities.
+An _MCP_ access with the _Restricted view_ permission reads the portfolio without the monetary values. Grant the _View_ permission to let the client also read the monetary values. Grant the _Restricted view and manage_ or the _View and manage_ permission to let the client also import activities.
 
 ### Connect a client
 

apps/api/src/app/activities/activities.service.spec.ts

@@ -8,6 +8,7 @@ import { AssetProfileSplitService } from '@ghostfolio/api/services/asset-profile
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
+import { TagService } from '@ghostfolio/api/services/tag/tag.service';
 import {
   INVESTMENT_ACTIVITY_TYPES,
   NON_INVESTMENT_ACTIVITY_TYPES
@@ -15,12 +16,15 @@ import {
 import { parseDate } from '@ghostfolio/common/helper';
 import { Activity, Filter } from '@ghostfolio/common/interfaces';
 
+import { EventEmitter2 } from '@nestjs/event-emitter';
 import {
   AssetProfileSplit,
   DataSource,
+  Prisma,
   Type as ActivityType
 } from '@prisma/client';
 import { Big } from 'big.js';
+import { isUUID } from 'class-validator';
 
 import { ActivitiesService } from './activities.service';
 
@@ -49,6 +53,98 @@ describe('ActivitiesService', () => {
     );
   });
 
+  describe('createActivity', () => {
+    it('creates a custom asset profile with a UUID if no asset profile exists for a symbol with the prefix', async () => {
+      const assetProfile = await getCreatedAssetProfile({ symbol: 'GF_COPX' });
+
+      expect(isUUID(assetProfile.symbol)).toBe(true);
+      expect(assetProfile.name).toBe('GF_COPX');
+    });
+
+    it('connects to the existing asset profile of a symbol with the prefix', async () => {
+      const assetProfile = await getCreatedAssetProfile({
+        existingAssetProfile: { id: 'asset-profile-id' },
+        symbol: 'GF_COPX'
+      });
+
+      expect(assetProfile.symbol).toBe('GF_COPX');
+    });
+
+    it('creates a custom asset profile with the requested UUID if no asset profile exists', async () => {
+      const symbol = '1ad7d4a2-6b2d-4e0f-9b1f-2c0f8d3e5a7b';
+
+      const assetProfile = await getCreatedAssetProfile({ symbol });
+
+      expect(assetProfile.symbol).toBe(symbol);
+    });
+
+    async function getCreatedAssetProfile({
+      existingAssetProfile,
+      symbol
+    }: {
+      existingAssetProfile?: { id: string };
+      symbol: string;
+    }) {
+      const create = jest.fn(({ data }: Prisma.OrderCreateArgs) => {
+        return {
+          ...data,
+          SymbolProfile: data.SymbolProfile.connectOrCreate.create
+        };
+      });
+
+      const service = new ActivitiesService(
+        null,
+        null,
+        null,
+        null,
+        null,
+        null,
+        { emit: jest.fn() } as unknown as EventEmitter2,
+        null,
+        null,
+        {
+          order: { create },
+          symbolProfile: {
+            findUnique: jest
+              .fn()
+              .mockResolvedValue(existingAssetProfile ?? null)
+          }
+        } as unknown as PrismaService,
+        null,
+        { validateTagIds: jest.fn() } as unknown as TagService
+      );
+
+      await service.createActivity({
+        currency: 'USD',
+        date: parseDate('2024-01-01'),
+        fee: 0,
+        quantity: 1,
+        SymbolProfile: {
+          connectOrCreate: {
+            create: { symbol, currency: 'USD', dataSource: DataSource.MANUAL },
+            where: {
+              dataSource_symbol: { symbol, dataSource: DataSource.MANUAL }
+            }
+          }
+        },
+        type: 'BUY',
+        unitPrice: 100,
+        user: { connect: { id: 'user-id' } },
+        userId: 'user-id'
+      });
+
+      const { create: assetProfile, where } =
+        create.mock.calls[0][0].data.SymbolProfile.connectOrCreate;
+
+      expect(where.dataSource_symbol).toEqual({
+        dataSource: DataSource.MANUAL,
+        symbol: assetProfile.symbol
+      });
+
+      return assetProfile;
+    }
+  });
+
   describe('getActivities', () => {
     it('returns the activities with the asset profile but without the relation to the symbol profile', async () => {
       const assetProfile = {

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

@@ -34,10 +34,11 @@ import {
 } from '@ghostfolio/common/config';
 import {
   canDeleteAssetProfile,
+  canUseCustomAssetProfileSymbol,
   getAssetProfileIdentifier,
   getStartOfUtcDateOfTomorrow,
-  isDraftActivity,
+  hasGhostfolioPrefix,
-  isValidCustomAssetProfileSymbol
+  isDraftActivity
 } from '@ghostfolio/common/helper';
 import {
   ActivitiesResponse,
@@ -220,19 +221,31 @@ export class ActivitiesService {
       const assetSubClass = data.assetSubClass;
       const dataSource: DataSource = 'MANUAL';
 
+      const requestedSymbol = data.SymbolProfile.connectOrCreate.create.symbol;
+
       let name = data.SymbolProfile.connectOrCreate.create.name;
       let symbol: string;
 
+      const existingAssetProfile = hasGhostfolioPrefix(requestedSymbol)
+        ? await this.prismaService.symbolProfile.findUnique({
+            select: { id: true },
+            where: {
+              dataSource_symbol: { dataSource, symbol: requestedSymbol }
+            }
+          })
+        : null;
+
       if (
-        isValidCustomAssetProfileSymbol(
+        canUseCustomAssetProfileSymbol({
-          data.SymbolProfile.connectOrCreate.create.symbol
+          assetProfile: existingAssetProfile,
-        )
+          symbol: requestedSymbol
+        })
       ) {
         // Connect custom asset profile (clone)
-        symbol = data.SymbolProfile.connectOrCreate.create.symbol;
+        symbol = requestedSymbol;
       } else {
         // Create custom asset profile
-        name = name ?? data.SymbolProfile.connectOrCreate.create.symbol;
+        name = name ?? requestedSymbol;
         symbol = randomUUID();
       }
 

apps/api/src/app/endpoints/benchmarks/benchmarks.service.spec.ts

@@ -0,0 +1,178 @@
+import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
+import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';
+import { BenchmarkService } from '@ghostfolio/api/services/benchmark/benchmark.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 { parseDate } from '@ghostfolio/common/helper';
+
+import { DataSource } from '@prisma/client';
+
+import { BenchmarksService } from './benchmarks.service';
+
+describe('BenchmarksService', () => {
+  let benchmarksService: BenchmarksService;
+  let get: jest.Mock;
+  let getExchangeRatesByCurrency: jest.Mock;
+  let getPerformance: jest.Mock;
+  let getRange: jest.Mock;
+  let marketDataItems: jest.Mock;
+
+  beforeEach(() => {
+    get = jest.fn().mockResolvedValue({ currency: 'USD', marketPrice: 200 });
+    getExchangeRatesByCurrency = jest.fn().mockResolvedValue({});
+    getPerformance = jest.fn().mockResolvedValue({
+      chart: [
+        { date: '2009-01-01' },
+        { date: '2009-06-01' },
+        { date: '2010-07-18' },
+        { date: '2010-07-19' }
+      ]
+    });
+    getRange = jest.fn().mockResolvedValue([]);
+    marketDataItems = jest.fn();
+
+    benchmarksService = new BenchmarksService(
+      new BenchmarkService(null, null, null, null, null, null),
+      { getExchangeRatesByCurrency } as unknown as ExchangeRateDataService,
+      { getRange, marketDataItems } as unknown as MarketDataService,
+      { getPerformance } as unknown as PortfolioService,
+      { get } as unknown as SymbolService
+    );
+  });
+
+  describe('getMarketDataForUser', () => {
+    const getMarketDataForUser = ({
+      endDate = parseDate('2010-07-19')
+    }: { endDate?: Date } = {}) => {
+      return benchmarksService.getMarketDataForUser({
+        endDate,
+        dataSource: DataSource.COINGECKO,
+        dateRange: 'max',
+        startDate: parseDate('2009-01-02'),
+        symbol: 'bitcoin',
+        userId: 'user-id',
+        userSettings: { baseCurrency: 'CHF' }
+      });
+    };
+
+    it('calculates the change since the baseline date', async () => {
+      marketDataItems.mockResolvedValue([
+        { date: new Date('2009-01-01'), marketPrice: 50 },
+        { date: new Date('2009-06-01'), marketPrice: 25 },
+        { date: new Date('2010-07-18'), marketPrice: 75 },
+        { date: new Date('2010-07-19'), marketPrice: 100 }
+      ]);
+
+      await expect(getMarketDataForUser()).resolves.toEqual({
+        marketData: [
+          { date: '2009-01-01', value: 0 },
+          { date: '2009-06-01', value: -50 },
+          { date: '2010-07-18', value: 50 },
+          { date: '2010-07-19', value: 100 }
+        ]
+      });
+
+      expect(getRange).not.toHaveBeenCalled();
+    });
+
+    it('returns no values before the market data of the benchmark starts', async () => {
+      marketDataItems.mockResolvedValue([
+        { date: new Date('2010-07-18'), marketPrice: 50 },
+        { date: new Date('2010-07-19'), marketPrice: 100 }
+      ]);
+
+      await expect(getMarketDataForUser()).resolves.toEqual({
+        marketData: [
+          { date: '2010-07-18', value: 0 },
+          { date: '2010-07-19', value: 100 }
+        ]
+      });
+
+      expect(getRange).toHaveBeenCalledWith({
+        assetProfileIdentifiers: [
+          { dataSource: DataSource.COINGECKO, symbol: 'bitcoin' }
+        ],
+        dateQuery: { lt: new Date('2009-01-01') },
+        take: 1
+      });
+
+      expect(marketDataItems).toHaveBeenCalledWith(
+        expect.objectContaining({ orderBy: { date: 'asc' } })
+      );
+    });
+
+    it('uses the exchange rate at the start of the market data', async () => {
+      getExchangeRatesByCurrency.mockResolvedValue({
+        USDCHF: {
+          '2009-01-01': 2,
+          '2009-06-01': 2,
+          '2010-07-18': 1,
+          '2010-07-19': 1.5
+        }
+      });
+
+      marketDataItems.mockResolvedValue([
+        { date: new Date('2010-07-18'), marketPrice: 50 },
+        { date: new Date('2010-07-19'), marketPrice: 100 }
+      ]);
+
+      await expect(getMarketDataForUser()).resolves.toEqual({
+        marketData: [
+          { date: '2010-07-18', value: 0 },
+          { date: '2010-07-19', value: 200 }
+        ]
+      });
+    });
+
+    it('calculates the value at the end date since the start of the market data', async () => {
+      getExchangeRatesByCurrency.mockResolvedValue({
+        USDCHF: {
+          '2009-01-01': 2,
+          '2010-07-18': 1,
+          '2010-07-19': 1,
+          '2010-07-20': 1.5
+        }
+      });
+
+      marketDataItems.mockResolvedValue([
+        { date: new Date('2010-07-18'), marketPrice: 50 },
+        { date: new Date('2010-07-19'), marketPrice: 100 }
+      ]);
+
+      await expect(
+        getMarketDataForUser({ endDate: parseDate('2010-07-20') })
+      ).resolves.toEqual({
+        marketData: [
+          { date: '2010-07-18', value: 0 },
+          { date: '2010-07-19', value: 100 },
+          { date: '2010-07-20', value: 500 }
+        ]
+      });
+    });
+
+    it('returns no market data if the market data at the baseline date is missing', async () => {
+      getRange.mockResolvedValue([
+        { date: new Date('2008-12-31'), marketPrice: 40 }
+      ]);
+
+      marketDataItems.mockResolvedValue([
+        { date: new Date('2010-07-18'), marketPrice: 50 },
+        { date: new Date('2010-07-19'), marketPrice: 100 }
+      ]);
+
+      await expect(getMarketDataForUser()).resolves.toEqual({
+        marketData: []
+      });
+
+      expect(getExchangeRatesByCurrency).not.toHaveBeenCalled();
+    });
+
+    it('returns no market data if the benchmark has none', async () => {
+      marketDataItems.mockResolvedValue([]);
+
+      await expect(getMarketDataForUser()).resolves.toEqual({
+        marketData: []
+      });
+    });
+  });
+});

apps/api/src/app/endpoints/benchmarks/benchmarks.service.ts

@@ -94,25 +94,15 @@ export class BenchmarksService {
 
     const baselineDate = resetHours(parseDate(chart[0].date));
 
-    const exchangeRates =
+    // The market data of the benchmark can start after the baseline date.
-      await this.exchangeRateDataService.getExchangeRatesByCurrency({
+    // In this case, the first market data item is the start and there is no
-        currencies: [currentSymbolItem.currency],
+    // value before it.
-        startDate: min([baselineDate, startDate]),
+    const [firstMarketDataItem] = marketDataItems;
-        targetCurrency: userCurrency
+    const marketPriceAtStartDate = firstMarketDataItem?.marketPrice;
-      });
-
-    const exchangeRateAtStartDate =
-      exchangeRates[`${currentSymbolItem.currency}${userCurrency}`]?.[
-        format(baselineDate, DATE_FORMAT)
-      ];
-
-    const marketPriceAtStartDate = marketDataItems?.find(({ date }) => {
-      return isSameDay(date, baselineDate);
-    })?.marketPrice;
 
     if (!marketPriceAtStartDate) {
       this.logger.error(
-        `No historical market data has been found for ${symbol} (${dataSource}) at ${format(
+        `No historical market data has been found for ${symbol} (${dataSource}) since ${format(
           baselineDate,
           DATE_FORMAT
         )}`
@@ -121,6 +111,47 @@ export class BenchmarksService {
       return { marketData };
     }
 
+    if (!isSameDay(firstMarketDataItem.date, baselineDate)) {
+      // If market data exists before the baseline date, the market data at
+      // the baseline date is missing and the benchmark does not start later
+      const [marketDataItemBeforeBaselineDate] =
+        await this.marketDataService.getRange({
+          assetProfileIdentifiers: [{ dataSource, symbol }],
+          dateQuery: { lt: baselineDate },
+          take: 1
+        });
+
+      if (marketDataItemBeforeBaselineDate) {
+        this.logger.error(
+          `No historical market data has been found for ${symbol} (${dataSource}) at ${format(
+            baselineDate,
+            DATE_FORMAT
+          )}`
+        );
+
+        return { marketData };
+      }
+
+      this.logger.warn(
+        `The market data of ${symbol} (${dataSource}) starts at ${format(
+          firstMarketDataItem.date,
+          DATE_FORMAT
+        )}, after the baseline date ${format(baselineDate, DATE_FORMAT)}`
+      );
+    }
+
+    const exchangeRates =
+      await this.exchangeRateDataService.getExchangeRatesByCurrency({
+        currencies: [currentSymbolItem.currency],
+        startDate: min([baselineDate, startDate]),
+        targetCurrency: userCurrency
+      });
+
+    const exchangeRateAtStartDate =
+      exchangeRates[`${currentSymbolItem.currency}${userCurrency}`]?.[
+        format(firstMarketDataItem.date, DATE_FORMAT)
+      ];
+
     for (const marketDataItem of marketDataItems) {
       const exchangeRate =
         exchangeRates[`${currentSymbolItem.currency}${userCurrency}`]?.[

apps/api/src/app/endpoints/mcp/mcp.controller.spec.ts

@@ -2,12 +2,17 @@ import { REQUIRES_SCOPE_KEY } from '@ghostfolio/api/decorators/requires-scope.de
 import { McpToolExceptionFilter } from '@ghostfolio/api/filters/mcp-tool-exception.filter';
 import { AccessGuard } from '@ghostfolio/api/guards/access.guard';
 import { getMcpUserOfBearerToken } from '@ghostfolio/api/helper/bearer-token.helper';
+import { SubscriptionType } from '@ghostfolio/common/enums';
 import {
   getScopesOfAccess,
   getScopesOfAccessLevel,
   Scope,
   scopes
 } from '@ghostfolio/common/scopes';
+import type {
+  AccessLevel,
+  ImpersonationContext
+} from '@ghostfolio/common/types';
 
 import {
   EXCEPTION_FILTERS_METADATA,
@@ -23,6 +28,7 @@ import {
 } from '@rekog/mcp-nest';
 
 import { GhostfolioMcpController } from './mcp.controller';
+import { McpService } from './mcp.service';
 
 /**
  * Gives the metadata which a decorator sets on the method of a tool. The
@@ -83,6 +89,86 @@ function getNamesOfListedTools(request: unknown) {
     });
 }
 
+/**
+ * Gives for each tool which reads the portfolio whether the controller asks
+ * the service for the monetary values
+ */
+async function getWithValuesOfReadTools(accessLevel: AccessLevel) {
+  const mcpService = {
+    getAccounts: jest.fn(),
+    getActivities: jest.fn(),
+    getPerformance: jest.fn(),
+    getPortfolio: jest.fn()
+  };
+
+  const controller = new GhostfolioMcpController(
+    mcpService as unknown as McpService
+  );
+
+  const impersonationContext = {
+    isActive: true,
+    scopes: getScopesOfAccess({
+      scopes: getScopesOfAccessLevel(accessLevel),
+      type: 'MCP'
+    }),
+    userId: 'user-id',
+    userSettings: { baseCurrency: 'CHF' }
+  } as ImpersonationContext;
+
+  await controller.getAccounts(impersonationContext, {});
+  await controller.getActivities(
+    impersonationContext,
+    {} as Parameters<GhostfolioMcpController['getActivities']>[1]
+  );
+  await controller.getPerformance(
+    impersonationContext,
+    {} as Parameters<GhostfolioMcpController['getPerformance']>[1]
+  );
+  await controller.getPortfolio(impersonationContext);
+
+  return Object.values(mcpService).map((method) => {
+    return (method.mock.calls[0][0] as { withValues: boolean }).withValues;
+  });
+}
+
+/**
+ * Gives whether the controller asks the service for the asset performance in
+ * base currency of an access with the permission "View"
+ */
+async function getWithAssetPerformanceInBaseCurrency(
+  subscriptionType?: SubscriptionType
+) {
+  const mcpService = { getPerformance: jest.fn() };
+
+  const controller = new GhostfolioMcpController(
+    mcpService as unknown as McpService
+  );
+
+  await controller.getPerformance(
+    {
+      isActive: true,
+      scopes: getScopesOfAccess({
+        scopes: getScopesOfAccessLevel('READ'),
+        type: 'MCP'
+      }),
+      userId: 'user-id',
+      userSettings: { baseCurrency: 'CHF' },
+      userSubscription: subscriptionType
+        ? ({
+            type: subscriptionType
+          } as ImpersonationContext['userSubscription'])
+        : undefined
+    },
+    {} as Parameters<GhostfolioMcpController['getPerformance']>[1]
+  );
+
+  return (
+    mcpService.getPerformance.mock.calls[0][0] as {
+      withAssetPerformanceInBaseCurrency: boolean;
+    }
+  ).withAssetPerformanceInBaseCurrency;
+}
+
 describe('GhostfolioMcpController', () => {
   // A tool without the decorator of the scope would be open to every access,
   // hence a new tool has to declare its scope
@@ -163,6 +249,82 @@ describe('GhostfolioMcpController', () => {
     ]);
   });
 
+  it('Lists only the tools to read for an access with the permission "View"', () => {
+    expect(
+      getNamesOfListedTools({
+        impersonationOfBearerToken: {
+          isActive: true,
+          scopes: getScopesOfAccess({
+            scopes: getScopesOfAccessLevel('READ'),
+            type: 'MCP'
+          })
+        }
+      })
+    ).toEqual([
+      'get-accounts',
+      'get-activities',
+      'get-performance',
+      'get-portfolio',
+      'get-watchlist'
+    ]);
+  });
+
+  it('Lists every tool for an access with the permission "View and manage"', () => {
+    expect(
+      getNamesOfListedTools({
+        impersonationOfBearerToken: {
+          isActive: true,
+          scopes: getScopesOfAccess({
+            scopes: getScopesOfAccessLevel('CREATE_READ_UPDATE_DELETE'),
+            type: 'MCP'
+          })
+        }
+      })
+    ).toEqual([
+      'get-accounts',
+      'get-activities',
+      'get-performance',
+      'get-portfolio',
+      'get-watchlist',
+      'import-activities',
+      'search-asset-profiles'
+    ]);
+  });
+
+  it('Gives the monetary values for an access with the permission "View"', async () => {
+    expect(await getWithValuesOfReadTools('READ')).toEqual([
+      true,
+      true,
+      true,
+      true
+    ]);
+  });
+
+  it('Gives no monetary values for an access with the permission "Restricted view"', async () => {
+    expect(await getWithValuesOfReadTools('READ_RESTRICTED')).toEqual([
+      false,
+      false,
+      false,
+      false
+    ]);
+  });
+
+  it('Gives the asset performance in base currency for a Premium subscription', async () => {
+    expect(
+      await getWithAssetPerformanceInBaseCurrency(SubscriptionType.Premium)
+    ).toBe(true);
+  });
+
+  it('Gives the asset performance in base currency if the subscription is disabled', async () => {
+    expect(await getWithAssetPerformanceInBaseCurrency()).toBe(true);
+  });
+
+  it('Gives no asset performance in base currency for a Basic subscription', async () => {
+    expect(
+      await getWithAssetPerformanceInBaseCurrency(SubscriptionType.Basic)
+    ).toBe(false);
+  });
+
   it('Lists no tool for an inactive access', () => {
     expect(
       getNamesOfListedTools({

apps/api/src/app/endpoints/mcp/mcp.controller.ts

@@ -3,7 +3,8 @@ import { RequiresScopeOfAccess } from '@ghostfolio/api/decorators/requires-scope
 import { McpToolExceptionFilter } from '@ghostfolio/api/filters/mcp-tool-exception.filter';
 import { PortfolioTableService } from '@ghostfolio/api/services/portfolio-table/portfolio-table.service';
 import { MCP_MAX_ACTIVITIES } from '@ghostfolio/common/config';
-import { scopes } from '@ghostfolio/common/scopes';
+import { SubscriptionType } from '@ghostfolio/common/enums';
+import { hasScope, scopes } from '@ghostfolio/common/scopes';
 import type { ImpersonationContext } from '@ghostfolio/common/types';
 
 import { UseFilters } from '@nestjs/common';
@@ -35,15 +36,22 @@ export class GhostfolioMcpController {
     },
     description: `Gives the accounts of the portfolio with these columns: ${PortfolioTableService.getAccountsTableColumnNames().join(
       ', '
-    )}. The allocation in percentage is relative to the accounts of the result, hence the parameters change it.`,
+    )}. If the access reads the monetary values, these columns are given in addition: ${PortfolioTableService.getAccountsTableValueColumnNames().join(
+      ', '
+    )}. The allocation in percentage is relative to the accounts of the result, hence the parameters change it. The parameters change the value in base currency as well. With the holding parameter, it is the value of the holding in the account without the cash balance. Without the holding parameter, it includes the full cash balance of the account, also with the assetClasses parameter. The balance is always the full cash balance of the account in the currency of the account.`,
     name: 'get-accounts',
     parameters: GET_ACCOUNTS_PARAMETERS
   })
   public async getAccounts(
-    @Impersonation() { userId }: ImpersonationContext,
+    @Impersonation()
+    { scopes: impersonationScopes, userId }: ImpersonationContext,
     @Payload() parameters: z.infer<typeof GET_ACCOUNTS_PARAMETERS>
   ) {
-    return this.mcpService.getAccounts({ ...parameters, userId });
+    return this.mcpService.getAccounts({
+      ...parameters,
+      userId,
+      withValues: this.hasScopeToReadValues(impersonationScopes)
+    });
   }
 
   @RequiresScopeOfAccess(scopes.activityRead)
@@ -55,18 +63,22 @@ export class GhostfolioMcpController {
     },
     description: `Gives the activities of the portfolio, the most recent first, with these columns: ${PortfolioTableService.getActivitiesTableColumnNames().join(
       ', '
-    )}. At most ${MCP_MAX_ACTIVITIES} activities are given per call, hence narrow the result with the parameters or get the further activities with the skip parameter.`,
+    )}. If the access reads the monetary values, these columns are given in addition: ${PortfolioTableService.getActivitiesTableValueColumnNames().join(
+      ', '
+    )}. The unit price and the fee are in the currency of the activity. At most ${MCP_MAX_ACTIVITIES} activities are given per call, hence narrow the result with the parameters or get the further activities with the skip parameter.`,
     name: 'get-activities',
     parameters: GET_ACTIVITIES_PARAMETERS
   })
   public async getActivities(
-    @Impersonation() { userId, userSettings }: ImpersonationContext,
+    @Impersonation()
+    { scopes: impersonationScopes, userId, userSettings }: ImpersonationContext,
     @Payload() parameters: z.infer<typeof GET_ACTIVITIES_PARAMETERS>
   ) {
     return this.mcpService.getActivities({
       ...parameters,
       userId,
-      userCurrency: userSettings.baseCurrency
+      userCurrency: userSettings.baseCurrency,
+      withValues: this.hasScopeToReadValues(impersonationScopes)
     });
   }
 
@@ -79,15 +91,28 @@ export class GhostfolioMcpController {
     },
     description: `Gives the performance of the portfolio in the date range with these columns: ${PortfolioTableService.getPerformanceTableColumnNames().join(
       ', '
-    )}. The asset performance excludes the effect of the exchange rates, the currency performance is that effect, and the net performance is the sum of both in the base currency of the user. Each performance is the return on average investment (ROAI) and includes the dividends (total return). The accounts and the activities which are excluded from analysis are not part of the performance. The parameters limit the performance to the holdings of the accounts, of the asset classes or of the asset profile.`,
+    )}. If the access reads the monetary values, these columns are given in addition: ${PortfolioTableService.getPerformanceTableValueColumnNames().join(
+      ', '
+    )}. The value in base currency is the value at the end of the date range. The asset performance excludes the effect of the exchange rates, the currency performance is that effect, and the net performance is the sum of both in the base currency of the user. Each performance is the return on average investment (ROAI) and includes the dividends (total return). The accounts and the activities which are excluded from analysis are not part of the performance. The parameters limit the performance to the holdings of the accounts, of the asset classes or of the asset profile.`,
     name: 'get-performance',
     parameters: GET_PERFORMANCE_PARAMETERS
   })
   public async getPerformance(
-    @Impersonation() { userId }: ImpersonationContext,
+    @Impersonation()
+    {
+      scopes: impersonationScopes,
+      userId,
+      userSubscription
+    }: ImpersonationContext,
     @Payload() parameters: z.infer<typeof GET_PERFORMANCE_PARAMETERS>
   ) {
-    return this.mcpService.getPerformance({ ...parameters, userId });
+    return this.mcpService.getPerformance({
+      ...parameters,
+      userId,
+      withAssetPerformanceInBaseCurrency:
+        userSubscription?.type !== SubscriptionType.Basic,
+      withValues: this.hasScopeToReadValues(impersonationScopes)
+    });
   }
 
   @RequiresScopeOfAccess(scopes.portfolioRead)
@@ -99,11 +124,19 @@ export class GhostfolioMcpController {
     },
     description: `Gives the holdings of the portfolio with these columns: ${PortfolioTableService.getHoldingsTableColumnNames().join(
       ', '
+    )}. If the access reads the monetary values, these columns are given in addition: ${PortfolioTableService.getHoldingsTableValueColumnNames().join(
+      ', '
     )}.`,
     name: 'get-portfolio'
   })
-  public async getPortfolio(@Impersonation() { userId }: ImpersonationContext) {
+  public async getPortfolio(
-    return this.mcpService.getPortfolio({ userId });
+    @Impersonation()
+    { scopes: impersonationScopes, userId }: ImpersonationContext
+  ) {
+    return this.mcpService.getPortfolio({
+      userId,
+      withValues: this.hasScopeToReadValues(impersonationScopes)
+    });
   }
 
   @RequiresScopeOfAccess(scopes.watchlistRead)
@@ -159,4 +192,8 @@ export class GhostfolioMcpController {
   ) {
     return this.mcpService.searchAssetProfiles({ ...parameters, userId });
   }
+
+  private hasScopeToReadValues(impersonationScopes: string[]) {
+    return hasScope(impersonationScopes, scopes.portfolioReadValues);
+  }
 }

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

@@ -7,6 +7,7 @@ import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { PortfolioTableModule } from '@ghostfolio/api/services/portfolio-table/portfolio-table.module';
+import { PortfolioTableService } from '@ghostfolio/api/services/portfolio-table/portfolio-table.service';
 import { MCP_ENDPOINT } from '@ghostfolio/common/config';
 
 import { Module } from '@nestjs/common';
@@ -37,9 +38,20 @@ import { McpService } from './mcp.service';
       useFactory: (configurationService: ConfigurationService) => {
         const { hostname } = new URL(configurationService.get('ROOT_URL'));
 
+        const instructions = [
+          'Ghostfolio is a wealth management application. The tools read the portfolio and the watchlist of the user who granted the access and import activities into the portfolio. They give the quantities and the monetary values only if the access has the permission "View" or "View and manage", otherwise no quantity and no monetary value (except the unit price of an activity). Only the tools which the permission of the access covers are listed. To import activities, the access needs the permission "Restricted view and manage" or "View and manage".'
+        ];
+
+        if (configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+          instructions.push(
+            `With the Basic subscription, the tool get-performance does not give these columns: ${PortfolioTableService.getAssetPerformanceInBaseCurrencyColumnNames().join(
+              ', '
+            )}.`
+          );
+        }
+
         return new McpStrategy({
-          instructions:
+          instructions: instructions.join(' '),
-            'Ghostfolio is a wealth management application. The tools read the portfolio and the watchlist of the user who granted the access and import activities into the portfolio. They give no quantity and no monetary value (except the unit price of an activity). Only the tools which the permission of the access covers are listed. To import activities, the access needs the permission "Restricted view and manage".',
           name: 'ghostfolio',
           resolveUser: getMcpUserOfBearerToken,
           title: 'Ghostfolio',

apps/api/src/app/endpoints/mcp/mcp.service.spec.ts

@@ -169,6 +169,14 @@ describe('McpService', () => {
         userId
       });
     });
+
+    it('Gives the values if the access reads them', async () => {
+      await mcpService.getAccounts({ userId, withValues: true });
+
+      expect(portfolioTableService.getAccountsTable).toHaveBeenCalledWith(
+        expect.objectContaining({ withValues: true })
+      );
+    });
   });
 
   describe('getActivities', () => {
@@ -272,6 +280,14 @@ describe('McpService', () => {
         types: [ActivityType.BUY]
       });
     });
+
+    it('Gives the values if the access reads them', async () => {
+      await getActivities({ withValues: true });
+
+      expect(portfolioTableService.getActivitiesTable).toHaveBeenCalledWith(
+        expect.objectContaining({ withValues: true })
+      );
+    });
   });
 
   describe('getPerformance', () => {
@@ -350,6 +366,30 @@ describe('McpService', () => {
         dateRange: '2024'
       });
     });
+
+    it('Gives the values if the access reads them', async () => {
+      await mcpService.getPerformance({
+        userId,
+        range: '2024',
+        withValues: true
+      });
+
+      expect(portfolioTableService.getPerformanceTable).toHaveBeenCalledWith(
+        expect.objectContaining({ withValues: true })
+      );
+    });
+
+    it('Gives the asset performance in base currency if the subscription permits it', async () => {
+      await mcpService.getPerformance({
+        userId,
+        range: '2024',
+        withAssetPerformanceInBaseCurrency: true
+      });
+
+      expect(portfolioTableService.getPerformanceTable).toHaveBeenCalledWith(
+        expect.objectContaining({ withAssetPerformanceInBaseCurrency: true })
+      );
+    });
   });
 
   describe('getPortfolio', () => {
@@ -364,6 +404,14 @@ describe('McpService', () => {
         withDataSource: true
       });
     });
+
+    it('Gives the values if the access reads them', async () => {
+      await mcpService.getPortfolio({ userId, withValues: true });
+
+      expect(portfolioTableService.getHoldingsTable).toHaveBeenCalledWith(
+        expect.objectContaining({ withValues: true })
+      );
+    });
   });
 
   describe('getWatchlist', () => {

apps/api/src/app/endpoints/mcp/mcp.service.ts

@@ -39,8 +39,12 @@ export class McpService {
     accountIds,
     assetClasses,
     holding,
-    userId
+    userId,
-  }: z.infer<typeof GET_ACCOUNTS_PARAMETERS> & { userId: string }) {
+    withValues
+  }: z.infer<typeof GET_ACCOUNTS_PARAMETERS> & {
+    userId: string;
+    withValues?: boolean;
+  }) {
     const filters = this.apiService.buildFiltersFromQueryParams({
       ...this.getHoldingFilterParameters({ holding }),
       filterByAccounts: accountIds,
@@ -49,7 +53,8 @@ export class McpService {
 
     const table = await this.portfolioTableService.getAccountsTable({
       filters,
-      userId
+      userId,
+      withValues
     });
 
     return this.getTextResult(table);
@@ -63,10 +68,12 @@ export class McpService {
     skip,
     take,
     userCurrency,
-    userId
+    userId,
+    withValues
   }: z.infer<typeof GET_ACTIVITIES_PARAMETERS> & {
     userCurrency: string;
     userId: string;
+    withValues?: boolean;
   }) {
     let endDate: Date | undefined;
     let startDate: Date | undefined;
@@ -90,6 +97,7 @@ export class McpService {
       take,
       userCurrency,
       userId,
+      withValues,
       types: activityTypes
     });
 
@@ -101,8 +109,14 @@ export class McpService {
     assetClasses,
     holding,
     range,
-    userId
+    userId,
-  }: z.infer<typeof GET_PERFORMANCE_PARAMETERS> & { userId: string }) {
+    withAssetPerformanceInBaseCurrency,
+    withValues
+  }: z.infer<typeof GET_PERFORMANCE_PARAMETERS> & {
+    userId: string;
+    withAssetPerformanceInBaseCurrency?: boolean;
+    withValues?: boolean;
+  }) {
     const filters = this.apiService.buildFiltersFromQueryParams({
       ...this.getHoldingFilterParameters({ holding }),
       filterByAccounts: accountIds,
@@ -112,15 +126,24 @@ export class McpService {
     const table = await this.portfolioTableService.getPerformanceTable({
       filters,
       userId,
+      withAssetPerformanceInBaseCurrency,
+      withValues,
       dateRange: range
     });
 
     return this.getTextResult(table);
   }
 
-  public async getPortfolio({ userId }: { userId: string }) {
+  public async getPortfolio({
+    userId,
+    withValues
+  }: {
+    userId: string;
+    withValues?: boolean;
+  }) {
     const table = await this.portfolioTableService.getHoldingsTable({
       userId,
+      withValues,
       languageCode: DEFAULT_LANGUAGE_CODE,
       withDataSource: true
     });

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

@@ -3,10 +3,15 @@ import { ActivitiesService } from '@ghostfolio/api/app/activities/activities.ser
 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 { DataGatheringService } from '@ghostfolio/api/services/queues/data-gathering/data-gathering.service';
+import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import { TagService } from '@ghostfolio/api/services/tag/tag.service';
 import { NON_INVESTMENT_ACTIVITY_TYPES } from '@ghostfolio/common/config';
-import { CreateOrderDto } from '@ghostfolio/common/dtos';
+import {
+  CreateAssetProfileWithMarketDataDto,
+  CreateOrderDto
+} from '@ghostfolio/common/dtos';
 import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
 import {
   Activity,
@@ -15,6 +20,7 @@ import {
 import { UserWithSettings } from '@ghostfolio/common/types';
 
 import { DataSource, SymbolProfile } from '@prisma/client';
+import { isUUID } from 'class-validator';
 import { parseISO } from 'date-fns';
 
 import { ImportService } from './import.service';
@@ -22,9 +28,11 @@ import { ImportService } from './import.service';
 const CUSTOM_ASSET_PROFILE_SYMBOL = '1ad7d4a2-6b2d-4e0f-9b1f-2c0f8d3e5a7b';
 
 describe('ImportService', () => {
+  let addSymbolProfile: jest.Mock;
   let createActivity: jest.Mock;
   let gatherSymbols: jest.Mock;
   let importService: ImportService;
+  let updateManyMarketData: jest.Mock;
 
   beforeEach(() => {
     const configuration = {
@@ -33,8 +41,10 @@ describe('ImportService', () => {
       MAX_ACTIVITIES_TO_IMPORT: Number.MAX_SAFE_INTEGER
     };
 
+    addSymbolProfile = jest.fn();
     createActivity = jest.fn();
     gatherSymbols = jest.fn();
+    updateManyMarketData = jest.fn();
 
     const validateActivities = jest.fn(
       ({ activitiesDto }: { activitiesDto: CreateOrderDto[] }) => {
@@ -77,10 +87,14 @@ describe('ImportService', () => {
       {
         toCurrencyAtDate: jest.fn().mockResolvedValue(0)
       } as unknown as ExchangeRateDataService,
+      { updateMany: updateManyMarketData } as unknown as MarketDataService,
       null,
       null,
-      null,
+      {
-      null,
+        add: addSymbolProfile,
+        getCustomSymbolProfilesByNames: jest.fn().mockResolvedValue([]),
+        getSymbolProfiles: jest.fn().mockResolvedValue([])
+      } as unknown as SymbolProfileService,
       {
         getTagsForUser: jest.fn().mockResolvedValue([])
       } as unknown as TagService
@@ -275,6 +289,146 @@ describe('ImportService', () => {
       ]);
     });
 
+    it('creates a custom asset profile with a UUID instead of a symbol with the prefix', async () => {
+      mockCreatedAssetProfiles([
+        { dataSource: DataSource.MANUAL, symbol: CUSTOM_ASSET_PROFILE_SYMBOL }
+      ]);
+
+      await importActivities({
+        activitiesDto: [
+          createActivityDto({
+            dataSource: DataSource.MANUAL,
+            date: '2024-01-01T00:00:00.000Z',
+            symbol: 'GF_COPX',
+            type: 'BUY'
+          })
+        ],
+        assetProfilesWithMarketDataDto: [
+          {
+            currency: 'USD',
+            dataSource: DataSource.MANUAL,
+            marketData: [],
+            name: 'Global X Copper Miners ETF',
+            symbol: 'GF_COPX'
+          }
+        ]
+      });
+
+      const { symbol } = addSymbolProfile.mock.calls[0][0];
+
+      expect(isUUID(symbol)).toBe(true);
+
+      expect(
+        createActivity.mock.calls[0][0].SymbolProfile.connectOrCreate.create
+      ).toMatchObject({ symbol, dataSource: DataSource.MANUAL });
+    });
+
+    it('keeps the symbol with the prefix as the name of a custom asset profile without a name', async () => {
+      mockCreatedAssetProfiles([
+        { dataSource: DataSource.MANUAL, symbol: CUSTOM_ASSET_PROFILE_SYMBOL }
+      ]);
+
+      await importActivities({
+        activitiesDto: [
+          createActivityDto({
+            dataSource: DataSource.MANUAL,
+            date: '2024-01-01T00:00:00.000Z',
+            symbol: 'GF_COPX',
+            type: 'BUY'
+          })
+        ],
+        assetProfilesWithMarketDataDto: [
+          {
+            currency: 'USD',
+            dataSource: DataSource.MANUAL,
+            marketData: [],
+            symbol: 'GF_COPX'
+          }
+        ]
+      });
+
+      expect(addSymbolProfile.mock.calls[0][0].name).toBe('GF_COPX');
+    });
+
+    it('merges the market data of asset profiles with the same symbol with the prefix', async () => {
+      mockCreatedAssetProfiles([
+        { dataSource: DataSource.MANUAL, symbol: CUSTOM_ASSET_PROFILE_SYMBOL }
+      ]);
+
+      await importActivities({
+        activitiesDto: [
+          createActivityDto({
+            dataSource: DataSource.MANUAL,
+            date: '2024-01-01T00:00:00.000Z',
+            symbol: 'GF_COPX',
+            type: 'BUY'
+          })
+        ],
+        assetProfilesWithMarketDataDto: [
+          {
+            currency: 'USD',
+            dataSource: DataSource.MANUAL,
+            marketData: [{ date: '2024-01-01', marketPrice: 100 }],
+            name: 'Global X Copper Miners ETF',
+            symbol: 'GF_COPX'
+          },
+          {
+            currency: 'USD',
+            dataSource: DataSource.MANUAL,
+            marketData: [{ date: '2024-01-02', marketPrice: 101 }],
+            name: 'Global X Copper Miners ETF',
+            symbol: 'GF_COPX'
+          }
+        ]
+      });
+
+      const { symbol } = addSymbolProfile.mock.calls[0][0];
+
+      expect(addSymbolProfile).toHaveBeenCalledTimes(1);
+
+      expect(updateManyMarketData.mock.calls[0][0].data).toMatchObject([
+        { symbol, date: '2024-01-01', marketPrice: 100 },
+        { symbol, date: '2024-01-02', marketPrice: 101 }
+      ]);
+
+      expect(
+        createActivity.mock.calls[0][0].SymbolProfile.connectOrCreate.create
+      ).toMatchObject({ symbol, dataSource: DataSource.MANUAL });
+    });
+
+    it('refers the next activities with a symbol with the prefix to the custom asset profile which createActivity() has created', async () => {
+      mockCreatedAssetProfiles([
+        { dataSource: DataSource.MANUAL, symbol: CUSTOM_ASSET_PROFILE_SYMBOL },
+        { dataSource: DataSource.MANUAL, symbol: CUSTOM_ASSET_PROFILE_SYMBOL }
+      ]);
+
+      await importActivities({
+        activitiesDto: [
+          createActivityDto({
+            dataSource: DataSource.MANUAL,
+            date: '2024-01-01T00:00:00.000Z',
+            symbol: 'GF_COPX',
+            type: 'BUY'
+          }),
+          createActivityDto({
+            dataSource: DataSource.MANUAL,
+            date: '2024-01-02T00:00:00.000Z',
+            symbol: 'GF_COPX',
+            type: 'BUY'
+          })
+        ]
+      });
+
+      expect(
+        createActivity.mock.calls.map(([activity]) => {
+          return activity.SymbolProfile.connectOrCreate.create;
+        })
+      ).toMatchObject([
+        { dataSource: DataSource.MANUAL, symbol: 'GF_COPX' },
+        { dataSource: DataSource.MANUAL, symbol: CUSTOM_ASSET_PROFILE_SYMBOL }
+      ]);
+    });
+
     it('keeps the asset profiles of the activities in a dry run', async () => {
       const activities = await importActivities({
         activitiesDto: [
@@ -306,16 +460,18 @@ describe('ImportService', () => {
 
   function importActivities({
     activitiesDto,
+    assetProfilesWithMarketDataDto = [],
     isDryRun
   }: {
     activitiesDto: CreateOrderDto[];
+    assetProfilesWithMarketDataDto?: CreateAssetProfileWithMarketDataDto[];
     isDryRun?: boolean;
   }) {
     return importService.import({
       activitiesDto,
+      assetProfilesWithMarketDataDto,
       isDryRun,
       accountsWithBalancesDto: [],
-      assetProfilesWithMarketDataDto: [],
       platformsDto: [],
       tagsDto: [],
       user: {

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

@@ -27,6 +27,7 @@ import {
 import { SubscriptionType } from '@ghostfolio/common/enums';
 import {
   getAssetProfileIdentifier,
+  hasGhostfolioPrefix,
   isValidCustomAssetProfileSymbol,
   parseDate
 } from '@ghostfolio/common/helper';
@@ -649,9 +650,23 @@ export class ImportService {
               'marketData'
             );
 
-            // Asset profile belongs to a different user, generate a new symbol
+            if (
-            if (existingAssetProfile && !isDryRun) {
+              (existingAssetProfile || hasGhostfolioPrefix(symbol)) &&
-              symbol = randomUUID();
+              !isDryRun
+            ) {
+              const isSymbolOfAssetProfileToCreate = assetProfilesToCreate.some(
+                ({ assetProfile: { symbol: symbolToCreate } }) => {
+                  return symbolToCreate === assetProfileSymbolMapping[symbol];
+                }
+              );
+
+              if (hasGhostfolioPrefix(symbol)) {
+                assetProfile.name ??= symbol;
+              }
+
+              symbol = isSymbolOfAssetProfileToCreate
+                ? assetProfileSymbolMapping[symbol]
+                : randomUUID();
             }
 
             assetProfile.symbol = symbol;

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

@@ -4,7 +4,8 @@ import { Impersonation } from '@ghostfolio/api/decorators/impersonation.decorato
 import { RequiresScope } from '@ghostfolio/api/decorators/requires-scope.decorator';
 import {
   hasNotDefinedValuesInObject,
-  nullifyValuesInObject
+  nullifyValuesInObject,
+  nullifyValuesInObjects
 } from '@ghostfolio/api/helper/object.helper';
 import { convertValuesToPercentages } from '@ghostfolio/api/helper/portfolio.helper';
 import { PerformanceLoggingInterceptor } from '@ghostfolio/api/interceptors/performance-logging/performance-logging.interceptor';
@@ -583,14 +584,22 @@ export class PortfolioController {
       this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
       this.request.user.subscription?.type === SubscriptionType.Basic
     ) {
-      performanceInformation.chart = performanceInformation.chart.map(
+      performanceInformation.chart = nullifyValuesInObjects(
-        (item) => {
+        performanceInformation.chart,
-          return nullifyValuesInObject(item, [
+        [
-            'dividendInBaseCurrency',
+          'dividendInBaseCurrency',
-            'totalInvestment',
+          'totalInvestment',
-            'value'
+          'value',
-          ]);
+          ...(groupBy === 'year'
-        }
+            ? [
+                'investmentValueWithCurrencyEffect',
+                'netPerformance',
+                'netPerformanceInPercentage',
+                'netPerformanceInPercentageWithCurrencyEffect',
+                'netPerformanceWithCurrencyEffect'
+              ]
+            : [])
+        ]
       );
       performanceInformation.performance = nullifyValuesInObject(
         performanceInformation.performance,

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

@@ -1052,7 +1052,6 @@ export class PortfolioService {
 
     const historicalData = await this.dataProviderService.getHistorical(
       [{ dataSource, symbol }],
-      'day',
       parseISO(dateOfFirstActivity, { in: utc }),
       new Date()
     );

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

@@ -371,7 +371,6 @@ export class DataProviderService implements OnModuleInit {
 
   public async getHistorical(
     aItems: AssetProfileIdentifier[],
-    aGranularity: Granularity = 'month',
     from: Date,
     to: Date
   ): Promise<{
@@ -389,11 +388,6 @@ export class DataProviderService implements OnModuleInit {
       return response;
     }
 
-    const granularityQuery =
-      aGranularity === 'month'
-        ? Prisma.sql`AND (date_part('day', date) = 1 OR date >= TIMESTAMP 'yesterday')`
-        : Prisma.empty;
-
     const rangeQuery =
       from && to
         ? Prisma.sql`AND date >= ${format(from, DATE_FORMAT, {
@@ -403,22 +397,18 @@ export class DataProviderService implements OnModuleInit {
           })}::timestamp`
         : Prisma.empty;
 
-    const dataSources = aItems.map(({ dataSource }) => {
+    const assetProfileIdentifiers = aItems.map(({ dataSource, symbol }) => {
-      return dataSource;
+      return Prisma.sql`(${dataSource}::"DataSource", ${symbol})`;
-    });
-
-    const symbols = aItems.map(({ symbol }) => {
-      return symbol;
     });
 
     try {
-      const marketDataByGranularity: MarketData[] = await this.prismaService
+      const marketDataByGranularity: Pick<
-        .$queryRaw`
+        MarketData,
-          SELECT *
+        'dataSource' | 'date' | 'marketPrice' | 'symbol'
+      >[] = await this.prismaService.$queryRaw`
+          SELECT "dataSource", "date", "marketPrice", "symbol"
           FROM "MarketData"
-          WHERE "dataSource"::text IN (${Prisma.join(dataSources)})
+          WHERE ("dataSource", "symbol") IN (${Prisma.join(assetProfileIdentifiers)})
-            AND "symbol" IN (${Prisma.join(symbols)})
-            ${granularityQuery}
             ${rangeQuery}
           ORDER BY date;`;
 

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

@@ -175,7 +175,6 @@ export class ExchangeRateDataService {
 
     const historicalData = await this.dataProviderService.getHistorical(
       this.currencyPairs,
-      'day',
       startOfUtcDateOfYesterday,
       startOfUtcDateOfYesterday
     );

apps/api/src/services/portfolio-table/portfolio-table.service.spec.ts

@@ -84,7 +84,8 @@ function createAccount({
     currency: 'CHF',
     platform: { name: 'Platform A' },
     tags: isExcluded ? [{ id: TAG_ID_EXCLUDE_FROM_ANALYSIS }] : [],
-    value: 2000
+    value: 2000,
+    valueInBaseCurrency: 1800
   } as unknown as AccountWithValue;
 }
 
@@ -105,8 +106,11 @@ function createActivity({
     },
     currency: 'CHF',
     date: new Date('2024-01-01'),
+    fee: 1.5,
+    quantity: 5,
     type: 'BUY',
-    unitPrice: 100
+    unitPrice: 100,
+    valueInBaseCurrency: 512.3456
   } as unknown as Activity;
 }
 
@@ -143,20 +147,24 @@ function createHolding({
 }
 
 function createPerformance({
+  netPerformance = 200,
   netPerformancePercentage = 0.1,
-  netPerformancePercentageWithCurrencyEffect = 0.15
+  netPerformancePercentageWithCurrencyEffect = 0.15,
+  netPerformanceWithCurrencyEffect = 300
 }: {
+  netPerformance?: number;
   netPerformancePercentage?: number;
   netPerformancePercentageWithCurrencyEffect?: number;
+  netPerformanceWithCurrencyEffect?: number;
 } = {}): PortfolioPerformanceResponse['performance'] {
   return {
+    netPerformance,
     netPerformancePercentage,
     netPerformancePercentageWithCurrencyEffect,
+    netPerformanceWithCurrencyEffect,
     currentNetWorth: 3000,
     currentValueInBaseCurrency: 2000,
     dividendInBaseCurrency: 50,
-    netPerformance: 200,
-    netPerformanceWithCurrencyEffect: 300,
     totalInvestment: 1700,
     totalInvestmentValueWithCurrencyEffect: 1700
   };
@@ -246,9 +254,8 @@ function createPortfolioTableService({
 }
 
 describe('PortfolioTableService', () => {
-  // The tools of the model context protocol are the only callers, and an
+  // A column with a monetary value is given only with the values, hence the
-  // access of that type never grants the scope to read the monetary values,
+  // names of these columns are given separately
-  // hence no table has a column with such a value
   describe('getAccountsTableColumnNames', () => {
     it('gives no column with a monetary value', () => {
       expect(PortfolioTableService.getAccountsTableColumnNames()).toEqual([
@@ -263,6 +270,15 @@ describe('PortfolioTableService', () => {
     });
   });
 
+  describe('getAccountsTableValueColumnNames', () => {
+    it('gives the columns with a monetary value', () => {
+      expect(PortfolioTableService.getAccountsTableValueColumnNames()).toEqual([
+        'Balance',
+        'Value in Base Currency'
+      ]);
+    });
+  });
+
   describe('getActivitiesTableColumnNames', () => {
     it('gives no column with a monetary value', () => {
       expect(PortfolioTableService.getActivitiesTableColumnNames()).toEqual([
@@ -278,6 +294,25 @@ describe('PortfolioTableService', () => {
     });
   });
 
+  describe('getActivitiesTableValueColumnNames', () => {
+    it('gives the columns with a quantity or with a monetary value', () => {
+      expect(
+        PortfolioTableService.getActivitiesTableValueColumnNames()
+      ).toEqual(['Quantity', 'Fee', 'Value in Base Currency']);
+    });
+  });
+
+  describe('getAssetPerformanceInBaseCurrencyColumnNames', () => {
+    it('gives the value columns of the performance which give the asset performance', () => {
+      expect(
+        PortfolioTableService.getAssetPerformanceInBaseCurrencyColumnNames()
+      ).toEqual([
+        'Asset Performance in Base Currency',
+        'Currency Performance in Base Currency'
+      ]);
+    });
+  });
+
   describe('getHoldingsTableColumnNames', () => {
     it('gives no column with a monetary value', () => {
       expect(PortfolioTableService.getHoldingsTableColumnNames()).toEqual([
@@ -294,6 +329,15 @@ describe('PortfolioTableService', () => {
     });
   });
 
+  describe('getHoldingsTableValueColumnNames', () => {
+    it('gives the columns with a quantity or with a monetary value', () => {
+      expect(PortfolioTableService.getHoldingsTableValueColumnNames()).toEqual([
+        'Quantity',
+        'Value in Base Currency'
+      ]);
+    });
+  });
+
   describe('getPerformanceTableColumnNames', () => {
     it('gives no column with a monetary value', () => {
       expect(PortfolioTableService.getPerformanceTableColumnNames()).toEqual([
@@ -304,6 +348,19 @@ describe('PortfolioTableService', () => {
     });
   });
 
+  describe('getPerformanceTableValueColumnNames', () => {
+    it('gives the columns with a monetary value', () => {
+      expect(
+        PortfolioTableService.getPerformanceTableValueColumnNames()
+      ).toEqual([
+        'Value in Base Currency',
+        'Asset Performance in Base Currency',
+        'Currency Performance in Base Currency',
+        'Net Performance in Base Currency'
+      ]);
+    });
+  });
+
   describe('getWatchlistTableColumnNames', () => {
     it('gives no column with a monetary value', () => {
       expect(PortfolioTableService.getWatchlistTableColumnNames()).toEqual([
@@ -331,9 +388,27 @@ describe('PortfolioTableService', () => {
 
       expect(result).not.toContain('Cash Balance');
       expect(result).not.toContain('1000');
+      expect(result).not.toContain('1800');
       expect(result).not.toContain('2000');
     });
 
+    it('gives the balance and the value with the values', async () => {
+      const portfolioTableService = createPortfolioTableService({
+        accounts: [createAccount()]
+      });
+
+      const result = await portfolioTableService.getAccountsTable({
+        userId: 'user-id',
+        withValues: true
+      });
+
+      const [row] = result.split('\n').filter((line) => {
+        return line.startsWith('| account-a-id');
+      });
+
+      expect(row).toMatch(/\| false \| 1000 \| 1800\.00 \|$/);
+    });
+
     // The accountIds parameter of the tool takes the identifiers, hence the
     // table has to give them
     it('gives the identifier of an account', async () => {
@@ -405,6 +480,40 @@ describe('PortfolioTableService', () => {
       expect(rowOfAapl).toContain(`| ${encodeDataSource(DataSource.YAHOO)} |`);
       expect(rowOfGold).toContain(`| ${DataSource.MANUAL} |`);
     });
+
+    it('gives no quantity, no fee and no value by default', async () => {
+      const result = await createPortfolioTableService({
+        activities: [createActivity()]
+      }).getActivitiesTable({
+        take: 50,
+        userCurrency: 'CHF',
+        userId: 'user-id'
+      });
+
+      const [row] = result.split('\n').filter((line) => {
+        return line.startsWith('| 2024-01-01');
+      });
+
+      expect(result).not.toContain('Quantity');
+      expect(row).toMatch(/\| 100 \| Account A \|$/);
+    });
+
+    it('gives the quantity, the fee and the value with the values', async () => {
+      const result = await createPortfolioTableService({
+        activities: [createActivity()]
+      }).getActivitiesTable({
+        take: 50,
+        userCurrency: 'CHF',
+        userId: 'user-id',
+        withValues: true
+      });
+
+      const [row] = result.split('\n').filter((line) => {
+        return line.startsWith('| 2024-01-01');
+      });
+
+      expect(row).toMatch(/\| Account A \| 5 \| 1\.5 \| 512\.35 \|$/);
+    });
   });
 
   describe('getHoldingsTable', () => {
@@ -412,10 +521,12 @@ describe('PortfolioTableService', () => {
       holdings: PortfolioPosition[],
       {
         configuration,
-        withDataSource
+        withDataSource,
+        withValues
       }: {
         configuration?: Record<string, unknown>;
         withDataSource?: boolean;
+        withValues?: boolean;
       } = {}
     ) {
       return createPortfolioTableService({
@@ -423,6 +534,7 @@ describe('PortfolioTableService', () => {
         holdings
       }).getHoldingsTable({
         withDataSource,
+        withValues,
         languageCode: DEFAULT_LANGUAGE_CODE,
         userId: 'user-id'
       });
@@ -516,13 +628,45 @@ describe('PortfolioTableService', () => {
       expect(firstRow).toContain('AAPL');
       expect(secondRow).toContain('MSFT');
     });
+
+    it('gives no quantity and no value by default', async () => {
+      const result = await getHoldingsTable([createHolding()]);
+
+      const [row] = result.split('\n').filter((line) => {
+        return line.startsWith('| Name of AAPL');
+      });
+
+      expect(result).not.toContain('Quantity');
+      expect(row).toMatch(/\| 75\.000% \|$/);
+    });
+
+    it('gives the quantity and the value with the values', async () => {
+      const result = await getHoldingsTable([createHolding()], {
+        withValues: true
+      });
+
+      const [row] = result.split('\n').filter((line) => {
+        return line.startsWith('| Name of AAPL');
+      });
+
+      expect(row).toMatch(/\| 75\.000% \| 5 \| 2000\.00 \|$/);
+    });
   });
 
   describe('getPerformanceTable', () => {
     function getPerformanceTable(
-      parameters: Parameters<typeof createPortfolioTableService>[0] = {}
+      parameters: Parameters<typeof createPortfolioTableService>[0] = {},
+      {
+        withAssetPerformanceInBaseCurrency,
+        withValues
+      }: {
+        withAssetPerformanceInBaseCurrency?: boolean;
+        withValues?: boolean;
+      } = {}
     ) {
       return createPortfolioTableService(parameters).getPerformanceTable({
+        withAssetPerformanceInBaseCurrency,
+        withValues,
         dateRange: 'ytd',
         userId: 'user-id'
       });
@@ -565,6 +709,51 @@ describe('PortfolioTableService', () => {
       }
     });
 
+    it('gives the value and the performance in base currency with the values', async () => {
+      const result = await getPerformanceTable(
+        {},
+        { withAssetPerformanceInBaseCurrency: true, withValues: true }
+      );
+
+      const [row] = result.split('\n').filter((line) => {
+        return line.startsWith('| 10.000%');
+      });
+
+      expect(row).toBe(
+        '| 10.000% | 5.000% | 15.000% | 2000.00 | 200.00 | 100.00 | 300.00 |'
+      );
+    });
+
+    it('gives no asset performance and no currency performance in base currency without the asset performance in base currency', async () => {
+      const result = await getPerformanceTable({}, { withValues: true });
+
+      const [row] = result.split('\n').filter((line) => {
+        return line.startsWith('| 10.000%');
+      });
+
+      expect(result).not.toContain('Asset Performance in Base Currency');
+      expect(result).not.toContain('Currency Performance in Base Currency');
+      expect(row).toBe('| 10.000% | 5.000% | 15.000% | 2000.00 | 300.00 |');
+    });
+
+    it('gives a currency performance in base currency of zero without a sign', async () => {
+      const result = await getPerformanceTable(
+        {
+          performance: createPerformance({
+            netPerformance: 200.000001,
+            netPerformanceWithCurrencyEffect: 200
+          })
+        },
+        { withAssetPerformanceInBaseCurrency: true, withValues: true }
+      );
+
+      const [row] = result.split('\n').filter((line) => {
+        return line.startsWith('| 10.000%');
+      });
+
+      expect(row).toMatch(/\| 200\.00 \| 0\.00 \| 200\.00 \|$/);
+    });
+
     it('tells that no performance is found if the chart is empty', async () => {
       const result = await getPerformanceTable({ chart: [] });
 

apps/api/src/services/portfolio-table/portfolio-table.service.ts

@@ -31,6 +31,17 @@ import { format } from 'date-fns';
 import { DataSourceTableContext } from './interfaces/data-source-table-context.interface';
 import { HoldingsTableColumnDefinition } from './types/holdings-table-column-definition.type';
 
+const ASSET_PERFORMANCE_IN_BASE_CURRENCY_COLUMN_NAME =
+  'Asset Performance in Base Currency';
+
+const CURRENCY_PERFORMANCE_IN_BASE_CURRENCY_COLUMN_NAME =
+  'Currency Performance in Base Currency';
+
+const ASSET_PERFORMANCE_IN_BASE_CURRENCY_COLUMN_NAMES = [
+  ASSET_PERFORMANCE_IN_BASE_CURRENCY_COLUMN_NAME,
+  CURRENCY_PERFORMANCE_IN_BASE_CURRENCY_COLUMN_NAME
+];
+
 const DATA_SOURCE_COLUMN_NAME = 'Data Source';
 
 function getDataSourceColumnDefinition<T>(
@@ -48,15 +59,21 @@ function getDataSourceColumnDefinition<T>(
   };
 }
 
+function getAmount(value: number) {
+  const amount = value.toFixed(2);
+
+  return Number.parseFloat(amount) === 0 ? (0).toFixed(2) : amount;
+}
+
 function getPercentage(value: number) {
   return `${(value * 100).toFixed(3)}%`;
 }
 
 /**
  * Renders the accounts, the activities, the holdings and the performance of a
- * portfolio and the watchlist of its user as a markdown table. No table has a
+ * portfolio and the watchlist of its user as a markdown table. A column with a
- * column with a quantity or with a monetary value, except the unit price of an
+ * quantity or with a monetary value, except the unit price of an activity, is
- * activity.
+ * given only with the values.
  */
 @Injectable()
 export class PortfolioTableService {
@@ -108,6 +125,24 @@ export class PortfolioTableService {
       }
     ];
 
+  private static readonly ACCOUNTS_TABLE_VALUE_COLUMN_DEFINITIONS: TableColumnDefinition<AccountWithValue>[] =
+    [
+      {
+        align: 'right',
+        getValue: ({ balance }) => {
+          return balance.toString();
+        },
+        name: 'Balance'
+      },
+      {
+        align: 'right',
+        getValue: ({ valueInBaseCurrency }) => {
+          return getAmount(valueInBaseCurrency);
+        },
+        name: 'Value in Base Currency'
+      }
+    ];
+
   private static readonly ACTIVITIES_TABLE_COLUMN_DEFINITIONS: TableColumnDefinition<
     Activity,
     DataSourceTableContext
@@ -160,6 +195,33 @@ export class PortfolioTableService {
     }
   ];
 
+  private static readonly ACTIVITIES_TABLE_VALUE_COLUMN_DEFINITIONS: TableColumnDefinition<
+    Activity,
+    DataSourceTableContext
+  >[] = [
+    {
+      align: 'right',
+      getValue: ({ quantity }) => {
+        return quantity.toString();
+      },
+      name: 'Quantity'
+    },
+    {
+      align: 'right',
+      getValue: ({ fee }) => {
+        return fee.toString();
+      },
+      name: 'Fee'
+    },
+    {
+      align: 'right',
+      getValue: ({ valueInBaseCurrency }) => {
+        return getAmount(valueInBaseCurrency);
+      },
+      name: 'Value in Base Currency'
+    }
+  ];
+
   private static readonly HOLDINGS_TABLE_COLUMN_DEFINITIONS: HoldingsTableColumnDefinition[] =
     [
       {
@@ -221,6 +283,26 @@ export class PortfolioTableService {
       }
     ];
 
+  private static readonly HOLDINGS_TABLE_VALUE_COLUMN_DEFINITIONS: HoldingsTableColumnDefinition[] =
+    [
+      {
+        align: 'right',
+        getValue: ({ quantity }) => {
+          return quantity.toString();
+        },
+        name: 'Quantity'
+      },
+      {
+        align: 'right',
+        getValue: ({ valueInBaseCurrency }) => {
+          return valueInBaseCurrency === undefined
+            ? ''
+            : getAmount(valueInBaseCurrency);
+        },
+        name: 'Value in Base Currency'
+      }
+    ];
+
   private static readonly PERFORMANCE_TABLE_COLUMN_DEFINITIONS: TableColumnDefinition<PortfolioPerformance>[] =
     [
       {
@@ -256,6 +338,38 @@ export class PortfolioTableService {
       }
     ];
 
+  private static readonly PERFORMANCE_TABLE_VALUE_COLUMN_DEFINITIONS: TableColumnDefinition<PortfolioPerformance>[] =
+    [
+      {
+        align: 'right',
+        getValue: ({ currentValueInBaseCurrency }) => {
+          return getAmount(currentValueInBaseCurrency);
+        },
+        name: 'Value in Base Currency'
+      },
+      {
+        align: 'right',
+        getValue: ({ netPerformance }) => {
+          return getAmount(netPerformance);
+        },
+        name: ASSET_PERFORMANCE_IN_BASE_CURRENCY_COLUMN_NAME
+      },
+      {
+        align: 'right',
+        getValue: ({ netPerformance, netPerformanceWithCurrencyEffect }) => {
+          return getAmount(netPerformanceWithCurrencyEffect - netPerformance);
+        },
+        name: CURRENCY_PERFORMANCE_IN_BASE_CURRENCY_COLUMN_NAME
+      },
+      {
+        align: 'right',
+        getValue: ({ netPerformanceWithCurrencyEffect }) => {
+          return getAmount(netPerformanceWithCurrencyEffect);
+        },
+        name: 'Net Performance in Base Currency'
+      }
+    ];
+
   private static readonly WATCHLIST_TABLE_COLUMN_DEFINITIONS: TableColumnDefinition<
     WatchlistResponse['watchlist'][number],
     DataSourceTableContext
@@ -326,6 +440,14 @@ export class PortfolioTableService {
     );
   }
 
+  public static getAccountsTableValueColumnNames() {
+    return PortfolioTableService.ACCOUNTS_TABLE_VALUE_COLUMN_DEFINITIONS.map(
+      ({ name }) => {
+        return name;
+      }
+    );
+  }
+
   public static getActivitiesTableColumnNames() {
     return PortfolioTableService.ACTIVITIES_TABLE_COLUMN_DEFINITIONS.map(
       ({ name }) => {
@@ -334,6 +456,18 @@ export class PortfolioTableService {
     );
   }
 
+  public static getActivitiesTableValueColumnNames() {
+    return PortfolioTableService.ACTIVITIES_TABLE_VALUE_COLUMN_DEFINITIONS.map(
+      ({ name }) => {
+        return name;
+      }
+    );
+  }
+
+  public static getAssetPerformanceInBaseCurrencyColumnNames() {
+    return [...ASSET_PERFORMANCE_IN_BASE_CURRENCY_COLUMN_NAMES];
+  }
+
   public static getHoldingsTableColumnNames() {
     return PortfolioTableService.HOLDINGS_TABLE_COLUMN_DEFINITIONS.map(
       ({ name }) => {
@@ -342,6 +476,14 @@ export class PortfolioTableService {
     );
   }
 
+  public static getHoldingsTableValueColumnNames() {
+    return PortfolioTableService.HOLDINGS_TABLE_VALUE_COLUMN_DEFINITIONS.map(
+      ({ name }) => {
+        return name;
+      }
+    );
+  }
+
   public static getPerformanceTableColumnNames() {
     return PortfolioTableService.PERFORMANCE_TABLE_COLUMN_DEFINITIONS.map(
       ({ name }) => {
@@ -350,6 +492,14 @@ export class PortfolioTableService {
     );
   }
 
+  public static getPerformanceTableValueColumnNames() {
+    return PortfolioTableService.PERFORMANCE_TABLE_VALUE_COLUMN_DEFINITIONS.map(
+      ({ name }) => {
+        return name;
+      }
+    );
+  }
+
   public static getWatchlistTableColumnNames() {
     return PortfolioTableService.WATCHLIST_TABLE_COLUMN_DEFINITIONS.map(
       ({ name }) => {
@@ -360,10 +510,12 @@ export class PortfolioTableService {
 
   public async getAccountsTable({
     filters,
-    userId
+    userId,
+    withValues = false
   }: {
     filters?: Filter[];
     userId: string;
+    withValues?: boolean;
   }) {
     const { accounts } =
       await this.portfolioService.getAccountsWithAggregations({
@@ -377,8 +529,13 @@ export class PortfolioTableService {
     if (accounts.length > 0) {
       accountsSection.push(
         await getMarkdownTable({
-          columnDefinitions:
+          columnDefinitions: this.getColumnDefinitions({
-            PortfolioTableService.ACCOUNTS_TABLE_COLUMN_DEFINITIONS,
+            withValues,
+            columnDefinitions:
+              PortfolioTableService.ACCOUNTS_TABLE_COLUMN_DEFINITIONS,
+            valueColumnDefinitions:
+              PortfolioTableService.ACCOUNTS_TABLE_VALUE_COLUMN_DEFINITIONS
+          }),
           rows: accounts
         })
       );
@@ -397,7 +554,8 @@ export class PortfolioTableService {
     take,
     types,
     userCurrency,
-    userId
+    userId,
+    withValues = false
   }: {
     endDate?: Date;
     filters?: Filter[];
@@ -407,6 +565,7 @@ export class PortfolioTableService {
     types?: ActivityType[];
     userCurrency: string;
     userId: string;
+    withValues?: boolean;
   }) {
     const { activities, count } = await this.activitiesService.getActivities({
       endDate,
@@ -437,8 +596,13 @@ export class PortfolioTableService {
       activitiesSection.push(
         '',
         await getMarkdownTable({
-          columnDefinitions:
+          columnDefinitions: this.getColumnDefinitions({
-            PortfolioTableService.ACTIVITIES_TABLE_COLUMN_DEFINITIONS,
+            withValues,
+            columnDefinitions:
+              PortfolioTableService.ACTIVITIES_TABLE_COLUMN_DEFINITIONS,
+            valueColumnDefinitions:
+              PortfolioTableService.ACTIVITIES_TABLE_VALUE_COLUMN_DEFINITIONS
+          }),
           context: { configurationService: this.configurationService },
           rows: activities
         })
@@ -452,12 +616,14 @@ export class PortfolioTableService {
     filters,
     languageCode,
     userId,
-    withDataSource = false
+    withDataSource = false,
+    withValues = false
   }: {
     filters?: Filter[];
     languageCode: string;
     userId: string;
     withDataSource?: boolean;
+    withValues?: boolean;
   }) {
     const { holdings } = await this.portfolioService.getDetails({
       filters,
@@ -484,12 +650,15 @@ export class PortfolioTableService {
       '## Holdings',
       '',
       await getMarkdownTable({
-        columnDefinitions:
+        columnDefinitions: this.getColumnDefinitions({
-          PortfolioTableService.HOLDINGS_TABLE_COLUMN_DEFINITIONS.filter(
+          withValues,
-            ({ name }) => {
+          columnDefinitions:
-              return withDataSource || name !== DATA_SOURCE_COLUMN_NAME;
+            PortfolioTableService.HOLDINGS_TABLE_COLUMN_DEFINITIONS,
-            }
+          valueColumnDefinitions:
-          ),
+            PortfolioTableService.HOLDINGS_TABLE_VALUE_COLUMN_DEFINITIONS
+        }).filter(({ name }) => {
+          return withDataSource || name !== DATA_SOURCE_COLUMN_NAME;
+        }),
         context: {
           assetClassTranslations,
           assetSubClassTranslations,
@@ -503,11 +672,15 @@ export class PortfolioTableService {
   public async getPerformanceTable({
     dateRange,
     filters,
-    userId
+    userId,
+    withAssetPerformanceInBaseCurrency = false,
+    withValues = false
   }: {
     dateRange: DateRange;
     filters?: Filter[];
     userId: string;
+    withAssetPerformanceInBaseCurrency?: boolean;
+    withValues?: boolean;
   }) {
     const { chart, performance } = await this.portfolioService.getPerformance({
       dateRange,
@@ -520,8 +693,18 @@ export class PortfolioTableService {
     if (chart?.length > 0) {
       performanceSection.push(
         await getMarkdownTable({
-          columnDefinitions:
+          columnDefinitions: this.getColumnDefinitions({
-            PortfolioTableService.PERFORMANCE_TABLE_COLUMN_DEFINITIONS,
+            withValues,
+            columnDefinitions:
+              PortfolioTableService.PERFORMANCE_TABLE_COLUMN_DEFINITIONS,
+            valueColumnDefinitions:
+              PortfolioTableService.PERFORMANCE_TABLE_VALUE_COLUMN_DEFINITIONS
+          }).filter(({ name }) => {
+            return (
+              withAssetPerformanceInBaseCurrency ||
+              !ASSET_PERFORMANCE_IN_BASE_CURRENCY_COLUMN_NAMES.includes(name)
+            );
+          }),
           rows: [performance]
         })
       );
@@ -587,6 +770,20 @@ export class PortfolioTableService {
     return `${summary} Get the further activities by raising the skip parameter or narrow the result with the other parameters.`;
   }
 
+  private getColumnDefinitions<T>({
+    columnDefinitions,
+    valueColumnDefinitions,
+    withValues
+  }: {
+    columnDefinitions: T[];
+    valueColumnDefinitions: T[];
+    withValues: boolean;
+  }) {
+    return withValues
+      ? [...columnDefinitions, ...valueColumnDefinitions]
+      : columnDefinitions;
+  }
+
   private getEnumTranslations<T extends string>({
     id,
     languageCode,

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

@@ -48,6 +48,6 @@
 
 @if (showFooter) {
   <footer class="justify-content-center overflow-hidden w-100">
-    <gf-footer class="py-4" [info]="info" [user]="user" />
+    <gf-footer class="py-4" [info]="info" />
   </footer>
 }

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

@@ -35,7 +35,6 @@ import {
   inject,
   OnInit
 } from '@angular/core';
-import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { MatButtonModule } from '@angular/material/button';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
@@ -82,7 +81,6 @@ import {
     MatTabsModule,
     NgxSkeletonLoaderModule
   ],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA],
   selector: 'gf-account-detail-dialog',
   styleUrls: ['./account-detail-dialog.component.scss'],
   templateUrl: 'account-detail-dialog.html'

apps/client/src/app/components/account-detail-dialog/account-detail-dialog.html

@@ -153,7 +153,6 @@
           [hasPermissionToCreateActivity]="data.hasPermissionToCreateActivity"
           [hasPermissionToDeleteActivity]="false"
           [hasPermissionToExportActivities]="!showValuesInPercentage()"
-          [hasPermissionToFilter]="false"
           [hasPermissionToOpenDetails]="false"
           [hasPermissionToUpdateActivity]="data.hasPermissionToUpdateActivity"
           [locale]="user?.settings?.locale"

apps/client/src/app/components/admin-platform/create-or-update-platform-dialog/create-or-update-platform-dialog.html

@@ -28,12 +28,8 @@
           matInput
           (keydown.enter)="$event.stopPropagation()"
         />
-        @if (platformForm.get('url')?.value) {
+        @if (platformForm.get('url')?.value; as url) {
-          <gf-entity-logo
+          <gf-entity-logo class="mat-icon" matSuffix [url]="url" />
-            class="mat-icon"
-            matSuffix
-            [url]="platformForm.get('url').value"
-          />
         }
       </mat-form-field>
     </div>

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

@@ -6,7 +6,7 @@
     <div class="col-sm">
       <div class="h6 mt-2" i18n>Personal Finance</div>
       <ul class="list-unstyled">
-        @if (hasPermissionToAccessFearAndGreedIndex) {
+        @if (hasPermissionToAccessFearAndGreedIndex()) {
           <li>
             <a i18n [routerLink]="routerLinkMarkets">Markets</a>
           </li>
@@ -18,7 +18,7 @@
       <div class="h6 mt-2">Ghostfolio</div>
       <ul class="list-unstyled">
         <li><a i18n [routerLink]="routerLinkAbout">About</a></li>
-        @if (hasPermissionForSubscription) {
+        @if (hasPermissionForSubscription()) {
           <li>
             <a i18n [routerLink]="routerLinkBlog">Blog</a>
           </li>
@@ -27,43 +27,43 @@
           <a i18n [routerLink]="routerLinkAboutChangelog">Changelog</a>
         </li>
         <li><a i18n [routerLink]="routerLinkFeatures">Features</a></li>
-        @if (hasPermissionForSubscription) {
+        @if (hasPermissionForSubscription()) {
           <li>
             <a i18n [routerLink]="routerLinkFaq"
               >Frequently Asked Questions (FAQ)</a
             >
           </li>
         }
-        @if (!hasPermissionForSubscription) {
+        @if (!hasPermissionForSubscription()) {
           <li>
             <a i18n [routerLink]="routerLinkAboutLicense">License</a>
           </li>
         }
-        @if (hasPermissionForStatistics) {
+        @if (hasPermissionForStatistics()) {
           <li>
             <a [routerLink]="routerLinkOpenStartup">Open Startup</a>
           </li>
         }
-        @if (hasPermissionForSubscription) {
+        @if (hasPermissionForSubscription()) {
           <li>
             <a i18n [routerLink]="routerLinkPricing">Pricing</a>
           </li>
         }
-        @if (hasPermissionForSubscription) {
+        @if (hasPermissionForSubscription()) {
           <li>
             <a i18n [routerLink]="routerLinkAboutPrivacyPolicy"
               >Privacy Policy</a
             >
           </li>
         }
-        @if (hasPermissionForSubscription) {
+        @if (hasPermissionForSubscription()) {
           <li>
             <a i18n [routerLink]="routerLinkAboutTermsOfService"
               >Terms of Service</a
             >
           </li>
         }
-        @if (hasPermissionForSubscription) {
+        @if (hasPermissionForSubscription()) {
           <li>
             <a
               class="align-items-baseline d-flex"

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

@@ -1,4 +1,4 @@
-import { InfoItem, User } from '@ghostfolio/common/interfaces';
+import { InfoItem } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import { publicRoutes } from '@ghostfolio/common/routes/routes';
 import { GfLogoComponent } from '@ghostfolio/ui/logo';
@@ -6,9 +6,9 @@ import { GfLogoComponent } from '@ghostfolio/ui/logo';
 import {
   ChangeDetectionStrategy,
   Component,
+  computed,
   CUSTOM_ELEMENTS_SCHEMA,
-  Input,
+  input
-  OnChanges
 } from '@angular/core';
 import { RouterModule } from '@angular/router';
 import { IonIcon } from '@ionic/angular/standalone';
@@ -23,51 +23,53 @@ import { openOutline } from 'ionicons/icons';
   styleUrls: ['./footer.component.scss'],
   templateUrl: './footer.component.html'
 })
-export class GfFooterComponent implements OnChanges {
+export class GfFooterComponent {
-  @Input() public info: InfoItem;
+  public readonly info = input.required<InfoItem | undefined>();
-  @Input() public user: User;
 
-  public currentYear = new Date().getFullYear();
+  protected readonly currentYear = new Date().getFullYear();
-  public hasPermissionForStatistics: boolean;
-  public hasPermissionForSubscription: boolean;
-  public hasPermissionToAccessFearAndGreedIndex: boolean;
-  public routerLinkAbout = publicRoutes.about.routerLink;
-  public routerLinkAboutChangelog =
-    publicRoutes.about.subRoutes.changelog.routerLink;
-  public routerLinkAboutLicense =
-    publicRoutes.about.subRoutes.license.routerLink;
-  public routerLinkAboutPrivacyPolicy =
-    publicRoutes.about.subRoutes.privacyPolicy.routerLink;
-  public routerLinkAboutTermsOfService =
-    publicRoutes.about.subRoutes.termsOfService.routerLink;
-  public routerLinkBlog = publicRoutes.blog.routerLink;
-  public routerLinkFaq = publicRoutes.faq.routerLink;
-  public routerLinkFeatures = publicRoutes.features.routerLink;
-  public routerLinkMarkets = publicRoutes.markets.routerLink;
-  public routerLinkOpenStartup = publicRoutes.openStartup.routerLink;
-  public routerLinkPricing = publicRoutes.pricing.routerLink;
-  public routerLinkResources = publicRoutes.resources.routerLink;
-
-  public constructor() {
-    addIcons({
-      openOutline
-    });
-  }
 
-  public ngOnChanges() {
+  protected readonly hasPermissionForStatistics = computed(() => {
-    this.hasPermissionForStatistics = hasPermission(
+    return hasPermission(
-      this.info?.globalPermissions,
+      this.info()?.globalPermissions,
       permissions.enableStatistics
     );
+  });
 
-    this.hasPermissionForSubscription = hasPermission(
+  protected readonly hasPermissionForSubscription = computed(() => {
-      this.info?.globalPermissions,
+    return hasPermission(
+      this.info()?.globalPermissions,
       permissions.enableSubscription
     );
+  });
 
-    this.hasPermissionToAccessFearAndGreedIndex = hasPermission(
+  protected readonly hasPermissionToAccessFearAndGreedIndex = computed(() => {
-      this.info?.globalPermissions,
+    return hasPermission(
+      this.info()?.globalPermissions,
       permissions.enableFearAndGreedIndex
     );
+  });
+
+  protected readonly routerLinkAbout = publicRoutes.about.routerLink;
+  protected readonly routerLinkAboutChangelog =
+    publicRoutes.about.subRoutes.changelog.routerLink;
+  protected readonly routerLinkAboutLicense =
+    publicRoutes.about.subRoutes.license.routerLink;
+  protected readonly routerLinkAboutPrivacyPolicy =
+    publicRoutes.about.subRoutes.privacyPolicy.routerLink;
+  protected readonly routerLinkAboutTermsOfService =
+    publicRoutes.about.subRoutes.termsOfService.routerLink;
+  protected readonly routerLinkBlog = publicRoutes.blog.routerLink;
+  protected readonly routerLinkFaq = publicRoutes.faq.routerLink;
+  protected readonly routerLinkFeatures = publicRoutes.features.routerLink;
+  protected readonly routerLinkMarkets = publicRoutes.markets.routerLink;
+  protected readonly routerLinkOpenStartup =
+    publicRoutes.openStartup.routerLink;
+  protected readonly routerLinkPricing = publicRoutes.pricing.routerLink;
+  protected readonly routerLinkResources = publicRoutes.resources.routerLink;
+
+  public constructor() {
+    addIcons({
+      openOutline
+    });
   }
 }

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

@@ -124,7 +124,7 @@
           >About</a
         >
       </li>
-      @if (hasPermissionToAccessAssistant) {
+      @if (hasPermissionToAccessAssistant && user(); as user) {
         <li class="d-inline-flex list-inline-item">
           <button
             #assistantTrigger="matMenuTrigger"
@@ -144,7 +144,7 @@
             class="no-max-width"
             xPosition="before"
             [overlapTrigger]="true"
-            (closed)="assistantElement()?.setIsOpen(false)"
+            (closed)="assistantElement().setIsOpen(false)"
           >
             <gf-assistant
               #assistant
@@ -156,7 +156,7 @@
                 hasPermissionToChangeDateRange()
               "
               [hasPermissionToChangeFilters]="hasPermissionToChangeFilters()"
-              [user]="user()"
+              [user]="user"
               (closed)="closeAssistant()"
               (dateRangeChanged)="onDateRangeChange($event)"
               (filtersChanged)="onFiltersChanged($event)"
@@ -191,7 +191,7 @@
             <a class="d-flex" mat-menu-item [routerLink]="routerLinkPricing"
               ><span class="align-items-center d-flex"
                 ><span>
-                  @if (user().subscription.offer.isRenewal) {
+                  @if (user()?.subscription?.offer?.isRenewal) {
                     <ng-container i18n>Renew Plan</ng-container>
                   } @else {
                     <ng-container i18n>Upgrade Plan</ng-container>
@@ -203,7 +203,7 @@
             ></a>
             <hr class="m-0" />
           }
-          @if (user()?.access?.length > 0) {
+          @if ((user()?.access?.length ?? 0) > 0) {
             <button mat-menu-item (click)="impersonateAccount(null)">
               <span class="align-items-center d-flex">
                 <ion-icon

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

@@ -41,7 +41,6 @@ import { GfTagsSelectorComponent } from '@ghostfolio/ui/tags-selector';
 import { GfValueComponent } from '@ghostfolio/ui/value';
 
 import {
-  CUSTOM_ELEMENTS_SCHEMA,
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
@@ -116,7 +115,6 @@ import {
     ReactiveFormsModule,
     RouterModule
   ],
-  schemas: [CUSTOM_ELEMENTS_SCHEMA],
   selector: 'gf-holding-detail-dialog',
   styleUrls: ['./holding-detail-dialog.component.scss'],
   templateUrl: 'holding-detail-dialog.html'

apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.html

@@ -383,7 +383,6 @@
           [hasPermissionToExportActivities]="
             !data.impersonationId && !user?.settings?.isRestrictedView
           "
-          [hasPermissionToFilter]="false"
           [hasPermissionToOpenDetails]="false"
           [hasPermissionToUpdateActivity]="data.hasPermissionToUpdateActivity"
           [locale]="data.locale"

apps/client/src/app/components/home-holdings/home-holdings.component.ts

@@ -1,5 +1,9 @@
 import { UserService } from '@ghostfolio/client/services/user/user.service';
-import { DEFAULT_LOCALE } from '@ghostfolio/common/config';
+import {
+  DEFAULT_CURRENCY,
+  DEFAULT_DATE_RANGE,
+  DEFAULT_LOCALE
+} from '@ghostfolio/common/config';
 import {
   AssetProfileIdentifier,
   PortfolioPosition,
@@ -22,10 +26,12 @@ import {
   ChangeDetectionStrategy,
   ChangeDetectorRef,
   Component,
+  computed,
   CUSTOM_ELEMENTS_SCHEMA,
   DestroyRef,
   inject,
-  OnInit
+  OnInit,
+  signal
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { MatButtonModule } from '@angular/material/button';
@@ -51,9 +57,22 @@ import { DeviceDetectorService } from 'ngx-device-detector';
 export class GfHomeHoldingsComponent implements OnInit {
   public static DEFAULT_HOLDINGS_VIEW_MODE: HoldingsViewMode = 'TABLE';
 
-  protected readonly DEFAULT_LOCALE = DEFAULT_LOCALE;
+  protected readonly baseCurrency = computed(() => {
+    return this.user()?.settings?.baseCurrency ?? DEFAULT_CURRENCY;
+  });
+
+  protected readonly colorScheme = computed(() => {
+    return this.user()?.settings?.colorScheme;
+  });
+
+  protected readonly dateRange = computed(() => {
+    return this.user()?.settings?.dateRange ?? DEFAULT_DATE_RANGE;
+  });
+
+  protected readonly deviceType = computed(() => {
+    return this.deviceDetectorService.deviceInfo().deviceType;
+  });
 
-  protected deviceType: string;
   protected hasPermissionToAccessHoldingsChart: boolean;
   protected hasPermissionToCreateActivity: boolean;
   protected holdings: PortfolioPosition[] | undefined;
@@ -78,9 +97,14 @@ export class GfHomeHoldingsComponent implements OnInit {
     { label: $localize`Closed`, value: 'CLOSED' }
   ];
   protected isHoldingsViewModeToggleDisabled = true;
+
+  protected readonly locale = computed(() => {
+    return this.user()?.settings?.locale ?? DEFAULT_LOCALE;
+  });
+
   protected readonly routerLinkPortfolioActivities =
     internalRoutes.portfolio.subRoutes.activities.routerLink;
-  protected user: User;
+  protected readonly user = signal<User | null>(null);
 
   private readonly changeDetectorRef = inject(ChangeDetectorRef);
   private readonly dataService = inject(DataService);
@@ -94,22 +118,22 @@ export class GfHomeHoldingsComponent implements OnInit {
   }
 
   public ngOnInit() {
-    this.deviceType = this.deviceDetectorService.getDeviceInfo().deviceType;
-
     this.userService.stateChanged
       .pipe(takeUntilDestroyed(this.destroyRef))
       .subscribe((state) => {
         if (state?.user) {
-          this.user = state.user;
+          const user = state.user;
+
+          this.user.set(user);
 
           this.hasPermissionToAccessHoldingsChart = hasPermission(
-            this.user.permissions,
+            user.permissions,
             permissions.accessHoldingsChart
           );
 
           this.hasPermissionToCreateActivity =
-            hasPermission(this.user.permissions, permissions.createActivity) &&
+            hasPermission(user.permissions, permissions.createActivity) &&
-            hasScope(this.user.scopes, scopes.activityCreate);
+            hasScope(user.scopes, scopes.activityCreate);
 
           this.initialize();
         }
@@ -129,7 +153,7 @@ export class GfHomeHoldingsComponent implements OnInit {
           .get(true)
           .pipe(takeUntilDestroyed(this.destroyRef))
           .subscribe((user) => {
-            this.user = user;
+            this.user.set(user);
 
             this.changeDetectorRef.markForCheck();
           });
@@ -144,7 +168,7 @@ export class GfHomeHoldingsComponent implements OnInit {
 
   protected onHoldingClicked({ dataSource, symbol }: AssetProfileIdentifier) {
     if (dataSource && symbol) {
-      this.router.navigate([], {
+      void this.router.navigate([], {
         queryParams: { dataSource, symbol, holdingDetailDialog: true }
       });
     }
@@ -157,7 +181,7 @@ export class GfHomeHoldingsComponent implements OnInit {
 
     return this.dataService.fetchPortfolioHoldings({
       filters,
-      range: this.user?.settings?.dateRange
+      range: this.user()?.settings?.dateRange
     });
   }
 
@@ -171,9 +195,9 @@ export class GfHomeHoldingsComponent implements OnInit {
       this.isHoldingsViewModeToggleDisabled = false;
 
       this.holdingsViewMode =
-        this.deviceType === 'mobile'
+        this.deviceType() === 'mobile'
           ? GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE
-          : (this.user?.settings?.holdingsViewMode ??
+          : (this.user()?.settings?.holdingsViewMode ??
             GfHomeHoldingsComponent.DEFAULT_HOLDINGS_VIEW_MODE);
     } else {
       this.holdingsViewMode =

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

@@ -27,18 +27,18 @@
         <gf-treemap-chart
           class="mt-3"
           cursor="pointer"
-          [baseCurrency]="user?.settings?.baseCurrency"
+          [baseCurrency]="baseCurrency()"
-          [colorScheme]="user?.settings?.colorScheme"
+          [colorScheme]="colorScheme()"
-          [dateRange]="user?.settings?.dateRange"
+          [dateRange]="dateRange()"
           [holdings]="holdings"
-          [locale]="user?.settings?.locale"
+          [locale]="locale()"
           (treemapChartClicked)="onHoldingClicked($event)"
         />
       }
       <div [class.d-none]="holdingsViewMode !== 'TABLE'">
         <gf-holdings-table
           [holdings]="holdings"
-          [locale]="user?.settings?.locale ?? DEFAULT_LOCALE"
+          [locale]="locale()"
           (holdingClicked)="onHoldingClicked($event)"
         />
         @if (hasPermissionToCreateActivity && (holdings?.length ?? 0) > 0) {

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

@@ -53,7 +53,6 @@ import { DeviceDetectorService } from 'ngx-device-detector';
   templateUrl: './home-overview.html'
 })
 export class GfHomeOverviewComponent implements OnInit {
-  protected readonly DEFAULT_LOCALE = DEFAULT_LOCALE;
   protected readonly errors = signal<AssetProfileIdentifier[]>([]);
   protected readonly hasImpersonationId = signal(false);
   protected readonly historicalDataItems = signal<LineChartItem[] | null>(null);
@@ -61,6 +60,11 @@ export class GfHomeOverviewComponent implements OnInit {
     undefined
   );
   protected readonly isLoadingPerformance = signal(true);
+
+  protected readonly locale = computed(() => {
+    return this.user()?.settings?.locale ?? DEFAULT_LOCALE;
+  });
+
   protected readonly performance = signal<PortfolioPerformance | null>(null);
   protected readonly performanceLabel = $localize`Performance`;
   protected readonly precision = signal(2);
@@ -147,7 +151,7 @@ export class GfHomeOverviewComponent implements OnInit {
 
   protected onHoldingClicked({ dataSource, symbol }: AssetProfileIdentifier) {
     if (dataSource && symbol) {
-      this.router.navigate([], {
+      void this.router.navigate([], {
         queryParams: { dataSource, symbol, holdingDetailDialog: true }
       });
     }

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

@@ -11,7 +11,10 @@
         <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" [class.text-muted]="user()?.accounts?.length > 1">
+          <li
+            class="mb-2"
+            [class.text-muted]="(user()?.accounts?.length ?? 0) > 1"
+          >
             <a class="d-block" [routerLink]="routerLinkAccounts"
               ><span i18n>Setup your accounts</span><br />
               <span class="font-weight-normal" i18n
@@ -48,7 +51,7 @@
             >
               <ng-container i18n>Setup accounts</ng-container>
             </a>
-          } @else if (user()?.accounts?.length > 1) {
+          } @else if ((user()?.accounts?.length ?? 0) > 1) {
             <a
               color="primary"
               mat-flat-button
@@ -73,25 +76,23 @@
             [historicalDataItems]="historicalDataItems()"
             [isAnimated]="user()?.settings?.dateRange === '1d' ? false : true"
             [label]="performanceLabel"
-            [locale]="user()?.settings?.locale"
+            [locale]="locale()"
             [showGradient]="true"
             [showLoader]="false"
             [showXAxis]="false"
             [showYAxis]="false"
           />
         </div>
-        <div class="overview-container row mt-1">
+        <div class="mt-1">
-          <div class="col">
+          <gf-portfolio-performance
-            <gf-portfolio-performance
+            [errors]="errors()"
-              [errors]="errors()"
+            [isLoading]="isLoadingPerformance()"
-              [isLoading]="isLoadingPerformance()"
+            [locale]="locale()"
-              [locale]="user()?.settings?.locale"
+            [performance]="performance()"
-              [performance]="performance()"
+            [precision]="precision()"
-              [precision]="precision()"
+            [showDetails]="showDetails()"
-              [showDetails]="showDetails()"
+            [unit]="unit()"
-              [unit]="unit()"
+          />
-            />
-          </div>
         </div>
       </div>
       @if (showExperimentalHoldings()) {
@@ -107,7 +108,7 @@
               <gf-holdings-table
                 mode="simple"
                 [holdings]="holdings()"
-                [locale]="user()?.settings?.locale ?? DEFAULT_LOCALE"
+                [locale]="locale()"
                 (holdingClicked)="onHoldingClicked($event)"
               />
             </mat-card-content>

apps/client/src/app/components/investment-chart/investment-chart.component.ts

@@ -113,10 +113,15 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy {
   }
 
   private initialize() {
-    // Create a clone
+    const isBarChart = !!this.groupBy;
+
+    const benchmarkColorRgb = isBarChart ? primaryColorRgb : secondaryColorRgb;
+
+    // Create clones of the input data
     this.investments = this.benchmarkDataItems.map((item) =>
       Object.assign({}, item)
     );
+
     this.values = this.historicalDataItems.map((item) =>
       Object.assign({}, item)
     );
@@ -127,9 +132,9 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy {
       }),
       datasets: [
         {
-          backgroundColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
+          backgroundColor: `rgb(${benchmarkColorRgb.r}, ${benchmarkColorRgb.g}, ${benchmarkColorRgb.b})`,
-          borderColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
+          borderColor: `rgb(${benchmarkColorRgb.r}, ${benchmarkColorRgb.g}, ${benchmarkColorRgb.b})`,
-          borderWidth: this.groupBy ? 0 : 1,
+          borderWidth: isBarChart ? 0 : 1,
           data: this.investments.map(({ date, investment }) => {
             return {
               x: parseDate(date)?.getTime() ?? null,
@@ -141,7 +146,7 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy {
             borderColor: (context) =>
               this.isInFuture(
                 context,
-                `rgba(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b}, 0.67)`
+                `rgba(${benchmarkColorRgb.r}, ${benchmarkColorRgb.g}, ${benchmarkColorRgb.b}, 0.67)`
               ),
             borderDash: (context) => this.isInFuture(context, [2, 2])
           },
@@ -200,10 +205,10 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy {
                   annotations: {
                     savingsRate: this.savingsRate
                       ? {
-                          borderColor: `rgba(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b}, 0.75)`,
+                          borderColor: `rgba(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b}, 0.75)`,
                           borderWidth: 1,
                           label: {
-                            backgroundColor: `rgb(${primaryColorRgb.r}, ${primaryColorRgb.g}, ${primaryColorRgb.b})`,
+                            backgroundColor: `rgb(${secondaryColorRgb.r}, ${secondaryColorRgb.g}, ${secondaryColorRgb.b})`,
                             borderRadius: 2,
                             color: 'white',
                             content: $localize`Savings Rate`,
@@ -234,7 +239,7 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy {
               responsive: true,
               scales: {
                 x: getTimeAxisOptions({
-                  borderWidth: this.groupBy ? 0 : 1,
+                  borderWidth: isBarChart ? 0 : 1,
                   colorScheme: this.colorScheme,
                   locale: this.locale
                 }),
@@ -250,7 +255,7 @@ export class GfInvestmentChartComponent implements OnChanges, OnDestroy {
             plugins: [
               getVerticalHoverLinePlugin(this.chartCanvas(), this.colorScheme)
             ],
-            type: this.groupBy ? 'bar' : 'line'
+            type: isBarChart ? 'bar' : 'line'
           }
         );
       }

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

@@ -3,8 +3,8 @@ import { DEFAULT_LOCALE } from '@ghostfolio/common/config';
 import { resetHours } from '@ghostfolio/common/helper';
 import {
   Benchmark,
-  HistoricalDataItem,
   InfoItem,
+  LineChartItem,
   MarketDataOfMarketsResponse,
   User
 } from '@ghostfolio/common/interfaces';
@@ -28,6 +28,7 @@ import {
   signal
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
+import { isNumber } from 'lodash-es';
 import { DeviceDetectorService } from 'ngx-device-detector';
 
 @Component({
@@ -66,7 +67,7 @@ export class GfMarketsComponent implements OnInit {
   protected fearAndGreedIndexMode: FearAndGreedIndexMode = 'STOCKS';
   protected hasPermissionToAccessFearAndGreedIndex: boolean;
   protected hasPermissionToReadMarketDataOfMarkets: boolean;
-  protected historicalDataItems: HistoricalDataItem[];
+  protected historicalDataItems: LineChartItem[];
   protected isLoadingFearAndGreedIndex = true;
   protected user: User;
 
@@ -158,13 +159,20 @@ export class GfMarketsComponent implements OnInit {
     this.fearAndGreedIndex =
       this.fearAndGreedIndexData[this.fearAndGreedIndexMode]?.marketPrice;
 
-    this.historicalDataItems = [
+    const historicalDataItems = (
-      ...(this.fearAndGreedIndexData[this.fearAndGreedIndexMode]
+      this.fearAndGreedIndexData[this.fearAndGreedIndexMode]?.historicalData ??
-        ?.historicalData ?? []),
+      []
-      {
+    ).filter((item): item is LineChartItem => {
+      return isNumber(item.value);
+    });
+
+    if (isNumber(this.fearAndGreedIndex)) {
+      historicalDataItems.push({
         date: resetHours(new Date()).toISOString(),
         value: this.fearAndGreedIndex
-      }
+      });
-    ];
+    }
+
+    this.historicalDataItems = historicalDataItems;
   }
 }

apps/client/src/app/components/markets/markets.html

@@ -29,7 +29,7 @@
             [colorScheme]="user?.settings?.colorScheme"
             [historicalDataItems]="historicalDataItems"
             [isAnimated]="true"
-            [locale]="user?.settings?.locale || undefined"
+            [locale]="user?.settings?.locale ?? DEFAULT_LOCALE"
             [showXAxis]="true"
             [showYAxis]="true"
             [yMax]="100"

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

@@ -1,6 +1,6 @@
 <div class="container p-0">
   <div class="no-gutters row">
-    <div class="status-container text-muted text-right">
+    <div class="px-1 status-container text-muted text-right">
       @if ((errors()?.length ?? 0) > 0 && !isLoading()) {
         <ion-icon
           i18n-title
@@ -33,7 +33,7 @@
     </div>
   </div>
   @if (showDetails()) {
-    <div class="row">
+    <div class="mx-0 row">
       <div class="d-flex col justify-content-end">
         <gf-value
           [colorizeSign]="true"

apps/client/src/app/components/portfolio-performance/portfolio-performance.component.scss

@@ -4,7 +4,6 @@
   .currency-container,
   .status-container {
     flex: 1;
-    min-width: 2.5rem;
   }
 
   .status-container {

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

@@ -35,9 +35,9 @@ import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
 })
 export class GfPortfolioPerformanceComponent {
   public readonly errors = input<ResponseError['errors']>();
-  public readonly isLoading = input<boolean>();
+  public readonly isLoading = input<boolean>(false);
   public readonly locale = input<string>(getLocale());
-  public readonly performance = input.required<PortfolioPerformance>();
+  public readonly performance = input.required<PortfolioPerformance | null>();
   public readonly precision = input.required<number, number>({
     transform: (value) => {
       return value >= 0 ? value : 2;
@@ -60,17 +60,19 @@ export class GfPortfolioPerformanceComponent {
           this.value().nativeElement.innerHTML = '';
         }
       } else {
-        if (isNumber(this.performance().currentValueInBaseCurrency)) {
+        const performance = this.performance();
-          new CountUp('value', this.performance().currentValueInBaseCurrency, {
+
+        if (isNumber(performance?.currentValueInBaseCurrency)) {
+          new CountUp('value', performance.currentValueInBaseCurrency, {
             decimal: getNumberFormatDecimal(this.locale()),
             decimalPlaces: this.precision(),
             duration: 1,
             separator: getNumberFormatGroup(this.locale())
           }).start();
-        } else if (this.showDetails() === false) {
+        } else if (this.showDetails() === false && performance) {
           new CountUp(
             'value',
-            this.performance().netPerformancePercentageWithCurrencyEffect * 100,
+            performance.netPerformancePercentageWithCurrencyEffect * 100,
             {
               decimal: getNumberFormatDecimal(this.locale()),
               decimalPlaces: 2,

apps/client/src/app/components/rule/rule-settings-dialog/interfaces/interfaces.ts

@@ -5,7 +5,7 @@ import {
 
 export interface RuleSettingsDialogParams {
   categoryName: string;
-  locale: string;
+  locale?: string;
   rule: PortfolioReportRule;
   settings: XRayRulesSettings['AccountClusterRiskCurrentInvestment'];
 }

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

@@ -8,11 +8,10 @@ import {
 import {
   ChangeDetectionStrategy,
   Component,
+  computed,
   DestroyRef,
-  EventEmitter,
   Input,
-  OnInit,
+  output
-  Output
 } from '@angular/core';
 import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
 import { MatButtonModule } from '@angular/material/button';
@@ -41,17 +40,20 @@ import { GfRuleSettingsDialogComponent } from './rule-settings-dialog/rule-setti
   styleUrls: ['./rule.component.scss'],
   templateUrl: './rule.component.html'
 })
-export class GfRuleComponent implements OnInit {
+export class GfRuleComponent {
   @Input() categoryName: string;
   @Input() hasPermissionToUpdateUserSettings: boolean;
   @Input() isLoading: boolean;
-  @Input() locale: string;
+  @Input() locale?: string;
   @Input() rule: PortfolioReportRule;
   @Input() settings: XRayRulesSettings['AccountClusterRiskCurrentInvestment'];
 
-  @Output() ruleUpdated = new EventEmitter<UpdateUserSettingDto>();
+  public readonly ruleUpdated = output<UpdateUserSettingDto>();
+
+  private readonly deviceType = computed(() => {
+    return this.deviceDetectorService.deviceInfo().deviceType;
+  });
 
-  private deviceType: string;
   public constructor(
     private destroyRef: DestroyRef,
     private deviceDetectorService: DeviceDetectorService,
@@ -67,11 +69,7 @@ export class GfRuleComponent implements OnInit {
     });
   }
 
-  public ngOnInit() {
+  protected onCustomizeRule(rule: PortfolioReportRule) {
-    this.deviceType = this.deviceDetectorService.getDeviceInfo().deviceType;
-  }
-
-  public onCustomizeRule(rule: PortfolioReportRule) {
     const dialogRef = this.dialog.open<
       GfRuleSettingsDialogComponent,
       RuleSettingsDialogParams
@@ -82,7 +80,7 @@ export class GfRuleComponent implements OnInit {
         locale: this.locale,
         settings: this.settings
       },
-      width: this.deviceType === 'mobile' ? '100vw' : '50rem'
+      width: this.deviceType() === 'mobile' ? '100vw' : '50rem'
     });
 
     dialogRef
@@ -99,7 +97,7 @@ export class GfRuleComponent implements OnInit {
       });
   }
 
-  public onUpdateRule(rule: PortfolioReportRule) {
+  protected onUpdateRule(rule: PortfolioReportRule) {
     const settings: UpdateUserSettingDto = {
       xRayRules: {
         [rule.key]: { isActive: !rule.isActive }

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

@@ -8,9 +8,8 @@ import {
 import {
   ChangeDetectionStrategy,
   Component,
-  EventEmitter,
   Input,
-  Output
+  output
 } from '@angular/core';
 import { MatButtonModule } from '@angular/material/button';
 import { MatCardModule } from '@angular/material/card';
@@ -26,13 +25,13 @@ export class GfRulesComponent {
   @Input() categoryName: string;
   @Input() hasPermissionToUpdateUserSettings: boolean;
   @Input() isLoading: boolean;
-  @Input() locale: string;
+  @Input() locale?: string;
   @Input() rules: PortfolioReportRule[];
-  @Input() settings: XRayRulesSettings;
+  @Input() settings?: XRayRulesSettings;
 
-  @Output() rulesUpdated = new EventEmitter<UpdateUserSettingDto>();
+  public readonly rulesUpdated = output<UpdateUserSettingDto>();
 
-  public onRuleUpdated(event: UpdateUserSettingDto) {
+  protected onRuleUpdated(event: UpdateUserSettingDto) {
     this.rulesUpdated.emit(event);
   }
 }

apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts

@@ -7,6 +7,7 @@ import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import {
   Scope,
   canGrantRestrictedWriteAccess,
+  canGrantUnrestrictedReadAccess,
   getAccessLevel,
   getScopesOfAccess,
   getScopesOfAccessLevel,
@@ -139,6 +140,10 @@ export class GfCreateOrUpdateAccessDialogComponent implements OnInit {
     return canGrantRestrictedWriteAccess({ type: this.accessType });
   }
 
+  public get canGrantUnrestrictedReadAccess() {
+    return canGrantUnrestrictedReadAccess({ type: this.accessType });
+  }
+
   public get canGrantWriteAccess() {
     return this.hasExperimentalFeatures;
   }
@@ -202,13 +207,16 @@ export class GfCreateOrUpdateAccessDialogComponent implements OnInit {
           granteeUserIdControl?.setValue(null);
         }
 
-        // Narrow the permission to the scopes which the type permits, because
+        // Narrow the permission to the scopes which the type permits and drop
-        // an access which is not granted to a user never exposes the monetary
+        // the monetary values, which have to be granted after the type
-        // values and a public access never changes data
         this.accessForm.get('accessLevel')?.setValue(
           getAccessLevel(
             getScopesOfAccess({
-              scopes: getScopesOfAccessLevel(this.accessLevel),
+              scopes: getScopesOfAccessLevel(this.accessLevel).filter(
+                (scope) => {
+                  return scope !== scopes.portfolioReadValues;
+                }
+              ),
               type: accessType
             })
           )

apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.html

@@ -92,7 +92,7 @@
               />
             </mat-option>
           }
-          @if (accessForm.get('type')?.value === 'PRIVATE') {
+          @if (canGrantUnrestrictedReadAccess) {
             <mat-option value="READ">
               <gf-access-level-icon accessLevel="READ" />
             </mat-option>

apps/client/src/app/components/user-account-membership/user-account-membership.html

@@ -3,7 +3,9 @@
     <div class="col">
       <div class="align-items-center d-flex flex-column">
         <gf-membership-card
-          [expiresAt]="user?.subscription?.expiresAt | date: defaultDateFormat"
+          [expiresAt]="
+            (user?.subscription?.expiresAt | date: defaultDateFormat) ?? ''
+          "
           [hasPermissionToCreateApiKey]="hasPermissionToCreateApiKey"
           [hover3d]="true"
           [name]="user?.subscription?.type"

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

@@ -43,7 +43,7 @@
         }}</span>
       </mat-form-field>
     </div>
-    <div [class.d-none]="platforms?.length < 1">
+    <div [class.d-none]="platforms.length < 1">
       <mat-form-field appearance="outline" class="w-100">
         <mat-label i18n>Platform</mat-label>
         @if (selectedPlatform) {
@@ -51,8 +51,8 @@
             class="ml-3"
             matPrefix
             [hasPlaceholder]="true"
-            [tooltip]="selectedPlatform?.name"
+            [tooltip]="selectedPlatform.name ?? ''"
-            [url]="selectedPlatform?.url"
+            [url]="selectedPlatform.url"
           />
         }
         <input
@@ -73,7 +73,7 @@
                 <gf-entity-logo
                   class="mr-1"
                   [hasPlaceholder]="true"
-                  [tooltip]="platformEntry.name"
+                  [tooltip]="platformEntry.name ?? ''"
                   [url]="platformEntry.url"
                 />
                 <span>{{ platformEntry.name }}</span>

apps/client/src/app/pages/portfolio/activities/import-activities-dialog/import-activities-dialog.html

@@ -128,14 +128,12 @@
               [hasPermissionToCreateActivity]="false"
               [hasPermissionToDeleteActivity]="false"
               [hasPermissionToExportActivities]="false"
-              [hasPermissionToFilter]="false"
               [hasPermissionToOpenDetails]="false"
               [locale]="data?.user?.settings?.locale"
               [pageIndex]="pageIndex"
               [pageSize]="pageSize"
               [showActions]="false"
               [showCheckbox]="true"
-              [showSymbolColumn]="false"
               [sortColumn]="sortColumn"
               [sortDirection]="sortDirection"
               [sortDisabled]="true"

apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts

@@ -5,6 +5,7 @@ import {
   DEFAULT_DATE_RANGE,
   NUMERICAL_PRECISION_THRESHOLD_6_FIGURES
 } from '@ghostfolio/common/config';
+import { SubscriptionType } from '@ghostfolio/common/enums';
 import { canOpenHoldingDetail } from '@ghostfolio/common/helper';
 import {
   InvestmentItem,
@@ -93,6 +94,7 @@ export class GfAnalysisPageComponent implements OnInit {
   protected isLoadingDividendTimelineChart: boolean;
   protected isLoadingInvestmentChart: boolean;
   protected isLoadingInvestmentTimelineChart: boolean;
+  protected isLoadingPerformanceTimelineChart: boolean;
   protected isLoadingPortfolioPrompt: boolean;
   protected readonly mode = signal<GroupBy>('month');
   protected readonly modeOptions: ToggleOption<GroupBy>[] = [
@@ -103,7 +105,9 @@ export class GfAnalysisPageComponent implements OnInit {
   protected readonly PerformanceCalculationType = PerformanceCalculationType;
   protected performanceDataItems: LineChartItem[];
   protected performanceDataItemsInPercentage: LineChartItem[];
-  protected readonly portfolioEvolutionDataLabel = $localize`Investment`;
+  protected performancePercentagesByYear: InvestmentItem[];
+  protected readonly performanceTimelineDataLabel = $localize`Net Performance`;
+  protected readonly portfolioEvolutionDataLabel = $localize`Invested Capital`;
   protected precision = 2;
   protected savingsRatePerMonth: number | undefined;
   protected streaks: PortfolioInvestmentsResponse['streaks'];
@@ -312,6 +316,37 @@ export class GfAnalysisPageComponent implements OnInit {
       );
   }
 
+  private fetchPerformanceByYear() {
+    this.isLoadingPerformanceTimelineChart = true;
+
+    this.dataService
+      .fetchPortfolioPerformance({
+        filters: this.userService.getFilters(),
+        groupBy: 'year',
+        range: this.user?.settings?.dateRange ?? DEFAULT_DATE_RANGE
+      })
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe(({ chart }) => {
+        this.performancePercentagesByYear = [];
+
+        for (const {
+          date,
+          netPerformanceInPercentageWithCurrencyEffect
+        } of chart ?? []) {
+          if (isNumber(netPerformanceInPercentageWithCurrencyEffect)) {
+            this.performancePercentagesByYear.push({
+              date,
+              investment: netPerformanceInPercentageWithCurrencyEffect
+            });
+          }
+        }
+
+        this.isLoadingPerformanceTimelineChart = false;
+
+        this.changeDetectorRef.markForCheck();
+      });
+  }
+
   private update() {
     this.isLoadingInvestmentChart = true;
 
@@ -420,6 +455,13 @@ export class GfAnalysisPageComponent implements OnInit {
 
     this.fetchDividendsAndInvestments();
 
+    if (
+      this.user?.settings?.isExperimentalFeatures &&
+      this.user?.subscription?.type !== SubscriptionType.Basic
+    ) {
+      this.fetchPerformanceByYear();
+    }
+
     this.changeDetectorRef.markForCheck();
   }
 

apps/client/src/app/pages/portfolio/analysis/analysis-page.html

@@ -430,6 +430,35 @@
     </div>
   </div>
 
+  @if (user?.settings?.isExperimentalFeatures) {
+    <div class="mb-5 row">
+      <div class="col-lg">
+        <div class="align-items-center d-flex mb-4">
+          <div
+            class="align-items-center d-flex flex-grow-1 h5 mb-0 text-truncate"
+          >
+            <span i18n>Performance Timeline</span>
+            @if (user?.subscription?.type === 'Basic') {
+              <gf-premium-indicator class="ml-1" />
+            }
+          </div>
+        </div>
+        <div class="chart-container">
+          <gf-investment-chart
+            class="h-100"
+            groupBy="year"
+            [benchmarkDataItems]="performancePercentagesByYear"
+            [benchmarkDataLabel]="performanceTimelineDataLabel"
+            [colorScheme]="user?.settings?.colorScheme"
+            [isInPercentage]="true"
+            [isLoading]="isLoadingPerformanceTimelineChart"
+            [locale]="user?.settings?.locale"
+          />
+        </div>
+      </div>
+    </div>
+  }
+
   <div class="mb-5 row">
     <div class="col-lg">
       <div class="align-items-center d-flex mb-4">

apps/client/src/app/pages/portfolio/fire/fire-page.html

@@ -178,7 +178,7 @@
                   [isPercent]="true"
                   [locale]="user?.settings?.locale"
                   [precision]="2"
-                  [value]="user?.settings?.annualInterestRate / 100"
+                  [value]="(user?.settings?.annualInterestRate ?? 0) / 100"
               /></span>
               annual interest rate.</ng-container
             >

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

@@ -258,21 +258,23 @@
                 </ul>
               </div>
               <p i18n>Fully managed Ghostfolio cloud offering.</p>
-              <p class="h5 text-right" [hidden]="!price">
+              @if (price) {
-                <span class="font-weight-normal">
+                <p class="h5 text-right">
-                  @if (coupon) {
+                  <span class="font-weight-normal">
-                    <del class="text-muted"
+                    @if (coupon) {
-                      >{{ baseCurrency }}&nbsp;{{ price }}</del
+                      <del class="text-muted"
-                    >&nbsp;{{ baseCurrency }}&nbsp;<strong>{{
+                        >{{ baseCurrency }}&nbsp;{{ price }}</del
-                      price - coupon
+                      >&nbsp;{{ baseCurrency }}&nbsp;<strong>{{
-                    }}</strong>
+                        price - coupon
-                  } @else {
+                      }}</strong>
-                    {{ baseCurrency }}&nbsp;<strong>{{ price }}</strong>
+                    } @else {
-                  }
+                      {{ baseCurrency }}&nbsp;<strong>{{ price }}</strong>
-                  <span>&nbsp;</span>
+                    }
-                  <span i18n>per year</span></span
+                    <span>&nbsp;</span>
-                >
+                    <span i18n>per year</span></span
-              </p>
+                  >
+                </p>
+              }
               @if (
                 hasPermissionToUpdateUserSettings &&
                 user?.subscription?.type === 'Basic'

apps/client/src/app/util/date.util.ts

@@ -10,16 +10,17 @@ export function formatRelativeTime({
   date,
   language
 }: {
-  date: string;
+  date: Date | string | null | undefined;
   language?: string;
 }) {
   if (date) {
-    const distanceString = formatDistanceToNowStrict(parseISO(date), {
+    const parsedDate = typeof date === 'string' ? parseISO(date) : date;
+    const distanceString = formatDistanceToNowStrict(parsedDate, {
       addSuffix: true,
       locale: getDateFnsLocale(language)
     });
 
-    return Math.abs(differenceInSeconds(parseISO(date), new Date())) < 60
+    return Math.abs(differenceInSeconds(parsedDate, new Date())) < 60
       ? $localize`just now`
       : distanceString;
   }

apps/client/tsconfig.json

@@ -14,20 +14,16 @@
     }
   ],
   "angularCompilerOptions": {
+    "extendedDiagnostics": {
+      "checks": {
+        // TODO: Remove once the fields are typed as optional
+        "nullishCoalescingNotNullable": "suppress",
+        "optionalChainNotNullable": "suppress"
+      }
+    },
     "strictInjectionParameters": true,
-    // TODO: Remove these subsets once strictTemplates is enabled
-    "strictAttributeTypes": true,
-    "strictContextGenerics": true,
-    "strictDomEventTypes": true,
-    "strictDomLocalRefTypes": true,
     "strictInputAccessModifiers": true,
-    "strictInputTypes": true,
+    "strictTemplates": true
-    "strictLiteralTypes": true,
-    "strictNullInputTypes": true,
-    "strictOutputEventTypes": true,
-    "strictSafeNavigationTypes": true,
-    // TODO: Enable stricter rules for this project
-    "strictTemplates": false
   },
   "compilerOptions": {
     "module": "preserve",

libs/common/src/lib/helper.spec.ts

@@ -4,6 +4,7 @@ import {
 } from '@ghostfolio/common/config';
 import {
   canApplyFiltersToAccess,
+  canUseCustomAssetProfileSymbol,
   extractNumberFromString,
   getCountryCodeFromCurrency,
   getEmojiFlag,
@@ -39,6 +40,50 @@ describe('Helper', () => {
     });
   });
 
+  describe('Can use custom asset profile symbol', () => {
+    const assetProfile = { id: 'asset-profile-id' };
+    const symbol = '7e91b7d4-1430-4212-8380-289a06c9bbc1';
+
+    it('Free-text symbol', () => {
+      expect(
+        canUseCustomAssetProfileSymbol({
+          assetProfile: null,
+          symbol: 'Penthouse Apartment'
+        })
+      ).toEqual(false);
+    });
+
+    it('New asset profile with UUID', () => {
+      expect(
+        canUseCustomAssetProfileSymbol({ symbol, assetProfile: null })
+      ).toEqual(true);
+    });
+
+    it('New asset profile with Ghostfolio prefix', () => {
+      expect(
+        canUseCustomAssetProfileSymbol({
+          assetProfile: null,
+          symbol: 'GF_PENTHOUSE_APARTMENT'
+        })
+      ).toEqual(false);
+    });
+
+    it('Existing asset profile with UUID', () => {
+      expect(canUseCustomAssetProfileSymbol({ assetProfile, symbol })).toEqual(
+        true
+      );
+    });
+
+    it('Existing asset profile with Ghostfolio prefix', () => {
+      expect(
+        canUseCustomAssetProfileSymbol({
+          assetProfile,
+          symbol: 'GF_PENTHOUSE_APARTMENT'
+        })
+      ).toEqual(true);
+    });
+  });
+
   describe('Extract number from string', () => {
     it('Get decimal number', () => {
       expect(extractNumberFromString({ value: '999.99' })).toEqual(999.99);

libs/common/src/lib/helper.ts

@@ -237,6 +237,29 @@ export function canOpenHoldingDetail({
   return assetProfile?.assetSubClass !== AssetSubClass.CASH;
 }
 
+/**
+ * Checks if the symbol of a custom asset profile can be used, either to connect
+ * to the existing asset profile or to create a new one. The prefix is reserved
+ * for the asset profiles of the admin, thus a new asset profile cannot use it.
+ */
+export function canUseCustomAssetProfileSymbol({
+  assetProfile,
+  symbol
+}: {
+  assetProfile: Pick<SymbolProfile, 'id'> | null;
+  symbol: string;
+}): boolean {
+  if (!isValidCustomAssetProfileSymbol(symbol)) {
+    return false;
+  }
+
+  if (assetProfile) {
+    return true;
+  }
+
+  return !hasGhostfolioPrefix(symbol);
+}
+
 export function capitalize(aString: string) {
   return aString.charAt(0).toUpperCase() + aString.slice(1).toLowerCase();
 }

libs/common/src/lib/scopes.spec.ts

@@ -3,6 +3,7 @@ import {
   SCOPES_OF_READ_ACCESS,
   SCOPES_OF_READ_RESTRICTED_ACCESS,
   SCOPES_OF_WRITE_ACCESS,
+  canGrantUnrestrictedReadAccess,
   getAccessLevel,
   getScopesOfAccess,
   getScopesOfAccessLevel,
@@ -239,12 +240,21 @@ describe('Scopes', () => {
       expect(scopesOfAccess).toContain(scopes.watchlistRead);
     });
 
-    it('Cannot expose the monetary values', () => {
+    it('Allows reading the monetary values', () => {
       expect(
         getScopesOfAccess({
           scopes: [...SCOPES_OF_READ_ACCESS],
           type: 'MCP'
         })
+      ).toContain(scopes.portfolioReadValues);
+    });
+
+    it('Without the scope to read the values', () => {
+      expect(
+        getScopesOfAccess({
+          scopes: [...SCOPES_OF_READ_RESTRICTED_ACCESS],
+          type: 'MCP'
+        })
       ).not.toContain(scopes.portfolioReadValues);
     });
 
@@ -276,6 +286,31 @@ describe('Scopes', () => {
         )
       ).toEqual('CREATE_READ_RESTRICTED_UPDATE_DELETE');
     });
+
+    it('Keeps the access level to change the data with the monetary values', () => {
+      expect(
+        getAccessLevel(
+          getScopesOfAccess({
+            scopes: getScopesOfAccessLevel('CREATE_READ_UPDATE_DELETE'),
+            type: 'MCP'
+          })
+        )
+      ).toEqual('CREATE_READ_UPDATE_DELETE');
+    });
+  });
+
+  describe('Can grant unrestricted read access', () => {
+    it('Model context protocol', () => {
+      expect(canGrantUnrestrictedReadAccess({ type: 'MCP' })).toEqual(true);
+    });
+
+    it('Private', () => {
+      expect(canGrantUnrestrictedReadAccess({ type: 'PRIVATE' })).toEqual(true);
+    });
+
+    it('Public', () => {
+      expect(canGrantUnrestrictedReadAccess({ type: 'PUBLIC' })).toEqual(false);
+    });
   });
 
   describe('Get scopes of own access', () => {

libs/common/src/lib/scopes.ts

@@ -68,19 +68,26 @@ export const SCOPES_OF_READ_RESTRICTED_ACCESS: readonly Scope[] =
  * monetary values.
  */
 const SCOPES_OF_TYPE: Record<AccessType, readonly Scope[]> = {
-  MCP: [...SCOPES_OF_READ_RESTRICTED_ACCESS, scopes.activityCreate],
+  MCP: [...SCOPES_OF_READ_ACCESS, scopes.activityCreate],
   PRIVATE: Object.values(scopes),
   PUBLIC: SCOPES_OF_PUBLIC_ACCESS
 };
 
 /**
- * Access types which combine a write scope with the restricted read access,
+ * Access types which can combine a write scope with the restricted read access,
- * because their tools change data without exposing the monetary values
+ * because their tools which change data do not expose the monetary values
  */
 export function canGrantRestrictedWriteAccess({ type }: { type: AccessType }) {
   return type === 'MCP';
 }
 
+/**
+ * Access types which can expose the monetary values
+ */
+export function canGrantUnrestrictedReadAccess({ type }: { type: AccessType }) {
+  return SCOPES_OF_TYPE[type].includes(scopes.portfolioReadValues);
+}
+
 /**
  * Access level which the scopes of an access grant
  */

libs/ui/src/lib/line-chart/line-chart.component.ts

@@ -60,7 +60,7 @@ export class GfLineChartComponent
   @Input() benchmarkLabel = '';
   @Input() colorScheme?: ColorScheme;
   @Input() currency?: string;
-  @Input() historicalDataItems: LineChartItem[];
+  @Input() historicalDataItems: LineChartItem[] | null;
   @Input() isAnimated = false;
   @Input() label: string;
   @Input() locale = getLocale();

libs/ui/src/lib/services/data.service.ts

@@ -728,14 +728,21 @@ export class DataService {
 
   public fetchPortfolioPerformance({
     filters,
+    groupBy,
     range,
     withExcludedAccounts = false
   }: {
     filters?: Filter[];
+    groupBy?: Extract<GroupBy, 'year'>;
     range: DateRange;
     withExcludedAccounts?: boolean;
   }): Observable<PortfolioPerformanceResponse> {
     let params = this.buildFiltersAsQueryParams({ filters });
+
+    if (groupBy) {
+      params = params.append('groupBy', groupBy);
+    }
+
     params = params.append('range', range);
 
     if (withExcludedAccounts) {

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ghostfolio",
-  "version": "3.82.0",
+  "version": "3.83.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ghostfolio",
-      "version": "3.82.0",
+      "version": "3.83.0",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghostfolio",
-  "version": "3.82.0",
+  "version": "3.83.0",
   "homepage": "https://ghostfol.io",
   "license": "AGPL-3.0",
   "repository": "https://github.com/ghostfolio/ghostfolio",