Skip to content

[pull] main from formbricks:main #495

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
Jul 14, 2026
Merged

[pull] main from formbricks:main #495

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
cc9b508
fix(api-keys): stop truncating the org-access note in the API key mod…
Dhruwang Jul 14, 2026
b580787
fix(ui): keep InputCombobox chevron right-aligned when the dropdown i…
Dhruwang Jul 14, 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
2 changes: 1 addition & 1 deletion apps/web/modules/organization/settings/api-keys/components/add-api-key-modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,7 @@ export const AddApiKeyModal = ({
</div>
))}
{isFormbricksCloud && (
<Alert variant="info" size="small">
<Alert variant="info">
<AlertDescription>
{t("workspace.api_keys.organization_access_cloud_note")}
</AlertDescription>
Expand Down
10 changes: 9 additions & 1 deletion apps/web/modules/ui/components/input-combo-box/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,15 @@ export const InputCombobox: React.FC<InputComboboxProps> = ({
}}
/>
) : (
<ChevronDownIcon className="size-5 shrink-0 text-slate-300 group-hover/icon:text-slate-400" />
<ChevronDownIcon
className={cn(
"size-5 shrink-0 text-slate-300 group-hover/icon:text-slate-400",
// Pin the chevron to the right even when there's no value/placeholder to render a
// leading flex-1 element — otherwise it collapses to the left and looks broken.
// Skip in the centered icon-only (withInput) variant so it stays centered.
!(withInput && inputType !== "dropdown") && "ml-auto"
)}
/>
)}
</div>
</DropdownMenuTrigger>
Expand Down
Loading