Skip to content

[pull] main from calcom:main #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 3 commits into from
Jan 3, 2026
+31 −23
Merged

[pull] main from calcom:main #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78826a3
fix: Make incomplete booking form mobile-responsive (#26413)
eeshm Jan 3, 2026
0c724dd
fix: update bundle identifier (#26402)
betomoedano Jan 3, 2026
9c08c5f
fix: patch React 19 vulnerabilities by upgrading to 19.2.3 (#26411)
shashank-100 Jan 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions apps/web/app/(use-page-wrapper)/apps/routing-forms/[...pages]/IncompleteBooking.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,22 +128,22 @@ function Page({ form }: { form: RoutingFormWithResponseCount }) {
<div className="bg-default mt-2 rounded-xl px-2 py-2">
<Label>Credential to use</Label>
<Select
size="sm"
options={credentialOptions}
value={selectedCredential}
onChange={(option) => {
if (!option) {
return;
}
setSelectedCredential(option);
}}
/>
</div>
size="sm"
options={credentialOptions}
value={selectedCredential}
onChange={(option) => {
if (!option) {
return;
}
setSelectedCredential(option);
}}
/>
</div>
</>
)}

<div className="bg-default mt-2 rounded-xl px-2 py-2">
<div className="grid grid-cols-5 gap-4">
<div className="hidden md:grid md:grid-cols-5 md:gap-4">
<Label>{t("field_name")}</Label>
<Label>{t("field_type")}</Label>
<Label>{t("value")}</Label>
Expand All @@ -155,30 +155,33 @@ function Page({ form }: { form: RoutingFormWithResponseCount }) {
salesforceWriteToRecordObject[key as keyof typeof salesforceWriteToRecordObject];
return (
<div
className="mt-2 grid gap-4"
style={{ gridTemplateColumns: "repeat(5, 1fr)" }}
className="mt-2 border-subtle flex flex-col gap-3 rounded-lg border p-3 md:mt-2 md:grid md:grid-cols-5 md:gap-4 md:border-0 md:p-0"
key={key}>
<div className="w-full">
<Label className="md:hidden">{t("field_name")}</Label>
<InputField value={key} readOnly />
</div>
<div className="w-full">
<Label className="md:hidden">{t("field_type")}</Label>
<Select
value={fieldTypeOptions.find((option) => option.value === action.fieldType)}
isDisabled={true}
/>
</div>
<div className="w-full">
<Label className="md:hidden">{t("value")}</Label>
<InputField value={action.value as string} readOnly />
</div>
<div className="w-full">
<Label className="md:hidden">{t("when_to_write")}</Label>
<Select
value={whenToWriteToRecordOptions.find(
(option) => option.value === action.whenToWrite
)}
isDisabled={true}
/>
</div>
<div>
<div className="flex justify-end md:justify-start">
<Button
StartIcon="trash"
variant="icon"
Expand All @@ -193,8 +196,9 @@ function Page({ form }: { form: RoutingFormWithResponseCount }) {
</div>
);
})}
<div className="mt-2 grid grid-cols-5 gap-4">
<div className="mt-2 border-subtle flex flex-col gap-4 rounded-lg border p-3 md:mt-2 md:grid md:grid-cols-5 md:gap-4 md:border-0 md:p-0">
<div>
<Label className="md:hidden">{t("field_name")}</Label>
<InputField
size="sm"
value={newSalesforceAction.field}
Expand All @@ -207,6 +211,7 @@ function Page({ form }: { form: RoutingFormWithResponseCount }) {
/>
</div>
<div>
<Label className="md:hidden">{t("field_type")}</Label>
<Select
size="sm"
options={fieldTypeOptions}
Expand All @@ -223,6 +228,7 @@ function Page({ form }: { form: RoutingFormWithResponseCount }) {
/>
</div>
<div>
<Label className="md:hidden">{t("value")}</Label>
<InputField
size="sm"
value={newSalesforceAction.value}
Expand All @@ -235,6 +241,7 @@ function Page({ form }: { form: RoutingFormWithResponseCount }) {
/>
</div>
<div>
<Label className="md:hidden">{t("when_to_write")}</Label>
<Select
size="sm"
options={whenToWriteToRecordOptions}
Expand Down
2 changes: 1 addition & 1 deletion companion/app.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"ios": {
"supportsTablet": true,
"deploymentTarget": "18.0",
"bundleIdentifier": "com.calcom.companion",
"bundleIdentifier": "com.cal.companion",
"infoPlist": {
"ITSAppUsesNonExemptEncryption": false
},
Expand Down
5 changes: 3 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,9 @@
"dayjs@^1": "patch:dayjs@npm%3A1.11.4#./.yarn/patches/dayjs-npm-1.11.4-97921cd375.patch",
"dayjs@^1.8.29": "patch:dayjs@npm%3A1.11.4#./.yarn/patches/dayjs-npm-1.11.4-97921cd375.patch",
"import-in-the-middle": "1.13.1",
"react@19.2.0": "19.2.2",
"react@19.2.1": "19.2.2",
"react@19.2.0": "19.2.3",
"react@19.2.1": "19.2.3",
"react@19.2.2": "19.2.3",
"tar-fs": "2.1.4",
"rollup": "4.22.4",
"jpeg-js": "0.4.4",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34332,10 +34332,10 @@ __metadata:
languageName: node
linkType: hard

"react@npm:19.2.2":
version: 19.2.2
resolution: "react@npm:19.2.2"
checksum: 10/a78dfc4663fbdd19f5b05af0dab99f056661de556c783c6bafa4e5936d2e0f8b0ecd0fa06da2f38cb557a7439fd7649361ef41ffd15733bf3f605a2d35d3cbf3
"react@npm:19.2.3":
version: 19.2.3
resolution: "react@npm:19.2.3"
checksum: 10/d16b7f35c0d35a56f63d9d1693819762e4abc479c57dd6310298920bed3820fcec7e17a99d44983416d8f5049143ea45b8005d3ab8324bae8973224400502b08
languageName: node
linkType: hard

Expand Down
Loading