Compare commits

..

4 Commits

Author SHA1 Message Date
victorAnumudu 2f7f482293 updated apply loan payload for employer uid 2024-06-13 15:00:24 +01:00
ameye ee86d40bcc Merge branch 'employer-uid' of DigiFi/digifi-www into master 2024-06-11 18:36:57 +00:00
victorAnumudu 409acd300d employer uid payload added 2024-06-11 19:01:16 +01:00
ameye fc7edec093 Merge branch 'employer-info-update' of DigiFi/digifi-www into master 2024-06-10 19:15:14 +00:00
2 changed files with 14 additions and 8 deletions
@@ -27,7 +27,7 @@ const initialValues = {
salary_payment_date: "",
employment_id: "",
highest_eductaion: "",
employer: "",
employer_uid: "",
isChecked: false
};
@@ -79,7 +79,7 @@ const validationSchema = Yup.object().shape({
.required("Required"),
highest_eductaion: Yup.string()
.required("Required"),
employer: Yup.string().when('isChecked', {
employer_uid: Yup.string().when('isChecked', {
is: false,
then: () => Yup.string().required('required'),
}),
@@ -96,7 +96,13 @@ export default function DashboardHomeEmploymentInfo({handleNextStep}:Props) {
//FUNCTION TO HANDLE SUBMIT
const handleSubmit = (values:any) => {
// Remember to changed the checked value's name
handleNextStep({employment: values})
if(values.employer_uid){
let employer_uid = values.employer_uid
delete values.employer_uid
handleNextStep({employer_uid, employment: values})
}else{
handleNextStep({employment: values})
}
};
useEffect(()=>{
@@ -128,15 +134,15 @@ export default function DashboardHomeEmploymentInfo({handleNextStep}:Props) {
<div className='w-full gap-[2rem]'>
<InputCompOne
parentClass="w-full"
name="employer"
name="employer_uid"
floatLabel="Employer Name"
// labelClass="font-bold text-[1.125rem]"
select={true}
selectClass="w-full h-[3.625rem] bg-[#EFEFEF] px-4 rounded-[.375rem]"
selectOptions={{loading:employersList?.loading, data: employersList?.data?.records}}
selectValue={props.values.employer}
selectValue={props.values.employer_uid}
onChange={props.handleChange}
error={(props.errors.employer && props.touched.employer) ? props.errors.employer : ''}
error={(props.errors.employer_uid && props.touched.employer_uid) ? props.errors.employer_uid : ''}
disabled={props.values.isChecked}
/>
<div className='flex gap-4 items-start my-2'>
+2 -2
View File
@@ -105,7 +105,7 @@ const InputCompOne = forwardRef<HTMLInputElement, InputCompOneProps>(
>
{selectOptions.loading ?
<option value=''>Loading...</option>
: selectOptions.data.length && name == 'employer' ?
: selectOptions.data.length && name == 'employer_uid' ?
<>
<option value=''>Please Select</option>
{selectOptions.data.map(({ uid, name }) => (
@@ -114,7 +114,7 @@ const InputCompOne = forwardRef<HTMLInputElement, InputCompOneProps>(
</option>
))}
</>
: selectOptions.data.length && name != 'employer' ?
: selectOptions.data.length && name != 'employer_uid' ?
selectOptions.data.map(({ value, label }) => (
<option key={value} value={value}>
{label}