Skip to content

Scheduling infrastructure for absolutely everyone.

fix: use correct logo (#20194)

Udit Takkarf459e5d9c41b
diff --git a/packages/trpc/server/routers/loggedInViewer/teamsAndUserProfilesQuery.handler.ts b/packages/trpc/server/routers/loggedInViewer/teamsAndUserProfilesQuery.handler.ts
index 9c6b88790ff..a103c9c0182 100644
--- a/packages/trpc/server/routers/loggedInViewer/teamsAndUserProfilesQuery.handler.ts
+++ b/packages/trpc/server/routers/loggedInViewer/teamsAndUserProfilesQuery.handler.ts
@@ -2,7 +2,6 @@ import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
import { withRoleCanCreateEntity } from "@calcom/lib/entityPermissionUtils";
import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
import type { PrismaClient } from "@calcom/prisma";
-import { MembershipRole } from "@calcom/prisma/enums";
import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
import type { TrpcSessionUser } from "@calcom/trpc/server/trpc";
@@ -45,6 +44,12 @@ export const teamsAndUserProfilesQuery = async ({ ctx, input }: TeamsAndUserProf
slug: true,
metadata: true,
parentId: true,
+ parent: {
+ select: {
+ logoUrl: true,
+ name: true,
+ },
+ },
members: {
select: {
userId: true,
@@ -84,11 +89,6 @@ export const teamsAndUserProfilesQuery = async ({ ctx, input }: TeamsAndUserProf
}));
}
- //For making team logo same as Org logo
- const ownerTeam = user.teams.find((membership) => membership.role === MembershipRole.OWNER);
- const ownerLogoUrl = ownerTeam?.team.logoUrl;
- const ownerName = ownerTeam?.team.name;
-
return [
{
teamId: null,
@@ -103,7 +103,9 @@ export const teamsAndUserProfilesQuery = async ({ ctx, input }: TeamsAndUserProf
teamId: membership.team.id,
name: membership.team.name,
slug: membership.team.slug ? `team/${membership.team.slug}` : null,
- image: ownerLogoUrl ?? getPlaceholderAvatar(membership.team.logoUrl, ownerName),
+ image: membership.team?.parent
+ ? getPlaceholderAvatar(membership.team.parent.logoUrl, membership.team.parent.name)
+ : getPlaceholderAvatar(membership.team.logoUrl, membership.team.name),
role: membership.role,
readOnly: !withRoleCanCreateEntity(membership.role),
})),