Merge branch 'relative-list' of WrenchBoard/Users-Wrench into master

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

src/components/FamilyAcc/FamilySettings/Tabs/RelativeTable.jsx

@@ -24,21 +24,22 @@ export default function RelativeTable({relativeList}) {
                     {relativeList && relativeList?.length > 0 ? (
                         currentRelativeList.map((value, index) => (
                         <tr key={value.uid || index} className="border-b dark:border-[#5356fb29] hover:bg-gray-50">
-                          <td className='py-2'>
+                          <td className='p-2'>
                             <div className="flex flex-col">
                               <h1 className="font-bold text-xl text-dark-gray dark:text-white">
-                                {/* {value.firstname && value.firstname} {value.lastname && value.lastname} */} Firstname Lastname
+                                {value.firstname && value.firstname} {value.lastname && value.lastname}
                               </h1>
                               <span className="text-sm text-thin-light-gray">
-                                {/* {value.email && value.email} */} email.gmail.com
+                                {value.email && value.email}
                               </span>
                             </div>
                           </td>
-                          <td className='py-2'>
-                            family type
+                          <td className='p-2'>
+                            {/* <span>Family Type</span> */}
+                            <span>{value.family_type && value.family_type.toUpperCase()}</span>
                           </td>
-                          <td className='py-2 text-right'>
-                            {0}
+                          <td className='p-2 text-right'>
+                            {value.status && value.status}
                           </td>
                         </tr>
                         ))

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:[]})
     })