@bifold/core 1.0.0 → 2.0.1

package/src/index.ts

@@ -4,7 +4,7 @@ import type { OnboardingStyleSheet } from './screens/Onboarding'
 import { Agent } from '@credo-ts/core'
 import AgentProvider from '@credo-ts/react-hooks'
 
-import App from './App'
+import createApp from './App'
 import * as components from './components'
 import { Button as IButton, ButtonImpl as Button, ButtonType } from './components/buttons/Button'
 import IconButton, { ButtonLocation } from './components/buttons/IconButton'
@@ -36,6 +36,7 @@ import NotificationListItem from './components/listItems/NotificationListItem'
 import * as contexts from './contexts'
 import { AutoLockTime, ActivityProvider, useActivity } from './contexts/activity'
 import { AuthProvider } from './contexts/auth'
+import NavContainer from './contexts/navigation'
 import { NetworkProvider } from './contexts/network'
 import { useTour } from './contexts/tour/tour-context'
 import { TourProvider } from './contexts/tour/tour-provider'
@@ -46,7 +47,7 @@ import Preface from './screens/Preface'
 import Splash from './screens/Splash'
 import Terms from './screens/Terms'
 import UpdateAvailable from './screens/UpdateAvailable'
-import UseBiometry from './screens/UseBiometry'
+import Biometry from './screens/Biometry'
 import { loadLoginAttempt } from './services/keychain'
 import { BifoldLogger } from './services/logger'
 import * as types from './types'
@@ -57,7 +58,7 @@ import { PINRules, walletTimeout, tours, attemptLockoutConfig } from './constant
 import { CredentialListFooterProps } from './types/credential-list-footer'
 import { OpenIDCredentialRecordProvider } from './modules/openid/context/OpenIDCredentialRecordProvider'
 import { defaultConfig, defaultHistoryEventsLogger } from './container-impl'
-import useInitializeAgent from './hooks/initialize-agent'
+import useBifoldAgentSetup from './hooks/useBifoldAgentSetup'
 import usePreventScreenCapture from './hooks/screen-capture'
 import { DefaultScreenLayoutOptions } from './navigators/defaultLayoutOptions'
 
@@ -76,10 +77,9 @@ export { ThemeProvider, useTheme } from './contexts/theme'
 export { AnimatedComponentsProvider, useAnimatedComponents } from './contexts/animated-components'
 export { ColorPallet } from './theme'
 export { animatedComponents } from './animated-components'
-export { theme } from './theme'
+export { bifoldTheme } from './theme'
 export { useAuth } from './contexts/auth'
 export { useNetwork } from './contexts/network'
-export { NavigationTheme } from './theme'
 export { testIdWithKey, testIdForAccessabilityLabel } from './utils/testable'
 export { Screens, Stacks, TabStacks } from './types/navigators'
 export { createStyles } from './screens/OnboardingPages'
@@ -122,12 +122,7 @@ export type { VersionInfo, PersistentState } from './types/state'
 export type { BifoldAgent } from './utils/agent'
 export type { TourStep, RenderProps } from './contexts/tour/tour-context'
 export type { GenericFn } from './types/fn'
-export type {
-  AuthenticateStackParams,
-  OnboardingStackParams,
-  NotificationStackParams,
-  ContactStackParams,
-} from './types/navigators'
+export type { OnboardingStackParams, NotificationStackParams, ContactStackParams } from './types/navigators'
 export type { OnboardingStyleSheet }
 export type { WalletSecret } from './types/security'
 export type { ReducerAction } from './contexts/reducers/store'
@@ -152,9 +147,11 @@ export type { ScreenLayoutConfig, OnboardingTask } from './types/navigators'
 export type { Config, HistoryEventsLoggerConfig } from './types/config'
 
 export { BaseTourID } from './types/tour'
+export type { SplashProps } from './screens/Splash'
+export type { OnboardingStackProps } from './navigators/OnboardingStack'
 
 export {
-  App,
+  createApp,
   Agent,
   AgentProvider,
   AuthProvider,
@@ -186,12 +183,13 @@ export {
   AutoLockTime,
   ToastType,
   toastConfig,
+  NavContainer,
   NetInfo,
   OnboardingPages,
   OpenIDCredentialRecordProvider,
   NotificationListItem,
   useDefaultStackOptions,
-  useInitializeAgent,
+  useBifoldAgentSetup,
   usePreventScreenCapture,
   Splash,
   Developer,
@@ -199,7 +197,7 @@ export {
   Preface,
   UpdateAvailable,
   HomeFooterView as HomeContentView,
-  UseBiometry,
+  Biometry,
   AttemptLockout,
   Record,
   Scan,

package/src/localization/en/index.ts

@@ -47,6 +47,7 @@ const translation = {
     "Updated": "Updated",
     "Close": "Close",
     "Remove": "Remove",
+    "GotIt": "Got it",
   },
   "Date": {
     "ShortFormat": "MMM D",
@@ -144,6 +145,10 @@ const translation = {
     "Message1046": "There was a problem while fetching contacts.",
     "Title1047": "Unable to display card.",
     "Message1047": "There was a problem parsing credential card.",
+    "Title1048": "Proof request problems.",
+    "Message1048": "There was a problem with the proof request.",
+    "Title1049": "Unable to change PIN.",
+    "Message1049": "There was a problem while attempting to change your PIN.",
   },
   "SelectionAxs": {
     "RadioChecked": "checked",
@@ -230,33 +235,27 @@ const translation = {
       "CheckIcon": "Criteria met",
       "ClearIcon": "Criteria not met",
     },
-    "UserAuthenticationPIN": "User authentication PIN",
     "PINTooShort": "PIN is too short",
     "InvalidPIN": "Invalid PIN",
     "PINsDoNotMatch": "PINs do not match",
-    "PleaseUseOnlyNumbersInYourPIN": "Please use only numbers in your PIN",
-    "YourPINMustBe6DigitsInLength": "Your PIN needs to be 6 digits long.",
-    "EnteredPINsDoNotMatch": "The entered PINs do not match. Please try again.",
-    "YouNeedToCreateA6DigitPIN": "You need to create a 6 digit PIN",
-    "PleaseReenterYourPIN": "Please re-enter your PIN",
-    "PinChangeSuccessTitle": "Successfully changed your PIN",
-    "PinChangeSuccessMessage": "Your PIN was successsfully changed. You can now log in with your new PIN.",
-    "EnterOldPINTitle": "Enter your old PIN",
-    "EnterOldPIN": "Enter your old PIN",
-    "NewPIN": "new",
-    "EnterPINTitle": "Enter a {{ new }}6 digit PIN",
+    "EnterPINTitle": "Enter a 6 digit PIN",
     "EnterPIN": "Enter PIN",
-    "ReenterPIN": "Re-enter {{ new }}PIN",
-    "ReenterPINTitle": "Re-Enter PIN",
+    "ReenterPIN": "Re-enter PIN",
     "CreatePIN": "Create PIN",
     "RememberPIN": "Create a PIN to secure your wallet.",
-    "RememberChangePIN": "Change your PIN to secure your wallet.",
     "PINDisclaimer": "If you forget it, you may need to set up your wallet again and re-add your cards.",
     "Show": "Show PIN",
     "Hide": "Hide PIN",
+  },
+  "PINChange": {
+    "PinChangeSuccessTitle": "Successfully changed your PIN",
+    "PinChangeSuccessMessage": "Your PIN was successsfully changed. You can now log in with your new PIN.",
+    "EnterOldPINTitle": "Enter your old PIN",
+    "EnterOldPIN": "Enter your old PIN",
+    "EnterPINTitle": "Enter a new 6 digit PIN",
+    "ReenterPIN": "Re-enter new PIN",
+    "RememberChangePIN": "Change your PIN to secure your wallet.",
     "ChangePIN": "Change PIN",
-    "Continue": "Continue",
-    "EnterYourCurrentPIN": "Enter your current PIN"
   },
   "PINEnter": {
     "Title": "Welcome back",
@@ -487,7 +486,7 @@ const translation = {
     "Credential": "credential"
   },
   "PushNotifications": {
-    "EnableNotifiactions": "Enable Notifications to get instant alerts",
+    "EnableNotifications": "Enable Notifications to get instant alerts",
     "BeNotified": "Be notified when you receive:",
     "ReceiveNotifications": "Receive notifications",
     "BulletFour": "new messages",
@@ -712,8 +711,15 @@ const translation = {
     "DeclineBulletPoint3": "Are you sure you want to decline this proof request?",
     "NoInfoShared": "No information was shared",
     "YourInfo": "Your information was not shared",
-    "YouCantRespond": "You can't respond due to the following reasons. Please address them before continuing.",
+    "YouCantRespond": "You can't respond to this proof request.",
+    "YouCantRespondReasons": "You can't respond due to: ",
     "CredentialNotInWallet": "This credential is not present in your wallet.",
+    "CredentialIsMissing": "missing credentials",
+    "ProofRequestPredicateError": "requirements aren't met",
+    "CredentialForProofIsRevoked": "revoked credential",
+    "ProofRequestStateError": "The proof request received is in: {{state}}, decline this proof and try again.",
+    "ProofRequestErrorMessage": "Something went wrong with the proof request.",
+    "PleaseAddress": " Please address them before continuing.",
   },
   "Settings": {
     "Version": "Version",
@@ -806,7 +812,7 @@ const translation = {
     "OnTheWay": 'On The Way',
     "Declined": 'Declined',
     "UseBiometry": 'Use Biometry',
-    "UsePushNotifications": 'Use Push Notifications',
+    "PushNotifications": 'Push notifications',
     "CustomNotification": 'Custom Notification',
     "ProofRequesting": 'Proof Requesting',
     "NameWallet": "Name your wallet",

package/src/localization/fr/index.ts

@@ -47,6 +47,7 @@ const translation = {
         "Updated": "Mis à jour",
         "Remove": "Supprimer",
         "Close": "Fermer",
+        "GotIt": "Got it (FR)",
     },
     "Date": {
         "ShortFormat": "D MMM",
@@ -142,8 +143,12 @@ const translation = {
         "Message1045": "Il y a eu un problème lors de l'initialisation de l'agent.",
         "Title1046": "Impossible de récupérer les contacts.",
         "Message1046": "Il y a eu un problème lors de la récupération des contacts.",
-        "Title1047": "Unable to display card. (PT-FR)",
-        "Message1047": "There was a problem parsing credential card. (PT-FR)",
+        "Title1047": "Unable to display card. (FR)",
+        "Message1047": "There was a problem parsing credential card. (FR)",
+        "Title1048": "Proof request problems. (FR)",
+        "Message1048": "There was a problem with the proof request. (FR)",
+        "Title1049": "Unable to change PIN. (FR)",
+        "Message1049": "There was a problem while attempting to change your PIN. (FR)",
     },
     "SelectionAxs": {
         "RadioChecked": "checked(fr)",
@@ -414,20 +419,20 @@ const translation = {
         },
         "Button": "Sort/Filter(fr)",
         "NoHistory": "You haven't used any cards yet.\n\nEach time you add or use a card, that activity will be saved here.(fr)",
-        "CardTitle":{
-          "CardAccepted": "Carte Acceptée:",
-          "CardDeclined": "Carte refusée:",
-          "CardExpired": "Card expirée",
-          "CardRemoved": "Carte retirée",
-          "CardRevoked": "Carte révoquée",
-          "CardUpdates": "Mises à jour de la carte",
-          "WalletPinUpdated": "NIP du portefeuille mis à jour",
-          "InformationSent": "Information envoyée à:",
-          "InformationNotSent": "Information non envoyée à:",
-          "Connection": "Connexion",
-          "ConnectionRemoved": "Connexion retirée",
-          "ActivateBiometry": "Biométrie activée",
-          "DeactivateBiometry": "Biométrie désactivée",
+        "CardTitle": {
+            "CardAccepted": "Carte Acceptée:",
+            "CardDeclined": "Carte refusée:",
+            "CardExpired": "Card expirée",
+            "CardRemoved": "Carte retirée",
+            "CardRevoked": "Carte révoquée",
+            "CardUpdates": "Mises à jour de la carte",
+            "WalletPinUpdated": "NIP du portefeuille mis à jour",
+            "InformationSent": "Information envoyée à:",
+            "InformationNotSent": "Information non envoyée à:",
+            "Connection": "Connexion",
+            "ConnectionRemoved": "Connexion retirée",
+            "ActivateBiometry": "Biométrie activée",
+            "DeactivateBiometry": "Biométrie désactivée",
         },
         "CardDescription": {
             "CardExpired": "{{cardName}} expired(fr)",
@@ -486,7 +491,7 @@ const translation = {
         "Credential": "attestation",
     },
     "PushNotifications": {
-        "EnableNotifiactions": "Activer les Notifications pour recevoir des alertes instantanées",
+        "EnableNotifications": "Activer les Notifications pour recevoir des alertes instantanées",
         "BeNotified": "Soyez averti lorsque vous recevez :",
         "ReceiveNotifications": "Recevoir des notifications",
         "BulletFour": "nouveaux messages",
@@ -697,8 +702,15 @@ const translation = {
         "DeclineBulletPoint3": "Etes-vous sûr vous voulez refuser cette demande de preuve?",
         "NoInfoShared": "Aucune information n'a été partagée",
         "YourInfo": "Votre information n'a pas été partagée",
-        "YouCantRespond": "You can't respond due to the following reasons. Please address them before continuing. (FR)",
-        "CredentailNotInWallet": "This credential is not present in your wallet.(FR)",
+        "YouCantRespond": "You can't respond to this proof request. (FR)",
+        "YouCantRespondReasons": "You can't respond due to:  (FR)",
+        "CredentialNotInWallet": "This credential is not present in your wallet. (FR)",
+        "CredentialIsMissing": "missing credentials (FR)",
+        "ProofRequestPredicateError": "requirements aren't met (FR)",
+        "CredentialForProofIsRevoked": "revoked credential (FR)",
+        "ProofRequestStateError": "The proof request received is in: {{state}}, decline this proof and try again. (FR)",
+        "ProofRequestErrorMessage": "Something went wrong with the proof request. (FR)",
+        "PleaseAddress": " Please address them before continuing. (FR)",
     },
     "Settings": {
         "Version": "Version",
@@ -892,6 +904,6 @@ const translation = {
         "LearnMore": "Learn what's New (FR)",
         "UpdateNow": "Update the app (FR)",
         "UpdateLater": "Do this later (FR)",
-      },
+    },
 }
 export default translation

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

@@ -46,6 +46,7 @@ const translation = {
     "Updated": "Updated",
     "Close": "Fechar",
     "Remove": "Remover",
+    "GotIt": "Got it (PT-BR)",
   },
   "Date": {
     "ShortFormat": "D MMM",
@@ -143,6 +144,10 @@ const translation = {
     "Message1046": "There was a problem while fetching contacts. (PT-BR)",
     "Title1047": "Unable to display card. (PT-BR)",
     "Message1047": "There was a problem parsing credential card. (PT-BR)",
+    "Title1048": "Proof request problems. (PT-BR)",
+    "Message1048": "There was a problem with the proof request. (PT-BR)",
+    "Title1049": "Unable to change PIN. (PT-BR)",
+    "Message1049": "There was a problem while attempting to change your PIN. (PT-BR)",
   },
   "SelectionAxs": {
     "RadioChecked": "checked",
@@ -222,33 +227,27 @@ const translation = {
       "CheckIcon": "Critério atendido",
       "ClearIcon": "Critério não atendido",
     },
-    "UserAuthenticationPIN": "PIN de autenticação do usuário",
     "PINTooShort": "PIN é curto demais",
     "InvalidPIN": "PIN inválido",
     "PINsDoNotMatch": "PINs não conferem",
-    "PleaseUseOnlyNumbersInYourPIN": "Favor usar somente números em seu PIN",
-    "YourPINMustBe6DigitsInLength": "Seu PIN precisa ter 6 digitos.",
-    "EnteredPINsDoNotMatch": "Os PINs não conferem. Favor tentar novamente.",
-    "YouNeedToCreateA6DigitPIN": "Você precisa criar um PIN de 6 digitos",
-    "PleaseReenterYourPIN": "Favor digitar novamente seu PIN",
-    "PinChangeSuccessTitle": "Seu PIN foi alterado com sucesso",
-    "PinChangeSuccessMessage": "Seu PIN foi alterado com sucesso. Agora você pode entrar no app com seu novo PIN.",
-    "EnterOldPINTitle": "Digite seu PIN antigo",
-    "EnterOldPIN": "Digite seu PIN antigo",
-    "NewPIN": "novo",
-    "EnterPINTitle": "Digite um {{ new }}PIN de 6 digitos",
+    "EnterPINTitle": "Digite um PIN de 6 digitos",
     "EnterPIN": "Digitar PIN",
-    "ReenterPIN": "Digite novamente o {{ new }}PIN",
-    "ReenterPINTitle": "Digitar novamente PIN",
+    "ReenterPIN": "Digite novamente o PIN",
     "CreatePIN": "Criar PIN",
     "RememberPIN": "Criar um PIN para assegurar sua carteira.",
-    "RememberChangePIN": "Altere seu PIN para assegurar sua carteira.",
     "PINDisclaimer": "Se você o esquecer, você precisará redefinir sua carteira e readicionar seus cards.",
     "Show": "Mostrar PIN",
     "Hide": "Esconder PIN",
+  },
+  "PINChange": {
+    "PinChangeSuccessTitle": "Seu PIN foi alterado com sucesso",
+    "PinChangeSuccessMessage": "Seu PIN foi alterado com sucesso. Agora você pode entrar no app com seu novo PIN.",
+    "EnterOldPINTitle": "Digite seu PIN antigo",
+    "EnterOldPIN": "Digite seu PIN antigo",
+    "EnterPINTitle": "Digite um PIN de 6 digitos",
+    "ReenterPIN": "Digite novamente o PIN",
+    "RememberChangePIN": "Altere seu PIN para assegurar sua carteira.",
     "ChangePIN": "Alterar PIN",
-    "Continue": "Continuar",
-    "EnterYourCurrentPIN": "Digite seu PIN atual."
   },
   "PINEnter": {
     "EnterPIN": "Digitar PIN",
@@ -399,19 +398,19 @@ const translation = {
     "Button": "Sort/Filter",
     "NoHistory": "You haven't used any cards yet.\n\nEach time you add or use a card, that activity will be saved here.",
     "CardTitle": {
-      "CardAccepted": "Card accepted:",
-      "CardDeclined": "Card declined:",
-      "CardExpired": "Card expired",
-      "CardRemoved": "Card removed",
-      "CardRevoked": "Card revoked",
-      "CardUpdates": "Card updates",
-      "WalletPinUpdated": "Wallet PIN updated",
-      "InformationSent": "Information sent to:",
-      "InformationNotSent": "Information not sent to:",
-      "Connection": "Connection",
-      "ConnectionRemoved": "Connection removed",
-      "ActivateBiometry": "Biometrics activated",
-      "DeactivateBiometry": "Biometrics deactivated"
+      "CardAccepted": "Card accepted: (PT-BR)",
+      "CardDeclined": "Card declined: (PT-BR)",
+      "CardExpired": "Card expired (PT-BR)",
+      "CardRemoved": "Card removed (PT-BR)",
+      "CardRevoked": "Card revoked (PT-BR)",
+      "CardUpdates": "Card updates (PT-BR)",
+      "WalletPinUpdated": "Wallet PIN updated (PT-BR)",
+      "InformationSent": "Information sent to (PT-BR):",
+      "InformationNotSent": "Information not sent to (PT-BR):",
+      "Connection": "Connection (PT-BR)",
+      "ConnectionRemoved": "Connection removed (PT-BR)",
+      "ActivateBiometry": "Biometrics activated (PT-BR)",
+      "DeactivateBiometry": "Biometrics deactivated (PT-BR)"
     },
     "CardDescription": {
       "CardExpired": "{{cardName}} expired",
@@ -470,7 +469,7 @@ const translation = {
     "Credential": "credencial"
   },
   "PushNotifications": {
-    "EnableNotifiactions": "Enable Notifications to get instant alerts (PT-BR)",
+    "EnableNotifications": "Enable Notifications to get instant alerts (PT-BR)",
     "BeNotified": "Be notified when you receive: (PT-BR)",
     "ReceiveNotifications": "Receive notifications (PT-BR)",
     "BulletFour": "new messages (PT-BR)",
@@ -688,8 +687,15 @@ const translation = {
     "DeclineBulletPoint3": "Você tem certeza que quer recusar esta requisição de prova?",
     "NoInfoShared": "No information was shared (PT-BR)",
     "YourInfo": "Your information was not shared (PT-BR)",
-    "YouCantRespond": "You can't respond due to the following reasons. Please address them before continuing. (PT-BR)",
-    "CredentailNotInWallet": "This credential is not present in your wallet. (PT-BR)",
+    "YouCantRespond": "You can't respond to this proof request. (PT-BR)",
+    "YouCantRespondReasons": "You can't respond due to:  (PT-BR)",
+    "CredentialNotInWallet": "This credential is not present in your wallet. (PT-BR)",
+    "CredentialIsMissing": "missing credentials (PT-BR)",
+    "ProofRequestPredicateError": "requirements aren't met (PT-BR)",
+    "CredentialForProofIsRevoked": "revoked credential (PT-BR)",
+    "ProofRequestStateError": "The proof request received is in: {{state}}, decline this proof and try again. (PT-BR)",
+    "ProofRequestErrorMessage": "Something went wrong with the proof request. (PT-BR)",
+    "PleaseAddress": " Please address them before continuing. (PT-BR)",
   },
   "Settings": {
     "Version": "Versão",

package/src/navigators/MainStack.tsx

@@ -1,5 +1,8 @@
+import { ProofCustomMetadata, ProofMetadata } from '@bifold/verifier'
+import { useAgent, useProofByState } from '@credo-ts/react-hooks'
+import { ProofState } from '@credo-ts/core'
 import { CardStyleInterpolators, StackCardStyleInterpolator, createStackNavigator } from '@react-navigation/stack'
-import React, { useMemo } from 'react'
+import React, { useEffect, useMemo } from 'react'
 import { View } from 'react-native'
 import { useTranslation } from 'react-i18next'
 
@@ -10,29 +13,45 @@ import HistoryStack from '../modules/history/navigation/HistoryStack'
 import Chat from '../screens/Chat'
 import { Screens, Stacks, TabStacks } from '../types/navigators'
 import { testIdWithKey } from '../utils/testable'
+import { useStore } from '../contexts/store'
+import { useTour } from '../contexts/tour/tour-context'
+import { useDeepLinks } from '../hooks/deep-links'
+import CredentialDetails from '../screens/CredentialDetails'
+import OpenIDCredentialDetails from '../modules/openid/screens/OpenIDCredentialDetails'
 
 import ConnectStack from './ConnectStack'
 import ContactStack from './ContactStack'
-import { useTour } from '../contexts/tour/tour-context'
 import DeliveryStack from './DeliveryStack'
 import NotificationStack from './NotificationStack'
 import ProofRequestStack from './ProofRequestStack'
 import SettingStack from './SettingStack'
 import TabStack from './TabStack'
 import { useDefaultStackOptions } from './defaultStackOptions'
-import CredentialDetails from '../screens/CredentialDetails'
-import OpenIDCredentialDetails from '../modules/openid/screens/OpenIDCredentialDetails'
 
 const MainStack: React.FC = () => {
   const { t } = useTranslation()
   const theme = useTheme()
   const { currentStep } = useTour()
+  const [store] = useStore()
+  const { agent } = useAgent()
   const defaultStackOptions = useDefaultStackOptions(theme)
-  const [splash, CustomNavStack1, ScreenOptionsDictionary] = useServices([
-    TOKENS.SCREEN_SPLASH,
+  const [CustomNavStack1, ScreenOptionsDictionary] = useServices([
     TOKENS.CUSTOM_NAV_STACK_1,
     TOKENS.OBJECT_SCREEN_CONFIG,
   ])
+  const declinedProofs = useProofByState([ProofState.Declined, ProofState.Abandoned])
+  useDeepLinks()
+
+  // remove connection on mobile verifier proofs if proof is rejected
+  useEffect(() => {
+    declinedProofs.forEach((proof) => {
+      const meta = proof?.metadata?.get(ProofMetadata.customMetadata) as ProofCustomMetadata
+      if (meta?.delete_conn_after_seen) {
+        agent?.connections.deleteById(proof?.connectionId ?? '').catch(() => null)
+        proof?.metadata.set(ProofMetadata.customMetadata, { ...meta, delete_conn_after_seen: false })
+      }
+    })
+  }, [declinedProofs, agent, store.preferences.useDataRetention])
 
   const Stack = createStackNavigator()
 
@@ -47,8 +66,10 @@ const MainStack: React.FC = () => {
 
   return (
     <View style={{ flex: 1 }} importantForAccessibility={hideElements}>
-      <Stack.Navigator initialRouteName={Screens.Splash} screenOptions={{ ...defaultStackOptions, headerShown: false }}>
-        <Stack.Screen name={Screens.Splash} component={splash} />
+      <Stack.Navigator
+        initialRouteName={Stacks.TabStack}
+        screenOptions={{ ...defaultStackOptions, headerShown: false }}
+      >
         <Stack.Screen name={Stacks.TabStack} component={TabStack} />
         <Stack.Screen
           name={Screens.CredentialDetails}

package/src/navigators/OnboardingScreens.ts

@@ -13,13 +13,13 @@ type ScreenOptions = RouteConfig<
 >
 
 interface ScreenComponents {
-  Splash: React.FC<StackScreenProps<ParamListBase>>
+  SplashScreen: React.FC<StackScreenProps<ParamListBase>>
   Preface: React.FC<StackScreenProps<ParamListBase>>
   UpdateAvailableScreen: React.FC
   Terms: React.FC<StackScreenProps<ParamListBase>>
   NameWallet: React.FC<StackScreenProps<ParamListBase>>
-  useBiometry: React.FC<StackScreenProps<ParamListBase>>
-  PushNotification: React.FC<StackScreenProps<ParamListBase, Screens.UsePushNotifications>>
+  Biometry: React.FC<StackScreenProps<ParamListBase>>
+  PushNotifications: React.FC<StackScreenProps<ParamListBase>>
   Developer: React.FC<StackScreenProps<ParamListBase>>
   AttemptLockout: React.FC<StackScreenProps<ParamListBase>>
   OnboardingScreen: React.FC
@@ -34,7 +34,7 @@ export const getOnboardingScreens = (
 ): ScreenOptions[] => [
   {
     name: Screens.Splash,
-    component: components.Splash,
+    component: components.SplashScreen,
     options: {
       ...TransitionPresets.ModalFadeTransition,
       title: t('Screens.Splash'),
@@ -100,23 +100,23 @@ export const getOnboardingScreens = (
     component: components.NameWallet,
   },
   {
-    name: Screens.UseBiometry,
+    name: Screens.Biometry,
     options: () => ({
       ...TransitionPresets.SlideFromRightIOS,
       title: t('Screens.Biometry'),
       headerLeft: () => false,
-      ...ScreenOptionsDictionary[Screens.UseBiometry],
+      ...ScreenOptionsDictionary[Screens.Biometry],
     }),
-    component: components.useBiometry,
+    component: components.Biometry,
   },
   {
-    name: Screens.UsePushNotifications,
-    component: components.PushNotification,
+    name: Screens.PushNotifications,
+    component: components.PushNotifications,
     options: () => ({
       ...TransitionPresets.SlideFromRightIOS,
-      title: t('Screens.UsePushNotifications'),
+      title: t('Screens.PushNotifications'),
       headerLeft: () => false,
-      ...ScreenOptionsDictionary[Screens.UsePushNotifications],
+      ...ScreenOptionsDictionary[Screens.PushNotifications],
     }),
   },
   {