@trustchex/react-native-sdk 1.481.1 → 1.484.0

package/src/Screens/Static/ResultScreen.tsx

@@ -259,14 +259,16 @@ const ResultScreen = () => {
         throw new Error('MRZ fields not found');
       }
 
-      // Backend payload must contain raw MRZ data only.
-      // Human-friendly formatting is strictly for UI rendering paths.
       const rawMrzFields = scannedDocument.mrzFields;
+      const docName = appContext.lastDocumentRead?.name;
 
       const identificationDocument = {
         type: rawMrzFields.documentCode,
         name: rawMrzFields.firstName,
         surname: rawMrzFields.lastName,
+          displayName: docName?.source === 'dg11' ? docName.displayFirst : undefined,
+        displaySurname: docName?.source === 'dg11' ? docName.displayLast : undefined,
+        nameSource: docName?.source === 'dg11' ? docName.source : undefined,
         gender: getGenderEnumType(rawMrzFields.sex),
         number: rawMrzFields.documentNumber,
         country: rawMrzFields.issuingState,
@@ -292,7 +294,7 @@ const ResultScreen = () => {
         }
       );
     },
-    [apiUrl, getGenderEnumType]
+    [apiUrl, appContext.lastDocumentRead, getGenderEnumType]
   );
 
   const uploadIdentificationMedia = useCallback(
@@ -790,23 +792,35 @@ const ResultScreen = () => {
                         <Text style={styles.mrzInfoLabel}>
                           {t('eidScannerScreen.name')}:
                         </Text>
-                        <Text style={styles.mrzInfoText}>
-                          {
-                            appContext.identificationInfo.scannedDocument
-                              .mrzFields?.firstName
-                          }
-                        </Text>
+                        <View style={styles.mrzInfoValueGroup}>
+                          <Text style={styles.mrzInfoText}>
+                            {appContext.lastDocumentRead?.name.source === 'dg11'
+                              ? appContext.lastDocumentRead.name.displayFirst
+                              : appContext.identificationInfo.scannedDocument.mrzFields?.firstName}
+                          </Text>
+                          {appContext.lastDocumentRead?.name.source === 'dg11' && (
+                            <Text style={styles.mrzInfoSubText}>
+                              {appContext.identificationInfo.scannedDocument.mrzFields?.firstName}
+                            </Text>
+                          )}
+                        </View>
                       </View>
                       <View style={styles.mrzInfoItem}>
                         <Text style={styles.mrzInfoLabel}>
                           {t('eidScannerScreen.surname')}:
                         </Text>
-                        <Text style={styles.mrzInfoText}>
-                          {
-                            appContext.identificationInfo.scannedDocument
-                              .mrzFields?.lastName
-                          }
-                        </Text>
+                        <View style={styles.mrzInfoValueGroup}>
+                          <Text style={styles.mrzInfoText}>
+                            {appContext.lastDocumentRead?.name.source === 'dg11'
+                              ? appContext.lastDocumentRead.name.displayLast
+                              : appContext.identificationInfo.scannedDocument.mrzFields?.lastName}
+                          </Text>
+                          {appContext.lastDocumentRead?.name.source === 'dg11' && (
+                            <Text style={styles.mrzInfoSubText}>
+                              {appContext.identificationInfo.scannedDocument.mrzFields?.lastName}
+                            </Text>
+                          )}
+                        </View>
                       </View>
                       <View style={styles.mrzInfoItem}>
                         <Text style={styles.mrzInfoLabel}>
@@ -1227,6 +1241,16 @@ const styles = StyleSheet.create({
     fontSize: 10,
     fontFamily: Platform.OS === 'ios' ? 'Courier' : 'monospace',
   },
+  mrzInfoValueGroup: {
+    flexDirection: 'column',
+    alignItems: 'flex-end',
+  },
+  mrzInfoSubText: {
+    color: '#aaa',
+    fontSize: 9,
+    fontFamily: Platform.OS === 'ios' ? 'Courier' : 'monospace',
+    marginTop: 1,
+  },
   mrzTextContainer: {
     padding: 12,
     backgroundColor: '#F3F4F6',

package/src/Shared/Components/EIDScanner.tsx

@@ -9,6 +9,8 @@ import { MRZInfo } from '../EIDReader/lds/icao/mrzInfo';
 import { eidReader } from '../EIDReader/eidReader';
 import NativeProgressBar from './NativeProgressBar';
 import type { MRZFields } from '../Types/mrzFields';
+import { buildDocumentName } from '../Libs/mrzTransliteration';
+import { normalizeFromMRZInfo } from '../Libs/documentDataNormalizer';
 import { useTranslation } from 'react-i18next';
 import AppContext from '../Contexts/AppContext';
 import StyledButton from './StyledButton';
@@ -52,6 +54,7 @@ const EIDScanner = ({
   const [documentMRZInfo, setDocumentMRZInfo] = React.useState<MRZInfo>();
   const [documentFaceImageMimeType, setDocumentFaceImageMimeType] =
     React.useState<string>();
+  const [documentName, setDocumentName] = React.useState<import('../Types/documentReadResult').DocumentName>();
   const [progress, setProgress] = React.useState(0);
   const [progressStage, setProgressStage] = React.useState<string>('');
 
@@ -133,6 +136,21 @@ const EIDScanner = ({
   const [voiceGuidanceMessage, setVoiceGuidanceMessage] = useState<string>();
   const [attemptNumber, setAttemptNumber] = useState<number>(0);
 
+  const getFieldsFromMRZ = useCallback((mrz: MRZInfo) => {
+    return {
+      documentCode: mrz.getDocumentCode(),
+      personalNumber: mrz.getPersonalNumber() || mrz.getOptionalData1(),
+      documentNumber: mrz.getDocumentNumber(),
+      firstName: mrz.getSecondaryIdentifier(),
+      lastName: mrz.getPrimaryIdentifier(),
+      birthDate: mrz.getDateOfBirth(),
+      expirationDate: mrz.getDateOfExpiry(),
+      issuingState: mrz.getIssuingState(),
+      sex: mrz.getGender().getStrCode(),
+      nationality: mrz.getNationality(),
+    } satisfies MRZFields;
+  }, []);
+
   const readNFC = useCallback(async () => {
     const startTime = Date.now();
     const currentAttempt = attemptNumber + 1;
@@ -228,6 +246,32 @@ const EIDScanner = ({
           setDocumentMRZInfo(passportData.mrz);
           setDocumentFaceImageMimeType(passportData.mimeType);
           setIsScanned(true);
+
+          {
+            const documentData = normalizeFromMRZInfo(passportData.mrz);
+            const builtName = buildDocumentName(
+              documentData.firstName,
+              documentData.lastName,
+              documentData.issuingCountry,
+              passportData.dg11FirstName,
+              passportData.dg11LastName
+            );
+            setDocumentName(builtName);
+            const documentReadResult = {
+              document: {
+                ...documentData,
+                firstName: builtName.displayFirst,
+                lastName: builtName.displayLast,
+              },
+              name: builtName,
+              face: {
+                data: passportData.faceImage,
+                mimeType: passportData.mimeType,
+              },
+            };
+            appContext.setLastDocumentRead?.(documentReadResult);
+            appContext.onDocumentRead?.(documentReadResult);
+          }
           await trackEIDScanComplete(
             docType,
             scanDuration,
@@ -314,23 +358,10 @@ const EIDScanner = ({
     isEnabled,
     attemptNumber,
     t,
+    getFieldsFromMRZ,
+    appContext,
   ]);
 
-  const getFieldsFromMRZ = useCallback((mrz: MRZInfo) => {
-    return {
-      documentCode: mrz.getDocumentCode(),
-      personalNumber: mrz.getPersonalNumber() || mrz.getOptionalData1(),
-      documentNumber: mrz.getDocumentNumber(),
-      firstName: mrz.getSecondaryIdentifier(),
-      lastName: mrz.getPrimaryIdentifier(),
-      birthDate: mrz.getDateOfBirth(),
-      expirationDate: mrz.getDateOfExpiry(),
-      issuingState: mrz.getIssuingState(),
-      sex: mrz.getGender().getStrCode(),
-      nationality: mrz.getNationality(),
-    } satisfies MRZFields;
-  }, []);
-
   useEffect(() => {
     const checkIsSupported = async () => {
       const deviceIsSupported = await NFCManager.isSupported();
@@ -533,11 +564,13 @@ const EIDScanner = ({
                   <View style={styles.idCardFields}>
                     <IDCardField
                       label={t('eidScannerScreen.surname')}
-                      value={documentMRZInfo.getPrimaryIdentifier()}
+                      value={documentName?.displayLast ?? documentMRZInfo.getPrimaryIdentifier()}
+                      subValue={documentName?.source === 'dg11' ? documentMRZInfo.getPrimaryIdentifier() : undefined}
                     />
                     <IDCardField
                       label={t('eidScannerScreen.name')}
-                      value={documentMRZInfo.getSecondaryIdentifier()}
+                      value={documentName?.displayFirst ?? documentMRZInfo.getSecondaryIdentifier()}
+                      subValue={documentName?.source === 'dg11' ? documentMRZInfo.getSecondaryIdentifier() : undefined}
                     />
                     <IDCardField
                       label={t('eidScannerScreen.documentNumber')}
@@ -866,6 +899,11 @@ const styles = StyleSheet.create({
     flexShrink: 1,
     flexWrap: 'wrap',
   },
+  idCardFieldSubValue: {
+    fontSize: 9,
+    color: '#aaa',
+    marginTop: 1,
+  },
   guide: {
     flex: 1,
     display: 'flex',
@@ -896,12 +934,23 @@ const styles = StyleSheet.create({
   },
 });
 
-const IDCardField = ({ label, value }: { label: string; value: string }) => (
+const IDCardField = ({
+  label,
+  value,
+  subValue,
+}: {
+  label: string;
+  value: string;
+  subValue?: string;
+}) => (
   <View style={styles.idCardFieldItem}>
     <Text style={styles.idCardFieldLabel} numberOfLines={1}>
       {label}
     </Text>
     <Text style={styles.idCardFieldValue}>{value || '—'}</Text>
+    {subValue ? (
+      <Text style={styles.idCardFieldSubValue}>{subValue}</Text>
+    ) : null}
   </View>
 );
 

package/src/Shared/Contexts/AppContext.ts

@@ -3,6 +3,7 @@ import type {
   IdentificationInfo,
   WorkflowStep,
 } from '../Types/identificationInfo';
+import type { DocumentReadResult } from '../Types/documentReadResult';
 
 export type AppContextType = {
   isDemoSession: boolean;
@@ -19,8 +20,12 @@ export type AppContextType = {
   currentWorkflowStep?: WorkflowStep;
   isDebugNavigated?: boolean;
   isTestVideoSession?: boolean;
+  /** Last document read result — available to upload services for real-name fields. */
+  lastDocumentRead?: DocumentReadResult;
   onCompleted?: () => void;
   onError?: (error: string) => void;
+  onDocumentRead?: (result: DocumentReadResult) => void;
+  setLastDocumentRead?: (result: DocumentReadResult) => void;
   setSessionId?: (id: string) => void;
   setBaseUrl?: (url: string) => void;
   setIsDemoSession?: (isDemoSession: boolean) => void;
@@ -49,8 +54,11 @@ export default createContext<AppContextType>({
   currentWorkflowStep: undefined,
   isDebugNavigated: false,
   isTestVideoSession: false,
+  lastDocumentRead: undefined,
   onCompleted: undefined,
   onError: undefined,
+  onDocumentRead: undefined,
+  setLastDocumentRead: undefined,
   setSessionId: undefined,
   setBaseUrl: undefined,
 });

package/src/Shared/EIDReader/eidReader.ts

@@ -4,6 +4,7 @@ import { NFCManagerCardService } from './nfcManagerCardService';
 import { EIDService } from './eidService';
 import { DG1File } from './lds/icao/dg1File';
 import { DG2File } from './lds/icao/dg2File';
+import { DG11File } from './lds/icao/dg11File';
 import { FaceImageInfo } from './lds/iso19794/faceImageInfo';
 import { Buffer } from 'buffer';
 import { MRZInfo } from './lds/icao/mrzInfo';
@@ -322,7 +323,14 @@ const eidReader = async (
   dateOfExpiry: string,
   progressCallback?: (progress: number) => void
 ): Promise<
-  { mrz?: MRZInfo; faceImage: string; mimeType: string } | undefined
+  | {
+      mrz?: MRZInfo;
+      faceImage: string;
+      mimeType: string;
+      dg11FirstName: string | null;
+      dg11LastName: string | null;
+    }
+  | undefined
 > => {
   let progress = 0;
   const nfcManagerCardService = new NFCManagerCardService();
@@ -566,6 +574,22 @@ const eidReader = async (
       progressCallback(progress);
     }
 
+    // Read DG11 (Additional Personal Data — printed name in UTF-8, optional)
+    let dg11FirstName: string | null = null;
+    let dg11LastName: string | null = null;
+    try {
+      const dg11InputStream = passportService.getInputStream(
+        EIDService.EF_DG11
+      );
+      await dg11InputStream.init();
+      const dg11File = new DG11File(dg11InputStream);
+      await dg11File.read();
+      dg11FirstName = dg11File.getFirstName();
+      dg11LastName = dg11File.getLastName();
+    } catch {
+      // DG11 is optional — not all chips have it, and access may be denied
+    }
+
     // Read DG2 (Face Image)
     const dg2Done = stepTimer();
     const dg2InputStream = passportService.getInputStream(EIDService.EF_DG2);
@@ -615,6 +639,8 @@ const eidReader = async (
       mrz: mrzInfo,
       faceImage: imageAsBase64,
       mimeType: mimeType,
+      dg11FirstName,
+      dg11LastName,
     };
   } catch (error) {
     const msg = error instanceof Error ? error.message : String(error);

package/src/Shared/EIDReader/lds/icao/dg11File.ts

@@ -0,0 +1,94 @@
+import { Buffer } from 'buffer';
+import { InputStream } from '../../java/inputStream';
+import { TLVInputStream } from '../../tlv/tlvInputStream';
+import { DataGroup } from '../dataGroup';
+
+/**
+ * DG11 — Additional Personal Data (ICAO 9303-10 §4.6.6).
+ *
+ * We only extract tag 0x5F0E (Name of Holder), which contains the full name
+ * exactly as printed on the document, in UTF-8, using the same `<<` primary/
+ * secondary delimiter as the MRZ (but with native Unicode characters).
+ *
+ * Example: "ÖZTÜRK<<GÖKHAN MEHMET" → lastName="ÖZTÜRK", firstName="GÖKHAN MEHMET"
+ *
+ * The file is optional on the chip — if absent or unreadable we return null
+ * so the caller can fall back to reverse transliteration.
+ */
+export class DG11File extends DataGroup {
+  private static readonly DG11_TAG = 0x6b;
+  private static readonly TAG_LIST_TAG = 0x5c;
+  private static readonly NAME_OF_HOLDER_TAG = 0x5f0e;
+
+  private firstName: string | null = null;
+  private lastName: string | null = null;
+
+  constructor(is?: InputStream) {
+    super(DG11File.DG11_TAG, is);
+  }
+
+  /** Returns the first name from DG11, or null if not present. */
+  getFirstName(): string | null {
+    return this.firstName;
+  }
+
+  /** Returns the last name from DG11, or null if not present. */
+  getLastName(): string | null {
+    return this.lastName;
+  }
+
+  async read(): Promise<void> {
+    await super.readObject();
+  }
+
+  protected async readContent(inputStream: InputStream): Promise<void> {
+    const tlvIn =
+      inputStream instanceof TLVInputStream
+        ? inputStream
+        : new TLVInputStream(inputStream);
+
+    // Skip the tag list (0x5C) — we only care about 0x5F0E
+    // The tag list tells us which optional tags are present; we probe directly.
+    try {
+      await tlvIn.skipToTag(DG11File.NAME_OF_HOLDER_TAG);
+    } catch {
+      // Tag not present in this chip's DG11
+      return;
+    }
+
+    const length = await tlvIn.readLength();
+    if (length <= 0) return;
+
+    const bytes = new Uint8Array(length);
+    await inputStream.readBytesWithOffset(bytes, 0, length);
+
+    const nameString = Buffer.from(bytes).toString('utf8').trim();
+    this.parseName(nameString);
+  }
+
+  protected writeContent(): void {
+    // Write not needed for reading
+  }
+
+  /**
+   * Split "PRIMARY<<SECONDARY" into last/first name components.
+   * Strips trailing filler `<` within each segment.
+   */
+  private parseName(nameString: string): void {
+    const delimIndex = nameString.indexOf('<<');
+    if (delimIndex < 0) {
+      this.lastName = nameString.replace(/<+$/, '').trim();
+      this.firstName = '';
+      return;
+    }
+    this.lastName = nameString
+      .substring(0, delimIndex)
+      .replace(/<+$/, '')
+      .trim();
+    this.firstName = nameString
+      .substring(delimIndex + 2)
+      .replace(/<$/, ' ')
+      .replace(/<+$/, '')
+      .trim();
+  }
+}

package/src/Shared/EIDReader/lds/icao/mrzInfo.ts

@@ -304,7 +304,7 @@ export class MRZInfo extends AbstractLDSInfo {
   public setPrimaryIdentifier(primaryIdentifier: string): void {
     this.primaryIdentifier = MRZInfo.trimTrailingFillerChars(
       primaryIdentifier
-    ).replace('<', ' ');
+    ).replace(/</g, ' ');
     this.checkDigit();
   }
 
@@ -916,13 +916,13 @@ export class MRZInfo extends AbstractLDSInfo {
       /* Only a primary identifier. */
       this.primaryIdentifier = MRZInfo.trimTrailingFillerChars(
         mrzNameString
-      ).replace('<', ' ');
+      ).replace(/</g, ' ');
       this.secondaryIdentifier = '';
       return;
     }
     this.primaryIdentifier = MRZInfo.trimTrailingFillerChars(
       mrzNameString.substring(0, delimIndex)
-    ).replace('<', ' ');
+    ).replace(/</g, ' ');
     const rest = mrzNameString.substring(delimIndex + 2);
     this.readSecondaryIdentifiers(rest);
   }
@@ -935,7 +935,7 @@ export class MRZInfo extends AbstractLDSInfo {
   private readSecondaryIdentifiers(secondaryIdentifier: string): void {
     this.secondaryIdentifier = MRZInfo.trimTrailingFillerChars(
       secondaryIdentifier
-    ).replace('<', ' ');
+    ).replace(/</g, ' ');
   }
 
   /**

package/src/Shared/Libs/documentDataNormalizer.ts

@@ -0,0 +1,108 @@
+import type { MRZFields } from '../Types/mrzFields';
+import type { DocumentData } from '../Types/documentData';
+import type { MRZInfo } from '../EIDReader/lds/icao/mrzInfo';
+
+/**
+ * Expand a 2-digit MRZ year to a 4-digit calendar year.
+ * ICAO 9303: YY >= 30 → 19YY, YY < 30 → 20YY.
+ * (Threshold 30 keeps all current valid documents in range.)
+ */
+function expandYear(yy: string): string {
+  const n = parseInt(yy, 10);
+  return n >= 30 ? `19${yy}` : `20${yy}`;
+}
+
+/**
+ * Convert a YYMMDD MRZ date string to ISO 8601 YYYY-MM-DD.
+ * Returns null for empty, null, or malformed input.
+ */
+function mrzDateToISO(raw: string | null | undefined): string | null {
+  if (!raw || raw.length !== 6) return null;
+  const yy = raw.slice(0, 2);
+  const mm = raw.slice(2, 4);
+  const dd = raw.slice(4, 6);
+  if (!/^\d{6}$/.test(raw)) return null;
+  return `${expandYear(yy)}-${mm}-${dd}`;
+}
+
+/**
+ * Normalize the MRZ document-code field to a single-letter form.
+ * The `mrz` npm package returns "ID" for TD1, while the chip returns "I".
+ */
+function normalizeDocumentType(raw: string | null | undefined): string {
+  if (!raw) return 'I';
+  const upper = raw.trim().toUpperCase();
+  if (upper === 'ID') return 'I';
+  // TD2 can be "IR", "AC", etc — take only the first character
+  return upper.charAt(0);
+}
+
+/**
+ * Normalize the sex field to a single uppercase letter.
+ * NFC chip: "M" | "F" | "U" | "X"
+ * mrz package: "male" | "female" | "" | null
+ */
+function normalizeSex(raw: string | null | undefined): 'M' | 'F' | 'X' | 'U' {
+  if (!raw) return 'U';
+  switch (raw.trim().toLowerCase()) {
+    case 'm':
+    case 'male':
+      return 'M';
+    case 'f':
+    case 'female':
+      return 'F';
+    case 'x':
+    case 'unspecified':
+      return 'X';
+    default:
+      return 'U';
+  }
+}
+
+/**
+ * Trim a string and return null if empty or only filler chars.
+ */
+function clean(val: string | null | undefined): string | null {
+  if (!val) return null;
+  const t = val.replace(/</g, '').trim();
+  return t.length > 0 ? t : null;
+}
+
+/**
+ * Build a DocumentData from a chip-read MRZInfo object (NFC path).
+ */
+export function normalizeFromMRZInfo(mrz: MRZInfo): DocumentData {
+  const rawPersonal =
+    mrz.getPersonalNumber() ?? clean(mrz.getOptionalData1());
+
+  return {
+    documentType: normalizeDocumentType(mrz.getDocumentCode()),
+    issuingCountry: mrz.getIssuingState().replace(/<$/, '').trim(),
+    nationality: mrz.getNationality().replace(/<$/, '').trim(),
+    documentNumber: mrz.getDocumentNumber().trim(),
+    personalNumber: clean(rawPersonal),
+    lastName: mrz.getPrimaryIdentifier().trim(),
+    firstName: mrz.getSecondaryIdentifier().trim(),
+    sex: normalizeSex(mrz.getGender().getStrCode()),
+    dateOfBirth: mrzDateToISO(mrz.getDateOfBirth()),
+    dateOfExpiry: mrzDateToISO(mrz.getDateOfExpiry()),
+  };
+}
+
+/**
+ * Build a DocumentData from an MRZFields object (camera OCR path).
+ */
+export function normalizeFromMRZFields(fields: MRZFields): DocumentData {
+  return {
+    documentType: normalizeDocumentType(fields.documentCode),
+    issuingCountry: clean(fields.issuingState) ?? '',
+    nationality: clean(fields.nationality) ?? '',
+    documentNumber: clean(fields.documentNumber) ?? '',
+    personalNumber: clean(fields.personalNumber),
+    lastName: clean(fields.lastName) ?? '',
+    firstName: clean(fields.firstName) ?? '',
+    sex: normalizeSex(fields.sex),
+    dateOfBirth: mrzDateToISO(fields.birthDate),
+    dateOfExpiry: mrzDateToISO(fields.expirationDate),
+  };
+}

package/src/Shared/Libs/mrz.utils.ts

@@ -1244,18 +1244,13 @@ const validateMRZ = (
       documentCode: result.fields.documentCode || null,
       issuingState: result.fields.issuingState || null,
       documentNumber: result.fields.documentNumber || null,
-      documentNumberCheckDigit: result.fields.documentNumberCheckDigit || null,
       nationality: result.fields.nationality || null,
       lastName: result.fields.lastName || null,
       firstName: result.fields.firstName || null,
       sex: result.fields.sex || null,
       birthDate: result.fields.birthDate || null,
-      birthDateCheckDigit: result.fields.birthDateCheckDigit || null,
       expirationDate: result.fields.expirationDate || null,
-      expirationDateCheckDigit: result.fields.expirationDateCheckDigit || null,
       personalNumber: result.fields.personalNumber || null,
-      personalNumberCheckDigit: result.fields.personalNumberCheckDigit || null,
-      compositeCheckDigit: result.fields.compositeCheckDigit || null,
       optional1: result.fields.optional1 || null,
       optional2: result.fields.optional2 || null,
     };