diff --git a/app/src/images/user.png b/app/src/images/user.png deleted file mode 100644 index 2e2a8c8c4..000000000 Binary files a/app/src/images/user.png and /dev/null differ diff --git a/app/src/images/user_profile.png b/app/src/images/user_profile.png new file mode 100644 index 000000000..e44ca0830 Binary files /dev/null and b/app/src/images/user_profile.png differ diff --git a/app/src/screens/MockDataScreen.tsx b/app/src/screens/MockDataScreen.tsx index 8cf1b6496..f0a2ab70f 100644 --- a/app/src/screens/MockDataScreen.tsx +++ b/app/src/screens/MockDataScreen.tsx @@ -34,7 +34,7 @@ const MockDataScreen: React.FC = () => { const sigAlgName = getSignatureAlgorithm(mockPassportData.dsc as string); const circuitName = getCircuitName("prove", sigAlgName.signatureAlgorithm, sigAlgName.hashFunction); downloadZkey(circuitName as any); - useNavigationStore.getState().setSelectedTab("app"); + useNavigationStore.getState().setSelectedTab("next"); }; return ( diff --git a/app/src/screens/NextScreen.tsx b/app/src/screens/NextScreen.tsx index c774791d0..9481c9e8b 100644 --- a/app/src/screens/NextScreen.tsx +++ b/app/src/screens/NextScreen.tsx @@ -3,7 +3,7 @@ import { YStack, XStack, Text, Image, useWindowDimensions, Fieldset } from 'tama import { ArrowRight, Info } from '@tamagui/lucide-icons'; import { getFirstName, maskString } from '../../utils/utils'; import { attributeToPosition } from '../../../common/src/constants/constants'; -import USER from '../images/user.png' +import USER_PROFILE from '../images/user_profile.png' import { bgGreen, borderColor, componentBgColor, textBlack, textColor1, textColor2 } from '../utils/colors'; import { Platform } from 'react-native'; import { formatAttribute } from '../utils/utils'; @@ -47,7 +47,7 @@ const NextScreen: React.FC = () => { h={height > 750 ? 190 : 80} borderRadius={height > 800 ? "$7" : "$6"} source={{ - uri: USER, + uri: USER_PROFILE, }} /> : { h={height > 750 ? 190 : 130} borderRadius={height > 750 ? "$7" : "$6"} source={{ - uri: passportData.photoBase64 ?? USER, + uri: passportData.mockUser ? USER_PROFILE : passportData.photoBase64 ?? USER_PROFILE, }} /> } @@ -65,9 +65,11 @@ const NextScreen: React.FC = () => { { - hideData - ? maskString(getFirstName(passportData.mrz)) - : getFirstName(passportData.mrz) + passportData.mockUser + ? "Anon" + : hideData + ? maskString(getFirstName(passportData.mrz)) + : getFirstName(passportData.mrz) } {" "}👋 @@ -104,7 +106,7 @@ const NextScreen: React.FC = () => { - Your information will remain confidential and will not be used or shared without your explicit consent. + Your information will remain confidential and will not be used or shared without your explicit consent. diff --git a/app/src/utils/nfcScanner.ts b/app/src/utils/nfcScanner.ts index 91f624500..32347e5de 100644 --- a/app/src/utils/nfcScanner.ts +++ b/app/src/utils/nfcScanner.ts @@ -166,6 +166,7 @@ const handleResponseIOS = async ( eContent: signedEContentArray, encryptedDigest: encryptedDigestArray, photoBase64: "data:image/jpeg;base64," + parsed.passportPhoto, + mockUser: false }; useUserStore.getState().registerPassportData(passportData) const sigAlgName = getSignatureAlgorithm(pem); @@ -229,6 +230,7 @@ const handleResponseAndroid = async ( eContent: JSON.parse(eContent), encryptedDigest: JSON.parse(encryptedDigest), photoBase64: photo.base64, + mockUser: false }; //amplitude.track('Sig alg after conversion: ' + passportData.signatureAlgorithm); diff --git a/common/src/utils/genMockPassportData.ts b/common/src/utils/genMockPassportData.ts index 0152262e8..03e66add9 100644 --- a/common/src/utils/genMockPassportData.ts +++ b/common/src/utils/genMockPassportData.ts @@ -89,7 +89,8 @@ export function genMockPassportData( dataGroupHashes: concatenatedDataHashes, eContent: eContent, encryptedDigest: signatureBytes, - photoBase64: "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABjElEQVR42mL8//8/AyUYiBQYmIy3..." + photoBase64: "iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABjElEQVR42mL8//8/AyUYiBQYmIy3...", + mockUser: true }; } diff --git a/common/src/utils/types.ts b/common/src/utils/types.ts index 0d06de428..5b657fa02 100644 --- a/common/src/utils/types.ts +++ b/common/src/utils/types.ts @@ -7,6 +7,7 @@ export type PassportData = { eContent: number[]; encryptedDigest: number[]; photoBase64: string; + mockUser?: boolean; }; export type Proof = {