Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Task/refactor liabilities to liabilitiesInBaseCurrency in portfolio summary interface (#5725)

Lagmator2220da95239ec2
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index f774378eff..a5bc10fbda 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -2106,7 +2106,7 @@ export class PortfolioService {
.plus(fees)
.toNumber(),
interest: interest.toNumber(),
- liabilities: liabilities.toNumber(),
+ liabilitiesInBaseCurrency: liabilities.toNumber(),
totalInvestment: totalInvestment.toNumber(),
totalValueInBaseCurrency: netWorth
};
diff --git a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
index 19f125523d..c8d710019d 100644
--- a/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
+++ b/apps/client/src/app/components/portfolio-summary/portfolio-summary.component.html
@@ -242,7 +242,10 @@
<div class="flex-nowrap px-3 py-1 row">
<div class="flex-grow-1 text-truncate" i18n>Liabilities</div>
<div class="d-flex justify-content-end">
- @if (summary?.liabilities || summary?.liabilities === 0) {
+ @if (
+ summary?.liabilitiesInBaseCurrency ||
+ summary?.liabilitiesInBaseCurrency === 0
+ ) {
<span class="mr-1">-</span>
}
<gf-value
@@ -250,7 +253,7 @@
[isCurrency]="true"
[locale]="locale"
[unit]="baseCurrency"
- [value]="isLoading ? undefined : summary?.liabilities"
+ [value]="isLoading ? undefined : summary?.liabilitiesInBaseCurrency"
/>
</div>
</div>
diff --git a/libs/common/src/lib/interfaces/portfolio-summary.interface.ts b/libs/common/src/lib/interfaces/portfolio-summary.interface.ts
index 05fac0ba04..092a4bb979 100644
--- a/libs/common/src/lib/interfaces/portfolio-summary.interface.ts
+++ b/libs/common/src/lib/interfaces/portfolio-summary.interface.ts
@@ -21,7 +21,7 @@ export interface PortfolioSummary extends PortfolioPerformance {
grossPerformance: number;
grossPerformanceWithCurrencyEffect: number;
interest: number;
- liabilities: number;
+ liabilitiesInBaseCurrency: number;
totalBuy: number;
totalSell: number;
totalValueInBaseCurrency?: number;