diff --git a/src/api/Agent.ts b/src/api/Agent.ts
index b4a38eb61..ac6c1d14b 100644
--- a/src/api/Agent.ts
+++ b/src/api/Agent.ts
@@ -3,7 +3,7 @@ import { apiRoutes } from "../config/apiRoutes";
 import { getFromLocalStorage } from "./Auth";
 import { storageKeys } from "../config/CommonConstant";
 
-export const getAgentHealth = async (orgId:number) => {
+export const getAgentHealth = async (orgId:string) => {
   const token = await getFromLocalStorage(storageKeys.TOKEN)
   const details = {
     url: `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Agent.checkAgentHealth}`,
diff --git a/src/api/BulkIssuance.ts b/src/api/BulkIssuance.ts
index da12a915e..64f18a7dd 100644
--- a/src/api/BulkIssuance.ts
+++ b/src/api/BulkIssuance.ts
@@ -40,7 +40,7 @@ export const DownloadCsvTemplate = async (credDefId: string) => {
 	}
 };
 
-export const uploadCsvFile = async (payload: {file: Uint8Array | Blob}, credefId: string) => {	
+export const uploadCsvFile = async (payload: {file: Uint8Array | Blob, fileName:string}, credefId: string) => {	
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
 	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Issuance.bulk.uploadCsv}?credDefId=${credefId}`;
 
diff --git a/src/api/Schema.ts b/src/api/Schema.ts
index a86d4b49a..1372d2f48 100644
--- a/src/api/Schema.ts
+++ b/src/api/Schema.ts
@@ -49,7 +49,7 @@ export const getAllSchemasByOrgId = async ({ search, itemPerPage, page }: GetAll
   }
 }
 
-export const addSchema = async (payload: createSchema, orgId: number) => {
+export const addSchema = async (payload: createSchema, orgId: string) => {
   const token = await getFromLocalStorage(storageKeys.TOKEN)
   const details = {
     url: `${apiRoutes.organizations.root}/${orgId}${apiRoutes.schema.create}`,
@@ -72,7 +72,7 @@ export const addSchema = async (payload: createSchema, orgId: number) => {
   }
 }
 
-export const getSchemaById = async (schemaId: string, orgId: number) => {
+export const getSchemaById = async (schemaId: string, orgId: string) => {
   const token = await getFromLocalStorage(storageKeys.TOKEN)
   const details = {
     url: `${apiRoutes.organizations.root}/${orgId}${apiRoutes.schema.getSchemaById}/${schemaId}`,
@@ -94,7 +94,7 @@ export const getSchemaById = async (schemaId: string, orgId: number) => {
   }
 }
 
-export const createCredentialDefinition = async (payload: createCredDeffFieldName, orgId:number) => {
+export const createCredentialDefinition = async (payload: createCredDeffFieldName, orgId:string) => {
   const token = await getFromLocalStorage(storageKeys.TOKEN)
   const details = {
     url: `${apiRoutes.organizations.root}/${orgId}${apiRoutes.schema.createCredentialDefinition}`,
@@ -118,7 +118,7 @@ export const createCredentialDefinition = async (payload: createCredDeffFieldNam
   }
 }
 
-export const getCredDeffById = async (schemaId: string, orgId: number) => {
+export const getCredDeffById = async (schemaId: string, orgId: string) => {
   const token = await getFromLocalStorage(storageKeys.TOKEN)
   const details = {
     url: `${apiRoutes.organizations.root}/${orgId}${apiRoutes.schema.getCredDefBySchemaId}/${schemaId}/cred-defs`,
diff --git a/src/api/ecosystem.ts b/src/api/ecosystem.ts
index 770edd9c9..e72275f56 100644
--- a/src/api/ecosystem.ts
+++ b/src/api/ecosystem.ts
@@ -10,7 +10,7 @@ interface CreateEcosystemPayload {
 	description: string;
 	logo: string;
 	tags?: string;
-	userId: number;
+	userId: string;
 	autoEndorsement: boolean;
 }
 
@@ -105,7 +105,7 @@ export const getEndorsementList = async (
 export const createSchemaRequest = async (
 	data: object,
 	endorsementId: string,
-	orgId: number,
+	orgId: string,
 ) => {
 	const url = `${apiRoutes.Ecosystem.root}/${endorsementId}/${orgId}${apiRoutes.Ecosystem.endorsements.createSchemaRequest}`;
 	const payload = data;
@@ -126,7 +126,7 @@ export const createSchemaRequest = async (
 export const createCredDefRequest = async (
 	data: object,
 	ecosystemId: string,
-	orgId: number,
+	orgId: string,
 ) => {
 	const url = `${apiRoutes.Ecosystem.root}/${ecosystemId}/${orgId}${apiRoutes.Ecosystem.endorsements.createCredDefRequest}`;
 	const payload = data;
diff --git a/src/api/invitations.ts b/src/api/invitations.ts
index 47bfbd2d5..c687945e0 100644
--- a/src/api/invitations.ts
+++ b/src/api/invitations.ts
@@ -43,7 +43,7 @@ export const createInvitations = async (invitationList: Array<object>) => {
 	const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.organizations.invitations}`
 	const payload = {
 		invitations: invitationList,
-		orgId: Number(orgId)
+		orgId: orgId
 	}
 	const token = await getFromLocalStorage(storageKeys.TOKEN)
 
@@ -233,7 +233,7 @@ export const getEcosystemInvitations = async (pageNumber: number, pageSize: numb
 }
 
 // Accept/ Reject Invitations
-export const acceptRejectEcosystemInvitations = async (invitationId: string, orgId: number, status: string, orgName: string, orgDid: string) => {
+export const acceptRejectEcosystemInvitations = async (invitationId: string, orgId: string, status: string, orgName: string, orgDid: string) => {
 
 	const url = `${apiRoutes.Ecosystem.root}/${orgId}${apiRoutes.Ecosystem.invitations}/${invitationId}`
 
@@ -265,12 +265,12 @@ export const acceptRejectEcosystemInvitations = async (invitationId: string, org
 	}
 }
 
-export const acceptRejectInvitations = async (invitationId: number, orgId: number, status: string) => {
+export const acceptRejectInvitations = async (invitationId: string, orgId: string, status: string) => {
 
 	const url = `${apiRoutes.users.invitations}/${invitationId}`
 
 	const payload = {
-		orgId: Number(orgId),
+		orgId: orgId,
 		status
 	}
 	const token = await getFromLocalStorage(storageKeys.TOKEN)
@@ -296,7 +296,7 @@ export const acceptRejectInvitations = async (invitationId: number, orgId: numbe
 	}
 }
 
-export const deleteEcosystemInvitations = async (invitationId: number) => {
+export const deleteEcosystemInvitations = async (invitationId: string) => {
 
 	const ecosystemId = await getFromLocalStorage(storageKeys.ECOSYSTEM_ID);
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID)
diff --git a/src/api/organization.ts b/src/api/organization.ts
index 236e7450e..818be26e5 100644
--- a/src/api/organization.ts
+++ b/src/api/organization.ts
@@ -138,7 +138,7 @@ export const getOrgDashboard = async (orgId: string) => {
     }
 }
 
-export const spinupDedicatedAgent = async (data: object, orgId:number) => {
+export const spinupDedicatedAgent = async (data: object, orgId:string) => {
 
     const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Agent.agentDedicatedSpinup}`
     const payload = data
@@ -166,7 +166,7 @@ export const spinupDedicatedAgent = async (data: object, orgId:number) => {
     }
 }
 
-export const spinupSharedAgent = async (data: object, orgId:number) => {
+export const spinupSharedAgent = async (data: object, orgId:string) => {
 
     const url = `${apiRoutes.organizations.root}/${orgId}${apiRoutes.Agent.agentSharedSpinup}`
     const payload = data
@@ -247,7 +247,7 @@ export const getOrganizationUsers = async (pageNumber: number, pageSize: number,
 }
 
 // Edit user roles
-export const editOrganizationUserRole = async (userId: number, roles: number[]) => {
+export const editOrganizationUserRole = async (userId: string, roles: string[]) => {
 
     const orgId = await getFromLocalStorage(storageKeys.ORG_ID)
 
@@ -284,7 +284,7 @@ export const createConnection = async (orgName: string) => {
         label: orgName,
         multiUseInvitation: true,
         autoAcceptConnection: true,
-        orgId: Number(orgId)
+        orgId: orgId
     }
     const payload = data
 
diff --git a/src/commonComponents/AgentHealth.tsx b/src/commonComponents/AgentHealth.tsx
index fc3bb9b39..58a135ccf 100644
--- a/src/commonComponents/AgentHealth.tsx
+++ b/src/commonComponents/AgentHealth.tsx
@@ -29,7 +29,7 @@ const AgentHealth = () => {
             const organizationId = await getFromLocalStorage(storageKeys.ORG_ID);
             setCheckOrgExist(Number(organizationId))
             if (Number(organizationId) !== 0) {
-                const agentData = await getAgentHealth(Number(organizationId));
+                const agentData = await getAgentHealth(organizationId);
                 const { data } = agentData as AxiosResponse;
                 if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
                     setAgentHealthDetails(data?.data);
diff --git a/src/components/CreateEcosystemOrgModal/index.tsx b/src/components/CreateEcosystemOrgModal/index.tsx
index b06b3f8b5..a3840d1ef 100644
--- a/src/components/CreateEcosystemOrgModal/index.tsx
+++ b/src/components/CreateEcosystemOrgModal/index.tsx
@@ -10,7 +10,7 @@ import {
 	storageKeys,
 } from '../../config/CommonConstant';
 import { calculateSize, dataURItoBlob } from '../../utils/CompressImage';
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { AlertComponent } from '../AlertComponent';
 import type { AxiosResponse } from 'axios';
 import { asset } from '../../lib/data.js';
@@ -186,7 +186,7 @@ const CreateEcosystemOrgModal = (props: IProps) => {
 				description: values.description,
 				logo: (logoImage?.imagePreviewUrl as string) || '',
 				tags: '',
-				userId: Number(user_data?.id),
+				userId: user_data?.id,
 				orgName: orgDetails?.orgName,
 				orgDid: orgDetails?.orgDid,
 				autoEndorsement: autoEndorse,
@@ -516,4 +516,4 @@ const CreateEcosystemOrgModal = (props: IProps) => {
 	return <>{renderEcosystemModal()}</>;
 };
 
-export default CreateEcosystemOrgModal;
+export default CreateEcosystemOrgModal;
\ No newline at end of file
diff --git a/src/components/Ecosystem/Endorsement/index.tsx b/src/components/Ecosystem/Endorsement/index.tsx
index 4dfe76fce..05fc2cead 100644
--- a/src/components/Ecosystem/Endorsement/index.tsx
+++ b/src/components/Ecosystem/Endorsement/index.tsx
@@ -42,7 +42,7 @@ interface IEndorsementList {
 	status: string;
 	type: string;
 	ecosystemOrgs: {
-		orgId: number;
+		orgId: string;
 	};
 	requestPayload: string;
 	responsePayload: string;
diff --git a/src/components/Ecosystem/interfaces/index.ts b/src/components/Ecosystem/interfaces/index.ts
index cdf99b631..479f2f950 100644
--- a/src/components/Ecosystem/interfaces/index.ts
+++ b/src/components/Ecosystem/interfaces/index.ts
@@ -14,12 +14,12 @@ export interface IEcosystem {
 }
 
 export interface Ecosystem {
-    id: number
+    id: string
     createDateTime: string
-    createdBy: number
+    createdBy: string
     lastChangedDateTime: string
+    lastChangedBy: string
     autoEndorsement:boolean
-    lastChangedBy: number
     name: string
     description: string
     logoUrl: string
diff --git a/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx b/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx
index 41e68e165..5f1da3f67 100644
--- a/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx
+++ b/src/components/EcosystemInvite/EcoSystemReceivedInvitations.tsx
@@ -40,9 +40,9 @@ export interface EcosystemInvitation {
 	ecosystem: { name: string; logoUrl: string; };
 	id: string
 	createDateTime: string
-	createdBy: number
+	createdBy: string
 	lastChangedDateTime: string
-	lastChangedBy: number
+	lastChangedBy: string
 	deletedAt: any
 	userId: string
 	orgId: string
@@ -60,7 +60,7 @@ const ReceivedInvitations = () => {
 	const [error, setError] = useState<string | null>(null);
 	const [organizationsList, setOrganizationsList] = useState<Array<Organisation> | null>(null);
 	const [currentPage, setCurrentPage] = useState(initialPageState);
-	const [selectedId, setSelectedId] = useState<number>();
+	const [selectedId, setSelectedId] = useState<string>('');
 	const [searchText, setSearchText] = useState('');
 	const [invitationsData, setInvitationsData] = useState<Array<EcosystemInvitation> | null>(null);
 	const [getOrgError, setGetOrgError] = useState<string | null>(null);
@@ -154,7 +154,7 @@ const ReceivedInvitations = () => {
 			if (orgDid) {
 				const response = await acceptRejectEcosystemInvitations(
 					invite.id,
-					Number(selectedId),
+					selectedId,
 					status,
 					orgName,
 					orgDid
@@ -222,7 +222,7 @@ const ReceivedInvitations = () => {
 	const getOrgId = async () => {
 		const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
 		if (orgId) {
-			setSelectedId(Number(orgId));
+			setSelectedId(orgId);
 		}
 	};
 
diff --git a/src/components/EcosystemInvite/SentInvitations.tsx b/src/components/EcosystemInvite/SentInvitations.tsx
index eecbb3069..ccd2c3179 100644
--- a/src/components/EcosystemInvite/SentInvitations.tsx
+++ b/src/components/EcosystemInvite/SentInvitations.tsx
@@ -66,7 +66,7 @@ const SentInvitations = () => {
 		setLoading(false);
 	};
 
-	const deletInvitations = async (invitationId: number) => {
+	const deletInvitations = async (invitationId: string) => {
 		const response = await deleteEcosystemInvitations(invitationId);
 		const { data } = response as AxiosResponse;
 
diff --git a/src/components/Issuance/BulkIssuance.tsx b/src/components/Issuance/BulkIssuance.tsx
index 46e0845cd..043cab0ef 100644
--- a/src/components/Issuance/BulkIssuance.tsx
+++ b/src/components/Issuance/BulkIssuance.tsx
@@ -232,6 +232,7 @@ const BulkIssuance = () => {
 			await setToLocalStorage(storageKeys.SOCKET_ID, clientId)
 			const payload = {
 				file: binaryData,
+				fileName: file?.name || "Not available"
 			};
 
 			await wait(500);
@@ -305,6 +306,7 @@ const BulkIssuance = () => {
 		setIsFileUploaded(false);
 		setUploadedFileName('');
 		setUploadedFile(null);
+		setUploadMessage(null)
 	};
 
 	const handleDrop = (e: {
@@ -447,7 +449,7 @@ const BulkIssuance = () => {
 				<div className="flex flex-col justify-between min-h-100/21rem">
 					<Card>
 						<div>
-							<div className="grid grid-cols-1 sm:grid-cols-2 gap-4">
+							<div className="grid grid-cols-1 sm:grid-cols-2 gap-6">
 								<div className="flex flex-col justify-between">
 									<div className="search-dropdown text-primary-700 drak:text-primary-700">
 										<Select
diff --git a/src/components/Issuance/History.tsx b/src/components/Issuance/History.tsx
index 78b1840fb..bbd4f5ed5 100644
--- a/src/components/Issuance/History.tsx
+++ b/src/components/Issuance/History.tsx
@@ -73,11 +73,11 @@ const HistoryBulkIssuance = () => {
 
 	useEffect(() => {
 		SOCKET.emit('bulk-connection');
-		SOCKET.on('bulk-issuance-process-completed', () => {
-			console.log(`bulk-issuance-process-completed`);
-			toast.success('Issuance process completed.', {
+		SOCKET.on('bulk-issuance-process-retry-completed', () => {
+			console.log(`bulk-issuance-process-retry-completed`);
+			toast.success('Issuance process completed', {
 				position: 'top-right',
-				autoClose: 5000,
+				autoClose: 3000,
 				hideProgressBar: false,
 				closeOnClick: true,
 				pauseOnHover: true,
@@ -85,10 +85,10 @@ const HistoryBulkIssuance = () => {
 				progress: undefined,
 				theme: 'colored',
 			});
-			setSuccess('Bulk issuance process completed.');
+			setSuccess('Issuance process completed');
 		});
 
-		SOCKET.on('error-in-bulk-issuance-process', () => {
+		SOCKET.on('error-in-bulk-issuance-retry-process', () => {
 			console.log(`error-in-bulk-issuance-retry-process-initiated`);
 			toast.error('Issuance process failed. Please retry', {
 				position: 'top-right',
@@ -171,28 +171,27 @@ const HistoryBulkIssuance = () => {
 							{
 								data: (
 									<p
-										className={`${
-											status === BulkIssuanceHistory.started
-												? 'bg-primary-100 text-primary-800 dark:bg-gray-700 dark:text-primary-400 border border-primary-100 dark:border-primary-500'
-												: status === BulkIssuanceHistory.completed ||
-												  status === BulkIssuanceHistory.retry
+										className={`${status === BulkIssuanceHistory.started
+											? 'bg-primary-100 text-primary-800 dark:bg-gray-700 dark:text-primary-400 border border-primary-100 dark:border-primary-500'
+											: status === BulkIssuanceHistory.completed ||
+												status === BulkIssuanceHistory.retry
 												? 'bg-green-100 text-green-800 dark:bg-gray-700 dark:text-green-400 border border-green-100 dark:border-green-500'
 												: status === BulkIssuanceHistory.interrupted
-												? 'bg-orange-100 text-orange-800 dark:bg-gray-700 dark:text-orange-400 border border-orange-100 dark:border-orange-400'
-												: status === BulkIssuanceHistory.partially_completed
-												? 'bg-red-100 text-red-800 dark:bg-gray-700 dark:text-red-400 border border-red-100 dark:border-red-500'
-												: 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-400 border border-gray-100 dark:border-gray-500'
-										} text-sm font-medium mr-0.5 px-0.5 py-0.5 rounded-md flex justify-center items-center max-w-[180px]`}
+													? 'bg-orange-100 text-orange-800 dark:bg-gray-700 dark:text-orange-400 border border-orange-100 dark:border-orange-400'
+													: status === BulkIssuanceHistory.partially_completed
+														? 'bg-red-100 text-red-800 dark:bg-gray-700 dark:text-red-400 border border-red-100 dark:border-red-500'
+														: 'bg-gray-100 text-gray-800 dark:bg-gray-700 dark:text-gray-400 border border-gray-100 dark:border-gray-500'
+											} text-sm font-medium mr-0.5 px-0.5 py-0.5 rounded-md flex justify-center items-center w-fit px-2`}
 									>
 										{status === BulkIssuanceHistory.started
 											? BulkIssuanceHistoryData.started
 											: status === BulkIssuanceHistory.completed
-											? BulkIssuanceHistoryData.completed
-											: status === BulkIssuanceHistory.interrupted
-											? BulkIssuanceHistoryData.interrupted
-											: status === BulkIssuanceHistory.partially_completed
-											? BulkIssuanceHistoryData.partially_completed
-											: BulkIssuanceHistoryData.retry}
+												? BulkIssuanceHistoryData.completed
+												: status === BulkIssuanceHistory.interrupted
+													? BulkIssuanceHistoryData.interrupted
+													: status === BulkIssuanceHistory.partially_completed
+														? BulkIssuanceHistoryData.partially_completed
+														: BulkIssuanceHistoryData.retry}
 									</p>
 								),
 							},
@@ -271,7 +270,9 @@ const HistoryBulkIssuance = () => {
 				total: totalPages,
 			});
 		} else {
-			setFailure(response as string);
+			if (response?.toString()?.toLowerCase() !== "history not found") {
+				setFailure(response as string);
+			}
 		}
 		setLoading(false);
 	};
diff --git a/src/components/Issuance/HistoryDetails.tsx b/src/components/Issuance/HistoryDetails.tsx
index 8a14b2313..ae44492ab 100644
--- a/src/components/Issuance/HistoryDetails.tsx
+++ b/src/components/Issuance/HistoryDetails.tsx
@@ -108,15 +108,15 @@ const HistoryDetails = ({ requestId }: IProps) => {
 							},
 							{
 								data: (
-									<span
+									<p
 										className={`${
 											history?.isError === false
 												? 'bg-green-100 text-green-800 dark:bg-gray-700 dark:text-green-400 border border-green-100 dark:border-green-500'
 												: 'bg-red-100 text-red-800 border border-red-100 dark:border-red-400 dark:bg-gray-700 dark:text-red-400'
-										}	text-md font-medium sm:mr-0 md:mr-2 min-[320]:px-3 sm:px-3 lg:px-3 py-0.5 rounded-md flex justify-center min-[320]:w-full md:w-1/3`}
+										}	text-md font-medium sm:mr-0 md:mr-2 px-2 min-[320]:px-3 sm:px-3 lg:px-3 py-0.5 rounded-md flex justify-center w-fit`}
 									>
 										{history?.isError === false ? BulkIssuanceStatus.successful : BulkIssuanceStatus.failed}
-									</span>
+									</p>
 								),
 							},
 							{
diff --git a/src/components/Issuance/Issuance.tsx b/src/components/Issuance/Issuance.tsx
index 1e37378cd..256ae3e68 100644
--- a/src/components/Issuance/Issuance.tsx
+++ b/src/components/Issuance/Issuance.tsx
@@ -36,7 +36,7 @@ interface IssuanceFormPayload {
 	connectionId: string;
 	attributes: Attributes[];
 	credentialDefinitionId: string;
-	orgId: number;
+	orgId: string;
 }
 
 interface DataTypeAttributes {
@@ -81,7 +81,7 @@ const IssueCred = () => {
 		const selectedUsers = await getSelectedUsers();
 		const attributes = await getSchemaDetails();
 		if (attributes && attributes.length) {
-			createIssuanceForm(selectedUsers, attributes, credDefId, Number(orgId));
+			createIssuanceForm(selectedUsers, attributes, credDefId, orgId);
 		} else {
 			setFailure('Attributes are not available');
 		}
@@ -91,7 +91,7 @@ const IssueCred = () => {
 		selectedUsers: SelectedUsers[],
 		attributes: DataTypeAttributes[],
 		credDefId: string,
-		orgId: number,
+		orgId: string,
 	) => {
 		const attrObj = attributes.map((attr) => ({
 			name: attr?.attributeName,
diff --git a/src/components/Profile/interfaces/index.ts b/src/components/Profile/interfaces/index.ts
index 6ed2fa620..249fda505 100644
--- a/src/components/Profile/interfaces/index.ts
+++ b/src/components/Profile/interfaces/index.ts
@@ -39,7 +39,7 @@ export interface UserEmail {
 }
 
 export interface UserProfile {
-  id: number
+  id: string
   profileImg?: string
   username?: string
   email: string
diff --git a/src/components/Resources/Schema/Create.tsx b/src/components/Resources/Schema/Create.tsx
index a6379de5c..3a7adeaa0 100644
--- a/src/components/Resources/Schema/Create.tsx
+++ b/src/components/Resources/Schema/Create.tsx
@@ -16,6 +16,7 @@ import { ICheckEcosystem, checkEcosystem, getEcosystemId } from '../../../config
 import { createSchemaRequest } from '../../../api/ecosystem';
 import ConfirmModal from '../../../commonComponents/ConfirmPopup';
 import EcosystemProfileCard from '../../../commonComponents/EcosystemProfileCard'
+import React from 'react';
 
 const options = [
     { value: 'string', label: 'String' },
@@ -39,7 +40,7 @@ interface IFormData {
 
 const CreateSchema = () => {
     const [failure, setFailure] = useState<string | null>(null);
-    const [orgId, setOrgId] = useState<number>(0);
+    const [orgId, setOrgId] = useState<string>('');
     const [createLoader, setCreateLoader] = useState<boolean>(false);
     const [showPopup, setShowPopup] = useState(false)
     const [isEcosystemData, setIsEcosystemData] = useState<ICheckEcosystem>();
@@ -60,7 +61,7 @@ const CreateSchema = () => {
         const fetchData = async () => {
             const organizationId = await getFromLocalStorage(
                 storageKeys.ORG_ID);
-            setOrgId(Number(organizationId));
+            setOrgId(organizationId);
         };
 
         fetchData();
diff --git a/src/components/Resources/Schema/ViewSchema.tsx b/src/components/Resources/Schema/ViewSchema.tsx
index f4bc29293..1e0488222 100644
--- a/src/components/Resources/Schema/ViewSchema.tsx
+++ b/src/components/Resources/Schema/ViewSchema.tsx
@@ -59,7 +59,7 @@ const ViewSchemas = () => {
   const [credDefListErr, setCredDefListErr] = useState<string | null>(null)
   const [schemaDetailErr, setSchemaDetailErr] = useState<string | null>(null)
   const [failure, setFailure] = useState<string | null>(null)
-  const [orgId, setOrgId] = useState<number>(0)
+  const [orgId, setOrgId] = useState<string>('')
   const [credDefAuto, setCredDefAuto] = useState<string>('')
   const [isEcosystemData, setIsEcosystemData] = useState<ICheckEcosystem>();
 
@@ -67,7 +67,7 @@ const ViewSchemas = () => {
   const [userRoles, setUserRoles] = useState<string[]>([])
 
 
-  const getSchemaDetails = async (SchemaId: string, organizationId: number) => {
+  const getSchemaDetails = async (SchemaId: string, organizationId: string) => {
     try {
       setLoading(true);
       const SchemaDetails = await getSchemaById(SchemaId, organizationId);
@@ -88,7 +88,7 @@ const ViewSchemas = () => {
     }
   };
 
-  const getCredentialDefinitionList = async (id: string, orgId: number) => {
+  const getCredentialDefinitionList = async (id: string, orgId: string) => {
     try {
       setCredDeffloader(true);
       const credentialDefinitions = await getCredDeffById(id, orgId);
@@ -113,12 +113,12 @@ const ViewSchemas = () => {
   useEffect(() => {
     const fetchData = async () => {
       const organizationId = await getFromLocalStorage(storageKeys.ORG_ID);
-      setOrgId(Number(organizationId));
+      setOrgId(String(organizationId));
       if (window?.location?.search) {
         const str = window?.location?.search;
         const schemaId = str.substring(str.indexOf('=') + 1);
-        await getSchemaDetails(schemaId, Number(organizationId));
-        await getCredentialDefinitionList(schemaId, Number(organizationId));
+        await getSchemaDetails(schemaId, String(organizationId));
+        await getCredentialDefinitionList(schemaId, String(organizationId));
       }
     };
 
diff --git a/src/components/Resources/Schema/interfaces/index.ts b/src/components/Resources/Schema/interfaces/index.ts
index d4dd1d444..f65ed2149 100644
--- a/src/components/Resources/Schema/interfaces/index.ts
+++ b/src/components/Resources/Schema/interfaces/index.ts
@@ -1,4 +1,3 @@
-import { Pagination } from 'flowbite-react';
 export interface GetAllSchemaListParameter {
   itemPerPage: number,
   page: number,
@@ -25,9 +24,9 @@ type DataItem = {
   version: string;
   attributes: string[];
   schemaLedgerId: string;
-  createdBy: number;
+  createdBy: string;
   publisherDid: string;
-  orgId: number;
+  orgId: string;
   issuerId: string;
 };
 
@@ -53,7 +52,7 @@ export type PaginationData = {
 export interface CredDeffFieldNameType {
   tag: string;
   revocable: boolean;
-  orgId: number;
+  orgId: string;
   schemaLedgerId: string;
 }
 
@@ -61,7 +60,7 @@ export interface FieldName {
   schemaName: string;
   schemaVersion: string;
   attributes: IAttributes[]
-  orgId: number;
+  orgId: string;
 
 }
 
@@ -69,13 +68,13 @@ export interface createSchema {
   schemaName: string;
   schemaVersion: string;
   attributes: IAttributes[]
-  orgId: number;
+  orgId: string;
 }
 
 export interface createCredDeffFieldName {
   tag: string;
   revocable: boolean;
-  orgId: number;
+  orgId: string;
   schemaLedgerId: string;
 }
 
diff --git a/src/components/Tooltip/index.tsx b/src/components/Tooltip/index.tsx
index 912a20ba3..40e30c9ec 100644
--- a/src/components/Tooltip/index.tsx
+++ b/src/components/Tooltip/index.tsx
@@ -1,7 +1,5 @@
 import { Tooltip } from 'flowbite-react';
 import moment from 'moment';
-import { dateConversion } from '../../utils/DateConversion';
-import type { ChildrenType } from 'react-tooltip';
 
 interface DateProps {
   date: string
@@ -11,11 +9,9 @@ interface DateProps {
 
 const DateTooltip = ({date, children}: DateProps) => {
 
-
   const updatedDate = new Date(date);
   const formattedDate = date ? moment(updatedDate).format("MMM DD, YYYY, h:mm A z") : '';
 
-
   return (
     <Tooltip 
       content= {formattedDate} 
diff --git a/src/components/User/UserDashBoard.tsx b/src/components/User/UserDashBoard.tsx
index f2a49bb7a..90c3a3006 100644
--- a/src/components/User/UserDashBoard.tsx
+++ b/src/components/User/UserDashBoard.tsx
@@ -161,8 +161,8 @@ const UserDashBoard = () => {
 		getAllResponses()
 	}, []);
 
-	const goToOrgDashboard = async (orgId: number, roles: string[]) => {
-		await setToLocalStorage(storageKeys.ORG_ID, orgId.toString());
+	const goToOrgDashboard = async (orgId: string, roles: string[]) => {
+		await setToLocalStorage(storageKeys.ORG_ID, orgId);
 		window.location.href = pathRoutes.organizations.dashboard;
 	};
 
@@ -206,7 +206,7 @@ const UserDashBoard = () => {
 							org.roles = roles;
 							return (
 								<button
-									className='block'
+									className='block w-full'
 									key={org?.id}
 									onClick={() => goToOrgDashboard(org?.id, org?.roles)}
 								>
diff --git a/src/components/User/interfaces/index.ts b/src/components/User/interfaces/index.ts
index f74b10de4..66f6784ec 100644
--- a/src/components/User/interfaces/index.ts
+++ b/src/components/User/interfaces/index.ts
@@ -1,12 +1,12 @@
 export interface UserActivity {
     id: number
-    userId: number
-    orgId: number
+    userId: string
+    orgId: string
     action: string
     details: string
     createDateTime: string
-    createdBy: number
+    createdBy: string
     lastChangedDateTime: string
-    lastChangedBy: number
+    lastChangedBy: string
     deletedAt: any
 }
diff --git a/src/components/Verification/Verification.tsx b/src/components/Verification/Verification.tsx
index 5a7ae38e0..c397f8a1e 100644
--- a/src/components/Verification/Verification.tsx
+++ b/src/components/Verification/Verification.tsx
@@ -32,7 +32,7 @@ interface VerifyCredentialPayload {
 		credDefId?: string  ;
 	}>;
 	comment: string;
-	orgId: number;
+	orgId: string;
 }
 
 const VerificationCred = () => {
@@ -161,7 +161,7 @@ const VerificationCred = () => {
 				connectionId: `${selectedUsers[0].connectionId}`,
 				attributes: attributes,
 				comment: "string",
-				orgId: Number(orgId)
+				orgId: orgId
 			};
 			if (attributes) {
 				const response = await verifyCredential(verifyCredentialPayload);
diff --git a/src/components/organization/OrgDropDown.tsx b/src/components/organization/OrgDropDown.tsx
index a6643480d..b79168be9 100644
--- a/src/components/organization/OrgDropDown.tsx
+++ b/src/components/organization/OrgDropDown.tsx
@@ -50,7 +50,7 @@ const OrgDropDown = () => {
 		const orgId = await getFromLocalStorage(storageKeys.ORG_ID)
 
 		if (orgId) {
-			activeOrg = organizations?.find(org => org.id === Number(orgId)) as Organisation
+			activeOrg = organizations?.find(org => org.id === String(orgId)) as Organisation
 			setactiveOrg(activeOrg || null)
 		} else {
 			activeOrg = organizations && organizations[0]
@@ -112,10 +112,10 @@ const OrgDropDown = () => {
 							org.roles = roles
 							return (
 								<li key={org?.id}>
-									<button onClick={() => goToOrgDashboard(org)}>
+									<button className='w-full' onClick={() => goToOrgDashboard(org)}>
 										<a
 											href="#"
-											className="flex items-center px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"
+											className="flex items-center w-full px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-600 dark:hover:text-white"
 										>
 											{org.logoUrl ? (
 												<CustomAvatar className='shrink-0 dark:text-white' size="25" src={org?.logoUrl} round />
diff --git a/src/components/organization/WalletSpinup.tsx b/src/components/organization/WalletSpinup.tsx
index 0024a5e19..32b73bd1b 100644
--- a/src/components/organization/WalletSpinup.tsx
+++ b/src/components/organization/WalletSpinup.tsx
@@ -67,7 +67,7 @@ const fetchNetworks = async () => {
 	try {
 		const { data } = await getLedgers() as AxiosResponse
 		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-			return data?.data
+			return data?.data 
 		}
 		return []
 	} catch (err) {
@@ -479,14 +479,14 @@ const WalletSpinup = (props: {
 			walletPassword: passwordEncryption(values.password),
 			did: values.did,
 			ledgerId: [
-				Number(values.network)
+				(values.network.toString())
 			],
 			clientSocketId: SOCKET.id
 		}
 
 		setLoading(true);
 		const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-		const spinupRes = await spinupDedicatedAgent(payload, parseInt(orgId));
+		const spinupRes = await spinupDedicatedAgent(payload, orgId);
 		const { data } = spinupRes as AxiosResponse;
 
 		if (data?.statusCode === apiStatusCodes.API_STATUS_CREATED) {
@@ -507,14 +507,14 @@ const WalletSpinup = (props: {
 			label: values.label,
 			seed: values.seed || seeds,
 			ledgerId: [
-				Number(values.network)
+				(values.network.toString())
 			],
 			did: values.did,
 			clientSocketId: SOCKET.id,
 		};
 
 		const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-		const spinupRes = await spinupSharedAgent(payload, parseInt(orgId));
+		const spinupRes = await spinupSharedAgent(payload, orgId);
 		const { data } = spinupRes as AxiosResponse;
 
 		if (data?.statusCode === apiStatusCodes.API_STATUS_CREATED) {
diff --git a/src/components/organization/interfaces/index.ts b/src/components/organization/interfaces/index.ts
index 45a533425..38fe0a864 100644
--- a/src/components/organization/interfaces/index.ts
+++ b/src/components/organization/interfaces/index.ts
@@ -1,18 +1,18 @@
 export interface UserOrgRole {
-    id: number
-    userId: number
-    orgRoleId: number
-    orgId: number
+    id: string
+    userId: string
+    orgRoleId: string
+    orgId: string
     orgRole: OrgRole
 }
 
 export interface Organisation {
     logoFile: string
-    id: number
+    id: string
     createDateTime: string
-    createdBy: number
+    createdBy: string
     lastChangedDateTime: string
-    lastChangedBy: number
+    lastChangedBy: string
     name: string
     description: string
     logoUrl: string
@@ -25,22 +25,22 @@ export interface Organisation {
 }
 
 export interface OrgRole {
-    id: number
+    id: string
     name: string
     description: string
     createDateTime?: string
-    createdBy?: number
+    createdBy?: string
     lastChangedDateTime?: string
-    lastChangedBy?: number
+    lastChangedBy?: string
     deletedAt?: any
 }
 
 export interface OrgAgent {
-    id: number
+    id: string
     createDateTime: string
-    createdBy: number
+    createdBy: string
     lastChangedDateTime: string
-    lastChangedBy: number
+    lastChangedBy: string
     orgDid: string
     verkey: string
     agentEndPoint: string
@@ -50,39 +50,39 @@ export interface OrgAgent {
     agentOptions: any
     walletName: string
     tenantId: any
-    agentsTypeId: number
-    orgId: number
-    orgAgentTypeId: number
+    agentsTypeId: string
+    orgId: string
+    orgAgentTypeId: string
     ledgers: ledgers
     org_agent_type: org_agent_type 
     agents_type: AgentsType
 }
 
 export interface AgentsType {
-    id: number
+    id: string
     createDateTime: string
-    createdBy: number
+    createdBy: string
     lastChangedDateTime: string
-    lastChangedBy: number
+    lastChangedBy: string
     agent: string
 }
 
 export interface org_agent_type{
-id: number
+id: string
 createDateTime: string
-createdBy: number
+createdBy: string
 lastChangedDateTime: string
-lastChangedBy: number
+lastChangedBy: string
 agent: string
 
 }
 
 export interface ledgers{
 createDateTime: string
-createdBy: number
-id: number
+createdBy: string
+id: string
 isActive: boolean
-lastChangedBy: number
+lastChangedBy: string
 lastChangedDateTime: string
 name: string
 networkString: string
@@ -98,15 +98,15 @@ export interface OrgDashboard {
 }
 
 export interface Connection {
-    id: number
-    orgId: number
-    agentId: number
+    id: string
+    orgId: string
+    agentId: string
     connectionInvitation: string
     multiUse: boolean
     createDateTime: string
-    createdBy: number
+    createdBy: string
     lastChangedDateTime: string
-    lastChangedBy: number
+    lastChangedBy: string
   }
 
   export interface EcosystemDashboard {
@@ -114,7 +114,6 @@ export interface Connection {
     endorsementsCount: number
   }
 
-
 export interface OrgInterface {
     name: string;
     website: string;
@@ -143,7 +142,7 @@ export interface UserDetails {
     firstName: string;
     email: string;
     publicProfile: boolean;
-    id: number;
+    id: string;
     username: string;
 }
 
diff --git a/src/components/organization/interfaces/invitations.ts b/src/components/organization/interfaces/invitations.ts
index 45da32baf..0d7500b29 100644
--- a/src/components/organization/interfaces/invitations.ts
+++ b/src/components/organization/interfaces/invitations.ts
@@ -2,14 +2,14 @@ import type { OrgRole, Organisation } from "."
 
 export interface Invitation {
 		ecosystem: any
-    id: number
+    id: string
     createDateTime: string
-    createdBy: number
+    createdBy: string
     lastChangedDateTime: string
-    lastChangedBy: number
+    lastChangedBy: string
     deletedAt: any
-    userId: number
-    orgId: number
+    userId: string
+    orgId: string
     status: string
     orgRoles: OrgRole[]
     email: string
diff --git a/src/components/organization/interfaces/users.ts b/src/components/organization/interfaces/users.ts
index 2bf7e4cb2..6e4994656 100644
--- a/src/components/organization/interfaces/users.ts
+++ b/src/components/organization/interfaces/users.ts
@@ -1,7 +1,7 @@
 import type { UserOrgRole } from "."
 
 export interface User {
-    id: number
+    id: string
     username: string
     email: string
     firstName: string
diff --git a/src/components/organization/invitations/ReceivedInvitations.tsx b/src/components/organization/invitations/ReceivedInvitations.tsx
index 368ccbe3c..57f156f40 100644
--- a/src/components/organization/invitations/ReceivedInvitations.tsx
+++ b/src/components/organization/invitations/ReceivedInvitations.tsx
@@ -12,9 +12,7 @@ import type { Invitation } from '../interfaces/invitations';
 import type { OrgRole } from '../interfaces';
 import SearchInput from '../../SearchInput';
 import SendInvitationModal from './SendInvitationModal';
-import { TextTittlecase } from '../../../utils/TextTransform';
 import { apiStatusCodes } from '../../../config/CommonConstant';
-import { getOrganizations } from '../../../api/organization';
 import { pathRoutes } from '../../../config/pathRoutes';
 import { EmptyListMessage } from '../../EmptyListComponent';
 import CustomSpinner from '../../CustomSpinner';
diff --git a/src/components/organization/invitations/SendInvitationModal.tsx b/src/components/organization/invitations/SendInvitationModal.tsx
index aa1bd45f3..ef91182cd 100644
--- a/src/components/organization/invitations/SendInvitationModal.tsx
+++ b/src/components/organization/invitations/SendInvitationModal.tsx
@@ -21,11 +21,11 @@ interface Values {
 interface Invitations {
 	email: string;
 	role: string;
-	roleId: number;
+	roleId: string;
 }
 
 interface RoleI {
-	id: number;
+	id: string;
 	name: string;
 }
 
@@ -87,7 +87,7 @@ const SendInvitationModal = (props: {
 			{
 				email: values.email,
 				role: memberRole?.name as string,
-				roleId: memberRole?.id as number,
+				roleId: String(memberRole?.id),
 			},
 		]);
 	};
diff --git a/src/components/organization/users/EditUserRolesModal.tsx b/src/components/organization/users/EditUserRolesModal.tsx
index af813a2ff..544ab0c43 100644
--- a/src/components/organization/users/EditUserRolesModal.tsx
+++ b/src/components/organization/users/EditUserRolesModal.tsx
@@ -8,7 +8,7 @@ import type { User } from "../interfaces/users";
 import { apiStatusCodes } from "../../../config/CommonConstant";
 
 interface RoleI {
-    id: number
+    id: string
     name: string,
     checked: boolean
     disabled: boolean
@@ -64,7 +64,7 @@ const EditUserRoleModal = (props: { openModal: boolean; user: User; setMessage:
 
         const roleIds = roles?.filter(role => role.checked).map(role => role.id)
 
-        const response = await editOrganizationUserRole(props.user.id, roleIds as number[])
+        const response = await editOrganizationUserRole(props.user.id, roleIds as string[])
 
         const { data } = response as AxiosResponse
 
@@ -79,7 +79,7 @@ const EditUserRoleModal = (props: { openModal: boolean; user: User; setMessage:
 
     }
 
-    const onRoleChanged = (event: any, id: number) => {
+    const onRoleChanged = (event: any, id: string) => {
 
      if (
             (event?.target?.name === 'issuer' && event?.target?.checked === true) || (event?.target?.name === 'verifier' && event?.target?.checked === true)
diff --git a/src/components/publicProfile/OrganisationPublicProfile.tsx b/src/components/publicProfile/OrganisationPublicProfile.tsx
index 5696fbbe4..42b48111c 100644
--- a/src/components/publicProfile/OrganisationPublicProfile.tsx
+++ b/src/components/publicProfile/OrganisationPublicProfile.tsx
@@ -102,7 +102,7 @@ const OrganisationPublicProfile = () => {
 								logoUrl: string;
 								name: string;
 								description: string;
-								id: number;
+								id: string;
 								orgSlug: string;
 							}) => (
 								<Card
diff --git a/src/types/entities.ts b/src/types/entities.ts
index 39531df0e..e353a67b6 100644
--- a/src/types/entities.ts
+++ b/src/types/entities.ts
@@ -17,7 +17,7 @@ export interface Product {
 
 export type Users = User[];
 export interface User {
-	id: number;
+	id: string;
 	name: string;
 	avatar: string;
 	email: string;