From e533a2285d2d5aa641db84631dae80450a481bf8 Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Mon, 11 Jul 2022 17:57:18 +0200
Subject: [PATCH] Fixes

---
 packages/web/app/src/components/get-started/wizard.tsx | 2 +-
 packages/web/app/src/components/v2/header.tsx          | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/web/app/src/components/get-started/wizard.tsx b/packages/web/app/src/components/get-started/wizard.tsx
index 503dde7fa2..788a55ac16 100644
--- 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
index 29a2234569..61c16bfbe2 100644
--- 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