chore: release v5.8.2

feat: SMS workflow action for form triggers #3 (#23673 )
* allow routing forms for activeOn * use repository function to get routing forms * remove unnecessary code * adjust logic in update handler * add triggers to api v2 * remvoe unused file * rename to getAcitveOnOptions handler * remove routingFormOptions handler * clean up getActiveOnOptions * refactor WorkflowService * remove logs * remove unused * fix: type check * fix: missed before after events for recurring * fix: calendarEvent handleMarkNoShow * fix error message Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> * don't query disabled routing forms * create tasker function * add tasker code * move isFormTrigger function * small adjustments + todo comments * remove email to host action for form triggers * throw trpc error if email to host is added as step * fix dialog on how to use form responses as variables * remove add variable dropdown for form triggers * remove form workfows in event workflows tab * improvements for workflow logic on form submission * review fixes * base setup for seperate schedule functions (evt and form) * add missing BOOKING_PAID workflow trigger * fix pathname * fix: test for BOOKING_REQUESTED * fix activeOn ids * pass hideBranding and smsReminderNumber * adjustments to reminderScheduler * create empty scheduelForForm functions * pass locale and timezone with form user * pass formData instead of responses * pass timeFormat and locale * reusable function for email sending and reminder creation * implement scheduleEmailReminderForForm * remove added editor field from merge conflict * don't support cal.ai action with form triggers * throw bad request if form trigger and cal.ai is combined * add tests for scheduleFormWorkflows * add form submission tests * remove form response varibe info * clean up workflow actions * fixes for getting template options * pass triggerType to getAllWorkflows * move reusable logic to scheduleSMSReminder * add formdata to param type * type fixes for text reminder managers * implement scheduleSMSReminderForForm * fix import * fix isAuthorizedToAddActiveOnIds * disble whatsapp action * implement triggerFormSubmittedNoEventWorkflow * code clean up * Merge branch 'devin/1755107037-add-workflow-triggers' into feat/routing-form-workflow-triggers * fix type errors * remove async from getSubmitterEmail * fix type errors * revert cal.ai changes * fix type error * add sublogger * code clean up * fix type errors * remove label for attendee whatsapp action * code clean up * fixes saving teams on org workflows * fix type error * code improvements for activeOn ids * Revert "code improvements for activeOn ids" This reverts commit 0a3590a4e2ce541b17d63483ad86ed458795a6a3. * improve variable name * fix unit tests * small fixes * type fixes * remove unused translation keys * fix merge conflict issues * code clean up * remove SMS action support * remove more SMS code * add missing imports * set custom template for form action * type fixes * fix tasker endpoint * fix duplicate check * fix workfows.test.ts * use repository funciton to getHideBranding * add back SMS action * add back changes to smsReminderManager * code clean up * fix hasDuplicateSubmission * code clean up * select only needed properties * remove repository functions * Revert "remove repository functions" This reverts commit 7aa47b1c59c9abd7f964ebf26f746934c53a44f4. * add scheduleWorkflows function * Revert "add scheduleWorkflows function" This reverts commit fe5db4fe3b65e2743c95475d585300cab98beed7. * move type to /types * Revert "move type to /types" This reverts commit 91e0152154594b3772a801a426260068a8ccea54. * revert changes causing type errors * remove import * remove unused import * Revert "remove unused import" This reverts commit 1916768c875ea5d0ac5598ccb8f9c796c5622dc9. * revert changed from attempt to fix type errors * pass object to gt all workflows * fix isAuthorized check * trigger filtering * remove form submitted no event booked code * remove form submitted no event from schema * remove more code * remove test * fixes * add getSubmitterEmail function * add trigger * small fixes * add missing workflow DTOs * small fixes * use activeOnWithChildren * fix active on when switching trigger type * remove add variable dropdown * add getAllWorkflowsFromRoutingForm to WorkflowService * fix error caused by undefined evt * fix type error * fix type error * fix tests * code clean up * final fixes and clean up * remove console.log * remove template text form from triggers * add routing form repoditory function * fix bug with key * add comments * fix test * add missing await * use predefined FormSubmissionData type * add .trim() to sms message * pass contextData instead * add missing trigger in update-workflow.input.ts * ForEvt and ForForm function for aiPhoneCallManager * chore: add support for form workflows on api v2 * fixup! chore: add support for form workflows on api v2 * use only repository functions in update handler * move all prisma queries from list.handler * review suggestions * chore: handle workflows api v2 * chore: handle workflows api v2, split in 2 endpoints * fix workflow step creation * remove connect agent and fixes types * add type to workflow * chore: use workflow type in apiv2 WorkflowsOutputService * update worklfow type on update * chore: use workflow type in apiv2 WorkflowsOutputService * fix template body for torm trigger * some UI fixes for email subject/body * resetting email body when changing form triggers * use type field to query workflows * clean up all old active on values * remove responseId from all funciton calls * remove undefined from updateTemplate * refactor: split routing form and event-type workflows code * refactor: split routing form and event-type workflows code * fix template text when adding action * chore: don't rename WorkflowActivationDto to avoid ci blocking * refine update schedule to use only allowed actions * fix type error * don't allow whatsapp action with form trigger * fix type error * return early if activeOn array is empty * fix: from step type in BaseFormWorkflowStepDto * fixup! fix: from step type in BaseFormWorkflowStepDto * api v2 updates * move all prisma calls to repository (service/workflows.ts) * use FORM_TRIGGER_WORKFLOW_EVENTS for form queries * use userRepository * use FORM_TRIGGER_WORKFLOW_EVENTS in isFormTrigger * code clean up * code clean up * use repository functions in formSubmissionValidation.ts * remove action check in update handler * add back trpc import * fix agent repository functions * add SMS actions to allowed form action constants * remove unsued import * fixes for offset api v2 * add missing responseId * fix failing test * fix failing test * remove unused imports * chore: handle sms step action for form worklfow in dtos --------- Co-authored-by: CarinaWolli <wollencarina@gmail.com> Co-authored-by: Amit Sharma <74371312+Amit91848@users.noreply.github.com> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: Udit Takkar <53316345+Udit-takkar@users.noreply.github.com> Co-authored-by: Benny Joo <sldisek783@gmail.com> Co-authored-by: cal.com <morgan@cal.com> Co-authored-by: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
2025-10-22 14:20:43 +01:00 · 2025-10-21 15:28:10 +00:00 · 2025-10-21 14:04:42 +00:00 · 2025-10-21 13:14:15 +00:00 · 2025-10-21 12:58:31 +00:00 · 2025-10-21 12:24:47 +00:00
392 changed files with 8169 additions and 3471 deletions
@@ -111,7 +111,7 @@ The event types page UI components are located in `apps/web/modules/event-types/

 Changes to shared UI patterns (like tab layouts and button alignments) need to be checked across multiple views to maintain consistency:
 - Event types page layout: `apps/web/modules/event-types/views/event-types-listing-view.tsx`
- Bookings page layout: `apps/web/modules/bookings/views/bookings-listing-view.tsx`
+- Bookings page layout: `apps/web/modules/bookings/views/bookings-view.tsx`
 - Common elements like tabs, search bars, and filter buttons should maintain consistent alignment across views

 ## When working on workflow triggers or similar enum-based features in the Cal.com codebase
@@ -1,5 +0,0 @@
---
-"@calcom/atoms": minor
---
-
-This PR adds ability to display bookings of a user event for calendar view atom
@@ -24,10 +24,10 @@
 /packages/embeds/**/* @calcom/Foundation
 /packages/features/auth/lib/next-auth-options.ts @calcom/Foundation
 /packages/features/bookings/lib/**/* @calcom/Foundation
-/packages/lib/getAggregatedAvailability.ts @calcom/Foundation
-/packages/lib/getUserAvailability.ts @calcom/Foundation
-/packages/lib/server/getLuckyUser.ts @calcom/Foundation
-/packages/lib/slots.ts @calcom/Foundation
+/packages/features/availability/lib/getAggregatedAvailability/getAggregatedAvailability.ts @calcom/Foundation
+/packages/features/availability/lib/getUserAvailability.ts @calcom/Foundation
+/packages/features/bookings/lib/getLuckyUser.ts @calcom/Foundation
+/packages/features/schedules/lib/slots.ts @calcom/Foundation
 /packages/platform/atoms/**/*WebWrapper.tsx @calcom/Consumer
 /packages/platform/**/* @calcom/Platform @calcom/Foundation
 /packages/prisma/**/* @calcom/Foundation
@@ -1,6 +1,7 @@
 {
  "typescript.tsdk": "node_modules/typescript/lib",
-  "editor.formatOnSave": false,
+  "editor.formatOnSave": true,
+  "editor.defaultFormatter": "esbenp.prettier-vscode",
  "editor.codeActionsOnSave": {
    "source.fixAll.eslint": "explicit"
  },
@@ -234,9 +234,10 @@ for Logger level to be set at info, for example.

   </details>

-   If you don't want to create a local DB. Then you can also consider using services like railway.app or render.
+   If you don't want to create a local DB. Then you can also consider using services like railway.app, Northflank or render.

   - [Setup postgres DB with railway.app](https://docs.railway.app/guides/postgresql)
+   - [Setup postgres DB with Northflank](https://northflank.com/guides/deploy-postgres-database-on-northflank)
   - [Setup postgres DB with render](https://render.com/docs/databases)

 1. Copy and paste your `DATABASE_URL` from `.env` to `.env.appStore`.
@@ -390,6 +391,12 @@ Cal.com, Inc. does not provide official support for Docker, but we will accept f

 You can deploy Cal.com on [Railway](https://railway.app) using the button above. The team at Railway also have a [detailed blog post](https://blog.railway.app/p/calendso) on deploying Cal.com on their platform.

+### Northflank
+
+[![Deploy on Northflank](https://assets.northflank.com/deploy_to_northflank_smm_36700fb050.svg)](https://northflank.com/stacks/deploy-calcom)
+
+You can deploy Cal.com on [Northflank](https://northflank.com) using the button above. The team at Northflank also have a [detailed blog post](https://northflank.com/guides/deploy-calcom-with-northflank) on deploying Cal.com on their platform.
+
 ### Vercel

 Currently Vercel Pro Plan is required to be able to Deploy this application with Vercel, due to limitations on the number of serverless functions on the free plan.
@@ -1,23 +0,0 @@
-import { get } from "@vercel/edge-config";
-import type { NextMiddleware } from "next-api-middleware";
-
-const safeGet = async <T = unknown>(key: string): Promise<T | undefined> => {
-  try {
-    return get<T>(key);
-  } catch (error) {
-    // Don't crash if EDGE_CONFIG env var is missing
-  }
-};
-
-export const config = { matcher: "/:path*" };
-
-export const checkIsInMaintenanceMode: NextMiddleware = async (req, res, next) => {
-  const isInMaintenanceMode = await safeGet<boolean>("isInMaintenanceMode");
-  if (isInMaintenanceMode) {
-    return res
-      .status(503)
-      .json({ message: "API is currently under maintenance. Please try again at a later time." });
-  }
-
-  await next();
-};
@@ -3,7 +3,6 @@ import { label } from "next-api-middleware";
 import { addRequestId } from "./addRequestid";
 import { captureErrors } from "./captureErrors";
 import { captureUserId } from "./captureUserId";
-import { checkIsInMaintenanceMode } from "./checkIsInMaintenanceMode";
 import { extendRequest } from "./extendRequest";
 import {
  HTTP_DELETE,
@@ -26,7 +25,6 @@ const middleware = {
  HTTP_POST,
  HTTP_DELETE,
  addRequestId,
-  checkIsInMaintenanceMode,
  verifyApiKey,
  rateLimitApiKey,
  extendRequest,
@@ -38,16 +36,14 @@ const middleware = {

 type Middleware = keyof typeof middleware;

-const middlewareOrder = [
-  // The order here, determines the order of execution
-  "checkIsInMaintenanceMode",
+const middlewareOrder: Middleware[] = [
  "extendRequest",
  "captureErrors",
  "verifyApiKey",
  "rateLimitApiKey",
  "addRequestId",
  "captureUserId",
-] as Middleware[]; // <-- Provide a list of middleware to call automatically
+];

 const withMiddleware = label(middleware, middlewareOrder);

@@ -1,10 +1,10 @@
 import type { NextApiRequest } from "next";

 import { purchaseTeamOrOrgSubscription } from "@calcom/features/ee/teams/lib/payments";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";

@@ -0,0 +1,10 @@
+import { BookingCancelService } from "@/lib/services/booking-cancel.service";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule],
+  providers: [BookingCancelService],
+  exports: [BookingCancelService],
+})
+export class BookingCancelModule {}
@@ -0,0 +1,15 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { BookingCancelService as BaseBookingCancelService } from "@calcom/features/bookings/lib/handleCancelBooking";
+
+@Injectable()
+export class BookingCancelService extends BaseBookingCancelService {
+  constructor(
+    prismaWriteService: PrismaWriteService,
+  ) {
+    super({
+      prismaClient: prismaWriteService.prisma,
+    });
+  }
+}
@@ -1,12 +1,7 @@
-import { PrismaAttributeRepository } from "@/lib/repositories/prisma-attribute.repository";
 import { PrismaBookingRepository } from "@/lib/repositories/prisma-booking.repository";
-import { PrismaFeaturesRepository } from "@/lib/repositories/prisma-features.repository";
-import { PrismaHostRepository } from "@/lib/repositories/prisma-host.repository";
-import { PrismaOOORepository } from "@/lib/repositories/prisma-ooo.repository";
 import { PrismaUserRepository } from "@/lib/repositories/prisma-user.repository";
 import { CacheService } from "@/lib/services/cache.service";
 import { CheckBookingAndDurationLimitsService } from "@/lib/services/check-booking-and-duration-limits.service";
-import { CheckBookingLimitsService } from "@/lib/services/check-booking-limits.service";
 import { LuckyUserService } from "@/lib/services/lucky-user.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
@@ -21,26 +16,16 @@ export class RegularBookingService extends BaseRegularBookingService {
    checkBookingAndDurationLimitsService: CheckBookingAndDurationLimitsService,
    prismaWriteService: PrismaWriteService,
    bookingRepository: PrismaBookingRepository,
-    featuresRepository: PrismaFeaturesRepository,
-    checkBookingLimitsService: CheckBookingLimitsService,
    luckyUserService: LuckyUserService,
-    hostRepository: PrismaHostRepository,
-    oooRepository: PrismaOOORepository,
-    userRepository: PrismaUserRepository,
-    attributeRepository: PrismaAttributeRepository
+    userRepository: PrismaUserRepository
  ) {
    super({
      cacheService,
      checkBookingAndDurationLimitsService,
      prismaClient: prismaWriteService.prisma as unknown as PrismaClient,
      bookingRepository,
-      featuresRepository,
-      checkBookingLimitsService,
      luckyUserService,
-      hostRepository,
-      oooRepository,
      userRepository,
-      attributeRepository,
    });
  }
 }
@@ -25,6 +25,11 @@ import {
 import { z } from "zod";

 import { SCHEDULE_READ, SCHEDULE_WRITE, SUCCESS_STATUS } from "@calcom/platform-constants";
+import type {
+  GetAvailabilityListHandlerReturn,
+  DuplicateScheduleHandlerReturn,
+} from "@calcom/platform-libraries/schedules";
+import { getAvailabilityListHandler, duplicateScheduleHandler } from "@calcom/platform-libraries/schedules";
 import type { CreateScheduleHandlerReturn, CreateScheduleSchema } from "@calcom/platform-libraries/schedules";
 import { createScheduleHandler } from "@calcom/platform-libraries/schedules";
 import { FindDetailedScheduleByIdReturnType } from "@calcom/platform-libraries/schedules";
@@ -68,6 +73,21 @@ export class AtomsSchedulesController {
    };
  }

+  @Get("/schedules/all")
+  @Version(VERSION_NEUTRAL)
+  @UseGuards(ApiAuthGuard)
+  @Permissions([SCHEDULE_READ])
+  async getAllUserSchedules(
+    @GetUser() user: UserWithProfile
+  ): Promise<ApiResponse<Awaited<GetAvailabilityListHandlerReturn>>> {
+    const userSchedules = await getAvailabilityListHandler({ ctx: { user } });
+
+    return {
+      status: SUCCESS_STATUS,
+      data: userSchedules,
+    };
+  }
+
  @Patch("schedules/:scheduleId")
  @Permissions([SCHEDULE_WRITE])
  @UseGuards(ApiAuthGuard)
@@ -104,4 +124,20 @@ export class AtomsSchedulesController {
      data: createdSchedule,
    };
  }
+
+  @Post("schedules/:scheduleId/duplicate")
+  @Permissions([SCHEDULE_WRITE])
+  @UseGuards(ApiAuthGuard)
+  @ApiOperation({ summary: "Duplicate existing schedule" })
+  async duplicateExistingSchedule(
+    @GetUser() user: UserWithProfile,
+    @Param("scheduleId", ParseIntPipe) scheduleId: number
+  ): Promise<ApiResponse<Awaited<DuplicateScheduleHandlerReturn>>> {
+    const duplicatedSchedule = await duplicateScheduleHandler({ ctx: { user }, input: { scheduleId } });
+
+    return {
+      status: SUCCESS_STATUS,
+      data: duplicatedSchedule,
+    };
+  }
 }
@@ -404,7 +404,7 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
      invalidWorkflow.steps = [
        {
          stepNumber: 1,
-          action: "sms_number",
+          action: "cal_ai_phone_call",
          recipient: PHONE_NUMBER,
          template: REMINDER,
          verifiedPhoneId: verifiedPhoneId,
@@ -439,6 +439,18 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
            html: "<p>Reminder for your event {EVENT_NAME}.</p>",
          },
        },
+        {
+          stepNumber: 2,
+          action: "sms_attendee",
+          recipient: EMAIL,
+          template: REMINDER,
+          phoneRequired: false,
+          sender: "updatedSender",
+          message: {
+            subject: "Update Upcoming: {EVENT_NAME}",
+            text: "Update Reminder for your event {EVENT_NAME}.</p>",
+          },
+        },
      ];
      return request(app.getHttpServer())
        .post(`${basePath}/routing-form`)
@@ -459,12 +471,15 @@ describe("OrganizationsTeamsWorkflowsController (E2E)", () => {
          }

          expect(responseBody.data.trigger.type).toEqual(sampleCreateWorkflowRoutingFormDto.trigger.type);
-          expect(responseBody.data.steps).toHaveLength(sampleCreateWorkflowRoutingFormDto.steps.length);
+          expect(responseBody.data.steps).toHaveLength(validWorkflow.steps.length);
          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.id).toBeDefined();
          expect(responseBody.data.steps.find((step) => step.stepNumber === 1)?.sender).toEqual(
            "CalcomE2EStep1"
          );

+          expect(responseBody.data.steps.find((step) => step.stepNumber === 2)?.id).toBeDefined();
+          expect(responseBody.data.steps.find((step) => step.action === "sms_attendee")).toBeDefined();
+
          const trigger = sampleCreateWorkflowRoutingFormDto.trigger as OnFormSubmittedTriggerDto;
          expect(responseBody.data.trigger?.type).toEqual(trigger.type);

@@ -1,8 +1,8 @@
 import { Locales } from "@/lib/enums/locales";
 import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
-import { Transform } from "class-transformer";
-import { IsOptional, IsTimeZone, IsString, IsEnum, IsIn, IsUrl, IsObject } from "class-validator";
+import { Transform, Type } from "class-transformer";
+import { IsOptional, IsTimeZone, IsString, IsEnum, IsIn, IsUrl, IsObject, IsNumber } from "class-validator";

 import { ValidateMetadata } from "@calcom/platform-types";

@@ -17,6 +17,8 @@ export class CreateManagedUserInput {
  @ApiProperty({ example: "Alice Smith", description: "Managed user's name is used in emails" })
  name!: string;

+  @Type(() => Number)
+  @IsNumber()
  @IsOptional()
  @IsIn([12, 24], { message: "timeFormat must be a number either 12 or 24" })
  @ApiPropertyOptional({ example: 12, enum: [12, 24], description: "Must be a number 12 or 24" })
@@ -2,6 +2,7 @@ import { Locales } from "@/lib/enums/locales";
 import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { TimeFormat, WeekDay } from "@/modules/users/inputs/create-managed-user.input";
 import { ApiPropertyOptional } from "@nestjs/swagger";
+import { Transform, Type } from "class-transformer";
 import { IsEnum, IsIn, IsNumber, IsObject, IsOptional, IsString, IsTimeZone, IsUrl } from "class-validator";

 import { ValidateMetadata } from "@calcom/platform-types";
@@ -17,6 +18,8 @@ export class UpdateManagedUserInput {
  @ApiPropertyOptional()
  name?: string;

+  @Type(() => Number)
+  @IsNumber()
  @IsOptional()
  @IsIn([12, 24])
  @ApiPropertyOptional({ example: 12, enum: [12, 24], description: "Must be 12 or 24" })
@@ -7,8 +7,12 @@ import {
  EMAIL_ADDRESS,
  EMAIL_ATTENDEE,
  FORM_ALLOWED_STEP_ACTIONS,
+  SMS_NUMBER,
  WorkflowEmailAddressStepDto,
  WorkflowEmailAttendeeStepDto,
+  WorkflowPhoneNumberStepDto,
+  WorkflowPhoneAttendeeStepDto,
+  SMS_ATTENDEE,
 } from "./workflow-step.input";
 import {
  RoutingFormWorkflowTriggerDto,
@@ -85,6 +89,8 @@ export class CreateFormWorkflowDto {
    oneOf: [
      { $ref: getSchemaPath(WorkflowEmailAddressStepDto) },
      { $ref: getSchemaPath(WorkflowEmailAttendeeStepDto) },
+      { $ref: getSchemaPath(WorkflowPhoneAttendeeStepDto) },
+      { $ref: getSchemaPath(WorkflowPhoneNumberStepDto) },
    ],
    type: "array",
  })
@@ -99,8 +105,15 @@ export class CreateFormWorkflowDto {
      subTypes: [
        { value: WorkflowEmailAddressStepDto, name: EMAIL_ADDRESS },
        { value: WorkflowEmailAttendeeStepDto, name: EMAIL_ATTENDEE },
+        { value: WorkflowPhoneAttendeeStepDto, name: SMS_ATTENDEE },
+        { value: WorkflowPhoneNumberStepDto, name: SMS_NUMBER },
      ],
    },
  })
-  steps!: (WorkflowEmailAddressStepDto | WorkflowEmailAttendeeStepDto)[];
+  steps!: (
+    | WorkflowEmailAddressStepDto
+    | WorkflowEmailAttendeeStepDto
+    | WorkflowPhoneAttendeeStepDto
+    | WorkflowPhoneNumberStepDto
+  )[];
 }
@@ -8,6 +8,8 @@ import {
  EMAIL_ADDRESS,
  EMAIL_ATTENDEE,
  FORM_ALLOWED_STEP_ACTIONS,
+  SMS_ATTENDEE,
+  SMS_NUMBER,
  UpdateEmailAddressWorkflowStepDto,
  UpdateEmailAttendeeWorkflowStepDto,
  UpdateEmailHostWorkflowStepDto,
@@ -75,6 +77,8 @@ export class UpdateFormWorkflowDto {
    oneOf: [
      { $ref: getSchemaPath(UpdateEmailAddressWorkflowStepDto) },
      { $ref: getSchemaPath(UpdateEmailAttendeeWorkflowStepDto) },
+      { $ref: getSchemaPath(UpdatePhoneAttendeeWorkflowStepDto) },
+      { $ref: getSchemaPath(UpdatePhoneNumberWorkflowStepDto) },
    ],
    type: "array",
  })
@@ -90,8 +94,15 @@ export class UpdateFormWorkflowDto {
      subTypes: [
        { value: UpdateEmailAddressWorkflowStepDto, name: EMAIL_ADDRESS },
        { value: UpdateEmailAttendeeWorkflowStepDto, name: EMAIL_ATTENDEE },
+        { value: UpdatePhoneAttendeeWorkflowStepDto, name: SMS_ATTENDEE },
+        { value: UpdatePhoneNumberWorkflowStepDto, name: SMS_NUMBER },
      ],
    },
  })
-  steps?: (UpdateEmailAddressWorkflowStepDto | UpdateEmailAttendeeWorkflowStepDto)[];
+  steps?: (
+    | UpdateEmailAddressWorkflowStepDto
+    | UpdateEmailAttendeeWorkflowStepDto
+    | UpdatePhoneNumberWorkflowStepDto
+    | UpdatePhoneAttendeeWorkflowStepDto
+  )[];
 }
@@ -24,7 +24,7 @@ export const STEP_ACTIONS = [
  CAL_AI_PHONE_CALL,
 ] as const;

-export const FORM_ALLOWED_STEP_ACTIONS = [EMAIL_ATTENDEE, EMAIL_ADDRESS] as const;
+export const FORM_ALLOWED_STEP_ACTIONS = [EMAIL_ATTENDEE, EMAIL_ADDRESS, SMS_ATTENDEE, SMS_NUMBER] as const;

 export const STEP_ACTIONS_TO_ENUM = {
  [EMAIL_HOST]: WorkflowActions.EMAIL_HOST,
@@ -13,7 +13,7 @@ import { getTeamEventType } from "@calcom/features/eventtypes/lib/getTeamEventTy
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { NEXTJS_CACHE_TTL } from "@calcom/lib/constants";
 import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
@@ -9,6 +9,7 @@ import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { AvailabilitySliderTable } from "@calcom/features/timezone-buddy/components/AvailabilitySliderTable";
+import { getScheduleListItemData } from "@calcom/lib/schedules/transformers/getScheduleListItemData";
 import { MembershipRole } from "@calcom/prisma/enums";
 import { availabilityRouter } from "@calcom/trpc/server/routers/viewer/availability/_router";

@@ -56,15 +57,7 @@ const Page = async ({ searchParams: _searchParams }: PageProps) => {
  // This is because the data is cached and as a result the data is converted to a string
  const availabilities = {
    ...cachedAvailabilities,
-    schedules: cachedAvailabilities.schedules.map((schedule) => ({
-      ...schedule,
-      availability: schedule.availability.map((avail) => ({
-        ...avail,
-        startTime: new Date(avail.startTime),
-        endTime: new Date(avail.endTime),
-        date: avail.date ? new Date(avail.date) : null,
-      })),
-    })),
+    schedules: cachedAvailabilities.schedules.map((schedule) => getScheduleListItemData(schedule)),
  };

  const organizationId = session?.user?.profile?.organizationId ?? session?.user.org?.id;
@@ -12,7 +12,7 @@ import { MembershipRole } from "@calcom/prisma/enums";
 import { buildLegacyRequest } from "@lib/buildLegacyCtx";

 import { validStatuses } from "~/bookings/lib/validStatuses";
-import BookingsList from "~/bookings/views/bookings-listing-view";
+import BookingsList from "~/bookings/views/bookings-view";

 const querySchema = z.object({
  status: z.enum(validStatuses),
@@ -4,7 +4,7 @@ import { unstable_cache } from "next/cache";

 import { TeamsListing } from "@calcom/features/ee/teams/components/TeamsListing";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { TeamService } from "@calcom/features/ee/teams/services/teamService";
 import prisma from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
@@ -53,16 +53,23 @@ export default async function SettingsLayoutAppDir(props: SettingsLayoutProps) {
  // For now we only grab organization features but it would be nice to fetch these on the server side for specific team feature flags
  if (orgId) {
    const isOrgAdminOrOwner = checkAdminOrOwner(session.user.org?.role);
-    const [features, rolePermissions, organizationPermissions] = await Promise.all([
-      getTeamFeatures(orgId),
-      getCachedResourcePermissions(userId, orgId, Resource.Role),
-      getCachedResourcePermissions(userId, orgId, Resource.Organization),
-    ]);
+    const features = await getTeamFeatures(orgId);

    if (features) {
      teamFeatures = {
        [orgId]: features,
      };
+    }
+
+    // Check if PBAC feature is enabled
+    const isPbacEnabled = features?.pbac === true;
+
+    if (isPbacEnabled) {
+      // Only fetch and apply PBAC permissions if the feature is enabled
+      const [rolePermissions, organizationPermissions] = await Promise.all([
+        getCachedResourcePermissions(userId, orgId, Resource.Role),
+        getCachedResourcePermissions(userId, orgId, Resource.Organization),
+      ]);

      // Check if user has permission to read roles
      const roleActions = PermissionMapper.toActionMap(rolePermissions, Resource.Role);
@@ -71,7 +78,8 @@ export default async function SettingsLayoutAppDir(props: SettingsLayoutProps) {
      canViewOrganizationBilling = orgActions[CustomAction.ManageBilling] ?? isOrgAdminOrOwner;
      canUpdateOrganization = orgActions[CrudAction.Update] ?? isOrgAdminOrOwner;
    } else {
-      canViewRoles = false;
+      // Fall back to legacy permissions when PBAC is not enabled or features not loaded
+      canViewRoles = features ? isOrgAdminOrOwner : false;
      canViewOrganizationBilling = isOrgAdminOrOwner;
      canUpdateOrganization = isOrgAdminOrOwner;
    }
@@ -0,0 +1,22 @@
+import { _generateMetadata } from "app/_utils";
+
+import ResumeOnboardingPage, { LayoutWrapper } from "~/settings/organizations/new/resume-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("resume_onboarding"),
+    (t) => t("resume_onboarding_description"),
+    undefined,
+    undefined,
+    "/settings/organizations/new/resume"
+  );
+
+const ServerPage = async () => {
+  return (
+    <LayoutWrapper>
+      <ResumeOnboardingPage />
+    </LayoutWrapper>
+  );
+};
+
+export default ServerPage;
@@ -26,11 +26,20 @@ async function handler(req: NextRequest) {
  cookieStore.delete("calcom.csrf_token");

  const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
+
  const result = await handleCancelBooking({
    bookingData,
    userId: session?.user?.id || -1,
  });

+  // const bookingCancelService = getBookingCancelService();
+  // const result = await bookingCancelService.cancelBooking({
+  //   bookingData: bookingData,
+  //   bookingMeta: {
+  //     userId: session?.user?.id || -1,
+  //   },
+  // });
+
  const statusCode = result.success ? 200 : 400;

  return NextResponse.json(result, { status: statusCode });
@@ -6,11 +6,11 @@
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";

+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";

 import { defaultResponderForAppDir } from "../../defaultResponderForAppDir";

@@ -12,7 +12,7 @@ import { findUniqueDelegationCalendarCredential } from "@calcom/app-store/delega
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
 import type { CredentialForCalendarServiceWithEmail } from "@calcom/types/Credential";
 import type { Ensure } from "@calcom/types/utils";
@@ -160,13 +160,21 @@ export const AppPage = ({
    function refactorMeWithoutEffect() {
      const data = appDbQuery.data;

-      const credentialsCount = data?.credentials.length || 0;
-      setExistingCredentials(data?.credentials || []);
+      const credentials = data?.credentials || [];
+      setExistingCredentials(credentials);
+
+      const hasPersonalInstall = credentials.some((c) => !!c.userId && !c.teamId);
+      const installedTeamIds = new Set<number>();
+      for (const cred of credentials) {
+        if (cred.teamId) installedTeamIds.add(cred.teamId);
+      }
+
+      const totalInstalledTargets = (hasPersonalInstall ? 1 : 0) + installedTeamIds.size;

      const appInstalledForAllTargets =
        availableForTeams && data?.userAdminTeams && data.userAdminTeams.length > 0
-          ? credentialsCount >= data.userAdminTeams.length
-          : credentialsCount > 0;
+          ? totalInstalledTargets >= data.userAdminTeams.length + 1
+          : credentials.length > 0;
      setAppInstalledForAllTargets(appInstalledForAllTargets);
    },
    [appDbQuery.data, availableForTeams]
@@ -244,7 +252,14 @@ export const AppPage = ({
              loading: isLoading,
            };
          }
-          return <InstallAppButtonChild credentials={appDbQuery.data?.credentials} paid={paid} {...props} />;
+
+          return (
+            <InstallAppButtonChild
+              credentials={availableForTeams ? undefined : appDbQuery.data?.credentials}
+              paid={paid}
+              {...props}
+            />
+          );
        }}
      />
    );
@@ -2,6 +2,7 @@

 import React from "react";

+import "@calcom/embed-core/src/embed-iframe";
 import { HttpError } from "@calcom/lib/http-error";
 import { Button } from "@calcom/ui/components/button";

@@ -83,9 +83,12 @@ export const getServerSideProps = async function getServerSideProps(
    props: {
      isEmbed,
      profile: {
-        theme: form.user.theme,
-        brandColor: form.user.brandColor,
-        darkBrandColor: form.user.darkBrandColor,
+        theme: formWithUserProfile.user.profile?.organization?.theme ?? formWithUserProfile.user.theme,
+        brandColor:
+          formWithUserProfile.user.profile?.organization?.brandColor ?? formWithUserProfile.user.brandColor,
+        darkBrandColor:
+          formWithUserProfile.user.profile?.organization?.darkBrandColor ??
+          formWithUserProfile.user.darkBrandColor,
      },
      form: await getSerializableForm({ form: enrichFormWithMigrationData(formWithUserProfile) }),
    },
@@ -49,6 +49,13 @@ export const getEventTypesFromDB = async (id: number) => {
      profile: {
        select: {
          organizationId: true,
+          organization: {
+            select: {
+              brandColor: true,
+              darkBrandColor: true,
+              theme: true,
+            },
+          },
        },
      },
      teamId: true,
@@ -71,9 +78,15 @@ export const getEventTypesFromDB = async (id: number) => {
          slug: true,
          name: true,
          hideBranding: true,
+          brandColor: true,
+          darkBrandColor: true,
+          theme: true,
          parent: {
            select: {
              hideBranding: true,
+              brandColor: true,
+              darkBrandColor: true,
+              theme: true,
            },
          },
          createdByOAuthClientId: true,
@@ -116,12 +129,11 @@ export const getEventTypesFromDB = async (id: number) => {
  }

  const metadata = EventTypeMetaDataSchema.parse(eventType.metadata);
-  const { profile, ...restEventType } = eventType;
-  const isOrgTeamEvent = !!eventType?.team && !!profile?.organizationId;
+  const isOrgTeamEvent = !!eventType?.team && !!eventType.profile?.organizationId;

  return {
    isDynamic: false,
-    ...restEventType,
+    ...eventType,
    bookingFields: getBookingFieldsWithSystemFields({ ...eventType, isOrgTeamEvent }),
    metadata,
  };
@@ -8,12 +8,12 @@ import type { GetBookingType } from "@calcom/features/bookings/lib/get-booking";
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { EventRepository } from "@calcom/features/eventtypes/repositories/EventRepository";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
+import { HashedLinkService } from "@calcom/features/hashedLink/services/hashedLinkService";
 import {
  shouldHideBrandingForTeamEvent,
  shouldHideBrandingForUserEvent,
 } from "@calcom/features/profile/lib/hideBranding";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
-import { HashedLinkService } from "@calcom/lib/server/service/hashedLinkService";
 import slugify from "@calcom/lib/slugify";
 import prisma from "@calcom/prisma";
 import { RedirectType } from "@calcom/prisma/enums";
@@ -1,4 +1,4 @@
-import { organizationScenarios } from "@calcom/lib/server/repository/__mocks__/organization";
+import { organizationScenarios } from "@calcom/features/ee/organizations/__mocks__/organizationMock";

 import { describe, it, expect, beforeEach, vi } from "vitest";

@@ -4,11 +4,11 @@ import { URLSearchParams } from "url";
 import { z } from "zod";

 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { buildEventUrlFromBooking } from "@calcom/features/bookings/lib/buildEventUrlFromBooking";
 import { determineReschedulePreventionRedirect } from "@calcom/features/bookings/lib/reschedule/determineReschedulePreventionRedirect";
 import { getDefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents";
-import { buildEventUrlFromBooking } from "@calcom/lib/bookings/buildEventUrlFromBooking";
-import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";
 import prisma, { bookingMinimalSelect } from "@calcom/prisma";

 const querySchema = z.object({
@@ -7,8 +7,9 @@ import { getBookingForReschedule } from "@calcom/features/bookings/lib/get-booki
 import { getSlugOrRequestedSlug, orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { getOrganizationSEOSettings } from "@calcom/features/ee/organizations/lib/orgSettings";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
-import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
+import { getBrandingForEventType } from "@calcom/features/profile/lib/getBranding";
 import { shouldHideBrandingForTeamEvent } from "@calcom/features/profile/lib/hideBranding";
+import { getPlaceholderAvatar } from "@calcom/lib/defaultAvatarImage";
 import slugify from "@calcom/lib/slugify";
 import { prisma } from "@calcom/prisma";
 import type { User } from "@calcom/prisma/client";
@@ -30,7 +31,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
  const { req, params, query } = context;
  const session = await getServerSession({ req });
  const { slug: teamSlug, type: meetingSlug } = paramsSchema.parse(params);
-  const { rescheduleUid, isInstantMeeting: queryIsInstantMeeting, email } = query;
+  const { rescheduleUid, isInstantMeeting: queryIsInstantMeeting } = query;
  const allowRescheduleForCancelledBooking = query.allowRescheduleForCancelledBooking === "true";
  const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(req, params?.orgSlug);

@@ -133,6 +134,14 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
  const teamHasApiV2Route = await featureRepo.checkIfTeamHasFeature(team.id, "use-api-v2-for-team-slots");
  const useApiV2 = teamHasApiV2Route && hasApiV2RouteInEnv();

+  const branding = getBrandingForEventType({
+    eventType: {
+      team: team.parent ?? team,
+      users: [],
+      profile: null,
+    },
+  });
+
  return {
    props: {
      useApiV2,
@@ -153,6 +162,7 @@ export const getServerSideProps = async (context: GetServerSidePropsContext) =>
            : getPlaceholderAvatar(team.logoUrl, team.name),
          name,
          username: orgSlug ?? null,
+          ...branding,
        },
        title: eventData.title,
        users: eventHostsUserData,
@@ -204,6 +214,9 @@ const getTeamWithEventsData = async (
          bannerUrl: true,
          logoUrl: true,
          hideBranding: true,
+          brandColor: true,
+          darkBrandColor: true,
+          theme: true,
          organizationSettings: {
            select: {
              allowSEOIndexing: true,
@@ -214,6 +227,9 @@ const getTeamWithEventsData = async (
      logoUrl: true,
      name: true,
      slug: true,
+      brandColor: true,
+      darkBrandColor: true,
+      theme: true,
      eventTypes: {
        where: {
          slug: meetingSlug,
@@ -1,3 +0,0 @@
-import type { RegularBookingCreateResult } from "@calcom/features/bookings/lib/dto/types";
-
-export type BookingResponse = RegularBookingCreateResult;
@@ -11,11 +11,11 @@ import { z } from "zod";

 import { SAMLLogin } from "@calcom/features/auth/SAMLLogin";
 import { ErrorCode } from "@calcom/features/auth/lib/ErrorCode";
+import { LastUsed, useLastUsed } from "@calcom/features/auth/lib/hooks/useLastUsed";
 import { HOSTED_CAL_FEATURES, WEBAPP_URL, WEBSITE_URL } from "@calcom/lib/constants";
 import { emailRegex } from "@calcom/lib/emailSchema";
 import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
-import { LastUsed, useLastUsed } from "@calcom/lib/hooks/useLastUsed";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useTelemetry } from "@calcom/lib/hooks/useTelemetry";
 import { collectPageParameters, telemetryEventTypes } from "@calcom/lib/telemetry";
@@ -62,7 +62,7 @@ export default function Login({
        .string()
        .min(1, `${t("error_required_field")}`)
        .regex(emailRegex, `${t("enter_valid_email")}`),
-      ...(!!totpEmail ? {} : { password: z.string().min(1, `${t("error_required_field")}`) }),
+      ...(totpEmail ? {} : { password: z.string().min(1, `${t("error_required_field")}`) }),
    })
    // Passthrough other fields like totpCode
    .passthrough();
@@ -141,6 +141,7 @@ export function AvailabilityList({ availabilities }: AvailabilityListProps) {
            <ul className="divide-subtle divide-y" data-testid="schedules" ref={animationParentRef}>
              {availabilities.schedules.map((schedule) => (
                <ScheduleListItem
+                  redirectUrl={`/availability/${schedule.id}`}
                  displayOptions={{
                    hour12: user?.timeFormat ? user.timeFormat === 12 : undefined,
                    timeZone: user?.timeZone,
@@ -0,0 +1,34 @@
+"use client";
+
+import type { Table as ReactTable } from "@tanstack/react-table";
+
+import { DataTableFilters, DataTableSegment } from "@calcom/features/data-table";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+
+import type { RowData, BookingListingStatus } from "../types";
+
+type BookingsCalendarViewProps = {
+  status: BookingListingStatus;
+  table: ReactTable<RowData>;
+};
+
+export function BookingsCalendar({ table }: BookingsCalendarViewProps) {
+  return (
+    <>
+      <div className="mb-4 flex items-center justify-between">
+        <div className="flex items-center gap-2">
+          <DataTableFilters.FilterBar table={table} />
+        </div>
+
+        <div className="flex items-center gap-2">
+          <DataTableFilters.ClearFiltersButton />
+          <DataTableSegment.SaveButton />
+          <DataTableSegment.Select />
+        </div>
+      </div>
+      <div className="flex items-center justify-center pt-2 xl:pt-0">
+        <EmptyScreen Icon="calendar" headline="Calendar view" description="Calendar view is coming soon." />
+      </div>
+    </>
+  );
+}
@@ -0,0 +1,69 @@
+"use client";
+
+import type { Table as ReactTable } from "@tanstack/react-table";
+
+import { DataTableWrapper, DataTableFilters, DataTableSegment } from "@calcom/features/data-table";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { EmptyScreen } from "@calcom/ui/components/empty-screen";
+
+import SkeletonLoader from "@components/booking/SkeletonLoader";
+
+import type { RowData, BookingListingStatus } from "../types";
+
+const descriptionByStatus: Record<BookingListingStatus, string> = {
+  upcoming: "upcoming_bookings",
+  recurring: "recurring_bookings",
+  past: "past_bookings",
+  cancelled: "cancelled_bookings",
+  unconfirmed: "unconfirmed_bookings",
+};
+
+type BookingsListViewProps = {
+  status: BookingListingStatus;
+  table: ReactTable<RowData>;
+  isPending: boolean;
+  totalRowCount?: number;
+};
+
+export function BookingsList({ status, table, isPending, totalRowCount }: BookingsListViewProps) {
+  const { t } = useLocale();
+
+  return (
+    <DataTableWrapper
+      className="mb-6"
+      table={table}
+      testId={`${status}-bookings`}
+      bodyTestId="bookings"
+      headerClassName="hidden"
+      isPending={isPending}
+      totalRowCount={totalRowCount}
+      variant="compact"
+      paginationMode="standard"
+      ToolbarLeft={
+        <>
+          <DataTableFilters.FilterBar table={table} />
+        </>
+      }
+      ToolbarRight={
+        <>
+          <DataTableFilters.ClearFiltersButton />
+          <DataTableSegment.SaveButton />
+          <DataTableSegment.Select />
+        </>
+      }
+      LoaderView={<SkeletonLoader />}
+      EmptyView={
+        <div className="flex items-center justify-center pt-2 xl:pt-0">
+          <EmptyScreen
+            Icon="calendar"
+            headline={t("no_status_bookings_yet", { status: t(status).toLowerCase() })}
+            description={t("no_status_bookings_yet_description", {
+              status: t(status).toLowerCase(),
+              description: t(descriptionByStatus[status]),
+            })}
+          />
+        </div>
+      }
+    />
+  );
+}
@@ -0,0 +1,25 @@
+import type { RouterOutputs } from "@calcom/trpc/react";
+
+import type { validStatuses } from "~/bookings/lib/validStatuses";
+
+export type BookingOutput = RouterOutputs["viewer"]["bookings"]["get"]["bookings"][0];
+
+export type RecurringInfo = {
+  recurringEventId: string | null;
+  count: number;
+  firstDate: Date | null;
+  bookings: { [key: string]: Date[] };
+};
+
+export type RowData =
+  | {
+      type: "data";
+      booking: BookingOutput;
+      isToday: boolean;
+      recurringInfo?: RecurringInfo;
+    }
+  | {
+      type: "today" | "next";
+    };
+
+export type BookingListingStatus = (typeof validStatuses)[number];
@@ -6,12 +6,13 @@ import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/app-store/zod-util
 import { orgDomainConfig } from "@calcom/ee/organizations/lib/orgDomains";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import getBookingInfo from "@calcom/features/bookings/lib/getBookingInfo";
+import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import { getDefaultEvent } from "@calcom/features/eventtypes/lib/defaultEvents";
+import { getBrandingForEventType } from "@calcom/features/profile/lib/getBranding";
 import { shouldHideBrandingForEvent } from "@calcom/features/profile/lib/hideBranding";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";
-import { BookingRepository } from "@calcom/features/bookings/repositories/BookingRepository";
 import prisma from "@calcom/prisma";
 import { customInputSchema } from "@calcom/prisma/zod-utils";
 import { meRouter } from "@calcom/trpc/server/routers/viewer/me/_router";
@@ -115,18 +116,27 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
  bookingInfo["startTime"] = (bookingInfo?.startTime as Date)?.toISOString() as unknown as Date;
  bookingInfo["endTime"] = (bookingInfo?.endTime as Date)?.toISOString() as unknown as Date;

-  eventTypeRaw.users = !!eventTypeRaw.hosts?.length
+  eventTypeRaw.users = eventTypeRaw.hosts?.length
    ? eventTypeRaw.hosts.map((host) => host.user)
    : eventTypeRaw.users;

  if (!eventTypeRaw.users.length) {
-    if (!eventTypeRaw.owner)
-      return {
-        notFound: true,
-      } as const;
-    eventTypeRaw.users.push({
-      ...eventTypeRaw.owner,
-    });
+    if (!eventTypeRaw.owner) {
+      if (bookingInfoRaw.user) {
+        eventTypeRaw.users.push({
+          ...bookingInfoRaw.user,
+          hideBranding: false,
+          theme: null,
+          brandColor: null,
+          darkBrandColor: null,
+          isPlatformManaged: false,
+        });
+      } else {
+        return { notFound: true } as const;
+      }
+    } else {
+      eventTypeRaw.users.push({ ...eventTypeRaw.owner });
+    }
  }

  const eventType = {
@@ -150,9 +160,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
  const profile = {
    name: eventType.team?.name || eventType.users[0]?.name || null,
    email: eventType.team ? null : eventType.users[0].email || null,
-    theme: (!eventType.team?.name && eventType.users[0]?.theme) || null,
-    brandColor: eventType.team ? null : eventType.users[0].brandColor || null,
-    darkBrandColor: eventType.team ? null : eventType.users[0].darkBrandColor || null,
+    ...getBrandingForEventType({ eventType: eventTypeRaw }),
    slug: eventType.team?.slug || eventType.users[0]?.username || null,
  };

@@ -24,9 +24,13 @@ import {
 import { Price } from "@calcom/features/bookings/components/event-meta/Price";
 import { getCalendarLinks, CalendarLinkType } from "@calcom/features/bookings/lib/getCalendarLinks";
 import { RATING_OPTIONS, validateRating } from "@calcom/features/bookings/lib/rating";
+import {
+  SMS_REMINDER_NUMBER_FIELD,
+  SystemField,
+  TITLE_FIELD,
+} from "@calcom/lib/bookings/SystemField";
 import type { nameObjectSchema } from "@calcom/features/eventtypes/lib/eventNaming";
 import { getEventName } from "@calcom/features/eventtypes/lib/eventNaming";
-import { SMS_REMINDER_NUMBER_FIELD, SystemField, TITLE_FIELD } from "@calcom/lib/SystemField";
 import { APP_NAME } from "@calcom/lib/constants";
 import { formatToLocalizedDate, formatToLocalizedTime, formatToLocalizedTimezone } from "@calcom/lib/dayjs";
 import useGetBrandingColours from "@calcom/lib/getBrandColours";
@@ -694,7 +698,7 @@ export default function Success(props: PageProps) {
                          <>
                            <div className="mt-9 font-medium">{t("additional_notes")}</div>
                            <div className="col-span-2 mb-2 mt-9">
-                              <p className="break-words">{bookingInfo.description}</p>
+                              <p className="whitespace-pre-line break-words">{bookingInfo.description}</p>
                            </div>
                          </>
                        )}
@@ -767,7 +771,7 @@ export default function Success(props: PageProps) {
                            <Fragment key={field.name}>
                              <div
                                className="text-emphasis mt-4 font-medium"
-                                // eslint-disable-next-line react/no-danger
+                                 
                                dangerouslySetInnerHTML={{
                                  __html: markdownToSafeHTML(label),
                                }}
@@ -1080,7 +1084,7 @@ export default function Success(props: PageProps) {
                      <span className="underline">
                        <a
                          target="_blank"
-                          href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations">
+                          href="https://cal.com/blog/google-s-new-spam-policy-may-be-affecting-your-invitations" rel="noreferrer">
                          {t("resolve")}
                        </a>
                      </span>
@@ -2,57 +2,38 @@

 import { useReactTable, getCoreRowModel, getSortedRowModel, createColumnHelper } from "@tanstack/react-table";
 import { useSearchParams, usePathname } from "next/navigation";
-import { useMemo, useRef } from "react";
+import { createParser, useQueryState } from "nuqs";
+import { useMemo } from "react";

 import dayjs from "@calcom/dayjs";
 import {
-  useDataTable,
  DataTableProvider,
-  DataTableWrapper,
-  DataTableFilters,
-  DataTableSegment,
+  type SystemFilterSegment,
+  useDataTable,
  ColumnFilterType,
  useFilterValue,
  ZMultiSelectFilterValue,
  ZDateRangeFilterValue,
  ZTextFilterValue,
-  type SystemFilterSegment,
 } from "@calcom/features/data-table";
 import { useSegments } from "@calcom/features/data-table/hooks/useSegments";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
 import useMeQuery from "@calcom/trpc/react/hooks/useMeQuery";
 import { Alert } from "@calcom/ui/components/alert";
-import { EmptyScreen } from "@calcom/ui/components/empty-screen";
 import type { HorizontalTabItemProps } from "@calcom/ui/components/navigation";
 import { HorizontalTabs } from "@calcom/ui/components/navigation";
 import type { VerticalTabItemProps } from "@calcom/ui/components/navigation";
 import { WipeMyCalActionButton } from "@calcom/web/components/apps/wipemycalother/wipeMyCalActionButton";

 import BookingListItem from "@components/booking/BookingListItem";
-import SkeletonLoader from "@components/booking/SkeletonLoader";

 import { useFacetedUniqueValues } from "~/bookings/hooks/useFacetedUniqueValues";
 import type { validStatuses } from "~/bookings/lib/validStatuses";

-type BookingListingStatus = (typeof validStatuses)[number];
-type BookingOutput = RouterOutputs["viewer"]["bookings"]["get"]["bookings"][0];
-
-type RecurringInfo = {
-  recurringEventId: string | null;
-  count: number;
-  firstDate: Date | null;
-  bookings: { [key: string]: Date[] };
-};
-
-const descriptionByStatus: Record<BookingListingStatus, string> = {
-  upcoming: "upcoming_bookings",
-  recurring: "recurring_bookings",
-  past: "past_bookings",
-  cancelled: "cancelled_bookings",
-  unconfirmed: "unconfirmed_bookings",
-};
+import { BookingsCalendar } from "../components/BookingsCalendar";
+import { BookingsList } from "../components/BookingsList";
+import type { RowData, BookingOutput } from "../types";

 type BookingsProps = {
  status: (typeof validStatuses)[number];
@@ -103,21 +84,18 @@ export default function Bookings(props: BookingsProps) {
  );
 }

-type RowData =
-  | {
-      type: "data";
-      booking: BookingOutput;
-      isToday: boolean;
-      recurringInfo?: RecurringInfo;
-    }
-  | {
-      type: "today" | "next";
-    };
+const viewParser = createParser({
+  parse: (value: string) => {
+    if (value === "calendar") return "calendar";
+    return "list";
+  },
+  serialize: (value: "list" | "calendar") => value,
+});

 function BookingsContent({ status, permissions }: BookingsProps) {
+  const [view] = useQueryState("view", viewParser.withDefault("list"));
  const { t } = useLocale();
  const user = useMeQuery().data;
-  const tableContainerRef = useRef<HTMLDivElement>(null);
  const searchParams = useSearchParams();

  // Generate dynamic tabs that preserve query parameters
@@ -411,6 +389,9 @@ function BookingsContent({ status, permissions }: BookingsProps) {
    getFacetedUniqueValues,
  });

+  const isPending = query.isPending;
+  const totalRowCount = query.data?.totalCount;
+
  return (
    <div className="flex flex-col">
      <div className="flex flex-row flex-wrap justify-between">
@@ -431,43 +412,16 @@ function BookingsContent({ status, permissions }: BookingsProps) {
              {!!bookingsToday.length && status === "upcoming" && (
                <WipeMyCalActionButton bookingStatus={status} bookingsEmpty={isEmpty} />
              )}
-              <DataTableWrapper
-                className="mb-6"
-                tableContainerRef={tableContainerRef}
-                table={table}
-                testId={`${status}-bookings`}
-                bodyTestId="bookings"
-                headerClassName="hidden"
-                isPending={query.isPending}
-                totalRowCount={query.data?.totalCount}
-                variant="compact"
-                paginationMode="standard"
-                ToolbarLeft={
-                  <>
-                    <DataTableFilters.FilterBar table={table} />
-                  </>
-                }
-                ToolbarRight={
-                  <>
-                    <DataTableFilters.ClearFiltersButton />
-                    <DataTableSegment.SaveButton />
-                    <DataTableSegment.Select />
-                  </>
-                }
-                LoaderView={<SkeletonLoader />}
-                EmptyView={
-                  <div className="flex items-center justify-center pt-2 xl:pt-0">
-                    <EmptyScreen
-                      Icon="calendar"
-                      headline={t("no_status_bookings_yet", { status: t(status).toLowerCase() })}
-                      description={t("no_status_bookings_yet_description", {
-                        status: t(status).toLowerCase(),
-                        description: t(descriptionByStatus[status]),
-                      })}
-                    />
-                  </div>
-                }
-              />
+              {view === "list" ? (
+                <BookingsList
+                  status={status}
+                  table={table}
+                  isPending={isPending}
+                  totalRowCount={totalRowCount}
+                />
+              ) : (
+                <BookingsCalendar status={status} table={table} />
+              )}
            </>
          )}
        </div>
@@ -205,6 +205,7 @@ const AddNewTeamsFormChild = ({ teams }: { teams: { id: number; name: string; sl
            <TextField
              key={field.id}
              {...register(`teams.${index}.name`)}
+              data-testid={`team.${index}.name`}
              label=""
              addOnClassname="bg-transparent p-0 border-l-0"
              className={index > 0 ? "mb-2" : ""}
@@ -34,28 +34,28 @@ const useOrgCreation = () => {
  const session = useSession();
  const utils = trpc.useUtils();
  const [serverErrorMessage, setServerErrorMessage] = useState("");
-  const { useOnboardingStore, isBillingEnabled } = useOnboarding();
+  const { useOnboardingStore } = useOnboarding();
  const { reset } = useOnboardingStore();

-  const checkoutMutation = trpc.viewer.organizations.createWithPaymentIntent.useMutation({
-    onSuccess: (data) => {
-      if (data.checkoutUrl) {
-        window.location.href = data.checkoutUrl;
-      }
-    },
-    onError: (error) => {
-      setServerErrorMessage(t(error.message));
-    },
-  });
-
-  const createOrgMutation = trpc.viewer.organizations.createSelfHosted.useMutation({
+  // Single mutation for all flows (billing, self-hosted, admin)
+  const intentToCreateOrgMutation = trpc.viewer.organizations.intentToCreateOrg.useMutation({
    onSuccess: async (data) => {
-      if (data.organization) {
-        // Invalidate the organizations query to ensure fresh data on the next page
+      reset({
+        onboardingId: data.organizationOnboardingId,
+      });
+
+      if (data.checkoutUrl) {
+        // Billing enabled - redirect to Stripe
+        window.location.href = data.checkoutUrl;
+      } else if (data.organizationId) {
+        // Self-hosted - org already created, redirect to organizations
        await utils.viewer.organizations.listCurrent.invalidate();
        await session.update();
        reset();
        window.location.href = `${window.location.origin}/settings/organizations/profile`;
+      } else {
+        // Unexpected state
+        setServerErrorMessage("Unexpected response from server");
      }
    },
    onError: (error) => {
@@ -63,12 +63,10 @@ const useOrgCreation = () => {
    },
  });

-  const mutationToUse = isBillingEnabled ? checkoutMutation : createOrgMutation;
-
  return {
-    mutation: mutationToUse,
-    mutate: mutationToUse.mutate,
-    isPending: mutationToUse.isPending,
+    mutation: intentToCreateOrgMutation,
+    mutate: intentToCreateOrgMutation.mutate,
+    isPending: intentToCreateOrgMutation.isPending,
    errorMessage: serverErrorMessage,
  };
 };
@@ -84,7 +82,13 @@ export const AddNewTeamMembersForm = () => {
    invitedMembers,
    logo,
    bio,
-    onboardingId,
+    name,
+    slug,
+    billingPeriod,
+    seats,
+    pricePerSeat,
+    brandColor,
+    bannerUrl,
  } = useOnboardingStore();
  const orgCreation = useOrgCreation();

@@ -155,7 +159,7 @@ export const AddNewTeamMembersForm = () => {
                placeholder="colleague@company.com"
              />
            </div>
-            <Button type="submit" StartIcon="plus" color="secondary">
+            <Button type="submit" StartIcon="plus" color="secondary" data-testid="invite-new-member-button">
              {t("add")}
            </Button>
          </form>
@@ -203,22 +207,31 @@ export const AddNewTeamMembersForm = () => {
        )}
      </div>

-      <div className="mt-3 mt-6 flex items-center justify-end">
+      <div className="mt-3 flex items-center justify-end">
        <Button
+          data-testid="publish-button"
          onClick={() => {
-            if (!onboardingId) {
-              console.error("Org owner email and onboardingId are required", {
-                orgOwnerEmail,
-                onboardingId,
-              });
+            // Submit ALL data to intentToCreateOrg
+            if (!name || !slug || !orgOwnerEmail) {
+              console.error("Required fields missing", { name, slug, orgOwnerEmail });
+              showToast(t("required_fields_missing"), "error");
              return;
            }
-            orgCreation.mutation.mutate({
+
+            orgCreation.mutate({
+              name,
+              slug,
+              orgOwnerEmail,
+              seats,
+              pricePerSeat,
+              billingPeriod,
+              creationSource: "WEBAPP" as const,
              logo,
              bio,
+              brandColor,
+              bannerUrl,
              teams,
              invitedMembers,
-              onboardingId,
            });
          }}
          loading={orgCreation.isPending}>
@@ -6,8 +6,8 @@ import { useEffect, useState } from "react";
 import { useOnboarding } from "@calcom/features/ee/organizations/lib/onboardingStore";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc";
-import { Icon } from "@calcom/ui/components/icon";
 import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";

 const PaymentStatusView = () => {
  const { t } = useLocale();
@@ -15,9 +15,7 @@ const PaymentStatusView = () => {
  const searchParams = useSearchParams();
  const paymentStatus = searchParams?.get("paymentStatus");
  const paymentError = searchParams?.get("error");
-  const { useOnboardingStore } = useOnboarding({
-    step: "status",
-  });
+  const { useOnboardingStore } = useOnboarding();
  const [organizationCreated, setOrganizationCreated] = useState<boolean>(false);
  const { name } = useOnboardingStore();

@@ -0,0 +1,114 @@
+"use client";
+
+import { useRouter, useSearchParams } from "next/navigation";
+import { useEffect } from "react";
+
+import { useOnboarding } from "@calcom/features/ee/organizations/lib/onboardingStore";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
+import { WizardLayout } from "@calcom/ui/components/layout";
+import { SkeletonContainer, SkeletonText } from "@calcom/ui/components/skeleton";
+
+export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
+  return (
+    <WizardLayout currentStep={1} maxSteps={5}>
+      {children}
+    </WizardLayout>
+  );
+};
+
+const ResumeOnboardingView = () => {
+  const { t } = useLocale();
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const onboardingIdParam = searchParams?.get("onboardingId");
+
+  const { dbOnboarding, isLoadingOrgOnboarding, useOnboardingStore } = useOnboarding();
+  const { reset } = useOnboardingStore();
+
+  useEffect(() => {
+    if (isLoadingOrgOnboarding) {
+      return;
+    }
+
+    if (!onboardingIdParam) {
+      router.push("/settings/organizations/new");
+      return;
+    }
+
+    if (!dbOnboarding) {
+      return;
+    }
+
+    if (dbOnboarding.isComplete) {
+      router.push("/settings/organizations");
+      return;
+    }
+
+    // Load onboarding data into store
+    reset({
+      onboardingId: dbOnboarding.id,
+      name: dbOnboarding.name,
+      slug: dbOnboarding.slug,
+      orgOwnerEmail: dbOnboarding.orgOwnerEmail,
+      billingPeriod: dbOnboarding.billingPeriod,
+      seats: dbOnboarding.seats,
+      pricePerSeat: dbOnboarding.pricePerSeat,
+      logo: dbOnboarding.logo,
+      bio: dbOnboarding.bio,
+      brandColor: dbOnboarding.brandColor,
+      bannerUrl: dbOnboarding.bannerUrl,
+    });
+
+    // Redirect to next step (About page)
+    router.push("/settings/organizations/new/about");
+  }, [dbOnboarding, isLoadingOrgOnboarding, onboardingIdParam, reset, router]);
+
+  if (isLoadingOrgOnboarding) {
+    return (
+      <SkeletonContainer className="space-y-4">
+        <SkeletonText className="h-8 w-full" />
+        <SkeletonText className="h-4 w-3/4" />
+        <SkeletonText className="h-4 w-1/2" />
+      </SkeletonContainer>
+    );
+  }
+
+  if (!onboardingIdParam) {
+    return (
+      <Alert
+        data-testid="error"
+        severity="error"
+        title={t("error")}
+        message={t("no_onboarding_id_provided")}
+      />
+    );
+  }
+
+  if (!dbOnboarding) {
+    return (
+      <Alert data-testid="error" severity="error" title={t("error")} message={t("onboarding_not_found")} />
+    );
+  }
+
+  if (dbOnboarding.isComplete) {
+    return (
+      <Alert
+        data-testid="error"
+        severity="info"
+        title={t("onboarding_already_complete")}
+        message={t("onboarding_already_complete_description")}
+      />
+    );
+  }
+
+  // Loading state while redirecting
+  return (
+    <SkeletonContainer className="space-y-4">
+      <SkeletonText className="h-8 w-full" />
+      <SkeletonText className="h-4 w-3/4" />
+    </SkeletonContainer>
+  );
+};
+
+export default ResumeOnboardingView;
@@ -4,8 +4,8 @@ import { useRouter } from "next/navigation";

 import { useOrgBranding } from "@calcom/features/ee/organizations/context/provider";
 import { TeamEventTypeForm } from "@calcom/features/ee/teams/components/TeamEventTypeForm";
+import { useCreateEventType } from "@calcom/features/eventtypes/hooks/useCreateEventType";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
-import { useCreateEventType } from "@calcom/lib/hooks/useCreateEventType";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
 import { Button } from "@calcom/ui/components/button";
@@ -60,7 +60,7 @@ vi.mock("@calcom/features/bookings/components/event-meta/Price", () => {
  return {};
 });

-vi.mock("@calcom/lib/SystemField", () => {
+vi.mock("@calcom/lib/bookings/SystemField", () => {
  return {};
 });

@@ -20,7 +20,14 @@ function mockedUserPageComponentProps(props: Partial<React.ComponentProps<typeof
      theme: "dark",
      brandColor: "red",
      darkBrandColor: "black",
-      organization: { requestedSlug: "slug", slug: "slug", id: 1 },
+      organization: {
+        requestedSlug: "slug",
+        slug: "slug",
+        id: 1,
+        brandColor: null,
+        darkBrandColor: null,
+        theme: null,
+      },
      allowSEOIndexing: true,
      username: "john",
    },
@@ -1,3 +1,4 @@
+/* eslint-disable */
 require("dotenv").config({ path: "../../.env" });
 const englishTranslation = require("./public/static/locales/en/common.json");
 const { withAxiom } = require("next-axiom");
@@ -223,8 +224,6 @@ const nextConfig = (phase) => {
      "@calcom/dayjs",
      "@calcom/emails",
      "@calcom/embed-core",
-      "@calcom/embed-react",
-      "@calcom/embed-snippet",
      "@calcom/features",
      "@calcom/lib",
      "@calcom/prisma",
@@ -1,6 +1,6 @@
 {
  "name": "@calcom/web",
-  "version": "5.8.0",
+  "version": "5.8.1",
  "private": true,
  "scripts": {
    "analyze": "ANALYZE=true next build",
@@ -201,6 +201,7 @@
    "tailwindcss": "^3.3.3",
    "tailwindcss-animate": "^1.0.6",
    "ts-node": "^10.9.1",
+    "turbo": "^2.5.5",
    "typescript": "^5.9.0-beta"
  },
  "nextBundleAnalysis": {
@@ -7,6 +7,7 @@ import type { ErrorProps } from "next/error";
 import NextError from "next/error";
 import React from "react";

+import "@calcom/embed-core/src/embed-iframe";
 import { getErrorFromUnknown } from "@calcom/lib/errors";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
@@ -541,9 +541,10 @@ test.describe("Reschedule for booking with seats", () => {
      data: bookingSeats,
    });

-    const references = await prisma.bookingSeat.findMany({
-      where: { bookingId: booking.id },
-      orderBy: { id: "asc" },
+    const secondAttendeeId = bookingAttendees.find((attendee)=> attendee.email === "second+seats@cal.com");
+
+    const references = await prisma.bookingSeat.findFirst({
+      where: { bookingId: booking.id, attendeeId: secondAttendeeId?.id },
    });

    const secondUser = await users.create({
@@ -556,13 +557,14 @@ test.describe("Reschedule for booking with seats", () => {
    await page.waitForSelector('[data-testid="bookings"]');

    await page.locator('[data-testid="booking-actions-dropdown"]').nth(0).click();
+    const href = await page.locator('[data-testid="reschedule"]').getAttribute("href");
+    expect(href).toBeTruthy();
+    const url = new URL(href!, page.url());
+    const seatReferenceUid = url.searchParams.get('seatReferenceUid');
+    expect(seatReferenceUid).toBeTruthy();
+    expect(seatReferenceUid).toBe(references?.referenceUid);
    await page.locator('[data-testid="reschedule"]').click();

-    await page.waitForURL((url) => {
-      const rescheduleUid = url.searchParams.get("rescheduleUid");
-      return !!rescheduleUid && rescheduleUid === references[1].referenceUid;
-    });
-
    await selectFirstAvailableTimeSlotNextMonth(page);

    const nameElement = page.locator("input[name=name]");
@@ -117,6 +117,7 @@ export function createAppsFixture(page: Page) {
    },
    goToAppsTab: async () => {
      await page.getByTestId("vertical-tab-apps").click();
+      await expect(page.getByTestId("vertical-tab-apps")).toHaveAttribute("aria-current", "page");
    },
    activeApp: async (app: string) => {
      await page.locator(`[data-testid='${app}-app-switch']`).click();
@@ -126,7 +127,7 @@ export function createAppsFixture(page: Page) {
    },
    verifyAppsInfoNew: async (app: string, eventTypeId: number) => {
      await page.goto(`event-types/${eventTypeId}?tabName=apps`);
-      await expect(page.getByTestId("vertical-tab-basics")).toContainText("Basics"); // fix the race condition
+      await expect(page.getByTestId("vertical-tab-apps")).toHaveAttribute("aria-current", "page"); // fix the race condition
      await expect(page.locator(`[data-testid='${app}-app-switch'][data-state="checked"]`)).toBeVisible();
    },
  };
@@ -0,0 +1,451 @@
+import type { Page } from "@playwright/test";
+import { expect } from "@playwright/test";
+import { uuid } from "short-uuid";
+
+import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
+
+import { test } from "../lib/fixtures";
+
+/**
+ * Utility function to complete the organization onboarding wizard steps
+ * (about, add-teams, onboard-members)
+ */
+async function completeOnboardingWizard(
+  page: Page,
+  options: {
+    aboutText?: string;
+    teams?: string[];
+    members?: string[];
+  } = {}
+) {
+  const { aboutText = "Test organization description", teams = ["Engineering"], members = [] } = options;
+
+  // Step 1: Complete "About" step
+  await page.waitForURL("**/settings/organizations/new/about");
+  await page.locator('textarea[name="about"]').fill(aboutText);
+  await page.locator("button[type=submit]").click();
+
+  // Step 2: Complete "Add Teams" step
+  await page.waitForURL("**/settings/organizations/new/add-teams");
+  for (let i = 0; i < teams.length; i++) {
+    await page.getByTestId(`team.${i}.name`).fill(teams[i]);
+    if (i < teams.length - 1) {
+      await page.getByTestId("add_a_team").click();
+    }
+  }
+  await page.locator("button[type=submit]").click();
+
+  // Step 3: Complete "Onboard Members" step
+  await page.waitForURL("**/settings/organizations/new/onboard-members");
+
+  // Add members if provided
+  for (const memberEmail of members) {
+    await page.locator('[placeholder="colleague\\@company\\.com"]').fill(memberEmail);
+    await page.getByTestId("invite-new-member-button").click();
+    await expect(page.getByTestId("pending-member-list")).toContainText(memberEmail);
+  }
+
+  // Click publish and wait for response
+  const responsePromise = page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**");
+  await page.getByTestId("publish-button").click();
+
+  const response = await responsePromise;
+  const responseData = await response.json();
+
+  // TRPC batch response is an array with one element
+  const result = responseData[0].result.data.json;
+
+  return result;
+}
+
+test.describe("Organization Creation Flows - Comprehensive Suite", () => {
+  test.afterEach(({ users, orgs }) => {
+    users.deleteAll();
+    orgs.deleteAll();
+  });
+
+  test.describe("Admin Handover Flow (Billing Disabled)", () => {
+    test("Admin creates org for existing user - handover and complete", async ({ page, users }) => {
+      // Setup: Create admin and future owner
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      const ownerEmail = users.trackEmail({
+        username: "orgowner",
+        domain: "example.com",
+      });
+      const ownerUser = await users.create({
+        username: "orgowner",
+        email: ownerEmail,
+      });
+
+      const orgName = "Test Organization";
+      const orgSlug = `test-org-${uuid()}`.toLowerCase();
+
+      // Step 1: Admin fills form
+      await page.goto("/settings/organizations/new");
+
+      await page.locator("input[name=orgOwnerEmail]").fill(ownerEmail);
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+
+      // If billing enabled, admin sees billing fields but we're testing billing disabled scenario
+      if (IS_TEAM_BILLING_ENABLED) {
+        await page.locator("input[name=seats]").fill("10");
+        await page.locator("input[name=pricePerSeat]").fill("15");
+      }
+
+      // Submit and wait for intentToCreateOrg
+      await Promise.all([
+        page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**"),
+        page.locator("button[type=submit]").click(),
+      ]);
+
+      // Step 2: Verify admin is on handover page
+      await page.waitForURL("**/settings/organizations/new/handover");
+
+      const onboardingUrlElement = page.getByTestId("onboarding-url");
+      await expect(onboardingUrlElement).toBeVisible();
+
+      const onboardingUrl = await onboardingUrlElement.textContent();
+      expect(onboardingUrl).toContain("/settings/organizations/new/resume?onboardingId=");
+
+      // Extract onboardingId from URL
+      const onboardingIdMatch = onboardingUrl?.match(/onboardingId=([\w-]+)/);
+      expect(onboardingIdMatch).toBeTruthy();
+      const onboardingId = onboardingIdMatch?.[1];
+
+      // Step 3: Switch to owner user
+      await page.context().clearCookies();
+      await ownerUser.apiLogin();
+
+      // Step 4: Owner opens resume URL and completes the onboarding wizard
+      await page.goto(`/settings/organizations/new/resume?onboardingId=${onboardingId}`);
+
+      const memberEmail = users.trackEmail({ username: "member1", domain: "example.com" });
+      const result = await completeOnboardingWizard(page, {
+        aboutText: "This is our test organization",
+        teams: ["Engineering", "Marketing"],
+        members: [memberEmail],
+      });
+
+      // Verify the organization was created successfully in the API response
+      expect(result.organizationId).toBeTruthy();
+      expect(result.name).toBe(orgName);
+      expect(result.slug).toBe(orgSlug);
+    });
+
+    test("Admin creates org for self - immediate creation", async ({ page, users }) => {
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      const orgName = "Admin Org";
+      const orgSlug = `admin-org-${uuid()}`.toLowerCase();
+
+      await page.goto("/settings/organizations/new");
+
+      // Fill form with admin's own email
+      await page.locator("input[name=orgOwnerEmail]").fill(admin.email);
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+
+      if (IS_TEAM_BILLING_ENABLED) {
+        await page.locator("input[name=seats]").fill("5");
+        await page.locator("input[name=pricePerSeat]").fill("20");
+      }
+
+      // Submit - admin creating for self goes through wizard
+      await page.locator("button[type=submit]").click();
+
+      // Admin creating for self goes through the onboarding wizard
+      const result = await completeOnboardingWizard(page, {
+        aboutText: "Admin's organization",
+        teams: ["Operations"],
+        members: [],
+      });
+
+      // Verify the organization was created successfully
+      expect(result.organizationId).toBeTruthy();
+      expect(result.name).toBe(orgName);
+      expect(result.slug).toBe(orgSlug);
+    });
+
+    test("Admin handover URL structure is correct", async ({ page, users }) => {
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      const ownerEmail = users.trackEmail({
+        username: "testowner",
+        domain: "example.com",
+      });
+      await users.create({
+        username: "testowner",
+        email: ownerEmail,
+      });
+
+      const orgName = "Handover Test";
+      const orgSlug = `handover-${uuid()}`.toLowerCase();
+
+      await page.goto("/settings/organizations/new");
+
+      await page.locator("input[name=orgOwnerEmail]").fill(ownerEmail);
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+
+      if (IS_TEAM_BILLING_ENABLED) {
+        await page.locator("input[name=seats]").fill("10");
+        await page.locator("input[name=pricePerSeat]").fill("15");
+      }
+
+      const responsePromise = page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**");
+      await page.locator("button[type=submit]").click();
+
+      // Wait for the response
+      await responsePromise;
+
+      // Wait for redirect to handover page
+      await page.waitForURL("**/settings/organizations/new/handover");
+
+      // Wait for handover page elements to be visible (with longer timeout for store to populate)
+      await expect(page.getByTestId("onboarding-url")).toBeVisible({ timeout: 10000 });
+      await expect(page.getByTestId("copy-onboarding-url")).toBeVisible();
+
+      const onboardingUrl = await page.getByTestId("onboarding-url").textContent();
+
+      // Verify URL format
+      expect(onboardingUrl).toMatch(/\/settings\/organizations\/new\/resume\?onboardingId=[\w-]+/);
+
+      // Verify copy button is clickable (toast message may vary by locale)
+      await page.getByTestId("copy-onboarding-url").click();
+    });
+  });
+
+  test.describe("Non-Admin User Flow", () => {
+    test("Regular user creates org through full wizard", async ({ page, users }) => {
+      test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
+
+      const user = await users.create({
+        username: "regularuser",
+        email: users.trackEmail({ username: "regularuser", domain: "example.com" }),
+      });
+      await user.apiLogin();
+
+      const orgName = "User Organization";
+      const orgSlug = `user-org-${uuid()}`.toLowerCase();
+
+      await page.goto("/settings/organizations/new");
+
+      // Verify user email is pre-filled and disabled
+      const emailInput = page.locator("input[name=orgOwnerEmail]");
+      await expect(emailInput).toBeDisabled();
+      await expect(emailInput).toHaveValue(user.email);
+
+      // Verify billing fields are NOT visible to regular users
+      if (IS_TEAM_BILLING_ENABLED) {
+        await expect(page.locator("input[name=seats]")).not.toBeVisible();
+        await expect(page.locator("input[name=pricePerSeat]")).not.toBeVisible();
+
+        // Verify "Upgrade to Organizations" UI is shown
+        await expect(page.getByText(/upgrade to organizations/i)).toBeVisible();
+      }
+
+      // Fill form
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+
+      await page.locator("button[type=submit]").click();
+
+      // Verify navigated to /about step
+      await page.waitForURL("**/settings/organizations/new/about");
+
+      // Complete about step
+      await page.locator('textarea[name="about"]').fill("User's organization description");
+      await page.locator("button[type=submit]").click();
+
+      // Complete add-teams step
+      await page.waitForURL("**/settings/organizations/new/add-teams");
+      await page.getByTestId("team.0.name").fill("Team Alpha");
+      await page.locator("button[type=submit]").click();
+
+      // Complete onboard-members step
+      await page.waitForURL("**/settings/organizations/new/onboard-members");
+      await Promise.all([
+        page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**"),
+        page.getByTestId("publish-button").click(),
+      ]);
+
+      // In billing enabled mode, should redirect to Stripe or payment
+      // In billing disabled mode, org created immediately
+      if (IS_TEAM_BILLING_ENABLED) {
+        // Would redirect to Stripe checkout
+        await page.waitForURL(/checkout\.stripe\.com|\/settings\/organizations/);
+      } else {
+        // After org creation, session update causes redirect to profile page
+        // Wait for it to load, then navigate to organizations
+        await page.waitForURL("**/settings/my-account/profile");
+        await page.goto("/settings/organizations");
+        await page.waitForURL(/\/settings\/organizations/);
+      }
+    });
+
+    test("Regular user - email field is disabled", async ({ page, users }) => {
+      test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
+
+      const user = await users.create({
+        username: "testuser",
+        email: users.trackEmail({ username: "testuser", domain: "company.com" }),
+      });
+      await user.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      // Verify email field state
+      const emailInput = page.locator("input[name=orgOwnerEmail]");
+      await expect(emailInput).toBeVisible();
+      await expect(emailInput).toBeDisabled();
+      await expect(emailInput).toHaveValue(user.email);
+
+      // Verify name and slug are derived from email domain
+      const nameInput = page.locator("input[name=name]");
+      const slugInput = page.locator("input[name=slug]");
+
+      // Name should be capitalized version of domain
+      const nameValue = await nameInput.inputValue();
+      expect(nameValue).toBeTruthy();
+      expect(nameValue).toMatch(/company/i);
+
+      // Slug should be domain-based
+      const slugValue = await slugInput.inputValue();
+      expect(slugValue).toBeTruthy();
+      expect(slugValue).toContain("company");
+    });
+  });
+
+  test.describe("Form Validation", () => {
+    test("Admin form - required fields validation", async ({ page, users }) => {
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      // Submit empty form
+      await page.locator("button[type=submit]").click();
+
+      // Should show validation errors
+      await expect(page.getByTestId("field-error")).toHaveCount(2); // name and slug required
+    });
+
+    test("Slug already taken shows error", async ({ page, users, orgs }) => {
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      // Create an existing org with a specific slug
+      const existingSlug = `existing-${uuid()}`.toLowerCase();
+      await orgs.create({
+        name: "Existing Org",
+        slug: existingSlug,
+      });
+
+      await page.goto("/settings/organizations/new");
+
+      const ownerEmail = users.trackEmail({ username: "owner", domain: "example.com" });
+      await users.create({ username: "owner", email: ownerEmail });
+
+      await page.locator("input[name=orgOwnerEmail]").fill(ownerEmail);
+      await page.locator("input[name=name]").fill("New Org");
+      await page.locator("input[name=slug]").fill(existingSlug);
+
+      if (IS_TEAM_BILLING_ENABLED) {
+        await page.locator("input[name=seats]").fill("5");
+        await page.locator("input[name=pricePerSeat]").fill("10");
+      }
+
+      await page.locator("button[type=submit]").click();
+
+      // Should show slug taken error
+      await expect(page.getByText(/url.*taken|already.*exists/i)).toBeVisible();
+    });
+  });
+
+  test.describe("Navigation Between Steps", () => {
+    test("User can navigate through wizard steps", async ({ page, users }) => {
+      test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
+
+      const user = await users.create({
+        username: "wizarduser",
+        email: users.trackEmail({ username: "wizarduser", domain: "example.com" }),
+      });
+      await user.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      const orgName = "Wizard Test";
+      const orgSlug = `wizard-${uuid()}`.toLowerCase();
+
+      // Step 1
+      await page.locator("input[name=name]").fill(orgName);
+      await page.locator("input[name=slug]").fill(orgSlug);
+      await page.locator("button[type=submit]").click();
+
+      // Step 2: About
+      await page.waitForURL("**/settings/organizations/new/about");
+      await page.locator('textarea[name="about"]').fill("Wizard test org");
+      await page.locator("button[type=submit]").click();
+
+      // Step 3: Add teams
+      await page.waitForURL("**/settings/organizations/new/add-teams");
+      await page.getByTestId("team.0.name").fill("Team 1");
+      await page.locator("button[type=submit]").click();
+
+      // Step 4: Onboard members
+      await page.waitForURL("**/settings/organizations/new/onboard-members");
+
+      // Verify wizard shows correct step numbers
+      // The WizardLayout component shows currentStep/maxSteps
+      // Just verify we reached the last step
+      await expect(page.getByTestId("publish-button")).toBeVisible();
+    });
+  });
+
+  test.describe("Billing Field Visibility", () => {
+    test("Admin sees billing fields when billing enabled", async ({ page, users }) => {
+      test.skip(!IS_TEAM_BILLING_ENABLED, "Billing is not enabled");
+
+      const admin = await users.create({ role: "ADMIN" });
+      await admin.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      // Verify billing fields are visible for admin
+      await expect(page.locator("input[name=seats]")).toBeVisible();
+      await expect(page.locator("input[name=pricePerSeat]")).toBeVisible();
+      await expect(page.locator("#billingPeriod")).toBeVisible();
+
+      // Verify toggle between monthly/annual
+      await expect(page.getByText("Monthly")).toBeVisible();
+      await expect(page.getByText("Annually")).toBeVisible();
+    });
+
+    test("Non-admin sees pricing UI but not billing fields", async ({ page, users }) => {
+      test.skip(!IS_TEAM_BILLING_ENABLED, "Billing is not enabled");
+      test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
+
+      const user = await users.create({
+        username: "pricinguser",
+        email: users.trackEmail({ username: "pricinguser", domain: "example.com" }),
+      });
+      await user.apiLogin();
+
+      await page.goto("/settings/organizations/new");
+
+      // Should NOT see admin billing fields
+      await expect(page.locator("input[name=seats]")).not.toBeVisible();
+      await expect(page.locator("input[name=pricePerSeat]")).not.toBeVisible();
+      await expect(page.locator("#billingPeriod")).not.toBeVisible();
+
+      // Should see upgrade/pricing UI
+      await expect(page.getByText(/upgrade to organizations/i)).toBeVisible();
+      await expect(page.getByText(/organization/i)).toBeVisible();
+    });
+  });
+});
@@ -1,475 +0,0 @@
-import type { Page } from "@playwright/test";
-import { expect } from "@playwright/test";
-import { JSDOM } from "jsdom";
-import type { Messages } from "mailhog";
-import path from "path";
-import { uuid } from "short-uuid";
-
-import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
-
-import type { createEmailsFixture } from "../fixtures/emails";
-import { test } from "../lib/fixtures";
-import { fillStripeTestCheckout } from "../lib/testUtils";
-import { getEmailsReceivedByUser } from "../lib/testUtils";
-
-async function expectEmailWithSubject(
-  page: Page,
-  emails: ReturnType<typeof createEmailsFixture>,
-  userEmail: string,
-  subject: string
-) {
-  if (!emails) return null;
-
-  // eslint-disable-next-line playwright/no-wait-for-timeout
-  await page.waitForTimeout(2000);
-  const receivedEmails = await getEmailsReceivedByUser({ emails, userEmail });
-
-  const allEmails = (receivedEmails as Messages).items;
-  const email = allEmails.find((email) => email.subject === subject);
-  if (!email) {
-    throw new Error(`Email with subject ${subject} not found`);
-  }
-  const dom = new JSDOM(email.html);
-  return dom;
-}
-
-export async function expectOrganizationCreationEmailToBeSent({
-  page,
-  emails,
-  userEmail,
-  orgSlug,
-}: {
-  page: Page;
-  emails: ReturnType<typeof createEmailsFixture>;
-  userEmail: string;
-  orgSlug: string;
-}) {
-  const dom = await expectEmailWithSubject(page, emails, userEmail, "Your organization has been created");
-  const document = dom?.window?.document;
-  expect(document?.querySelector(`[href*=${orgSlug}]`)).toBeTruthy();
-  return dom;
-}
-
-async function expectOrganizationCreationEmailToBeSentWithLinks({
-  page,
-  emails,
-  userEmail,
-  oldUsername,
-  newUsername,
-  orgSlug,
-}: {
-  page: Page;
-  emails: ReturnType<typeof createEmailsFixture>;
-  userEmail: string;
-  oldUsername: string;
-  newUsername: string;
-  orgSlug: string;
-}) {
-  const dom = await expectOrganizationCreationEmailToBeSent({
-    page,
-    emails,
-    userEmail,
-    orgSlug,
-  });
-  const document = dom?.window.document;
-  const links = document?.querySelectorAll(`[data-testid="organization-link-info"] [href]`);
-  if (!links) {
-    throw new Error(`data-testid="organization-link-info doesn't have links`);
-  }
-  expect((links[0] as unknown as HTMLAnchorElement).href).toContain(oldUsername);
-  expect((links[1] as unknown as HTMLAnchorElement).href).toContain(newUsername);
-}
-
-export async function expectEmailVerificationEmailToBeSent(
-  page: Page,
-  emails: ReturnType<typeof createEmailsFixture>,
-  userEmail: string
-) {
-  const subject = "Cal.com: Verify your account";
-  return expectEmailWithSubject(page, emails, userEmail, subject);
-}
-
-test.afterEach(({ users, orgs }) => {
-  users.deleteAll();
-  orgs.deleteAll();
-});
-
-function capitalize(text: string) {
-  if (!text) {
-    return text;
-  }
-  return text.charAt(0).toUpperCase() + text.slice(1);
-}
-
-test.describe("Organization", () => {
-  test("Admin should be able to do onboarding handover an org where an existing user is made an owner", async ({
-    page,
-    users,
-    emails,
-  }) => {
-    const appLevelAdmin = await users.create({
-      role: "ADMIN",
-    });
-    await appLevelAdmin.apiLogin();
-
-    const orgOwnerUsernamePrefix = "owner";
-
-    const orgOwnerEmail = users.trackEmail({
-      username: orgOwnerUsernamePrefix,
-      domain: `example.com`,
-    });
-
-    const orgOwnerUser = await users.create({
-      username: orgOwnerUsernamePrefix,
-      email: orgOwnerEmail,
-      role: "ADMIN",
-    });
-
-    const orgOwnerUsernameOutsideOrg = orgOwnerUser.username;
-    const orgOwnerUsernameInOrg = orgOwnerEmail.split("@")[0];
-    const orgName = capitalize(`${orgOwnerUser.username}`);
-    const orgSlug = `myOrg-${uuid()}`.toLowerCase();
-    await page.goto("/settings/organizations/new");
-
-    await test.step("Basic info", async () => {
-      // Check required fields
-      await page.locator("button[type=submit]").click();
-      await expect(page.getByTestId("field-error")).toHaveCount(2);
-
-      // Happy path
-      await fillAndSubmitFirstStepAsAdmin(page, orgOwnerEmail, orgName, orgSlug);
-    });
-
-    await test.step("Handover", async () => {
-      const onboardingUrl = await page.getByTestId("onboarding-url").textContent();
-      expect(onboardingUrl).toContain("settings/organizations/new");
-    });
-  });
-
-  test.skip("Admin should be able to create an org where the owner doesn't exist yet", async ({
-    page,
-    users,
-    emails,
-  }) => {
-    const appLevelAdmin = await users.create({
-      role: "ADMIN",
-    });
-    await appLevelAdmin.apiLogin();
-    const orgOwnerUsername = `owner`;
-    const orgName = capitalize(`${orgOwnerUsername}`);
-    const orgSlug = `myOrg-${uuid()}`.toLowerCase();
-    const orgOwnerEmail = users.trackEmail({
-      username: orgOwnerUsername,
-      domain: `example.com`,
-    });
-
-    await page.goto("/settings/organizations/new");
-
-    await test.step("Basic info", async () => {
-      // Check required fields
-      await page.locator("button[type=submit]").click();
-      await expect(page.getByTestId("field-error")).toHaveCount(2);
-
-      // Happy path
-      await fillAndSubmitFirstStepAsAdmin(page, orgOwnerEmail, orgName, orgSlug);
-    });
-
-    const dom = await expectOrganizationCreationEmailToBeSent({
-      page,
-      emails,
-      userEmail: orgOwnerEmail,
-      orgSlug,
-    });
-    expect(dom?.window.document.querySelector(`[href*=${orgSlug}]`)).toBeTruthy();
-    await expectEmailVerificationEmailToBeSent(page, emails, orgOwnerEmail);
-    // Rest of the steps remain same as org creation with existing user as owner. So skipping them
-  });
-
-  test("User can create and upgrade a org", async ({ page, users, emails }) => {
-    // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
-    const stringUUID = uuid();
-
-    const orgOwnerUsername = `owner-${stringUUID}`;
-
-    const targetOrgEmail = users.trackEmail({
-      username: orgOwnerUsername,
-      domain: `example.com`,
-    });
-    const orgOwnerUser = await users.create({
-      username: orgOwnerUsername,
-      email: targetOrgEmail,
-    });
-
-    await orgOwnerUser.apiLogin();
-    const orgName = capitalize(`${orgOwnerUsername}`);
-    await page.goto("/settings/organizations/new");
-
-    await test.step("Basic info", async () => {
-      // These values are inferred due to an existing user being signed
-      expect(await page.locator("input[name=name]").inputValue()).toBe("Example");
-      expect(await page.locator("input[name=slug]").inputValue()).toBe("example");
-
-      await page.locator("input[name=name]").fill(orgName);
-      await page.locator("input[name=slug]").fill(orgOwnerUsername);
-
-      await page.locator("button[type=submit]").click();
-    });
-
-    await test.step("About the organization", async () => {
-      // Choosing an avatar
-      await page.getByTestId("open-upload-avatar-dialog").click();
-      const fileChooserPromise = page.waitForEvent("filechooser");
-      await page.getByText("Choose a file...").click();
-      const fileChooser = await fileChooserPromise;
-      await fileChooser.setFiles(path.join(__dirname, "../../public/apple-touch-icon.png"));
-      await page.getByTestId("upload-avatar").click();
-
-      // About text
-      await page.locator('textarea[name="about"]').fill("This is a testing org");
-      await page.locator("button[type=submit]").click();
-
-      // Waiting to be in next step URL
-      await page.waitForURL("/settings/organizations/*/onboard-members");
-    });
-
-    await test.step("On-board administrators", async () => {
-      await page.waitForSelector('[data-testid="pending-member-list"]');
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(1);
-
-      const adminEmail = users.trackEmail({ username: "rick", domain: `example.com` });
-
-      //can add members
-      await page.getByTestId("new-member-button").click();
-      await page.locator('[placeholder="email\\@example\\.com"]').fill(adminEmail);
-      await page.getByTestId("invite-new-member-button").click();
-      await expect(page.getByTestId("pending-member-item").filter({ hasText: adminEmail })).toBeVisible();
-      // TODO: Check if invited admin received the invitation email
-      // await expectInvitationEmailToBeReceived(
-      //   page,
-      //   emails,
-      //   adminEmail,
-      //   `${orgName}'s admin invited you to join the organization ${orgName} on Cal.com`
-      // );
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(2);
-
-      // can remove members
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(2);
-      const lastRemoveMemberButton = page.getByTestId("remove-member-button").last();
-      await lastRemoveMemberButton.click();
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(1);
-      await page.getByTestId("publish-button").click();
-      // Waiting to be in next step URL
-      await page.waitForURL("/settings/organizations/*/add-teams");
-    });
-
-    await test.step("Create teams", async () => {
-      // Filling one team
-      await page.locator('input[name="teams.0.name"]').fill("Marketing");
-
-      // Adding another team
-      await page.getByTestId("add_a_team").click();
-      await page.locator('input[name="teams.1.name"]').fill("Sales");
-
-      // Finishing the creation wizard
-      await page.getByTestId("continue_or_checkout").click();
-    });
-
-    await test.step("Login as org owner and pay", async () => {
-      // eslint-disable-next-line playwright/no-skipped-test
-      test.skip(!IS_TEAM_BILLING_ENABLED, "Skipping paying for org as stripe is disabled");
-      await orgOwnerUser.apiLogin();
-      await page.goto("/event-types");
-      const upgradeButton = await page.getByTestId("upgrade_org_banner_button");
-
-      await expect(upgradeButton).toBeVisible();
-      await upgradeButton.click();
-      // Check that stripe checkout is present
-      const expectedUrl = "https://checkout.stripe.com";
-
-      await page.waitForURL((url) => url.href.startsWith(expectedUrl));
-      const url = page.url();
-
-      // Check that the URL matches the expected URL
-      expect(url).toContain(expectedUrl);
-
-      await fillStripeTestCheckout(page);
-
-      const upgradeButtonHidden = await page.getByTestId("upgrade_org_banner_button");
-
-      await expect(upgradeButtonHidden).toBeHidden();
-    });
-  });
-
-  test("User gets prompted with >=3 teams to upgrade & can transfer existing teams to org", async ({
-    page,
-    users,
-  }) => {
-    // eslint-disable-next-line playwright/no-skipped-test
-    test.skip(process.env.NEXT_PUBLIC_ORG_SELF_SERVE_ENABLED !== "1", "Org self serve is not enabled");
-    const numberOfTeams = 3;
-    const stringUUID = uuid();
-
-    const orgOwnerUsername = `owner-${stringUUID}`;
-
-    const targetOrgEmail = users.trackEmail({
-      username: orgOwnerUsername,
-      domain: `example.com`,
-    });
-    const orgOwnerUser = await users.create(
-      {
-        username: orgOwnerUsername,
-        email: targetOrgEmail,
-      },
-      { hasTeam: true, numberOfTeams }
-    );
-
-    await orgOwnerUser.apiLogin();
-
-    await page.goto("/teams");
-
-    await test.step("Has org self serve banner", async () => {
-      // These values are inferred due to an existing user being signed
-      const selfServeButtonLocator = await page.getByTestId("setup_your_org_action_button");
-      await expect(selfServeButtonLocator).toBeVisible();
-
-      await selfServeButtonLocator.click();
-      await page.waitForURL("/settings/organizations/new");
-    });
-
-    await test.step("Basic info", async () => {
-      // These values are inferred due to an existing user being signed
-      const slugLocator = await page.locator("input[name=slug]");
-      expect(await page.locator("input[name=name]").inputValue()).toBe("Example");
-      expect(await slugLocator.inputValue()).toBe("example");
-
-      await slugLocator.fill(`example-${stringUUID}`);
-
-      await page.locator("button[type=submit]").click();
-    });
-
-    await test.step("About the organization", async () => {
-      // Choosing an avatar
-      await page.getByTestId("open-upload-avatar-dialog").click();
-      const fileChooserPromise = page.waitForEvent("filechooser");
-      await page.getByText("Choose a file...").click();
-      const fileChooser = await fileChooserPromise;
-      await fileChooser.setFiles(path.join(__dirname, "../../public/apple-touch-icon.png"));
-      await page.getByTestId("upload-avatar").click();
-
-      // About text
-      await page.locator('textarea[name="about"]').fill("This is a testing org");
-      await page.locator("button[type=submit]").click();
-
-      // Waiting to be in next step URL
-      await page.waitForURL("/settings/organizations/*/onboard-members");
-    });
-
-    await test.step("On-board administrators", async () => {
-      await page.waitForSelector('[data-testid="pending-member-list"]');
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(1);
-
-      const adminEmail = users.trackEmail({ username: "rick", domain: `example.com` });
-
-      //can add members
-      await page.getByTestId("new-member-button").click();
-      await page.locator('[placeholder="email\\@example\\.com"]').fill(adminEmail);
-      await page.getByTestId("invite-new-member-button").click();
-      await expect(page.getByTestId("pending-member-item").filter({ hasText: adminEmail })).toBeVisible();
-      // TODO: Check if invited admin received the invitation email
-      // await expectInvitationEmailToBeReceived(
-      //   page,
-      //   emails,
-      //   adminEmail,
-      //   `${orgName}'s admin invited you to join the organization ${orgName} on Cal.com`
-      // );
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(2);
-
-      // can remove members
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(2);
-      const lastRemoveMemberButton = page.getByTestId("remove-member-button").last();
-      await lastRemoveMemberButton.click();
-      await expect(page.getByTestId("pending-member-item")).toHaveCount(1);
-      await page.getByTestId("publish-button").click();
-      // Waiting to be in next step URL
-      await page.waitForURL("/settings/organizations/*/add-teams");
-    });
-
-    await test.step("Move existing teams to org", async () => {
-      // No easy way to get all team checkboxes so we fill all checkboxes on the page in
-      const foundCheckboxes = page.locator('input[type="checkbox"]');
-      const count = await foundCheckboxes.count();
-      for (let i = 0; i < count; i++) {
-        const checkbox = foundCheckboxes.nth(i);
-        await checkbox.click();
-      }
-    });
-
-    await test.step("Create teams", async () => {
-      // Filling one team
-      await page.locator('input[name="teams.0.name"]').fill("Marketing");
-
-      // Adding another team
-      await page.getByTestId("new-team-dialog-button").click();
-      await page.locator('input[name="teams.1.name"]').fill("Sales");
-
-      // Finishing the creation wizard
-      await page.getByTestId("continue_or_checkout").click();
-    });
-
-    await test.step("Login as org owner and pay", async () => {
-      // eslint-disable-next-line playwright/no-skipped-test
-      test.skip(!IS_TEAM_BILLING_ENABLED, "Skipping paying for org as stripe is disabled");
-      await orgOwnerUser.apiLogin();
-      await page.goto("/event-types");
-      const upgradeButton = await page.getByTestId("upgrade_org_banner_button");
-
-      await expect(upgradeButton).toBeVisible();
-      await upgradeButton.click();
-      // Check that stripe checkout is present
-      const expectedUrl = "https://checkout.stripe.com";
-
-      await page.waitForURL((url) => url.href.startsWith(expectedUrl));
-      const url = page.url();
-
-      // Check that the URL matches the expected URL
-      expect(url).toContain(expectedUrl);
-
-      await fillStripeTestCheckout(page);
-
-      const upgradeButtonHidden = await page.getByTestId("upgrade_org_banner_button");
-
-      await expect(upgradeButtonHidden).toBeHidden();
-    });
-
-    await test.step("Ensure correctnumberOfTeams are migrated", async () => {
-      // eslint-disable-next-line playwright/no-skipped-test
-      await page.goto("/teams");
-      const teamListItems = await page.getByTestId("team-list-item-link").all();
-
-      // Number of teams migrated + the two created in the create teams step
-      expect(teamListItems.length).toBe(numberOfTeams + 2);
-    });
-  });
-});
-
-async function fillAndSubmitFirstStepAsAdmin(
-  page: Page,
-  targetOrgEmail: string,
-  orgName: string,
-  orgSlug: string
-) {
-  await page.locator("input[name=orgOwnerEmail]").fill(targetOrgEmail);
-  // Since we are admin fill in this information instead of deriving it
-  await page.locator("input[name=name]").fill(orgName);
-  await page.locator("input[name=slug]").fill(orgSlug);
-
-  // Fill in seat information
-  await page.locator("input[name=seats]").fill("30");
-  await page.locator("input[name=pricePerSeat]").fill("30");
-
-  await Promise.all([
-    page.waitForResponse("**/api/trpc/organizations/intentToCreateOrg**"),
-    page.locator("button[type=submit]").click(),
-  ]);
-}
@@ -653,11 +653,12 @@ test.describe("Out of office", () => {
    test("Default date range filter set to `Last 7 Days`", async ({ page, users }) => {
      const user = await users.create({ name: `userOne=${Date.now()}` });
      await user.apiLogin();
-      await page.goto("/settings/my-account/out-of-office");
-      await page.waitForLoadState("domcontentloaded");
-      await page.waitForResponse(
+      const responsePromise = page.waitForResponse(
        (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
      );
+      await page.goto("/settings/my-account/out-of-office");
+      await page.waitForLoadState("domcontentloaded");
+      await responsePromise;
      await addFilter(page, "dateRange");
      await expect(
        page.locator('[data-testid="filter-popover-trigger-dateRange"]', { hasText: "Last 7 Days" }).first()
@@ -667,11 +668,12 @@ test.describe("Out of office", () => {
    test("Can choose date range presets", async ({ page, users }) => {
      const user = await users.create({ name: `userOne=${Date.now()}` });
      await user.apiLogin();
-      await page.goto("/settings/my-account/out-of-office");
-      await page.waitForLoadState("domcontentloaded");
-      await page.waitForResponse(
+      const responsePromise = page.waitForResponse(
        (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
      );
+      await page.goto("/settings/my-account/out-of-office");
+      await page.waitForLoadState("domcontentloaded");
+      await responsePromise;
      await addFilter(page, "dateRange");

      await expect(page.locator('[data-testid="date-range-options-tdy"]')).toBeVisible(); //Today
@@ -1,6 +1,7 @@
 import { expect } from "@playwright/test";

 import prisma from "@calcom/prisma";
+import type { Page } from "@playwright/test";

 import { test } from "./lib/fixtures";
 import { selectFirstAvailableTimeSlotNextMonth, submitAndWaitForResponse } from "./lib/testUtils";
@@ -8,6 +9,11 @@ import { selectFirstAvailableTimeSlotNextMonth, submitAndWaitForResponse } from
 test.describe.configure({ mode: "parallel" });
 test.afterEach(({ users }) => users.deleteAll());

+async function goToAppsTab(page: Page, eventTypeId?: number) {
+  await page.goto(`event-types/${eventTypeId}?tabName=apps`);
+  await expect(page.getByTestId("vertical-tab-apps")).toHaveAttribute("aria-current", "page");
+}
+
 test.describe("Payment app", () => {
  test("Should be able to edit alby price, currency", async ({ page, users }) => {
    const user = await users.create();
@@ -29,7 +35,7 @@ test.describe("Payment app", () => {
      },
    });

-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);

    await page.locator("#event-type-form").getByRole("switch").click();
    await page.getByPlaceholder("Price").click();
@@ -75,7 +81,7 @@ test.describe("Payment app", () => {
      },
    });

-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);
    await page.locator("#event-type-form").getByRole("switch").click();
    await page.getByTestId("stripe-currency-select").click();
    await page.getByTestId("select-option-usd").click();
@@ -115,7 +121,7 @@ test.describe("Payment app", () => {
      },
    });

-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);

    await page.locator("#event-type-form").getByRole("switch").click();

@@ -158,7 +164,7 @@ test.describe("Payment app", () => {
      },
    });

-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);

    await page.locator("#event-type-form").getByRole("switch").click();

@@ -185,7 +191,7 @@ test.describe("Payment app", () => {
      },
    });

-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);

    await page.locator("#event-type-form").getByRole("switch").click();

@@ -220,7 +226,7 @@ test.describe("Payment app", () => {
      },
    });

-    await page.goto(`event-types/${paymentEvent?.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);

    await page.locator("#event-type-form").getByRole("switch").click();
    // make sure Tracking ID is displayed
@@ -267,7 +273,7 @@ test.describe("Payment app", () => {
      ],
    });

-    await page.goto(`event-types/${paymentEvent.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);

    await page.locator("[data-testid='paypal-app-switch']").click();
    await page.locator("[data-testid='stripe-app-switch']").isDisabled();
@@ -314,7 +320,7 @@ test.describe("Payment app", () => {
      ],
    });

-    await page.goto(`event-types/${paymentEvent.id}?tabName=apps`);
+    await goToAppsTab(page, paymentEvent?.id);

    await page.getByTestId("paypal-app-switch").click();
    await page.getByTestId("paypal-price-input").fill("100");
@@ -1460,6 +1460,7 @@
  "email_host_action": "send email to host",
  "email_attendee_action": "send email to attendees",
  "email_attendee_action_form": "Send email to submitted email address",
+  "sms_attendee_action_form": "Send SMS to submitted phone number",
  "sms_attendee_action": "Send SMS to attendee",
  "sms_number_action": "send SMS to a specific number",
  "send_reminder_sms": "Easily send meeting reminders via SMS to your attendees",
@@ -1893,7 +1894,7 @@
  "only_show_first_available_slot_description": "This will limit your availability for this event type to one slot per day, scheduled at the earliest available time.",
  "limit_total_booking_duration": "Limit total booking duration",
  "limit_total_booking_duration_description": "Limit total amount of time that this event can be booked",
-  "booker_booking_limit": "Booker active booking limit",
+  "booker_upcoming_limit": "Limit number of upcoming bookings per booker",
  "booker_booking_limit_description": "Limit the number of active bookings a booker can make for this event type",
  "recurring_event_doesnt_support_booker_booking_limit": "Recurring events don't support booker booking limit",
  "add_limit": "Add Limit",
@@ -3299,6 +3300,12 @@
  "organization_onboarding_already_completed": "Organization onboarding already completed",
  "organization_onboarding_already_exists": "Organization onboarding already exists",
  "organization_onboarding_not_found": "Organization onboarding not found",
+  "no_onboarding_id_provided": "No onboarding ID provided",
+  "onboarding_not_found": "Onboarding not found",
+  "onboarding_already_complete": "Onboarding already complete",
+  "onboarding_already_complete_description": "This onboarding has already been completed. You can view your organization in settings.",
+  "resume_onboarding": "Resume Onboarding",
+  "resume_onboarding_description": "Continue with your organization onboarding process",
  "payment_successful": "Payment successful!",
  "handover_onboarding_page_title": "Handover onboarding",
  "handover_onboarding_page_description": "Handover onboarding to the user",
@@ -3630,8 +3637,8 @@
  "error_downloading_expense_log": "Error downloading expense log",
  "require_booker_email_verification": "Prevent Impersonation on Bookings",
  "require_booker_email_verification_description": "When enabled, anyone trying to book events using your email address must verify they own it via a one time code or be logged in to prevent impersonation",
-  "offer_to_reschedule_last_booking": "Offer to reschedule last active booking to chosen time slot",
-  "booker_limit_exceeded_error": "Booker maximum active booking limit exceeded",
+  "reschedule_last_booking_offer": "Offer to reschedule the last booking to the new time slot",
+  "booker_upcoming_limit_reached": "You've reached the limit of {{count}} upcoming bookings for this event type",
  "booker_limit_exceeded_error_reschedule": "You already have a booking for this event on {{date}}. Would you like to reschedule to the new selected time?",
  "duration_min_error": "Duration must be at least {{min}} minute(s)",
  "duration_max_error": "Duration cannot exceed {{max}} minutes (24 hours)",
@@ -4,14 +4,15 @@ import { encode } from "querystring";
 import type { z } from "zod";

 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { getEventTypesPublic } from "@calcom/features/eventtypes/lib/getEventTypesPublic";
-import { DEFAULT_DARK_BRAND_COLOR, DEFAULT_LIGHT_BRAND_COLOR } from "@calcom/lib/constants";
 import { getUsernameList } from "@calcom/features/eventtypes/lib/defaultEvents";
+import { getEventTypesPublic } from "@calcom/features/eventtypes/lib/getEventTypesPublic";
+import { getBrandingForUser } from "@calcom/features/profile/lib/getBranding";
+import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
+import { DEFAULT_DARK_BRAND_COLOR, DEFAULT_LIGHT_BRAND_COLOR } from "@calcom/lib/constants";
 import { getUserAvatarUrl } from "@calcom/lib/getAvatarUrl";
 import logger from "@calcom/lib/logger";
 import { markdownToSafeHTML } from "@calcom/lib/markdownToSafeHTML";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { stripMarkdown } from "@calcom/lib/stripMarkdown";
 import { prisma } from "@calcom/prisma";
 import type { EventType, User } from "@calcom/prisma/client";
@@ -33,6 +34,9 @@ type UserPageProps = {
      requestedSlug: string | null;
      slug: string | null;
      id: number | null;
+      brandColor: string | null;
+      darkBrandColor: string | null;
+      theme: string | null;
    } | null;
    allowSEOIndexing: boolean;
    username: string | null;
@@ -130,15 +134,18 @@ export const getServerSideProps: GetServerSideProps<UserPageProps> = async (cont

  const [user] = usersInOrgContext; //to be used when dealing with single user, not dynamic group

+  const branding = getBrandingForUser({ user });
+
  const profile = {
    name: user.name || user.username || "",
    image: getUserAvatarUrl({
      avatarUrl: user.avatarUrl,
    }),
-    theme: user.theme,
-    brandColor: user.brandColor ?? DEFAULT_LIGHT_BRAND_COLOR,
+    theme: branding.theme,
+    brandColor: branding.brandColor ?? DEFAULT_LIGHT_BRAND_COLOR,
    avatarUrl: user.avatarUrl,
-    darkBrandColor: user.darkBrandColor ?? DEFAULT_DARK_BRAND_COLOR,
+    darkBrandColor:
+      branding.darkBrandColor ?? DEFAULT_DARK_BRAND_COLOR,
    allowSEOIndexing: user.allowSEOIndexing ?? true,
    username: user.username,
    organization: user.profile.organization,
@@ -1,9 +1,6 @@
 import { createMocks } from "node-mocks-http";

-import type {
-  CustomNextApiRequest,
-  CustomNextApiResponse,
-} from "@calcom/features/bookings/lib/handleNewBooking/test/fresh-booking.test";
+import type { CustomNextApiRequest, CustomNextApiResponse } from "./types";

 export function createMockNextJsRequest(...args: Parameters<typeof createMocks>) {
  return createMocks<CustomNextApiRequest, CustomNextApiResponse>(...args);
@@ -0,0 +1,6 @@
+import type { Request, Response } from "express";
+import type { NextApiRequest, NextApiResponse } from "next";
+
+export type CustomNextApiRequest = NextApiRequest & Request;
+
+export type CustomNextApiResponse = NextApiResponse & Response;
@@ -17241,6 +17241,20 @@
        },
        "required": ["type", "slug", "label", "required", "placeholder", "hidden", "isDefault"]
      },
+      "BookerActiveBookingsLimitOutput_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "maximumActiveBookings": {
+            "type": "number",
+            "description": "The maximum number of active bookings a booker can have for this event type.",
+            "example": 3
+          },
+          "offerReschedule": {
+            "type": "boolean",
+            "description": "Whether to offer rescheduling the last active booking to the chosen time slot when limit is reached."
+          }
+        }
+      },
      "EventTypeOutput_2024_06_14": {
        "type": "object",
        "properties": {
@@ -17428,7 +17442,7 @@
            "type": "object"
          },
          "bookerActiveBookingsLimit": {
-            "$ref": "#/components/schemas/BookerActiveBookingsLimit_2024_06_14"
+            "$ref": "#/components/schemas/BookerActiveBookingsLimitOutput_2024_06_14"
          },
          "onlyShowFirstAvailableSlot": {
            "type": "boolean"
@@ -19729,7 +19743,7 @@
            "type": "object"
          },
          "bookerActiveBookingsLimit": {
-            "$ref": "#/components/schemas/BookerActiveBookingsLimit_2024_06_14"
+            "$ref": "#/components/schemas/BookerActiveBookingsLimitOutput_2024_06_14"
          },
          "onlyShowFirstAvailableSlot": {
            "type": "boolean"
@@ -140,6 +140,7 @@
        "self-hosting/deployments/azure",
        "self-hosting/deployments/elestio",
        "self-hosting/deployments/gcp",
+        "self-hosting/deployments/northflank",
        "self-hosting/deployments/railway",
        "self-hosting/deployments/render",
        "self-hosting/deployments/vercel"
@@ -209,18 +210,19 @@
          "group": "Atoms",
          "icon": "atom",
          "pages": [
-            "platform/atoms/cal-provider",
-            "platform/atoms/google-calendar-connect",
-            "platform/atoms/outlook-calendar-connect",
            "platform/atoms/apple-calendar-connect",
            "platform/atoms/availability-settings",
            "platform/atoms/booker",
-            "platform/atoms/event-type",
+            "platform/atoms/cal-provider",
            "platform/atoms/calendar-settings",
-            "platform/atoms/payment-form",
-            "platform/atoms/conferencing-apps",
            "platform/atoms/calendar-view",
-            "platform/atoms/create-schedule"
+            "platform/atoms/conferencing-apps",
+            "platform/atoms/create-schedule",
+            "platform/atoms/event-type",
+            "platform/atoms/google-calendar-connect",
+            "platform/atoms/list-schedules",
+            "platform/atoms/outlook-calendar-connect",
+            "platform/atoms/payment-form"
          ]
        },
        {
@@ -0,0 +1,116 @@
+---
+title: "List schedules"
+---
+
+The List schedules atom displays all of a user's availability schedules and provides management actions such as delete, duplicate, and edit capabilities for each schedule.
+
+Below code snippet can be used to render the List schedules atom
+
+```js
+import { ListSchedules } from "@calcom/atoms";
+
+export default function ListSchedules() {
+  return (
+    <>
+      <ListSchedules getRedirectUrl={(scheduleId) => `/availability/${scheduleId}`} />
+    </>
+  );
+}
+```
+
+For a demonstration of the List schedules atom, please refer to the video below.
+
+<p></p>
+
+    <iframe
+      height="315"
+      style={{ width: "100%", maxWidth: "560px" }}
+      src="https://www.loom.com/embed/8e020a4848d543548c519d3a7cd532c6?sid=e6ccad23-8372-402a-8fd3-c0180bc9113c"
+      frameborder="0"
+      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+      allowfullscreen="true"
+    ></iframe>
+
+<p></p>
+
+Below is a list of props that can be passed to the List schedules atom.
+
+<p></p>
+
+| Name           | Required | Description                                                                                                       |
+| :------------- | :------- | :---------------------------------------------------------------------------------------------------------------- |
+| getRedirectUrl | No       | Callback function that determines where the user should be redirected when they click on a schedule from the atom |
+
+## Combining list schedules atom with availability settings atom
+
+The List schedules atom works best when combined with the Availability settings atom to provide a seamless experience. In order to combine both of atom, here are the steps we recommend:
+
+<Steps>
+    <Step title="Setup list schedules atom"> 
+    Create a page for demostrating the list schedules atom.
+
+    Below code snippet can be used to setup the list schedules atom on a new page
+
+```js
+import { ListSchedules } from "@calcom/atoms";
+
+export default function ListSchedules() {
+  return (
+    <>
+      <ListSchedules getRedirectUrl={(scheduleId) => `/availability/${scheduleId}`} />
+    </>
+  );
+}
+```
+
+`getRedirectUrl` prop is a callback function that determines where the user should be redirected when they click on a schedule from the atom. Say if you want to display your availability settings atom on the page `/availability/:scheduleId`, you need to make sure you return the exact same url when you call the `getRedirectUrl` function.
+
+    </Step>
+    <Step title="Setup availability settings atom">
+    Create a page for demonstrating the availability settings atom. This should be a dynamic route that accepts a schedule id as a query parameter, and then the schedule id gets passed to the availability settings atom.
+
+      Below code snippet can be used to obtain the `scheduleId` and display the availability settings atom
+
+```js
+import { AvailabilitySettings } from "@calcom/atoms";
+import { useRouter } from "next/router";
+
+export default function Availability() {
+  const router = useRouter();
+
+  return (
+    <>
+       <AvailabilitySettings
+          id={router.query.scheduleId as string}
+          onUpdateSuccess={() => {
+            console.log("Updated schedule successfully");
+          }}
+       />
+    </>
+  )
+}
+```
+
+    </Step>
+
+</Steps>
+
+-Below video shows a demonstration of how we combined the list schedules atom and availability settings atom in one of our example app to create a seamless availability management experience.
+
+<p></p>
+
+    <iframe
+      height="315"
+      style={{ width: "100%", maxWidth: "560px" }}
+      src="https://www.loom.com/embed/76b65330e61e47eb95b7072ed3a42ec8?sid=9373ec6f-ba55-431e-98de-5dd3fb252a8a"
+      frameborder="0"
+      allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture"
+      allowfullscreen="true"
+    ></iframe>
+
+<p></p>
+
+<Info>
+  Link to the example app can be found
+  [here](https://github.com/calcom/cal.com/tree/main/packages/platform/examples/base)
+</Info>
@@ -0,0 +1,13 @@
+---
+title: "Northflank"
+icon: "square-n"
+---
+
+You can deploy Cal.com on Northflank using the button below. 
+The team at Northflank also have a [detailed blog post](https://northflank.com/guides/deploy-calcom-with-northflank) on deploying Cal.com on their platform.
+
+## One Click Deployment
+
+<a href="https://northflank.com/stacks/deploy-calcom" target="_blank">
+<img src="/images/deploy-northflank.svg" noZoom alt="Deploy on Northflank" />
+</a>
@@ -1,6 +1,6 @@
 {
  "name": "calcom-monorepo",
-  "version": "0.0.0",
+  "version": "5.8.2",
  "private": true,
  "workspaces": [
    "apps/*",
@@ -1,5 +1,5 @@
 import { HttpError } from "@calcom/lib/http-error";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { UserProfile } from "@calcom/types/UserProfile";
@@ -1,6 +1,6 @@
 import { isInMemoryDelegationCredential } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import type { CredentialForCalendarService } from "@calcom/types/Credential";

 import { getTokenObjectFromCredential } from "./getTokenObjectFromCredential";
@@ -1,7 +1,7 @@
 import type z from "zod";

 import logger from "@calcom/lib/logger";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";

@@ -2,7 +2,7 @@ import type { GetServerSidePropsContext } from "next";
 import { z } from "zod";

 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";

 import { btcpayCredentialKeysSchema } from "../../lib/btcpayCredentialKeysSchema";

@@ -4,8 +4,8 @@ import { describe, it, expect, beforeEach, vi } from "vitest";

 import { metadata as googleCalendarMetadata } from "@calcom/app-store/googlecalendar/_metadata";
 import { metadata as googleMeetMetadata } from "@calcom/app-store/googlevideo/_metadata";
-import type { ServiceAccountKey } from "@calcom/lib/server/repository/delegationCredential";
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
+import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 import { OrganizationRepository } from "@calcom/features/ee/organizations/repositories/OrganizationRepository";
 import { SMSLockState, RRTimestampBasis } from "@calcom/prisma/enums";
 import type { CredentialForCalendarService, CredentialPayload } from "@calcom/types/Credential";
@@ -28,7 +28,7 @@ vi.mock("@calcom/features/ee/organizations/repositories/OrganizationRepository",
 }));

 // Mock DelegationCredentialRepository
-vi.mock("@calcom/lib/server/repository/delegationCredential", () => ({
+vi.mock("@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository", () => ({
  DelegationCredentialRepository: {
    findUniqueByOrgMemberEmailIncludeSensitiveServiceAccountKey: vi.fn(),
    findUniqueByOrganizationIdAndDomainIncludeSensitiveServiceAccountKey: vi.fn(),
@@ -10,9 +10,9 @@ import {
 } from "@calcom/lib/delegationCredential";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
-import type { ServiceAccountKey } from "@calcom/lib/server/repository/delegationCredential";
-import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
+import type { ServiceAccountKey } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
+import { DelegationCredentialRepository } from "@calcom/features/delegation-credentials/repositories/DelegationCredentialRepository";
 import { UserRepository } from "@calcom/features/users/repositories/UserRepository";
 import { prisma } from "@calcom/prisma";
 import type { SelectedCalendar } from "@calcom/prisma/client";
@@ -1,7 +1,7 @@
 import { Dub } from "dub-package";

 import logger from "@calcom/lib/logger";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import type { AnalyticsService, SendEventProps } from "@calcom/types/AnalyticsService";
 import type { CredentialPayload } from "@calcom/types/Credential";

@@ -14,7 +14,7 @@ import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultHandler } from "@calcom/lib/server/defaultHandler";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import { Prisma } from "@calcom/prisma/client";

 import getInstalledAppPath from "../../_utils/getInstalledAppPath";
@@ -7,8 +7,8 @@ import type {
  SimplePublicObjectInput,
 } from "@hubspot/api-client/lib/codegen/crm/objects/meetings";

-import getLabelValueMapFromResponses from "@calcom/features/bookings/lib/getLabelValueMapFromResponses";
 import { getLocation } from "@calcom/lib/CalEventParser";
+import getLabelValueMapFromResponses from "@calcom/lib/bookings/getLabelValueMapFromResponses";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
@@ -21,10 +21,6 @@ import getAppKeysFromSlug from "../../_utils/getAppKeysFromSlug";
 import refreshOAuthTokens from "../../_utils/oauth/refreshOAuthTokens";
 import type { HubspotToken } from "../api/callback";

-interface CustomPublicObjectInput extends SimplePublicObjectInput {
-  id?: string;
-}
-
 export default class HubspotCalendarService implements CRM {
  private url = "";
  private integrationName = "";
@@ -117,8 +113,14 @@ export default class HubspotCalendarService implements CRM {
    return this.hubspotClient.crm.objects.meetings.basicApi.update(uid, simplePublicObjectInput);
  };

-  private hubspotDeleteMeeting = async (uid: string) => {
-    return this.hubspotClient.crm.objects.meetings.basicApi.archive(uid);
+  private hubspotCancelMeeting = async (uid: string) => {
+    const simplePublicObjectInput: SimplePublicObjectInput = {
+      properties: {
+        hs_meeting_outcome: "CANCELED",
+      },
+    };
+
+    return this.hubspotClient.crm.objects.meetings.basicApi.update(uid, simplePublicObjectInput);
  };

  private hubspotAuth = async (credential: CredentialPayload) => {
@@ -204,7 +206,6 @@ export default class HubspotCalendarService implements CRM {
    return await this.handleMeetingCreation(event, contacts);
  }

-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  async updateEvent(uid: string, event: CalendarEvent): Promise<any> {
    const auth = await this.auth;
    await auth.getToken();
@@ -214,7 +215,7 @@ export default class HubspotCalendarService implements CRM {
  async deleteEvent(uid: string): Promise<void> {
    const auth = await this.auth;
    await auth.getToken();
-    return await this.hubspotDeleteMeeting(uid);
+    await this.hubspotCancelMeeting(uid);
  }

  async getContacts({ emails }: { emails: string | string[] }): Promise<Contact[]> {
@@ -1,8 +1,11 @@
 import type { NextApiRequest, NextApiResponse } from "next";
 import { getSession } from "next-auth/react";

+import {
+  entityPrismaWhereClause,
+  canEditEntity,
+} from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import { sanitizeValue } from "@calcom/lib/csvUtils";
-import { entityPrismaWhereClause, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";
 import prisma from "@calcom/prisma";
 import type { App_RoutingForms_Form } from "@calcom/prisma/client";

@@ -3,9 +3,9 @@ import { prisma } from "@calcom/prisma/__mocks__/prisma";

 import { describe, it, vi, expect, beforeEach, afterEach } from "vitest";

+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import { sendGenericWebhookPayload } from "@calcom/features/webhooks/lib/sendPayload";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
 import {
  WebhookTriggerEvents,
  WorkflowTriggerEvents,
@@ -37,7 +37,7 @@ vi.mock("@calcom/features/tasker", () => {
 });

 // Mock workflow dependencies
-vi.mock("@calcom/lib/server/service/workflows", () => ({
+vi.mock("@calcom/features/ee/workflows/lib/service/WorkflowService", () => ({
  WorkflowService: {
    getAllWorkflowsFromRoutingForm: vi.fn(() => Promise.resolve([])),
    scheduleFormWorkflows: vi.fn(() => Promise.resolve()),
@@ -6,7 +6,7 @@ import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { HttpError } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { withReporting } from "@calcom/lib/sentryWrapper";
-import { WorkflowService } from "@calcom/lib/server/service/workflows";
+import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import { prisma } from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 import type { App_RoutingForms_Form, User } from "@calcom/prisma/client";
@@ -1,6 +1,6 @@
 import type { z } from "zod";

-import { entityPrismaWhereClause } from "@calcom/lib/entityPermissionUtils.server";
+import { entityPrismaWhereClause } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
 import type { App_RoutingForms_Form } from "@calcom/prisma/client";
@@ -1,4 +1,4 @@
-import { canCreateEntity, canEditEntity } from "@calcom/lib/entityPermissionUtils.server";
+import { canCreateEntity, canEditEntity } from "@calcom/features/pbac/lib/entityPermissionUtils.server";
 import prisma from "@calcom/prisma";
 import type { App_RoutingForms_Form, User } from "@calcom/prisma/client";

@@ -1,4 +1,4 @@
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";
 import logger from "@calcom/lib/logger";

 import { routingFormIncompleteBookingDataSchema } from "../../zod";
@@ -1,4 +1,4 @@
-import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { CredentialRepository } from "@calcom/features/credentials/repositories/CredentialRepository";

 import type { AttributeRoutingConfig } from "../../routing-forms/types/types";
 import SalesforceCRMService from "./CrmService";
@@ -4,7 +4,7 @@ import { describe, it, expect, vi, beforeEach } from "vitest";

 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { WEBAPP_URL } from "@calcom/lib/constants";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import { MembershipRole } from "@calcom/prisma/enums";

 import {
@@ -18,7 +18,7 @@ import { validateAuthentication, buildReturnUrl } from "../portal";

 // Mock dependencies
 vi.mock("@calcom/features/pbac/services/permission-check.service");
-vi.mock("@calcom/lib/server/repository/team");
+vi.mock("@calcom/features/ee/teams/repositories/TeamRepository");
 vi.mock("../../lib/customer");
 vi.mock("../../lib/server");
 vi.mock("../../lib/subscriptions");
@@ -4,7 +4,7 @@ import { PermissionCheckService } from "@calcom/features/pbac/services/permissio
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { getSafeRedirectUrl } from "@calcom/lib/getSafeRedirectUrl";
 import logger from "@calcom/lib/logger";
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import prisma from "@calcom/prisma";

 import stripe from "../../server";
@@ -1,4 +1,4 @@
-import { TeamRepository } from "@calcom/lib/server/repository/team";
+import { TeamRepository } from "@calcom/features/ee/teams/repositories/TeamRepository";
 import prisma from "@calcom/prisma";

 import type { BillingPortalService } from "../base/BillingPortalService";
@@ -0,0 +1,12 @@
+import type { TFunction } from "i18next";
+
+export interface IBookingRedirect {
+  language: TFunction;
+  fromEmail: string;
+  eventOwner: string;
+  toEmail: string;
+  toName: string;
+  oldDates?: string;
+  dates: string;
+  action: "add" | "update" | "cancel";
+}
@@ -0,0 +1,23 @@
+import type { TFunction } from "i18next";
+
+export type OrganizationCreation = {
+  language: TFunction;
+  from: string;
+  to: string;
+  ownerNewUsername: string;
+  ownerOldUsername: string | null;
+  orgDomain: string;
+  orgName: string;
+  prevLink: string | null;
+  newLink: string;
+};
+
+export type EmailVerifyCode = {
+  language: TFunction;
+  user: {
+    name?: string | null;
+    email: string;
+  };
+  verificationEmailCode: string;
+  isVerifyingEmail?: boolean;
+};
@@ -0,0 +1,26 @@
+import dayjs from "@calcom/dayjs";
+import { TimeFormat } from "@calcom/lib/timeFormat";
+import type { CalendarEvent, Person } from "@calcom/types/Calendar";
+
+export function getFormattedDate(calEvent: CalendarEvent, attendee: Person): string {
+  const inviteeTimeFormat = calEvent.organizer.timeFormat || TimeFormat.TWELVE_HOUR;
+  const timezone = attendee.timeZone;
+  const locale = attendee.language.locale;
+  const t = attendee.language.translate;
+
+  const getFormattedRecipientTime = (time: string, format: string) => {
+    return dayjs(time).tz(timezone).locale(locale).format(format);
+  };
+
+  const getInviteeStart = (format: string) => {
+    return getFormattedRecipientTime(calEvent.startTime, format);
+  };
+
+  const getInviteeEnd = (format: string) => {
+    return getFormattedRecipientTime(calEvent.endTime, format);
+  };
+
+  return `${getInviteeStart(inviteeTimeFormat)} - ${getInviteeEnd(inviteeTimeFormat)}, ${t(
+    getInviteeStart("dddd").toLowerCase()
+  )}, ${t(getInviteeStart("MMMM").toLowerCase())} ${getInviteeStart("D, YYYY")}`;
+}
@@ -0,0 +1,59 @@
+import type { TFunction } from "i18next";
+
+import { APP_NAME } from "@calcom/lib/constants";
+
+export type TeamInvite = {
+  language: TFunction;
+  from: string;
+  to: string;
+  teamName: string;
+  joinLink: string;
+  isCalcomMember: boolean;
+  /**
+   * We ideally should have a separate email for auto-join(when a user is automatically accepted into a team/org), but we don't have one yet.
+   */
+  isAutoJoin: boolean;
+  isOrg: boolean;
+  parentTeamName: string | undefined;
+  isExistingUserMovedToOrg: boolean;
+  prevLink: string | null;
+  newLink: string | null;
+};
+
+export function getTypeOfInvite(teamInviteEvent: TeamInvite) {
+  if (teamInviteEvent.isOrg) {
+    return "TO_ORG";
+  }
+
+  if (teamInviteEvent.parentTeamName) {
+    return "TO_SUBTEAM";
+  }
+
+  if (teamInviteEvent.isAutoJoin) {
+    throw new Error("Auto-join is not supported for regular teams");
+  }
+
+  return "TO_REGULAR_TEAM";
+}
+
+export const getSubject = (teamInviteEvent: TeamInvite) => {
+  const typeOfInvite = getTypeOfInvite(teamInviteEvent);
+  const type = teamInviteEvent.isAutoJoin ? "added" : "invited";
+  const variables = {
+    user: teamInviteEvent.from,
+    team: teamInviteEvent.teamName,
+    appName: APP_NAME,
+    parentTeamName: teamInviteEvent.parentTeamName,
+    entity: teamInviteEvent.language(teamInviteEvent.isOrg ? "organization" : "team").toLowerCase(),
+  };
+
+  if (typeOfInvite === "TO_ORG") {
+    return teamInviteEvent.language(`email_team_invite|subject|${type}_to_org`, variables);
+  }
+
+  if (typeOfInvite === "TO_SUBTEAM") {
+    return teamInviteEvent.language(`email_team_invite|subject|${type}_to_subteam`, variables);
+  }
+
+  return teamInviteEvent.language(`email_team_invite|subject|${type}_to_regular_team`, variables);
+};
@@ -1,6 +1,6 @@
 import type { TFunction } from "i18next";

-import getLabelValueMapFromResponses from "@calcom/features/bookings/lib/getLabelValueMapFromResponses";
+import getLabelValueMapFromResponses from "@calcom/lib/bookings/getLabelValueMapFromResponses";
 import type { CalendarEvent } from "@calcom/types/Calendar";

 import { Info } from "./Info";
@@ -1,8 +1,8 @@
-import AttendeeScheduledEmailClass from "../../templates/attendee-rescheduled-email";
+import { getFormattedDate } from "../../lib/utils/date-formatting";
 import { AttendeeScheduledEmail } from "./AttendeeScheduledEmail";

 export const AttendeeRequestEmail = (props: React.ComponentProps<typeof AttendeeScheduledEmail>) => {
-  const date = new AttendeeScheduledEmailClass(props.calEvent, props.attendee).getFormattedDate();
+  const date = getFormattedDate(props.calEvent, props.attendee);

  return (
    <AttendeeScheduledEmail
@@ -1,4 +1,4 @@
-import type { IBookingRedirect } from "../../templates/booking-redirect-notification";
+import type { IBookingRedirect } from "../../lib/types/booking-redirect-types";
 import { BaseEmailHtml } from "../components";

 export const BookingRedirectEmailNotification = (
@@ -1,7 +1,7 @@
 import ServerTrans from "@calcom/lib/components/ServerTrans";
 import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";

-import type { OrganizationCreation } from "../../templates/organization-creation-email";
+import type { OrganizationCreation } from "../../lib/types/email-types";
 import { V2BaseEmailHtml } from "../components";

 export const OrganizationCreationEmail = (
@@ -3,7 +3,7 @@ import type { TFunction } from "i18next";
 import ServerTrans from "@calcom/lib/components/ServerTrans";
 import { APP_NAME, WEBAPP_URL, IS_PRODUCTION } from "@calcom/lib/constants";

-import { getSubject, getTypeOfInvite } from "../../templates/team-invite-email";
+import { getSubject, getTypeOfInvite } from "../../lib/utils/team-invite-utils";
 import { V2BaseEmailHtml, CallToAction } from "../components";

 type TeamInvite = {
--- a/Show More
+++ b/Show More