From 5dcc5c295624f310f4e863915ce50af9c63009be Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Mon, 15 Apr 2024 15:05:36 +0530
Subject: [PATCH 01/19] refactor: parameter name

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/organization/interfaces/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/organization/interfaces/index.ts b/src/components/organization/interfaces/index.ts
index 566b67047..4c7530d89 100644
--- a/src/components/organization/interfaces/index.ts
+++ b/src/components/organization/interfaces/index.ts
@@ -89,7 +89,7 @@ name: string
 networkString: string
 networkType: string
 poolConfig: string
-registerDIDEndpoint: string
+nymTxnEndpoint: string
 }
 export interface OrgDashboard {
     usersCount: number

From ac0a437cc06f7239adc9eb0419fc401b287b1b17 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Thu, 16 May 2024 18:57:16 +0530
Subject: [PATCH 02/19] refactor: added query parameter

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/api/ecosystem.ts                       | 3 ++-
 src/components/Resources/Schema/Create.tsx | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/api/ecosystem.ts b/src/api/ecosystem.ts
index 112476acc..7d3445153 100644
--- a/src/api/ecosystem.ts
+++ b/src/api/ecosystem.ts
@@ -110,10 +110,11 @@ export const getEndorsementList = async (
 
 export const createSchemaRequest = async (
 	data: object,
+	schemaType: string,
 	endorsementId: string,
 	orgId: string,
 ) => {
-	const url = `${apiRoutes.Ecosystem.root}/${endorsementId}/${orgId}${apiRoutes.Ecosystem.endorsements.createSchemaRequest}`;
+	const url = `${apiRoutes.Ecosystem.root}/${endorsementId}/${orgId}${apiRoutes.Ecosystem.endorsements.createSchemaRequest}?schemaType=${schemaType}`;
 	const payload = data;
 	const axiosPayload = {
 		url,
diff --git a/src/components/Resources/Schema/Create.tsx b/src/components/Resources/Schema/Create.tsx
index 23b7803f3..921f910e3 100644
--- a/src/components/Resources/Schema/Create.tsx
+++ b/src/components/Resources/Schema/Create.tsx
@@ -158,7 +158,7 @@ const CreateSchema = () => {
 
 		const id = await getEcosystemId();
 
-		const createSchema = await createSchemaRequest(schemaFieldName, id, orgId);
+		const createSchema = await createSchemaRequest(schemaFieldName, 'indy', id, orgId);
 		const { data } = createSchema as AxiosResponse;
 		if (data?.statusCode === apiStatusCodes.API_STATUS_CREATED) {
 			setSuccess(data?.message);

From cfabd6ae6871bb4a7462a623de6e10961e3d08b6 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Thu, 16 May 2024 19:09:14 +0530
Subject: [PATCH 03/19] fix: remove unnecessary code

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/organization/interfaces/index.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/organization/interfaces/index.ts b/src/components/organization/interfaces/index.ts
index e9482b636..99bc7d5ca 100644
--- a/src/components/organization/interfaces/index.ts
+++ b/src/components/organization/interfaces/index.ts
@@ -95,7 +95,7 @@ name: string
 networkString: string
 networkType: string
 poolConfig: string
-nymTxnEndpoint: string
+registerDIDEndpoint: string
 }
 export interface OrgDashboard {
     usersCount: number

From caf8e60db8d9271bcfbae12c39007aa8bb6e14d8 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Fri, 17 May 2024 13:10:59 +0530
Subject: [PATCH 04/19] fix: query param issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/common/enums.ts                        | 4 ++++
 src/components/Resources/Schema/Create.tsx | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/common/enums.ts b/src/common/enums.ts
index 7abdc1dff..dd66bea4f 100644
--- a/src/common/enums.ts
+++ b/src/common/enums.ts
@@ -31,6 +31,10 @@ export enum ProofRequestStateUserText {
 	abandoned = 'Declined',
 }
 
+export enum SchemaType {
+    INDY = 'indy',
+    W3C = 'w3c'
+}
 export enum IssueCredentialUserText {
 	offerSent = 'Offered',
 	done = 'Accepted',
diff --git a/src/components/Resources/Schema/Create.tsx b/src/components/Resources/Schema/Create.tsx
index 921f910e3..8f85fa74b 100644
--- a/src/components/Resources/Schema/Create.tsx
+++ b/src/components/Resources/Schema/Create.tsx
@@ -20,6 +20,7 @@ import { ICheckEcosystem,	checkEcosystem,	getEcosystemId } from '../../../config
 import { createSchemaRequest } from '../../../api/ecosystem';
 import EcosystemProfileCard from '../../../commonComponents/EcosystemProfileCard';
 import ConfirmationModal from '../../../commonComponents/ConfirmationModal';
+import { SchemaType } from '../../../common/enums';
 
 const options = [
 	{
@@ -158,7 +159,7 @@ const CreateSchema = () => {
 
 		const id = await getEcosystemId();
 
-		const createSchema = await createSchemaRequest(schemaFieldName, 'indy', id, orgId);
+		const createSchema = await createSchemaRequest(schemaFieldName, SchemaType.INDY, id, orgId);
 		const { data } = createSchema as AxiosResponse;
 		if (data?.statusCode === apiStatusCodes.API_STATUS_CREATED) {
 			setSuccess(data?.message);

From f7103aade82b37c1ce81c0a1e8abea26f71727d1 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Tue, 18 Jun 2024 18:20:07 +0530
Subject: [PATCH 05/19] fix: css issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/AddOrganizationInEcosystem.tsx                  | 1 +
 .../organization/walletCommonComponents/SharedAgent.tsx        | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/AddOrganizationInEcosystem.tsx b/src/components/AddOrganizationInEcosystem.tsx
index c4f5578f5..44cb30a11 100644
--- a/src/components/AddOrganizationInEcosystem.tsx
+++ b/src/components/AddOrganizationInEcosystem.tsx
@@ -409,6 +409,7 @@ const AddOrganizationInEcosystem = () => {
 				<Button
 					onClick={() => handleAddOrganization()}
 					isProcessing={loader}
+					disabled={localOrgs.length === 0}
 					className={`hover:bg-primary-800 dark:hover:text-white dark:hover:bg-primary-700 hover:!bg-primary-800 text-base font-medium text-center text-white bg-primary-700 rounded-lg focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:focus:ring-primary-800`}
 				>
 					<svg
diff --git a/src/components/organization/walletCommonComponents/SharedAgent.tsx b/src/components/organization/walletCommonComponents/SharedAgent.tsx
index a66583e32..59d16aa92 100644
--- a/src/components/organization/walletCommonComponents/SharedAgent.tsx
+++ b/src/components/organization/walletCommonComponents/SharedAgent.tsx
@@ -185,6 +185,7 @@ const SharedAgentForm = ({
 						formikHandlers.handleChange(e);
 						handleMethodChange(e);
 						setSelectedMethod(method);
+						setDomainValue('');
 					}}
 					className="mr-2"
 				/>
@@ -424,7 +425,7 @@ const SharedAgentForm = ({
 										name="did-method"
 										value={selectedDid}
 										readOnly
-										className="mt-2 bg-[#F4F4F4] w-[180px] md:w-[154px] dark:bg-gray-700 text-gray-900 dark:text-gray-300" />
+										className="mt-2 bg-[#F4F4F4] w-[180px] dark:bg-gray-700 text-gray-900 dark:text-gray-300" />
 										</div>
 								</div>
 							)}

From 67babdf85e32fcfe5749342455bf42fb0490c254 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Fri, 21 Jun 2024 12:14:25 +0530
Subject: [PATCH 06/19] fix: create did button restrictions

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 .../configuration-settings/DidList.tsx        | 30 +++++--------
 .../walletCommonComponents/SharedAgent.tsx    | 43 +++++++++++--------
 2 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/components/organization/configuration-settings/DidList.tsx b/src/components/organization/configuration-settings/DidList.tsx
index 1205bb1bc..1c7485bad 100644
--- a/src/components/organization/configuration-settings/DidList.tsx
+++ b/src/components/organization/configuration-settings/DidList.tsx
@@ -2,7 +2,7 @@ import React, { useEffect, useState } from "react"
 import { Button } from "flowbite-react"
 import CopyDid from '../../../commonComponents/CopyDid'
 import CreateDidPopup from "./CreateDid"
-import { getDids, getOrganizationById, updatePrimaryDid } from "../../../api/organization"
+import { getDids, updatePrimaryDid } from "../../../api/organization"
 import { getFromLocalStorage } from "../../../api/Auth"
 import { apiStatusCodes, storageKeys } from "../../../config/CommonConstant"
 import type { AxiosResponse } from "axios"
@@ -15,8 +15,7 @@ const DIDList = () => {
     const [showPopup, setShowPopup] = useState(false);
     const [erroMsg, setErrMsg] = useState<string | null>(null);
     const [successMsg, setSuccessMsg] = useState<string | null>(null);
-	const [roleName, setRoleName] = useState<string | null>(null);
-
+	const [userRoles, setUserRoles] = useState<string[]>([]);
     const setPrimaryDid = async (id: string, did: string) => {
         try {
             const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
@@ -36,22 +35,6 @@ const DIDList = () => {
         }
     }
 
-    const fetchOrganizationDetails = async () => {
-		const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-		const response = await getOrganizationById(orgId);
-		const { data } = response as AxiosResponse;
-		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-
-			const ownerRole = data?.data?.userOrgRoles.find(role => role?.orgRole.name === "owner");
-            
-			const ownerRoleName = ownerRole ? ownerRole.orgRole.name : null;
-			setRoleName(ownerRoleName);
-
-		} else {
-			console.error('Error in fetching organization:::');
-		}
-	};
-
     const getData = async () => {
         try {
             const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
@@ -70,9 +53,15 @@ const DIDList = () => {
         }
     }
 
+    const getUserOrgRoles = async () => {
+		const orgRoles = await getFromLocalStorage(storageKeys.ORG_ROLES);
+		const roles = orgRoles.split(',');
+		setUserRoles(roles);
+	}
+
     useEffect(() => {
         getData();
-        fetchOrganizationDetails();
+        getUserOrgRoles();
     }, [])
 
     return (
@@ -90,6 +79,7 @@ const DIDList = () => {
                     <h3 className="text-lg font-bold dark:text-white">DID Details</h3>
                     <Button
                         onClick={() => setShowPopup(true)}
+                        disabled= {userRoles.includes(Roles.MEMBER) || userRoles.includes(Roles.ISSUER) || userRoles.includes(Roles.VERIFIER)}
                         className={`hover:bg-primary-800 dark:hover:text-white dark:hover:bg-primary-700 hover:!bg-primary-800 text-base font-medium text-center text-white bg-primary-700 rounded-lg focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:focus:ring-primary-800`}
                     >
                         Create DID
diff --git a/src/components/organization/walletCommonComponents/SharedAgent.tsx b/src/components/organization/walletCommonComponents/SharedAgent.tsx
index 59d16aa92..3df9d96f6 100644
--- a/src/components/organization/walletCommonComponents/SharedAgent.tsx
+++ b/src/components/organization/walletCommonComponents/SharedAgent.tsx
@@ -1,12 +1,12 @@
 import { Button, Label, Checkbox } from "flowbite-react";
-import { Field, Form, Formik } from "formik";
+import { Field, Form, Formik, type FormikHelpers } from "formik";
 import { useState, useEffect, type ChangeEvent } from "react";
 import { getLedgerConfig, getLedgers } from "../../../api/Agent";
 import { apiStatusCodes } from "../../../config/CommonConstant";
 import * as yup from 'yup';
 import type { AxiosResponse } from 'axios';
 import CopyDid from '../../../commonComponents/CopyDid';
-import { DidMethod } from '../../../common/enums';
+import { DidMethod, Ledgers, Network } from '../../../common/enums';
 import SetDomainValueInput from './SetDomainValueInput';
 import SetPrivateKeyValueInput from './SetPrivateKeyValue';
 import type { ISharedAgentForm, IValuesShared } from "./interfaces";
@@ -58,10 +58,10 @@ const SharedAgentForm = ({
 			if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 				const ledgerConfigData: ILedgerConfigData = {
 					indy: {
-						'did:indy': {}
+						[`${DidMethod.INDY}`]: {}
 					},
 					polygon: {
-						'did:polygon': {}
+						[`${DidMethod.POLYGON}`]: {}
 					},
 					noLedger: {}
 				};
@@ -69,26 +69,26 @@ const SharedAgentForm = ({
 				data.data.forEach(({ name, details }: ILedgerItem) => {
 					const lowerName = name.toLowerCase();
 				
-					if (lowerName === 'indy' && details) {
+					if (lowerName === Ledgers.INDY && details) {
 						for (const [key, subDetails] of Object.entries(details)) {
 							if (typeof subDetails === 'object' && subDetails !== null) {
 								for (const [subKey, value] of Object.entries(subDetails)) {
-									const formattedKey = `${key}:${subKey}`.replace('did:indy:', '');
-									ledgerConfigData.indy['did:indy'][formattedKey] = value;
+									const formattedKey = `${key}:${subKey}`.replace(`${DidMethod.INDY}:`, '');
+									ledgerConfigData.indy[`${DidMethod.INDY}`][formattedKey] = value;
 								}
 							}
 						}
-					} else if (lowerName === 'polygon' && details) {
+					} else if (lowerName === Ledgers.POLYGON && details) {
 						for (const [key, value] of Object.entries(details)) {
 							if (typeof value === 'object' && value !== null) {
 								for (const [subKey, subValue] of Object.entries(value)) {
-									ledgerConfigData.polygon['did:polygon'][subKey] = subValue;
+									ledgerConfigData.polygon[`${DidMethod.POLYGON}`][subKey] = subValue;
 								}
 							} else if (typeof value === 'string') {
-								ledgerConfigData.polygon['did:polygon'][key] = value;
+								ledgerConfigData.polygon[`${DidMethod.POLYGON}`][key] = value;
 							}
 						}
-					} else if (lowerName === 'noledger' && details) {
+					} else if (lowerName === Ledgers.NO_LEDGER.toLowerCase() && details) {
 						for (const [key, value] of Object.entries(details)) {
 							ledgerConfigData.noLedger[key] = value  as string;
 						}
@@ -207,8 +207,13 @@ const SharedAgentForm = ({
 			return null;
 		}
 
-		return Object.keys(networks).map((network) => (
-			<div key={network} className="mt-2">
+		let filteredNetworks = Object.keys(networks);
+		if (selectedMethod === DidMethod.POLYGON) {
+			filteredNetworks = filteredNetworks.filter(network => network === Network.TESTNET);
+		}
+
+		return filteredNetworks.map((network) => (
+				<div key={network} className="mt-2">
 				<input
 					type="radio"
 					id={network}
@@ -269,8 +274,9 @@ const SharedAgentForm = ({
 					keyType: ''
 				}}
 				validationSchema={yup.object().shape(validations)}
-				onSubmit={(values: IValuesShared) => {
-
+				onSubmit={(values: IValuesShared,
+					actions: FormikHelpers<IValuesShared>
+				) => {
 					if (!values.privatekey) {
 						values.privatekey = privateKeyValue;
 					}
@@ -279,6 +285,7 @@ const SharedAgentForm = ({
 						values,
 						domainValue,
 					);
+					actions.resetForm();
 				}}
 			>
 				{(formikHandlers) => (
@@ -388,7 +395,7 @@ const SharedAgentForm = ({
 								)}
 							</div>
 
-							{selectedLedger !== 'noLedger' && (
+							{selectedLedger !== Ledgers.NO_LEDGER && (
 								<div className="mb-3 relative">
 									<label
 										htmlFor="network"
@@ -408,7 +415,7 @@ const SharedAgentForm = ({
 								</div>
 							)}
 
-							{selectedLedger !== 'noLedger' && (
+							{selectedLedger !== Ledgers.NO_LEDGER && (
 
 								<div className="mb-3 relative">
 									<label
@@ -461,7 +468,7 @@ const SharedAgentForm = ({
 						</div>
 
 						<div className="grid grid-cols-1 md:grid-cols-2 bg-[#F4F4F4] dark:bg-gray-700 mt-4 pl-4 pr-2 md:pr-0">
-							{selectedMethod === 'did:polygon' && (
+							{selectedMethod === DidMethod.POLYGON && (
 								<><div className="grid-col-1">
 									<SetPrivateKeyValueInput setPrivateKeyValue={setPrivateKeyValue}
 										privateKeyValue={privateKeyValue} formikHandlers={formikHandlers} />	

From 576b4b855f3bbd53715001f8892b579688f08873 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Wed, 28 Aug 2024 16:08:43 +0530
Subject: [PATCH 07/19] fix: popup card fixes

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/Issuance/EmailIssuance.tsx     |   3 +-
 src/components/Issuance/interface.ts          |   1 +
 .../Verification/AttributesListData.tsx       | 104 ++++++++++++++----
 .../Verification/EmailCredDefSelection.tsx    |  47 ++++----
 .../Verification/ProofRequestPopup.tsx        |  30 ++---
 5 files changed, 121 insertions(+), 64 deletions(-)

diff --git a/src/components/Issuance/EmailIssuance.tsx b/src/components/Issuance/EmailIssuance.tsx
index 59d8d4ea8..901c37f81 100644
--- a/src/components/Issuance/EmailIssuance.tsx
+++ b/src/components/Issuance/EmailIssuance.tsx
@@ -210,8 +210,8 @@ const EmailIssuance = () => {
 				transformedData.credentialOffer.push(transformedEntry);
 			});
 			transformedData.credentialDefinitionId = credDefId;
+			transformedData.isReuseConnection = true;
 
-		
     } else if (schemaType=== SchemaTypes.schema_W3C) {
 		
         existingData.formData.forEach((entry: { email: string; credentialData: IEmailCredentialData; attributes:IIssueAttributes[] }) => {
@@ -253,6 +253,7 @@ const EmailIssuance = () => {
         });
 
         transformedData.protocolVersion = "v2";
+		transformedData.isReuseConnection = true;
         transformedData.credentialType = CredentialType.JSONLD;
     }
 	
diff --git a/src/components/Issuance/interface.ts b/src/components/Issuance/interface.ts
index 8c27ddd77..fe161edc9 100644
--- a/src/components/Issuance/interface.ts
+++ b/src/components/Issuance/interface.ts
@@ -187,5 +187,6 @@ export interface ICredentialOffer {
 	credentialOffer: ICredentialOffer[];
 	credentialDefinitionId?: string;
 	protocolVersion?: string;
+	isReuseConnection?: boolean;
 	credentialType?: string;
   }
\ No newline at end of file
diff --git a/src/components/Verification/AttributesListData.tsx b/src/components/Verification/AttributesListData.tsx
index 9eac679dd..0d89dbb7b 100644
--- a/src/components/Verification/AttributesListData.tsx
+++ b/src/components/Verification/AttributesListData.tsx
@@ -2,45 +2,101 @@ import { Card } from 'flowbite-react';
 import CopyDid from '../../commonComponents/CopyDid';
 
 interface AttributesListProps {
-    attributeDataList: { [key: string]: any }[] 
+	attributeDataList: { [key: string]: any }[];
 }
 
+const groupAndMergeAttributes = (data: { [key: string]: any }[], key: string): { [key: string]: any }[] => {
+	const grouped = data.reduce((result, item) => {
+		const groupKey = item[key] || item['schemaId'];
+		if (!result[groupKey]) {
+			result[groupKey] = {};
+		}
+		// Merge attributes into a single object
+		result[groupKey] = { ...result[groupKey], ...item };
+		return result;
+	}, {} as { [key: string]: any });
+
+	// Convert the grouped object back to an array
+	return Object.values(grouped);
+};
+
 const AttributesListData = ({ attributeDataList }: AttributesListProps): JSX.Element => {
 
-    return (
-        <>
-            {attributeDataList?.map((item, index) => (
-                <Card key={index} className="mb-4">
-                    <div className="flex flex-col justify-start gap-2 p-4">
-					<div className="flex justify-start text-xl font-semibold text-gray-900 dark:text-white mb-2">
-                            {`Credential ${index + 1}`}
-                        </div>
+	const mergedData = groupAndMergeAttributes(attributeDataList, 'credDefId');
 
+	return (
+		<>
+			{mergedData?.map((item, index) => (
+				<Card key={index} className="mb-4">
+					<div className="flex flex-col justify-start gap-2 p-4">
+						<div className="flex justify-start text-xl font-semibold text-gray-900 dark:text-white mb-2">
+							{`Credential ${index + 1}`}
+						</div>
 
-						{Object.entries(item).map(([key, value], idx) => (
-							<div key={idx} className="flex w-full text-lg items-center">
-								<div className="w-3/12 font-semibold text-primary-700 dark:bg-gray-800 m-1 p-1 flex justify-start items-center text-start">
-									{key}
+						<div className="flex h-full flex-col justify-center gap-0 sm:p-0 mb-4">
+							<div className="flex border-b">
+								<div className="w-5/12 font-semibold flex truncate md:pl-1 sm:mr-8 md:mr-0 text-primary-700 dark:bg-gray-800 text-lg">
+									Attributes
+								</div>
+								<div className="w-1/12 font-semibold flex justify-start truncate md:pl-1 sm:mr-8 md:mr-0 text-primary-700 dark:bg-gray-800 text-xl"></div>
+								<div className="w-6/12 font-semibold flex truncate sm:pl-4 text-primary-700 dark:bg-gray-800 text-lg">
+									{' '}
+									Values
 								</div>
-								<div className="flex items-center p-1 m-1">
-									:
+							</div>
+
+							{Object.entries(item)
+								.filter(([key]) => key !== 'credDefId' && key !== 'schemaId')
+								.map(([key, value], idx) => (
+									<div key={idx} className="flex w-full text-lg items-center">
+										<div className="w-3/12 font-semibold text-primary-700 dark:bg-gray-800 m-1 p-1 flex justify-start items-center text-start">
+
+											{key}
+										</div>
+										<div className="w-1/12 m-1 p-1 flex items-center text-gray-700 dark:text-white text-lg">
+											:
+										</div>
+										<div className="w-9/12 m-1 text-start text-gray-600 dark:text-white items-center cursor-pointer overflow-auto">
+											{value}
+										</div>
+									</div>
+								))}
+						</div>
+
+						<div className="">
+							<div className="flex w-full text-lg items-center">
+								<div className="w-3/12 font-semibold text-primary-700 dark:bg-gray-800 m-1 p-1 flex justify-start items-center text-start">
+									schemaId
 								</div>
+								<div className="flex items-center p-1 m-1">:</div>
 								<div className="w-9/12 m-1 text-start text-gray-600 dark:text-white items-center cursor-pointer overflow-auto">
-									{key === 'schemaId' || key === 'credDefId' ? (
+									<div className="flex items-center">
+										<CopyDid value={item.schemaId} className="truncate font-courier mt-2" />
+									</div>
+								</div>
+							</div>
+						</div>
+
+						{item.credDefId && (
+							<div className="mb-4">
+								<div className="flex w-full text-lg items-center">
+									<div className="w-3/12 font-semibold text-primary-700 dark:bg-gray-800 m-1 p-1 flex justify-start items-center text-start">
+										credDefId
+									</div>
+									<div className="flex items-center p-1 m-1">:</div>
+									<div className="w-9/12 m-1 text-start text-gray-600 dark:text-white items-center cursor-pointer overflow-auto">
 										<div className="flex items-center">
-											<CopyDid value={value} className="truncate font-courier mt-2" />
+											<CopyDid value={item.credDefId} className="truncate font-courier mt-2" />
 										</div>
-									) : (
-										<span className="truncate font-courier">{value}</span>
-									)}
+									</div>
 								</div>
 							</div>
-						))}
+						)}
 					</div>
 				</Card>
 			))}
-        </>
-    );
-}
+		</>
+	);
+};
 
 export default AttributesListData;
diff --git a/src/components/Verification/EmailCredDefSelection.tsx b/src/components/Verification/EmailCredDefSelection.tsx
index aeddbaaff..0448f4608 100644
--- a/src/components/Verification/EmailCredDefSelection.tsx
+++ b/src/components/Verification/EmailCredDefSelection.tsx
@@ -110,43 +110,42 @@ const EmailCredDefSelection = () => {
     };
 
     const selectConnection = async (credDefId: string, checked: boolean) => {
-        if (credDefId) {
-            const getRawCredDefs = await getFromLocalStorage(storageKeys.SCHEMA_CRED_DEFS);
-            const parsedRawCredDefs = JSON.parse(getRawCredDefs);
-
-            const selectedCredDef = parsedRawCredDefs.find((credDef: CredDefData) => credDef.credentialDefinitionId === credDefId);
-
-            if (selectedCredDef) {
-                setSelectedCredDefs((prevSelected) => {
+        if (!credDefId) return;
+    
+        const getRawCredDefs = await getFromLocalStorage(storageKeys.SCHEMA_CRED_DEFS);
+        const parsedRawCredDefs = JSON.parse(getRawCredDefs);
+    
+        const selectedCredDef = parsedRawCredDefs.find(
+            (credDef: CredDefData) => credDef.credentialDefinitionId === credDefId
+        );
+    
+        if (selectedCredDef) {
+            setSelectedCredDefs((prevSelected) => {
+                if (checked) {
                     const isAlreadySelected = prevSelected.some(
                         (credDef) => credDef.credentialDefinitionId === selectedCredDef.credentialDefinitionId
                     );
-
+    
                     if (!isAlreadySelected) {
                         const newSelected = [...prevSelected, selectedCredDef];
-                        
                         setToLocalStorage(storageKeys.CRED_DEF_DATA, JSON.stringify(newSelected));
-                        
                         return newSelected;
                     }
-                    return prevSelected;
-                });
-            }
-        } 
-        else if (!checked) {
-            setSelectedCredDefs((prevSelected) => {
-                const newSelected = prevSelected.filter(
-                    (credDef) => credDef.credentialDefinitionId !== credDefId
-                );
-                
-                setToLocalStorage(storageKeys.CRED_DEF_DATA, JSON.stringify(newSelected));
-                
-                return newSelected;
+                } else {
+                    const newSelected = prevSelected.filter(
+                        (credDef) => credDef.credentialDefinitionId !== selectedCredDef.credentialDefinitionId
+                    );
+                    setToLocalStorage(storageKeys.CRED_DEF_DATA, JSON.stringify(newSelected));
+                    return newSelected;
+                }
+    
+                return prevSelected;
             });
         }
     };
     
     
+    
     return (
         <div className="px-4 pt-2">
             <div className="mb-4 col-span-full xl:mb-2">
diff --git a/src/components/Verification/ProofRequestPopup.tsx b/src/components/Verification/ProofRequestPopup.tsx
index edcc9242b..ee1d207b4 100644
--- a/src/components/Verification/ProofRequestPopup.tsx
+++ b/src/components/Verification/ProofRequestPopup.tsx
@@ -87,21 +87,7 @@ const ProofRequest = (props: IProofRrquestDetails) => {
 								{' '}
 								Verification Details
 							</p>
-							{props.verifyLoading ? (
-								<div className="flex items-center justify-center m-4">
-									<CustomSpinner />
-								</div>
-							) : (
-								<div className=" text-gray-500 dark:text-gray-300 w-full">
-									<div className="mt-1 ">
-
-											<AttributesListData attributeDataList={props?.userData} />
-
-									</div>
-								</div>
-							)}
-						</div>
-						{succesMsg && (
+							{succesMsg && (
 							<div
 								className="p-4 mb-4 text-sm text-green-800 rounded-lg bg-green-100 border-green-500 dark:bg-green-200 dark:text-green-800"
 								role="alert"
@@ -118,6 +104,20 @@ const ProofRequest = (props: IProofRrquestDetails) => {
 							</div>
 						)}
 
+							{props.verifyLoading ? (
+								<div className="flex items-center justify-center m-4">
+									<CustomSpinner />
+								</div>
+							) : (
+								<div className=" text-gray-500 dark:text-gray-300 w-full">
+									<div className="mt-1 ">
+
+											<AttributesListData attributeDataList={props?.userData} />
+
+									</div>
+								</div>
+							)}
+						</div>
 						<div className="flex justify-center items-center space-x-4">
 							<button
 								onClick={() => {

From ac1358fb3cdd0548896535f74e26e8d5148f93c0 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Wed, 28 Aug 2024 17:33:41 +0530
Subject: [PATCH 08/19] fix: remove click on card

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/commonComponents/SchemaCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commonComponents/SchemaCard.tsx b/src/commonComponents/SchemaCard.tsx
index e00d582a2..7a10475c1 100644
--- a/src/commonComponents/SchemaCard.tsx
+++ b/src/commonComponents/SchemaCard.tsx
@@ -68,7 +68,7 @@ const handleCheckboxChange = (checked: boolean, schemaData?: ISchemaData) => {
   return (
     <Card onClick={() => {
 
-      if (!props.w3cSchema) {
+      if (!props.w3cSchema && !props.isVerificationUsingEmail) {
         props.onClickCallback(props.schemaId, props.attributes, props.issuerDid, props.created)
       }
 

From bc0f693e7a8c98f7b596e36a76ca3a278e4f1d7d Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Wed, 28 Aug 2024 17:57:52 +0530
Subject: [PATCH 09/19] fix: remove card click

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/commonComponents/SchemaCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commonComponents/SchemaCard.tsx b/src/commonComponents/SchemaCard.tsx
index 7a10475c1..e00d582a2 100644
--- a/src/commonComponents/SchemaCard.tsx
+++ b/src/commonComponents/SchemaCard.tsx
@@ -68,7 +68,7 @@ const handleCheckboxChange = (checked: boolean, schemaData?: ISchemaData) => {
   return (
     <Card onClick={() => {
 
-      if (!props.w3cSchema && !props.isVerificationUsingEmail) {
+      if (!props.w3cSchema) {
         props.onClickCallback(props.schemaId, props.attributes, props.issuerDid, props.created)
       }
 

From b7472e21f0bd0fcdecfbfa79bc12d9e959f543a1 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Wed, 28 Aug 2024 18:01:30 +0530
Subject: [PATCH 10/19] fix: cred def details

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/commonComponents/SchemaCard.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/commonComponents/SchemaCard.tsx b/src/commonComponents/SchemaCard.tsx
index 7a10475c1..e00d582a2 100644
--- a/src/commonComponents/SchemaCard.tsx
+++ b/src/commonComponents/SchemaCard.tsx
@@ -68,7 +68,7 @@ const handleCheckboxChange = (checked: boolean, schemaData?: ISchemaData) => {
   return (
     <Card onClick={() => {
 
-      if (!props.w3cSchema && !props.isVerificationUsingEmail) {
+      if (!props.w3cSchema) {
         props.onClickCallback(props.schemaId, props.attributes, props.issuerDid, props.created)
       }
 

From c2aa3edba06a0a8404c63915006ac80c2e290e44 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Thu, 29 Aug 2024 16:53:14 +0530
Subject: [PATCH 11/19] fix: schema card click issue

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 .../Verification/EmailVerification.tsx        |   1 +
 .../Verification/VerificationSchemasList.tsx  | 102 +++++++++---------
 2 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/src/components/Verification/EmailVerification.tsx b/src/components/Verification/EmailVerification.tsx
index e01ee3e1e..76c0924fb 100644
--- a/src/components/Verification/EmailVerification.tsx
+++ b/src/components/Verification/EmailVerification.tsx
@@ -178,6 +178,7 @@ const EmailVerification = () => {
 
                 payload = {
                     goalCode: "verification",
+                    reuseConnection: true,
                     protocolVersion: ProtocolVersion.V1,
                     isShortenUrl: true,
                     autoAcceptProof: AutoAccept.NEVER,
diff --git a/src/components/Verification/VerificationSchemasList.tsx b/src/components/Verification/VerificationSchemasList.tsx
index 298288dd6..35a3d25cc 100644
--- a/src/components/Verification/VerificationSchemasList.tsx
+++ b/src/components/Verification/VerificationSchemasList.tsx
@@ -7,7 +7,7 @@ import { checkEcosystem, type ICheckEcosystem } from '../../config/ecosystem';
 import { getFromLocalStorage, setToLocalStorage } from '../../api/Auth';
 import { apiStatusCodes, itemPerPage, storageKeys } from '../../config/CommonConstant';
 import { getAllSchemas, getAllSchemasByOrgId } from '../../api/Schema';
-import { DidMethod, SchemaType } from '../../common/enums';
+import { DidMethod, SchemaTypes } from '../../common/enums';
 import { getOrganizationById } from '../../api/organization';
 import { Create, SchemaEndorsement } from '../Issuance/Constant';
 import BreadCrumbs from '../BreadCrumbs';
@@ -40,24 +40,16 @@ const VerificationSchemasList = () => {
 	const [selectedSchemas, setSelectedSchemas] = useState<ISchema[]>([]);
 	const [w3cSchema, setW3cSchema] = useState<boolean>(false);
 	const [isNoLedger, setIsNoLedger] = useState<boolean>(false);
+	const [schemaType, setSchemaType] = useState('');
 
-	const getSchemaListDetails = async (
-		schemasListParameter: {
-			itemPerPage: number,
-			page: number,
-			search: string,
-			sortingOrder: string,
-			sortBy: string,
-			allSearch: string
-		},
-		flag: boolean,
-	) => {
+		const getSchemaListDetails = async () => {
+	
 		try {
 			const organizationId = await getFromLocalStorage(storageKeys.ORG_ID);
 			setLoading(true);
 			let schemasList;
-			if (allSchemasFlag) {
-				schemasList = await getAllSchemas(schemasListParameter, SchemaType.INDY);
+				if (allSchemasFlag) {
+				schemasList = await getAllSchemas(schemasListParameter, schemaType);
 			} else {
 				schemasList = await getAllSchemasByOrgId(
 					schemasListParameter,
@@ -99,33 +91,27 @@ const VerificationSchemasList = () => {
 	};
 
 	useEffect(() => {
-		getSchemaListDetails(schemasListParameter, false);
+		getSchemaListDetails();
 	}, [schemasListParameter, allSchemasFlag]);
 
-
 	const onSchemaListParameterSearch = async (
 		event: ChangeEvent<HTMLInputElement>,
 	): Promise<void> => {
 		event.preventDefault();
 		const inputValue = event.target.value;
 		setSearchValue(inputValue);
-
-		getSchemaListDetails(
-			{
-				...schemasListParameter,
-				search: inputValue,
-			},
-			false,
-		);
-
 		if (allSchemasFlag) {
-			getSchemaListDetails(
-				{
-					...schemasListParameter,
-					allSearch: inputValue,
-				},
-				false,
-			);
+			setSchemasListParameter(prevParams => ({
+				...prevParams,
+				allSearch: inputValue,
+				page: 1,
+			}));
+		} else {
+			setSchemasListParameter(prevParams => ({
+				...prevParams,
+				search: inputValue,
+				page: 1,
+			}));
 		}
 	};
 
@@ -134,6 +120,7 @@ const VerificationSchemasList = () => {
 		attributes: IAttributesDetails[],
 		issuerId: string,
 		created: string,
+		checked: boolean,
 	) => {
 		const schemaDetails = {
 			schemaId: schemaId,
@@ -141,18 +128,16 @@ const VerificationSchemasList = () => {
 			issuerId: issuerId,
 			createdDate: created,
 		};
-
-		const isSelected = selectedSchemas.some((schema) => schema.schemaId === schemaId);
-		if (isSelected) {
-			const updatedSchemas = selectedSchemas.filter((schema) => schema.schemaId !== schemaId);
-
-			setSelectedSchemas(updatedSchemas);
+	
+		if (checked) {
+			setSelectedSchemas((prevSelectedSchemas) => [...prevSelectedSchemas, schemaDetails]);
 		} else {
-			setSelectedSchemas([...selectedSchemas, schemaDetails]);
+			setSelectedSchemas((prevSelectedSchemas) =>
+				prevSelectedSchemas.filter((schema) => schema.schemaId !== schemaId)
+			);
 		}
 	};
 
-
 	const handleW3cSchemas = async (checked: boolean, schemaData?: ISchemaData) => {
 		const updateSchemas = (prevSchemas: ISchemaData[]) => {
 			let updatedSchemas = [...prevSchemas];
@@ -193,9 +178,11 @@ const VerificationSchemasList = () => {
 			}
 			if (did.includes(DidMethod.POLYGON) || did.includes(DidMethod.KEY) || did.includes(DidMethod.WEB)) {
 				setW3cSchema(true);
+				setSchemaType(SchemaTypes.schema_W3C)
 			}
 			if (did.includes(DidMethod.INDY)) {
 				setW3cSchema(false);
+				setSchemaType(SchemaTypes.schema_INDY)
 			}
 			if (did.includes(DidMethod.KEY) || did.includes(DidMethod.WEB)) {
 				setIsNoLedger(true);
@@ -235,15 +222,19 @@ const VerificationSchemasList = () => {
 
 	const options = ['All schemas'];
 
-	const handleFilter = (e: React.ChangeEvent<HTMLSelectElement>) => {
-		if (e.target.value === 'All schemas') {
-			setAllSchemasFlag(true);
-		} else {
-			setAllSchemasFlag(false);
-			getSchemaListDetails(schemasListParameter, false);
-		}
-	};
-
+	const handleFilter = async (e: React.ChangeEvent<HTMLSelectElement>) => {
+		const selectedFilter = e.target.value;
+		setAllSchemasFlag(selectedFilter === 'All schemas');
+			
+			setSchemasListParameter((prevParams) => ({
+				...prevParams,
+				page: 1,
+				search: '', 
+				allSearch: '', 	  
+			}));
+			setSearchValue(''); 
+
+	};	
 	useEffect(() => {
 		fetchOrganizationDetails();
 		(async () => {
@@ -346,8 +337,17 @@ const VerificationSchemasList = () => {
 											w3cSchema={w3cSchema}
 											noLedger={isNoLedger}
 											isVerificationUsingEmail={true}
-											onChange={(checked) => handleW3cSchemas(checked, element)}
-											onClickCallback={handleSchemaSelection}
+											onChange={(checked) => {
+												w3cSchema 
+													? handleW3cSchemas(checked, element) 
+													: handleSchemaSelection(
+														  element['schemaLedgerId'], 
+														  element['attributes'], 
+														  element['issuerId'], 
+														  element['createDateTime'], 
+														  checked
+													  );
+											}}										
 										/>
 									</div>
 								))}

From 014a3c9d43705128e245f7f95098f7e3bc684638 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Thu, 29 Aug 2024 20:07:50 +0530
Subject: [PATCH 12/19] fix: schema name is not visible in credentials list

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/Issuance/IssuedCrdentials.tsx | 5 ++---
 src/components/Issuance/interface.ts         | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/Issuance/IssuedCrdentials.tsx b/src/components/Issuance/IssuedCrdentials.tsx
index 361fda30d..b09fb0ce4 100644
--- a/src/components/Issuance/IssuedCrdentials.tsx
+++ b/src/components/Issuance/IssuedCrdentials.tsx
@@ -73,9 +73,8 @@ const CredentialList = () => {
 					});
 					const credentialList = data?.data?.data?.map(
 						(issuedCredential: IssuedCredential) => {
-							const schemaName = issuedCredential.schemaId
-								? issuedCredential.schemaId.split(':').slice(2).join(':')
-								: 'Not available';
+								
+							const schemaName = issuedCredential?.schemaName ?? 'Not available';
 							return {
 								data: [
 									{
diff --git a/src/components/Issuance/interface.ts b/src/components/Issuance/interface.ts
index fe161edc9..ba2f27521 100644
--- a/src/components/Issuance/interface.ts
+++ b/src/components/Issuance/interface.ts
@@ -55,6 +55,7 @@ export interface IssuedCredential {
 	state: string;
 	isRevocable: boolean;
 	schemaId: string;
+	schemaName: string;
 }
 
 export interface IProps {

From 05f514268c8122db05e7f7cc3354b8499cd21be7 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Tue, 3 Sep 2024 17:09:28 +0530
Subject: [PATCH 13/19] feat: applied search filter in issuance dropdown

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/Issuance/BulkIssuance.tsx  | 73 +++++++++++++++--------
 src/components/Issuance/EmailIssuance.tsx | 72 +++++++++++++---------
 2 files changed, 92 insertions(+), 53 deletions(-)

diff --git a/src/components/Issuance/BulkIssuance.tsx b/src/components/Issuance/BulkIssuance.tsx
index b6a9210ca..8f4ecba49 100644
--- a/src/components/Issuance/BulkIssuance.tsx
+++ b/src/components/Issuance/BulkIssuance.tsx
@@ -133,38 +133,59 @@ const BulkIssuance = () => {
 			}
 			else if (currentSchemaType === SchemaTypes.schema_W3C && orgId && isAllSchema) {
 
-				
-				const response = await getAllSchemas(schemaListAPIParameters,currentSchemaType); 
+				let allSchemas: ICredentials[] = [];
+				let totalItems = 0;
+				let response;
+			
+				for (let currentPage = 1; ; currentPage++) {
+					response = await getAllSchemas({
+						...schemaListAPIParameters,
+						page: currentPage,
+					}, currentSchemaType);
+			
 					const { data } = response as AxiosResponse;
-					
-
+			
 					if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-						const  credentialDefsData = data.data.data;
-						
-
-						const options =  credentialDefsData.map(({
-							name,
-							version,
-							schemaLedgerId,
-							attributes,
-							type
-						} : ICredentials) => ({
-							value:  version,
-							label: `${name} [${version}]`,
-							schemaName: name,
-							type:type,
-							schemaVersion: version,
-							schemaIdentifier: schemaLedgerId,
-							attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
-						}));	
-					 setCredentialOptionsData(options);
+						const credentialDefs = data.data.data;
+						totalItems = data.data.totalItems;
+						allSchemas = [...allSchemas, ...credentialDefs];
+			
+						if (allSchemas.length >= totalItems) {
+							break;
+						}
+					} else {
+						setSuccess(null);
+						setFailure(null);
+						break;
+					}
+				}
+			
+				if (allSchemas.length > 0) {
+					const options = allSchemas.map(({
+						name,
+						version,
+						schemaLedgerId,
+						attributes,
+						type
+					} : ICredentials) => ({
+						value: version,
+						label: `${name} [${version}]`,
+						schemaName: name,
+						type: type,
+						schemaVersion: version,
+						schemaIdentifier: schemaLedgerId,
+						attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
+					}));
+					setCredentialOptionsData(options);
 				} else {
-					setUploadMessage({message: response as string, type: "failure"});
-					setSuccess(null)
-					setFailure(null)
+					setUploadMessage({ message: response as string, type: "failure" });
+					setSuccess(null);
+					setFailure(null);
 				}
+			
 				setLoading(false);
 			}
+			
 		} catch (error) {
 			setUploadMessage({message: error as string, type: "failure"});
 			setSuccess(null)
diff --git a/src/components/Issuance/EmailIssuance.tsx b/src/components/Issuance/EmailIssuance.tsx
index 08e366944..6f2d1d004 100644
--- a/src/components/Issuance/EmailIssuance.tsx
+++ b/src/components/Issuance/EmailIssuance.tsx
@@ -132,38 +132,56 @@ const EmailIssuance = () => {
 						setLoading(false);
 				}
 			    	
-			  else if (currentSchemaType === SchemaTypes.schema_W3C && orgId && allSchemaSelectedFlag) {
-					const  response = await getAllSchemas(schemaListAPIParameter,currentSchemaType); 
-					const { data } = response as AxiosResponse;
-					
-					if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-					const credentialDefs = data.data.data;
-					
-					const options = credentialDefs.map(({
-						name,
-						version,
-						schemaLedgerId,
-						attributes,
-						type
-					} : ICredentials) => ({
-						value:  version,
-						label: `${name} [${version}]`,
-						schemaName: name,
-						type:type,
-						schemaVersion: version,
-						schemaIdentifier: schemaLedgerId,
-						attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
-					}));										
-					setCredentialOptions(options);
-	
-							
+				else if ((currentSchemaType === SchemaTypes.schema_W3C) && (orgId) && (allSchemaSelectedFlag)) {
+					let allSchemas: ICredentials[] = [];
+					let totalItems = 0;
+					let response;
+
+					for (let currentPage = 1; ; currentPage++) {
+						response = await getAllSchemas({
+							...schemaListAPIParameter,
+							page: currentPage,
+						}, currentSchemaType);
+
+						const { data } = response as AxiosResponse;
+
+						if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
+							const credentialDefs = data.data.data;
+							totalItems = data.data.totalItems;
+							allSchemas = [...allSchemas, ...credentialDefs];
+
+							if (allSchemas.length >= totalItems) {
+								break;
+							}
 						} else {
 							setSuccess(null);
 							setFailure(null);
+							break;
 						}
-						setLoading(false);
 					}
-					
+		
+					if (allSchemas.length > 0) {
+						const options = allSchemas.map(({
+							name,
+							version,
+							schemaLedgerId,
+							attributes,
+							type
+						}: ICredentials) => ({
+							value: version,
+							label: `${name} [${version}]`,
+							schemaName: name,
+							type: type,
+							schemaVersion: version,
+							schemaIdentifier: schemaLedgerId,
+							attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
+						}));
+		
+						setCredentialOptions(options);
+					}
+		
+					setLoading(false);
+				}					
 					} catch (error) {
 						setSuccess(null);
 						setFailure(null);

From 03bf24ce3f80a69a1c10a30a24105ec9d783b03c Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Tue, 3 Sep 2024 17:23:21 +0530
Subject: [PATCH 14/19] fix: resolved sonarlint checks

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/Issuance/BulkIssuance.tsx | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/Issuance/BulkIssuance.tsx b/src/components/Issuance/BulkIssuance.tsx
index 50b878f2f..47377b08b 100644
--- a/src/components/Issuance/BulkIssuance.tsx
+++ b/src/components/Issuance/BulkIssuance.tsx
@@ -133,7 +133,7 @@ const BulkIssuance = () => {
 			}
 			else if (currentSchemaType === SchemaTypes.schema_W3C && orgId && isAllSchema) {
 
-				let allSchemas: ICredentials[] = [];
+				let platformSchemas: ICredentials[] = [];
 				let totalItems = 0;
 				let response;
 			
@@ -148,9 +148,9 @@ const BulkIssuance = () => {
 					if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 						const credentialDefs = data.data.data;
 						totalItems = data.data.totalItems;
-						allSchemas = [...allSchemas, ...credentialDefs];
+						platformSchemas = [...platformSchemas, ...credentialDefs];
 			
-						if (allSchemas.length >= totalItems) {
+						if (platformSchemas.length >= totalItems) {
 							break;
 						}
 					} else {
@@ -160,8 +160,8 @@ const BulkIssuance = () => {
 					}
 				}
 			
-				if (allSchemas.length > 0) {
-					const options = allSchemas.map(({
+				if (platformSchemas.length > 0) {
+					const optionsData = platformSchemas.map(({
 						name,
 						version,
 						schemaLedgerId,
@@ -176,7 +176,7 @@ const BulkIssuance = () => {
 						schemaIdentifier: schemaLedgerId,
 						attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
 					}));
-					setCredentialOptionsData(options);
+					setCredentialOptionsData(optionsData);
 				} else {
 					setUploadMessage({ message: response as string, type: "failure" });
 					setSuccess(null);

From 3e6d71fca38d06048cddaefd29ad084f4cc0bd0d Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Tue, 3 Sep 2024 17:30:11 +0530
Subject: [PATCH 15/19] fix: resolved sonarcloud issues

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/Issuance/EmailIssuance.tsx | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/components/Issuance/EmailIssuance.tsx b/src/components/Issuance/EmailIssuance.tsx
index 4c0a73d69..90ba184f1 100644
--- a/src/components/Issuance/EmailIssuance.tsx
+++ b/src/components/Issuance/EmailIssuance.tsx
@@ -136,7 +136,7 @@ const EmailIssuance = () => {
 			    
 				//FIXME:  Logic of API call as per schema selection
 			else if ((currentSchemaType === SchemaTypes.schema_W3C) && (orgId) && (allSchemaSelectedFlag)) {
-				let allSchemas: ICredentials[] = [];
+				let allSchemaList: ICredentials[] = [];
 				let totalItems = 0;
 				let response;
 
@@ -151,13 +151,13 @@ const EmailIssuance = () => {
 					if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 						const credentialDefs = data.data.data;
 						totalItems = data.data.totalItems;
-						allSchemas = [...allSchemas, ...credentialDefs];
+						allSchemaList = [...allSchemaList, ...credentialDefs];
 
-						if (allSchemas.length >= totalItems) {
+						if (allSchemaList.length >= totalItems) {
 							break;
 						}
 
-						const options = allSchemas.map(({
+						const dropDownOptions = allSchemaList.map(({
 							name,
 							version,
 							schemaLedgerId,
@@ -172,7 +172,7 @@ const EmailIssuance = () => {
 							schemaIdentifier: schemaLedgerId,
 							attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
 						}));
-						setCredentialOptions(options);
+						setCredentialOptions(dropDownOptions);
 
 
 					} else {
@@ -182,8 +182,8 @@ const EmailIssuance = () => {
 					}
 				}
 
-				if (allSchemas.length > 0) {
-					const options = allSchemas.map(({
+				if (allSchemaList.length > 0) {
+					const dropDownOptions = allSchemaList.map(({
 						name,
 						version,
 						schemaLedgerId,
@@ -199,7 +199,7 @@ const EmailIssuance = () => {
 						attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
 					}));
 
-					setCredentialOptions(options);
+					setCredentialOptions(dropDownOptions);
 				}
 
 				setLoading(false);

From d0e13a676d9f08fc98a823cf80d673f4502fe120 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Wed, 4 Sep 2024 17:29:03 +0530
Subject: [PATCH 16/19] refactor: serach functionality

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/Issuance/EmailIssuance.tsx | 185 ++++++++++------------
 src/components/Issuance/interface.ts      |   2 +-
 2 files changed, 81 insertions(+), 106 deletions(-)

diff --git a/src/components/Issuance/EmailIssuance.tsx b/src/components/Issuance/EmailIssuance.tsx
index 90ba184f1..c0258be07 100644
--- a/src/components/Issuance/EmailIssuance.tsx
+++ b/src/components/Issuance/EmailIssuance.tsx
@@ -5,7 +5,7 @@ import { pathRoutes } from '../../config/pathRoutes';
 import BreadCrumbs from '../BreadCrumbs';
 import BackButton from '../../commonComponents/backbutton';
 import { Button, Card } from 'flowbite-react';
-import Select from 'react-select';
+import Select, { type SingleValue } from 'react-select';
 import { AlertComponent } from '../AlertComponent';
 import IssuancePopup from './IssuancePopup';
 import type { AxiosResponse } from 'axios';
@@ -61,59 +61,71 @@ const EmailIssuance = () => {
 	const [schemasIdentifier, setSchemasIdentifier] = useState<string>();
 	const [schemaTypeValue, setSchemaTypeValue] = useState<SchemaTypeValue>();
 	const [isAllSchemaFlagSelected, setIsAllSchemaFlagSelected] = useState<boolean>();
-
-	const getSchemaCredentials = async (schemaListAPIParameter: GetAllSchemaListParameter) => {
+	const [searchValue, setSearchValue] = useState('');
+
+	const handleInputChange = (inputValue: string) => {
+		setSearchValue(inputValue); 
+		setSchemaListAPIParameter(prevParams => {
+			const updatedParams = {
+				...prevParams,
+				allSearch: inputValue,
+			};
+			getSchemaCredentials(updatedParams);
+			return updatedParams;
+		});
+	};
 		
+	const getSchemaCredentials = async (schemaListAPIParameter: GetAllSchemaListParameter) => {
+
 		try {
 			setLoading(true);
 			const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
 			const orgDid = await getFromLocalStorage(storageKeys.ORG_DID);
 
 			const allSchemaSelectedFlag = await getFromLocalStorage(storageKeys.ALL_SCHEMAS)
-			if(allSchemaSelectedFlag === `false` || !allSchemaSelectedFlag){		
+			if (allSchemaSelectedFlag === `false` || !allSchemaSelectedFlag) {
 				setIsAllSchemaFlagSelected(false)
 			}
-			else if(allSchemaSelectedFlag ==='true'){
-			setIsAllSchemaFlagSelected(true)
-	
+			else if (allSchemaSelectedFlag === 'true') {
+				setIsAllSchemaFlagSelected(true)
 			}
 			let currentSchemaType = schemaType;
-	
 			if (orgDid?.includes(DidMethod.POLYGON)) {
 				currentSchemaType = SchemaTypes.schema_W3C;
 				setSchemaTypeValue(SchemaTypeValue.POLYGON)
 				setCredentialType(CredentialType.JSONLD)
-				
-			} else if ( orgDid?.includes(DidMethod.KEY) || orgDid?.includes(DidMethod.WEB)) {
+
+			} else if (orgDid?.includes(DidMethod.KEY) || orgDid?.includes(DidMethod.WEB)) {
 				currentSchemaType = SchemaTypes.schema_W3C;
 				setSchemaTypeValue(SchemaTypeValue.NO_LEDGER)
 
 				setCredentialType(CredentialType.JSONLD)
 			}
-				else if (orgDid?.includes(DidMethod.INDY)) {
+			else if (orgDid?.includes(DidMethod.INDY)) {
 				setCredentialType(CredentialType.INDY)
 				currentSchemaType = SchemaTypes.schema_INDY;
 			}
-			setSchemaType(currentSchemaType); 
+			setSchemaType(currentSchemaType);
 
-			//FIXME:  Logic of API call as per schema selection
-				if((currentSchemaType === SchemaTypes.schema_INDY && orgId && isAllSchemaFlagSelected ) || (currentSchemaType && !isAllSchemaFlagSelected)){
+			let options;
 
-					const response = await getSchemaCredDef(currentSchemaType); 
-					const { data } = response as AxiosResponse;
-	
-					if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
+			//FIXME:  Logic of API call as per schema selection
+			if((currentSchemaType === SchemaTypes.schema_INDY && orgId 
+			 ) || (currentSchemaType ===SchemaTypes.schema_W3C && isAllSchemaFlagSelected === false)){
+				const response = await getSchemaCredDef(currentSchemaType);
+				const { data } = response as AxiosResponse;
+				if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 					const credentialDefs = data.data;
-					
-					const options = credentialDefs.map(({
+
+					options = credentialDefs.map(({
 						schemaName,
 						schemaVersion,
 						credentialDefinition,
 						credentialDefinitionId,
 						schemaIdentifier,
 						schemaAttributes
-					} : ICredentials) => ({
-						value: schemaType===SchemaTypes.schema_INDY ? credentialDefinitionId : schemaVersion,
+					}: ICredentials) => ({
+						value: schemaType === SchemaTypes.schema_INDY ? credentialDefinitionId : schemaVersion,
 						label: `${schemaName} [${schemaVersion}]${currentSchemaType === SchemaTypes.schema_INDY ? ` - (${credentialDefinition})` : ''}`,
 						schemaName: schemaName,
 						schemaVersion: schemaVersion,
@@ -125,65 +137,23 @@ const EmailIssuance = () => {
 							typeof schemaAttributes === 'string' &&
 							JSON.parse(schemaAttributes),
 					}));
-	
-					setCredentialOptions(options);			
-						} else {
-							setSuccess(null);
-							setFailure(null);
-						}
-						setLoading(false);
-				}
-			    
-				//FIXME:  Logic of API call as per schema selection
-			else if ((currentSchemaType === SchemaTypes.schema_W3C) && (orgId) && (allSchemaSelectedFlag)) {
-				let allSchemaList: ICredentials[] = [];
-				let totalItems = 0;
-				let response;
 
-				for (let currentPage = 1; ; currentPage++) {
-					response = await getAllSchemas({
-						...schemaListAPIParameter,
-						page: currentPage,
-					}, currentSchemaType);
-
-					const { data } = response as AxiosResponse;
-
-					if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-						const credentialDefs = data.data.data;
-						totalItems = data.data.totalItems;
-						allSchemaList = [...allSchemaList, ...credentialDefs];
-
-						if (allSchemaList.length >= totalItems) {
-							break;
-						}
-
-						const dropDownOptions = allSchemaList.map(({
-							name,
-							version,
-							schemaLedgerId,
-							attributes,
-							type
-						}: ICredentials) => ({
-							value: version,
-							label: `${name} [${version}]`,
-							schemaName: name,
-							type: type,
-							schemaVersion: version,
-							schemaIdentifier: schemaLedgerId,
-							attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
-						}));
-						setCredentialOptions(dropDownOptions);
-
-
-					} else {
-						setSuccess(null);
-						setFailure(null);
-						break;
-					}
+					setCredentialOptions(options);
+				} else {
+					setSuccess(null);
+					setFailure(null);
 				}
+				setLoading(false);
+			}
+			
+			//FIXME:  Logic of API call as per schema selection
+			else if ((currentSchemaType === SchemaTypes.schema_W3C) && (orgId) && (allSchemaSelectedFlag)) {
+				const response = await getAllSchemas(schemaListAPIParameter, currentSchemaType);
+				const { data } = response as AxiosResponse;
 
-				if (allSchemaList.length > 0) {
-					const dropDownOptions = allSchemaList.map(({
+				if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
+					const credentialDefs = data.data.data;
+					options = credentialDefs.map(({
 						name,
 						version,
 						schemaLedgerId,
@@ -198,17 +168,36 @@ const EmailIssuance = () => {
 						schemaIdentifier: schemaLedgerId,
 						attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
 					}));
-
-					setCredentialOptions(dropDownOptions);
+					setCredentialOptions(options);
+				} else {
+					setSuccess(null);
+					setFailure(null);
 				}
-
 				setLoading(false);
-			}					
-					} catch (error) {
-						setSuccess(null);
-						setFailure(null);
-					}
-				};
+			}
+
+
+			setCredentialOptions(options);
+		} catch (error) {
+			setSuccess(null);
+			setFailure(null);
+		}
+	};
+
+
+	const handleSelectChange = (newValue: SingleValue<ICredentials> | null) => {
+		const value = newValue as ICredentials | null;
+		setBatchName(value?.label ?? '');
+		if (schemaType === SchemaTypes.schema_INDY) {
+			setCredDefId(value?.credentialDefinitionId);
+			setCredentialSelected(value ?? null);
+		} else if (schemaType === SchemaTypes.schema_W3C) {
+			setCredentialSelected(value ?? null);
+			setSchemasIdentifier(value?.schemaIdentifier);
+		}
+		setAttributes(value?.schemaAttributes ?? value?.attributes ?? []);
+	};
+
 
 				useEffect(() => {
 						
@@ -443,25 +432,11 @@ const EmailIssuance = () => {
 											isSearchable={true}
 											id="long-value-select"
 											instanceId="long-value-select"
-
 											name="color"
 											options={credentialOptions}
-												onChange={(value: ICredentials | null) => {
-													setBatchName(value?.label ?? '');
-													 
-												if (schemaType === SchemaTypes.schema_INDY) {
-													
-													setCredDefId(value?.credentialDefinitionId);
-													setCredentialSelected(value ?? null);
-												} else if (schemaType === SchemaTypes.schema_W3C) {
-
-													setCredentialSelected(value ?? null);
-													setSchemasIdentifier(value?.schemaIdentifier)
-												}
-												
-												setAttributes(value?.schemaAttributes ?? value?.attributes ?? []);
-
-												}}
+											onInputChange={handleInputChange}
+											onChange={handleSelectChange}
+											value={credentialOptions.find(option => option.value === searchValue)}
 											ref={selectInputRef}
 										/>
 										:
@@ -1017,4 +992,4 @@ const EmailIssuance = () => {
 	);
 };
 
-export default EmailIssuance;
+export default EmailIssuance;
\ No newline at end of file
diff --git a/src/components/Issuance/interface.ts b/src/components/Issuance/interface.ts
index ba2f27521..f7173d272 100644
--- a/src/components/Issuance/interface.ts
+++ b/src/components/Issuance/interface.ts
@@ -35,7 +35,7 @@ export interface ICredentials {
 	value?:String;
 	label?: string;
 	credentialDefinitionId?: string;
-	schemaCredDefName: string;
+	schemaCredDefName?: string;
 	schemaName: string;
 	schemaVersion: string;
 	schemaIdentifier: string;

From 45d6be3345257a3a94205bdefdf83ad0073c2667 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Wed, 4 Sep 2024 18:23:29 +0530
Subject: [PATCH 17/19] refactor: search functionality for bulk issuance
 dropdown

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/Issuance/BulkIssuance.tsx | 124 ++++++++++++-----------
 1 file changed, 63 insertions(+), 61 deletions(-)

diff --git a/src/components/Issuance/BulkIssuance.tsx b/src/components/Issuance/BulkIssuance.tsx
index 47377b08b..cd92a1d5e 100644
--- a/src/components/Issuance/BulkIssuance.tsx
+++ b/src/components/Issuance/BulkIssuance.tsx
@@ -1,6 +1,6 @@
 import { Button, Card, Pagination } from 'flowbite-react';
 import React, { useEffect, useState } from 'react';
-import Select from 'react-select';
+import Select, { type ActionMeta, type SingleValue } from 'react-select';
 import {
 	DownloadCsvTemplate, getSchemaCredDef, getCsvFileData,
 	issueBulkCredential,
@@ -72,6 +72,20 @@ const BulkIssuance = () => {
 	};
 	const [currentPage, setCurrentPage] = useState(initialPageState);
 
+	const [searchValue, setSearchValue] = useState('');
+
+	const onInputChange = (inputValue: string) => {
+		setSearchValue(inputValue); 
+		setSchemaListAPIParameters(prevParams => {
+			const updatedParams = {
+				...prevParams,
+				allSearch: inputValue,
+			};
+			getSchemaCredentials(updatedParams);
+			return updatedParams;
+		});
+	};
+
 	const getSchemaCredentials = async (schemaListAPIParameters: GetAllSchemaListParameter) => {
 		try {
 			setLoading(true);
@@ -95,6 +109,7 @@ const BulkIssuance = () => {
 				currentSchemaType = SchemaTypes.schema_INDY;
 			}
 
+			let dropDownOptions;
 			setSchemaType(currentSchemaType); 
 			if ((currentSchemaType === SchemaTypes.schema_INDY &&  isAllSchema) || (currentSchemaType && orgId && !isAllSchema)) {
 				const response = await getSchemaCredDef(currentSchemaType); 
@@ -103,7 +118,7 @@ const BulkIssuance = () => {
 				if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
 					const { data:  credentialDefsData } = data;
 
-					const options =  credentialDefsData.map(
+					dropDownOptions =  credentialDefsData.map(
 						({
 							schemaName,
 							schemaVersion,
@@ -123,7 +138,7 @@ const BulkIssuance = () => {
 						}),
 					);
 					
-					 setCredentialOptionsData(options);
+					 setCredentialOptionsData(dropDownOptions);
 				} else {
 					setUploadMessage({message: response as string, type: "failure"});
 					setSuccess(null)
@@ -133,66 +148,59 @@ const BulkIssuance = () => {
 			}
 			else if (currentSchemaType === SchemaTypes.schema_W3C && orgId && isAllSchema) {
 
-				let platformSchemas: ICredentials[] = [];
-				let totalItems = 0;
-				let response;
-			
-				for (let currentPage = 1; ; currentPage++) {
-					response = await getAllSchemas({
-						...schemaListAPIParameters,
-						page: currentPage,
-					}, currentSchemaType);
-			
+				
+				const response = await getAllSchemas(schemaListAPIParameters,currentSchemaType); 
 					const { data } = response as AxiosResponse;
-			
+					
+
 					if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-						const credentialDefs = data.data.data;
-						totalItems = data.data.totalItems;
-						platformSchemas = [...platformSchemas, ...credentialDefs];
-			
-						if (platformSchemas.length >= totalItems) {
-							break;
-						}
-					} else {
-						setSuccess(null);
-						setFailure(null);
-						break;
-					}
-				}
-			
-				if (platformSchemas.length > 0) {
-					const optionsData = platformSchemas.map(({
-						name,
-						version,
-						schemaLedgerId,
-						attributes,
-						type
-					} : ICredentials) => ({
-						value: version,
-						label: `${name} [${version}]`,
-						schemaName: name,
-						type: type,
-						schemaVersion: version,
-						schemaIdentifier: schemaLedgerId,
-						attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
-					}));
-					setCredentialOptionsData(optionsData);
+						const  credentialDefsData = data.data.data;
+						
+
+						dropDownOptions =  credentialDefsData.map(({
+							name,
+							version,
+							schemaLedgerId,
+							attributes,
+							type
+						} : ICredentials) => ({
+							value:  version,
+							label: `${name} [${version}]`,
+							schemaName: name,
+							type:type,
+							schemaVersion: version,
+							schemaIdentifier: schemaLedgerId,
+							attributes: Array.isArray(attributes) ? attributes : (attributes ? JSON.parse(attributes) : []),
+						}));	
+					 setCredentialOptionsData(dropDownOptions);
 				} else {
-					setUploadMessage({ message: response as string, type: "failure" });
-					setSuccess(null);
-					setFailure(null);
+					setUploadMessage({message: response as string, type: "failure"});
+					setSuccess(null)
+					setFailure(null)
 				}
-			
 				setLoading(false);
 			}
-			
 		} catch (error) {
-			setUploadMessage({message: error as string, type: "failure"});
+			// setUploadMessage({message: error as string, type: "failure"});
+			setUploadMessage({ message: (error as Error).message, type: "failure" });
 			setSuccess(null)
 			setFailure(null)
 		}
 	};
 
+
+	const onSelectChange = (newValue: SingleValue<ICredentials | undefined>, actionMeta: ActionMeta<ICredentials | undefined>) => {
+		const value = newValue as ICredentials | undefined;
+		if (schemaType === SchemaTypes.schema_INDY) {
+			setSelectedTemplate(value?.credentialDefinitionId);
+			setCredentialSelected(value ?? null);
+		} else if (schemaType === SchemaTypes.schema_W3C) {
+			setCredentialSelected(value ?? null);
+			setSelectedTemplate(value?.schemaIdentifier)
+		}
+	};
+
+
 	useEffect(() => {
 		getSchemaCredentials(schemaListAPIParameters);
 	}, [isAllSchema]);
@@ -607,15 +615,9 @@ const BulkIssuance = () => {
 											isSearchable={true}
 											name="color"
 											options={ credentialOptionsData}
-											onChange={(value: ICredentials | null) => {
-												if (schemaType === SchemaTypes.schema_INDY) {
-													setSelectedTemplate(value?.credentialDefinitionId);
-													setCredentialSelected(value ?? null);
-												} else if (schemaType === SchemaTypes.schema_W3C) {
-													setCredentialSelected(value ?? null);
-													setSelectedTemplate(value?.schemaIdentifier)
-												}
-											}}
+											onInputChange={onInputChange}
+											onChange={onSelectChange}
+											value={credentialOptionsData.find(option => option.value === searchValue)}
 											ref={selectInputRef}
 										/>:
 										null
@@ -980,4 +982,4 @@ const BulkIssuance = () => {
 	);
 };
 
-export default BulkIssuance;
+export default BulkIssuance;
\ No newline at end of file

From d760e92cd84f82611ba8ea61255f0351605645ac Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Wed, 4 Sep 2024 18:44:32 +0530
Subject: [PATCH 18/19] fix: remove unnecessary code

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/Issuance/BulkIssuance.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/Issuance/BulkIssuance.tsx b/src/components/Issuance/BulkIssuance.tsx
index cd92a1d5e..4d3782ec1 100644
--- a/src/components/Issuance/BulkIssuance.tsx
+++ b/src/components/Issuance/BulkIssuance.tsx
@@ -181,7 +181,6 @@ const BulkIssuance = () => {
 				setLoading(false);
 			}
 		} catch (error) {
-			// setUploadMessage({message: error as string, type: "failure"});
 			setUploadMessage({ message: (error as Error).message, type: "failure" });
 			setSuccess(null)
 			setFailure(null)
@@ -189,7 +188,7 @@ const BulkIssuance = () => {
 	};
 
 
-	const onSelectChange = (newValue: SingleValue<ICredentials | undefined>, actionMeta: ActionMeta<ICredentials | undefined>) => {
+	const onSelectChange = (newValue: SingleValue<ICredentials | undefined>) => {
 		const value = newValue as ICredentials | undefined;
 		if (schemaType === SchemaTypes.schema_INDY) {
 			setSelectedTemplate(value?.credentialDefinitionId);

From a18d58ef1264e198a0c11ae35ec6d4e112ba8215 Mon Sep 17 00:00:00 2001
From: bhavanakarwade <bhavana.karwade@ayanworks.com>
Date: Wed, 4 Sep 2024 18:51:10 +0530
Subject: [PATCH 19/19] fix: remove unnecessary import

Signed-off-by: bhavanakarwade <bhavana.karwade@ayanworks.com>
---
 src/components/Issuance/BulkIssuance.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Issuance/BulkIssuance.tsx b/src/components/Issuance/BulkIssuance.tsx
index 4d3782ec1..b9129abba 100644
--- a/src/components/Issuance/BulkIssuance.tsx
+++ b/src/components/Issuance/BulkIssuance.tsx
@@ -1,6 +1,6 @@
 import { Button, Card, Pagination } from 'flowbite-react';
 import React, { useEffect, useState } from 'react';
-import Select, { type ActionMeta, type SingleValue } from 'react-select';
+import Select, { type SingleValue } from 'react-select';
 import {
 	DownloadCsvTemplate, getSchemaCredDef, getCsvFileData,
 	issueBulkCredential,