Use secret from keychain (selfxyz#108)

Author: 0xturboblitz

app/src/Navigation.tsx

@@ -20,7 +20,6 @@ import DisclaimerScreen from './screens/DisclaimerScreen';
 import HomeScreen from './screens/HomeScreen';
 import LaunchScreen from './screens/LaunchScreen';
 import MockDataScreen from './screens/MockDataScreen';
-import NextScreen from './screens/NextScreen';
 import ConfirmBelongingScreen from './screens/Onboarding/ConfirmBelongingScreen';
 import LoadingScreen from './screens/Onboarding/LoadingScreen';
 import PassportCameraScreen from './screens/Onboarding/PassportCameraScreen';
@@ -117,13 +116,6 @@ const AppNavigation = createNativeStackNavigator({
         title: 'Mock Passport',
       },
     },
-    // TODO: rename ? maybe summary
-    NextScreen: {
-      screen: NextScreen,
-      options: {
-        title: 'TODO: NextScreen',
-      },
-    },
     /**
      * HOME SECTION
      */

app/src/screens/AccountFlow/RecoverWithPhraseScreen.tsx

@@ -9,6 +9,7 @@ import { Text, TextArea, View, XStack, YStack } from 'tamagui';
 import { SecondaryButton } from '../../components/buttons/SecondaryButton';
 import Description from '../../components/typography/Description';
 import Paste from '../../images/icons/paste.svg';
+import { useAuth } from '../../stores/authProvider';
 import {
   black,
   slate300,
@@ -17,14 +18,14 @@ import {
   slate700,
   white,
 } from '../../utils/colors';
-import { restoreSecret } from '../../utils/keychain';
 
 interface RecoverWithPhraseScreenProps {}
 
 const RecoverWithPhraseScreen: React.FC<
   RecoverWithPhraseScreenProps
 > = ({}) => {
   const navigation = useNavigation();
+  const { restoreAccountFromMnemonic } = useAuth();
   const [mnemonic, setMnemonic] = useState<string>();
 
   const onPaste = useCallback(async () => {
@@ -38,7 +39,7 @@ const RecoverWithPhraseScreen: React.FC<
     if (!mnemonic || !ethers.Mnemonic.isValidMnemonic(mnemonic)) {
       return;
     }
-    await restoreSecret(mnemonic);
+    await restoreAccountFromMnemonic(mnemonic);
     navigation.navigate('Home');
   }, [mnemonic]);
 

app/src/screens/MockDataScreen.tsx

@@ -20,9 +20,8 @@ import {
 
 import { countryCodes } from '../../../common/src/constants/constants';
 import { genMockPassportData } from '../../../common/src/utils/passports/genMockPassportData';
-import { initPassportDataParsing } from '../../../common/src/utils/passports/passport';
 import CustomButton from '../components/CustomButton';
-import useUserStore from '../stores/userStore';
+import { usePassport } from '../stores/passportDataProvider';
 import {
   bgWhite,
   borderColor,
@@ -48,6 +47,7 @@ const MockDataScreen: React.FC<MockDataScreenProps> = ({}) => {
       date.toISOString().slice(8, 10)
     ).toString();
   };
+  const { setData } = usePassport();
 
   const [selectedCountry, setSelectedCountry] = useState('USA');
   const [selectedAlgorithm, setSelectedAlgorithm] = useState('rsa sha256');
@@ -91,7 +91,7 @@ const MockDataScreen: React.FC<MockDataScreenProps> = ({}) => {
             castDate(-age),
             castDate(expiryYears),
             randomPassportNumber,
-            'HENAO MONTOYA', // this name is the OFAC list
+            'HENAO MONTOYA', // this name is on the OFAC list
             'ARCANGEL DE JESUS',
           );
         } else {
@@ -107,15 +107,14 @@ const MockDataScreen: React.FC<MockDataScreenProps> = ({}) => {
             randomPassportNumber,
           );
         }
-        const passportDataInit = initPassportDataParsing(mockPassportData);
-        useUserStore.getState().registerPassportData(passportDataInit);
-        useUserStore.getState().setRegistered(true);
+
+        setData(mockPassportData);
         resolve(null);
       }, 0),
     );
 
     await new Promise(resolve => setTimeout(resolve, 1000));
-    navigation.navigate('NextScreen');
+    navigation.navigate('ConfirmBelongingScreen');
   }, [selectedAlgorithm, selectedCountry, age, expiryYears, isInOfacList]);
 
   return (

app/src/screens/NextScreen.tsx

@@ -5,12 +5,12 @@ import LottieView from 'lottie-react-native';
 
 // Import passport data generation and payload functions from common
 import { genMockPassportData } from '../../../../common/src/utils/passports/genMockPassportData';
-import { initPassportDataParsing } from '../../../../common/src/utils/passports/passport';
 // Import animations
 import failAnimation from '../../assets/animations/loading/fail.json';
 import miscAnimation from '../../assets/animations/loading/misc.json';
 import successAnimation from '../../assets/animations/loading/success.json';
 import useHapticNavigation from '../../hooks/useHapticNavigation';
+// import { usePassport } from '../../stores/passportDataProvider';
 import { ProofStatusEnum, useProofInfo } from '../../stores/proofProvider';
 import { registerPassport } from '../../utils/proving/payload';
 
@@ -29,6 +29,7 @@ const LoadingScreen: React.FC = () => {
   };
   const [animationSource, setAnimationSource] = useState<any>(miscAnimation);
   const { status, setStatus } = useProofInfo();
+  // const { getPassportDataAndSecret } = usePassport();
 
   // Ensure we only set the initial status once on mount (if needed)
   useEffect(() => {
@@ -66,8 +67,17 @@ const LoadingScreen: React.FC = () => {
             '000101',
             '300101',
           );
-          const passportDataInit = initPassportDataParsing(passportData);
-          await registerPassport(passportDataInit);
+          await registerPassport(passportData, '0');
+
+          // const passportDataAndSecret = await getPassportDataAndSecret();
+          // if (!passportDataAndSecret) {
+          //   return;
+          // }
+
+          // const { passportData, secret } = passportDataAndSecret.data;
+
+          // // This will trigger sendPayload(), which updates global status via your tee.ts code.
+          // registerPassport(passportData, secret);
         } catch (error) {
           console.error('Error processing payload:', error);
           setStatus(ProofStatusEnum.ERROR);

app/src/screens/Onboarding/LoadingScreen.tsx

@@ -7,7 +7,6 @@ import { Image, Text, View, YStack } from 'tamagui';
 
 import { ArgumentsDisclose } from '../../../../common/src/utils/appType';
 import { genMockPassportData } from '../../../../common/src/utils/passports/genMockPassportData';
-import { initPassportDataParsing } from '../../../../common/src/utils/passports/passport';
 import miscAnimation from '../../assets/animations/loading/misc.json';
 import Disclosures from '../../components/Disclosures';
 import { HeldPrimaryButton } from '../../components/buttons/PrimaryButtonLongHold';
@@ -22,7 +21,7 @@ import { sendVcAndDisclosePayload } from '../../utils/proving/payload';
 
 const ProveScreen: React.FC = () => {
   const { navigate } = useNavigation();
-  const { getData } = usePassport();
+  const { getPassportDataAndSecret } = usePassport();
   const { selectedApp, setStatus } = useProofInfo();
 
   // Add effect to log when selectedApp changes
@@ -60,8 +59,13 @@ const ProveScreen: React.FC = () => {
     buttonTap();
     navigate('ProofRequestStatusScreen');
     try {
-      const passportData = await getData();
-      await sendVcAndDisclosePayload('0', passportData!.data, selectedApp);
+      const passportDataAndSecret = await getPassportDataAndSecret();
+      if (!passportDataAndSecret) {
+        return;
+      }
+
+      const { passportData, secret } = passportDataAndSecret.data;
+      await sendVcAndDisclosePayload(secret, passportData, selectedApp);
     } catch (e) {
       console.log('Error sending VC and disclose payload', e);
       setStatus(ProofStatusEnum.ERROR);
@@ -78,8 +82,7 @@ const ProveScreen: React.FC = () => {
       '000101',
       '300101',
     );
-    const passportDataInit = initPassportDataParsing(passportData);
-    await sendVcAndDisclosePayload('0', passportDataInit, selectedApp);
+    await sendVcAndDisclosePayload('0', passportData, selectedApp);
   }
 
   return (

app/src/screens/ProveFlow/ProveScreen.tsx

@@ -23,7 +23,6 @@ const items: (keyof RootStackParamList)[] = [
   'AccountVerifiedSuccess',
   'ConfirmBelongingScreen',
   'CreateMock',
-  'NextScreen',
   'Home',
   'Disclaimer',
   'QRCodeViewFinder',
@@ -92,16 +91,11 @@ const ScreenSelector = ({}) => {
 };
 
 const DevSettingsScreen: React.FC<DevSettingsScreenProps> = ({}) => {
-  const {
-    clearPassportDataFromStorage,
-    clearPassportMetadataFromStorage,
-    setRegistered,
-  } = useUserStore();
+  const { clearPassportDataFromStorage, setRegistered } = useUserStore();
 
   const nav = useNavigation();
 
   function handleRestart() {
-    clearPassportMetadataFromStorage();
     clearPassportDataFromStorage();
     setRegistered(false);
     nav.navigate('Launch');

app/src/screens/Settings/DevSettingsScreen.tsx

@@ -69,7 +69,7 @@ async function restoreFromPrivateKey(privateKey: string) {
   return loadSecret();
 }
 
-async function loadSecretOrCreateIt() {
+export async function loadSecretOrCreateIt() {
   const secret = await loadSecret();
   if (secret) {
     return secret;