@bifold/core 1.0.0 → 2.0.1

package/src/screens/Preface.tsx

@@ -10,7 +10,7 @@ import CheckBoxRow from '../components/inputs/CheckBoxRow'
 import { DispatchAction } from '../contexts/reducers/store'
 import { useStore } from '../contexts/store'
 import { useTheme } from '../contexts/theme'
-import { AuthenticateStackParams, Screens } from '../types/navigators'
+import { OnboardingStackParams, Screens } from '../types/navigators'
 import { testIdWithKey } from '../utils/testable'
 import { ThemedText } from '../components/texts/ThemedText'
 
@@ -18,7 +18,7 @@ const Preface: React.FC = () => {
   const [, dispatch] = useStore()
   const [checked, setChecked] = useState(false)
   const { t } = useTranslation()
-  const navigation = useNavigation<StackNavigationProp<AuthenticateStackParams>>()
+  const navigation = useNavigation<StackNavigationProp<OnboardingStackParams>>()
   const { Assets, OnboardingTheme, TextTheme } = useTheme()
   const onSubmitPressed = () => {
     dispatch({

package/src/screens/ProofRequest.tsx

@@ -8,9 +8,9 @@ import {
   CredentialExchangeRecord,
   CredentialRecordBinding,
   DifPexInputDescriptorToCredentials,
-  ProofState,
   CredoError,
   V2RequestPresentationMessage,
+  ProofState,
 } from '@credo-ts/core'
 import { useConnectionById, useProofById } from '@credo-ts/react-hooks'
 import { Attribute, Predicate } from '@bifold/oca/build/legacy'
@@ -18,14 +18,21 @@ import { useIsFocused } from '@react-navigation/native'
 import moment from 'moment'
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { DeviceEventEmitter, EmitterSubscription, FlatList, ScrollView, StyleSheet, View } from 'react-native'
+import {
+  DeviceEventEmitter,
+  EmitterSubscription,
+  FlatList,
+  ScrollView,
+  StyleSheet,
+  useWindowDimensions,
+  View,
+} from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
-import Icon from 'react-native-vector-icons/MaterialIcons'
 
 import Button, { ButtonType } from '../components/buttons/Button'
 import { CredentialCard } from '../components/misc'
 import ConnectionImage from '../components/misc/ConnectionImage'
-import { InfoBoxType } from '../components/misc/InfoBox'
+import InfoBox, { InfoBoxType } from '../components/misc/InfoBox'
 import CommonRemoveModal from '../components/modals/CommonRemoveModal'
 import ProofCancelModal from '../components/modals/ProofCancelModal'
 import InfoTextBox from '../components/texts/InfoTextBox'
@@ -83,6 +90,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
   const { agent } = useAppAgent()
   const { t } = useTranslation()
   const { assertNetworkConnected } = useNetwork()
+  const { height } = useWindowDimensions()
   const proof = useProofById(proofId)
   const connection = useConnectionById(proof?.connectionId ?? '')
   const [pendingModalVisible, setPendingModalVisible] = useState(false)
@@ -102,6 +110,8 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
   const [activeCreds, setActiveCreds] = useState<ProofCredentialItems[]>([])
   const [selectedCredentials, setSelectedCredentials] = useState<string[]>([])
   const [attestationLoading, setAttestationLoading] = useState(false)
+  const [showDetailsModal, setShowDetailsModal] = useState(false)
+  const [showErrorModal, setShowErrorModal] = useState(false)
 
   const [store, dispatch] = useStore()
   const credProofPromise = useAllCredentialsForProof(proofId)
@@ -129,7 +139,6 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
     TOKENS.HISTORY_ENABLED,
     TOKENS.HISTORY_EVENTS_LOGGER,
   ])
-
   const styles = StyleSheet.create({
     pageContainer: {
       flex: 1,
@@ -170,6 +179,12 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
     },
   })
 
+  useEffect(() => {
+    if (proof && proof?.state !== ProofState.RequestReceived) {
+      setShowErrorModal(true)
+    }
+  }, [t, proof])
+
   useEffect(() => {
     if (!attestationMonitor) {
       return
@@ -236,6 +251,10 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
     })
 
     return revList.some((item) => {
+      // no revocation date means it's not revoked, leave early
+      if (!item.revocationDate) {
+        return false
+      }
       const revDate = moment(item.revocationDate)
       return item.id.some((id) => {
         return Object.keys(fields).some((key) => {
@@ -487,7 +506,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
           proofFormats: { presentationExchange: { credentials: selectedCredentials } },
         })
 
-        if (proof.connectionId && goalCode && goalCode.endsWith('verify.once')) {
+        if (proof.connectionId && goalCode?.endsWith('verify.once')) {
           agent.connections.deleteById(proof.connectionId)
         }
         return
@@ -533,7 +552,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
         proofRecordId: proof.id,
         proofFormats: automaticRequestedCreds.proofFormats,
       })
-      if (proof.connectionId && goalCode && goalCode.endsWith('verify.once')) {
+      if (proof.connectionId && goalCode?.endsWith('verify.once')) {
         agent.connections.deleteById(proof.connectionId)
       }
 
@@ -570,7 +589,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
 
         await agent.proofs.declineRequest({ proofRecordId: proof.id })
 
-        if (connectionId && goalCode && goalCode.endsWith('verify.once')) {
+        if (connectionId && goalCode?.endsWith('verify.once')) {
           agent.connections.deleteById(connectionId)
         }
       }
@@ -604,7 +623,7 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
         await agent.proofs.sendProblemReport({ proofRecordId: proof.id, description: t('ProofRequest.Declined') })
         await agent.proofs.declineRequest({ proofRecordId: proof.id })
 
-        if (proof.connectionId && goalCode && goalCode.endsWith('verify.once')) {
+        if (proof.connectionId && goalCode?.endsWith('verify.once')) {
           agent.connections.deleteById(proof.connectionId)
         }
       }
@@ -618,15 +637,19 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
     navigation.getParent()?.navigate(TabStacks.HomeStack, { screen: Screens.Home })
   }, [navigation])
 
-  const isShareDisabled = useCallback(() => {
-    return (
-      !hasAvailableCredentials ||
-      !hasSatisfiedPredicates(getCredentialsFields()) ||
-      revocationOffense ||
-      proof?.state !== ProofState.RequestReceived
-    )
+  const shareDisabledErrors = useMemo(() => {
+    return {
+      hasCredentialError: !hasAvailableCredentials,
+      hasSatisfiedPredicateError: !hasSatisfiedPredicates(getCredentialsFields()),
+      hasRevokedOffense: revocationOffense,
+      hasProofStateReceivedError: proof?.state !== ProofState.RequestReceived,
+    }
   }, [hasAvailableCredentials, hasSatisfiedPredicates, getCredentialsFields, revocationOffense, proof])
 
+  const isShareDisabled = useMemo(() => {
+    return Object.values(shareDisabledErrors).some((value) => value)
+  }, [shareDisabledErrors])
+
   const proofPageHeader = () => {
     return (
       <View style={styles.pageMargin}>
@@ -649,37 +672,39 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
           <>
             <ConnectionImage connectionId={proof?.connectionId} />
             <View style={styles.headerTextContainer}>
-              {hasAvailableCredentials && !hasSatisfiedPredicates(getCredentialsFields()) ? (
-                <View style={{ flexDirection: 'row', alignItems: 'center' }}>
-                  <Icon
-                    style={{ marginLeft: -2, marginRight: 10 }}
-                    name="highlight-off"
-                    color={ListItems.proofIcon.color}
-                    size={ListItems.proofIcon.fontSize}
-                  />
-
-                  <ThemedText style={styles.headerText} testID={testIdWithKey('HeaderText')}>
-                    {t('ProofRequest.YouDoNotHaveDataPredicate')}{' '}
-                    <ThemedText variant="title">
-                      {proofConnectionLabel || outOfBandInvitation?.label || t('ContactDetails.AContact')}
-                    </ThemedText>
-                  </ThemedText>
-                </View>
-              ) : (
-                <ThemedText style={styles.headerText} testID={testIdWithKey('HeaderText')}>
-                  <ThemedText variant="title">
-                    {proofConnectionLabel || outOfBandInvitation?.label || t('ContactDetails.AContact')}
-                  </ThemedText>{' '}
-                  <ThemedText>{t('ProofRequest.IsRequestingYouToShare')}</ThemedText>
-                  <ThemedText variant="title">{` ${activeCreds?.length} `}</ThemedText>
-                  <ThemedText>
-                    {activeCreds?.length > 1 ? t('ProofRequest.Credentials') : t('ProofRequest.Credential')}
-                  </ThemedText>
+              <ThemedText style={styles.headerText} testID={testIdWithKey('HeaderText')}>
+                <ThemedText variant="title">
+                  {proofConnectionLabel || outOfBandInvitation?.label || t('ContactDetails.AContact')}
+                </ThemedText>{' '}
+                <ThemedText>{t('ProofRequest.IsRequestingYouToShare')}</ThemedText>
+                <ThemedText variant="title">{` ${activeCreds?.length} `}</ThemedText>
+                <ThemedText>
+                  {activeCreds?.length > 1 ? t('ProofRequest.Credentials') : t('ProofRequest.Credential')}
                 </ThemedText>
-              )}
-              {isShareDisabled() && (
+              </ThemedText>
+              {isShareDisabled && (
                 <InfoTextBox type={InfoBoxType.Error} style={{ marginTop: 16 }} textStyle={{ fontWeight: 'normal' }}>
-                  {t('ProofRequest.YouCantRespond')}
+                  <View style={{ flex: 1, flexWrap: 'wrap' }}>
+                    <ThemedText
+                      style={{
+                        alignSelf: 'center',
+                        flex: 1,
+                        flexWrap: 'wrap',
+                        color: ColorPallet.notification.errorText,
+                      }}
+                    >
+                      {t('ProofRequest.YouCantRespond')}{' '}
+                      <ThemedText
+                        style={{
+                          fontWeight: TextTheme.normal.fontWeight,
+                          color: ColorPallet.brand.link,
+                        }}
+                        onPress={() => setShowDetailsModal(true)}
+                      >
+                        {t('Global.ShowDetails')}
+                      </ThemedText>
+                    </ThemedText>
+                  </View>
                 </InfoTextBox>
               )}
             </View>
@@ -689,6 +714,26 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
     )
   }
 
+  const shareDisabledMessage = useMemo(() => {
+    let finalMessage = `${t('ProofRequest.YouCantRespondReasons')}\n`
+
+    if (shareDisabledErrors.hasCredentialError) {
+      finalMessage += `\n \u2B24 ${t('ProofRequest.CredentialIsMissing')}`
+    }
+    if (shareDisabledErrors.hasSatisfiedPredicateError) {
+      finalMessage += `\n \u2B24 ${t('ProofRequest.ProofRequestPredicateError')}`
+    }
+    if (shareDisabledErrors.hasRevokedOffense) {
+      finalMessage += `\n \u2B24 ${t('ProofRequest.CredentialForProofIsRevoked')}`
+    }
+    if (shareDisabledErrors.hasProofStateReceivedError) {
+      finalMessage += `\n \u2B24 ${t('ProofRequest.ProofRequestStateError', { state: proof?.state })}`
+    }
+
+    finalMessage += `\n\n${t('ProofRequest.PleaseAddress')}`
+    return finalMessage
+  }, [t, shareDisabledErrors, proof])
+
   const handleAltCredChange = useCallback(
     (selectedCred: string, altCredentials: string[]) => {
       const onCredChange = (cred: string) => {
@@ -722,10 +767,10 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
             {t('ProofRequest.SensitiveInformation')}
           </InfoTextBox>
         )}
-        {!loading && proofConnectionLabel && goalCode === 'aries.vc.verify' && (
-          <ConnectionAlert connectionID={proofConnectionLabel} />
+        {!loading && Boolean(proofConnectionLabel) && goalCode === 'aries.vc.verify' && (
+          <ConnectionAlert connectionLabel={proofConnectionLabel} />
         )}
-        {!loading && isShareDisabled() ? (
+        {!loading && isShareDisabled ? (
           <View style={styles.footerButton}>
             <Button
               title={t('Global.Cancel')}
@@ -829,6 +874,53 @@ const ProofRequest: React.FC<ProofRequestProps> = ({ navigation, proofId }) => {
   }
   return (
     <SafeAreaView style={styles.pageContainer} edges={['bottom', 'left', 'right']}>
+      {showErrorModal && (
+        <SafeAreaView
+          style={{
+            minHeight: height,
+            flexDirection: 'column',
+            justifyContent: 'center',
+            alignItems: 'center',
+            backgroundColor: ColorPallet.brand.primaryBackground,
+          }}
+        >
+          <InfoBox
+            title={t('Error.Title1027')}
+            description={t('ProofRequest.ProofRequestErrorMessage')}
+            message={t('ProofRequest.ProofRequestStateError', { state: proof?.state })}
+            notificationType={InfoBoxType.Error}
+            onCallToActionLabel={t('Global.TryAgain')}
+            onCallToActionPressed={() => {
+              setShowErrorModal(false)
+              handleCancelTouched()
+            }}
+            showVersionFooter={true}
+          />
+        </SafeAreaView>
+      )}
+      {showDetailsModal && (
+        <SafeAreaView
+          style={{
+            minHeight: height,
+            flexDirection: 'column',
+            justifyContent: 'center',
+            alignItems: 'center',
+            backgroundColor: ColorPallet.brand.primaryBackground,
+          }}
+        >
+          <InfoBox
+            title={t('Error.Title1027')}
+            description={t('ProofRequest.ProofRequestErrorMessage')}
+            message={shareDisabledMessage}
+            notificationType={InfoBoxType.Error}
+            onCallToActionPressed={() => setShowDetailsModal(false)}
+            onCallToActionLabel={t('Global.GotIt')}
+            showVersionFooter={true}
+            renderShowDetails={true}
+            onClosePressed={() => setShowDetailsModal(false)}
+          />
+        </SafeAreaView>
+      )}
       <ScrollView>
         <View style={styles.pageContent}>
           {proofPageHeader()}

package/src/screens/PushNotifications.tsx

@@ -0,0 +1,59 @@
+import React from 'react'
+import { useTranslation } from 'react-i18next'
+import { ScrollView, StyleSheet, View } from 'react-native'
+import { SafeAreaView } from 'react-native-safe-area-context'
+
+import Button, { ButtonType } from '../components/buttons/Button'
+import PushNotificationsContent from '../components/views/PushNotificationsContent'
+import { TOKENS, useServices } from '../container-api'
+import { DispatchAction } from '../contexts/reducers/store'
+import { useStore } from '../contexts/store'
+import { testIdWithKey } from '../utils/testable'
+
+// Screen to show during onboarding that prompts
+// for push notification permissions
+const PushNotifications: React.FC = () => {
+  const { t } = useTranslation()
+  const [, dispatch] = useStore()
+  const [{ enablePushNotifications }] = useServices([TOKENS.CONFIG])
+
+  if (!enablePushNotifications) {
+    throw new Error('Push notification configuration not found')
+  }
+
+  const styles = StyleSheet.create({
+    screenContainer: {
+      flex: 1,
+      padding: 30,
+    },
+    controlsContainer: {
+      marginTop: 'auto',
+    }
+  })
+
+  const activatePushNotifications = async () => {
+    const state = await enablePushNotifications.setup()
+    dispatch({ type: DispatchAction.USE_PUSH_NOTIFICATIONS, payload: [state === 'granted'] })
+  }
+
+  return (
+    <SafeAreaView style={{ flex: 1 }} edges={['left', 'right', 'bottom']}>
+      <ScrollView contentContainerStyle={{ flexGrow: 1 }}>
+        <View style={styles.screenContainer}>
+          <PushNotificationsContent/>
+          <View style={styles.controlsContainer}>
+            <Button
+              buttonType={ButtonType.Primary}
+              title={t('Global.Continue')}
+              accessibilityLabel={t('Global.Continue')}
+              testID={testIdWithKey('PushNotificationContinue')}
+              onPress={activatePushNotifications}
+            ></Button>
+          </View>
+        </View>
+      </ScrollView>
+    </SafeAreaView>
+  )
+}
+
+export default PushNotifications

package/src/screens/Settings.tsx

@@ -10,11 +10,12 @@ import {
   useWindowDimensions,
   View,
 } from 'react-native'
-import { getVersion, getBuildNumber } from 'react-native-device-info'
+import { getBuildNumber, getVersion } from 'react-native-device-info'
 import { SafeAreaView } from 'react-native-safe-area-context'
 import Icon from 'react-native-vector-icons/MaterialIcons'
 
 import IconButton, { ButtonLocation } from '../components/buttons/IconButton'
+import { ThemedText } from '../components/texts/ThemedText'
 import { TOKENS, useServices } from '../container-api'
 import { AutoLockTime } from '../contexts/activity'
 import { DispatchAction } from '../contexts/reducers/store'
@@ -25,7 +26,6 @@ import { GenericFn } from '../types/fn'
 import { Screens, SettingStackParams, Stacks } from '../types/navigators'
 import { SettingIcon, SettingSection } from '../types/settings'
 import { testIdWithKey } from '../utils/testable'
-import { ThemedText } from '../components/texts/ThemedText'
 
 type SettingsProps = StackScreenProps<SettingStackParams>
 
@@ -139,17 +139,14 @@ const Settings: React.FC<SettingsProps> = ({ navigation }) => {
           value: store.preferences.useBiometry ? t('Global.On') : t('Global.Off'),
           accessibilityLabel: t('Global.Biometrics'),
           testID: testIdWithKey('Biometrics'),
-          onPress: () => navigation.navigate(Screens.UseBiometry),
+          onPress: () => navigation.navigate(Screens.ToggleBiometry),
         },
         {
           title: t('Settings.ChangePin'),
           value: undefined,
           accessibilityLabel: t('Settings.ChangePin'),
           testID: testIdWithKey('Change Pin'),
-          onPress: () =>
-            navigation
-              .getParent()
-              ?.navigate(Stacks.SettingStack, { screen: Screens.CreatePIN, params: { updatePin: true } }),
+          onPress: () => navigation.navigate(Screens.ChangePIN),
         },
         {
           title: t('Settings.Language'),
@@ -186,9 +183,7 @@ const Settings: React.FC<SettingsProps> = ({ navigation }) => {
         accessibilityLabel: t('Settings.Notifications'),
         testID: testIdWithKey('Notifications'),
         onPress: () =>
-          navigation
-            .getParent()
-            ?.navigate(Stacks.SettingStack, { screen: Screens.UsePushNotifications, params: { isMenu: true } }),
+          navigation.navigate(Screens.TogglePushNotifications),
       })
   }
 

package/src/screens/Splash.tsx

@@ -1,5 +1,4 @@
 import { RemoteOCABundleResolver } from '@bifold/oca/build/legacy'
-import { useNavigation, CommonActions } from '@react-navigation/native'
 import React, { useEffect } from 'react'
 import { useTranslation } from 'react-i18next'
 import { DeviceEventEmitter, StyleSheet } from 'react-native'
@@ -9,25 +8,25 @@ import { EventTypes } from '../constants'
 import { TOKENS, useServices } from '../container-api'
 import { useAnimatedComponents } from '../contexts/animated-components'
 import { useTheme } from '../contexts/theme'
-import useInitializeAgent from '../hooks/initialize-agent'
 import { BifoldError } from '../types/error'
-import { Stacks } from '../types/navigators'
+import { WalletSecret } from '../types/security'
 import { useAuth } from '../contexts/auth'
 import { useStore } from '../contexts/store'
 
+export type SplashProps = {
+  initializeAgent: (walletSecret: WalletSecret) => Promise<void>
+}
+
 /**
- * To customize this splash screen set the background color of the
- * iOS and Android launch screen to match the background color of
- * of this view.
+ * This Splash screen is shown in two scenarios: initial load of the app,
+ * and during agent initialization after login
  */
-const Splash: React.FC = () => {
+const Splash: React.FC<SplashProps> = ({ initializeAgent }) => {
   const { walletSecret } = useAuth()
   const { t } = useTranslation()
-  const navigation = useNavigation()
   const [store] = useStore()
   const { ColorPallet } = useTheme()
   const { LoadingIndicator } = useAnimatedComponents()
-  const { initializeAgent } = useInitializeAgent()
   const [logger, ocaBundleResolver] = useServices([TOKENS.UTIL_LOGGER, TOKENS.UTIL_OCA_RESOLVER])
 
   const styles = StyleSheet.create({
@@ -53,18 +52,7 @@ const Splash: React.FC = () => {
           throw new Error('Wallet secret is missing')
         }
 
-        const agent = await initializeAgent(walletSecret)
-
-        if (!agent) {
-          return
-        }
-
-        navigation.dispatch(
-          CommonActions.reset({
-            index: 0,
-            routes: [{ name: Stacks.TabStack }],
-          })
-        )
+        await initializeAgent(walletSecret)
       } catch (err: unknown) {
         const error = new BifoldError(
           t('Error.Title1045'),
@@ -79,7 +67,7 @@ const Splash: React.FC = () => {
     }
 
     initAgentAsyncEffect()
-  }, [initializeAgent, ocaBundleResolver, logger, navigation, walletSecret, t, store.authentication.didAuthenticate])
+  }, [initializeAgent, ocaBundleResolver, logger, walletSecret, t, store.authentication.didAuthenticate])
 
   return (
     <SafeAreaView style={styles.container}>

package/src/screens/Terms.tsx

@@ -12,7 +12,7 @@ import { TOKENS, useServices } from '../container-api'
 import { DispatchAction } from '../contexts/reducers/store'
 import { useStore } from '../contexts/store'
 import { useTheme } from '../contexts/theme'
-import { AuthenticateStackParams, Screens } from '../types/navigators'
+import { OnboardingStackParams, Screens } from '../types/navigators'
 import { testIdWithKey } from '../utils/testable'
 import ScreenLayout from '../layout/ScreenLayout'
 import { ThemedText } from '../components/texts/ThemedText'
@@ -24,7 +24,7 @@ const Terms: React.FC = () => {
   const agreedToPreviousTerms = store.onboarding.didAgreeToTerms
   const [checked, setChecked] = useState(agreedToPreviousTerms)
   const { t } = useTranslation()
-  const navigation = useNavigation<StackNavigationProp<AuthenticateStackParams>>()
+  const navigation = useNavigation<StackNavigationProp<OnboardingStackParams>>()
   const { OnboardingTheme, TextTheme } = useTheme()
   const [Button] = useServices([TOKENS.COMP_BUTTON])
   const onSubmitPressed = useCallback(() => {