From 4b96ba76f55bdb73a45b4ed9e64c60f023ae3356 Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 28 Oct 2021 14:39:54 +0200
Subject: [PATCH 1/2] feat: fix Money in & out dialog.

---
 src/common/cashflowOptions.js                             | 1 -
 .../AccountTransactions/AccountTransactionsActionsBar.js  | 6 ++++--
 src/containers/Dialogs/MoneyInDialog/index.js             | 8 ++++----
 src/containers/Dialogs/MoneyOutDialog/index.js            | 7 ++++---
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/common/cashflowOptions.js b/src/common/cashflowOptions.js
index 8857e2c5a..93e30ebf4 100644
--- a/src/common/cashflowOptions.js
+++ b/src/common/cashflowOptions.js
@@ -7,7 +7,6 @@ export const addMoneyIn = [
   },
   {
     name: intl.get('cash_flow.other_income'),
-    type: 'OTHER_INCOME',
     value: 'other_income',
   },
   {
diff --git a/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.js b/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.js
index c86e29667..0121a9c59 100644
--- a/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.js
+++ b/src/containers/CashFlow/AccountTransactions/AccountTransactionsActionsBar.js
@@ -43,15 +43,17 @@ function AccountTransactionsActionsBar({
   // Handle money in form
   const handleMoneyInFormTransaction = (account) => {
     openDialog('money-in', {
-      account_type: account,
       account_id: accountId,
+      account_type: account.value,
+      account_name: account.name,
     });
   };
   // Handle money out form
   const handlMoneyOutFormTransaction = (account) => {
     openDialog('money-out', {
-      account_type: account,
       account_id: accountId,
+      account_type: account.value,
+      account_name: account.name,
     });
   };
   // Refresh cashflow infinity transactions hook.
diff --git a/src/containers/Dialogs/MoneyInDialog/index.js b/src/containers/Dialogs/MoneyInDialog/index.js
index d5098a413..01c54bfa5 100644
--- a/src/containers/Dialogs/MoneyInDialog/index.js
+++ b/src/containers/Dialogs/MoneyInDialog/index.js
@@ -12,15 +12,15 @@ const MoneyInDialogContent = React.lazy(() => import('./MoneyInDialogContent'));
  */
 function MoneyInDialog({
   dialogName,
-  payload = { account_type: null, account_id: null },
+  payload = { account_type: null, account_id: null, account_name: '' },
   isOpen,
 }) {
-
+  console.log(payload, 'EE');
   return (
     <Dialog
       name={dialogName}
       title={intl.get('cash_flow_transaction.money_in', {
-        value: payload.account_type?.name,
+        value: payload.account_name,
       })}
       isOpen={isOpen}
       canEscapeJeyClose={true}
@@ -31,7 +31,7 @@ function MoneyInDialog({
         <MoneyInDialogContent
           dialogName={dialogName}
           accountId={payload.account_id}
-          accountType={payload.account_type?.value}
+          accountType={payload.account_type}
         />
       </DialogSuspense>
     </Dialog>
diff --git a/src/containers/Dialogs/MoneyOutDialog/index.js b/src/containers/Dialogs/MoneyOutDialog/index.js
index 2cf31320e..308ddc18e 100644
--- a/src/containers/Dialogs/MoneyOutDialog/index.js
+++ b/src/containers/Dialogs/MoneyOutDialog/index.js
@@ -13,14 +13,15 @@ const MoneyOutDialogContent = React.lazy(() =>
  */
 function MoneyOutDialog({
   dialogName,
-  payload = { account_type: null, account_id: null },
+  payload = { account_type: null, account_id: null, account_name: '' },
+
   isOpen,
 }) {
   return (
     <Dialog
       name={dialogName}
       title={intl.get('cash_flow_transaction.money_out', {
-        value: payload.account_type?.name,
+        value: payload.account_name,
       })}
       isOpen={isOpen}
       canEscapeJeyClose={true}
@@ -31,7 +32,7 @@ function MoneyOutDialog({
         <MoneyOutDialogContent
           dialogName={dialogName}
           accountId={payload.account_id}
-          accountType={payload.account_type?.value}
+          accountType={payload.account_type}
         />
       </DialogSuspense>
     </Dialog>

From fb14858f16444a9d318c820c07972a4265270a4d Mon Sep 17 00:00:00 2001
From: elforjani13 <39470382+elforjani13@users.noreply.github.com>
Date: Thu, 28 Oct 2021 15:15:54 +0200
Subject: [PATCH 2/2] fix: add invalidate query cash flow in receipt.

---
 src/hooks/query/receipts.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/hooks/query/receipts.js b/src/hooks/query/receipts.js
index 989677765..ebefb6c26 100644
--- a/src/hooks/query/receipts.js
+++ b/src/hooks/query/receipts.js
@@ -20,6 +20,10 @@ const commonInvalidateQueries = (queryClient) => {
   // Invalidate financial reports.
   queryClient.invalidateQueries(t.FINANCIAL_REPORT);
 
+  // Invalidate the cashflow transactions.
+  queryClient.invalidateQueries(t.CASH_FLOW_TRANSACTIONS);
+  queryClient.invalidateQueries(t.CASHFLOW_ACCOUNT_TRANSACTIONS_INFINITY);
+  
   // Invalidate the settings.
   queryClient.invalidateQueries([t.SETTING, t.SETTING_RECEIPTS]);
 };