Revert "Mixpanel tweaks (#971)"

This reverts commit 7536875.

Author: transphorm

app/jest.setup.js

@@ -151,7 +151,7 @@ jest.mock('react-native-check-version', () => ({
 
 // Mock @react-native-community/netinfo
 jest.mock('@react-native-community/netinfo', () => ({
-  addEventListener: jest.fn(() => jest.fn()),
+  addEventListener: jest.fn(),
   useNetInfo: jest.fn().mockReturnValue({
     type: 'wifi',
     isConnected: true,
@@ -161,9 +161,7 @@ jest.mock('@react-native-community/netinfo', () => ({
       cellularGeneration: '4g',
     },
   }),
-  fetch: jest
-    .fn()
-    .mockResolvedValue({ isConnected: true, isInternetReachable: true }),
+  fetch: jest.fn(),
 }));
 
 // Mock react-native-nfc-manager
@@ -228,6 +226,11 @@ NativeModules.PassportReader = {
   flush: jest.fn(),
 };
 
+jest.mock('@react-native-community/netinfo', () => ({
+  addEventListener: jest.fn(() => jest.fn()),
+  fetch: jest.fn(() => Promise.resolve({ isConnected: true })),
+}));
+
 // Mock @stablelib packages
 jest.mock('@stablelib/cbor', () => ({
   encode: jest.fn(),

app/src/mocks/react-native-passport-reader.ts

@@ -3,39 +3,6 @@
 // NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
 // Web mock for react-native-passport-reader
-
-// Mock PassportReader object with analytics methods
-export const PassportReader = {
-  configure: (
-    token: string,
-    enableDebug?: boolean,
-    flushPolicies?: {
-      flushInterval?: number;
-      flushCount?: number;
-      flushOnBackground?: boolean;
-      flushOnForeground?: boolean;
-      flushOnNetworkChange?: boolean;
-    },
-  ) => {
-    // No-op for web
-    return Promise.resolve();
-  },
-  trackEvent: (name: string, properties?: Record<string, unknown>) => {
-    // No-op for web
-    return Promise.resolve();
-  },
-  flush: () => {
-    // No-op for web
-    return Promise.resolve();
-  },
-  reset: () => {
-    // No-op for web
-    return Promise.resolve();
-  },
-  scan: async () => {
-    throw new Error('NFC scanning is not supported on web');
-  },
-};
 export const reset = async () => {
   // No-op for web
   return Promise.resolve();

app/src/utils/analytics.ts

@@ -3,7 +3,7 @@
 // NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
 import { AppState, type AppStateStatus } from 'react-native';
-import { PassportReader } from 'react-native-passport-reader';
+import { NativeModules } from 'react-native';
 import { ENABLE_DEBUG_LOGS, MIXPANEL_NFC_PROJECT_TOKEN } from '@env';
 import NetInfo from '@react-native-community/netinfo';
 import type { JsonMap, JsonValue } from '@segment/analytics-react-native';
@@ -161,32 +161,28 @@ export const cleanupAnalytics = () => {
 const setupFlushPolicies = () => {
   AppState.addEventListener('change', (state: AppStateStatus) => {
     if (state === 'background' || state === 'active') {
-      flushMixpanelEvents().catch(console.warn);
+      flushMixpanelEvents();
     }
   });
 
   NetInfo.addEventListener(state => {
     isConnected = state.isConnected ?? true;
     if (isConnected) {
-      flushMixpanelEvents().catch(console.warn);
+      flushMixpanelEvents();
     }
   });
 };
 
-const flushMixpanelEvents = async () => {
+const flushMixpanelEvents = () => {
   if (!MIXPANEL_NFC_PROJECT_TOKEN) return;
   try {
     if (__DEV__) console.log('[Mixpanel] flush');
     // Send any queued events before flushing
     while (eventQueue.length > 0) {
       const evt = eventQueue.shift()!;
-      if (PassportReader.trackEvent) {
-        await Promise.resolve(
-          PassportReader.trackEvent(evt.name, evt.properties),
-        );
-      }
+      NativeModules.PassportReader?.trackEvent?.(evt.name, evt.properties);
     }
-    if (PassportReader.flush) await Promise.resolve(PassportReader.flush());
+    NativeModules.PassportReader?.flush?.();
     eventCount = 0;
   } catch (err) {
     if (__DEV__) console.warn('Mixpanel flush failed', err);
@@ -198,20 +194,20 @@ const flushMixpanelEvents = async () => {
 };
 
 // --- Mixpanel NFC Analytics ---
-export const configureNfcAnalytics = async () => {
+export const configureNfcAnalytics = () => {
   if (!MIXPANEL_NFC_PROJECT_TOKEN || mixpanelConfigured) return;
   const enableDebugLogs = JSON.parse(String(ENABLE_DEBUG_LOGS));
-  if (PassportReader.configure) {
-    await Promise.resolve(
-      PassportReader.configure(MIXPANEL_NFC_PROJECT_TOKEN, enableDebugLogs, {
-        flushInterval: 20,
-        flushCount: 5,
-        flushOnBackground: true,
-        flushOnForeground: true,
-        flushOnNetworkChange: true,
-      }),
-    );
-  }
+  NativeModules.PassportReader.configure(
+    MIXPANEL_NFC_PROJECT_TOKEN,
+    enableDebugLogs,
+    {
+      flushInterval: 20,
+      flushCount: 5,
+      flushOnBackground: true,
+      flushOnForeground: true,
+      flushOnNetworkChange: true,
+    },
+  );
   setupFlushPolicies();
   mixpanelConfigured = true;
 };
@@ -226,30 +222,28 @@ export const flushAllAnalytics = () => {
   flushAnalytics();
 
   // Flush Mixpanel events
-  flushMixpanelEvents().catch(console.warn);
+  flushMixpanelEvents();
 };
 
-export const trackNfcEvent = async (
+export const trackNfcEvent = (
   name: string,
   properties?: Record<string, unknown>,
 ) => {
   if (!MIXPANEL_NFC_PROJECT_TOKEN) return;
-  if (!mixpanelConfigured) await configureNfcAnalytics();
+  if (!mixpanelConfigured) configureNfcAnalytics();
 
   if (!isConnected) {
     eventQueue.push({ name, properties });
     return;
   }
 
   try {
-    if (PassportReader.trackEvent) {
-      await Promise.resolve(PassportReader.trackEvent(name, properties));
-    }
+    NativeModules.PassportReader?.trackEvent?.(name, properties);
     eventCount++;
     if (eventCount >= 5) {
-      flushMixpanelEvents().catch(console.warn);
+      flushMixpanelEvents();
     }
-  } catch {
+  } catch (err) {
     eventQueue.push({ name, properties });
   }
 };

app/src/utils/nfcScanner.ts

@@ -3,12 +3,8 @@
 // NOTE: Converts to Apache-2.0 on 2029-06-11 per LICENSE.
 
 import { Buffer } from 'buffer';
-import { Platform } from 'react-native';
-import {
-  PassportReader,
-  reset,
-  scan as scanDocument,
-} from 'react-native-passport-reader';
+import { NativeModules, Platform } from 'react-native';
+import { reset, scan as scanDocument } from 'react-native-passport-reader';
 
 import type { PassportData } from '@selfxyz/common/types';
 
@@ -48,7 +44,7 @@ export const parseScanResponse = (response: unknown) => {
 };
 
 export const scan = async (inputs: Inputs) => {
-  await configureNfcAnalytics();
+  configureNfcAnalytics();
 
   return Platform.OS === 'android'
     ? await scanAndroid(inputs)
@@ -67,14 +63,16 @@ const scanAndroid = async (inputs: Inputs) => {
 };
 
 const scanIOS = async (inputs: Inputs) => {
-  return await Promise.resolve(
-    PassportReader.scan({
-      documentNumber: inputs.passportNumber,
-      dateOfBirth: inputs.dateOfBirth,
-      dateOfExpiry: inputs.dateOfExpiry,
-      canNumber: inputs.canNumber ?? '',
-      useCan: inputs.useCan ?? false,
-    }),
+  return await NativeModules.PassportReader.scanDocument(
+    inputs.passportNumber,
+    inputs.dateOfBirth,
+    inputs.dateOfExpiry,
+    inputs.canNumber ?? '',
+    inputs.useCan ?? false,
+    inputs.skipPACE ?? false,
+    inputs.skipCA ?? false,
+    inputs.extendedMode ?? false,
+    inputs.usePacePolling ?? false,
   );
 };