diff --git a/apps/web/components/team/screens/Team.tsx b/apps/web/components/team/screens/Team.tsx index 6503636861..bbf31e1b01 100644 --- a/apps/web/components/team/screens/Team.tsx +++ b/apps/web/components/team/screens/Team.tsx @@ -4,6 +4,7 @@ import { useRouter } from "next/router"; import { WEBAPP_URL } from "@calcom/lib/constants"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { md } from "@calcom/lib/markdownIt"; +import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; import type { TeamWithMembers } from "@calcom/lib/server/queries/teams"; import { Avatar } from "@calcom/ui"; @@ -23,7 +24,7 @@ const Member = ({ member, teamName }: { member: MemberType; teamName: string | n return ( -
+
) : ( diff --git a/apps/web/pages/video/[uid].tsx b/apps/web/pages/video/[uid].tsx index 36d3e6968c..9c03690c19 100644 --- a/apps/web/pages/video/[uid].tsx +++ b/apps/web/pages/video/[uid].tsx @@ -12,6 +12,7 @@ import classNames from "@calcom/lib/classNames"; import { APP_NAME, SEO_IMG_OGIMG_VIDEO, WEBSITE_URL } from "@calcom/lib/constants"; import { formatToLocalizedDate, formatToLocalizedTime } from "@calcom/lib/date-fns"; import { useLocale } from "@calcom/lib/hooks/useLocale"; +import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; import prisma, { bookingMinimalSelect } from "@calcom/prisma"; import type { inferSSRProps } from "@calcom/types/inferSSRProps"; import { ChevronRight } from "@calcom/ui/components/icon"; @@ -244,7 +245,7 @@ export function VideoMeetingInfo(props: VideoMeetingInfo) {
)} diff --git a/packages/features/bookings/Booker/components/EventMeta.tsx b/packages/features/bookings/Booker/components/EventMeta.tsx index 405d920072..3da5e1cc12 100644 --- a/packages/features/bookings/Booker/components/EventMeta.tsx +++ b/packages/features/bookings/Booker/components/EventMeta.tsx @@ -5,6 +5,7 @@ import { EventDetails, EventMembers, EventMetaSkeleton, EventTitle } from "@calc import { EventMetaBlock } from "@calcom/features/bookings/components/event-meta/Details"; import { useTimePreferences } from "@calcom/features/bookings/lib"; import { useLocale } from "@calcom/lib/hooks/useLocale"; +import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; import { Calendar, Globe } from "@calcom/ui/components/icon"; import { fadeInUp } from "../config"; @@ -38,7 +39,7 @@ export const EventMeta = () => { {event?.title} {event.description && ( -
+
)}
diff --git a/packages/features/ee/teams/pages/team-profile-view.tsx b/packages/features/ee/teams/pages/team-profile-view.tsx index a6bcbec6ab..f23a65ba69 100644 --- a/packages/features/ee/teams/pages/team-profile-view.tsx +++ b/packages/features/ee/teams/pages/team-profile-view.tsx @@ -11,6 +11,7 @@ import { IS_TEAM_BILLING_ENABLED, WEBAPP_URL } from "@calcom/lib/constants"; import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage"; import { useLocale } from "@calcom/lib/hooks/useLocale"; import { md } from "@calcom/lib/markdownIt"; +import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML"; import objectKeys from "@calcom/lib/objectKeys"; import turndown from "@calcom/lib/turndownService"; import { MembershipRole } from "@calcom/prisma/enums"; @@ -265,7 +266,7 @@ const ProfileView = () => {
)} diff --git a/packages/lib/markdownToSafeHTML.ts b/packages/lib/markdownToSafeHTML.ts index f4c993377b..fd5945930b 100644 --- a/packages/lib/markdownToSafeHTML.ts +++ b/packages/lib/markdownToSafeHTML.ts @@ -3,7 +3,7 @@ import sanitizeHtml from "sanitize-html"; import { md } from "@calcom/lib/markdownIt"; export function markdownToSafeHTML(markdown: string | null) { - if (!markdown) return null; + if (!markdown) return ""; const html = md.render(markdown);