From 7469444aea12774eea930d06b1d29f7635732a20 Mon Sep 17 00:00:00 2001
From: Chayan Das <145531182+ChayanDass@users.noreply.github.com>
Date: Fri, 19 Jun 2026 12:11:40 +0530
Subject: [PATCH] fix: align confirmation dialog header and footer (#29588)

Signed-off-by: Chayan Das <daschayan8837@gmail.com>
Co-authored-by: Bandhan Majumder <133476557+bandhan-majumder@users.noreply.github.com>
---
 packages/ui/components/dialog/Dialog.tsx | 47 +++++++++++++-----------
 1 file changed, 26 insertions(+), 21 deletions(-)

diff --git a/packages/ui/components/dialog/Dialog.tsx b/packages/ui/components/dialog/Dialog.tsx
index 27f52c03a7..10b5598aff 100644
--- a/packages/ui/components/dialog/Dialog.tsx
+++ b/packages/ui/components/dialog/Dialog.tsx
@@ -98,15 +98,10 @@ export const DialogContent = React.forwardRef<HTMLDivElement, DialogContentProps
             </div>
           )}
           {type === "confirmation" && (
-            <div className="flex">
-              {icon && (
-                <div className="bg-emphasis flex h-10 w-10 shrink-0 items-center justify-center rounded-full">
-                  <Icon name={icon} className="text-emphasis h-4 w-4" />
-                </div>
-              )}
-              <div className="ml-4 grow">
-                <DialogHeader title={title} subtitle={props.description} />
-                <div data-testid="dialog-confirmation">{children}</div>
+            <div>
+              <DialogHeader title={title} subtitle={props.description} icon={icon} />
+              <div data-testid="dialog-confirmation" className="flex flex-col">
+                {children}
               </div>
             </div>
           )}
@@ -120,6 +115,7 @@ export const DialogContent = React.forwardRef<HTMLDivElement, DialogContentProps
 type DialogHeaderProps = {
   title: React.ReactNode;
   subtitle?: React.ReactNode;
+  icon?: IconName;
 } & React.HTMLAttributes<HTMLDivElement>;
 
 export function DialogHeader(props: DialogHeaderProps) {
@@ -127,17 +123,26 @@ export function DialogHeader(props: DialogHeaderProps) {
 
   return (
     <div className="mb-4">
-      <h2
-        data-testid="dialog-title"
-        className="text-semibold text-emphasis font-cal mb-1 text-xl"
-        id="modal-title">
-        {props.title}
-      </h2>
-      {props.subtitle && (
-        <p className="text-subtle text-sm" data-testid="dialog-subtitle">
-          {props.subtitle}
-        </p>
-      )}
+      <div className={classNames("flex gap-2", props.subtitle ? "items-start" : "items-center")}>
+        {props.icon && (
+          <div className="bg-emphasis flex h-10 w-10 shrink-0 items-center justify-center rounded-full">
+            <Icon name={props.icon} className="text-emphasis h-4 w-4" />
+          </div>
+        )}
+        <div>
+          <h2
+            data-testid="dialog-title"
+            className="text-semibold text-emphasis font-cal text-xl"
+            id="modal-title">
+            {props.title}
+          </h2>
+          {props.subtitle && (
+            <p className="text-subtle text-sm" data-testid="dialog-subtitle">
+              {props.subtitle}
+            </p>
+          )}
+        </div>
+      </div>
     </div>
   );
 }
@@ -198,4 +203,4 @@ export function DialogClose(
       </Button>
     </DialogPrimitive.Close>
   );
-}
+}
\ No newline at end of file