Skip to content

[pull] main from formbricks:main #411

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 2 commits into from
May 25, 2026
Merged

[pull] main from formbricks:main #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
af7e394
fix: add missing JSX key props in segment-filter SelectItem lists (#8…
mattinannt May 25, 2026
6d08844
fix: clean up setTimeout schedules in contact-attribute effects (#8126)
mattinannt May 25, 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
3 changes: 2 additions & 1 deletion apps/web/modules/ee/contacts/components/edit-contact-attributes-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ export const EditContactAttributesModal = ({
const errorFieldId = `attribute-key-${firstErrorIndex}`;
const errorElement = document.getElementById(errorFieldId);
if (errorElement) {
setTimeout(() => {
const timeoutId = setTimeout(() => {
errorElement.scrollIntoView({ behavior: "smooth", block: "center" });
// Try to focus the input inside the combobox if it exists
const inputElement = errorElement.querySelector("input") as HTMLInputElement;
Expand All @@ -143,6 +143,7 @@ export const EditContactAttributesModal = ({
errorElement.focus();
}
}, 100);
return () => clearTimeout(timeoutId);
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion apps/web/modules/ee/contacts/components/upload-contacts-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,10 @@ export const UploadContactsCSVButton = ({
useEffect(() => {
if (error && errorContainerRef.current) {
// Small delay to ensure DOM has updated and the alert is visible
setTimeout(() => {
const timeoutId = setTimeout(() => {
errorContainerRef.current?.scrollIntoView({ behavior: "smooth", block: "center" });
}, 100);
return () => clearTimeout(timeoutId);
}
}, [error]);

Expand Down
8 changes: 6 additions & 2 deletions apps/web/modules/ee/contacts/segments/components/segment-filter.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,7 +811,9 @@ function DeviceFilter({

<SelectContent>
{operatorArr.map((operator) => (
<SelectItem value={operator.id}>{operator.name}</SelectItem>
<SelectItem key={operator.id} value={operator.id}>
{operator.name}
</SelectItem>
))}
</SelectContent>
</Select>
Expand All @@ -831,7 +833,9 @@ function DeviceFilter({
{ id: "desktop", name: t("workspace.segments.desktop") },
{ id: "phone", name: t("workspace.segments.phone") },
].map((operator) => (
<SelectItem value={operator.id}>{operator.name}</SelectItem>
<SelectItem key={operator.id} value={operator.id}>
{operator.name}
</SelectItem>
))}
</SelectContent>
</Select>
Expand Down
Loading