Fixes

kamilkisiela · Jul 11, 2022 · e533a22 · e533a22
1 parent aee4379
commit e533a22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/packages/web/app/src/components/get-started/wizard.tsx b/packages/web/app/src/components/get-started/wizard.tsx
@@ -45,7 +45,7 @@ export function GetStartedProgress({
           invitingMembers: undefined,
         }
       : tasks;
-  const values = Object.values(processedTasks);
+  const values = Object.values(processedTasks).filter(v => typeof v === 'boolean');
   const total = values.length;
   const completed = values.filter(t => t === true).length;
   const remaining = total - completed;

diff --git a/packages/web/app/src/components/v2/header.tsx b/packages/web/app/src/components/v2/header.tsx
@@ -45,7 +45,8 @@ export const Header = (): ReactElement => {
   }, []);
 
   const me = meQuery.data?.me;
-  const { personal, organizations } = (organizationsQuery.data?.organizations.nodes || []).reduce<{
+  const allOrgs = organizationsQuery.data?.organizations.nodes || [];
+  const { personal, organizations } = allOrgs.reduce<{
     personal: DropdownOrganization;
     organizations: DropdownOrganization;
   }>(
@@ -61,7 +62,7 @@ export const Header = (): ReactElement => {
   );
 
   const currentOrg =
-    typeof router.organizationId === 'string' ? organizations.find(org => org.cleanId === router.organizationId) : null;
+    typeof router.organizationId === 'string' ? allOrgs.find(org => org.cleanId === router.organizationId) : null;
 
   // Copied from tailwindcss website
   // https://github.com/tailwindlabs/tailwindcss.com/blob/94971856747c159b4896621c3308bcfa629bb736/src/components/Header.js#L149