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 ( 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 (