@bifold/core 2.0.1 → 2.1.1

package/src/localization/pt-br/index.ts

@@ -47,6 +47,7 @@ const translation = {
     "Close": "Fechar",
     "Remove": "Remover",
     "GotIt": "Got it (PT-BR)",
+    "Send": "Enviar",
   },
   "Date": {
     "ShortFormat": "D MMM",

package/src/modules/openid/components/OpenIDCredentialCard.tsx

@@ -21,9 +21,8 @@ import { MdocRecord, SdJwtVcRecord, W3cCredentialRecord } from '@credo-ts/core'
 import { getCredentialForDisplay } from '../display'
 import { BifoldError } from '../../../types/error'
 import { EventTypes } from '../../../constants'
-import { getAttributeField } from '../utils/utils'
 import { Attribute } from '@bifold/oca/build/legacy'
-import startCase from 'lodash.startcase'
+import { getAttributeField } from '../../../utils/oca'
 
 interface CredentialCardProps {
   credentialDisplay?: W3cCredentialDisplay
@@ -66,7 +65,7 @@ const OpenIDCredentialCard: React.FC<CredentialCardProps> = ({
 
   const overlayAttributeField = useMemo((): Attribute | undefined => {
     if (!display?.primary_overlay_attribute || !credentialDisplay) return undefined
-    return getAttributeField(credentialDisplay, display.primary_overlay_attribute)
+    return getAttributeField(credentialDisplay, display.primary_overlay_attribute)?.field
   }, [display, credentialDisplay])
 
   const { width } = useWindowDimensions()
@@ -228,7 +227,7 @@ const OpenIDCredentialCard: React.FC<CredentialCardProps> = ({
           testID={testIdWithKey('CredentialIssued')}
           maxFontSizeMultiplier={1}
         >
-          {overlayAttributeField.label ?? startCase(overlayAttributeField.name || '')}: {overlayAttributeField.value}
+          {overlayAttributeField.label ?? overlayAttributeField.name}: {overlayAttributeField.value}
         </Text>
       </View>
     )

package/src/modules/openid/display.tsx

@@ -351,6 +351,7 @@ export function getCredentialForDisplay(
       claimFormat: ClaimFormat.SdJwtVc,
       validUntil: mapped.raw.validUntil,
       validFrom: mapped.raw.validFrom,
+      credentialSubject: openId4VcMetadata?.credential.credential_subject,
     }
   }
 
@@ -383,6 +384,7 @@ export function getCredentialForDisplay(
       claimFormat: ClaimFormat.MsoMdoc,
       validUntil: mdocInstance.validityInfo.validUntil,
       validFrom: mdocInstance.validityInfo.validFrom,
+      credentialSubject: openId4VcMetadata?.credential.credential_subject,
     }
   }
 
@@ -427,6 +429,7 @@ export function getCredentialForDisplay(
     validFrom: credentialRecord.credential.issuanceDate
       ? new Date(credentialRecord.credential.issuanceDate)
       : undefined,
+    credentialSubject: openId4VcMetadata?.credential.credential_subject,
   }
 }
 

package/src/modules/openid/metadata.tsx

@@ -1,11 +1,13 @@
 import type { W3cCredentialRecord, SdJwtVcRecord, MdocRecord } from '@credo-ts/core'
 import type { OpenId4VciCredentialSupported, OpenId4VciIssuerMetadataDisplay } from '@credo-ts/openid4vc'
 import type { MetadataDisplay } from '@sphereon/oid4vci-common'
+import { CredentialSubjectRecord } from './types'
 
 export interface OpenId4VcCredentialMetadata {
   credential: {
     display?: OpenId4VciCredentialSupported['display']
     order?: OpenId4VciCredentialSupported['order']
+    credential_subject?: CredentialSubjectRecord
   }
   issuer: {
     display?: OpenId4VciIssuerMetadataDisplay[]
@@ -13,16 +15,20 @@ export interface OpenId4VcCredentialMetadata {
   }
 }
 
+export type OpenId4VcCredentialMetadataExtended = Partial<
+  OpenId4VciCredentialSupported & { credential_subject: CredentialSubjectRecord }
+>
 const openId4VcCredentialMetadataKey = '_bifold/openId4VcCredentialMetadata'
 
 export function extractOpenId4VcCredentialMetadata(
-  credentialMetadata: OpenId4VciCredentialSupported,
+  credentialMetadata: Partial<OpenId4VciCredentialSupported & { credential_subject: CredentialSubjectRecord }>,
   serverMetadata: { display?: MetadataDisplay[]; id: string }
 ): OpenId4VcCredentialMetadata {
   return {
     credential: {
       display: credentialMetadata.display,
       order: credentialMetadata.order,
+      credential_subject: credentialMetadata.credential_subject,
     },
     issuer: {
       display: serverMetadata.display,

package/src/modules/openid/screens/OpenIDProofChangeCredential.tsx

@@ -0,0 +1,132 @@
+import { StackScreenProps } from '@react-navigation/stack'
+import { DeliveryStackParams, Screens } from '../../../types/navigators'
+import ScreenLayout from '../../../layout/ScreenLayout'
+import { FlatList, StyleSheet, TouchableOpacity, View } from 'react-native'
+import { useTranslation } from 'react-i18next'
+import { useTheme } from '../../../contexts/theme'
+import { useEffect, useState } from 'react'
+import { MdocRecord, SdJwtVcRecord, W3cCredentialRecord } from '@credo-ts/core'
+import { isSdJwtProofRequest, isW3CProofRequest } from '../utils/utils'
+import { useOpenIDCredentials } from '../context/OpenIDCredentialRecordProvider'
+import RecordLoading from '../../../components/animated/RecordLoading'
+import { ThemedText } from '../../../components/texts/ThemedText'
+import { testIdWithKey } from '../../../utils/testable'
+import { CredentialCard } from '../../../components/misc'
+
+type Props = StackScreenProps<DeliveryStackParams, Screens.OpenIDProofCredentialSelect>
+type TypedCred = {
+  credential: W3cCredentialRecord | SdJwtVcRecord | MdocRecord
+  claimFormat: string
+}
+
+const OpenIDProofCredentialSelect: React.FC<Props> = ({ route, navigation }: Props) => {
+  if (!route?.params) {
+    throw new Error('Change credential route params were not set properly')
+  }
+  const selectedCredentialID = route.params.selectedCredID
+  const altCredentials = route.params.altCredIDs
+  const onCredChange = route.params.onCredChange
+  const { ColorPallet, SelectedCredTheme } = useTheme()
+  const { getW3CCredentialById, getSdJwtCredentialById } = useOpenIDCredentials()
+
+  const { t } = useTranslation()
+  const [loading, setLoading] = useState(false)
+
+  const [credentialsRequested, setCredentialsRequested] = useState<Array<TypedCred>>([])
+
+  useEffect(() => {
+    async function fetchCreds() {
+      if (!altCredentials) return
+      setLoading(true)
+
+      const creds: TypedCred[] = []
+
+      for (const { id, claimFormat } of Object.values(altCredentials)) {
+        let credential: W3cCredentialRecord | SdJwtVcRecord | MdocRecord | undefined
+        if (isW3CProofRequest(claimFormat)) {
+          credential = await getW3CCredentialById(id)
+        } else if (isSdJwtProofRequest(claimFormat)) {
+          credential = await getSdJwtCredentialById(id)
+        }
+
+        if (credential) {
+          creds.push({
+            credential,
+            claimFormat,
+          })
+        }
+      }
+      setCredentialsRequested(creds)
+      setLoading(false)
+    }
+    fetchCreds()
+  }, [altCredentials, getW3CCredentialById, getSdJwtCredentialById])
+
+  const styles = StyleSheet.create({
+    pageContainer: {
+      flex: 1,
+    },
+    pageMargin: {
+      marginHorizontal: 20,
+    },
+    cardLoading: {
+      backgroundColor: ColorPallet.brand.secondaryBackground,
+      flex: 1,
+      flexGrow: 1,
+      marginVertical: 35,
+      borderRadius: 15,
+      paddingHorizontal: 10,
+    },
+  })
+
+  const changeCred = (selection: TypedCred) => {
+    onCredChange({
+      inputDescriptorID: route.params.inputDescriptorID,
+      id: selection.credential.id,
+      claimFormat: selection.claimFormat,
+    })
+    navigation.goBack()
+  }
+
+  const listHeader = () => {
+    return (
+      <View style={{ ...styles.pageMargin, marginVertical: 20 }}>
+        {loading ? (
+          <View style={styles.cardLoading}>
+            <RecordLoading />
+          </View>
+        ) : (
+          <ThemedText>{t('ProofRequest.MultipleCredentials')}</ThemedText>
+        )}
+      </View>
+    )
+  }
+
+  return (
+    <ScreenLayout screen={Screens.OpenIDProofCredentialSelect}>
+      <FlatList
+        data={credentialsRequested}
+        ListHeaderComponent={listHeader}
+        renderItem={({ item }) => {
+          return (
+            <View style={styles.pageMargin}>
+              <TouchableOpacity
+                accessibilityRole="button"
+                testID={testIdWithKey(`select:${item.credential.id}`)}
+                onPress={() => changeCred(item)}
+                style={[
+                  item.credential.id === selectedCredentialID ? SelectedCredTheme : undefined,
+                  { marginBottom: 10 },
+                ]}
+              >
+                <CredentialCard credential={item.credential}></CredentialCard>
+              </TouchableOpacity>
+            </View>
+          )
+        }}
+      ></FlatList>
+    </ScreenLayout>
+  )
+}
+
+export default OpenIDProofCredentialSelect

package/src/modules/openid/screens/OpenIDProofPresentation.tsx

@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect, useMemo, useState } from 'react'
 import { DeviceEventEmitter } from 'react-native'
 import { useAgent } from '@credo-ts/react-hooks'
 import { useTranslation } from 'react-i18next'
@@ -31,6 +31,20 @@ import { isSdJwtProofRequest, isW3CProofRequest } from '../utils/utils'
 
 type OpenIDProofPresentationProps = StackScreenProps<DeliveryStackParams, Screens.OpenIDProofPresentation>
 
+type SatisfiedCredentialsFormat = {
+  [inputDescriptorId: string]: {
+    id: string
+    claimFormat: string
+  }[]
+}
+
+type SelectedCredentialsFormat = {
+  [inputDescriptorId: string]: {
+    id: string
+    claimFormat: string
+  }
+}
+
 const OpenIDProofPresentation: React.FC<OpenIDProofPresentationProps> = ({
   navigation,
   route: {
@@ -43,6 +57,9 @@ const OpenIDProofPresentation: React.FC<OpenIDProofPresentationProps> = ({
   const [credentialsRequested, setCredentialsRequested] = useState<
     Array<W3cCredentialRecord | SdJwtVcRecord | MdocRecord>
   >([])
+  const [satistfiedCredentialsSubmission, setSatistfiedCredentialsSubmission] = useState<SatisfiedCredentialsFormat>()
+  const [selectedCredentialsSubmission, setSelectedCredentialsSubmission] = useState<SelectedCredentialsFormat>()
+
   const { getW3CCredentialById, getSdJwtCredentialById } = useOpenIDCredentials()
 
   const { ColorPallet, ListItems, TextTheme } = useTheme()
@@ -104,53 +121,61 @@ const OpenIDProofPresentation: React.FC<OpenIDProofPresentationProps> = ({
     [credential]
   )
 
-  const selectedCredentials:
-    | {
-        [inputDescriptorId: string]: {
-          id: string
-          claimFormat: string
-        }
-      }
-    | undefined = useMemo(
-    () =>
-      submission?.entries.reduce((acc, entry) => {
-        if (entry.isSatisfied) {
-          //TODO: Support multiplae credentials
-          return {
-            ...acc,
-            [entry.inputDescriptorId]: {
-              id: entry.credentials[0].id,
-              claimFormat: entry.credentials[0].claimFormat,
-            },
-          }
-        }
-        return acc
-      }, {}),
-    [submission]
-  )
+  //This should run only once when the screen is mounted
+  useEffect(() => {
+    if (!submission) return
+    const creds = submission.entries.reduce((acc: SatisfiedCredentialsFormat, entry) => {
+      acc[entry.inputDescriptorId] = entry.credentials.map((cred) => ({
+        id: cred.id,
+        claimFormat: cred.claimFormat,
+      }))
+      return acc
+    }, {})
+    setSatistfiedCredentialsSubmission(creds)
+  }, [submission])
 
+  //Fetch all credentials satisfying the proof
   useEffect(() => {
     async function fetchCreds() {
-      if (!selectedCredentials) return
+      if (!satistfiedCredentialsSubmission || satistfiedCredentialsSubmission.entries) return
 
       const creds: Array<W3cCredentialRecord | SdJwtVcRecord | MdocRecord> = []
 
-      for (const [inputDescriptorID, { id, claimFormat }] of Object.entries(selectedCredentials)) {
-        let credential: W3cCredentialRecord | SdJwtVcRecord | MdocRecord | undefined
-        if (isW3CProofRequest(claimFormat)) {
-          credential = await getW3CCredentialById(id)
-        } else if (isSdJwtProofRequest(claimFormat)) {
-          credential = await getSdJwtCredentialById(id)
-        }
+      for (const [inputDescriptorID, credIDs] of Object.entries(satistfiedCredentialsSubmission)) {
+        for (const { id, claimFormat } of credIDs) {
+          let credential: W3cCredentialRecord | SdJwtVcRecord | MdocRecord | undefined
+          if (isW3CProofRequest(claimFormat)) {
+            credential = await getW3CCredentialById(id)
+          } else if (isSdJwtProofRequest(claimFormat)) {
+            credential = await getSdJwtCredentialById(id)
+          }
 
-        if (credential && inputDescriptorID) {
-          creds.push(credential)
+          if (credential && inputDescriptorID) {
+            creds.push(credential)
+          }
         }
       }
       setCredentialsRequested(creds)
     }
     fetchCreds()
-  }, [selectedCredentials, getW3CCredentialById, getSdJwtCredentialById])
+  }, [satistfiedCredentialsSubmission, getW3CCredentialById, getSdJwtCredentialById])
+
+  //Once satisfied credentials are set and all credentials fetched, we select the first one of each submission to display on screen
+  useEffect(() => {
+    if (!satistfiedCredentialsSubmission || credentialsRequested?.length <= 0) return
+
+    const creds = Object.entries(satistfiedCredentialsSubmission).reduce(
+      (acc: SelectedCredentialsFormat, [inputDescriptorId, credentials]) => {
+        acc[inputDescriptorId] = {
+          id: credentials[0].id,
+          claimFormat: credentials[0].claimFormat,
+        }
+        return acc
+      },
+      {}
+    )
+    setSelectedCredentialsSubmission(creds)
+  }, [satistfiedCredentialsSubmission, credentialsRequested])
 
   const { verifierName } = useMemo(() => {
     return { verifierName: credential?.verifierHostName }
@@ -158,16 +183,15 @@ const OpenIDProofPresentation: React.FC<OpenIDProofPresentationProps> = ({
 
   const handleAcceptTouched = async () => {
     try {
-      if (!agent || !credential.credentialsForRequest || !selectedCredentials) {
+      if (!agent || !credential.credentialsForRequest || !selectedCredentialsSubmission) {
         return
       }
       await shareProof({
         agent,
         authorizationRequest: credential.authorizationRequest,
         credentialsForRequest: credential.credentialsForRequest,
-        selectedCredentials,
+        selectedCredentials: selectedCredentialsSubmission,
       })
-
       setAcceptModalVisible(true)
     } catch (err: unknown) {
       setButtonsVisible(true)
@@ -185,6 +209,47 @@ const OpenIDProofPresentation: React.FC<OpenIDProofPresentationProps> = ({
     navigation.getParent()?.navigate(TabStacks.HomeStack, { screen: Screens.Home })
   }
 
+  // Re-construct the selected credentials object based on user alt credential
+  const onCredChange = ({
+    inputDescriptorID,
+    id,
+    claimFormat,
+  }: {
+    inputDescriptorID: string
+    id: string
+    claimFormat: string
+  }) => {
+    setSelectedCredentialsSubmission((prev) => ({
+      ...prev,
+      [inputDescriptorID]: {
+        id,
+        claimFormat,
+      },
+    }))
+  }
+
+  const handleAltCredChange = useCallback(
+    (inputDescriptorID: string, selectedCredID: string, inputDescriptor: string) => {
+      const submittionEntries = submission?.entries.find((entry) => entry.inputDescriptorId === inputDescriptor)
+      const credsForEntry = submittionEntries?.credentials
+
+      if (!credsForEntry) return
+
+      navigation.navigate(Screens.OpenIDProofCredentialSelect, {
+        inputDescriptorID: inputDescriptorID,
+        selectedCredID: selectedCredID,
+        altCredIDs: credsForEntry.map((cred) => {
+          return {
+            id: cred.id,
+            claimFormat: cred.claimFormat,
+          }
+        }),
+        onCredChange: onCredChange,
+      })
+    },
+    [submission, navigation]
+  )
+
   const renderHeader = () => {
     return (
       <View style={styles.headerTextContainer}>
@@ -200,8 +265,6 @@ const OpenIDProofPresentation: React.FC<OpenIDProofPresentationProps> = ({
   const renderCard = (
     sub: FormattedSubmissionEntry,
     selectedCredential: FormattedSelectedCredentialEntry,
-    //TODO: Support multiplae credentials
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     hasMultipleCreds: boolean
   ) => {
     const credential = credentialsRequested.find((c) => c.id === selectedCredential.id)
@@ -209,33 +272,38 @@ const OpenIDProofPresentation: React.FC<OpenIDProofPresentationProps> = ({
       return null
     }
     const credentialDisplay = getCredentialForDisplay(credential)
-    const fields = buildFieldsFromW3cCredsCredential(credentialDisplay)
     const requestedAttributes = selectedCredential.requestedAttributes
-    const fieldsMapped = fields.filter((field) => requestedAttributes?.includes(field.name))
+    const fields = buildFieldsFromW3cCredsCredential(credentialDisplay, requestedAttributes)
     return (
       <CredentialCard
         credential={credential}
-        displayItems={fieldsMapped as Attribute[]}
-        //TODO: Support multiplae credentials
-        // hasAltCredentials={hasMultipleCreds}
-        // handleAltCredChange={selectAltCredentail}
+        displayItems={fields as Attribute[]}
+        hasAltCredentials={hasMultipleCreds}
+        handleAltCredChange={() => {
+          handleAltCredChange(sub.inputDescriptorId, selectedCredential.id, sub.inputDescriptorId)
+        }}
       />
     )
   }
 
   const renderBody = () => {
-    if (!submission) return null
+    if (!selectedCredentialsSubmission || !submission) return null
 
     return (
       <View style={styles.credentialsList}>
-        {submission.entries.map((s, i) => {
+        {Object.entries(selectedCredentialsSubmission).map(([inputDescriptorId, credentialSimplified], i) => {
           //TODO: Support multiplae credentials
-          const selectedCredential = s.credentials[0]
 
           const globalSubmissionName = submission.name
           const globalSubmissionPurpose = submission.purpose
-          const submissionName = s.name
-          const submissionPurpose = s.purpose
+          const correspondingSubmission = submission.entries?.find((s) => s.inputDescriptorId === inputDescriptorId)
+          const submissionName = correspondingSubmission?.name
+          const submissionPurpose = correspondingSubmission?.purpose
+          const isSatisfied = correspondingSubmission?.isSatisfied
+          const credentialSubmittion = correspondingSubmission?.credentials.find(
+            (s) => s.id === credentialSimplified.id
+          )
+          const requestedAttributes = credentialSubmittion?.requestedAttributes
 
           const name = submissionName || globalSubmissionName || undefined
           const purpose = submissionPurpose || globalSubmissionPurpose || undefined
@@ -246,12 +314,16 @@ const OpenIDProofPresentation: React.FC<OpenIDProofPresentationProps> = ({
                 <View style={styles.cardGroupContainer}>
                   {name && purpose && (
                     <View style={styles.cardGroupHeader}>
-                      <Text style={TextTheme.labelSubtitle}>{name}</Text>
-                      <Text style={TextTheme.labelSubtitle}>{purpose}</Text>
+                      <Text style={TextTheme.bold}>{name}</Text>
+                      <Text style={TextTheme.labelTitle}>{purpose}</Text>
                     </View>
                   )}
-                  {s.isSatisfied && selectedCredential?.requestedAttributes ? (
-                    renderCard(s, selectedCredential, s.credentials.length > 1)
+                  {isSatisfied && requestedAttributes ? (
+                    renderCard(
+                      correspondingSubmission,
+                      credentialSubmittion,
+                      correspondingSubmission.credentials.length > 1
+                    )
                   ) : (
                     <Text style={TextTheme.normal}>{t('ProofRequest.CredentialNotInWallet')}</Text>
                   )}
@@ -295,14 +367,14 @@ const OpenIDProofPresentation: React.FC<OpenIDProofPresentationProps> = ({
           backgroundColor: ColorPallet.brand.secondaryBackground,
         }}
       >
-        {selectedCredentials && Object.keys(selectedCredentials).length > 0 ? (
+        {selectedCredentialsSubmission && Object.keys(selectedCredentialsSubmission).length > 0 ? (
           <>
             {footerButton(
-              t('Global.Accept'),
+              t('Global.Send'),
               handleAcceptTouched,
               ButtonType.Primary,
               testIdWithKey('AcceptCredentialOffer'),
-              t('Global.Accept')
+              t('Global.Send')
             )}
             {footerButton(
               t('Global.Decline'),

package/src/modules/openid/types.tsx

@@ -86,6 +86,7 @@ export interface W3cCredentialDisplay {
   claimFormat: ClaimFormat
   validUntil: Date | undefined
   validFrom: Date | undefined
+  credentialSubject: CredentialSubjectRecord | undefined
 }
 
 export interface OpenId4VPRequestRecord extends OpenId4VcSiopResolvedAuthorizationRequest {
@@ -96,6 +97,13 @@ export interface OpenId4VPRequestRecord extends OpenId4VcSiopResolvedAuthorizati
   type: string
 }
 
+interface DisplayInfo {
+  name: string
+  locale?: string
+}
+
+export type CredentialSubjectRecord = Record<string, { display: DisplayInfo[] }>
+
 export enum OpenIDCredentialType {
   W3cCredential,
   SdJwtVc,

package/src/modules/openid/utils/utils.tsx

@@ -1,6 +1,5 @@
 import { getDomainFromUrl } from '@credo-ts/core'
 import { Attribute, Field } from '@bifold/oca/build/legacy'
-import { W3cCredentialDisplay } from '../types'
 
 /**
  * Converts a camelCase string to a sentence format (first letter capitalized, rest in lower case).
@@ -53,19 +52,6 @@ export function formatDate(input: string | Date): string {
   })
 }
 
-export const getAttributeField = (display: W3cCredentialDisplay, searchKey: string): Attribute | undefined => {
-  for (const [key, value] of Object.entries(display.attributes)) {
-    if (searchKey === key) {
-      return new Attribute({
-        name: key,
-        value: value as string | number | null,
-        mimeType: typeof value === 'number' ? 'text/number' : 'text/plain',
-      })
-    }
-  }
-  return undefined
-}
-
 /**
  * Mostly used for mdoc crednetials
  */

package/src/navigators/ConnectStack.tsx

@@ -3,7 +3,7 @@ import React from 'react'
 import { useTranslation } from 'react-i18next'
 
 import { useTheme } from '../contexts/theme'
-import NameWallet from '../screens/NameWallet'
+import RenameWallet from '../screens/RenameWallet'
 import PasteUrl from '../screens/PasteUrl'
 import ScanHelp from '../screens/ScanHelp'
 import { ConnectStackParams, Screens } from '../types/navigators'
@@ -53,12 +53,12 @@ const ConnectStack: React.FC = () => {
       />
 
       <Stack.Screen
-        name={Screens.NameWallet}
-        component={NameWallet}
+        name={Screens.RenameWallet}
+        component={RenameWallet}
         options={{
           title: t('Screens.NameWallet'),
           headerBackTestID: testIdWithKey('Back'),
-          ...ScreenOptionsDictionary[Screens.NameWallet],
+          ...ScreenOptionsDictionary[Screens.RenameWallet],
         }}
       />
     </Stack.Navigator>

package/src/navigators/DeliveryStack.tsx

@@ -13,6 +13,7 @@ import { useDefaultStackOptions } from './defaultStackOptions'
 import OpenIDProofPresentation from '../modules/openid/screens/OpenIDProofPresentation'
 import { TOKENS, useServices } from '../container-api'
 import OpenIDCredentialOffer from '../modules/openid/screens/OpenIDCredentialOffer'
+import OpenIDProofCredentialSelect from '../modules/openid/screens/OpenIDProofChangeCredential'
 
 const DeliveryStack: React.FC = () => {
   const Stack = createStackNavigator<DeliveryStackParams>()
@@ -67,6 +68,14 @@ const DeliveryStack: React.FC = () => {
           ...ScreenOptionsDictionary[Screens.OpenIDProofPresentation],
         }}
       />
+      <Stack.Screen
+        name={Screens.OpenIDProofCredentialSelect}
+        component={OpenIDProofCredentialSelect}
+        options={{
+          title: t('Screens.ProofRequest'),
+          ...ScreenOptionsDictionary[Screens.OpenIDProofCredentialSelect],
+        }}
+      />
     </Stack.Navigator>
   )
 }

package/src/navigators/OnboardingScreens.ts

@@ -20,7 +20,6 @@ interface ScreenComponents {
   NameWallet: React.FC<StackScreenProps<ParamListBase>>
   Biometry: React.FC<StackScreenProps<ParamListBase>>
   PushNotifications: React.FC<StackScreenProps<ParamListBase>>
-  Developer: React.FC<StackScreenProps<ParamListBase>>
   AttemptLockout: React.FC<StackScreenProps<ParamListBase>>
   OnboardingScreen: React.FC
   CreatePINScreen: React.FC
@@ -119,15 +118,6 @@ export const getOnboardingScreens = (
       ...ScreenOptionsDictionary[Screens.PushNotifications],
     }),
   },
-  {
-    name: Screens.Developer,
-    component: components.Developer,
-    options: () => ({
-      title: t('Screens.Developer'),
-      headerBackAccessibilityLabel: t('Global.Back'),
-      ...ScreenOptionsDictionary[Screens.Developer],
-    }),
-  },
   {
     name: Screens.EnterPIN,
     children: components.EnterPINScreen,