Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions app/src/consts/analytics.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export const PassportEvents = {
PASSPORT_PARSE_FAILED: 'Passport: Passport Parse Failed',
PASSPORT_PARSED: 'Passport: Passport Parsed',
START_PASSPORT_NFC: 'Passport: Start Passport NFC',
PASSPORT_DATA_NOT_FOUND: 'Passport: Passport Data Not Found',
UNSUPPORTED_PASSPORT: 'Passport: Passport Not Supported',
};

Expand All @@ -63,6 +64,47 @@ export const ProofEvents = {
PROVING_STATE_CHANGE: 'Proof: Proving State Change',
REGISTER_COMPLETED: 'Proof: Register Completed',
ALREADY_REGISTERED: 'Proof: Already Registered',
PROVING_INIT: 'Proof: Proving Machine Init',
CLEANUP_STARTED: 'Proof: Connections Cleanup Started',
CLEANUP_COMPLETED: 'Proof: Connections Cleanup Completed',
DOCUMENT_LOAD_STARTED: 'Proof: Load Selected Document Started',
LOAD_SECRET_FAILED: 'Proof: Load Secret Failed',
FETCH_DATA_STARTED: 'Proof: Fetch Data Started',
FETCH_DATA_SUCCESS: 'Proof: Fetch Data Succeeded',
FETCH_DATA_FAILED: 'Proof: Fetch Data Failed',
VALIDATION_STARTED: 'Proof: Validation Started',
VALIDATION_SUCCESS: 'Proof: Validation Succeeded',
VALIDATION_FAILED: 'Proof: Validation Failed',
PASSPORT_NULLIFIER_ONCHAIN: 'Proof: Passport Nullifier Onchain',
DSC_IN_TREE: 'Proof: DSC Already In Tree',
TEE_CONN_STARTED: 'Proof: TEE Connection Started',
TEE_CONN_SUCCESS: 'Proof: TEE Connection Succeeded',
TEE_CONN_FAILED: 'Proof: TEE Connection Failed',
WS_HELLO_SENT: 'Proof: WS Hello Sent',
WS_HELLO_ACK: 'Proof: WS Hello Acknowledged',
ATTESTATION_RECEIVED: 'Proof: Attestation Received',
ATTESTATION_VERIFIED: 'Proof: Attestation Verified',
SHARED_KEY_DERIVED: 'Proof: Shared Key Derived',
TEE_WS_ERROR: 'Proof: TEE WS Error',
TEE_WS_CLOSED: 'Proof: TEE WS Closed',
DEVICE_TOKEN_REG_STARTED: 'Proof: Device Token Registration Started',
DEVICE_TOKEN_REG_SUCCESS: 'Proof: Device Token Registration Succeeded',
DEVICE_TOKEN_REG_FAILED: 'Proof: Device Token Registration Failed',
PAYLOAD_GEN_STARTED: 'Proof: Payload Generation Started',
PAYLOAD_GEN_COMPLETED: 'Proof: Payload Generation Completed',
PAYLOAD_ENCRYPTED: 'Proof: Payload Encrypted',
PAYLOAD_SENT: 'Proof: Payload Sent',
SOCKETIO_CONN_STARTED: 'Proof: Socket.IO Connection Started',
SOCKETIO_SUBSCRIBED: 'Proof: Socket.IO Subscribed',
SOCKETIO_STATUS_RECEIVED: 'Proof: Socket.IO Status Received',
SOCKETIO_PROOF_SUCCESS: 'Proof: Socket.IO Proof Success',
SOCKETIO_PROOF_FAILURE: 'Proof: Socket.IO Proof Failure',
SOCKETIO_DISCONNECT_UNEXPECTED: 'Proof: Socket.IO Disconnected Unexpectedly',
SOCKETIO_CONNECT_ERROR: 'Proof: Socket.IO Connect Error',
POST_PROVING_STARTED: 'Proof: Post Proving Started',
POST_PROVING_CHAIN_STEP: 'Proof: Post Proving Chain Step',
POST_PROVING_COMPLETED: 'Proof: Post Proving Completed',
USER_CONFIRMED: 'Proof: User Confirmed',
QR_SCAN_CANCELLED: 'Proof: QR Scan Cancelled',
QR_SCAN_FAILED: 'Proof: QR Scan Failed',
QR_SCAN_SUCCESS: 'Proof: QR Scan Success',
Expand Down
20 changes: 3 additions & 17 deletions app/src/screens/misc/LoadingScreen.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: BUSL-1.1; Copyright (c) 2025 Social Connect Labs, Inc.; Licensed under BUSL-1.1 (see LICENSE); Apache-2.0 from 2029-06-11

import { StaticScreenProps, useIsFocused } from '@react-navigation/native';

Check warning on line 3 in app/src/screens/misc/LoadingScreen.tsx

View workflow job for this annotation

GitHub Actions / lint

Run autofix to sort these imports!

Check warning on line 3 in app/src/screens/misc/LoadingScreen.tsx

View workflow job for this annotation

GitHub Actions / lint

Run autofix to sort these imports!
import { PassportData } from '@selfxyz/common';
import LottieView from 'lottie-react-native';
import React, { useEffect, useState } from 'react';
Expand All @@ -11,14 +11,14 @@
import failAnimation from '../../assets/animations/loading/fail.json';
import proveLoadingAnimation from '../../assets/animations/loading/prove.json';
import successAnimation from '../../assets/animations/loading/success.json';
import { PassportEvents, ProofEvents } from '../../consts/analytics';

import useHapticNavigation from '../../hooks/useHapticNavigation';
import CloseWarningIcon from '../../images/icons/close-warning.svg';
import {
clearPassportData,
loadPassportDataAndSecret,
} from '../../providers/passportDataProvider';
import analytics from '../../utils/analytics';

import { black, slate400, white, zinc500, zinc900 } from '../../utils/colors';
import { extraYPadding } from '../../utils/constants';
import { advercase, dinot } from '../../utils/fonts';
Expand All @@ -31,8 +31,6 @@
} from '../../utils/proving/provingMachine';
import { checkPassportSupported } from '../../utils/proving/validateDocument';

const { trackEvent } = analytics();

type LoadingScreenProps = StaticScreenProps<{}>;

const LoadingScreen: React.FC<LoadingScreenProps> = ({}) => {
Expand Down Expand Up @@ -75,11 +73,7 @@
const canCloseApp = safeToCloseStates.includes(currentState);

const handleUnsupportedPassport = async (_passportData: PassportData) => {
const isSupported = await checkPassportSupported(_passportData);
trackEvent(PassportEvents.UNSUPPORTED_PASSPORT, {
reason: isSupported.status,
details: isSupported.details,
});
await checkPassportSupported(_passportData);
console.log('Passport not supported');
clearPassportData();
goToUnsupportedScreen();
Expand All @@ -105,9 +99,6 @@
}
} catch (error: any) {
console.error('Error loading passport data:', error);
trackEvent(PassportEvents.DATA_LOAD_ERROR, {
error: error?.message || 'Unknown error',
});
}
}

Expand Down Expand Up @@ -136,12 +127,7 @@
console.log('[LoadingScreen] Current proving state:', currentState);
console.log('[LoadingScreen] FCM token available:', !!fcmToken);

trackEvent(ProofEvents.PROVING_STATE_CHANGE, {
state: currentState,
fcmTokenAvailable: !!fcmToken,
passportDataAvailable: !!passportData,
});

Check warning on line 130 in app/src/screens/misc/LoadingScreen.tsx

View workflow job for this annotation

GitHub Actions / lint

Delete `⏎`

Check warning on line 130 in app/src/screens/misc/LoadingScreen.tsx

View workflow job for this annotation

GitHub Actions / lint

Delete `⏎`
// Update UI if passport data is available
if (passportData?.passportMetadata) {
// Update loading text based on current state
Expand Down
Loading
Loading