@trustchex/react-native-sdk 1.361.0 → 1.362.0

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

@@ -2,10 +2,11 @@
 
 /* eslint-disable react-native/no-inline-styles */
 import React, { useEffect, useState, useRef, useCallback } from 'react';
-import { View, StyleSheet, Text as TextView, Platform, StatusBar, Vibration, Linking, Image, ActivityIndicator, PermissionsAndroid, Dimensions } from 'react-native';
+import { View, StyleSheet, Text as TextView, Platform, StatusBar, Vibration, Linking, Image, ActivityIndicator, PermissionsAndroid, Dimensions, ScrollView } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { TrustchexCamera } from "./TrustchexCamera.js";
 import { NativeModules } from 'react-native';
+import mrzUtils from "../Libs/mrz.utils.js";
 import { useKeepAwake } from "../Libs/native-keep-awake.utils.js";
 import { useIsFocused } from '@react-navigation/native';
 import { useTranslation } from 'react-i18next';
@@ -28,7 +29,8 @@ const MIN_BRIGHTNESS_THRESHOLD = 45;
 const MAX_CONSECUTIVE_QUALITY_FAILURES = 30;
 const IdentityDocumentCamera = ({
   onlyMRZScan,
-  onIdentityDocumentScanned
+  onIdentityDocumentScanned,
+  testMode = false
 }) => {
   useKeepAwake();
   const theme = useTheme();
@@ -84,6 +86,9 @@ const IdentityDocumentCamera = ({
   // Barcode caching - persist detected barcode across frames for reliability
   const cachedBarcode = useRef(null);
 
+  // Test mode tracking
+  const [testModeData, setTestModeData] = useState(null);
+
   // Helper to compare MRZ field values (ignore raw text variations)
   const areMRZFieldsEqual = useCallback((fields1, fields2) => {
     if (!fields1 || !fields2) return false;
@@ -355,7 +360,7 @@ const IdentityDocumentCamera = ({
       }, 1000);
     }
   }, [setIsTorchOn]);
-  const handleFaceAndText = useCallback(async (text, faces, frameWidth, frameHeight, barcode, image, elementsOutside, nativeMrzResult) => {
+  const handleFaceAndText = useCallback(async (text, faces, frameWidth, frameHeight, barcode, image, elementsOutside, scannedText) => {
     const detectDocumentType = (facesParam, ocrText, mrzFields, frameWidthParam, mrzTextParam) => {
       // Relaxed signature detection: matches signature/imza variants and OCR errors
       const hasSignatureMatch = /s[gi]g?n[au]?t[u]?r|imz[a]s?/i.test(ocrText);
@@ -530,17 +535,44 @@ const IdentityDocumentCamera = ({
       setStatus('SEARCHING');
       return;
     }
-    const parsedMRZData = nativeMrzResult?.valid && nativeMrzResult.documentCode ? {
-      valid: true,
-      fields: nativeMrzResult
-    } : nativeMrzResult?.documentCode ? {
-      valid: false,
-      fields: nativeMrzResult
-    } : {
-      valid: false,
-      fields: null
+
+    // Use JavaScript MRZ validation with corrections
+    // Prefer MRZ-only text if available (from detected MRZ blocks),
+    // otherwise fall back to all text (for backward compatibility)
+    const textForValidation = scannedText?.mrzOnlyText || text;
+    const mrzValidationResult = mrzUtils.validateMRZWithCorrections(textForValidation);
+    const parsedMRZData = {
+      valid: mrzValidationResult.valid,
+      fields: mrzValidationResult.fields || null
     };
-    const mrzText = parsedMRZData.valid ? nativeMrzResult?.rawLines : null;
+
+    // Capture test mode data
+    if (testMode && text && text.includes('<')) {
+      const mrzOnlyText = scannedText?.mrzOnlyText || text;
+      setTestModeData({
+        mrzText: mrzOnlyText,
+        timestamp: Date.now()
+      });
+    }
+
+    // Log MRZ validation details for debugging
+    if (isDebugEnabled() && text && text.includes('<')) {
+      const mrzLines = text.split('\n').filter(line => line.includes('<') && line.length > 20);
+      if (mrzLines.length >= 2) {
+        console.log('[MRZ Debug] Raw OCR text lines:', mrzLines.map(l => `"${l}"`));
+        console.log('[MRZ Debug] Validation result:', {
+          valid: mrzValidationResult.valid,
+          format: mrzValidationResult.format,
+          documentCode: mrzValidationResult.fields?.documentCode,
+          documentNumber: mrzValidationResult.fields?.documentNumber,
+          optional1: mrzValidationResult.fields?.optional1,
+          error: mrzValidationResult.error
+        });
+      }
+    }
+
+    // Extract raw MRZ lines from text if validation succeeded
+    const mrzText = parsedMRZData.valid ? mrzUtils.fixMRZ(text) : null;
 
     // MRZ stability check - require consistent valid reads to avoid OCR noise
     // Compare parsed field values instead of raw text to handle OCR variations in filler characters
@@ -609,9 +641,17 @@ const IdentityDocumentCamera = ({
       // CRITICAL: Only accept MRZ with valid checksums AND consistent reads
       // AND ensure all required fields are present
       const mrzAccepted = parsedMRZData?.valid === true && hasRequiredFields && mrzStableAndValid;
+
+      // For Turkish ID cards, barcode should match MRZ optional1 (serial number)
+      // But some cards have encoding differences, so be lenient
       const barcodeMatchesMRZ = barcodeToUse?.rawValue?.trim() === parsedMRZData?.fields?.optional1?.trim();
+
+      // If barcode doesn't match exactly, check if it contains the optional1 value
+      const barcodeContainsMRZ = barcodeToUse?.rawValue?.includes(parsedMRZData?.fields?.optional1?.trim() || '') || parsedMRZData?.fields?.optional1?.includes(barcodeToUse?.rawValue?.trim() || '');
+
       // Require barcode for all documents (no special card fallback)
-      const barcodeAccepted = onlyMRZScan || barcodeMatchesMRZ;
+      // Accept if exact match OR if one contains the other (handles encoding differences)
+      const barcodeAccepted = onlyMRZScan || barcodeMatchesMRZ || !!barcodeToUse?.rawValue && barcodeContainsMRZ;
 
       // CRITICAL: Require all document elements to be in frame before accepting
       // For ID_BACK: MRZ + barcode (check directly, not via state to avoid timing issues)
@@ -652,8 +692,11 @@ const IdentityDocumentCamera = ({
               onlyMRZScan,
               hasBarcodeValue: !!barcodeToUse?.rawValue,
               barcodeMatchesMRZ,
+              barcodeContainsMRZ,
               mrzOptional1: parsedMRZData?.fields?.optional1,
               barcodeValue: barcodeToUse?.rawValue,
+              barcodeValueTrimmed: barcodeToUse?.rawValue?.trim(),
+              optional1Trimmed: parsedMRZData?.fields?.optional1?.trim(),
               barcodeSource: barcodeToUse === cachedBarcode.current ? 'cached' : 'current'
             });
           }
@@ -1158,7 +1201,7 @@ const IdentityDocumentCamera = ({
       }
       setStatus('SCANNING');
     }
-  }, [nextStep, frameDimensions, currentHologramImage, currentFaceImage, hasRequiredMRZFields, areMRZFieldsEqual, detectedDocumentType, onlyMRZScan, isTorchOn, setIsTorchOn, setNextStepAndVibrate, onIdentityDocumentScanned, logMRZDetails, logMRZValidationFailure, currentSecondaryFaceImage, detectHologramNative]);
+  }, [nextStep, frameDimensions, currentHologramImage, currentFaceImage, hasRequiredMRZFields, areMRZFieldsEqual, detectedDocumentType, onlyMRZScan, isTorchOn, setIsTorchOn, setNextStepAndVibrate, onIdentityDocumentScanned, logMRZDetails, logMRZValidationFailure, currentSecondaryFaceImage, detectHologramNative, mrzUtils]);
   const handleFrame = useCallback(async event => {
     if (!isCameraInitialized.current) {
       return;
@@ -1253,6 +1296,8 @@ const IdentityDocumentCamera = ({
       const resultText = textBlocks.map(b => b.text).join('\n');
       const scannedText = {
         resultText,
+        mrzOnlyText: undefined,
+        // Will be set below if MRZ blocks detected
         blocks: textBlocks.map(block => ({
           blockText: block.text || '',
           blockFrame: block.blockFrame ?? {
@@ -1423,6 +1468,12 @@ const IdentityDocumentCamera = ({
           const mrzBlocks = textBlocks.filter(block => block.blockFrame && block.blockFrame.y > bottomHalf && mrzPattern.test(block.text));
           console.log('[Debug] MRZ blocks found:', mrzBlocks.length);
           if (mrzBlocks.length > 0) {
+            // Extract MRZ-only text from detected blocks (sorted by Y position for correct line order)
+            const sortedMrzBlocks = [...mrzBlocks].sort((a, b) => (a.blockFrame?.y || 0) - (b.blockFrame?.y || 0));
+            scannedText.mrzOnlyText = sortedMrzBlocks.map(b => b.text).join('\n');
+            if (isDebugEnabled()) {
+              console.log('[MRZ Extraction] Using only MRZ blocks:', scannedText.mrzOnlyText.substring(0, 100));
+            }
             const minX = Math.min(...mrzBlocks.map(b => b.blockFrame.x));
             const minY = Math.min(...mrzBlocks.map(b => b.blockFrame.y));
             const maxX = Math.max(...mrzBlocks.map(b => b.blockFrame.x + b.blockFrame.width));
@@ -1660,7 +1711,7 @@ const IdentityDocumentCamera = ({
         }
       }
       setElementsOutsideScanArea(outsideElements);
-      handleFaceAndText(scannedText.resultText ?? '', detectedFaces, frame.width, frame.height, barcodes.length ? barcodes[0] : undefined, base64Image, outsideElements.length > 0, frame.mrzResult);
+      handleFaceAndText(scannedText.resultText ?? '', detectedFaces, frame.width, frame.height, barcodes.length ? barcodes[0] : undefined, base64Image, outsideElements.length > 0, scannedText);
     } catch (error) {
       console.warn('Frame processing error:', error?.message);
     }
@@ -1745,7 +1796,6 @@ const IdentityDocumentCamera = ({
         enableFrameProcessing: isActive,
         enableFaceDetection: isActive && faceDetectionEnabled,
         enableTextRecognition: isActive,
-        enableMrzValidation: isActive,
         enableBarcodeScanning: isActive && nextStep === 'SCAN_ID_BACK',
         includeBase64: isActive,
         targetFps: 10,
@@ -2184,32 +2234,6 @@ const IdentityDocumentCamera = ({
               }],
               children: `${currentSecondaryFaceImage ? '✓ ' : ''}2nd Face`
             })]
-          }), isDebugEnabled() && /*#__PURE__*/_jsxs(View, {
-            style: styles.imageContainer,
-            children: [_currentHologramMaskImage ? /*#__PURE__*/_jsx(Image, {
-              source: {
-                uri: `data:image/jpeg;base64,${_currentHologramMaskImage}`
-              },
-              style: styles.faceImage
-            }) : /*#__PURE__*/_jsx(View, {
-              style: [styles.faceImage, {
-                backgroundColor: '#333',
-                justifyContent: 'center'
-              }],
-              children: /*#__PURE__*/_jsx(TextView, {
-                style: {
-                  color: '#666',
-                  fontSize: 10,
-                  textAlign: 'center'
-                },
-                children: "Waiting..."
-              })
-            }), /*#__PURE__*/_jsx(TextView, {
-              style: [styles.imageContainerText, _currentHologramMaskImage && {
-                color: '#4CAF50'
-              }],
-              children: `${_currentHologramMaskImage ? '✓ ' : ''}Mask`
-            })]
           }), isDebugEnabled() && /*#__PURE__*/_jsxs(View, {
             style: styles.imageContainer,
             children: [currentHologramImage ? /*#__PURE__*/_jsx(Image, {
@@ -2269,31 +2293,30 @@ const IdentityDocumentCamera = ({
               children: `${currentHologramImage ? '✓ ' : latestHologramFaceImage ? '⏳ ' : ''}Hologram`
             })]
           }), isDebugEnabled() && /*#__PURE__*/_jsxs(View, {
-            style: styles.debugInfoContainer,
-            children: [/*#__PURE__*/_jsx(TextView, {
-              style: styles.debugInfoText,
-              children: `Step: ${nextStep}`
-            }), /*#__PURE__*/_jsx(TextView, {
-              style: styles.debugInfoText,
-              children: `Status: ${status}`
-            }), /*#__PURE__*/_jsx(TextView, {
-              style: styles.debugInfoText,
-              children: `Face: ${currentFaceImage ? '✓ CAPTURED' : '✗ WAITING'} ${!faceDetectionEnabled ? '(DISABLED)' : ''}`
-            }), /*#__PURE__*/_jsx(TextView, {
-              style: styles.debugInfoText,
-              children: `Hologram: ${currentHologramImage ? '✓ CAPTURED' : `${hologramImageCount}/${HOLOGRAM_IMAGE_COUNT} imgs`} (retry ${hologramDetectionCurrentRetryCount.current}/${HOLOGRAM_DETECTION_RETRY_COUNT})`
-            }), /*#__PURE__*/_jsx(TextView, {
-              style: styles.debugInfoText,
-              children: `2nd Face: ${currentSecondaryFaceImage ? '✓ CAPTURED' : '✗ WAITING'} (retry ${secondaryFaceDetectionCurrentRetryCount.current}/${SECOND_FACE_DETECTION_RETRY_COUNT})`
-            }), /*#__PURE__*/_jsx(TextView, {
-              style: styles.debugInfoText,
-              children: `Flash: ${isTorchOn ? '🔦 ON' : '🔦 OFF'}`
-            }), /*#__PURE__*/_jsx(TextView, {
-              style: styles.debugInfoText,
-              children: `Brightness: ${isBrightnessLow ? '⚠️ LOW' : '✓ OK'}`
+            style: styles.imageContainer,
+            children: [_currentHologramMaskImage ? /*#__PURE__*/_jsx(Image, {
+              source: {
+                uri: `data:image/jpeg;base64,${_currentHologramMaskImage}`
+              },
+              style: styles.faceImage
+            }) : /*#__PURE__*/_jsx(View, {
+              style: [styles.faceImage, {
+                backgroundColor: '#333',
+                justifyContent: 'center'
+              }],
+              children: /*#__PURE__*/_jsx(TextView, {
+                style: {
+                  color: '#666',
+                  fontSize: 10,
+                  textAlign: 'center'
+                },
+                children: "Waiting..."
+              })
             }), /*#__PURE__*/_jsx(TextView, {
-              style: styles.debugInfoText,
-              children: `Blur: ${isFrameBlurry ? '⚠️ BLURRY' : '✓ OK'}`
+              style: [styles.imageContainerText, _currentHologramMaskImage && {
+                color: '#4CAF50'
+              }],
+              children: `${_currentHologramMaskImage ? '✓ ' : ''}Mask`
             })]
           })]
         })
@@ -2323,98 +2346,123 @@ const IdentityDocumentCamera = ({
           loop: true,
           autoPlay: true
         }) : null
-      }), isDebugEnabled() && /*#__PURE__*/_jsxs(View, {
+      }), isDebugEnabled() && /*#__PURE__*/_jsx(SafeAreaView, {
         style: {
           position: 'absolute',
-          top: 10,
-          right: 10,
-          backgroundColor: 'rgba(0, 0, 0, 0.85)',
-          padding: 10,
-          borderRadius: 8,
-          borderWidth: 1,
-          borderColor: '#FF6B6B',
-          maxWidth: 200
+          top: 0,
+          left: 0,
+          right: 0,
+          alignItems: 'center',
+          pointerEvents: 'none'
         },
-        children: [/*#__PURE__*/_jsx(TextView, {
-          style: {
-            color: '#FF6B6B',
-            fontSize: 11,
-            fontWeight: 'bold',
-            marginBottom: 6
-          },
-          children: "\uD83D\uDC1B DEBUG MODE"
-        }), /*#__PURE__*/_jsx(TextView, {
-          style: {
-            color: '#88D8B0',
-            fontSize: 9,
-            marginBottom: 2
-          },
-          children: `Step: ${nextStep}`
-        }), /*#__PURE__*/_jsx(TextView, {
-          style: {
-            color: '#88D8B0',
-            fontSize: 9,
-            marginBottom: 2
-          },
-          children: `Status: ${status}`
-        }), /*#__PURE__*/_jsx(TextView, {
-          style: {
-            color: '#88D8B0',
-            fontSize: 9,
-            marginBottom: 2
-          },
-          children: `Doc Type: ${detectedDocumentType}`
-        }), /*#__PURE__*/_jsx(TextView, {
+        children: /*#__PURE__*/_jsxs(View, {
           style: {
-            color: '#88D8B0',
-            fontSize: 9,
-            marginBottom: 2
+            marginTop: 10,
+            backgroundColor: 'rgba(0, 0, 0, 0.85)',
+            padding: 10,
+            borderRadius: 8,
+            borderWidth: 1,
+            borderColor: '#FF6B6B',
+            minWidth: 200
           },
-          children: `Face: ${currentFaceImage ? '✓' : '✗'}`
-        }), !onlyMRZScan && /*#__PURE__*/_jsxs(_Fragment, {
           children: [/*#__PURE__*/_jsx(TextView, {
+            style: {
+              color: '#FF6B6B',
+              fontSize: 11,
+              fontWeight: 'bold',
+              marginBottom: 6,
+              textAlign: 'center'
+            },
+            children: "DEBUG MODE"
+          }), /*#__PURE__*/_jsx(TextView, {
+            style: {
+              color: '#88D8B0',
+              fontSize: 9,
+              marginBottom: 2
+            },
+            children: `Step: ${nextStep}`
+          }), /*#__PURE__*/_jsx(TextView, {
+            style: {
+              color: '#88D8B0',
+              fontSize: 9,
+              marginBottom: 2
+            },
+            children: `Status: ${status}`
+          }), /*#__PURE__*/_jsx(TextView, {
+            style: {
+              color: '#88D8B0',
+              fontSize: 9,
+              marginBottom: 2
+            },
+            children: `Doc Type: ${detectedDocumentType}`
+          }), /*#__PURE__*/_jsx(TextView, {
+            style: {
+              color: '#88D8B0',
+              fontSize: 9,
+              marginBottom: 2
+            },
+            children: `Brightness: ${isBrightnessLow ? '⚠️ LOW' : '✓'}`
+          }), /*#__PURE__*/_jsx(TextView, {
             style: {
               color: '#88D8B0',
               fontSize: 9,
               marginBottom: 2
             },
-            children: `2nd Face: ${currentSecondaryFaceImage ? '✓' : '✗'}`
+            children: `Blur: ${isFrameBlurry ? '⚠️' : '✓'}`
           }), /*#__PURE__*/_jsx(TextView, {
             style: {
               color: '#88D8B0',
               fontSize: 9,
               marginBottom: 2
             },
-            children: `Hologram: ${hologramImageCount}/${HOLOGRAM_IMAGE_COUNT}`
+            children: `Flash: ${isTorchOn ? '🔦' : '○'}`
+          }), /*#__PURE__*/_jsx(TextView, {
+            style: {
+              color: '#88D8B0',
+              fontSize: 9
+            },
+            children: `Face Detection: ${faceDetectionEnabled ? '✓' : '✗'}`
           })]
-        }), /*#__PURE__*/_jsx(TextView, {
-          style: {
-            color: '#88D8B0',
-            fontSize: 9,
-            marginBottom: 2
-          },
-          children: `Brightness: ${isBrightnessLow ? '⚠️ LOW' : '✓'}`
-        }), /*#__PURE__*/_jsx(TextView, {
-          style: {
-            color: '#88D8B0',
-            fontSize: 9,
-            marginBottom: 2
-          },
-          children: `Blur: ${isFrameBlurry ? '⚠️' : '✓'}`
-        }), /*#__PURE__*/_jsx(TextView, {
-          style: {
-            color: '#88D8B0',
-            fontSize: 9,
-            marginBottom: 2
-          },
-          children: `Flash: ${isTorchOn ? '🔦' : '○'}`
-        }), /*#__PURE__*/_jsx(TextView, {
+        })
+      }), testMode && testModeData && /*#__PURE__*/_jsx(SafeAreaView, {
+        style: {
+          position: 'absolute',
+          bottom: 0,
+          left: 0,
+          right: 0,
+          maxHeight: '40%',
+          backgroundColor: 'rgba(0, 0, 0, 0.95)',
+          borderTopWidth: 2,
+          borderTopColor: '#FFA500'
+        },
+        children: /*#__PURE__*/_jsx(ScrollView, {
           style: {
-            color: '#88D8B0',
-            fontSize: 9
+            flex: 1
           },
-          children: `Face Detection: ${faceDetectionEnabled ? '✓' : '✗'}`
-        })]
+          children: /*#__PURE__*/_jsxs(View, {
+            style: {
+              padding: 10
+            },
+            children: [/*#__PURE__*/_jsx(TextView, {
+              style: {
+                color: '#FFA500',
+                fontSize: 12,
+                fontWeight: 'bold',
+                marginBottom: 8,
+                textAlign: 'center'
+              },
+              children: "MRZ Text Read"
+            }), /*#__PURE__*/_jsx(TextView, {
+              style: {
+                color: '#FFFFFF',
+                fontSize: 9,
+                fontFamily: 'monospace',
+                lineHeight: 16
+              },
+              children: testModeData.mrzText.split('\n').map((line, i) => `Line ${i + 1}: ${line} (${line.length} chars)`).join('\n')
+            })]
+          })
+        })
       })]
     })]
   });
@@ -2523,7 +2571,7 @@ const styles = StyleSheet.create({
     display: 'flex',
     flexDirection: 'row',
     gap: 10,
-    justifyContent: 'flex-start',
+    justifyContent: 'center',
     flexWrap: 'wrap'
   },
   cardDetectionRow: {
@@ -2563,16 +2611,6 @@ const styles = StyleSheet.create({
     flexDirection: 'column',
     alignItems: 'center'
   },
-  debugInfoContainer: {
-    flex: 1,
-    paddingLeft: 10
-  },
-  debugInfoText: {
-    color: 'white',
-    fontSize: 8,
-    fontWeight: 'bold',
-    marginBottom: 2
-  },
   guide: {
     flex: 1,
     display: 'flex',

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

@@ -39,12 +39,9 @@ const QrCodeScannerCamera = ({
       right: width * (0.97 - marginBuffer),
       bottom: height * (0.65 - marginBuffer)
     };
-    console.log(`[QR Frame Check] Frame: ${width}x${height}, Scanning: left=${scanningFrame.left}, top=${scanningFrame.top}, right=${scanningFrame.right}, bottom=${scanningFrame.bottom}`);
-    console.log(`[QR Frame Check] Code bbox: left=${boundingBox.left}, top=${boundingBox.top}, right=${boundingBox.right}, bottom=${boundingBox.bottom}`);
 
     // Check if entire bounding box is within scanning frame (with margin buffer)
     const isInFrame = boundingBox.left >= scanningFrame.left && boundingBox.top >= scanningFrame.top && boundingBox.right <= scanningFrame.right && boundingBox.bottom <= scanningFrame.bottom;
-    console.log(`[QR Frame Check] Is in frame: ${isInFrame}`);
     return isInFrame;
   };
   const handleFrame = useCallback(async event => {