chore: cleanup

animo · Nov 26, 2024 · 7c19153 · 7c19153
1 parent 697ff0c
commit 7c19153
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/apps/easypid/src/app/(app)/_layout.tsx b/apps/easypid/src/app/(app)/_layout.tsx
@@ -1,4 +1,4 @@
-import { Redirect, Stack, useGlobalSearchParams, useLocalSearchParams, usePathname, useRouter } from 'expo-router'
+import { Redirect, Stack, useGlobalSearchParams, usePathname, useRouter } from 'expo-router'
 
 import { TypedArrayEncoder } from '@credo-ts/core'
 import { useSecureUnlock } from '@easypid/agent'
@@ -137,7 +137,7 @@ export default function AppLayout() {
             <Stack.Screen name="activity/[id]" options={headerNormalOptions} />
             <Stack.Screen name="pinConfirmation" options={headerNormalOptions} />
             <Stack.Screen name="pinLocked" options={headerNormalOptions} />
-            <Stack.Screen name="issuer" options={headerNormalOptions} />
+            <Stack.Screen name="federation" options={headerNormalOptions} />
             <Stack.Screen name="pidSetup" />
           </Stack>
         </WithBackgroundPidRefresh>

diff --git a/apps/easypid/src/app/(app)/issuer.tsx → apps/easypid/src/app/(app)/federation.tsx b/apps/easypid/src/app/(app)/issuer.tsx → apps/easypid/src/app/(app)/federation.tsx
@@ -1,4 +1,4 @@
-import { FunkeIssuerDetailScreen } from '@easypid/features/wallet/FunkeIssuerDetailScreen'
+import { FunkeFederationDetailScreen } from '@easypid/features/wallet/FunkeFederationDetailScreen'
 import { useLocalSearchParams } from 'expo-router'
 
 export default function Screen() {
@@ -7,7 +7,7 @@ export default function Screen() {
   const trustedEntityIdsArray = Array.isArray(trustedEntityIds) ? trustedEntityIds : trustedEntityIds?.split(',') ?? []
 
   return (
-    <FunkeIssuerDetailScreen
+    <FunkeFederationDetailScreen
       entityId={entityId as string}
       trustedEntityIds={trustedEntityIdsArray}
       name={name as string}

diff --git a/apps/easypid/src/features/receive/FunkeCredentialNotificationScreen.tsx b/apps/easypid/src/features/receive/FunkeCredentialNotificationScreen.tsx
@@ -353,7 +353,6 @@ export function FunkeCredentialNotificationScreen() {
               entityId={issuerMetadata?.credential_issuer as string}
               lastInteractionDate={activities[0]?.date}
               onContinue={onCheckCardContinue}
-              trustedEntityIds={Object.keys(credentialsForRequest?.verifier.verifiedEntityIds ?? [])}
             />
           ),
         },

diff --git a/apps/easypid/src/features/receive/slides/VerifyPartySlide.tsx b/apps/easypid/src/features/receive/slides/VerifyPartySlide.tsx
@@ -26,7 +26,7 @@ interface VerifyPartySlideProps {
   backgroundColor?: string
   lastInteractionDate?: string
   onContinue?: () => Promise<void>
-  trustedEntityIds?: string[]
+  verifiedEntityIds?: Record<string, boolean>
 }
 
 export const VerifyPartySlide = ({
@@ -37,13 +37,17 @@ export const VerifyPartySlide = ({
   backgroundColor,
   lastInteractionDate,
   onContinue,
-  trustedEntityIds,
+  verifiedEntityIds,
 }: VerifyPartySlideProps) => {
   const router = useRouter()
   const { onNext, onCancel } = useWizard()
   const { withHaptics } = useHaptics()
   const [isLoading, setIsLoading] = useState(false)
 
+  const trustedEntityIds = Object.entries(verifiedEntityIds ?? {})
+    .filter(([_, isVerified]) => isVerified)
+    .map(([entityId]) => entityId)
+
   const handleContinue = async () => {
     setIsLoading(true)
     if (onContinue) {

diff --git a/apps/easypid/src/features/share/FunkeOpenIdPresentationNotificationScreen.tsx b/apps/easypid/src/features/share/FunkeOpenIdPresentationNotificationScreen.tsx
@@ -146,7 +146,7 @@ export function FunkeOpenIdPresentationNotificationScreen() {
       entityId={credentialsForRequest?.verifier.entityId as string}
       verifierName={credentialsForRequest?.verifier.name}
       logo={credentialsForRequest?.verifier.logo}
-      trustedEntityIds={Object.keys(credentialsForRequest?.verifier.verifiedEntityIds ?? [])}
+      verifiedEntityIds={credentialsForRequest?.verifier.verifiedEntityIds}
       lastInteractionDate={lastInteractionDate}
       onComplete={() => pushToWallet('replace')}
     />

diff --git a/apps/easypid/src/features/share/FunkePresentationNotificationScreen.tsx b/apps/easypid/src/features/share/FunkePresentationNotificationScreen.tsx
@@ -13,7 +13,7 @@ interface FunkePresentationNotificationScreenProps {
   verifierName?: string
   logo?: DisplayImage
   lastInteractionDate?: string
-  trustedEntityIds?: string[]
+  verifiedEntityIds?: Record<string, boolean>
   submission?: FormattedSubmission
   usePin: boolean
   isAccepting: boolean
@@ -33,7 +33,7 @@ export function FunkePresentationNotificationScreen({
   isAccepting,
   submission,
   onComplete,
-  trustedEntityIds,
+  verifiedEntityIds,
 }: FunkePresentationNotificationScreenProps) {
   return (
     <SlideWizard
@@ -56,7 +56,7 @@ export function FunkePresentationNotificationScreen({
                 name={verifierName}
                 logo={logo}
                 lastInteractionDate={lastInteractionDate}
-                trustedEntityIds={trustedEntityIds}
+                verifiedEntityIds={verifiedEntityIds}
               />
             ),
           },

diff --git a/...atures/wallet/FunkeIssuerDetailScreen.tsx → ...es/wallet/FunkeFederationDetailScreen.tsx b/...atures/wallet/FunkeIssuerDetailScreen.tsx → ...es/wallet/FunkeFederationDetailScreen.tsx
@@ -17,14 +17,19 @@ import { TextBackButton, useScrollViewPosition } from 'packages/app/src'
 import { useRef } from 'react'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 
-interface FunkeIssuerDetailScreenProps {
+interface FunkeFederationDetailScreenProps {
   name: string
   logo?: string
   entityId?: string
   trustedEntityIds?: string[]
 }
 
-export function FunkeIssuerDetailScreen({ name, logo, entityId, trustedEntityIds = [] }: FunkeIssuerDetailScreenProps) {
+export function FunkeFederationDetailScreen({
+  name,
+  logo,
+  entityId,
+  trustedEntityIds = [],
+}: FunkeFederationDetailScreenProps) {
   const { trustedEntities } = useTrustedEntities()
 
   const { handleScroll, isScrolledByOffset, scrollEventThrottle } = useScrollViewPosition()