Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Bugfix/total fee calculation related to activities in custom currency (part 2) (#6199)
Thomas Kauld9a4d261e495
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex c7757c1c46..de71fcf0da 100644--- a/CHANGELOG.md+++ b/CHANGELOG.md@@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0### Fixed- Fixed a numeric parsing error related to cash positions on the _X-ray_ page+- Fixed the total fee calculation in the holding detail dialog related to activities in a custom currency+- Fixed the total fee calculation in the summary related to activities in a custom currency## 2.230.0 - 2026-01-14diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator.tsindex dfc39afa52..8fee1957c7 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator.ts@@ -120,6 +120,7 @@ export abstract class PortfolioCalculator {({date,feeInAssetProfileCurrency,+ feeInBaseCurrency,quantity,SymbolProfile,tags = [],@@ -142,6 +143,7 @@ export abstract class PortfolioCalculator {type,date: format(date, DATE_FORMAT),fee: new Big(feeInAssetProfileCurrency),+ feeInBaseCurrency: new Big(feeInBaseCurrency),quantity: new Big(quantity),unitPrice: new Big(unitPriceInAssetProfileCurrency)};@@ -336,12 +338,6 @@ export abstract class PortfolioCalculator {} = {};for (const item of lastTransactionPoint.items) {- const feeInBaseCurrency = item.fee.mul(- exchangeRatesByCurrency[`${item.currency}${this.currency}`]?.[- lastTransactionPoint.date- ] ?? 1- );-const marketPriceInBaseCurrency = (marketSymbolMap[endDateString]?.[item.symbol] ?? item.averagePrice).mul(@@ -408,7 +404,6 @@ export abstract class PortfolioCalculator {}positions.push({- feeInBaseCurrency,includeInTotalAssetValue,timeWeightedInvestment,timeWeightedInvestmentWithCurrencyEffect,@@ -418,6 +413,7 @@ export abstract class PortfolioCalculator {dividend: totalDividend,dividendInBaseCurrency: totalDividendInBaseCurrency,fee: item.fee,+ feeInBaseCurrency: item.feeInBaseCurrency,firstBuyDate: item.firstBuyDate,grossPerformance: !hasErrors ? (grossPerformance ?? null) : null,grossPerformancePercentage: !hasErrors@@ -937,6 +933,7 @@ export abstract class PortfolioCalculator {for (const {date,fee,+ feeInBaseCurrency,quantity,SymbolProfile,tags,@@ -1001,6 +998,8 @@ export abstract class PortfolioCalculator {: investment.div(newQuantity).abs(),dividend: new Big(0),fee: oldAccumulatedSymbol.fee.plus(fee),+ feeInBaseCurrency:+ oldAccumulatedSymbol.feeInBaseCurrency.plus(feeInBaseCurrency),firstBuyDate: oldAccumulatedSymbol.firstBuyDate,includeInHoldings: oldAccumulatedSymbol.includeInHoldings,quantity: newQuantity,@@ -1013,6 +1012,7 @@ export abstract class PortfolioCalculator {currency,dataSource,fee,+ feeInBaseCurrency,skipErrors,symbol,tags,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.tsindex f0e2f64882..6b56b39a24 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts@@ -87,6 +87,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-22'),feeInAssetProfileCurrency: 1.55,+ feeInBaseCurrency: 1.55,quantity: 2,SymbolProfile: {...symbolProfileDummyData,@@ -102,6 +103,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-30'),feeInAssetProfileCurrency: 1.65,+ feeInBaseCurrency: 1.65,quantity: 2,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.tsindex 10b1fabd38..2aad0cb263 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts@@ -87,6 +87,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-22'),feeInAssetProfileCurrency: 1.55,+ feeInBaseCurrency: 1.55,quantity: 2,SymbolProfile: {...symbolProfileDummyData,@@ -102,6 +103,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-30'),feeInAssetProfileCurrency: 1.65,+ feeInBaseCurrency: 1.65,quantity: 1,SymbolProfile: {...symbolProfileDummyData,@@ -117,6 +119,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-30'),feeInAssetProfileCurrency: 0,+ feeInBaseCurrency: 0,quantity: 1,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.tsindex 32cd9f7d45..35e4309eb1 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts@@ -87,6 +87,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-22'),feeInAssetProfileCurrency: 1.55,+ feeInBaseCurrency: 1.55,quantity: 2,SymbolProfile: {...symbolProfileDummyData,@@ -102,6 +103,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-30'),feeInAssetProfileCurrency: 1.65,+ feeInBaseCurrency: 1.65,quantity: 2,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.tsindex bfa4d06f3b..ebce2ac1c9 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts@@ -87,6 +87,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-30'),feeInAssetProfileCurrency: 1.55,+ feeInBaseCurrency: 1.55,quantity: 2,SymbolProfile: {...symbolProfileDummyData,@@ -208,6 +209,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-30'),feeInAssetProfileCurrency: 1.55,+ feeInBaseCurrency: 1.55,quantity: 2,SymbolProfile: {...symbolProfileDummyData,@@ -247,6 +249,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-30'),feeInAssetProfileCurrency: 1.55,+ feeInBaseCurrency: 1.55,quantity: 2,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur-in-base-currency-eur.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur-in-base-currency-eur.spec.tsindex 84ea6c251b..774c1d2f62 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur-in-base-currency-eur.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur-in-base-currency-eur.spec.ts@@ -110,6 +110,7 @@ describe('PortfolioCalculator', () => {...activity,date: parseDate(activity.date),feeInAssetProfileCurrency: 4.46,+ feeInBaseCurrency: 3.94,SymbolProfile: {...symbolProfileDummyData,currency: 'USD',diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.tsindex 32b3f05c2b..9ca8b2d368 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts@@ -98,6 +98,7 @@ describe('PortfolioCalculator', () => {...activity,date: parseDate(activity.date),feeInAssetProfileCurrency: 4.46,+ feeInBaseCurrency: 4.46,SymbolProfile: {...symbolProfileDummyData,currency: 'USD',diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.tsindex 0c111fab27..3648eb84b9 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts@@ -100,6 +100,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2015-01-01'),feeInAssetProfileCurrency: 0,+ feeInBaseCurrency: 0,quantity: 2,SymbolProfile: {...symbolProfileDummyData,@@ -115,6 +116,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2017-12-31'),feeInAssetProfileCurrency: 0,+ feeInBaseCurrency: 0,quantity: 1,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.tsindex 618dc805ca..6a45f79c61 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts@@ -98,6 +98,7 @@ describe('PortfolioCalculator', () => {...activity,date: parseDate(activity.date),feeInAssetProfileCurrency: activity.fee,+ feeInBaseCurrency: activity.fee,SymbolProfile: {...symbolProfileDummyData,currency: 'USD',diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.tsindex 716ec7a596..5179fdaa6c 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts@@ -98,6 +98,7 @@ describe('PortfolioCalculator', () => {...activity,date: parseDate(activity.date),feeInAssetProfileCurrency: 4.46,+ feeInBaseCurrency: 4.46,SymbolProfile: {...symbolProfileDummyData,currency: 'USD',diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.tsindex aae77c876e..59a5531df4 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-fee.spec.ts@@ -87,6 +87,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-09-01'),feeInAssetProfileCurrency: 49,+ feeInBaseCurrency: 49,quantity: 0,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.tsindex 495728e229..fa38d0030a 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts@@ -99,6 +99,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2023-01-03'),feeInAssetProfileCurrency: 1,+ feeInBaseCurrency: 0.9238,quantity: 1,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.tsindex 1fd88dacc1..acbf6a66bb 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-liability.spec.ts@@ -87,6 +87,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2023-01-01'), // Date in futurefeeInAssetProfileCurrency: 0,+ feeInBaseCurrency: 0,quantity: 1,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-and-sell.spec.tsindex 4c8ccdcf5b..baa6ae1ede 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-and-sell.spec.ts@@ -80,6 +80,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2024-03-08'),feeInAssetProfileCurrency: 0,+ feeInBaseCurrency: 0,quantity: 0.3333333333333333,SymbolProfile: {...symbolProfileDummyData,@@ -94,8 +95,9 @@ describe('PortfolioCalculator', () => {{...activityDummyData,date: new Date('2024-03-13'),- quantity: 0.6666666666666666,feeInAssetProfileCurrency: 0,+ feeInBaseCurrency: 0,+ quantity: 0.6666666666666666,SymbolProfile: {...symbolProfileDummyData,currency: 'USD',@@ -109,8 +111,9 @@ describe('PortfolioCalculator', () => {{...activityDummyData,date: new Date('2024-03-14'),- quantity: 1,feeInAssetProfileCurrency: 0,+ feeInBaseCurrency: 0,+ quantity: 1,SymbolProfile: {...symbolProfileDummyData,currency: 'USD',diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.tsindex 0331e163e3..ab7480bbff 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts@@ -87,6 +87,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-09-16'),feeInAssetProfileCurrency: 19,+ feeInBaseCurrency: 19,quantity: 1,SymbolProfile: {...symbolProfileDummyData,@@ -102,6 +103,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2021-11-16'),feeInAssetProfileCurrency: 0,+ feeInBaseCurrency: 0,quantity: 1,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.tsindex 650944421c..32a1b02f3b 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts@@ -101,6 +101,7 @@ describe('PortfolioCalculator', () => {...activity,date: parseDate(activity.date),feeInAssetProfileCurrency: activity.fee,+ feeInBaseCurrency: activity.fee,SymbolProfile: {...symbolProfileDummyData,currency: activity.currency,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.tsindex 2e408dc3cc..f2903f3cdd 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts@@ -101,6 +101,7 @@ describe('PortfolioCalculator', () => {...activity,date: parseDate(activity.date),feeInAssetProfileCurrency: activity.fee,+ feeInBaseCurrency: activity.fee,SymbolProfile: {...symbolProfileDummyData,currency: activity.currency,diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.tsindex 1db1332881..3a00c022cb 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts@@ -87,6 +87,7 @@ describe('PortfolioCalculator', () => {...activityDummyData,date: new Date('2022-01-01'),feeInAssetProfileCurrency: 0,+ feeInBaseCurrency: 0,quantity: 1,SymbolProfile: {...symbolProfileDummyData,diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-order-item.interface.ts b/apps/api/src/app/portfolio/interfaces/portfolio-order-item.interface.tsindex 06e471d67e..42759b5213 100644--- a/apps/api/src/app/portfolio/interfaces/portfolio-order-item.interface.ts+++ b/apps/api/src/app/portfolio/interfaces/portfolio-order-item.interface.ts@@ -3,7 +3,6 @@ import { Big } from 'big.js';import { PortfolioOrder } from './portfolio-order.interface';export interface PortfolioOrderItem extends PortfolioOrder {- feeInBaseCurrency?: Big;feeInBaseCurrencyWithCurrencyEffect?: Big;itemType?: 'end' | 'start';unitPriceFromMarketData?: Big;diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts b/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.tsindex fcc8322fce..2dbd68f12a 100644--- a/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts+++ b/apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts@@ -3,6 +3,7 @@ import { Activity } from '@ghostfolio/common/interfaces';export interface PortfolioOrder extends Pick<Activity, 'tags' | 'type'> {date: string;fee: Big;+ feeInBaseCurrency: Big;quantity: Big;SymbolProfile: Pick<Activity['SymbolProfile'],diff --git a/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts b/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.tsindex 14e2e1f372..1c43508dd1 100644--- a/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts+++ b/apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts@@ -8,6 +8,7 @@ export interface TransactionPointSymbol {dataSource: DataSource;dividend: Big;fee: Big;+ feeInBaseCurrency: Big;firstBuyDate: string;includeInHoldings: boolean;investment: Big;