Skip to content

Commit 5bab2af

Browse files
pumfleetdevin-ai-integration[bot]Amit91848emrysal
authored
chore: some minor QA fixes (#22727)
* Various fixes * Remove tooltip * another string change * Fix width of custom event name modal to prevent overflow * Booking questions fixes * minor string fix * checkbox alignment * padding in reassign dialog * fix: update FormBuilder tests for checkbox UI changes - Updated test utilities to work with CheckboxField instead of BooleanToggleGroupField - Fixed badge expectations to check for 'optional' instead of 'required' - Updated dialog interaction methods to use checkbox.checked instead of button text - All 13 FormBuilder tests now pass successfully Fixes failing tests in PR #22727 caused by UI changes from toggle buttons to checkboxes for required field selection. Co-Authored-By: amit@cal.com <samit91848@gmail.com> --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: amit@cal.com <samit91848@gmail.com> Co-authored-by: Alex van Andel <me@alexvanandel.com>
1 parent 9b7c658 commit 5bab2af

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+232
-221
lines changed

apps/web/app/providers.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import { TrpcProvider } from "app/_trpc/trpc-provider";
44
import { SessionProvider } from "next-auth/react";
5+
import { usePathname } from "next/navigation";
56
import CacheProvider from "react-inlinesvg/provider";
67

78
import { WebPushProvider } from "@calcom/features/notifications/WebPushContext";
@@ -17,11 +18,13 @@ type ProvidersProps = {
1718
};
1819
export function Providers({ isEmbed, children, nonce }: ProvidersProps) {
1920
const isBookingPage = useIsBookingPage();
21+
const pathname = usePathname();
22+
const isOnboardingPage = pathname?.startsWith("/getting-started");
2023

2124
return (
2225
<SessionProvider>
2326
<TrpcProvider>
24-
{!isBookingPage ? <PlainChat nonce={nonce} /> : null}
27+
{!isBookingPage && !isOnboardingPage ? <PlainChat nonce={nonce} /> : null}
2528
{!isEmbed && !isBookingPage && <NotificationSoundHandler />}
2629
{/* @ts-expect-error FIXME remove this comment when upgrading typescript to v5 */}
2730
<CacheProvider>

apps/web/components/dialog/ReassignDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ export const ReassignDialog = ({
218218
placeholder={t("search")}
219219
onChange={(e) => setSearchTerm(e.target.value)}
220220
/>
221-
<div className="scroll-bar flex h-[150px] flex-col gap-0.5 overflow-y-scroll rounded-md border p-1">
221+
<div className="scroll-bar mt-2 flex h-[150px] flex-col gap-0.5 overflow-y-scroll rounded-md border p-1">
222222
{teamMemberOptions.map((member) => (
223223
<label
224224
key={member.value}

apps/web/components/getting-started/components/AppConnectionItem.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ const AppConnectionItem = (props: IAppConnectionItem) => {
8484
{t("this_app_requires_connected_account", {
8585
appName: title,
8686
dependencyName: dependency.name,
87+
interpolation: { escapeValue: false },
8788
})}
8889
</span>
8990

apps/web/components/getting-started/steps-views/ConnectCalendars.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ const ConnectedCalendars = (props: IConnectCalendarsProps) => {
9292
loading={isPageLoading}
9393
onClick={() => nextStep()}
9494
disabled={disabledNextButton}>
95-
{firstCalendar ? `${t("continue")}` : `${t("next_step_text")}`}
95+
{firstCalendar ? `${t("connect_your_video")}` : `${t("connect_calendar_first")}`}
9696
</Button>
9797
</>
9898
);

apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ const ConnectedVideoStep = (props: ConnectedAppStepProps) => {
105105
disabled={!hasAnyInstalledVideoApps}
106106
loading={isPageLoading}
107107
onClick={() => nextStep()}>
108-
{t("next_step_text")}
108+
{t("set_availability")}
109109
</Button>
110110
</>
111111
);

apps/web/components/getting-started/steps-views/SetupAvailability.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ const SetupAvailability = (props: ISetupAvailabilityProps) => {
8181
className="mt-2 w-full justify-center p-2 text-sm sm:mt-8"
8282
loading={availabilityForm.formState.isSubmitting}
8383
disabled={availabilityForm.formState.isSubmitting}>
84-
{t("next_step_text")}
84+
{t("complete_profile")}
8585
</Button>
8686
</div>
8787
</Form>

apps/web/components/getting-started/steps-views/UserProfile.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ const UserProfile = ({ user }: UserProfileProps) => {
164164
EndIcon="arrow-right"
165165
type="submit"
166166
className="mt-8 w-full items-center justify-center">
167-
{t("finish")}
167+
{t("finish_and_start")}
168168
</Button>
169169
</form>
170170
);

apps/web/components/getting-started/steps-views/UserSettings.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,7 @@ const UserSettings = (props: IUserSettingsProps) => {
8888
id="name"
8989
name="name"
9090
type="text"
91+
placeholder="John Doe"
9192
autoComplete="off"
9293
autoCorrect="off"
9394
/>
@@ -121,7 +122,7 @@ const UserSettings = (props: IUserSettingsProps) => {
121122
className="mt-8 flex w-full flex-row justify-center"
122123
loading={mutation.isPending}
123124
disabled={mutation.isPending}>
124-
{t("next_step_text")}
125+
{t("connect_your_calendar")}
125126
</Button>
126127
</form>
127128
);

apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ const UsernameTextfield = (props: ICustomUsernameProps & Partial<React.Component
120120
<TextField
121121
ref={usernameRef}
122122
name="username"
123+
placeholder="john"
123124
value={inputUsernameValue}
124125
autoComplete="none"
125126
autoCapitalize="none"

apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const getStepsAndHeadersForUser = (t: TFunction) => {
4242
}[] = [
4343
{
4444
title: t("welcome_to_cal_header", { appName: APP_NAME }),
45-
subtitle: [t("we_just_need_basic_info"), t("edit_form_later_subtitle")],
45+
subtitle: [t("we_just_need_basic_info")],
4646
},
4747
{
4848
title: t("connect_your_calendar"),
@@ -57,8 +57,9 @@ const getStepsAndHeadersForUser = (t: TFunction) => {
5757
{
5858
title: t("set_availability"),
5959
subtitle: [
60-
t("set_availability_getting_started_subtitle_1"),
61-
t("set_availability_getting_started_subtitle_2"),
60+
`${t("set_availability_getting_started_subtitle_1")} ${t(
61+
"set_availability_getting_started_subtitle_2"
62+
)}`,
6263
],
6364
},
6465
{

0 commit comments

Comments
 (0)