Merge branch 'feature/migrate-blog-page-to-standalone' of https://github.com/HarjobandeepSingh/ghostfolio into feature/migrate-blog-page-to-standalone

CHANGELOG.md

@@ -9,14 +9,26 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Extended the glossary of the resources page by _Stealth Wealth_
+- Extended the content of the pricing page
 - Added a _Storybook_ story for the holdings table component
 
 ### Changed
 
 - Refactored the blog page component to standalone
 - Disabled the zoom functionality in the _Progressive Web App_ (PWA)
+- Improved the currency validation in the get asset profiles functionality of the data provider service
+- Improved the currency validation in the search functionality of the data provider service
 - Optimized the get quotes functionality by utilizing the asset profile resolutions in the _Financial Modeling Prep_ service
 - Extracted the footer to a component
+- Improved the portfolio calculator unit tests to load the user currency from the exported file
+
+### Fixed
+
+- Respected the include indices flag in the search functionality of the _Financial Modeling Prep_ service
+- Fixed an issue where the scroll position was not restored when changing pages
+- Fixed the word wrap in the menus of the activities table component
+- Fixed the dark mode in the _As seen in_ section on the landing page
 
 ## 2.208.0 - 2025-10-11
 

apps/api/src/app/endpoints/data-providers/ghostfolio/ghostfolio.controller.ts

@@ -1,5 +1,6 @@
 import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
 import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
+import { AssetProfileInvalidError } from '@ghostfolio/api/services/data-provider/errors/asset-profile-invalid.error';
 import { parseDate } from '@ghostfolio/common/helper';
 import {
   DataProviderGhostfolioAssetProfileResponse,
@@ -66,7 +67,14 @@ export class GhostfolioController {
       });
 
       return assetProfile;
-    } catch {
+    } catch (error) {
+      if (error instanceof AssetProfileInvalidError) {
+        throw new HttpException(
+          getReasonPhrase(StatusCodes.NOT_FOUND),
+          StatusCodes.NOT_FOUND
+        );
+      }
+
       throw new HttpException(
         getReasonPhrase(StatusCodes.INTERNAL_SERVER_ERROR),
         StatusCodes.INTERNAL_SERVER_ERROR

apps/api/src/app/endpoints/data-providers/ghostfolio/ghostfolio.service.ts

@@ -40,10 +40,7 @@ export class GhostfolioService {
     private readonly propertyService: PropertyService
   ) {}
 
-  public async getAssetProfile({
+  public async getAssetProfile({ symbol }: GetAssetProfileParams) {
-    requestTimeout = this.configurationService.get('REQUEST_TIMEOUT'),
-    symbol
-  }: GetAssetProfileParams) {
     let result: DataProviderGhostfolioAssetProfileResponse = {};
 
     try {
@@ -51,12 +48,15 @@ export class GhostfolioService {
 
       for (const dataProviderService of this.getDataProviderServices()) {
         promises.push(
-          dataProviderService
+          this.dataProviderService
-            .getAssetProfile({
+            .getAssetProfiles([
-              requestTimeout,
+              {
-              symbol
+                symbol,
-            })
+                dataSource: dataProviderService.getName()
-            .then(async (assetProfile) => {
+              }
+            ])
+            .then(async (assetProfiles) => {
+              const assetProfile = assetProfiles[symbol];
               const dataSourceOrigin = DataSource.GHOSTFOLIO;
 
               if (assetProfile) {

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

@@ -1,3 +1,5 @@
+import { Export } from '@ghostfolio/common/interfaces';
+
 import { readFileSync } from 'node:fs';
 
 export const activityDummyData = {
@@ -37,6 +39,6 @@ export const userDummyData = {
   id: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'
 };
 
-export function loadActivityExportFile(filePath: string) {
+export function loadExportFile(filePath: string): Export {
-  return JSON.parse(readFileSync(filePath, 'utf8')).activities;
+  return JSON.parse(readFileSync(filePath, 'utf8'));
 }

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts

@@ -1,8 +1,7 @@
-import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  loadActivityExportFile,
+  loadExportFile,
   symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
@@ -16,9 +15,9 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';
 import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';
 import { parseDate } from '@ghostfolio/common/helper';
+import { Export } from '@ghostfolio/common/interfaces';
 import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
 
-import { Tag } from '@prisma/client';
 import { Big } from 'big.js';
 import { join } from 'node:path';
 
@@ -53,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
-  let activityDtos: CreateOrderDto[];
+  let exportResponse: Export;
 
   let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
@@ -63,7 +62,7 @@ describe('PortfolioCalculator', () => {
   let redisCacheService: RedisCacheService;
 
   beforeAll(() => {
-    activityDtos = loadActivityExportFile(
+    exportResponse = loadExportFile(
       join(__dirname, '../../../../../../../test/import/ok/btceur.json')
     );
   });
@@ -97,28 +96,27 @@ describe('PortfolioCalculator', () => {
     it.only('with BTCUSD buy (in EUR)', async () => {
       jest.useFakeTimers().setSystemTime(parseDate('2022-01-14').getTime());
 
-      const activities: Activity[] = activityDtos.map((activity) => ({
+      const activities: Activity[] = exportResponse.activities.map(
-        ...activityDummyData,
+        (activity) => ({
-        ...activity,
+          ...activityDummyData,
-        date: parseDate(activity.date),
+          ...activity,
-        feeInAssetProfileCurrency: 4.46,
+          date: parseDate(activity.date),
-        SymbolProfile: {
+          feeInAssetProfileCurrency: 4.46,
-          ...symbolProfileDummyData,
+          SymbolProfile: {
-          currency: 'USD',
+            ...symbolProfileDummyData,
-          dataSource: activity.dataSource,
+            currency: 'USD',
-          name: 'Bitcoin',
+            dataSource: activity.dataSource,
-          symbol: activity.symbol
+            name: 'Bitcoin',
-        },
+            symbol: activity.symbol
-        tags: activity.tags?.map((id) => {
+          },
-          return { id } as Tag;
+          unitPriceInAssetProfileCurrency: 44558.42
-        }),
+        })
-        unitPriceInAssetProfileCurrency: 44558.42
+      );
-      }));
 
       const portfolioCalculator = portfolioCalculatorFactory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.ROAI,
-        currency: 'USD',
+        currency: exportResponse.user.settings.currency,
         userId: userDummyData.id
       });
 

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts

@@ -1,8 +1,7 @@
-import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  loadActivityExportFile,
+  loadExportFile,
   symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
@@ -16,9 +15,9 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';
 import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';
 import { parseDate } from '@ghostfolio/common/helper';
+import { Export } from '@ghostfolio/common/interfaces';
 import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
 
-import { Tag } from '@prisma/client';
 import { Big } from 'big.js';
 import { join } from 'node:path';
 
@@ -53,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
-  let activityDtos: CreateOrderDto[];
+  let exportResponse: Export;
 
   let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
@@ -63,7 +62,7 @@ describe('PortfolioCalculator', () => {
   let redisCacheService: RedisCacheService;
 
   beforeAll(() => {
-    activityDtos = loadActivityExportFile(
+    exportResponse = loadExportFile(
       join(__dirname, '../../../../../../../test/import/ok/btcusd-short.json')
     );
   });
@@ -97,28 +96,27 @@ describe('PortfolioCalculator', () => {
     it.only('with BTCUSD short sell (in USD)', async () => {
       jest.useFakeTimers().setSystemTime(parseDate('2022-01-14').getTime());
 
-      const activities: Activity[] = activityDtos.map((activity) => ({
+      const activities: Activity[] = exportResponse.activities.map(
-        ...activityDummyData,
+        (activity) => ({
-        ...activity,
+          ...activityDummyData,
-        date: parseDate(activity.date),
+          ...activity,
-        feeInAssetProfileCurrency: activity.fee,
+          date: parseDate(activity.date),
-        SymbolProfile: {
+          feeInAssetProfileCurrency: activity.fee,
-          ...symbolProfileDummyData,
+          SymbolProfile: {
-          currency: 'USD',
+            ...symbolProfileDummyData,
-          dataSource: activity.dataSource,
+            currency: 'USD',
-          name: 'Bitcoin',
+            dataSource: activity.dataSource,
-          symbol: activity.symbol
+            name: 'Bitcoin',
-        },
+            symbol: activity.symbol
-        tags: activity.tags?.map((id) => {
+          },
-          return { id } as Tag;
+          unitPriceInAssetProfileCurrency: activity.unitPrice
-        }),
+        })
-        unitPriceInAssetProfileCurrency: activity.unitPrice
+      );
-      }));
 
       const portfolioCalculator = portfolioCalculatorFactory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.ROAI,
-        currency: 'USD',
+        currency: exportResponse.user.settings.currency,
         userId: userDummyData.id
       });
 

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts

@@ -1,8 +1,7 @@
-import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  loadActivityExportFile,
+  loadExportFile,
   symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
@@ -16,9 +15,9 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';
 import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';
 import { parseDate } from '@ghostfolio/common/helper';
+import { Export } from '@ghostfolio/common/interfaces';
 import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
 
-import { Tag } from '@prisma/client';
 import { Big } from 'big.js';
 import { join } from 'node:path';
 
@@ -53,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
-  let activityDtos: CreateOrderDto[];
+  let exportResponse: Export;
 
   let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
@@ -63,7 +62,7 @@ describe('PortfolioCalculator', () => {
   let redisCacheService: RedisCacheService;
 
   beforeAll(() => {
-    activityDtos = loadActivityExportFile(
+    exportResponse = loadExportFile(
       join(__dirname, '../../../../../../../test/import/ok/btcusd.json')
     );
   });
@@ -97,28 +96,27 @@ describe('PortfolioCalculator', () => {
     it.only('with BTCUSD buy (in USD)', async () => {
       jest.useFakeTimers().setSystemTime(parseDate('2022-01-14').getTime());
 
-      const activities: Activity[] = activityDtos.map((activity) => ({
+      const activities: Activity[] = exportResponse.activities.map(
-        ...activityDummyData,
+        (activity) => ({
-        ...activity,
+          ...activityDummyData,
-        date: parseDate(activity.date),
+          ...activity,
-        feeInAssetProfileCurrency: 4.46,
+          date: parseDate(activity.date),
-        SymbolProfile: {
+          feeInAssetProfileCurrency: 4.46,
-          ...symbolProfileDummyData,
+          SymbolProfile: {
-          currency: 'USD',
+            ...symbolProfileDummyData,
-          dataSource: activity.dataSource,
+            currency: 'USD',
-          name: 'Bitcoin',
+            dataSource: activity.dataSource,
-          symbol: activity.symbol
+            name: 'Bitcoin',
-        },
+            symbol: activity.symbol
-        tags: activity.tags?.map((id) => {
+          },
-          return { id } as Tag;
+          unitPriceInAssetProfileCurrency: 44558.42
-        }),
+        })
-        unitPriceInAssetProfileCurrency: 44558.42
+      );
-      }));
 
       const portfolioCalculator = portfolioCalculatorFactory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.ROAI,
-        currency: 'USD',
+        currency: exportResponse.user.settings.currency,
         userId: userDummyData.id
       });
 

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts

@@ -1,8 +1,7 @@
-import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  loadActivityExportFile,
+  loadExportFile,
   symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
@@ -16,9 +15,9 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';
 import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';
 import { parseDate } from '@ghostfolio/common/helper';
+import { Export } from '@ghostfolio/common/interfaces';
 import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
 
-import { Tag } from '@prisma/client';
 import { Big } from 'big.js';
 import { join } from 'node:path';
 
@@ -53,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
-  let activityDtos: CreateOrderDto[];
+  let exportResponse: Export;
 
   let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
@@ -63,7 +62,7 @@ describe('PortfolioCalculator', () => {
   let redisCacheService: RedisCacheService;
 
   beforeAll(() => {
-    activityDtos = loadActivityExportFile(
+    exportResponse = loadExportFile(
       join(
         __dirname,
         '../../../../../../../test/import/ok/novn-buy-and-sell-partially.json'
@@ -100,28 +99,27 @@ describe('PortfolioCalculator', () => {
     it.only('with NOVN.SW buy and sell partially', async () => {
       jest.useFakeTimers().setSystemTime(parseDate('2022-04-11').getTime());
 
-      const activities: Activity[] = activityDtos.map((activity) => ({
+      const activities: Activity[] = exportResponse.activities.map(
-        ...activityDummyData,
+        (activity) => ({
-        ...activity,
+          ...activityDummyData,
-        date: parseDate(activity.date),
+          ...activity,
-        feeInAssetProfileCurrency: activity.fee,
+          date: parseDate(activity.date),
-        SymbolProfile: {
+          feeInAssetProfileCurrency: activity.fee,
-          ...symbolProfileDummyData,
+          SymbolProfile: {
-          currency: activity.currency,
+            ...symbolProfileDummyData,
-          dataSource: activity.dataSource,
+            currency: activity.currency,
-          name: 'Novartis AG',
+            dataSource: activity.dataSource,
-          symbol: activity.symbol
+            name: 'Novartis AG',
-        },
+            symbol: activity.symbol
-        tags: activity.tags?.map((id) => {
+          },
-          return { id } as Tag;
+          unitPriceInAssetProfileCurrency: activity.unitPrice
-        }),
+        })
-        unitPriceInAssetProfileCurrency: activity.unitPrice
+      );
-      }));
 
       const portfolioCalculator = portfolioCalculatorFactory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.ROAI,
-        currency: 'CHF',
+        currency: exportResponse.user.settings.currency,
         userId: userDummyData.id
       });
 

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts

@@ -1,8 +1,7 @@
-import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import {
   activityDummyData,
-  loadActivityExportFile,
+  loadExportFile,
   symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
@@ -16,9 +15,9 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';
 import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';
 import { parseDate } from '@ghostfolio/common/helper';
+import { Export } from '@ghostfolio/common/interfaces';
 import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';
 
-import { Tag } from '@prisma/client';
 import { Big } from 'big.js';
 import { join } from 'node:path';
 
@@ -53,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {
 });
 
 describe('PortfolioCalculator', () => {
-  let activityDtos: CreateOrderDto[];
+  let exportResponse: Export;
 
   let configurationService: ConfigurationService;
   let currentRateService: CurrentRateService;
@@ -63,7 +62,7 @@ describe('PortfolioCalculator', () => {
   let redisCacheService: RedisCacheService;
 
   beforeAll(() => {
-    activityDtos = loadActivityExportFile(
+    exportResponse = loadExportFile(
       join(
         __dirname,
         '../../../../../../../test/import/ok/novn-buy-and-sell.json'
@@ -100,28 +99,27 @@ describe('PortfolioCalculator', () => {
     it.only('with NOVN.SW buy and sell', async () => {
       jest.useFakeTimers().setSystemTime(parseDate('2022-04-11').getTime());
 
-      const activities: Activity[] = activityDtos.map((activity) => ({
+      const activities: Activity[] = exportResponse.activities.map(
-        ...activityDummyData,
+        (activity) => ({
-        ...activity,
+          ...activityDummyData,
-        date: parseDate(activity.date),
+          ...activity,
-        feeInAssetProfileCurrency: activity.fee,
+          date: parseDate(activity.date),
-        SymbolProfile: {
+          feeInAssetProfileCurrency: activity.fee,
-          ...symbolProfileDummyData,
+          SymbolProfile: {
-          currency: activity.currency,
+            ...symbolProfileDummyData,
-          dataSource: activity.dataSource,
+            currency: activity.currency,
-          name: 'Novartis AG',
+            dataSource: activity.dataSource,
-          symbol: activity.symbol
+            name: 'Novartis AG',
-        },
+            symbol: activity.symbol
-        tags: activity.tags?.map((id) => {
+          },
-          return { id } as Tag;
+          unitPriceInAssetProfileCurrency: activity.unitPrice
-        }),
+        })
-        unitPriceInAssetProfileCurrency: activity.unitPrice
+      );
-      }));
 
       const portfolioCalculator = portfolioCalculatorFactory.createCalculator({
         activities,
         calculationType: PerformanceCalculationType.ROAI,
-        currency: 'CHF',
+        currency: exportResponse.user.settings.currency,
         userId: userDummyData.id
       });
 

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

@@ -197,7 +197,7 @@ export class PortfolioController {
         'filteredValueInBaseCurrency',
         'grossPerformance',
         'grossPerformanceWithCurrencyEffect',
-        'interest',
+        'interestInBaseCurrency',
         'items',
         'liabilities',
         'netPerformance',

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

@@ -2105,7 +2105,7 @@ export class PortfolioService {
       )
         .plus(fees)
         .toNumber(),
-      interest: interest.toNumber(),
+      interestInBaseCurrency: interest.toNumber(),
       liabilitiesInBaseCurrency: liabilities.toNumber(),
       totalInvestment: totalInvestment.toNumber(),
       totalValueInBaseCurrency: netWorth

apps/api/src/helper/object.helper.spec.ts

@@ -1536,7 +1536,7 @@ describe('redactAttributes', () => {
             fireWealth: null,
             grossPerformance: null,
             grossPerformanceWithCurrencyEffect: null,
-            interest: null,
+            interestInBaseCurrency: null,
             items: null,
             liabilities: null,
             totalInvestment: null,
@@ -3039,7 +3039,7 @@ describe('redactAttributes', () => {
         fireWealth: null,
         grossPerformance: null,
         grossPerformanceWithCurrencyEffect: null,
-        interest: null,
+        interestInBaseCurrency: null,
         items: null,
         liabilities: null,
         totalInvestment: null,

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

@@ -35,6 +35,8 @@ import { eachDayOfInterval, format, isValid } from 'date-fns';
 import { groupBy, isEmpty, isNumber, uniqWith } from 'lodash';
 import ms from 'ms';
 
+import { AssetProfileInvalidError } from './errors/asset-profile-invalid.error';
+
 @Injectable()
 export class DataProviderService implements OnModuleInit {
   private dataProviderMapping: { [dataProviderName: string]: string };
@@ -106,9 +108,9 @@ export class DataProviderService implements OnModuleInit {
         );
 
         promises.push(
-          promise.then((symbolProfile) => {
+          promise.then((assetProfile) => {
-            if (symbolProfile) {
+            if (isCurrency(assetProfile?.currency)) {
-              response[symbol] = symbolProfile;
+              response[symbol] = assetProfile;
             }
           })
         );
@@ -117,6 +119,12 @@ export class DataProviderService implements OnModuleInit {
 
     try {
       await Promise.all(promises);
+
+      if (isEmpty(response)) {
+        throw new AssetProfileInvalidError(
+          'No valid asset profiles have been found'
+        );
+      }
     } catch (error) {
       Logger.error(error, 'DataProviderService');
 
@@ -645,8 +653,11 @@ export class DataProviderService implements OnModuleInit {
 
     const filteredItems = lookupItems
       .filter(({ currency }) => {
-        // Only allow symbols with supported currency
+        if (includeIndices) {
-        return currency ? true : false;
+          return true;
+        }
+
+        return currency ? isCurrency(currency) : false;
       })
       .map((lookupItem) => {
         if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {

apps/api/src/services/data-provider/errors/asset-profile-invalid.error.ts

@@ -0,0 +1,7 @@
+export class AssetProfileInvalidError extends Error {
+  public constructor(message: string) {
+    super(message);
+
+    this.name = 'AssetProfileInvalidError';
+  }
+}

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

@@ -102,6 +102,10 @@ export class FinancialModelingPrepService implements DataProviderInterface {
           }
         ).then((res) => res.json());
 
+        if (!assetProfile) {
+          throw new Error(`${symbol} not found`);
+        }
+
         const { assetClass, assetSubClass } =
           this.parseAssetClass(assetProfile);
 
@@ -373,26 +377,42 @@ export class FinancialModelingPrepService implements DataProviderInterface {
           {
             signal: AbortSignal.timeout(requestTimeout)
           }
-        ).then((res) => res.json())
+        ).then(
+          (res) => res.json() as unknown as { price: number; symbol: string }[]
+        )
       ]);
 
-      if (assetProfileResolutions.length === symbols.length) {
+      for (const { currency, symbolTarget } of assetProfileResolutions) {
-        for (const { currency, symbolTarget } of assetProfileResolutions) {
+        currencyBySymbolMap[symbolTarget] = { currency };
-          currencyBySymbolMap[symbolTarget] = { currency };
+      }
+
+      const resolvedSymbols = assetProfileResolutions.map(
+        ({ symbolTarget }) => {
+          return symbolTarget;
         }
-      } else {
+      );
+
+      const symbolsToFetch = quotes
+        .map(({ symbol }) => {
+          return symbol;
+        })
+        .filter((symbol) => {
+          return !resolvedSymbols.includes(symbol);
+        });
+
+      if (symbolsToFetch.length > 0) {
         await Promise.all(
-          quotes.map(({ symbol }) => {
+          symbolsToFetch.map(async (symbol) => {
-            return this.getAssetProfile({
+            const assetProfile = await this.getAssetProfile({
               requestTimeout,
               symbol
-            }).then((assetProfile) => {
-              if (assetProfile?.currency) {
-                currencyBySymbolMap[symbol] = {
-                  currency: assetProfile.currency
-                };
-              }
             });
+
+            if (assetProfile?.currency) {
+              currencyBySymbolMap[symbol] = {
+                currency: assetProfile.currency
+              };
+            }
           })
         );
       }
@@ -438,6 +458,7 @@ export class FinancialModelingPrepService implements DataProviderInterface {
   }
 
   public async search({
+    includeIndices = false,
     query,
     requestTimeout = this.configurationService.get('REQUEST_TIMEOUT')
   }: GetSearchParams): Promise<LookupResponse> {
@@ -484,17 +505,25 @@ export class FinancialModelingPrepService implements DataProviderInterface {
           }
         ).then((res) => res.json());
 
-        items = result.map(({ currency, name, symbol }) => {
+        items = result
-          return {
+          .filter(({ symbol }) => {
-            currency,
+            if (includeIndices === false && symbol.startsWith('^')) {
-            symbol,
+              return false;
-            assetClass: undefined, // TODO
+            }
-            assetSubClass: undefined, // TODO
+
-            dataProviderInfo: this.getDataProviderInfo(),
+            return true;
-            dataSource: this.getName(),
+          })
-            name: this.formatName({ name })
+          .map(({ currency, name, symbol }) => {
-          };
+            return {
-        });
+              currency,
+              symbol,
+              assetClass: undefined, // TODO
+              assetSubClass: undefined, // TODO
+              dataProviderInfo: this.getDataProviderInfo(),
+              dataSource: this.getName(),
+              name: this.formatName({ name })
+            };
+          });
       }
     } catch (error) {
       let message = error;

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

@@ -155,8 +155,9 @@ const routes: Routes = [
       // Preload all lazy loaded modules with the attribute preload === true
       {
         anchorScrolling: 'enabled',
-        preloadingStrategy: ModulePreloadService
+        // enableTracing: true, // <-- debugging purposes only
-        // enableTracing: true // <-- debugging purposes only
+        preloadingStrategy: ModulePreloadService,
+        scrollPositionRestoration: 'top'
       }
     )
   ],

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

@@ -302,7 +302,7 @@
         [isCurrency]="true"
         [locale]="locale"
         [unit]="baseCurrency"
-        [value]="isLoading ? undefined : summary?.interest"
+        [value]="isLoading ? undefined : summary?.interestInBaseCurrency"
       />
     </div>
   </div>

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

@@ -69,6 +69,16 @@ export class GfPricingPageComponent implements OnDestroy, OnInit {
   public professionalDataProviderTooltipPremium = translate(
     'PROFESSIONAL_DATA_PROVIDER_TOOLTIP_PREMIUM'
   );
+  public referralBrokers = [
+    'DEGIRO',
+    'finpension',
+    'frankly',
+    'Interactive Brokers',
+    'Mintos',
+    'Swissquote',
+    'VIAC',
+    'Zak'
+  ];
   public routerLinkFeatures = publicRoutes.features.routerLink;
   public routerLinkRegister = publicRoutes.register.routerLink;
   public user: User;

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

@@ -326,16 +326,43 @@
     <div class="row">
       <div class="col mt-3">
         <p>
-          If you plan to open an account at <i>DEGIRO</i>, <i>finpension</i>,
+          <ng-container i18n>If you plan to open an account at</ng-container>
-          <i>frankly</i>, <i>Interactive Brokers</i>, <i>Swissquote</i>,
+          <ng-container>&nbsp;</ng-container>
-          <i>VIAC</i>, or <i>Zak</i>, please
+          @for (
-          <a href="mailto:hi@ghostfol.io?Subject=Referral link for..."
+            broker of referralBrokers;
+            track broker;
+            let i = $index;
+            let last = $last
+          ) {
+            <i>{{ broker }}</i>
+            @if (last) {
+              <span>, </span>
+            } @else {
+              @if (i === referralBrokers.length - 2) {
+                <ng-container>&nbsp;</ng-container>
+                <ng-container i18n>or</ng-container>
+                <ng-container>&nbsp;</ng-container>
+              } @else {
+                <span>, </span>
+              }
+            }
+          }
+          <ng-container i18n>please</ng-container>
+          <ng-container>&nbsp;</ng-container>
+          <a href="mailto:hi@ghostfol.io?Subject=Referral link for..." i18n
             >contact us</a
           >
-          to use our referral link and get a Ghostfolio Premium membership for
+          <ng-container>&nbsp;</ng-container>
-          one year. Looking for a student discount? Request it
+          <ng-container i18n
-          <a href="mailto:hi@ghostfol.io?Subject=Student Discount">here</a>
+            >to use our referral link and get a Ghostfolio Premium membership
-          with your university e-mail address.
+            for one year</ng-container
+          >. <ng-container i18n>Looking for a student discount?</ng-container>
+          <ng-container>&nbsp;</ng-container>
+          <ng-container i18n>Request it</ng-container>
+          <ng-container>&nbsp;</ng-container>
+          <a href="mailto:hi@ghostfol.io?Subject=Student Discount" i18n>here</a>
+          <ng-container>&nbsp;</ng-container>
+          <ng-container i18n>with your university e-mail address</ng-container>.
         </p>
       </div>
     </div>

apps/client/src/app/pages/resources/glossary/resources-glossary.component.html

@@ -132,6 +132,23 @@
             </div>
           </div>
         </div>
+        <div class="mb-4 media">
+          <div class="media-body">
+            <h3 class="h5 mt-0">Stealth Wealth</h3>
+            <div class="mb-1">
+              Stealth wealth is a lifestyle choice where you don’t openly show
+              off your wealth, but instead live quietly to maintain privacy and
+              security.
+            </div>
+            <div>
+              <a
+                href="https://en.wikipedia.org/wiki/Stealth_wealth"
+                target="_blank"
+                >Stealth Wealth →</a
+              >
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>

libs/common/src/lib/helper.ts

@@ -1,7 +1,7 @@
-import * as currencies from '@dinero.js/currencies';
 import { NumberParser } from '@internationalized/number';
 import { Type as ActivityType, DataSource, MarketData } from '@prisma/client';
 import { Big } from 'big.js';
+import { isISO4217CurrencyCode } from 'class-validator';
 import {
   getDate,
   getMonth,
@@ -340,8 +340,12 @@ export function interpolate(template: string, context: any) {
   });
 }
 
-export function isCurrency(aCurrency = '') {
+export function isCurrency(aCurrency: string) {
-  return currencies[aCurrency] || isDerivedCurrency(aCurrency);
+  if (!aCurrency) {
+    return false;
+  }
+
+  return isISO4217CurrencyCode(aCurrency) || isDerivedCurrency(aCurrency);
 }
 
 export function isDerivedCurrency(aCurrency: string) {

libs/common/src/lib/interfaces/portfolio-summary.interface.ts

@@ -20,7 +20,7 @@ export interface PortfolioSummary extends PortfolioPerformance {
   fireWealth: FireWealth;
   grossPerformance: number;
   grossPerformanceWithCurrencyEffect: number;
-  interest: number;
+  interestInBaseCurrency: number;
   liabilitiesInBaseCurrency: number;
   totalBuy: number;
   totalSell: number;

libs/ui/src/lib/activities-table/activities-table.component.html

@@ -361,7 +361,11 @@
             <ion-icon name="ellipsis-vertical" />
           </button>
         }
-        <mat-menu #activitiesMenu="matMenu" xPosition="before">
+        <mat-menu
+          #activitiesMenu="matMenu"
+          class="no-max-width"
+          xPosition="before"
+        >
           @if (hasPermissionToCreateActivity) {
             <button
               class="align-items-center d-flex"
@@ -425,7 +429,11 @@
             <ion-icon name="ellipsis-horizontal" />
           </button>
         }
-        <mat-menu #activityMenu="matMenu" xPosition="before">
+        <mat-menu
+          #activityMenu="matMenu"
+          class="no-max-width"
+          xPosition="before"
+        >
           <button mat-menu-item (click)="onUpdateActivity(element)">
             <span class="align-items-center d-flex">
               <ion-icon class="mr-2" name="create-outline" />

libs/ui/src/lib/logo-carousel/logo-carousel.component.scss

@@ -194,19 +194,13 @@
       );
     }
 
-    .logo {
+    .logo-carousel-track {
-      &.logo-alternative-to,
+      .logo-carousel-item {
-      &.logo-dev-community,
+        .logo {
-      &.logo-hacker-news,
+          &.mask {
-      &.logo-openalternative,
+            background-color: rgba(var(--light-secondary-text));
-      &.logo-privacy-tools,
+          }
-      &.logo-reddit,
+        }
-      &.logo-sackgeld,
-      &.logo-selfh-st,
-      &.logo-sourceforge,
-      &.logo-umbrel,
-      &.logo-unraid {
-        background-color: rgba(var(--light-primary-text));
       }
     }
   }

package-lock.json

@@ -28,7 +28,6 @@
         "@dfinity/candid": "0.15.7",
         "@dfinity/identity": "0.15.7",
         "@dfinity/principal": "0.15.7",
-        "@dinero.js/currencies": "2.0.0-alpha.8",
         "@internationalized/number": "3.6.3",
         "@ionic/angular": "8.7.3",
         "@keyv/redis": "4.4.0",
@@ -5018,12 +5017,6 @@
         "ts-node": "^10.8.2"
       }
     },
-    "node_modules/@dinero.js/currencies": {
-      "version": "2.0.0-alpha.8",
-      "resolved": "https://registry.npmjs.org/@dinero.js/currencies/-/currencies-2.0.0-alpha.8.tgz",
-      "integrity": "sha512-zApiqtuuPwjiM9LJA5/kNcT48VSHRiz2/mktkXjIpfxrJKzthXybUAgEenExIH6dYhLDgVmsLQZtZFOsdYl0Ag==",
-      "license": "MIT"
-    },
     "node_modules/@discoveryjs/json-ext": {
       "version": "0.6.3",
       "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.6.3.tgz",

package.json

@@ -74,7 +74,6 @@
     "@dfinity/candid": "0.15.7",
     "@dfinity/identity": "0.15.7",
     "@dfinity/principal": "0.15.7",
-    "@dinero.js/currencies": "2.0.0-alpha.8",
     "@internationalized/number": "3.6.3",
     "@ionic/angular": "8.7.3",
     "@keyv/redis": "4.4.0",

test/import/ok/novn-buy-and-sell-partially.json

@@ -24,5 +24,10 @@
       "date": "2022-03-07T00:00:00.000Z",
       "symbol": "NOVN.SW"
     }
-  ]
+  ],
+  "user": {
+    "settings": {
+      "currency": "CHF"
+    }
+  }
 }

test/import/ok/novn-buy-and-sell.json

@@ -24,5 +24,10 @@
       "date": "2022-03-07T00:00:00.000Z",
       "symbol": "NOVN.SW"
     }
-  ]
+  ],
+  "user": {
+    "settings": {
+      "currency": "CHF"
+    }
+  }
 }