Merge branch 'main' into task/upgrade-simplewebauthn-to-version-13.2.2

CHANGELOG.md

@@ -7,14 +7,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Extended the content of the _Self-Hosting_ section on the Frequently Asked Questions (FAQ) page with information on derived currencies
+
 ### Changed
 
 - Ignored nested ETFs when fetching top holdings for ETF and mutual fund assets from _Yahoo Finance_
 - Improved the scraper configuration with more detailed error messages
 - Upgraded `@simplewebauthn/browser` and `@simplewebauthn/server` from version `13.1.0` to `13.2.2`
+- Upgraded `cheerio` from version `1.0.0` to `1.2.0`
 
 ### Fixed
 
+- Fixed the investment value by including currency effects in the portfolio summary tab on the home page
 - Added the missing `valueInBaseCurrency` to the response of the import activities endpoint
 
 ## 2.238.0 - 2026-02-12

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

@@ -194,6 +194,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: 0.07032490039195362,
           netPerformanceInPercentageWithCurrencyEffect: 0.07032490039195362,
           netPerformanceWithCurrencyEffect: 33.4,
+          totalInvestment: 559,
           totalInvestmentValueWithCurrencyEffect: 559
         })
       );

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts

@@ -208,6 +208,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: -0.05528341497550734703,
           netPerformanceInPercentageWithCurrencyEffect: -0.05528341497550734703,
           netPerformanceWithCurrencyEffect: -15.8,
+          totalInvestment: 0,
           totalInvestmentValueWithCurrencyEffect: 0
         })
       );

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

@@ -192,6 +192,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: -0.05528341497550734703,
           netPerformanceInPercentageWithCurrencyEffect: -0.05528341497550734703,
           netPerformanceWithCurrencyEffect: -15.8,
+          totalInvestment: 0,
           totalInvestmentValueWithCurrencyEffect: 0
         })
       );

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

@@ -192,6 +192,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: 0.08437042459736457,
           netPerformanceInPercentageWithCurrencyEffect: 0.08437042459736457,
           netPerformanceWithCurrencyEffect: 23.05,
+          totalInvestment: 273.2,
           totalInvestmentValueWithCurrencyEffect: 273.2
         })
       );

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

@@ -210,6 +210,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: 42.41983590271396609433,
           netPerformanceInPercentageWithCurrencyEffect: 41.64017412624815597854,
           netPerformanceWithCurrencyEffect: 26516.208701400000064086,
+          totalInvestment: 318.542667299999967957,
           totalInvestmentValueWithCurrencyEffect: 318.542667299999967957
         })
       );

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

@@ -128,6 +128,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: 0,
           netPerformanceInPercentageWithCurrencyEffect: 0,
           netPerformanceWithCurrencyEffect: 0,
+          totalInvestment: 0,
           totalInvestmentValueWithCurrencyEffect: 0
         })
       );

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

@@ -188,6 +188,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: 0.29544434470377019749,
           netPerformanceInPercentageWithCurrencyEffect: 0.24112962014285697628,
           netPerformanceWithCurrencyEffect: 19.851974,
+          totalInvestment: new Big('89.12').mul(0.8854).toNumber(),
           totalInvestmentValueWithCurrencyEffect: 82.329056
         })
       );

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts

@@ -174,6 +174,7 @@ describe('PortfolioCalculator', () => {
 
       expect(portfolioSnapshot.historicalData.at(-1)).toMatchObject(
         expect.objectContaining({
+          totalInvestment: 298.58,
           totalInvestmentValueWithCurrencyEffect: 298.58
         })
       );

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

@@ -190,6 +190,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: 0.12184460284330327256,
           netPerformanceInPercentageWithCurrencyEffect: 0.12184460284330327256,
           netPerformanceWithCurrencyEffect: 17.68,
+          totalInvestment: 75.8,
           totalInvestmentValueWithCurrencyEffect: 75.8
         })
       );

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

@@ -241,6 +241,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: 0.13100263852242744063,
           netPerformanceInPercentageWithCurrencyEffect: 0.13100263852242744063,
           netPerformanceWithCurrencyEffect: 19.86,
+          totalInvestment: 0,
           totalInvestmentValueWithCurrencyEffect: 0
         })
       );

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

@@ -162,6 +162,7 @@ describe('PortfolioCalculator', () => {
           netPerformanceInPercentage: 0,
           netPerformanceInPercentageWithCurrencyEffect: 0,
           netPerformanceWithCurrencyEffect: 0,
+          totalInvestment: 500000,
           totalInvestmentValueWithCurrencyEffect: 500000
         })
       );

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

@@ -206,6 +206,7 @@ export class PortfolioController {
         'netPerformanceWithCurrencyEffect',
         'totalBuy',
         'totalInvestment',
+        'totalInvestmentValueWithCurrencyEffect',
         'totalSell',
         'totalValueInBaseCurrency'
       ]);

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

@@ -1007,7 +1007,8 @@ export class PortfolioService {
           netPerformancePercentage: 0,
           netPerformancePercentageWithCurrencyEffect: 0,
           netPerformanceWithCurrencyEffect: 0,
-          totalInvestment: 0
+          totalInvestment: 0,
+          totalInvestmentValueWithCurrencyEffect: 0
         }
       };
     }
@@ -1038,6 +1039,7 @@ export class PortfolioService {
       netPerformanceWithCurrencyEffect,
       netWorth,
       totalInvestment,
+      totalInvestmentValueWithCurrencyEffect,
       valueWithCurrencyEffect
     } = chart?.at(-1) ?? {
       netPerformance: 0,
@@ -1058,6 +1060,7 @@ export class PortfolioService {
         netPerformance,
         netPerformanceWithCurrencyEffect,
         totalInvestment,
+        totalInvestmentValueWithCurrencyEffect,
         currentNetWorth: netWorth,
         currentValueInBaseCurrency: valueWithCurrencyEffect,
         netPerformancePercentage: netPerformanceInPercentage,
@@ -1860,8 +1863,11 @@ export class PortfolioService {
       }
     }
 
-    const { currentValueInBaseCurrency, totalInvestment } =
-      await portfolioCalculator.getSnapshot();
+    const {
+      currentValueInBaseCurrency,
+      totalInvestment,
+      totalInvestmentWithCurrencyEffect
+    } = await portfolioCalculator.getSnapshot();
 
     const { performance } = await this.getPerformance({
       impersonationId,
@@ -2004,6 +2010,8 @@ export class PortfolioService {
       interestInBaseCurrency: interest.toNumber(),
       liabilitiesInBaseCurrency: liabilities.toNumber(),
       totalInvestment: totalInvestment.toNumber(),
+      totalInvestmentValueWithCurrencyEffect:
+        totalInvestmentWithCurrencyEffect.toNumber(),
       totalValueInBaseCurrency: netWorth
     };
   }

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

@@ -1554,6 +1554,7 @@ describe('redactAttributes', () => {
             items: null,
             liabilities: null,
             totalInvestment: null,
+            totalInvestmentValueWithCurrencyEffect: null,
             totalValueInBaseCurrency: null,
             currentNetWorth: null
           }
@@ -3030,6 +3031,7 @@ describe('redactAttributes', () => {
         items: null,
         liabilities: null,
         totalInvestment: null,
+        totalInvestmentValueWithCurrencyEffect: null,
         totalValueInBaseCurrency: null,
         currentNetWorth: null
       }

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

@@ -65,7 +65,11 @@
         [locale]="locale"
         [precision]="precision"
         [unit]="baseCurrency"
-        [value]="isLoading ? undefined : summary?.committedFunds"
+        [value]="
+          isLoading
+            ? undefined
+            : summary?.totalInvestmentValueWithCurrencyEffect
+        "
       />
     </div>
   </div>

apps/client/src/app/pages/faq/self-hosting/self-hosting-page.html

@@ -93,6 +93,10 @@
               dialog
             </li>
           </ol>
+          <p>
+            For derived currencies (e.g. <code>GBp</code>), ensure that you
+            gather the data for the parent currency (e.g. <code>GBP</code>).
+          </p>
         </mat-card-content>
       </mat-card>
       <mat-card appearance="outlined" class="mb-3">

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

@@ -7,4 +7,5 @@ export interface PortfolioPerformance {
   netPerformancePercentageWithCurrencyEffect: number;
   netPerformanceWithCurrencyEffect: number;
   totalInvestment: number;
+  totalInvestmentValueWithCurrencyEffect: number;
 }

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

@@ -6,7 +6,10 @@ export interface PortfolioSummary extends PortfolioPerformance {
   annualizedPerformancePercent: number;
   annualizedPerformancePercentWithCurrencyEffect: number;
   cash: number;
+
+  /** @deprecated use totalInvestmentValueWithCurrencyEffect instead */
   committedFunds: number;
+
   dateOfFirstActivity: Date;
   dividendInBaseCurrency: number;
   emergencyFund: {

package-lock.json

@@ -51,7 +51,7 @@
         "chartjs-chart-treemap": "3.1.0",
         "chartjs-plugin-annotation": "3.1.0",
         "chartjs-plugin-datalabels": "2.2.0",
-        "cheerio": "1.0.0",
+        "cheerio": "1.2.0",
         "class-transformer": "0.5.1",
         "class-validator": "0.14.3",
         "color": "5.0.3",
@@ -16203,25 +16203,25 @@
       }
     },
     "node_modules/cheerio": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz",
-      "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.2.0.tgz",
+      "integrity": "sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==",
       "license": "MIT",
       "dependencies": {
         "cheerio-select": "^2.1.0",
         "dom-serializer": "^2.0.0",
         "domhandler": "^5.0.3",
-        "domutils": "^3.1.0",
-        "encoding-sniffer": "^0.2.0",
-        "htmlparser2": "^9.1.0",
-        "parse5": "^7.1.2",
-        "parse5-htmlparser2-tree-adapter": "^7.0.0",
+        "domutils": "^3.2.2",
+        "encoding-sniffer": "^0.2.1",
+        "htmlparser2": "^10.1.0",
+        "parse5": "^7.3.0",
+        "parse5-htmlparser2-tree-adapter": "^7.1.0",
         "parse5-parser-stream": "^7.1.2",
-        "undici": "^6.19.5",
+        "undici": "^7.19.0",
         "whatwg-mimetype": "^4.0.0"
       },
       "engines": {
-        "node": ">=18.17"
+        "node": ">=20.18.1"
       },
       "funding": {
         "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
@@ -16244,25 +16244,6 @@
         "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/cheerio/node_modules/htmlparser2": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
-      "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "license": "MIT",
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3",
-        "domutils": "^3.1.0",
-        "entities": "^4.5.0"
-      }
-    },
     "node_modules/cheerio/node_modules/parse5": {
       "version": "7.3.0",
       "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
@@ -21758,9 +21739,9 @@
       }
     },
     "node_modules/htmlparser2": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.0.0.tgz",
-      "integrity": "sha512-TwAZM+zE5Tq3lrEHvOlvwgj1XLWQCtaaibSN11Q+gGBAS7Y1uZSWwXXRe4iF6OXnaq1riyQAPFOBtYc77Mxq0g==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-10.1.0.tgz",
+      "integrity": "sha512-VTZkM9GWRAtEpveh7MSF6SjjrpNVNNVJfFup7xTY3UpFtm67foy9HDVXneLtFVt4pMz5kZtgNcvCniNFb1hlEQ==",
       "funding": [
         "https://github.com/fb55/htmlparser2?sponsor=1",
         {
@@ -21772,14 +21753,14 @@
       "dependencies": {
         "domelementtype": "^2.3.0",
         "domhandler": "^5.0.3",
-        "domutils": "^3.2.1",
-        "entities": "^6.0.0"
+        "domutils": "^3.2.2",
+        "entities": "^7.0.1"
       }
     },
     "node_modules/htmlparser2/node_modules/entities": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz",
-      "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==",
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
+      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
       "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.12"
@@ -33746,12 +33727,12 @@
       "license": "MIT"
     },
     "node_modules/undici": {
-      "version": "6.21.3",
-      "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.3.tgz",
-      "integrity": "sha512-gBLkYIlEnSp8pFbT64yFgGE6UIB9tAkhukC23PmMDCe5Nd+cRqKxSjw5y54MK2AZMgZfJWMaNE4nYUHgi1XEOw==",
+      "version": "7.22.0",
+      "resolved": "https://registry.npmjs.org/undici/-/undici-7.22.0.tgz",
+      "integrity": "sha512-RqslV2Us5BrllB+JeiZnK4peryVTndy9Dnqq62S3yYRRTj0tFQCwEniUy2167skdGOy3vqRzEvl1Dm4sV2ReDg==",
       "license": "MIT",
       "engines": {
-        "node": ">=18.17"
+        "node": ">=20.18.1"
       }
     },
     "node_modules/undici-types": {

package.json

@@ -95,7 +95,7 @@
     "chartjs-chart-treemap": "3.1.0",
     "chartjs-plugin-annotation": "3.1.0",
     "chartjs-plugin-datalabels": "2.2.0",
-    "cheerio": "1.0.0",
+    "cheerio": "1.2.0",
     "class-transformer": "0.5.1",
     "class-validator": "0.14.3",
     "color": "5.0.3",