From 3f68767eba4c10be25010245925535dacc78f6dc Mon Sep 17 00:00:00 2001
From: sanjay-k1910 <sanjay.khatal@ayanworks.com>
Date: Fri, 13 Oct 2023 21:41:50 +0530
Subject: [PATCH 1/3] refactor: endorsement flow

Signed-off-by: sanjay-k1910 <sanjay.khatal@ayanworks.com>
---
 src/api/ecosystem.ts                          |   2 +-
 src/app/SideBar.astro                         |  18 +-
 src/commonComponents/SchemaCard.tsx           |   2 +-
 src/commonComponents/StatusTabletTag.tsx      |   2 +-
 src/components/Ecosystem/Dashboard.tsx        |  13 +-
 .../Ecosystem/EcosystemSidebarOption.tsx      | 125 ++++----
 .../Ecosystem/Endorsement/EndorsementCard.tsx |  37 ++-
 .../Endorsement/EndorsementPopup.tsx          |   4 +-
 .../Ecosystem/Endorsement/index.tsx           |  69 +++--
 src/components/EmptyListComponent/index.tsx   |   2 +-
 src/components/Issuance/IssuedCrdentials.tsx  | 140 ++++-----
 .../Verification/ProofRequestPopup.tsx        |   2 +-
 .../VerificationCredentialList.tsx            | 289 +++++++++---------
 src/config/ecosystem.ts                       |  21 +-
 14 files changed, 368 insertions(+), 358 deletions(-)

diff --git a/src/api/ecosystem.ts b/src/api/ecosystem.ts
index 4a29856ea..bab35e7ca 100644
--- a/src/api/ecosystem.ts
+++ b/src/api/ecosystem.ts
@@ -87,7 +87,7 @@ export const getEndorsementList = async (
 		apiRoutes.Ecosystem.endorsements.list
 	}?${page ? `pageNumber=${page}` : ''}${search ? `&search=${search}` : ''}${
 		itemPerPage ? `&pageSize=${itemPerPage}` : ''
-	}${type ? `&type=${type}` : ''}${status ? `&status=${status}` : ''}`;
+	}${type ? `&type=${type}` : ''}${status ? `&search=${status}` : ''}`;
 
 	const axiosPayload = {
 		url,
diff --git a/src/app/SideBar.astro b/src/app/SideBar.astro
index 041a91212..62e3d9e49 100644
--- a/src/app/SideBar.astro
+++ b/src/app/SideBar.astro
@@ -22,7 +22,7 @@ import { pathRoutes } from '../config/pathRoutes';
 			]}
 		>
 			<div
-				class="flex-1 px-3 space-y-1 bg-white divide-y divide-gray-200 dark:bg-gray-800 dark:divide-gray-700"
+				class="px-3 space-y-1 bg-white divide-y divide-gray-200 dark:bg-gray-800 dark:divide-gray-700"
 			>
 				<ul class="pb-2 space-y-2">
 					<li class="hidden">
@@ -73,7 +73,6 @@ import { pathRoutes } from '../config/pathRoutes';
 							<span class="ml-3" sidebar-toggle-item>Dashboard</span>
 						</a>
 					</li>
-					<EcosystemSidebarOption client:load />
 					<li>
 						<a
 							href={pathRoutes.organizations.root}
@@ -278,20 +277,21 @@ import { pathRoutes } from '../config/pathRoutes';
 										height="20"
 										fill="none"
 										viewBox="0 0 25 22"
+										class="flex-shrink-0 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
 									>
 										<path
-											stroke="#6B7280"
+											stroke="currentColor"
 											stroke-linecap="round"
 											stroke-linejoin="round"
 											stroke-width="1.25"
 											d="M4 4h3.125M4 6.885h3.125M1 1h15.702M4.695 10h.962m1.453 0h.96m1.422 0h.962m1.452 0h.962M17 1v4.952m0 3.715V13H1V1"
 										></path>
 										<path
-											fill="#6B7280"
+											fill="currentColor"
 											d="M14 5.5a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0Zm-3.816 0a1.316 1.316 0 1 0 2.632 0 1.316 1.316 0 0 0-2.633 0Z"
 										></path>
 										<path
-											stroke="#6B7280"
+											stroke="currentColor"
 											stroke-linecap="round"
 											stroke-linejoin="round"
 											stroke-width="1.25"
@@ -312,17 +312,18 @@ import { pathRoutes } from '../config/pathRoutes';
 										height="20"
 										fill="none"
 										viewBox="0 0 25 25"
+										class="flex-shrink-0 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
 									>
 										<path
-											fill="#6B7280"
+											fill="currentColor"
 											d="M19.322 8.824h-4.427V7.612c0-.515-.375-.93-.84-.93h-1.592v-.76a3.335 3.335 0 0 0 1.156-2.52C13.62 1.527 12.035 0 10.085 0 8.135 0 6.55 1.526 6.55 3.403c0 .97.424 1.881 1.157 2.519v.76H6.114c-.465 0-.84.415-.84.93v1.212H.84c-.465 0-.839.414-.839.93v11.638c0 .515.374.93.84.93h12.78l-.993-1.86 7.534-7.962V9.753c0-.51-.374-.93-.84-.93Zm-10.36-4.2c-.461-.296-.737-.752-.737-1.221 0-.838.848-1.544 1.856-1.544 1.004 0 1.855.706 1.855 1.544 0 .47-.275.93-.736 1.22a.952.952 0 0 0-.42.807v1.248H9.381V5.43a.958.958 0 0 0-.42-.806ZM6.948 8.54h6.267v2.141H6.949v-2.14Zm5.678 11.922H1.68v-9.78h16.804l.065 1.37 1.21.447h.403l-7.534 7.963Z"
 										></path>
 										<path
-											fill="#6B7280"
+											fill="currentColor"
 											d="M24.997 17.854c0 3.945-2.889 7.143-6.452 7.143s-6.451-3.198-6.451-7.143 2.888-7.143 6.451-7.143c3.563 0 6.452 3.198 6.452 7.143Zm-11.292 0c0 2.96 2.167 5.358 4.84 5.358s4.84-2.399 4.84-5.358c0-2.96-2.167-5.359-4.84-5.359s-4.84 2.4-4.84 5.359Z"
 										></path>
 										<path
-											stroke="#6B7280"
+											stroke="currentColor"
 											stroke-linecap="round"
 											stroke-width="1.5"
 											d="m15.328 17.984 2.24 2.55 4.48-4.464"></path></svg
@@ -332,6 +333,7 @@ import { pathRoutes } from '../config/pathRoutes';
 							</li>
 						</ul>
 					</li>
+					<EcosystemSidebarOption client:load />
 				</ul>
 
 				<!-- li>
diff --git a/src/commonComponents/SchemaCard.tsx b/src/commonComponents/SchemaCard.tsx
index d1395b0da..91f2ff549 100644
--- a/src/commonComponents/SchemaCard.tsx
+++ b/src/commonComponents/SchemaCard.tsx
@@ -16,7 +16,7 @@ const SchemaCard = (props: {className?:string, schemaName: string, version: stri
   return (
     <Card onClick={() => {
       props.onClickCallback(props.schemaId, props.attributes, props.issuerDid, props.created)
-    }} className='transform transition duration-500 hover:scale-105 hover:bg-gray-50 cursor-pointer' style={{ width: '100%', height: '260px', overflow: 'auto' }}>
+    }} className='transform transition duration-500 hover:scale-105 hover:bg-gray-50 cursor-pointer h-full w-full overflow-auto'>
       <div className="flex justify-between items-start">
         <div>
           <h5 className="text-xl font-bold leading-none text-gray-900 dark:text-white">
diff --git a/src/commonComponents/StatusTabletTag.tsx b/src/commonComponents/StatusTabletTag.tsx
index 2c9ad6f24..a29f9196a 100644
--- a/src/commonComponents/StatusTabletTag.tsx
+++ b/src/commonComponents/StatusTabletTag.tsx
@@ -19,7 +19,7 @@ const StatusTabletTag = ({ status }: IStatusTabletTag) => {
                 }
             case status === EndorsementStatus.requested:
                 return {
-                    style: `bg-[#EEE] text-[#7D7D7D]`,
+                    style: `bg-[#1f4ead33] text-[#1F4EAD]`,
                     title: "Requested"
                 }
             case status === EndorsementStatus.submited:
diff --git a/src/components/Ecosystem/Dashboard.tsx b/src/components/Ecosystem/Dashboard.tsx
index 2908746b7..90e3f5e3a 100644
--- a/src/components/Ecosystem/Dashboard.tsx
+++ b/src/components/Ecosystem/Dashboard.tsx
@@ -23,6 +23,7 @@ import { getUserEcosystemInvitations } from '../../api/invitations';
 import { pathRoutes } from '../../config/pathRoutes';
 import type { EcosystemDashboard } from '../organization/interfaces';
 import { dateConversion } from '../../utils/DateConversion';
+import DateTooltip from '../Tooltip';
 
 interface IRoleTablet {
     role: string
@@ -124,8 +125,8 @@ const Dashboard = () => {
                         logoUrl: ecosystemData?.logoUrl,
                         name: ecosystemData?.name,
                         description: ecosystemData?.description,
-                        joinedDate: ecosystemOrg && ecosystemOrg?.createDateTime,
-                        role: ecosystemOrg && ecosystemOrg?.ecosystemRole?.name
+                        joinedDate: ecosystemOrg && ecosystemOrg?.createDateTime ? ecosystemOrg?.createDateTime : "",
+                        role: ecosystemOrg && ecosystemOrg?.ecosystemRole?.name ? ecosystemOrg?.ecosystemRole?.name : ""
                     });
                 } else {
                     await removeFromLocalStorage(storageKeys.ECOSYSTEM_ID)
@@ -263,7 +264,9 @@ const Dashboard = () => {
                                                     <span className='text-[#3D3D3D] dark:text-white min-w-[10rem]'>Ecosystem Lead</span> <span className='dark:text-white'>:</span><span className='text-[#5E5972] dark:text-white ml-2'>NA</span>
                                                 </div>
                                                 <div className='flex'>
-                                                    <span className='text-[#3D3D3D] dark:text-white min-w-[10rem]'>Joined since</span> <span className='dark:text-white'>:</span><span className='text-[#5E5972] dark:text-white ml-2'>{ecosystemDetails.joinedDate ? dateConversion(ecosystemDetails.joinedDate) : "NA"}</span>
+                                                    <span className='text-[#3D3D3D] dark:text-white min-w-[10rem]'>Joined since</span> <span className='dark:text-white'>:</span><span className='text-[#5E5972] dark:text-white ml-2'><DateTooltip date={ecosystemDetails.joinedDate}>
+                                                        {dateConversion(ecosystemDetails.joinedDate || "")}
+                                                    </DateTooltip ></span>
                                                 </div>
                                             </div>
                                             :
@@ -380,9 +383,9 @@ const Dashboard = () => {
                                     </div>
                                 </div>
                             </div>
-														<div>
+                            <div>
                                 <MemberList />
-														</div>
+                            </div>
                             <EditPopupModal
                                 openModal={editOpenModal}
                                 setOpenModal={setEditOpenModal}
diff --git a/src/components/Ecosystem/EcosystemSidebarOption.tsx b/src/components/Ecosystem/EcosystemSidebarOption.tsx
index b23a6cd63..3afb14abf 100644
--- a/src/components/Ecosystem/EcosystemSidebarOption.tsx
+++ b/src/components/Ecosystem/EcosystemSidebarOption.tsx
@@ -4,6 +4,7 @@ import { pathRoutes } from '../../config/pathRoutes'
 
 const EcosystemSidebarOption = () => {
     const [isEcosystemEnabled, setIsEcosystemEnabled] = useState(false);
+    const [showSubMenus, setShowSubMenus] = useState(true);
 
     useEffect(() => {
         const checkEcosystemData = async () => {
@@ -21,19 +22,30 @@ const EcosystemSidebarOption = () => {
                     className="flex items-center w-full p-2 text-base text-gray-900 transition duration-75 rounded-lg group hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"
                     aria-controls="dropdown-ecosystems"
                     data-collapse-toggle="dropdown-ecosystems"
+                    onClick={() => setShowSubMenus(!showSubMenus)}
                 >
-                    <svg
-                        xmlns="http://www.w3.org/2000/svg"
-                        className="flex-shrink-0 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
-                        width="18"
-                        height="17"
-                        fill="none"
-                        viewBox="0 0 25 25"
-                    >
-                        <path
-                            fill="currentColor"
-                            d="M23 9.487h-5.27V8.184a.997.997 0 0 0-.999-.999h-1.895v-.818c.872-.685 1.376-1.665 1.376-2.708C16.212 1.64 14.326 0 12.005 0 9.683 0 7.798 1.64 7.798 3.659c0 1.043.504 2.023 1.376 2.708v.818H7.278a.998.998 0 0 0-.999 1v1.302H1a.998.998 0 0 0-.999 1V23A.996.996 0 0 0 1 24h22c.554 0 1-.446 1-1V10.487a1 1 0 0 0-1-.999ZM10.669 4.971c-.549-.318-.877-.808-.877-1.312 0-.901 1.009-1.66 2.209-1.66 1.195 0 2.209.759 2.209 1.66 0 .504-.328.999-.877 1.312a1 1 0 0 0-.5.867V7.18h-1.665V5.838c0-.357-.19-.685-.5-.867ZM8.273 9.184h7.46v2.566h-7.46V9.184Zm13.729 12.818H1.998h14.733L19.5 22l2.497.002h.005Z"
-                        />
+                    <svg xmlns="http://www.w3.org/2000/svg" className="flex-shrink-0 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white"
+                        width="17" height="17" viewBox="0 0 25 25" fill="none">
+                        <path d="M7.50073 12.2256H4.82031C4.86744 13.7985 5.4212 15.2418 6.32252 16.4053C6.33136 16.3994 6.34019 16.3906 6.34903 16.3847C6.82915 16.0548 7.3888 15.7779 7.99852 15.5481C7.69807 14.5555 7.52134 13.4274 7.50073 12.2227V12.2256Z" fill="currentColor" />
+                        <path d="M8.55859 8.186C9.53356 8.49823 10.6322 8.67496 11.778 8.69558V4.82812C10.4202 4.95773 9.23901 6.26553 8.55859 8.186Z" fill="currentColor" />
+                        <path d="M10.0812 5.07812C8.71445 5.45515 7.51269 6.22687 6.60547 7.26075C7.05024 7.56708 7.56865 7.82334 8.13419 8.03836C8.59074 6.74528 9.26821 5.71435 10.0812 5.08107V5.07812Z" fill="currentColor" />
+                        <path d="M8.13419 15.9688C7.56865 16.1808 7.05024 16.44 6.60547 16.7464C7.51563 17.7802 8.7174 18.552 10.0812 18.929C9.26526 18.2928 8.5878 17.2618 8.13419 15.9717V15.9688Z" fill="currentColor" />
+                        <path d="M12.2227 4.82812V8.69558C13.3685 8.67496 14.4701 8.49823 15.4421 8.186C14.7617 6.26553 13.5805 4.95773 12.2227 4.82812Z" fill="currentColor" />
+                        <path d="M11.778 19.176V15.3086C10.6322 15.3292 9.53061 15.5059 8.55859 15.8182C9.23901 17.7386 10.4202 19.0464 11.778 19.176Z" fill="currentColor" />
+                        <path d="M13.918 18.929C15.2847 18.552 16.4865 17.7802 17.3937 16.7464C16.9489 16.44 16.4305 16.1838 15.8649 15.9688C15.4084 17.2618 14.7309 18.2928 13.918 18.926V18.929Z" fill="currentColor" />
+                        <path d="M15.8689 8.03836C16.4344 7.82628 16.9528 7.56708 17.3976 7.26075C16.4874 6.22687 15.2856 5.45515 13.9219 5.07812C14.7378 5.71435 15.4152 6.74528 15.8689 8.03541V8.03836Z" fill="currentColor" />
+                        <path d="M15.4421 15.8182C14.4671 15.5059 13.3685 15.3292 12.2227 15.3086V19.176C13.5805 19.0464 14.7617 17.7386 15.4421 15.8182Z" fill="currentColor" />
+                        <path d="M7.94141 11.7837H11.7794V9.13861C10.5865 9.11799 9.44067 8.93242 8.42152 8.60547C8.13286 9.55687 7.96202 10.6349 7.94141 11.7837Z" fill="currentColor" />
+                        <path d="M16.0029 15.5481C16.6156 15.7779 17.1782 16.0577 17.6613 16.3906C17.6672 16.3935 17.6701 16.4023 17.676 16.4053C18.5773 15.2418 19.1311 13.7985 19.1782 12.2227H16.4978C16.4772 13.4274 16.3034 14.5526 16 15.5452L16.0029 15.5481Z" fill="currentColor" />
+                        <path d="M8.42152 15.4009C9.44067 15.0739 10.5865 14.8883 11.7794 14.8677V12.2227H7.94141C7.96202 13.3685 8.13286 14.4495 8.42152 15.4009Z" fill="currentColor" />
+                        <path d="M7.99948 8.45871C7.38681 8.22896 6.82422 7.94913 6.34116 7.61629C6.33527 7.61334 6.33232 7.60451 6.32643 7.60156C5.4251 8.76504 4.87135 10.2083 4.82422 11.7842H7.50463C7.52525 10.5795 7.69903 9.45429 8.00242 8.46165L7.99948 8.45871Z" fill="currentColor" />
+                        <path d="M16.0607 12.2227H12.2227V14.8677C13.4156 14.8883 14.5614 15.0739 15.5805 15.4009C15.8692 14.4495 16.04 13.3714 16.0607 12.2227Z" fill="currentColor" />
+                        <path d="M16.5017 11.7812H19.1821C19.135 10.2083 18.5812 8.76504 17.6799 7.60156C17.6711 7.60745 17.6622 7.61629 17.6534 7.62218C17.1733 7.95208 16.6136 8.22896 16.0039 8.45871C16.3043 9.45134 16.4811 10.5795 16.5017 11.7842V11.7812Z" fill="currentColor" />
+                        <path d="M15.5805 8.60547C14.5614 8.93242 13.4156 9.11799 12.2227 9.13861V11.7837H16.0607C16.04 10.6379 15.8692 9.55687 15.5805 8.60547Z" fill="currentColor" />
+                        <path d="M12 24.008C14.2533 24.008 16.43 23.3777 18.327 22.1965L18.0059 21.8754C16.1973 22.98 14.1355 23.5662 12 23.5662C5.62592 23.5662 0.438881 18.3791 0.438881 12.0051C0.438881 10.8858 0.597938 9.78119 0.913107 8.72081C0.948453 8.60299 0.880707 8.48222 0.765832 8.44688C0.648012 8.41153 0.5243 8.47928 0.4919 8.5971C0.164948 9.69577 0 10.8445 0 12.0051C0 18.6236 5.38439 24.008 12.0029 24.008H12Z" fill="currentColor" />
+                        <path d="M12.0018 0.441826C18.3759 0.441826 23.5629 5.62887 23.5629 12.0029C23.5629 13.1222 23.4038 14.2268 23.0887 15.2872C23.0533 15.405 23.1211 15.5258 23.2359 15.5611C23.2566 15.567 23.2772 15.57 23.2978 15.57C23.3921 15.57 23.4804 15.5081 23.5099 15.4109C23.8368 14.3122 24.0018 13.1635 24.0018 12.0029C24.0018 5.38439 18.6174 0 11.9988 0C9.74551 0 7.56878 0.630339 5.67188 1.81149L5.99294 2.13255C7.80148 1.02798 9.86333 0.441826 11.9988 0.441826H12.0018Z" fill="currentColor" />
+                        <path d="M3.90244 0.664062L2.42969 5.08232L6.84795 3.60957L3.90244 0.664062Z" fill="currentColor" />
+                        <path d="M21.5745 18.9219L17.1562 20.3946L20.1018 23.3401L21.5745 18.9219Z" fill="currentColor" />
                     </svg>
                     <span
                         className="flex-1 ml-3 text-left whitespace-nowrap"
@@ -53,70 +65,35 @@ const EcosystemSidebarOption = () => {
                         />
                     </svg>
                 </button>
-                <ul id="dropdown-ecosystems" className="py-2 space-y-2">
-                    <li>
-                        <a
-                            href={pathRoutes.ecosystem.root}
-                            className="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"
-                        >
-                            <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                width="20"
-                                height="20"
-                                fill="none"
-                                viewBox="0 0 25 22"
+                {
+                    showSubMenus &&
+                    <ul id="dropdown-ecosystems" className="py-2 space-y-2">
+                        <li>
+                            <a
+                                href={pathRoutes.ecosystem.root}
+                                className="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"
                             >
-                                <path
-                                    stroke="#6B7280"
-                                    strokeLinejoin="round"
-                                    strokeWidth={1.25}
-                                    d="M4 4h3.125M4 6.885h3.125M1 1h15.702M4.695 10h.962m1.453 0h.96m1.422 0h.962m1.452 0h.962M17 1v4.952m0 3.715V13H1V1"
-                                />
-                                <path
-                                    fill="#6B7280"
-                                    d="M14 5.5a2.5 2.5 0 1 1-5 0 2.5 2.5 0 0 1 5 0Zm-3.816 0a1.316 1.316 0 1 0 2.632 0 1.316 1.316 0 0 0-2.633 0Z"
-                                />
-                                <path
-                                    stroke="#6B7280"
-                                    strokeLinejoin="round"
-                                    strokeWidth={1.25}
-                                    d="M7.164 13.647v1.47h7.53m-6.024.589v2.353h6.526m-4.518.294V21h11.044l3.263-1.177m0 0v-9.705m0 9.705h3.012m-3.012-9.705L23.48 8.353 16.2 6l-1.004.588-.25 1.47.501 1.177 3.263.883.502 1.764 1.004 1.765h1.506m3.263-3.53h3.012"
-                                />
-                            </svg>
-                            <span className="ml-2">Profile</span>
-                        </a>
-                    </li>
-                    <li>
-                        <a
-                            href={pathRoutes.ecosystem.endorsements}
-                            className="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"
-                        >
-                            <svg
-                                xmlns="http://www.w3.org/2000/svg"
-                                width="20"
-                                height="20"
-                                fill="none"
-                                viewBox="0 0 25 25"
+                                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" className='flex-shrink-0 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white'>
+                                    <path d="M12.4689 11.226C14.9817 11.226 17.0277 9.17995 17.0277 6.66719C17.0277 4.15443 14.9817 2.10547 12.4689 2.10547C9.95618 2.10547 7.91016 4.15149 7.91016 6.66425C7.91016 9.17701 9.95618 11.226 12.4689 11.226ZM12.4689 3.27966C14.3359 3.27966 15.8535 4.79729 15.8535 6.66425C15.8535 8.53121 14.3359 10.0488 12.4689 10.0488C10.602 10.0488 9.08434 8.53121 9.08434 6.66425C9.08434 4.80023 10.602 3.27966 12.4689 3.27966Z" fill="currentColor" />
+                                    <path d="M20.9984 20.5578V16.7887C20.9984 14.1614 18.8614 12.0273 16.2371 12.0273H8.69883C6.07159 12.0273 3.9375 14.1644 3.9375 16.7887V20.5578C3.9375 20.8807 4.20169 21.1449 4.52459 21.1449H20.4143C20.7372 21.1449 20.9984 20.8807 20.9984 20.5578ZM19.8243 19.9707H5.11169V16.7887C5.11169 14.8102 6.72032 13.2015 8.69883 13.2015H16.2371C18.2156 13.2015 19.8243 14.8102 19.8243 16.7887V19.9707Z" fill="currentColor" />
+                                </svg>
+                                <span className="ml-2">Profile</span>
+                            </a>
+                        </li>
+                        <li>
+                            <a
+                                href={pathRoutes.ecosystem.endorsements}
+                                className="flex items-center p-2 text-base text-gray-900 transition duration-75 rounded-lg pl-11 group hover:bg-gray-100 dark:text-gray-200 dark:hover:bg-gray-700"
                             >
-                                <path
-                                    fill="#6B7280"
-                                    d="M19.322 8.824h-4.427V7.612c0-.515-.375-.93-.84-.93h-1.592v-.76a3.335 3.335 0 0 0 1.156-2.52C13.62 1.527 12.035 0 10.085 0 8.135 0 6.55 1.526 6.55 3.403c0 .97.424 1.881 1.157 2.519v.76H6.114c-.465 0-.84.415-.84.93v1.212H.84c-.465 0-.839.414-.839.93v11.638c0 .515.374.93.84.93h12.78l-.993-1.86 7.534-7.962V9.753c0-.51-.374-.93-.84-.93Zm-10.36-4.2c-.461-.296-.737-.752-.737-1.221 0-.838.848-1.544 1.856-1.544 1.004 0 1.855.706 1.855 1.544 0 .47-.275.93-.736 1.22a.952.952 0 0 0-.42.807v1.248H9.381V5.43a.958.958 0 0 0-.42-.806ZM6.948 8.54h6.267v2.141H6.949v-2.14Zm5.678 11.922H1.68v-9.78h16.804l.065 1.37 1.21.447h.403l-7.534 7.963Z"
-                                />
-                                <path
-                                    fill="#6B7280"
-                                    d="M24.997 17.854c0 3.945-2.889 7.143-6.452 7.143s-6.451-3.198-6.451-7.143 2.888-7.143 6.451-7.143c3.563 0 6.452 3.198 6.452 7.143Zm-11.292 0c0 2.96 2.167 5.358 4.84 5.358s4.84-2.399 4.84-5.358c0-2.96-2.167-5.359-4.84-5.359s-4.84 2.4-4.84 5.359Z"
-                                />
-                                <path
-                                    stroke="#6B7280"
-                                    strokeLinejoin="round"
-                                    strokeWidth={1.5}
-                                    d="m15.328 17.984 2.24 2.55 4.48-4.464"
-                                />
-                            </svg>
-                            <span className="ml-2">Endorsements</span>
-                        </a>
-                    </li>
-                </ul>
+                                <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" className='flex-shrink-0 text-gray-500 transition duration-75 group-hover:text-gray-900 dark:text-gray-400 dark:group-hover:text-white'>
+                                    <path d="M9.44322 0.737955C7.93853 0.93483 6.58385 2.04577 6.09166 3.48014C5.54791 5.05983 5.95572 6.69577 7.18385 7.86295C9.17135 9.74733 12.4526 9.15202 13.6948 6.6817C13.9526 6.17077 14.0698 5.69264 14.0932 5.03639C14.1307 4.10827 13.962 3.43795 13.4885 2.63639C13.2917 2.30358 12.626 1.62389 12.2557 1.38483C11.4588 0.864517 10.3713 0.616079 9.44322 0.737955ZM10.6573 1.33327C11.3135 1.45983 11.8854 1.75045 12.3963 2.2192C13.1557 2.90827 13.5448 3.7942 13.5448 4.83014C13.5448 6.25514 12.7807 7.46452 11.501 8.0692C10.976 8.31764 10.5776 8.40202 9.95885 8.40202C8.98385 8.39733 8.22447 8.08327 7.51666 7.38483C6.78072 6.65358 6.42447 5.83795 6.41978 4.86764C6.4151 2.61295 8.45416 0.91608 10.6573 1.33327Z" fill="currentColor" stroke="currentColor" stroke-width="0.5" />
+                                    <path d="M8.32933 9.61523C6.39339 9.91055 4.7387 11.1012 3.8762 12.8215C3.63714 13.2949 3.50589 13.6652 3.36058 14.2512C3.27152 14.6309 3.26214 14.8043 3.24808 17.9168C3.22933 21.1652 3.22933 21.184 3.32308 21.2777C3.42152 21.3762 3.45433 21.3762 6.51527 21.3762H9.60902V22.0465C9.60902 22.6746 9.61839 22.7262 9.70745 22.8105C9.8012 22.8949 9.90433 22.8996 11.1981 22.9137C12.07 22.923 12.6418 22.909 12.7168 22.8809C12.8059 22.848 12.8528 22.7871 12.8715 22.6887C12.8903 22.6137 12.9043 22.548 12.909 22.548C12.9184 22.548 13.0778 22.6043 13.27 22.6699C13.7856 22.848 14.77 23.0918 15.3512 23.1855C16.0637 23.3027 17.4184 23.3027 18.07 23.1855C18.7028 23.0684 19.2934 22.8949 19.5465 22.7496C19.8887 22.548 20.2262 22.1684 20.4371 21.7418C20.7325 21.1371 20.7746 20.8465 20.7559 19.473L20.7418 18.3012L20.5637 17.9449C20.3621 17.5324 20.0621 17.2324 19.6496 17.0309C19.3871 16.8996 19.3637 16.8996 18.4121 16.8855L17.4418 16.8715L17.4278 15.6668C17.4137 14.5324 17.4043 14.448 17.3012 14.1902C17.1418 13.7871 16.8043 13.3699 16.4715 13.1496C16.2887 13.0324 16.1528 12.9012 16.1012 12.798C16.059 12.709 15.8856 12.4277 15.7168 12.1746C15.0512 11.1668 13.9778 10.3277 12.8434 9.91523C12.0325 9.62461 11.8309 9.60117 10.1481 9.58242C9.29964 9.57773 8.47933 9.5918 8.32933 9.61523ZM11.559 10.1777C12.9887 10.3746 14.3621 11.209 15.1825 12.3762L15.4262 12.7277L15.1262 12.7559C14.7559 12.7887 14.5965 12.8824 14.4793 13.1402C14.3621 13.4074 14.3668 13.5715 14.5309 14.4199C14.709 15.3199 14.7231 15.8027 14.5778 16.1074C14.3996 16.4684 13.9918 16.6793 13.2934 16.7777C13.0965 16.8059 12.9231 16.8293 12.909 16.8293C12.8996 16.8293 12.8903 16.7918 12.8903 16.7496C12.8903 16.7074 12.8575 16.6324 12.8106 16.5855C12.7403 16.5059 12.6278 16.5012 11.259 16.5012C9.9512 16.5012 9.76839 16.5105 9.69339 16.5809C9.6137 16.6512 9.60902 16.7824 9.60902 18.7371V20.8137H6.70277H3.79652V17.9871C3.8012 15.1277 3.81995 14.7434 3.97933 14.1105C4.50902 12.0809 6.29495 10.4777 8.36683 10.1777C8.77933 10.1168 11.1371 10.1168 11.559 10.1777ZM15.9465 13.4918C16.3075 13.6699 16.5559 13.923 16.7293 14.2934C16.8512 14.5559 16.8512 14.5652 16.8746 15.9246C16.8934 17.1293 16.9075 17.3027 16.9778 17.373C17.0481 17.4434 17.1934 17.4527 18.1731 17.4574L19.2887 17.4621L19.509 17.5887C19.809 17.7668 20.0528 18.0668 20.1371 18.3668C20.1981 18.573 20.2075 18.8262 20.1934 19.773C20.17 21.0809 20.1418 21.2262 19.8043 21.7277C19.5653 22.084 19.2981 22.2855 18.9043 22.4074C17.2637 22.9137 15.4543 22.8199 13.3825 22.1121L12.9137 21.9527L12.8996 19.6746L12.8903 17.3965L13.1106 17.3684C14.0903 17.2512 14.6762 16.9934 14.9668 16.5527C15.2856 16.0746 15.3184 15.5074 15.0981 14.373C14.9481 13.6277 14.9246 13.4027 14.9903 13.3418C15.009 13.323 15.1637 13.3137 15.3325 13.323C15.5575 13.3324 15.7168 13.3793 15.9465 13.4918ZM12.3278 19.7121V22.3605H11.2496H10.1715V19.7121V17.0637H11.2496H12.3278V19.7121Z" fill="currentColor" stroke="currentColor" stroke-width="0.5" />
+                                </svg>
+                                <span className="ml-2">Endorsements</span>
+                            </a>
+                        </li>
+                    </ul>
+                }
             </li>
         )
     }
diff --git a/src/components/Ecosystem/Endorsement/EndorsementCard.tsx b/src/components/Ecosystem/Endorsement/EndorsementCard.tsx
index fe7dbf84b..e9bc23eb8 100644
--- a/src/components/Ecosystem/Endorsement/EndorsementCard.tsx
+++ b/src/components/Ecosystem/Endorsement/EndorsementCard.tsx
@@ -16,6 +16,7 @@ interface IProps {
 
 const EndorsementCard = ({ fromEndorsementList, data, onClickCallback, cardTransitionDisabled, allAttributes }: IProps) => {
     const [isEcosystemLead, setIsEcosystemLead] = useState(false);
+    const isSchema = data?.type === EndorsementType.schema
 
     useEffect(() => {
         const checkEcosystemData = async () => {
@@ -25,13 +26,35 @@ const EndorsementCard = ({ fromEndorsementList, data, onClickCallback, cardTrans
         checkEcosystemData();
     }, [])
 
+    const getAttributes = () => {
+        switch (true) {
+            case isSchema:
+                if (requestData?.attr_names && requestData?.attr_names.length > 0) {
+                    if (allAttributes) {
+                        return requestData?.attr_names
+                    }
+                    return requestData?.attr_names?.slice(0, 3)
+                }
+                return []
+            case !isSchema && allAttributes:
+                if (data?.requestBody?.schemaDetails?.version && data?.requestBody?.schemaDetails?.version.length > 0) {
+                    if (allAttributes) {
+                        return data?.requestBody?.schemaDetails?.version
+                    }
+                    return data?.requestBody?.schemaDetails?.version?.slice(0, 3)
+                }
+                return []
+            default:
+                return []
+        }
+    }
+
     const enableAction = (!fromEndorsementList && data?.status === EndorsementStatus.signed) || Boolean(fromEndorsementList)
-    const isSchema = data?.type === EndorsementType.schema
 
     const requestPayload = data?.requestPayload && JSON.parse(data?.requestPayload)
 
     const requestData = isSchema ? requestPayload?.operation?.data : requestPayload?.operation
-    const attributesData = allAttributes ? requestData?.attr_names : requestData?.attr_names?.slice(0, 3)
+    const attributesData = getAttributes()
 
     return (
         <Card onClick={() => {
@@ -80,10 +103,10 @@ const EndorsementCard = ({ fromEndorsementList, data, onClickCallback, cardTrans
                 {!isSchema &&
                     <>
                         <p className="truncate text-sm font-medium text-gray-900 dark:text-white pb-2">
-                            <span className="font-semibold">Schema Name:</span> NA
+                            <span className="font-semibold">Schema Name:</span> {data?.requestBody?.schemaDetails?.name || "NA"}
                         </p>
                         <p className="truncate text-sm font-medium text-gray-900 dark:text-white pb-2">
-                            <span className="font-semibold">Schema Version:</span> NA
+                            <span className="font-semibold">Schema Version:</span> {data?.requestBody?.schemaDetails?.version || "NA"}
                         </p>
                     </>
                 }
@@ -91,11 +114,11 @@ const EndorsementCard = ({ fromEndorsementList, data, onClickCallback, cardTrans
                     <span className="font-semibold">Author DID:</span> {data?.authorDid}
                 </p>
                 <p className="truncate text-sm font-medium text-gray-900 dark:text-white pb-2">
-                    <span className="font-semibold">Ledger:</span> NA
+                    <span className="font-semibold">Ledger:</span> {data?.authorDid.split(":")[2]}
                 </p>
                 {isEcosystemLead &&
                     <p className="truncate text-sm font-medium text-gray-900 dark:text-white">
-                        <span className="font-semibold">Organization:</span> NA
+                        <span className="font-semibold">Organization:</span> {data?.ecosystemOrgs?.orgName}
                     </p>
                 }
             </div>
@@ -123,7 +146,7 @@ const EndorsementCard = ({ fromEndorsementList, data, onClickCallback, cardTrans
                                                     </span>
                                                 </div>
                                             ))}
-                                            {attributesData.length === 3 && <span>...</span>}
+                                            {!allAttributes && attributesData.length === 3 && <span>...</span>}
                                         </>
                                     )}
                                 </div>
diff --git a/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx b/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx
index cb2f19874..ce4af9ef7 100644
--- a/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx
+++ b/src/components/Ecosystem/Endorsement/EndorsementPopup.tsx
@@ -137,6 +137,7 @@ const EndorsementPopup = (props: {
 			<EndorsementCard
 				cardTransitionDisabled={true}
 				data={props.endorsementData}
+				allAttributes={true}
 			/>
 
 			<div className="justify-between">
@@ -146,7 +147,6 @@ const EndorsementPopup = (props: {
 						<div className="flex gap-3 pt-1 pb-3">
 							<button
 								onClick={() => RejectEndorsement(props.endorsementData.id)}
-								title="Reject"
 								disabled={loadingReject}
 								className="hover:bg-secondary-700 bg-white !ring-2 dark:text-white text-primary-700 font-medium rounded-lg text-sm dark:hover:text-primary-700 "
 							>
@@ -181,7 +181,6 @@ const EndorsementPopup = (props: {
 							</button>
 
 							<Button
-								title="Accept"
 								isProcessing={loading}
 								color="bg-primary-800"
 								disabled={loading}
@@ -215,7 +214,6 @@ const EndorsementPopup = (props: {
 								props.endorsementData?.status === EndorsementStatus.signed ? (
 								<div className="flex gap-3 pt-1 pb-3">
 									<Button
-										title="Accept"
 										isProcessing={loading}
 										color="bg-primary-800"
 										disabled={loading}
diff --git a/src/components/Ecosystem/Endorsement/index.tsx b/src/components/Ecosystem/Endorsement/index.tsx
index 9b9421752..a815c23e0 100644
--- a/src/components/Ecosystem/Endorsement/index.tsx
+++ b/src/components/Ecosystem/Endorsement/index.tsx
@@ -25,6 +25,7 @@ import {
 } from '../../../api/ecosystem';
 import { EndorsementStatus, EndorsementType } from '../../../common/enums';
 import { AlertComponent } from '../../AlertComponent';
+import { Features } from '../../../utils/enums/features';
 
 interface ISelectedRequest {
 	attribute: IAttributes[];
@@ -76,7 +77,7 @@ const EndorsementList = () => {
 			value: '',
 		},
 		{
-			name: 'Signed',
+			name: 'Accepted',
 			value: EndorsementStatus.signed,
 		},
 		{
@@ -115,24 +116,26 @@ const EndorsementList = () => {
 			const organizationId = await getFromLocalStorage(storageKeys.ORG_ID);
 			setOrgId(organizationId);
 			const id = await getEcosystemId();
-			const endorsementList = await getEndorsementList(
-				endorsementListAPIParameter,
-				organizationId,
-				id,
-			);
+			if (id && organizationId) {
+				const endorsementList = await getEndorsementList(
+					endorsementListAPIParameter,
+					organizationId,
+					id,
+				);
 
-			const { data } = endorsementList as AxiosResponse;
+				const { data } = endorsementList as AxiosResponse;
 
-			if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-				if (data?.data?.transactions) {
-					setSchemaList(data?.data?.transactions);
-					setTotalPages(data?.data?.totalPages);
-					setLoading(false);
+				if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
+					if (data?.data?.transactions) {
+						setSchemaList(data?.data?.transactions);
+						setTotalPages(data?.data?.totalPages);
+						setLoading(false);
+					} else {
+						setLoading(false);
+					}
 				} else {
 					setLoading(false);
 				}
-			} else {
-				setLoading(false);
 			}
 		} catch (error) {
 			console.error('Error while fetching schema list:', error);
@@ -278,16 +281,19 @@ const EndorsementList = () => {
 								</div>
 							))}
 						</div>
-						<div
-							className="flex items-center justify-end mb-4"
-							id="schemasPagination"
-						>
-							<Pagination
-								currentPage={endorsementListAPIParameter.page}
-								onPageChange={onPageChange}
-								totalPages={totalPages}
-							/>
-						</div>
+						{
+							totalPages > 1 &&
+							<div
+								className="flex items-center justify-end mb-4"
+								id="schemasPagination"
+							>
+								<Pagination
+									currentPage={endorsementListAPIParameter.page}
+									onPageChange={onPageChange}
+									totalPages={totalPages}
+								/>
+							</div>
+						}
 					</div>
 				) : (
 					<div>
@@ -297,13 +303,11 @@ const EndorsementList = () => {
 							</div>
 						) : (
 							<div>
-								{walletStatus ? (
+								{orgId ? (
 									<EmptyListMessage
 										message={'No Endorsement Requests'}
-										description={''}
-										buttonContent={
-											isEcosystemLead ? '' : 'Request Endorsements'
-										}
+										description={"You don't have any endorsement requests"}
+										buttonContent={''}
 										svgComponent={
 											<svg
 												className="pr-2 mr-1"
@@ -325,9 +329,10 @@ const EndorsementList = () => {
 									/>
 								) : (
 									<EmptyListMessage
-										message={'No Wallet'}
-										description={'Get started by creating a Wallet'}
-										buttonContent={'Create Wallet'}
+										message={'No Organization'}
+										description={'Get started by creating a Organization'}
+										buttonContent={''}
+										feature={Features.CRETAE_ORG}
 										svgComponent={
 											<svg
 												className="pr-2 mr-1"
diff --git a/src/components/EmptyListComponent/index.tsx b/src/components/EmptyListComponent/index.tsx
index a3b29005e..c3b7c2309 100644
--- a/src/components/EmptyListComponent/index.tsx
+++ b/src/components/EmptyListComponent/index.tsx
@@ -11,7 +11,7 @@ export const EmptyListMessage = ({ message, description, buttonContent, svgCompo
         onClick?: () => void,
     }) => {
     return (
-        <div className='flex mt-20 justify-start items-center flex-col'>
+        <div className='flex mt-20 mb-16 justify-start items-center flex-col'>
             <p className='text-2xl font-bold mb-4 text-gray-900 dark:text-white'>{message}</p>
             <p className='text-lg mb-4 text-gray-900 dark:text-white'>{description}</p>
             {
diff --git a/src/components/Issuance/IssuedCrdentials.tsx b/src/components/Issuance/IssuedCrdentials.tsx
index 894d45214..c2ab6bce9 100644
--- a/src/components/Issuance/IssuedCrdentials.tsx
+++ b/src/components/Issuance/IssuedCrdentials.tsx
@@ -16,10 +16,11 @@ import React from 'react';
 import RoleViewButton from '../RoleViewButton';
 import SearchInput from '../SearchInput';
 import type { TableData } from '../../commonComponents/datatable/interface';
-import { apiStatusCodes } from '../../config/CommonConstant';
+import { apiStatusCodes, storageKeys } from '../../config/CommonConstant';
 import { dateConversion } from '../../utils/DateConversion';
 import { getIssuedCredentials } from '../../api/issuance';
 import { pathRoutes } from '../../config/pathRoutes';
+import { getFromLocalStorage } from '../../api/Auth';
 
 interface IssuedCredential {
 	metadata: { [x: string]: { schemaId: string } };
@@ -35,77 +36,76 @@ const CredentialList = () => {
 	const [issuedCredList, setIssuedCredList] = useState<TableData[]>([]);
 
 	const getIssuedCredDefs = async () => {
-		setLoading(true);
-		const response = await getIssuedCredentials();
-		
-		const { data } = response as AxiosResponse;
-
-		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-			
-			const credentialList = data?.data?.map(
-				(issuedCredential: IssuedCredential) => {
-					const schemaName = issuedCredential.metadata['_anoncreds/credential']
-						.schemaId
-						? issuedCredential.metadata['_anoncreds/credential'].schemaId
+		setLoading(true)
+		const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
+		if (orgId) {
+			const response = await getIssuedCredentials();
+
+			const { data } = response as AxiosResponse;
+
+			if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
+
+				const credentialList = data?.data?.map(
+					(issuedCredential: IssuedCredential) => {
+						const schemaName = issuedCredential.metadata['_anoncreds/credential']
+							.schemaId
+							? issuedCredential.metadata['_anoncreds/credential'].schemaId
 								.split(':')
 								.slice(2)
 								.join(':')
-						: 'Not available';
-
-					return {
-						data: [
-							{
-								data: issuedCredential.connectionId
-									? issuedCredential.connectionId
-									: 'Not available',
-							},
-							{ data: schemaName },
-							{ data: <DateTooltip date={issuedCredential.updatedAt}> {dateConversion(issuedCredential.updatedAt)} </DateTooltip> },
-							{
-								data: (
-									<span
-										className={` ${
-											issuedCredential.state === IssueCredential.offerSent &&
-											'bg-orange-100 text-orange-800 border border-orange-100 dark:bg-gray-700 dark:border-orange-300 dark:text-orange-300'
-										} ${
-											issuedCredential?.state === IssueCredential.done &&
-											'bg-green-100 text-green-800 dark:bg-gray-700 dark:text-green-400 border border-green-100 dark:border-green-500'
-										} ${
-											issuedCredential?.state === IssueCredential.abandoned &&
-											'bg-red-100 text-red-800 border border-red-100 dark:border-red-400 dark:bg-gray-700 dark:text-red-400'
-										} text-xs font-medium mr-0.5 px-0.5 py-0.5 rounded-md border flex justify-center min-[320]:w-full xl:w-9/12 2xl:w-6/12`}
-									>
-										{issuedCredential.state === IssueCredential.offerSent
-											? IssueCredentialUserText.offerSent
-											: issuedCredential.state === IssueCredential.done
-											? IssueCredentialUserText.done
-											: issuedCredential.state === IssueCredential.abandoned
-											? IssueCredentialUserText.abandoned :''}
-									</span>
-								),
-							},
-							{
-								data: issuedCredential?.isRevocable ? (
-									<Button
-										disabled
-										className='text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"'
-									>
-										Revoke
-									</Button>
-								) : (
-									<span className="text-gray-400">Non revocable</span>
-								),
-							},
-						],
-					};
-				},
-			);
-
-			setIssuedCredList(credentialList)
-		} else {
-			setError(response as string)
+							: 'Not available';
+
+						return {
+							data: [
+								{
+									data: issuedCredential.connectionId
+										? issuedCredential.connectionId
+										: 'Not available',
+								},
+								{ data: schemaName },
+								{ data: <DateTooltip date={issuedCredential.updatedAt}> {dateConversion(issuedCredential.updatedAt)} </DateTooltip> },
+								{
+									data: (
+										<span
+											className={` ${issuedCredential.state === IssueCredential.offerSent &&
+												'bg-orange-100 text-orange-800 border border-orange-100 dark:bg-gray-700 dark:border-orange-300 dark:text-orange-300'
+												} ${issuedCredential?.state === IssueCredential.done &&
+												'bg-green-100 text-green-800 dark:bg-gray-700 dark:text-green-400 border border-green-100 dark:border-green-500'
+												} ${issuedCredential?.state === IssueCredential.abandoned &&
+												'bg-red-100 text-red-800 border border-red-100 dark:border-red-400 dark:bg-gray-700 dark:text-red-400'
+												} text-xs font-medium mr-0.5 px-0.5 py-0.5 rounded-md border flex justify-center min-[320]:w-full xl:w-9/12 2xl:w-6/12`}
+										>
+											{issuedCredential.state === IssueCredential.offerSent
+												? IssueCredentialUserText.offerSent
+												: issuedCredential.state === IssueCredential.done
+													? IssueCredentialUserText.done
+													: issuedCredential.state === IssueCredential.abandoned
+														? IssueCredentialUserText.abandoned : ''}
+										</span>
+									),
+								},
+								{
+									data: issuedCredential?.isRevocable ? (
+										<Button
+											disabled
+											className='text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"'
+										>
+											Revoke
+										</Button>
+									) : (
+										<span className="text-gray-400">Non revocable</span>
+									),
+								},
+							],
+						};
+					},
+				);
+
+				setIssuedCredList(credentialList)
+			} else {
+				setError(response as string)
+			}
 		}
-
 		setLoading(false)
 	}
 
@@ -152,7 +152,7 @@ const CredentialList = () => {
 			<div>
 				<div
 					className="p-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-					<div className="flex items-center justify-end mb-4">						
+					<div className="flex items-center justify-end mb-4">
 
 						<RoleViewButton
 							buttonTitle='Issue'
@@ -166,7 +166,7 @@ const CredentialList = () => {
 							onClickEvent={schemeSelection}
 						/>
 
-					</div>			
+					</div>
 					<AlertComponent
 						message={error}
 						type={'failure'}
diff --git a/src/components/Verification/ProofRequestPopup.tsx b/src/components/Verification/ProofRequestPopup.tsx
index f2561a07b..19329043a 100644
--- a/src/components/Verification/ProofRequestPopup.tsx
+++ b/src/components/Verification/ProofRequestPopup.tsx
@@ -118,7 +118,7 @@ const ProofRequest = (props: {
 								className="p-4 mb-4 text-sm text-green-800 rounded-lg bg-green-50 dark:bg-gray-800 dark:text-green-400"
 								role="alert"
 							>
-								<span className="font-medium">Success alert! </span> {succesMsg}
+								{succesMsg}
 							</div>
 						)}
 
diff --git a/src/components/Verification/VerificationCredentialList.tsx b/src/components/Verification/VerificationCredentialList.tsx
index 645a01ac1..ed011c083 100644
--- a/src/components/Verification/VerificationCredentialList.tsx
+++ b/src/components/Verification/VerificationCredentialList.tsx
@@ -29,7 +29,7 @@ import SearchInput from '../SearchInput';
 import type { TableData } from '../../commonComponents/datatable/interface';
 import { dateConversion } from '../../utils/DateConversion';
 import { pathRoutes } from '../../config/pathRoutes';
-import { removeFromLocalStorage } from '../../api/Auth';
+import { getFromLocalStorage, removeFromLocalStorage } from '../../api/Auth';
 
 const VerificationCredentialList = () => {
 	const [loading, setLoading] = useState<boolean>(true);
@@ -66,128 +66,127 @@ const VerificationCredentialList = () => {
 		setLoading(true);
 
 		try {
-			const response = await getVerificationList();
-			const { data } = response as AxiosResponse;
+			const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
+			if (orgId) {
+				const response = await getVerificationList();
+				const { data } = response as AxiosResponse;
 
-			if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-				
-				const credentialList = data?.data?.map((requestProof: RequestProof) => {
-					return {
-						data: [
-							{ data: requestProof?.id ? requestProof?.id : 'Not available' },
-							{
-								data: requestProof?.connectionId
-									? requestProof?.connectionId
-									: 'Not available',
-							},
-							{ data: <DateTooltip date={requestProof.updatedAt}> {dateConversion(requestProof.updatedAt)} </DateTooltip> },
-							{
-								data: (
-									<span
-										className={`${
-											requestProof?.state === ProofRequestState.requestSent &&
-											'bg-orange-100 text-orange-800 border border-orange-100 dark:bg-gray-700 dark:border-orange-300 dark:text-orange-300'
-										} ${
-											requestProof?.state === ProofRequestState.done &&
-											'bg-green-100 text-green-800 dark:bg-gray-700 dark:text-green-400 border border-green-100 dark:border-green-500'
-										} ${
-											requestProof?.state === ProofRequestState.abandoned &&
-											'bg-red-100 text-red-800 border border-red-100 dark:border-red-400 dark:bg-gray-700 dark:text-red-400'
-										} ${
-											requestProof?.state === ProofRequestState.presentationReceived &&
-											'bg-secondary-700 text-primary-600 border border-secondary-100 dark:border-secondary-700 dark:bg-gray-700 dark:text-secondary-800'
-										}	text-xs font-medium sm:mr-0 md:mr-2 min-[320]:px-1 sm:px-0 lg:px-0.5 py-0.5 rounded-md flex justify-center min-[320]:w-full 2xl:w-8/12`}
-									>
-										{requestProof?.state === ProofRequestState.requestSent
-											? ProofRequestStateUserText.requestSent
-											: requestProof?.state ===
-											  ProofRequestState.presentationReceived
-											? ProofRequestStateUserText.requestReceived
-											: requestProof?.state === ProofRequestState.done
-											? ProofRequestStateUserText.done
-											: requestProof?.state === ProofRequestState.abandoned
-											? ProofRequestStateUserText.abandoned
-											: ''}
-									</span>
-								),
-							},
-							{
-								data: (
-									<Button
-										disabled={
-											(
-												requestProof.state !==
-												ProofRequestState.presentationReceived
-											) && requestProof?.state !== 'done'
-										}
-										className='text-base font-medium text-center text-white bg-primary-700 hover:!bg-primary-800 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"'
-										style={{ height: '2.5rem', minWidth: '4rem' }}
-										onClick={() => {
-											openProofRequestModel(
-												true,
-												requestProof?.id,
-												requestProof.state,
-											);
+				if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
+
+					const credentialList = data?.data?.map((requestProof: RequestProof) => {
+						return {
+							data: [
+								{ data: requestProof?.id ? requestProof?.id : 'Not available' },
+								{
+									data: requestProof?.connectionId
+										? requestProof?.connectionId
+										: 'Not available',
+								},
+								{ data: <DateTooltip date={requestProof.updatedAt}> {dateConversion(requestProof.updatedAt)} </DateTooltip> },
+								{
+									data: (
+										<span
+											className={`${requestProof?.state === ProofRequestState.requestSent &&
+												'bg-orange-100 text-orange-800 border border-orange-100 dark:bg-gray-700 dark:border-orange-300 dark:text-orange-300'
+												} ${requestProof?.state === ProofRequestState.done &&
+												'bg-green-100 text-green-800 dark:bg-gray-700 dark:text-green-400 border border-green-100 dark:border-green-500'
+												} ${requestProof?.state === ProofRequestState.abandoned &&
+												'bg-red-100 text-red-800 border border-red-100 dark:border-red-400 dark:bg-gray-700 dark:text-red-400'
+												} ${requestProof?.state === ProofRequestState.presentationReceived &&
+												'bg-secondary-700 text-primary-600 border border-secondary-100 dark:border-secondary-700 dark:bg-gray-700 dark:text-secondary-800'
+												}	text-xs font-medium sm:mr-0 md:mr-2 min-[320]:px-1 sm:px-0 lg:px-0.5 py-0.5 rounded-md flex justify-center min-[320]:w-full 2xl:w-8/12`}
+										>
+											{requestProof?.state === ProofRequestState.requestSent
+												? ProofRequestStateUserText.requestSent
+												: requestProof?.state ===
+													ProofRequestState.presentationReceived
+													? ProofRequestStateUserText.requestReceived
+													: requestProof?.state === ProofRequestState.done
+														? ProofRequestStateUserText.done
+														: requestProof?.state === ProofRequestState.abandoned
+															? ProofRequestStateUserText.abandoned
+															: ''}
+										</span>
+									),
+								},
+								{
+									data: (
+										<Button
+											disabled={
+												(
+													requestProof.state !==
+													ProofRequestState.presentationReceived
+												) && requestProof?.state !== 'done'
+											}
+											className='text-base font-medium text-center text-white bg-primary-700 hover:!bg-primary-800 rounded-lg hover:bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"'
+											style={{ height: '2.5rem', minWidth: '4rem' }}
+											onClick={() => {
+												openProofRequestModel(
+													true,
+													requestProof?.id,
+													requestProof.state,
+												);
 												getProofPresentationData(requestProof?.id);
-										}}
-									>
-										{requestProof?.state === 'done' ? (
-											<p className="pr-1 flex text-center justify-center item-center">
-												{' '}
-												<svg
-													className="pr-1 mt-0.5 flex items-center"
-													xmlns="http://www.w3.org/2000/svg"
-													width="24"
-													height="15"
-													fill="none"
-													viewBox="0 0 24 15"
-												>
-													 {' '}
-													<path
-														fill="#fff"
-														d="M23.385 7.042C23.175 6.755 18.165 0 11.767 0 5.37 0 .36 6.755.15 7.042a.777.777 0 0 0 0 .916C.36 8.245 5.37 15 11.767 15c6.398 0 11.408-6.755 11.618-7.042.2-.273.2-.643 0-.916Zm-11.618 6.406c-4.713 0-8.795-4.483-10.003-5.949 1.207-1.466 5.28-5.947 10.003-5.947 4.713 0 8.794 4.482 10.003 5.949-1.207 1.466-5.28 5.947-10.003 5.947Z"
-													/>
-													 {' '}
-													<path
-														fill="#fff"
-														d="M11.772 2.84a4.66 4.66 0 0 0-4.655 4.655 4.66 4.66 0 0 0 4.655 4.655 4.66 4.66 0 0 0 4.656-4.655 4.66 4.66 0 0 0-4.656-4.655Zm0 7.758A3.107 3.107 0 0 1 8.67 7.495a3.107 3.107 0 0 1 3.103-3.103 3.107 3.107 0 0 1 3.104 3.103 3.107 3.107 0 0 1-3.104 3.103Z"
-													/>
-												</svg>
-												<span className="pl-1">View</span>{' '}
-											</p>
-										) : (
-											<p className="flex items-center justify-center">
-												{' '}
-												<svg
-													className="pr-2 flex items-center"
-													xmlns="http://www.w3.org/2000/svg"
-													width="25"
-													height="25"
-													fill="none"
-													viewBox="0 0 17 17"
-												>
-													<path
-														fill="#fff"
-														d="M15.749 6.99c-.334-.21-.813-.503-.813-.697.01-.397.113-.786.3-1.136.277-.69.561-1.395.204-1.915-.358-.519-1.122-.462-1.853-.405-.358.082-.73.082-1.089 0a2.74 2.74 0 0 1-.374-1.087c-.162-.739-.333-1.501-.942-1.704-.61-.203-1.154.3-1.699.811-.309.276-.723.65-.934.65-.212 0-.634-.374-.943-.65C7.07.362 6.51-.14 5.908.046c-.602.187-.805.933-.967 1.671-.05.383-.18.75-.382 1.08a2.295 2.295 0 0 1-1.09 0c-.722-.066-1.478-.13-1.844.405-.365.535-.081 1.225.195 1.914.19.35.295.739.31 1.136-.066.195-.521.487-.854.698C.65 7.34 0 7.76 0 8.41c0 .649.65 1.07 1.276 1.468.333.211.812.495.853.69-.014.4-.12.791-.309 1.144-.276.69-.56 1.395-.195 1.914.366.52 1.122.463 1.845.398a2.441 2.441 0 0 1 1.089.04c.2.33.33.697.382 1.08.162.738.333 1.508.934 1.711a.86.86 0 0 0 .277.106 2.439 2.439 0 0 0 1.422-.812c.308-.275.731-.657.942-.657.212 0 .626.382.935.657.544.487 1.105.998 1.698.812.593-.187.813-.974.943-1.712a2.69 2.69 0 0 1 .374-1.08 2.472 2.472 0 0 1 1.089-.04c.73.065 1.479.138 1.852-.397.374-.536.073-1.225-.203-1.915a2.585 2.585 0 0 1-.3-1.144c.056-.194.511-.478.812-.69C16.35 9.587 17 9.174 17 8.517c0-.658-.618-1.136-1.251-1.526Zm-.431 2.248c-.537.332-1.04.649-1.195 1.135a2.73 2.73 0 0 0 .325 1.68c.155.373.399.99.293 1.151-.106.163-.731.09-1.113.057a2.393 2.393 0 0 0-1.626.203 2.594 2.594 0 0 0-.682 1.55c-.082.365-.236 1.054-.406 1.111-.171.057-.667-.422-.894-.625a2.585 2.585 0 0 0-1.48-.868c-.58.11-1.105.417-1.486.868-.22.203-.756.674-.894.625-.138-.049-.325-.746-.407-1.111a2.594 2.594 0 0 0-.674-1.55 1.522 1.522 0 0 0-.95-.243 7.016 7.016 0 0 0-.708.04c-.374 0-1.008.09-1.105-.056-.098-.146.097-.78.26-1.112.285-.51.4-1.1.325-1.68-.146-.486-.65-.81-1.186-1.135-.358-.227-.902-.568-.902-.811 0-.244.544-.552.902-.811.536-.333 1.04-.658 1.186-1.136a2.754 2.754 0 0 0-.325-1.688c-.163-.348-.398-.973-.284-1.127.113-.154.73-.09 1.105-.057.549.122 1.123.05 1.625-.203.392-.427.629-.972.674-1.55.082-.364.236-1.054.407-1.11.17-.058.674.421.894.624.381.45.907.753 1.487.86a2.569 2.569 0 0 0 1.479-.86c.227-.203.756-.673.894-.625.138.049.325.747.406 1.112.048.578.288 1.123.682 1.55a2.397 2.397 0 0 0 1.626.202c.382 0 1.007-.09 1.113.057.106.146-.138.811-.292 1.144a2.755 2.755 0 0 0-.326 1.687c.155.479.659.811 1.195 1.136.357.227.902.568.902.811 0 .243-.488.527-.845.755Z"
-													/>
-													<path
-														fill="#fff"
-														d="m11.253 6.126-3.78 3.943-1.687-1.403a.473.473 0 0 0-.149-.08.556.556 0 0 0-.352 0 .473.473 0 0 0-.148.08.377.377 0 0 0-.101.12.306.306 0 0 0 0 .284.377.377 0 0 0 .101.12l2.002 1.7a.459.459 0 0 0 .152.083.548.548 0 0 0 .181.027.601.601 0 0 0 .19-.043.499.499 0 0 0 .153-.097l4.105-4.284a.312.312 0 0 0 .074-.265.365.365 0 0 0-.174-.234.55.55 0 0 0-.632.049h.065Z"
-													/>
-												</svg>
-												<span>Verify</span>
-											</p>
-										)}
-									</Button>
-								),
-							},
-						],
-					};
-				});
+											}}
+										>
+											{requestProof?.state === 'done' ? (
+												<p className="pr-1 flex text-center justify-center item-center">
+													{' '}
+													<svg
+														className="pr-1 mt-0.5 flex items-center"
+														xmlns="http://www.w3.org/2000/svg"
+														width="24"
+														height="15"
+														fill="none"
+														viewBox="0 0 24 15"
+													>
+														{' '}
+														<path
+															fill="#fff"
+															d="M23.385 7.042C23.175 6.755 18.165 0 11.767 0 5.37 0 .36 6.755.15 7.042a.777.777 0 0 0 0 .916C.36 8.245 5.37 15 11.767 15c6.398 0 11.408-6.755 11.618-7.042.2-.273.2-.643 0-.916Zm-11.618 6.406c-4.713 0-8.795-4.483-10.003-5.949 1.207-1.466 5.28-5.947 10.003-5.947 4.713 0 8.794 4.482 10.003 5.949-1.207 1.466-5.28 5.947-10.003 5.947Z"
+														/>
+														{' '}
+														<path
+															fill="#fff"
+															d="M11.772 2.84a4.66 4.66 0 0 0-4.655 4.655 4.66 4.66 0 0 0 4.655 4.655 4.66 4.66 0 0 0 4.656-4.655 4.66 4.66 0 0 0-4.656-4.655Zm0 7.758A3.107 3.107 0 0 1 8.67 7.495a3.107 3.107 0 0 1 3.103-3.103 3.107 3.107 0 0 1 3.104 3.103 3.107 3.107 0 0 1-3.104 3.103Z"
+														/>
+													</svg>
+													<span className="pl-1">View</span>{' '}
+												</p>
+											) : (
+												<p className="flex items-center justify-center">
+													{' '}
+													<svg
+														className="pr-2 flex items-center"
+														xmlns="http://www.w3.org/2000/svg"
+														width="25"
+														height="25"
+														fill="none"
+														viewBox="0 0 17 17"
+													>
+														<path
+															fill="#fff"
+															d="M15.749 6.99c-.334-.21-.813-.503-.813-.697.01-.397.113-.786.3-1.136.277-.69.561-1.395.204-1.915-.358-.519-1.122-.462-1.853-.405-.358.082-.73.082-1.089 0a2.74 2.74 0 0 1-.374-1.087c-.162-.739-.333-1.501-.942-1.704-.61-.203-1.154.3-1.699.811-.309.276-.723.65-.934.65-.212 0-.634-.374-.943-.65C7.07.362 6.51-.14 5.908.046c-.602.187-.805.933-.967 1.671-.05.383-.18.75-.382 1.08a2.295 2.295 0 0 1-1.09 0c-.722-.066-1.478-.13-1.844.405-.365.535-.081 1.225.195 1.914.19.35.295.739.31 1.136-.066.195-.521.487-.854.698C.65 7.34 0 7.76 0 8.41c0 .649.65 1.07 1.276 1.468.333.211.812.495.853.69-.014.4-.12.791-.309 1.144-.276.69-.56 1.395-.195 1.914.366.52 1.122.463 1.845.398a2.441 2.441 0 0 1 1.089.04c.2.33.33.697.382 1.08.162.738.333 1.508.934 1.711a.86.86 0 0 0 .277.106 2.439 2.439 0 0 0 1.422-.812c.308-.275.731-.657.942-.657.212 0 .626.382.935.657.544.487 1.105.998 1.698.812.593-.187.813-.974.943-1.712a2.69 2.69 0 0 1 .374-1.08 2.472 2.472 0 0 1 1.089-.04c.73.065 1.479.138 1.852-.397.374-.536.073-1.225-.203-1.915a2.585 2.585 0 0 1-.3-1.144c.056-.194.511-.478.812-.69C16.35 9.587 17 9.174 17 8.517c0-.658-.618-1.136-1.251-1.526Zm-.431 2.248c-.537.332-1.04.649-1.195 1.135a2.73 2.73 0 0 0 .325 1.68c.155.373.399.99.293 1.151-.106.163-.731.09-1.113.057a2.393 2.393 0 0 0-1.626.203 2.594 2.594 0 0 0-.682 1.55c-.082.365-.236 1.054-.406 1.111-.171.057-.667-.422-.894-.625a2.585 2.585 0 0 0-1.48-.868c-.58.11-1.105.417-1.486.868-.22.203-.756.674-.894.625-.138-.049-.325-.746-.407-1.111a2.594 2.594 0 0 0-.674-1.55 1.522 1.522 0 0 0-.95-.243 7.016 7.016 0 0 0-.708.04c-.374 0-1.008.09-1.105-.056-.098-.146.097-.78.26-1.112.285-.51.4-1.1.325-1.68-.146-.486-.65-.81-1.186-1.135-.358-.227-.902-.568-.902-.811 0-.244.544-.552.902-.811.536-.333 1.04-.658 1.186-1.136a2.754 2.754 0 0 0-.325-1.688c-.163-.348-.398-.973-.284-1.127.113-.154.73-.09 1.105-.057.549.122 1.123.05 1.625-.203.392-.427.629-.972.674-1.55.082-.364.236-1.054.407-1.11.17-.058.674.421.894.624.381.45.907.753 1.487.86a2.569 2.569 0 0 0 1.479-.86c.227-.203.756-.673.894-.625.138.049.325.747.406 1.112.048.578.288 1.123.682 1.55a2.397 2.397 0 0 0 1.626.202c.382 0 1.007-.09 1.113.057.106.146-.138.811-.292 1.144a2.755 2.755 0 0 0-.326 1.687c.155.479.659.811 1.195 1.136.357.227.902.568.902.811 0 .243-.488.527-.845.755Z"
+														/>
+														<path
+															fill="#fff"
+															d="m11.253 6.126-3.78 3.943-1.687-1.403a.473.473 0 0 0-.149-.08.556.556 0 0 0-.352 0 .473.473 0 0 0-.148.08.377.377 0 0 0-.101.12.306.306 0 0 0 0 .284.377.377 0 0 0 .101.12l2.002 1.7a.459.459 0 0 0 .152.083.548.548 0 0 0 .181.027.601.601 0 0 0 .19-.043.499.499 0 0 0 .153-.097l4.105-4.284a.312.312 0 0 0 .074-.265.365.365 0 0 0-.174-.234.55.55 0 0 0-.632.049h.065Z"
+														/>
+													</svg>
+													<span>Verify</span>
+												</p>
+											)}
+										</Button>
+									),
+								},
+							],
+						};
+					});
 
-				setVerificationList(credentialList);
-			} else {
-				setErrMsg(response as string);
+					setVerificationList(credentialList);
+				} else {
+					setErrMsg(response as string);
+				}
 			}
 		} catch (error) {
 			setErrMsg('An error occurred while fetching the proof request list');
@@ -243,7 +242,7 @@ const VerificationCredentialList = () => {
 		let getData: NodeJS.Timeout
 
 		if (searchText.length >= 1) {
-			getData = setTimeout(() => {}, 1000);
+			getData = setTimeout(() => { }, 1000);
 		} else {
 			getproofRequestList()
 		}
@@ -278,33 +277,33 @@ const VerificationCredentialList = () => {
 			<div>
 				<div
 					className="p-4 bg-white border border-gray-200 rounded-lg shadow-sm 2xl:col-span-2 dark:border-gray-700 sm:p-6 dark:bg-gray-800">
-					<div className="flex items-center justify-end mb-4">					
+					<div className="flex items-center justify-end mb-4">
 						<RoleViewButton
-								buttonTitle='Request'
-								feature={Features.VERIFICATION}
-								svgComponent={
-									<svg className='mr-2 mt-1' xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 25 25">
-								<path fill="#fff" d="M21.094 0H3.906A3.906 3.906 0 0 0 0 3.906v12.5a3.906 3.906 0 0 0 3.906 3.907h.781v3.906a.781.781 0 0 0 1.335.553l4.458-4.46h10.614A3.906 3.906 0 0 0 25 16.407v-12.5A3.907 3.907 0 0 0 21.094 0Zm2.343 16.406a2.343 2.343 0 0 1-2.343 2.344H10.156a.782.782 0 0 0-.553.228L6.25 22.333V19.53a.781.781 0 0 0-.781-.781H3.906a2.344 2.344 0 0 1-2.344-2.344v-12.5a2.344 2.344 0 0 1 2.344-2.344h17.188a2.343 2.343 0 0 1 2.343 2.344v12.5Zm-3.184-5.951a.81.81 0 0 1-.17.254l-3.125 3.125a.781.781 0 0 1-1.105-1.106l1.792-1.79h-7.489a2.343 2.343 0 0 0-2.344 2.343.781.781 0 1 1-1.562 0 3.906 3.906 0 0 1 3.906-3.906h7.49l-1.793-1.79a.78.78 0 0 1 .254-1.277.781.781 0 0 1 .852.17l3.125 3.125a.79.79 0 0 1 .169.852Z" />
-							</svg>
-								}
-								onClickEvent={schemeSelection}
-							/>
+							buttonTitle='Request'
+							feature={Features.VERIFICATION}
+							svgComponent={
+								<svg className='mr-2 mt-1' xmlns="http://www.w3.org/2000/svg" width="20" height="20" fill="none" viewBox="0 0 25 25">
+									<path fill="#fff" d="M21.094 0H3.906A3.906 3.906 0 0 0 0 3.906v12.5a3.906 3.906 0 0 0 3.906 3.907h.781v3.906a.781.781 0 0 0 1.335.553l4.458-4.46h10.614A3.906 3.906 0 0 0 25 16.407v-12.5A3.907 3.907 0 0 0 21.094 0Zm2.343 16.406a2.343 2.343 0 0 1-2.343 2.344H10.156a.782.782 0 0 0-.553.228L6.25 22.333V19.53a.781.781 0 0 0-.781-.781H3.906a2.344 2.344 0 0 1-2.344-2.344v-12.5a2.344 2.344 0 0 1 2.344-2.344h17.188a2.343 2.343 0 0 1 2.343 2.344v12.5Zm-3.184-5.951a.81.81 0 0 1-.17.254l-3.125 3.125a.781.781 0 0 1-1.105-1.106l1.792-1.79h-7.489a2.343 2.343 0 0 0-2.344 2.343.781.781 0 1 1-1.562 0 3.906 3.906 0 0 1 3.906-3.906h7.49l-1.793-1.79a.78.78 0 0 1 .254-1.277.781.781 0 0 1 .852.17l3.125 3.125a.79.79 0 0 1 .169.852Z" />
+								</svg>
+							}
+							onClickEvent={schemeSelection}
+						/>
 					</div>
 					{
-					(proofReqSuccess || errMsg) && (
-						<div className="p-2">
-							<Alert
-								color={proofReqSuccess ? 'success' : 'failure'}
-								onDismiss={() => setErrMsg(null)}
-							>
-								<span>
-									<p>
-										{proofReqSuccess || errMsg}
-									</p>
-								</span>
-							</Alert>
-						</div>
-					)}
+						(proofReqSuccess || errMsg) && (
+							<div className="p-2">
+								<Alert
+									color={proofReqSuccess ? 'success' : 'failure'}
+									onDismiss={() => setErrMsg(null)}
+								>
+									<span>
+										<p>
+											{proofReqSuccess || errMsg}
+										</p>
+									</span>
+								</Alert>
+							</div>
+						)}
 					{loading ? (
 						<div className="flex items-center justify-center mb-4">
 							<CustomSpinner />
diff --git a/src/config/ecosystem.ts b/src/config/ecosystem.ts
index 61eaa1230..deb0dbed9 100644
--- a/src/config/ecosystem.ts
+++ b/src/config/ecosystem.ts
@@ -89,17 +89,20 @@ const getOrgDetails = async (): Promise<IOrgDetails> => {
     const org = await getOrgData()
     const orgData: IOrgDetails = org && JSON.parse(org)
     const isOrgData = Object.keys(orgData).length > 0
-    if (!isOrgData) {
+    const isOrgDid = orgData?.orgDid
+    if (!isOrgData || !isOrgDid) {
         try {
-            const { data } = await getOrganizationById(orgId) as AxiosResponse
-
-            if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-                const orgData: IOrgDetails = {
-                    orgName: data?.data?.name,
-                    orgDid: data?.data && data?.data?.org_agents?.length > 0 ? data?.data?.org_agents[0]?.orgDid : ""
+            if(orgId){
+                const { data } = await getOrganizationById(orgId) as AxiosResponse
+    
+                if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
+                    const orgData: IOrgDetails = {
+                        orgName: data?.data?.name,
+                        orgDid: data?.data && data?.data?.org_agents?.length > 0 ? data?.data?.org_agents[0]?.orgDid : ""
+                    }
+                    await setToLocalStorage(storageKeys.ORG_DETAILS, JSON.stringify(orgData));
+                    return orgData
                 }
-                await setToLocalStorage(storageKeys.ORG_DETAILS, JSON.stringify(orgData));
-                return orgData
             }
         } catch (err) {
             console.log("ERROR-Get ORG Details", err)

From 991ed96cb64b97f7603579c9e3bf0a055c74e99f Mon Sep 17 00:00:00 2001
From: sanjay-k1910 <sanjay.khatal@ayanworks.com>
Date: Fri, 13 Oct 2023 23:23:37 +0530
Subject: [PATCH 2/3] refactor: dashboard

Signed-off-by: sanjay-k1910 <sanjay.khatal@ayanworks.com>
---
 src/components/Ecosystem/Dashboard.tsx | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/Ecosystem/Dashboard.tsx b/src/components/Ecosystem/Dashboard.tsx
index 945bf3b9a..1557c6de3 100644
--- a/src/components/Ecosystem/Dashboard.tsx
+++ b/src/components/Ecosystem/Dashboard.tsx
@@ -312,10 +312,6 @@ const Dashboard = () => {
                                                 </span>
                                             </div>
                                             <div className="flex">
-                                                <span className="text-[#3D3D3D] dark:text-white min-w-[10rem]">
-                                                    Joined since
-                                                </span>{' '}
-                                                <span className="dark:text-white">:</span>
                                                 <span className='text-[#3D3D3D] dark:text-white min-w-[10rem]'>Joined since</span> <span className='dark:text-white'>:</span><span className='text-[#5E5972] dark:text-white ml-2'><DateTooltip date={ecosystemDetails.joinedDate}>
                                                     {dateConversion(ecosystemDetails.joinedDate || "")}
                                                 </DateTooltip ></span>

From 8dd8941a213459a008fa5cf76d5cf1f4c6197acc Mon Sep 17 00:00:00 2001
From: sanjay-k1910 <sanjay.khatal@ayanworks.com>
Date: Fri, 13 Oct 2023 23:56:52 +0530
Subject: [PATCH 3/3] refactor: on org change update ecosystem id and role

Signed-off-by: sanjay-k1910 <sanjay.khatal@ayanworks.com>
---
 src/components/organization/OrgDropDown.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/organization/OrgDropDown.tsx b/src/components/organization/OrgDropDown.tsx
index c532e589c..e0a57886f 100644
--- a/src/components/organization/OrgDropDown.tsx
+++ b/src/components/organization/OrgDropDown.tsx
@@ -1,5 +1,5 @@
 import { apiStatusCodes, storageKeys } from '../../config/CommonConstant';
-import { getFromLocalStorage, setToLocalStorage } from '../../api/Auth';
+import { getFromLocalStorage, removeFromLocalStorage, setToLocalStorage } from '../../api/Auth';
 import { useEffect, useState } from 'react';
 
 import type { AxiosResponse } from 'axios';
@@ -27,6 +27,8 @@ const OrgDropDown = () => {
 	};
 
 	const goToOrgDashboard = async (org: Organisation) => {
+		await removeFromLocalStorage(storageKeys.ECOSYSTEM_ID)
+		await removeFromLocalStorage(storageKeys.ECOSYSTEM_ROLE)
 
 		await setOrgRoleDetails(org)
 		window.location.href = pathRoutes.organizations.dashboard;
@@ -36,7 +38,7 @@ const OrgDropDown = () => {
 
 		await setToLocalStorage(storageKeys.ORG_ID, org.id.toString());
 		const roles: string[] = org?.userOrgRoles.map(role => role.orgRole.name)
-		
+
 		await setToLocalStorage(storageKeys.ORG_ROLES, roles.toString());
 	}
 
@@ -45,7 +47,7 @@ const OrgDropDown = () => {
 		let activeOrg: Organisation | null = null
 
 		const orgId = await getFromLocalStorage(storageKeys.ORG_ID)
-		
+
 		if (orgId) {
 			activeOrg = organizations?.find(org => org.id === Number(orgId)) as Organisation
 			setactiveOrg(activeOrg || null)