#3110 Small Changes

Northeastern-Electric-Racing · Jan 15, 2025 · 49d7794 · 49d7794
1 parent 94f5854
commit 49d7794
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/frontend/src/pages/AcceptedPage/AcceptedPage.tsx b/src/frontend/src/pages/AcceptedPage/AcceptedPage.tsx
@@ -19,8 +19,6 @@ const AcceptedPage = () => {
     return <LoadingIndicator />;
   }
 
-  // const { mutateAsync: setTeamInitialMember, isLoading: setTeamMembersIsLoading } = useSetTeamInitialMember(team.teamId);
-
   const handleClick = async () => {
     Promise.all(user.onboardingTeamTypeIds.map((teamTypeId) => toggleOnboardingUser(teamTypeId)));
     window.location.reload();
@@ -37,7 +35,7 @@ const AcceptedPage = () => {
           marginLeft="auto"
           sx={{ marginTop: 2, textAlign: 'center', pt: 1, padding: 0, fontWeight: 1 }}
         >
-          We are so excited to welcome you to {organization.name} team!
+          We are so excited to welcome you to {organization.name}!
         </Typography>
       </Box>
       <Box

diff --git a/src/frontend/src/pages/HomePage/OnboardingHomePage.tsx b/src/frontend/src/pages/HomePage/OnboardingHomePage.tsx
@@ -58,7 +58,6 @@ const OnboardingHomePage = () => {
 
   const progress = useChecklistProgress([...generalChecklists, ...(usersChecklists || [])], checkedChecklists || []);
 
-
   if (usersChecklistsIsError) {
     return <ErrorPage error={usersChecklistsError} />;
   }
@@ -78,7 +77,8 @@ const OnboardingHomePage = () => {
     checkedChecklistsLoading ||
     !checkedChecklists ||
     allChecklistsIsLoading ||
-    !allChecklists
+    !allChecklists ||
+    organizationIsLoading
   ) {
     return <LoadingIndicator />;
   }
@@ -91,10 +91,6 @@ const OnboardingHomePage = () => {
     setModalOpen(false);
   };
 
-  if (organizationIsLoading || !organization) {
-    return <LoadingIndicator />;
-  }
-
   const handleConfirmModal = async () => {
     history.push(routes.HOME_ACCEPT);
   };