@bifold/core 2.1.1 → 2.1.3

package/src/components/modals/CommonRemoveModal.tsx

@@ -23,6 +23,7 @@ interface CommonRemoveModalProps {
   onSubmit?: GenericFn
   onCancel?: GenericFn
   visible?: boolean
+  extraDetails?: string
 }
 
 interface RemoveProps {
@@ -66,7 +67,7 @@ const Dropdown: React.FC<RemoveProps> = ({ title, content }) => {
   )
 }
 
-const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, onSubmit, onCancel }) => {
+const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, onSubmit, onCancel, extraDetails }) => {
   if (!usage) {
     throw new Error('usage cannot be undefined')
   }
@@ -246,9 +247,13 @@ const CommonRemoveModal: React.FC<CommonRemoveModalProps> = ({ usage, visible, o
       case ModalUsage.CredentialOfferDecline:
         return (
           <View style={{ marginBottom: 25 }}>
-            <ThemedText variant="modalTitle">{t('CredentialOffer.DeclineTitle')}</ThemedText>
-            <ThemedText variant="modalNormal" style={{ marginTop: 30 }}>
-              {t('CredentialOffer.DeclineParagraph1')}
+            <ThemedText variant="modalTitle" style={{ marginTop: 15 }}>
+              {t('CredentialOffer.DeclineTitle')}
+            </ThemedText>
+            <ThemedText variant="modalNormal" style={{ marginVertical: 30 }}>
+              {extraDetails
+                ? t('CredentialOffer.DeclineParagraph1WithIssuerName', { issuer: extraDetails })
+                : t('CredentialOffer.DeclineParagraph1')}
             </ThemedText>
             <ThemedText variant="modalNormal">{t('CredentialOffer.DeclineParagraph2')}</ThemedText>
           </View>

package/src/components/modals/DeveloperModal.tsx

@@ -18,7 +18,10 @@ const DeveloperModal: React.FC<DeveloperModalProps> = ({ onBackPressed }) => {
 
   return (
     <SafeAreaModal>
-      <SafeAreaView edges={['left', 'right', 'top']} style={{ flex: 1, backgroundColor: NavigationTheme.colors.primary }}>
+      <SafeAreaView
+        edges={['left', 'right', 'top']}
+        style={{ flex: 1, backgroundColor: NavigationTheme.colors.primary }}
+      >
         <FauxHeader title={t('Screens.Developer')} onBackPressed={onBackPressed} />
         <Developer />
       </SafeAreaView>
@@ -27,4 +30,4 @@ const DeveloperModal: React.FC<DeveloperModalProps> = ({ onBackPressed }) => {
   )
 }
 
-export default DeveloperModal
+export default DeveloperModal

package/src/container-impl.ts

@@ -63,6 +63,7 @@ export const defaultConfig: Config = {
   settings: [],
   enableChat: true,
   enableTours: false,
+  preventScreenCapture: false,
   supportedLanguages: [Locales.en, Locales.fr, Locales.ptBr],
   showPreface: false,
   disableOnboardingSkip: false,

package/src/contexts/activity.tsx

@@ -12,7 +12,7 @@ import React, {
 import { AppState, AppStateStatus, PanResponder, View } from 'react-native'
 import { defaultAutoLockTime } from '../constants'
 import { TOKENS, useServices } from '../container-api'
-import { useAuth } from './auth'
+import { LockoutReason, useAuth } from './auth'
 import { useStore } from './store'
 
 // number of minutes before the timeout action is triggered
@@ -60,7 +60,7 @@ export const ActivityProvider: React.FC<PropsWithChildren> = ({ children }) => {
       // do not set timeout if timeout duration is set to 0
       if (milliseconds > 0) {
         // create new timeout
-        inactivityTimeoutRef.current = setTimeout(lockOutUser, milliseconds)
+        inactivityTimeoutRef.current = setTimeout(() => lockOutUser(LockoutReason.Timeout), milliseconds)
       }
     },
     [clearInactivityTimeoutIfExists, lockOutUser]
@@ -89,7 +89,7 @@ export const ActivityProvider: React.FC<PropsWithChildren> = ({ children }) => {
           Date.now() - lastActiveTimeRef.current >= timeoutInMilliseconds.current &&
           timeoutInMilliseconds.current > 0
         ) {
-          lockOutUser()
+          lockOutUser(LockoutReason.Timeout)
         } else {
           // otherwise restart message pickup
           try {

package/src/contexts/auth.tsx

@@ -26,7 +26,7 @@ import { BifoldError } from '../types/error'
 import { EventTypes } from '../constants'
 
 export interface AuthContext {
-  lockOutUser: () => void
+  lockOutUser: (reason: LockoutReason) => void
   checkWalletPIN: (PIN: string) => Promise<boolean>
   getWalletSecret: () => Promise<WalletSecret | undefined>
   walletSecret?: WalletSecret
@@ -40,6 +40,10 @@ export interface AuthContext {
 }
 
 export const AuthContext = createContext<AuthContext>(null as unknown as AuthContext)
+export enum LockoutReason {
+  Timeout = 'Timeout',
+  Logout = 'Logout',
+}
 
 export const AuthProvider: React.FC<React.PropsWithChildren> = ({ children }) => {
   const [walletSecret, setWalletSecret] = useState<WalletSecret>()
@@ -118,8 +122,7 @@ export const AuthProvider: React.FC<React.PropsWithChildren> = ({ children }) =>
 
         await askarWallet.close()
 
-        const fullSecret = await secretForPIN(PIN, secret.salt)
-        setWalletSecret(fullSecret)
+        setWalletSecret({ id: secret.id, key: hash, salt: secret.salt })
         return true
       } catch (e) {
         return false
@@ -132,17 +135,20 @@ export const AuthProvider: React.FC<React.PropsWithChildren> = ({ children }) =>
     setWalletSecret(undefined)
   }, [])
 
-  const lockOutUser = useCallback(() => {
-    removeSavedWalletSecret()
-    dispatch({
-      type: DispatchAction.DID_AUTHENTICATE,
-      payload: [false],
-    })
-    dispatch({
-      type: DispatchAction.LOCKOUT_UPDATED,
-      payload: [{ displayNotification: true }],
-    })
-  }, [removeSavedWalletSecret, dispatch])
+  const lockOutUser = useCallback(
+    (reason: LockoutReason) => {
+      removeSavedWalletSecret()
+      dispatch({
+        type: DispatchAction.DID_AUTHENTICATE,
+        payload: [false],
+      })
+      dispatch({
+        type: DispatchAction.LOCKOUT_UPDATED,
+        payload: [{ displayNotification: reason === LockoutReason.Timeout }],
+      })
+    },
+    [removeSavedWalletSecret, dispatch]
+  )
 
   const disableBiometrics = useCallback(async () => {
     await wipeWalletKey(true)

package/src/index.ts

@@ -153,6 +153,7 @@ 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 { LockoutReason } from './contexts/auth'
 
 export {
   createApp,

package/src/localization/en/index.ts

@@ -247,6 +247,7 @@ const translation = {
     "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",
+    "Masked": "PIN Masked for privacy",
   },
   "PINChange": {
     "PinChangeSuccessTitle": "Successfully changed your PIN",
@@ -641,6 +642,7 @@ const translation = {
     "DeclineTitle": "Decline credential offer?",
     "Declined": "Declined",
     "DeclineParagraph1": "In order to receive the credential offer again, you will need to restart the issuing process again with the issuing service.",
+    "DeclineParagraph1WithIssuerName": "If you change your mind you will need to request the card from {{ issuer }} again.",
     "DeclineParagraph2": "Are you sure you want to decline this credential offer?",
     "CustomOfferTitle": "Delete this offer?",
     "CustomOfferParagraph1": "Deleting this offer will remove the notification from your list.",
@@ -741,6 +743,7 @@ const translation = {
     "Developer": "Developer options",
     "Notifications": "Notifications",
     "AutoLockTime": "Auto lock time",
+    "Logout": "Log out",
   },
   "AutoLockTimes": {
     "FiveMinutes": "Five Minutes",

package/src/localization/fr/index.ts

@@ -258,6 +258,7 @@ const translation = {
         "PINDisclaimer": "Si vous l'oubliez, vous devrez configurer à nouveau votre portefeuille et vos cartes.",
         "Show": "Afficher NIP",
         "Hide": "Masquer NIP",
+        "Masked": "PIN Masked for privacy (FR)",
         "ChangePIN": "Changer votre NIP",
         "Continue": "Continuer",
         "EnterYourCurrentPIN": "Entrez votre NIP actuel"
@@ -644,6 +645,7 @@ const translation = {
         "DeclineTitle": "Refuser l'offre d'attestation d'identité?",
         "Declined": "Refusé",
         "DeclineParagraph1": "Afin de recevoir à nouveau l'offre d'attestation d'identité, vous devrez recommencer le processus d'émission avec le service d'émission.",
+        "DeclineParagraph1WithIssuerName": "If you change your mind you will need to request the card from {{ issuer }} again. (FR)",
         "DeclineParagraph2": "Êtes-vous sûr de vouloir refuser cette offre d'attestation d'identité?",
         "CustomOfferTitle": "Supprimer cette offre?",
         "CustomOfferParagraph1": "La suppression de cette offre supprimera la notification de votre liste.",
@@ -729,6 +731,7 @@ const translation = {
         "ScanMyQR": "Scanner mon code QR",
         "Developer": "Options de développeur",
         "AutoLockTime": "Auto lock time (FR)",
+        "Logout": "Déconnexion",
     },
     "AutoLockTimes": {
         "FiveMinutes": "Five Minutes (FR)",

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

@@ -239,6 +239,7 @@ const translation = {
     "PINDisclaimer": "Se você o esquecer, você precisará redefinir sua carteira e readicionar seus cards.",
     "Show": "Mostrar PIN",
     "Hide": "Esconder PIN",
+    "Masked": "PIN Masked for privacy (PT-BR)",
   },
   "PINChange": {
     "PinChangeSuccessTitle": "Seu PIN foi alterado com sucesso",
@@ -626,6 +627,7 @@ const translation = {
     "ShareFollowingInformation_one": "está compartilhando as seguintes informações de credenciais {{count}}.",
     "ShareFollowingInformation_other": "está compartilhando as seguintes informações de credenciais {{count}}.",
     "DeclineParagraph1": "Para receber novamente a oferta de credencial, você precisara iniciar novamente o processo de emissão com o serviço emissor.",
+    "DeclineParagraph1WithIssuerName": "If you change your mind you will need to request the card from {{ issuer }} again. (PT-BR)",
     "DeclineParagraph2": "Você tem certeza que quer recusar esta oferta de credencial?",
     "CustomOfferTitle": "Remover esta oferta?",
     "CustomOfferParagraph1": "Remover esta oferta irá remover a notificação de sua lista.",
@@ -713,6 +715,7 @@ const translation = {
     "ScanMyQR": "Scanear meu QR code",
     "Developer": "Opções de Desenvolvedor",
     "AutoLockTime": "Auto lock time (PT-BR)",
+    "Logout": "Sair",
   },
   "AutoLockTimes": {
     "FiveMinutes": "Five Minutes (PT-BR)",

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

@@ -183,6 +183,7 @@ const OpenIDCredentialOffer: React.FC<OpenIDCredentialDetailsProps> = ({ navigat
         visible={isRemoveModalDisplayed}
         onSubmit={handleDeclineTouched}
         onCancel={toggleDeclineModalVisible}
+        extraDetails={display.issuer.name}
       />
     </ScreenLayout>
   )

package/src/screens/NameWallet.tsx

@@ -3,9 +3,7 @@ import React from 'react'
 import WalletNameForm from '../components/forms/WalletNameForm'
 
 const NameWallet: React.FC = () => {
-  return (
-    <WalletNameForm />
-  )
+  return <WalletNameForm />
 }
 
 export default NameWallet

package/src/screens/PINEnter.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useEffect, useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
-import { DeviceEventEmitter, InteractionManager, Keyboard, Pressable, StyleSheet, View } from 'react-native'
+import { DeviceEventEmitter, InteractionManager, Keyboard, Pressable, StyleSheet, Vibration, View } from 'react-native'
 
 import Button, { ButtonType } from '../components/buttons/Button'
 import { InlineErrorType, InlineMessageProps } from '../components/inputs/InlineErrorText'
@@ -41,14 +41,23 @@ const PINEnter: React.FC<PINEnterProps> = ({ setAuthenticated }) => {
   const [biometricsEnrollmentChange, setBiometricsEnrollmentChange] = useState(false)
   const { ColorPallet } = useTheme()
   const { ButtonLoading } = useAnimatedComponents()
-  const [logger, { preventScreenCapture, enableHiddenDevModeTrigger, attemptLockoutConfig: { thresholdRules } = attemptLockoutConfig }] =
-    useServices([TOKENS.UTIL_LOGGER, TOKENS.CONFIG])
+  const [
+    logger,
+    {
+      preventScreenCapture,
+      enableHiddenDevModeTrigger,
+      attemptLockoutConfig: { thresholdRules } = attemptLockoutConfig,
+    },
+  ] = useServices([TOKENS.UTIL_LOGGER, TOKENS.CONFIG])
   const [inlineMessageField, setInlineMessageField] = useState<InlineMessageProps>()
   const [inlineMessages] = useServices([TOKENS.INLINE_ERRORS])
   const [alertModalMessage, setAlertModalMessage] = useState('')
   const { getLockoutPenalty, attemptLockout, unMarkServedPenalty } = useLockout()
   const onBackPressed = () => setDevModalVisible(false)
-  const onDevModeTriggered = () => setDevModalVisible(true)
+  const onDevModeTriggered = () => {
+    Vibration.vibrate()
+    setDevModalVisible(true)
+  }
   const { incrementDeveloperMenuCounter } = useDeveloperMode(onDevModeTriggered)
   const gotoPostAuthScreens = useGotoPostAuthScreens()
   const isContinueDisabled = inlineMessages.enabled ? !continueEnabled : !continueEnabled || PIN.length < minPINLength

package/src/screens/RenameWallet.tsx

@@ -12,14 +12,15 @@ const RenameWallet: React.FC = () => {
     navigation.goBack()
   }, [navigation])
 
-  const onSubmitSuccess = useCallback((name: string) => {
-    agent.config.label = name
-    navigation.goBack()
-  }, [navigation, agent])
-
-  return (
-    <WalletNameForm isRenaming onCancel={onCancel} onSubmitSuccess={onSubmitSuccess} />
+  const onSubmitSuccess = useCallback(
+    (name: string) => {
+      agent.config.label = name
+      navigation.goBack()
+    },
+    [navigation, agent]
   )
+
+  return <WalletNameForm isRenaming onCancel={onCancel} onSubmitSuccess={onSubmitSuccess} />
 }
 
 export default RenameWallet

package/src/screens/Settings.tsx

@@ -1,6 +1,7 @@
 import { StackScreenProps } from '@react-navigation/stack'
 import React from 'react'
 import { useTranslation } from 'react-i18next'
+import { LockoutReason, useAuth } from '../contexts/auth'
 import {
   ScrollView,
   SectionList,
@@ -33,6 +34,7 @@ type SettingsProps = StackScreenProps<SettingStackParams>
 const Settings: React.FC<SettingsProps> = ({ navigation }) => {
   const { t, i18n } = useTranslation()
   const [store] = useStore()
+  const { lockOutUser } = useAuth()
   const onDevModeTriggered = () => {
     Vibration.vibrate()
     navigation.navigate(Screens.Developer)
@@ -216,6 +218,12 @@ const Settings: React.FC<SettingsProps> = ({ navigation }) => {
           testID: testIdWithKey('DeveloperOptions'),
           onPress: () => navigation.navigate(Screens.Developer),
         },
+        {
+          title: t('Settings.Logout'),
+          accessibilityLabel: t('Settings.Logout'),
+          testID: testIdWithKey('Logout'),
+          onPress: () => lockOutUser(LockoutReason.Logout),
+        },
       ]
     }
   }

package/src/screens/Splash.tsx

@@ -1,5 +1,5 @@
 import { RemoteOCABundleResolver } from '@bifold/oca/build/legacy'
-import React, { useEffect } from 'react'
+import React, { useEffect, useRef } from 'react'
 import { useTranslation } from 'react-i18next'
 import { DeviceEventEmitter, StyleSheet } from 'react-native'
 import { SafeAreaView } from 'react-native-safe-area-context'
@@ -27,6 +27,7 @@ const Splash: React.FC<SplashProps> = ({ initializeAgent }) => {
   const [store] = useStore()
   const { ColorPallet } = useTheme()
   const { LoadingIndicator } = useAnimatedComponents()
+  const initializing = useRef(false)
   const [logger, ocaBundleResolver] = useServices([TOKENS.UTIL_LOGGER, TOKENS.UTIL_OCA_RESOLVER])
 
   const styles = StyleSheet.create({
@@ -39,19 +40,19 @@ const Splash: React.FC<SplashProps> = ({ initializeAgent }) => {
   })
 
   useEffect(() => {
+    if (initializing.current || !store.authentication.didAuthenticate) {
+      return
+    }
+
+    if (!walletSecret) {
+      throw new Error('Wallet secret is missing')
+    }
+    initializing.current = true
+
     const initAgentAsyncEffect = async (): Promise<void> => {
       try {
         await (ocaBundleResolver as RemoteOCABundleResolver).checkForUpdates?.()
 
-        // User hasn't authenticated yet, no point in trying to initialize wallet agent
-        if (!store.authentication.didAuthenticate) {
-          return
-        }
-
-        if (!walletSecret) {
-          throw new Error('Wallet secret is missing')
-        }
-
         await initializeAgent(walletSecret)
       } catch (err: unknown) {
         const error = new BifoldError(

package/src/screens/ToggleBiometry.tsx

@@ -14,7 +14,6 @@ import { useAppAgent } from '../utils/agent'
 import PINVerify, { PINEntryUsage } from './PINVerify'
 import { SafeAreaView } from 'react-native-safe-area-context'
 
-
 const ToggleBiometry: React.FC = () => {
   const [store, dispatch] = useStore()
   const { agent } = useAppAgent()
@@ -138,8 +137,8 @@ const ToggleBiometry: React.FC = () => {
         animationType={'slide'}
         presentationStyle={'fullScreen'}
       >
-        <SafeAreaView edges={['top']} style={{ backgroundColor: NavigationTheme.colors.primary }}/>
-        <FauxHeader title={t('Screens.EnterPIN')} onBackPressed={onBackPressed}/>
+        <SafeAreaView edges={['top']} style={{ backgroundColor: NavigationTheme.colors.primary }} />
+        <FauxHeader title={t('Screens.EnterPIN')} onBackPressed={onBackPressed} />
         <PINVerify
           usage={PINEntryUsage.ChangeBiometrics}
           setAuthenticated={onAuthenticationComplete}

package/src/theme.ts

@@ -730,21 +730,21 @@ export interface ITabTheme {
     shadowOpacity: number
     borderTopWidth: number
     paddingBottom: number
-  },
-  tabBarContainerStyle: ViewStyle,
-  tabBarActiveTintColor: string,
-  tabBarInactiveTintColor: string,
+  }
+  tabBarContainerStyle: ViewStyle
+  tabBarActiveTintColor: string
+  tabBarInactiveTintColor: string
   tabBarTextStyle: TextStyle & {
     fontSize: number
-  },
+  }
   tabBarButtonIconStyle: {
     color: string
-  },
-  focusTabIconStyle: ViewStyle,
+  }
+  focusTabIconStyle: ViewStyle
   focusTabActiveTintColor: {
     backgroundColor: string
-  },
-  tabBarSecondaryBackgroundColor: string,
+  }
+  tabBarSecondaryBackgroundColor: string
 }
 
 export const TabTheme: ITabTheme = {