diff --git a/src/components/FamilyAcc/FamilySettings/Tabs/InviteRelative.jsx b/src/components/FamilyAcc/FamilySettings/Tabs/InviteRelative.jsx index 0691d73..3803026 100644 --- a/src/components/FamilyAcc/FamilySettings/Tabs/InviteRelative.jsx +++ b/src/components/FamilyAcc/FamilySettings/Tabs/InviteRelative.jsx @@ -49,8 +49,6 @@ export default function InviteRelative({action, situation, setReloadRelList}) { }); // STATE FOR KNOWING WHEN A REQUEST IS MADE TO THE SERVER const handleInvite = (values) => { - // delete values.firstname - // delete values.lasttname setRequestStatus({loading: true, status: false, message: ""}) api.inviteFamilyRelative(values).then(response => { let {status, data} = response diff --git a/src/components/FamilyAcc/FamilySettings/Tabs/RelativeTable.jsx b/src/components/FamilyAcc/FamilySettings/Tabs/RelativeTable.jsx index 384d839..4706be5 100644 --- a/src/components/FamilyAcc/FamilySettings/Tabs/RelativeTable.jsx +++ b/src/components/FamilyAcc/FamilySettings/Tabs/RelativeTable.jsx @@ -24,21 +24,22 @@ export default function RelativeTable({relativeList}) { {relativeList && relativeList?.length > 0 ? ( currentRelativeList.map((value, index) => ( - +

- {/* {value.firstname && value.firstname} {value.lastname && value.lastname} */} Firstname Lastname + {value.firstname && value.firstname} {value.lastname && value.lastname}

- {/* {value.email && value.email} */} email.gmail.com + {value.email && value.email}
- - family type + + {/* Family Type */} + {value.family_type && value.family_type.toUpperCase()} - - {0} + + {value.status && value.status} )) diff --git a/src/components/FamilyAcc/FamilySettings/Tabs/Relatives.jsx b/src/components/FamilyAcc/FamilySettings/Tabs/Relatives.jsx index 24cc536..db59ded 100644 --- a/src/components/FamilyAcc/FamilySettings/Tabs/Relatives.jsx +++ b/src/components/FamilyAcc/FamilySettings/Tabs/Relatives.jsx @@ -21,8 +21,12 @@ const Relatives = () => { const getRelativeList = () => { setRelativeList(prev => ({...prev, loading: true})) api.getFamilyRelativeList().then(response => { - setRelativeList({loading:false, data:response.data.family_types}) - // console.log('RESPONSE',response.data) + let {data:{result_list}} = response + if(!result_list || result_list?.length <= 0){ + setRelativeList({loading:false, data:[]}) + return + } + setRelativeList({loading:false, data:result_list}) }).catch(error => { setRelativeList({loading:false, data:[]}) })