diff --git a/src/components/FamilyAcc/FamilySettings/Tabs/InviteRelative.jsx b/src/components/FamilyAcc/FamilySettings/Tabs/InviteRelative.jsx index 3803026..e880d90 100644 --- a/src/components/FamilyAcc/FamilySettings/Tabs/InviteRelative.jsx +++ b/src/components/FamilyAcc/FamilySettings/Tabs/InviteRelative.jsx @@ -38,7 +38,7 @@ const validationSchema = Yup.object().shape({ }; -export default function InviteRelative({action, situation, setReloadRelList}) { +export default function InviteRelative({action, situation, setReloadRelList, relativeList}) { const api = new usersService() @@ -167,7 +167,7 @@ export default function InviteRelative({action, situation, setReloadRelList}) { {/* Type */}
-
+ {/*
+
*/} +
+ +
diff --git a/src/components/FamilyAcc/FamilySettings/Tabs/Relatives.jsx b/src/components/FamilyAcc/FamilySettings/Tabs/Relatives.jsx index db59ded..a662d61 100644 --- a/src/components/FamilyAcc/FamilySettings/Tabs/Relatives.jsx +++ b/src/components/FamilyAcc/FamilySettings/Tabs/Relatives.jsx @@ -12,7 +12,7 @@ const Relatives = () => { const [invitePopout, setInvitePopout] = useState(false) - const [relativeList, setRelativeList] = useState({loading: true, data:[]}) + const [relativeList, setRelativeList] = useState({loading: true, result_list:[], family_types:[]}) const showInviteMemberPopout = () => { setInvitePopout(true) @@ -21,14 +21,14 @@ const Relatives = () => { const getRelativeList = () => { setRelativeList(prev => ({...prev, loading: true})) api.getFamilyRelativeList().then(response => { - let {data:{result_list}} = response - if(!result_list || result_list?.length <= 0){ - setRelativeList({loading:false, data:[]}) + let {status, data} = response + if(status != 200 || !data){ + setRelativeList({loading:false, result_list:[], family_types:[]}) return } - setRelativeList({loading:false, data:result_list}) + setRelativeList({loading:false, result_list:data?.result_list, family_types:data?.family_types}) }).catch(error => { - setRelativeList({loading:false, data:[]}) + setRelativeList({loading:false, result_list:[], family_types:[]}) }) } @@ -47,7 +47,7 @@ const Relatives = () => { {relativeList.loading ? : - + }
@@ -58,6 +58,7 @@ const Relatives = () => { action={()=>setInvitePopout(false)} situation={invitePopout} setReloadRelList={setReloadRelList} + relativeList={relativeList} /> } {/* END OF INVITE RELATIVE POPOUT */}