From 281dd1de88bc0c57694d5e5ac078e78f16621b77 Mon Sep 17 00:00:00 2001
From: turnoffthiscomputer <colin.remi07@gmail.com>
Date: Thu, 22 Aug 2024 18:10:07 +0100
Subject: [PATCH] update app

---
 app/src/screens/MainScreen.tsx     | 56 ++++++++++++++----------------
 app/src/screens/ProveScreen.tsx    |  4 +--
 common/src/utils/generateInputs.ts |  4 ++-
 3 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/app/src/screens/MainScreen.tsx b/app/src/screens/MainScreen.tsx
index 25b8fac6c..6a860e232 100644
--- a/app/src/screens/MainScreen.tsx
+++ b/app/src/screens/MainScreen.tsx
@@ -398,23 +398,23 @@ const MainScreen: React.FC = () => {
 
           <Sheet open={SettingsIsOpen} onOpenChange={setSettingsIsOpen} dismissOnSnapToBottom modal animation="medium" snapPoints={[88]}>
             <Sheet.Overlay />
-            <Sheet.Frame bg={bgColor} borderRadius="$9">
+            <Sheet.Frame bg={bgWhite} borderTopLeftRadius="$9" borderTopRightRadius="$9" pt="$2" pb="$3" >
               <YStack p="$3" pb="$5" f={1} gap={height > 750 ? "$3" : "$1"} mb="$1.5">
                 <XStack gap="$2" ml="$2" >
-                  <H2 color={textColor1}>Settings</H2>
-                  <Cog color={textColor1} mt="$1" alignSelf='center' size="$2" />
+                  <H2 color={textBlack}>Settings</H2>
+                  <Cog color={textBlack} mt="$1" alignSelf='center' size="$2" />
                 </XStack>
 
                 <Fieldset gap="$4" mt="$1" horizontal>
-                  <Label color={textColor1} width={200} justifyContent="flex-end" htmlFor="restart">
+                  <Label color={textBlack} width={200} justifyContent="flex-end" htmlFor="restart">
                     Contribute
                   </Label>
-                  <Button bg={componentBgColor} jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={() => setDialogContributeIsOpen(true)}>
-                    <Share color={textColor1} />
+                  <Button bg="white" jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={() => setDialogContributeIsOpen(true)}>
+                    <Share color={textBlack} />
                   </Button>
                 </Fieldset>
                 <Fieldset horizontal>
-                  <Label color={textColor1} width={225} justifyContent="flex-end" htmlFor="restart" >
+                  <Label color={textBlack} width={225} justifyContent="flex-end" htmlFor="restart" >
                     Private mode
                   </Label>
                   <Switch size="$3.5" checked={hideData} onCheckedChange={handleHideData}>
@@ -422,10 +422,8 @@ const MainScreen: React.FC = () => {
                   </Switch>
                 </Fieldset>
 
-
-
                 <Fieldset horizontal>
-                  <Label color={textColor1} width={225} justifyContent="flex-end" htmlFor="restart" >
+                  <Label color={textBlack} width={225} justifyContent="flex-end" htmlFor="restart" >
                     Display other options
                   </Label>
                   <Switch size="$3.5" checked={displayOtherOptions} onCheckedChange={() => setDisplayOtherOptions(!displayOtherOptions)}>
@@ -456,62 +454,62 @@ const MainScreen: React.FC = () => {
                   <>
                     <XStack my="$3" alignSelf='center' h={2} w="80%" bg={componentBgColor} borderRadius={100} />
                     <Fieldset gap="$4" horizontal>
-                      <Label color={textColor1} width={200} justifyContent="flex-end" htmlFor="restart">
+                      <Label color={textBlack} width={200} justifyContent="flex-end" htmlFor="restart">
                         Restart to step 1
                       </Label>
-                      <Button bg={componentBgColor} jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={handleRestart}>
-                        <IterationCw color={textColor1} />
+                      <Button bg="white" jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={handleRestart}>
+                        <IterationCw color={textBlack} />
                       </Button>
                     </Fieldset>
 
                     <Fieldset gap="$4" mt="$1" horizontal>
-                      <Label color={textColor1} width={200} justifyContent="flex-end" htmlFor="skip" >
+                      <Label color={textBlack} width={200} justifyContent="flex-end" htmlFor="skip" >
                         Use mock passport data
                       </Label>
-                      <Button bg={componentBgColor} jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={handleSkip}>
-                        <VenetianMask color={textColor1} />
+                      <Button bg="white" jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={handleSkip}>
+                        <VenetianMask color={textBlack} />
                       </Button>
                     </Fieldset>
 
                     <Fieldset gap="$4" mt="$1" horizontal>
-                      <Label color={textColor1} width={200} justifyContent="flex-end" htmlFor="skip" >
+                      <Label color={textBlack} width={200} justifyContent="flex-end" htmlFor="skip" >
                         Delete passport data
                       </Label>
-                      <Button bg={componentBgColor} jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={clearPassportDataFromStorage}>
-                        <Eraser color={textColor1} />
+                      <Button bg="white" jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={clearPassportDataFromStorage}>
+                        <Eraser color={textBlack} />
                       </Button>
                     </Fieldset>
 
                     <Fieldset gap="$4" mt="$1" horizontal>
-                      <Label color={textColor1} width={200} justifyContent="flex-end" htmlFor="skip" >
+                      <Label color={textBlack} width={200} justifyContent="flex-end" htmlFor="skip" >
                         Delete proofs
                       </Label>
-                      <Button bg={componentBgColor} jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={clearProofsFromStorage}>
-                        <Eraser color={textColor1} />
+                      <Button bg="white" jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={clearProofsFromStorage}>
+                        <Eraser color={textBlack} />
                       </Button>
                     </Fieldset>
 
                     <Fieldset gap="$4" mt="$1" horizontal>
-                      <Label color={textColor1} width={200} justifyContent="flex-end" htmlFor="skip" >
+                      <Label color={textBlack} width={200} justifyContent="flex-end" htmlFor="skip" >
                         Delete secret (caution)
                       </Label>
-                      <Button bg={componentBgColor} jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={() => setDialogDeleteSecretIsOpen(true)}>
+                      <Button bg="white" jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={() => setDialogDeleteSecretIsOpen(true)}>
                         <Eraser color={textColor2} />
                       </Button>
                     </Fieldset>
                     <Fieldset gap="$4" mt="$1" horizontal>
-                      <Label color={textColor1} width={200} justifyContent="flex-end" htmlFor="skip" >
+                      <Label color={textBlack} width={200} justifyContent="flex-end" htmlFor="skip" >
                         go to register
                       </Label>
-                      <Button bg={componentBgColor} jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={() => setSelectedTab('register')}>
+                      <Button bg="white" jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={() => setSelectedTab('register')}>
                         <ArrowRight color={textColor2} />
                       </Button>
                     </Fieldset>
                     <Fieldset gap="$4" mt="$1" horizontal>
-                      <Label color={textColor1} width={200} justifyContent="flex-end" htmlFor="skip" >
+                      <Label color={textBlack} width={200} justifyContent="flex-end" htmlFor="skip" >
                         registered = (!registered)
                       </Label>
-                      <Button bg={componentBgColor} jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={() => setRegistered(!registered)}>
+                      <Button bg="white" jc="center" borderColor={borderColor} borderWidth={1.2} size="$3.5" ml="$2" onPress={() => setRegistered(!registered)}>
                         <UserPlus color={textColor2} />
                       </Button>
                     </Fieldset>
@@ -525,7 +523,7 @@ const MainScreen: React.FC = () => {
 
                 <YStack mb="$0">
                   {/* <Button p="$2.5" borderRadius="$3" bg={componentBgColor} jc="center" borderColor={borderColor} borderWidth={1.2} onPress={() => setSettingsIsOpen(false)} w="80%" alignSelf='center'>
-                    <Text color={textColor1} textAlign='center' fow="bold">Close</Text>
+                    <Text color={textBlack}textAlign='center' fow="bold">Close</Text>
                   </Button> */}
                 </YStack>
               </YStack>
diff --git a/app/src/screens/ProveScreen.tsx b/app/src/screens/ProveScreen.tsx
index d543e43a0..d0bf5792e 100644
--- a/app/src/screens/ProveScreen.tsx
+++ b/app/src/screens/ProveScreen.tsx
@@ -126,16 +126,14 @@ const ProveScreen: React.FC<ProveScreenProps> = ({ setSheetRegisterIsOpen }) =>
       // );
 
       const user_identifier = '0xE6E4b6a802F2e0aeE5676f6010e0AF5C9CDd0a50';
-      const scope = poseidon1([BigInt(Buffer.from('VOTEEEEE').readUIntBE(0, 6))]).toString();
 
       const inputs = generateCircuitInputsProve(
         passportData,
         64, 32,
-        scope,
+        selectedApp.scope,
         revealBitmapFromAttributes(selectedApp.disclosureOptions as any),
         (selectedApp.disclosureOptions && selectedApp.disclosureOptions.older_than) ? selectedApp.disclosureOptions.older_than : DEFAULT_MAJORITY,
         user_identifier
-
       );
 
       console.log("inputs", inputs);
diff --git a/common/src/utils/generateInputs.ts b/common/src/utils/generateInputs.ts
index 871f0114f..575a342ad 100644
--- a/common/src/utils/generateInputs.ts
+++ b/common/src/utils/generateInputs.ts
@@ -274,6 +274,8 @@ export function generateCircuitInputsProve(
 
   const register_inputs = generateCircuitInputsRegister('0', '0', '0', passportData, n_dsc, k_dsc);
   const current_date = getCurrentDateYYMMDD().map(datePart => BigInt(datePart).toString());
+  // Ensure majority is at least two digits
+  const formattedMajority = majority.length === 1 ? `0${majority}` : majority;
   return {
     mrz: register_inputs.mrz,
     dg1_hash_offset: register_inputs.dg1_hash_offset, // uncomment when adding new circuits
@@ -284,7 +286,7 @@ export function generateCircuitInputsProve(
     dsc_modulus: register_inputs.dsc_modulus,
     current_date: current_date,
     bitmap: bitmap,
-    majority: majority.split('').map(char => BigInt(char.charCodeAt(0)).toString()),
+    majority: formattedMajority.split('').map(char => BigInt(char.charCodeAt(0)).toString()),
     user_identifier: [user_identifier],
     scope: [BigInt(scope).toString()]
   };