Merge branch 'develop' into fix-uptime-monitor-redirection-incident

client/src/App.jsx

@@ -22,9 +22,18 @@ function App() {
 		};
 	}, []);
 
+	const theme = mode === "light" ? lightTheme : darkTheme;
+
 	return (
-		<ThemeProvider theme={mode === "light" ? lightTheme : darkTheme}>
+		<ThemeProvider theme={theme}>
 			<CssBaseline />
+			<GlobalStyles
+				styles={{
+					body: {
+						backgroundColor: theme.palette.background.main,
+					},
+				}}
+			/>
 			<AppLayout>
 				<Routes />
 			</AppLayout>

client/src/Components/v1/Sidebar/index.jsx

@@ -84,8 +84,8 @@ const Sidebar = () => {
 			gap={theme.spacing(6)}
 			sx={{
 				transition,
-				backgroundColor: "#000000",
-				borderRight: "1px solid #344054",
+				backgroundColor: theme.palette.background.main,
+				borderRight: `1px solid ${theme.palette.primary.lowContrast}`,
 				zIndex: 1000,
 			}}
 		>

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"

client/src/index.css

@@ -6,7 +6,6 @@
 
 html,
 body {
-	background-color: #000000;
 	overscroll-behavior: none;
 }