Skip to content

Commit 15fee31

Browse files
authored
Merge pull request #2153 from Northeastern-Electric-Racing/duplicate-error-msg-bug
Address error msg issues with reimbursement products
2 parents 91c0aa6 + a619c6d commit 15fee31

1 file changed

Lines changed: 13 additions & 14 deletions

File tree

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

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,14 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
129129
<Controller
130130
name={`reimbursementProducts.${product.index}.name`}
131131
control={control}
132-
render={({ fieldState: { error } }) => (
132+
render={({ field }) => (
133133
<TextField
134-
placeholder="Description"
135-
error={!!error}
136-
helperText={error ? error.message : null}
137-
variant="outlined"
138-
fullWidth
134+
{...field}
135+
placeholder={'Description'}
139136
autoComplete="off"
137+
variant={'outlined'}
138+
fullWidth
139+
error={!!errors.reimbursementProducts?.[product.index]?.name}
140140
/>
141141
)}
142142
/>
@@ -148,20 +148,19 @@ const ReimbursementProductTable: React.FC<ReimbursementProductTableProps> = ({
148148
<Controller
149149
name={`reimbursementProducts.${product.index}.cost`}
150150
control={control}
151-
render={({ fieldState: { error } }) => (
151+
render={({ field }) => (
152152
<TextField
153-
placeholder="Cost"
153+
{...field}
154+
placeholder={'Cost'}
155+
variant={'outlined'}
154156
type="number"
155-
InputLabelProps={{ shrink: true }}
157+
fullWidth
158+
autoComplete="off"
156159
InputProps={{
157160
startAdornment: <InputAdornment position="start">$</InputAdornment>
158161
}}
159-
error={!!error}
160-
helperText={error ? error.message : null}
161-
variant="outlined"
162-
fullWidth
163-
autoComplete="off"
164162
onBlur={(e) => onCostBlurHandler(parseFloat(e.target.value), product.index)}
163+
error={!!errors.reimbursementProducts?.[product.index]?.cost}
165164
/>
166165
)}
167166
/>

0 commit comments

Comments
 (0)