Merge pull request #1089 from divyanshu-patil/main

fix: #1088 Uncaught TypeError: Cannot read properties of undefined (reading 'uniqueId')
jetstreamapp · Nov 23, 2024 · bf8f822 · bf8f822
2 parents dc4a724 + ee306af
commit bf8f822
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/libs/features/organizations/src/lib/OrganizationPage.tsx b/libs/features/organizations/src/lib/OrganizationPage.tsx
@@ -171,12 +171,15 @@ export function Organizations() {
     (organization?: Maybe<JetstreamOrganizationWithOrgs>) => {
       setActiveOrganizationId(organization?.id);
       if (organization && (!selectedOrg || !organization.orgs.find(({ uniqueId }) => uniqueId === selectedOrg.uniqueId))) {
-        setSelectedOrgId(organization.orgs[0].uniqueId);
+        const firstOrgUniqueId = organization.orgs?.[0]?.uniqueId || null;
+        setSelectedOrgId(firstOrgUniqueId);
       } else if (!organization && (!selectedOrg || selectedOrg.jetstreamOrganizationId != null)) {
         const orgsWithNoOrganization = allOrgs.filter(({ jetstreamOrganizationId }) => !jetstreamOrganizationId);
-        setSelectedOrgId(orgsWithNoOrganization[0].uniqueId);
+        const firstUnassignedOrgId = orgsWithNoOrganization?.[0]?.uniqueId || null;
+        setSelectedOrgId(firstUnassignedOrgId);
       }
-    },
+
+  },
     [allOrgs, selectedOrg, setActiveOrganizationId, setSelectedOrgId]
   );