diff --git a/apps/web/pages/team/[slug].tsx b/apps/web/pages/team/[slug].tsx
index 2adbfe768a..41f4046447 100644
--- a/apps/web/pages/team/[slug].tsx
+++ b/apps/web/pages/team/[slug].tsx
@@ -5,6 +5,7 @@ import { usePathname } from "next/navigation";
import { useEffect } from "react";
import { sdkActionManager, useIsEmbed } from "@calcom/embed-core/embed-iframe";
+import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
import EventTypeDescription from "@calcom/features/eventtypes/components/EventTypeDescription";
import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
@@ -43,6 +44,7 @@ function TeamPage({ team, isUnpublished, markdownStrippedBio, isValidOrgDomain }
const teamName = team.name || "Nameless Team";
const isBioEmpty = !team.bio || !team.bio.replace("
", "").length;
const metadata = teamMetadataSchema.parse(team.metadata);
+ const orgBranding = useOrgBranding();
useEffect(() => {
telemetry.event(
@@ -124,12 +126,6 @@ function TeamPage({ team, isUnpublished, markdownStrippedBio, isValidOrgDomain }
-
{ch.name}
@@ -185,9 +181,11 @@ function TeamPage({ team, isUnpublished, markdownStrippedBio, isValidOrgDomain }
diff --git a/packages/features/bookings/components/event-meta/Members.tsx b/packages/features/bookings/components/event-meta/Members.tsx
index 1712666534..85d8f22d2c 100644
--- a/packages/features/bookings/components/event-meta/Members.tsx
+++ b/packages/features/bookings/components/event-meta/Members.tsx
@@ -61,7 +61,7 @@ export const EventMembers = ({ schedulingType, users, profile, entity }: EventMe
image: "logo" in profile && profile.logo ? `${profile.logo}` : undefined,
alt: profile.name || undefined,
href: profile.username
- ? `${CAL_URL}` + (pathname.indexOf("/team/") !== -1 ? "/team" : "") + `/${profile.username}`
+ ? `${CAL_URL}${pathname.indexOf("/team/") !== -1 ? "/team" : ""}/${profile.username}`
: undefined,
});
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx
index 9ae0e26cc4..d9cd6ab6e2 100644
--- a/packages/features/ee/teams/pages/team-profile-view.tsx
+++ b/packages/features/ee/teams/pages/team-profile-view.tsx
@@ -176,30 +176,37 @@ const ProfileView = () => {
mutation.mutate({ id: team.id, ...variables });
}
}}>
-
-
(
- <>
-
-
- {
- form.setValue("logo", newLogo);
- }}
- imageSrc={value}
- />
-
- >
- )}
- />
-
-
-
+ {!team.parent && (
+ <>
+
+
(
+ <>
+
+
+ {
+ form.setValue("logo", newLogo);
+ }}
+ imageSrc={value}
+ />
+
+ >
+ )}
+ />
+
+
+ >
+ )}
)}
-
+ {!team.parentId && (
+
+ )}
{team.name}
{!team.accepted && (
@@ -517,11 +519,13 @@ const SettingsSidebarContainer = ({
)}
-
+ {!otherTeam.parentId && (
+
+ )}
{otherTeam.name}