fix: lifecycle and accessibility improvements (#231)

animo · Nov 25, 2024 · 3119fa2 · 3119fa2
1 parent 160ae6d
commit 3119fa2
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/apps/easypid/src/features/menu/FunkeMenuScreen.tsx b/apps/easypid/src/features/menu/FunkeMenuScreen.tsx
@@ -89,7 +89,13 @@ export function FunkeMenuScreen() {
             ))}
             <YStack py="$4" ai="center">
               <YStack px="$4" w="60%">
-                <Button.Solid scaleOnPress onPress={onResetWallet}>
+                <Button.Solid
+                  accessible={true}
+                  accessibilityRole="button"
+                  aria-label="Reset wallet"
+                  scaleOnPress
+                  onPress={onResetWallet}
+                >
                   Reset wallet
                 </Button.Solid>
               </YStack>

diff --git a/apps/easypid/src/features/onboarding/screens/biometrics.tsx b/apps/easypid/src/features/onboarding/screens/biometrics.tsx
@@ -11,7 +11,7 @@ interface OnboardingBiometricsProps {
 
 export function OnboardingBiometrics({ goToNextStep, actionText }: OnboardingBiometricsProps) {
   const [isLoading, setIsLoading] = useState(false)
-  const { height, onLayout } = useImageScaler()
+  const { height, onLayout } = useImageScaler({ scaleFactor: 0.6 })
 
   const onEnableBiometrics = () => {
     if (isLoading) return

diff --git a/apps/easypid/src/features/onboarding/screens/id-card-scan.tsx b/apps/easypid/src/features/onboarding/screens/id-card-scan.tsx
@@ -21,7 +21,7 @@ export function OnboardingIdCardScan({
   showScanModal,
   onStartScanning,
 }: OnboardingIdCardScanProps) {
-  const { height, onLayout } = useImageScaler()
+  const { height, onLayout } = useImageScaler({ scaleFactor: 0.6 })
 
   return (
     <>

diff --git a/apps/easypid/src/features/wallet/FunkeWalletScreen.tsx b/apps/easypid/src/features/wallet/FunkeWalletScreen.tsx
@@ -68,7 +68,14 @@ export function FunkeWalletScreen() {
         }}
       >
         <YStack fg={1}>
-          <Stack accessible={true} alignItems="center" pt="$6" pb="$4">
+          <Stack
+            accessible={true}
+            aria-label="Scan QR-Code"
+            accessibilityRole="button"
+            alignItems="center"
+            pt="$6"
+            pb="$4"
+          >
             <AnimatedStack
               flexDirection="column"
               style={qrPressStyle}

diff --git a/packages/agent/src/display.ts b/packages/agent/src/display.ts
@@ -538,7 +538,7 @@ export function getCredentialForDisplay(
 ): CredentialForDisplay {
   const credentialCategoryMetadata = getCredentialCategoryMetadata(credentialRecord)
   const credentialForDisplayId = getCredentialForDisplayId(credentialRecord)
-  const hasRefreshToken = getRefreshCredentialMetadata(credentialRecord) !== undefined
+  const hasRefreshToken = getRefreshCredentialMetadata(credentialRecord) !== null
 
   if (credentialRecord instanceof SdJwtVcRecord) {
     const sdJwtVc = credentialRecord.credential

diff --git a/packages/app/src/components/CardInfoLifecycle.tsx b/packages/app/src/components/CardInfoLifecycle.tsx
@@ -1,4 +1,4 @@
-import { Button, HeroIcons, InfoButton, InfoSheet, Stack, useToastController } from '@package/ui'
+import { Button, HeroIcons, InfoButton, InfoSheet, Stack } from '@package/ui'
 import type { StatusVariant } from '@package/ui/src/utils/variants'
 import { formatDate, formatDaysString, getDaysUntil } from '@package/utils/src'
 import { useRouter } from 'expo-router'

diff --git a/packages/app/src/hooks/useImageScaler.tsx b/packages/app/src/hooks/useImageScaler.tsx
@@ -3,11 +3,11 @@ import type { LayoutChangeEvent } from 'react-native'
 
 const SCALE_FACTOR = 0.7
 
-export function useImageScaler() {
+export function useImageScaler({ scaleFactor = SCALE_FACTOR }: { scaleFactor?: number } = {}) {
   const [availableImageHeight, setAvailableImageHeight] = useState(0)
 
   return {
-    height: availableImageHeight * SCALE_FACTOR,
+    height: availableImageHeight * scaleFactor,
     onLayout: (event: LayoutChangeEvent) => {
       if (availableImageHeight === 0) {
         setAvailableImageHeight(event.nativeEvent.layout.height)