From 6101fe1bfa2eafd349f534775d2de6b0ea406dcb Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 21 Jan 2026 01:42:00 +0530
Subject: [PATCH 1/3] Fix: Configure Pause Button

---
 client/src/Components/v1/MonitorDetailsControlHeader/index.jsx | 2 +-
 client/src/Pages/Uptime/Create/index.jsx                       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/client/src/Components/v1/MonitorDetailsControlHeader/index.jsx b/client/src/Components/v1/MonitorDetailsControlHeader/index.jsx
index c5b62280f..0793e7149 100644
--- a/client/src/Components/v1/MonitorDetailsControlHeader/index.jsx
+++ b/client/src/Components/v1/MonitorDetailsControlHeader/index.jsx
@@ -124,7 +124,7 @@ const MonitorDetailsControlHeader = ({
 							});
 						}}
 					>
-						{monitor?.isActive ? "Pause" : "Resume"}
+						{monitor?.isActive ? t("pause") : t("resume")}
 					</Button>
 				)}
 				{isAdmin && (
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index b1460dba6..1d0aa64f4 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -285,6 +285,7 @@ const UptimeCreate = ({ isClone = false }) => {
 
 	const handlePause = async () => {
 		await pauseMonitor({ monitorId, triggerUpdate });
+		setMonitor((prev) => ({ ...prev, isActive: !prev.isActive }));
 	};
 
 	const handleRemove = async (event) => {

From dd259fea8924790065c3371eb127cc668ca5d3ca Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 21 Jan 2026 02:02:16 +0530
Subject: [PATCH 2/3] Fix: One source of truth

---
 client/src/Hooks/monitorHooks.js         | 9 +++++++--
 client/src/Pages/Uptime/Create/index.jsx | 9 ++++++---
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index 9d46e9365..f0bf805f4 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -412,14 +412,19 @@ export const usePauseMonitor = () => {
 		try {
 			setIsLoading(true);
 			const res = await networkService.pauseMonitorById({ monitorId });
+			const updatedMonitor = res.data.data;
 			createToast({
-				body: res.data.data.isActive
+				body: updatedMonitor.isActive
 					? "Monitor resumed successfully"
 					: "Monitor paused successfully",
 			});
-			triggerUpdate();
+			if (triggerUpdate) {
+				triggerUpdate();
+			}
+			return updatedMonitor;
 		} catch (error) {
 			setError(error);
+			return null;
 		} finally {
 			setIsLoading(false);
 		}
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index 1d0aa64f4..6688f9b12 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -284,8 +284,10 @@ const UptimeCreate = ({ isClone = false }) => {
 	};
 
 	const handlePause = async () => {
-		await pauseMonitor({ monitorId, triggerUpdate });
-		setMonitor((prev) => ({ ...prev, isActive: !prev.isActive }));
+		const updatedMonitor = await pauseMonitor({ monitorId });
+		if (updatedMonitor) {
+			setMonitor((prev) => ({ ...prev, isActive: updatedMonitor.isActive }));
+		}
 	};
 
 	const handleRemove = async (event) => {
@@ -425,7 +427,8 @@ const UptimeCreate = ({ isClone = false }) => {
 							<Button
 								variant="contained"
 								color="secondary"
-								loading={isBusy}
+								loading={isPausing}
+								disabled={isBusy}
 								startIcon={
 									monitor?.isActive ? (
 										<Icon

From b34dbec3cf44762293bd37fe3542b8efcb3b3f35 Mon Sep 17 00:00:00 2001
From: Br0wnHammer <kumararyaman26@gmail.com>
Date: Wed, 21 Jan 2026 18:47:38 +0530
Subject: [PATCH 3/3] Fix: updateTrigger val

---
 client/src/Hooks/monitorHooks.js         |  9 ++-------
 client/src/Pages/Uptime/Create/index.jsx | 21 +++++++++------------
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/client/src/Hooks/monitorHooks.js b/client/src/Hooks/monitorHooks.js
index f0bf805f4..9d46e9365 100644
--- a/client/src/Hooks/monitorHooks.js
+++ b/client/src/Hooks/monitorHooks.js
@@ -412,19 +412,14 @@ export const usePauseMonitor = () => {
 		try {
 			setIsLoading(true);
 			const res = await networkService.pauseMonitorById({ monitorId });
-			const updatedMonitor = res.data.data;
 			createToast({
-				body: updatedMonitor.isActive
+				body: res.data.data.isActive
 					? "Monitor resumed successfully"
 					: "Monitor paused successfully",
 			});
-			if (triggerUpdate) {
-				triggerUpdate();
-			}
-			return updatedMonitor;
+			triggerUpdate();
 		} catch (error) {
 			setError(error);
-			return null;
 		} finally {
 			setIsLoading(false);
 		}
diff --git a/client/src/Pages/Uptime/Create/index.jsx b/client/src/Pages/Uptime/Create/index.jsx
index 6688f9b12..01fc9eb7a 100644
--- a/client/src/Pages/Uptime/Create/index.jsx
+++ b/client/src/Pages/Uptime/Create/index.jsx
@@ -80,13 +80,13 @@ const UptimeCreate = ({ isClone = false }) => {
 	const [isFetchingMonitor] = useFetchMonitorById({
 		monitorId,
 		setMonitor,
-		updateTrigger: true,
+		updateTrigger,
 	});
 
 	// Fetch games
 	const [isFetchingGames] = useFetchMonitorGames({
 		setGames,
-		triggerUpdate: true,
+		updateTrigger,
 	});
 
 	// Combine the loading states
@@ -283,13 +283,6 @@ const UptimeCreate = ({ isClone = false }) => {
 		}));
 	};
 
-	const handlePause = async () => {
-		const updatedMonitor = await pauseMonitor({ monitorId });
-		if (updatedMonitor) {
-			setMonitor((prev) => ({ ...prev, isActive: updatedMonitor.isActive }));
-		}
-	};
-
 	const handleRemove = async (event) => {
 		event.preventDefault();
 		const TEMP_MONITOR = { id: monitor.id };
@@ -427,8 +420,7 @@ const UptimeCreate = ({ isClone = false }) => {
 							<Button
 								variant="contained"
 								color="secondary"
-								loading={isPausing}
-								disabled={isBusy}
+								loading={isBusy}
 								startIcon={
 									monitor?.isActive ? (
 										<Icon
@@ -442,7 +434,12 @@ const UptimeCreate = ({ isClone = false }) => {
 										/>
 									)
 								}
-								onClick={handlePause}
+								onClick={() => {
+									pauseMonitor({
+										monitorId: monitor?.id,
+										triggerUpdate,
+									});
+								}}
 							>
 								{monitor?.isActive ? t("pause") : t("resume")}
 							</Button>