From 7441169a0ec64bfec3c5a105d735f06b31205be4 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Fri, 23 Jan 2026 00:47:57 +0530
Subject: [PATCH] Fix: Incident Detail UI Layout

---
 .../Components/IncidentDetailsModal/index.jsx | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/client/src/Pages/Incidents/Components/IncidentDetailsModal/index.jsx b/client/src/Pages/Incidents/Components/IncidentDetailsModal/index.jsx
index 05d296b4a..f198c5c18 100644
--- a/client/src/Pages/Incidents/Components/IncidentDetailsModal/index.jsx
+++ b/client/src/Pages/Incidents/Components/IncidentDetailsModal/index.jsx
@@ -318,21 +318,14 @@ const IncidentDetailsModal = ({ open, incidentId, onClose, onResolved }) => {
 													value={toCapitalLetter(incident?.resolutionType) || "-"}
 												/>
 												{incident?.resolutionType === "manual" && (
-													<>
-														<KeyValueRow
-															label={t("incidentsPage.resolvedBy")}
-															value={incident?.resolvedBy?.email || "Unknown"}
-														/>
-
-														<KeyValueRow
-															label={t("incidentsPage.comment")}
-															value={
-																incident?.comment?.trim()
-																	? incident.comment
-																	: t("incidentsPage.noCommentProvided")
-															}
-														/>
-													</>
+													<KeyValueRow
+														label={t("incidentsPage.comment")}
+														value={
+															incident?.comment?.trim()
+																? incident.comment
+																: t("incidentsPage.noCommentProvided")
+														}
+													/>
 												)}
 											</>
 										)}
@@ -359,6 +352,18 @@ const IncidentDetailsModal = ({ open, incidentId, onClose, onResolved }) => {
 				sx={{ maxHeight: "70vh", overflowY: "auto", pr: 1 }}
 			>
 				{renderContent()}
+				{!isActive &&
+					incident?.resolutionType === "manual" &&
+					incident?.resolvedBy?.email && (
+						<Typography
+							variant="body2"
+							sx={{
+								fontStyle: "italic",
+							}}
+						>
+							{t("incidentsPage.resolvedBy")}: {incident.resolvedBy.email}
+						</Typography>
+					)}
 				<Stack
 					direction="row"
 					justifyContent="flex-end"