feat: improving parseCredDefFromId function and CredentialCard11 attr…

…ibute value (openwallet-foundation#1155) Signed-off-by: Caroline Lucas Calheirani <ccalheirani@gmail.com>
petridishdev · Jun 11, 2024 · 6115b21 · 6115b21
1 parent 37ca0a2
commit 6115b21
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 17 deletions.
diff --git a/packages/legacy/core/App/components/misc/CredentialCard11.tsx b/packages/legacy/core/App/components/misc/CredentialCard11.tsx
@@ -244,7 +244,7 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
 
   const parseAttribute = (item: (Attribute & Predicate) | undefined) => {
     let parsedItem = item
-    if (item && !item.value) {
+    if (item && item.value != null) {
       parsedItem = pTypeToText(item, t, attributeTypes) as Attribute & Predicate
     }
     const parsedValue = formatIfDate(
@@ -253,7 +253,7 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
     )
     return {
       label: item?.label ?? item?.name ?? '',
-      value: item?.value ? parsedValue : `${parsedItem?.pType} ${parsedValue}`,
+      value: item?.value !== undefined && item?.value != null ? parsedValue : `${parsedItem?.pType} ${parsedValue}`,
     }
   }
 
@@ -407,7 +407,7 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
     return (
       item && (
         <View style={{ marginTop: 15 }}>
-          {!(item?.value || item?.satisfied) ? (
+          {!(item?.value != null || item?.satisfied) ? (
             <View style={{ flexDirection: 'row', alignItems: 'center' }}>
               <Icon
                 style={{ paddingTop: 2, paddingHorizontal: 2 }}
@@ -420,7 +420,7 @@ const CredentialCard11: React.FC<CredentialCard11Props> = ({
           ) : (
             <AttributeLabel label={label} />
           )}
-          {!(item?.value || item?.pValue) ? null : (
+          {!(item?.value != null || item?.pValue) ? null : (
             <View style={{ flexDirection: 'row', alignItems: 'center' }}>
               {flaggedAttributes?.includes(label) && !item.pValue && !allPI && proof && (
                 <Icon

diff --git a/packages/legacy/core/App/utils/cred-def.ts b/packages/legacy/core/App/utils/cred-def.ts
@@ -1,22 +1,19 @@
-import { AnonCredsCredentialMetadataKey } from '@credo-ts/anoncreds'
+import { AnonCredsCredentialMetadataKey, parseIndyCredentialDefinitionId, parseIndySchemaId } from '@credo-ts/anoncreds'
 import { CredentialExchangeRecord as CredentialRecord } from '@credo-ts/core'
 
-import { credentialSchema, parseSchemaFromId } from './schema'
+import { credentialSchema } from './schema'
 
 export function parseCredDefFromId(credDefId?: string, schemaId?: string): string {
   let name = 'Credential'
   if (credDefId) {
-    const credDefRegex = /[^:]+/g
-    const credDefIdParts = credDefId.match(credDefRegex)
-    if (credDefIdParts?.length === 5) {
-      name = `${credDefIdParts?.[4].replace(/_|-/g, ' ')}`
-        .split(' ')
-        .map((credIdPart) => credIdPart.charAt(0).toUpperCase() + credIdPart.substring(1))
-        .join(' ')
-    }
+    const parseIndyCredDefId = parseIndyCredentialDefinitionId(credDefId)
+    name = parseIndyCredDefId.tag
   }
   if (name.toLocaleLowerCase() === 'default' || name.toLowerCase() === 'credential') {
-    name = parseSchemaFromId(schemaId).name
+    if (schemaId) {
+      const parseIndySchema = parseIndySchemaId(schemaId)
+      name = parseIndySchema.schemaName
+    }
   }
   return name
 }

diff --git a/packages/legacy/core/__tests__/screens/ProofChangeCredential.test.tsx b/packages/legacy/core/__tests__/screens/ProofChangeCredential.test.tsx
@@ -82,7 +82,7 @@ describe('displays a credential selection screen', () => {
   const attributeBase = {
     referent: '',
     schemaId: '',
-    credentialDefinitionId: 'AAAAAAAAAAAAAAAAAAAAAA:1:AA:1234:test',
+    credentialDefinitionId: 'AAAAAAAAAAAAAAAAAAAAAA:3:CL:1234:test',
     toJSON: jest.fn(),
   }
 

diff --git a/packages/legacy/core/__tests__/screens/ProofRequest.test.tsx b/packages/legacy/core/__tests__/screens/ProofRequest.test.tsx
@@ -136,7 +136,7 @@ describe('displays a proof request screen', () => {
     const attributeBase = {
       referent: '',
       schemaId: '',
-      credentialDefinitionId: 'AAAAAAAAAAAAAAAAAAAAAA:1:AA:1234:test',
+      credentialDefinitionId: 'AAAAAAAAAAAAAAAAAAAAAA:3:CL:1234:test',
       toJSON: jest.fn(),
     }