From cc9b5086c87419b6b56cbc9f981a9bc184215168 Mon Sep 17 00:00:00 2001
From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:01:30 +0530
Subject: [PATCH 1/2] fix(api-keys): stop truncating the org-access note in the
 API key modal (#8519)

---
 .../settings/api-keys/components/add-api-key-modal.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/web/modules/organization/settings/api-keys/components/add-api-key-modal.tsx b/apps/web/modules/organization/settings/api-keys/components/add-api-key-modal.tsx
index 409c88eec565..b49b32317837 100644
--- a/apps/web/modules/organization/settings/api-keys/components/add-api-key-modal.tsx
+++ b/apps/web/modules/organization/settings/api-keys/components/add-api-key-modal.tsx
@@ -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>

From b5807874351a5a3d1e41b7d4ed63eeed90ca7f9e Mon Sep 17 00:00:00 2001
From: Dhruwang Jariwala <67850763+Dhruwang@users.noreply.github.com>
Date: Tue, 14 Jul 2026 17:01:45 +0530
Subject: [PATCH 2/2] fix(ui): keep InputCombobox chevron right-aligned when
 the dropdown is empty (#8520)

---
 .../modules/ui/components/input-combo-box/index.tsx    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/web/modules/ui/components/input-combo-box/index.tsx b/apps/web/modules/ui/components/input-combo-box/index.tsx
index 3226feb8f4ba..f00161bbcbcc 100644
--- a/apps/web/modules/ui/components/input-combo-box/index.tsx
+++ b/apps/web/modules/ui/components/input-combo-box/index.tsx
@@ -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>