From f275f50383408347f13da043d09e9f179a4d0ba1 Mon Sep 17 00:00:00 2001
From: Toba Ojo <toba.ojo@mav-systems.com>
Date: Mon, 6 Oct 2025 14:21:56 +0100
Subject: [PATCH 1/2] Updated loading states and error states accross app

---
 .../CameraOverview/SnapshotContainer.tsx      |  11 +-
 .../CameraSettings/CameraSettingFields.tsx    |  37 ++--
 .../CameraSettings/CameraSettings.tsx         |  12 +-
 src/components/HistoryList/AlertItem.tsx      |   3 +-
 .../SettingForms/NPED/NPEDFields.tsx          |   1 -
 .../SettingForms/System/SettingSaveRecall.tsx |  16 +-
 .../System/SystemConfigFields.tsx             |   8 +-
 .../SettingForms/WiFi&Modem/ModemSettings.tsx |   6 -
 .../WiFi&Modem/WiFiSettingsForm.tsx           |   7 -
 .../SightingOverview/SightingOverview.tsx     |  20 ++-
 .../SightingsWidget/SightingWidget.tsx        |   8 +
 src/components/UI/ErrorState.tsx              | 162 ++++++++++++++++++
 src/components/UI/Loading.tsx                 |  14 ++
 src/context/providers/AlertHitProvider.tsx    |   4 -
 src/hooks/useCameraBlackboard.ts              |  13 +-
 src/hooks/useCameraConfig.ts                  |   7 +-
 src/hooks/useCameraWifiandModem.ts            |  34 +++-
 src/hooks/useCameraZoom.ts                    |   9 +-
 src/hooks/useGetOverviewSnapshot.ts           |  12 +-
 src/hooks/useNPEDAuth.ts                      |  77 ++++++---
 src/hooks/useSightingFeed.ts                  |   4 +-
 src/hooks/useSystemConfig.ts                  |   5 +-
 src/pages/Dashboard.tsx                       |   4 +-
 src/pages/Session.tsx                         |   2 +
 src/utils/utils.ts                            |   2 +-
 25 files changed, 377 insertions(+), 101 deletions(-)
 create mode 100644 src/components/UI/ErrorState.tsx
 create mode 100644 src/components/UI/Loading.tsx

diff --git a/src/components/CameraOverview/SnapshotContainer.tsx b/src/components/CameraOverview/SnapshotContainer.tsx
index c7a26b9..87cb48f 100644
--- a/src/components/CameraOverview/SnapshotContainer.tsx
+++ b/src/components/CameraOverview/SnapshotContainer.tsx
@@ -3,6 +3,8 @@ import type { ZoomInOptions } from "../../types/types";
 import NavigationArrow from "../UI/NavigationArrow";
 import { useCameraZoom } from "../../hooks/useCameraZoom";
 import { useEffect } from "react";
+import Loading from "../UI/Loading";
+import ErrorState from "../UI/ErrorState";
 
 type SnapshotContainerProps = {
   side: string;
@@ -42,13 +44,16 @@ export const SnapshotContainer = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [zoomLevel]);
 
-  if (isError) return <p className="h-100">An error occurred</p>;
-  if (isPending) return <p className="h-100">Loading...</p>;
-
   return (
     <div className="flex flex-col md:flex-row">
       <NavigationArrow side={side} settingsPage={settingsPage} />
       <div className="w-full">
+        {isError && <ErrorState />}
+        {isPending && (
+          <div className="my-50 h-[50%]">
+            <Loading message="Camera Preview" />
+          </div>
+        )}
         <canvas
           onClick={handleZoomClick}
           ref={canvasRef}
diff --git a/src/components/CameraSettings/CameraSettingFields.tsx b/src/components/CameraSettings/CameraSettingFields.tsx
index 46211c9..5975257 100644
--- a/src/components/CameraSettings/CameraSettingFields.tsx
+++ b/src/components/CameraSettings/CameraSettingFields.tsx
@@ -17,6 +17,7 @@ type CameraSettingsProps = {
   updateCameraConfig: (values: CameraSettingValues) => Promise<void> | void;
   zoomLevel?: number;
   onZoomLevelChange?: (level: number) => void;
+  updateCameraConfigError: null | Error;
 };
 
 const CameraSettingFields = ({
@@ -24,6 +25,7 @@ const CameraSettingFields = ({
   updateCameraConfig,
   zoomLevel,
   onZoomLevelChange,
+  updateCameraConfigError,
 }: CameraSettingsProps) => {
   const [showPwd, setShowPwd] = useState(false);
   const cameraControllerSide =
@@ -43,23 +45,20 @@ const CameraSettingFields = ({
     switch (levelstring) {
       case "1x":
         return 1;
-        break;
+
       case "2x":
         return 2;
-        break;
+
       case "4x":
         return 4;
-        break;
+
       case "8x":
         return 8;
       default:
         return 1;
     }
   };
-  const level = getZoomLevel(query.data);
 
-  console.log("level from get", level);
-  console.log("zoomLevel state", zoomLevel);
   const initialValues = useMemo<CameraSettingValues>(
     () => ({
       friendlyName: initialData?.id ?? "",
@@ -70,6 +69,7 @@ const CameraSettingFields = ({
 
       zoom: zoomLevel,
     }),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [initialData?.id, initialData?.propURI?.value, zoomLevel]
   );
 
@@ -96,7 +96,6 @@ const CameraSettingFields = ({
     mutation.mutate(zoomInOptions);
   };
   const selectedZoom = zoomLevel ?? 1;
-  console.log(selectedZoom);
   return (
     <Formik
       initialValues={initialValues}
@@ -105,7 +104,7 @@ const CameraSettingFields = ({
       validateOnChange={false}
       enableReinitialize
     >
-      {({ errors, touched }) => (
+      {({ errors, touched, isSubmitting }) => (
         <Form className="flex flex-col space-y-6 p-2">
           <div className="flex flex-col space-y-2 relative">
             <label htmlFor="friendlyName">Name</label>
@@ -184,7 +183,7 @@ const CameraSettingFields = ({
               <CardHeader title="Zoom settings" />
               <div className="mx-auto grid grid-cols-4 items-center">
                 {zoomOptions.map((zoom) => (
-                  <div key={zoom}>
+                  <div key={zoom} className="my-3">
                     <Field
                       type="radio"
                       name="zoom"
@@ -206,12 +205,20 @@ const CameraSettingFields = ({
                 ))}
               </div>
             </div>
-            <button
-              type="submit"
-              className="bg-[#26B170] text-white rounded-lg p-2 mx-auto h-[100%] w-full"
-            >
-              Save settings
-            </button>
+            <div className="mt-3">
+              {updateCameraConfigError ? (
+                <button className="bg-red-500 text-white rounded-lg p-2 mx-auto h-[100%] w-full">
+                  Retry
+                </button>
+              ) : (
+                <button
+                  type="submit"
+                  className="bg-[#26B170] text-white rounded-lg p-2 mx-auto h-[100%] w-full"
+                >
+                  {isSubmitting ? "Saving" : "Save settings"}
+                </button>
+              )}
+            </div>
           </div>
         </Form>
       )}
diff --git a/src/components/CameraSettings/CameraSettings.tsx b/src/components/CameraSettings/CameraSettings.tsx
index de79feb..2a0a68e 100644
--- a/src/components/CameraSettings/CameraSettings.tsx
+++ b/src/components/CameraSettings/CameraSettings.tsx
@@ -1,5 +1,4 @@
 import { useFetchCameraConfig } from "../../hooks/useCameraConfig";
-
 import Card from "../UI/Card";
 import CardHeader from "../UI/CardHeader";
 import CameraSettingFields from "./CameraSettingFields";
@@ -16,22 +15,23 @@ const CameraSettings = ({
   zoomLevel?: number;
   onZoomLevelChange?: (level: number) => void;
 }) => {
-  const { data, isError, isPending, updateCameraConfig } =
+  const { data, updateCameraConfig, updateCameraConfigError } =
     useFetchCameraConfig(side);
+  console.log(updateCameraConfigError);
   return (
     <Card className="overflow-hidden min-h-[40vh] md:min-h-[60vh] max-h-[80vh] lg:w-[40%] p-4">
-      {isPending && <>Loading camera config</>}
-      {isError && <>Error fetching camera config</>}
       <div className="relative flex flex-col space-y-3">
         <CardHeader title={title} icon={faWrench} />
-        {!isPending && (
+
+        {
           <CameraSettingFields
             initialData={data}
             updateCameraConfig={updateCameraConfig}
             zoomLevel={zoomLevel}
             onZoomLevelChange={onZoomLevelChange}
+            updateCameraConfigError={updateCameraConfigError}
           />
-        )}
+        }
       </div>
     </Card>
   );
diff --git a/src/components/HistoryList/AlertItem.tsx b/src/components/HistoryList/AlertItem.tsx
index ccdcb26..89838a2 100644
--- a/src/components/HistoryList/AlertItem.tsx
+++ b/src/components/HistoryList/AlertItem.tsx
@@ -15,7 +15,7 @@ type AlertItemProps = {
 
 const AlertItem = ({ item }: AlertItemProps) => {
   const [isModalOpen, setIsModalOpen] = useState(false);
-  const { dispatch } = useAlertHitContext();
+  const { dispatch, isError } = useAlertHitContext();
 
   // const {d} = useCameraBlackboard();
   const motionAway = (item?.motion ?? "").toUpperCase() === "AWAY";
@@ -24,6 +24,7 @@ const AlertItem = ({ item }: AlertItemProps) => {
   const isNPEDHitB = item?.metadata?.npedJSON?.["NPED CATEGORY"] === "B";
   const isNPEDHitC = item?.metadata?.npedJSON?.["NPED CATEGORY"] === "C";
 
+  console.log(isError);
   const handleClick = () => {
     setIsModalOpen(true);
   };
diff --git a/src/components/SettingForms/NPED/NPEDFields.tsx b/src/components/SettingForms/NPED/NPEDFields.tsx
index 0288916..6485a36 100644
--- a/src/components/SettingForms/NPED/NPEDFields.tsx
+++ b/src/components/SettingForms/NPED/NPEDFields.tsx
@@ -32,7 +32,6 @@ const NPEDFields = () => {
       ...values,
     };
     signIn(valuesToSend);
-    toast.success("Signed into NPED Successfully");
   };
 
   const validateValues = (values: NPEDFieldType) => {
diff --git a/src/components/SettingForms/System/SettingSaveRecall.tsx b/src/components/SettingForms/System/SettingSaveRecall.tsx
index 83511b9..8d9b3e7 100644
--- a/src/components/SettingForms/System/SettingSaveRecall.tsx
+++ b/src/components/SettingForms/System/SettingSaveRecall.tsx
@@ -1,3 +1,4 @@
+import { toast } from "sonner";
 import type { SystemValues } from "../../../types/types";
 import { CAM_BASE } from "../../../utils/config";
 
@@ -35,7 +36,13 @@ export async function handleSystemSave(values: SystemValues) {
       );
     }
   } catch (err) {
-    console.error(err);
+    if (err instanceof Error) {
+      toast.error(`Failed to save system settings: ${err.message}`);
+      console.error(err);
+    } else {
+      toast.error("An unexpected error occurred while saving.");
+      console.error("Unknown error:", err);
+    }
   }
 }
 
@@ -79,7 +86,12 @@ export async function handleSystemRecall() {
 
     return { deviceName, sntpServer, sntpInterval, timeZone };
   } catch (err) {
-    console.error(err);
+    if (err instanceof Error) {
+      toast.error(`Error: ${err.message}`);
+    } else {
+      toast.error("An unexpected error occurred");
+    }
+
     return null;
   } finally {
     clearTimeout(timeoutId);
diff --git a/src/components/SettingForms/System/SystemConfigFields.tsx b/src/components/SettingForms/System/SystemConfigFields.tsx
index cdc3f2e..a542212 100644
--- a/src/components/SettingForms/System/SystemConfigFields.tsx
+++ b/src/components/SettingForms/System/SystemConfigFields.tsx
@@ -7,7 +7,8 @@ import type { SystemValues, SystemValuesErrors } from "../../../types/types";
 import { useSystemConfig } from "../../../hooks/useSystemConfig";
 
 const SystemConfigFields = () => {
-  const { saveSystemSettings, systemSettingsData } = useSystemConfig();
+  const { saveSystemSettings, systemSettingsData, saveSystemSettingsLoading } =
+    useSystemConfig();
   const initialvalues: SystemValues = {
     deviceName: systemSettingsData?.deviceName ?? "",
     timeZone: systemSettingsData?.timeZone ?? "",
@@ -37,7 +38,7 @@ const SystemConfigFields = () => {
       validateOnChange
       validateOnBlur
     >
-      {({ values, errors, touched }) => (
+      {({ values, errors, touched, isSubmitting }) => (
         <Form className="flex flex-col space-y-5 px-2">
           <FormGroup>
             <label
@@ -131,8 +132,9 @@ const SystemConfigFields = () => {
           <button
             type="submit"
             className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
+            disabled={isSubmitting}
           >
-            Save System Settings
+            {saveSystemSettingsLoading ? "Saving..." : "Save System Settings"}
           </button>
           <SystemFileUpload
             name={"softwareUpdate"}
diff --git a/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx b/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx
index ccf6402..9ebd17a 100644
--- a/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx
+++ b/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx
@@ -4,7 +4,6 @@ import type { ModemSettingsType } from "../../../types/types";
 import { useWifiAndModem } from "../../../hooks/useCameraWifiandModem";
 import { useEffect, useState } from "react";
 import ModemToggle from "./ModemToggle";
-import { toast } from "sonner";
 
 const ModemSettings = () => {
   const [showSettings, setShowSettings] = useState(false);
@@ -50,11 +49,6 @@ const ModemSettings = () => {
       ],
     };
     modemMutation.mutate(modemConfig);
-    if (modemMutation.error) {
-      toast.error("Failed to update modem settings");
-      return;
-    }
-    toast.success("Modem settings updated");
   };
 
   return (
diff --git a/src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx b/src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx
index fc646c3..92898ab 100644
--- a/src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx
+++ b/src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx
@@ -2,7 +2,6 @@ import { Field, Form, Formik } from "formik";
 import FormGroup from "../components/FormGroup";
 import type { WifiSettingValues } from "../../../types/types";
 import { useWifiAndModem } from "../../../hooks/useCameraWifiandModem";
-import { toast } from "sonner";
 import { useState } from "react";
 import { faEyeSlash, faEye } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -36,12 +35,6 @@ const WiFiSettingsForm = () => {
     };
 
     wifiMutation.mutate(wifiConfig);
-
-    if (wifiMutation.error) {
-      toast.error("Failed to update WiFi settings");
-      return;
-    }
-    toast.success("WiFi settings updated");
   };
   return (
     <Formik
diff --git a/src/components/SightingOverview/SightingOverview.tsx b/src/components/SightingOverview/SightingOverview.tsx
index 939a81d..bf522ec 100644
--- a/src/components/SightingOverview/SightingOverview.tsx
+++ b/src/components/SightingOverview/SightingOverview.tsx
@@ -5,6 +5,7 @@ import { useSightingFeedContext } from "../../context/SightingFeedContext";
 import { useHiDPICanvas } from "../../hooks/useHiDPICanvas";
 import NavigationArrow from "../UI/NavigationArrow";
 import NumberPlate from "../PlateStack/NumberPlate";
+import Loading from "../UI/Loading";
 
 const SightingOverview = () => {
   const [overlayMode, setOverlayMode] = useState<0 | 1 | 2>(0);
@@ -22,18 +23,11 @@ const SightingOverview = () => {
 
   const { sync } = useHiDPICanvas(imgRef, canvasRef);
 
-  if (!mostRecent)
-    return (
-      <div className="h-150 flex items-center justify-center text-3xl animate-pulse">
-        <NavigationArrow side={side} />
-        <p>No Recent Sightings</p>
-      </div>
-    );
   if (isLoading)
     return (
-      <div className="h-150 flex items-center justify-center text-3xl animate-pulse">
+      <div className="h-150 flex items-center justify-center">
         <NavigationArrow side={side} />
-        <p>Loading</p>
+        <Loading message="Loading" />
       </div>
     );
 
@@ -42,6 +36,14 @@ const SightingOverview = () => {
     An error occurred. Cannot display footage.
   </div>;
 
+  if (!mostRecent)
+    return (
+      <div className="h-150 flex items-center justify-center text-3xl animate-pulse">
+        <NavigationArrow side={side} />
+        <Loading message="No Recent Sightings" />
+      </div>
+    );
+
   return (
     <div className="flex flex-col md:flex-row">
       <NavigationArrow side={side} />
diff --git a/src/components/SightingsWidget/SightingWidget.tsx b/src/components/SightingsWidget/SightingWidget.tsx
index ee5936d..3305233 100644
--- a/src/components/SightingsWidget/SightingWidget.tsx
+++ b/src/components/SightingsWidget/SightingWidget.tsx
@@ -16,6 +16,7 @@ import popup from "../../assets/sounds/ui/popup_open.mp3";
 import { useSound } from "react-sounds";
 import { useNPEDContext } from "../../context/NPEDUserContext";
 import { useSoundContext } from "../../context/SoundContext";
+import Loading from "../UI/Loading";
 
 function useNow(tickMs = 1000) {
   const [, setNow] = useState(() => Date.now());
@@ -54,6 +55,7 @@ export default function SightingHistoryWidget({
     isSightingModalOpen,
     selectedSighting,
     mostRecent,
+    isLoading,
   } = useSightingFeedContext();
 
   const { dispatch } = useAlertHitContext();
@@ -64,6 +66,7 @@ export default function SightingHistoryWidget({
       if (!mostRecent) return;
       setSessionList([...sessionList, mostRecent]);
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mostRecent, sessionStarted, setSessionList]);
 
   const hasAutoOpenedRef = useRef(false);
@@ -127,6 +130,11 @@ export default function SightingHistoryWidget({
       >
         <CardHeader title={title} />
         <div className="flex flex-col gap-3 ">
+          {isLoading && (
+            <div className="my-50 h-[50%]">
+              <Loading message="Loading Sightings" />
+            </div>
+          )}
           {/* Rows */}
           <div className="flex flex-col">
             {rows?.map((obj) => {
diff --git a/src/components/UI/ErrorState.tsx b/src/components/UI/ErrorState.tsx
new file mode 100644
index 0000000..731bf27
--- /dev/null
+++ b/src/components/UI/ErrorState.tsx
@@ -0,0 +1,162 @@
+import type { IconDefinition } from "@fortawesome/fontawesome-svg-core";
+import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
+import {
+  faTriangleExclamation,
+  faRotateRight,
+  faChevronDown,
+  faChevronUp,
+  faClipboard,
+} from "@fortawesome/free-solid-svg-icons";
+import { useState, type FC } from "react";
+
+type Variant = "inline" | "card" | "banner";
+
+export type ErrorStateProps = {
+  /** Main heading shown to the user */
+  title?: string;
+  /** Friendly message for the user */
+  message?: string;
+  /** Raw error to help devs (object, string, whatever) */
+  error?: unknown;
+  /** Called when user clicks Retry */
+  onRetry?: () => Promise<void> | void;
+  /** Show a Retry button */
+  showRetry?: boolean;
+  /** Optional custom icon */
+  icon?: IconDefinition;
+  /** Visual style */
+  variant?: Variant;
+  /** Additional actions (e.g. “Report”) */
+  actions?: React.ReactNode;
+  /** Test id for testing */
+  "data-testid"?: string;
+  /** ClassName passthrough */
+  className?: string;
+};
+
+function formatError(err: unknown) {
+  if (!err) return "";
+  if (typeof err === "string") return err;
+  if (err instanceof Error) return err.stack || err.message;
+  try {
+    return JSON.stringify(err, null, 2);
+  } catch {
+    return String(err);
+  }
+}
+
+const baseStyles = "w-full text-left flex items-start gap-3 rounded-md border";
+
+const variants: Record<Variant, string> = {
+  inline: "p-3 border-red-200 bg-red-50 text-red-800",
+  card: "p-4 border-red-200 bg-red-50 text-red-800 shadow-sm",
+  banner: "p-3 border-red-200 bg-red-50 text-red-800 rounded-none border-x-0",
+};
+
+export const ErrorState: FC<ErrorStateProps> = ({
+  title = "Something went wrong",
+  message = "Please try again or contact support if the problem persists.",
+  error,
+  onRetry,
+  showRetry = !!onRetry,
+  icon = faTriangleExclamation,
+  variant = "inline",
+  actions,
+  className = "",
+  ...rest
+}) => {
+  const [expanded, setExpanded] = useState(false);
+  const [retrying, setRetrying] = useState(false);
+
+  const details = formatError(error);
+
+  async function handleRetry() {
+    if (!onRetry) return;
+    try {
+      setRetrying(true);
+      await onRetry();
+    } finally {
+      setRetrying(false);
+    }
+  }
+
+  function copyDetails() {
+    if (!details) return;
+    navigator.clipboard?.writeText(details).catch(() => {});
+  }
+
+  return (
+    <div
+      role="alert"
+      aria-live="assertive"
+      className={`${baseStyles} ${variants[variant]} ${className}`}
+      {...rest}
+    >
+      <div className="mt-0.5">
+        <FontAwesomeIcon icon={icon} className="h-5 w-5" />
+      </div>
+
+      <div className="flex-1 space-y-1">
+        <h3 className="font-medium">{title}</h3>
+        {message && <p className="text-sm opacity-90">{message}</p>}
+
+        {/* Controls */}
+        <div className="flex flex-wrap items-center gap-2 pt-1">
+          {showRetry && (
+            <button
+              type="button"
+              onClick={handleRetry}
+              disabled={retrying}
+              className="inline-flex items-center gap-2 px-3 py-1.5 rounded-md bg-red-600 text-white text-sm hover:bg-red-700 disabled:opacity-60"
+            >
+              <FontAwesomeIcon icon={faRotateRight} className="h-4 w-4" />
+              {retrying ? "Retrying…" : "Retry"}
+            </button>
+          )}
+
+          {details && (
+            <>
+              <button
+                type="button"
+                onClick={() => setExpanded((v) => !v)}
+                className="inline-flex items-center gap-2 px-3 py-1.5 rounded-md border text-sm hover:bg-white/50"
+                aria-expanded={expanded}
+                aria-controls="error-details"
+              >
+                <FontAwesomeIcon
+                  icon={expanded ? faChevronUp : faChevronDown}
+                  className="h-4 w-4"
+                />
+                {expanded ? "Hide details" : "Show details"}
+              </button>
+
+              <button
+                type="button"
+                onClick={copyDetails}
+                className="inline-flex items-center gap-2 px-3 py-1.5 rounded-md border text-sm hover:bg-white/50"
+                aria-label="Copy error details"
+              >
+                <FontAwesomeIcon icon={faClipboard} className="h-4 w-4" />
+                Copy details
+              </button>
+            </>
+          )}
+
+          {actions}
+        </div>
+
+        {/* Dev details (collapsible) */}
+        {expanded && details && (
+          <pre
+            id="error-details"
+            className="mt-2 max-h-64 overflow-auto text-xs leading-relaxed bg-white/60 text-red-900 border rounded p-3"
+          >
+            {details}
+          </pre>
+        )}
+      </div>
+    </div>
+  );
+};
+
+export default ErrorState;
diff --git a/src/components/UI/Loading.tsx b/src/components/UI/Loading.tsx
new file mode 100644
index 0000000..e0facc3
--- /dev/null
+++ b/src/components/UI/Loading.tsx
@@ -0,0 +1,14 @@
+type LoadingProps = {
+  message?: string;
+};
+
+const Loading = ({ message }: LoadingProps) => {
+  return (
+    <div className="flex flex-col items-center justify-center py-6">
+      <div className="animate-spin rounded-full h-8 w-8 border-t-2 border-b-2 border-gray-500 mb-2"></div>
+      {message && <p className="text-lg text-gray-500">{message}</p>}
+    </div>
+  );
+};
+
+export default Loading;
diff --git a/src/context/providers/AlertHitProvider.tsx b/src/context/providers/AlertHitProvider.tsx
index 0281d58..a9410a7 100644
--- a/src/context/providers/AlertHitProvider.tsx
+++ b/src/context/providers/AlertHitProvider.tsx
@@ -17,10 +17,6 @@ export const AlertHitProvider = ({ children }: AlertHitProviderTypeProps) => {
       query?.data?.alertHistory?.forEach((element: SightingType) => {
         dispatch({ type: "ADD", payload: element });
       });
-    } else if (query.error) {
-      console.error("Error fetching alert hits:", query.error);
-    } else {
-      console.log("Loading alert hits...");
     }
   }, [query.data, query.error, query.isLoading]);
 
diff --git a/src/hooks/useCameraBlackboard.ts b/src/hooks/useCameraBlackboard.ts
index 81c16a8..e490411 100644
--- a/src/hooks/useCameraBlackboard.ts
+++ b/src/hooks/useCameraBlackboard.ts
@@ -1,9 +1,13 @@
 import { useMutation, useQuery } from "@tanstack/react-query";
 import { CAM_BASE } from "../utils/config";
 import type { CameraBlackBoardOptions } from "../types/types";
+import { useEffect } from "react";
+import { toast } from "sonner";
 
 const getAllBlackboardData = async () => {
-  const response = await fetch(`${CAM_BASE}/api/blackboard`);
+  const response = await fetch(`${CAM_BASE}/api/blackboard`, {
+    signal: AbortSignal.timeout(500),
+  });
   if (!response.ok) {
     throw new Error("Failed to fetch blackboard data");
   }
@@ -36,7 +40,14 @@ export const useCameraBlackboard = () => {
         path: options?.path,
         value: options?.value,
       }),
+    onError: (error) => {
+      toast.error(`cannot get data: ${error.message}`);
+    },
   });
 
+  useEffect(() => {
+    if (query.isError) toast.error(query.error.message);
+  }, [query?.error?.message, query.isError]);
+
   return { query, mutation };
 };
diff --git a/src/hooks/useCameraConfig.ts b/src/hooks/useCameraConfig.ts
index c07d540..a7b3f37 100644
--- a/src/hooks/useCameraConfig.ts
+++ b/src/hooks/useCameraConfig.ts
@@ -4,10 +4,14 @@ import { CAM_BASE } from "../utils/config";
 
 const base_url = `${CAM_BASE}/api`;
 
+const fetch_url = `http://100.82.205.44/api/fetch-config?id=Colour`;
+console.log(fetch_url);
 const fetchCameraSideConfig = async ({ queryKey }: { queryKey: string[] }) => {
   const [, cameraSide] = queryKey;
   const fetchUrl = `${base_url}/fetch-config?id=${cameraSide}`;
-  const response = await fetch(fetchUrl);
+  const response = await fetch(fetchUrl, {
+    signal: AbortSignal.timeout(500),
+  });
   if (!response.ok) throw new Error("cannot react cameraSide ");
   return response.json();
 };
@@ -53,5 +57,6 @@ export const useFetchCameraConfig = (cameraSide: string) => {
     isError: fetchedConfigQuery.isError,
     updateCameraConfig: updateConfigMutation.mutate,
     updateCameraConfigError: updateConfigMutation.error,
+    updateCameraConfigLoading: updateConfigMutation.isPending,
   };
 };
diff --git a/src/hooks/useCameraWifiandModem.ts b/src/hooks/useCameraWifiandModem.ts
index d501a6b..0abb631 100644
--- a/src/hooks/useCameraWifiandModem.ts
+++ b/src/hooks/useCameraWifiandModem.ts
@@ -1,10 +1,15 @@
 import { useQuery, useMutation } from "@tanstack/react-query";
 import { CAM_BASE } from "../utils/config";
 import type { ModemConfig, WifiConfig } from "../types/types";
+import { useEffect } from "react";
+import { toast } from "sonner";
 
 const getWiFiSettings = async () => {
   const response = await fetch(
-    `${CAM_BASE}/api/fetch-config?id=ModemAndWifiManager-wifi`
+    `${CAM_BASE}/api/fetch-config?id=ModemAndWifiManager-wifi`,
+    {
+      signal: AbortSignal.timeout(500),
+    }
   );
   if (!response.ok) {
     throw new Error("Cannot fetch Wifi settings");
@@ -29,7 +34,10 @@ const updateWifiSettings = async (wifiConfig: WifiConfig) => {
 
 const getModemSettings = async () => {
   const response = await fetch(
-    `${CAM_BASE}/api/fetch-config?id=ModemAndWifiManager-modem`
+    `${CAM_BASE}/api/fetch-config?id=ModemAndWifiManager-modem`,
+    {
+      signal: AbortSignal.timeout(500),
+    }
   );
   if (!response.ok) {
     throw new Error("Cannot fetch modem settings");
@@ -61,7 +69,13 @@ export const useWifiAndModem = () => {
   const wifiMutation = useMutation({
     mutationKey: ["updateWifiSettings"],
     mutationFn: (wifiConfig: WifiConfig) => updateWifiSettings(wifiConfig),
-    onError: (error) => console.log(error),
+    onError: (error) => {
+      toast.error("Failed to update WiFi settings");
+      console.error(error);
+    },
+    onSuccess: () => {
+      toast.success("WiFi settings updated successfully");
+    },
   });
 
   const modemQuery = useQuery({
@@ -72,8 +86,22 @@ export const useWifiAndModem = () => {
   const modemMutation = useMutation({
     mutationKey: ["updateModemSettings"],
     mutationFn: (modemConfig: ModemConfig) => updateModemSettings(modemConfig),
+    onError: (error) => {
+      toast.error("Failed to update Modem settings");
+      console.error(error);
+    },
+    onSuccess: () => {
+      toast.success("Modem settings updated successfully");
+    },
   });
 
+  useEffect(() => {
+    if (wifiQuery.isError) toast.error("Cannot get WiFi settings");
+  }, [wifiQuery?.error?.message, wifiQuery.isError]);
+
+  useEffect(() => {
+    if (modemQuery.isError) toast.error("Cannot get Modem settings");
+  }, [modemQuery?.error?.message, modemQuery.isError]);
   return {
     wifiQuery,
     wifiMutation,
diff --git a/src/hooks/useCameraZoom.ts b/src/hooks/useCameraZoom.ts
index 7d310d8..9134c0f 100644
--- a/src/hooks/useCameraZoom.ts
+++ b/src/hooks/useCameraZoom.ts
@@ -8,7 +8,10 @@ import type { zoomConfig, ZoomInOptions } from "../types/types";
 
 async function zoomIn(options: ZoomInOptions) {
   const response = await fetch(
-    `${CAM_BASE}/Ip${options.camera}-command?magnification=${options.multiplier}x`
+    `${CAM_BASE}/Ip${options.camera}-command?magnification=${options.multiplier}x`,
+    {
+      signal: AbortSignal.timeout(500),
+    }
   );
   if (!response.ok) {
     throw new Error("Cannot reach camera zoom endpoint");
@@ -21,7 +24,9 @@ async function fetchZoomInConfig({
   queryKey,
 }: QueryFunctionContext<[string, zoomConfig]>) {
   const [, { camera }] = queryKey;
-  const response = await fetch(`${CAM_BASE}/Ip${camera}-inspect`);
+  const response = await fetch(`${CAM_BASE}/Ip${camera}-inspect`, {
+    signal: AbortSignal.timeout(500),
+  });
   if (!response.ok) {
     throw new Error("Cannot get camera zoom settings");
   }
diff --git a/src/hooks/useGetOverviewSnapshot.ts b/src/hooks/useGetOverviewSnapshot.ts
index 9ca68b8..294e8ab 100644
--- a/src/hooks/useGetOverviewSnapshot.ts
+++ b/src/hooks/useGetOverviewSnapshot.ts
@@ -3,9 +3,11 @@ import { useQuery } from "@tanstack/react-query";
 import { CAM_BASE } from "../utils/config";
 
 const apiUrl = CAM_BASE;
-
+// const fetch_url = `http://100.82.205.44/Colour-preview`;
 async function fetchSnapshot(cameraSide: string) {
-  const response = await fetch(`${apiUrl}/${cameraSide}-preview`);
+  const response = await fetch(`${apiUrl}/${cameraSide}-preview`, {
+    signal: AbortSignal.timeout(500),
+  });
   if (!response.ok) {
     throw new Error("Cannot reach endpoint");
   }
@@ -75,9 +77,5 @@ export function useGetOverviewSnapshot(side: string) {
     };
   }, [drawImage]);
 
-  if (isError) {
-    console.error("Snapshot error:", error);
-  }
-
-  return { canvasRef, isError, isPending };
+  return { canvasRef, isError, error, isPending };
 }
diff --git a/src/hooks/useNPEDAuth.ts b/src/hooks/useNPEDAuth.ts
index f1844d4..619f4e5 100644
--- a/src/hooks/useNPEDAuth.ts
+++ b/src/hooks/useNPEDAuth.ts
@@ -3,10 +3,13 @@ import type { NPEDFieldType } from "../types/types";
 import { useNPEDContext } from "../context/NPEDUserContext";
 import { useEffect } from "react";
 import { CAM_BASE } from "../utils/config";
+import { toast } from "sonner";
 
 async function fetchNPEDDetails() {
   const fetchUrl = `${CAM_BASE}/api/fetch-config?id=NPED`;
-  const response = await fetch(fetchUrl);
+  const response = await fetch(fetchUrl, {
+    signal: AbortSignal.timeout(500),
+  });
   if (!response.ok) throw new Error("Cannot reach fetch-config endpoint");
 
   return response.json();
@@ -14,43 +17,37 @@ async function fetchNPEDDetails() {
 
 async function signIn(loginDetails: NPEDFieldType) {
   const { frontId, rearId, username, password, clientId } = loginDetails;
+
   const NPEDLoginURLFront = `${CAM_BASE}/api/update-config?id=${frontId}`;
   const NPEDLoginURLRear = `${CAM_BASE}/api/update-config?id=${rearId}`;
-  const frontCameraPayload = {
-    id: frontId,
+
+  const payload = (id: string) => ({
+    id,
     fields: [
       { property: "propEnabled", value: true },
       { property: "propUsername", value: username },
       { property: "propPassword", value: password },
       { property: "propClientID", value: clientId },
     ],
-  };
-
-  const rearCameraPayload = {
-    id: rearId,
-    fields: [
-      { property: "propEnabled", value: true },
-      { property: "propUsername", value: username },
-      { property: "propPassword", value: password },
-      { property: "propClientID", value: clientId },
-    ],
-  };
-  const frontCameraResponse = await fetch(NPEDLoginURLFront, {
-    method: "POST",
-    body: JSON.stringify(frontCameraPayload),
   });
 
-  const rearCameraResponse = await fetch(NPEDLoginURLRear, {
-    method: "POST",
-    body: JSON.stringify(rearCameraPayload),
-  });
+  const [frontRes, rearRes] = await Promise.all([
+    fetch(NPEDLoginURLFront, {
+      method: "POST",
+      body: JSON.stringify(payload(frontId)),
+    }),
+    fetch(NPEDLoginURLRear, {
+      method: "POST",
+      body: JSON.stringify(payload(rearId)),
+    }),
+  ]);
 
-  if (!frontCameraResponse.ok) throw new Error("cannot reach NPED endpoint");
-  if (!rearCameraResponse.ok) throw new Error("cannot reach NPED endpoint");
+  if (!frontRes.ok || !rearRes.ok)
+    throw new Error("Cannot reach NPED endpoint");
 
   return {
-    frontResponse: frontCameraResponse.json(),
-    rearResponse: rearCameraResponse.json(),
+    frontResponse: frontRes.json(),
+    rearResponse: rearRes.json(),
   };
 }
 
@@ -81,12 +78,34 @@ export const useNPEDAuth = () => {
   const signInMutation = useMutation({
     mutationKey: ["NPEDSignin"],
     mutationFn: signIn,
-    onSuccess: async (data) => setUser(await data.frontResponse),
+    onMutate: () => {
+      toast.loading("Signing in...");
+    },
+    onSuccess: async (data) => {
+      toast.dismiss();
+      toast.success("Signed in successfully!");
+      setUser(await data.frontResponse);
+    },
+    onError: (error) => {
+      toast.dismiss();
+      if (error.message.includes("timed out")) {
+        toast.error("Connection timed out. Please check your network.");
+      } else {
+        toast.error(`Sign-in failed: ${error.message}`);
+      }
+    },
   });
 
   const signOutMutation = useMutation({
     mutationKey: ["auth", "NPEDSignOut"],
     mutationFn: signOut,
+    onSuccess: () => {
+      toast.success("Signed out successfully");
+      setUser(null);
+    },
+    onError: (error) => {
+      toast.error(`Sign-out failed: ${error.message}`);
+    },
   });
 
   const fetchdataQuery = useQuery({
@@ -102,6 +121,10 @@ export const useNPEDAuth = () => {
     }
   }, [fetchdataQuery.data, fetchdataQuery.isSuccess, setUser]);
 
+  useEffect(() => {
+    if (fetchdataQuery.isError) toast.error(fetchdataQuery.error.message);
+  }, [fetchdataQuery?.error?.message, fetchdataQuery.isError]);
+
   return {
     signIn: signInMutation.mutate,
     signInAsync: signInMutation.mutateAsync,
@@ -109,6 +132,8 @@ export const useNPEDAuth = () => {
     isError: signInMutation.isError,
     error: signInMutation.error,
     data: signInMutation.data,
+    fetchdataQueryError: fetchdataQuery.error,
+    fetchdataQueryLoading: fetchdataQuery.isLoading,
     user,
     setUser,
     signOut: signOutMutation.mutate,
diff --git a/src/hooks/useSightingFeed.ts b/src/hooks/useSightingFeed.ts
index 8f742ff..6f5e51d 100644
--- a/src/hooks/useSightingFeed.ts
+++ b/src/hooks/useSightingFeed.ts
@@ -10,7 +10,9 @@ async function fetchSighting(
   url: string | undefined,
   ref: number
 ): Promise<SightingType> {
-  const res = await fetch(`${url}${ref}`);
+  const res = await fetch(`${url}${ref}`, {
+    signal: AbortSignal.timeout(5000),
+  });
   if (!res.ok) throw new Error(String(res.status));
   return res.json();
 }
diff --git a/src/hooks/useSystemConfig.ts b/src/hooks/useSystemConfig.ts
index 407112e..6e3a2da 100644
--- a/src/hooks/useSystemConfig.ts
+++ b/src/hooks/useSystemConfig.ts
@@ -17,7 +17,7 @@ export const useSystemConfig = () => {
   const saveSystemSettings = useMutation({
     mutationKey: ["systemSaveSettings"],
     mutationFn: handleSystemSave,
-    onSuccess: () => toast("System Settings Saved Successfully!"),
+    onError: (error) => console.error(error.message),
   });
 
   const getSystemSettings = useQuery({
@@ -28,5 +28,8 @@ export const useSystemConfig = () => {
     uploadSettings: uploadSettingsMutation.mutate,
     saveSystemSettings: saveSystemSettings.mutate,
     systemSettingsData: getSystemSettings.data,
+    systemSettingsError: getSystemSettings.error,
+    saveSystemSettingsError: saveSystemSettings.isError,
+    saveSystemSettingsLoading: saveSystemSettings.isPending,
   };
 };
diff --git a/src/pages/Dashboard.tsx b/src/pages/Dashboard.tsx
index fb0182a..2a94a9f 100644
--- a/src/pages/Dashboard.tsx
+++ b/src/pages/Dashboard.tsx
@@ -1,12 +1,14 @@
 import FrontCameraOverviewCard from "../components/FrontCameraOverview/FrontCameraOverviewCard";
 import SightingHistoryWidget from "../components/SightingsWidget/SightingWidget";
 import { SightingFeedProvider } from "../context/providers/SightingFeedProvider";
-import { CAM_BASE } from "../utils/config";
+import { CAM_BASE, OUTSIDE_CAM_BASE } from "../utils/config";
 
 const Dashboard = () => {
   const mode = import.meta.env.MODE;
   const base_url = `${CAM_BASE}/SightingList/sightingSummary?mostRecentRef=`;
+  // const outside_url = `http://100.82.205.44/mergedHistory/sightingSummary?mostRecentRef=`;
   console.log(mode);
+  console.log(OUTSIDE_CAM_BASE);
   return (
     <SightingFeedProvider url={base_url}>
       <div className="mx-auto flex flex-col lg:flex-row gap-2 px-1 sm:px-2 lg:px-0 w-full min-h-screen">
diff --git a/src/pages/Session.tsx b/src/pages/Session.tsx
index cbb682b..058bf84 100644
--- a/src/pages/Session.tsx
+++ b/src/pages/Session.tsx
@@ -1,3 +1,4 @@
+import { Toaster } from "sonner";
 import HistoryList from "../components/HistoryList/HistoryList.tsx";
 import HitSearchCard from "../components/SessionForm/HitSearchCard.tsx";
 import SessionCard from "../components/SessionForm/SessionCard.tsx";
@@ -15,6 +16,7 @@ const Session = () => {
         <div className="col-span-2">
           <HistoryList />
         </div>
+        <Toaster />
       </div>
     </SightingFeedProvider>
   );
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index ba8ea90..ebd8391 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -21,7 +21,7 @@ const randomChars = () => {
 
 export function parseRTSPUrl(url: string) {
   const regex = /rtsp:\/\/([^:]+):([^@]+)@([^:/]+):?(\d+)?(\/.*)?/;
-  const match = url.match(regex);
+  const match = url?.match(regex);
 
   if (!match) {
     return null;

From a95c9077c4464f4b2406ac408f7ca082ce51bb04 Mon Sep 17 00:00:00 2001
From: Toba Ojo <toba.ojo@mav-systems.com>
Date: Mon, 6 Oct 2025 15:18:58 +0100
Subject: [PATCH 2/2] more enhancements to loading and error feedback

---
 .../SettingForms/NPED/NPEDFields.tsx          |   8 +-
 .../SettingForms/WiFi&Modem/ModemSettings.tsx | 146 +++++++++---------
 .../WiFi&Modem/WiFiSettingsForm.tsx           |  10 +-
 .../SightingOverview/SightingCanvas.tsx       |  15 --
 src/hooks/useCameraBlackboard.ts              |   7 +-
 src/hooks/useCameraConfig.ts                  |   2 -
 src/hooks/useCameraWifiandModem.ts            |  18 ++-
 src/hooks/useCameraZoom.ts                    |   4 +
 src/hooks/useLatestSighting.ts                |  60 -------
 src/hooks/useSystemConfig.ts                  |  24 ++-
 10 files changed, 127 insertions(+), 167 deletions(-)
 delete mode 100644 src/components/SightingOverview/SightingCanvas.tsx
 delete mode 100644 src/hooks/useLatestSighting.ts

diff --git a/src/components/SettingForms/NPED/NPEDFields.tsx b/src/components/SettingForms/NPED/NPEDFields.tsx
index 6485a36..ee0c9ee 100644
--- a/src/components/SettingForms/NPED/NPEDFields.tsx
+++ b/src/components/SettingForms/NPED/NPEDFields.tsx
@@ -27,11 +27,11 @@ const NPEDFields = () => {
         rearId: "NPED",
       };
 
-  const handleSubmit = (values: NPEDFieldType) => {
+  const handleSubmit = async (values: NPEDFieldType) => {
     const valuesToSend = {
       ...values,
     };
-    signIn(valuesToSend);
+    await signIn(valuesToSend);
   };
 
   const validateValues = (values: NPEDFieldType) => {
@@ -54,7 +54,7 @@ const NPEDFields = () => {
       validate={validateValues}
       enableReinitialize
     >
-      {({ errors, touched }) => (
+      {({ errors, touched, isSubmitting }) => (
         <Form className="flex flex-col space-y-5 px-2">
           <FormGroup>
             <label htmlFor="username">Username</label>
@@ -112,7 +112,7 @@ const NPEDFields = () => {
               type="submit"
               className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 hover:cursor-pointer"
             >
-              Login
+              {isSubmitting ? "Logging in..." : "Login"}
             </button>
           ) : (
             <button
diff --git a/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx b/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx
index 9ebd17a..c031de8 100644
--- a/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx
+++ b/src/components/SettingForms/WiFi&Modem/ModemSettings.tsx
@@ -25,7 +25,7 @@ const ModemSettings = () => {
     authenticationType: "PAP",
   };
 
-  const handleSubmit = (values: ModemSettingsType) => {
+  const handleSubmit = async (values: ModemSettingsType) => {
     const modemConfig = {
       id: "ModemAndWifiManager-modem",
       fields: [
@@ -48,7 +48,7 @@ const ModemSettings = () => {
         },
       ],
     };
-    modemMutation.mutate(modemConfig);
+    await modemMutation.mutateAsync(modemConfig);
   };
 
   return (
@@ -63,76 +63,80 @@ const ModemSettings = () => {
           onSubmit={handleSubmit}
           enableReinitialize
         >
-          <Form className="flex flex-col space-y-5 px-2">
-            <FormGroup>
-              <label
-                htmlFor="apn"
-                className="font-medium whitespace-nowrap md:w-2/3"
+          {({ isSubmitting }) => (
+            <Form className="flex flex-col space-y-5 px-2">
+              <FormGroup>
+                <label
+                  htmlFor="apn"
+                  className="font-medium whitespace-nowrap md:w-2/3"
+                >
+                  APN
+                </label>
+                <Field
+                  placeholder="Enter APN"
+                  name="apn"
+                  id="apn"
+                  type="text"
+                  className="p-1.5 border border-gray-400 rounded-lg"
+                />
+              </FormGroup>
+              <FormGroup>
+                <label
+                  htmlFor="username"
+                  className="font-medium whitespace-nowrap md:w-2/3"
+                >
+                  Username
+                </label>
+                <Field
+                  placeholder="Enter Username"
+                  name="username"
+                  id="username"
+                  type="text"
+                  className="p-1.5 border border-gray-400 rounded-lg"
+                />
+              </FormGroup>
+              <FormGroup>
+                <label
+                  htmlFor="password"
+                  className="font-medium whitespace-nowrap md:w-2/3"
+                >
+                  Password
+                </label>
+                <Field
+                  placeholder="Enter Password"
+                  name="password"
+                  id="password"
+                  type="text"
+                  className="p-1.5 border border-gray-400 rounded-lg"
+                />
+              </FormGroup>
+              <FormGroup>
+                <label
+                  htmlFor="password"
+                  className="font-medium whitespace-nowrap md:w-2/3"
+                >
+                  Password
+                </label>
+                <Field
+                  name="authenticationType"
+                  as="select"
+                  className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] flex-1 w-2/3"
+                >
+                  <option value="PAP">PAP</option>
+                  <option value="CHAP">CHAP</option>
+                  <option value="none">None</option>
+                </Field>
+              </FormGroup>
+              <button
+                type="submit"
+                className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
               >
-                APN
-              </label>
-              <Field
-                placeholder="Enter APN"
-                name="apn"
-                id="apn"
-                type="text"
-                className="p-1.5 border border-gray-400 rounded-lg"
-              />
-            </FormGroup>
-            <FormGroup>
-              <label
-                htmlFor="username"
-                className="font-medium whitespace-nowrap md:w-2/3"
-              >
-                Username
-              </label>
-              <Field
-                placeholder="Enter Username"
-                name="username"
-                id="username"
-                type="text"
-                className="p-1.5 border border-gray-400 rounded-lg"
-              />
-            </FormGroup>
-            <FormGroup>
-              <label
-                htmlFor="password"
-                className="font-medium whitespace-nowrap md:w-2/3"
-              >
-                Password
-              </label>
-              <Field
-                placeholder="Enter Password"
-                name="password"
-                id="password"
-                type="text"
-                className="p-1.5 border border-gray-400 rounded-lg"
-              />
-            </FormGroup>
-            <FormGroup>
-              <label
-                htmlFor="password"
-                className="font-medium whitespace-nowrap md:w-2/3"
-              >
-                Password
-              </label>
-              <Field
-                name="authenticationType"
-                as="select"
-                className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] flex-1 w-2/3"
-              >
-                <option value="PAP">PAP</option>
-                <option value="CHAP">CHAP</option>
-                <option value="none">None</option>
-              </Field>
-            </FormGroup>
-            <button
-              type="submit"
-              className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
-            >
-              Save Modem settings
-            </button>
-          </Form>
+                {isSubmitting || modemMutation.isPending
+                  ? "Saving..."
+                  : "Save Modem settings"}
+              </button>
+            </Form>
+          )}
         </Formik>
       )}
     </>
diff --git a/src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx b/src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx
index 92898ab..ece30e3 100644
--- a/src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx
+++ b/src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx
@@ -19,7 +19,7 @@ const WiFiSettingsForm = () => {
     encryption: "WPA2",
   };
 
-  const handleSubmit = (values: WifiSettingValues) => {
+  const handleSubmit = async (values: WifiSettingValues) => {
     const wifiConfig = {
       id: "ModemAndWifiManager-wifi",
       fields: [
@@ -34,7 +34,7 @@ const WiFiSettingsForm = () => {
       ],
     };
 
-    wifiMutation.mutate(wifiConfig);
+    await wifiMutation.mutateAsync(wifiConfig);
   };
   return (
     <Formik
@@ -42,7 +42,7 @@ const WiFiSettingsForm = () => {
       onSubmit={handleSubmit}
       enableReinitialize
     >
-      {() => (
+      {({ isSubmitting }) => (
         <Form className="flex flex-col space-y-5 px-2">
           <FormGroup>
             <label
@@ -103,7 +103,9 @@ const WiFiSettingsForm = () => {
             type="submit"
             className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
           >
-            Save WiFi settings
+            {isSubmitting || wifiMutation.isPending
+              ? "Saving..."
+              : " Save WiFi settings"}
           </button>
         </Form>
       )}
diff --git a/src/components/SightingOverview/SightingCanvas.tsx b/src/components/SightingOverview/SightingCanvas.tsx
deleted file mode 100644
index 42d1058..0000000
--- a/src/components/SightingOverview/SightingCanvas.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { useLatestSighting } from "../../hooks/useLatestSighting";
-
-const SightingCanvas = () => {
-  const { canvasRef } = useLatestSighting();
-  return (
-    <div className="w-70 flex flex-col">
-      <canvas
-        ref={canvasRef}
-        className="items-center w-full h-10 object-contain block"
-      />
-    </div>
-  );
-};
-
-export default SightingCanvas;
diff --git a/src/hooks/useCameraBlackboard.ts b/src/hooks/useCameraBlackboard.ts
index e490411..f344ff1 100644
--- a/src/hooks/useCameraBlackboard.ts
+++ b/src/hooks/useCameraBlackboard.ts
@@ -41,12 +41,15 @@ export const useCameraBlackboard = () => {
         value: options?.value,
       }),
     onError: (error) => {
-      toast.error(`cannot get data: ${error.message}`);
+      toast.error(`cannot get data: ${error.message}`, {
+        id: "viewBlackboardData",
+      });
     },
   });
 
   useEffect(() => {
-    if (query.isError) toast.error(query.error.message);
+    if (query.isError)
+      toast.error(query.error.message, { id: "viewBlackboardData" });
   }, [query?.error?.message, query.isError]);
 
   return { query, mutation };
diff --git a/src/hooks/useCameraConfig.ts b/src/hooks/useCameraConfig.ts
index a7b3f37..1dc9c0f 100644
--- a/src/hooks/useCameraConfig.ts
+++ b/src/hooks/useCameraConfig.ts
@@ -4,8 +4,6 @@ import { CAM_BASE } from "../utils/config";
 
 const base_url = `${CAM_BASE}/api`;
 
-const fetch_url = `http://100.82.205.44/api/fetch-config?id=Colour`;
-console.log(fetch_url);
 const fetchCameraSideConfig = async ({ queryKey }: { queryKey: string[] }) => {
   const [, cameraSide] = queryKey;
   const fetchUrl = `${base_url}/fetch-config?id=${cameraSide}`;
diff --git a/src/hooks/useCameraWifiandModem.ts b/src/hooks/useCameraWifiandModem.ts
index 0abb631..bdd4430 100644
--- a/src/hooks/useCameraWifiandModem.ts
+++ b/src/hooks/useCameraWifiandModem.ts
@@ -70,11 +70,13 @@ export const useWifiAndModem = () => {
     mutationKey: ["updateWifiSettings"],
     mutationFn: (wifiConfig: WifiConfig) => updateWifiSettings(wifiConfig),
     onError: (error) => {
-      toast.error("Failed to update WiFi settings");
+      toast.error("Failed to update WiFi settings", { id: "wiFiSettings" });
       console.error(error);
     },
     onSuccess: () => {
-      toast.success("WiFi settings updated successfully");
+      toast.success("WiFi settings updated successfully", {
+        id: "wiFiSettings",
+      });
     },
   });
 
@@ -87,20 +89,24 @@ export const useWifiAndModem = () => {
     mutationKey: ["updateModemSettings"],
     mutationFn: (modemConfig: ModemConfig) => updateModemSettings(modemConfig),
     onError: (error) => {
-      toast.error("Failed to update Modem settings");
+      toast.error("Failed to update Modem settings", { id: "modemSettings" });
       console.error(error);
     },
     onSuccess: () => {
-      toast.success("Modem settings updated successfully");
+      toast.success("Modem settings updated successfully", {
+        id: "modemSettings",
+      });
     },
   });
 
   useEffect(() => {
-    if (wifiQuery.isError) toast.error("Cannot get WiFi settings");
+    if (wifiQuery.isError)
+      toast.error("Cannot get WiFi settings", { id: "wiFiSettings" });
   }, [wifiQuery?.error?.message, wifiQuery.isError]);
 
   useEffect(() => {
-    if (modemQuery.isError) toast.error("Cannot get Modem settings");
+    if (modemQuery.isError)
+      toast.error("Cannot get Modem settings", { id: "modemSettings" });
   }, [modemQuery?.error?.message, modemQuery.isError]);
   return {
     wifiQuery,
diff --git a/src/hooks/useCameraZoom.ts b/src/hooks/useCameraZoom.ts
index 9134c0f..f9c334a 100644
--- a/src/hooks/useCameraZoom.ts
+++ b/src/hooks/useCameraZoom.ts
@@ -5,6 +5,7 @@ import {
 } from "@tanstack/react-query";
 import { CAM_BASE } from "../utils/config";
 import type { zoomConfig, ZoomInOptions } from "../types/types";
+import { toast } from "sonner";
 
 async function zoomIn(options: ZoomInOptions) {
   const response = await fetch(
@@ -37,6 +38,9 @@ export const useCameraZoom = (options: zoomConfig) => {
   const mutation = useMutation({
     mutationKey: ["zoomIn"],
     mutationFn: (options: ZoomInOptions) => zoomIn(options),
+    onError: () => {
+      toast.error("Failed to update zoom settings", { id: "zoom" });
+    },
   });
 
   const query = useQuery({
diff --git a/src/hooks/useLatestSighting.ts b/src/hooks/useLatestSighting.ts
deleted file mode 100644
index b4c49e7..0000000
--- a/src/hooks/useLatestSighting.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { useCallback, useEffect, useRef } from "react";
-
-async function fetchSighting() {
-  const response = await fetch(
-    // `http://100.82.205.44/api`
-    `http://192.168.75.11/mergedHistory/sightingSummary?mostRecentRef=-1`
-  );
-  if (!response.ok) throw new Error("Failed to fetch sighting");
-  return response.json();
-}
-
-export function useLatestSighting() {
-  const latestUrlRef = useRef<string | null>(null);
-  const canvasRef = useRef<HTMLCanvasElement | null>(null);
-  const sightingImageRef = useRef<HTMLImageElement | null>(null);
-
-  const drawImage = useCallback(() => {
-    const canvas = canvasRef.current;
-    const ctx = canvas?.getContext("2d");
-    const img2 = sightingImageRef.current;
-
-    if (!img2 || !canvas) return;
-
-    canvas.width = canvas.clientWidth;
-    canvas.height = canvas.clientHeight;
-
-    ctx?.drawImage(img2, 0, 0, 200, 50);
-  }, [sightingImageRef]);
-
-  const { data } = useQuery({
-    queryKey: ["latestSighting"],
-    queryFn: fetchSighting,
-    refetchInterval: 100,
-  });
-
-  useEffect(() => {
-    const img = new Image();
-    sightingImageRef.current = img;
-
-    img.onload = () => {
-      drawImage();
-    };
-    img.src = data?.plateUrlColour;
-
-    if (latestUrlRef.current) {
-      URL.revokeObjectURL(latestUrlRef.current);
-    }
-    latestUrlRef.current = img.src;
-
-    return () => {
-      if (latestUrlRef.current) {
-        URL.revokeObjectURL(latestUrlRef.current);
-        latestUrlRef.current = null;
-      }
-    };
-  }, [data?.plateUrlColour, drawImage]);
-
-  return { data, sightingImageRef, canvasRef };
-}
diff --git a/src/hooks/useSystemConfig.ts b/src/hooks/useSystemConfig.ts
index 6e3a2da..9fd4b3c 100644
--- a/src/hooks/useSystemConfig.ts
+++ b/src/hooks/useSystemConfig.ts
@@ -5,25 +5,43 @@ import {
   handleSystemSave,
   handleSystemRecall,
 } from "../components/SettingForms/System/SettingSaveRecall";
+import { useEffect } from "react";
 
 export const useSystemConfig = () => {
   const uploadSettingsMutation = useMutation({
     mutationKey: ["uploadSettings"],
     mutationFn: sendBlobFileUpload,
-    onError: (error) => toast.error(error.message),
-    onSuccess: (test) => toast(test),
+    onError: (error) =>
+      toast.error(error.message, {
+        id: "uploadSettings",
+      }),
+    onSuccess: (test) =>
+      toast(test, {
+        id: "uploadSettings",
+      }),
   });
 
   const saveSystemSettings = useMutation({
     mutationKey: ["systemSaveSettings"],
     mutationFn: handleSystemSave,
-    onError: (error) => console.error(error.message),
+    onError: (error) =>
+      toast.error(error.message, {
+        id: "systemSettings",
+      }),
   });
 
   const getSystemSettings = useQuery({
     queryKey: ["getSystemSettings"],
     queryFn: handleSystemRecall,
   });
+
+  useEffect(() => {
+    if (getSystemSettings.isError)
+      toast.error(getSystemSettings.error.message, {
+        id: "systemSettings",
+      });
+  }, [getSystemSettings?.error?.message, getSystemSettings.isError]);
+
   return {
     uploadSettings: uploadSettingsMutation.mutate,
     saveSystemSettings: saveSystemSettings.mutate,