Skip to content

Commit a3c70f4

Browse files
authored
Fix the to field issue in the liability payment form. (#78)
1 parent 9f9f80e commit a3c70f4

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

src/pages/account/liability/payment-form.tsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react'
22
import { mdiCancel, mdiContentSave } from "@mdi/js";
33
import { useLoaderData, useNavigate, useRouteLoaderData } from "react-router-dom";
4+
import Loading from "../../../components/layout/loading.component";
45
import { Category, Transaction } from "../../../types/types";
56
import { TransactionService } from "../../../service/TransactionService";
67
import BreadCrumbItem from "../../../components/breadcrumb/breadcrumb-item.component";
@@ -17,16 +18,20 @@ const LiabilityPayment = () => {
1718

1819
const onSubmit = (entity: any) => {
1920
const { id } = transaction
20-
TransactionService.persist(account, entity, navigate, id)
21+
TransactionService.persist(account, {
22+
...entity,
23+
to: account
24+
}, navigate, id)
2125
}
2226

27+
if (!account) return <Loading/>
2328
const model = transaction as Transaction
2429
return <>
2530
<BreadCrumbs>
2631
<BreadCrumbItem label='page.nav.settings'/>
27-
<BreadCrumbItem label='pae.nav.accounts'/>
32+
<BreadCrumbItem label='page.nav.accounts'/>
2833
<BreadCrumbItem label='page.nav.accounts.liability'/>
29-
<BreadCrumbItem message={ account?.name }/>
34+
<BreadCrumbItem message={ account.name }/>
3035
<BreadCrumbItem label='page.nav.transactions'/>
3136
<BreadCrumbItem label='common.action.edit' />
3237
</BreadCrumbs>
@@ -52,7 +57,7 @@ const LiabilityPayment = () => {
5257
<Input.Hidden id='to' value={ transaction.destination }/>
5358
<Input.Text id='_none'
5459
type='text'
55-
value={ account?.name }
60+
value={ account.name }
5661
title='Transaction.to'
5762
readonly
5863
required/>

src/pages/account/liability/routes.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,7 @@ const routes = {
2121
id: 'liability',
2222
path: ':id',
2323
loader: async ({ params }) => {
24-
return {
25-
account: await AccountRepository.get(params.id)
26-
}
24+
return await AccountRepository.get(params.id)
2725
},
2826
children: [
2927
{
@@ -43,6 +41,7 @@ const routes = {
4341
loader: () => {
4442
return {
4543
transaction: {
44+
id: NaN
4645
}
4746
}
4847
}
@@ -52,9 +51,7 @@ const routes = {
5251
path: 'transactions/:transactionId/edit',
5352
Component: lazy(() => import('./payment-form')),
5453
loader: async ({ params }) => {
55-
return {
56-
transaction: await TransactionRepository.get(params.id, params.transactionId)
57-
}
54+
return await TransactionRepository.get(params.id, params.transactionId)
5855
}
5956
}
6057
]

0 commit comments

Comments
 (0)