@trustchex/react-native-sdk 1.478.7 → 1.483.4

package/android/src/main/java/com/trustchex/reactnativesdk/camera/TrustchexCameraView.kt

@@ -40,6 +40,7 @@ import com.google.mlkit.vision.text.TextRecognition
 import com.google.mlkit.vision.text.latin.TextRecognizerOptions
 import java.io.ByteArrayOutputStream
 import kotlin.math.max
+import kotlin.math.min
 import java.io.File
 import java.util.concurrent.ExecutorService
 import java.util.concurrent.Executors
@@ -524,8 +525,35 @@ class TrustchexCameraView(context: ThemedReactContext) : FrameLayout(context) {
                             val result = textTask.result
                             frameData.putString("resultText", result.text)
 
+                            // Per-symbol confidence aggregation (ML Kit BUNDLED library
+                            // only — Text.Symbol.confidence is 0 on the unbundled
+                            // play-services variant). We walk Block→Line→Element→Symbol
+                            // and accumulate confidence over MRZ-shaped characters
+                            // ([A-Z0-9<]) only, so surrounding non-MRZ text doesn't skew
+                            // the weight. The mean and min are surfaced to JS as a
+                            // per-frame quality signal that down-weights low-confidence
+                            // frames in the multi-frame vote.
+                            var confSum = 0f
+                            var confCount = 0
+                            var confMin = 1f
+
                             val blocksArray = Arguments.createArray()
                             for (block in result.textBlocks) {
+                                for (line in block.lines) {
+                                    for (element in line.elements) {
+                                        for (symbol in element.symbols) {
+                                            val ch = symbol.text.firstOrNull() ?: continue
+                                            val upper = ch.uppercaseChar()
+                                            val isMrzChar = upper in 'A'..'Z' ||
+                                                upper in '0'..'9' || upper == '<'
+                                            if (!isMrzChar) continue
+                                            val c = symbol.confidence ?: continue
+                                            confSum += c
+                                            confCount++
+                                            if (c < confMin) confMin = c
+                                        }
+                                    }
+                                }
                                 val blockMap = Arguments.createMap()
                                 blockMap.putString("text", block.text)
                                 val bb = block.boundingBox
@@ -552,6 +580,17 @@ class TrustchexCameraView(context: ThemedReactContext) : FrameLayout(context) {
                                 blocksArray.pushMap(blockMap)
                             }
                             frameData.putArray("textBlocks", blocksArray)
+
+                            // Frame-level MRZ-character confidence (mean + min over MRZ
+                            // symbols). Omitted when ML Kit returned no usable confidence
+                            // (count == 0) so JS can fall back to band-height weighting.
+                            if (confCount > 0) {
+                                val confMap = Arguments.createMap()
+                                confMap.putDouble("mean", (confSum / confCount).toDouble())
+                                confMap.putDouble("min", confMin.toDouble())
+                                confMap.putInt("count", confCount)
+                                frameData.putMap("textConfidence", confMap)
+                            }
                         } else {
                             frameData.putString("resultText", "")
                             frameData.putArray("textBlocks", Arguments.createArray())
@@ -1085,11 +1124,26 @@ class TrustchexCameraView(context: ThemedReactContext) : FrameLayout(context) {
             full.recycle()
 
             // Upscale so a ~30–44-char MRZ line clears the per-character pixel
-            // minimum. Cap the long edge to keep OCR latency bounded.
+            // minimum — but NO FURTHER. ML Kit gains no accuracy above ~24px per
+            // character (Google's guidance), and upscaling past that only adds
+            // interpolation artifacts and latency. So target ~24px/char and take
+            // the SMALLER of (a) the scale needed to reach that target and (b) the
+            // long-edge/latency cap. When the band is already sharp enough, scale
+            // stays at 1 (skip upscaling entirely).
             val maxLongEdge = 2200
             val longEdge = max(cropW, cropH)
-            val rawScale = if (longEdge > 0) (maxLongEdge.toFloat() / longEdge) else 1f
-            val scale = rawScale.coerceIn(1f, 2.5f)
+            val capScale = if (longEdge > 0) {
+                (maxLongEdge.toFloat() / longEdge).coerceIn(1f, 2.5f)
+            } else 1f
+            // Estimate current glyph height: the MRZ band is up to ~3 text lines
+            // (TD1) within the crop; ~1.4 accounts for line spacing vs glyph height.
+            val mrzBandLines = 3f
+            val targetGlyphPx = 24f
+            val estGlyphPx = (cropH / mrzBandLines) / 1.4f
+            val targetScale = if (estGlyphPx > 0f) {
+                (targetGlyphPx / estGlyphPx).coerceAtLeast(1f)
+            } else capScale
+            val scale = min(targetScale, capScale)
             val outW = (cropW * scale).toInt()
             val outH = (cropH * scale).toInt()
             val scaled = if (scale != 1f) {

package/ios/Camera/TrustchexCameraView.swift

@@ -972,19 +972,14 @@ extension TrustchexCameraView: AVCaptureVideoDataOutputSampleBufferDelegate {
                         blockY = Int(bb.origin.y / roi.scale) + roi.offsetY
                         blockWidth = Int(bb.width / roi.scale)
                         blockHeight = Int(bb.height / roi.scale)
-                    } else if isBufferLandscape {
-                        // Rotate from landscape (1920x1080) to portrait (1080x1920)
-                        // When rotating 90° clockwise (.right):
-                        // new_x = old_y
-                        // new_y = landscape_width - old_x - width
-                        // new_width = old_height
-                        // new_height = old_width
-                        blockX = Int(bb.origin.y)
-                        blockY = pixelWidth - Int(bb.origin.x) - Int(bb.width)
-                        blockWidth = Int(bb.height)
-                        blockHeight = Int(bb.width)
                     } else {
-                        // Already portrait, use directly
+                        // Fallback when the ROI couldn't be built: OCR ran on
+                        // `visionImage`, which is created from `orientedImage` — already
+                        // rotated to portrait (.right applied above when the buffer was
+                        // landscape) with VisionImage.orientation = .up. ML Kit therefore
+                        // returns coordinates in PORTRAIT space already, so they are used
+                        // directly. (A prior landscape→portrait rotation here was a
+                        // double-rotation bug, since the image was no longer landscape.)
                         blockX = Int(bb.origin.x)
                         blockY = Int(bb.origin.y)
                         blockWidth = Int(bb.width)
@@ -1091,10 +1086,20 @@ extension TrustchexCameraView: AVCaptureVideoDataOutputSampleBufferDelegate {
         // Move the crop origin to (0,0) so downstream extents are simple.
         img = img.transformed(by: CGAffineTransform(translationX: -cropRect.origin.x, y: -cropRect.origin.y))
 
-        // Upscale (≤2.5×, long edge capped at 2200) for more pixels per character.
+        // Upscale for more pixels per character, but only up to ~24px/char — ML Kit
+        // gains no accuracy above that (Google's guidance), and scaling further only
+        // adds interpolation artifacts and latency. Take the SMALLER of the scale
+        // needed to reach the target glyph height and the long-edge/latency cap; a
+        // band that's already sharp enough stays at scale 1 (no upscaling).
         let longEdge = max(cropW, cropH)
-        let rawScale = longEdge > 0 ? (2200.0 / longEdge) : 1.0
-        let scale = min(max(rawScale, 1.0), 2.5)
+        let capScale = longEdge > 0 ? min(max(2200.0 / longEdge, 1.0), 2.5) : 1.0
+        // MRZ band is up to ~3 text lines (TD1) within the crop; ~1.4 accounts for
+        // line spacing vs glyph height.
+        let mrzBandLines: CGFloat = 3.0
+        let targetGlyphPx: CGFloat = 24.0
+        let estGlyphPx = (cropH / mrzBandLines) / 1.4
+        let targetScale = estGlyphPx > 0 ? max(targetGlyphPx / estGlyphPx, 1.0) : capScale
+        let scale = min(targetScale, capScale)
         if scale != 1.0 {
             img = img.transformed(by: CGAffineTransform(scaleX: scale, y: scale))
         }

package/lib/module/Screens/Dynamic/IdentityDocumentEIDScanningScreen.js

@@ -70,9 +70,6 @@ const IdentityDocumentEIDScanningScreen = () => {
     setAllowedDocumentTypes(appContext.currentWorkflowStep?.data?.allowedDocumentTypes ?? null);
     setAllowedCountries(appContext.currentWorkflowStep?.data?.allowedCountries ?? null);
   }, [appContext.currentWorkflowStep]);
-  if (!appContext.currentWorkflowStep) {
-    return null;
-  }
   return /*#__PURE__*/_jsxs(SafeAreaView, {
     style: styles.safeAreaContainer,
     children: [documentNumber && dateOfBirth && dateOfExpiry ? /*#__PURE__*/_jsx(View, {

package/lib/module/Screens/Dynamic/IdentityDocumentScanningScreen.js

@@ -1,6 +1,8 @@
 "use strict";
 
 import React, { useContext, useEffect, useState } from 'react';
+import { buildDocumentName } from "../../Shared/Libs/mrzTransliteration.js";
+import { normalizeFromMRZFields } from "../../Shared/Libs/documentDataNormalizer.js";
 import { Alert, SafeAreaView, StyleSheet, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import IdentityDocumentCamera from "../../Shared/Components/IdentityDocumentCamera.js";
@@ -78,6 +80,25 @@ const IdentityDocumentScanningScreen = () => {
 
       // Track successful document scan completion as funnel step
       trackFunnelStep('Document Scan Completed', 2, 5, 'contract_acceptance', true);
+      {
+        const documentData = normalizeFromMRZFields(mrzFields);
+        const faceImg = idFrontSideData?.faceImage || passportData?.faceImage;
+        const builtName = buildDocumentName(documentData.firstName, documentData.lastName, documentData.issuingCountry);
+        const documentReadResult = {
+          document: {
+            ...documentData,
+            firstName: builtName.displayFirst,
+            lastName: builtName.displayLast
+          },
+          name: builtName,
+          face: faceImg ? {
+            data: faceImg,
+            mimeType: 'image/jpeg'
+          } : undefined
+        };
+        appContext.setLastDocumentRead?.(documentReadResult);
+        appContext.onDocumentRead?.(documentReadResult);
+      }
       setTimeout(() => navigationManagerRef.current?.navigateToNextStep(), 1000);
     }
   }, [idFrontSideData, idBackSideData, passportData, appContext.identificationInfo, allowedCountries, allowedDocumentTypes, t, appContext]);

package/lib/module/Screens/Dynamic/VideoCallScreen.js

@@ -126,7 +126,7 @@ const VideoCallScreen = ({
             try {
               const uploadService = new DataUploadService(baseUrl);
               dataUploadServiceRef.current = uploadService;
-              const uploaded = await uploadService.uploadCollectedData(identificationInfo);
+              const uploaded = await uploadService.uploadCollectedData(identificationInfo, undefined, appContext.lastDocumentRead?.name);
               if (!uploaded) {
                 console.warn('[VideoCallScreen] Upload service returned false');
                 if (mounted) {

package/lib/module/Screens/Static/ResultScreen.js

@@ -18,7 +18,33 @@ import { Video as VideoCompressor } from 'react-native-compressor';
 import { encryptWithAes, getSessionKey } from "../../Shared/Libs/crypto.utils.js";
 import Video from 'react-native-video';
 import StyledButton from "../../Shared/Components/StyledButton.js";
+import DiagnosticReportButton from "../../Shared/Components/DiagnosticReportButton.js";
 import NativeDeviceInfo from "../../Shared/Libs/native-device-info.utils.js";
+
+/**
+ * Collect the captured document/face images (base64) as attachments for a
+ * diagnostic report. On an ID card the BACK image is the MRZ side; on a passport
+ * the front carries the MRZ. The NFC chip face arrives as `faceImage` with its
+ * own mime type, which may be png.
+ */
+const collectDiagnosticImages = doc => {
+  if (!doc) return [];
+  const out = [];
+  const push = (name, b64, mime = 'jpg') => {
+    if (b64 && b64 !== '') out.push({
+      name,
+      base64: b64,
+      mime
+    });
+  };
+  push('mrz-side', doc.backImage);
+  push('front', doc.frontImage);
+  const faceMime = doc.faceImageMimeType === 'image/png' ? 'png' : 'jpg';
+  push('face', doc.faceImage, faceMime);
+  push('secondary-face', doc.secondaryFaceImage);
+  push('hologram', doc.hologramImage);
+  return out;
+};
 import { trackError, trackFunnelStep, useScreenTracking } from "../../Shared/Libs/analytics.utils.js";
 import { analyticsService } from "../../Shared/Services/AnalyticsService.js";
 import { AnalyticsEventName, AnalyticsEventCategory } from "../../Shared/Types/analytics.types.js";
@@ -152,14 +178,15 @@ const ResultScreen = () => {
     if (!scannedDocument.mrzFields) {
       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,
@@ -178,7 +205,7 @@ const ResultScreen = () => {
       encryptedData,
       nonce
     });
-  }, [apiUrl, getGenderEnumType]);
+  }, [apiUrl, appContext.lastDocumentRead, getGenderEnumType]);
   const uploadIdentificationMedia = useCallback(async (identificationId, scannedIdentityDocument, livenessDetection, skipIfAlreadyUploaded) => {
     // Skip media upload if already uploaded during video call
     if (skipIfAlreadyUploaded) {
@@ -507,18 +534,30 @@ const ResultScreen = () => {
                   children: [/*#__PURE__*/_jsxs(Text, {
                     style: styles.mrzInfoLabel,
                     children: [t('eidScannerScreen.name'), ":"]
-                  }), /*#__PURE__*/_jsx(Text, {
-                    style: styles.mrzInfoText,
-                    children: appContext.identificationInfo.scannedDocument.mrzFields?.firstName
+                  }), /*#__PURE__*/_jsxs(View, {
+                    style: styles.mrzInfoValueGroup,
+                    children: [/*#__PURE__*/_jsx(Text, {
+                      style: styles.mrzInfoText,
+                      children: appContext.lastDocumentRead?.name.source === 'dg11' ? appContext.lastDocumentRead.name.displayFirst : appContext.identificationInfo.scannedDocument.mrzFields?.firstName
+                    }), appContext.lastDocumentRead?.name.source === 'dg11' && /*#__PURE__*/_jsx(Text, {
+                      style: styles.mrzInfoSubText,
+                      children: appContext.identificationInfo.scannedDocument.mrzFields?.firstName
+                    })]
                   })]
                 }), /*#__PURE__*/_jsxs(View, {
                   style: styles.mrzInfoItem,
                   children: [/*#__PURE__*/_jsxs(Text, {
                     style: styles.mrzInfoLabel,
                     children: [t('eidScannerScreen.surname'), ":"]
-                  }), /*#__PURE__*/_jsx(Text, {
-                    style: styles.mrzInfoText,
-                    children: appContext.identificationInfo.scannedDocument.mrzFields?.lastName
+                  }), /*#__PURE__*/_jsxs(View, {
+                    style: styles.mrzInfoValueGroup,
+                    children: [/*#__PURE__*/_jsx(Text, {
+                      style: styles.mrzInfoText,
+                      children: appContext.lastDocumentRead?.name.source === 'dg11' ? appContext.lastDocumentRead.name.displayLast : appContext.identificationInfo.scannedDocument.mrzFields?.lastName
+                    }), appContext.lastDocumentRead?.name.source === 'dg11' && /*#__PURE__*/_jsx(Text, {
+                      style: styles.mrzInfoSubText,
+                      children: appContext.identificationInfo.scannedDocument.mrzFields?.lastName
+                    })]
                   })]
                 }), /*#__PURE__*/_jsxs(View, {
                   style: styles.mrzInfoItem,
@@ -711,18 +750,28 @@ const ResultScreen = () => {
               }, `${consentVideo.videoPath}-${index}`))]
             })]
           })
-        }), /*#__PURE__*/_jsx(View, {
-          style: {
-            paddingBottom: insets.bottom
-          },
-          children: /*#__PURE__*/_jsx(StyledButton, {
+        }), /*#__PURE__*/_jsxs(View, {
+          style: [styles.footer, {
+            paddingBottom: insets.bottom + 20
+          }],
+          children: [/*#__PURE__*/_jsx(StyledButton, {
             mode: "contained",
             onPress: () => {
               appContext.onCompleted?.();
               navigationManagerRef.current?.reset();
             },
             children: t('resultScreen.demoStartOver')
-          })
+          }), /*#__PURE__*/_jsx(DiagnosticReportButton, {
+            sessionId: appContext.identificationInfo?.sessionId,
+            scan: {
+              documentType: appContext.identificationInfo?.scannedDocument?.documentType,
+              dataSource: appContext.identificationInfo?.scannedDocument?.dataSource,
+              mrzText: appContext.identificationInfo?.scannedDocument?.mrzText,
+              mrzFields: appContext.identificationInfo?.scannedDocument?.mrzFields,
+              barcodeValue: appContext.identificationInfo?.scannedDocument?.barcodeValue
+            },
+            images: collectDiagnosticImages(appContext.identificationInfo?.scannedDocument)
+          })]
         })]
       }) : /*#__PURE__*/_jsxs(_Fragment, {
         children: [/*#__PURE__*/_jsx(LottieView, {
@@ -846,6 +895,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/lib/module/Shared/Components/DiagnosticReportButton.js

@@ -0,0 +1,64 @@
+"use strict";
+
+import React, { useState } from 'react';
+import { Alert } from 'react-native';
+import { useTranslation } from 'react-i18next';
+import StyledButton from "./StyledButton.js";
+import { sendDiagnosticReport, isDiagnosticSharingAvailable } from "../Libs/sendDiagnosticReport.js";
+import { SDK_VERSION } from "../../version.js";
+import { jsx as _jsx } from "react/jsx-runtime";
+/**
+ * "Report a scanning issue" button for the result screen.
+ *
+ * Shows a brief notice describing what will be shared (the draft itself is the
+ * user's review/consent step), then opens the OS share sheet — the user picks
+ * email / WhatsApp / Drive / etc. and sends the diagnostic bundle to support.
+ * Self-contained so the result screen only needs to render it with the scan
+ * data + captured images.
+ */
+const DiagnosticReportButton = ({
+  scan,
+  sessionId,
+  images
+}) => {
+  const {
+    t
+  } = useTranslation();
+  const [sending, setSending] = useState(false);
+
+  // `react-native-share` is optional — hide the button entirely when the host
+  // app hasn't installed it, so apps that don't want diagnostics see no UI.
+  if (!isDiagnosticSharingAvailable()) {
+    return null;
+  }
+  const onPress = () => {
+    if (sending) return;
+    // Brief notice — the share draft is the actual review/consent step.
+    Alert.alert(t('diagnosticReport.noticeTitle'), t('diagnosticReport.noticeBody'), [{
+      text: t('diagnosticReport.cancel'),
+      style: 'cancel'
+    }, {
+      text: t('diagnosticReport.continue'),
+      onPress: async () => {
+        setSending(true);
+        try {
+          await sendDiagnosticReport({
+            scan,
+            sdkVersion: SDK_VERSION,
+            sessionId,
+            images
+          });
+        } finally {
+          setSending(false);
+        }
+      }
+    }]);
+  };
+  return /*#__PURE__*/_jsx(StyledButton, {
+    mode: "outlined",
+    onPress: onPress,
+    disabled: sending,
+    children: t('diagnosticReport.button')
+  });
+};
+export default DiagnosticReportButton;

package/lib/module/Shared/Components/EIDScanner.js

@@ -9,6 +9,8 @@ import PermissionManager from "../Libs/permissions.utils.js";
 import { debugError } from "../Libs/debug.utils.js";
 import { eidReader } from "../EIDReader/eidReader.js";
 import NativeProgressBar from "./NativeProgressBar.js";
+import { buildDocumentName } from "../Libs/mrzTransliteration.js";
+import { normalizeFromMRZInfo } from "../Libs/documentDataNormalizer.js";
 import { useTranslation } from 'react-i18next';
 import AppContext from "../Contexts/AppContext.js";
 import StyledButton from "./StyledButton.js";
@@ -34,6 +36,7 @@ const EIDScanner = ({
   const [documentFaceImage, setDocumentFaceImage] = React.useState();
   const [documentMRZInfo, setDocumentMRZInfo] = React.useState();
   const [documentFaceImageMimeType, setDocumentFaceImageMimeType] = React.useState();
+  const [documentName, setDocumentName] = React.useState();
   const [progress, setProgress] = React.useState(0);
   const [progressStage, setProgressStage] = React.useState('');
 
@@ -99,6 +102,20 @@ const EIDScanner = ({
   }, [i18n.language]);
   const [voiceGuidanceMessage, setVoiceGuidanceMessage] = useState();
   const [attemptNumber, setAttemptNumber] = useState(0);
+  const getFieldsFromMRZ = useCallback(mrz => {
+    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()
+    };
+  }, []);
   const readNFC = useCallback(async () => {
     const startTime = Date.now();
     const currentAttempt = attemptNumber + 1;
@@ -160,6 +177,25 @@ 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, currentAttempt).catch(() => {});
         }
       } else {
@@ -196,21 +232,7 @@ const EIDScanner = ({
       setProgressStage('');
       setHasGuideShown(false);
     }
-  }, [documentNumber, dateOfBirth, dateOfExpiry, documentType, hasNfc, isEnabled, attemptNumber, t]);
-  const getFieldsFromMRZ = useCallback(mrz => {
-    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()
-    };
-  }, []);
+  }, [documentNumber, dateOfBirth, dateOfExpiry, documentType, hasNfc, isEnabled, attemptNumber, t, getFieldsFromMRZ, appContext]);
   useEffect(() => {
     const checkIsSupported = async () => {
       const deviceIsSupported = await NFCManager.isSupported();
@@ -367,10 +389,12 @@ const EIDScanner = ({
               style: styles.idCardFields,
               children: [/*#__PURE__*/_jsx(IDCardField, {
                 label: t('eidScannerScreen.surname'),
-                value: documentMRZInfo.getPrimaryIdentifier()
+                value: documentName?.displayLast ?? documentMRZInfo.getPrimaryIdentifier(),
+                subValue: documentName?.source === 'dg11' ? documentMRZInfo.getPrimaryIdentifier() : undefined
               }), /*#__PURE__*/_jsx(IDCardField, {
                 label: t('eidScannerScreen.name'),
-                value: documentMRZInfo.getSecondaryIdentifier()
+                value: documentName?.displayFirst ?? documentMRZInfo.getSecondaryIdentifier(),
+                subValue: documentName?.source === 'dg11' ? documentMRZInfo.getSecondaryIdentifier() : undefined
               }), /*#__PURE__*/_jsx(IDCardField, {
                 label: t('eidScannerScreen.documentNumber'),
                 value: documentMRZInfo.getDocumentNumber()
@@ -627,6 +651,11 @@ const styles = StyleSheet.create({
     flexShrink: 1,
     flexWrap: 'wrap'
   },
+  idCardFieldSubValue: {
+    fontSize: 9,
+    color: '#aaa',
+    marginTop: 1
+  },
   guide: {
     flex: 1,
     display: 'flex',
@@ -658,7 +687,8 @@ const styles = StyleSheet.create({
 });
 const IDCardField = ({
   label,
-  value
+  value,
+  subValue
 }) => /*#__PURE__*/_jsxs(View, {
   style: styles.idCardFieldItem,
   children: [/*#__PURE__*/_jsx(Text, {
@@ -668,6 +698,9 @@ const IDCardField = ({
   }), /*#__PURE__*/_jsx(Text, {
     style: styles.idCardFieldValue,
     children: value || '—'
-  })]
+  }), subValue ? /*#__PURE__*/_jsx(Text, {
+    style: styles.idCardFieldSubValue,
+    children: subValue
+  }) : null]
 });
 export default EIDScanner;