- finland version release

package.json

@@ -22,7 +22,6 @@
     "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/PlateStack/NumberPlate.tsx

@@ -1,5 +1,5 @@
-import { GB } from "country-flag-icons/react/3x2";
+// import { EU } from "country-flag-icons/react/3x2";
-import { formatNumberPlate } from "../../utils/utils";
+import { formatNumberPlateEU } from "../../utils/utils";
 
 type NumberPlateProps = {
   vrm?: string | undefined;
@@ -40,19 +40,16 @@ const NumberPlate = ({ motion, vrm, size }: NumberPlateProps) => {
 
   return (
     <div
-      className={`relative ${options.plateWidth} ${
+      className={`relative ${options.plateWidth} ${options.borderWidth} border-black rounded-xl text-nowrap
-        options.borderWidth
-      } border-black rounded-xl text-nowrap
         text-black px-6 py-2
-        ${motion ? "bg-yellow-400" : "bg-white"}`}
+        ${motion ? "bg-white" : "bg-white"}`}
     >
       <div>
-        <div className="absolute inset-y-0 left-0 bg-blue-600 w-8 flex flex-col">
+        {/* <div className="absolute inset-y-0 left-0 bg-[#003399] w-8 flex flex-col">
-          <GB />
+          <EU />
-        </div>
+          <small className="text-white font-semibold text-center">FIN</small>
-        <p className={`pl-4 font-extrabold ${options.textSize} text-right`}>
+        </div> */}
-          {vrm && formatNumberPlate(vrm)}
+        <p className={`pl-4 font-extrabold ${options.textSize} text-center`}>{vrm && formatNumberPlateEU(vrm)}</p>
-        </p>
       </div>
     </div>
   );

src/components/SettingForms/BearerType/BearerTypeFields.tsx

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

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

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

src/components/SettingForms/Sound/SoundSettingsFields.tsx

@@ -1,10 +1,9 @@
-import { Field, Form, Formik } from "formik";
+import { Field, FieldArray, 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();
@@ -13,30 +12,22 @@ const SoundSettingsFields = () => {
   const hotlists: Hotlist[] = state.hotlists;
 
   const soundOptions = state?.soundOptions?.map((soundOption) => ({
-    value: soundOption?.soundFileName,
+    value: soundOption?.name,
     label: soundOption?.name,
   }));
 
   const initialValues: FormValues = {
     sightingSound: state.sightingSound ?? "switch",
     NPEDsound: state.NPEDsound ?? "popup",
-    hotlistSound: state.hotlistSound ?? "notification",
     hotlists,
   };
 
   const handleSubmit = async (values: FormValues) => {
-    const updatedValues = {
+    dispatch({ type: "UPDATE", payload: values });
-      ...values,
-      sightingVolume: state.sightingVolume,
-      NPEDsoundVolume: state.NPEDsoundVolume,
-      hotlistSoundVolume: state.hotlistSoundVolume,
-    };
-
-    dispatch({ type: "UPDATE", payload: updatedValues });
     const result = await mutation.mutateAsync({
       operation: "INSERT",
       path: "soundSettings",
-      value: updatedValues,
+      value: values,
     });
     if (result.reason !== "OK") {
       toast.error("Cannot update sound settings");
@@ -46,72 +37,55 @@ 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>
-              <label htmlFor="sightingSound">Sighting Sound</label>
+            <Field
-              <Field
+              as="select"
-                as="select"
+              name="sightingSound"
-                name="sightingSound"
+              className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445]  w-full md:w-60"
-                className="p-2 border border-gray-400 rounded-lg text-white bg-[#253445] w-full md:w-60"
+            >
-              >
+              {soundOptions?.map(({ value, label }) => {
-                {soundOptions?.map(({ value, label }) => {
+                return (
-                  return (
-                    <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"
-                name="NPEDsound"
-                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="NPEDVOLUME" />
+            </Field>
-            </div>
+          </FormGroup>
+          <FormGroup>
+            <label htmlFor="NPEDsound">NPED notification Sound</label>
+            <Field
+              as="select"
+              name="NPEDsound"
+              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>
           </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 key={hotlist.name} className="flex items-center m-2 w-full justify-between">
+                        <div
-                          <label htmlFor={`hotlists.${index}.sound`} className="w-32 shrink-0">
+                          key={hotlist.name}
+                          className="flex items-center m-2 w-full justify-between"
+                        >
+                          <label
+                            htmlFor={`hotlists.${index}.sound`}
+                            className="w-32 shrink-0"
+                          >
                             {hotlist.name}
                           </label>
                           <Field
@@ -134,7 +108,7 @@ const SoundSettingsFields = () => {
                   </div>
                 )}
               />
-            </FormGroup> */}
+            </FormGroup>
           </div>
           <button
             type="submit"

src/components/SettingForms/Sound/SoundUpload.tsx

@@ -21,21 +21,25 @@ const SoundUpload = () => {
   };
 
   return (
-    <Formik initialValues={initialValues} onSubmit={handleSubmit} enableReinitialize>
+    <Formik
-      {({ setFieldValue, errors, setFieldError, values }) => (
+      initialValues={initialValues}
+      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 (e.target?.files && e.target?.files[0]?.type === "audio/mpeg") {
+                if (
+                  e.target?.files &&
+                  e.target?.files[0]?.type === "audio/mpeg"
+                ) {
                   setFieldValue("name", e.target.files[0].name);
                   setFieldValue("soundFile", e.target.files[0]);
                 } else {
@@ -45,24 +49,12 @@ const SoundUpload = () => {
               }}
             />
           </FormGroup>
-
+          {errors.soundFile && (
-          <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">
+            <p className="text-red-500 text-sm mt-1">Not an mp3 file</p>
-            {!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 mt-[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"
             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 col-span-3 w-full">
+    <Card className="p-4">
       <CardHeader title={"Sound upload"} />
       <SoundUpload />
     </Card>

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, saveSystemSettingsLoading } = useSystemConfig();
+  const { saveSystemSettings, systemSettingsData, saveSystemSettingsLoading } =
+    useSystemConfig();
   const { softRebootMutation, hardRebootMutation } = useReboots();
 
   const initialvalues: SystemValues = {
@@ -25,7 +26,8 @@ const SystemConfigFields = () => {
     const interval = Number(values.sntpInterval);
     if (!values.deviceName) errors.deviceName = "Required";
     if (!values.timeZone) errors.timeZone = "Required";
-    if (isNaN(interval) || interval <= 0) errors.sntpInterval = "Cannot be less than 0";
+    if (isNaN(interval) || interval <= 0)
+      errors.sntpInterval = "Cannot be less than 0";
     if (!values.sntpServer) errors.sntpServer = "Required";
     return errors;
   };
@@ -50,11 +52,16 @@ const SystemConfigFields = () => {
       {({ values, errors, touched, isSubmitting }) => (
         <Form className="flex flex-col space-y-5 px-2">
           <FormGroup>
-            <label htmlFor="deviceName" className="font-medium whitespace-nowrap md:w-1/2 text-left">
+            <label
+              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">{errors.deviceName}</small>
+              <small className="absolute right-0 -top-5 text-red-500">
+                {errors.deviceName}
+              </small>
             )}
             <Field
               id="deviceName"
@@ -66,11 +73,16 @@ const SystemConfigFields = () => {
             />
           </FormGroup>
           <FormGroup>
-            <label htmlFor="timeZone" className="font-medium whitespace-nowrap md:w-1/2 text-left">
+            <label
+              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">{errors.timeZone}</small>
+              <small className="absolute right-0 -top-5 text-red-500">
+                {errors.timeZone}
+              </small>
             )}
             <Field
               id="timeZone"
@@ -87,11 +99,16 @@ const SystemConfigFields = () => {
             </Field>
           </FormGroup>
           <FormGroup>
-            <label htmlFor="sntpServer" className="font-medium whitespace-nowrap md:w-1/2 text-left">
+            <label
+              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">{errors.sntpServer}</small>
+              <small className="absolute right-0 -top-5 text-red-500">
+                {errors.sntpServer}
+              </small>
             )}
             <Field
               id="sntpServer"
@@ -103,11 +120,16 @@ const SystemConfigFields = () => {
             />
           </FormGroup>
           <FormGroup>
-            <label htmlFor="sntpInterval" className="font-medium whitespace-nowrap md:w-1/2 text-left">
+            <label
+              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">{errors.sntpInterval}</small>
+              <small className="absolute right-0 -top-5 text-red-500">
+                {errors.sntpInterval}
+              </small>
             )}
             <Field
               id="sntpInterval"
@@ -120,12 +142,15 @@ const SystemConfigFields = () => {
           </FormGroup>
           <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="bg-[#26B170] text-white px-4 py-2 rounded hover:bg-green-700 transition w-full md:w-[50%]"
             disabled={isSubmitting}
           >
             {saveSystemSettingsLoading ? "Saving..." : "Save System Settings"}
           </button>
-          <SystemFileUpload name={"softwareUpdate"} selectedFile={values.softwareUpdate} />
+          <SystemFileUpload
+            name={"softwareUpdate"}
+            selectedFile={values.softwareUpdate}
+          />
           <div className="border-b border-gray-600">
             <p>Reboot</p>
           </div>
@@ -135,14 +160,18 @@ 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 ? "Rebooting..." : "Software Reboot"}
+            {softRebootMutation.isPending || isSubmitting
+              ? "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 ? "Rebooting" : "Hardware Reboot"}
+            {hardRebootMutation.isPending || isSubmitting
+              ? "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="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"
+            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"
             onChange={(event) => {
               const file = event.currentTarget.files?.[0];
               if (!file) {
@@ -44,7 +44,8 @@ const SystemFileUpload = ({ name, selectedFile }: SystemFileUploadProps) => {
                 return;
               }
 
-              if (file?.size > 8 * 1024 * 1024) toast.error("File is too large (max 8MB).");
+              if (file?.size > 8 * 1024 * 1024)
+                toast.error("File is too large (max 8MB).");
               setFieldValue(name, file);
             }}
           />
@@ -52,7 +53,7 @@ const SystemFileUpload = ({ name, selectedFile }: SystemFileUploadProps) => {
       </FormGroup>
       <button
         type="button"
-        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"
+        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"
         disabled={!selectedFile}
         onClick={handleFileUploadClick}
       >

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

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

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

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

src/components/SettingForms/components/FormGroup.tsx

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

src/components/SightingModal/SightingModal.tsx

@@ -109,7 +109,7 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
                 onClick={handleAcknowledgeButton}
               >
                 <FontAwesomeIcon icon={faCheck} />
-                Acknowledge
+                Accept
               </button>
             )}
           </div>
@@ -122,7 +122,7 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
                   <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].replace(/\.csv$/i, "") : "-"}
+                      {hotlistName ? hotlistName[0] : "-"}
                     </p>
                   </div>
                 </div>
@@ -157,26 +157,18 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
                   <dd className="font-medium text-2xl">{sighting?.seenCount ?? "-"}</dd>
                 </div>
 
-                {sighting?.make && (
+                <div>
-                  <div>
+                  <dt className="text-gray-300">Make</dt>
-                    <dt className="text-gray-300">Make</dt>
+                  <dd className="font-medium text-2xl">{sighting?.make ?? "-"}</dd>
-                    <dd className="font-medium text-2xl">{sighting?.make ?? "-"}</dd>
+                </div>
-                  </div>
+                <div>
-                )}
+                  <dt className="text-gray-300">Model</dt>
-                {sighting?.model ||
+                  <dd className="font-medium text-2xl">{sighting?.model ?? "-"}</dd>
-                  (!sighting?.model.trim() && (
+                </div>
-                    <div>
+                <div className="sm:col-span-2">
-                      <dt className="text-gray-300">Model</dt>
+                  <dt className="text-gray-300">Colour</dt>
-                      <dd className="font-medium text-2xl">{sighting?.model ?? "-"}</dd>
+                  <dd className="font-medium text-2xl">{sighting?.color ?? "-"}</dd>
-                    </div>
+                </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>
@@ -200,7 +192,7 @@ const SightingModal = ({ isSightingModalOpen, handleClose, sighting, onDelete }:
                 onClick={handleAcknowledgeButton}
               >
                 <FontAwesomeIcon icon={faCheck} />
-                Acknowledge
+                Accept
               </button>
             )}
             {onDelete ? (

src/components/SightingsWidget/SightingWidget.tsx

@@ -38,7 +38,10 @@ type SightingHistoryProps = {
   className?: string;
 };
 
-export default function SightingHistoryWidget({ className, title }: SightingHistoryProps) {
+export default function SightingHistoryWidget({
+  className,
+  title,
+}: SightingHistoryProps) {
   useNow(1000);
   const { state } = useSoundContext();
 
@@ -47,11 +50,11 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
   }, [state.NPEDsound]);
 
   const soundSrcHotlist = useMemo(() => {
-    return getSoundFileURL(state?.hotlistSound) ?? notification;
+    return getSoundFileURL(state?.hotlists?.[0]?.sound) ?? notification;
-  }, [state?.hotlistSound]);
+  }, [state.hotlists]);
 
-  const { play: npedSound } = useSound(soundSrcNped, { volume: state.NPEDsoundVolume });
+  const { play: npedSound } = useSound(soundSrcNped);
-  const { play: hotlistsound } = useSound(soundSrcHotlist, { volume: state.hotlistSoundVolume });
+  const { play: hotlistsound } = useSound(soundSrcHotlist);
   const {
     sightings,
     setSelectedSighting,
@@ -95,7 +98,10 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
     [setSelectedSighting, setSightingModalOpen]
   );
 
-  const rows = useMemo(() => sightings?.filter(Boolean) as SightingType[], [sightings]);
+  const rows = useMemo(
+    () => sightings?.filter(Boolean) as SightingType[],
+    [sightings]
+  );
 
   useEffect(() => {
     if (!rows?.length) return;
@@ -123,7 +129,13 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
         break;
       }
     }
-  }, [rows, hotlistsound, npedSound, setSightingModalOpen, setSelectedSighting]);
+  }, [
+    rows,
+    hotlistsound,
+    npedSound,
+    setSightingModalOpen,
+    setSelectedSighting,
+  ]);
 
   useEffect(() => {
     rows?.forEach((obj) => {
@@ -175,7 +187,12 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
   };
   return (
     <>
-      <Card className={clsx("overflow-y-auto min-h-[40vh] md:min-h-[60vh] max-h-[80vh] lg:w-[40%] p-4", className)}>
+      <Card
+        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 && (
@@ -198,16 +215,45 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
                   className={`border border-gray-700 rounded-md mb-2 p-2 cursor-pointer `}
                   onClick={() => onRowClick(obj)}
                 >
-                  <div className={`flex items-center gap-3 mt-2 justify-between `}>
+                  <div
+                    className={`flex items-center gap-3 mt-2 justify-between `}
+                  >
                     <div className={`border p-1 `}>
-                      <img src={obj?.plateUrlColour || BLANK_IMG} height={48} width={200} alt="colour patch" />
+                      <img
+                        src={obj?.plateUrlColour || BLANK_IMG}
+                        height={48}
+                        width={200}
+                        alt="colour patch"
+                      />
                     </div>
                     {isHotListHit && (
-                      <img src={HotListImg} alt="hotlistHit" className="h-20 object-contain rounded-md" />
+                      <img
+                        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>
@@ -216,7 +262,11 @@ export default function SightingHistoryWidget({ className, title }: SightingHist
           </div>
         </div>
       </Card>
-      <SightingModal isSightingModalOpen={isSightingModalOpen} handleClose={handleClose} sighting={selectedSighting} />
+      <SightingModal
+        isSightingModalOpen={isSightingModalOpen}
+        handleClose={handleClose}
+        sighting={selectedSighting}
+      />
     </>
   );
 }

src/components/UI/ModalComponent.tsx

@@ -7,12 +7,16 @@ type ModalComponentProps = {
   close: () => void;
 };
 
-const ModalComponent = ({ isModalOpen, children, close }: ModalComponentProps) => {
+const ModalComponent = ({
+  isModalOpen,
+  children,
+  close,
+}: ModalComponentProps) => {
   return (
     <Modal
       isOpen={isModalOpen}
       onRequestClose={close}
-      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"
+      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"
       overlayClassName="fixed inset-0 bg-[#1e2a38]/70 flex justify-center items-start z-100"
     >
       {children}

src/components/UI/NavigationArrow.tsx

@@ -11,6 +11,7 @@ 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

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

src/context/providers/SoundContextProvider.tsx

@@ -1,4 +1,11 @@
-import { useEffect, useMemo, useReducer, useRef, useState, type ReactNode } from "react";
+import {
+  useEffect,
+  useMemo,
+  useReducer,
+  useRef,
+  useState,
+  type ReactNode,
+} from "react";
 import { SoundContext } from "../SoundContext";
 import { initialState, reducer } from "../reducers/SoundContextReducer";
 import { useCameraBlackboard } from "../../hooks/useCameraBlackboard";
@@ -56,8 +63,13 @@ const SoundContextProvider = ({ children }: SoundContextProviderProps) => {
     };
   }, []);
 
-  const value = useMemo(() => ({ state, dispatch, audioArmed }), [state, audioArmed]);
+  const value = useMemo(
-  return <SoundContext.Provider value={value}>{children}</SoundContext.Provider>;
+    () => ({ state, dispatch, audioArmed }),
+    [state, audioArmed]
+  );
+  return (
+    <SoundContext.Provider value={value}>{children}</SoundContext.Provider>
+  );
 };
 
 export default SoundContextProvider;

src/context/reducers/SoundContextReducer.ts

@@ -3,20 +3,12 @@ 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)", soundFileName: "switch" },
+    { name: "switch (Default)", soundFile: null },
-    { name: "Popup", soundFileName: "popup" },
+    { name: "popup", soundFile: null },
-    { name: "Notification", soundFileName: "notification" },
+    { name: "notification", soundFile: null },
-    { 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 {
@@ -26,14 +18,10 @@ 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,
       };
     }
 
@@ -43,24 +31,6 @@ 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

@@ -75,9 +75,8 @@ export function useSightingFeed(url: string | undefined) {
   });
 
   //use latestref instead of trigger to revert back
-
   useSoundOnChange(soundSrc, trigger, {
-    volume: state.sightingVolume,
+    volume: 1,
     initial: false,
   });
 

src/pages/SystemSettings.tsx

@@ -47,7 +47,7 @@ const SystemSettings = () => {
           </div>
         </TabPanel>
         <TabPanel>
-          <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">
+          <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">
             <SoundSettingsCard />
             <SoundUploadCard />
           </div>

src/types/types.ts

@@ -43,7 +43,9 @@ export type CameraSettingValues = {
   id: number | string;
 };
 
-export type CameraSettingErrorValues = Partial<Record<keyof CameraSettingValues, string>>;
+export type CameraSettingErrorValues = Partial<
+  Record<keyof CameraSettingValues, string>
+>;
 
 export type BearerTypeFieldType = {
   format: string;
@@ -285,24 +287,18 @@ export type FormValues = {
   sightingSound: SoundValue;
   NPEDsound: SoundValue;
   hotlists: Hotlist[];
-  hotlistSound: SoundValue;
 };
 
 export type SoundUploadValue = {
   name: string;
-  soundFileName?: string;
+  soundFile: File | null;
-  soundFile?: File | null;
 };
 
 export type SoundState = {
   sightingSound: SoundValue;
   NPEDsound: SoundValue;
   hotlists: Hotlist[];
-  hotlistSound: SoundValue;
   soundOptions?: SoundUploadValue[];
-  sightingVolume: number;
-  NPEDsoundVolume: number;
-  hotlistSoundVolume: number;
 };
 
 type UpdateAction = {
@@ -311,10 +307,6 @@ type UpdateAction = {
     sightingSound: SoundValue;
     NPEDsound: SoundValue;
     hotlists: Hotlist[];
-    sightingVolume: number;
-    NPEDsoundVolume: number;
-    hotlistSoundVolume: number;
-    hotlistSound: SoundValue;
   };
 };
 
@@ -323,12 +315,7 @@ type AddAction = {
   payload: SoundUploadValue;
 };
 
-type VolumeAction = {
+export type SoundAction = UpdateAction | AddAction;
-  type: "SIGHTINGVOLUME" | "NPEDVOLUME" | "HOTLISTVOLUME";
-  payload: number;
-};
-
-export type SoundAction = UpdateAction | AddAction | VolumeAction;
 export type WifiSettingValues = {
   ssid: string;
   password: string;

src/utils/utils.ts

@@ -1,22 +1,14 @@
 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";
+import { hasFlag } from "country-flag-icons";
 
 export function getSoundFileURL(name: string) {
   const sounds: Record<string, string> = {
     switch: switchSound,
     popup: popup,
     notification: notification,
-    beep: beep,
-    warning: warning,
-    ding: ding,
-    shutter: shutter,
   };
   return sounds[name] ?? null;
 }
@@ -87,6 +79,12 @@ export const formatNumberPlate = (plate: string) => {
   const formattedPlate = splittedPlate?.join("");
   return formattedPlate;
 };
+export const formatNumberPlateEU = (plate: string) => {
+  const splittedPlate = plate?.split("");
+  splittedPlate?.splice(3, 0, " ");
+  const formattedPlate = splittedPlate?.join("");
+  return formattedPlate;
+};
 
 export const BLANK_IMG = "data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw==";
 
@@ -151,3 +149,8 @@ export function getHotlistName(obj: HotlistMatches | undefined) {
 
 export const getNPEDCategory = (r?: SightingType | null) =>
   r?.metadata?.npedJSON?.["NPED CATEGORY"] as "A" | "B" | "C" | undefined;
+
+export const numberPlateFlag = (countryCode: string) => {
+  const result = hasFlag(countryCode) === true;
+  console.log(result);
+};

yarn.lock

@@ -138,7 +138,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.18.3":
+"@babel/runtime@^7.1.2":
   version "7.28.4"
   resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
   integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
@@ -1044,11 +1044,6 @@ 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"
@@ -1880,23 +1875,6 @@ 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"
@@ -1914,11 +1892,6 @@ 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"