Merge pull request #45 from Grvs44:Grvs44/issue44

Fixed issue with alert "Missing budget/payee" in payee/payment edit dialogs
Grvs44 · Aug 21, 2024 · cf28b7e · cf28b7e
2 parents 3725421 + 7b3988b
commit cf28b7e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/budgetmanagerpwa/src/components/PayeeForm.jsx b/budgetmanagerpwa/src/components/PayeeForm.jsx
@@ -9,7 +9,9 @@ const empty = { budget: null, name: '', description: '' }
 export default function PayeeForm({ payee, onClose, onSubmit, open, title }) {
   if (payee == null) payee = empty
   const budget = useGetBudgetQuery(payee.budget, { skip: payee.budget == null })
-  const [data, setData] = React.useState(budget.data)
+  const [data, setData] = React.useState(
+    payee.budget ? payee.budget : budget.data
+  )
 
   React.useEffect(() => setData(budget.data), [budget.isLoading])
 

diff --git a/budgetmanagerpwa/src/components/PaymentForm.jsx b/budgetmanagerpwa/src/components/PaymentForm.jsx
@@ -29,7 +29,9 @@ export default function PaymentForm({
   const budgetQuery = useGetBudgetQuery(payeeQuery.data?.budget, {
     skip: payeeQuery.data == null,
   })
-  const [payee, setPayee] = React.useState(payeeQuery.data)
+  const [payee, setPayee] = React.useState(
+    payment.payee ? payment.payee : payeeQuery.data
+  )
   const [budget, setBudget] = React.useState(budgetQuery.data)
   React.useEffect(() => setPayee(payeeQuery.data), [payeeQuery.isLoading])
   React.useEffect(() => setBudget(budgetQuery.data), [budgetQuery.data != null])