Merge pull request #33 from MonobikashDas/develop

Fixed app crashing and language issue
idpass · Jun 8, 2022 · 888abbc · 888abbc
2 parents 8fbd3d2 + 046f2d2
commit 888abbc
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 8 deletions.
diff --git a/components/VcDetails.tsx b/components/VcDetails.tsx
@@ -82,7 +82,9 @@ export const VcDetails: React.FC<VcDetailsProps> = (props) => {
       <TextItem
         divider
         label={t('fullName')}
-        text={props.vc?.verifiableCredential.credentialSubject.fullName}
+        text={getLocalizedField(
+          props.vc?.verifiableCredential.credentialSubject.fullName
+        )}
       />
 
       <TextItem
@@ -96,19 +98,25 @@ export const VcDetails: React.FC<VcDetailsProps> = (props) => {
       <TextItem
         divider
         label={t('dateOfBirth')}
-        text={props.vc?.verifiableCredential.credentialSubject.dateOfBirth}
+        text={getLocalizedField(
+          props.vc?.verifiableCredential.credentialSubject.dateOfBirth
+        )}
       />
 
       <TextItem
         divider
         label={t('phoneNumber')}
-        text={props.vc?.verifiableCredential.credentialSubject.phone}
+        text={getLocalizedField(
+          props.vc?.verifiableCredential.credentialSubject.phone
+        )}
       />
 
       <TextItem
         divider
         label={t('email')}
-        text={props.vc?.verifiableCredential.credentialSubject.email}
+        text={getLocalizedField(
+          props.vc?.verifiableCredential.credentialSubject.email
+        )}
       />
 
       <TextItem
@@ -168,10 +176,12 @@ function getFullAddress(credential: CredentialSubject) {
 }
 
 function getLocalizedField(rawField: string | LocalizedField) {
+  if (typeof rawField === 'string') {
+    return rawField;
+  }
   try {
-    const locales: LocalizedField[] =
-      typeof rawField === 'string' ? JSON.parse(rawField) : rawField;
-    return locales.find((locale) => locale.language === 'eng').value.trim();
+    const locales: LocalizedField[] = JSON.parse(JSON.stringify(rawField));
+    return locales[0].value;
   } catch (e) {
     return '';
   }

diff --git a/components/VcItem.tsx b/components/VcItem.tsx
@@ -95,7 +95,9 @@ export const VcItem: React.FC<VcItemProps> = (props) => {
             }>
             {!verifiableCredential
               ? ''
-              : verifiableCredential.credentialSubject.fullName +
+              : getLocalizedField(
+                  verifiableCredential.credentialSubject.fullName
+                ) +
                 ' · ' +
                 generatedOn}
           </Text>
@@ -117,3 +119,15 @@ interface VcItemProps {
   selected?: boolean;
   onPress?: (vcRef?: ActorRefFrom<typeof vcItemMachine>) => void;
 }
+
+function getLocalizedField(rawField: string | LocalizedField) {
+  if (typeof rawField === 'string') {
+    return rawField;
+  }
+  try {
+    const locales: LocalizedField[] = JSON.parse(JSON.stringify(rawField));
+    return locales[0].value;
+  } catch (e) {
+    return '';
+  }
+}