diff --git a/apps/web/pages/v2/event-types/index.tsx b/apps/web/pages/v2/event-types/index.tsx
index 59ad825fa5ea49..20e73d29801ad2 100644
--- a/apps/web/pages/v2/event-types/index.tsx
+++ b/apps/web/pages/v2/event-types/index.tsx
@@ -32,6 +32,7 @@ import EventTypeDescription from "@components/eventtype/EventTypeDescription";
import SkeletonLoader from "@components/eventtype/SkeletonLoader";
import Avatar from "@components/ui/Avatar";
import AvatarGroup from "@components/ui/AvatarGroup";
+import NoCalendarConnectedAlert from "@components/ui/NoCalendarConnectedAlert";
import { TRPCClientError } from "@trpc/react";
@@ -551,6 +552,7 @@ const WithQuery = withQuery(["viewer.eventTypes"]);
const EventTypesPage = () => {
const { t } = useLocale();
+
return (
@@ -581,6 +583,9 @@ const EventTypesPage = () => {
className="mb-4"
/>
)}
+
+
+
{data.eventTypeGroups.map((group, index) => (
{/* hide list heading when there is only one (current user) */}
diff --git a/packages/ui/v2/modules/event-types/DestinationCalendarSelector.tsx b/packages/ui/v2/modules/event-types/DestinationCalendarSelector.tsx
index 1109909442222f..340f5d0106d62d 100644
--- a/packages/ui/v2/modules/event-types/DestinationCalendarSelector.tsx
+++ b/packages/ui/v2/modules/event-types/DestinationCalendarSelector.tsx
@@ -2,6 +2,7 @@ import classNames from "classnames";
import React, { useEffect, useState } from "react";
import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { DestinationCalendar } from "@calcom/prisma/client";
import { trpc } from "@calcom/trpc/react";
import Select from "@calcom/ui/v2/core/form/Select";
@@ -10,6 +11,7 @@ interface Props {
isLoading?: boolean;
hidePlaceholder?: boolean;
/** The external Id of the connected calendar */
+ destinationCalendar?: DestinationCalendar | null;
value: string | undefined;
maxWidth?: number;
}
@@ -20,6 +22,7 @@ const DestinationCalendarSelector = ({
value,
hidePlaceholder,
maxWidth,
+ destinationCalendar,
}: Props): JSX.Element | null => {
const { t } = useLocale();
const query = trpc.useQuery(["viewer.connectedCalendars"]);
@@ -73,7 +76,15 @@ const DestinationCalendarSelector = ({