From c339c9c47998d5213aab7701c99aa246db4619d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E5=BF=97=E8=B0=A6?= <89645338+simpleqt@users.noreply.github.com> Date: Sun, 20 Sep 2026 15:25:27 +0800 Subject: [PATCH 1/2] fix: remove duplicated words in three user-visible strings (#30190) 'the the event type' (slots API property description), 'for for new booking' (EventManager debug log), and 'one-one one template' (en locale). Co-authored-by: Sahitya Chandra --- packages/features/bookings/lib/EventManager.ts | 2 +- packages/i18n/locales/en/common.json | 2 +- .../types/slots/slots-2024-09-04/inputs/get-slots.input.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/features/bookings/lib/EventManager.ts b/packages/features/bookings/lib/EventManager.ts index 235ae2f540d..3b327a81616 100644 --- a/packages/features/bookings/lib/EventManager.ts +++ b/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); diff --git a/packages/i18n/locales/en/common.json b/packages/i18n/locales/en/common.json index daf2add9597..d57c59fed36 100644 --- a/packages/i18n/locales/en/common.json +++ b/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}}", diff --git a/packages/platform/types/slots/slots-2024-09-04/inputs/get-slots.input.ts b/packages/platform/types/slots/slots-2024-09-04/inputs/get-slots.input.ts index 46d8e578f87..1c7150235e9 100644 --- a/packages/platform/types/slots/slots-2024-09-04/inputs/get-slots.input.ts +++ b/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; From 54343aa685ae8f33159d2f485ec4a57bad5c574a Mon Sep 17 00:00:00 2001 From: Robert Harrison Date: Sun, 20 Sep 2026 02:17:32 -0600 Subject: [PATCH 2/2] fix: restore @ts-expect-error for CacheProvider type mismatch (#30171) * fix: restore @ts-expect-error for CacheProvider type mismatch PR #30140 removed these comments assuming they were stale now that the repo is on TypeScript 5. The comments were about the compiler version, but the actual incompatibility is between react-inlinesvg/provider's CacheProvider (typed to return a bare ReactNode) and this repo's pinned @types/react@18.0.26, which requires JSX components to return Element | null. ReactNode includes undefined, so the JSX usage fails type-checking. Verified yarn build completes successfully with this restored. Fixes #30170 * docs: explain the actual @ts-expect-error compatibility condition Per @coderabbitai review on #30171: the old wording ("remove when upgrading typescript to v5") was itself stale/misleading, since the incompatibility is with the pinned @types/react version, not the TypeScript compiler version. Documents the real condition instead. --- apps/web/app/providers.tsx | 1 + apps/web/pages/_app.tsx | 1 + 2 files changed, 2 insertions(+) diff --git a/apps/web/app/providers.tsx b/apps/web/app/providers.tsx index eec350d9784..4207ffd214e 100644 --- a/apps/web/app/providers.tsx +++ b/apps/web/app/providers.tsx @@ -27,6 +27,7 @@ export function Providers({ isEmbed, children, country }: ProvidersProps) { {!isEmbed && !isBookingPage && } + {/* @ts-expect-error react-inlinesvg/provider is incompatible with @types/react@18.0.26. Remove when these types are compatible. */} {children} diff --git a/apps/web/pages/_app.tsx b/apps/web/pages/_app.tsx index 10f9db9ddf1..b8ff80506e2 100644 --- a/apps/web/pages/_app.tsx +++ b/apps/web/pages/_app.tsx @@ -17,6 +17,7 @@ function MyApp(props: AppProps) { return ( + {/* @ts-expect-error react-inlinesvg/provider is incompatible with @types/react@18.0.26. Remove when these types are compatible. */} {Component.PageWrapper ? : }