From 0cb2e60d9b537606d81d04247d5f8576f4cb71d9 Mon Sep 17 00:00:00 2001
From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date: Thu, 23 May 2024 21:47:44 +0530
Subject: [PATCH] fix: broken url on booking page (#15028)

---
 .../components/event-meta/Members.tsx         | 32 ++++++++++++-------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/packages/features/bookings/components/event-meta/Members.tsx b/packages/features/bookings/components/event-meta/Members.tsx
index 36dec9c163..02974c40eb 100644
--- a/packages/features/bookings/components/event-meta/Members.tsx
+++ b/packages/features/bookings/components/event-meta/Members.tsx
@@ -2,6 +2,7 @@ import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
 import { useBookerStore } from "@calcom/features/bookings/Booker/store";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
 import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
+import { getTeamUrlSync } from "@calcom/lib/getBookerUrl/client";
 import { SchedulingType } from "@calcom/prisma/enums";
 import { AvatarGroup } from "@calcom/ui";
 
@@ -22,7 +23,7 @@ export const EventMembers = ({ schedulingType, users, profile, entity }: EventMe
   const username = useBookerStore((state) => state.username);
   const isDynamic = !!(username && username.indexOf("+") > -1);
   const isEmbed = useIsEmbed();
-  const showMembers = !!schedulingType && schedulingType !== SchedulingType.ROUND_ROBIN;
+  const showMembers = schedulingType !== SchedulingType.ROUND_ROBIN;
   const shownUsers = showMembers ? users : [];
   // In some cases we don't show the user's names, but only show the profile name.
   const showOnlyProfileName =
@@ -30,23 +31,30 @@ export const EventMembers = ({ schedulingType, users, profile, entity }: EventMe
     !users.length ||
     (profile.name !== users[0].name && schedulingType === SchedulingType.COLLECTIVE);
 
+  const orgAvatarItem =
+    entity.orgSlug && !(isDynamic && !profile.image)
+      ? [
+          {
+            // We don't want booker to be able to see the list of other users or teams inside the embed
+            href: isEmbed
+              ? null
+              : entity.teamSlug
+              ? getTeamUrlSync({ orgSlug: entity.orgSlug, teamSlug: entity.teamSlug })
+              : getBookerBaseUrlSync(entity.orgSlug),
+            image: profile.image || "",
+            alt: profile.name || "",
+            title: profile.name || "",
+          },
+        ]
+      : [];
+
   return (
     <>
       <AvatarGroup
         size="sm"
         className="border-muted"
         items={[
-          ...(isDynamic && !profile.image
-            ? []
-            : [
-                {
-                  // We don't want booker to be able to see the list of other users or teams inside the embed
-                  href: isEmbed ? null : getBookerBaseUrlSync(entity.orgSlug),
-                  image: profile.image || "",
-                  alt: profile.name || "",
-                  title: profile.name || "",
-                },
-              ]),
+          ...orgAvatarItem,
           ...shownUsers.map((user) => ({
             href: `${getBookerBaseUrlSync(user.profile?.organization?.slug ?? null)}/${
               user.profile?.username