From b0f1584b049abb2d0af540ff13104246420cf9fb Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Wed, 27 Oct 2021 19:29:32 +0200
Subject: [PATCH] feat: add specific cashflow account transactions.

---
 .../AccountTransactionsProvider.js            |  5 +++--
 .../AccountTransactions/components.js         | 13 +++++++++++--
 src/hooks/query/cashflowAccounts.js           | 19 ++-----------------
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/containers/CashFlow/AccountTransactions/AccountTransactionsProvider.js b/src/containers/CashFlow/AccountTransactions/AccountTransactionsProvider.js
index 4eeae0a14..101601e50 100644
--- a/src/containers/CashFlow/AccountTransactions/AccountTransactionsProvider.js
+++ b/src/containers/CashFlow/AccountTransactions/AccountTransactionsProvider.js
@@ -12,7 +12,7 @@ import {
 const AccountTransactionsContext = React.createContext();
 
 function flattenInfinityPages(data) {
-  return flatten(map(data.pages, (page) => page.cashflow_transactions));
+  return flatten(map(data.pages, (page) => page.transactions));
 }
 
 /**
@@ -30,9 +30,10 @@ function AccountTransactionsProvider({ query, ...props }) {
     isSuccess: isCashflowTransactionsSuccess,
     fetchNextPage: fetchNextTransactionsPage,
     isFetchingNextPage,
-    hasNextPage
+    hasNextPage,
   } = useAccountTransactionsInfinity(accountId, {
     page_size: 50,
+    account_id: accountId,
   });
 
   // Memorized the cashflow account transactions.
diff --git a/src/containers/CashFlow/AccountTransactions/components.js b/src/containers/CashFlow/AccountTransactions/components.js
index cb292468c..199408d54 100644
--- a/src/containers/CashFlow/AccountTransactions/components.js
+++ b/src/containers/CashFlow/AccountTransactions/components.js
@@ -49,7 +49,7 @@ export function useAccountTransactionsColumns() {
       {
         id: 'type',
         Header: intl.get('type'),
-        accessor: 'reference_type_formatted',
+        accessor: 'formatted_transaction_type',
         className: 'type',
         width: 140,
         textOverview: true,
@@ -89,12 +89,21 @@ export function useAccountTransactionsColumns() {
       {
         id: 'running_balance',
         Header: intl.get('cash_flow.label.running_balance'),
-        accessor: 'running_balance',
+        accessor: 'formatted_running_balance',
         className: 'running_balance',
         width: 150,
         textOverview: true,
         align: 'right',
       },
+      {
+        id: 'balance',
+        Header: intl.get('balance'),
+        accessor: 'formatted_balance',
+        className: 'balance',
+        width: 150,
+        textOverview: true,
+        align: 'right',
+      },
     ],
     [],
   );
diff --git a/src/hooks/query/cashflowAccounts.js b/src/hooks/query/cashflowAccounts.js
index 51be16048..df93ab6ee 100644
--- a/src/hooks/query/cashflowAccounts.js
+++ b/src/hooks/query/cashflowAccounts.js
@@ -7,7 +7,7 @@ const commonInvalidateQueries = (queryClient) => {
   // Invalidate accounts.
   queryClient.invalidateQueries(t.ACCOUNTS);
   queryClient.invalidateQueries(t.ACCOUNT);
-  
+
   // Invalidate account transactions.
   queryClient.invalidateQueries(t.ACCOUNT_TRANSACTION);
 
@@ -38,21 +38,6 @@ export function useCashflowAccounts(query, props) {
   );
 }
 
-/**
- * Retrieve account transactions list.
- */
-export function useCashflowTransactions(accountId, props) {
-  return useRequestQuery(
-    [t.CASH_FLOW_TRANSACTIONS, accountId],
-    { method: 'get', url: `cashflow/account/${accountId}/transactions` },
-    {
-      select: (res) => res.data.cashflow_transactions,
-      defaultData: [],
-      ...props,
-    },
-  );
-}
-
 /**
  * Create Money in owner contribution .
  */
@@ -123,7 +108,7 @@ export function useAccountTransactionsInfinity(
       const response = await apiRequest.http({
         ...axios,
         method: 'get',
-        url: `/api/cashflow/account/${accountId}/transactions`,
+        url: `/api/financial_statements/cashflow-account-transactions`,
         params: { page: pageParam, ...query },
       });
       return response.data;