Refactoring

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

@@ -161,10 +161,12 @@ export class PortfolioController {
         'emergencyFund',
         'excludedAccountsAndActivities',
         'fees',
+        'fireWealth',
         'items',
         'liabilities',
         'netWorth',
         'totalBuy',
+        'totalInvestment',
         'totalSell'
       ]);
     }

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

@@ -1679,9 +1679,14 @@ export class PortfolioService {
       totalBuy,
       totalSell,
       committedFunds: committedFunds.toNumber(),
-      emergencyFund: emergencyFund.toNumber(),
+      emergencyFund: {
-      emergencyFundinAssets: emergencyFundPositionsValueInBaseCurrency,
+        assets: emergencyFundPositionsValueInBaseCurrency,
-      emergencyFundInCash: emergencyFund
+        cash: emergencyFund
+          .minus(emergencyFundPositionsValueInBaseCurrency)
+          .toNumber(),
+        total: emergencyFund.toNumber()
+      },
+      fireWealth: new Big(performanceInformation.performance.currentValue)
         .minus(emergencyFundPositionsValueInBaseCurrency)
         .toNumber(),
       ordersCount: activities.filter(({ type }) => {

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

@@ -163,7 +163,33 @@
         [isCurrency]="true"
         [locale]="locale"
         [unit]="baseCurrency"
-        [value]="isLoading ? undefined : summary?.emergencyFund"
+        [value]="isLoading ? undefined : summary?.emergencyFund?.total"
+      ></gf-value>
+    </div>
+  </div>
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 ml-3 text-truncate" i18n>Cash</div>
+    <div class="flex-column flex-wrap justify-content-end">
+      <gf-value
+        class="justify-content-end"
+        position="end"
+        [isCurrency]="true"
+        [locale]="locale"
+        [unit]="baseCurrency"
+        [value]="isLoading ? undefined : summary?.emergencyFund?.cash"
+      ></gf-value>
+    </div>
+  </div>
+  <div class="flex-nowrap px-3 py-1 row">
+    <div class="flex-grow-1 ml-3 text-truncate" i18n>Assets</div>
+    <div class="flex-column flex-wrap justify-content-end">
+      <gf-value
+        class="justify-content-end"
+        position="end"
+        [isCurrency]="true"
+        [locale]="locale"
+        [unit]="baseCurrency"
+        [value]="isLoading ? undefined : summary?.emergencyFund?.assets"
       ></gf-value>
     </div>
   </div>

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

@@ -51,7 +51,7 @@ export class FirePageComponent implements OnDestroy, OnInit {
           return;
         }
 
-        this.fireWealth = new Big(summary.currentValue);
+        this.fireWealth = new Big(summary.fireWealth);
         this.withdrawalRatePerYear = this.fireWealth.mul(4).div(100);
         this.withdrawalRatePerMonth = this.withdrawalRatePerYear.div(12);
 

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

@@ -5,11 +5,14 @@ export interface PortfolioSummary extends PortfolioPerformance {
   cash: number;
   committedFunds: number;
   dividend: number;
-  emergencyFund: number;
+  emergencyFund: {
-  emergencyFundInCash: number;
+    assets: number;
-  emergencyFundinAssets: number;
+    cash: number;
+    total: number;
+  };
   excludedAccountsAndActivities: number;
   fees: number;
+  fireWealth: number;
   firstOrderDate: Date;
   items: number;
   liabilities: number;