From 179f90defe29c087a1f7de732f9a86517e39f5a8 Mon Sep 17 00:00:00 2001
From: Jeremy Zongker <jeremy@zongker.net>
Date: Tue, 11 Nov 2025 21:21:58 -0600
Subject: [PATCH] Added error handling to checkin

---
 src/app/[sdSlug]/my/[pageSlug]/components/TabsClient.tsx | 2 +-
 src/components/checkin/Groups.tsx                        | 3 ++-
 src/components/checkin/Household.tsx                     | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/app/[sdSlug]/my/[pageSlug]/components/TabsClient.tsx b/src/app/[sdSlug]/my/[pageSlug]/components/TabsClient.tsx
index 6ac9ec84..1059d4e2 100644
--- a/src/app/[sdSlug]/my/[pageSlug]/components/TabsClient.tsx
+++ b/src/app/[sdSlug]/my/[pageSlug]/components/TabsClient.tsx
@@ -61,7 +61,7 @@ export const TabsClient = (props: Props) => {
   useEffect(() => { loadData() }, [context.userChurch])
 
 
-  const getItem = (tab:any) => (<li><Link href={tab.url} data-testid={`my-tab-${tab.label.toLowerCase()}`} aria-label={`Go to ${tab.label}`}>{tab.label}</Link></li>)
+  const getItem = (tab:any) => (<li key={tab.url}><Link href={tab.url} data-testid={`my-tab-${tab.label.toLowerCase()}`} aria-label={`Go to ${tab.label}`}>{tab.label}</Link></li>)
 
   return <ul data-testid="my-portal-tabs" aria-label="Member portal navigation">
     {getTabs().map((tab, index) => getItem(tab))}
diff --git a/src/components/checkin/Groups.tsx b/src/components/checkin/Groups.tsx
index 4f459554..0da7c158 100644
--- a/src/components/checkin/Groups.tsx
+++ b/src/components/checkin/Groups.tsx
@@ -23,10 +23,11 @@ export function Groups({ selectedHandler }: Props) {
     let gt: GroupCategoryInterface[] = [];
 
     const sortedGroups = CheckinHelper.selectedServiceTime?.groups?.sort((a, b) =>
-      (a.categoryName || "") > (b.categoryName || "") ? 1 : -1
+      ((a?.categoryName || "") > (b?.categoryName || "")) ? 1 : -1
     );
 
     sortedGroups?.forEach((g) => {
+      if (!g) return;
       if (g.categoryName !== category) gt.push({ key: gt.length, name: g.categoryName || "", items: [] });
       gt[gt.length - 1].items.push(g);
       category = g.categoryName || "";
diff --git a/src/components/checkin/Household.tsx b/src/components/checkin/Household.tsx
index 3f64e70f..d3250f2d 100644
--- a/src/components/checkin/Household.tsx
+++ b/src/components/checkin/Household.tsx
@@ -45,7 +45,8 @@ export function Household({ completeHandler = () => { } }: Props) {
     let hasSelection = false;
     if (stSessions.length > 0) {
       const groupId = stSessions[0].session?.groupId || "";
-      const group: GroupInterface = ArrayHelper.getOne(st.groups || [], "id", groupId);
+      const validGroups = (st.groups || []).filter((g) => g != null);
+      const group: GroupInterface = ArrayHelper.getOne(validGroups, "id", groupId);
       selectedGroupName = group?.name || "None";
       hasSelection = true;
     }