From f853a034910fddfc4c2266672208ab3c7ff23d08 Mon Sep 17 00:00:00 2001
From: Sky-walkerX <khandelwalnaman0101@gmail.com>
Date: Sun, 22 Jun 2025 17:17:26 +0530
Subject: [PATCH 1/4] refactor(settings): email settings toggle in one row

---
 client/src/Pages/Settings/SettingsEmail.jsx | 58 ++++++++++-----------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/client/src/Pages/Settings/SettingsEmail.jsx b/client/src/Pages/Settings/SettingsEmail.jsx
index 4bd6ff3ad..061cf2602 100644
--- a/client/src/Pages/Settings/SettingsEmail.jsx
+++ b/client/src/Pages/Settings/SettingsEmail.jsx
@@ -212,37 +212,35 @@ const SettingsEmail = ({
 							gap: theme.spacing(4),
 						}}
 					>
-						<Typography>{t("settingsEmailSecure")}</Typography>
-						<Switch
-							name="systemEmailSecure"
-							checked={systemEmailSecure}
-							onChange={handleChange}
-						/>
-						<Typography>{t("settingsEmailPool")}</Typography>
-						<Switch
-							name="systemEmailPool"
-							checked={systemEmailPool}
-							onChange={handleChange}
-						/>
-						<Typography>{t("settingsEmailIgnoreTLS")}</Typography>
-						<Switch
-							name="systemEmailIgnoreTLS"
-							checked={systemEmailIgnoreTLS}
-							onChange={handleChange}
-						/>
-						<Typography>{t("settingsEmailRequireTLS")}</Typography>
-						<Switch
-							name="systemEmailRequireTLS"
-							checked={systemEmailRequireTLS}
-							onChange={handleChange}
-						/>
-						<Typography>{t("settingsEmailRejectUnauthorized")}</Typography>
-						<Switch
-							name="systemEmailRejectUnauthorized"
-							checked={systemEmailRejectUnauthorized}
-							onChange={handleChange}
-						/>
+						{[
+							["settingsEmailSecure", "systemEmailSecure", systemEmailSecure],
+							["settingsEmailPool", "systemEmailPool", systemEmailPool],
+							["settingsEmailIgnoreTLS", "systemEmailIgnoreTLS", systemEmailIgnoreTLS],
+							["settingsEmailRequireTLS", "systemEmailRequireTLS", systemEmailRequireTLS],
+							[
+								"settingsEmailRejectUnauthorized",
+								"systemEmailRejectUnauthorized",
+								systemEmailRejectUnauthorized,
+							],
+						].map(([labelKey, name, value]) => (
+							<Box
+								key={name}
+								sx={{
+									display: "flex",
+									alignItems: "center",
+									justifyContent: "space-between",
+								}}
+							>
+								<Typography>{t(labelKey)}</Typography>
+								<Switch
+									name={name}
+									checked={value}
+									onChange={handleChange}
+								/>
+							</Box>
+						))}
 					</Box>
+
 					<Box>
 						{systemEmailHost &&
 							systemEmailPort &&

From 9972c3cf9a31b266e238f84020c24285a70b863f Mon Sep 17 00:00:00 2001
From: Sky-walkerX <khandelwalnaman0101@gmail.com>
Date: Sun, 22 Jun 2025 17:35:45 +0530
Subject: [PATCH 2/4] refactor(settings): changed wordings of email settings

---
 client/src/locales/en.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index d3a274a32..b29c290a9 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -749,11 +749,11 @@
 	},
 	"advancedMatching": "Advanced matching",
 	"settingsEmailTLSServername": "TLS Servername - Optional Hostname for TLS Validation when host is an IP",
-	"settingsEmailIgnoreTLS": "Ignore TLS - Disable STARTTLS",
-	"settingsEmailRequireTLS": "Require TLS - Force STARTTLS",
-	"settingsEmailRejectUnauthorized": "Reject Unauthorized",
-	"settingsEmailSecure": "Secure - Use SSL",
-	"settingsEmailPool": "Pool - Enable connection pooling",
+	"settingsEmailIgnoreTLS": "Disable STARTTLS: Don't use TLS even if the server supports it",
+	"settingsEmailRequireTLS": "Force STARTTLS: Require TLS upgrade, fail if not supported",
+	"settingsEmailRejectUnauthorized": "Reject invalid certificates: Reject connections with self-signed or untrusted certificates",
+	"settingsEmailSecure": "Use SSL (recommended): Encrypt the connection using SSL/TLS",
+	"settingsEmailPool": "Enable connection pooling: Reuse existing connections to improve performance",
 	"sendTestNotifications": "Send test notifications",
 	"selectAll": "Select all",
 	"queuePage": {

From 3a6d3071be4ca68fd225142ff362e721f91c7011 Mon Sep 17 00:00:00 2001
From: Sky-walkerX <khandelwalnaman0101@gmail.com>
Date: Sun, 22 Jun 2025 17:39:42 +0530
Subject: [PATCH 3/4] chore: format

---
 client/src/locales/en.json | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/client/src/locales/en.json b/client/src/locales/en.json
index b29c290a9..14317e689 100644
--- a/client/src/locales/en.json
+++ b/client/src/locales/en.json
@@ -785,15 +785,16 @@
 			"failCountHeader": "Fail count",
 			"failedAtHeader": "Last failed at",
 			"failReasonHeader": "Fail reason"
+		},
+		"export": {
+			"title": "Export Monitors",
+			"success": "Monitors exported successfully!",
+			"failed": "Failed to export monitors"
+		},
+		"monitorActions": {
+			"title": "Export/Import",
+			"import": "Import Monitors",
+			"export": "Export Monitors"
 		}
-	"export": {
-		"title": "Export Monitors",
-		"success": "Monitors exported successfully!",
-		"failed": "Failed to export monitors"
-	},
-	"monitorActions": {
-		"title": "Export/Import",
-		"import": "Import Monitors",
-		"export": "Export Monitors"
 	}
 }

From 50e9a6b967ce3f32c4c390a58d1bcf45f8fb22c6 Mon Sep 17 00:00:00 2001
From: Sky-walkerX <khandelwalnaman0101@gmail.com>
Date: Sun, 22 Jun 2025 19:40:42 +0530
Subject: [PATCH 4/4] chore: formatted NetworkService

---
 client/src/Utils/NetworkService.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/src/Utils/NetworkService.js b/client/src/Utils/NetworkService.js
index d9a3853e1..651f72fe0 100644
--- a/client/src/Utils/NetworkService.js
+++ b/client/src/Utils/NetworkService.js
@@ -1033,8 +1033,8 @@ class NetworkService {
 
 	async flushQueue() {
 		return this.axiosInstance.post(`/queue/flush`);
-    
-    
+	}
+
 	async exportMonitors() {
 		const response = await this.axiosInstance.get("/monitors/export", {
 			responseType: "blob",