@bifold/core 1.0.0 → 2.0.1

package/src/navigators/OnboardingStack.tsx

@@ -1,30 +1,37 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { Agent } from '@credo-ts/core'
 import { StackActions, useNavigation, useNavigationState } from '@react-navigation/native'
 import { StackNavigationProp, createStackNavigator } from '@react-navigation/stack'
-import { EventTypes } from '../constants'
 import React, { useMemo, useCallback, useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
+import { DeviceEventEmitter } from 'react-native'
 
+import { EventTypes } from '../constants'
 import { TOKENS, useServices } from '../container-api'
 import { DispatchAction } from '../contexts/reducers/store'
 import { useStore } from '../contexts/store'
 import { useTheme } from '../contexts/theme'
+import { useOnboardingState } from '../hooks/useOnboardingState'
 import AttemptLockout from '../screens/AttemptLockout'
 import NameWallet from '../screens/NameWallet'
 import { createCarouselStyle } from '../screens/OnboardingPages'
 import PINCreate from '../screens/PINCreate'
 import PINEnter from '../screens/PINEnter'
-import PushNotification from '../screens/PushNotification'
-import { AuthenticateStackParams } from '../types/navigators'
+import PushNotifications from '../screens/PushNotifications'
+import { OnboardingStackParams } from '../types/navigators'
+import { WalletSecret } from '../types/security'
 import { State } from '../types/state'
 import { Config } from '../types/config'
 
 import { useDefaultStackOptions } from './defaultStackOptions'
-import { DeviceEventEmitter } from 'react-native'
 import { getOnboardingScreens } from './OnboardingScreens'
-import { useOnboardingState } from '../hooks/useOnboardingState'
 
-const OnboardingStack: React.FC = () => {
+export type OnboardingStackProps = {
+  initializeAgent: (walletSecret: WalletSecret) => Promise<void>
+  agent: Agent | null
+}
+
+const OnboardingStack: React.FC<OnboardingStackProps> = ({ initializeAgent, agent }) => {
   const [store, dispatch] = useStore<State>()
   const { t } = useTranslation()
   const Stack = createStackNavigator()
@@ -35,7 +42,7 @@ const OnboardingStack: React.FC = () => {
     config,
     Splash,
     pages,
-    useBiometry,
+    Biometry,
     Onboarding,
     Developer,
     { screen: Terms, version: termsVersion },
@@ -49,7 +56,7 @@ const OnboardingStack: React.FC = () => {
     TOKENS.CONFIG,
     TOKENS.SCREEN_SPLASH,
     TOKENS.SCREEN_ONBOARDING_PAGES,
-    TOKENS.SCREEN_USE_BIOMETRY,
+    TOKENS.SCREEN_BIOMETRY,
     TOKENS.SCREEN_ONBOARDING,
     TOKENS.SCREEN_DEVELOPER,
     TOKENS.SCREEN_TERMS,
@@ -61,7 +68,7 @@ const OnboardingStack: React.FC = () => {
     TOKENS.ONBOARDING,
   ])
   const defaultStackOptions = useDefaultStackOptions(theme)
-  const navigation = useNavigation<StackNavigationProp<AuthenticateStackParams>>()
+  const navigation = useNavigation<StackNavigationProp<OnboardingStackParams>>()
   const onTutorialCompleted = onTutorialCompletedCurried(dispatch, navigation)
   const currentRoute = useNavigationState((state) => state?.routes[state?.index])
   const { disableOnboardingSkip } = config as Config
@@ -69,6 +76,7 @@ const OnboardingStack: React.FC = () => {
     store,
     config,
     Number(termsVersion),
+    agent,
     generateOnboardingWorkflowSteps
   )
 
@@ -94,6 +102,10 @@ const OnboardingStack: React.FC = () => {
     [dispatch]
   )
 
+  const SplashScreen = useCallback(() => {
+    return <Splash initializeAgent={initializeAgent} />
+  }, [Splash, initializeAgent])
+
   const UpdateAvailableScreen = useCallback(() => {
     return (
       <UpdateAvailable
@@ -153,13 +165,13 @@ const OnboardingStack: React.FC = () => {
   const screens = useMemo(
     () =>
       getOnboardingScreens(t, ScreenOptionsDictionary, {
-        Splash,
+        SplashScreen,
         Preface,
         UpdateAvailableScreen,
         Terms,
         NameWallet,
-        useBiometry,
-        PushNotification,
+        Biometry,
+        PushNotifications,
         Developer,
         AttemptLockout,
         OnboardingScreen,
@@ -167,14 +179,14 @@ const OnboardingStack: React.FC = () => {
         EnterPINScreen,
       }),
     [
-      Splash,
+      SplashScreen,
       CreatePINScreen,
       Developer,
       EnterPINScreen,
       OnboardingScreen,
       Preface,
       Terms,
-      useBiometry,
+      Biometry,
       t,
       ScreenOptionsDictionary,
       UpdateAvailableScreen,

package/src/navigators/RootStack.tsx

@@ -1,34 +1,39 @@
-import { ProofState } from '@credo-ts/core'
-import { useAgent, useProofByState } from '@credo-ts/react-hooks'
-import { ProofCustomMetadata, ProofMetadata } from '@bifold/verifier'
+import AgentProvider from '@credo-ts/react-hooks'
 import React, { useState, useEffect, useMemo } from 'react'
 import { useTranslation } from 'react-i18next'
 import { DeviceEventEmitter } from 'react-native'
 
+import { OpenIDCredentialRecordProvider } from '../modules/openid/context/OpenIDCredentialRecordProvider'
 import { EventTypes } from '../constants'
 import { TOKENS, useServices } from '../container-api'
+import { ActivityProvider } from '../contexts/activity'
 import { useStore } from '../contexts/store'
-import { useDeepLinks } from '../hooks/deep-links'
 import { BifoldError } from '../types/error'
 import MainStack from './MainStack'
 
 const RootStack: React.FC = () => {
   const [store, dispatch] = useStore()
-  const { agent } = useAgent()
   const { t } = useTranslation()
-  const [OnboardingStack, loadState] = useServices([TOKENS.STACK_ONBOARDING, TOKENS.LOAD_STATE])
-  // remove connection on mobile verifier proofs if proof is rejected
-  // regardless of if it has been opened
-  const declinedProofs = useProofByState([ProofState.Declined, ProofState.Abandoned])
+  const [useAgentSetup, OnboardingStack, loadState] = useServices([
+    TOKENS.HOOK_USE_AGENT_SETUP,
+    TOKENS.STACK_ONBOARDING,
+    TOKENS.LOAD_STATE,
+  ])
+  const { agent, initializeAgent, shutdownAndClearAgentIfExists } = useAgentSetup()
   const [onboardingComplete, setOnboardingComplete] = useState(false)
 
-  useDeepLinks()
-
   const shouldRenderMainStack = useMemo(
     () => onboardingComplete && store.authentication.didAuthenticate,
     [onboardingComplete, store.authentication.didAuthenticate]
   )
 
+  useEffect(() => {
+    // if user gets locked out, erase agent
+    if (!store.authentication.didAuthenticate) {
+      shutdownAndClearAgentIfExists()
+    }
+  }, [store.authentication.didAuthenticate, shutdownAndClearAgentIfExists])
+
   useEffect(() => {
     const sub = DeviceEventEmitter.addListener(EventTypes.DID_COMPLETE_ONBOARDING, () => {
       setOnboardingComplete(true)
@@ -38,28 +43,29 @@ const RootStack: React.FC = () => {
   }, [])
 
   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])
-
-  useEffect(() => {
+    // Load state only if it hasn't been loaded yet
+    if (store.stateLoaded) return
+    
     loadState(dispatch).catch((err: unknown) => {
       const error = new BifoldError(t('Error.Title1044'), t('Error.Message1044'), (err as Error).message, 1001)
 
       DeviceEventEmitter.emit(EventTypes.ERROR_ADDED, error)
     })
-  }, [dispatch, loadState, t])
+  }, [dispatch, loadState, t, store.stateLoaded])
 
-  if (shouldRenderMainStack) {
-    return <MainStack />
+  if (shouldRenderMainStack && agent) {
+    return (
+      <AgentProvider agent={agent}>
+        <OpenIDCredentialRecordProvider>
+          <ActivityProvider>
+            <MainStack />
+          </ActivityProvider>
+        </OpenIDCredentialRecordProvider>
+      </AgentProvider>
+    )
   }
 
-  return <OnboardingStack />
+  return <OnboardingStack agent={agent} initializeAgent={initializeAgent} />
 }
 
 export default RootStack

package/src/navigators/SettingStack.tsx

@@ -9,8 +9,8 @@ import Language from '../screens/Language'
 import NameWallet from '../screens/NameWallet'
 import Onboarding from '../screens/Onboarding'
 import { createCarouselStyle } from '../screens/OnboardingPages'
-import PINCreate from '../screens/PINCreate'
-import PushNotification from '../screens/PushNotification'
+import PINChange from '../screens/PINChange'
+import TogglePushNotifications from '../screens/TogglePushNotifications'
 import Settings from '../screens/Settings'
 import Tours from '../screens/Tours'
 import { Screens, SettingStackParams } from '../types/navigators'
@@ -24,10 +24,10 @@ const SettingStack: React.FC = () => {
   const Stack = createStackNavigator<SettingStackParams>()
   const theme = useTheme()
   const { t } = useTranslation()
-  const [pages, { screen: terms }, UseBiometry, developer, ScreenOptionsDictionary] = useServices([
+  const [pages, { screen: terms }, ToggleBiometry, developer, ScreenOptionsDictionary] = useServices([
     TOKENS.SCREEN_ONBOARDING_PAGES,
     TOKENS.SCREEN_TERMS,
-    TOKENS.SCREEN_USE_BIOMETRY,
+    TOKENS.SCREEN_TOGGLE_BIOMETRY,
     TOKENS.SCREEN_DEVELOPER,
     TOKENS.OBJECT_SCREEN_CONFIG,
   ])
@@ -92,31 +92,30 @@ const SettingStack: React.FC = () => {
         }}
       />
       <Stack.Screen
-        name={Screens.UseBiometry}
-        component={UseBiometry}
+        name={Screens.ToggleBiometry}
+        component={ToggleBiometry}
         options={{
           title: t('Screens.Biometry'),
           headerBackTestID: testIdWithKey('Back'),
-          ...ScreenOptionsDictionary[Screens.UseBiometry],
+          ...ScreenOptionsDictionary[Screens.ToggleBiometry],
         }}
       />
       <Stack.Screen
-        name={Screens.CreatePIN}
+        name={Screens.ChangePIN}
+        component={PINChange}
         options={{
           title: t('Screens.ChangePIN'),
           headerBackTestID: testIdWithKey('Back'),
-          ...ScreenOptionsDictionary[Screens.CreatePIN],
+          ...ScreenOptionsDictionary[Screens.ChangePIN],
         }}
-      >
-        {(props: any) => <PINCreate explainedStatus {...props} />}
-      </Stack.Screen>
+      ></Stack.Screen>
       <Stack.Screen
-        name={Screens.UsePushNotifications}
-        component={PushNotification}
+        name={Screens.TogglePushNotifications}
+        component={TogglePushNotifications}
         options={{
-          title: t('Screens.UsePushNotifications'),
+          title: t('Screens.PushNotifications'),
           headerBackTestID: testIdWithKey('Back'),
-          ...ScreenOptionsDictionary[Screens.UsePushNotifications],
+          ...ScreenOptionsDictionary[Screens.TogglePushNotifications],
         }}
       />
       <Stack.Screen

package/src/navigators/defaultStackOptions.tsx

@@ -27,11 +27,18 @@ export const DefaultScreenOptionsDictionary: ScreenOptionsType = {
   [Screens.CreatePIN]: {
     headerBackTestID: testIdWithKey('Back'),
   },
+  [Screens.ChangePIN]: {
+    headerBackTestID: testIdWithKey('Back'),
+  },
   [Screens.NameWallet]: {
     headerTintColor: OnboardingTheme.headerTintColor,
     headerBackTestID: testIdWithKey('Back'),
   },
-  [Screens.UseBiometry]: {
+  [Screens.Biometry]: {
+    headerTintColor: OnboardingTheme.headerTintColor,
+    headerBackTestID: testIdWithKey('Back'),
+  },
+  [Screens.ToggleBiometry]: {
     headerTintColor: OnboardingTheme.headerTintColor,
     headerBackTestID: testIdWithKey('Back'),
   },
@@ -39,7 +46,11 @@ export const DefaultScreenOptionsDictionary: ScreenOptionsType = {
     headerTintColor: OnboardingTheme.headerTintColor,
     headerBackTestID: testIdWithKey('Back'),
   },
-  [Screens.UsePushNotifications]: {
+  [Screens.PushNotifications]: {
+    headerTintColor: OnboardingTheme.headerTintColor,
+    headerBackTestID: testIdWithKey('Back'),
+  },
+  [Screens.TogglePushNotifications]: {
     headerTintColor: OnboardingTheme.headerTintColor,
     headerBackTestID: testIdWithKey('Back'),
   },

package/src/onboarding.ts

@@ -1,7 +1,8 @@
-import { Screens, OnboardingTask } from './types/navigators'
+import { Agent } from '@credo-ts/core'
+import { OnboardingTask, Screens } from './types/navigators'
 
-import { State } from './types/state'
 import { Config } from './types/config'
+import { State } from './types/state'
 
 export const isPrefaceComplete = (didSeePreface: boolean, showPreface: boolean): OnboardingTask => {
   return { name: Screens.Preface, completed: (didSeePreface && showPreface) || !showPreface }
@@ -24,7 +25,7 @@ export const isPINCreationComplete = (didCreatePIN: boolean): OnboardingTask =>
 }
 
 export const isBiometryComplete = (didConsiderBiometry: boolean): OnboardingTask => {
-  return { name: Screens.UseBiometry, completed: didConsiderBiometry }
+  return { name: Screens.Biometry, completed: didConsiderBiometry }
 }
 
 export const isPushNotificationComplete = (
@@ -32,7 +33,7 @@ export const isPushNotificationComplete = (
   enablePushNotifications: any
 ): OnboardingTask => {
   return {
-    name: Screens.UsePushNotifications,
+    name: Screens.PushNotifications,
     completed: !enablePushNotifications || (didConsiderPushNotifications && enablePushNotifications),
   }
 }
@@ -49,10 +50,15 @@ export const isAttemptLockoutComplete = (servedPenalty: boolean | undefined): On
   return { name: Screens.AttemptLockout, completed: servedPenalty !== false }
 }
 
+export const isAgentInitializationComplete = (agent: Agent | null): OnboardingTask => {
+  return { name: Screens.Splash, completed: !!agent }
+}
+
 export const generateOnboardingWorkflowSteps = (
   state: State,
   config: Config,
-  termsVersion: number
+  termsVersion: number,
+  agent: Agent | null
 ): Array<OnboardingTask> => {
   const {
     didSeePreface,
@@ -79,5 +85,6 @@ export const generateOnboardingWorkflowSteps = (
     isNameWalletComplete(didNameWallet, enableWalletNaming),
     isAttemptLockoutComplete(servedPenalty),
     isAuthenticationComplete(didCreatePIN, didAuthenticate),
+    isAgentInitializationComplete(agent),
   ]
 }

package/src/screens/Biometry.tsx

@@ -0,0 +1,57 @@
+import React, { useCallback, useState } from 'react'
+import { useTranslation } from 'react-i18next'
+import { View } from 'react-native'
+
+import Button, { ButtonType } from '../components/buttons/Button'
+import BiometryControl from '../components/inputs/BiometryControl'
+import { useAnimatedComponents } from '../contexts/animated-components'
+import { useAuth } from '../contexts/auth'
+import { DispatchAction } from '../contexts/reducers/store'
+import { useStore } from '../contexts/store'
+import { testIdWithKey } from '../utils/testable'
+
+const Biometry: React.FC = () => {
+  const [store, dispatch] = useStore()
+  const { t } = useTranslation()
+  const { commitWalletToKeychain } = useAuth()
+  const [biometryEnabled, setBiometryEnabled] = useState(store.preferences.useBiometry)
+  const [continueEnabled, setContinueEnabled] = useState(true)
+  const { ButtonLoading } = useAnimatedComponents()
+
+  const continueTouched = useCallback(async () => {
+    setContinueEnabled(false)
+
+    await commitWalletToKeychain(biometryEnabled)
+
+    dispatch({
+      type: DispatchAction.USE_BIOMETRY,
+      payload: [biometryEnabled],
+    })
+  }, [biometryEnabled, commitWalletToKeychain, dispatch])
+
+  const handleBiometryToggle = useCallback((newValue: boolean) => {
+    setBiometryEnabled(newValue)
+  }, [])
+
+  return (
+    <BiometryControl 
+      biometryEnabled={biometryEnabled} 
+      onBiometryToggle={handleBiometryToggle}
+    >
+      <View style={{ marginTop: 'auto', margin: 20 }}>
+        <Button
+          title={t('Global.Continue')}
+          accessibilityLabel={'Continue'}
+          testID={testIdWithKey('Continue')}
+          onPress={continueTouched}
+          buttonType={ButtonType.Primary}
+          disabled={!continueEnabled}
+        >
+          {!continueEnabled && <ButtonLoading />}
+        </Button>
+      </View>
+    </BiometryControl>
+  )
+}
+
+export default Biometry

package/src/screens/CredentialOffer.tsx

@@ -290,8 +290,8 @@ const CredentialOffer: React.FC<CredentialOfferProps> = ({ navigation, credentia
         }}
       >
         {loading ? <RecordLoading /> : null}
-        {credentialConnectionLabel && goalCode === 'aries.vc.issue' && (
-          <ConnectionAlert connectionID={credentialConnectionLabel} />
+        {Boolean(credentialConnectionLabel) && goalCode === 'aries.vc.issue' && (
+          <ConnectionAlert connectionLabel={credentialConnectionLabel} />
         )}
         <View style={styles.footerButton}>
           <Button

package/src/screens/Onboarding.tsx

@@ -9,7 +9,7 @@ import IconButton, { ButtonLocation } from '../components/buttons/IconButton'
 import { Pagination } from '../components/misc/Pagination'
 import { DispatchAction } from '../contexts/reducers/store'
 import { useStore } from '../contexts/store'
-import { AuthenticateStackParams } from '../types/navigators'
+import { OnboardingStackParams } from '../types/navigators'
 import { testIdWithKey } from '../utils/testable'
 export interface OnboardingStyleSheet {
   container: ViewStyle
@@ -41,7 +41,7 @@ const Onboarding: React.FC<OnboardingProps> = ({
   const flatList: Ref<FlatList> = useRef(null)
   const scrollX = useRef(new Animated.Value(0)).current
   const { t } = useTranslation()
-  const navigation = useNavigation<StackNavigationProp<AuthenticateStackParams>>()
+  const navigation = useNavigation<StackNavigationProp<OnboardingStackParams>>()
   const [, dispatch] = useStore()
   const { width } = useWindowDimensions()