[pull] main from calcom:main

apps/web/app/providers.tsx

@@ -27,6 +27,7 @@ export function Providers({ isEmbed, children, country }: ProvidersProps) {
         <TrpcProvider>
           <ToastProvider position="bottom-center">
             {!isEmbed && !isBookingPage && <NotificationSoundHandler />}
+            {/* @ts-expect-error react-inlinesvg/provider is incompatible with @types/react@18.0.26. Remove when these types are compatible. */}
             <CacheProvider>
               <WebPushProvider>{children}</WebPushProvider>
             </CacheProvider>

apps/web/pages/_app.tsx

@@ -17,6 +17,7 @@ function MyApp(props: AppProps) {
   return (
     <SessionProvider session={pageProps.session ?? undefined}>
       <WebPushProvider>
+        {/* @ts-expect-error react-inlinesvg/provider is incompatible with @types/react@18.0.26. Remove when these types are compatible. */}
         <CacheProvider>
           {Component.PageWrapper ? <Component.PageWrapper {...props} /> : <Component {...pageProps} />}
         </CacheProvider>

packages/features/bookings/lib/EventManager.ts

@@ -712,7 +712,7 @@ export default class EventManager {
           });
         }
 
-        log.debug("RescheduleOrganizerChanged: Creating Event and Meeting for for new booking");
+        log.debug("RescheduleOrganizerChanged: Creating Event and Meeting for new booking");
         const createdEvent = await this.create(originalEvt);
         results.push(...createdEvent.results);
         updatedBookingReferences.push(...createdEvent.referencesToCreate);

packages/i18n/locales/en/common.json

@@ -2516,7 +2516,7 @@
   "recommended_next_steps": "Recommended next steps",
   "create_a_managed_event": "Create a managed event type",
   "meetings_are_better_with_the_right": "Meetings are better with the right team members there. Invite them now.",
-  "create_a_one_one_template": "Create a one-one one template for an event type and distribute it to multiple members.",
+  "create_a_one_one_template": "Create a one-on-one template for an event type and distribute it to multiple members.",
   "collective_or_roundrobin": "Collective or round-robin",
   "book_your_team_members": "Book your team members together with collective events or cycle through to get the right person with round-robin.",
   "event_no_longer_attending_subject": "No longer attending {{title}} at {{date}}",

packages/platform/types/slots/slots-2024-09-04/inputs/get-slots.input.ts

@@ -176,7 +176,7 @@ export class ByTeamSlugAndEventTypeSlug_2024_09_04 extends GetAvailableSlotsInpu
   @ApiProperty({
     type: String,
     description:
-      "When searching by eventTypeSlug a teamSlug must be provided too aka team who owns the the event type.",
+      "When searching by eventTypeSlug a teamSlug must be provided too aka team who owns the event type.",
     example: "bob",
   })
   teamSlug!: string;