diff --git a/src/components/Resources/Schema/SchemasList.tsx b/src/components/Resources/Schema/SchemasList.tsx
index 0c3760db6..bc1f9cfb6 100644
--- a/src/components/Resources/Schema/SchemasList.tsx
+++ b/src/components/Resources/Schema/SchemasList.tsx
@@ -23,7 +23,7 @@ import { checkEcosystem } from '../../../config/ecosystem';
 import type { ICheckEcosystem } from '../../../config/ecosystem';
 
 import { Create, SchemaEndorsement } from '../../Issuance/Constant';
-import { DidMethod, SchemaType } from '../../../common/enums';
+import { DidMethod, SchemaType, SchemaTypes } from '../../../common/enums';
 
 const SchemaList = (props: {
 		schemaSelectionCallback: (
@@ -57,6 +57,8 @@ const SchemaList = (props: {
 	const [totalItem, setTotalItem] = useState(0);
 	const [isEcosystemData, setIsEcosystemData] = useState<ICheckEcosystem>();
 	const [searchValue, setSearchValue] = useState('');
+	const [schemaType, setSchemaType] = useState('');
+
 	const [w3cSchema,setW3CSchema]= useState<boolean>(false);
 	const [isNoLedger,setisNoLedger]= useState<boolean>(false);	
 
@@ -70,7 +72,7 @@ const SchemaList = (props: {
 			setLoading(true);
 			let schemaList;
 			if (allSchemaFlag) {
-				schemaList = await getAllSchemas(schemaListAPIParameter, SchemaType.INDY);
+				schemaList = await getAllSchemas(schemaListAPIParameter, schemaType);
 			} else {
 				schemaList = await getAllSchemasByOrgId(
 					schemaListAPIParameter,
@@ -229,9 +231,11 @@ const SchemaList = (props: {
 			}
 			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);
diff --git a/src/components/organization/walletCommonComponents/DedicatedAgent.tsx b/src/components/organization/walletCommonComponents/DedicatedAgent.tsx
index 60817dcfe..f1c0b7369 100644
--- a/src/components/organization/walletCommonComponents/DedicatedAgent.tsx
+++ b/src/components/organization/walletCommonComponents/DedicatedAgent.tsx
@@ -19,6 +19,7 @@ import SetDomainValueInput from './SetDomainValueInput';
 import SetPrivateKeyValueInput from './SetPrivateKeyValue';
 import { getOrganizationById, setAgentConfigDetails } from '../../../api/organization';
 import type { IDedicatedAgentConfig} from '../interfaces';
+import React from 'react';
 
 const RequiredAsterisk = () => <span className="text-xs text-red-500">*</span>
 
@@ -36,6 +37,7 @@ const DedicatedAgentForm = ({
 	const [selectedLedger, setSelectedLedger] = useState('');
 	const [selectedDid, setSelectedDid] = useState('');
 	const [selectedMethod, setSelectedMethod]=useState('')
+	const [isSelectedNetwork, setIsSelectedNetwork]=useState('')
 	const [privateKeyValue, setPrivateKeyValue] = useState<string>('');
 	const [domainValue, setDomainValue] = useState<string>('');
 	const [isLoading, setIsLoading] = useState<boolean>(false);
@@ -118,6 +120,7 @@ const DedicatedAgentForm = ({
 	const handleLedgerChanges = (e: ChangeEvent<HTMLInputElement>) => {
 		setSelectedLedger(e.target.value);
 		setSelectedMethod('');
+		setIsSelectedNetwork('');
 		setSelectedDid('');
 	};
 	const handleMethodChanges = (e: ChangeEvent<HTMLInputElement>) => {
@@ -248,6 +251,7 @@ const networkRenderOptions = (formikHandlers: { handleChange: (e: React.ChangeEv
 				onChange={(e) => {
 					formikHandlers.handleChange(e);
 					handleNetworkChanges(e);
+					setIsSelectedNetwork(networks[network])
 				}}
 				className="mr-2"
 			/>
@@ -258,7 +262,19 @@ const networkRenderOptions = (formikHandlers: { handleChange: (e: React.ChangeEv
 	));
 };
 
+const isSubmitButtonDisabled = () => {
+	if (!selectedLedger) {
+		return true;
+	}
+	else if ((selectedLedger === Ledgers.POLYGON && !privateKeyValue) || (selectedLedger === Ledgers.INDY && (!selectedMethod || !isSelectedNetwork))) {
+		return true;
+	}
+	else if ((selectedLedger === Ledgers.NO_LEDGER && !selectedMethod) ||(selectedLedger === Ledgers.NO_LEDGER && selectedMethod === DidMethod.WEB && !domainValue)) {
+		return true;
+	}
 
+	return false;
+};
 
 	return (
 		<>
@@ -565,6 +581,7 @@ const networkRenderOptions = (formikHandlers: { handleChange: (e: React.ChangeEv
 
 				
 				<Button
+				disabled={isSubmitButtonDisabled()}
 						  isProcessing={loading}
 						  type="submit"
 						  className='float-right mb-2 text-base font-medium text-center text-white bg-primary-700 rounded-lg hover:!bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800'
diff --git a/src/components/organization/walletCommonComponents/SharedAgent.tsx b/src/components/organization/walletCommonComponents/SharedAgent.tsx
index 3df9d96f6..dc364d72f 100644
--- a/src/components/organization/walletCommonComponents/SharedAgent.tsx
+++ b/src/components/organization/walletCommonComponents/SharedAgent.tsx
@@ -43,7 +43,8 @@ const SharedAgentForm = ({
 }: ISharedAgentForm) => {
 	const [haveDidShared, setHaveDidShared] = useState(false);
 	const [selectedLedger, setSelectedLedger] = useState('');
-	const [selectedMethod, setSelectedMethod] = useState('');
+	const [selectedMethod, setSelectedMethod] = useState(''); 
+	const [selectedNetwork, setSelectedNetwork] = useState(''); 
 	const [seedVal, setSeedVal] = useState('');
 	const [maskedSeedVal, setMaskedSeedVal] = useState('');
 	const [selectedDid, setSelectedDid] = useState('');
@@ -119,6 +120,7 @@ const SharedAgentForm = ({
 	const handleLedgerChange = (e: ChangeEvent<HTMLInputElement>) => {
 		setSelectedLedger(e.target.value);
 		setSelectedMethod('');
+		setSelectedNetwork('');
 		setSelectedDid('');
 	};
 
@@ -222,6 +224,7 @@ const SharedAgentForm = ({
 					onChange={(e) => {
 						formikHandlers.handleChange(e)
 						 handleNetworkChange(e)
+						 setSelectedNetwork(networks[network])
 					}}
 					className="mr-2"
 				/>
@@ -232,6 +235,21 @@ const SharedAgentForm = ({
 		));
 	};
 
+	const isSubmitDisabled = () => {
+		if (!selectedLedger) {
+			return true;
+		}
+		else if ((selectedLedger === Ledgers.POLYGON && !privateKeyValue) || (selectedLedger === Ledgers.INDY && (!selectedMethod || !selectedNetwork))) {
+			return true;
+		}
+		else if ((selectedLedger === Ledgers.NO_LEDGER && !selectedMethod) ||(selectedLedger === Ledgers.NO_LEDGER && selectedMethod === DidMethod.WEB && !domainValue)) {
+			return true;
+		}
+
+		return false;
+	};
+
+
 	return (
 		<div className="mt-4 flex-col gap-4">
 			<div className="bg-[#F4F4F4] dark:bg-gray-700 max-w-lg">
@@ -508,6 +526,7 @@ const SharedAgentForm = ({
 
 						<div className="w-full flex justify-end">
 							<Button
+							disabled={isSubmitDisabled()}
 								type="submit"
 								className="flex h-min p-0.5 focus:z-10 focus:outline-none border border-transparent enabled:hover:bg-cyan-800 dark:enabled:hover:bg-cyan-700 mt-4 text-base font-medium text-center text-white bg-primary-700 rounded-md hover:!bg-primary-800 focus:ring-4 focus:ring-primary-300 sm:w-auto dark:bg-primary-600 dark:hover:bg-primary-700 dark:focus:ring-primary-800"
 							>