Merge pull request #326 from credebl/invitation-issues

Invitation issues
credebl · Oct 10, 2023 · c3412f7 · c3412f7
2 parents 4e4796c + e671475
commit c3412f7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 19 deletions.
diff --git a/src/components/EcosystemInvite/EcoInvitationList.tsx b/src/components/EcosystemInvite/EcoInvitationList.tsx
@@ -1,18 +1,14 @@
-
-import React from 'react';
-
-interface InvitationProps{
-	invitationId:string;
-	invitationEmail:string
-	ecosytem:[]
+interface InvitationProps {
+	invitationId: string;
+	ecosytem: [];
 }
 
-const EcoInvitationList = (props: InvitationProps ) => {
+const EcoInvitationList = (props: InvitationProps) => {
+	const { invitationId, ecosytem } = props;
+
+	const { name } = ecosytem;
 
-	const {invitationId, invitationEmail,ecosytem} = props
-
 	return (
-		<>
 			<div className="flex space-x-4">
 				<svg
 					width="60"
@@ -52,7 +48,7 @@ const EcoInvitationList = (props: InvitationProps ) => {
 
 				<div className="flex-1 min-w-0">
 					<p className="text-base font-semibold text-gray-900 leading-none truncate mb-0.5 dark:text-white">
-						{invitationEmail}
+						{name}
 					</p>
 
 					<div className="flow-root h-auto">
@@ -74,7 +70,6 @@ const EcoInvitationList = (props: InvitationProps ) => {
 					</div>
 				</div>
 			</div>
-		</>
 	);
 };
 

diff --git a/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx b/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx
@@ -1,4 +1,4 @@
-import { Button, Pagination } from 'flowbite-react';
+import { Button, Card, Pagination } from 'flowbite-react';
 import { useEffect, useState } from 'react';
 import {
 	acceptRejectEcosystemInvitations,
@@ -229,12 +229,12 @@ stroke-linejoin="round"
 							<CustomSpinner />
 						</div>
 					) : invitationsData && invitationsData?.length > 0 ? (
-						<div id={selectedId?.toString()} className="p-2 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-3 dark:bg-gray-800">
+						<div id={selectedId?.toString()} className="p-2 mb-4 bg-white 2xl:col-span-2 dark:border-gray-700 sm:p-3 dark:bg-gray-800">
 							<div id={selectedId?.toString()} className="flow-root">
-								<ul id={selectedId?.toString()} className="divide-y divide-gray-200 dark:divide-gray-700">
+								<ul id={selectedId?.toString()}>
 									{invitationsData.map((invitation) => (
-										<li key={invitation.id} className="p-4">
-											<div id={invitation.email} className="flex flex-wrap justify-between xl:block 2xl:flex align-center 2xl:space-x-4">
+										<Card key={invitation.id} className="p-4 mb-4">
+											<div id={invitation.email} className="flex flex-wrap justify-between 2xl:flex align-center">
 												<div id={invitation.email} className=" xl:mb-4 2xl:mb-0">
 													<EcoInvitationList 
 													invitationId={invitation.id} 
@@ -290,7 +290,7 @@ stroke-linejoin="round"
 													</select>
 												</div>
 											</div>
-										</li>
+										</Card>
 									))}
 								</ul>
 							</div>