Merge branch 'develop' of https://github.com/credebl/studio into refa…

…ctor-dasboard-memberlist
credebl · Oct 19, 2023 · 2db0b24 · 2db0b24
2 parents 1185012 + 0437408
commit 2db0b24
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 11 deletions.
diff --git a/src/api/verification.ts b/src/api/verification.ts
@@ -89,7 +89,7 @@ export const getProofAttributes=async (proofId:string)=>{
 
 export const getCredentialDefinitionsForVerification = async (schemaId: string) => {
 	const orgId = await getFromLocalStorage(storageKeys.ORG_ID);
-	const url= `${apiRoutes.organizations.root}/${orgId}${apiRoutes.schema.getCredDefBySchemaId}/${schemaId}/cred-defs`;
+	const url= `${apiRoutes.Verification.verificationCredDef}/${schemaId}`;
 
 	const axiosPayload = {
 		url,

diff --git a/src/commonComponents/DeviceDetailsCard.tsx b/src/commonComponents/DeviceDetailsCard.tsx
@@ -87,7 +87,6 @@ const DeviceDetails = (props: { deviceFriendlyName: string, createDateTime: stri
                                     className="p-1 border border-gray-400 rounded hover:bg-gray-100 dark:hover:bg-black dark:text-white dark:hover:text-white"
                                     onClick={(e) => {
                                         e.preventDefault(); 
-                                        props.refreshList()
                                         setOpenEditModel(true)
                                     }}
                                 >

diff --git a/src/components/Authentication/SignInUser.tsx b/src/components/Authentication/SignInUser.tsx
@@ -1,5 +1,4 @@
 import '../../common/global.css'
-
 import * as yup from 'yup';
 import { Button, Label} from 'flowbite-react';
 import { Field, Form, Formik } from 'formik';

diff --git a/src/components/Authentication/SignInUserPasskey.tsx b/src/components/Authentication/SignInUserPasskey.tsx
@@ -1,5 +1,4 @@
 import '../../common/global.css'
-
 import { Alert, Button } from 'flowbite-react';
 import {
 	UserSignInData,

diff --git a/src/components/Profile/AddPasskey.tsx b/src/components/Profile/AddPasskey.tsx
@@ -162,6 +162,8 @@ const AddPasskey = () => {
 						: [];
 				if (data?.data?.length === 1) {
 					setDisableFlag(true);
+				} else {
+					setDisableFlag(false);
 				}
 				setDeviceList(deviceDetails);
 			}

diff --git a/src/components/User/UserDashBoard.tsx b/src/components/User/UserDashBoard.tsx
@@ -270,13 +270,13 @@ const UserDashBoard = () => {
 
 			<div className="">
 				<div className="p-4 mb-4 bg-white border border-gray-200 rounded-lg shadow-sm dark:border-gray-700 sm:p-6 dark:bg-gray-800 xl:mb-0">
-					<div className="flex items-start justify-start mb-4">
+					<div className="items-start justify-start mb-4">
 						<h3 className="text-xl font-semibold text-gray-900 dark:text-white ">
 							Recent Activity
 						</h3>
 						{activityList && activityList?.length === 0 && (
-							<div className="px-2 py-1 text-black-800  text-xs">
-								Looks like there are no activities to display at the moment.
+							<div className="py-1 text-black-800 dark:text-white text-xs flex items-center" >
+								Looks like there is no activity to display at the moment.
 							</div>
 						)}
 					</div>

diff --git a/src/components/Verification/CredDefSelection.tsx b/src/components/Verification/CredDefSelection.tsx
@@ -66,12 +66,11 @@ const CredDefSelection = () => {
 
 	const getCredDefs = async (schemaId: string) => {
 		setLoading(true)
-		const response = await getCredentialDefinitionsForVerification(schemaId,31);
+		const response = await getCredentialDefinitionsForVerification(schemaId);
 
 		const { data } = response as AxiosResponse
-
 		if (data?.statusCode === apiStatusCodes.API_STATUS_SUCCESS) {
-			const credDefs = data?.data?.data.map((ele: CredDefData) => {
+			const credDefs = data?.data?.map((ele: CredDefData) => {
 				return {
 					data: [{ data: ele?.tag ? ele?.tag : 'Not available' }, { data: ele?.credentialDefinitionId ? ele?.credentialDefinitionId : 'Not available' },
 					{ data: ele?.revocable === true ? <span className="text-blue-700 dark:text-white">Yes</span> : <span className="text-cyan-500 dark:text-white">No</span> },
@@ -99,9 +98,10 @@ const CredDefSelection = () => {
 			if (credDefs?.length === 0) {
 				setError('No Data Found')
 			}
-
+            setLoading(false)
 			setCredDefList(credDefs)
 		} else {
+			setLoading(false)
 			setError(response as string)
 		}
 

diff --git a/src/config/apiRoutes.ts b/src/config/apiRoutes.ts
@@ -54,6 +54,7 @@ export const apiRoutes = {
 		verifyCredential: '/proofs',
 		presentationVerification: '/proofs',
 		proofRequestAttributesVerification: '/proofs',
+		verificationCredDef: '/verifiation/cred-defs'
 	},
 	Agent: {
 		checkAgentHealth: '/agents/health',