@trustchex/react-native-sdk 1.478.7 → 1.483.4

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

@@ -13,6 +13,7 @@ import { useKeepAwake } from "../Libs/native-keep-awake.utils.js";
 import { useIsFocused } from '@react-navigation/native';
 import { useTranslation } from 'react-i18next';
 import { debugLog, logError, isDebugEnabled } from "../Libs/debug.utils.js";
+import { diagnostics } from "../Libs/diagnostics.js";
 import LottieView from 'lottie-react-native';
 import StyledButton from "./StyledButton.js";
 import { SafeAreaView } from 'react-native-safe-area-context';
@@ -52,8 +53,21 @@ const IdentityDocumentCamera = ({
   }, []);
   const isCameraInitialized = useRef(false);
   const [currentFaceImage, setCurrentFaceImage] = useState(undefined);
+  // Synchronous mirror of the locked face image (see currentHologramImageRef).
+  // Used as a fallback when completing SCAN_HOLOGRAM: the torch is on during
+  // hologram capture so the live frame's face is often rejected, leaving the
+  // state-derived faceImageToUse null within the stale closure — without this
+  // the completion gate's `&& !!faceImageToUse` would never pass.
+  const currentFaceImageRef = useRef(undefined);
   const [_currentHologramMaskImage, setCurrentHologramMaskImage] = useState(undefined);
   const [currentHologramImage, setCurrentHologramImage] = useState(undefined);
+  // Mirror of currentHologramImage for synchronous reads inside the per-frame
+  // callback. The setState above is async and currentHologramImage is a
+  // useCallback dependency, so frames processed before React re-renders the
+  // closure would otherwise still see the old (undefined) value — causing the
+  // SCAN_HOLOGRAM step to re-collect faces forever and never complete after a
+  // successful detection. Always keep this ref in lockstep with the state.
+  const currentHologramImageRef = useRef(undefined);
   const [currentSecondaryFaceImage, setCurrentSecondaryFaceImage] = useState(undefined);
   const [isBrightnessLow, setIsBrightnessLow] = useState(false);
   const [isFrameBlurry, setIsFrameBlurry] = useState(false);
@@ -110,10 +124,28 @@ const IdentityDocumentCamera = ({
   const isHologramDetectionInProgress = useRef(false); // Prevent concurrent hologram detection calls
   const isCompletionCallbackInvoked = useRef(false); // Prevent multiple callback invocations when COMPLETED
   const isStepTransitionInProgress = useRef(false); // Prevent duplicate step transitions from rapid frames
+  // The step a transition is currently in progress FROM. The latch above is
+  // reset asynchronously (via a nextStep effect), so in fast flows (e.g. demo
+  // mode auto-advancing) a later transition from a DIFFERENT step could be
+  // wrongly blocked while the latch is still set for the previous step. Gating
+  // on the originating step lets a genuine next-step transition through while
+  // still de-duping rapid repeat frames of the SAME transition.
+  const stepTransitionFrom = useRef(null);
   const isCompletionAnnouncementSpoken = useRef(false); // Prevent duplicate "scan completed" voice guidance
 
   const faceDetectionErrorCount = useRef(0);
   const brightnessHistory = useRef([]);
+  // Running camera-quality stats for the support diagnostic report.
+  const diagStats = useRef({
+    frames: 0,
+    brightnessSum: 0,
+    minBrightness: 255,
+    maxBrightness: 0,
+    frameW: 0,
+    frameH: 0,
+    hadLowBrightness: false,
+    hadBlurryFrames: false
+  });
   const [faceDetectionEnabled, setFaceDetectionEnabled] = useState(true);
   const faceImages = useRef([]);
   const hologramImageCountRef = useRef(0);
@@ -151,6 +183,7 @@ const IdentityDocumentCamera = ({
       setIsActive(true);
       isCompletionCallbackInvoked.current = false; // Reset callback flag when starting new scan
       isStepTransitionInProgress.current = false;
+      stepTransitionFrom.current = null;
       isCompletionAnnouncementSpoken.current = false;
     } else {
       setIsActive(false);
@@ -166,12 +199,27 @@ const IdentityDocumentCamera = ({
       validMRZConsecutiveCount.current = 0;
       mrzAggregator.current.reset();
       setMrzReliable(false);
+      // Start a fresh diagnostics session for the support report.
+      diagnostics.reset(Date.now());
+      diagStats.current = {
+        frames: 0,
+        brightnessSum: 0,
+        minBrightness: 255,
+        maxBrightness: 0,
+        frameW: 0,
+        frameH: 0,
+        hadLowBrightness: false,
+        hadBlurryFrames: false
+      };
       cachedBarcode.current = null;
       isCompletionCallbackInvoked.current = false;
       isStepTransitionInProgress.current = false;
+      stepTransitionFrom.current = null;
       isCompletionAnnouncementSpoken.current = false;
       // Clear all captured image states from previous scan
+      currentFaceImageRef.current = undefined;
       setCurrentFaceImage(undefined);
+      currentHologramImageRef.current = undefined;
       setCurrentHologramImage(undefined);
       setCurrentSecondaryFaceImage(undefined);
       resetLastMessage();
@@ -184,9 +232,12 @@ const IdentityDocumentCamera = ({
       setLatestHologramFaceImage(undefined);
       isCompletionCallbackInvoked.current = false; // Reset callback flag on unmount
       isStepTransitionInProgress.current = false;
+      stepTransitionFrom.current = null;
       isCompletionAnnouncementSpoken.current = false;
       // Clear all captured image states on unmount
+      currentFaceImageRef.current = undefined;
       setCurrentFaceImage(undefined);
+      currentHologramImageRef.current = undefined;
       setCurrentHologramImage(undefined);
       setCurrentSecondaryFaceImage(undefined);
       resetLastMessage();
@@ -232,6 +283,7 @@ const IdentityDocumentCamera = ({
       isCompletionCallbackInvoked.current = false;
     }
     isStepTransitionInProgress.current = false;
+    stepTransitionFrom.current = null;
   }, [nextStep]);
 
   // Update status bar based on guide visibility
@@ -365,6 +417,7 @@ const IdentityDocumentCamera = ({
         setHologramImageCount(0);
         setLatestHologramFaceImage(undefined);
         // Clear previous hologram state to prevent premature completion
+        currentHologramImageRef.current = undefined;
         setCurrentHologramImage(undefined);
         setCurrentHologramMaskImage(undefined);
       }
@@ -408,10 +461,14 @@ const IdentityDocumentCamera = ({
     }
   }, [setIsTorchOn]);
   const transitionStepWithCallback = useCallback((nextStepType, fromStep, scannedData) => {
-    if (isStepTransitionInProgress.current) {
+    // De-dupe only rapid repeat frames of the SAME originating step. A
+    // transition from a different step is a genuine advance (the async latch
+    // reset may not have run yet in fast flows like demo mode), so allow it.
+    if (isStepTransitionInProgress.current && stepTransitionFrom.current === fromStep) {
       return;
     }
     isStepTransitionInProgress.current = true;
+    stepTransitionFrom.current = fromStep;
 
     // Torch only needed during SCAN_HOLOGRAM - turn off for all other transitions
     if (nextStepType !== 'SCAN_HOLOGRAM') {
@@ -567,9 +624,30 @@ const IdentityDocumentCamera = ({
     // of letting one noisy frame reset progress.
     const mrzBandHeight = scannedText?.blocks?.length ? Math.max(0, ...scannedText.blocks.map(b => b.blockFrame?.height ?? 0)) : 0;
     const frameWeight = mrzBandHeight > 0 ? mrzBandHeight : 1;
+    // ML Kit per-symbol confidence over MRZ characters (Android bundled library
+    // only; undefined on iOS). When present it down-weights frames the
+    // recognizer was unsure about, so a confident frame outvotes a shaky one of
+    // the same band height on look-alike ties (A↔4, S↔5, B↔8).
+    const frameConfidence = scannedText?.textConfidence?.mean;
     const consensus = mrzAggregator.current.addFrame({
       text: textForValidation,
-      weight: frameWeight
+      weight: frameWeight,
+      confidence: frameConfidence
+    });
+
+    // Record MRZ consensus metrics for the support diagnostic report (counts
+    // and pass/fail only — never the MRZ values themselves). `reachedStable`
+    // is sticky in the collector, so a later flicker can't unset it.
+    // `stabilityFrames`/`minContestedMargin` and the MRZ band pixel height are
+    // device-variance signals (convergence speed, look-alike resolution
+    // confidence, and whether the band cleared the ~16px/char OCR floor).
+    diagnostics.setMrz({
+      framesProcessed: consensus.frames,
+      reachedStable: consensus.stable,
+      format: consensus.validation?.format ?? undefined,
+      stabilityFrames: consensus.stableStreak,
+      minContestedMargin: Number.isFinite(consensus.minContestedMargin) ? consensus.minContestedMargin : 0,
+      maxMrzBandHeightPx: mrzBandHeight
     });
 
     // Use the fused consensus when it is valid; otherwise fall back to a
@@ -593,6 +671,9 @@ const IdentityDocumentCamera = ({
     // be wrong (ID_FRONT locked before passport MRZ became readable)
     const documentType = nextStep === 'SCAN_ID_FRONT_OR_PASSPORT' ? detectDocumentType(primaryFaces, text, parsedMRZData?.fields, frameWidth, mrzText) : parsedMRZData?.fields?.documentCode === 'P' ? 'PASSPORT' : detectedDocumentType;
 
+    // Record the detected document type for the diagnostic report.
+    if (documentType) diagnostics.setDocument(documentType);
+
     // Crop faces once document type is confirmed or we're past the initial step
     const shouldCropFaces = documentType === 'ID_FRONT' || documentType === 'PASSPORT' || nextStep !== 'SCAN_ID_FRONT_OR_PASSPORT';
     const croppedFaces = shouldCropFaces ? await getFaceImages(primaryFaces, image ?? '', frameWidth, frameHeight) : [];
@@ -646,6 +727,7 @@ const IdentityDocumentCamera = ({
         // Continue scanning without locking this face
       } else {
         faceImageToUse = croppedFaces[0];
+        currentFaceImageRef.current = croppedFaces[0];
         setCurrentFaceImage(croppedFaces[0]);
       }
     }
@@ -860,8 +942,8 @@ const IdentityDocumentCamera = ({
         // Skip face position validation for hologram — flash toggling causes position jitter
         if (primaryFaceOnly) {
           hologramFramesWithoutFace.current = 0;
-          if (currentHologramImage) {
-            scannedData.hologramImage = currentHologramImage;
+          if (currentHologramImageRef.current) {
+            scannedData.hologramImage = currentHologramImageRef.current;
           } else if (faceImages.current.length < HOLOGRAM_IMAGE_COUNT) {
             // Space out captures for better variation
             const timeSinceLastCapture = Date.now() - lastHologramCaptureTime.current;
@@ -921,6 +1003,7 @@ const IdentityDocumentCamera = ({
               if (hologram) {
                 setCurrentHologramMaskImage(hologramMask);
                 scannedData.hologramImage = hologram;
+                currentHologramImageRef.current = hologram;
                 setCurrentHologramImage(hologram);
                 if (isDebugEnabled()) {
                   debugLog('IdentityDocumentCamera', '[Hologram] ✓ Saved hologram image');
@@ -946,8 +1029,8 @@ const IdentityDocumentCamera = ({
         } else {
           hologramFramesWithoutFace.current++;
         }
-      } else if (currentHologramImage) {
-        scannedData.hologramImage = currentHologramImage;
+      } else if (currentHologramImageRef.current) {
+        scannedData.hologramImage = currentHologramImageRef.current;
       }
 
       // Secondary face capture (continuous during initial scan and hologram detection)
@@ -1081,10 +1164,20 @@ const IdentityDocumentCamera = ({
         return;
       }
 
-      // Complete when hologram captured OR retries exhausted (not mid-collection)
-      const stepComplete = (!!scannedData.hologramImage || maxRetriesReached && !isCollecting) && !!faceImageToUse; // Require face before completing
+      // Complete when hologram captured OR retries exhausted (not mid-collection).
+      // Fall back to the previously locked face (ref) when the live frame's face
+      // was rejected — the torch is on during hologram capture, so faceImageToUse
+      // is frequently null even though a valid face was locked during the front
+      // scan. Without this the gate's face requirement could never be satisfied.
+      const faceForCompletion = faceImageToUse ?? currentFaceImageRef.current;
+      const stepComplete = (!!scannedData.hologramImage || maxRetriesReached && !isCollecting) && !!faceForCompletion; // Require face before completing
 
       if (stepComplete) {
+        // Make sure the locked face rides along even if this frame's face was
+        // rejected.
+        if (!scannedData.faceImage && faceForCompletion) {
+          scannedData.faceImage = faceForCompletion;
+        }
         // Ensure preserved MRZ data is included (current frame may not have
         // readable MRZ due to flash/tilting during hologram capture)
         if (!scannedData.mrzText && lastValidMRZText.current) {
@@ -1196,6 +1289,15 @@ const IdentityDocumentCamera = ({
       brightnessHistory.current.shift();
     }
     const avgBrightness = brightnessHistory.current.reduce((a, b) => a + b, 0) / brightnessHistory.current.length;
+
+    // Accumulate camera diagnostics (frame count, brightness range, dims) for
+    // the support diagnostic report. Cheap, side-effect-only.
+    diagStats.current.frames += 1;
+    diagStats.current.brightnessSum += frameBrightness;
+    diagStats.current.minBrightness = Math.min(diagStats.current.minBrightness, frameBrightness);
+    diagStats.current.maxBrightness = Math.max(diagStats.current.maxBrightness, frameBrightness);
+    diagStats.current.frameW = frame.width ?? diagStats.current.frameW;
+    diagStats.current.frameH = frame.height ?? diagStats.current.frameH;
     const isOverallBright = avgBrightness >= MIN_BRIGHTNESS_THRESHOLD;
 
     // Check brightness in center region (area of interest)
@@ -1206,6 +1308,7 @@ const IdentityDocumentCamera = ({
       isRegionBright = isOverallBright;
     }
     setIsBrightnessLow(!isRegionBright);
+    if (!isRegionBright) diagStats.current.hadLowBrightness = true;
 
     // Check blur only in center region (area of interest) to avoid false positives
     // from iOS depth-of-field background blur
@@ -1226,10 +1329,30 @@ const IdentityDocumentCamera = ({
       );
       isNotBlurry = !isBlurry;
       setIsFrameBlurry(isBlurry);
+      if (isBlurry) diagStats.current.hadBlurryFrames = true;
     } catch (error) {
       setIsFrameBlurry(false);
     }
 
+    // Flush accumulated camera stats into the diagnostics collector.
+    const ds = diagStats.current;
+    diagnostics.setCamera({
+      frames: ds.frames,
+      frameW: ds.frameW,
+      frameH: ds.frameH,
+      avgBrightness: ds.frames > 0 ? Math.round(ds.brightnessSum / ds.frames) : 0,
+      minBrightness: ds.minBrightness === 255 && ds.frames === 0 ? 0 : ds.minBrightness,
+      maxBrightness: ds.maxBrightness,
+      hadLowBrightness: ds.hadLowBrightness,
+      hadBlurryFrames: ds.hadBlurryFrames,
+      // The actual gates the measured values are judged against — lets support
+      // read "measured 45 vs floor 45" instead of just a pass/fail flag.
+      thresholds: {
+        minBrightness: MIN_BRIGHTNESS_THRESHOLD,
+        blur: 50
+      }
+    });
+
     // Only proceed if image quality is acceptable
     const hasAcceptableQuality = isRegionBright && isNotBlurry;
 
@@ -1274,6 +1397,7 @@ const IdentityDocumentCamera = ({
         resultText,
         mrzOnlyText: undefined,
         // Will be set below if MRZ blocks detected
+        textConfidence: frame.textConfidence,
         blocks: textBlocks.map(block => ({
           blockText: block.text || '',
           blockFrame: block.blockFrame ?? {

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

@@ -5,7 +5,6 @@ import AppContext from "../Contexts/AppContext.js";
 import { CommonActions, useNavigation, usePreventRemove } from '@react-navigation/native';
 import { View, StyleSheet, Alert } from 'react-native';
 import { useTranslation } from 'react-i18next';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import i18n from "../../Translation/index.js";
 import StyledButton from "./StyledButton.js";
 import { analyticsService } from "../Services/AnalyticsService.js";
@@ -26,7 +25,6 @@ const NavigationManager = /*#__PURE__*/forwardRef(({
   const {
     t
   } = useTranslation();
-  const insets = useSafeAreaInsets();
   const routes = {
     VERIFICATION_SESSION_CHECK: 'VerificationSessionCheckScreen',
     DYNAMIC_ROUTES: {
@@ -185,9 +183,7 @@ const NavigationManager = /*#__PURE__*/forwardRef(({
     allowSkipStep: appContext.currentWorkflowStep?.required
   }));
   return appContext.currentWorkflowStep && (!appContext.currentWorkflowStep?.required || canSkipStep) && /*#__PURE__*/_jsx(View, {
-    style: [styles.container, {
-      paddingBottom: insets.bottom
-    }],
+    style: styles.container,
     children: /*#__PURE__*/_jsx(StyledButton, {
       mode: "text",
       onPress: goToNextRouteWithAlert,
@@ -196,11 +192,13 @@ const NavigationManager = /*#__PURE__*/forwardRef(({
   });
 });
 const styles = StyleSheet.create({
+  // Hug the text button: centered, minimal padding, no full-width opaque bar so
+  // it occupies the least area and never overlays sibling content. The screen's
+  // footer wrapper already applies the bottom safe-area inset.
   container: {
-    justifyContent: 'center',
-    alignItems: 'center',
-    padding: 20,
-    backgroundColor: 'white'
+    alignSelf: 'center',
+    paddingHorizontal: 16,
+    paddingVertical: 8
   }
 });
 export default NavigationManager;

package/lib/module/Shared/Contexts/AppContext.js

@@ -24,8 +24,11 @@ export default /*#__PURE__*/createContext({
   currentWorkflowStep: undefined,
   isDebugNavigated: false,
   isTestVideoSession: false,
+  lastDocumentRead: undefined,
   onCompleted: undefined,
   onError: undefined,
+  onDocumentRead: undefined,
+  setLastDocumentRead: undefined,
   setSessionId: undefined,
   setBaseUrl: undefined
 });

package/lib/module/Shared/EIDReader/eidReader.js

@@ -6,9 +6,37 @@ import { NFCManagerCardService } from "./nfcManagerCardService.js";
 import { EIDService } from "./eidService.js";
 import { DG1File } from "./lds/icao/dg1File.js";
 import { DG2File } from "./lds/icao/dg2File.js";
+import { DG11File } from "./lds/icao/dg11File.js";
 import { Buffer } from 'buffer';
 import { InputStream } from "./java/inputStream.js";
 import { debugLog } from "../Libs/debug.utils.js";
+import { diagnostics } from "../Libs/diagnostics.js";
+
+/**
+ * Extract an APDU status word (hex, e.g. "6982") from an error message if the
+ * protocol layer included one. Returns undefined when none is present. Kept
+ * deliberately loose — the protocol senders embed "SW=...." / "(6982)" forms.
+ */
+const extractStatusWord = msg => {
+  const m = msg.match(/\b(?:SW[:= ]?)?([0-9a-fA-F]{4})\b/);
+  return m ? m[1].toUpperCase() : undefined;
+};
+
+/** Categorise an NFC error message into a coarse, non-PII bucket. */
+const categorizeNfcError = msg => {
+  const m = msg.toLowerCase();
+  if (m.includes('cancel')) return 'user_cancelled';
+  if (m.includes('lost') || m.includes('steady')) return 'tag_lost';
+  if (m.includes('timeout')) return 'timeout';
+  if (m.includes('not supported') || m.includes('unsupported')) {
+    return 'unsupported';
+  }
+  if (m.includes('not enabled') || m.includes('disabled')) return 'not_enabled';
+  if (m.includes('auth') || m.includes('mutual') || m.includes('security')) {
+    return 'auth_failed';
+  }
+  return 'reading_error';
+};
 
 // --- Minimal PNG encoder (pure JS, no native deps) ---
 // Uses deflate stored (uncompressed) blocks for O(n) encoding speed.
@@ -275,8 +303,40 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
   let progress = 0;
   const nfcManagerCardService = new NFCManagerCardService();
   const passportService = new EIDService(nfcManagerCardService, EIDService.NORMAL_MAX_TRANSCEIVE_LENGTH, EIDService.DEFAULT_MAX_BLOCKSIZE, false, true);
+
+  // Structured NFC diagnostics: record each step's outcome + timing + APDU SW
+  // into the session collector so the result screen can surface device-specific
+  // read failures. Best-effort and side-effect-only — never alters the flow.
+  diagnostics.nfcAttemptStarted();
+  const stepTimer = () => {
+    const t0 = Date.now();
+    return (step, ok, error) => {
+      const msg = error instanceof Error ? error.message : error ? String(error) : undefined;
+      // Store only the APDU status word and a COARSE category — never the raw
+      // error text, which could in theory embed field/PII values. The SW + step
+      // name + category carry all the actionable signal.
+      diagnostics.nfcStep({
+        step,
+        ok,
+        ms: Date.now() - t0,
+        sw: msg ? extractStatusWord(msg) : undefined,
+        error: msg ? categorizeNfcError(msg) : undefined
+      });
+    };
+  };
   try {
-    await passportService.open();
+    {
+      const done = stepTimer();
+      try {
+        await passportService.open();
+        // Reaching open() without throwing means the chip powered on / was seen.
+        diagnostics.nfcChipDetected();
+        done('open', true);
+      } catch (e) {
+        done('open', false, e);
+        throw e;
+      }
+    }
     progress = 1;
     if (progressCallback) {
       progressCallback(progress);
@@ -286,12 +346,17 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
     // Explicitly SELECT MF first so the SFI=0x1C context is correct,
     // regardless of which application the chip activates on power-on.
     let hasPACESucceeded = false;
-    try {
-      await passportService.sendSelectMF();
-      debugLog('EID', '[EID] SELECT MF OK');
-    } catch (mfErr) {
-      const mfMsg = mfErr instanceof Error ? mfErr.message : String(mfErr);
-      debugLog('EID', `[EID] SELECT MF failed (${mfMsg}), continuing with SFI read anyway`);
+    {
+      const done = stepTimer();
+      try {
+        await passportService.sendSelectMF();
+        done('selectMF', true);
+        debugLog('EID', '[EID] SELECT MF OK');
+      } catch (mfErr) {
+        done('selectMF', false, mfErr);
+        const mfMsg = mfErr instanceof Error ? mfErr.message : String(mfErr);
+        debugLog('EID', `[EID] SELECT MF failed (${mfMsg}), continuing with SFI read anyway`);
+      }
     }
     progress = 2;
     if (progressCallback) {
@@ -301,19 +366,24 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
     // Read EF.CardAccess — kept in a separate try/catch so we can distinguish
     // "file read failure" from "PACE protocol failure" in the logs.
     let cardAccessBuf = null;
-    try {
-      const cardAccessStream = passportService.getInputStream(EIDService.EF_CARD_ACCESS);
-      await cardAccessStream.init();
-      const cardAccessLen = cardAccessStream.getLength();
-      const buf = Buffer.alloc(cardAccessLen);
-      for (let i = 0; i < cardAccessLen; i++) {
-        buf[i] = await cardAccessStream.read();
+    {
+      const done = stepTimer();
+      try {
+        const cardAccessStream = passportService.getInputStream(EIDService.EF_CARD_ACCESS);
+        await cardAccessStream.init();
+        const cardAccessLen = cardAccessStream.getLength();
+        const buf = Buffer.alloc(cardAccessLen);
+        for (let i = 0; i < cardAccessLen; i++) {
+          buf[i] = await cardAccessStream.read();
+        }
+        cardAccessBuf = buf;
+        done('readCardAccess', true);
+        debugLog('EID', `[EID] EF.CardAccess read OK: ${cardAccessLen} bytes = ${cardAccessBuf.toString('hex')}`);
+      } catch (readErr) {
+        done('readCardAccess', false, readErr);
+        const readMsg = readErr instanceof Error ? readErr.message : String(readErr);
+        debugLog('EID', `[EID] EF.CardAccess read FAILED: ${readMsg} — falling back to BAC`);
       }
-      cardAccessBuf = buf;
-      debugLog('EID', `[EID] EF.CardAccess read OK: ${cardAccessLen} bytes = ${cardAccessBuf.toString('hex')}`);
-    } catch (readErr) {
-      const readMsg = readErr instanceof Error ? readErr.message : String(readErr);
-      debugLog('EID', `[EID] EF.CardAccess read FAILED: ${readMsg} — falling back to BAC`);
     }
     progress = 3;
     if (progressCallback) {
@@ -321,11 +391,17 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
     }
 
     // If EF.CardAccess was read successfully, attempt PACE.
+    if (cardAccessBuf === null) {
+      // EF.CardAccess unreadable (the readCardAccess step already recorded the
+      // failure/SW) → PACE can't be attempted; BAC will be used.
+      diagnostics.nfcPaceFellBackToBac('no_card_access');
+    }
     if (cardAccessBuf !== null) {
       try {
         const paceInfo = parsePACEInfoFromCardAccess(cardAccessBuf);
         if (paceInfo) {
           debugLog('EID', `[EID] PACE available: oid=${paceInfo.oid} parameterId=${paceInfo.parameterId}`);
+          diagnostics.nfcSetAuth('PACE', paceInfo.oid);
           // PACE is available - derive key from MRZ and perform PACE
           const bacKey = new BACKey(documentNumber, dateOfBirth, dateOfExpiry);
           const paceKey = PACEKeySpec.createMRZKey(bacKey.getKeySeedForPACE());
@@ -333,14 +409,23 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
           if (progressCallback) {
             progressCallback(progress);
           }
-          await passportService.doPACE(paceKey, paceInfo.oid, paceInfo.parameterId, progressCallback);
-          hasPACESucceeded = true;
-          debugLog('EID', '[EID] PACE succeeded');
+          const done = stepTimer();
+          try {
+            await passportService.doPACE(paceKey, paceInfo.oid, paceInfo.parameterId, progressCallback);
+            hasPACESucceeded = true;
+            done('paceAuth', true);
+            debugLog('EID', '[EID] PACE succeeded');
+          } catch (paceErr) {
+            done('paceAuth', false, paceErr);
+            throw paceErr;
+          }
         } else {
+          diagnostics.nfcPaceFellBackToBac('no_pace_info');
           debugLog('EID', '[EID] EF.CardAccess read OK but no PACE SecurityInfo found — document does not support PACE, falling back to BAC');
         }
       } catch (paceError) {
         // PACE protocol exchange failed — fall back to BAC
+        diagnostics.nfcPaceFellBackToBac('pace_failed');
         const msg = paceError instanceof Error ? paceError.message : String(paceError);
         debugLog('EID', `[EID] PACE protocol failed (${msg}), falling back to BAC`);
         if (paceError instanceof Error && paceError.stack) {
@@ -354,7 +439,16 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
     }
 
     // Select Applet for MRTD
-    await passportService.sendSelectApplet(hasPACESucceeded);
+    {
+      const done = stepTimer();
+      try {
+        await passportService.sendSelectApplet(hasPACESucceeded);
+        done('selectApplet', true);
+      } catch (e) {
+        done('selectApplet', false, e);
+        throw e;
+      }
+    }
     progress = 10;
     if (progressCallback) {
       progressCallback(progress);
@@ -367,8 +461,16 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
         await efComStream.read();
       } catch (error) {
         // EF_COM not available -> try to do BAC
+        diagnostics.nfcSetAuth('BAC');
         const bacKey = new BACKey(documentNumber, dateOfBirth, dateOfExpiry);
-        await passportService.doBAC(bacKey);
+        const done = stepTimer();
+        try {
+          await passportService.doBAC(bacKey);
+          done('bacAuth', true);
+        } catch (e) {
+          done('bacAuth', false, e);
+          throw e;
+        }
       }
     }
     progress = 20;
@@ -377,16 +479,39 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
     }
 
     // Read DG1 (MRZ Info)
-    const dg1InputStream = passportService.getInputStream(EIDService.EF_DG1);
-    await dg1InputStream.init();
-    const dg1File = new DG1File(undefined, dg1InputStream);
-    const mrzInfo = await dg1File.getMRZInfo();
+    const dg1Done = stepTimer();
+    let mrzInfo;
+    try {
+      const dg1InputStream = passportService.getInputStream(EIDService.EF_DG1);
+      await dg1InputStream.init();
+      const dg1File = new DG1File(undefined, dg1InputStream);
+      mrzInfo = await dg1File.getMRZInfo();
+      dg1Done('readDG1', true);
+    } catch (e) {
+      dg1Done('readDG1', false, e);
+      throw e;
+    }
     progress = 30;
     if (progressCallback) {
       progressCallback(progress);
     }
 
+    // Read DG11 (Additional Personal Data — printed name in UTF-8, optional)
+    let dg11FirstName = null;
+    let dg11LastName = 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);
     await dg2InputStream.init();
     InputStream.onRead((totalBytesRead, fileLength) => {
@@ -399,7 +524,14 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
     let imageAsBase64 = '';
     let mimeType = '';
     const allFaceImageInfos = [];
-    const faceInfos = await dg2File.getFaceInfos();
+    let faceInfos;
+    try {
+      faceInfos = await dg2File.getFaceInfos();
+      dg2Done('readDG2', true);
+    } catch (e) {
+      dg2Done('readDG2', false, e);
+      throw e;
+    }
     for (let faceInfo of faceInfos) {
       allFaceImageInfos.push(...faceInfo.getFaceImageInfos());
     }
@@ -418,12 +550,17 @@ const eidReader = async (documentNumber, dateOfBirth, dateOfExpiry, progressCall
     if (progressCallback) {
       progressCallback(progress);
     }
+    diagnostics.nfcResult(true);
     return {
       mrz: mrzInfo,
       faceImage: imageAsBase64,
-      mimeType: mimeType
+      mimeType: mimeType,
+      dg11FirstName,
+      dg11LastName
     };
   } catch (error) {
+    const msg = error instanceof Error ? error.message : String(error);
+    diagnostics.nfcResult(false, categorizeNfcError(msg));
     debugLog('EID', 'Error reading passport data', error);
   } finally {
     await passportService.close();