v3.8.8

New Crowdin translations by Github Action
feat: new privacy settings for orgs (#13693 )
2024-03-12 13:03:00 -03:00 · 2024-03-12 16:00:52 +00:00 · 2024-03-12 15:56:43 +00:00 · 2024-03-12 11:46:24 -04:00 · 2024-03-12 15:37:53 +00:00 · 2024-03-12 15:30:02 +00:00
475 changed files with 13337 additions and 7780 deletions
@@ -294,9 +294,9 @@ E2E_TEST_CALCOM_GCAL_KEYS=
 # Used for self-hosters that are implementing Cal.com into their applications that already have certain integrations
 # Under settings/admin/apps ensure that all app secrets are set the same as the parent application
 # You can use: `openssl rand -base64 32` to generate one
-CALCOM_WEBHOOK_SECRET=""
+CALCOM_CREDENTIAL_SYNC_SECRET=""
 # This is the header name that will be used to verify the webhook secret. Should be in lowercase
-CALCOM_WEBHOOK_HEADER_NAME="calcom-webhook-secret"
+CALCOM_CREDENTIAL_SYNC_SECRET_HEADER_NAME="calcom-webhook-secret"
 CALCOM_CREDENTIAL_SYNC_ENDPOINT=""
 # Key should match on Cal.com and your application
 # must be 24 bytes for AES256 encryption algorithm
@@ -0,0 +1,17 @@
+name: Manually Delete BuildJet Cache
+on:
+  workflow_dispatch:
+    inputs:
+      cache_key:
+        description: "BuildJet Cache Key to Delete"
+        required: true
+        type: string
+jobs:
+  manually-delete-buildjet-cache:
+    runs-on: buildjet-2vcpu-ubuntu-2204
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: buildjet/cache-delete@v1
+        with:
+          cache_key: ${{ inputs.cache_key }}
@@ -1,5 +1,6 @@
+import { ChatPromptTemplate } from "@langchain/core/prompts";
 import { ChatOpenAI } from "@langchain/openai";
-import { initializeAgentExecutorWithOptions } from "langchain/agents";
+import { AgentExecutor, createOpenAIFunctionsAgent } from "langchain/agents";

 import { env } from "../env.mjs";
 import createBookingIfAvailable from "../tools/createBooking";
@@ -47,67 +48,72 @@ const agent = async (
  /**
   * Initialize the agent executor with arguments.
   */
-  const executor = await initializeAgentExecutorWithOptions(tools, model, {
-    agentArgs: {
-      prefix: `You are Cal.ai - a bleeding edge scheduling assistant that interfaces via email.
-Make sure your final answers are definitive, complete and well formatted.
-Sometimes, tools return errors. In this case, try to handle the error intelligently or ask the user for more information.
-Tools will always handle times in UTC, but times sent to users should be formatted per that user's timezone.
-In responses to users, always summarize necessary context and open the door to follow ups. For example "I have booked your chat with @username for 3pm on Wednesday, December 20th, 2023 EST. Please let me know if you need to reschedule."
-If you can't find a referenced user, ask the user for their email or @username. Make sure to specify that usernames require the @username format. Users don't know other users' userIds.
+  const prompt =
+    ChatPromptTemplate.fromTemplate(`You are Cal.ai - a bleeding edge scheduling assistant that interfaces via email.
+  Make sure your final answers are definitive, complete and well formatted.
+  Sometimes, tools return errors. In this case, try to handle the error intelligently or ask the user for more information.
+  Tools will always handle times in UTC, but times sent to users should be formatted per that user's timezone.
+  In responses to users, always summarize necessary context and open the door to follow ups. For example "I have booked your chat with @username for 3pm on Wednesday, December 20th, 2023 EST. Please let me know if you need to reschedule."
+  If you can't find a referenced user, ask the user for their email or @username. Make sure to specify that usernames require the @username format. Users don't know other users' userIds.
+  
+  The primary user's id is: ${userId}
+  The primary user's username is: ${user.username}
+  The current time in the primary user's timezone is: ${now(user.timeZone, {
+    weekday: "long",
+    year: "numeric",
+    month: "long",
+    day: "numeric",
+    hour: "numeric",
+    minute: "numeric",
+  })}
+  The primary user's time zone is: ${user.timeZone}
+  The primary user's event types are: ${user.eventTypes
+    .map((e: EventType) => `ID: ${e.id}, Slug: ${e.slug}, Title: ${e.title}, Length: ${e.length};`)
+    .join("\n")}
+  The primary user's working hours are: ${user.workingHours
+    .map(
+      (w: WorkingHours) =>
+        `Days: ${w.days.join(", ")}, Start Time (minutes in UTC): ${
+          w.startTime
+        }, End Time (minutes in UTC): ${w.endTime};`
+    )
+    .join("\n")}
+  ${
+    users.length
+      ? `The email references the following @usernames and emails: ${users
+          .map(
+            (u) =>
+              `${
+                (u.id ? `, id: ${u.id}` : "id: (non user)") +
+                (u.username
+                  ? u.type === "fromUsername"
+                    ? `, username: @${u.username}`
+                    : ", username: REDACTED"
+                  : ", (no username)") +
+                (u.email
+                  ? u.type === "fromEmail"
+                    ? `, email: ${u.email}`
+                    : ", email: REDACTED"
+                  : ", (no email)")
+              };`
+          )
+          .join("\n")}`
+      : ""
+  }`);
+  const agent = await createOpenAIFunctionsAgent({
+    llm: model,
+    prompt,
+    tools,
+  });

-The primary user's id is: ${userId}
-The primary user's username is: ${user.username}
-The current time in the primary user's timezone is: ${now(user.timeZone, {
-        weekday: "long",
-        year: "numeric",
-        month: "long",
-        day: "numeric",
-        hour: "numeric",
-        minute: "numeric",
-      })}
-The primary user's time zone is: ${user.timeZone}
-The primary user's event types are: ${user.eventTypes
-        .map((e: EventType) => `ID: ${e.id}, Slug: ${e.slug}, Title: ${e.title}, Length: ${e.length};`)
-        .join("\n")}
-The primary user's working hours are: ${user.workingHours
-        .map(
-          (w: WorkingHours) =>
-            `Days: ${w.days.join(", ")}, Start Time (minutes in UTC): ${
-              w.startTime
-            }, End Time (minutes in UTC): ${w.endTime};`
-        )
-        .join("\n")}
-${
-  users.length
-    ? `The email references the following @usernames and emails: ${users
-        .map(
-          (u) =>
-            `${
-              (u.id ? `, id: ${u.id}` : "id: (non user)") +
-              (u.username
-                ? u.type === "fromUsername"
-                  ? `, username: @${u.username}`
-                  : ", username: REDACTED"
-                : ", (no username)") +
-              (u.email
-                ? u.type === "fromEmail"
-                  ? `, email: ${u.email}`
-                  : ", email: REDACTED"
-                : ", (no email)")
-            };`
-        )
-        .join("\n")}`
-    : ""
-}
-            `,
-    },
-    agentType: "openai-functions",
+  const executor = new AgentExecutor({
+    agent,
+    tools,
    returnIntermediateSteps: env.NODE_ENV === "development",
    verbose: env.NODE_ENV === "development",
  });

-  const result = await executor.call({ input });
+  const result = await executor.invoke({ input });
  const { output } = result;

  return output;
@@ -74,6 +74,7 @@ export const schemaUserBaseBodyParams = User.pick({
  timeZone: true,
  weekStart: true,
  theme: true,
+  appTheme: true,
  defaultScheduleId: true,
  locale: true,
  hideBranding: true,
@@ -100,6 +101,7 @@ const schemaUserEditParams = z.object({
  hideBranding: z.boolean().optional(),
  timeZone: timeZone.optional(),
  theme: z.nativeEnum(theme).optional().nullable(),
+  appTheme: z.nativeEnum(theme).optional().nullable(),
  timeFormat: z.nativeEnum(timeFormat).optional(),
  defaultScheduleId: z
    .number()
@@ -122,6 +124,7 @@ const schemaUserCreateParams = z.object({
  hideBranding: z.boolean().optional(),
  timeZone: timeZone.optional(),
  theme: z.nativeEnum(theme).optional().nullable(),
+  appTheme: z.nativeEnum(theme).optional().nullable(),
  timeFormat: z.nativeEnum(timeFormat).optional(),
  defaultScheduleId: z
    .number()
@@ -159,6 +162,7 @@ export const schemaUserReadPublic = User.pick({
  weekStart: true,
  endTime: true,
  bufferTime: true,
+  appTheme: true,
  theme: true,
  defaultScheduleId: true,
  locale: true,
@@ -24,6 +24,7 @@
    "@types/node": "16.9.1",
    "@types/react": "18.0.26",
    "@types/react-dom": "^18.0.9",
+    "@types/swagger-ui-react": "^4.18.3",
    "typescript": "^4.9.4"
  }
 }
@@ -1,9 +1,10 @@
 import "highlight.js/styles/default.css";
+import { type AppProps } from "next/app";
 import "swagger-ui-react/swagger-ui.css";

 import "../styles/globals.css";

-function MyApp({ Component, pageProps }) {
+function MyApp({ Component, pageProps }: AppProps) {
  return <Component {...pageProps} />;
 }

@@ -1,9 +1,8 @@
 import dynamic from "next/dynamic";
-import type { SwaggerUI } from "swagger-ui-react";

 import { SnippedGenerator, requestSnippets } from "@lib/snippets";

-const SwaggerUIDynamic: SwaggerUI & { url: string } = dynamic(() => import("swagger-ui-react"), {
+const SwaggerUIDynamic = dynamic(() => import("swagger-ui-react"), {
  ssr: false,
 });

@@ -17,8 +16,6 @@ export default function APIDocs() {
      requestSnippets={requestSnippets}
      plugins={[SnippedGenerator]}
      tryItOutEnabled={true}
-      syntaxHighlight={true}
-      enableCORS={false} // Doesn't seem to work either
      docExpansion="list"
      filter={true}
    />
@@ -2,11 +2,9 @@ import { dir } from "i18next";
 import { Inter } from "next/font/google";
 import localFont from "next/font/local";
 import { headers, cookies } from "next/headers";
-import Script from "next/script";
 import React from "react";

 import { getLocale } from "@calcom/features/auth/lib/getLocale";
-import { IS_PRODUCTION } from "@calcom/lib/constants";

 import { prepareRootMetadata } from "@lib/metadata";

@@ -18,6 +16,7 @@ const calFont = localFont({
  variable: "--font-cal",
  preload: true,
  display: "block",
+  weight: "600",
 });

 export const generateMetadata = () =>
@@ -69,11 +68,13 @@ export default async function RootLayout({ children }: { children: React.ReactNo
      style={embedColorScheme ? { colorScheme: embedColorScheme as string } : undefined}
      data-nextjs-router="app">
      <head nonce={nonce}>
-        {!IS_PRODUCTION && process.env.VERCEL_ENV === "preview" && (
-          // eslint-disable-next-line @next/next/no-sync-scripts
-          <Script
-            data-project-id="KjpMrKTnXquJVKfeqmjdTffVPf1a6Unw2LZ58iE4"
-            src="https://snippet.meticulous.ai/v1/stagingMeticulousSnippet.js"
+        {!!process.env.NEXT_PUBLIC_HEAD_SCRIPTS && (
+          <script
+            nonce={nonce}
+            id="injected-head-scripts"
+            dangerouslySetInnerHTML={{
+              __html: process.env.NEXT_PUBLIC_HEAD_SCRIPTS,
+            }}
          />
        )}
        <style>{`
@@ -97,6 +98,15 @@ export default async function RootLayout({ children }: { children: React.ReactNo
              }
            : {}
        }>
+        {!!process.env.NEXT_PUBLIC_BODY_SCRIPTS && (
+          <script
+            nonce={nonce}
+            id="injected-head-scripts"
+            dangerouslySetInnerHTML={{
+              __html: process.env.NEXT_PUBLIC_BODY_SCRIPTS,
+            }}
+          />
+        )}
        {children}
      </body>
    </html>
@@ -24,6 +24,7 @@ const calFont = localFont({
  variable: "--font-cal",
  preload: true,
  display: "swap",
+  weight: "600",
 });

 function PageWrapper(props: AppProps) {
@@ -75,6 +76,26 @@ function PageWrapper(props: AppProps) {
        id="page-status"
        dangerouslySetInnerHTML={{ __html: `window.CalComPageStatus = '${pageStatus}'` }}
      />
+      {process.env.NEXT_PUBLIC_GTM_ID ? (
+        <>
+          <Script
+            id="gtm-init-script"
+            dangerouslySetInnerHTML={{
+              __html: `(function (w, d, s, l, i) {
+                        w[l] = w[l] || []; w[l].push({ 'gtm.start': new Date().getTime(), event: 'gtm.js' });
+                        var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
+                        j.async = true; j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl; f.parentNode.insertBefore(j, f);
+                    })(window, document, 'script', 'dataLayer', '${process.env.NEXT_PUBLIC_GTM_ID}');`,
+            }}
+          />
+          <noscript
+            dangerouslySetInnerHTML={{
+              __html: `<iframe src="https://www.googletagmanager.com/ns.html?id=${process.env.NEXT_PUBLIC_GTM_ID}" height="0" width="0" style="display:none;visibility:hidden"></iframe>`,
+            }}
+          />
+        </>
+      ) : null}
+
      <style jsx global>{`
        :root {
          --font-inter: ${interFont.style.fontFamily};
@@ -5,7 +5,7 @@ import { InstallAppButton } from "@calcom/app-store/components";
 import { getEventLocationTypeFromApp, type EventLocationType } from "@calcom/app-store/locations";
 import type { CredentialOwner } from "@calcom/app-store/types";
 import { AppSetDefaultLinkDialog } from "@calcom/features/apps/components/AppSetDefaultLinkDialog";
-import { BulkEditDefaultConferencingModal } from "@calcom/features/eventtypes/components/BulkEditDefaultConferencingModal";
+import { BulkEditDefaultForEventsModal } from "@calcom/features/eventtypes/components/BulkEditDefaultForEventsModal";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { AppCategories } from "@calcom/prisma/enums";
 import { trpc, type RouterOutputs } from "@calcom/trpc";
@@ -154,6 +154,12 @@ export const AppList = ({ data, handleDisconnect, variant, listClassName }: AppL
  });

  const { t } = useLocale();
+  const updateLocationsMutation = trpc.viewer.eventTypes.bulkUpdateToDefaultLocation.useMutation({
+    onSuccess: () => {
+      utils.viewer.getUsersDefaultConferencingApp.invalidate();
+      setBulkUpdateModal(false);
+    },
+  });
  return (
    <>
      <List className={listClassName}>
@@ -173,7 +179,12 @@ export const AppList = ({ data, handleDisconnect, variant, listClassName }: AppL
      )}

      {bulkUpdateModal && (
-        <BulkEditDefaultConferencingModal open={bulkUpdateModal} setOpen={setBulkUpdateModal} />
+        <BulkEditDefaultForEventsModal
+          bulkUpdateFunction={updateLocationsMutation.mutate}
+          open={bulkUpdateModal}
+          setOpen={setBulkUpdateModal}
+          isPending={updateLocationsMutation.isPending}
+        />
      )}
    </>
  );
@@ -162,7 +162,7 @@ function BookingListItem(booking: BookingItemProps) {
  let bookedActions: ActionType[] = [
    {
      id: "cancel",
-      label: isTabRecurring && isRecurring ? t("cancel_all_remaining") : t("cancel"),
+      label: isTabRecurring && isRecurring ? t("cancel_all_remaining") : t("cancel_event"),
      /* When cancelling we need to let the UI and the API know if the intention is to
               cancel all remaining bookings or just that booking instance. */
      href: `/booking/${booking.uid}?cancel=true${
@@ -297,6 +297,8 @@ function BookingListItem(booking: BookingItemProps) {
    },
  ];

+  const showPendingPayment = paymentAppData.enabled && booking.payment.length && !booking.paid;
+
  return (
    <>
      <RescheduleDialog
@@ -463,7 +465,7 @@ function BookingListItem(booking: BookingItemProps) {
                  {booking.eventType.team.name}
                </Badge>
              )}
-              {!!booking?.eventType?.price && !booking.paid && (
+              {showPendingPayment && (
                <Badge className="ltr:mr-2 rtl:ml-2 sm:hidden" variant="orange">
                  {t("pending_payment")}
                </Badge>
@@ -490,8 +492,8 @@ function BookingListItem(booking: BookingItemProps) {
                {title}
                <span> </span>

-                {paymentAppData.enabled && !booking.paid && booking.payment.length && (
-                  <Badge className="me-2 ms-2 hidden sm:inline-flex" variant="orange">
+                {showPendingPayment && (
+                  <Badge className="hidden sm:inline-flex" variant="orange">
                    {t("pending_payment")}
                  </Badge>
                )}
@@ -1,6 +1,7 @@
 import { useRouter } from "next/navigation";
 import { useCallback, useState } from "react";

+import { sdkActionManager } from "@calcom/embed-core/embed-iframe";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import type { RecurringEvent } from "@calcom/types/Calendar";
@@ -23,13 +24,22 @@ type Props = {
  theme: string | null;
  allRemainingBookings: boolean;
  seatReferenceUid?: string;
+  bookingCancelledEventProps: {
+    booking: unknown;
+    organizer: {
+      name: string;
+      email: string;
+      timeZone?: string;
+    };
+    eventType: unknown;
+  };
 };

 export default function CancelBooking(props: Props) {
  const [cancellationReason, setCancellationReason] = useState<string>("");
  const { t } = useLocale();
  const router = useRouter();
-  const { booking, allRemainingBookings, seatReferenceUid } = props;
+  const { booking, allRemainingBookings, seatReferenceUid, bookingCancelledEventProps } = props;
  const [loading, setLoading] = useState(false);
  const telemetry = useTelemetry();
  const [error, setError] = useState<string | null>(booking ? null : t("booking_already_cancelled"));
@@ -97,8 +107,17 @@ export default function CancelBooking(props: Props) {
                    method: "POST",
                  });

+                  const bookingWithCancellationReason = {
+                    ...(bookingCancelledEventProps.booking as object),
+                    cancellationReason,
+                  } as unknown;
+
                  if (res.status >= 200 && res.status < 300) {
                    // tested by apps/web/playwright/booking-pages.e2e.ts
+                    sdkActionManager?.fire("bookingCancelled", {
+                      ...bookingCancelledEventProps,
+                      booking: bookingWithCancellationReason,
+                    });
                    router.refresh();
                  } else {
                    setLoading(false);
@@ -1,6 +1,7 @@
+import { InfoIcon } from "lucide-react";
 import dynamic from "next/dynamic";
 import Link from "next/link";
-import type { EventTypeSetupProps, FormValues } from "pages/event-types/[type]";
+import type { EventTypeSetupProps } from "pages/event-types/[type]";
 import { useEffect, useState } from "react";
 import { Controller, useFormContext } from "react-hook-form";
 import type { z } from "zod";
@@ -14,6 +15,7 @@ import {
  allowDisablingAttendeeConfirmationEmails,
  allowDisablingHostConfirmationEmails,
 } from "@calcom/features/ee/workflows/lib/allowDisablingStandardEmails";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { FormBuilder } from "@calcom/features/form-builder/FormBuilder";
 import type { EditableSchema } from "@calcom/features/form-builder/schema";
 import { BookerLayoutSelector } from "@calcom/features/settings/BookerLayoutSelector";
@@ -26,8 +28,10 @@ import { trpc } from "@calcom/trpc/react";
 import {
  Alert,
  Button,
+  Badge,
  CheckboxField,
  Label,
+  SelectField,
  SettingsToggle,
  showToast,
  Switch,
@@ -52,14 +56,12 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
    formMethods.getValues("useEventTypeDestinationCalendarEmail")
  );
  const [hashedUrl, setHashedUrl] = useState(eventType.hashedLink?.link);
-
  const bookingFields: Prisma.JsonObject = {};

  const workflows = eventType.workflows.map((workflowOnEventType) => workflowOnEventType.workflow);
  const selectedThemeIsDark =
    user?.theme === "dark" ||
    (!user?.theme && typeof document !== "undefined" && document.documentElement.classList.contains("dark"));
-
  formMethods.getValues().bookingFields.forEach(({ name }) => {
    bookingFields[name] = `${name} input`;
  });
@@ -84,6 +86,7 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,

  useEffect(() => {
    !hashedUrl && setHashedUrl(generateHashedLink(formMethods.getValues("users")[0]?.id ?? team?.id));
+    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [formMethods.getValues("users"), hashedUrl, team?.id]);

  const toggleGuests = (enabled: boolean) => {
@@ -101,15 +104,16 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
          };
        }
        return field;
-      })
+      }),
+      { shouldDirty: true }
    );
  };

-  const { shouldLockDisableProps } = useLockedFieldsManager(
-    formMethods.getValues(),
-    t("locked_fields_admin_description"),
-    t("locked_fields_member_description")
-  );
+  const { isChildrenManagedEventType, isManagedEventType, shouldLockDisableProps } = useLockedFieldsManager({
+    eventType,
+    translate: t,
+    formMethods,
+  });
  const eventNamePlaceholder = getEventName({
    ...eventNameObject,
    eventName: formMethods.watch("eventName"),
@@ -117,10 +121,24 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,

  const successRedirectUrlLocked = shouldLockDisableProps("successRedirectUrl");
  const seatsLocked = shouldLockDisableProps("seatsPerTimeSlotEnabled");
+  const requiresBookerEmailVerificationProps = shouldLockDisableProps("requiresBookerEmailVerification");
+  const hideCalendarNotesLocked = shouldLockDisableProps("hideCalendarNotes");
+  const lockTimeZoneToggleOnBookingPageLocked = shouldLockDisableProps("lockTimeZoneToggleOnBookingPage");

  const closeEventNameTip = () => setShowEventNameTip(false);
  const displayDestinationCalendarSelector =
-    !!connectedCalendarsQuery.data?.connectedCalendars.length && !team;
+    !!connectedCalendarsQuery.data?.connectedCalendars.length && (!team || isChildrenManagedEventType);
+
+  const verifiedSecondaryEmails = [
+    {
+      label: user?.email || "",
+      value: -1,
+    },
+    ...(user?.secondaryEmails || [])
+      .filter((secondaryEmail) => !!secondaryEmail.emailVerified)
+      .map((secondaryEmail) => ({ label: secondaryEmail.email, value: secondaryEmail.id })),
+  ];
+  const selectedSecondaryEmailId = formMethods.getValues("secondaryEmailId") || -1;

  return (
    <div className="flex flex-col space-y-4">
@@ -168,6 +186,7 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
              <Button
                color="minimal"
                size="sm"
+                {...(shouldLockDisableProps("eventName").disabled ? { disabled: true } : {})}
                aria-label="edit custom name"
                className="hover:stroke-3 hover:text-emphasis min-w-fit !py-0 px-0 hover:bg-transparent"
                onClick={() => setShowEventNameTip((old) => !old)}>
@@ -179,19 +198,48 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
        {displayDestinationCalendarSelector && (
          <div className="w-full">
            <Switch
-              label={`${t("display_add_to_calendar_organizer")}. ${t("reconnect_calendar_to_use")} `}
+              tooltip={t("reconnect_calendar_to_use")}
+              label={
+                <>
+                  {t("display_add_to_calendar_organizer")}
+                  <InfoIcon className="text-default hover:text-attention hover:bg-attention ms-1 inline h-4 w-4 rounded-md" />
+                </>
+              }
              checked={useEventTypeDestinationCalendarEmail}
              onCheckedChange={(val) => {
                setUseEventTypeDestinationCalendarEmail(val);
-                formMethods.setValue("useEventTypeDestinationCalendarEmail", val);
+                formMethods.setValue("useEventTypeDestinationCalendarEmail", val, { shouldDirty: true });
+                if (val) {
+                  showToast(t("reconnect_calendar_to_use"), "warning");
+                }
              }}
            />
          </div>
        )}
+        {!useEventTypeDestinationCalendarEmail && verifiedSecondaryEmails.length > 0 && (
+          <div className="w-full">
+            <SelectField
+              label={t("send_event_details_to")}
+              placeholder={
+                selectedSecondaryEmailId === -1 && (
+                  <span className="text-default min-w-0 overflow-hidden truncate whitespace-nowrap">
+                    <Badge variant="blue">{t("default")}</Badge> {user?.email || ""}
+                  </span>
+                )
+              }
+              onChange={(option) =>
+                formMethods.setValue("secondaryEmailId", option?.value, { shouldDirty: true })
+              }
+              value={verifiedSecondaryEmails.find(
+                (secondaryEmail) =>
+                  selectedSecondaryEmailId !== -1 && secondaryEmail.value === selectedSecondaryEmailId
+              )}
+              options={verifiedSecondaryEmails}
+            />
+          </div>
+        )}
      </div>
-
      <BookerLayoutSelector fallbackToUserSettings isDark={selectedThemeIsDark} isOuterBorder={true} />
-
      <div className="border-subtle space-y-6 rounded-lg border p-6">
        <FormBuilder
          title={t("booking_questions_title")}
@@ -206,7 +254,6 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
          }}
        />
      </div>
-
      <RequiresConfirmationController
        eventType={eventType}
        seatsEnabled={seatsEnabled}
@@ -214,7 +261,6 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
        requiresConfirmation={requiresConfirmation}
        onRequiresConfirmation={setRequiresConfirmation}
      />
-
      <Controller
        name="requiresBookerEmailVerification"
        render={({ field: { value, onChange } }) => (
@@ -224,14 +270,13 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
            switchContainerClassName="border-subtle rounded-lg border py-6 px-4 sm:px-6"
            title={t("requires_booker_email_verification")}
            data-testid="requires-booker-email-verification"
-            {...shouldLockDisableProps("requiresBookerEmailVerification")}
+            {...requiresBookerEmailVerificationProps}
            description={t("description_requires_booker_email_verification")}
            checked={value}
            onCheckedChange={(e) => onChange(e)}
          />
        )}
      />
-
      <Controller
        name="hideCalendarNotes"
        render={({ field: { value, onChange } }) => (
@@ -239,16 +284,15 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
            labelClassName="text-sm"
            toggleSwitchAtTheEnd={true}
            switchContainerClassName="border-subtle rounded-lg border py-6 px-4 sm:px-6"
-            title={t("disable_notes")}
            data-testid="disable-notes"
-            {...shouldLockDisableProps("hideCalendarNotes")}
+            title={t("disable_notes")}
+            {...hideCalendarNotesLocked}
            description={t("disable_notes_description")}
            checked={value}
            onCheckedChange={(e) => onChange(e)}
          />
        )}
      />
-
      <Controller
        name="successRedirectUrl"
        render={({ field: { value, onChange } }) => (
@@ -295,7 +339,6 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
          </>
        )}
      />
-
      <SettingsToggle
        labelClassName="text-sm"
        toggleSwitchAtTheEnd={true}
@@ -315,52 +358,53 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
            <Info className="ml-1.5 h-4 w-4 cursor-pointer" />
          </a>
        }
-        {...shouldLockDisableProps("hashedLinkCheck")}
+        {...shouldLockDisableProps("hashedLink")}
        description={t("private_link_description", { appName: APP_NAME })}
        checked={hashedLinkVisible}
        onCheckedChange={(e) => {
-          formMethods.setValue("hashedLink", e ? hashedUrl : undefined);
+          formMethods.setValue("hashedLink", e ? hashedUrl : undefined, { shouldDirty: true });
          setHashedLinkVisible(e);
        }}>
-        <div className="border-subtle rounded-b-lg border border-t-0 p-6">
-          {!IS_VISUAL_REGRESSION_TESTING && (
-            <TextField
-              disabled
-              name="hashedLink"
-              label={t("private_link_label")}
-              data-testid="generated-hash-url"
-              labelSrOnly
-              type="text"
-              hint={t("private_link_hint")}
-              defaultValue={placeholderHashedLink}
-              addOnSuffix={
-                <Tooltip
-                  content={
-                    formMethods.getValues("hashedLink") ? t("copy_to_clipboard") : t("enabled_after_update")
-                  }>
-                  <Button
-                    color="minimal"
-                    size="sm"
-                    type="button"
-                    className="hover:stroke-3 hover:text-emphasis min-w-fit !py-0 px-0 hover:bg-transparent"
-                    aria-label="copy link"
-                    onClick={() => {
-                      navigator.clipboard.writeText(placeholderHashedLink);
-                      if (formMethods.getValues("hashedLink")) {
-                        showToast(t("private_link_copied"), "success");
-                      } else {
-                        showToast(t("enabled_after_update_description"), "warning");
-                      }
-                    }}>
-                    <Copy className="h-4 w-4" />
-                  </Button>
-                </Tooltip>
-              }
-            />
-          )}
-        </div>
+        {!isManagedEventType && (
+          <div className="border-subtle rounded-b-lg border border-t-0 p-6">
+            {!IS_VISUAL_REGRESSION_TESTING && (
+              <TextField
+                disabled
+                name="hashedLink"
+                label={t("private_link_label")}
+                data-testid="generated-hash-url"
+                labelSrOnly
+                type="text"
+                hint={t("private_link_hint")}
+                defaultValue={placeholderHashedLink}
+                addOnSuffix={
+                  <Tooltip
+                    content={
+                      formMethods.getValues("hashedLink") ? t("copy_to_clipboard") : t("enabled_after_update")
+                    }>
+                    <Button
+                      color="minimal"
+                      size="sm"
+                      type="button"
+                      className="hover:stroke-3 hover:text-emphasis min-w-fit !py-0 px-0 hover:bg-transparent"
+                      aria-label="copy link"
+                      onClick={() => {
+                        navigator.clipboard.writeText(placeholderHashedLink);
+                        if (formMethods.getValues("hashedLink")) {
+                          showToast(t("private_link_copied"), "success");
+                        } else {
+                          showToast(t("enabled_after_update_description"), "warning");
+                        }
+                      }}>
+                      <Copy className="h-4 w-4" />
+                    </Button>
+                  </Tooltip>
+                }
+              />
+            )}
+          </div>
+        )}
      </SettingsToggle>
-
      <Controller
        name="seatsPerTimeSlotEnabled"
        render={({ field: { value, onChange } }) => (
@@ -383,10 +427,12 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
                // Enabling seats will disable guests and requiring confirmation until fully supported
                if (e) {
                  toggleGuests(false);
-                  formMethods.setValue("requiresConfirmation", false);
+                  formMethods.setValue("requiresConfirmation", false, { shouldDirty: true });
                  setRequiresConfirmation(false);
-                  formMethods.setValue("metadata.multipleDuration", undefined);
-                  formMethods.setValue("seatsPerTimeSlot", eventType.seatsPerTimeSlot ?? 2);
+                  formMethods.setValue("metadata.multipleDuration", undefined, { shouldDirty: true });
+                  formMethods.setValue("seatsPerTimeSlot", eventType.seatsPerTimeSlot ?? 2, {
+                    shouldDirty: true,
+                  });
                } else {
                  formMethods.setValue("seatsPerTimeSlot", null);
                  toggleGuests(true);
@@ -458,7 +504,7 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
            toggleSwitchAtTheEnd={true}
            switchContainerClassName="border-subtle rounded-lg border py-6 px-4 sm:px-6"
            title={t("lock_timezone_toggle_on_booking_page")}
-            {...shouldLockDisableProps("lockTimeZoneToggleOnBookingPage")}
+            {...lockTimeZoneToggleOnBookingPageLocked}
            description={t("description_lock_timezone_toggle_on_booking_page")}
            checked={value}
            onCheckedChange={(e) => onChange(e)}
@@ -506,7 +552,7 @@ export const EventAdvancedTab = ({ eventType, team }: Pick<EventTypeSetupProps,
      {showEventNameTip && (
        <CustomEventTypeModal
          close={closeEventNameTip}
-          setValue={(val: string) => formMethods.setValue("eventName", val)}
+          setValue={(val: string) => formMethods.setValue("eventName", val, { shouldDirty: true })}
          defaultValue={formMethods.getValues("eventName")}
          placeHolder={eventNamePlaceholder}
          event={eventNameObject}
@@ -1,6 +1,6 @@
 import { Trans } from "next-i18next";
 import Link from "next/link";
-import type { EventTypeSetupProps, FormValues } from "pages/event-types/[type]";
+import type { EventTypeSetupProps } from "pages/event-types/[type]";
 import { useFormContext } from "react-hook-form";

 import type { GetAppData, SetAppData } from "@calcom/app-store/EventTypeAppContext";
@@ -8,6 +8,7 @@ import { EventTypeAppCard } from "@calcom/app-store/_components/EventTypeAppCard
 import type { EventTypeAppCardComponentProps } from "@calcom/app-store/types";
 import type { EventTypeAppsList } from "@calcom/app-store/utils";
 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { Button, EmptyScreen, Alert } from "@calcom/ui";
@@ -31,10 +32,14 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
  const allAppsData = formMethods.watch("metadata")?.apps || {};

  const setAllAppsData = (_allAppsData: typeof allAppsData) => {
-    formMethods.setValue("metadata", {
-      ...formMethods.getValues("metadata"),
-      apps: _allAppsData,
-    });
+    formMethods.setValue(
+      "metadata",
+      {
+        ...formMethods.getValues("metadata"),
+        apps: _allAppsData,
+      },
+      { shouldDirty: true }
+    );
  };

  const getAppDataGetter = (appId: EventTypeAppsList): GetAppData => {
@@ -70,11 +75,13 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
    };
  };

-  const { shouldLockDisableProps, isManagedEventType, isChildrenManagedEventType } = useLockedFieldsManager(
+  const { shouldLockDisableProps, isManagedEventType, isChildrenManagedEventType } = useLockedFieldsManager({
    eventType,
-    t("locked_fields_admin_description"),
-    t("locked_fields_member_description")
-  );
+    translate: t,
+    formMethods,
+  });
+  const appsDisableProps = shouldLockDisableProps("apps", { simple: true });
+  const lockedText = appsDisableProps.isLocked ? "locked" : "unlocked";

  const appsWithTeamCredentials = eventTypeApps?.items.filter((app) => app.teams.length) || [];
  const cardsForAppsWithTeams = appsWithTeamCredentials.map((app) => {
@@ -93,7 +100,6 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
          app={app}
          eventType={eventType}
          eventTypeFormMetadata={eventTypeFormMetadata}
-          {...shouldLockDisableProps("apps")}
        />
      );
    }
@@ -117,7 +123,7 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
            }}
            eventType={eventType}
            eventTypeFormMetadata={eventTypeFormMetadata}
-            {...shouldLockDisableProps("apps")}
+            disabled={shouldLockDisableProps("apps").disabled}
          />
        );
      }
@@ -129,12 +135,28 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
    <>
      <div>
        <div className="before:border-0">
-          {isManagedEventType && (
+          {(isManagedEventType || isChildrenManagedEventType) && (
            <Alert
-              severity="neutral"
+              severity={appsDisableProps.isLocked ? "neutral" : "green"}
              className="mb-2"
-              title={t("locked_for_members")}
-              message={t("locked_apps_description")}
+              title={
+                <Trans i18nKey={`${lockedText}_${isManagedEventType ? "for_members" : "by_team_admins"}`}>
+                  {lockedText[0].toUpperCase()}
+                  {lockedText.slice(1)} {isManagedEventType ? "for members" : "by team admins"}
+                </Trans>
+              }
+              actions={<div className="flex h-full items-center">{appsDisableProps.LockedIcon}</div>}
+              message={
+                <Trans
+                  i18nKey={`apps_${lockedText}_${
+                    isManagedEventType ? "for_members" : "by_team_admins"
+                  }_description`}>
+                  {isManagedEventType ? "Members" : "You"}{" "}
+                  {appsDisableProps.isLocked
+                    ? "will be able to see the active apps but will not be able to edit any app settings"
+                    : "will be able to see the active apps and will be able to edit any app settings"}
+                </Trans>
+              }
            />
          )}
          {!isPending && !installedApps?.length ? (
@@ -143,9 +165,9 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
              headline={t("empty_installed_apps_headline")}
              description={t("empty_installed_apps_description")}
              buttonRaw={
-                isChildrenManagedEventType && !isManagedEventType ? (
+                appsDisableProps.disabled ? (
                  <Button StartIcon={Lock} color="secondary" disabled>
-                    {t("locked_by_admin")}
+                    {t("locked_by_team_admin")}
                  </Button>
                ) : (
                  <Button target="_blank" color="secondary" href="/apps">
@@ -170,13 +192,12 @@ export const EventAppsTab = ({ eventType }: { eventType: EventType }) => {
                  app={app}
                  eventType={eventType}
                  eventTypeFormMetadata={eventTypeFormMetadata}
-                  {...shouldLockDisableProps("apps")}
                />
              );
          })}
        </div>
      </div>
-      {!shouldLockDisableProps("apps").disabled && (
+      {!appsDisableProps.disabled && (
        <div className="bg-muted mt-6 rounded-md p-8">
          {!isPending && notInstalledApps?.length ? (
            <>
@@ -1,4 +1,4 @@
-import type { EventTypeSetup, FormValues } from "pages/event-types/[type]";
+import type { EventTypeSetup } from "pages/event-types/[type]";
 import { useState, memo, useEffect } from "react";
 import { Controller, useFormContext } from "react-hook-form";
 import type { OptionProps, SingleValueProps } from "react-select";
@@ -6,6 +6,7 @@ import { components } from "react-select";

 import dayjs from "@calcom/dayjs";
 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
+import type { AvailabilityOption, FormValues } from "@calcom/features/eventtypes/lib/types";
 import classNames from "@calcom/lib/classNames";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { weekdayNames } from "@calcom/lib/weekday";
@@ -17,13 +18,6 @@ import { ExternalLink, Globe } from "@calcom/ui/components/icon";

 import { SelectSkeletonLoader } from "@components/availability/SkeletonLoader";

-export type AvailabilityOption = {
-  label: string;
-  value: number;
-  isDefault: boolean;
-  isManaged?: boolean;
-};
-
 const Option = ({ ...props }: OptionProps<AvailabilityOption>) => {
  const { label, isDefault, isManaged = false } = props.data;
  const { t } = useLocale();
@@ -160,12 +154,10 @@ EventTypeScheduleDetails.displayName = "EventTypeScheduleDetails";

 const EventTypeSchedule = ({ eventType }: { eventType: EventTypeSetup }) => {
  const { t } = useLocale();
-  const { shouldLockIndicator, isManagedEventType, isChildrenManagedEventType } = useLockedFieldsManager(
-    eventType,
-    t("locked_fields_admin_description"),
-    t("locked_fields_member_description")
-  );
-  const { watch, setValue, getValues } = useFormContext<FormValues>();
+  const formMethods = useFormContext<FormValues>();
+  const { shouldLockIndicator, shouldLockDisableProps, isManagedEventType, isChildrenManagedEventType } =
+    useLockedFieldsManager({ eventType, translate: t, formMethods });
+  const { watch, setValue, getValues } = formMethods;
  const watchSchedule = watch("schedule");
  const [options, setOptions] = useState<AvailabilityOption[]>([]);

@@ -230,7 +222,7 @@ const EventTypeSchedule = ({ eventType }: { eventType: EventTypeSetup }) => {
          : option.value === schedules.find((schedule) => schedule.isDefault)?.id
      );

-      setValue("availability", value);
+      setValue("availability", value, { shouldDirty: true });
    },
    [data]
  );
@@ -238,7 +230,7 @@ const EventTypeSchedule = ({ eventType }: { eventType: EventTypeSetup }) => {

  useEffect(() => {
    if (!availabilityValue?.value) return;
-    setValue("schedule", availabilityValue.value);
+    setValue("schedule", availabilityValue.value, { shouldDirty: true });
  }, [availabilityValue, setValue]);

  return (
@@ -246,7 +238,7 @@ const EventTypeSchedule = ({ eventType }: { eventType: EventTypeSetup }) => {
      <div className="border-subtle rounded-t-md border p-6">
        <label htmlFor="availability" className="text-default mb-2 block text-sm font-medium leading-none">
          {t("availability")}
-          {shouldLockIndicator("availability")}
+          {(isManagedEventType || isChildrenManagedEventType) && shouldLockIndicator("availability")}
        </label>
        {isPending && <SelectSkeletonLoader />}
        {!isPending && (
@@ -257,10 +249,11 @@ const EventTypeSchedule = ({ eventType }: { eventType: EventTypeSetup }) => {
                <Select
                  placeholder={t("select")}
                  options={options}
+                  isDisabled={shouldLockDisableProps("availability").disabled}
                  isSearchable={false}
                  onChange={(selected) => {
                    field.onChange(selected?.value || null);
-                    if (selected?.value) setValue("availability", selected);
+                    if (selected?.value) setValue("availability", selected, { shouldDirty: true });
                  }}
                  className="block w-full min-w-0 flex-1 rounded-sm text-sm"
                  value={availabilityValue}
@@ -298,7 +291,7 @@ const UseCommonScheduleSettingsToggle = ({ eventType }: { eventType: EventTypeSe
          onCheckedChange={(checked) => {
            onChange(!checked);
            if (!checked) {
-              setValue("schedule", null);
+              setValue("schedule", null, { shouldDirty: true });
            }
          }}
          title={t("choose_common_schedule_team_event")}
@@ -1,12 +1,14 @@
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import * as RadioGroup from "@radix-ui/react-radio-group";
-import type { FormValues } from "pages/event-types/[type]";
+import type { EventTypeSetupProps } from "pages/event-types/[type]";
 import type { Key } from "react";
 import React, { useEffect, useState } from "react";
 import type { UseFormRegisterReturn } from "react-hook-form";
 import { Controller, useFormContext } from "react-hook-form";
 import type { SingleValue } from "react-select";

+import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { classNames } from "@calcom/lib";
 import type { DurationType } from "@calcom/lib/convertToNewDurationType";
 import convertToNewDurationType from "@calcom/lib/convertToNewDurationType";
@@ -61,7 +63,8 @@ const MinimumBookingNoticeInput = React.forwardRef<
        minimumBookingNoticeDisplayValues.type,
        "minutes",
        minimumBookingNoticeDisplayValues.value
-      )
+      ),
+      { shouldDirty: true }
    );
  }, [minimumBookingNoticeDisplayValues, setValue, passThroughProps.name]);

@@ -107,7 +110,7 @@ const MinimumBookingNoticeInput = React.forwardRef<
  );
 });

-export const EventLimitsTab = () => {
+export const EventLimitsTab = ({ eventType }: Pick<EventTypeSetupProps, "eventType">) => {
  const { t, i18n } = useLocale();
  const formMethods = useFormContext<FormValues>();

@@ -128,6 +131,18 @@ export const EventLimitsTab = () => {

  const watchPeriodType = formMethods.watch("periodType");

+  const { shouldLockIndicator, shouldLockDisableProps } = useLockedFieldsManager({
+    eventType,
+    translate: t,
+    formMethods,
+  });
+
+  const bookingLimitsLocked = shouldLockDisableProps("bookingLimits");
+  const durationLimitsLocked = shouldLockDisableProps("durationLimits");
+  const onlyFirstAvailableSlotLocked = shouldLockDisableProps("onlyShowFirstAvailableSlot");
+  const periodTypeLocked = shouldLockDisableProps("periodType");
+  const offsetStartLockedProps = shouldLockDisableProps("offsetStart");
+
  const optionsPeriod = [
    { value: 0, label: t("business_days") },
    { value: 1, label: t("calendar_days") },
@@ -146,7 +161,10 @@ export const EventLimitsTab = () => {
      <div className="border-subtle space-y-6 rounded-lg border p-6">
        <div className="flex flex-col space-y-4 lg:flex-row lg:space-x-4 lg:space-y-0">
          <div className="w-full">
-            <Label htmlFor="beforeEventBuffer">{t("before_event")}</Label>
+            <Label htmlFor="beforeBufferTime">
+              {t("before_event")}
+              {shouldLockIndicator("beforeBufferTime")}
+            </Label>
            <Controller
              name="beforeEventBuffer"
              render={({ field: { onChange, value } }) => {
@@ -166,6 +184,7 @@ export const EventLimitsTab = () => {
                    onChange={(val) => {
                      if (val) onChange(val.value);
                    }}
+                    isDisabled={shouldLockDisableProps("beforeBufferTime").disabled}
                    defaultValue={
                      beforeBufferOptions.find((option) => option.value === value) || beforeBufferOptions[0]
                    }
@@ -176,7 +195,10 @@ export const EventLimitsTab = () => {
            />
          </div>
          <div className="w-full">
-            <Label htmlFor="afterEventBuffer">{t("after_event")}</Label>
+            <Label htmlFor="afterBufferTime">
+              {t("after_event")}
+              {shouldLockIndicator("afterBufferTime")}
+            </Label>
            <Controller
              name="afterEventBuffer"
              render={({ field: { onChange, value } }) => {
@@ -196,6 +218,7 @@ export const EventLimitsTab = () => {
                    onChange={(val) => {
                      if (val) onChange(val.value);
                    }}
+                    isDisabled={shouldLockDisableProps("afterBufferTime").disabled}
                    defaultValue={
                      afterBufferOptions.find((option) => option.value === value) || afterBufferOptions[0]
                    }
@@ -208,11 +231,20 @@ export const EventLimitsTab = () => {
        </div>
        <div className="flex flex-col space-y-4 lg:flex-row lg:space-x-4 lg:space-y-0">
          <div className="w-full">
-            <Label htmlFor="minimumBookingNotice">{t("minimum_booking_notice")}</Label>
-            <MinimumBookingNoticeInput {...formMethods.register("minimumBookingNotice")} />
+            <Label htmlFor="minimumBookingNotice">
+              {t("minimum_booking_notice")}
+              {shouldLockIndicator("minimumBookingNotice")}
+            </Label>
+            <MinimumBookingNoticeInput
+              disabled={shouldLockDisableProps("minimumBookingNotice").disabled}
+              {...formMethods.register("minimumBookingNotice")}
+            />
          </div>
          <div className="w-full">
-            <Label htmlFor="slotInterval">{t("slot_interval")}</Label>
+            <Label htmlFor="slotInterval">
+              {t("slot_interval")}
+              {shouldLockIndicator("slotInterval")}
+            </Label>
            <Controller
              name="slotInterval"
              render={() => {
@@ -229,8 +261,11 @@ export const EventLimitsTab = () => {
                return (
                  <Select
                    isSearchable={false}
+                    isDisabled={shouldLockDisableProps("slotInterval").disabled}
                    onChange={(val) => {
-                      formMethods.setValue("slotInterval", val && (val.value || 0) > 0 ? val.value : null);
+                      formMethods.setValue("slotInterval", val && (val.value || 0) > 0 ? val.value : null, {
+                        shouldDirty: true,
+                      });
                    }}
                    defaultValue={
                      slotIntervalOptions.find(
@@ -254,15 +289,20 @@ export const EventLimitsTab = () => {
              toggleSwitchAtTheEnd={true}
              labelClassName="text-sm"
              title={t("limit_booking_frequency")}
+              {...bookingLimitsLocked}
              description={t("limit_booking_frequency_description")}
              checked={isChecked}
              onCheckedChange={(active) => {
                if (active) {
-                  formMethods.setValue("bookingLimits", {
-                    PER_DAY: 1,
-                  });
+                  formMethods.setValue(
+                    "bookingLimits",
+                    {
+                      PER_DAY: 1,
+                    },
+                    { shouldDirty: true }
+                  );
                } else {
-                  formMethods.setValue("bookingLimits", {});
+                  formMethods.setValue("bookingLimits", {}, { shouldDirty: true });
                }
              }}
              switchContainerClassName={classNames(
@@ -271,7 +311,12 @@ export const EventLimitsTab = () => {
              )}
              childrenClassName="lg:ml-0">
              <div className="border-subtle rounded-b-lg border border-t-0 p-6">
-                <IntervalLimitsManager propertyName="bookingLimits" defaultLimit={1} step={1} />
+                <IntervalLimitsManager
+                  disabled={bookingLimitsLocked.disabled}
+                  propertyName="bookingLimits"
+                  defaultLimit={1}
+                  step={1}
+                />
              </div>
            </SettingsToggle>
          );
@@ -279,7 +324,7 @@ export const EventLimitsTab = () => {
      />
      <Controller
        name="onlyShowFirstAvailableSlot"
-        render={({ field: { value } }) => {
+        render={({ field: { onChange, value } }) => {
          const isChecked = value;
          return (
            <SettingsToggle
@@ -288,8 +333,9 @@ export const EventLimitsTab = () => {
              title={t("limit_booking_only_first_slot")}
              description={t("limit_booking_only_first_slot_description")}
              checked={isChecked}
+              {...onlyFirstAvailableSlotLocked}
              onCheckedChange={(active) => {
-                formMethods.setValue("onlyShowFirstAvailableSlot", active ?? false);
+                onChange(active ?? false);
              }}
              switchContainerClassName={classNames(
                "border-subtle mt-6 rounded-lg border py-6 px-4 sm:px-6",
@@ -301,7 +347,7 @@ export const EventLimitsTab = () => {
      />
      <Controller
        name="durationLimits"
-        render={({ field: { value } }) => {
+        render={({ field: { onChange, value } }) => {
          const isChecked = Object.keys(value ?? {}).length > 0;
          return (
            <SettingsToggle
@@ -314,20 +360,22 @@ export const EventLimitsTab = () => {
              childrenClassName="lg:ml-0"
              title={t("limit_total_booking_duration")}
              description={t("limit_total_booking_duration_description")}
+              {...durationLimitsLocked}
              checked={isChecked}
              onCheckedChange={(active) => {
                if (active) {
-                  formMethods.setValue("durationLimits", {
+                  onChange({
                    PER_DAY: 60,
                  });
                } else {
-                  formMethods.setValue("durationLimits", {});
+                  onChange({});
                }
              }}>
              <div className="border-subtle rounded-b-lg border border-t-0 p-6">
                <IntervalLimitsManager
                  propertyName="durationLimits"
                  defaultLimit={60}
+                  disabled={durationLimitsLocked.disabled}
                  step={15}
                  textFieldSuffix={t("minutes")}
                />
@@ -338,7 +386,7 @@ export const EventLimitsTab = () => {
      />
      <Controller
        name="periodType"
-        render={({ field: { value } }) => {
+        render={({ field: { onChange, value } }) => {
          const isChecked = value && value !== "UNLIMITED";

          return (
@@ -352,13 +400,23 @@ export const EventLimitsTab = () => {
              childrenClassName="lg:ml-0"
              title={t("limit_future_bookings")}
              description={t("limit_future_bookings_description")}
+              {...periodTypeLocked}
              checked={isChecked}
-              onCheckedChange={(bool) => formMethods.setValue("periodType", bool ? "ROLLING" : "UNLIMITED")}>
+              onCheckedChange={(bool) => {
+                if (bool && !formMethods.getValues("periodDays")) {
+                  formMethods.setValue("periodDays", 30, { shouldDirty: true });
+                }
+                return onChange(bool ? "ROLLING" : "UNLIMITED");
+              }}>
              <div className="border-subtle rounded-b-lg border border-t-0 p-6">
                <RadioGroup.Root
                  value={watchPeriodType}
-                  onValueChange={(val) => formMethods.setValue("periodType", val as PeriodType)}>
-                  {PERIOD_TYPES.map((period) => {
+                  onValueChange={(val) =>
+                    formMethods.setValue("periodType", val as PeriodType, { shouldDirty: true })
+                  }>
+                  {PERIOD_TYPES.filter((opt) =>
+                    periodTypeLocked.disabled ? watchPeriodType === opt.type : true
+                  ).map((period) => {
                    if (period.type === "UNLIMITED") return null;
                    return (
                      <div
@@ -367,12 +425,14 @@ export const EventLimitsTab = () => {
                          watchPeriodType === "UNLIMITED" && "pointer-events-none opacity-30"
                        )}
                        key={period.type}>
-                        <RadioGroup.Item
-                          id={period.type}
-                          value={period.type}
-                          className="min-w-4 bg-default border-default flex h-4 w-4 cursor-pointer items-center rounded-full border focus:border-2 focus:outline-none ltr:mr-2 rtl:ml-2">
-                          <RadioGroup.Indicator className="after:bg-inverted relative flex h-4 w-4 items-center justify-center after:block after:h-2 after:w-2 after:rounded-full" />
-                        </RadioGroup.Item>
+                        {!periodTypeLocked.disabled && (
+                          <RadioGroup.Item
+                            id={period.type}
+                            value={period.type}
+                            className="min-w-4 bg-default border-default flex h-4 w-4 cursor-pointer items-center rounded-full border focus:border-2 focus:outline-none ltr:mr-2 rtl:ml-2">
+                            <RadioGroup.Indicator className="after:bg-inverted relative flex h-4 w-4 items-center justify-center after:block after:h-2 after:w-2 after:rounded-full" />
+                          </RadioGroup.Item>
+                        )}

                        {period.prefix ? <span>{period.prefix}&nbsp;</span> : null}
                        {period.type === "ROLLING" && (
@@ -382,23 +442,29 @@ export const EventLimitsTab = () => {
                              type="number"
                              className="border-default my-0 block w-16 text-sm [appearance:textfield] ltr:mr-2 rtl:ml-2"
                              placeholder="30"
+                              disabled={periodTypeLocked.disabled}
                              {...formMethods.register("periodDays", { valueAsNumber: true })}
                            />
                            <Select
                              options={optionsPeriod}
                              isSearchable={false}
-                              onChange={(opt) =>
-                                formMethods.setValue("periodCountCalendarDays", opt?.value === 1 ? "1" : "0")
-                              }
+                              isDisabled={periodTypeLocked.disabled}
+                              onChange={(opt) => {
+                                formMethods.setValue(
+                                  "periodCountCalendarDays",
+                                  opt?.value === 1 ? true : false,
+                                  { shouldDirty: true }
+                                );
+                              }}
                              name="periodCoundCalendarDays"
                              value={optionsPeriod.find((opt) => {
                                opt.value ===
-                                  (formMethods.getValues("periodCountCalendarDays") === "1" ? 1 : 0);
+                                  (formMethods.getValues("periodCountCalendarDays") === true ? 1 : 0);
                              })}
                              defaultValue={optionsPeriod.find(
                                (opt) =>
                                  opt.value ===
-                                  (formMethods.getValues("periodCountCalendarDays") === "1" ? 1 : 0)
+                                  (formMethods.getValues("periodCountCalendarDays") === true ? 1 : 0)
                              )}
                            />
                          </div>
@@ -407,12 +473,13 @@ export const EventLimitsTab = () => {
                          <div className="me-2 ms-2 inline-flex space-x-2 rtl:space-x-reverse">
                            <Controller
                              name="periodDates"
-                              render={() => (
+                              render={({ field: { onChange } }) => (
                                <DateRangePicker
                                  startDate={formMethods.getValues("periodDates").startDate}
                                  endDate={formMethods.getValues("periodDates").endDate}
+                                  disabled={periodTypeLocked.disabled}
                                  onDatesChange={({ startDate, endDate }) => {
-                                    formMethods.setValue("periodDates", {
+                                    onChange({
                                      startDate,
                                      endDate,
                                    });
@@ -442,11 +509,12 @@ export const EventLimitsTab = () => {
        childrenClassName="lg:ml-0"
        title={t("offset_toggle")}
        description={t("offset_toggle_description")}
+        {...offsetStartLockedProps}
        checked={offsetToggle}
        onCheckedChange={(active) => {
          setOffsetToggle(active);
          if (!active) {
-            formMethods.setValue("offsetStart", 0);
+            formMethods.setValue("offsetStart", 0, { shouldDirty: true });
          }
        }}>
        <div className="border-subtle rounded-b-lg border border-t-0 p-6">
@@ -577,11 +645,16 @@ const IntervalLimitsManager = <K extends "durationLimits" | "bookingLimits">({
          );
          if (!rest || !currentKeys.length) return;
          //currentDurationLimits is always defined so can be casted
-          // @ts-expect-error FIXME Fix these typings
-          setValue(propertyName, {
-            ...watchIntervalLimits,
-            [rest.value]: defaultLimit,
-          });
+
+          setValue(
+            propertyName,
+            // @ts-expect-error FIXME Fix these typings
+            {
+              ...watchIntervalLimits,
+              [rest.value]: defaultLimit,
+            },
+            { shouldDirty: true }
+          );
        };

        return (
@@ -611,7 +684,7 @@ const IntervalLimitsManager = <K extends "durationLimits" | "bookingLimits">({
                      )}
                      onLimitChange={(intervalLimitKey, val) =>
                        // @ts-expect-error FIXME Fix these typings
-                        setValue(`${propertyName}.${intervalLimitKey}`, val)
+                        setValue(`${propertyName}.${intervalLimitKey}`, val, { shouldDirty: true })
                      }
                      onDelete={(intervalLimitKey) => {
                        const current = currentIntervalLimits;
@@ -2,7 +2,7 @@ import { useAutoAnimate } from "@formkit/auto-animate/react";
 import { ErrorMessage } from "@hookform/error-message";
 import { Trans } from "next-i18next";
 import Link from "next/link";
-import type { EventTypeSetupProps, FormValues } from "pages/event-types/[type]";
+import type { EventTypeSetupProps } from "pages/event-types/[type]";
 import { useEffect, useState } from "react";
 import { Controller, useFormContext, useFieldArray } from "react-hook-form";
 import type { MultiValue } from "react-select";
@@ -11,6 +11,7 @@ import type { EventLocationType } from "@calcom/app-store/locations";
 import { getEventLocationType, MeetLocationType } from "@calcom/app-store/locations";
 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
 import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { md } from "@calcom/lib/markdownIt";
@@ -83,7 +84,7 @@ const DescriptionEditor = ({ isEditable }: { isEditable: boolean }) => {
  return mounted ? (
    <Editor
      getText={() => md.render(formMethods.getValues("description") || "")}
-      setText={(value: string) => formMethods.setValue("description", turndown(value))}
+      setText={(value: string) => formMethods.setValue("description", turndown(value), { shouldDirty: true })}
      excludedToolbarItems={["blockType"]}
      placeholder={t("quick_video_meeting")}
      editable={isEditable}
@@ -142,12 +143,7 @@ export const EventSetupTab = (
  );

  const { isChildrenManagedEventType, isManagedEventType, shouldLockIndicator, shouldLockDisableProps } =
-    useLockedFieldsManager(
-      formMethods.getValues(),
-      t("locked_fields_admin_description"),
-      t("locked_fields_member_description")
-    );
-
+    useLockedFieldsManager({ eventType, translate: t, formMethods });
  const Locations = () => {
    const { t } = useLocale();
    const {
@@ -183,7 +179,6 @@ export const EventSetupTab = (
      index: number;
    }) => {
      const { eventLocationType, index, ...remainingProps } = props;
-
      if (eventLocationType?.organizerInputType === "text") {
        const { defaultValue, ...rest } = remainingProps;

@@ -200,6 +195,7 @@ export const EventSetupTab = (
                  required
                  onChange={onChange}
                  value={value}
+                  {...(shouldLockDisableProps("locations").disabled ? { disabled: true } : {})}
                  className="my-0"
                  {...rest}
                />
@@ -218,6 +214,7 @@ export const EventSetupTab = (
              return (
                <PhoneInput
                  required
+                  disabled={shouldLockDisableProps("locations").disabled}
                  placeholder={t(eventLocationType.organizerInputPlaceholder || "")}
                  name={`locations[${index}].${eventLocationType.defaultValueVariable}`}
                  value={value}
@@ -233,7 +230,10 @@ export const EventSetupTab = (
    };

    const [showEmptyLocationSelect, setShowEmptyLocationSelect] = useState(false);
-    const [selectedNewOption, setSelectedNewOption] = useState<SingleValueLocationOption | null>(null);
+    const defaultInitialLocation = defaultValue || null;
+    const [selectedNewOption, setSelectedNewOption] = useState<SingleValueLocationOption | null>(
+      defaultInitialLocation
+    );

    return (
      <div className="w-full">
@@ -288,16 +288,18 @@ export const EventSetupTab = (
                      }
                    }}
                  />
-                  <button
-                    data-testid={`delete-locations.${index}.type`}
-                    className="min-h-9 block h-9 px-2"
-                    type="button"
-                    onClick={() => remove(index)}
-                    aria-label={t("remove")}>
-                    <div className="h-4 w-4">
-                      <X className="border-l-1 hover:text-emphasis text-subtle h-4 w-4" />
-                    </div>
-                  </button>
+                  {!(shouldLockDisableProps("locations").disabled && isChildrenManagedEventType) && (
+                    <button
+                      data-testid={`delete-locations.${index}.type`}
+                      className="min-h-9 block h-9 px-2"
+                      type="button"
+                      onClick={() => remove(index)}
+                      aria-label={t("remove")}>
+                      <div className="h-4 w-4">
+                        <X className="border-l-1 hover:text-emphasis text-subtle h-4 w-4" />
+                      </div>
+                    </button>
+                  )}
                </div>

                {eventLocationType?.organizerInputType && (
@@ -318,7 +320,7 @@ export const EventSetupTab = (
                        />
                      </div>
                      <ErrorMessage
-                        errors={formMethods.formState.errors.locations?.[index]}
+                        errors={formMethods.formState.errors?.locations?.[index]}
                        name={eventLocationType.defaultValueVariable}
                        className="text-error my-1 ml-6 text-sm"
                        as="div"
@@ -329,6 +331,7 @@ export const EventSetupTab = (
                      <CheckboxField
                        name={`locations[${index}].displayLocationPublicly`}
                        data-testid="display-location"
+                        disabled={shouldLockDisableProps("locations").disabled}
                        defaultChecked={defaultLocation?.displayLocationPublicly}
                        description={t("display_location_label")}
                        onChange={(e) => {
@@ -417,7 +420,8 @@ export const EventSetupTab = (
              </a>
            </p>
          )}
-          {validLocations.length > 0 && !isManagedEventType && !isChildrenManagedEventType && (
+          {validLocations.length > 0 && !shouldLockDisableProps("locations").disabled && (
+            //  && !isChildrenManagedEventType : Add this to hide add-location button only when location is disabled by Admin
            <li>
              <Button
                data-testid="add-location"
@@ -444,7 +448,8 @@ export const EventSetupTab = (

  const lengthLockedProps = shouldLockDisableProps("length");
  const descriptionLockedProps = shouldLockDisableProps("description");
-
+  const urlLockedProps = shouldLockDisableProps("slug");
+  const titleLockedProps = shouldLockDisableProps("title");
  const urlPrefix = orgBranding
    ? orgBranding?.fullDomain.replace(/^(https?:|)\/\//, "")
    : `${WEBSITE_URL?.replace(/^(https?:|)\/\//, "")}`;
@@ -456,20 +461,22 @@ export const EventSetupTab = (
          <TextField
            required
            label={t("title")}
-            {...shouldLockDisableProps("title")}
+            {...(isManagedEventType || isChildrenManagedEventType ? titleLockedProps : {})}
+            defaultValue={eventType.title}
            {...formMethods.register("title")}
          />
          <div>
-            <Label>
+            <Label htmlFor="editor">
              {t("description")}
-              {shouldLockIndicator("description")}
+              {(isManagedEventType || isChildrenManagedEventType) && shouldLockIndicator("description")}
            </Label>
            <DescriptionEditor isEditable={!descriptionLockedProps.disabled} />
          </div>
          <TextField
            required
            label={t("URL")}
-            {...shouldLockDisableProps("slug")}
+            {...(isManagedEventType || isChildrenManagedEventType ? urlLockedProps : {})}
+            defaultValue={eventType.slug}
            addOnLeading={
              <>
                {urlPrefix}/
@@ -498,6 +505,7 @@ export const EventSetupTab = (
                  defaultValue={selectedMultipleDuration}
                  name="metadata.multipleDuration"
                  isSearchable={false}
+                  isDisabled={lengthLockedProps.disabled}
                  className="h-auto !min-h-[36px] text-sm"
                  options={multipleDurationOptions}
                  value={selectedMultipleDuration}
@@ -512,16 +520,16 @@ export const EventSetupTab = (
                    if (!newOptions.find((opt) => opt.value === defaultDuration?.value)) {
                      if (newOptions.length > 0) {
                        setDefaultDuration(newOptions[0]);
-                        formMethods.setValue("length", newOptions[0].value);
+                        formMethods.setValue("length", newOptions[0].value, { shouldDirty: true });
                      } else {
                        setDefaultDuration(null);
                      }
                    }
                    if (newOptions.length === 1 && defaultDuration === null) {
                      setDefaultDuration(newOptions[0]);
-                      formMethods.setValue("length", newOptions[0].value);
+                      formMethods.setValue("length", newOptions[0].value, { shouldDirty: true });
                    }
-                    formMethods.setValue("metadata.multipleDuration", values);
+                    formMethods.setValue("metadata.multipleDuration", values, { shouldDirty: true });
                  }}
                />
              </div>
@@ -542,7 +550,7 @@ export const EventSetupTab = (
                    setDefaultDuration(
                      selectedMultipleDuration.find((opt) => opt.value === option?.value) ?? null
                    );
-                    if (option) formMethods.setValue("length", option.value);
+                    if (option) formMethods.setValue("length", option.value, { shouldDirty: true });
                  }}
                />
              </div>
@@ -551,7 +559,8 @@ export const EventSetupTab = (
            <TextField
              required
              type="number"
-              {...lengthLockedProps}
+              data-testid="duration"
+              {...(isManagedEventType || isChildrenManagedEventType ? lengthLockedProps : {})}
              label={t("duration")}
              defaultValue={formMethods.getValues("length") ?? 15}
              {...formMethods.register("length")}
@@ -571,27 +580,32 @@ export const EventSetupTab = (
                    setMultipleDuration(undefined);
                    setSelectedMultipleDuration([]);
                    setDefaultDuration(null);
-                    formMethods.setValue("metadata.multipleDuration", undefined);
-                    formMethods.setValue("length", eventType.length);
+                    formMethods.setValue("metadata.multipleDuration", undefined, { shouldDirty: true });
+                    formMethods.setValue("length", eventType.length, { shouldDirty: true });
                  } else {
                    setMultipleDuration([]);
-                    formMethods.setValue("metadata.multipleDuration", []);
-                    formMethods.setValue("length", 0);
+                    formMethods.setValue("metadata.multipleDuration", [], { shouldDirty: true });
+                    formMethods.setValue("length", 0, { shouldDirty: true });
                  }
                }}
              />
            </div>
          )}
        </div>
-
        <div className="border-subtle rounded-lg border p-6">
          <div>
-            <Skeleton as={Label} loadingClassName="w-16">
+            <Skeleton as={Label} loadingClassName="w-16" htmlFor="locations">
              {t("location")}
+              {/*improve shouldLockIndicator function to also accept eventType and then conditionally render
+              based on Managed Event type or not.*/}
              {shouldLockIndicator("locations")}
            </Skeleton>
-
-            <Controller name="locations" render={() => <Locations />} />
+            <Controller
+              name="locations"
+              control={formMethods.control}
+              defaultValue={eventType.locations || []}
+              render={() => <Locations />}
+            />
          </div>
        </div>
      </div>
@@ -1,6 +1,6 @@
 import { Trans } from "next-i18next";
 import Link from "next/link";
-import type { EventTypeSetupProps, FormValues, Host } from "pages/event-types/[type]";
+import type { EventTypeSetupProps, Host } from "pages/event-types/[type]";
 import { useEffect, useRef, useState } from "react";
 import type { ComponentProps, Dispatch, SetStateAction } from "react";
 import { Controller, useFormContext, useWatch } from "react-hook-form";
@@ -9,6 +9,7 @@ import type { Options } from "react-select";
 import type { CheckedSelectOption } from "@calcom/features/eventtypes/components/CheckedTeamSelect";
 import CheckedTeamSelect from "@calcom/features/eventtypes/components/CheckedTeamSelect";
 import ChildrenEventTypeSelect from "@calcom/features/eventtypes/components/ChildrenEventTypeSelect";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { SchedulingType } from "@calcom/prisma/enums";
 import { Label, Select, SettingsToggle } from "@calcom/ui";
@@ -127,7 +128,7 @@ const AssignAllTeamMembers = ({
          labelClassName="mt-0.5 font-normal"
          checked={assignAllTeamMembers}
          onCheckedChange={(active) => {
-            setValue("assignAllTeamMembers", active);
+            setValue("assignAllTeamMembers", active, { shouldDirty: true });
            setAssignAllTeamMembers(active);
            if (active) {
              onActive();
@@ -250,7 +251,8 @@ const FixedHosts = ({
                    isFixed: true,
                    userId: parseInt(teamMember.value, 10),
                    priority: 2,
-                  }))
+                  })),
+                  { shouldDirty: true }
                )
              }
            />
@@ -269,7 +271,7 @@ const FixedHosts = ({
              const rrHosts = getValues("hosts")
                .filter((host) => !host.isFixed)
                .sort((a, b) => (b.priority ?? 2) - (a.priority ?? 2));
-              setValue("hosts", rrHosts);
+              setValue("hosts", rrHosts, { shouldDirty: true });
            }
            setIsDisabled(checked);
          }}
@@ -290,7 +292,8 @@ const FixedHosts = ({
                    isFixed: true,
                    userId: parseInt(teamMember.value, 10),
                    priority: 2,
-                  }))
+                  })),
+                  { shouldDirty: true }
                )
              }
            />
@@ -332,7 +335,7 @@ const AddMembersWithSwitch = ({
              assignAllTeamMembers={assignAllTeamMembers}
              setAssignAllTeamMembers={setAssignAllTeamMembers}
              onActive={onActive}
-              onInactive={() => setValue("hosts", [])}
+              onInactive={() => setValue("hosts", [], { shouldDirty: true })}
            />
          </div>
        ) : (
@@ -395,7 +398,8 @@ const RoundRobinHosts = ({
                  userId: parseInt(teamMember.value, 10),
                  priority: 2,
                }))
-                .sort((a, b) => b.priority - a.priority)
+                .sort((a, b) => b.priority - a.priority),
+              { shouldDirty: true }
            )
          }
        />
@@ -420,7 +424,7 @@ const ChildrenEventTypes = ({
        <AssignAllTeamMembers
          assignAllTeamMembers={assignAllTeamMembers}
          setAssignAllTeamMembers={setAssignAllTeamMembers}
-          onActive={() => setValue("children", childrenEventTypeOptions)}
+          onActive={() => setValue("children", childrenEventTypeOptions, { shouldDirty: true })}
        />
        {!assignAllTeamMembers ? (
          <Controller<FormValues>
@@ -449,7 +453,7 @@ const Hosts = ({
  const { t } = useLocale();
  const {
    control,
-    resetField,
+    setValue,
    getValues,
    formState: { submitCount },
  } = useFormContext<FormValues>();
@@ -469,10 +473,12 @@ const Hosts = ({
      initialValue.current = { hosts: getValues("hosts"), schedulingType, submitCount };
      return;
    }
-    resetField("hosts", {
-      defaultValue: initialValue.current.schedulingType === schedulingType ? initialValue.current.hosts : [],
-    });
-  }, [schedulingType, resetField, getValues, submitCount]);
+    setValue(
+      "hosts",
+      initialValue.current.schedulingType === schedulingType ? initialValue.current.hosts : [],
+      { shouldDirty: true }
+    );
+  }, [schedulingType, setValue, getValues, submitCount]);

  return (
    <Controller<FormValues>
@@ -586,7 +592,7 @@ export const EventTeamTab = ({
                    className="w-full"
                    onChange={(val) => {
                      onChange(val?.value);
-                      setValue("assignAllTeamMembers", false);
+                      setValue("assignAllTeamMembers", false, { shouldDirty: true });
                      setAssignAllTeamMembers(false);
                    }}
                  />
@@ -2,18 +2,20 @@ import { Webhook as TbWebhook } from "lucide-react";
 import type { TFunction } from "next-i18next";
 import { Trans } from "next-i18next";
 import { useRouter } from "next/navigation";
-import type { EventTypeSetupProps, FormValues } from "pages/event-types/[type]";
+import type { EventTypeSetupProps } from "pages/event-types/[type]";
 import { useMemo, useState, Suspense } from "react";
 import type { UseFormReturn } from "react-hook-form";

 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
 import { EventTypeEmbedButton, EventTypeEmbedDialog } from "@calcom/features/embed/EventTypeEmbed";
+import type { FormValues, AvailabilityOption } from "@calcom/features/eventtypes/lib/types";
 import Shell from "@calcom/features/shell/Shell";
 import { classNames } from "@calcom/lib";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { HttpError } from "@calcom/lib/http-error";
 import { SchedulingType } from "@calcom/prisma/enums";
 import { trpc, TRPCClientError } from "@calcom/trpc/react";
+import type { DialogProps } from "@calcom/ui";
 import {
  Button,
  ButtonGroup,
@@ -51,8 +53,6 @@ import {
  Loader,
 } from "@calcom/ui/components/icon";

-import type { AvailabilityOption } from "@components/eventtype/EventAvailabilityTab";
-
 type Props = {
  children: React.ReactNode;
  eventType: EventTypeSetupProps["eventType"];
@@ -133,6 +133,60 @@ function getNavigation({
  ];
 }

+function DeleteDialog({
+  isManagedEvent,
+  eventTypeId,
+  open,
+  onOpenChange,
+}: { isManagedEvent: string; eventTypeId: number } & Pick<DialogProps, "open" | "onOpenChange">) {
+  const utils = trpc.useContext();
+  const { t } = useLocale();
+  const router = useRouter();
+  const deleteMutation = trpc.viewer.eventTypes.delete.useMutation({
+    onSuccess: async () => {
+      await utils.viewer.eventTypes.invalidate();
+      showToast(t("event_type_deleted_successfully"), "success");
+      router.push("/event-types");
+      onOpenChange?.(false);
+    },
+    onError: (err) => {
+      if (err instanceof HttpError) {
+        const message = `${err.statusCode}: ${err.message}`;
+        showToast(message, "error");
+        onOpenChange?.(false);
+      } else if (err instanceof TRPCClientError) {
+        showToast(err.message, "error");
+      }
+    },
+  });
+
+  return (
+    <Dialog open={open} onOpenChange={onOpenChange}>
+      <ConfirmationDialogContent
+        isPending={deleteMutation.isPending}
+        variety="danger"
+        title={t(`delete${isManagedEvent}_event_type`)}
+        confirmBtnText={t(`confirm_delete_event_type`)}
+        loadingText={t(`confirm_delete_event_type`)}
+        onConfirm={(e) => {
+          e.preventDefault();
+          deleteMutation.mutate({ id: eventTypeId });
+        }}>
+        <p className="mt-5">
+          <Trans
+            i18nKey={`delete${isManagedEvent}_event_type_description`}
+            components={{ li: <li />, ul: <ul className="ml-4 list-disc" /> }}>
+            <ul>
+              <li>Members assigned to this event type will also have their event types deleted.</li>
+              <li>Anyone who they&apos;ve shared their link with will no longer be able to book using it.</li>
+            </ul>
+          </Trans>
+        </p>
+      </ConfirmationDialogContent>
+    </Dialog>
+  );
+}
+
 function EventTypeSingleLayout({
  children,
  eventType,
@@ -149,9 +203,8 @@ function EventTypeSingleLayout({
  bookerUrl,
  activeWebhooksNumber,
 }: Props) {
-  const utils = trpc.useContext();
  const { t } = useLocale();
-  const router = useRouter();
+
  const [deleteDialogOpen, setDeleteDialogOpen] = useState(false);

  const hasPermsToDelete =
@@ -160,30 +213,12 @@ function EventTypeSingleLayout({
    formMethods.getValues("schedulingType") === SchedulingType.MANAGED ||
    isUserOrganizationAdmin;

-  const deleteMutation = trpc.viewer.eventTypes.delete.useMutation({
-    onSuccess: async () => {
-      await utils.viewer.eventTypes.invalidate();
-      showToast(t("event_type_deleted_successfully"), "success");
-      router.push("/event-types");
-      setDeleteDialogOpen(false);
-    },
-    onError: (err) => {
-      if (err instanceof HttpError) {
-        const message = `${err.statusCode}: ${err.message}`;
-        showToast(message, "error");
-        setDeleteDialogOpen(false);
-      } else if (err instanceof TRPCClientError) {
-        showToast(err.message, "error");
-      }
-    },
+  const { isManagedEventType, isChildrenManagedEventType } = useLockedFieldsManager({
+    eventType,
+    translate: t,
+    formMethods,
  });

-  const { isManagedEventType, isChildrenManagedEventType } = useLockedFieldsManager(
-    formMethods.getValues(),
-    t("locked_fields_admin_description"),
-    t("locked_fields_member_description")
-  );
-
  const length = formMethods.watch("length");
  const multipleDuration = formMethods.watch("metadata")?.multipleDuration;

@@ -308,7 +343,7 @@ function EventTypeSingleLayout({
                      id="hiddenSwitch"
                      checked={!formMethods.watch("hidden")}
                      onCheckedChange={(e) => {
-                        formMethods.setValue("hidden", !e);
+                        formMethods.setValue("hidden", !e, { shouldDirty: true });
                      }}
                    />
                  </div>
@@ -424,7 +459,7 @@ function EventTypeSingleLayout({
                  id="hiddenSwitch"
                  checked={!formMethods.watch("hidden")}
                  onCheckedChange={(e) => {
-                    formMethods.setValue("hidden", !e);
+                    formMethods.setValue("hidden", !e, { shouldDirty: true });
                  }}
                />
              </div>
@@ -435,6 +470,7 @@ function EventTypeSingleLayout({
            className="ml-4 lg:ml-0"
            type="submit"
            loading={isUpdateMutationLoading}
+            disabled={!formMethods.formState.isDirty}
            data-testid="update-eventtype"
            form="event-type-form">
            {t("save")}
@@ -467,31 +503,13 @@ function EventTypeSingleLayout({
          </div>
        </div>
      </Suspense>
-      <Dialog open={deleteDialogOpen} onOpenChange={setDeleteDialogOpen}>
-        <ConfirmationDialogContent
-          isPending={deleteMutation.isPending}
-          variety="danger"
-          title={t(`delete${isManagedEvent}_event_type`)}
-          confirmBtnText={t(`confirm_delete_event_type`)}
-          loadingText={t(`confirm_delete_event_type`)}
-          onConfirm={(e) => {
-            e.preventDefault();
-            deleteMutation.mutate({ id: formMethods.getValues("id") });
-          }}>
-          <p className="mt-5">
-            <Trans
-              i18nKey={`delete${isManagedEvent}_event_type_description`}
-              components={{ li: <li />, ul: <ul className="ml-4 list-disc" /> }}>
-              <ul>
-                <li>Members assigned to this event type will also have their event types deleted.</li>
-                <li>
-                  Anyone who they&apos;ve shared their link with will no longer be able to book using it.
-                </li>
-              </ul>
-            </Trans>
-          </p>
-        </ConfirmationDialogContent>
-      </Dialog>
+      <DeleteDialog
+        eventTypeId={eventType.id}
+        isManagedEvent={isManagedEvent}
+        open={deleteDialogOpen}
+        onOpenChange={setDeleteDialogOpen}
+      />
+
      <EventTypeEmbedDialog />
    </Shell>
  );
@@ -4,8 +4,10 @@ import { Trans } from "next-i18next";
 import Link from "next/link";
 import type { EventTypeSetupProps } from "pages/event-types/[type]";
 import { useState } from "react";
+import { useFormContext } from "react-hook-form";

 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { WebhookForm } from "@calcom/features/webhooks/components";
 import type { WebhookFormSubmitData } from "@calcom/features/webhooks/components/WebhookForm";
 import WebhookListItem from "@calcom/features/webhooks/components/WebhookListItem";
@@ -20,6 +22,7 @@ export const EventWebhooksTab = ({ eventType }: Pick<EventTypeSetupProps, "event
  const { t } = useLocale();

  const utils = trpc.useContext();
+  const formMethods = useFormContext<FormValues>();

  const { data: webhooks } = trpc.viewer.webhook.list.useQuery({ eventTypeId: eventType.id });

@@ -96,11 +99,11 @@ export const EventWebhooksTab = ({ eventType }: Pick<EventTypeSetupProps, "event
    );
  };

-  const { shouldLockDisableProps, isChildrenManagedEventType, isManagedEventType } = useLockedFieldsManager(
+  const { shouldLockDisableProps, isChildrenManagedEventType, isManagedEventType } = useLockedFieldsManager({
    eventType,
-    t("locked_fields_admin_description"),
-    t("locked_fields_member_description")
-  );
+    translate: t,
+    formMethods,
+  });
  const webhookLockedStatus = shouldLockDisableProps("webhooks");

  return (
@@ -163,7 +166,7 @@ export const EventWebhooksTab = ({ eventType }: Pick<EventTypeSetupProps, "event
                    buttonRaw={
                      isChildrenManagedEventType && !isManagedEventType ? (
                        <Button StartIcon={Lock} color="secondary" disabled>
-                          {t("locked_by_admin")}
+                          {t("locked_by_team_admin")}
                        </Button>
                      ) : (
                        <NewWebhookButton />
@@ -1,11 +1,12 @@
 import type { Webhook } from "@prisma/client";
 import { useSession } from "next-auth/react";
-import type { EventTypeSetup, FormValues } from "pages/event-types/[type]";
+import type { EventTypeSetup } from "pages/event-types/[type]";
 import { useState } from "react";
 import { useFormContext } from "react-hook-form";

 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { WebhookForm } from "@calcom/features/webhooks/components";
 import type { WebhookFormSubmitData } from "@calcom/features/webhooks/components/WebhookForm";
 import WebhookListItem from "@calcom/features/webhooks/components/WebhookListItem";
@@ -33,11 +34,7 @@ export default function InstantEventController({
  const [instantEventState, setInstantEventState] = useState<boolean>(eventType?.isInstantEvent ?? false);
  const formMethods = useFormContext<FormValues>();

-  const { shouldLockDisableProps } = useLockedFieldsManager(
-    eventType,
-    t("locked_fields_admin_description"),
-    t("locked_fields_member_description")
-  );
+  const { shouldLockDisableProps } = useLockedFieldsManager({ eventType, translate: t, formMethods });

  const instantLocked = shouldLockDisableProps("isInstantEvent");

@@ -81,10 +78,10 @@ export default function InstantEventController({
                  data-testid="instant-event-check"
                  onCheckedChange={(e) => {
                    if (!e) {
-                      formMethods.setValue("isInstantEvent", false);
+                      formMethods.setValue("isInstantEvent", false, { shouldDirty: true });
                      setInstantEventState(false);
                    } else {
-                      formMethods.setValue("isInstantEvent", true);
+                      formMethods.setValue("isInstantEvent", true, { shouldDirty: true });
                      setInstantEventState(true);
                    }
                  }}>
@@ -104,6 +101,8 @@ export default function InstantEventController({
 const InstantMeetingWebhooks = ({ eventType }: { eventType: EventTypeSetup }) => {
  const { t } = useLocale();
  const utils = trpc.useContext();
+  const formMethods = useFormContext<FormValues>();
+
  const { data: webhooks } = trpc.viewer.webhook.list.useQuery({
    eventTypeId: eventType.id,
    eventTriggers: [WebhookTriggerEvents.INSTANT_MEETING],
@@ -179,11 +178,11 @@ const InstantMeetingWebhooks = ({ eventType }: { eventType: EventTypeSetup }) =>
    );
  };

-  const { shouldLockDisableProps, isChildrenManagedEventType, isManagedEventType } = useLockedFieldsManager(
+  const { shouldLockDisableProps, isChildrenManagedEventType, isManagedEventType } = useLockedFieldsManager({
    eventType,
-    t("locked_fields_admin_description"),
-    t("locked_fields_member_description")
-  );
+    formMethods,
+    translate: t,
+  });
  const webhookLockedStatus = shouldLockDisableProps("webhooks");

  return (
@@ -1,8 +1,9 @@
-import type { EventTypeSetup, FormValues } from "pages/event-types/[type]";
+import type { EventTypeSetup } from "pages/event-types/[type]";
 import { useState } from "react";
 import { useFormContext } from "react-hook-form";

 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { classNames } from "@calcom/lib";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Frequency } from "@calcom/prisma/zod-utils";
@@ -31,11 +32,7 @@ export default function RecurringEventController({
      value: value.toString(),
    }));

-  const { shouldLockDisableProps } = useLockedFieldsManager(
-    eventType,
-    t("locked_fields_admin_description"),
-    t("locked_fields_member_description")
-  );
+  const { shouldLockDisableProps } = useLockedFieldsManager({ eventType, translate: t, formMethods });

  const recurringLocked = shouldLockDisableProps("recurringEvent");

@@ -66,7 +63,7 @@ export default function RecurringEventController({
              data-testid="recurring-event-check"
              onCheckedChange={(e) => {
                if (!e) {
-                  formMethods.setValue("recurringEvent", null);
+                  formMethods.setValue("recurringEvent", null, { shouldDirty: true });
                  setRecurringEventState(null);
                } else {
                  const newVal = eventType.recurringEvent || {
@@ -74,7 +71,7 @@ export default function RecurringEventController({
                    count: 12,
                    freq: Frequency.WEEKLY,
                  };
-                  formMethods.setValue("recurringEvent", newVal);
+                  formMethods.setValue("recurringEvent", newVal, { shouldDirty: true });
                  setRecurringEventState(newVal);
                }
              }}>
@@ -95,7 +92,7 @@ export default function RecurringEventController({
                            ...recurringEventState,
                            interval: parseInt(event?.target.value),
                          };
-                          formMethods.setValue("recurringEvent", newVal);
+                          formMethods.setValue("recurringEvent", newVal, { shouldDirty: true });
                          setRecurringEventState(newVal);
                        }}
                      />
@@ -110,7 +107,7 @@ export default function RecurringEventController({
                            ...recurringEventState,
                            freq: parseInt(event?.value || `${Frequency.WEEKLY}`),
                          };
-                          formMethods.setValue("recurringEvent", newVal);
+                          formMethods.setValue("recurringEvent", newVal, { shouldDirty: true });
                          setRecurringEventState(newVal);
                        }}
                      />
@@ -129,7 +126,7 @@ export default function RecurringEventController({
                            ...recurringEventState,
                            count: parseInt(event?.target.value),
                          };
-                          formMethods.setValue("recurringEvent", newVal);
+                          formMethods.setValue("recurringEvent", newVal, { shouldDirty: true });
                          setRecurringEventState(newVal);
                        }}
                      />
@@ -1,13 +1,14 @@
 import * as RadioGroup from "@radix-ui/react-radio-group";
 import type { UnitTypeLongPlural } from "dayjs";
 import { Trans } from "next-i18next";
-import type { EventTypeSetup, FormValues } from "pages/event-types/[type]";
+import type { EventTypeSetup } from "pages/event-types/[type]";
 import type { Dispatch, SetStateAction } from "react";
 import { useEffect, useState } from "react";
 import { Controller, useFormContext } from "react-hook-form";
 import type z from "zod";

 import useLockedFieldsManager from "@calcom/features/ee/managed-event-types/hooks/useLockedFieldsManager";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { classNames } from "@calcom/lib";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
@@ -37,16 +38,12 @@ export default function RequiresConfirmationController({

  useEffect(() => {
    if (!requiresConfirmation) {
-      formMethods.setValue("metadata.requiresConfirmationThreshold", undefined);
+      formMethods.setValue("metadata.requiresConfirmationThreshold", undefined, { shouldDirty: true });
    }
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, [requiresConfirmation]);

-  const { shouldLockDisableProps } = useLockedFieldsManager(
-    eventType,
-    t("locked_fields_admin_description"),
-    t("locked_fields_member_description")
-  );
+  const { shouldLockDisableProps } = useLockedFieldsManager({ eventType, translate: t, formMethods });
  const requiresConfirmationLockedProps = shouldLockDisableProps("requiresConfirmation");

  const options = [
@@ -82,7 +79,7 @@ export default function RequiresConfirmationController({
              checked={requiresConfirmation}
              LockedIcon={requiresConfirmationLockedProps.LockedIcon}
              onCheckedChange={(val) => {
-                formMethods.setValue("requiresConfirmation", val);
+                formMethods.setValue("requiresConfirmation", val, { shouldDirty: true });
                onRequiresConfirmation(val);
              }}>
              <div className="border-subtle rounded-b-lg border border-t-0 p-6">
@@ -96,16 +93,19 @@ export default function RequiresConfirmationController({
                  }
                  onValueChange={(val) => {
                    if (val === "always") {
-                      formMethods.setValue("requiresConfirmation", true);
+                      formMethods.setValue("requiresConfirmation", true, { shouldDirty: true });
                      onRequiresConfirmation(true);
-                      formMethods.setValue("metadata.requiresConfirmationThreshold", undefined);
+                      formMethods.setValue("metadata.requiresConfirmationThreshold", undefined, {
+                        shouldDirty: true,
+                      });
                      setRequiresConfirmationSetup(undefined);
                    } else if (val === "notice") {
-                      formMethods.setValue("requiresConfirmation", true);
+                      formMethods.setValue("requiresConfirmation", true, { shouldDirty: true });
                      onRequiresConfirmation(true);
                      formMethods.setValue(
                        "metadata.requiresConfirmationThreshold",
-                        requiresConfirmationSetup || defaultRequiresConfirmationSetup
+                        requiresConfirmationSetup || defaultRequiresConfirmationSetup,
+                        { shouldDirty: true }
                      );
                    }
                  }}>
@@ -146,7 +146,8 @@ export default function RequiresConfirmationController({
                                        });
                                        formMethods.setValue(
                                          "metadata.requiresConfirmationThreshold.time",
-                                          val
+                                          val,
+                                          { shouldDirty: true }
                                        );
                                      }}
                                      className="border-default !m-0 block w-16 rounded-r-none border-r-0 text-sm [appearance:textfield] focus:z-10 focus:border-r"
@@ -171,7 +172,8 @@ export default function RequiresConfirmationController({
                                          });
                                          formMethods.setValue(
                                            "metadata.requiresConfirmationThreshold.unit",
-                                            opt?.value as UnitTypeLongPlural
+                                            opt?.value as UnitTypeLongPlural,
+                                            { shouldDirty: true }
                                          );
                                        }}
                                        defaultValue={defaultValue}
@@ -37,7 +37,7 @@ const UserProfile = () => {
      if (context.avatar) {
        showToast(t("your_user_profile_updated_successfully"), "success");
        await utils.viewer.me.refetch();
-      } else {
+      } else
        try {
          if (eventTypes?.length === 0) {
            await Promise.all(
@@ -50,9 +50,11 @@ const UserProfile = () => {
          console.error(error);
        }

-        await utils.viewer.me.refetch();
-        router.push("/");
-      }
+      await utils.viewer.me.refetch();
+      const redirectUrl = localStorage.getItem("onBoardingRedirect");
+      localStorage.removeItem("onBoardingRedirect");
+
+      redirectUrl ? router.push(redirectUrl) : router.push("/");
    },
    onError: () => {
      showToast(t("problem_saving_user_profile"), "error");
@@ -0,0 +1,127 @@
+import type { FormValues } from "@pages/settings/my-account/profile";
+import { useState } from "react";
+import type { UseFormReturn } from "react-hook-form";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import {
+  Badge,
+  TextField,
+  Dropdown,
+  DropdownItem,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  Button,
+  InputError,
+} from "@calcom/ui";
+import { MoreHorizontal, Flag, Trash, Send } from "@calcom/ui/components/icon";
+
+type CustomEmailTextFieldProps = {
+  formMethods: UseFormReturn<FormValues>;
+  formMethodFieldName: keyof FormValues;
+  errorMessage: string;
+  emailVerified: boolean;
+  emailPrimary: boolean;
+  dataTestId: string;
+  handleChangePrimary: () => void;
+  handleVerifyEmail: () => void;
+  handleItemDelete: () => void;
+};
+
+const CustomEmailTextField = ({
+  formMethods,
+  formMethodFieldName,
+  errorMessage,
+  emailVerified,
+  emailPrimary,
+  dataTestId,
+  handleChangePrimary,
+  handleVerifyEmail,
+  handleItemDelete,
+}: CustomEmailTextFieldProps) => {
+  const { t } = useLocale();
+  const [inputFocus, setInputFocus] = useState(false);
+
+  return (
+    <>
+      <div
+        className={`border-default mt-2 flex items-center rounded-md border ${
+          inputFocus ? "ring-brand-default border-neutral-300 ring-2" : ""
+        }`}>
+        <TextField
+          {...formMethods.register(formMethodFieldName)}
+          label=""
+          containerClassName="flex flex-1 items-center"
+          className="mb-0 border-none outline-none focus:ring-0"
+          data-testid={dataTestId}
+          onFocus={() => setInputFocus(true)}
+          onBlur={() => setInputFocus(false)}
+        />
+        <div className="flex items-center pr-2">
+          {emailPrimary && (
+            <Badge variant="blue" size="sm" data-testid={`${dataTestId}-primary-badge`}>
+              {t("primary")}
+            </Badge>
+          )}
+          {!emailVerified && (
+            <Badge variant="orange" size="sm" className="ml-2" data-testid={`${dataTestId}-unverified-badge`}>
+              {t("unverified")}
+            </Badge>
+          )}
+          <Dropdown>
+            <DropdownMenuTrigger asChild>
+              <Button
+                StartIcon={MoreHorizontal}
+                variant="icon"
+                size="sm"
+                color="secondary"
+                className="ml-2 rounded-md"
+                data-testid="secondary-email-action-group-button"
+              />
+            </DropdownMenuTrigger>
+            <DropdownMenuContent>
+              <DropdownMenuItem>
+                <DropdownItem
+                  StartIcon={Flag}
+                  color="secondary"
+                  className="disabled:opacity-40"
+                  onClick={handleChangePrimary}
+                  disabled={!emailVerified || emailPrimary}
+                  data-testid="secondary-email-make-primary-button">
+                  {t("make_primary")}
+                </DropdownItem>
+              </DropdownMenuItem>
+              {!emailVerified && (
+                <DropdownMenuItem>
+                  <DropdownItem
+                    StartIcon={Send}
+                    color="secondary"
+                    className="disabled:opacity-40"
+                    onClick={handleVerifyEmail}
+                    disabled={emailVerified}
+                    data-testid="resend-verify-email-button">
+                    {t("resend_email")}
+                  </DropdownItem>
+                </DropdownMenuItem>
+              )}
+              <DropdownMenuItem>
+                <DropdownItem
+                  StartIcon={Trash}
+                  color="destructive"
+                  className="disabled:opacity-40"
+                  onClick={handleItemDelete}
+                  disabled={emailPrimary}
+                  data-testid="secondary-email-delete-button">
+                  {t("delete")}
+                </DropdownItem>
+              </DropdownMenuItem>
+            </DropdownMenuContent>
+          </Dropdown>
+        </div>
+      </div>
+      {errorMessage && <InputError message={errorMessage} />}
+    </>
+  );
+};
+
+export default CustomEmailTextField;
@@ -0,0 +1,31 @@
+import { Trans } from "react-i18next";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Dialog, DialogClose, DialogContent, DialogFooter } from "@calcom/ui";
+
+interface SecondaryEmailConfirmModalProps {
+  email: string;
+  onCancel: () => void;
+}
+
+const SecondaryEmailConfirmModal = ({ email, onCancel }: SecondaryEmailConfirmModalProps) => {
+  const { t } = useLocale();
+
+  return (
+    <Dialog open={true}>
+      <DialogContent
+        title={t("confirm_email")}
+        description={<Trans i18nKey="confirm_email_description" values={{ email }} />}
+        type="creation"
+        data-testid="secondary-email-confirm-dialog">
+        <DialogFooter>
+          <DialogClose color="primary" onClick={onCancel} data-testid="secondary-email-confirm-done-button">
+            {t("done")}
+          </DialogClose>
+        </DialogFooter>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export default SecondaryEmailConfirmModal;
@@ -0,0 +1,77 @@
+import { zodResolver } from "@hookform/resolvers/zod";
+import { useEffect } from "react";
+import { useForm } from "react-hook-form";
+import { z } from "zod";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import {
+  Dialog,
+  DialogContent,
+  DialogFooter,
+  DialogClose,
+  Button,
+  TextField,
+  Form,
+  InputError,
+} from "@calcom/ui";
+
+interface SecondaryEmailModalProps {
+  isLoading: boolean;
+  errorMessage?: string;
+  handleAddEmail: (value: { email: string }) => void;
+  onCancel: () => void;
+  clearErrorMessage: () => void;
+}
+
+const SecondaryEmailModal = ({
+  isLoading,
+  errorMessage,
+  handleAddEmail,
+  onCancel,
+  clearErrorMessage,
+}: SecondaryEmailModalProps) => {
+  const { t } = useLocale();
+  type FormValues = {
+    email: string;
+  };
+  const formMethods = useForm<FormValues>({
+    resolver: zodResolver(
+      z.object({
+        email: z.string().email(),
+      })
+    ),
+  });
+
+  useEffect(() => {
+    // We will reset the errorMessage once the user starts modifying the email
+    const subscription = formMethods.watch(() => clearErrorMessage());
+    return () => subscription.unsubscribe();
+  }, [formMethods.watch]);
+
+  return (
+    <Dialog open={true}>
+      <DialogContent
+        title={t("add_email")}
+        description={t("add_email_description")}
+        type="creation"
+        data-testid="secondary-email-add-dialog">
+        <Form form={formMethods} handleSubmit={handleAddEmail}>
+          <TextField
+            label={t("email_address")}
+            data-testid="secondary-email-input"
+            {...formMethods.register("email")}
+          />
+          {errorMessage && <InputError message={errorMessage} />}
+          <DialogFooter showDivider className="mt-10">
+            <DialogClose onClick={onCancel}>{t("cancel")}</DialogClose>
+            <Button type="submit" data-testid="add-secondary-email-button" disabled={isLoading}>
+              {t("add_email")}
+            </Button>
+          </DialogFooter>
+        </Form>
+      </DialogContent>
+    </Dialog>
+  );
+};
+
+export default SecondaryEmailModal;
@@ -160,7 +160,7 @@ const UsernameTextfield = (props: ICustomUsernameProps & Partial<React.Component
              <div className="bg-subtle flex w-full flex-wrap gap-6 rounded-sm px-2 py-3 text-sm">
                <div>
                  <p className="text-subtle">{t("current_username")}</p>
-                  <p className="text-emphasis mt-1" data-testid="current-username">
+                  <p className="text-emphasis mt-1 break-all" data-testid="current-username">
                    {currentUsername}
                  </p>
                </div>
@@ -168,7 +168,10 @@ const UsernameTextfield = (props: ICustomUsernameProps & Partial<React.Component
                  <p className="text-subtle" data-testid="new-username">
                    {t("new_username")}
                  </p>
-                  <p className="text-emphasis mt-1">{inputUsernameValue}</p>
+
+                  <p className="text-emphasis min-h-5 mt-1 max-h-12 overflow-y-auto break-all">
+                    {inputUsernameValue}
+                  </p>
                </div>
              </div>
            </div>
@@ -113,7 +113,7 @@ const enum ThemeSupport {
  // e.g. Login Page
  None = "none",
  // Entire App except Booking Pages
-  App = "systemOnly",
+  App = "userConfigured",
  // Booking Pages(including Routing Forms)
  Booking = "userConfigured",
 }
@@ -127,9 +127,9 @@ const enum ThemeSupport {
  // e.g. Login Page
  None = "none",
  // Entire App except Booking Pages
-  App = "systemOnly",
+  App = "appConfigured",
  // Booking Pages(including Routing Forms)
-  Booking = "userConfigured",
+  Booking = "bookingConfigured",
 }

 type CalcomThemeProps = PropsWithChildren<
@@ -144,8 +144,10 @@ const CalcomThemeProvider = (props: CalcomThemeProps) => {
  const embedNamespace = getEmbedNamespace(props.router.query);
  const isEmbedMode = typeof embedNamespace === "string";

+  const themeProviderProps = getThemeProviderProps({ props, isEmbedMode, embedNamespace });
+
  return (
-    <ThemeProvider {...getThemeProviderProps({ props, isEmbedMode, embedNamespace })}>
+    <ThemeProvider {...themeProviderProps}>
      {/* Embed Mode can be detected reliably only on client side here as there can be static generated pages as well which can't determine if it's embed mode at backend */}
      {/* color-scheme makes background:transparent not work in iframe which is required by embed. */}
      {typeof window !== "undefined" && !isEmbedMode && (
@@ -1,11 +1,11 @@
-import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
+import { getFeatureFlag } from "@calcom/features/flags/server/utils";

 // If feature flag is disabled, return not found on getServerSideProps
 export const getServerSideProps = async () => {
  const prisma = await import("@calcom/prisma").then((mod) => mod.default);
-  const flags = await getFeatureFlagMap(prisma);
+  const insightsEnabled = await getFeatureFlag(prisma, "insights");

-  if (flags.insights === false) {
+  if (!insightsEnabled) {
    return {
      notFound: true,
    } as const;
@@ -696,7 +696,7 @@ describe("orgMigration", () => {
    });

    describe("when user email matches orgAutoAcceptEmail", () => {
-      const orgMetadata = {
+      const orgSettings = {
        orgAutoAcceptEmail: "org1.com",
      } as const;

@@ -725,8 +725,10 @@ describe("orgMigration", () => {
        const dbOrg = await createOrg({
          slug: data.targetOrg.slug,
          name: data.targetOrg.name,
-          metadata: {
-            ...orgMetadata,
+          organizationSettings: {
+            create: {
+              ...orgSettings,
+            },
          },
        });

@@ -784,8 +786,10 @@ describe("orgMigration", () => {
        const dbOrg = await createOrg({
          slug: data.targetOrg.slug,
          name: data.targetOrg.name,
-          metadata: {
-            ...orgMetadata,
+          organizationSettings: {
+            create: {
+              ...orgSettings,
+            },
          },
        });

@@ -837,7 +841,11 @@ describe("orgMigration", () => {
          name: data.targetOrg.name,
          metadata: {
            requestedSlug: data.targetOrg.requestedSlug,
-            ...orgMetadata,
+          },
+          organizationSettings: {
+            create: {
+              ...orgSettings,
+            },
          },
        });

@@ -901,9 +909,7 @@ describe("orgMigration", () => {
          id: data.targetOrg.id,
          slug: data.targetOrg.slug,
          name: data.targetOrg.name,
-          metadata: {
-            isOrganization: true,
-          },
+          isOrganization: true,
        },
      });

@@ -1564,9 +1570,9 @@ async function createOrg(
  return await prismock.team.create({
    data: {
      ...data,
+      isOrganization: true,
      metadata: {
        ...(data.metadata || {}),
-        isOrganization: true,
      },
    },
  });
@@ -47,7 +47,7 @@ export async function moveUserToOrg({

  const teamMetadata = teamMetadataSchema.parse(team?.metadata);

-  if (!teamMetadata?.isOrganization) {
+  if (!team.isOrganization) {
    throw new Error(`Team with ID:${targetOrgId} is not an Org`);
  }

@@ -61,7 +61,7 @@ export async function moveUserToOrg({
  if (!targetOrgUsername) {
    targetOrgUsername = getOrgUsernameFromEmail(
      userToMoveToOrg.email,
-      targetOrganization.metadata.orgAutoAcceptEmail || ""
+      targetOrganization.organizationSettings?.orgAutoAcceptEmail || ""
    );
  }

@@ -196,7 +196,7 @@ export async function moveTeamToOrg({

  const teamMetadata = teamMetadataSchema.parse(possibleOrg?.metadata);

-  if (!teamMetadata?.isOrganization) {
+  if (!possibleOrg.isOrganization) {
    throw new Error(`${targetOrg.id} is not an Org`);
  }

@@ -205,7 +205,7 @@ export async function moveTeamToOrg({
  await addTeamRedirect({
    oldTeamSlug,
    teamSlug: updatedTeam.slug,
-    orgSlug: targetOrganization.slug || orgMetadata.requestedSlug || null,
+    orgSlug: targetOrganization.slug || orgMetadata?.requestedSlug || null,
  });
  await setOrgSlugIfNotSet({ slug: targetOrganization.slug }, orgMetadata, targetOrg.id);
  if (moveMembers) {
@@ -329,13 +329,14 @@ async function setOrgSlugIfNotSet(
  },
  orgMetadata: {
    requestedSlug?: string | null | undefined;
-  },
+  } | null,
  targetOrgId: number
 ) {
  if (targetOrganization.slug) {
    return;
  }
-  if (!orgMetadata.requestedSlug) {
+
+  if (!orgMetadata?.requestedSlug) {
    throw new HttpError({
      statusCode: 400,
      message: `Org with id: ${targetOrgId} doesn't have a slug. Tried using requestedSlug but that's also not present. So, all migration done but failed to set the Organization slug. Please set it manually`,
@@ -372,6 +373,9 @@ async function getTeamOrThrowError(targetOrgId: number) {
    where: {
      id: targetOrgId,
    },
+    include: {
+      organizationSettings: true,
+    },
  });

  if (!team) {
@@ -650,6 +654,7 @@ async function moveTeamsWithoutMembersToOrg({
      id: true,
      slug: true,
      metadata: true,
+      isOrganization: true,
    },
  });

@@ -661,7 +666,7 @@ async function moveTeamsWithoutMembersToOrg({
      };
    })
    // Remove Orgs from the list
-    .filter((team) => !team.metadata?.isOrganization);
+    .filter((team) => !team.isOrganization);

  const teamIdsToBeMovedToOrg = teamsToBeMovedToOrg.map((t) => t.id);

@@ -814,6 +819,7 @@ async function removeTeamsWithoutItsMemberFromOrg({ userToRemoveFromOrg }: { use
      id: true,
      slug: true,
      metadata: true,
+      isOrganization: true,
    },
  });

@@ -825,7 +831,7 @@ async function removeTeamsWithoutItsMemberFromOrg({ userToRemoveFromOrg }: { use
      };
    })
    // Remove Orgs from the list
-    .filter((team) => !team.metadata?.isOrganization);
+    .filter((team) => !team.isOrganization);

  const teamIdsToBeRemovedFromOrg = teamsToBeRemovedFromOrg.map((t) => t.id);

@@ -1,12 +1,12 @@
 import type { GetServerSidePropsContext } from "next";

-import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
+import { getFeatureFlag } from "@calcom/features/flags/server/utils";

 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
  const prisma = await import("@calcom/prisma").then((mod) => mod.default);
-  const flags = await getFeatureFlagMap(prisma);
+  const organizations = await getFeatureFlag(prisma, "organizations");
  // Check if organizations are enabled
-  if (flags["organizations"] !== true) {
+  if (!organizations) {
    return {
      notFound: true,
    } as const;
@@ -4,7 +4,7 @@ import { z } from "zod";
 import { getOrgUsernameFromEmail } from "@calcom/features/auth/signup/utils/getOrgUsernameFromEmail";
 import { checkPremiumUsername } from "@calcom/features/ee/common/lib/checkPremiumUsername";
 import { isSAMLLoginEnabled } from "@calcom/features/ee/sso/lib/saml";
-import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
+import { getFeatureFlag } from "@calcom/features/flags/server/utils";
 import { IS_SELF_HOSTED, WEBAPP_URL } from "@calcom/lib/constants";
 import slugify from "@calcom/lib/slugify";
 import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
@@ -24,11 +24,22 @@ const querySchema = z.object({

 export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
  const prisma = await import("@calcom/prisma").then((mod) => mod.default);
-  const flags = await getFeatureFlagMap(prisma);
+  const signupDisabled = await getFeatureFlag(prisma, "disable-signup");
  const ssr = await ssrInit(ctx);
  const token = z.string().optional().parse(ctx.query.token);
+  const redirectUrlData = z
+    .string()
+    .refine((value) => value.startsWith(WEBAPP_URL), {
+      params: (value: string) => ({ value }),
+      message: "Redirect URL must start with 'cal.com'",
+    })
+    .optional()
+    .safeParse(ctx.query.redirect);
+
+  const redirectUrl = redirectUrlData.success && redirectUrlData.data ? redirectUrlData.data : null;

  const props = {
+    redirectUrl,
    isGoogleLoginEnabled: IS_GOOGLE_LOGIN_ENABLED,
    isSAMLLoginEnabled,
    trpcState: ssr.dehydrate(),
@@ -38,7 +49,7 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
  // username + email prepopulated from query params
  const { username: preFillusername, email: prefilEmail } = querySchema.parse(ctx.query);

-  if ((process.env.NEXT_PUBLIC_DISABLE_SIGNUP === "true" && !token) || flags["disable-signup"]) {
+  if ((process.env.NEXT_PUBLIC_DISABLE_SIGNUP === "true" && !token) || signupDisabled) {
    return {
      notFound: true,
    } as const;
@@ -67,14 +78,17 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
      team: {
        select: {
          metadata: true,
+          isOrganization: true,
          parentId: true,
          parent: {
            select: {
              slug: true,
-              metadata: true,
+              isOrganization: true,
+              organizationSettings: true,
            },
          },
          slug: true,
+          organizationSettings: true,
        },
      },
    },
@@ -123,8 +137,8 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
  };

  const isATeamInOrganization = tokenTeam?.parentId !== null;
-  const isOrganization = tokenTeam.metadata?.isOrganization;
  // Detect if the team is an org by either the metadata flag or if it has a parent team
+  const isOrganization = tokenTeam.isOrganization;
  const isOrganizationOrATeamInOrganization = isOrganization || isATeamInOrganization;
  // If we are dealing with an org, the slug may come from the team itself or its parent
  const orgSlug = isOrganizationOrATeamInOrganization
@@ -141,9 +155,7 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {

  const isValidEmail = checkValidEmail(verificationToken.identifier);
  const isOrgInviteByLink = isOrganizationOrATeamInOrganization && !isValidEmail;
-  const parentMetaDataForSubteam = tokenTeam?.parent?.metadata
-    ? teamMetadataSchema.parse(tokenTeam.parent.metadata)
-    : null;
+  const parentOrgSettings = tokenTeam?.parent?.organizationSettings ?? null;

  return {
    props: {
@@ -156,15 +168,15 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
              ? getOrgUsernameFromEmail(
                  verificationToken.identifier,
                  (isOrganization
-                    ? tokenTeam.metadata?.orgAutoAcceptEmail
-                    : parentMetaDataForSubteam?.orgAutoAcceptEmail) || ""
+                    ? tokenTeam.organizationSettings?.orgAutoAcceptEmail
+                    : parentOrgSettings?.orgAutoAcceptEmail) || ""
                )
              : slugify(username),
          }
        : null,
      orgSlug,
      orgAutoAcceptEmail: isOrgInviteByLink
-        ? tokenTeam?.metadata?.orgAutoAcceptEmail ?? parentMetaDataForSubteam?.orgAutoAcceptEmail ?? null
+        ? tokenTeam?.organizationSettings?.orgAutoAcceptEmail ?? parentOrgSettings?.orgAutoAcceptEmail ?? null
        : null,
    },
  };
@@ -96,6 +96,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
      isBrandingHidden: team?.hideBranding,
      isInstantMeeting: eventData.isInstantEvent && queryIsInstantMeeting ? true : false,
      themeBasis: null,
+      orgBannerUrl: eventData?.team?.parent?.bannerUrl ?? "",
    },
  };
 };
@@ -1,7 +1,7 @@
 import type { GetServerSidePropsContext } from "next";

 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { getFeatureFlagMap } from "@calcom/features/flags/server/utils";
+import { getFeatureFlag } from "@calcom/features/flags/server/utils";
 import { getBookerBaseUrlSync } from "@calcom/lib/getBookerUrl/client";
 import logger from "@calcom/lib/logger";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
@@ -37,12 +37,11 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>

  // Provided by Rewrite from next.config.js
  const isOrgProfile = context.query?.isOrgProfile === "1";
-  const flags = await getFeatureFlagMap(prisma);
-  const isOrganizationFeatureEnabled = flags["organizations"];
+  const organizationsEnabled = await getFeatureFlag(prisma, "organizations");

  log.debug("getServerSideProps", {
    isOrgProfile,
-    isOrganizationFeatureEnabled,
+    isOrganizationFeatureEnabled: organizationsEnabled,
    isValidOrgDomain,
    currentOrgDomain,
  });
@@ -73,8 +72,8 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
  // Taking care of sub-teams and orgs
  if (
    (!isValidOrgDomain && team?.parent) ||
-    (!isValidOrgDomain && !!metadata?.isOrganization) ||
-    !isOrganizationFeatureEnabled
+    (!isValidOrgDomain && !!team?.isOrganization) ||
+    !organizationsEnabled
  ) {
    return { notFound: true } as const;
  }
@@ -91,6 +90,17 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
              },
            }),
      },
+      include: {
+        parent: {
+          select: {
+            id: true,
+            slug: true,
+            name: true,
+            isPrivate: true,
+            isOrganization: true,
+          },
+        },
+      },
    });

    if (!unpublishedTeam) return { notFound: true } as const;
@@ -104,19 +114,23 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
    } as const;
  }

+  const isTeamOrParentOrgPrivate = team.isPrivate || (team.parent?.isOrganization && team.parent?.isPrivate);
+
  team.eventTypes =
    team.eventTypes?.map((type) => ({
      ...type,
-      users: type.users.map((user) => ({
-        ...user,
-        avatar: `/${user.username}/avatar.png`,
-      })),
+      users: !isTeamOrParentOrgPrivate
+        ? type.users.map((user) => ({
+            ...user,
+            avatar: `/${user.username}/avatar.png`,
+          }))
+        : [],
      descriptionAsSafeHTML: markdownToSafeHTML(type.description),
    })) ?? null;

  const safeBio = markdownToSafeHTML(team.bio) || "";

-  const members = !team.isPrivate
+  const members = !isTeamOrParentOrgPrivate
    ? team.members.map((member) => {
        return {
          name: member.name,
@@ -140,7 +154,13 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>

  return {
    props: {
-      team: { ...serializableTeam, safeBio, members, metadata },
+      team: {
+        ...serializableTeam,
+        safeBio,
+        members,
+        metadata,
+        children: isTeamOrParentOrgPrivate ? [] : team.children,
+      },
      themeBasis: serializableTeam.slug,
      trpcState: ssr.dehydrate(),
      markdownStrippedBio,
@@ -19,13 +19,16 @@ import { getEventName } from "@calcom/core/event";
 import type { ConfigType } from "@calcom/dayjs";
 import dayjs from "@calcom/dayjs";
 import {
-  sdkActionManager,
  useEmbedNonStylesConfig,
  useIsBackgroundTransparent,
  useIsEmbed,
 } from "@calcom/embed-core/embed-iframe";
 import { Price } from "@calcom/features/bookings/components/event-meta/Price";
-import { SMS_REMINDER_NUMBER_FIELD, SystemField } from "@calcom/features/bookings/lib/SystemField";
+import {
+  SMS_REMINDER_NUMBER_FIELD,
+  SystemField,
+  TITLE_FIELD,
+} from "@calcom/features/bookings/lib/SystemField";
 import { APP_NAME } from "@calcom/lib/constants";
 import {
  formatToLocalizedDate,
@@ -92,6 +95,7 @@ export default function Success(props: PageProps) {
  const pathname = usePathname();
  const searchParams = useCompatSearchParams();
  const { eventType, bookingInfo, requiresLoginToUpdate } = props;
+
  const {
    allRemainingBookings,
    isSuccessBookingPage,
@@ -193,22 +197,6 @@ export default function Success(props: PageProps) {
  }, [telemetry]); */

  useEffect(() => {
-    const users = eventType.users;
-    if (!sdkActionManager) return;
-    // TODO: We should probably make it consistent with Webhook payload. Some data is not available here, as and when requirement comes we can add
-    sdkActionManager.fire("bookingSuccessful", {
-      booking: bookingInfo,
-      eventType,
-      date: date.toString(),
-      duration: calculatedDuration,
-      organizer: {
-        name: users[0].name || "Nameless",
-        email: bookingInfo?.userPrimaryEmail || users[0].email || "Email-less",
-        timeZone: users[0].timeZone,
-      },
-      confirmed: !needsConfirmation,
-      // TODO: Add payment details
-    });
    setDate(
      date.tz(localStorage.getItem("timeOption.preferredTimeZone") || dayjs.tz.guess() || "Europe/London")
    );
@@ -294,6 +282,16 @@ export default function Success(props: PageProps) {
  const providerName = guessEventLocationType(location)?.label;
  const rescheduleProviderName = guessEventLocationType(rescheduleLocation)?.label;

+  const bookingCancelledEventProps = {
+    booking: bookingInfo,
+    organizer: {
+      name: bookingInfo?.user?.name || "Nameless",
+      email: bookingInfo?.userPrimaryEmail || bookingInfo?.user?.email || "Email-less",
+      timeZone: bookingInfo?.user?.timeZone,
+    },
+    eventType,
+  };
+
  return (
    <div className={isEmbed ? "" : "h-screen"} data-testid="success-page">
      {!isEmbed && (
@@ -352,7 +350,7 @@ export default function Success(props: PageProps) {
                    !giphyImage && !isCancelled && needsConfirmation
                      ? "bg-subtle h-12 w-12 rounded-full"
                      : "",
-                    isCancelled ? "bg-error h-12 w-12 rounded-full" : ""
+                    isCancelled ? "bg-error h-12 w-12 rounded-full " : ""
                  )}>
                  {giphyImage && !needsConfirmation && !isCancelled && (
                    // eslint-disable-next-line @next/next/no-img-element
@@ -525,7 +523,13 @@ export default function Success(props: PageProps) {
                      if (!field) return null;
                      const isSystemField = SystemField.safeParse(field.name);
                      // SMS_REMINDER_NUMBER_FIELD is a system field but doesn't have a dedicated place in the UI. So, it would be shown through the following responses list
-                      if (isSystemField.success && field.name !== SMS_REMINDER_NUMBER_FIELD) return null;
+                      // TITLE is also an identifier for booking question "What is this meeting about?"
+                      if (
+                        isSystemField.success &&
+                        field.name !== SMS_REMINDER_NUMBER_FIELD &&
+                        field.name !== TITLE_FIELD
+                      )
+                        return null;

                      const label = field.label || t(field.defaultLabel || "");

@@ -610,6 +614,7 @@ export default function Success(props: PageProps) {
                        theme={isSuccessBookingPage ? props.profile.theme : "light"}
                        allRemainingBookings={allRemainingBookings}
                        seatReferenceUid={seatReferenceUid}
+                        bookingCancelledEventProps={bookingCancelledEventProps}
                      />
                    </>
                  ))}
@@ -425,7 +425,7 @@ export const EventTypeList = ({
                  <MemoizedItem type={type} group={group} readOnly={readOnly} />
                  <div className="mt-4 hidden sm:mt-0 sm:flex">
                    <div className="flex justify-between space-x-2 rtl:space-x-reverse">
-                      {type.team && !isManagedEventType && (
+                      {!!type.teamId && !isManagedEventType && (
                        <UserAvatarGroup
                          className="relative right-3"
                          size="sm"
@@ -803,11 +803,10 @@ const CreateFirstEventTypeView = ({ slug }: { slug: string }) => {
  );
 };

-const CTA = ({ data }: { data: GetByViewerResponse }) => {
+const CTA = ({ data, isOrganization }: { data: GetByViewerResponse; isOrganization: boolean }) => {
  const { t } = useLocale();

  if (!data) return null;
-
  const profileOptions = data.profiles
    .filter((profile) => !profile.readOnly)
    .map((profile) => {
@@ -825,7 +824,9 @@ const CTA = ({ data }: { data: GetByViewerResponse }) => {
      data-testid="new-event-type"
      subtitle={t("create_event_on").toUpperCase()}
      options={profileOptions}
-      createDialog={() => <CreateEventTypeDialog profileOptions={profileOptions} />}
+      createDialog={() => (
+        <CreateEventTypeDialog profileOptions={profileOptions} isOrganization={isOrganization} />
+      )}
    />
  );
 };
@@ -983,7 +984,7 @@ const EventTypesPage: React.FC & {
      hideHeadingOnMobile
      subtitle={t("event_types_page_subtitle")}
      beforeCTAactions={<Actions />}
-      CTA={<CTA data={data} />}>
+      CTA={<CTA data={data} isOrganization={!!user?.organizationId} />}>
      <HeadSeo
        title="Event Types"
        description="Create events to share for people to book on your calendar."
@@ -12,8 +12,8 @@ import { z } from "zod";
 import checkForMultiplePaymentApps from "@calcom/app-store/_utils/payments/checkForMultiplePaymentApps";
 import { getEventLocationType } from "@calcom/app-store/locations";
 import { validateCustomEventName } from "@calcom/core/event";
-import type { EventLocationType } from "@calcom/core/location";
 import type { ChildrenEventType } from "@calcom/features/eventtypes/components/ChildrenEventTypeSelect";
+import type { FormValues } from "@calcom/features/eventtypes/lib/types";
 import { validateIntervalLimitOrder } from "@calcom/lib";
 import { WEBSITE_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -22,21 +22,14 @@ import { HttpError } from "@calcom/lib/http-error";
 import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import { validateBookerLayouts } from "@calcom/lib/validateBookerLayouts";
 import type { Prisma } from "@calcom/prisma/client";
-import type { PeriodType, SchedulingType } from "@calcom/prisma/enums";
-import type {
-  BookerLayoutSettings,
-  customInputSchema,
-  EventTypeMetaDataSchema,
-} from "@calcom/prisma/zod-utils";
+import type { customInputSchema, EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import { eventTypeBookingFields } from "@calcom/prisma/zod-utils";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
-import type { IntervalLimit, RecurringEvent } from "@calcom/types/Calendar";
 import { Form, showToast } from "@calcom/ui";

 import type { AppProps } from "@lib/app-providers";

-import type { AvailabilityOption } from "@components/eventtype/EventAvailabilityTab";
 import { EventTypeSingleLayout } from "@components/eventtype/EventTypeSingleLayout";

 import { type PageProps } from "~/event-types/views/event-types-single-view.getServerSideProps";
@@ -84,73 +77,6 @@ const ManagedEventTypeDialog = dynamic(() => import("@components/eventtype/Manag

 export type Host = { isFixed: boolean; userId: number; priority: number };

-export type FormValues = {
-  id: number;
-  title: string;
-  eventTitle: string;
-  eventName: string;
-  slug: string;
-  isInstantEvent: boolean;
-  length: number;
-  offsetStart: number;
-  description: string;
-  disableGuests: boolean;
-  lockTimeZoneToggleOnBookingPage: boolean;
-  requiresConfirmation: boolean;
-  requiresBookerEmailVerification: boolean;
-  recurringEvent: RecurringEvent | null;
-  schedulingType: SchedulingType | null;
-  hidden: boolean;
-  hideCalendarNotes: boolean;
-  hashedLink: string | undefined;
-  locations: {
-    type: EventLocationType["type"];
-    address?: string;
-    attendeeAddress?: string;
-    link?: string;
-    hostPhoneNumber?: string;
-    displayLocationPublicly?: boolean;
-    phone?: string;
-    hostDefault?: string;
-    credentialId?: number;
-    teamName?: string;
-  }[];
-  customInputs: CustomInputParsed[];
-  schedule: number | null;
-  periodType: PeriodType;
-  periodDays: number;
-  periodCountCalendarDays: "1" | "0";
-  periodDates: { startDate: Date; endDate: Date };
-  seatsPerTimeSlot: number | null;
-  seatsShowAttendees: boolean | null;
-  seatsShowAvailabilityCount: boolean | null;
-  seatsPerTimeSlotEnabled: boolean;
-  scheduleName: string;
-  minimumBookingNotice: number;
-  minimumBookingNoticeInDurationType: number;
-  beforeEventBuffer: number;
-  afterEventBuffer: number;
-  slotInterval: number | null;
-  metadata: z.infer<typeof EventTypeMetaDataSchema>;
-  destinationCalendar: {
-    integration: string;
-    externalId: string;
-  };
-  successRedirectUrl: string;
-  durationLimits?: IntervalLimit;
-  bookingLimits?: IntervalLimit;
-  onlyShowFirstAvailableSlot: boolean;
-  children: ChildrenEventType[];
-  hosts: Host[];
-  bookingFields: z.infer<typeof eventTypeBookingFields>;
-  availability?: AvailabilityOption;
-  bookerLayouts: BookerLayoutSettings;
-  multipleDurationEnabled: boolean;
-  users: EventTypeSetup["users"];
-  assignAllTeamMembers: boolean;
-  useEventTypeDestinationCalendarEmail: boolean;
-};
-
 export type CustomInputParsed = typeof customInputSchema._output;

 const querySchema = z.object({
@@ -192,14 +118,17 @@ const EventTypePage = (props: EventTypeSetupProps) => {
  const [animationParentRef] = useAutoAnimate<HTMLDivElement>();
  const updateMutation = trpc.viewer.eventTypes.update.useMutation({
    onSuccess: async () => {
-      formMethods.setValue(
-        "children",
-        formMethods.getValues().children.map((child) => ({
-          ...child,
-          created: true,
-        }))
-      );
-      formMethods.setValue("assignAllTeamMembers", formMethods.getValues("assignAllTeamMembers") || false);
+      const currentValues = formMethods.getValues();
+
+      currentValues.children = currentValues.children.map((child) => ({
+        ...child,
+        created: true,
+      }));
+      currentValues.assignAllTeamMembers = currentValues.assignAllTeamMembers || false;
+
+      // Reset the form with these values as new default values to ensure the correct comparison for dirtyFields eval
+      formMethods.reset(currentValues);
+
      showToast(t("event_type_updated_successfully", { eventTypeTitle: eventType.title }), "success");
    },
    async onSettled() {
@@ -253,7 +182,6 @@ const EventTypePage = (props: EventTypeSetupProps) => {
  eventType.bookingFields.forEach(({ name }) => {
    bookingFields[name] = name;
  });
-
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  const defaultValues: any = useMemo(() => {
    return {
@@ -264,7 +192,7 @@ const EventTypePage = (props: EventTypeSetupProps) => {
      beforeEventBuffer: eventType.beforeEventBuffer,
      eventName: eventType.eventName || "",
      scheduleName: eventType.scheduleName,
-      periodDays: eventType.periodDays || 30,
+      periodDays: eventType.periodDays,
      requiresBookerEmailVerification: eventType.requiresBookerEmailVerification,
      seatsPerTimeSlot: eventType.seatsPerTimeSlot,
      seatsShowAttendees: eventType.seatsShowAttendees,
@@ -290,7 +218,7 @@ const EventTypePage = (props: EventTypeSetupProps) => {
      offsetStart: eventType.offsetStart,
      bookingFields: eventType.bookingFields,
      periodType: eventType.periodType,
-      periodCountCalendarDays: eventType.periodCountCalendarDays ? "1" : "0",
+      periodCountCalendarDays: eventType.periodCountCalendarDays ? true : false,
      schedulingType: eventType.schedulingType,
      requiresConfirmation: eventType.requiresConfirmation,
      slotInterval: eventType.slotInterval,
@@ -300,6 +228,7 @@ const EventTypePage = (props: EventTypeSetupProps) => {
      successRedirectUrl: eventType.successRedirectUrl || "",
      users: eventType.users,
      useEventTypeDestinationCalendarEmail: eventType.useEventTypeDestinationCalendarEmail,
+      secondaryEmailId: eventType?.secondaryEmailId || -1,
      children: eventType.children.map((ch) => ({
        ...ch,
        created: true,
@@ -316,7 +245,6 @@ const EventTypePage = (props: EventTypeSetupProps) => {
      assignAllTeamMembers: eventType.assignAllTeamMembers,
    };
  }, [eventType, periodDates, metadata]);
-
  const formMethods = useForm<FormValues>({
    defaultValues,
    resolver: zodResolver(
@@ -405,14 +333,9 @@ const EventTypePage = (props: EventTypeSetupProps) => {
        .passthrough()
    ),
  });
-
-  useEffect(() => {
-    if (!formMethods.formState.isDirty) {
-      //TODO: What's the best way to sync the form with backend
-      formMethods.setValue("bookingFields", defaultValues.bookingFields);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [defaultValues]);
+  const {
+    formState: { isDirty: isFormDirty, dirtyFields },
+  } = formMethods;

  const appsMetadata = formMethods.getValues("metadata")?.apps;
  const availability = formMethods.watch("availability");
@@ -440,7 +363,7 @@ const EventTypePage = (props: EventTypeSetupProps) => {
    ),
    availability: <EventAvailabilityTab eventType={eventType} isTeamEvent={!!team} />,
    team: <EventTeamTab teamMembers={teamMembers} team={team} eventType={eventType} />,
-    limits: <EventLimitsTab />,
+    limits: <EventLimitsTab eventType={eventType} />,
    advanced: <EventAdvancedTab eventType={eventType} team={team} />,
    instant: <EventInstantTab eventType={eventType} isTeamEvent={!!team} />,
    recurring: <EventRecurringTab eventType={eventType} />,
@@ -453,8 +376,100 @@ const EventTypePage = (props: EventTypeSetupProps) => {
    ),
    webhooks: <EventWebhooksTab eventType={eventType} />,
  } as const;
+  const isObject = <T,>(value: T): boolean => {
+    return value !== null && typeof value === "object" && !Array.isArray(value);
+  };
+
+  const isArray = <T,>(value: T): boolean => {
+    return Array.isArray(value);
+  };
+
+  const isFieldDirty = (fieldName: keyof FormValues) => {
+    // If the field itself is directly marked as dirty
+    if (dirtyFields[fieldName] === true) {
+      return true;
+    }
+
+    // Check if the field is an object or an array
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const fieldValue: any = getNestedField(dirtyFields, fieldName);
+    if (isObject(fieldValue)) {
+      for (const key in fieldValue) {
+        if (fieldValue[key] === true) {
+          return true;
+        }
+
+        if (isObject(fieldValue[key]) || isArray(fieldValue[key])) {
+          const nestedFieldName = `${fieldName}.${key}` as keyof FormValues;
+          // Recursive call for nested objects or arrays
+          if (isFieldDirty(nestedFieldName)) {
+            return true;
+          }
+        }
+      }
+    }
+    if (isArray(fieldValue)) {
+      for (const element of fieldValue) {
+        // If element is an object, check each property of the object
+        if (isObject(element)) {
+          for (const key in element) {
+            if (element[key] === true) {
+              return true;
+            }
+
+            if (isObject(element[key]) || isArray(element[key])) {
+              const nestedFieldName = `${fieldName}.${key}` as keyof FormValues;
+              // Recursive call for nested objects or arrays within each element
+              if (isFieldDirty(nestedFieldName)) {
+                return true;
+              }
+            }
+          }
+        } else if (element === true) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  };
+
+  const getNestedField = (obj: typeof dirtyFields, path: string) => {
+    const keys = path.split(".");
+    let current = obj;
+
+    for (let i = 0; i < keys.length; i++) {
+      // @ts-expect-error /—— currentKey could be any deeply nested fields thanks to recursion
+      const currentKey = current[keys[i]];
+      if (currentKey === undefined) return undefined;
+      current = currentKey;
+    }
+
+    return current;
+  };
+
+  const getDirtyFields = (values: FormValues): Partial<FormValues> => {
+    if (!isFormDirty) {
+      return {};
+    }
+    const updatedFields: Partial<FormValues> = {};
+    Object.keys(dirtyFields).forEach((key) => {
+      const typedKey = key as keyof typeof dirtyFields;
+      updatedFields[typedKey] = undefined;
+      const isDirty = isFieldDirty(typedKey);
+      if (isDirty) {
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        updatedFields[typedKey] = values[typedKey];
+      }
+    });
+    return updatedFields;
+  };

  const handleSubmit = async (values: FormValues) => {
+    const { children } = values;
+    const dirtyValues = getDirtyFields(values);
+    const dirtyFieldExists = Object.keys(dirtyValues).length !== 0;
    const {
      periodDates,
      periodCountCalendarDays,
@@ -470,7 +485,6 @@ const EventTypePage = (props: EventTypeSetupProps) => {
      locations,
      metadata,
      customInputs,
-      children,
      assignAllTeamMembers,
      // We don't need to send send these values to the backend
      // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -483,8 +497,7 @@ const EventTypePage = (props: EventTypeSetupProps) => {
      multipleDurationEnabled,
      length,
      ...input
-    } = values;
-
+    } = dirtyValues;
    if (!Number(length)) throw new Error(t("event_setup_length_error"));

    if (bookingLimits) {
@@ -504,8 +517,12 @@ const EventTypePage = (props: EventTypeSetupProps) => {
      if (metadata?.multipleDuration.length < 1) {
        throw new Error(t("event_setup_multiple_duration_error"));
      } else {
-        if (!length && !metadata?.multipleDuration?.includes(length)) {
-          throw new Error(t("event_setup_multiple_duration_default_error"));
+        // if length is unchanged, we skip this check
+        if (length !== undefined) {
+          if (!length && !metadata?.multipleDuration?.includes(length)) {
+            //This would work but it leaves the potential of this check being useless. Need to check against length and not eventType.length, but length can be undefined
+            throw new Error(t("event_setup_multiple_duration_default_error"));
+          }
        }
      }
    }
@@ -521,14 +538,14 @@ const EventTypePage = (props: EventTypeSetupProps) => {

    // eslint-disable-next-line @typescript-eslint/no-unused-vars
    const { availability, users, scheduleName, ...rest } = input;
-    updateMutation.mutate({
+    const payload = {
      ...rest,
      length,
      locations,
      recurringEvent,
-      periodStartDate: periodDates.startDate,
-      periodEndDate: periodDates.endDate,
-      periodCountCalendarDays: periodCountCalendarDays === "1",
+      periodStartDate: periodDates?.startDate,
+      periodEndDate: periodDates?.endDate,
+      periodCountCalendarDays,
      id: eventType.id,
      beforeEventBuffer,
      afterEventBuffer,
@@ -542,7 +559,19 @@ const EventTypePage = (props: EventTypeSetupProps) => {
      customInputs,
      children,
      assignAllTeamMembers,
-    });
+    };
+    // Filter out undefined values
+    const filteredPayload = Object.entries(payload).reduce((acc, [key, value]) => {
+      if (value !== undefined) {
+        // @ts-expect-error Element implicitly has any type
+        acc[key] = value;
+      }
+      return acc;
+    }, {});
+
+    if (dirtyFieldExists) {
+      updateMutation.mutate({ ...filteredPayload, id: eventType.id });
+    }
  };

  const [slugExistsChildrenDialogOpen, setSlugExistsChildrenDialogOpen] = useState<ChildrenEventType[]>([]);
@@ -595,6 +624,9 @@ const EventTypePage = (props: EventTypeSetupProps) => {
          form={formMethods}
          id="event-type-form"
          handleSubmit={async (values) => {
+            const { children } = values;
+            const dirtyValues = getDirtyFields(values);
+            const dirtyFieldExists = Object.keys(dirtyValues).length !== 0;
            const {
              periodDates,
              periodCountCalendarDays,
@@ -617,9 +649,9 @@ const EventTypePage = (props: EventTypeSetupProps) => {
              multipleDurationEnabled,
              length,
              ...input
-            } = values;
+            } = dirtyValues;

-            if (!Number(length)) throw new Error(t("event_setup_length_error"));
+            if (length && !Number(length)) throw new Error(t("event_setup_length_error"));

            if (bookingLimits) {
              const isValid = validateIntervalLimitOrder(bookingLimits);
@@ -638,8 +670,11 @@ const EventTypePage = (props: EventTypeSetupProps) => {
              if (metadata?.multipleDuration.length < 1) {
                throw new Error(t("event_setup_multiple_duration_error"));
              } else {
-                if (!length && !metadata?.multipleDuration?.includes(length)) {
-                  throw new Error(t("event_setup_multiple_duration_default_error"));
+                if (length !== undefined) {
+                  if (!length && !metadata?.multipleDuration?.includes(length)) {
+                    //This would work but it leaves the potential of this check being useless. Need to check against length and not eventType.length, but length can be undefined
+                    throw new Error(t("event_setup_multiple_duration_default_error"));
+                  }
                }
              }
            }
@@ -651,14 +686,15 @@ const EventTypePage = (props: EventTypeSetupProps) => {

            // eslint-disable-next-line @typescript-eslint/no-unused-vars
            const { availability, users, scheduleName, ...rest } = input;
-            updateMutation.mutate({
+            const payload = {
              ...rest,
+              children,
              length,
              locations,
              recurringEvent,
-              periodStartDate: periodDates.startDate,
-              periodEndDate: periodDates.endDate,
-              periodCountCalendarDays: periodCountCalendarDays === "1",
+              periodStartDate: periodDates?.startDate,
+              periodEndDate: periodDates?.endDate,
+              periodCountCalendarDays,
              id: eventType.id,
              beforeEventBuffer,
              afterEventBuffer,
@@ -670,7 +706,19 @@ const EventTypePage = (props: EventTypeSetupProps) => {
              seatsShowAvailabilityCount,
              metadata,
              customInputs,
-            });
+            };
+            // Filter out undefined values
+            const filteredPayload = Object.entries(payload).reduce((acc, [key, value]) => {
+              if (value !== undefined) {
+                // @ts-expect-error Element implicitly has any type
+                acc[key] = value;
+              }
+              return acc;
+            }, {});
+
+            if (dirtyFieldExists) {
+              updateMutation.mutate({ ...filteredPayload, id: eventType.id });
+            }
          }}>
          <div ref={animationParentRef}>{tabMap[tabName]}</div>
        </Form>
@@ -7,6 +7,7 @@ import { handleUserRedirection } from "@calcom/features/booking-redirect/handle-
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { DEFAULT_DARK_BRAND_COLOR, DEFAULT_LIGHT_BRAND_COLOR } from "@calcom/lib/constants";
 import { getUsernameList } from "@calcom/lib/defaultEvents";
+import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
 import logger from "@calcom/lib/logger";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import { safeStringify } from "@calcom/lib/safeStringify";
@@ -206,7 +207,10 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont

  const profile = {
    name: user.name || user.username || "",
-    image: user.avatar,
+    image: getUserAvatarUrl({
+      ...user,
+      profile: user.profile,
+    }),
    theme: user.theme,
    brandColor: user.brandColor ?? DEFAULT_LIGHT_BRAND_COLOR,
    avatarUrl: user.avatarUrl,
@@ -155,7 +155,7 @@ export function UserPage(props: InferGetServerSidePropsType<typeof getServerSide
                    <Link
                      prefetch={false}
                      href={{
-                        pathname: `/${user.username}/${type.slug}`,
+                        pathname: `/${user.profile.username}/${type.slug}`,
                        query,
                      }}
                      passHref
@@ -1,6 +1,6 @@
 {
  "name": "@calcom/web",
-  "version": "3.8.0",
+  "version": "3.8.8",
  "private": true,
  "scripts": {
    "analyze": "ANALYZE=true next build",
@@ -10,6 +10,8 @@ const verifySchema = z.object({
  token: z.string(),
 });

+const USER_ALREADY_EXISTING_MESSAGE = "A User already exists with this email";
+
 export default async function handler(req: NextApiRequest, res: NextApiResponse) {
  const { token } = verifySchema.parse(req.query);

@@ -27,6 +29,23 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    return res.status(401).json({ message: "Token expired" });
  }

+  // The user is verifying the secondary email
+  if (foundToken?.secondaryEmailId) {
+    await prisma.secondaryEmail.update({
+      where: {
+        id: foundToken.secondaryEmailId,
+        email: foundToken?.identifier,
+      },
+      data: {
+        emailVerified: new Date(),
+      },
+    });
+
+    await cleanUpVerificationTokens(foundToken.id);
+
+    return res.redirect(`${WEBAPP_URL}/settings/my-account/profile`);
+  }
+
  const user = await prisma.user.findFirst({
    where: {
      email: foundToken?.identifier,
@@ -49,9 +68,25 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    });

    if (existingUser) {
-      return res.status(401).json({ message: "A User already exists with this email" });
+      return res.status(401).json({ message: USER_ALREADY_EXISTING_MESSAGE });
    }

+    // Ensure this email isn't being added by another user as secondary email
+    const existingSecondaryUser = await prisma.secondaryEmail.findUnique({
+      where: {
+        email: userMetadataParsed?.emailChangeWaitingForVerification,
+      },
+      select: {
+        id: true,
+        userId: true,
+      },
+    });
+
+    if (existingSecondaryUser && existingSecondaryUser.userId !== user.id) {
+      return res.status(401).json({ message: USER_ALREADY_EXISTING_MESSAGE });
+    }
+
+    const oldEmail = user.email;
    const updatedEmail = userMetadataParsed.emailChangeWaitingForVerification;
    delete userMetadataParsed.emailChangeWaitingForVerification;

@@ -66,6 +101,21 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
      },
    });

+    // The user is trying to update the email to an already existing unverified secondary email of his
+    // so we swap the emails and its verified status
+    if (existingSecondaryUser?.userId === user.id) {
+      await prisma.secondaryEmail.update({
+        where: {
+          id: existingSecondaryUser.id,
+          userId: user.id,
+        },
+        data: {
+          email: oldEmail,
+          emailVerified: user.emailVerified,
+        },
+      });
+    }
+
    await cleanUpVerificationTokens(foundToken.id);

    return res.status(200).json({
@@ -87,7 +137,7 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
  return res.redirect(`${WEBAPP_URL}/${hasCompletedOnboarding ? "/event-types" : "/getting-started"}`);
 }

-async function cleanUpVerificationTokens(id: number) {
+export async function cleanUpVerificationTokens(id: number) {
  // Delete token from DB after it has been used
  await prisma.verificationToken.delete({
    where: {
@@ -0,0 +1,73 @@
+import type { DirectorySyncEvent, DirectorySyncRequest } from "@boxyhq/saml-jackson";
+import type { NextApiRequest, NextApiResponse } from "next";
+
+import handleGroupEvents from "@calcom/features/ee/dsync/lib/handleGroupEvents";
+import handleUserEvents from "@calcom/features/ee/dsync/lib/handleUserEvents";
+import jackson from "@calcom/features/ee/sso/lib/jackson";
+import prisma from "@calcom/prisma";
+
+// This is the handler for the SCIM API requests
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const { dsyncController } = await jackson();
+
+  const { method, query, body } = req;
+
+  const [directoryId, path, resourceId] = query.directory as string[];
+
+  // Handle the SCIM API requests
+  const request: DirectorySyncRequest = {
+    method: method as string,
+    directoryId,
+    resourceId,
+    apiSecret: extractAuthToken(req),
+    resourceType: path === "Users" ? "users" : "groups",
+    body: body ? JSON.parse(body) : undefined,
+    query: {
+      count: req.query.count ? parseInt(req.query.count as string) : undefined,
+      startIndex: req.query.startIndex ? parseInt(req.query.startIndex as string) : undefined,
+      filter: req.query.filter as string,
+    },
+  };
+
+  const { status, data } = await dsyncController.requests.handle(request, handleEvents);
+
+  res.status(status).json(data);
+}
+
+// Fetch the auth token from the request headers
+export const extractAuthToken = (req: NextApiRequest): string | null => {
+  const authHeader = req.headers.authorization || null;
+
+  return authHeader ? authHeader.split(" ")[1] : null;
+};
+
+// Handle the SCIM events
+const handleEvents = async (event: DirectorySyncEvent) => {
+  const dSyncData = await prisma.dSyncData.findFirst({
+    where: {
+      directoryId: event.directory_id,
+    },
+    select: {
+      id: true,
+      organizationId: true,
+    },
+  });
+
+  if (!dSyncData) {
+    throw new Error("Directory sync data not found");
+  }
+
+  const { organizationId } = dSyncData;
+
+  if (!organizationId) {
+    throw new Error(`Org ID not found for dsync ${dSyncData.id}`);
+  }
+
+  if (event.event.includes("group")) {
+    handleGroupEvents(event, organizationId);
+  }
+
+  if (event.event === "user.created" || event.event === "user.updated") {
+    await handleUserEvents(event, organizationId);
+  }
+};
@@ -0,0 +1,4 @@
+import { createNextApiHandler } from "@calcom/trpc/server/createNextApiHandler";
+import { dsyncRouter } from "@calcom/trpc/server/routers/viewer/dsync/_router";
+
+export default createNextApiHandler(dsyncRouter);
@@ -2,6 +2,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
 import z from "zod";

 import { appStoreMetadata } from "@calcom/app-store/appStoreMetaData";
+import { CREDENTIAL_SYNC_SECRET, CREDENTIAL_SYNC_SECRET_HEADER_NAME } from "@calcom/lib/constants";
 import { APP_CREDENTIAL_SHARING_ENABLED } from "@calcom/lib/constants";
 import { symmetricDecrypt } from "@calcom/lib/crypto";
 import prisma from "@calcom/prisma";
@@ -19,11 +20,8 @@ export default async function handler(req: NextApiRequest, res: NextApiResponse)
    return res.status(403).json({ message: "Credential sharing is not enabled" });
  }

-  if (
-    req.headers[process.env.CALCOM_WEBHOOK_HEADER_NAME || "calcom-webhook-secret"] !==
-    process.env.CALCOM_WEBHOOK_SECRET
-  ) {
-    return res.status(403).json({ message: "Invalid webhook secret" });
+  if (req.headers[CREDENTIAL_SYNC_SECRET_HEADER_NAME] !== CREDENTIAL_SYNC_SECRET) {
+    return res.status(403).json({ message: "Invalid credential sync secret" });
  }

  const reqBody = appCredentialWebhookRequestBodySchema.parse(req.body);
@@ -95,6 +95,7 @@ const IntegrationsContainer = ({
              className="mb-6"
              actions={
                <Button
+                  data-testid="add-apps"
                  href={variant ? `/apps/categories/${variant}` : "/apps"}
                  color="secondary"
                  StartIcon={Plus}>
@@ -1,8 +1,9 @@
 import { useAutoAnimate } from "@formkit/auto-animate/react";
 import Link from "next/link";
 import { useRouter, usePathname } from "next/navigation";
-import { useCallback } from "react";
+import { useCallback, useState } from "react";

+import { BulkEditDefaultForEventsModal } from "@calcom/features/eventtypes/components/BulkEditDefaultForEventsModal";
 import { NewScheduleButton, ScheduleListItem } from "@calcom/features/schedules";
 import Shell from "@calcom/features/shell/Shell";
 import { AvailabilitySliderTable } from "@calcom/features/timezone-buddy/components/AvailabilitySliderTable";
@@ -21,6 +22,7 @@ import SkeletonLoader from "@components/availability/SkeletonLoader";

 export function AvailabilityList({ schedules }: RouterOutputs["viewer"]["availability"]["list"]) {
  const { t } = useLocale();
+  const [bulkUpdateModal, setBulkUpdateModal] = useState(false);
  const utils = trpc.useContext();

  const meQuery = trpc.viewer.me.useQuery();
@@ -65,6 +67,7 @@ export function AvailabilityList({ schedules }: RouterOutputs["viewer"]["availab
        }),
        "success"
      );
+      setBulkUpdateModal(true);
    },
    onError: (err) => {
      if (err instanceof HttpError) {
@@ -74,6 +77,15 @@ export function AvailabilityList({ schedules }: RouterOutputs["viewer"]["availab
    },
  });

+  const bulkUpdateDefaultAvailabilityMutation =
+    trpc.viewer.availability.schedule.bulkUpdateToDefaultAvailability.useMutation({
+      onSuccess: () => {
+        utils.viewer.availability.list.invalidate();
+        setBulkUpdateModal(false);
+        showToast(t("success"), "success");
+      },
+    });
+
  const duplicateMutation = trpc.viewer.availability.schedule.duplicate.useMutation({
    onSuccess: async ({ schedule }) => {
      await router.push(`/availability/${schedule.id}`);
@@ -129,6 +141,14 @@ export function AvailabilityList({ schedules }: RouterOutputs["viewer"]["availab
              {t("add_a_redirect")}
            </Link>
          </div>
+          {bulkUpdateModal && (
+            <BulkEditDefaultForEventsModal
+              isPending={bulkUpdateDefaultAvailabilityMutation.isPending}
+              open={bulkUpdateModal}
+              setOpen={setBulkUpdateModal}
+              bulkUpdateFunction={bulkUpdateDefaultAvailabilityMutation.mutate}
+            />
+          )}
        </>
      )}
    </>
@@ -7,9 +7,9 @@ export type {
  CustomInputParsed,
  EventTypeSetup,
  EventTypeSetupProps,
-  FormValues,
  Host,
 } from "~/event-types/views/event-types-single-view";
+export type { FormValues } from "@calcom/features/eventtypes/lib/types";

 EventTypePageWrapper.PageWrapper = PageWrapper;

@@ -11,8 +11,10 @@ import { getLayout } from "@calcom/features/settings/layouts/SettingsLayout";
 import { APP_NAME } from "@calcom/lib/constants";
 import { DEFAULT_LIGHT_BRAND_COLOR, DEFAULT_DARK_BRAND_COLOR } from "@calcom/lib/constants";
 import { checkWCAGContrastColor } from "@calcom/lib/getBrandColours";
+import useGetBrandingColours from "@calcom/lib/getBrandColours";
 import { useHasPaidPlan } from "@calcom/lib/hooks/useHasPaidPlan";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import useTheme from "@calcom/lib/hooks/useTheme";
 import { validateBookerLayouts } from "@calcom/lib/validateBookerLayouts";
 import type { userMetadata } from "@calcom/prisma/zod-utils";
 import { trpc } from "@calcom/trpc/react";
@@ -29,6 +31,7 @@ import {
  SkeletonText,
  SettingsToggle,
  UpgradeTeamsBadge,
+  useCalcomTheme,
 } from "@calcom/ui";

 import PageWrapper from "@components/PageWrapper";
@@ -41,10 +44,10 @@ const SkeletonLoader = ({ title, description }: { title: string; description: st
        <SkeletonText className="h-8 w-1/3" />
      </div>
      <div className="border-subtle space-y-6 border-x px-4 py-6 sm:px-6">
-        <div className="flex items-center justify-center">
-          <SkeletonButton className="mr-6 h-32 w-48 rounded-md p-5" />
-          <SkeletonButton className="mr-6 h-32 w-48 rounded-md p-5" />
-          <SkeletonButton className="mr-6 h-32 w-48 rounded-md p-5" />
+        <div className="[&>*]:bg-emphasis flex w-full items-center justify-center gap-x-2 [&>*]:animate-pulse">
+          <div className="h-32 flex-1 rounded-md p-5" />
+          <div className="h-32 flex-1 rounded-md p-5" />
+          <div className="h-32 flex-1 rounded-md p-5" />
        </div>
        <div className="flex justify-between">
          <SkeletonText className="h-8 w-1/3" />
@@ -62,6 +65,26 @@ const SkeletonLoader = ({ title, description }: { title: string; description: st
  );
 };

+const useBrandColors = (
+  currentTheme: string | null,
+  {
+    brandColor,
+    darkBrandColor,
+  }: {
+    brandColor?: string | null;
+    darkBrandColor?: string | null;
+  }
+): void => {
+  const brandTheme = useGetBrandingColours({
+    lightVal: brandColor,
+    darkVal: darkBrandColor,
+  });
+  const selectedTheme = currentTheme ? brandTheme[currentTheme as "light" | "dark"] : {};
+  useCalcomTheme({
+    root: selectedTheme,
+  });
+};
+
 const AppearanceView = ({
  user,
  hasPaidPlan,
@@ -77,6 +100,22 @@ const AppearanceView = ({
    user?.brandColor !== DEFAULT_LIGHT_BRAND_COLOR || user?.darkBrandColor !== DEFAULT_DARK_BRAND_COLOR
  );
  const [hideBrandingValue, setHideBrandingValue] = useState(user?.hideBranding ?? false);
+  useTheme(user?.appTheme);
+  useBrandColors(user?.appTheme ?? null, {
+    brandColor: user?.brandColor,
+    darkBrandColor: user?.darkBrandColor,
+  });
+
+  const userAppThemeFormMethods = useForm({
+    defaultValues: {
+      appTheme: user.appTheme,
+    },
+  });
+
+  const {
+    formState: { isSubmitting: isUserAppThemeSubmitting, isDirty: isUserAppThemeDirty },
+    reset: resetUserAppThemeReset,
+  } = userAppThemeFormMethods;

  const userThemeFormMethods = useForm({
    defaultValues: {
@@ -131,6 +170,7 @@ const AppearanceView = ({
      resetBrandColorsThemeReset({ brandColor: data.brandColor, darkBrandColor: data.darkBrandColor });
      resetBookerLayoutThemeReset({ metadata: data.metadata });
      resetUserThemeReset({ theme: data.theme });
+      resetUserAppThemeReset({ appTheme: data.appTheme });
    },
    onError: (error) => {
      if (error.message) {
@@ -147,6 +187,56 @@ const AppearanceView = ({
  return (
    <div>
      <Meta title={t("appearance")} description={t("appearance_description")} borderInShellHeader={false} />
+      <div className="border-subtle mt-6 flex items-center rounded-t-lg border p-6 text-sm">
+        <div>
+          <p className="text-default text-base font-semibold">{t("app_theme")}</p>
+          <p className="text-default">{t("app_theme_applies_note")}</p>
+        </div>
+      </div>
+      <Form
+        form={userAppThemeFormMethods}
+        handleSubmit={(values) => {
+          mutation.mutate({
+            appTheme: values.appTheme ?? null,
+          });
+        }}>
+        <div className="border-subtle flex flex-col justify-between border-x px-6 py-8 sm:flex-row">
+          <ThemeLabel
+            variant="system"
+            value={undefined}
+            label={t("theme_system")}
+            defaultChecked={user.appTheme === null}
+            register={userAppThemeFormMethods.register}
+            fieldName="appTheme"
+          />
+          <ThemeLabel
+            variant="light"
+            value="light"
+            label={t("light")}
+            defaultChecked={user.appTheme === "light"}
+            register={userAppThemeFormMethods.register}
+            fieldName="appTheme"
+          />
+          <ThemeLabel
+            variant="dark"
+            value="dark"
+            label={t("dark")}
+            defaultChecked={user.appTheme === "dark"}
+            register={userAppThemeFormMethods.register}
+            fieldName="appTheme"
+          />
+        </div>
+        <SectionBottomActions className="mb-6" align="end">
+          <Button
+            disabled={isUserAppThemeSubmitting || !isUserAppThemeDirty}
+            type="submit"
+            data-testid="update-app-theme-btn"
+            color="primary">
+            {t("update")}
+          </Button>
+        </SectionBottomActions>
+      </Form>
+
      <div className="border-subtle mt-6 flex items-center rounded-t-lg border p-6 text-sm">
        <div>
          <p className="text-default text-base font-semibold">{t("theme")}</p>
@@ -1,10 +1,12 @@
 "use client";

 import { zodResolver } from "@hookform/resolvers/zod";
+// eslint-disable-next-line no-restricted-imports
+import { pick, get } from "lodash";
 import { signOut, useSession } from "next-auth/react";
 import type { BaseSyntheticEvent } from "react";
 import React, { useRef, useState } from "react";
-import { Controller, useForm } from "react-hook-form";
+import { Controller, useForm, useFieldArray } from "react-hook-form";
 import { z } from "zod";

 import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
@@ -43,10 +45,13 @@ import {
  TextField,
 } from "@calcom/ui";
 import { UserAvatar } from "@calcom/ui";
-import { AlertTriangle, Trash2 } from "@calcom/ui/components/icon";
+import { AlertTriangle, Trash2, Plus } from "@calcom/ui/components/icon";

 import PageWrapper from "@components/PageWrapper";
 import TwoFactor from "@components/auth/TwoFactor";
+import CustomEmailTextField from "@components/settings/CustomEmailTextField";
+import SecondaryEmailConfirmModal from "@components/settings/SecondaryEmailConfirmModal";
+import SecondaryEmailModal from "@components/settings/SecondaryEmailModal";
 import { UsernameAvailabilityField } from "@components/ui/UsernameAvailability";

 const SkeletonLoader = ({ title, description }: { title: string; description: string }) => {
@@ -72,12 +77,20 @@ interface DeleteAccountValues {
  totpCode: string;
 }

-type FormValues = {
+type Email = {
+  id: number;
+  email: string;
+  emailVerified: string | null;
+  emailPrimary: boolean;
+};
+
+export type FormValues = {
  username: string;
  avatar: string;
  name: string;
  email: string;
  bio: string;
+  secondaryEmails: Email[];
 };

 const ProfileView = () => {
@@ -126,11 +139,27 @@ const ProfileView = () => {
    },
  });

+  const addSecondaryEmailMutation = trpc.viewer.addSecondaryEmail.useMutation({
+    onSuccess: (res) => {
+      setShowSecondaryEmailModalOpen(false);
+      setNewlyAddedSecondaryEmail(res?.data?.email);
+      utils.viewer.me.invalidate();
+    },
+    onError: (error) => {
+      setSecondaryEmailAddErrorMessage(error?.message || "");
+    },
+  });
+
+  const resendVerifyEmailMutation = trpc.viewer.auth.resendVerifyEmail.useMutation();
+
  const [confirmPasswordOpen, setConfirmPasswordOpen] = useState(false);
-  const [tempFormValues, setTempFormValues] = useState<FormValues | null>(null);
+  const [tempFormValues, setTempFormValues] = useState<ExtendedFormValues | null>(null);
  const [confirmPasswordErrorMessage, setConfirmPasswordDeleteErrorMessage] = useState("");
  const [confirmAuthEmailChangeWarningDialogOpen, setConfirmAuthEmailChangeWarningDialogOpen] =
    useState(false);
+  const [showSecondaryEmailModalOpen, setShowSecondaryEmailModalOpen] = useState(false);
+  const [secondaryEmailAddErrorMessage, setSecondaryEmailAddErrorMessage] = useState("");
+  const [newlyAddedSecondaryEmail, setNewlyAddedSecondaryEmail] = useState<undefined | string>(undefined);

  const [deleteAccountOpen, setDeleteAccountOpen] = useState(false);
  const [hasDeleteErrors, setHasDeleteErrors] = useState(false);
@@ -232,6 +261,7 @@ const ProfileView = () => {
    );
  }

+  const userEmail = user.email || "";
  const defaultValues = {
    username: user.username || "",
    avatar: getUserAvatarUrl({
@@ -239,8 +269,22 @@ const ProfileView = () => {
      profile: user.profile,
    }),
    name: user.name || "",
-    email: user.email || "",
+    email: userEmail,
    bio: user.bio || "",
+    // We add the primary email as the first item in the list
+    secondaryEmails: [
+      {
+        id: 0,
+        email: userEmail,
+        emailVerified: user.emailVerified?.toString() || null,
+        emailPrimary: true,
+      },
+      ...(user.secondaryEmails || []).map((secondaryEmail) => ({
+        ...secondaryEmail,
+        emailVerified: secondaryEmail.emailVerified?.toString() || null,
+        emailPrimary: false,
+      })),
+    ],
  };

  return (
@@ -269,6 +313,11 @@ const ProfileView = () => {
            updateProfileMutation.mutate(values);
          }
        }}
+        handleAddSecondaryEmail={() => setShowSecondaryEmailModalOpen(true)}
+        handleResendVerifyEmail={(email) => {
+          resendVerifyEmailMutation.mutate({ email });
+          showToast(t("email_sent"), "success");
+        }}
        extraField={
          <div className="mt-6">
            <UsernameAvailabilityField
@@ -374,7 +423,7 @@ const ProfileView = () => {
          </div>
          <DialogFooter showDivider>
            <Button
-              data-testId="profile-update-email-submit-button"
+              data-testid="profile-update-email-submit-button"
              color="primary"
              loading={confirmPasswordMutation.isPending}
              onClick={(e) => onConfirmPassword(e)}>
@@ -405,13 +454,50 @@ const ProfileView = () => {
          </DialogFooter>
        </DialogContent>
      </Dialog>
+
+      {showSecondaryEmailModalOpen && (
+        <SecondaryEmailModal
+          isLoading={addSecondaryEmailMutation.isPending}
+          errorMessage={secondaryEmailAddErrorMessage}
+          handleAddEmail={(values) => {
+            setSecondaryEmailAddErrorMessage("");
+            addSecondaryEmailMutation.mutate(values);
+          }}
+          onCancel={() => {
+            setSecondaryEmailAddErrorMessage("");
+            setShowSecondaryEmailModalOpen(false);
+          }}
+          clearErrorMessage={() => {
+            addSecondaryEmailMutation.reset();
+            setSecondaryEmailAddErrorMessage("");
+          }}
+        />
+      )}
+      {!!newlyAddedSecondaryEmail && (
+        <SecondaryEmailConfirmModal
+          email={newlyAddedSecondaryEmail}
+          onCancel={() => setNewlyAddedSecondaryEmail(undefined)}
+        />
+      )}
    </>
  );
 };

+type SecondaryEmailApiPayload = {
+  id: number;
+  email: string;
+  isDeleted: boolean;
+};
+
+type ExtendedFormValues = Omit<FormValues, "secondaryEmails"> & {
+  secondaryEmails: SecondaryEmailApiPayload[];
+};
+
 const ProfileForm = ({
  defaultValues,
  onSubmit,
+  handleAddSecondaryEmail,
+  handleResendVerifyEmail,
  extraField,
  isPending = false,
  isFallbackImg,
@@ -419,7 +505,9 @@ const ProfileForm = ({
  userOrganization,
 }: {
  defaultValues: FormValues;
-  onSubmit: (values: FormValues) => void;
+  onSubmit: (values: ExtendedFormValues) => void;
+  handleAddSecondaryEmail: () => void;
+  handleResendVerifyEmail: (email: string) => void;
  extraField?: React.ReactNode;
  isPending: boolean;
  isFallbackImg: boolean;
@@ -441,6 +529,14 @@ const ProfileForm = ({
      }),
    email: z.string().email(),
    bio: z.string(),
+    secondaryEmails: z.array(
+      z.object({
+        id: z.number(),
+        email: z.string().email(),
+        emailVerified: z.union([z.string(), z.null()]).optional(),
+        emailPrimary: z.boolean().optional(),
+      })
+    ),
  });

  const formMethods = useForm<FormValues>({
@@ -448,13 +544,61 @@ const ProfileForm = ({
    resolver: zodResolver(profileFormSchema),
  });

+  const {
+    fields: secondaryEmailFields,
+    remove: deleteSecondaryEmail,
+    replace: updateAllSecondaryEmailFields,
+  } = useFieldArray({
+    control: formMethods.control,
+    name: "secondaryEmails",
+    keyName: "itemId",
+  });
+
+  const handleFormSubmit = (values: FormValues) => {
+    const changedFields = formMethods.formState.dirtyFields?.secondaryEmails || [];
+    const updatedValues: FormValues = {
+      ...values,
+    };
+
+    // If the primary email is changed, we will need to update
+    const primaryEmailIndex = updatedValues.secondaryEmails.findIndex(
+      (secondaryEmail) => secondaryEmail.emailPrimary
+    );
+    if (primaryEmailIndex >= 0) {
+      // Add the new updated value as primary email
+      updatedValues.email = updatedValues.secondaryEmails[primaryEmailIndex].email;
+    }
+
+    // We will only send the emails which have already changed
+    const updatedEmails: Email[] = [];
+    changedFields.map((field, index) => {
+      // If the email changed and if its only secondary email, we add it for updation, the first
+      // item in the list is always primary email
+      if (field?.email && updatedValues.secondaryEmails[index]?.id) {
+        updatedEmails.push(updatedValues.secondaryEmails[index]);
+      }
+    });
+
+    const deletedEmails = (user?.secondaryEmails || []).filter(
+      (secondaryEmail) => !updatedValues.secondaryEmails.find((val) => val.id && val.id === secondaryEmail.id)
+    );
+    const secondaryEmails = [
+      ...updatedEmails.map((email) => ({ ...email, isDeleted: false })),
+      ...deletedEmails.map((email) => ({ ...email, isDeleted: true })),
+    ].map((secondaryEmail) => pick(secondaryEmail, ["id", "email", "isDeleted"]));
+    onSubmit({
+      ...updatedValues,
+      secondaryEmails,
+    });
+  };
+
  const {
    formState: { isSubmitting, isDirty },
  } = formMethods;

  const isDisabled = isSubmitting || !isDirty;
  return (
-    <Form form={formMethods} handleSubmit={onSubmit}>
+    <Form form={formMethods} handleSubmit={handleFormSubmit}>
      <div className="border-subtle border-x px-4 pb-10 pt-8 sm:px-6">
        <div className="flex items-center">
          <Controller
@@ -508,12 +652,36 @@ const ProfileForm = ({
          <TextField label={t("full_name")} {...formMethods.register("name")} />
        </div>
        <div className="mt-6">
-          <TextField
-            label={t("email")}
-            hint={t("change_email_hint")}
-            data-testId="profile-form-email"
-            {...formMethods.register("email")}
-          />
+          <Label>{t("email")}</Label>
+          {secondaryEmailFields.map((field, index) => (
+            <CustomEmailTextField
+              key={field.itemId}
+              formMethods={formMethods}
+              formMethodFieldName={`secondaryEmails.${index}.email` as keyof FormValues}
+              errorMessage={get(formMethods.formState.errors, `secondaryEmails.${index}.email.message`)}
+              emailVerified={Boolean(field.emailVerified)}
+              emailPrimary={field.emailPrimary}
+              dataTestId={`profile-form-email-${index}`}
+              handleChangePrimary={() => {
+                const fields = secondaryEmailFields.map((secondaryField, cIndex) => ({
+                  ...secondaryField,
+                  emailPrimary: cIndex === index,
+                }));
+                updateAllSecondaryEmailFields(fields);
+              }}
+              handleVerifyEmail={() => handleResendVerifyEmail(field.email)}
+              handleItemDelete={() => deleteSecondaryEmail(index)}
+            />
+          ))}
+          <div className="text-default mt-2 flex items-center text-sm">{t("change_email_hint")}</div>
+          <Button
+            color="minimal"
+            StartIcon={Plus}
+            className="mt-2"
+            onClick={() => handleAddSecondaryEmail()}
+            data-testid="add-secondary-email">
+            {t("add_email")}
+          </Button>
        </div>
        <div className="mt-6">
          <Label>{t("about")}</Label>
@@ -535,7 +703,7 @@ const ProfileForm = ({
          disabled={isDisabled}
          color="primary"
          type="submit"
-          data-testId="profile-submit-button">
+          data-testid="profile-submit-button">
          {t("update")}
        </Button>
      </SectionBottomActions>
@@ -0,0 +1,9 @@
+import DirectorySyncTeamView from "@calcom/features/ee/dsync/page/team-dsync-view";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = DirectorySyncTeamView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
@@ -0,0 +1,9 @@
+import PrivacyView from "@calcom/features/ee/organizations/pages/settings/privacy";
+
+import type { CalPageWrapper } from "@components/PageWrapper";
+import PageWrapper from "@components/PageWrapper";
+
+const Page = PrivacyView as CalPageWrapper;
+Page.PageWrapper = PageWrapper;
+
+export default Page;
@@ -1,22 +1,63 @@
 "use client";

 import Head from "next/head";
+import { useRouter } from "next/navigation";
+import { z } from "zod";

 import { CreateANewTeamForm } from "@calcom/features/ee/teams/components";
+import { HOSTED_CAL_FEATURES } from "@calcom/lib/constants";
+import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
+import { telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
+import type { RouterOutputs } from "@calcom/trpc/react";
 import { WizardLayout } from "@calcom/ui";

 import PageWrapper from "@components/PageWrapper";

+const querySchema = z.object({
+  returnTo: z.string().optional(),
+  slug: z.string().optional(),
+});
+
 const CreateNewTeamPage = () => {
  const { t } = useLocale();
+  const params = useParamsWithFallback();
+  const parsedQuery = querySchema.safeParse(params);
+  const router = useRouter();
+  const telemetry = useTelemetry();
+
+  const isTeamBillingEnabledClient = !!process.env.NEXT_PUBLIC_STRIPE_PUBLIC_KEY && HOSTED_CAL_FEATURES;
+  const flag = isTeamBillingEnabledClient
+    ? {
+        telemetryEvent: telemetryEventTypes.team_checkout_session_created,
+        submitLabel: "checkout",
+      }
+    : {
+        telemetryEvent: telemetryEventTypes.team_created,
+        submitLabel: "continue",
+      };
+
+  const returnToParam =
+    (parsedQuery.success ? getSafeRedirectUrl(parsedQuery.data.returnTo) : "/teams") || "/teams";
+
+  const onSuccess = (data: RouterOutputs["viewer"]["teams"]["create"]) => {
+    telemetry.event(flag.telemetryEvent);
+    router.push(data.url);
+  };
+
  return (
    <>
      <Head>
        <title>{t("create_new_team")}</title>
        <meta name="description" content={t("create_new_team_description")} />
      </Head>
-      <CreateANewTeamForm />
+      <CreateANewTeamForm
+        slug={parsedQuery.success ? parsedQuery.data.slug : ""}
+        onCancel={() => router.push(returnToParam)}
+        submitLabel={flag.submitLabel}
+        onSuccess={onSuccess}
+      />
    </>
  );
 };
@@ -20,6 +20,7 @@ import { useFlagMap } from "@calcom/features/flags/context/provider";
 import { classNames } from "@calcom/lib";
 import { APP_NAME, URL_PROTOCOL_REGEX, IS_CALCOM, WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import { fetchUsername } from "@calcom/lib/fetchUsername";
+import { pushGTMEvent } from "@calcom/lib/gtm";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { useDebounce } from "@calcom/lib/hooks/useDebounce";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -159,11 +160,11 @@ export default function Signup({
  isGoogleLoginEnabled,
  isSAMLLoginEnabled,
  orgAutoAcceptEmail,
+  redirectUrl,
 }: SignupProps) {
  const [premiumUsername, setPremiumUsername] = useState(false);
  const [usernameTaken, setUsernameTaken] = useState(false);
  const [isGoogleLoading, setIsGoogleLoading] = useState(false);
-
  const searchParams = useCompatSearchParams();
  const telemetry = useTelemetry();
  const { t, i18n } = useLocale();
@@ -180,6 +181,12 @@ export default function Signup({
    formState: { isSubmitting, errors, isSubmitSuccessful },
  } = formMethods;

+  useEffect(() => {
+    if (redirectUrl) {
+      localStorage.setItem("onBoardingRedirect", redirectUrl);
+    }
+  }, [redirectUrl]);
+
  const loadingSubmitState = isSubmitSuccessful || isSubmitting;

  const handleErrorsAndStripe = async (resp: Response) => {
@@ -216,6 +223,9 @@ export default function Signup({
    })
      .then(handleErrorsAndStripe)
      .then(async () => {
+        if (process.env.NEXT_PUBLIC_GTM_ID)
+          pushGTMEvent("create_account", { email: data.email, user: data.username, lang: data.language });
+
        telemetry.event(telemetryEventTypes.signup, collectPageParameters());
        const verifyOrGettingStarted = flags["email-verification"] ? "auth/verify-email" : "getting-started";
        const callBackUrl = `${
@@ -13,7 +13,7 @@ import { useEffect } from "react";

 import { sdkActionManager, useIsEmbed } from "@calcom/embed-core/embed-iframe";
 import EventTypeDescription from "@calcom/features/eventtypes/components/EventTypeDescription";
-import { WEBAPP_URL } from "@calcom/lib/constants";
+import { getOrgAvatarUrl, getTeamAvatarUrl } from "@calcom/lib/getAvatarUrl";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
 import useTheme from "@calcom/lib/hooks/useTheme";
@@ -50,6 +50,8 @@ function TeamPage({
  const isBioEmpty = !team.bio || !team.bio.replace("<p><br></p>", "").length;
  const metadata = teamMetadataSchema.parse(team.metadata);

+  const teamOrOrgIsPrivate = team.isPrivate || (team?.parent?.isOrganization && team.parent?.isPrivate);
+
  useEffect(() => {
    telemetry.event(
      telemetryEventTypes.pageView,
@@ -62,7 +64,7 @@ function TeamPage({
    return (
      <div className="flex h-full min-h-[100dvh] items-center justify-center">
        <UnpublishedEntity
-          {...(metadata?.isOrganization || team.parentId ? { orgSlug: slug } : { teamSlug: slug })}
+          {...(team?.isOrganization || team.parentId ? { orgSlug: slug } : { teamSlug: slug })}
          name={teamName}
        />
      </div>
@@ -123,7 +125,7 @@ function TeamPage({
            (mem) => mem.subteams?.includes(ch.slug) && mem.accepted
          ).length;
          return (
-            <li key={i} className="hover:bg-muted w-full">
+            <li key={i} className="hover:bg-muted w-full rounded-md">
              <Link href={`/${ch.slug}`} className="flex items-center justify-between">
                <div className="flex items-center px-5 py-5">
                  <div className="ms-3 inline-block truncate">
@@ -157,6 +159,11 @@ function TeamPage({
      </div>
    );

+  const profileImageSrc =
+    isValidOrgDomain || team.isOrganization
+      ? getOrgAvatarUrl({ slug: currentOrgDomain, logoUrl: team.logoUrl })
+      : getTeamAvatarUrl({ slug: team.slug, logoUrl: team.logoUrl, organizationId: team.parent?.id });
+
  return (
    <>
      <HeadSeo
@@ -166,22 +173,14 @@ function TeamPage({
          title: markdownStrippedBio,
          profile: {
            name: `${team.name}`,
-            image: `${WEBAPP_URL}/${team.metadata?.isOrganization ? "org" : "team"}/${team.slug}/avatar.png`,
+            image: profileImageSrc,
          },
        }}
      />
      <main className="dark:bg-darkgray-50 bg-subtle mx-auto max-w-3xl rounded-md px-4 pb-12 pt-12">
        <div className="mx-auto mb-8 max-w-3xl text-center">
          <div className="relative">
-            <Avatar
-              alt={teamName}
-              imageSrc={
-                isValidOrgDomain
-                  ? `/org/${currentOrgDomain}/avatar.png`
-                  : `${WEBAPP_URL}/${team.metadata?.isOrganization ? "org" : "team"}/${team.slug}/avatar.png`
-              }
-              size="lg"
-            />
+            <Avatar alt={teamName} imageSrc={profileImageSrc} size="lg" />
          </div>
          <p className="font-cal  text-emphasis mb-2 text-2xl tracking-wider" data-testid="team-name">
            {team.parent && `${team.parent.name} `}
@@ -196,12 +195,18 @@ function TeamPage({
            </>
          )}
        </div>
-        {metadata?.isOrganization ? (
-          <SubTeams />
+        {team.isOrganization ? (
+          !teamOrOrgIsPrivate ? (
+            <SubTeams />
+          ) : (
+            <div className="w-full text-center">
+              <h2 className="text-emphasis font-semibold">{t("you_cannot_see_teams_of_org")}</h2>
+            </div>
+          )
        ) : (
          <>
            {(showMembers.isOn || !team.eventTypes?.length) &&
-              (team.isPrivate ? (
+              (teamOrOrgIsPrivate ? (
                <div className="w-full text-center">
                  <h2 data-testid="you-cannot-see-team-members" className="text-emphasis font-semibold">
                    {t("you_cannot_see_team_members")}
@@ -215,7 +220,7 @@ function TeamPage({
                <EventTypes eventTypes={team.eventTypes} />

                {/* Hide "Book a team member button when team is private or hideBookATeamMember is true" */}
-                {!team.hideBookATeamMember && !team.isPrivate && (
+                {!team.hideBookATeamMember && !teamOrOrgIsPrivate && (
                  <div>
                    <div className="relative mt-12">
                      <div className="absolute inset-0 flex items-center" aria-hidden="true">
@@ -25,6 +25,7 @@ export const getMultipleDurationValue = (
  if (multipleDurationConfig.includes(Number(queryDuration))) return Number(queryDuration);
  return defaultValue;
 };
+
 export default function Type({
  slug,
  user,
@@ -34,6 +35,7 @@ export default function Type({
  isBrandingHidden,
  eventData,
  isInstantMeeting,
+  orgBannerUrl,
 }: PageProps) {
  const searchParams = useSearchParams();

@@ -66,6 +68,7 @@ export default function Type({
          searchParams?.get("duration"),
          eventData.length
        )}
+        orgBannerUrl={orgBannerUrl}
      />
    </main>
  );
@@ -0,0 +1,35 @@
+import { loginUser } from "../../fixtures/regularBookings";
+import { test } from "../../lib/fixtures";
+
+const ALL_APPS = ["fathom", "matomo", "plausible", "ga4", "gtm", "metapixel"];
+
+test.describe("Check analytics Apps", () => {
+  test.beforeEach(async ({ page, users }) => {
+    await loginUser(users);
+    await page.goto("/apps/");
+  });
+
+  test("Check analytics Apps", async ({ appsPage, page }) => {
+    await appsPage.goToAppsCategory("analytics");
+    await appsPage.installApp("fathom");
+    await appsPage.goBackToAppsPage();
+    await appsPage.installApp("matomo");
+    await appsPage.goBackToAppsPage();
+    await appsPage.installApp("plausible");
+    await appsPage.goBackToAppsPage();
+    await appsPage.installApp("ga4");
+    await appsPage.goBackToAppsPage();
+    await appsPage.installApp("gtm");
+    await appsPage.goBackToAppsPage();
+    await appsPage.installApp("metapixel");
+    await appsPage.goBackToAppsPage();
+    await page.goto("/event-types");
+    await appsPage.goToEventType("30 min");
+    await appsPage.goToAppsTab();
+    await appsPage.verifyAppsInfo(0);
+    for (const app of ALL_APPS) {
+      await appsPage.activeApp(app);
+    }
+    await appsPage.verifyAppsInfo(6);
+  });
+});
@@ -175,6 +175,35 @@ testBothFutureAndLegacyRoutes.describe("pro user", () => {
    await expect(page.locator('[data-testid="empty-screen"]')).toBeVisible();
  });

+  test("can book an unconfirmed event multiple times", async ({ page, users }) => {
+    await page.locator('[data-testid="event-type-link"]:has-text("Opt in")').click();
+    await selectFirstAvailableTimeSlotNextMonth(page);
+
+    const pageUrl = page.url();
+
+    await bookTimeSlot(page);
+    await expect(page.locator("[data-testid=success-page]")).toBeVisible();
+
+    // go back to the booking page to re-book.
+    await page.goto(pageUrl);
+    await bookTimeSlot(page, { email: "test2@example.com" });
+    await expect(page.locator("[data-testid=success-page]")).toBeVisible();
+  });
+
+  test("cannot book an unconfirmed event multiple times with the same email", async ({ page, users }) => {
+    await page.locator('[data-testid="event-type-link"]:has-text("Opt in")').click();
+    await selectFirstAvailableTimeSlotNextMonth(page);
+
+    const pageUrl = page.url();
+
+    await bookTimeSlot(page);
+    // go back to the booking page to re-book.
+    await page.goto(pageUrl);
+
+    await bookTimeSlot(page);
+    await expect(page.getByText("Could not book the meeting.")).toBeVisible();
+  });
+
  test("can book with multiple guests", async ({ page, users }) => {
    const additionalGuests = ["test@gmail.com", "test2@gmail.com"];

@@ -1,483 +0,0 @@
-import { loginUser } from "../../fixtures/regularBookings";
-import { test } from "../../lib/fixtures";
-
-test.describe("Booking With Address Question and Each Other Question", () => {
-  const bookingOptions = { hasPlaceholder: true, isRequired: true };
-
-  test.beforeEach(async ({ page, users }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-  });
-
-  test.describe("Booking With Address Question and Checkbox Group Question", () => {
-    test("Address required and checkbox group required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Checkbox Group question (both required)",
-        secondQuestion: "checkbox",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Address and checkbox group not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Checkbox Group question (only address required)",
-        secondQuestion: "checkbox",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Address Question and Checkbox Question", () => {
-    test("Address required and checkbox required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Checkbox question (both required)",
-        secondQuestion: "boolean",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Addres and checkbox not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Checkbox question (only address required)",
-        secondQuestion: "boolean",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Address Question and Long text Question", () => {
-    test("Addres required and Long Text required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Long Text question (both required)",
-        secondQuestion: "textarea",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Address and Long Text not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", false, "textarea test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Long Text question (only address required)",
-        secondQuestion: "textarea",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Address Question and Multi email Question", () => {
-    test("Address required and Multi email required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Multiemail question (both required)",
-        secondQuestion: "multiemail",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Address and Multi email not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        false,
-        "multiemail test"
-      );
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Multiemail question (only address required)",
-        secondQuestion: "multiemail",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Address Question and multiselect Question", () => {
-    test("Address required and multiselect text required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Multi Select question (both required)",
-        secondQuestion: "multiselect",
-        options: { ...bookingOptions, isMultiSelect: true },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Address and multiselect text not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Multi Select question (only address required)",
-        secondQuestion: "multiselect",
-        options: { ...bookingOptions, isMultiSelect: true, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Address Question and Number Question", () => {
-    test("Address required and Number required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("number", "number-test", "number test", true, "number test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Number question (both required)",
-        secondQuestion: "number",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Address and Number not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("number", "number-test", "number test", false, "number test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Number question (only address required)",
-        secondQuestion: "number",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Address Question and Phone Question", () => {
-    test("Address required and Phone required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone-test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Multi Select question (both required)",
-        secondQuestion: "phone",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Address and Phone not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", false, "phone-test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Multi Select question (only address required)",
-        secondQuestion: "phone",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Address Question and Radio group Question", () => {
-    test("Address required and Radio group required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Radio question (both required)",
-        secondQuestion: "radio",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Address and Radio group not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Radio question (only address required)",
-        secondQuestion: "radio",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Address Question and select Question", () => {
-    test("Address required and select required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Select question (both required)",
-        secondQuestion: "select",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Address and select not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("select", "select-test", "select test", false, "select test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Select question (both required)",
-        secondQuestion: "select",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Address Question and Short text question", () => {
-    test("Address required and Short text required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("text", "text-test", "text test", true, "text test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Multi Select question (both required)",
-        secondQuestion: "text",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Address and Short text not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.addQuestion("text", "text-test", "text test", false, "text test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "address",
-        fillText: "Test Address question and Multi Select question (only address required)",
-        secondQuestion: "text",
-        options: { ...bookingOptions, isRequired: true },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-});
@@ -1,110 +0,0 @@
-/* eslint-disable playwright/no-conditional-in-test */
-import { loginUser } from "../fixtures/regularBookings";
-import { test } from "../lib/fixtures";
-
-test.describe("Booking With All Questions", () => {
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-  });
-
-  const bookingOptions = { isAllRequired: true };
-
-  test("Selecting and filling all questions as required", async ({ bookingPage }) => {
-    const allQuestions = [
-      "phone",
-      "address",
-      "checkbox",
-      "boolean",
-      "textarea",
-      "multiemail",
-      "multiselect",
-      "number",
-      "radio",
-      "select",
-      "text",
-    ];
-    for (const question of allQuestions) {
-      if (
-        question !== "number" &&
-        question !== "select" &&
-        question !== "checkbox" &&
-        question !== "boolean" &&
-        question !== "multiselect" &&
-        question !== "radio"
-      ) {
-        await bookingPage.addQuestion(
-          question,
-          `${question}-test`,
-          `${question} test`,
-          true,
-          `${question} test`
-        );
-      } else {
-        await bookingPage.addQuestion(question, `${question}-test`, `${question} test`, true);
-      }
-      await bookingPage.checkField(question);
-    }
-
-    await bookingPage.updateEventType();
-    const eventTypePage = await bookingPage.previewEventType();
-    await bookingPage.selectTimeSlot(eventTypePage);
-    await bookingPage.fillAllQuestions(eventTypePage, allQuestions, bookingOptions);
-    await bookingPage.rescheduleBooking(eventTypePage);
-    await bookingPage.assertBookingRescheduled(eventTypePage);
-    await bookingPage.cancelBooking(eventTypePage);
-    await bookingPage.assertBookingCanceled(eventTypePage);
-  });
-
-  test("Selecting and filling all questions as optional", async ({ bookingPage }) => {
-    const allQuestions = [
-      "phone",
-      "address",
-      "checkbox",
-      "boolean",
-      "textarea",
-      "multiemail",
-      "multiselect",
-      "number",
-      "radio",
-      "select",
-      "text",
-    ];
-    for (const question of allQuestions) {
-      if (
-        question !== "number" &&
-        question !== "select" &&
-        question !== "checkbox" &&
-        question !== "boolean" &&
-        question !== "multiselect" &&
-        question !== "radio"
-      ) {
-        await bookingPage.addQuestion(
-          question,
-          `${question}-test`,
-          `${question} test`,
-          false,
-          `${question} test`
-        );
-      } else {
-        await bookingPage.addQuestion(question, `${question}-test`, `${question} test`, false);
-      }
-      await bookingPage.checkField(question, { isOptional: true });
-    }
-
-    await bookingPage.updateEventType();
-    const eventTypePage = await bookingPage.previewEventType();
-    await bookingPage.selectTimeSlot(eventTypePage);
-    await bookingPage.fillAllQuestions(eventTypePage, allQuestions, {
-      ...bookingOptions,
-      isAllRequired: false,
-    });
-
-    await bookingPage.rescheduleBooking(eventTypePage);
-    await bookingPage.assertBookingRescheduled(eventTypePage);
-    await bookingPage.cancelBooking(eventTypePage);
-    await bookingPage.assertBookingCanceled(eventTypePage);
-  });
-});
@@ -1,445 +0,0 @@
-import { loginUser } from "../fixtures/regularBookings";
-import { test } from "../lib/fixtures";
-
-test.describe("Booking With Checkbox Group Question and Each Other Question", () => {
-  const bookingOptions = { hasPlaceholder: true, isRequired: true };
-
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-  });
-
-  test.describe("Booking With Checkbox Group Question and Address Question", () => {
-    test("Checkbox Group required and Address required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "checkbox",
-        fillText: "Test Checkbox Group question and Address question (both required)",
-        secondQuestion: "address",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Checkbox Group and Address not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-      await bookingPage.addQuestion("address", "address-test", "address test", false, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "checkbox",
-        fillText: "Test Checkbox Group question and Address question (only checkbox required)",
-        secondQuestion: "address",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test.describe("Booking With Checkbox Group Question and Phone Question", () => {
-      test("Checkbox Group required and Phone required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and phone question (both required)",
-          secondQuestion: "phone",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Checkbox Group and Phone not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", false, "phone test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Phone question (only checkbox required)",
-          secondQuestion: "phone",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Checkbox Group Question and checkbox Question", () => {
-      test("Checkbox Group required and checkbox required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and checkbox question (both required)",
-          secondQuestion: "boolean",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Checkbox Group and checkbox not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and checkbox (only checkbox required)",
-          secondQuestion: "boolean",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Checkbox Group Question and Long text Question", () => {
-      test("Checkbox Group required and Long text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Long Text question (both required)",
-          secondQuestion: "textarea",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Checkbox Group and Long text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", false, "textarea test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Long Text question (only checkbox required)",
-          secondQuestion: "textarea",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Checkbox Group Question and Multi email Question", () => {
-      test("Checkbox Group required and Multi email required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          true,
-          "multiemail test"
-        );
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Multi Email question (both required)",
-          secondQuestion: "multiemail",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Checkbox Group and Multi email not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          false,
-          "multiemail test"
-        );
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Multi Email question (only checkbox required)",
-          secondQuestion: "multiemail",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Checkbox Group Question and multiselect Question", () => {
-      test("Checkbox Group required and multiselect text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Multi Select question (both required)",
-          secondQuestion: "multiselect",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Checkbox Group and multiselect text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Multi Select question (only checkbox required)",
-          secondQuestion: "multiselect",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Checkbox Group Question and Number Question", () => {
-      test("Checkbox Group required and Number required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("number", "number-test", "number test", true, "number test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Number question (both required)",
-          secondQuestion: "number",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Checkbox Group and Number not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("number", "number-test", "number test", false, "number test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Number question (only checkbox required)",
-          secondQuestion: "number",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Checkbox Group Question and Radio group Question", () => {
-      test("Checkbox Group required and Radio group required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Radio question (both required)",
-          secondQuestion: "radio",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Checkbox Group and Radio group not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Radio question (only checkbox required)",
-          secondQuestion: "radio",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Checkbox Group Question and select Question", () => {
-      test("Checkbox Group required and select required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Select question (both required)",
-          secondQuestion: "select",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Checkbox Group and select not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("select", "select-test", "select test", false, "select test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Select question (only checkbox required)",
-          secondQuestion: "select",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Checkbox Group Question and Short text question", () => {
-      test("Checkbox Group required and Short Text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("text", "text-test", "text test", true, "text test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Text question (both required)",
-          secondQuestion: "text",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Checkbox Group and Short Text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.addQuestion("text", "text-test", "text test", false, "text test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "checkbox",
-          fillText: "Test Checkbox Group question and Text question (only checkbox required)",
-          secondQuestion: "text",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-  });
-});
@@ -1,54 +0,0 @@
-import { test } from "../../lib/fixtures";
-
-test.describe("Collective event type", () => {
-  const teamEventTitle = "Test Managed Event Type";
-  let userId: number;
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    const userFixture = await users.create(
-      { name: "testuser" },
-      { hasTeam: true, schedulingType: "COLLECTIVE", teamEventTitle }
-    );
-    await userFixture.apiLogin();
-    userId = userFixture.id;
-    await page.goto("/event-types");
-    await bookingPage.goToEventType(teamEventTitle);
-  });
-  test("Book a Collective event type", async ({ bookingPage }) => {
-    const eventTypePage = await bookingPage.previewEventType();
-    await bookingPage.selectTimeSlot(eventTypePage);
-    await bookingPage.fillEmailAndName(eventTypePage);
-    await bookingPage.confirmBooking(eventTypePage);
-    await bookingPage.backToBookings(eventTypePage);
-    await bookingPage.assertLabelWithCorrectTeamName(eventTypePage, teamEventTitle);
-    await bookingPage.assertBookingWithCorrectTitleAndDescription(eventTypePage, {
-      profileName: "testuser",
-      bookingName: teamEventTitle,
-      teamName: `user-id-${userId}'s Team`,
-    });
-    await bookingPage.clickOnBooking(eventTypePage, teamEventTitle);
-    await bookingPage.rescheduleBooking(eventTypePage);
-    await bookingPage.assertBookingRescheduled(eventTypePage);
-    await bookingPage.cancelBookingWithReason(eventTypePage);
-    await bookingPage.assertBookingCanceled(eventTypePage);
-  });
-  test("Book a Collective event type (with added guest)", async ({ bookingPage }) => {
-    const eventTypePage = await bookingPage.previewEventType();
-    await bookingPage.selectTimeSlot(eventTypePage);
-    await bookingPage.fillEmailAndName(eventTypePage);
-    await bookingPage.addGuests(eventTypePage, { guests: ["test@example.com"] });
-    await bookingPage.confirmBooking(eventTypePage);
-    await bookingPage.backToBookings(eventTypePage);
-    await bookingPage.assertLabelWithCorrectTeamName(eventTypePage, teamEventTitle);
-    await bookingPage.assertBookingWithCorrectTitleAndDescription(eventTypePage, {
-      profileName: "testuser",
-      bookingName: teamEventTitle,
-      teamName: `user-id-${userId}'s Team`,
-      aditionalGuestEmail: "test@example.com",
-    });
-    await bookingPage.clickOnBooking(eventTypePage, teamEventTitle);
-    await bookingPage.rescheduleBooking(eventTypePage);
-    await bookingPage.assertBookingRescheduled(eventTypePage);
-    await bookingPage.cancelBookingWithReason(eventTypePage);
-    await bookingPage.assertBookingCanceled(eventTypePage);
-  });
-});
@@ -1,483 +0,0 @@
-import { loginUser } from "../fixtures/regularBookings";
-import { test } from "../lib/fixtures";
-
-test.describe("Booking With Long Text Question and Each Other Question", () => {
-  const bookingOptions = { hasPlaceholder: true, isRequired: true };
-
-  test.beforeEach(async ({ page, users }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-  });
-
-  test("Long Text and Address required", async ({ bookingPage }) => {
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-    await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-    await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-    await bookingPage.updateEventType();
-    const eventTypePage = await bookingPage.previewEventType();
-    await bookingPage.selectTimeSlot(eventTypePage);
-    await bookingPage.fillAndConfirmBooking({
-      eventTypePage,
-      placeholderText: "Please share anything that will help prepare for our meeting.",
-      question: "textarea",
-      fillText: "Test Long Text question and Address question (both required)",
-      secondQuestion: "address",
-      options: bookingOptions,
-    });
-    await bookingPage.rescheduleBooking(eventTypePage);
-    await bookingPage.assertBookingRescheduled(eventTypePage);
-    await bookingPage.cancelBooking(eventTypePage);
-    await bookingPage.assertBookingCanceled(eventTypePage);
-  });
-
-  test("Long Text required and Address not required", async ({ bookingPage }) => {
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-    await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-    await bookingPage.addQuestion("address", "address-test", "address test", false, "address test");
-    await bookingPage.updateEventType();
-    const eventTypePage = await bookingPage.previewEventType();
-    await bookingPage.selectTimeSlot(eventTypePage);
-    await bookingPage.fillAndConfirmBooking({
-      eventTypePage,
-      placeholderText: "Please share anything that will help prepare for our meeting.",
-      question: "textarea",
-      fillText: "Test Long Text question and Address question (only Long Text required)",
-      secondQuestion: "address",
-      options: { ...bookingOptions, isRequired: false },
-    });
-    await bookingPage.rescheduleBooking(eventTypePage);
-    await bookingPage.assertBookingRescheduled(eventTypePage);
-    await bookingPage.cancelBooking(eventTypePage);
-    await bookingPage.assertBookingCanceled(eventTypePage);
-  });
-
-  test.describe("Booking With Long Text Question and Checkbox Group Question", () => {
-    test("Long Text and Checkbox Group required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Checkbox Group question (both required)",
-        secondQuestion: "checkbox",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Long Text required and Checkbox Group not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Checkbox Group question (only Long Text required)",
-        secondQuestion: "checkbox",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Long Text Question and checkbox Question", () => {
-    test("Long Text and checkbox required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Checkbox question (only Long Text required)",
-        secondQuestion: "boolean",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Long Text required and checkbox not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Checkbox question (only Long Text required)",
-        secondQuestion: "boolean",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Long Text Question and Multiple email Question", () => {
-    const bookingOptions = { hasPlaceholder: true, isRequired: true };
-    test("Long Text and Multiple email required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Multiple email question (both required)",
-        secondQuestion: "multiemail",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Long Text required and Multiple email not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        false,
-        "multiemail test"
-      );
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Multiple email question (only Long Text required)",
-        secondQuestion: "multiemail",
-        options: { hasPlaceholder: true, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Long Text Question and multiselect Question", () => {
-    test("Long Text and multiselect text required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and multiselect question (both required)",
-        secondQuestion: "multiselect",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Long Text required and multiselect text not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and multiselect question (only long text required)",
-        secondQuestion: "multiselect",
-        options: { hasPlaceholder: false, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Long Text Question and Number Question", () => {
-    test("Long Text and Number required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Number question (both required)",
-        secondQuestion: "multiselect",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test("Long Text required and Number not required", async ({ bookingPage }) => {
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-    await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-    await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", false);
-    await bookingPage.updateEventType();
-    const eventTypePage = await bookingPage.previewEventType();
-    await bookingPage.selectTimeSlot(eventTypePage);
-    await bookingPage.fillAndConfirmBooking({
-      eventTypePage,
-      placeholderText: "Please share anything that will help prepare for our meeting.",
-      question: "textarea",
-      fillText: "Test Long Text question and Number question (only Long Textß required)",
-      secondQuestion: "multiselect",
-      options: { hasPlaceholder: false, isRequired: false },
-    });
-    await bookingPage.rescheduleBooking(eventTypePage);
-    await bookingPage.assertBookingRescheduled(eventTypePage);
-    await bookingPage.cancelBooking(eventTypePage);
-    await bookingPage.assertBookingCanceled(eventTypePage);
-  });
-
-  test.describe("Booking With Long Text Question and Phone Question", () => {
-    test("Long Text and Phone required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Phone question (both required)",
-        secondQuestion: "phone",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Long Text required and Phone not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", false, "phone test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Phone question (only Long Text required)",
-        secondQuestion: "phone",
-        options: { hasPlaceholder: false, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Long Text Question and Radio group Question", () => {
-    test("Long Text and Radio group required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Radio Group question (both required)",
-        secondQuestion: "radio",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Long Text required and Radio group not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Radio Group question (only Long Text required)",
-        secondQuestion: "radio",
-        options: { hasPlaceholder: false, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Long Text Question and select Question", () => {
-    test("Long Text and select required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("select", "select-test", "select test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Select question (both required)",
-        secondQuestion: "select",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Long Text required and select not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("select", "select-test", "select test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Select question (only Long Text required)",
-        secondQuestion: "select",
-        options: { hasPlaceholder: false, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Long Text Question and Short text question", () => {
-    const bookingOptions = { hasPlaceholder: true, isRequired: true };
-    test("Long Text and Short text required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("text", "text-test", "text test", true, "text test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Text question (both required)",
-        secondQuestion: "text",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Long Text required and Short text not required", async ({ bookingPage }) => {
-      await bookingPage.goToEventType("30 min");
-      await bookingPage.goToTab("event_advanced_tab_title");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.addQuestion("text", "text-test", "text test", false, "text test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "textarea",
-        fillText: "Test Long Text question and Text question (only Long Text required)",
-        secondQuestion: "text",
-        options: { hasPlaceholder: false, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-});
@@ -1,553 +0,0 @@
-import { loginUser } from "../fixtures/regularBookings";
-import { test } from "../lib/fixtures";
-
-test.describe("Booking With Multiple Email Question and Each Other Question", () => {
-  const bookingOptions = { hasPlaceholder: true, isRequired: true };
-
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-  });
-
-  test.describe("Booking With Multiple Email Question and Address Question", () => {
-    test("Multiple Email required and Address required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Address question (both required)",
-        secondQuestion: "address",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Multiple Email and Address not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("address", "address-test", "address test", false, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Address question (only Multiple Email required)",
-        secondQuestion: "address",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Multiple Email Question and checkbox group Question", () => {
-    test("Multiple Email required and checkbox group required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and checkbox group question (both required)",
-        secondQuestion: "checkbox",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Multiple Email and checkbox group not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and checkbox group question (only Multiple Email required)",
-        secondQuestion: "checkbox",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Multiple Email Question and checkbox Question", () => {
-    test("Multiple Email required and checkbox required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and checkbox question (both required)",
-        secondQuestion: "boolean",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Multiple Email and checkbox not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and checkbox (only Multiple Email required)",
-        secondQuestion: "boolean",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Multiple Email Question and Long text Question", () => {
-    test("Multiple Email required and Long text required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Long Text question (both required)",
-        secondQuestion: "textarea",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Multiple Email and Long text not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", false, "textarea test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Long Text question (only Multiple Email required)",
-        secondQuestion: "textarea",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Multiple Email Question and multiselect Question", () => {
-    test("Multiple Email required and multiselect text required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Multi Select question (both required)",
-        secondQuestion: "multiselect",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Multiple Email and multiselect text not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Multi Select question (only  Multiple Email required)",
-        secondQuestion: "multiselect",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Multiple Email Question and Number Question", () => {
-    test("Multiple Email required and Number required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("number", "number-test", "number test", true, "number test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Number question (both required)",
-        secondQuestion: "number",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Multiple Email and Number not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("number", "number-test", "number test", false, "number test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Number question (only Multiple Email required)",
-        secondQuestion: "number",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Multiple email Question and phone Question", () => {
-    test("Multiple email required and Phone required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Phone question (both required)",
-        secondQuestion: "phone",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Multiple email and Phone not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", false, "phone test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Phone question (both required)",
-        secondQuestion: "phone",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Multiple Email Question and Radio group Question", () => {
-    test("Multiple Email required and Radio group required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test  Multiple Email question and Radio question (both required)",
-        secondQuestion: "radio",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Multiple Email and Radio group not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "multiemail",
-        fillText: "Test Multiple Email question and Radio question (only  Multiple Email required)",
-        secondQuestion: "radio",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test.describe("Booking With Multiple Email Question and select Question", () => {
-      test("Multiple Email required and select required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          true,
-          "multiemail test"
-        );
-        await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "multiemail",
-          fillText: "Test Multiple Email question and Select question (both required)",
-          secondQuestion: "select",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Multiple Email and select not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          true,
-          "multiemail test"
-        );
-        await bookingPage.addQuestion("select", "select-test", "select test", false, "select test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "multiemail",
-          fillText: "Test Multiple Email question and Select question (only Multiple Email required)",
-          secondQuestion: "select",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Multiple Email Question and Short text question", () => {
-      test("Multiple Email required and Short text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          true,
-          "multiemail test"
-        );
-        await bookingPage.addQuestion("text", "text-test", "text test", true, "text test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "multiemail",
-          fillText: "Test Multiple Email question and Text question (both required)",
-          secondQuestion: "text",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Multiple Email and Short text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          true,
-          "multiemail test"
-        );
-        await bookingPage.addQuestion("text", "text-test", "text test", false, "text test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "multiemail",
-          fillText: "Test Multiple Email question and Text question (only Multiple Email required)",
-          secondQuestion: "text",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-  });
-});
@@ -1,446 +0,0 @@
-import { loginUser } from "../fixtures/regularBookings";
-import { test } from "../lib/fixtures";
-
-test.describe("Booking With Phone Question and Each Other Question", () => {
-  const bookingOptions = { hasPlaceholder: true, isRequired: true };
-
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-  });
-
-  test.describe("Booking With Phone Question and Address Question", () => {
-    test("Phone and Address required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "phone",
-        fillText: "Test Phone question and Address question (both required)",
-        secondQuestion: "address",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Phone required and Address not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-      await bookingPage.addQuestion("address", "address-test", "address test", false, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "phone",
-        fillText: "Test Phone question and Address question (only phone required)",
-        secondQuestion: "address",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test.describe("Booking With Phone Question and checkbox group Question", () => {
-      const bookingOptions = { hasPlaceholder: false, isRequired: true };
-      test("Phone and checkbox group required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and checkbox group question (both required)",
-          secondQuestion: "checkbox",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Phone required and checkbox group not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and checkbox group question (only phone required)",
-          secondQuestion: "checkbox",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Phone Question and checkbox Question", () => {
-      test("Phone and checkbox required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and checkbox question (both required)",
-          secondQuestion: "boolean",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-      test("Phone required and checkbox not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and checkbox (only phone required)",
-          secondQuestion: "boolean",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Phone Question and Long text Question", () => {
-      test("Phone and Long text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Long Text question (both required)",
-          secondQuestion: "textarea",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Phone required and Long text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", false, "textarea test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Long Text question (only phone required)",
-          secondQuestion: "textarea",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Phone Question and Multi email Question", () => {
-      const bookingOptions = { hasPlaceholder: true, isRequired: true };
-      test("Phone and Multi email required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          true,
-          "multiemail test"
-        );
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Multi Email question (both required)",
-          secondQuestion: "multiemail",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Phone required and Multi email not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          false,
-          "multiemail test"
-        );
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Multi Email question (only phone required)",
-          secondQuestion: "multiemail",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Phone Question and multiselect Question", () => {
-      test("Phone and multiselect text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Multi Select question (both required)",
-          secondQuestion: "multiselect",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Phone required and multiselect text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Multi Select question (only phone required)",
-          secondQuestion: "multiselect",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Phone Question and Number Question", () => {
-      test("Phone and Number required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("number", "number-test", "number test", true, "number test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Number question (both required)",
-          secondQuestion: "number",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Phone required and Number not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("number", "number-test", "number test", false, "number test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Number question (only phone required)",
-          secondQuestion: "number",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Phone Question and Radio group Question", () => {
-      test("Phone and Radio group required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Radio question (both required)",
-          secondQuestion: "radio",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Phone required and Radio group not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Radio question (only phone required)",
-          secondQuestion: "radio",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Phone Question and select Question", () => {
-      test("Phone and select required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Select question (both required)",
-          secondQuestion: "select",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Phone required and select not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("select", "select-test", "select test", false, "select test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Select question (only phone required)",
-          secondQuestion: "select",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Phone Question and Short text question", () => {
-      test("Phone and Short text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("text", "text-test", "text test", true, "text test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Text question (both required)",
-          secondQuestion: "text",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Phone required and Short text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.addQuestion("text", "text-test", "text test", false, "text test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "phone",
-          fillText: "Test Phone question and Text question (only phone required)",
-          secondQuestion: "text",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-  });
-});
@@ -1,444 +0,0 @@
-import { loginUser } from "../fixtures/regularBookings";
-import { test } from "../lib/fixtures";
-
-test.describe("Booking With Radio Question and Each Other Question", () => {
-  const bookingOptions = { hasPlaceholder: true, isRequired: true };
-
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-  });
-
-  test.describe("Booking With Radio Question and Address Question", () => {
-    test("Radio required and Address required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "radio",
-        fillText: "Test Radio question and Address question (both required)",
-        secondQuestion: "address",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Radio and Address not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-      await bookingPage.addQuestion("address", "address-test", "address test", false, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "radio",
-        fillText: "Test Radio question and Address question (only radio required)",
-        secondQuestion: "address",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test.describe("Booking With Radio Question and checkbox group Question", () => {
-      test("Radio required and checkbox group required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and checkbox group question (both required)",
-          secondQuestion: "checkbox",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Radio and checkbox group not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and checkbox group question (only radio required)",
-          secondQuestion: "checkbox",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Radio Question and checkbox Question", () => {
-      test("Radio required and checkbox required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and checkbox question (both required)",
-          secondQuestion: "boolean",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-      test("Radio and checkbox not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and checkbox (only radio required)",
-          secondQuestion: "boolean",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Radio Question and Long text Question", () => {
-      test("Radio required and Long text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Long Text question (both required)",
-          secondQuestion: "textarea",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Radio and Long text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", false, "textarea test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Long Text question (only radio required)",
-          secondQuestion: "textarea",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Radio Question and Multi email Question", () => {
-      test("Radio required and Multi email required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          true,
-          "multiemail test"
-        );
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Multi Email question (both required)",
-          secondQuestion: "multiemail",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Radio and Multi email not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion(
-          "multiemail",
-          "multiemail-test",
-          "multiemail test",
-          false,
-          "multiemail test"
-        );
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Multi Email question (only radio required)",
-          secondQuestion: "multiemail",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Radio Question and multiselect Question", () => {
-      test("Radio required and multiselect text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", true);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Multi Select question (both required)",
-          secondQuestion: "multiselect",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Radio and multiselect text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", false);
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Multi Select question (only radio required)",
-          secondQuestion: "multiselect",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Radio Question and Number Question", () => {
-      test("Radio required and Number required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("number", "number-test", "number test", true, "number test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Number question (both required)",
-          secondQuestion: "number",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Radio and Number not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("number", "number-test", "number test", false, "number test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Number question (only radio required)",
-          secondQuestion: "number",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Radio Question and Phone Question", () => {
-      test("Radio required and Phone required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Phone question (both required)",
-          secondQuestion: "phone",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Radio and Phone not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("phone", "phone-test", "phone test", false, "phone test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Phone question (only radio required)",
-          secondQuestion: "phone",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Radio Question and select Question", () => {
-      test("Radio required and select required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Select question (both required)",
-          secondQuestion: "select",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Radio and select not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("select", "select-test", "select test", false, "select test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Select question (only radio required)",
-          secondQuestion: "select",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-
-    test.describe("Booking With Radio Question and Short text question", () => {
-      test("Radio required and Short text required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("text", "text-test", "text test", true, "text test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Text question (both required)",
-          secondQuestion: "text",
-          options: bookingOptions,
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-
-      test("Radio and Short text not required", async ({ bookingPage }) => {
-        await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-        await bookingPage.addQuestion("text", "text-test", "text test", false, "text test");
-        await bookingPage.updateEventType();
-        const eventTypePage = await bookingPage.previewEventType();
-        await bookingPage.selectTimeSlot(eventTypePage);
-        await bookingPage.fillAndConfirmBooking({
-          eventTypePage,
-          placeholderText: "Please share anything that will help prepare for our meeting.",
-          question: "radio",
-          fillText: "Test Radio question and Text question (only radio required)",
-          secondQuestion: "text",
-          options: { ...bookingOptions, isRequired: false },
-        });
-        await bookingPage.rescheduleBooking(eventTypePage);
-        await bookingPage.assertBookingRescheduled(eventTypePage);
-        await bookingPage.cancelBooking(eventTypePage);
-        await bookingPage.assertBookingCanceled(eventTypePage);
-      });
-    });
-  });
-});
@@ -1,28 +0,0 @@
-/* eslint-disable playwright/no-conditional-in-test */
-import { loginUser } from "../fixtures/regularBookings";
-import { test } from "../lib/fixtures";
-
-test.describe.configure({ mode: "serial" });
-
-test.describe("Booking with recurring checked", () => {
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("recurring");
-  });
-
-  test("Updates event type with recurring events", async ({ page, bookingPage }) => {
-    await bookingPage.updateRecurringTab("2", "3");
-    await bookingPage.updateEventType();
-    await page.getByRole("link", { name: "Event Types" }).click();
-    await bookingPage.assertRepeatEventType();
-  });
-
-  test("Updates and shows recurring schedule correctly in booking page", async ({ bookingPage }) => {
-    await bookingPage.updateRecurringTab("2", "3");
-    await bookingPage.updateEventType();
-    const eventTypePage = await bookingPage.previewEventType();
-    await bookingPage.fillRecurringFieldAndConfirm(eventTypePage);
-  });
-});
@@ -1,107 +0,0 @@
-/* eslint-disable playwright/no-conditional-in-test */
-import { loginUser } from "../fixtures/regularBookings";
-import { test } from "../lib/fixtures";
-
-const resolutions = [
-  {
-    width: 1920,
-    height: 1080,
-  },
-  {
-    width: 1280,
-    height: 720,
-  },
-  {
-    width: 640,
-    height: 480,
-  },
-];
-
-test.describe("Booking With All Questions", () => {
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-
-    const allQuestions = [
-      "phone",
-      "address",
-      "checkbox",
-      "boolean",
-      "textarea",
-      "multiemail",
-      "multiselect",
-      "number",
-      "radio",
-      "select",
-      "text",
-    ];
-    for (const question of allQuestions) {
-      if (
-        question !== "number" &&
-        question !== "select" &&
-        question !== "checkbox" &&
-        question !== "boolean" &&
-        question !== "multiselect" &&
-        question !== "radio"
-      ) {
-        await bookingPage.addQuestion(
-          question,
-          `${question}-test`,
-          `${question} test`,
-          true,
-          `${question} test`
-        );
-      } else {
-        await bookingPage.addQuestion(question, `${question}-test`, `${question} test`, true);
-      }
-      await bookingPage.checkField(question);
-    }
-  });
-
-  for (const resolution of resolutions) {
-    test(`Booking with ${resolution.width}x${resolution.height} resolution and all questions`, async ({
-      bookingPage,
-    }) => {
-      await bookingPage.setResolution(resolution.width, resolution.height);
-      await bookingPage.updateEventType();
-    });
-  }
-});
-
-test.describe("Booking With no questions", () => {
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-  });
-
-  for (const resolution of resolutions) {
-    test(`Booking with ${resolution.width}x${resolution.height} resolution and no questions`, async ({
-      bookingPage,
-    }) => {
-      await bookingPage.setResolution(resolution.width, resolution.height);
-      await bookingPage.updateEventType();
-    });
-  }
-});
-
-test.describe("Booking page with no questions", () => {
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-  });
-
-  for (const resolution of resolutions) {
-    test(`Booking page with ${resolution.width}x${resolution.height} resolution`, async ({ bookingPage }) => {
-      const eventTypePage = await bookingPage.previewEventType();
-      await eventTypePage.setViewportSize({ width: resolution.width, height: resolution.height });
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.confirmBooking(eventTypePage);
-    });
-  }
-});
@@ -1,441 +0,0 @@
-import { loginUser } from "../fixtures/regularBookings";
-import { test } from "../lib/fixtures";
-
-test.describe("Booking With Phone Question and Each Other Question", () => {
-  const bookingOptions = { hasPlaceholder: true, isRequired: true };
-
-  test.beforeEach(async ({ page, users, bookingPage }) => {
-    await loginUser(users);
-    await page.goto("/event-types");
-    await bookingPage.goToEventType("30 min");
-    await bookingPage.goToTab("event_advanced_tab_title");
-  });
-
-  test.describe("Booking With Select Question and Address Question", () => {
-    test("Select required and Address required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("address", "address-test", "address test", true, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and Address question (both required)",
-        secondQuestion: "address",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and Address not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("address", "address-test", "address test", false, "address test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and Address question (only select required)",
-        secondQuestion: "address",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Select Question and checkbox group Question", () => {
-    test("Select required and checkbox group required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and Checkbox question (both required)",
-        secondQuestion: "checkbox",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and checkbox group not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("checkbox", "checkbox-test", "checkbox test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and Checkbox question (only Select required)",
-        secondQuestion: "checkbox",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Select Question and checkbox Question", () => {
-    test("Select required and checkbox required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and boolean question (both required)",
-        secondQuestion: "boolean",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and checkbox not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("boolean", "boolean-test", "boolean test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and boolean question (only select required)",
-        secondQuestion: "boolean",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Select Question and Long text Question", () => {
-    test("Select required and Long text required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", true, "textarea test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and textarea question (both required)",
-        secondQuestion: "textarea",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and Long text not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("textarea", "textarea-test", "textarea test", false, "textarea test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and textarea question (only select required)",
-        secondQuestion: "textarea",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Select Question and Multi email Question", () => {
-    test("Select required and Multi email required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        true,
-        "multiemail test"
-      );
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and multiemail question (both required)",
-        secondQuestion: "multiemail",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and Multi email not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion(
-        "multiemail",
-        "multiemail-test",
-        "multiemail test",
-        false,
-        "multiemail test"
-      );
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and multiemail question (only select required)",
-        secondQuestion: "multiemail",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Select Question and multiselect Question", () => {
-    test("Select required and multiselect text required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and multiselect question (both required)",
-        secondQuestion: "multiselect",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and multiselect text not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("multiselect", "multiselect-test", "multiselect test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and multiselect question (only select required)",
-        secondQuestion: "multiselect",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Select Question and Number Question", () => {
-    test("Select required and Number required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("number", "number-test", "number test", true, "number test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and number question (both required)",
-        secondQuestion: "number",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and Number not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("number", "number-test", "number test", false, "number test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and number question (only select required)",
-        secondQuestion: "number",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Select Question and Phone Question", () => {
-    test("Select required and select required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", true, "phone test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and phone question (both required)",
-        secondQuestion: "phone",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and Phone not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("phone", "phone-test", "phone test", false, "phone test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and phone question (only select required)",
-        secondQuestion: "phone",
-        options: { ...bookingOptions, isRequired: false },
-      });
-    });
-  });
-
-  test.describe("Booking With Select Question and Radio group Question", () => {
-    test("Select required and Radio group required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", true);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and radio question (both required)",
-        secondQuestion: "radio",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and Radio group not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("radio", "radio-test", "radio test", false);
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and radio question (only select required)",
-        secondQuestion: "radio",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-
-  test.describe("Booking With Select Question and Short text question", () => {
-    test("Select required and Short text required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("text", "text-test", "text test", true, "text test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and text question (both required)",
-        secondQuestion: "text",
-        options: bookingOptions,
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-
-    test("Select and Short text not required", async ({ bookingPage }) => {
-      await bookingPage.addQuestion("select", "select-test", "select test", true, "select test");
-      await bookingPage.addQuestion("text", "text-test", "text test", false, "text test");
-      await bookingPage.updateEventType();
-      const eventTypePage = await bookingPage.previewEventType();
-      await bookingPage.selectTimeSlot(eventTypePage);
-      await bookingPage.fillAndConfirmBooking({
-        eventTypePage,
-        placeholderText: "Please share anything that will help prepare for our meeting.",
-        question: "select",
-        fillText: "Test Select question and text question (only select required)",
-        secondQuestion: "text",
-        options: { ...bookingOptions, isRequired: false },
-      });
-      await bookingPage.rescheduleBooking(eventTypePage);
-      await bookingPage.assertBookingRescheduled(eventTypePage);
-      await bookingPage.cancelBooking(eventTypePage);
-      await bookingPage.assertBookingCanceled(eventTypePage);
-    });
-  });
-});
@@ -1,9 +1,15 @@
 import { expect } from "@playwright/test";

+import { randomString } from "@calcom/lib/random";
+import slugify from "@calcom/lib/slugify";
+import prisma from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/client";
+import { SchedulingType } from "@calcom/prisma/enums";

+import { createTeamEventType } from "./fixtures/users";
 import type { Fixtures } from "./lib/fixtures";
 import { test } from "./lib/fixtures";
+import { assertBookingVisibleFor, bookTeamEvent, bookUserEvent } from "./lib/testUtils";

 test.afterEach(({ users }) => users.deleteAll());

@@ -61,6 +67,137 @@ test.describe("Bookings", () => {
        secondUpcomingBooking.locator(`text=${bookingWhereFirstUserIsOrganizer!.title}`)
      ).toBeVisible();
    });
+    test("collective eventType booking should be visible to team admin", async ({ page, users }) => {
+      const { owner1, owner2, commonUser, team1_teammate1 } = await createTeams(users);
+
+      const { team: team1 } = await owner1.getFirstTeamMembership();
+      const scenario = {
+        schedulingType: SchedulingType.COLLECTIVE,
+        teamEventTitle: `collective-team-event`,
+        teamEventSlug: slugify(`collective-team-event-${randomString(5)}`),
+      };
+
+      const eventType = await createTeamEventType(owner1, team1, scenario);
+      const { id: eventId, slug: evnetSlug } = eventType;
+
+      await prisma.host.createMany({
+        data: [
+          {
+            userId: commonUser.id,
+            eventTypeId: eventId,
+            isFixed: true,
+          },
+          {
+            userId: team1_teammate1.id,
+            eventTypeId: eventId,
+            isFixed: true,
+          },
+        ],
+      });
+
+      // to test if booking is visible to team admin/owner even if he is not part of the booking
+      await prisma.host.deleteMany({
+        where: {
+          userId: owner1.id,
+          eventTypeId: eventId,
+        },
+      });
+
+      await bookTeamEvent(page, team1, eventType);
+
+      // booking should be visible for the team host even though he is not part of the booking
+      await assertBookingVisibleFor(owner1, page, eventType, true);
+      // booking should not be visible for other team host
+      await assertBookingVisibleFor(owner2, page, eventType, false);
+      // booking should be visible for commonUser as he is part of the booking
+      await assertBookingVisibleFor(commonUser, page, eventType, true);
+      // booking should be visible for team1_teammate1 as he is part of the booking
+      await assertBookingVisibleFor(team1_teammate1, page, eventType, true);
+    });
+    test("round-robin eventType booking should be visible to team admin", async ({ page, users }) => {
+      const { owner1, owner2, commonUser, team1_teammate1 } = await createTeams(users);
+
+      const { team: team1 } = await owner1.getFirstTeamMembership();
+      const scenario = {
+        schedulingType: SchedulingType.ROUND_ROBIN,
+        teamEventTitle: `round-robin-team-event`,
+        teamEventSlug: slugify(`round-robin-team-event-${randomString(5)}`),
+      };
+
+      const eventType = await createTeamEventType(owner1, team1, scenario);
+      const { id: eventId } = eventType;
+
+      await prisma.host.createMany({
+        data: [
+          {
+            userId: commonUser.id,
+            eventTypeId: eventId,
+          },
+          {
+            userId: team1_teammate1.id,
+            eventTypeId: eventId,
+          },
+        ],
+      });
+
+      await prisma.host.deleteMany({
+        where: {
+          userId: owner1.id,
+          eventTypeId: eventId,
+        },
+      });
+
+      await bookTeamEvent(page, team1, eventType);
+
+      // booking should be visible for the team host even though he is not part of the booking
+      await assertBookingVisibleFor(owner1, page, eventType, true);
+      // bookings should not be visible for other team host
+      await assertBookingVisibleFor(owner2, page, eventType, false);
+    });
+    test("managed eventType booking should be visible to team admin", async ({ page, users }) => {
+      const { owner1, owner2, commonUser, team1_teammate1 } = await createTeams(users);
+
+      const { team: team1 } = await owner1.getFirstTeamMembership();
+
+      await owner1.apiLogin();
+      await page.goto(`/event-types?dialog=new&eventPage=team%2F${team1.slug}&teamId=${team1.id}`);
+      await page.getByTestId("managed-event-type").click();
+      await page.getByTestId("event-type-quick-chat").click();
+      await page.getByTestId("event-type-quick-chat").fill("managed-event");
+      await page.getByRole("button", { name: "Continue" }).click();
+      await page.getByTestId("vertical-tab-assignment").click();
+
+      await page.getByRole("combobox", { name: "assignment-dropdown" }).fill("commonUser");
+      await page.getByRole("combobox", { name: "assignment-dropdown" }).press("Enter");
+      await page.getByRole("combobox", { name: "assignment-dropdown" }).fill("team1_teammate1");
+      await page.getByRole("combobox", { name: "assignment-dropdown" }).press("Enter");
+      await page.getByTestId("update-eventtype").click();
+
+      const eventType = await owner1.getFirstTeamEvent(team1.id);
+
+      await bookUserEvent(page, commonUser, eventType);
+
+      // booking should be visible for the team host even though he is not part of the booking
+      await assertBookingVisibleFor(owner1, page, eventType, true);
+      // booking should not be visible for other team host
+      await assertBookingVisibleFor(owner2, page, eventType, false);
+      // booking should be visible for commonUser as he is part of the booking
+      await assertBookingVisibleFor(commonUser, page, eventType, true);
+      // booking should not be visible for team1_teammate1 as we booked for commonUser
+      await assertBookingVisibleFor(team1_teammate1, page, eventType, false);
+    });
+    test("individual team members booking should not be visible to team admin", async ({ page, users }) => {
+      const { owner1, owner2, commonUser, team1_teammate1 } = await createTeams(users);
+
+      const eventType = await commonUser.getFirstEventAsOwner();
+      await bookUserEvent(page, commonUser, eventType);
+      // non-team bookings should not be visible for the team host
+      await assertBookingVisibleFor(owner1, page, eventType, false);
+      // non-team bookings should not be visible for other team host
+      await assertBookingVisibleFor(owner2, page, eventType, false);
+      // booking should be visible for commonUser as he is part of the booking
+      await assertBookingVisibleFor(commonUser, page, eventType, true);
+    });
  });
 });

@@ -111,3 +248,75 @@ async function createBooking({
    },
  });
 }
+
+const createTeams = async (userFixture: Fixtures["users"]) => {
+  const owner1 = await userFixture.create({ name: "team-owner-1" });
+  const owner2 = await userFixture.create({ name: "team-owner-2" });
+  const commonUser = await userFixture.create({ name: "commonUser" });
+  const team1_teammate1 = await userFixture.create({ name: "team1_teammate1" });
+  const team2_teammate1 = await userFixture.create({ name: "team2_teammate1" });
+  const teamOne = await prisma.team.create({
+    data: {
+      name: "bookings-test-team-1",
+      slug: slugify(`bookings-test-team-2-${randomString(5)}`),
+    },
+  });
+
+  const teamTwo = await prisma.team.create({
+    data: {
+      name: "bookings-test-team-2",
+      slug: slugify(`bookings-test-team-2-${randomString(5)}`),
+    },
+  });
+
+  // create memberships
+  await prisma.membership.createMany({
+    data: [
+      {
+        userId: owner1.id,
+        teamId: teamOne.id,
+        accepted: true,
+        role: "OWNER",
+      },
+      {
+        userId: commonUser.id,
+        teamId: teamOne.id,
+        accepted: true,
+        role: "MEMBER",
+      },
+      {
+        userId: team1_teammate1.id,
+        teamId: teamOne.id,
+        accepted: true,
+        role: "MEMBER",
+      },
+      {
+        userId: owner2.id,
+        teamId: teamTwo.id,
+        accepted: true,
+        role: "OWNER",
+      },
+      {
+        userId: commonUser.id,
+        teamId: teamTwo.id,
+        accepted: true,
+        role: "MEMBER",
+      },
+      {
+        userId: team2_teammate1.id,
+        teamId: teamTwo.id,
+        accepted: true,
+        role: "MEMBER",
+      },
+    ],
+  });
+  return {
+    owner1,
+    owner2,
+    commonUser,
+    team1_teammate1,
+    team2_teammate1,
+    teamOne,
+    teamTwo,
+  };
+};
@@ -2,6 +2,9 @@ import { expect } from "@playwright/test";

 import stripe from "@calcom/features/ee/payments/server/stripe";
 import { WEBAPP_URL } from "@calcom/lib/constants";
+import { MembershipRole } from "@calcom/prisma/enums";
+
+import { moveUserToOrg } from "@lib/orgMigration";

 import { test } from "./lib/fixtures";

@@ -110,4 +113,54 @@ test.describe("Change username on settings", () => {

    await expect(page).toHaveURL(/.*checkout.stripe.com/);
  });
+
+  test("User can't take a username that has been migrated to a different username in an organization", async ({
+    users,
+    orgs,
+    page,
+  }) => {
+    const existingUser =
+      await test.step("Migrate user to a different username in an organization", async () => {
+        const org = await orgs.create({
+          name: "TestOrg",
+        });
+
+        const existingUser = await users.create({
+          username: "john",
+          emailDomain: org.organizationSettings?.orgAutoAcceptEmail ?? "",
+          name: "John Outside Organization",
+        });
+
+        await moveUserToOrg({
+          user: existingUser,
+          targetOrg: {
+            // Changed username. After this there is no user with username equal to {existingUser.username}
+            username: `${existingUser.username}-org`,
+            id: org.id,
+            membership: {
+              role: MembershipRole.MEMBER,
+              accepted: true,
+            },
+          },
+          shouldMoveTeams: false,
+        });
+        return existingUser;
+      });
+
+    await test.step("Changing username for another user to the previous username of migrated user - shouldn't be allowed", async () => {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const previousUsername = existingUser.username!;
+
+      const user = await users.create();
+      await user.apiLogin();
+
+      await page.goto("/settings/my-account/profile");
+      const usernameInput = page.locator("[data-testid=username-input]");
+
+      await usernameInput.fill(previousUsername);
+      await page.waitForLoadState("networkidle");
+      await expect(page.locator("[data-testid=update-username-btn]").nth(0)).toBeHidden();
+      await expect(page.locator("[data-testid=update-username-btn]").nth(1)).toBeHidden();
+    });
+  });
 });
@@ -107,6 +107,10 @@ testBothFutureAndLegacyRoutes.describe("Event Types tests", () => {

      expect(formTitle).toBe(firstTitle);
      expect(formSlug).toContain(firstSlug);
+
+      const test = await page.getByTestId("continue").click();
+      const toast = await page.waitForSelector('[data-testid="toast-success"]');
+      expect(toast).toBeTruthy();
    });

    test("edit first event", async ({ page }) => {
@@ -0,0 +1,29 @@
+import { expect, type Page } from "@playwright/test";
+
+export function createAppsFixture(page: Page) {
+  return {
+    goToAppsCategory: async (category: string) => {
+      await page.getByTestId(`app-store-category-${category}`).nth(1).click();
+      await page.goto("apps/categories/analytics");
+    },
+    installApp: async (app: string) => {
+      await page.getByTestId(`app-store-app-card-${app}`).click();
+      await page.getByTestId("install-app-button").click();
+    },
+    goBackToAppsPage: async () => {
+      await page.getByTestId("add-apps").click();
+    },
+    goToEventType: async (eventType: string) => {
+      await page.getByRole("link", { name: eventType }).click();
+    },
+    goToAppsTab: async () => {
+      await page.getByTestId("vertical-tab-apps").click();
+    },
+    activeApp: async (app: string) => {
+      await page.getByTestId(`${app}-app-switch`).click();
+    },
+    verifyAppsInfo: async (activeApps: number) => {
+      await expect(page.locator(`text=6 apps, ${activeApps} active`)).toBeVisible();
+    },
+  };
+}
@@ -48,8 +48,8 @@ export async function createOrgInDb({
    data: {
      name: name,
      slug: slug,
+      isOrganization: true,
      metadata: {
-        isOrganization: true,
        ...(requestedSlug
          ? {
              requestedSlug,
@@ -57,5 +57,8 @@ export async function createOrgInDb({
          : null),
      },
    },
+    include: {
+      organizationSettings: true,
+    },
  });
 }
@@ -1,183 +1,14 @@
 import { expect, type Page } from "@playwright/test";

-import dayjs from "@calcom/dayjs";
-import { WEBAPP_URL } from "@calcom/lib/constants";
 import type { MembershipRole } from "@calcom/prisma/enums";

 import { localize } from "../lib/testUtils";
 import type { createUsersFixture } from "./users";

-const reschedulePlaceholderText = "Let others know why you need to reschedule";
 export const scheduleSuccessfullyText = "This meeting is scheduled";

-const EMAIL = "test@test.com";
-const EMAIL2 = "test2@test.com";
-const PHONE = "+55 (32) 983289947";
-
-type BookingOptions = {
-  hasPlaceholder?: boolean;
-  isReschedule?: boolean;
-  isRequired?: boolean;
-  isAllRequired?: boolean;
-  isMultiSelect?: boolean;
-};
-
-interface QuestionActions {
-  [key: string]: () => Promise<void>;
-}
-
-type teamBookingtypes = { isManagedType?: boolean; isRoundRobinType?: boolean; isCollectiveType?: boolean };
-
-type customLocators = {
-  shouldChangeSelectLocator: boolean;
-  shouldUseLastRadioGroupLocator: boolean;
-  shouldUseFirstRadioGroupLocator: boolean;
-  shouldChangeMultiSelectLocator: boolean;
-};
-
-type fillAndConfirmBookingParams = {
-  eventTypePage: Page;
-  placeholderText: string;
-  question: string;
-  fillText: string;
-  secondQuestion: string;
-  options: BookingOptions;
-};
-
 type UserFixture = ReturnType<typeof createUsersFixture>;

-function isLastDayOfMonth(): boolean {
-  const today = dayjs();
-  const endOfMonth = today.endOf("month");
-  return today.isSame(endOfMonth, "day");
-}
-
-const fillQuestion = async (eventTypePage: Page, questionType: string, customLocators: customLocators) => {
-  const questionActions: QuestionActions = {
-    phone: async () => {
-      await eventTypePage.locator('input[name="phone-test"]').clear();
-      await eventTypePage.locator('input[name="phone-test"]').fill(PHONE);
-    },
-    multiemail: async () => {
-      await eventTypePage.getByRole("button", { name: `${questionType} test` }).click();
-      await eventTypePage.getByPlaceholder(`${questionType} test`).fill(EMAIL);
-      await eventTypePage.getByTestId("add-another-guest").last().click();
-      await eventTypePage.getByPlaceholder(`${questionType} test`).last().fill(EMAIL2);
-    },
-    checkbox: async () => {
-      if (customLocators.shouldUseLastRadioGroupLocator || customLocators.shouldChangeMultiSelectLocator) {
-        await eventTypePage.getByLabel("Option 1").last().click();
-        await eventTypePage.getByLabel("Option 2").last().click();
-      } else if (customLocators.shouldUseFirstRadioGroupLocator) {
-        await eventTypePage.getByLabel("Option 1").first().click();
-        await eventTypePage.getByLabel("Option 2").first().click();
-      } else {
-        await eventTypePage.getByLabel("Option 1").click();
-        await eventTypePage.getByLabel("Option 2").click();
-      }
-    },
-    multiselect: async () => {
-      if (customLocators.shouldChangeMultiSelectLocator) {
-        await eventTypePage.getByLabel("multi-select-dropdown").click();
-        await eventTypePage.getByTestId("select-option-Option 1").click();
-      } else {
-        await eventTypePage.getByLabel("multi-select-dropdown").last().click();
-        await eventTypePage.getByTestId("select-option-Option 1").click();
-      }
-    },
-    boolean: async () => {
-      await eventTypePage.getByLabel(`${questionType} test`).check();
-    },
-    radio: async () => {
-      await eventTypePage.locator('[id="radio-test\\.option\\.0\\.radio"]').click();
-    },
-    select: async () => {
-      if (customLocators.shouldChangeSelectLocator) {
-        await eventTypePage.getByLabel("select-dropdown").first().click();
-        await eventTypePage.getByTestId("select-option-Option 1").click();
-      } else {
-        await eventTypePage.getByLabel("select-dropdown").last().click();
-        await eventTypePage.getByTestId("select-option-Option 1").click();
-      }
-    },
-    number: async () => {
-      await eventTypePage.getByPlaceholder(`${questionType} test`).click();
-      await eventTypePage.getByPlaceholder(`${questionType} test`).fill("123");
-    },
-    address: async () => {
-      await eventTypePage.getByPlaceholder(`${questionType} test`).click();
-      await eventTypePage.getByPlaceholder(`${questionType} test`).fill("address test");
-    },
-    textarea: async () => {
-      await eventTypePage.getByPlaceholder(`${questionType} test`).click();
-      await eventTypePage.getByPlaceholder(`${questionType} test`).fill("textarea test");
-    },
-    text: async () => {
-      await eventTypePage.getByPlaceholder(`${questionType} test`).click();
-      await eventTypePage.getByPlaceholder(`${questionType} test`).fill("text test");
-    },
-  };
-  if (questionActions[questionType]) {
-    await questionActions[questionType]();
-  }
-};
-
-const fillAllQuestions = async (eventTypePage: Page, questions: string[], options: BookingOptions) => {
-  if (options.isAllRequired) {
-    for (const question of questions) {
-      switch (question) {
-        case "email":
-          await eventTypePage.getByPlaceholder("Email").click();
-          await eventTypePage.getByPlaceholder("Email").fill(EMAIL);
-          break;
-        case "phone":
-          await eventTypePage.getByPlaceholder("Phone test").click();
-          await eventTypePage.getByPlaceholder("Phone test").fill(PHONE);
-          break;
-        case "address":
-          await eventTypePage.getByPlaceholder("Address test").click();
-          await eventTypePage.getByPlaceholder("Address test").fill("123 Main St, City, Country");
-          break;
-        case "textarea":
-          await eventTypePage.getByPlaceholder("Textarea test").click();
-          await eventTypePage.getByPlaceholder("Textarea test").fill("This is a sample text for textarea.");
-          break;
-        case "select":
-          await eventTypePage.getByLabel("select-dropdown").last().click();
-          await eventTypePage.getByTestId("select-option-Option 1").click();
-          break;
-        case "multiselect":
-          // select-dropdown
-          await eventTypePage.getByLabel("multi-select-dropdown").click();
-          await eventTypePage.getByTestId("select-option-Option 1").click();
-          break;
-        case "number":
-          await eventTypePage.getByLabel("number test").click();
-          await eventTypePage.getByLabel("number test").fill("123");
-          break;
-        case "radio":
-          await eventTypePage.getByRole("radiogroup").getByText("Option 1").check();
-          break;
-        case "text":
-          await eventTypePage.getByPlaceholder("Text test").click();
-          await eventTypePage.getByPlaceholder("Text test").fill("Sample text");
-          break;
-        case "checkbox":
-          await eventTypePage.getByLabel("Option 1").first().check();
-          await eventTypePage.getByLabel("Option 2").first().check();
-          break;
-        case "boolean":
-          await eventTypePage.getByLabel(`${question} test`).check();
-          break;
-        case "multiemail":
-          await eventTypePage.getByRole("button", { name: "multiemail test" }).click();
-          await eventTypePage.getByPlaceholder("multiemail test").fill(EMAIL);
-          break;
-      }
-    }
-  }
-};
-
 export async function loginUser(users: UserFixture) {
  const pro = await users.create({ name: "testuser" });
  await pro.apiLogin();
@@ -191,17 +22,6 @@ export async function loginUserWithTeam(users: UserFixture, role: MembershipRole
  await pro.apiLogin();
 }

-const goToNextMonthIfNoAvailabilities = async (eventTypePage: Page) => {
-  try {
-    if (isLastDayOfMonth()) {
-      await eventTypePage.getByTestId("view_next_month").waitFor({ timeout: 6000 });
-      await eventTypePage.getByTestId("view_next_month").click();
-    }
-  } catch (err) {
-    console.info("No need to click on view next month button");
-  }
-};
-
 export function createBookingPageFixture(page: Page) {
  return {
    goToEventType: async (eventType: string) => {
@@ -216,308 +36,19 @@ export function createBookingPageFixture(page: Page) {
    goToTab: async (tabName: string) => {
      await page.getByTestId(`vertical-tab-${tabName}`).click();
    },
-
    goToEventTypesPage: async () => {
      await page.goto("/event-types");
    },
-
-    setResolution: async (width: number, height: number) => {
-      await page.setViewportSize({ width: width, height: height });
-    },
-    addQuestion: async (
-      questionType: string,
-      identifier: string,
-      label: string,
-      isRequired: boolean,
-      placeholder?: string
-    ) => {
-      await page.getByTestId("add-field").click();
-      await page.getByTestId("test-field-type").click();
-      await page.getByTestId(`select-option-${questionType}`).click();
-      await page.getByLabel("Identifier").dblclick();
-      await page.getByLabel("Identifier").fill(identifier);
-      await page.getByLabel("Label").click();
-      await page.getByLabel("Label").fill(label);
-      if (placeholder) {
-        await page.getByLabel("Placeholder").click();
-        await page.getByLabel("Placeholder").fill(placeholder);
-      }
-      if (!isRequired) {
-        await page.getByRole("radio", { name: "No" }).click();
-      }
-      await page.getByTestId("field-add-save").click();
-    },
-    updateRecurringTab: async (repeatWeek: string, maxEvents: string) => {
-      const repeatText = (await localize("en"))("repeats_every");
-      const maximumOf = (await localize("en"))("for_a_maximum_of");
-      await page.getByTestId("recurring-event-check").click();
-      await page
-        .getByTestId("recurring-event-collapsible")
-        .locator("div")
-        .filter({ hasText: repeatText })
-        .getByRole("spinbutton")
-        .fill(repeatWeek);
-      await page
-        .getByTestId("recurring-event-collapsible")
-        .locator("div")
-        .filter({ hasText: maximumOf })
-        .getByRole("spinbutton")
-        .fill(maxEvents);
-    },
    updateEventType: async () => {
      await page.getByTestId("update-eventtype").click();
      const toast = await page.waitForSelector('[data-testid="toast-success"]');
      expect(toast).toBeTruthy();
    },
-
    previewEventType: async () => {
      const eventtypePromise = page.waitForEvent("popup");
      await page.getByTestId("preview-button").click();
      return eventtypePromise;
    },
-
-    selectTimeSlot: async (eventTypePage: Page) => {
-      await goToNextMonthIfNoAvailabilities(eventTypePage);
-      await eventTypePage.getByTestId("time").first().click();
-    },
-
-    clickReschedule: async () => {
-      await page.getByText("Reschedule").click();
-    },
-
-    selectFirstAvailableTime: async () => {
-      await page.getByTestId("time").first().click();
-    },
-
-    fillRescheduleReasonAndConfirm: async () => {
-      await page.getByPlaceholder(reschedulePlaceholderText).click();
-      await page.getByPlaceholder(reschedulePlaceholderText).fill("Test reschedule");
-      await page.getByTestId("confirm-reschedule-button").click();
-    },
-
-    fillRecurringFieldAndConfirm: async (eventTypePage: Page) => {
-      await eventTypePage.getByTestId("occurrence-input").click();
-      await eventTypePage.getByTestId("occurrence-input").fill("2");
-      await goToNextMonthIfNoAvailabilities(eventTypePage);
-      await eventTypePage.getByTestId("time").first().click();
-      await expect(eventTypePage.getByTestId("recurring-dates")).toBeVisible();
-    },
-
-    cancelBookingWithReason: async (page: Page) => {
-      await page.getByTestId("cancel").click();
-      await page.getByTestId("cancel_reason").fill("Test cancel");
-      await page.getByTestId("confirm_cancel").click();
-    },
-
-    assertBookingCanceled: async (page: Page) => {
-      await expect(page.getByTestId("cancelled-headline")).toBeVisible();
-    },
-
-    rescheduleBooking: async (eventTypePage: Page) => {
-      await goToNextMonthIfNoAvailabilities(eventTypePage);
-      await eventTypePage.getByText("Reschedule").click();
-      while (await eventTypePage.getByRole("button", { name: "View next" }).isVisible()) {
-        await eventTypePage.getByRole("button", { name: "View next" }).click();
-      }
-      await eventTypePage.getByTestId("time").first().click();
-      await eventTypePage.getByPlaceholder(reschedulePlaceholderText).click();
-      await eventTypePage.getByPlaceholder(reschedulePlaceholderText).fill("Test reschedule");
-      await eventTypePage.getByTestId("confirm-reschedule-button").click();
-      await eventTypePage.waitForTimeout(400);
-      if (
-        await eventTypePage.getByRole("heading", { name: "Could not reschedule the meeting." }).isVisible()
-      ) {
-        await eventTypePage.getByTestId("back").click();
-        await eventTypePage.getByTestId("time").last().click();
-        await eventTypePage.getByTestId("confirm-reschedule-button").click();
-      }
-    },
-
-    assertBookingRescheduled: async (page: Page) => {
-      await expect(page.getByText(scheduleSuccessfullyText)).toBeVisible();
-    },
-
-    assertRepeatEventType: async () => {
-      await expect(page.getByTestId("repeat-eventtype")).toBeVisible();
-    },
-
-    cancelBooking: async (eventTypePage: Page) => {
-      await eventTypePage.getByTestId("cancel").click();
-      await eventTypePage.getByTestId("cancel_reason").fill("Test cancel");
-      await eventTypePage.getByTestId("confirm_cancel").click();
-      await expect(eventTypePage.getByTestId("cancelled-headline")).toBeVisible();
-    },
-
-    confirmBooking: async (eventTypePage: Page) => {
-      await eventTypePage.getByTestId("confirm-book-button").click();
-      await eventTypePage.waitForURL("booking/**");
-      await expect(eventTypePage.getByText(scheduleSuccessfullyText)).toBeVisible();
-    },
-
-    fillAndConfirmBooking: async ({
-      eventTypePage,
-      placeholderText,
-      question,
-      fillText,
-      secondQuestion,
-      options,
-    }: fillAndConfirmBookingParams) => {
-      const confirmButton = options.isReschedule ? "confirm-reschedule-button" : "confirm-book-button";
-
-      await expect(eventTypePage.getByText(`${secondQuestion} test`).first()).toBeVisible();
-      await eventTypePage.getByPlaceholder(placeholderText).fill(fillText);
-
-      // Change the selector for specifics cases related to select question
-      const shouldChangeSelectLocator = (question: string, secondQuestion: string): boolean =>
-        question === "select" && ["multiemail", "multiselect", "address"].includes(secondQuestion);
-
-      const shouldUseLastRadioGroupLocator = (question: string, secondQuestion: string): boolean =>
-        question === "radio" && secondQuestion === "checkbox";
-
-      const shouldUseFirstRadioGroupLocator = (question: string, secondQuestion: string): boolean =>
-        question === "checkbox" && secondQuestion === "radio";
-
-      const shouldChangeMultiSelectLocator = (question: string, secondQuestion: string): boolean =>
-        question === "multiselect" &&
-        ["address", "checkbox", "multiemail", "select"].includes(secondQuestion);
-
-      const customLocators = {
-        shouldChangeSelectLocator: shouldChangeSelectLocator(question, secondQuestion),
-        shouldUseLastRadioGroupLocator: shouldUseLastRadioGroupLocator(question, secondQuestion),
-        shouldUseFirstRadioGroupLocator: shouldUseFirstRadioGroupLocator(question, secondQuestion),
-        shouldChangeMultiSelectLocator: shouldChangeMultiSelectLocator(question, secondQuestion),
-      };
-
-      // Fill the first question
-      await fillQuestion(eventTypePage, question, customLocators);
-
-      // Fill the second question if is required
-      options.isRequired && (await fillQuestion(eventTypePage, secondQuestion, customLocators));
-
-      await eventTypePage.getByTestId(confirmButton).click();
-      await eventTypePage.waitForTimeout(400);
-      if (await eventTypePage.getByRole("heading", { name: "Could not book the meeting." }).isVisible()) {
-        await eventTypePage.getByTestId("back").click();
-        await eventTypePage.getByTestId("time").last().click();
-        await fillQuestion(eventTypePage, question, customLocators);
-        options.isRequired && (await fillQuestion(eventTypePage, secondQuestion, customLocators));
-        await eventTypePage.getByTestId(confirmButton).click();
-      }
-      const scheduleSuccessfullyPage = eventTypePage.getByText(scheduleSuccessfullyText);
-      await scheduleSuccessfullyPage.waitFor({ state: "visible" });
-      await expect(scheduleSuccessfullyPage).toBeVisible();
-    },
-
-    fillAllQuestions: async (eventTypePage: Page, questions: string[], options: BookingOptions) => {
-      const confirmButton = options.isReschedule ? "confirm-reschedule-button" : "confirm-book-button";
-      await fillAllQuestions(eventTypePage, questions, options);
-      await eventTypePage.getByTestId(confirmButton).click();
-      const scheduleSuccessfullyPage = eventTypePage.getByText(scheduleSuccessfullyText);
-      await scheduleSuccessfullyPage.waitFor({ state: "visible" });
-      await expect(scheduleSuccessfullyPage).toBeVisible();
-    },
-    addGuests: async (eventTypePage: Page, options: { guests: string[] }) => {
-      await eventTypePage.getByTestId("add-guests").click();
-      for (const guest of options.guests) {
-        await eventTypePage.getByPlaceholder("Email").fill(guest);
-      }
-    },
-    createTeam: async (name: string) => {
-      await page.getByTestId("teams-test").click();
-      await page.getByTestId("new-team-btn").click();
-      await page.getByPlaceholder("Acme Inc.").click();
-      await page.getByPlaceholder("Acme Inc.").fill(name);
-      await page.getByTestId("continue-button").click();
-      await page.getByTestId("publish-button").click();
-
-      await page.getByTestId("vertical-tab-Back").click();
-    },
-
-    createTeamEventType: async (name: string, options: teamBookingtypes) => {
-      await page.getByTestId("new-event-type").click();
-      await page.getByTestId("option-0").click();
-
-      // We first simulate to create a default event type to check if managed option is not available
-
-      const managedEventDescription = (await localize("en"))("managed_event_description");
-      const roundRobinEventDescription = (await localize("en"))("round_robin_description");
-      const collectiveEventDescription = (await localize("en"))("collective_description");
-      const quickChatText = (await localize("en"))("quick_chat");
-      await expect(page.locator("div").filter({ hasText: managedEventDescription })).toBeHidden();
-      await page.getByTestId("dialog-rejection").click();
-
-      await page.getByTestId("new-event-type").click();
-      await page.getByTestId("option-team-1").click();
-      await page.getByPlaceholder(quickChatText).fill(name);
-      if (options.isCollectiveType) {
-        await page
-          .locator("div")
-          .filter({ hasText: `Collective${collectiveEventDescription}` })
-          .getByRole("radio")
-          .first()
-          .click();
-      }
-
-      if (options.isRoundRobinType) {
-        await page
-          .locator("div")
-          .filter({ hasText: `Round Robin${roundRobinEventDescription}` })
-          .getByRole("radio")
-          .nth(1)
-          .click();
-      }
-
-      if (options.isManagedType) {
-        await page
-          .locator("div")
-          .filter({ hasText: `Managed Event${managedEventDescription}` })
-          .getByRole("radio")
-          .last()
-          .click();
-
-        const managedEventClarification = (await localize("en"))("managed_event_url_clarification");
-        await expect(page.getByText(managedEventClarification)).toBeVisible();
-      }
-
-      const continueText = (await localize("en"))("continue");
-      const toast = page.getByTestId("toast-success");
-
-      await page.getByRole("button", { name: continueText }).click();
-      expect(toast).toBeTruthy();
-      await page.getByTestId("update-eventtype").click();
-    },
-    assertLabelWithCorrectTeamName: async (page: Page, teamName: string) => {
-      await expect(page.getByRole("link", { name: teamName }).first()).toBeVisible();
-    },
-    assertBookingWithCorrectTitleAndDescription: async (
-      page: Page,
-      options: { profileName: string; bookingName: string; teamName: string; aditionalGuestEmail?: string }
-    ) => {
-      options.aditionalGuestEmail
-        ? await expect(
-            page.getByRole("link", {
-              name: `${options.bookingName} between ${options.teamName} and ${options.profileName} You , ${options.profileName} and ${options.aditionalGuestEmail}`,
-            })
-          ).toBeVisible()
-        : await expect(
-            page.getByRole("link", {
-              name: `${options.bookingName} between ${options.teamName} and ${options.profileName} You and ${options.profileName}`,
-            })
-          ).toBeVisible();
-    },
-    clickOnBooking: async (page: Page, teamName: string) => {
-      await page.getByRole("link", { name: teamName }).first().click();
-    },
-
-    checkField: async (question: string, options?: { isOptional: boolean }) => {
-      if (options?.isOptional) {
-        await expect(page.getByTestId(`field-${question}-test`).getByTestId("optional")).toBeVisible();
-      } else {
-        await expect(page.getByTestId(`field-${question}-test`).getByTestId("required")).toBeVisible();
-      }
-      await expect(page.getByTestId(`field-${question}-test`)).toBeVisible();
-    },
-
    checkRequiresConfirmation: async () => {
      // Check existence of the icon
      await expect(page.getByTestId("requires-confirmation-title").locator("svg")).toBeVisible();
@@ -526,7 +57,6 @@ export function createBookingPageFixture(page: Page) {
      await expect(confirmationSwitch).toBeVisible();
      await confirmationSwitch.click();
    },
-
    checkRequiresBookerEmailVerification: async () => {
      await expect(page.getByTestId("requires-booker-email-verification-title").locator("svg")).toBeVisible();

@@ -535,7 +65,6 @@ export function createBookingPageFixture(page: Page) {
      await expect(emailSwitch).toBeVisible();
      await emailSwitch.click();
    },
-
    checkHideNotes: async () => {
      await expect(page.getByTestId("disable-notes-title").locator("svg")).toBeVisible();

@@ -544,7 +73,6 @@ export function createBookingPageFixture(page: Page) {
      await expect(hideNotesSwitch).toBeVisible();
      await hideNotesSwitch.click();
    },
-
    checkRedirectOnBooking: async () => {
      await expect(page.getByTestId("redirect-success-booking-title").locator("svg")).toBeVisible();

@@ -555,7 +83,6 @@ export function createBookingPageFixture(page: Page) {
      await page.getByTestId("external-redirect-url").fill("https://cal.com");
      await expect(page.getByTestId("redirect-url-warning")).toBeVisible();
    },
-
    checkEnablePrivateUrl: async () => {
      await expect(page.getByTestId("hashedLinkCheck-title").locator("label div")).toBeVisible();

@@ -564,7 +91,6 @@ export function createBookingPageFixture(page: Page) {
      await page.getByTestId("hashedLinkCheck").click();
      await expect(page.getByTestId("generated-hash-url")).toBeVisible();
    },
-
    toggleOfferSeats: async () => {
      await expect(page.getByTestId("offer-seats-toggle-title").locator("svg")).toBeVisible();

@@ -575,7 +101,6 @@ export function createBookingPageFixture(page: Page) {
      await expect(seatSwitchField).toHaveValue("3");
      await expect(page.getByTestId("show-attendees")).toBeVisible();
    },
-
    checkLockTimezone: async () => {
      await expect(page.getByTestId("lock-timezone-toggle-title").locator("svg")).toBeVisible();

@@ -584,18 +109,9 @@ export function createBookingPageFixture(page: Page) {
      await expect(lockSwitch).toBeVisible();
      await lockSwitch.click();
    },
-
    checkEventType: async () => {
      await expect(page.getByTestId("requires-confirmation-badge").last()).toBeVisible();
    },
-
-    assertBookingIsVisible: async (name: string) => {
-      await expect(
-        page.getByRole("link", {
-          name,
-        })
-      ).toBeVisible();
-    },
    checkBufferTime: async () => {
      const minutes = (await localize("en"))("minutes");
      const fieldPlaceholder = page.getByPlaceholder("0");
@@ -629,7 +145,6 @@ export function createBookingPageFixture(page: Page) {
      await page.getByTestId("select-option-60").click();
      await expect(page.getByText(`60 ${minutes}`, { exact: true })).toBeVisible();
    },
-
    checkLimitBookingFrequency: async () => {
      const fieldPlaceholder = page.getByPlaceholder("1").nth(1);
      const limitFrequency = (await localize("en"))("limit_booking_frequency");
@@ -645,7 +160,6 @@ export function createBookingPageFixture(page: Page) {
      await expect(fieldPlaceholder).toHaveValue("12");
      await limitFrequencySwitch.click();
    },
-
    checkLimitBookingDuration: async () => {
      const limitDuration = (await localize("en"))("limit_total_booking_duration");
      const addlimit = (await localize("en"))("add_limit");
@@ -659,7 +173,6 @@ export function createBookingPageFixture(page: Page) {
      await expect(page.getByTestId("add-limit")).toHaveCount(2);
      await limitDurationSwitch.click();
    },
-
    checkLimitFutureBookings: async () => {
      const limitFutureBookings = (await localize("en"))("limit_future_bookings");
      const limitBookingsSwitch = page
@@ -672,7 +185,6 @@ export function createBookingPageFixture(page: Page) {
      await expect(page.locator("#RANGE")).toBeChecked();
      await limitBookingsSwitch.click();
    },
-
    checkOffsetTimes: async () => {
      const offsetStart = (await localize("en"))("offset_start");
      const offsetStartTimes = (await localize("en"))("offset_toggle");
@@ -685,54 +197,8 @@ export function createBookingPageFixture(page: Page) {
        page.getByText("e.g. this will show time slots to your bookers at 9:10 AM instead of 9:00 AM")
      ).toBeVisible();
    },
-
    checkTimeSlotsCount: async (eventTypePage: Page, count: number) => {
      await expect(eventTypePage.getByTestId("time")).toHaveCount(count);
    },
-    createBookingWebhook: async (webhookReceiver: { url: string }, eventTitle: string) => {
-      const events = [
-        "Booking Canceled",
-        "Booking Created",
-        "Booking Rejected",
-        "Booking Requested",
-        "Booking Payment Initiated",
-        "Booking Rescheduled",
-        "Meeting Ended",
-        "Booking Paid",
-        "Recording Download Link Ready",
-      ];
-      await page.goto(`${WEBAPP_URL}/event-types`);
-      await page.getByText(eventTitle).click();
-
-      await page.getByTestId("vertical-tab-webhooks").click();
-
-      await page.getByTestId("new_webhook").click();
-      await page.getByLabel("Subscriber URL").fill(webhookReceiver.url);
-      await page.getByRole("button", { name: "Ping test" }).click();
-      page
-        .getByTestId("dialog-creation")
-        .locator("div")
-        .filter({ hasText: '{ "ok": true, "status": 200, "message": "{}" }' })
-        .nth(2);
-      await page.getByRole("button", { name: "Create Webhook" }).click();
-
-      page.getByText(webhookReceiver.url);
-      events.forEach((event) => {
-        page.getByText(event);
-      });
-    },
-    rejectFirstBooking: async () => {
-      await page.goto("/bookings/unconfirmed");
-      await page.getByTestId("horizontal-tab-unconfirmed").click();
-      await page.getByTestId("booking-item").first().getByText("Reject").click();
-      await page.getByTestId("rejection-confirm").click();
-    },
-    fillEmailAndName: async (eventTypePage: Page) => {
-      const emailLabel = (await localize("en"))("email_address");
-      const nameLabel = (await localize("en"))("your_name");
-
-      await eventTypePage.getByLabel(emailLabel).fill(EMAIL);
-      await eventTypePage.getByLabel(nameLabel).fill("testuser");
-    },
  };
 }
@@ -58,7 +58,7 @@ const createTeamWorkflow = async (user: { id: number }, team: { id: number }) =>
  });
 };

-const createTeamEventType = async (
+export const createTeamEventType = async (
  user: { id: number },
  team: { id: number },
  scenario?: {
@@ -120,18 +120,21 @@ const createTeamAndAddUser = async (
  const slug = `${isOrg ? "org" : "team"}-${workerInfo.workerIndex}-${Date.now()}`;
  const data: PrismaType.TeamCreateInput = {
    name: `user-id-${user.id}'s ${isOrg ? "Org" : "Team"}`,
+    isOrganization: isOrg,
  };
  data.metadata = {
    ...(isUnpublished ? { requestedSlug: slug } : {}),
-    ...(isOrg
-      ? {
-          isOrganization: true,
-          isOrganizationVerified: !!isOrgVerified,
-          orgAutoAcceptEmail: user.email.split("@")[1],
-          isOrganizationConfigured: false,
-        }
-      : {}),
  };
+  if (isOrg) {
+    data.organizationSettings = {
+      create: {
+        isOrganizationVerified: !!isOrgVerified,
+        orgAutoAcceptEmail: user.email.split("@")[1],
+        isOrganizationConfigured: false,
+      },
+    };
+  }
+
  data.slug = !isUnpublished ? slug : undefined;
  if (isOrg && hasSubteam) {
    const team = await createTeamAndAddUser({ user }, workerInfo);
@@ -518,6 +521,7 @@ export const createUsersFixture = (
      // Delete all users that were tracked by email(if they were created)
      await prisma.user.deleteMany({ where: { email: { in: store.trackedEmails.map((e) => e.email) } } });
      await prisma.team.deleteMany({ where: { id: { in: store.teams.map((org) => org.id) } } });
+      await prisma.secondaryEmail.deleteMany({ where: { userId: { in: ids } } });
      store.users = [];
      store.teams = [];
      store.trackedEmails = [];
@@ -593,25 +597,40 @@ const createUserFixture = (user: UserWithIncludes, page: Page) => {
            },
          };
        })
-        .find((membership) => !membership.team?.metadata?.isOrganization);
+        .find((membership) => !membership.team.isOrganization);
      if (!membership) {
        throw new Error("No team found for user");
      }
      return membership;
    },
    getOrgMembership: async () => {
-      return prisma.membership.findFirstOrThrow({
+      const membership = await prisma.membership.findFirstOrThrow({
        where: {
          userId: user.id,
          team: {
-            metadata: {
-              path: ["isOrganization"],
-              equals: true,
+            isOrganization: true,
+          },
+        },
+        include: {
+          team: {
+            include: {
+              children: true,
+              organizationSettings: true,
            },
          },
        },
-        include: { team: { include: { children: true } } },
      });
+      if (!membership) {
+        return membership;
+      }
+
+      return {
+        ...membership,
+        team: {
+          ...membership.team,
+          metadata: teamMetadataSchema.parse(membership.team.metadata),
+        },
+      };
    },
    getFirstEventAsOwner: async () =>
      prisma.eventType.findFirstOrThrow({
@@ -669,6 +688,7 @@ type CustomUserOpts = Partial<Pick<Prisma.User, CustomUserOptsKeys>> & {
  roleInOrganization?: MembershipRole;
  schedule?: Schedule;
  password?: string | null;
+  emailDomain?: string;
 };

 // creates the actual user in the db.
@@ -686,10 +706,11 @@ const createUser = (
      ? opts.username
      : `${opts?.username || "user"}-${workerInfo.workerIndex}-${Date.now()}`;

+  const emailDomain = opts?.emailDomain || "example.com";
  return {
    username: uname,
    name: opts?.name,
-    email: opts?.email ?? `${uname}@example.com`,
+    email: opts?.email ?? `${uname}@${emailDomain}`,
    password: {
      create: {
        hash: hashPassword(uname),
@@ -4,6 +4,7 @@ import { test as base } from "@playwright/test";
 import prisma from "@calcom/prisma";

 import type { ExpectedUrlDetails } from "../../../../playwright.config";
+import { createAppsFixture } from "../fixtures/apps";
 import { createBookingsFixture } from "../fixtures/bookings";
 import { createEmailsFixture } from "../fixtures/emails";
 import { createEmbedsFixture } from "../fixtures/embeds";
@@ -32,6 +33,7 @@ export interface Fixtures {
  workflowPage: ReturnType<typeof createWorkflowPageFixture>;
  features: ReturnType<typeof createFeatureFixture>;
  eventTypePage: ReturnType<typeof createEventTypeFixture>;
+  appsPage: ReturnType<typeof createAppsFixture>;
 }

 declare global {
@@ -104,4 +106,8 @@ export const test = base.extend<Fixtures>({
    const eventTypePage = createEventTypeFixture(page);
    await use(eventTypePage);
  },
+  appsPage: async ({ page }, use) => {
+    const appsPage = createAppsFixture(page);
+    await use(appsPage);
+  },
 });
@@ -1,4 +1,5 @@
 import type { Frame, Page } from "@playwright/test";
+import type { APIResponse } from "@playwright/test";
 import { expect } from "@playwright/test";
 import { createHash } from "crypto";
 import EventEmitter from "events";
@@ -369,3 +370,53 @@ export async function doOnOrgDomain(
 // When App directory is there, this is the 404 page text. We should work on fixing the 404 page as it changed due to app directory.
 export const NotFoundPageTextAppDir = "This page does not exist.";
 // export const NotFoundPageText = "ERROR 404";
+
+export type Team = {
+  id: number;
+  slug: string | null;
+  name: string;
+};
+
+export type EventType = {
+  id: number;
+  title: string;
+  slug: string;
+};
+export type User = {
+  id: number;
+  name: string | null;
+  username: string | null;
+};
+
+export async function bookTeamEvent(page: Page, team: Team, eventType: EventType) {
+  await page.goto(`/team/${team.slug}/${eventType.slug}/`);
+  await bookEventOnThisPage(page);
+  const bookingTitle = `${eventType.title} between ${team.name} and ${testName}`;
+  await assertBookingIsCorrect(page, bookingTitle);
+}
+export async function bookUserEvent(page: Page, user: User, eventType: EventType) {
+  await page.goto(`/${user.username}/${eventType.slug}/`);
+  await bookEventOnThisPage(page);
+  const bookingTitle = `${eventType.title} between ${user.name} and ${testName}`;
+  await assertBookingIsCorrect(page, bookingTitle);
+}
+
+export async function assertBookingIsCorrect(page: Page, bookingTitle: string) {
+  await expect(page.locator("[data-testid=booking-title]")).toHaveText(bookingTitle);
+  // The booker should be in the attendee list
+  await expect(page.locator(`[data-testid="attendee-name-${testName}"]`)).toHaveText(testName);
+}
+
+export const assertBookingVisibleFor = async (
+  user: { apiLogin: () => Promise<APIResponse> },
+  pageFixture: Fixtures["page"],
+  eventType: EventType,
+  shouldBeVisible: boolean
+) => {
+  await user.apiLogin();
+  await pageFixture.goto(`/bookings/upcoming`);
+  const upcomingBookingList = pageFixture.locator('[data-testid="booking-item"]');
+  shouldBeVisible
+    ? await expect(upcomingBookingList.locator(`text=${eventType.title}`)).toBeVisible()
+    : await expect(upcomingBookingList.locator(`text=${eventType.title}`)).toBeHidden();
+};
@@ -11,9 +11,9 @@ import {
  selectFirstAvailableTimeSlotNextMonth,
 } from "./lib/testUtils";

-test.afterEach(({ users }) => users.deleteAll());
+test.afterAll(({ users }) => users.deleteAll());

-test.describe("Managed Event Types tests", () => {
+test.describe("Managed Event Types", () => {
  test("Can create managed event type", async ({ page, users }) => {
    // Creating the owner user of the team
    const adminUser = await users.create();
@@ -61,7 +61,7 @@ test.describe("Managed Event Types tests", () => {
      await expect(page.locator('input[name="title"]')).toBeEditable();
      await expect(page.locator('input[name="slug"]')).toBeEditable();
      await expect(page.locator('input[name="length"]')).toBeEditable();
-      await adminUser.logout();
+      await adminUser.apiLogin();
    });

    await test.step("Managed event type exists for added member", async () => {
@@ -73,7 +73,7 @@ test.describe("Managed Event Types tests", () => {
      await page.locator('button[data-testid^="accept-invitation"]').click();
      await page.getByText("Member").waitFor();

-      await memberUser.logout();
+      await page.goto("/auth/logout");

      // Coming back as team owner to assign member user to managed event
      await adminUser.apiLogin();
@@ -107,7 +107,6 @@ test.describe("Managed Event Types tests", () => {

    await test.step("Managed event type has locked fields for added member", async () => {
      await adminUser.logout();
-
      // Coming back as member user to see if there is a managed event present after assignment
      await memberUser.apiLogin();
      await page.goto("/event-types");
@@ -118,6 +117,90 @@ test.describe("Managed Event Types tests", () => {
      await expect(page.locator('input[name="title"]')).not.toBeEditable();
      await expect(page.locator('input[name="slug"]')).not.toBeEditable();
      await expect(page.locator('input[name="length"]')).not.toBeEditable();
+
+      await page.goto("/auth/logout");
+    });
+
+    await test.step("Managed event type provides discrete field lock/unlock state for admin", async () => {
+      await adminUser.apiLogin();
+      await page.goto("/event-types");
+
+      await page.getByTestId("event-types").locator('a[title="managed"]').click();
+      await page.waitForURL("event-types/**");
+
+      // Locked by default
+      const titleLockIndicator = page.getByTestId("locked-indicator-title");
+      await expect(titleLockIndicator).toBeVisible();
+      await expect(titleLockIndicator.locator("[data-state='checked']")).toHaveCount(1);
+
+      // Proceed to unlock and check that it got unlocked
+      titleLockIndicator.click();
+      await expect(titleLockIndicator.locator("[data-state='checked']")).toHaveCount(0);
+      await expect(titleLockIndicator.locator("[data-state='unchecked']")).toHaveCount(1);
+
+      // Save changes
+      await page.locator('[type="submit"]').click();
+      await page.waitForLoadState("networkidle");
+
+      await page.goto("/auth/logout");
+    });
+
+    await test.step("Managed event type shows discretionally unlocked field to member", async () => {
+      await memberUser.apiLogin();
+      await page.goto("/event-types");
+
+      await page.getByTestId("event-types").locator('a[title="managed"]').click();
+      await page.waitForURL("event-types/**");
+
+      await expect(page.locator('input[name="title"]')).toBeEditable();
+      await page.waitForLoadState("networkidle");
+
+      await page.goto("/auth/logout");
+    });
+
+    await test.step("Managed event type should only update the unlocked fields modified by Admin", async () => {
+      await memberUser.apiLogin();
+      await page.goto("/event-types");
+
+      await page.getByTestId("event-types").locator('a[title="managed"]').click();
+      await page.waitForURL("event-types/**");
+
+      await expect(page.locator('input[name="title"]')).toBeEditable();
+      await page.locator('input[name="title"]').fill(`Managed Event Title`);
+      // Save changes
+      await page.locator('[type="submit"]').click();
+      await page.getByTestId("toast-success").waitFor();
+      await page.waitForLoadState("networkidle");
+
+      await page.goto("/auth/logout");
+
+      await adminUser.apiLogin();
+      await page.goto("/event-types");
+      await page.getByTestId("event-types").locator('a[title="managed"]').click();
+      await page.waitForURL("event-types/**");
+
+      await page.locator('input[name="length"]').fill(`45`);
+      // Save changes
+      await page.locator('[type="submit"]').click();
+      await page.getByTestId("toast-success").waitFor();
+      await page.waitForLoadState("networkidle");
+
+      await page.goto("/auth/logout");
+
+      await memberUser.apiLogin();
+      await page.goto("/event-types");
+
+      await page.getByTestId("event-types").locator('a[title="Managed Event Title"]').click();
+      await page.waitForURL("event-types/**");
+
+      //match length
+      expect(await page.locator("[data-testid=duration]").getAttribute("value")).toBe("45");
+      //ensure description didn't update
+      expect(await page.locator(`input[name="title"]`).getAttribute("value")).toBe(`Managed Event Title`);
+      await page.locator('input[name="title"]').fill(`managed`);
+      // Save changes
+      await page.locator('[type="submit"]').click();
+      await page.getByTestId("toast-success").waitFor();
    });
  });
 });
@@ -10,6 +10,8 @@ test.beforeEach(async ({ page, users, bookingPage }) => {

  await page.goto("/event-types");
  await bookingPage.goToEventType(teamEventTitle);
+  await page.getByTestId("location-select").click();
+  await page.locator(`text="Cal Video (Global)"`).click();
  await bookingPage.goToTab("event_advanced_tab_title");
 });

@@ -19,7 +21,6 @@ test.describe("Check advanced options in a managed team event type", () => {
    await bookingPage.checkRequiresBookerEmailVerification();
    await bookingPage.checkHideNotes();
    await bookingPage.checkRedirectOnBooking();
-    await bookingPage.checkEnablePrivateUrl();
    await bookingPage.checkLockTimezone();
    await bookingPage.updateEventType();
    await bookingPage.goToEventTypesPage();
@@ -32,7 +33,6 @@ test.describe("Check advanced options in a managed team event type", () => {
    await bookingPage.checkRequiresBookerEmailVerification();
    await bookingPage.checkHideNotes();
    await bookingPage.checkRedirectOnBooking();
-    await bookingPage.checkEnablePrivateUrl();
    await bookingPage.toggleOfferSeats();
    await bookingPage.checkLockTimezone();
    await bookingPage.updateEventType();
@@ -0,0 +1,391 @@
+import type { Page } from "@playwright/test";
+import { expect } from "@playwright/test";
+
+import { randomString } from "@calcom/lib/random";
+import slugify from "@calcom/lib/slugify";
+import prisma from "@calcom/prisma";
+import { MembershipRole, SchedulingType } from "@calcom/prisma/enums";
+
+import { createTeamEventType } from "../fixtures/users";
+import { test } from "../lib/fixtures";
+import type { Fixtures } from "../lib/fixtures";
+import {
+  assertBookingVisibleFor,
+  bookTimeSlot,
+  doOnOrgDomain,
+  NotFoundPageTextAppDir,
+  selectFirstAvailableTimeSlotNextMonth,
+  testName,
+} from "../lib/testUtils";
+
+test.describe("Bookings list for organizations", () => {
+  test.afterEach(({ orgs, users }) => {
+    orgs.deleteAll();
+    users.deleteAll();
+  });
+
+  test.describe("Team Event", () => {
+    test("Collective EventType booking list", async ({ page, users, orgs }) => {
+      const { org, orgOwner, orgAdmin, team1owner, team2owner, commonUser, team1_teammate1 } =
+        await createOrg(orgs, users);
+
+      const { team: team1 } = await team1owner.getFirstTeamMembership();
+      const scenario = {
+        schedulingType: SchedulingType.COLLECTIVE,
+        teamEventTitle: `collective-team-event`,
+        teamEventSlug: slugify(`collective-team-event-${randomString(5)}`),
+      };
+      const eventType = await createTeamEventType(team1owner, team1, scenario);
+      const { id: eventId, slug: evnetSlug } = eventType;
+
+      await prisma.host.createMany({
+        data: [
+          {
+            userId: commonUser.id,
+            eventTypeId: eventId,
+            isFixed: true,
+          },
+          {
+            userId: team1_teammate1.id,
+            eventTypeId: eventId,
+            isFixed: true,
+          },
+        ],
+      });
+
+      // to test if booking is visible to team admin/owner even if he is not part of the booking
+      await prisma.host.deleteMany({
+        where: {
+          userId: team1owner.id,
+          eventTypeId: eventId,
+        },
+      });
+
+      await expectPageToBeNotFound({ page, url: `/team/${team1.slug}/${eventType.slug}` });
+      await doOnOrgDomain(
+        {
+          orgSlug: org.slug,
+          page,
+        },
+        async () => {
+          await bookTeamEvent({ page, team: team1, event: eventType });
+        }
+      );
+      // booking should be visible for the Org OWNER even though he is not part of the booking
+      await assertBookingVisibleFor(orgOwner, page, eventType, true);
+      // booking should be visible for the Org ADMIN even though he is not part of the booking
+      await assertBookingVisibleFor(orgAdmin, page, eventType, true);
+      // booking should be visible for the team host even though he is not part of the booking
+      await assertBookingVisibleFor(team1owner, page, eventType, true);
+      // booking should not be visible for other team host, because its a team1 team-event
+      await assertBookingVisibleFor(team2owner, page, eventType, false);
+      // booking should be visible for commonUser as he is part of the booking
+      await assertBookingVisibleFor(commonUser, page, eventType, true);
+      // booking should be visible for team1_teammate1 as he is part of the booking
+      await assertBookingVisibleFor(team1_teammate1, page, eventType, true);
+    });
+
+    test("Round Robin EventType booking list", async ({ page, users, orgs }) => {
+      const { org, orgOwner, orgAdmin, team1owner, team2owner, commonUser, team1_teammate1 } =
+        await createOrg(orgs, users);
+
+      const { team: team1 } = await team1owner.getFirstTeamMembership();
+      const scenario = {
+        schedulingType: SchedulingType.ROUND_ROBIN,
+        teamEventTitle: `round-robin-team-event`,
+        teamEventSlug: slugify(`round-robin-team-event-${randomString(5)}`),
+      };
+
+      const eventType = await createTeamEventType(team1owner, team1, scenario);
+      const { id: eventId } = eventType;
+      await prisma.host.createMany({
+        data: [
+          {
+            userId: commonUser.id,
+            eventTypeId: eventId,
+          },
+          {
+            userId: team1_teammate1.id,
+            eventTypeId: eventId,
+          },
+        ],
+      });
+
+      await prisma.host.deleteMany({
+        where: {
+          userId: team1owner.id,
+          eventTypeId: eventId,
+        },
+      });
+
+      await expectPageToBeNotFound({ page, url: `/team/${team1.slug}/${eventType.slug}` });
+
+      await doOnOrgDomain(
+        {
+          orgSlug: org.slug,
+          page,
+        },
+        async () => {
+          await bookTeamEvent({ page, team: team1, event: eventType });
+        }
+      );
+      // booking should be visible for the Org OWNER even though he is not part of the booking
+      await assertBookingVisibleFor(orgOwner, page, eventType, true);
+      // booking should be visible for the Org ADMIN even though he is not part of the booking
+      await assertBookingVisibleFor(orgAdmin, page, eventType, true);
+      // booking should be visible for the team host even though he is not part of the booking
+      await assertBookingVisibleFor(team1owner, page, eventType, true);
+      // booking should not be visible for other team host
+      await assertBookingVisibleFor(team2owner, page, eventType, false);
+    });
+
+    test("Managed EventType booking list", async ({ page, users, orgs }) => {
+      const { org, orgOwner, orgAdmin, team1owner, team2owner, commonUser, team1_teammate1 } =
+        await createOrg(orgs, users);
+
+      const { team: team1 } = await team1owner.getFirstTeamMembership();
+
+      await team1owner.apiLogin();
+      await page.goto(`/event-types?dialog=new&eventPage=team%2F${team1.slug}&teamId=${team1.id}`);
+      await page.getByTestId("managed-event-type").click();
+      await page.getByTestId("event-type-quick-chat").click();
+      await page.getByTestId("event-type-quick-chat").fill("managed-event");
+      await page.getByRole("button", { name: "Continue" }).click();
+      await page.getByTestId("vertical-tab-assignment").click();
+
+      await page.getByRole("combobox", { name: "assignment-dropdown" }).fill("commonUser");
+      await page.getByRole("combobox", { name: "assignment-dropdown" }).press("Enter");
+      await page.getByRole("combobox", { name: "assignment-dropdown" }).fill("team1_teammate1");
+      await page.getByRole("combobox", { name: "assignment-dropdown" }).press("Enter");
+      await page.getByTestId("update-eventtype").click();
+
+      const eventType = await team1owner.getFirstTeamEvent(team1.id);
+
+      await expectPageToBeNotFound({ page, url: `/${commonUser.username}/${eventType.slug}` });
+
+      await doOnOrgDomain(
+        {
+          orgSlug: org.slug,
+          page,
+        },
+        async () => {
+          await bookUserEvent({ page, user: commonUser, event: eventType });
+        }
+      );
+
+      // booking should be visible for the Org OWNER even though he is not part of the booking
+      await assertBookingVisibleFor(orgOwner, page, eventType, true);
+      // booking should be visible for the Org ADMIN even though he is not part of the booking
+      await assertBookingVisibleFor(orgAdmin, page, eventType, true);
+      // booking should be visible for the team host even though he is not part of the booking
+      await assertBookingVisibleFor(team1owner, page, eventType, true);
+      // booking should not be visible for other team host
+      await assertBookingVisibleFor(team2owner, page, eventType, false);
+    });
+  });
+
+  test.describe("User Event", () => {
+    test("User personal booking list", async ({ page, users, orgs }) => {
+      const { org, orgOwner, orgAdmin, team1owner, team2owner, commonUser, team1_teammate1 } =
+        await createOrg(orgs, users);
+
+      const event = await commonUser.getFirstEventAsOwner();
+
+      await page.goto(`/${commonUser.username}/${event.slug}`);
+      // Shouldn't be servable on the non-org domain
+      await expect(page.locator(`text=${NotFoundPageTextAppDir}`)).toBeVisible();
+
+      await doOnOrgDomain(
+        {
+          orgSlug: org.slug,
+          page,
+        },
+        async () => {
+          await bookUserEvent({ page, user: commonUser, event });
+        }
+      );
+      // booking should be visible for the Org OWNER
+      await assertBookingVisibleFor(orgOwner, page, event, true);
+      // booking should be visible for the Org ADMIN
+      await assertBookingVisibleFor(orgAdmin, page, event, true);
+      // booking should be visible for the team host
+      await assertBookingVisibleFor(team1owner, page, event, true);
+      // booking should be visible for other team host because commonUser is part of both teams
+      await assertBookingVisibleFor(team2owner, page, event, true);
+      // booking should be visible for commonUser as he is part of the booking
+      await assertBookingVisibleFor(commonUser, page, event, true);
+      // booking should not be visible for team1_teammate1
+      await assertBookingVisibleFor(team1_teammate1, page, event, false);
+    });
+  });
+});
+
+async function bookUserEvent({
+  page,
+  user,
+  event,
+}: {
+  page: Page;
+  user: {
+    username: string | null;
+    name: string | null;
+  };
+  event: { slug: string; title: string };
+}) {
+  await page.goto(`/${user.username}/${event.slug}`);
+
+  await selectFirstAvailableTimeSlotNextMonth(page);
+  await bookTimeSlot(page);
+  await expect(page.getByTestId("success-page")).toBeVisible();
+
+  // The title of the booking
+  const BookingTitle = `${event.title} between ${user.name} and ${testName}`;
+  await expect(page.getByTestId("booking-title")).toHaveText(BookingTitle);
+  // The booker should be in the attendee list
+  await expect(page.getByTestId(`attendee-name-${testName}`)).toHaveText(testName);
+}
+
+async function bookTeamEvent({
+  page,
+  team,
+  event,
+}: {
+  page: Page;
+  team: {
+    slug: string | null;
+    name: string | null;
+  };
+  event: { slug: string; title: string };
+}) {
+  // Note that even though the default way to access a team booking in an organization is to not use /team in the URL, but it isn't testable with playwright as the rewrite is taken care of by Next.js config which can't handle on the fly org slug's handling
+  // So, we are using /team in the URL to access the team booking
+  // There are separate tests to verify that the next.config.js rewrites are working
+  // Also there are additional checkly tests that verify absolute e2e flow. They are in __checks__/organization.spec.ts
+  await page.goto(`/team/${team.slug}/${event.slug}`);
+
+  await selectFirstAvailableTimeSlotNextMonth(page);
+  await bookTimeSlot(page);
+  await expect(page.getByTestId("success-page")).toBeVisible();
+
+  // The title of the booking
+  const BookingTitle = `${event.title} between ${team.name} and ${testName}`;
+  await expect(page.getByTestId("booking-title")).toHaveText(BookingTitle);
+  // The booker should be in the attendee list
+  await expect(page.getByTestId(`attendee-name-${testName}`)).toHaveText(testName);
+}
+
+async function expectPageToBeNotFound({ page, url }: { page: Page; url: string }) {
+  await page.goto(`${url}`);
+  await expect(page.locator(`text=${NotFoundPageTextAppDir}`)).toBeVisible();
+}
+
+const createOrg = async (orgs: Fixtures["orgs"], userFixture: Fixtures["users"]) => {
+  const org = await orgs.create({
+    name: "TestOrg",
+  });
+  const orgOwner = await userFixture.create({
+    name: "org-owner",
+    organizationId: org.id,
+    roleInOrganization: MembershipRole.OWNER,
+  });
+
+  const orgAdmin = await userFixture.create({
+    name: "org-admin",
+    organizationId: org.id,
+    roleInOrganization: MembershipRole.ADMIN,
+  });
+  const team1owner = await userFixture.create({
+    name: "team-owner-1",
+    organizationId: org.id,
+    roleInOrganization: MembershipRole.MEMBER,
+  });
+  const team2owner = await userFixture.create({
+    name: "team-owner-2",
+    organizationId: org.id,
+    roleInOrganization: MembershipRole.MEMBER,
+  });
+  const commonUser = await userFixture.create({
+    name: "commonUser",
+    organizationId: org.id,
+    roleInOrganization: MembershipRole.MEMBER,
+  });
+  const team1_teammate1 = await userFixture.create({
+    name: "team1_teammate1",
+    organizationId: org.id,
+    roleInOrganization: MembershipRole.MEMBER,
+  });
+  const team2_teammate1 = await userFixture.create({
+    name: "team2_teammate1",
+    organizationId: org.id,
+    roleInOrganization: MembershipRole.MEMBER,
+  });
+  const teamOne = await prisma.team.create({
+    data: {
+      name: "bookings-test-team-1",
+      slug: slugify(`bookings-test-team-2-${randomString(5)}`),
+      parentId: org.id,
+    },
+  });
+
+  const teamTwo = await prisma.team.create({
+    data: {
+      name: "bookings-test-team-2",
+      slug: slugify(`bookings-test-team-2-${randomString(5)}`),
+      parentId: org.id,
+    },
+  });
+
+  // create memberships
+  await prisma.membership.createMany({
+    data: [
+      {
+        userId: team1owner.id,
+        teamId: teamOne.id,
+        accepted: true,
+        role: "OWNER",
+      },
+      {
+        userId: commonUser.id,
+        teamId: teamOne.id,
+        accepted: true,
+        role: "MEMBER",
+      },
+      {
+        userId: team1_teammate1.id,
+        teamId: teamOne.id,
+        accepted: true,
+        role: "MEMBER",
+      },
+      {
+        userId: team2owner.id,
+        teamId: teamTwo.id,
+        accepted: true,
+        role: "OWNER",
+      },
+      {
+        userId: commonUser.id,
+        teamId: teamTwo.id,
+        accepted: true,
+        role: "MEMBER",
+      },
+      {
+        userId: team2_teammate1.id,
+        teamId: teamTwo.id,
+        accepted: true,
+        role: "MEMBER",
+      },
+    ],
+  });
+  return {
+    org,
+    orgOwner,
+    orgAdmin,
+    team1owner,
+    team2owner,
+    commonUser,
+    team1_teammate1,
+    team2_teammate1,
+    teamOne,
+    teamTwo,
+  };
+};
@@ -351,7 +351,7 @@ test.describe("Bookings", () => {
      }
      const usernameInOrg = getOrgUsernameFromEmail(
        invitedUserEmail,
-        org.metadata?.orgAutoAcceptEmail ?? null
+        org.organizationSettings?.orgAutoAcceptEmail ?? null
      );

      const usernameOutsideOrg = userOutsideOrganization.username;
@@ -2,6 +2,9 @@ import type { Browser, Page } from "@playwright/test";
 import { expect } from "@playwright/test";

 import prisma from "@calcom/prisma";
+import { MembershipRole } from "@calcom/prisma/client";
+
+import { moveUserToOrg } from "@lib/orgMigration";

 import { test } from "../lib/fixtures";
 import { getInviteLink } from "../lib/testUtils";
@@ -16,7 +19,7 @@ test.afterEach(async ({ users, orgs }) => {

 test.describe("Organization", () => {
  test.describe("Email not matching orgAutoAcceptEmail", () => {
-    test("Org Invitation", async ({ browser, page, users, emails }) => {
+    test("nonexisting user invited to an organization", async ({ browser, page, users, emails }) => {
      const orgOwner = await users.create(undefined, { hasTeam: true, isOrg: true });
      const { team: org } = await orgOwner.getOrgMembership();
      await orgOwner.apiLogin();
@@ -83,7 +86,17 @@ test.describe("Organization", () => {
      });
    });

-    test("Team invitation", async ({ browser, page, users, emails }) => {
+    // This test is already covered by booking.e2e.ts where existing user is invited and his booking links are tested.
+    // We can re-test here when we want to test some more scenarios.
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
+    test("existing user invited to an organization", () => {});
+
+    test("nonexisting user invited to a Team inside organization", async ({
+      browser,
+      page,
+      users,
+      emails,
+    }) => {
      const orgOwner = await users.create(undefined, { hasTeam: true, isOrg: true, hasSubteam: true });
      await orgOwner.apiLogin();
      const { team } = await orgOwner.getFirstTeamMembership();
@@ -183,7 +196,7 @@ test.describe("Organization", () => {
  });

  test.describe("Email matching orgAutoAcceptEmail and a Verified Organization", () => {
-    test("Org Invitation", async ({ browser, page, users, emails }) => {
+    test("nonexisting user is invited to Org", async ({ browser, page, users, emails }) => {
      const orgOwner = await users.create(undefined, { hasTeam: true, isOrg: true, isOrgVerified: true });
      const { team: org } = await orgOwner.getOrgMembership();
      await orgOwner.apiLogin();
@@ -248,7 +261,52 @@ test.describe("Organization", () => {
      });
    });

-    test("Team Invitation", async ({ browser, page, users, emails }) => {
+    // Such a user has user.username changed directly in addition to having the new username in the profile.username
+    test("existing user migrated to an organization", async ({ users, page, emails }) => {
+      const orgOwner = await users.create(undefined, { hasTeam: true, isOrg: true, isOrgVerified: true });
+      const { team: org } = await orgOwner.getOrgMembership();
+      await orgOwner.apiLogin();
+      const { existingUser } = await test.step("Invite an existing user to an organization", async () => {
+        const existingUser = await users.create({
+          username: "john",
+          emailDomain: org.organizationSettings?.orgAutoAcceptEmail ?? "",
+          name: "John Outside Organization",
+        });
+
+        await moveUserToOrg({
+          user: existingUser,
+          targetOrg: {
+            username: `${existingUser.username}-org`,
+            id: org.id,
+            membership: {
+              role: MembershipRole.MEMBER,
+              accepted: true,
+            },
+          },
+          shouldMoveTeams: false,
+        });
+        return { existingUser };
+      });
+
+      await test.step("Signing up with the previous username of the migrated user - shouldn't be allowed", async () => {
+        await page.goto("/signup");
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        await page.locator('input[name="username"]').fill(existingUser.username!);
+        await page
+          .locator('input[name="email"]')
+          .fill(`${existingUser.username}-differnet-email@example.com`);
+        await page.locator('input[name="password"]').fill("Password99!");
+        await page.waitForLoadState("networkidle");
+        await expect(page.locator('button[type="submit"]')).toBeDisabled();
+      });
+    });
+
+    test("nonexisting user is invited to a team inside organization", async ({
+      browser,
+      page,
+      users,
+      emails,
+    }) => {
      const orgOwner = await users.create(undefined, {
        hasTeam: true,
        isOrg: true,
@@ -1,8 +1,14 @@
 import { expect } from "@playwright/test";
+import type { Page } from "@playwright/test";
+import type { createUsersFixture } from "playwright/fixtures/users";

 import { WEBAPP_URL } from "@calcom/lib/constants";
+import type { PrismaClient } from "@calcom/prisma";

+import type { createEmailsFixture } from "./fixtures/emails";
 import { test } from "./lib/fixtures";
+import { getEmailsReceivedByUser } from "./lib/testUtils";
+import { expectInvitationEmailToBeReceived } from "./team/expects";

 test.describe.configure({ mode: "parallel" });

@@ -48,7 +54,7 @@ test.describe("Update Profile", () => {
    await user.apiLogin();
    await page.goto("/settings/my-account/profile");

-    const emailInput = page.getByTestId("profile-form-email");
+    const emailInput = page.getByTestId("profile-form-email-0");

    await emailInput.fill(email);

@@ -58,7 +64,7 @@ test.describe("Update Profile", () => {

    await page.getByTestId("profile-update-email-submit-button").click();

-    const toastLocator = await page.waitForSelector('[data-testId="toast-success"]');
+    const toastLocator = await page.getByTestId("toast-success");

    const textContent = await toastLocator.textContent();

@@ -84,12 +90,12 @@ test.describe("Update Profile", () => {

    await page.goto(verifyUrl);

-    const errorLocator = await page.waitForSelector('[data-testId="toast-error"]');
+    const errorLocator = await page.getByTestId("toast-error");

    expect(errorLocator).toBeDefined();

    await page.goto("/settings/my-account/profile");
-    const emailInputUpdated = page.getByTestId("profile-form-email");
+    const emailInputUpdated = page.getByTestId("profile-form-email-0");
    expect(await emailInputUpdated.inputValue()).toEqual(user.email);
  });

@@ -108,7 +114,7 @@ test.describe("Update Profile", () => {
    await user.apiLogin();
    await page.goto("/settings/my-account/profile");

-    const emailInput = page.getByTestId("profile-form-email");
+    const emailInput = page.getByTestId("profile-form-email-0");

    await emailInput.fill(email);

@@ -118,11 +124,7 @@ test.describe("Update Profile", () => {

    await page.getByTestId("profile-update-email-submit-button").click();

-    const toastLocator = await page.waitForSelector('[data-testId="toast-success"]');
-
-    const textContent = await toastLocator.textContent();
-
-    expect(textContent).toContain(email);
+    expect(await page.getByTestId("toast-success").textContent()).toContain(email);

    // Instead of dealing with emails in e2e lets just get the token and navigate to it
    const verificationToken = await prisma.verificationToken.findFirst({
@@ -140,13 +142,16 @@ test.describe("Update Profile", () => {

    await page.goto(verifyUrl);

-    const successLocator = await page.waitForSelector('[data-testId="toast-success"]');
+    expect(await page.getByTestId("toast-success").textContent()).toContain(email);
+
+    // After email verification is successfull. user is sent to /event-types
+    await page.waitForURL("/event-types");

-    expect(await successLocator.textContent()).toContain(email);
    await page.goto("/settings/my-account/profile");
-    const emailInputUpdated = page.getByTestId("profile-form-email");
+    const emailInputUpdated = await page.getByTestId("profile-form-email-0");
    expect(await emailInputUpdated.inputValue()).toEqual(email);
  });
+
  test("Can update a users email (verification disabled)", async ({ page, users, prisma, features }) => {
    const emailVerificationEnabled = features.get("email-verification");
    // eslint-disable-next-line playwright/no-conditional-in-test, playwright/no-skipped-test
@@ -162,7 +167,7 @@ test.describe("Update Profile", () => {
    await user.apiLogin();
    await page.goto("/settings/my-account/profile");

-    const emailInput = page.getByTestId("profile-form-email");
+    const emailInput = page.getByTestId("profile-form-email-0");

    await emailInput.fill(email);

@@ -172,12 +177,235 @@ test.describe("Update Profile", () => {

    await page.getByTestId("profile-update-email-submit-button").click();

-    const toastLocator = await page.waitForSelector('[data-testId="toast-success"]');
+    expect(await page.getByTestId("toast-success").isVisible()).toBe(true);

-    expect(await toastLocator.isVisible()).toBe(true);
-
-    const emailInputUpdated = page.getByTestId("profile-form-email");
+    const emailInputUpdated = page.getByTestId("profile-form-email-0");

    expect(await emailInputUpdated.inputValue()).toEqual(email);
  });
+
+  const testEmailVerificationLink = async ({
+    page,
+    prisma,
+    emails,
+    secondaryEmail,
+  }: {
+    page: Page;
+    prisma: PrismaClient;
+    emails: ReturnType<typeof createEmailsFixture>;
+    secondaryEmail: string;
+  }) => {
+    await test.step("the user receives the correct invitation link", async () => {
+      await page.waitForLoadState("networkidle");
+      const verificationToken = await prisma.verificationToken.findFirst({
+        where: {
+          identifier: secondaryEmail,
+        },
+      });
+      const inviteLink = await expectInvitationEmailToBeReceived(
+        page,
+        emails,
+        secondaryEmail,
+        "Verify your email address",
+        "verify-email"
+      );
+      expect(inviteLink).toEqual(`${WEBAPP_URL}/api/auth/verify-email?token=${verificationToken?.token}`);
+    });
+  };
+
+  test("Can add a new email as a secondary email", async ({ page, users, prisma, emails }) => {
+    const user = await users.create({
+      name: "update-profile-user",
+    });
+
+    const [emailInfo, emailDomain] = user.email.split("@");
+
+    await user.apiLogin();
+    await page.goto("/settings/my-account/profile");
+
+    await page.getByTestId("add-secondary-email").click();
+
+    const secondaryEmailAddDialog = await page.waitForSelector('[data-testid="secondary-email-add-dialog"]');
+    expect(await secondaryEmailAddDialog.isVisible()).toBe(true);
+
+    const secondaryEmail = `${emailInfo}-secondary-email@${emailDomain}`;
+    const secondaryEmailInput = page.getByTestId("secondary-email-input");
+    await secondaryEmailInput.fill(secondaryEmail);
+
+    await page.getByTestId("add-secondary-email-button").click();
+
+    const secondaryEmailConfirmDialog = await page.waitForSelector(
+      '[data-testid="secondary-email-confirm-dialog"]'
+    );
+    expect(await secondaryEmailConfirmDialog.isVisible()).toBe(true);
+
+    const textContent = await secondaryEmailConfirmDialog.textContent();
+    expect(textContent).toContain(secondaryEmail);
+
+    await page.getByTestId("secondary-email-confirm-done-button").click();
+    expect(await secondaryEmailConfirmDialog.isVisible()).toBe(false);
+
+    await test.step("the user receives the correct invitation link", async () => {
+      await page.waitForLoadState("networkidle");
+      const verificationToken = await prisma.verificationToken.findFirst({
+        where: {
+          identifier: secondaryEmail,
+        },
+      });
+      const inviteLink = await expectInvitationEmailToBeReceived(
+        page,
+        emails,
+        secondaryEmail,
+        "Verify your email address",
+        "verify-email"
+      );
+      expect(inviteLink?.endsWith(`/api/auth/verify-email?token=${verificationToken?.token}`)).toEqual(true);
+    });
+
+    const primaryEmail = page.getByTestId("profile-form-email-0");
+    expect(await primaryEmail.inputValue()).toEqual(user.email);
+
+    const newlyAddedSecondaryEmail = page.getByTestId("profile-form-email-1");
+    expect(await newlyAddedSecondaryEmail.inputValue()).toEqual(secondaryEmail);
+  });
+
+  const createSecondaryEmail = async ({
+    page,
+    users,
+  }: {
+    page: Page;
+    users: ReturnType<typeof createUsersFixture>;
+  }) => {
+    const user = await users.create({
+      name: "update-profile-user",
+    });
+
+    const [emailInfo, emailDomain] = user.email.split("@");
+    const email = `${emailInfo}@${emailDomain}`;
+
+    await user.apiLogin();
+    await page.goto("/settings/my-account/profile");
+
+    await page.getByTestId("add-secondary-email").click();
+
+    const secondaryEmail = `${emailInfo}-secondary-email@${emailDomain}`;
+    const secondaryEmailInput = await page.getByTestId("secondary-email-input");
+    await secondaryEmailInput.fill(secondaryEmail);
+
+    await page.getByTestId("add-secondary-email-button").click();
+
+    await page.getByTestId("secondary-email-confirm-done-button").click();
+
+    return { user, email, secondaryEmail };
+  };
+
+  test("Newly added secondary email should show as Unverified", async ({ page, users }) => {
+    await createSecondaryEmail({ page, users });
+
+    expect(await page.getByTestId("profile-form-email-0-primary-badge").isVisible()).toEqual(true);
+    expect(await page.getByTestId("profile-form-email-0-unverified-badge").isVisible()).toEqual(false);
+
+    expect(await page.getByTestId("profile-form-email-1-primary-badge").isVisible()).toEqual(false);
+    expect(await page.getByTestId("profile-form-email-1-unverified-badge").isVisible()).toEqual(true);
+  });
+
+  test("Can verify the newly added secondary email", async ({ page, users, prisma }) => {
+    const { secondaryEmail } = await createSecondaryEmail({ page, users });
+
+    expect(await page.getByTestId("profile-form-email-1-primary-badge").isVisible()).toEqual(false);
+    expect(await page.getByTestId("profile-form-email-1-unverified-badge").isVisible()).toEqual(true);
+    // Instead of dealing with emails in e2e lets just get the token and navigate to it
+    const verificationToken = await prisma.verificationToken.findFirst({
+      where: {
+        identifier: secondaryEmail,
+      },
+    });
+
+    const params = new URLSearchParams({
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      token: verificationToken!.token,
+    });
+
+    const verifyUrl = `${WEBAPP_URL}/api/auth/verify-email?${params.toString()}`;
+
+    await page.goto(verifyUrl);
+
+    expect(await page.getByTestId("profile-form-email-1-primary-badge").isVisible()).toEqual(false);
+    expect(await page.getByTestId("profile-form-email-1-unverified-badge").isVisible()).toEqual(false);
+  });
+
+  test("Can delete the newly added secondary email", async ({ page, users }) => {
+    await createSecondaryEmail({ page, users });
+
+    await page.getByTestId("secondary-email-action-group-button").nth(1).click();
+    await page.getByTestId("secondary-email-delete-button").click();
+
+    expect(await page.getByTestId("profile-form-email-1").isVisible()).toEqual(false);
+  });
+
+  test("Can make the newly added secondary email as the primary email and login", async ({
+    page,
+    users,
+    prisma,
+  }) => {
+    const { secondaryEmail } = await createSecondaryEmail({ page, users });
+
+    // Instead of dealing with emails in e2e lets just get the token and navigate to it
+    const verificationToken = await prisma.verificationToken.findFirst({
+      where: {
+        identifier: secondaryEmail,
+      },
+    });
+
+    const params = new URLSearchParams({
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      token: verificationToken!.token,
+    });
+
+    const verifyUrl = `${WEBAPP_URL}/api/auth/verify-email?${params.toString()}`;
+
+    await page.goto(verifyUrl);
+    await page.getByTestId("secondary-email-action-group-button").nth(1).click();
+    await page.getByTestId("secondary-email-make-primary-button").click();
+
+    expect(await page.getByTestId("profile-form-email-1-primary-badge").isVisible()).toEqual(true);
+    expect(await page.getByTestId("profile-form-email-1-unverified-badge").isVisible()).toEqual(false);
+  });
+
+  test("Can resend verification link if the secondary email is unverified", async ({
+    page,
+    users,
+    prisma,
+    emails,
+  }) => {
+    const { secondaryEmail } = await createSecondaryEmail({ page, users });
+    // When a user is created a link is sent, we will delete it manually to make sure verification link works fine
+    await prisma.verificationToken.deleteMany({
+      where: {
+        identifier: secondaryEmail,
+      },
+    });
+    const receivedEmails = await getEmailsReceivedByUser({ emails, userEmail: secondaryEmail });
+    if (receivedEmails?.items?.[0]?.ID) {
+      await emails.deleteMessage(receivedEmails.items[0].ID);
+    }
+
+    expect(await page.getByTestId("profile-form-email-1-unverified-badge").isVisible()).toEqual(true);
+    await page.getByTestId("secondary-email-action-group-button").nth(1).click();
+    expect(await page.locator("button[data-testid=resend-verify-email-button]").isDisabled()).toEqual(false);
+    await page.getByTestId("resend-verify-email-button").click();
+
+    await testEmailVerificationLink({ page, prisma, emails, secondaryEmail });
+
+    const verificationToken = await prisma.verificationToken.findFirst({
+      where: {
+        identifier: secondaryEmail,
+      },
+    });
+    await page.goto(`${WEBAPP_URL}/api/auth/verify-email?token=${verificationToken?.token}`);
+
+    await page.getByTestId("secondary-email-action-group-button").nth(1).click();
+    expect(await page.locator("button[data-testid=resend-verify-email-button]").isVisible()).toEqual(false);
+    expect(await page.getByTestId("profile-form-email-1-unverified-badge").isVisible()).toEqual(false);
+  });
 });
@@ -33,17 +33,16 @@ test.describe("UploadAvatar", async () => {

      const response = await prisma.avatar.findUniqueOrThrow({
        where: {
-          teamId_userId: {
+          teamId_userId_isBanner: {
            userId: user.id,
            teamId: 0,
+            isBanner: false,
          },
        },
      });

-      // todo: remove this; ideally the organization-avatar is updated the moment
-      //       'Settings updated succesfully' is saved.
-      await page.waitForLoadState("networkidle");
-      const avatar = page.getByTestId("profile-upload-avatar").locator("img");
+      // Wait for the avatar image with the http src to appear instead of the data uri
+      const avatar = page.getByTestId("profile-upload-avatar").locator("img[src^=http]");

      const src = await avatar.getAttribute("src");

@@ -275,6 +275,44 @@ testBothFutureAndLegacyRoutes.describe("Teams - NonOrg", (routeVariant) => {
    await expect(page.locator('[data-testid="you-cannot-see-team-members"]')).toBeVisible();
    await expect(page.locator('[data-testid="team-members-container"]')).toBeHidden();
  });
+  test("Email Embeds slots are loading for team event types", async ({ page, users }) => {
+    const teamMatesObj = [
+      { name: "teammate-1" },
+      { name: "teammate-2" },
+      { name: "teammate-3" },
+      { name: "teammate-4" },
+    ];
+
+    const owner = await users.create(
+      { username: "pro-user", name: "pro-user" },
+      {
+        hasTeam: true,
+        teammates: teamMatesObj,
+        schedulingType: SchedulingType.COLLECTIVE,
+      }
+    );
+
+    await owner.apiLogin();
+    const { team } = await owner.getFirstTeamMembership();
+    const {
+      title: teamEventTitle,
+      slug: teamEventSlug,
+      id: teamEventId,
+    } = await owner.getFirstTeamEvent(team.id);
+
+    await page.goto("/event-types");
+
+    await page.getByTestId(`event-type-options-${teamEventId}`).first().click();
+    await page.getByTestId("embed").click();
+    await page.getByTestId("email").click();
+    await page.getByTestId("incrementMonth").click();
+
+    await expect(page.getByTestId("no-slots-available")).toBeHidden();
+
+    // Check Team Url
+    const availableTimesUrl = await page.getByTestId("see_all_available_times").getAttribute("href");
+    await expect(availableTimesUrl).toContain(`/team/${team.slug}/${teamEventSlug}`);
+  });

  todo("Create a Round Robin with different leastRecentlyBooked hosts");
  todo("Reschedule a Collective EventType booking");
@@ -47,6 +47,7 @@ test.describe("Workflow Tab - Event Type", () => {

        await createWorkflow({ name: "A New Workflow", trigger: WorkflowTriggerEvents.NEW_EVENT });
        await page.goto(`/${user.username}/${eventType.slug}`);
+        await page.click('[data-testid="incrementMonth"]');
        await bookEventOnThisPage(page);
        await assertWorkflowReminders(eventType.id, 1);
      });
@@ -1823,10 +1823,8 @@
  "requires_at_least_one_schedule": "يجب أن يكون لديك جدول واحد على الأقل",
  "default_conferencing_bulk_description": "تحديث المواقع لأنواع الأحداث المحددة",
  "locked_for_members": "مقفل للأعضاء",
-  "locked_apps_description": "سيتمكن الأعضاء من رؤية التطبيقات النشطة، ولكن لن يتمكنوا من تعديل أي إعدادات للتطبيق",
-  "locked_webhooks_description": "سيكون الأعضاء قادرين على رؤية webhooks النشطة، ولكن من دون القدرة على تعديل أي إعدادات Webhook",
-  "locked_workflows_description": "سيكون الأعضاء قادرين على رؤية مسارات العمل النشطة، ولكن من دون القدرة على تعديل أي إعدادات لمسار العمل",
-  "locked_by_admin": "مقفل من قبل المشرف",
+  "apps_locked_for_members_description": "سيتمكن الأعضاء من رؤية التطبيقات النشطة، ولكن لن يتمكنوا من تعديل أي إعدادات للتطبيق",
+  "locked_by_team_admin": "مقفل من قبل المشرف",
  "app_not_connected": "أنت غير متصل بحساب {{appName}}.",
  "connect_now": "اتصل الآن",
  "managed_event_dialog_confirm_button_one": "الاستبدال وإخطار {{count}} عضو",
@@ -2061,6 +2059,7 @@
  "workflow_automation": "أتمتة سير العمل",
  "scheduling_for_your_team": "أتمتة سير العمل",
  "no_members_found": "لم يُعثر على أعضاء",
+  "directory_sync": "مزامنة الدليل",
  "event_setup_length_error": "إعداد الفعالية: يجب أن تكون المدة لدقيقة على الأقل.",
  "availability_schedules": "جدولة التوافر",
  "unauthorized": "غير مصرح به",
@@ -2097,5 +2096,6 @@
  "extensive_whitelabeling": "عملية انضمام ودعم هندسي مخصصين",
  "need_help": "هل تحتاج إلى مساعدة؟",
  "show_more": "إظهار المزيد",
+  "privacy": "الخصوصية",
  "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ أضف السلاسل الجديدة أعلاه هنا ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
-}
+}
@@ -1 +1 @@
-{}
+{}
@@ -1 +1 @@
-{}
+{}
@@ -21,4 +21,4 @@
  "load_more_results": "Carrega més resultats",
  "integration_meeting_id": "{{integrationName}} Identificador de la reunió: {{meetingId}}",
  "confirmed_event_type_subject": "Confirmat: {{eventType}} amb {{name}} el {{date}}"
-}
+}
@@ -1823,10 +1823,8 @@
  "requires_at_least_one_schedule": "Musíte mít alespoň jeden rozvrh",
  "default_conferencing_bulk_description": "Aktualizujte místa pro vybrané typy událostí",
  "locked_for_members": "Zamčeno pro členy",
-  "locked_apps_description": "Členové uvidí aktivní aplikace, ale nastavení aplikací upravovat nemohou",
-  "locked_webhooks_description": "Členové uvidí aktivní webhooky, ale nastavení webhooků upravovat nemohou",
-  "locked_workflows_description": "Členové uvidí aktivní pracovní postupy, ale nastavení pracovních postupů upravovat nemohou",
-  "locked_by_admin": "Uzamčeno správcem týmu",
+  "apps_locked_for_members_description": "Členové uvidí aktivní aplikace, ale nastavení aplikací upravovat nemohou",
+  "locked_by_team_admin": "Uzamčeno správcem týmu",
  "app_not_connected": "Nemáte připojený účet {{appName}}.",
  "connect_now": "Připojte se",
  "managed_event_dialog_confirm_button_one": "Nahradit a upozornit {{count}} člena",
@@ -2061,6 +2059,7 @@
  "workflow_automation": "Automatizace pracovních postupů",
  "scheduling_for_your_team": "Automatizace pracovních postupů",
  "no_members_found": "Nenalezeni žádní členové",
+  "directory_sync": "Synchronizace adresářů",
  "event_setup_length_error": "Nastavení události: Doba trvání musí být alespoň 1 minuta.",
  "availability_schedules": "Plány dostupnosti",
  "unauthorized": "Neautorizováno",
@@ -2097,5 +2096,6 @@
  "extensive_whitelabeling": "Vyhrazená podpora zaškolovací a inženýrská podpora",
  "need_help": "Potřebujete pomoc?",
  "show_more": "Zobrazit více",
+  "privacy": "Ochrana soukromí",
  "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Přidejte své nové řetězce nahoru ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
-}
+}
@@ -1535,4 +1535,4 @@
  "confirm_your_details": "Bekræft dine oplysninger",
  "overlay_my_calendar": "Vis min kalender",
  "need_help": "Brug for hjælp?"
-}
+}
@@ -13,10 +13,17 @@
  "reset_password_subject": "{{appName}}: Anleitung zum Zurücksetzen des Passworts",
  "verify_email_subject": "{{appName}}: Bestätigen Sie Ihr Konto",
  "check_your_email": "Schauen Sie in Ihrem E-Mail-Postfach nach",
+  "old_email_address": "Alte E-Mail-Adresse",
+  "new_email_address": "Neue E-Mail-Adresse",
  "verify_email_page_body": "Wir haben eine E-Mail an {{email}} gesendet. Es ist wichtig, Ihre E-Mail-Adresse zu bestätigen, um die Zustellbarkeit für E-Mails und Kalenderbenachrichtigungen von {{appName}} zu gewährleisten.",
  "verify_email_banner_body": "Bestätigen Sie Ihre E-Mail-Adresse, um die Zustellbarkeit von E-Mails und Kalenderbenachrichtigungen zu gewährleisten",
  "verify_email_email_header": "Bestätigen Sie Ihre E-Mail-Adresse",
  "verify_email_email_button": "E-Mail bestätigen",
+  "verify_email_change_description": "Sie haben vor kurzem angefordert, die E-Mail-Adresse zu ändern, die Sie verwenden, um sich bei Ihrem {{appName}} Konto anzumelden. Bitte klicken Sie auf die Schaltfläche unten, um Ihre neue E-Mail-Adresse zu bestätigen.",
+  "verify_email_change_success_toast": "Ihre E-Mail wurde auf {{email}} aktualisiert",
+  "verify_email_change_failure_toast": "Fehler beim Aktualisieren der E-Mail.",
+  "change_of_email": "Bestätigen Sie Ihre neue {{appName}} E-Mail-Adresse",
+  "change_of_email_toast": "Wir haben einen Bestätigungslink an {{email}} gesendet. Wir werden Ihre E-Mail-Adresse aktualisieren, sobald Sie auf diesen Link klicken.",
  "copy_somewhere_safe": "Speichern Sie diesen API-Schlüssel an einem sicheren Ort. Sie können ihn nicht erneut ansehen.",
  "verify_email_email_body": "Bitte bestätigen Sie Ihre E-Mail-Adresse, indem Sie unten auf die Schaltfläche klicken.",
  "verify_email_by_code_email_body": "Bitte bestätigen Sie Ihre E-Mail-Adresse mit dem unten stehenden Code.",
@@ -56,6 +63,17 @@
  "a_refund_failed": "Erstattung fehlgeschlagen",
  "awaiting_payment_subject": "Warte auf Zahlung: {{title}} am {{date}}",
  "meeting_awaiting_payment": "Zahlung für den Termin noch offen",
+  "dark_theme_contrast_error": "Die Farbe des dunklen Designs hat die Kontrastprüfung nicht bestanden. Wir empfehlen Ihnen, diese Farbe zu ändern, damit Ihre Schaltflächen sichtbarer sind.",
+  "light_theme_contrast_error": "Die Farbe des hellen Designs hat die Kontrastprüfung nicht bestanden. Wir empfehlen Ihnen, diese Farbe zu ändern, damit Ihre Schaltflächen sichtbarer sind.",
+  "payment_not_created_error": "Zahlung konnte nicht erstellt werden",
+  "couldnt_charge_card_error": "Karte konnte nicht für die Zahlung belastet werden",
+  "no_available_users_found_error": "Keine verfügbaren Benutzer gefunden. Können Sie es mit einem anderen Zeitfenster versuchen?",
+  "request_body_end_time_internal_error": "Interner Fehler. Request-Body enthält keinen Endzeitpunkt",
+  "create_calendar_event_error": "Kalenderereignis konnte nicht im Kalender des Organisators erstellt werden",
+  "update_calendar_event_error": "Kalenderereignis konnte nicht aktualisiert werden.",
+  "delete_calendar_event_error": "Kalenderereignis konnte nicht gelöscht werden.",
+  "already_signed_up_for_this_booking_error": "Sie sind bereits für diese Buchung registriert.",
+  "hosts_unavailable_for_booking": "Einige der Veranstalter sind nicht für die Buchung verfügbar.",
  "help": "Hilfe",
  "price": "Preis",
  "paid": "Bezahlt",
@@ -101,6 +119,7 @@
  "requested_to_reschedule_subject_attendee": "Aktion erforderlich - Neuplanung: Bitte buchen Sie eine neue Zeit für „{{eventType}}“ mit {{name}}",
  "hi_user_name": "Hallo, {{name}}",
  "ics_event_title": "{{eventType}} mit {{name}}",
+  "please_book_a_time_sometime_later": "Ups, wir konnten Sie dieses Mal nicht verbinden. Bitte planen Sie stattdessen einen zukünftigen Anruf",
  "new_event_subject": "Neuer Termin: {{attendeeName}} - {{date}} - {{eventType}}",
  "join_by_entrypoint": "{{entryPoint}} beitreten",
  "notes": "Notizen",
@@ -117,15 +136,20 @@
  "meeting_id": "Termin-ID",
  "meeting_password": "Termin-Passwort",
  "meeting_url": "Termin-URL",
+  "meeting_url_not_found": "Meeting-URL nicht gefunden",
+  "token_not_found": "Token nicht gefunden",
+  "some_other_host_already_accepted_the_meeting": "Ein anderer Veranstalter hat das Meeting bereits akzeptiert. Möchten Sie trotzdem beitreten? <1>Mit dem Meeting fortfahren</1>",
  "meeting_request_rejected": "Ihre Terminanfrage wurde abgelehnt",
  "rejected_event_type_with_organizer": "Abgelehnt: {{eventType}} mit {{organizer}} auf {{date}}",
  "hi": "Hi",
  "join_team": "Team beitreten",
  "manage_this_team": "Dieses Team verwalten",
  "team_info": "Informationen zum Team",
+  "join_meeting": "Meeting beitreten",
  "request_another_invitation_email": "Falls Sie {{toEmail}} lieber nicht als Ihre {{appName}}-E-Mail verwenden möchten oder bereits über ein {{appName}}-Konto verfügen, fordern Sie bitte eine weitere Einladung zu dieser E-Mail an.",
  "you_have_been_invited": "Sie wurden eingeladen, dem Team {{teamName}} beizutreten",
  "user_invited_you": "{{user}} hat Sie eingeladen, dem {{entity}} {{team}} auf {{appName}} beizutreten",
+  "user_invited_you_to_subteam": "{{user}} hat Sie eingeladen, dem Team {{team}} der Organisation {{parentTeamName}} auf {{appName}} beizutreten",
  "hidden_team_member_title": "Sie sind in diesem Team ausgeblendet",
  "hidden_team_member_message": "Ihre Teammitgliedschaft ist nicht bezahlt, entweder upgraden Sie Ihren Account auf Pro oder lassen den Team-Organisator wissen, dass er für Ihren Platz im Team bezahlen kann.",
  "hidden_team_owner_message": "Sie benötigen einen Pro-Account um die Teamfunktionen zu verweden. Sie werden dem Team nicht angezeigt, bis der Account upgegradet wurde.",
@@ -229,6 +253,7 @@
  "reset_your_password": "Legen Sie Ihr neues Passwort mit den Anweisungen fest, die an Ihre E-Mail-Adresse gesendet wurden.",
  "email_change": "Melden Sie sich mit Ihrer neuen E-Mail-Adresse und Ihrem Passwort wieder an.",
  "create_your_account": "Erstellen Sie Ihr Konto",
+  "create_your_calcom_account": "Erstellen Sie Ihr Cal.com-Konto",
  "sign_up": "Registrieren",
  "youve_been_logged_out": "Sie wurden abgemeldet",
  "hope_to_see_you_soon": "Wir hoffen, Sie bald wieder zu sehen!",
@@ -266,6 +291,9 @@
  "nearly_there_instructions": "Zu guter Letzt: Ein Foto und eine Kurzbeschreibung zu Ihnen helfen, öfter gebucht zu werden, da Kunden dann genauer wissen, bei wem sie einen Termin buchen.",
  "set_availability_instructions": "Definieren Sie Zeiträume, wenn Sie wiederkehrend verfügbar sind. Sie können später weitere Zeiträume erstellen und verschiedenen Kalendern zuordnen.",
  "set_availability": "Verfügbarkeit festlegen",
+  "set_availbility_description": "Legen Sie Zeitpläne für die Zeiten fest, in denen Sie gebucht werden möchten.",
+  "share_a_link_or_embed": "Link oder Einbettung teilen",
+  "share_a_link_or_embed_description": "Teilen Sie Ihren {{appName}} Link oder betten Sie ihn auf Ihrer Website ein.",
  "availability_settings": "Verfügbarkeitseinstellungen",
  "continue_without_calendar": "Ohne Kalender fortfahren",
  "continue_with": "Mit {{appName}} fortfahren",
@@ -281,6 +309,7 @@
  "welcome_to_calcom": "Willkommen bei {{appName}}",
  "welcome_instructions": "Wie ist Ihr Name und in welcher Zeitzone sind Sie? Dies kann später bearbeitet werden.",
  "connect_caldav": "Mit CalDav-Server verbinden",
+  "connect_ics_feed": "Mit einem ICS-Feed verbinden",
  "connect": "Verbinden",
  "try_for_free": "Kostenlos testen",
  "create_booking_link_with_calcom": "Erstellen Sie Ihren eigenen Buchungslink mit {{appName}}",
@@ -419,6 +448,7 @@
  "browse_api_documentation": "Durchsuchen Sie unsere API Dokumentation",
  "leverage_our_api": "Nutzen Sie unsere API für die volle Kontrolle und Anpassbarkeit.",
  "create_webhook": "Webhook erstellen",
+  "instant_meeting": "Sofortiges Meeting erstellt",
  "booking_cancelled": "Termin abgesagt",
  "booking_rescheduled": "Termin verlegt",
  "recording_ready": "Download-Link der Aufnahme ist nun verfügbar",
@@ -533,6 +563,7 @@
  "enter_number_between_range": "Bitte geben Sie eine Zahl zwischen 1 und {{maxOccurences}} ein",
  "email_address": "E-Mail Adresse",
  "enter_valid_email": "Bitte geben Sie eine gültige Emaildresse ein",
+  "please_schedule_future_call": " Bitte planen Sie einen Anruf in der Zukunft ein, falls wir nicht innerhalb von {{seconds}} Sekunden verfügbar sind",
  "location": "Ort",
  "address": "Adresse",
  "enter_address": "Geben Sie eine Adresse ein",
@@ -592,6 +623,7 @@
  "new_member": "Neues Mitglied",
  "invite": "Einladen",
  "add_team_members": "Teammitglieder hinzufügen",
+  "add_org_members": "Mitglieder hinzufügen",
  "add_team_members_description": "Lade andere ein, deinem Team beizutreten",
  "add_team_member": "Teammitglied hinzufügen",
  "invite_new_member": "Ein neues Mitglied einladen",
@@ -606,8 +638,9 @@
  "hide_book_a_team_member_description": "Blendet die „Ein Teammitglied buchen“-Schaltflächen auf Ihren öffentlichen Seiten aus.",
  "danger_zone": "Achtung",
  "account_deletion_cannot_be_undone": "Vorsicht. Löschen eines Kontos kann nicht rückgängig gemacht werden.",
+  "team_deletion_cannot_be_undone": "Seien Sie vorsichtig. Das Löschen eines Teams kann nicht rückgängig gemacht werden",
  "back": "Zurück",
-  "cancel": "Absagen",
+  "cancel": "Abbrechen",
  "cancel_all_remaining": "Alle verbleibenden absagen",
  "apply": "Anwenden",
  "cancel_event": "Termin absagen",
@@ -656,6 +689,7 @@
  "default_duration": "Standardlaufzeit",
  "default_duration_no_options": "Bitte wählen Sie zuerst die verfügbaren Laufzeiten aus",
  "multiple_duration_mins": "{{count}} $t(minute_timeUnit)",
+  "multiple_duration_timeUnit": "{{count}} $t({{unit}}_timeUnit)",
  "minutes": "Minuten",
  "round_robin": "Round Robin",
  "round_robin_description": "Treffen zwischen mehreren Teammitgliedern durchwechseln.",
@@ -668,6 +702,7 @@
  "add_members": "Mitglieder hinzufügen...",
  "no_assigned_members": "Keine zugeordneten Mitglieder",
  "assigned_to": "Zugeordnet zu",
+  "you_must_be_logged_in_to": "Sie müssen bei {{url}} angemeldet sein",
  "start_assigning_members_above": "Mit der Zuordnung von Mitgliedern oben beginnen",
  "locked_fields_admin_description": "Mitglieder werden dies nicht bearbeiten können",
  "locked_fields_member_description": "Diese Option wurde vom Team-Admin gesperrt",
@@ -772,6 +807,8 @@
  "additional_input_description": "Erfordert die Eingabe zusätzlicher Eingaben durch den Planer vor der Terminbestätigung",
  "label": "Bezeichnung",
  "placeholder": "Platzhalter",
+  "display_add_to_calendar_organizer": "„Zum Kalender hinzufügen“-E-Mail als Organisator anzeigen",
+  "reconnect_calendar_to_use": "Bitte beachten Sie, dass Sie möglicherweise die Verbindung trennen und anschließend Ihr „Zum Kalender hinzufügen“-Konto erneut verbinden müssen, um diese Funktion nutzen zu können.",
  "type": "Typ",
  "edit": "Bearbeiten",
  "add_input": "Eingabe hinzufügen",
@@ -780,6 +817,9 @@
  "requires_confirmation_description": "Die Buchung muss manuell bestätigt werden, bevor die Buchungsinformationen an die Integrationen weitergeleitet werden und eine Bestätigungsmail gesendet wird.",
  "recurring_event": "Wiederkehrender Termin",
  "recurring_event_description": "Personen können sich für wiederkehrende Termine anmelden",
+  "cannot_be_used_with_paid_event_types": "Es kann nicht mit bezahlten Ereignistypen verwendet werden",
+  "warning_payment_instant_meeting_event": "Softige Meetings werden von wiederkehrenden Ereignissen und Zahlungs-Apps noch nicht unterstützt",
+  "warning_instant_meeting_experimental": "Experimentell: „Sofortiges Meeting“-Ereignisse sind derzeit eine experimentelle Funktion.",
  "starting": "Beginnen",
  "disable_guests": "Gäste deaktivieren",
  "disable_guests_description": "Das Hinzufügen zusätzlicher Gäste deaktivieren.",
@@ -788,6 +828,7 @@
  "private_link_label": "Privater Link",
  "private_link_hint": "Ihr privater Link wird nach jeder Nutzung neu generiert",
  "copy_private_link": "Privaten Link kopieren",
+  "copy_private_link_to_event": "Privaten Link zum Ereignis kopieren",
  "private_link_description": "Erzeugen Sie einen privaten Link, den Sie teilen können, ohne Ihren {{appName}}-Benutzername preiszugeben",
  "invitees_can_schedule": "Teilnehmende können folgendes buchen",
  "date_range": "Datumszeitraum",
@@ -847,6 +888,7 @@
  "next_step": "Schritt überspringen",
  "prev_step": "Vorheriger Schritt",
  "install": "Installieren",
+  "start_paid_trial": "Kostenlose Testphase starten",
  "installed": "Installiert",
  "active_install_one": "{{count}} aktive Installation",
  "active_install_other": "{{count}} aktive Installationen",
@@ -861,6 +903,7 @@
  "toggle_calendars_conflict": "Wechseln Sie die Kalender in denen nach Konflikten gesucht werden sollen, um Doppelbuchungen zu vermeiden.",
  "connect_additional_calendar": "Zusätzlichen Kalender verbinden",
  "calendar_updated_successfully": "Kalender erfolgreich aktualisiert",
+  "check_here": "Hier auswählen",
  "conferencing": "Videokonferenzen",
  "calendar": "Kalender",
  "payments": "Zahlungen",
@@ -1032,6 +1075,9 @@
  "user_impersonation_heading": "Benutzeridentitätswechsel",
  "user_impersonation_description": "Erlaubt es unserem Support-Team, sich vorübergehend mit Ihrem Konto anzumelden, um jegliche Probleme, die Sie gemeldet haben, schneller zu lösen.",
  "team_impersonation_description": "Ermöglicht den Team-Administratoren, sich vorübergehend als Sie einzuloggen.",
+  "cal_signup_description": "Für Einzelpersonen kostenlos. Teampläne für kollaborative Funktionen.",
+  "make_org_private": "Organisation privat stellen",
+  "make_org_private_description": "Wenn diese Einstellung aktiv ist, können Ihre Organisationsmitglieder keine anderen Organisationsmitglieder sehen.",
  "make_team_private": "Team privat stellen",
  "make_team_private_description": "Wenn diese Einstellung aktiv ist, können deine Teammitglieder keine anderen Teammitglieder sehen.",
  "you_cannot_see_team_members": "Sie können nicht alle Teammitglieder eines privaten Teams sehen.",
@@ -1091,6 +1137,7 @@
  "developer_documentation": "Entwickler-Dokumentation",
  "get_in_touch": "Kontakt aufnehmen",
  "contact_support": "Support kontaktieren",
+  "premium_support": "Premium-Support",
  "community_support": "Community Support",
  "feedback": "Feedback",
  "submitted_feedback": "Vielen Dank für Ihr Feedback!",
@@ -1254,6 +1301,7 @@
  "default_calendar_selected": "Standardkalender",
  "hide_from_profile": "Im Profil ausblenden",
  "event_setup_tab_title": "Termin-Einrichtung",
+  "availability_not_found_in_schedule_error": "Keine Verfügbarkeit im Zeitplan gefunden",
  "event_limit_tab_title": "Limits",
  "event_limit_tab_description": "Wie oft können Sie gebucht werden",
  "event_advanced_tab_description": "Kalendereinstellungen & mehr...",
@@ -1274,6 +1322,7 @@
  "do_this": "Mache dies",
  "turn_off": "Abschalten",
  "turn_on": "Einschalten",
+  "cancelled_bookings_cannot_be_rescheduled": "Stornierte Buchungen können nicht verschoben werden",
  "settings_updated_successfully": "Einstellungen erfolgreich aktualisiert",
  "error_updating_settings": "Fehler beim Aktualisieren der Einstellungen",
  "personal_cal_url": "Meine persönliche {{appName}}-URL",
@@ -1297,6 +1346,7 @@
  "customize_your_brand_colors": "Passen Sie Ihre eigene Markenfarbe auf Ihrer Buchungsseite an.",
  "pro": "Pro",
  "removes_cal_branding": "Entfernt alle {{appName}}-bezogenen Markenzeichen, z. B. „Powered by {{appName}}.“",
+  "instant_meeting_with_title": "Sofortiges Meeting mit {{name}}",
  "profile_picture": "Profilbild",
  "upload": "Upload",
  "add_profile_photo": "Profilbild hinzufügen",
@@ -1352,6 +1402,7 @@
  "event_name_info": "Name des Ereignistyps",
  "event_date_info": "Das Datum der Veranstaltung",
  "event_time_info": "Die Startzeit des Termins",
+  "event_type_not_found": "Ereignistyp nicht gefunden",
  "location_variable": "Ort",
  "location_info": "Der Ort des Events",
  "additional_notes_variable": "Zusätzliche Notizen",
@@ -1394,6 +1445,7 @@
  "slot_length": "Zeitfensterlänge",
  "booking_appearance": "Darstellung der Buchungsseite",
  "appearance_team_description": "Einstellungen für die Buchungsdarstellung Ihres Teams verwalten",
+  "appearance_org_description": "Einstellungen für die Buchungsdarstellung Ihrer Organisation verwalten",
  "only_owner_change": "Nur der Besitzer dieses Teams kann Änderungen an den Buchungen des Teams vornehmen ",
  "team_disable_cal_branding_description": "Entfernt alle {{appName}}-bezogenen Markenzeichen, z. B. „Powered by {{appName}}“",
  "invited_by_team": "{{teamName}} hat Sie eingeladen, dem Team als {{role}} beizutreten",
@@ -1423,6 +1475,8 @@
  "copy_link_to_form": "Link in Formular kopieren",
  "theme": "Theme",
  "theme_applies_note": "Dies gilt nur für Ihre öffentlichen Buchungsseiten",
+  "app_theme": "Dashboard-Theme",
+  "app_theme_applies_note": "Dies gilt nur für Ihr eingeloggtes Dashboard",
  "theme_system": "Systemstandard",
  "add_a_team": "Team hinzufügen",
  "add_webhook_description": "Erhalten Sie Meetingdaten in Echtzeit, wenn etwas in {{appName}} passiert",
@@ -1447,6 +1501,7 @@
  "password_updated": "Passwort aktualisiert!",
  "pending_payment": "Zahlung ausstehend",
  "pending_invites": "Offene Einladungen",
+  "pending_organization_invites": "Ausstehende Organisationseinladungen",
  "not_on_cal": "Nicht auf {{appName}}",
  "no_calendar_installed": "Kein Kalender installiert",
  "no_calendar_installed_description": "Sie haben noch keinen Ihrer Kalender verbunden",
@@ -1458,6 +1513,8 @@
  "report_app": "App melden",
  "limit_booking_frequency": "Buchungsfrequenz begrenzen",
  "limit_booking_frequency_description": "Begrenzen, wie oft dieses Ereignis gebucht werden kann",
+  "limit_booking_only_first_slot": "Buchun auf den ersten Platz beschränken",
+  "limit_booking_only_first_slot_description": "Nur die Buchung des ersten Platzes am Tag erlauben",
  "limit_total_booking_duration": "Gesamtbuchungsdauer beschränken",
  "limit_total_booking_duration_description": "Begrenzt die Gesamtanzahl, die dieser Termin gebucht werden kann",
  "add_limit": "Begrenzung hinzufügen",
@@ -1525,10 +1582,14 @@
  "your_org_disbanded_successfully": "Ihre Organization wurde erfolgreich aufgelöst",
  "error_creating_team": "Fehler beim Erstellen des Teams",
  "you": "Sie",
+  "or_continue_with": "Oder fortfahren mit",
  "resend_email": "E-Mail erneut senden",
  "member_already_invited": "Mitglied wurde bereits eingeladen",
  "already_in_use_error": "Benutzername wird bereits verwendet",
  "enter_email_or_username": "E-Mail oder Benutzername eingeben",
+  "enter_email": "E-Mail-Adresse eingeben",
+  "enter_emails": "E-Mail-Adressen eingeben",
+  "too_many_invites": "Sie sind darauf beschränkt, maximal {{nbUsers}} Benutzer gleichzeitig einzuladen.",
  "team_name_taken": "Dieser Name ist bereits vergeben",
  "must_enter_team_name": "Team-Name muss eingegeben werden",
  "team_url_required": "Team-URL muss eingegeben werden",
@@ -1541,6 +1602,7 @@
  "attendee_email_info": "Die E-Mail-Adresse der buchenden Person",
  "kbar_search_placeholder": "Geben Sie einen Befehl ein oder suchen Sie ...",
  "invalid_credential": "Oh nein! Es sieht so aus, als ob die Berechtigung abgelaufen ist oder entzogen wurden. Bitte erneut installieren.",
+  "invalid_credential_action": "App neu installieren",
  "reschedule_reason": "Verlegungsgrund",
  "choose_common_schedule_team_event": "Gemeinsamen Zeitplan auswählen",
  "choose_common_schedule_team_event_description": "Aktivieren Sie dies, wenn Sie einen gemeinsamen Zeitplan zwischen Hosts verwenden möchten. Wenn deaktiviert, ist jeder Host basierend auf seinen Standardplan buchbar.",
@@ -1608,6 +1670,7 @@
  "individual": "Person",
  "all_bookings_filter_label": "Alle Buchungen",
  "all_users_filter_label": "Alle Benutzer",
+  "all_event_types_filter_label": "Alle Ereignistypen",
  "your_bookings_filter_label": "Ihre Buchungen",
  "meeting_url_variable": "Meeting-URL",
  "meeting_url_info": "Die URL der Meeting-Konferenz",
@@ -1704,9 +1767,11 @@
  "organizer_timezone": "Zeitzone des Veranstalters",
  "email_user_cta": "Einladung anzeigen",
  "email_no_user_invite_heading_team": "Sie wurden eingeladen, einem {{appName}}-Team beizutreten",
+  "email_no_user_invite_heading_subteam": "Sie wurden eingeladen, einem Team der Organisation {{parentTeamName}} beizutreten",
  "email_no_user_invite_heading_org": "Sie wurden eingeladen, einer {{appName}}-Organisation beizutreten",
  "email_no_user_invite_subheading": "{{invitedBy}} hat Sie eingeladen, dem Team in {{appName}} beizutreten. {{appName}} ist der Event-Planer, der es Ihnen und Ihrem Team ermöglicht, Meetings ohne ständiges hin und her zu planen.",
  "email_user_invite_subheading_team": "{{invitedBy}} hat Sie eingeladen, dem Team „{{teamName}}“ beizutreten. {{appName}} ist der Event-Planer, der es Ihnen und Ihrem Team ermöglicht, Meetings ohne Hin und Her zu planen.",
+  "email_user_invite_subheading_subteam": "{{invitedBy}} hat Sie eingeladen, dem Team „{{teamName}}“ in seiner bzw. ihrer Organisation {{parentTeamName}} bei {{appName}} beizutreten. {{appName}} ist der Terminplaner, der es Ihnen und Ihrem Team ermöglicht, Meetings ohne Hin und Her zu planen.",
  "email_user_invite_subheading_org": "{{invitedBy}} hat Sie eingeladen, ihrer Organisation „{{teamName}}“ in {{appName}} beizutreten. {{appName}} ist der Terminplaner, der es Ihnen und Ihrer Organisation ermöglicht, Meetings ohne ständiges hin und her zu planen.",
  "email_no_user_invite_steps_intro": "Wir begleiten Sie durch ein paar Schritte, danach können Sie in kürzester Zeit stressfreie Planung mit Ihrer {{entity}} genießen.",
  "email_no_user_step_one": "Wählen Sie Ihren Benutzernamen",
@@ -1823,10 +1888,8 @@
  "requires_at_least_one_schedule": "Sie müssen mindestens einen Verfügbarkeitsplan haben",
  "default_conferencing_bulk_description": "Orte für die ausgewählten Termintypen aktualisieren",
  "locked_for_members": "Für Mitglieder gesperrt",
-  "locked_apps_description": "Mitglieder können die aktiven Apps sehen, können aber keine App-Einstellungen anpassen",
-  "locked_webhooks_description": "Mitglieder können die aktiven Webhooks sehen, können aber keine Webhook-Einstellungen anpassen",
-  "locked_workflows_description": "Mitglieder können die aktiven Workflows sehen, können aber keine Workflow-Einstellungen anpassen",
-  "locked_by_admin": "Vom Team-Admin gesperrt",
+  "apps_locked_for_members_description": "Mitglieder können die aktiven Apps sehen, können aber keine App-Einstellungen anpassen",
+  "locked_by_team_admin": "Vom Team-Admin gesperrt",
  "app_not_connected": "Sie haben kein {{appName}}-Konto verbunden.",
  "connect_now": "Jetzt verbinden",
  "managed_event_dialog_confirm_button_one": "{{count}} Mitglied ersetzen & benachrichtigen",
@@ -1839,7 +1902,9 @@
  "review_event_type": "Ereignistyp überprüfen",
  "looking_for_more_analytics": "Suchen Sie nach weiteren Analysedaten?",
  "looking_for_more_insights": "Möchten Sie mehr Insights?",
+  "filters": "Filter",
  "add_filter": "Filter hinzufügen",
+  "remove_filters": "Alle Filter löschen",
  "select_user": "Benutzer auswählen",
  "select_event_type": "Ereignistyp auswählen",
  "select_date_range": "Datumsbereich auswählen",
@@ -1930,6 +1995,7 @@
  "connect_google_workspace": "Google Workspace verbinden",
  "google_workspace_admin_tooltip": "Sie müssen ein Workspace-Admin sein, um diese Funktion nutzen zu können",
  "first_event_type_webhook_description": "Erstellen Sie Ihren ersten Webhook für diesen Termintypen",
+  "create_instant_meeting_webhook_description": "Erstellen Sie Ihren ersten Webhook mit „Sofortiges Meeting erstellt“ als Auslöser für diesen Ereignistyp",
  "install_app_on": "App installieren auf",
  "create_for": "Erstellen für",
  "currency": "Währung",
@@ -1994,6 +2060,8 @@
  "add_times_to_your_email": "Zeiten zur E-Mail hinzufügen",
  "select_time": "Zeit auswählen",
  "select_date": "Datum auswählen",
+  "connecting_you_to_someone": "Wir verbinden Sie mit jemandem.",
+  "please_do_not_close_this_tab": "Diesen Tab bitte nicht schließen",
  "see_all_available_times": "Alle verfügbaren Zeiten ansehen",
  "org_team_names_example_1": "z.B. Marketing-Team",
  "org_team_names_example_2": "z.B. Vertriebsteam",
@@ -2011,8 +2079,12 @@
  "description_requires_booker_email_verification": "Um sicherzustellen, dass die E-Mail des Buchenden vor der Terminplanung verifiziert ist",
  "requires_confirmation_mandatory": "Textnachrichten können nur an Teilnehmer gesendet werden, wenn der Ereignistyp bestätigt werden muss.",
  "organizations": "Organisationen",
+  "upload_cal_video_logo": "Cal Video Logo hochladen",
+  "update_cal_video_logo": "Cal Video Logo aktualisieren",
+  "cal_video_logo_upload_instruction": "Um sicherzustellen, dass Ihr Logo vor dem dunklen Hintergrund von Cal Video gut sichtbar ist, laden Sie bitte ein helles Bild im PNG- oder SVG-Format hoch, um die Transparenz zu erhalten.",
  "org_admin_other_teams": "Weitere Teams",
  "org_admin_other_teams_description": "Hier können Sie Teams innerhalb Ihrer Organisation sehen, zu denen Sie nicht gehören. Sie können sich bei Bedarf selbst hinzufügen.",
+  "not_part_of_org": "Sie gehören keiner Organisation an",
  "no_other_teams_found": "Keine weiteren Teams gefunden",
  "no_other_teams_found_description": "Es gibt keine weiteren Teams in dieser Organisation.",
  "attendee_first_name_variable": "Vorname des Teilnehmers",
@@ -2048,7 +2120,9 @@
  "org_error_processing": "Beim Verarbeiten dieser Organisation ist ein Fehler aufgetreten",
  "orgs_page_description": "Eine Liste aller Organisationen. Wenn Sie eine Organisation akzeptieren, können sich alle Benutzer mit dieser E-Mail-Domain OHNE E-Mail-Überprüfung registrieren.",
  "unverified": "Nicht verifiziert",
+  "verified": "Verifiziert",
  "dns_missing": "DNS fehlt",
+  "dns_configured": "DNS konfiguriert",
  "mark_dns_configured": "Als DNS konfiguriert kennzeichnen",
  "value": "Wert",
  "your_organization_updated_sucessfully": "Ihre Organisation wurde erfolgreich aktualisiert",
@@ -2058,9 +2132,13 @@
  "oAuth": "OAuth",
  "recently_added": "Kürzlich hinzugefügt",
  "connect_all_calendars": "Verbinden Sie alle Ihre Kalender",
+  "connect_all_calendars_description": "{{appName}} liest die Verfügbarkeit aus allen Ihren vorhandenen Kalendern.",
  "workflow_automation": "Workflow-Automatisierung",
+  "workflow_automation_description": "Personalisieren Sie Ihre Planungserfahrung mit Workflows",
  "scheduling_for_your_team": "Workflow-Automatisierung",
+  "scheduling_for_your_team_description": "Planen Sie Ihr Team mit kollektiver Terminplanung und Round-Robin-Terminplanung",
  "no_members_found": "Keine Mitglieder gefunden",
+  "directory_sync": "Verzeichnissynchronisierung",
  "event_setup_length_error": "Ereignis-Einrichtung: Die Dauer muss mindestens 1 Minute betragen.",
  "availability_schedules": "Verfügbarkeitspläne",
  "unauthorized": "Nicht authorisiert",
@@ -2092,10 +2170,108 @@
  "overlay_my_calendar": "Meinen Kalender überlagern",
  "overlay_my_calendar_toc": "Durch das Verbinden mit Ihrem Kalender akzeptieren Sie unsere Datenschutzerklärung und Nutzungsbedingungen. Sie können den Zugriff jederzeit widerrufen.",
  "view_overlay_calendar_events": "Sehen Sie sich Ihre Kalendertermine an, um Buchungskonflikte zu vermeiden.",
+  "join_event_location": "{{eventLocationType}} beitreten",
+  "troubleshooting": "Problembehandlung",
+  "calendars_were_checking_for_conflicts": "Kalender, die wir auf Konflikten überprüfen",
+  "availabilty_schedules": "Verfügbarkeitspläne",
+  "manage_calendars": "Kalender verwalten",
+  "manage_availability_schedules": "Verfügbarkeitspläne verwalten",
  "lock_timezone_toggle_on_booking_page": "Zeitzone auf der Buchungsseite sperren",
  "description_lock_timezone_toggle_on_booking_page": "Um die Zeitzone auf der Buchungsseite zu sperren, nützlich für Termine in Person.",
+  "event_setup_multiple_payment_apps_error": "Sie können nur eine Zahlungs-App pro Ereignistyp aktiv haben.",
+  "number_in_international_format": "Bitte geben Sie die Nummer im internationalen Format ein.",
+  "install_calendar": "Kalender installieren",
+  "branded_subdomain": "Marken-Subdomain",
+  "branded_subdomain_description": "Holen Sie sich Ihre eigene Marken-Subdomain, wie z.B. acme.cal.com",
+  "org_insights": "Organisationsweite Insights",
+  "org_insights_description": "Verstehen Sie, wie Ihre gesamte Organisation Zeit verbringt",
  "extensive_whitelabeling": "Dedizierte Onboarding- und Engineeringsupport",
+  "extensive_whitelabeling_description": "Passen Sie Ihre Planungserfahrung mit Ihrem eigenen Logo, eigenen Farben und mehr an",
+  "unlimited_teams": "Unbegrenzte Teams",
+  "unlimited_teams_description": "Fügen Sie Ihrer Organisation so viele Unterteams hinzu, wie notwendig",
+  "unified_billing": "Einheitliche Abrechnung",
+  "unified_billing_description": "Fügen Sie eine einzige Kreditkarte hinzu, um alle Abos Ihres Teams zu bezahlen",
+  "advanced_managed_events": "Erweiterte verwaltete Ereignistypen",
+  "advanced_managed_events_description": "Fügen Sie eine einzige Kreditkarte hinzu, um alle Abonnements Ihres Teams zu bezahlen",
+  "enterprise_description": "Rüsten Sie auf Enterprise auf, um Ihre Organisation zu erstellen",
+  "create_your_org": "Erstellen Sie Ihre Organisation",
+  "create_your_org_description": "Rüsten Sie auf Enterprise auf und erhalten Sie eine Subdomain, einheitliche Abrechnung, Insights, umfangreiches Whitelabeling und mehr",
+  "other_payment_app_enabled": "Sie können nur eine Zahlungs-App pro Ereignistyp aktivieren",
+  "admin_delete_organization_description": "<ul><li>Teams, die Mitglieder dieser Organisation sind, werden ebenfalls zusammen mit ihren Ereignistypen gelöscht</li><li>Benutzer, die Teil der Organisation waren, werden nicht gelöscht und ihre Ereignistypen bleiben ebenfalls intakt.</li><li>Benutzernamen würden geändert werden, um zu ermöglichen, dass sie außerhalb der Organisation existieren können</li></ul>",
+  "admin_delete_organization_title": "{{organizationName}} löschen?",
+  "published": "Veröffentlicht",
+  "unpublished": "Unveröffentlicht",
+  "publish": "Veröffentlichen",
+  "org_publish_error": "Organisation konnte nicht veröffentlicht werden",
+  "troubleshooter_tooltip": "Öffnen Sie die Problembehandlung und finden Sie heraus, was mit Ihrem Zeitplan nicht stimmt",
  "need_help": "Brauchst du Hilfe?",
+  "troubleshooter": "Problembehandlung",
+  "please_install_a_calendar": "Bitte installieren Sie einen Kalender",
+  "instant_tab_title": "Sofortige Buchung",
+  "instant_event_tab_description": "Personen sofort buchen lassen",
+  "uprade_to_create_instant_bookings": "Rüsten Sie auf Enterprise auf und lassen Sie Ihre Gäste an einem Sofortanruf teilnehmen, an dem die Teilnehmer direkt teilnehmen können. Dies ist nur für Team-Ereignistypen verfügbar",
+  "dont_want_to_wait": "Sie möchten nicht warten?",
+  "meeting_started": "Meeting gestartet",
+  "pay_and_book": "Zum Buchen bezahlen",
+  "booking_not_found_error": "Buchung konnte nicht gefunden werden",
+  "booking_seats_full_error": "Die Buchungsplätze sind voll",
+  "missing_payment_credential_error": "Fehlende Zahlungsinformationen",
+  "missing_payment_app_id_error": "Fehlende Zahlungsapp-ID",
+  "not_enough_available_seats_error": "Die Buchung hat nicht genügend Plätze verfügbar",
+  "user_redirect_title": "{{username}} ist derzeit kurzzeitig abwesend.",
+  "user_redirect_description": "In der Zwischenzeit wird {{profile.username}} für alle neuen geplanten Meetings im Namen von {{username}} verantwortlich sein.",
+  "out_of_office": "Abwesend",
+  "out_of_office_description": "Konfigurieren Sie Aktionen in Ihrem Profil während Sie abwesend sind.",
+  "send_request": "Anfrage senden",
+  "start_date_and_end_date_required": "Startdatum und Enddatum sind erforderlich",
+  "start_date_must_be_before_end_date": "Das Startdatum muss vor dem Enddatum liegen",
+  "start_date_must_be_in_the_future": "Das Startdatum muss in der Zukunft liegen",
+  "user_not_found": "Benutzer nicht gefunden",
+  "out_of_office_entry_already_exists": "Abwesenheitseintrag existiert bereits",
+  "out_of_office_id_required": "Abwesenheitseintrags-ID erforderlich",
+  "booking_redirect_infinite_not_allowed": "Es besteht bereits eine Buchungsumleitung von diesem Benutzer zu Ihnen.",
+  "success_entry_created": "Neuer Eintrag wurde erfolgreich erstellt",
+  "booking_redirect_email_subject": "Buchungsumleitungsbenachrichtigung",
+  "booking_redirect_email_title": "Buchungsumleitungsbenachrichtigung",
+  "booking_redirect_email_description": "Sie haben eine Umleitung der Buchung von {{toName}} erhalten, so dass deren Profillinks für das Zeitfenster an Sie umgeleitet werden: ",
+  "success_accept_booking_redirect": "Sie haben diese Buchungsumleitungsanfrage akzeptiert.",
+  "success_reject_booking_redirect": "Sie haben diese Buchungsumleitungsanfrage abgelehnt.",
+  "copy_link_booking_redirect_request": "Link zum Teilen der Anfrage kopieren",
+  "booking_redirect_request_title": "Buchungsumleitungsanfrage",
+  "select_team_member": "Teammitglied auswählen",
+  "going_away_title": "Verreisen Sie? Markieren Sie einfach Ihren Profillink für eine gewisse Zeit als nicht verfügbar.",
+  "redirect_team_enabled": "Leiten Sie Ihr Profil an ein anderes Teammitglied um",
+  "redirect_team_disabled": "Leiten Sie Ihr Profil an ein anderes Teammitglied um (Teamplan erforderlich)",
+  "out_of_office_unavailable_list": "Abwesenheits-Unverfügbarkeitsliste",
+  "success_deleted_entry_out_of_office": "Eintrag erfolgreich gelöscht",
+  "temporarily_out_of_office": "Temporär abwesend?",
+  "add_a_redirect": "Umleitung hinzufügen",
+  "create_entry": "Eintrag erstellen",
+  "time_range": "Zeitspanne",
+  "automatically_add_all_team_members": "Alle Teammitglieder hinzufügen, einschließlich zukünftiger Mitglieder",
+  "redirect_to": "Umleiten zu",
+  "having_trouble_finding_time": "Haben Sie Schwierigkeiten, ein Zeitfenster zu finden?",
  "show_more": "Mehr anzeigen",
+  "assignment_description": "Planen Sie Meetings ein, wenn jeder verfügbar ist, oder rotieren Sie durch die Mitglieder Ihres Team",
+  "lowest": "Niedrigste",
+  "low": "Niedrig",
+  "medium": "Mittel",
+  "high": "Hoch",
+  "Highest": "Höchste",
+  "send_booker_to": "Bucher senden an",
+  "set_priority": "Priorität festlegen",
+  "priority_for_user": "Priorität von {{userName}}",
+  "change_priority": "Priorität ändern",
+  "field_identifiers_as_variables": "Verwenden Sie Feldbezeichner als Variablen für Ihre benutzerdefinierte Ereignisumleitung",
+  "field_identifiers_as_variables_with_example": "Verwenden Sie Feldbezeichner als Variablen für Ihre benutzerdefinierte Ereignisumleitung (z. B. {{variable}})",
+  "account_already_linked": "Konto ist bereits verknüpft",
+  "privacy": "Datenschutz",
+  "primary": "Primär",
+  "make_primary": "Zur Primäradresse machen",
+  "add_email": "E-Mail-Adresse hinzufügen",
+  "add_email_description": "Fügen Sie eine E-Mail-Adresse hinzu, um die Ihre primäre E-Mail-Adresse ersetzt, oder als alternative E-Mail in Ihren Ereignistypen verwendet wird.",
+  "confirm_email": "Bestätigen Sie Ihre E-Mail-Adresse",
+  "confirm_email_description": "Wir haben eine E-Mail an <strong>{{email}}</strong> gesendet. Klicken Sie auf den Link in der E-Mail, um diese Adresse zu bestätigen.",
+  "send_event_details_to": "Termindetails senden an",
  "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Fügen Sie Ihre neuen Code-Zeilen über dieser hinzu ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
-}
+}
@@ -278,4 +278,4 @@
  "location_variable": "Τοποθεσία",
  "additional_notes_variable": "Πρόσθετες σημειώσεις",
  "already_have_account": "Έχετε ήδη λογαριασμό;"
-}
+}
@@ -131,6 +131,7 @@
  "invitee_timezone": "Invitee Time Zone",
  "time_left": "Time left",
  "event_type": "Event Type",
+  "duplicate_event_type":"Duplicate Event Type",
  "enter_meeting": "Enter Meeting",
  "video_call_provider": "Video call provider",
  "meeting_id": "Meeting ID",
@@ -251,6 +252,7 @@
  "confirm_auth_change": "This will change the way you log in",
  "confirm_auth_email_change": "Changing the email address will disconnect your current authentication method to log in to Cal.com. We will ask you to verify your new email address. Moving forward, you will be logged out and use your new email address to log in instead of your current authentication method after setting your password by following the instructions that will be sent to your mail.",
  "reset_your_password": "Set your new password with the instructions sent to your email address.",
+  "org_banner_instructions":"Please upload image of {{width}} width and {{height}} height.",
  "email_change": "Log back in with your new email address and password.",
  "create_your_account": "Create your account",
  "create_your_calcom_account": "Create your Cal.com account",
@@ -638,7 +640,7 @@
  "hide_book_a_team_member_description": "Hide Book a Team Member Button from your public pages.",
  "danger_zone": "Danger zone",
  "account_deletion_cannot_be_undone":"Be Careful. Account deletion cannot be undone.",
-  "team_deletion_cannot_be_undone":"Be Careful. Team deletion cannot be undone",
+  "team_deletion_cannot_be_undone":"Be Careful. Team deletion cannot be undone.",
  "back": "Back",
  "cancel": "Cancel",
  "cancel_all_remaining": "Cancel all remaining",
@@ -704,8 +706,10 @@
  "assigned_to": "Assigned to",
  "you_must_be_logged_in_to":"You must be logged in to {{url}}",
  "start_assigning_members_above": "Start assigning members above",
-  "locked_fields_admin_description": "Members will not be able to edit this",
-  "locked_fields_member_description": "This option was locked by the team admin",
+  "locked_fields_admin_description": "Members can not edit",
+  "unlocked_fields_admin_description": "Members can edit",
+  "locked_fields_member_description": "Locked by the team admin",
+  "unlocked_fields_member_description": "Unlocked by team admin",
  "url": "URL",
  "hidden": "Hidden",
  "readonly": "Readonly",
@@ -808,7 +812,7 @@
  "label": "Label",
  "placeholder": "Placeholder",
  "display_add_to_calendar_organizer":"Display 'Add to calendar' email as the organizer",
-  "reconnect_calendar_to_use": "Please note that you may need to disconnect and then reconnect your calendar to use this feature.",
+  "reconnect_calendar_to_use": "Please note that you may need to disconnect and then reconnect your 'Add to Calendar' account to use this feature.",
  "type": "Type",
  "edit": "Edit",
  "add_input": "Add an Input",
@@ -1081,6 +1085,7 @@
  "make_team_private": "Make team private",
  "make_team_private_description": "Your team members won't be able to see other team members when this is turned on.",
  "you_cannot_see_team_members": "You cannot see all the team members of a private team.",
+  "you_cannot_see_teams_of_org":"You cannot see teams of a private organization.",
  "allow_booker_to_select_duration": "Allow booker to select duration",
  "impersonate_user_tip": "All uses of this feature is audited.",
  "impersonating_user_warning": "Impersonating username \"{{user}}\".",
@@ -1272,7 +1277,7 @@
  "recordings_are_part_of_the_teams_plan": "Recordings are part of the teams plan",
  "team_feature_teams": "This is a Team feature. Upgrade to Team to see your team's availability.",
  "team_feature_workflows": "This is a Team feature. Upgrade to Team to automate your event notifications and reminders with Workflows.",
-  "show_eventtype_on_profile": "Show on profile",
+  "show_eventtype_on_profile": "Show on Profile",
  "embed": "Embed",
  "new_username": "New username",
  "current_username": "Current username",
@@ -1473,8 +1478,10 @@
  "route_to_the_right_person": "Route to the right person based on the answers to your form",
  "form_description": "Create your form to route a booker",
  "copy_link_to_form": "Copy link to form",
-  "theme": "Theme",
+  "theme": "Booking Page Theme",
  "theme_applies_note": "This only applies to your public booking pages",
+  "app_theme": "Dashboard Theme",
+  "app_theme_applies_note": "This only applies to your logged in dashboard",
  "theme_system": "System default",
  "add_a_team": "Add a team",
  "add_webhook_description": "Receive meeting data in real-time when something happens in {{appName}}",
@@ -1599,7 +1606,8 @@
  "attendee_email_variable": "Attendee email",
  "attendee_email_info": "The person booking's email",
  "kbar_search_placeholder": "Type a command or search...",
-  "invalid_credential": "Oh no! Looks like permission expired or was revoked. Please reinstall again.",
+  "invalid_credential": "It looks like permissions expired or were revoked for {{appName}}.",
+  "invalid_credential_action": "Reinstall app",
  "reschedule_reason": "Reschedule reason",
  "choose_common_schedule_team_event": "Choose a common schedule",
  "choose_common_schedule_team_event_description": "Enable this if you want to use a common schedule between hosts. When disabled, each host will be booked based on their default schedule.",
@@ -1613,6 +1621,7 @@
  "test_routing": "Test Routing",
  "payment_app_disabled": "An admin has disabled a payment app",
  "edit_event_type": "Edit event type",
+  "only_admin_can_see_members_of_org": "This Organization is private, and only the organization's admin or owner can view its members.",
  "collective_scheduling": "Collective Scheduling",
  "make_it_easy_to_book": "Make it easy to book your team when everyone is available.",
  "find_the_best_person": "Find the best person available and cycle through your team.",
@@ -1885,10 +1894,16 @@
  "requires_at_least_one_schedule": "You are required to have at least one schedule",
  "default_conferencing_bulk_description": "Update the locations for the selected event types",
  "locked_for_members": "Locked for members",
-  "locked_apps_description": "Members will be able to see the active apps but will not be able to edit any app settings",
-  "locked_webhooks_description": "Members will be able to see the active webhooks but will not be able to edit any webhook settings",
-  "locked_workflows_description": "Members will be able to see the active workflows but will not be able to edit any workflow settings",
-  "locked_by_admin": "Locked by team admin",
+  "unlocked_for_members": "Unlocked for members",
+  "apps_locked_for_members_description": "Members will be able to see the active apps but will not be able to edit any app settings",
+  "apps_unlocked_for_members_description": "Members will be able to see the active apps and will be able to edit any app settings",
+  "apps_locked_by_team_admins_description": "You will be able to see the active apps but will not be able to edit any app settings",
+  "apps_unlocked_by_team_admins_description": "You will be able to see the active apps and will be able to edit any app settings",
+  "workflows_locked_for_members_description": "Members can not add their personal workflows to this event type.  Members will be able to see the active team workflows but will not be able to edit any workflow settings.",
+  "workflows_unlocked_for_members_description": "Members will be able to add their personal workflows to this event type.  Members will be able to see the active team workflows but will not be able to edit any workflow settings.",
+  "workflows_locked_by_team_admins_description": "You will be able to see the active team workflows but will not be able to edit any workflow settings or add your personal workflows to this event type.",
+  "workflows_unlocked_by_team_admins_description": "You will be able to enable/disable personal workflows on this event type. You will be able to see the active team workflows but will not be able to edit any team workflow settings.",
+  "locked_by_team_admin": "Locked by team admin",
  "app_not_connected": "You have not connected a {{appName}} account.",
  "connect_now": "Connect now",
  "managed_event_dialog_confirm_button_one": "Replace & notify {{count}} member",
@@ -2080,6 +2095,7 @@
  "organizations": "Organizations",
  "upload_cal_video_logo":"Upload Cal Video Logo",
  "update_cal_video_logo":"Update Cal Video Logo",
+  "upload_banner": "Upload Banner",
  "cal_video_logo_upload_instruction":"To ensure your logo is visible against Cal video's dark background, please upload a light-colored image in PNG or SVG format to maintain transparency.",
  "org_admin_other_teams": "Other teams",
  "org_admin_other_teams_description": "Here you can see teams inside your organization that you are not part of. You can add yourself to them if needed.",
@@ -2137,6 +2153,24 @@
  "scheduling_for_your_team":"Workflow automation",
  "scheduling_for_your_team_description":"Schedule for your team with collective and round-robin scheduling",
  "no_members_found": "No members found",
+  "directory_sync" : "Directory Sync",
+  "directory_name": "Directory Name",
+  "directory_provider": "Directory Provider",
+  "directory_scim_url": "SCIM Base URL",
+  "directory_scim_token": "SCIM Bearer Token",
+  "directory_scim_url_copied": "SCIM Base URL copied",
+  "directory_scim_token_copied": "SCIM Bearer Token copied",
+  "directory_sync_info_description": "Your Identity Provider will ask for the following information to configure SCIM. Follow the instructions to finish the setup.",
+  "directory_sync_configure" : "Configure Directory Sync",
+  "directory_sync_configure_description" : "Choose an identity provider to configure directory for your team.",
+  "directory_sync_title": "Configure an identity provider to get started with SCIM.",
+  "directory_sync_created": "Directory sync connection created.",
+  "directory_sync_description": "Provision and de-provision users with your directory provider.",
+  "directory_sync_deleted": "Directory sync connection deleted.",
+  "directory_sync_delete_connection": "Delete Connection",
+  "directory_sync_delete_title": "Delete Directory Sync Connection",
+  "directory_sync_delete_description": "Are you sure you want to delete this directory sync connection?",
+  "directory_sync_delete_confirmation": "This action cannot be undone. This will permanently delete the directory sync connection.",
  "event_setup_length_error":"Event Setup: The duration must be at least 1 minute.",
  "availability_schedules":"Availability Schedules",
  "unauthorized":"Unauthorized",
@@ -2168,7 +2202,9 @@
  "overlay_my_calendar":"Overlay my calendar",
  "overlay_my_calendar_toc":"By connecting to your calendar, you accept our privacy policy and terms of use. You may revoke access at any time.",
  "view_overlay_calendar_events":"View your calendar events to prevent clashed booking.",
-  "join_event_location":"Join {{eventLocationType}}",
+  "locked": "Locked",
+  "unlocked": "Unlocked",
+  "join_event_location": "Join  {{eventLocationType}}",
  "troubleshooting":"Troubleshooting",
  "calendars_were_checking_for_conflicts":"Calendars we’re checking for conflicts",
  "availabilty_schedules":"Availability schedules",
@@ -2263,5 +2299,18 @@
  "field_identifiers_as_variables": "Use field identifiers as variables for your custom event redirect",
  "field_identifiers_as_variables_with_example": "Use field identifiers as variables for your custom event redirect (e.g. {{variable}})",
  "account_already_linked": "Account is already linked",
+  "privacy_organization_description": "Manage privacy settings for your organization",
+  "privacy": "Privacy",
+  "team_will_be_under_org": "New teams will be under your organization",
+  "add_group_name": "Add group name",
+  "group_name": "Group Name",
+  "routers": "Routers",
+  "primary": "Primary",
+  "make_primary": "Make primary",
+  "add_email": "Add Email",
+  "add_email_description": "Add an email address to replace your primary or to use as an alternative email on your event types.",
+  "confirm_email": "Confirm your email",
+  "confirm_email_description": "We sent an email to <strong>{{email}}</strong>. Click the link in the email to verify this address.",
+  "send_event_details_to": "Send event details to",
  "ADD_NEW_STRINGS_ABOVE_THIS_LINE_TO_PREVENT_MERGE_CONFLICTS": "↑↑↑↑↑↑↑↑↑↑↑↑↑ Add your new strings above here ↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑↑"
-}
+}
--- a/Show More
+++ b/Show More