Skip to content

Commit 73bf611

Browse files
committed
Fixed cost error messages and removed div
1 parent 0b78ec5 commit 73bf611

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

src/frontend/src/pages/FinancePage/ReimbursementRequestForm/ReimbursementProductTable.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import {
66
Autocomplete,
77
Button,
8+
FormControl,
89
FormLabel,
910
FormHelperText,
1011
IconButton,
@@ -98,7 +99,7 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
9899
{uniqueWbsElementsWithProducts.get(key)?.map((product, index) => (
99100
<ListItem key={product.index}>
100101
<Box sx={{ display: 'flex', flexDirection: 'row' }}>
101-
<div style={{ display: 'flex', flexDirection: 'column', width: '50%', marginRight: '4px' }}>
102+
<FormControl sx={{ width: '50%', marginRight: '4px' }}>
102103
<Controller
103104
name={`reimbursementProducts.${product.index}.name`}
104105
control={control}
@@ -117,8 +118,8 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
117118
<FormHelperText error>
118119
{errors.reimbursementProducts?.[product.index]?.name?.message}
119120
</FormHelperText>
120-
</div>
121-
<div style={{ display: 'flex', flexDirection: 'column', width: '50%' }}>
121+
</FormControl>
122+
<FormControl sx={{ width: '50%' }}>
122123
<Controller
123124
name={`reimbursementProducts.${product.index}.cost`}
124125
control={control}
@@ -142,7 +143,7 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
142143
<FormHelperText error>
143144
{errors.reimbursementProducts?.[product.index]?.cost?.message}
144145
</FormHelperText>
145-
</div>
146+
</FormControl>
146147
<IconButton onClick={() => removeProduct(product.index)}>
147148
<Delete />
148149
</IconButton>

src/frontend/src/pages/FinancePage/ReimbursementRequestForm/ReimbursementRequestForm.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ const schema = yup.object().shape({
4747
yup.object().shape({
4848
wbsNum: yup.object().required('WBS Number is required'),
4949
name: yup.string().required('Description is required'),
50-
cost: yup.number().required('Amount is required').min(1, 'Amount must be greater than 0')
50+
cost: yup
51+
.number()
52+
.typeError('Amount is required')
53+
.required('Amount is required')
54+
.min(1, 'Amount must be greater than 0')
5155
})
5256
)
5357
.required('reimbursement products required')

0 commit comments

Comments
 (0)