From a01d6aa932df5ccb5c70694fa030368015737a19 Mon Sep 17 00:00:00 2001
From: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com>
Date: Tue, 5 Nov 2024 19:32:30 +0530
Subject: [PATCH] feat: instant meeting modal improvements (#17489)

* feat: instant meeting modal improvements

* fix: type error
---
 .../bookings/Booker/components/InstantBooking.tsx   |  7 +++----
 .../ui/components/avatar/UserAvatarGroupWithOrg.tsx | 13 +++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/features/bookings/Booker/components/InstantBooking.tsx b/packages/features/bookings/Booker/components/InstantBooking.tsx
index 19b3ad9112..6ff912428a 100644
--- a/packages/features/bookings/Booker/components/InstantBooking.tsx
+++ b/packages/features/bookings/Booker/components/InstantBooking.tsx
@@ -1,7 +1,6 @@
 import type { BookerEvent } from "@calcom/features/bookings/types";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { User } from "@calcom/prisma/client";
-import { SchedulingType } from "@calcom/prisma/enums";
 import { Button, UserAvatarGroupWithOrg } from "@calcom/ui";
 
 interface IInstantBookingProps {
@@ -24,10 +23,10 @@ export const InstantBooking = ({ onConnectNow, event }: IInstantBookingProps) =>
             organization={{
               slug: event.entity.orgSlug,
               name: event.entity.name || "",
+              logoUrl: event.entity.logoUrl ?? null,
             }}
-            users={
-              event.schedulingType !== SchedulingType.ROUND_ROBIN ? event.users : event.users.slice(0, 3)
-            }
+            users={event.users.slice(0, 2)}
+            disableHref
           />
           <div className="border-muted absolute -bottom-0.5 -right-1 h-2 w-2 rounded-full border bg-green-500" />
         </div>
diff --git a/packages/ui/components/avatar/UserAvatarGroupWithOrg.tsx b/packages/ui/components/avatar/UserAvatarGroupWithOrg.tsx
index 2d19532db7..d01c1ed220 100644
--- a/packages/ui/components/avatar/UserAvatarGroupWithOrg.tsx
+++ b/packages/ui/components/avatar/UserAvatarGroupWithOrg.tsx
@@ -1,5 +1,5 @@
 import { useIsEmbed } from "@calcom/embed-core/embed-iframe";
-import { WEBAPP_URL } from "@calcom/lib/constants";
+import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
 import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
 import type { Team, User } from "@calcom/prisma/client";
@@ -9,25 +9,26 @@ type UserAvatarProps = Omit<React.ComponentProps<typeof AvatarGroup>, "items"> &
   users: (Pick<User, "name" | "username" | "avatarUrl"> & {
     bookerUrl: string;
   })[];
-  organization: Pick<Team, "slug" | "name">;
+  organization: Pick<Team, "slug" | "name" | "logoUrl">;
+  disableHref?: boolean;
 };
 
 export function UserAvatarGroupWithOrg(props: UserAvatarProps) {
-  const { users, organization, ...rest } = props;
+  const { users, organization, disableHref = false, ...rest } = props;
   const isEmbed = useIsEmbed();
 
   const items = [
     {
       // We don't want booker to be able to see the list of other users or teams inside the embed
-      href: isEmbed ? null : getBookerBaseUrlSync(organization.slug),
-      image: `${WEBAPP_URL}/team/${organization.slug}/avatar.png`,
+      href: isEmbed || disableHref ? null : getBookerBaseUrlSync(organization.slug),
+      image: getPlaceholderAvatar(organization.logoUrl, organization.name),
       alt: organization.name || undefined,
       title: organization.name,
     },
   ].concat(
     users.map((user) => {
       return {
-        href: `${user.bookerUrl}/${user.username}?redirect=false`,
+        href: disableHref ? null : `${user.bookerUrl}/${user.username}?redirect=false`,
         image: getUserAvatarUrl(user),
         alt: user.name || undefined,
         title: user.name || user.username || "",