Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge: develop to QA #602

Merged
merged 5 commits into from
Feb 27, 2024
Merged

merge: develop to QA #602

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2c2fc57
fix: verification dark mode
16-karan Feb 27, 2024
a2ed7a6
Merge branch 'develop' of https://github.com/credebl/studio into endo…
16-karan Feb 27, 2024
956a9ae
handled sonar lint issue
16-karan Feb 27, 2024
98e5b12
dark mode issues
16-karan Feb 27, 2024
bd42c0b
Merge pull request #601 from credebl/dark-mode
pranalidhanavade Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions src/components/Verification/Verification.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,42 @@ const VerificationCred = () => {
}
};

const myFunction = () => {
const fetchData = async () => {
try {
setLoading(true);
await getSchemaAndUsers();
const schemaAttributes = await getFromLocalStorage(
storageKeys.SCHEMA_ATTR,
);
const parsedSchemaDetails = JSON.parse(schemaAttributes) || [];
const inputArray: SelectedUsers[] = parsedSchemaDetails.attribute.map(
(attribute: IAttribute) => {
return {
displayName: attribute.displayName,
attributeName: attribute.attributeName,
isChecked: false,
value: '',
condition: '',
options: [
{ value: '', label: 'Select' },
{ value: '>', label: 'Greater than' },
{ value: '<', label: 'Less than' },
{ value: '>=', label: 'Greater than or equal to' },
{ value: '<=', label: 'Less than or equal to' },
],
dataType: attribute.schemaDataType,
};
},
);
setAttributeData(inputArray);
setLoading(false);
} catch (error) {
setLoading(false);
console.error('Error fetching data:', error);
}
};

const attributeFunction = () => {
const attributes =
attributeData &&
attributeData.map((attribute: ISelectedUser, index: number) => {
Expand Down Expand Up @@ -226,7 +261,7 @@ const VerificationCred = () => {
!attribute?.isChecked
? 'opacity-50 cursor-not-allowed'
: 'cursor-pointer'
} p-1 border border-black rounded-md`}
} p-1 border border-black rounded-md dark:text-gray-200 dark:bg-gray-700 dark:border-gray-300 dark:placeholder-gray-400 dark:text-white`}
>
{attribute?.options?.map(
(
Expand Down Expand Up @@ -269,7 +304,7 @@ const VerificationCred = () => {
!attribute?.isChecked
? 'opacity-50 cursor-not-allowed'
: 'cursor-pointer'
} p-1 border border-black rounded-md`}
} p-1 border border-black rounded-md dark:text-gray-200 dark:bg-gray-700 dark:border-gray-300 dark:placeholder-gray-400 dark:text-white`}
/>
)}
{attribute?.inputError && (
Expand All @@ -290,41 +325,6 @@ const VerificationCred = () => {
);
};

const fetchData = async () => {
try {
setLoading(true);
await getSchemaAndUsers();
const schemaAttributes = await getFromLocalStorage(
storageKeys.SCHEMA_ATTR,
);
const parsedSchemaDetails = JSON.parse(schemaAttributes) || [];
const inputArray: SelectedUsers[] = parsedSchemaDetails.attribute.map(
(attribute: IAttribute) => {
return {
displayName: attribute.displayName,
attributeName: attribute.attributeName,
isChecked: false,
value: '',
condition: '',
options: [
{ value: '', label: 'Select' },
{ value: '>', label: 'Greater than' },
{ value: '<', label: 'Less than' },
{ value: '>=', label: 'Greater than or equal to' },
{ value: '<=', label: 'Less than or equal to' },
],
dataType: attribute.schemaDataType,
};
},
);
setAttributeData(inputArray);
setLoading(false);
} catch (error) {
setLoading(false);
console.error('Error fetching data:', error);
}
};

useEffect(() => {
fetchData();
return () => {
Expand All @@ -333,7 +333,7 @@ const VerificationCred = () => {
}, []);

useEffect(() => {
attributeData && myFunction();
attributeData && attributeFunction();
}, [attributeData]);

const getSchemaAndUsers = async () => {
Expand Down
Loading