Merge remote-tracking branch 'origin/main' into feat/new-oid4vp-dc-api

Author: TimoGlastra

apps/easypid/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "animo-easypid",
-	"version": "1.7.1",
+	"version": "1.8.0",
 	"main": "index.ts",
 	"private": true,
 	"scripts": {

apps/easypid/src/features/onboarding/screens/data-protection.tsx

@@ -26,16 +26,6 @@ export function OnboardingDataProtection({ goToNextStep }: OnboardingDataProtect
   const onToggleCloudHsm = () => {
     const newShouldUseCloudHsm = !shouldUseCloudHsm
 
-    if (newShouldUseCloudHsm === false && !isLocalSecureEnvironmentSupported()) {
-      toast.show(`You device does not support on-device ${Platform.OS === 'ios' ? 'Secure Enclave' : 'Strongbox'}.`, {
-        message: 'Only Cloud HSM supported for PID cryptogrpahic keys.',
-        customData: {
-          preset: 'danger',
-        },
-      })
-      return
-    }
-
     toast.show(
       newShouldUseCloudHsm
         ? 'Now using Cloud HSM for PID cryptographic keys.'
@@ -66,7 +56,13 @@ export function OnboardingDataProtection({ goToNextStep }: OnboardingDataProtect
           Read the Privacy Policy
         </Button.Text>
         <XStack gap="$2" width="100%">
-          <Button.Outline bg="$grey-100" scaleOnPress width="$buttonHeight" onPress={onToggleCloudHsm}>
+          <Button.Outline
+            bg="$grey-100"
+            scaleOnPress
+            width="$buttonHeight"
+            onPress={onToggleCloudHsm}
+            disabled={!isLocalSecureEnvironmentSupported()}
+          >
             {shouldUseCloudHsm ? <HeroIcons.Cloud /> : <HeroIcons.DevicePhoneMobile />}
           </Button.Outline>
           <Button.Solid scaleOnPress flexGrow={1} disabled={isLoading} onPress={onContinue}>

apps/easypid/src/features/share/FunkeMdocOfflineSharingScreen.tsx

@@ -1,10 +1,11 @@
 import { useAppAgent } from '@easypid/agent'
 import { setWalletServiceProviderPin } from '@easypid/crypto/WalletServiceProviderClient'
 import { InvalidPinError } from '@easypid/crypto/error'
+import { useDevelopmentMode } from '@easypid/hooks'
 import { type FormattedSubmission, getSubmissionForMdocDocumentRequest } from '@package/agent'
 import { usePushToWallet } from '@package/app/src/hooks/usePushToWallet'
 import { useToastController } from '@package/ui'
-import { useEffect, useState } from 'react'
+import { useCallback, useEffect, useState } from 'react'
 import { type ActivityStatus, addSharedActivityForCredentialsForRequest } from '../activity/activityRecord'
 import { shareDeviceResponse, shutdownDataTransfer } from '../proximity'
 import { FunkeOfflineSharingScreen } from './FunkeOfflineSharingScreen'
@@ -23,6 +24,7 @@ export function FunkeMdocOfflineSharingScreen({
   const toast = useToastController()
   const pushToWallet = usePushToWallet()
   const { agent } = useAppAgent()
+  const [isDevelopmentModeEnabled] = useDevelopmentMode()
 
   const [submission, setSubmission] = useState<FormattedSubmission>()
   const [isProcessing, setIsProcessing] = useState(false)
@@ -32,6 +34,8 @@ export function FunkeMdocOfflineSharingScreen({
       .then(setSubmission)
       .catch((error) => {
         toast.show('Presentation information could not be extracted.', {
+          message:
+            error instanceof Error && isDevelopmentModeEnabled ? `Development mode error: ${error.message}` : undefined,
           customData: { preset: 'danger' },
         })
         agent.config.logger.error('Error getting credentials for mdoc device request', {
@@ -40,7 +44,16 @@ export function FunkeMdocOfflineSharingScreen({
 
         pushToWallet()
       })
-  }, [agent, deviceRequest, toast.show, pushToWallet])
+  }, [agent, deviceRequest, toast.show, pushToWallet, isDevelopmentModeEnabled])
+
+  const handleError = useCallback(
+    ({ reason, description, redirect = true }: { reason: string; description?: string; redirect?: boolean }) => {
+      toast.show(reason, { message: description, customData: { preset: 'danger' } })
+      if (redirect) pushToWallet()
+      return
+    },
+    [toast, pushToWallet]
+  )
 
   const onProofAccept = async ({ pin, onPinComplete, onPinError }: onPinSubmitProps) => {
     // Already checked for submission in the useEffect
@@ -59,6 +72,13 @@ export function FunkeMdocOfflineSharingScreen({
       if (e instanceof InvalidPinError) {
         onPinError?.()
       }
+
+      handleError({
+        reason: 'Authentication Error',
+        redirect: true,
+        description:
+          e instanceof Error && isDevelopmentModeEnabled ? `Development mode error: ${e.message}` : undefined,
+      })
     }
 
     // Once this returns we just assume it's successful
@@ -69,10 +89,14 @@ export function FunkeMdocOfflineSharingScreen({
         sessionTranscript,
         submission,
       })
-    } catch (error) {
-      agent.config.logger.error('Could not share device response', { error })
+    } catch (e) {
       await addActivity('failed')
-      pushToWallet()
+      handleError({
+        reason: 'Could not share device response',
+        redirect: true,
+        description:
+          e instanceof Error && isDevelopmentModeEnabled ? `Development mode error: ${e.message}` : undefined,
+      })
     }
 
     await addActivity('success')
@@ -89,8 +113,7 @@ export function FunkeMdocOfflineSharingScreen({
     setIsProcessing(false)
 
     shutdownDataTransfer()
-    pushToWallet()
-    toast.show('Proof has been declined.', { customData: { preset: 'danger' } })
+    handleError({ reason: 'Proof has been declined', redirect: true })
   }
 
   const onProofComplete = () => {