From 2fd78ca1c4d7b0cbc91f612c00e6080455697351 Mon Sep 17 00:00:00 2001 From: elforjani13 <39470382+elforjani13@users.noreply.github.com> Date: Tue, 26 Oct 2021 14:33:41 +0200 Subject: [PATCH] feat: fix setting cash. --- .../Dialogs/MoneyInDialog/MoneyInDialogProvider.js | 10 +++++++++- .../MoneyInDialog/OtherIncome/OtherIncomeFormFields.js | 6 +++--- .../OwnerContribution/OwnerContributionFormFields.js | 8 ++++---- .../TransferFromAccountFormFields.js | 6 +++--- .../Dialogs/MoneyOutDialog/MoneyOutDialogProvider.js | 10 +++++++++- .../OtherExpense/OtherExpnseFormFields.js | 6 +++--- .../OwnerDrawings/OwnerDrawingsFormFields.js | 4 ++-- .../TransferToAccount/TransferToAccountFormFields.js | 6 +++--- 8 files changed, 36 insertions(+), 20 deletions(-) diff --git a/src/containers/Dialogs/MoneyInDialog/MoneyInDialogProvider.js b/src/containers/Dialogs/MoneyInDialog/MoneyInDialogProvider.js index 8d365451d..897187065 100644 --- a/src/containers/Dialogs/MoneyInDialog/MoneyInDialogProvider.js +++ b/src/containers/Dialogs/MoneyInDialog/MoneyInDialogProvider.js @@ -4,6 +4,7 @@ import { useCreateCashflowTransaction, useAccounts, useCashflowAccounts, + useSettingCashFlow, } from 'hooks/query'; const MoneyInDialogContent = React.createContext(); @@ -27,6 +28,9 @@ function MoneyInDialogProvider({ const { mutateAsync: createCashflowTransactionMutate } = useCreateCashflowTransaction(); + // Handle fetching settings. + const { isLoading: isSettingsLoading } = useSettingCashFlow(); + // Submit payload. const [submitPayload, setSubmitPayload] = React.useState({}); @@ -47,7 +51,11 @@ function MoneyInDialogProvider({ }; return ( - + ); diff --git a/src/containers/Dialogs/MoneyInDialog/OtherIncome/OtherIncomeFormFields.js b/src/containers/Dialogs/MoneyInDialog/OtherIncome/OtherIncomeFormFields.js index a21c12e9e..e8446a008 100644 --- a/src/containers/Dialogs/MoneyInDialog/OtherIncome/OtherIncomeFormFields.js +++ b/src/containers/Dialogs/MoneyInDialog/OtherIncome/OtherIncomeFormFields.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FastField, ErrorMessage } from 'formik'; +import { FastField, Field, ErrorMessage } from 'formik'; import { Classes, FormGroup, @@ -112,7 +112,7 @@ function OtherIncomeFormFields({ {/*------------ Transaction number -----------*/} - + {({ form, field, meta: { error, touched } }) => ( } @@ -147,7 +147,7 @@ function OtherIncomeFormFields({ )} - + {/*------------ amount -----------*/} diff --git a/src/containers/Dialogs/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.js b/src/containers/Dialogs/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.js index edaead623..a696ee8a5 100644 --- a/src/containers/Dialogs/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.js +++ b/src/containers/Dialogs/MoneyInDialog/OwnerContribution/OwnerContributionFormFields.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FastField, ErrorMessage } from 'formik'; +import { FastField, Field, ErrorMessage } from 'formik'; import { Classes, FormGroup, @@ -28,7 +28,7 @@ import { momentFormatter, tansformDateValue, handleDateChange, - compose + compose, } from 'utils'; import { CLASSES } from 'common/classes'; import { useMoneyInDailogContext } from '../MoneyInDialogProvider'; @@ -112,7 +112,7 @@ function OwnerContributionFormFields({ {/*------------ Transaction number -----------*/} - + {({ form, field, meta: { error, touched } }) => ( } @@ -147,7 +147,7 @@ function OwnerContributionFormFields({ )} - + {/*------------ amount -----------*/} diff --git a/src/containers/Dialogs/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.js b/src/containers/Dialogs/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.js index 61bcf810a..64bd3f338 100644 --- a/src/containers/Dialogs/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.js +++ b/src/containers/Dialogs/MoneyInDialog/TransferFromAccount/TransferFromAccountFormFields.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FastField, ErrorMessage } from 'formik'; +import { FastField, Field, ErrorMessage } from 'formik'; import { Classes, FormGroup, @@ -111,7 +111,7 @@ function TransferFromAccountFormFields({ {/*------------ Transaction number -----------*/} - + {({ form, field, meta: { error, touched } }) => ( } @@ -146,7 +146,7 @@ function TransferFromAccountFormFields({ )} - + {/*------------ amount -----------*/} diff --git a/src/containers/Dialogs/MoneyOutDialog/MoneyOutDialogProvider.js b/src/containers/Dialogs/MoneyOutDialog/MoneyOutDialogProvider.js index fb11f772a..648dacc2c 100644 --- a/src/containers/Dialogs/MoneyOutDialog/MoneyOutDialogProvider.js +++ b/src/containers/Dialogs/MoneyOutDialog/MoneyOutDialogProvider.js @@ -4,6 +4,7 @@ import { useAccounts, useCreateCashflowTransaction, useCashflowAccounts, + useSettingCashFlow, } from 'hooks/query'; const MoneyInDialogContent = React.createContext(); @@ -22,6 +23,9 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) { const { mutateAsync: createCashflowTransactionMutate } = useCreateCashflowTransaction(); + // Handle fetching settings. + const { isLoading: isSettingsLoading } = useSettingCashFlow(); + // Submit payload. const [submitPayload, setSubmitPayload] = React.useState({}); @@ -42,7 +46,11 @@ function MoneyOutProvider({ accountId, accountType, dialogName, ...props }) { }; return ( - + ); diff --git a/src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.js b/src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.js index 3366d5c6f..c1ab6813c 100644 --- a/src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.js +++ b/src/containers/Dialogs/MoneyOutDialog/OtherExpense/OtherExpnseFormFields.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FastField, ErrorMessage } from 'formik'; +import { FastField, Field, ErrorMessage } from 'formik'; import { Classes, FormGroup, @@ -112,7 +112,7 @@ function OtherExpnseFormFields({ {/*------------ Transaction number -----------*/} - + {({ form, field, meta: { error, touched } }) => ( } @@ -147,7 +147,7 @@ function OtherExpnseFormFields({ )} - + {/*------------ amount -----------*/} diff --git a/src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.js b/src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.js index bdf8a2d2c..7f0feb21d 100644 --- a/src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.js +++ b/src/containers/Dialogs/MoneyOutDialog/OwnerDrawings/OwnerDrawingsFormFields.js @@ -111,7 +111,7 @@ function OwnerDrawingsFormFields({ {/*------------ Transaction number -----------*/} - + {({ form, field, meta: { error, touched } }) => ( } @@ -146,7 +146,7 @@ function OwnerDrawingsFormFields({ )} - + {/*------------ amount -----------*/} diff --git a/src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.js b/src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.js index 3f03027a5..94d2bff33 100644 --- a/src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.js +++ b/src/containers/Dialogs/MoneyOutDialog/TransferToAccount/TransferToAccountFormFields.js @@ -1,5 +1,5 @@ import React from 'react'; -import { FastField, ErrorMessage } from 'formik'; +import { FastField, Field, ErrorMessage } from 'formik'; import { Classes, FormGroup, @@ -112,7 +112,7 @@ function TransferToAccountFormFields({ {/*------------ Transaction number -----------*/} - + {({ form, field, meta: { error, touched } }) => ( } @@ -147,7 +147,7 @@ function TransferToAccountFormFields({ )} - + {/*------------ amount -----------*/}