- removed console.log

Bugfix/uploadsounds

package.json

@@ -22,6 +22,7 @@
     "country-flag-icons": "^1.5.19",
     "formik": "^2.4.6",
     "howler": "^2.2.4",
+    "rc-slider": "^11.1.9",
     "react": "^19.1.1",
     "react-dom": "^19.1.1",
     "react-modal": "^3.16.3",

src/components/SettingForms/BearerType/BearerTypeFields.tsx

@@ -29,11 +29,7 @@ const BearerTypeFields = () => {
   };
 
   return (
-    <Formik
+    <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize>
-      initialValues={initialValues}
-      onSubmit={handleSubmit}
-      enableReinitialize
-    >
       {({ isSubmitting }) => (
         <Form>
           <div className="flex flex-col space-y-4 px-2">
@@ -60,11 +56,9 @@ const BearerTypeFields = () => {
             </FormGroup>
             <button
               type="submit"
-              className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
+              className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
             >
-              {isSubmitting || dispatcherMutation.isPending
+              {isSubmitting || dispatcherMutation.isPending ? "Saving..." : "Save Changes"}
-                ? "Saving..."
-                : "Save Changes"}
             </button>
           </div>
         </Form>

src/components/SettingForms/Channel1-JSON/ChannelFields.tsx

@@ -4,10 +4,7 @@ import { useEffect, useState } from "react";
 import { faEyeSlash, faEye } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { useCameraOutput } from "../../../hooks/useCameraOutput";
-import type {
+import type { InitialValuesForm, InitialValuesFormErrors } from "../../../types/types";
-  InitialValuesForm,
-  InitialValuesFormErrors,
-} from "../../../types/types";
 import { toast } from "sonner";
 
 const ChannelFields = () => {
@@ -17,10 +14,8 @@ const ChannelFields = () => {
   const backOfficeURL = backOfficeQuery?.data?.propBackofficeURL?.value;
   const username = backOfficeQuery?.data?.propUsername?.value;
   const password = backOfficeQuery?.data?.propPassword?.value;
-  const connectTimeoutSeconds =
+  const connectTimeoutSeconds = backOfficeQuery?.data?.propConnectTimeoutSeconds?.value;
-    backOfficeQuery?.data?.propConnectTimeoutSeconds?.value;
+  const readTimeoutSeconds = backOfficeQuery?.data?.propReadTimeoutSeconds?.value;
-  const readTimeoutSeconds =
-    backOfficeQuery?.data?.propReadTimeoutSeconds?.value;
 
   const initialValues: InitialValuesForm = {
     backOfficeURL: backOfficeURL ?? "",
@@ -44,9 +39,7 @@ const ChannelFields = () => {
     return null;
   };
 
-  const validateValues = (
+  const validateValues = (values: InitialValuesForm): InitialValuesFormErrors => {
-    values: InitialValuesForm
-  ): InitialValuesFormErrors => {
     const errors: InitialValuesFormErrors = {};
 
     const url = values.backOfficeURL?.trim();
@@ -78,12 +71,7 @@ const ChannelFields = () => {
   };
 
   return (
-    <Formik
+    <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize validate={validateValues}>
-      initialValues={initialValues}
-      onSubmit={handleSubmit}
-      enableReinitialize
-      validate={validateValues}
-    >
       {({ errors, touched, isSubmitting }) => (
         <Form>
           <div className="flex flex-col space-y-2 px-2">
@@ -98,9 +86,7 @@ const ChannelFields = () => {
                 id="backoffice"
                 placeholder="https://www.backoffice.com"
                 className={`p-1.5 border ${
-                  errors.backOfficeURL && touched.backOfficeURL
+                  errors.backOfficeURL && touched.backOfficeURL ? "border-red-500" : "border-gray-400 "
-                    ? "border-red-500"
-                    : "border-gray-400 "
                 } rounded-lg w-full md:w-60`}
               />
             </FormGroup>
@@ -112,9 +98,7 @@ const ChannelFields = () => {
                 id="username"
                 placeholder="Back office username"
                 className={`p-1.5 border ${
-                  errors.username && touched.username
+                  errors.username && touched.username ? "border-red-500" : "border-gray-400 "
-                    ? "border-red-500"
-                    : "border-gray-400 "
                 } rounded-lg w-full md:w-60`}
               />
             </FormGroup>
@@ -127,9 +111,7 @@ const ChannelFields = () => {
                   id="password"
                   placeholder="Back office password"
                   className={`p-1.5 border ${
-                    errors.password && touched.password
+                    errors.password && touched.password ? "border-red-500" : "border-gray-400 "
-                      ? "border-red-500"
-                      : "border-gray-400 "
                   } rounded-lg w-full md:w-60`}
                 />
                 <FontAwesomeIcon
@@ -142,17 +124,13 @@ const ChannelFields = () => {
             </FormGroup>
 
             <FormGroup>
-              <label htmlFor="connectTimeoutSeconds">
+              <label htmlFor="connectTimeoutSeconds">Connect Timeout Seconds</label>
-                Connect Timeout Seconds
-              </label>
               <Field
                 name={"connectTimeoutSeconds"}
                 type="number"
                 id="connectTimeoutSeconds"
                 className={`p-1.5 border ${
-                  errors.connectTimeoutSeconds && touched.connectTimeoutSeconds
+                  errors.connectTimeoutSeconds && touched.connectTimeoutSeconds ? "border-red-500" : "border-gray-400 "
-                    ? "border-red-500"
-                    : "border-gray-400 "
                 } rounded-lg w-full md:w-60`}
               />
             </FormGroup>
@@ -164,20 +142,16 @@ const ChannelFields = () => {
                 id="readTimeoutSeconds"
                 placeholder="https://example.com"
                 className={`p-1.5 border ${
-                  errors.readTimeoutSeconds && touched.readTimeoutSeconds
+                  errors.readTimeoutSeconds && touched.readTimeoutSeconds ? "border-red-500" : "border-gray-400 "
-                    ? "border-red-500"
-                    : "border-gray-400 "
                 } rounded-lg w-full md:w-60`}
               />
             </FormGroup>
           </div>
           <button
             type="submit"
-            className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
+            className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
           >
-            {isSubmitting || backOfficeMutation.isPending
+            {isSubmitting || backOfficeMutation.isPending ? "Saving..." : "Save Changes"}
-              ? "Saving..."
-              : "Save Changes"}
           </button>
           <ValidationToastOnce />
         </Form>

src/components/SettingForms/NPED/NPEDHotlist.tsx

@@ -31,7 +31,7 @@ const NPEDHotlist = () => {
               type="file"
               name="file"
               id="file"
-              className="file:px-3 file:border file:border-gray-500 file:rounded-lg file:bg-blue-800 file:mr-5"
+              className="mt-4 w-full flex flex-col items-center justify-center rounded-2xl border border-slate-800 bg-slate-900/40 p-10 text-center file:px-3 file:border file:border-gray-500 file:rounded-lg file:bg-blue-800 file:mr-5"
               onChange={(e) => {
                 if (e.target.files) {
                   if (e.target.files[0].type !== "text/csv") {

src/components/SettingForms/Sound/SoundSettingsCard.tsx

@@ -4,7 +4,7 @@ import SoundSettingsFields from "./SoundSettingsFields";
 
 const SoundSettingsCard = () => {
   return (
-    <Card className="p-4">
+    <Card className="p-4 col-span-5 w-full">
       <CardHeader title={"Sound Settings"} />
       <SoundSettingsFields />
     </Card>

src/components/SettingForms/Sound/SoundSettingsFields.tsx

@@ -1,9 +1,10 @@
-import { Field, FieldArray, Form, Formik } from "formik";
+import { Field, Form, Formik } from "formik";
 import FormGroup from "../components/FormGroup";
 import type { FormValues, Hotlist } from "../../../types/types";
 import { useSoundContext } from "../../../context/SoundContext";
 import { useCameraBlackboard } from "../../../hooks/useCameraBlackboard";
 import { toast } from "sonner";
+import SliderComponent from "../../UI/Slider";
 
 const SoundSettingsFields = () => {
   const { state, dispatch } = useSoundContext();
@@ -12,22 +13,32 @@ const SoundSettingsFields = () => {
   const hotlists: Hotlist[] = state.hotlists;
 
   const soundOptions = state?.soundOptions?.map((soundOption) => ({
-    value: soundOption?.name,
+    value: soundOption?.soundFileName,
     label: soundOption?.name,
   }));
 
   const initialValues: FormValues = {
     sightingSound: state.sightingSound ?? "switch",
     NPEDsound: state.NPEDsound ?? "popup",
+    hotlistSound: state.hotlistSound ?? "notification",
     hotlists,
   };
 
   const handleSubmit = async (values: FormValues) => {
-    dispatch({ type: "UPDATE", payload: values });
+    const updatedValues = {
+      ...values,
+      sightingVolume: state.sightingVolume,
+      NPEDsoundVolume: state.NPEDsoundVolume,
+      hotlistSoundVolume: state.hotlistSoundVolume,
+      soundOptions: [...(state.soundOptions ?? [])],
+    };
+
+    dispatch({ type: "UPDATE", payload: updatedValues });
+
     const result = await mutation.mutateAsync({
       operation: "INSERT",
       path: "soundSettings",
-      value: values,
+      value: updatedValues,
     });
     if (result.reason !== "OK") {
       toast.error("Cannot update sound settings");
@@ -37,9 +48,10 @@ const SoundSettingsFields = () => {
   };
   return (
     <Formik initialValues={initialValues} onSubmit={handleSubmit}>
-      {({ values }) => (
+      {() => (
         <Form className="flex flex-col space-y-3">
           <FormGroup>
+            <div className="flex flex-col md:flex-row space-y-2 w-full justify-between gap-3">
               <label htmlFor="sightingSound">Sighting Sound</label>
               <Field
                 as="select"
@@ -48,14 +60,17 @@ const SoundSettingsFields = () => {
               >
                 {soundOptions?.map(({ value, label }) => {
                   return (
-                  <option key={value} value={value}>
+                    <option key={label} value={value}>
                       {label}
                     </option>
                   );
                 })}
               </Field>
+              <SliderComponent soundCategory="SIGHTINGVOLUME" />
+            </div>
           </FormGroup>
           <FormGroup>
+            <div className="flex flex-col md:flex-row space-y-2 w-full justify-between gap-3">
               <label htmlFor="NPEDsound">NPED notification Sound</label>
               <Field
                 as="select"
@@ -68,24 +83,37 @@ const SoundSettingsFields = () => {
                   </option>
                 ))}
               </Field>
+              <SliderComponent soundCategory="NPEDVOLUME" />
+            </div>
           </FormGroup>
           <div>
             <h3 className="text-lg font-semibold mb-2">Hotlist Sounds</h3>
             <FormGroup>
+              <div className="flex flex-col md:flex-row space-y-2 w-full justify-between gap-3">
+                <label htmlFor="hotlistSound">All hotlist Sounds</label>
+                <Field
+                  as="select"
+                  name="hotlistSound"
+                  className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] w-full md:w-60"
+                >
+                  {soundOptions?.map(({ value, label }) => (
+                    <option key={value} value={value}>
+                      {label}
+                    </option>
+                  ))}
+                </Field>
+                <SliderComponent soundCategory="HOTLISTVOLUME" />
+              </div>
+            </FormGroup>
+            {/* <FormGroup>
               <FieldArray
                 name="hotlists"
                 render={() => (
                   <div className="w-full m-2">
                     {values?.hotlists?.length > 0 ? (
                       values?.hotlists?.map((hotlist, index) => (
-                        <div
+                        <div key={hotlist.name} className="flex items-center m-2 w-full justify-between">
-                          key={hotlist.name}
+                          <label htmlFor={`hotlists.${index}.sound`} className="w-32 shrink-0">
-                          className="flex items-center m-2 w-full justify-between"
-                        >
-                          <label
-                            htmlFor={`hotlists.${index}.sound`}
-                            className="w-32 shrink-0"
-                          >
                             {hotlist.name}
                           </label>
                           <Field
@@ -108,7 +136,7 @@ const SoundSettingsFields = () => {
                   </div>
                 )}
               />
-            </FormGroup>
+            </FormGroup> */}
           </div>
           <button
             type="submit"

src/components/SettingForms/Sound/SoundUpload.tsx

@@ -3,44 +3,69 @@ import FormGroup from "../components/FormGroup";
 import type { SoundUploadValue } from "../../../types/types";
 import { useSoundContext } from "../../../context/SoundContext";
 import { toast } from "sonner";
+import { useCameraBlackboard } from "../../../hooks/useCameraBlackboard";
 
 const SoundUpload = () => {
-  const { dispatch } = useSoundContext();
+  const { state, dispatch } = useSoundContext();
+  const { mutation } = useCameraBlackboard();
+
   const initialValues: SoundUploadValue = {
     name: "",
     soundFile: null,
+    soundFileName: "",
+    soundUrl: "",
   };
 
-  const handleSubmit = (values: SoundUploadValue) => {
+  const handleSubmit = async (values: SoundUploadValue) => {
     if (!values.soundFile) {
       toast.warning("Please select an audio file");
-    } else {
+      return;
-      dispatch({ type: "ADD", payload: values });
-      toast.success("Sound file upload successfully");
     }
+    const alreadyExists = state?.soundOptions?.some((soundOption) => soundOption.name === values.name);
+    if (state.soundOptions?.includes(values) || alreadyExists) {
+      toast.warning("Sound already in list");
+      return;
+    }
+
+    const updatedValues = {
+      ...state,
+      soundOptions: [...(state.soundOptions ?? []), values],
+    };
+
+    const result = await mutation.mutateAsync({
+      operation: "INSERT",
+      path: "soundSettings",
+      value: updatedValues,
+    });
+    if (result.reason !== "OK") {
+      toast.error("Cannot update sound settings");
+    } else {
+      toast.success(`${values.name} file added`);
+    }
+
+    dispatch({ type: "ADD", payload: values });
   };
 
   return (
-    <Formik
+    <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize>
-      initialValues={initialValues}
+      {({ setFieldValue, errors, setFieldError, values }) => (
-      onSubmit={handleSubmit}
-      enableReinitialize
-    >
-      {({ setFieldValue, errors, setFieldError }) => (
         <Form>
+          <label htmlFor="soundFile" className="">
+            Sound File
+          </label>
           <FormGroup>
-            <label htmlFor="soundFile">Sound File</label>
             <input
               type="file"
               name="soundFile"
               id="sightingSoundinput"
               accept="audio/mpeg"
+              className="mt-4 w-full flex flex-col items-center justify-center rounded-2xl border border-slate-800 bg-slate-900/40 p-10 text-center file:px-3 file:border file:border-gray-500 file:rounded-lg file:bg-blue-800 file:mr-5"
               onChange={(e) => {
-                if (
+                if (e.target?.files && e.target?.files[0]?.type === "audio/mpeg") {
-                  e.target?.files &&
+                  const url = URL.createObjectURL(e.target.files[0]);
-                  e.target?.files[0]?.type === "audio/mpeg"
+                  setFieldValue("soundUrl", url);
-                ) {
                   setFieldValue("name", e.target.files[0].name);
+                  setFieldValue("soundFileName", e.target.files[0].name);
                   setFieldValue("soundFile", e.target.files[0]);
                 } else {
                   setFieldError("soundFile", "Not an mp3 file");
@@ -49,12 +74,24 @@ const SoundUpload = () => {
               }}
             />
           </FormGroup>
-          {errors.soundFile && (
+
-            <p className="text-red-500 text-sm mt-1">Not an mp3 file</p>
+          <div className="mt-4 flex flex-col items-center justify-center rounded-2xl border border-slate-800 bg-slate-900/40 p-10 text-center">
+            {!values.soundFile && (
+              <div className="mb-3 rounded-xl bg-slate-800 px-3 py-1 text-xs uppercase tracking-wider text-slate-400">
+                No uploaded sound files
+              </div>
             )}
+            <p className="max-w-md text-slate-300">
+              Uploaded Sound files will appear in the <span className="font-bold">drop downs</span> once they are
+              uploaded. They can be used for any <span className="text-blue-400">Sighting,</span>{" "}
+              <span className="text-emerald-400">Hotlist</span> or <span className="text-amber-600">NPED</span> hits.
+            </p>
+          </div>
+
+          {errors.soundFile && <p className="text-red-500 text-sm mt-1">Not an mp3 file</p>}
           <button
             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"
+            className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 mt-[5%]"
             disabled={errors.soundFile ? true : false}
           >
             Upload

src/components/SettingForms/Sound/SoundUploadCard.tsx

@@ -4,7 +4,7 @@ import SoundUpload from "./SoundUpload";
 
 const SoundUploadCard = () => {
   return (
-    <Card className="p-4">
+    <Card className="p-4 col-span-3 w-full">
       <CardHeader title={"Sound upload"} />
       <SoundUpload />
     </Card>

src/components/SettingForms/System/SystemConfigFields.tsx

@@ -7,8 +7,7 @@ import type { SystemValues, SystemValuesErrors } from "../../../types/types";
 import { useSystemConfig } from "../../../hooks/useSystemConfig";
 
 const SystemConfigFields = () => {
-  const { saveSystemSettings, systemSettingsData, saveSystemSettingsLoading } =
+  const { saveSystemSettings, systemSettingsData, saveSystemSettingsLoading } = useSystemConfig();
-    useSystemConfig();
   const { softRebootMutation, hardRebootMutation } = useReboots();
 
   const initialvalues: SystemValues = {
@@ -26,8 +25,7 @@ const SystemConfigFields = () => {
     const interval = Number(values.sntpInterval);
     if (!values.deviceName) errors.deviceName = "Required";
     if (!values.timeZone) errors.timeZone = "Required";
-    if (isNaN(interval) || interval <= 0)
+    if (isNaN(interval) || interval <= 0) errors.sntpInterval = "Cannot be less than 0";
-      errors.sntpInterval = "Cannot be less than 0";
     if (!values.sntpServer) errors.sntpServer = "Required";
     return errors;
   };
@@ -52,16 +50,11 @@ const SystemConfigFields = () => {
       {({ values, errors, touched, isSubmitting }) => (
         <Form className="flex flex-col space-y-5 px-2">
           <FormGroup>
-            <label
+            <label htmlFor="deviceName" className="font-medium whitespace-nowrap md:w-1/2 text-left">
-              htmlFor="deviceName"
-              className="font-medium whitespace-nowrap md:w-1/2 text-left"
-            >
               Device Name
             </label>
             {touched.deviceName && errors.deviceName && (
-              <small className="absolute right-0 -top-5 text-red-500">
+              <small className="absolute right-0 -top-5 text-red-500">{errors.deviceName}</small>
-                {errors.deviceName}
-              </small>
             )}
             <Field
               id="deviceName"
@@ -73,16 +66,11 @@ const SystemConfigFields = () => {
             />
           </FormGroup>
           <FormGroup>
-            <label
+            <label htmlFor="timeZone" className="font-medium whitespace-nowrap md:w-1/2 text-left">
-              htmlFor="timeZone"
-              className="font-medium whitespace-nowrap md:w-1/2 text-left"
-            >
               Local Time Zone
             </label>
             {touched.timeZone && errors.timeZone && (
-              <small className="absolute right-0 -top-5 text-red-500">
+              <small className="absolute right-0 -top-5 text-red-500">{errors.timeZone}</small>
-                {errors.timeZone}
-              </small>
             )}
             <Field
               id="timeZone"
@@ -99,16 +87,11 @@ const SystemConfigFields = () => {
             </Field>
           </FormGroup>
           <FormGroup>
-            <label
+            <label htmlFor="sntpServer" className="font-medium whitespace-nowrap md:w-1/2 text-left">
-              htmlFor="sntpServer"
-              className="font-medium whitespace-nowrap md:w-1/2 text-left"
-            >
               SNTP Server
             </label>
             {touched.sntpServer && errors.sntpServer && (
-              <small className="absolute right-0 -top-5 text-red-500">
+              <small className="absolute right-0 -top-5 text-red-500">{errors.sntpServer}</small>
-                {errors.sntpServer}
-              </small>
             )}
             <Field
               id="sntpServer"
@@ -120,16 +103,11 @@ const SystemConfigFields = () => {
             />
           </FormGroup>
           <FormGroup>
-            <label
+            <label htmlFor="sntpInterval" className="font-medium whitespace-nowrap md:w-1/2 text-left">
-              htmlFor="sntpInterval"
-              className="font-medium whitespace-nowrap md:w-1/2 text-left"
-            >
               SNTP Interval minutes
             </label>
             {touched.sntpInterval && errors.sntpInterval && (
-              <small className="absolute right-0 -top-5 text-red-500">
+              <small className="absolute right-0 -top-5 text-red-500">{errors.sntpInterval}</small>
-                {errors.sntpInterval}
-              </small>
             )}
             <Field
               id="sntpInterval"
@@ -142,15 +120,12 @@ const SystemConfigFields = () => {
           </FormGroup>
           <button
             type="submit"
-            className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
+            className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
             disabled={isSubmitting}
           >
             {saveSystemSettingsLoading ? "Saving..." : "Save System Settings"}
           </button>
-          <SystemFileUpload
+          <SystemFileUpload name={"softwareUpdate"} selectedFile={values.softwareUpdate} />
-            name={"softwareUpdate"}
-            selectedFile={values.softwareUpdate}
-          />
           <div className="border-b border-gray-600">
             <p>Reboot</p>
           </div>
@@ -160,18 +135,14 @@ const SystemConfigFields = () => {
             className="bg-red-600 text-white px-4 py-2 rounded hover:bg-red-700 transition  w-full md:w-[50%]"
             onClick={handleSoftReboot}
           >
-            {softRebootMutation.isPending || isSubmitting
+            {softRebootMutation.isPending || isSubmitting ? "Rebooting..." : "Software Reboot"}
-              ? "Rebooting..."
-              : "Software Reboot"}
           </button>
           <button
             type="button"
             className="bg-red-600 text-white px-4 py-2 rounded hover:bg-red-700 transition w-full md:w-[50%]"
             onClick={handleHardReboot}
           >
-            {hardRebootMutation.isPending || isSubmitting
+            {hardRebootMutation.isPending || isSubmitting ? "Rebooting" : "Hardware Reboot"}
-              ? "Rebooting"
-              : "Hardware Reboot"}
           </button>
         </Form>
       )}

src/components/SettingForms/System/SystemFileUpload.tsx

@@ -36,7 +36,7 @@ const SystemFileUpload = ({ name, selectedFile }: SystemFileUploadProps) => {
             type="file"
             name="softwareUpdate"
             id="softwareUpdate"
-            className="file:px-10 file:border file:border-gray-500 file:rounded-lg file:bg-blue-800 file:mr-5 w-full max-w-xs"
+            className="mt-4 w-full flex flex-col items-center justify-center rounded-2xl border border-slate-800 bg-slate-900/40 p-10 text-center file:px-3 file:border file:border-gray-500 file:rounded-lg file:bg-blue-800 file:mr-5"
             onChange={(event) => {
               const file = event.currentTarget.files?.[0];
               if (!file) {
@@ -44,8 +44,7 @@ const SystemFileUpload = ({ name, selectedFile }: SystemFileUploadProps) => {
                 return;
               }
 
-              if (file?.size > 8 * 1024 * 1024)
+              if (file?.size > 8 * 1024 * 1024) toast.error("File is too large (max 8MB).");
-                toast.error("File is too large (max 8MB).");
               setFieldValue(name, file);
             }}
           />
@@ -53,7 +52,7 @@ const SystemFileUpload = ({ name, selectedFile }: SystemFileUploadProps) => {
       </FormGroup>
       <button
         type="button"
-        className="w-full md:w-[50%] text-white bg-[#26B170]  hover:bg-green-700 font-small rounded-lg text-sm px-2 py-2.5 disabled:opacity-50 disabled:cursor-not-allowed"
+        className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5 disabled:opacity-50 disabled:cursor-not-allowed"
         disabled={!selectedFile}
         onClick={handleFileUploadClick}
       >

src/components/SettingForms/WiFi&Modem/ModemSettings.tsx

@@ -56,23 +56,13 @@ const ModemSettings = () => {
 
   return (
     <>
-      <ModemToggle
+      <ModemToggle showSettings={showSettings} onShowSettings={setShowSettings} />
-        showSettings={showSettings}
-        onShowSettings={setShowSettings}
-      />
       {!showSettings && (
-        <Formik
+        <Formik initialValues={inititalValues} onSubmit={handleSubmit} enableReinitialize>
-          initialValues={inititalValues}
-          onSubmit={handleSubmit}
-          enableReinitialize
-        >
           {({ isSubmitting }) => (
             <Form className="flex flex-col space-y-5 px-2">
               <FormGroup>
-                <label
+                <label htmlFor="apn" className="font-medium whitespace-nowrap md:w-2/3">
-                  htmlFor="apn"
-                  className="font-medium whitespace-nowrap md:w-2/3"
-                >
                   APN
                 </label>
                 <Field
@@ -84,10 +74,7 @@ const ModemSettings = () => {
                 />
               </FormGroup>
               <FormGroup>
-                <label
+                <label htmlFor="username" className="font-medium whitespace-nowrap md:w-2/3">
-                  htmlFor="username"
-                  className="font-medium whitespace-nowrap md:w-2/3"
-                >
                   Username
                 </label>
                 <Field
@@ -99,10 +86,7 @@ const ModemSettings = () => {
                 />
               </FormGroup>
               <FormGroup>
-                <label
+                <label htmlFor="password" className="font-medium whitespace-nowrap md:w-2/3">
-                  htmlFor="password"
-                  className="font-medium whitespace-nowrap md:w-2/3"
-                >
                   Password
                 </label>
                 <div className="flex gap-2 items-center relative mb-4">
@@ -122,10 +106,7 @@ const ModemSettings = () => {
                 </div>
               </FormGroup>
               <FormGroup>
-                <label
+                <label htmlFor="password" className="font-medium whitespace-nowrap md:w-2/3">
-                  htmlFor="password"
-                  className="font-medium whitespace-nowrap md:w-2/3"
-                >
                   Password
                 </label>
                 <Field
@@ -140,11 +121,9 @@ const ModemSettings = () => {
               </FormGroup>
               <button
                 type="submit"
-                className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
+                className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
               >
-                {isSubmitting || modemMutation.isPending
+                {isSubmitting || modemMutation.isPending ? "Saving..." : "Save Modem settings"}
-                  ? "Saving..."
-                  : "Save Modem settings"}
               </button>
             </Form>
           )}

src/components/SettingForms/WiFi&Modem/WiFiSettingsForm.tsx

@@ -37,18 +37,11 @@ const WiFiSettingsForm = () => {
     await wifiMutation.mutateAsync(wifiConfig);
   };
   return (
-    <Formik
+    <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize>
-      initialValues={initialValues}
-      onSubmit={handleSubmit}
-      enableReinitialize
-    >
       {({ isSubmitting }) => (
         <Form className="flex flex-col space-y-5 px-2">
           <FormGroup>
-            <label
+            <label htmlFor="ssid" className="font-medium whitespace-nowrap md:w-2/3">
-              htmlFor="ssid"
-              className="font-medium whitespace-nowrap md:w-2/3"
-            >
               SSID
             </label>
             <Field
@@ -60,10 +53,7 @@ const WiFiSettingsForm = () => {
             />
           </FormGroup>
           <FormGroup>
-            <label
+            <label htmlFor="password" className="font-medium whitespace-nowrap md:w-2/3">
-              htmlFor="password"
-              className="font-medium whitespace-nowrap md:w-2/3"
-            >
               Password
             </label>
             <div className="flex gap-2 items-center relative mb-4">
@@ -83,10 +73,7 @@ const WiFiSettingsForm = () => {
             </div>
           </FormGroup>
           <FormGroup>
-            <label
+            <label htmlFor="encryption" className="font-medium whitespace-nowrap md:w-2/3">
-              htmlFor="encryption"
-              className="font-medium whitespace-nowrap md:w-2/3"
-            >
               WPA/Encryption Type
             </label>
             <Field
@@ -103,11 +90,9 @@ const WiFiSettingsForm = () => {
           </FormGroup>
           <button
             type="submit"
-            className="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
+            className="w-1/4 text-white bg-green-700 hover:bg-green-800 font-small rounded-lg text-sm px-2 py-2.5"
           >
-            {isSubmitting || wifiMutation.isPending
+            {isSubmitting || wifiMutation.isPending ? "Saving..." : " Save WiFi settings"}
-              ? "Saving..."
-              : " Save WiFi settings"}
           </button>
         </Form>
       )}

src/components/SettingForms/components/FormGroup.tsx

@@ -5,11 +5,7 @@ type FormGroupProps = {
 };
 
 const FormGroup = ({ children }: FormGroupProps) => {
-  return (
+  return <div className="flex flex-col md:flex-row md:items-center justify-between relative space-y-2">{children}</div>;
-    <div className="flex flex-col md:flex-row md:items-center justify-between relative">
-      {children}
-    </div>
-  );
 };
 
 export default FormGroup;

src/components/SightingModal/SightingModal.tsx

@@ -23,8 +23,7 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
   const { dispatch } = useAlertHitContext();
   const { query, mutation } = useCameraBlackboard();
 
-  const hotlistName = getHotlistName(sighting?.metadata?.hotlistMatches);
+  const hotlistNames = getHotlistName(sighting?.metadata?.hotlistMatches);
-
   const handleAcknowledgeButton = () => {
     try {
       if (!sighting) {
@@ -109,7 +108,7 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
                 onClick={handleAcknowledgeButton}
               >
                 <FontAwesomeIcon icon={faCheck} />
-                Accept
+                Acknowledge
               </button>
             )}
           </div>
@@ -117,16 +116,6 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
             <div className="flex flex-col md:flex-row gap-3 items-center">
               <NumberPlate vrm={sighting?.vrm} motion={motionAway} />
               <img src={sighting?.plateUrlColour} alt="plate patch" className="h-16 object-contain rounded-md" />
-              {hotlistName && (
-                <div>
-                  <p className="text-gray-300">Hotlist</p>
-                  <div className="items-center px-2.5 py-0.5 rounded-sm me-2 bg-amber-500">
-                    <p className="font-medium text-2xl break-all text-amber-800">
-                      {hotlistName ? hotlistName[0] : "-"}
-                    </p>
-                  </div>
-                </div>
-              )}
             </div>
 
             {isHotListHit && <img src={HotListImg} alt="hotlistHit" className="h-20 object-contain rounded-md" />}
@@ -134,6 +123,20 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
             {isNPEDHitB && <img src={NPED_CAT_B} alt="hotlistHit" className="h-20 object-contain rounded-md" />}
             {isNPEDHitC && <img src={NPED_CAT_C} alt="hotlistHit" className="h-20 object-contain rounded-md" />}
           </div>
+          {hotlistNames && (
+            <div className="flex flex-col border-b border-gray-600 mb-4">
+              <p className="text-gray-300">Hotlists</p>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-x-[90%] lg:gap-x-[15%] w-[50%]">
+                {hotlistNames.map((hotlistName) => (
+                  <div className="items-center px-2.5 py-0.5 rounded-sm me-2 bg-amber-500 w-55 m-2">
+                    <p className="font-medium text-2xl break-all text-amber-800">
+                      {hotlistName ? hotlistName?.replace(/\.csv$/i, "") : "-"}
+                    </p>
+                  </div>
+                ))}
+              </div>
+            </div>
+          )}
           <div className="flex flex-col lg:flex-row items-center gap-3">
             <img
               src={sighting?.overviewUrl}
@@ -157,18 +160,26 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
                   <dd className="font-medium text-2xl">{sighting?.seenCount ?? "-"}</dd>
                 </div>
 
+                {sighting?.make && (
                   <div>
                     <dt className="text-gray-300">Make</dt>
                     <dd className="font-medium text-2xl">{sighting?.make ?? "-"}</dd>
                   </div>
+                )}
+                {sighting?.model ||
+                  (!sighting?.model.trim() && (
                     <div>
                       <dt className="text-gray-300">Model</dt>
                       <dd className="font-medium text-2xl">{sighting?.model ?? "-"}</dd>
                     </div>
+                  ))}
+                {sighting?.color && (
                   <div className="sm:col-span-2">
                     <dt className="text-gray-300">Colour</dt>
                     <dd className="font-medium text-2xl">{sighting?.color ?? "-"}</dd>
                   </div>
+                )}
+
                 <div>
                   <dt className="text-gray-300">Time</dt>
                   <dd className="font-medium text-xl">{sighting?.timeStamp ?? "-"}</dd>
@@ -192,7 +203,7 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
                 onClick={handleAcknowledgeButton}
               >
                 <FontAwesomeIcon icon={faCheck} />
-                Accept
+                Acknowledge
               </button>
             )}
             {onDelete ? (

src/components/SightingsWidget/SightingWidget.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import type { ReducedSightingType, SightingType } from "../../types/types";
+import type { HitKind, QueuedHit, ReducedSightingType, SightingType } from "../../types/types";
 import { BLANK_IMG, getSoundFileURL } from "../../utils/utils";
 import NumberPlate from "../PlateStack/NumberPlate";
 import Card from "../UI/Card";
@@ -38,23 +38,29 @@ type SightingHistoryProps = {
   className?: string;
 };
 
-export default function SightingHistoryWidget({
+export default function SightingHistoryWidget({ className, title }: SightingHistoryProps) {
-  className,
+  const [modalQueue, setModalQueue] = useState<QueuedHit[]>([]);
-  title,
-}: SightingHistoryProps) {
   useNow(1000);
   const { state } = useSoundContext();
 
   const soundSrcNped = useMemo(() => {
+    if (state?.NPEDsound?.includes(".mp3") || state.NPEDsound?.includes(".wav")) {
+      const file = state.soundOptions?.find((item) => item.name === state.NPEDsound);
+      return file?.soundUrl ?? popup;
+    }
     return getSoundFileURL(state.NPEDsound) ?? popup;
-  }, [state.NPEDsound]);
+  }, [state.NPEDsound, state.soundOptions]);
 
   const soundSrcHotlist = useMemo(() => {
-    return getSoundFileURL(state?.hotlists?.[0]?.sound) ?? notification;
+    if (state?.hotlistSound?.includes(".mp3") || state.hotlistSound?.includes(".wav")) {
-  }, [state.hotlists]);
+      const file = state.soundOptions?.find((item) => item.name === state.hotlistSound);
+      return file?.soundUrl ?? notification;
+    }
+    return getSoundFileURL(state?.hotlistSound) ?? notification;
+  }, [state.hotlistSound, state.soundOptions]);
 
-  const { play: npedSound } = useSound(soundSrcNped);
+  const { play: npedSound } = useSound(soundSrcNped, { volume: state.NPEDsoundVolume });
-  const { play: hotlistsound } = useSound(soundSrcHotlist);
+  const { play: hotlistsound } = useSound(soundSrcHotlist, { volume: state.hotlistSoundVolume });
   const {
     sightings,
     setSelectedSighting,
@@ -73,6 +79,14 @@ export default function SightingHistoryWidget({
   const hasAutoOpenedRef = useRef(false);
   const npedRef = useRef(false);
 
+  const enqueue = useCallback((sighting: SightingType, kind: HitKind) => {
+    const id = sighting.vrm ?? sighting.ref;
+    if (processedRefs.current.has(id)) return;
+    processedRefs.current.add(id);
+
+    setModalQueue((q) => [...q, { id, sighting, kind }]);
+  }, []);
+
   const reduceObject = (obj: SightingType): ReducedSightingType => {
     return {
       vrm: obj.vrm,
@@ -98,10 +112,7 @@ export default function SightingHistoryWidget({
     [setSelectedSighting, setSightingModalOpen]
   );
 
-  const rows = useMemo(
+  const rows = useMemo(() => sightings?.filter(Boolean) as SightingType[], [sightings]);
-    () => sightings?.filter(Boolean) as SightingType[],
-    [sightings]
-  );
 
   useEffect(() => {
     if (!rows?.length) return;
@@ -110,32 +121,15 @@ export default function SightingHistoryWidget({
       const id = sighting.vrm;
 
       if (processedRefs.current.has(id)) continue;
-      const isHot = checkIsHotListHit(sighting);
+      const isHotlistHit = checkIsHotListHit(sighting);
-      const cat = sighting?.metadata?.npedJSON?.["NPED CATEGORY"];
+      const npedcategory = sighting?.metadata?.npedJSON?.["NPED CATEGORY"];
+      const isNPED = npedcategory === "A" || npedcategory === "B" || npedcategory === "C";
 
-      if (cat === "A" || cat === "B" || cat === "C") {
+      if (isNPED || isHotlistHit) {
-        npedSound();
+        enqueue(sighting, isNPED ? "NPED" : "HOTLIST"); // enqueue ONLY
-        setSelectedSighting(sighting);
-        setSightingModalOpen(true);
-        processedRefs.current.add(id);
-        break; // stop after one new open per render cycle
-      }
-
-      if (isHot) {
-        hotlistsound();
-        setSelectedSighting(sighting);
-        setSightingModalOpen(true);
-        processedRefs.current.add(id);
-        break;
       }
     }
-  }, [
+  }, [rows, enqueue]);
-    rows,
-    hotlistsound,
-    npedSound,
-    setSightingModalOpen,
-    setSelectedSighting,
-  ]);
 
   useEffect(() => {
     rows?.forEach((obj) => {
@@ -168,31 +162,37 @@ export default function SightingHistoryWidget({
     });
 
     if (firstNPED) {
-      setSelectedSighting(firstNPED);
+      enqueue(firstNPED, "NPED");
-      npedSound();
+
-      setSightingModalOpen(true);
       npedRef.current = true;
     }
 
     if (firstHot) {
-      setSelectedSighting(firstHot);
+      enqueue(firstHot, "HOTLIST");
-      hotlistsound();
+
-      setSightingModalOpen(true);
       hasAutoOpenedRef.current = true;
     }
-  }, [hotlistsound, npedSound, setSelectedSighting]);
+  }, [enqueue, hotlistsound, npedSound, rows, setSelectedSighting, setSightingModalOpen]);
+
+  useEffect(() => {
+    if (!isSightingModalOpen && modalQueue.length > 0) {
+      const next = modalQueue[0];
+
+      if (next.kind === "NPED") npedSound();
+      else hotlistsound();
+
+      setSelectedSighting(next.sighting);
+      setSightingModalOpen(true);
+    }
+  }, [isSightingModalOpen, npedSound, hotlistsound, setSelectedSighting, setSightingModalOpen, modalQueue]);
 
   const handleClose = () => {
     setSightingModalOpen(false);
+    setModalQueue((q) => q.slice(1));
   };
   return (
     <>
-      <Card
+      <Card className={clsx("overflow-y-auto min-h-[40vh] md:min-h-[60vh] max-h-[80vh] lg:w-[40%] p-4", className)}>
-        className={clsx(
-          "overflow-y-auto min-h-[40vh] md:min-h-[60vh] max-h-[80vh] lg:w-[40%] p-4",
-          className
-        )}
-      >
         <CardHeader title={title} />
         <div className="flex flex-col gap-3 ">
           {isLoading && (
@@ -215,45 +215,16 @@ export default function SightingHistoryWidget({
                   className={`border border-gray-700 rounded-md mb-2 p-2 cursor-pointer `}
                   onClick={() => onRowClick(obj)}
                 >
-                  <div
+                  <div className={`flex items-center gap-3 mt-2 justify-between `}>
-                    className={`flex items-center gap-3 mt-2 justify-between `}
-                  >
                     <div className={`border p-1 `}>
-                      <img
+                      <img src={obj?.plateUrlColour || BLANK_IMG} height={48} width={200} alt="colour patch" />
-                        src={obj?.plateUrlColour || BLANK_IMG}
-                        height={48}
-                        width={200}
-                        alt="colour patch"
-                      />
                     </div>
                     {isHotListHit && (
-                      <img
+                      <img src={HotListImg} alt="hotlistHit" className="h-20 object-contain rounded-md" />
-                        src={HotListImg}
-                        alt="hotlistHit"
-                        className="h-20 object-contain rounded-md"
-                      />
-                    )}
-                    {isNPEDHitA && (
-                      <img
-                        src={NPED_CAT_A}
-                        alt="hotlistHit"
-                        className="h-20 object-contain rounded-md"
-                      />
-                    )}
-                    {isNPEDHitB && (
-                      <img
-                        src={NPED_CAT_B}
-                        alt="hotlistHit"
-                        className="h-20 object-contain rounded-md"
-                      />
-                    )}
-                    {isNPEDHitC && (
-                      <img
-                        src={NPED_CAT_C}
-                        alt="hotlistHit"
-                        className="h-20 object-contain rounded-md"
-                      />
                     )}
+                    {isNPEDHitA && <img src={NPED_CAT_A} alt="hotlistHit" className="h-20 object-contain rounded-md" />}
+                    {isNPEDHitB && <img src={NPED_CAT_B} alt="hotlistHit" className="h-20 object-contain rounded-md" />}
+                    {isNPEDHitC && <img src={NPED_CAT_C} alt="hotlistHit" className="h-20 object-contain rounded-md" />}
                     <NumberPlate motion={motionAway} vrm={obj?.vrm} />
                   </div>
                 </div>
@@ -262,11 +233,7 @@ export default function SightingHistoryWidget({
           </div>
         </div>
       </Card>
-      <SightingModal
+      <SightingModal isSightingModalOpen={isSightingModalOpen} handleClose={handleClose} sighting={selectedSighting} />
-        isSightingModalOpen={isSightingModalOpen}
-        handleClose={handleClose}
-        sighting={selectedSighting}
-      />
     </>
   );
 }

src/components/UI/ModalComponent.tsx

@@ -7,16 +7,12 @@ type ModalComponentProps = {
   close: () => void;
 };
 
-const ModalComponent = ({
+const ModalComponent = ({ isModalOpen, children, close }: ModalComponentProps) => {
-  isModalOpen,
-  children,
-  close,
-}: ModalComponentProps) => {
   return (
     <Modal
       isOpen={isModalOpen}
       onRequestClose={close}
-      className="bg-[#1e2a38] p-6 rounded-lg shadow-lg max-w-[90%] mx-auto mt-[1%] md:w-[80%] md:h-[95%] z-[100] overflow-y-auto max-h-screen"
+      className="bg-[#1e2a38] p-6 rounded-lg shadow-lg max-w-[80%] mx-auto mt-[1%] md:w-[70%] md:h-[95%] z-[100] overflow-y-auto max-h-screen"
       overlayClassName="fixed inset-0 bg-[#1e2a38]/70 flex justify-center items-start z-100"
     >
       {children}

src/components/UI/NavigationArrow.tsx

@@ -11,7 +11,6 @@ const NavigationArrow = ({ side, settingsPage }: NavigationArrowProps) => {
   const navigate = useNavigate();
 
   const navigationDest = (side: string | undefined) => {
-    console.log(side);
     if (settingsPage) {
       navigate("/");
       return;

src/components/UI/Slider.tsx

@@ -0,0 +1,60 @@
+import "rc-slider/assets/index.css";
+import Slider from "rc-slider";
+import { useSoundContext } from "../../context/SoundContext";
+
+const SliderComponent = ({ soundCategory }: { soundCategory: "SIGHTINGVOLUME" | "NPEDVOLUME" | "HOTLISTVOLUME" }) => {
+  const { dispatch, state } = useSoundContext();
+
+  const getVolumeOption = (soundCategory: string) => {
+    if (soundCategory === "SIGHTINGVOLUME") {
+      return state.sightingVolume;
+    }
+    if (soundCategory === "NPEDVOLUME") {
+      return state.NPEDsoundVolume;
+    }
+    if (soundCategory === "HOTLISTVOLUME") {
+      return state.hotlistSoundVolume;
+    }
+  };
+
+  const volume = getVolumeOption(soundCategory);
+
+  const handleChange = (value: number | number[]) => {
+    const number = typeof value === "number" ? value : value[0];
+    dispatch({ type: soundCategory, payload: number });
+  };
+
+  return (
+    <div className="flex flex-row w-full lg:w-[40%] space-x-5">
+      <Slider
+        min={0}
+        max={1}
+        onChange={handleChange}
+        value={volume}
+        step={0.1}
+        styles={{
+          handle: {
+            width: "1.2rem",
+            height: "1.2rem",
+            marginTop: -7,
+            backgroundColor: "#3b82f6",
+            border: "2px solid white",
+            borderRadius: "50%",
+            boxShadow: "0 0 5px rgba(0, 0, 0, 0.2)",
+          },
+          track: {
+            backgroundColor: "#3b82f6",
+            height: 6,
+          },
+          rail: {
+            backgroundColor: "#e5e7eb",
+            height: 6,
+          },
+        }}
+      />
+      <span>{volume ? volume * 10 : 1}</span>
+    </div>
+  );
+};
+
+export default SliderComponent;

src/context/SoundContext.ts

@@ -7,13 +7,10 @@ type SoundContextType = {
   audioArmed: boolean;
 };
 
-export const SoundContext = createContext<SoundContextType | undefined>(
+export const SoundContext = createContext<SoundContextType | undefined>(undefined);
-  undefined
-);
 
 export const useSoundContext = () => {
   const ctx = useContext(SoundContext);
-  if (!ctx)
+  if (!ctx) throw new Error("useSoundContext must be used within <SoundContext>");
-    throw new Error("useSoundContext must be used within <SoundContext>");
   return ctx;
 };

src/context/providers/SoundContextProvider.tsx

@@ -1,11 +1,4 @@
-import {
+import { useEffect, useMemo, useReducer, useRef, useState, type ReactNode } from "react";
-  useEffect,
-  useMemo,
-  useReducer,
-  useRef,
-  useState,
-  type ReactNode,
-} from "react";
 import { SoundContext } from "../SoundContext";
 import { initialState, reducer } from "../reducers/SoundContextReducer";
 import { useCameraBlackboard } from "../../hooks/useCameraBlackboard";
@@ -28,7 +21,11 @@ const SoundContextProvider = ({ children }: SoundContextProviderProps) => {
         path: "soundSettings",
       });
 
+      if (!result.result || typeof result.result !== "object") {
+        dispatch({ type: "UPDATE", payload: state });
+      } else {
         dispatch({ type: "UPDATE", payload: result.result });
+      }
     };
     fetchSound();
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -63,13 +60,8 @@ const SoundContextProvider = ({ children }: SoundContextProviderProps) => {
     };
   }, []);
 
-  const value = useMemo(
+  const value = useMemo(() => ({ state, dispatch, audioArmed }), [state, audioArmed]);
-    () => ({ state, dispatch, audioArmed }),
+  return <SoundContext.Provider value={value}>{children}</SoundContext.Provider>;
-    [state, audioArmed]
-  );
-  return (
-    <SoundContext.Provider value={value}>{children}</SoundContext.Provider>
-  );
 };
 
 export default SoundContextProvider;

src/context/reducers/SoundContextReducer.ts

@@ -3,12 +3,20 @@ import type { SoundAction, SoundState } from "../../types/types";
 export const initialState: SoundState = {
   sightingSound: "switch",
   NPEDsound: "popup",
+  hotlistSound: "warning",
   hotlists: [{ name: "hotlistName", sound: "notification" }],
   soundOptions: [
-    { name: "switch (Default)", soundFile: null },
+    { name: "Switch (Default)", soundFileName: "switch" },
-    { name: "popup", soundFile: null },
+    { name: "Popup", soundFileName: "popup" },
-    { name: "notification", soundFile: null },
+    { name: "Notification", soundFileName: "notification" },
+    { name: "Beep", soundFileName: "beep" },
+    { name: "Ding", soundFileName: "ding" },
+    { name: "Shutter", soundFileName: "shutter" },
+    { name: "Warning (voice)", soundFileName: "warning" },
   ],
+  sightingVolume: 1,
+  NPEDsoundVolume: 1,
+  hotlistSoundVolume: 1,
 };
 
 export function reducer(state: SoundState, action: SoundAction): SoundState {
@@ -18,10 +26,15 @@ export function reducer(state: SoundState, action: SoundAction): SoundState {
         ...state,
         sightingSound: action.payload.sightingSound,
         NPEDsound: action.payload.NPEDsound,
+        hotlistSound: action.payload.hotlistSound,
         hotlists: action.payload.hotlists?.map((hotlist) => ({
           name: hotlist.name,
           sound: hotlist.sound,
         })),
+        NPEDsoundVolume: action.payload.NPEDsoundVolume,
+        sightingVolume: action.payload.sightingVolume,
+        hotlistSoundVolume: action.payload.hotlistSoundVolume,
+        soundOptions: action.payload.soundOptions,
       };
     }
 
@@ -31,6 +44,24 @@ export function reducer(state: SoundState, action: SoundAction): SoundState {
         soundOptions: [...(state.soundOptions ?? []), action.payload],
       };
     }
+    // todo: refactor to use single state coupled with sound name. e.g : {name: <soundname>, volume: <volume>}
+    case "SIGHTINGVOLUME":
+      return {
+        ...state,
+        sightingVolume: action.payload,
+      };
+
+    case "NPEDVOLUME":
+      return {
+        ...state,
+        NPEDsoundVolume: action.payload,
+      };
+
+    case "HOTLISTVOLUME":
+      return {
+        ...state,
+        hotlistSoundVolume: action.payload,
+      };
 
     default:
       return state;

src/hooks/useSightingFeed.ts

@@ -43,8 +43,12 @@ export function useSightingFeed(url: string | undefined) {
   }, [audioArmed, latestRef]);
 
   const soundSrc = useMemo(() => {
+    if (state?.sightingSound?.includes(".mp3") || state.sightingSound?.includes(".wav")) {
+      const file = state.soundOptions?.find((item) => item.name === state.sightingSound);
+      return file?.soundUrl ?? switchSound;
+    }
     return getSoundFileURL(state?.sightingSound) ?? switchSound;
-  }, [state.sightingSound]);
+  }, [state.sightingSound, state.soundOptions]);
 
   function refetchInterval(query: Query<SightingType, Error, SightingType, (string | undefined)[]>) {
     if (!query) return;
@@ -75,8 +79,9 @@ export function useSightingFeed(url: string | undefined) {
   });
 
   //use latestref instead of trigger to revert back
+
   useSoundOnChange(soundSrc, trigger, {
-    volume: 1,
+    volume: state.sightingVolume,
     initial: false,
   });
 

src/pages/SystemSettings.tsx

@@ -47,7 +47,7 @@ const SystemSettings = () => {
           </div>
         </TabPanel>
         <TabPanel>
-          <div className="mx-auto grid grid-cols-1 sm:grid-cols-1 lg:grid-cols-2 gap-4 px-2 sm:px-4 lg:px-0 w-full">
+          <div className="mx-auto grid grid-rows-2 sm:grid-cols-1 lg:grid-cols-8 gap-4 px-2 sm:px-4 lg:px-0 w-full">
             <SoundSettingsCard />
             <SoundUploadCard />
           </div>

src/types/types.ts

@@ -43,9 +43,7 @@ export type CameraSettingValues = {
   id: number | string;
 };
 
-export type CameraSettingErrorValues = Partial<
+export type CameraSettingErrorValues = Partial<Record<keyof CameraSettingValues, string>>;
-  Record<keyof CameraSettingValues, string>
->;
 
 export type BearerTypeFieldType = {
   format: string;
@@ -287,18 +285,26 @@ export type FormValues = {
   sightingSound: SoundValue;
   NPEDsound: SoundValue;
   hotlists: Hotlist[];
+  hotlistSound: SoundValue;
+  soundOptions?: SoundUploadValue[];
 };
 
 export type SoundUploadValue = {
   name: string;
-  soundFile: File | null;
+  soundFileName?: string;
+  soundFile?: File | null;
+  soundUrl?: string;
 };
 
 export type SoundState = {
   sightingSound: SoundValue;
   NPEDsound: SoundValue;
   hotlists: Hotlist[];
+  hotlistSound: SoundValue;
   soundOptions?: SoundUploadValue[];
+  sightingVolume: number;
+  NPEDsoundVolume: number;
+  hotlistSoundVolume: number;
 };
 
 type UpdateAction = {
@@ -307,6 +313,11 @@ type UpdateAction = {
     sightingSound: SoundValue;
     NPEDsound: SoundValue;
     hotlists: Hotlist[];
+    sightingVolume: number;
+    NPEDsoundVolume: number;
+    hotlistSoundVolume: number;
+    hotlistSound: SoundValue;
+    soundOptions?: SoundUploadValue[];
   };
 };
 
@@ -315,7 +326,12 @@ type AddAction = {
   payload: SoundUploadValue;
 };
 
-export type SoundAction = UpdateAction | AddAction;
+type VolumeAction = {
+  type: "SIGHTINGVOLUME" | "NPEDVOLUME" | "HOTLISTVOLUME";
+  payload: number;
+};
+
+export type SoundAction = UpdateAction | AddAction | VolumeAction;
 export type WifiSettingValues = {
   ssid: string;
   password: string;
@@ -355,3 +371,11 @@ export type ModemSettingsType = {
   password: string;
   authenticationType: string;
 };
+
+export type HitKind = "NPED" | "HOTLIST";
+
+export type QueuedHit = {
+  id: number | string;
+  sighting: SightingType;
+  kind: HitKind;
+};

src/utils/utils.ts

@@ -1,6 +1,11 @@
 import switchSound from "../assets/sounds/ui/switch.mp3";
 import popup from "../assets/sounds/ui/popup_open.mp3";
 import notification from "../assets/sounds/ui/notification.mp3";
+import beep from "../assets/sounds/ui/Beep.wav";
+import warning from "../assets/sounds/ui/Warning.wav";
+import ding from "../assets/sounds/ui/Ding.wav";
+import shutter from "../assets/sounds/ui/shutter.mp3";
+
 import type { HotlistMatches, SightingType } from "../types/types";
 
 export function getSoundFileURL(name: string) {
@@ -8,10 +13,18 @@ export function getSoundFileURL(name: string) {
     switch: switchSound,
     popup: popup,
     notification: notification,
+    beep: beep,
+    warning: warning,
+    ding: ding,
+    shutter: shutter,
   };
   return sounds[name] ?? null;
 }
 
+export const showSoundURL = (url: URL | string | undefined) => {
+  console.log(url);
+};
+
 const randomChars = () => {
   const uppercaseAsciiStart = 65;
   const letterIndex = Math.floor(Math.random() * 26);
@@ -134,10 +147,12 @@ export const checkIsHotListHit = (sigthing: SightingType | null) => {
 };
 
 export function getHotlistName(obj: HotlistMatches | undefined) {
-  if (!obj || Object.values(obj).includes(false)) return;
+  if (!obj) return;
 
-  const keys = Object.keys(obj);
+  const hotlistNames = Object.entries(obj)
-  return keys;
+    .filter(([, value]) => value === true)
+    .map(([key]) => key);
+  return hotlistNames;
 }
 
 export const getNPEDCategory = (r?: SightingType | null) =>

yarn.lock

@@ -138,7 +138,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/runtime@^7.1.2":
+"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.18.3":
   version "7.28.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
   integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
@@ -1044,6 +1044,11 @@ chownr@^3.0.0:
   resolved "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz"
   integrity sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==
 
+classnames@^2.2.5:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.5.1.tgz#ba774c614be0f016da105c858e7159eae8e7687b"
+  integrity sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==
+
 clsx@^2.0.0, clsx@^2.1.1:
   version "2.1.1"
   resolved "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz"
@@ -1875,6 +1880,23 @@ queue-microtask@^1.2.2:
   resolved "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz"
   integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
+rc-slider@^11.1.9:
+  version "11.1.9"
+  resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-11.1.9.tgz#d872130fbf4ec51f28543d62e90451091d6f5208"
+  integrity sha512-h8IknhzSh3FEM9u8ivkskh+Ef4Yo4JRIY2nj7MrH6GQmrwV6mcpJf5/4KgH5JaVI1H3E52yCdpOlVyGZIeph5A==
+  dependencies:
+    "@babel/runtime" "^7.10.1"
+    classnames "^2.2.5"
+    rc-util "^5.36.0"
+
+rc-util@^5.36.0:
+  version "5.44.4"
+  resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.44.4.tgz#89ee9037683cca01cd60f1a6bbda761457dd6ba5"
+  integrity sha512-resueRJzmHG9Q6rI/DfK6Kdv9/Lfls05vzMs1Sk3M2P+3cJa+MakaZyWY8IPfehVuhPJFKrIY1IK4GqbiaiY5w==
+  dependencies:
+    "@babel/runtime" "^7.18.3"
+    react-is "^18.2.0"
+
 react-dom@^19.1.1:
   version "19.1.1"
   resolved "https://registry.npmjs.org/react-dom/-/react-dom-19.1.1.tgz"
@@ -1892,6 +1914,11 @@ react-is@^16.13.1, react-is@^16.7.0:
   resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz"
   integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==
 
+react-is@^18.2.0:
+  version "18.3.1"
+  resolved "https://registry.yarnpkg.com/react-is/-/react-is-18.3.1.tgz#e83557dc12eae63a99e003a46388b1dcbb44db7e"
+  integrity sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==
+
 react-lifecycles-compat@^3.0.0:
   version "3.0.4"
   resolved "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"