Fix: add missing transfers label

actualbudget · Jan 20, 2024 · d676533 · d676533
1 parent 69c55ed
commit d676533
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx b/packages/desktop-client/src/components/reports/graphs/CashFlowGraph.tsx
@@ -79,6 +79,16 @@ function CustomTooltip({ active, payload, isConcise }: CustomTooltipProps) {
               </strong>
             }
           />
+          {data.transfers !== 0 && (
+            <AlignedText
+              left="Transfers:"
+              right={
+                <PrivacyFilter>
+                  {amountToCurrency(data.transfers)}
+                </PrivacyFilter>
+              }
+            />
+          )}
           <AlignedText
             left="Balance:"
             right={
@@ -96,6 +106,7 @@ type CashFlowGraphProps = {
     expenses: { x: Date; y: number }[];
     income: { x: Date; y: number }[];
     balances: { x: Date; y: number }[];
+    transfers: { x: Date; y: number }[];
   };
   isConcise: boolean;
 };
@@ -108,6 +119,7 @@ export function CashFlowGraph({ graphData, isConcise }: CashFlowGraphProps) {
     expenses: row.y,
     income: graphData.income[idx].y,
     balance: graphData.balances[idx].y,
+    transfers: graphData.transfers[idx].y,
   }));
 
   return (

diff --git a/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx b/packages/desktop-client/src/components/reports/spreadsheets/cash-flow-spreadsheet.tsx
@@ -180,6 +180,10 @@ function recalculate(data, start, end, isConcise) {
 
       res.income.push({ x, y: integerToAmount(income) });
       res.expenses.push({ x, y: integerToAmount(expense) });
+      res.transfers.push({
+        x,
+        y: integerToAmount(creditTransfers + debitTransfers),
+      });
       res.balances.push({
         x,
         y: integerToAmount(balance),
@@ -188,7 +192,7 @@ function recalculate(data, start, end, isConcise) {
       });
       return res;
     },
-    { expenses: [], income: [], balances: [] },
+    { expenses: [], income: [], transfers: [], balances: [] },
   );
 
   const { balances } = graphData;