Merge pull request #389 from itbel/ib-fix-event-bug

Fixed event service issue causing null events to display
themeetinghouse · Jul 19, 2023 · 83a6d42 · 83a6d42
2 parents 801e5f0 + 4af05d9
commit 83a6d42
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/home/EventCard.tsx b/src/components/home/EventCard.tsx
@@ -85,8 +85,8 @@ export default function EventCard({
   return (
     <TouchableOpacity
       accessibilityRole="button"
-      accessibilityLabel={`Learn more about ${event.name}`}
-      accessibilityHint={`Navigate to the ${event.name} details screen`}
+      accessibilityLabel={`Learn more about ${event?.name}`}
+      accessibilityHint={`Navigate to the ${event?.name} details screen`}
       activeOpacity={0.45}
       onPress={handlePress}
     >

diff --git a/src/services/EventsService.ts b/src/services/EventsService.ts
@@ -57,6 +57,6 @@ export default class EventsService {
         ?.map((fb) => fb?.pageId)
         .filter((pageId) => pageId) as string[]) ?? [];
     const events = await getEvents(idsToFetch);
-    return events as FBEvent[];
+    return events.filter((event) => Boolean(event)) as FBEvent[];
   };
 }