Clean stale ios refs and update / fix typescript config

app/declarations.d.ts

@@ -16,3 +16,8 @@ declare module '*.svg' {
   const content: React.FC<SvgProps>;
   export default content;
 }
+
+declare module '*.json' {
+  const value: any;
+  export default value;
+}

app/ios/Self.xcodeproj/project.pbxproj

@@ -19,9 +19,6 @@
 		1686F0DC2C500F3800841CDE /* QRScannerBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1686F0DB2C500F3800841CDE /* QRScannerBridge.swift */; };
 		1686F0DE2C500F4F00841CDE /* QRScannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1686F0DD2C500F4F00841CDE /* QRScannerViewController.swift */; };
 		1686F0E02C500FBD00841CDE /* QRScannerBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 1686F0DF2C500FBD00841CDE /* QRScannerBridge.m */; };
-		1686F0E42C500FBD00841CDE /* DocumentScanner.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1686F0E12C500FBD00841CDE /* DocumentScanner.swift */; };
-		1686F0E52C500FBD00841CDE /* DocumentScannerBridge.m in Sources */ = {isa = PBXBuildFile; fileRef = 1686F0E22C500FBD00841CDE /* DocumentScannerBridge.m */; };
-		1686F0E62C500FBD00841CDE /* DocumentScannerViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1686F0E32C500FBD00841CDE /* DocumentScannerViewController.swift */; };
 		16E6646E2B8D292500FDD6A0 /* QKMRZScannerViewRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16E6646D2B8D292500FDD6A0 /* QKMRZScannerViewRepresentable.swift */; };
 		16E884A52C5BD764003B7125 /* passport.json in Resources */ = {isa = PBXBuildFile; fileRef = 16E884A42C5BD764003B7125 /* passport.json */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
@@ -55,9 +52,6 @@
 		1686F0DB2C500F3800841CDE /* QRScannerBridge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRScannerBridge.swift; sourceTree = "<group>"; };
 		1686F0DD2C500F4F00841CDE /* QRScannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QRScannerViewController.swift; sourceTree = "<group>"; };
 		1686F0DF2C500FBD00841CDE /* QRScannerBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = QRScannerBridge.m; sourceTree = "<group>"; };
-		1686F0E12C500FBD00841CDE /* DocumentScanner.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentScanner.swift; sourceTree = "<group>"; };
-		1686F0E22C500FBD00841CDE /* DocumentScannerBridge.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = DocumentScannerBridge.m; sourceTree = "<group>"; };
-		1686F0E32C500FBD00841CDE /* DocumentScannerViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DocumentScannerViewController.swift; sourceTree = "<group>"; };
 		169349842CC694DA00166F21 /* OpenPassportDebug.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = OpenPassportDebug.entitlements; path = OpenPassport/OpenPassportDebug.entitlements; sourceTree = "<group>"; };
 		16E6646D2B8D292500FDD6A0 /* QKMRZScannerViewRepresentable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = QKMRZScannerViewRepresentable.swift; sourceTree = "<group>"; };
 		16E884A42C5BD764003B7125 /* passport.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = passport.json; sourceTree = "<group>"; };
@@ -123,9 +117,6 @@
 				1648EB772CC9564D003BEA7D /* LottieView.swift */,
 				164FD9662D569A640067E63B /* QRCodeScannerViewManager.swift */,
 				164FD9682D569C1F0067E63B /* QRCodeScannerViewManager.m */,
-				1686F0E12C500FBD00841CDE /* DocumentScanner.swift */,
-				1686F0E22C500FBD00841CDE /* DocumentScannerBridge.m */,
-				1686F0E32C500FBD00841CDE /* DocumentScannerViewController.swift */,
 			);
 			name = OpenPassport;
 			sourceTree = "<group>";
@@ -393,9 +384,6 @@
 				165E76BD2B8DC4A00000FA90 /* MRZScannerModule.swift in Sources */,
 				BF1044812DD53540009B3688 /* LiveMRZScannerView.swift in Sources */,
 				164FD9692D569C1F0067E63B /* QRCodeScannerViewManager.m in Sources */,
-				1686F0E42C500FBD00841CDE /* DocumentScanner.swift in Sources */,
-				1686F0E52C500FBD00841CDE /* DocumentScannerBridge.m in Sources */,
-				1686F0E62C500FBD00841CDE /* DocumentScannerViewController.swift in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

app/src/components/buttons/AbstractButton.tsx

@@ -19,7 +19,7 @@ interface AbstractButtonProps extends ButtonProps {
   bgColor: string;
   borderColor?: string;
   color: string;
-  onPress?: ((e: any) => void) | null | undefined;
+  onPress?: (e: any) => void;
 }
 
 const { trackEvent: analyticsTrackEvent } = analytics();

app/src/components/native/RCTFragment.tsx

@@ -4,6 +4,14 @@ import React, { useEffect, useRef } from 'react';
 import { NativeSyntheticEvent, requireNativeComponent } from 'react-native';
 import { findNodeHandle, UIManager } from 'react-native';
 
+// Type definition for the view manager config structure
+interface ViewManagerConfig {
+  Commands: {
+    [commandName: string]: number;
+  };
+  [key: string]: any;
+}
+
 export interface RCTFragmentViewManagerProps {
   RCTFragmentViewManager: ReturnType<typeof requireNativeComponent>;
   fragmentComponentName: string;
@@ -33,9 +41,11 @@ function dispatchCommand(
   try {
     UIManager.dispatchViewManagerCommand(
       viewId,
-      UIManager.getViewManagerConfig(fragmentComponentName).Commands[
-        command
-      ].toString(),
+      (
+        UIManager.getViewManagerConfig(
+          fragmentComponentName,
+        ) as ViewManagerConfig
+      ).Commands[command],
       [viewId],
     );
   } catch (e) {

app/src/screens/passport/PassportNFCScanScreen.tsx

@@ -48,6 +48,21 @@ const { trackEvent } = analytics();
 
 interface PassportNFCScanScreenProps {}
 
+/**
+ * Type definition for native events emitted by the Android NFC module.
+ * These events represent the current status of the NFC scanning process.
+ */
+type NativeEventData =
+  | 'Scanning.....'
+  | 'Stop moving.....'
+  | 'Auth.....'
+  | 'Reading DG1.....'
+  | 'Reading SOD.....'
+  | 'Reading DG14.....'
+  | 'Comparing.....'
+  | 'Scanning completed'
+  | ''; // Empty string for reset
+
 const emitter =
   Platform.OS === 'android'
     ? new NativeEventEmitter(NativeModules.nativeModule)
@@ -286,7 +301,11 @@ const PassportNFCScanScreen: React.FC<PassportNFCScanScreenProps> = ({}) => {
       if (Platform.OS === 'android' && emitter) {
         const subscription = emitter.addListener(
           'NativeEvent',
-          (event: string) => console.info(event),
+          (event: Object) => {
+            // Type assertion is safe as we know the native module emits NativeEventData
+            const eventData = event as NativeEventData;
+            console.info(eventData);
+          },
         );
 
         return () => {

app/src/screens/prove/ProveScreen.tsx

@@ -49,7 +49,7 @@ const ProveScreen: React.FC = () => {
   const [hasScrolledToBottom, setHasScrolledToBottom] = useState(false);
   const [scrollViewContentHeight, setScrollViewContentHeight] = useState(0);
   const [scrollViewHeight, setScrollViewHeight] = useState(0);
-  const scrollViewRef = useRef<ScrollView>(null);
+  const scrollViewRef = useRef<React.ComponentRef<typeof ScrollView>>(null);
 
   const isContentShorterThanScrollView = useMemo(
     () => scrollViewContentHeight <= scrollViewHeight,

app/tsconfig.json

@@ -5,7 +5,8 @@
     "resolveJsonModule": true,
     "esModuleInterop": true,
     "customConditions": ["react-native-strict-api"],
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "allowJs": false
   },
   "exclude": [
     "node_modules",

common/package.json

@@ -78,6 +78,7 @@
   },
   "devDependencies": {
     "@types/js-sha1": "^0.6.3",
+    "@types/node": "^20.11.19",
     "@types/node-forge": "^1.3.10",
     "mocha": "^10.7.3",
     "prettier": "^3.3.3",

sdk/core/tsconfig.json

@@ -13,7 +13,7 @@
     "moduleResolution": "node16",
     "baseUrl": "."
   },
-  "include": ["index.ts", "src/**/*", "circuits/**/*", "circuits/**/*.json", "utils/utils.ts"],
+  "include": ["index.ts", "src/**/*", "circuits/**/*", "circuits/**/*.json", "src/utils/utils.ts"],
   "exclude": [
     "node_modules",
     "**/__tests__/*",

yarn.lock

@@ -4002,6 +4002,7 @@ __metadata:
     "@openpassport/zk-kit-lean-imt": "npm:^0.0.6"
     "@openpassport/zk-kit-smt": "npm:^0.0.1"
     "@types/js-sha1": "npm:^0.6.3"
+    "@types/node": "npm:^20.11.19"
     "@types/node-forge": "npm:^1.3.10"
     asn1.js: "npm:^5.4.1"
     asn1js: "npm:^3.0.5"