From 1b7b2eec37d51623ff2e2fca8327ca745e8411fd Mon Sep 17 00:00:00 2001
From: Toba Ojo <toba.ojo@mav-systems.com>
Date: Tue, 30 Sep 2025 15:32:00 +0100
Subject: [PATCH] Implement sound settings update and integrate sound context
 in sightings widget

---
 .../SettingForms/Sound/SoundSettingsFields.tsx    | 11 +++++------
 src/components/SightingsWidget/SightingWidget.tsx | 11 +++++++++--
 src/components/UI/NavigationArrow.tsx             |  3 ++-
 src/context/reducers/SoundContextReducer.ts       |  4 ++++
 src/hooks/useSightingFeed.ts                      | 15 +++------------
 src/utils/utils.ts                                | 13 +++++++++++++
 6 files changed, 36 insertions(+), 21 deletions(-)

diff --git a/src/components/SettingForms/Sound/SoundSettingsFields.tsx b/src/components/SettingForms/Sound/SoundSettingsFields.tsx
index c8a712e..0b5c5d0 100644
--- a/src/components/SettingForms/Sound/SoundSettingsFields.tsx
+++ b/src/components/SettingForms/Sound/SoundSettingsFields.tsx
@@ -2,6 +2,7 @@ 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 { toast } from "sonner";
 
 const SoundSettingsFields = () => {
   const { state, dispatch } = useSoundContext();
@@ -34,6 +35,7 @@ const SoundSettingsFields = () => {
 
   const handleSubmit = (values: FormValues) => {
     dispatch({ type: "UPDATE", payload: values });
+    toast.success("Sound settings updated");
   };
   console.log(state);
   return (
@@ -70,20 +72,18 @@ const SoundSettingsFields = () => {
               ))}
             </Field>
           </FormGroup>
-
           <div>
             <h3 className="text-lg font-semibold mb-2">Hotlist Sounds</h3>
-
             <FormGroup>
               <FieldArray
                 name="hotlists"
                 render={() => (
-                  <div>
+                  <div className="w-full m-2">
                     {values.hotlists.length > 0 ? (
                       values.hotlists.map((hotlist, index) => (
                         <div
                           key={hotlist.name}
-                          className="flex items-center gap-3"
+                          className="flex items-center m-2 w-full justify-between"
                         >
                           <label
                             htmlFor={`hotlists.${index}.sound`}
@@ -106,14 +106,13 @@ const SoundSettingsFields = () => {
                         </div>
                       ))
                     ) : (
-                      <>No hotlists yet, Add one</>
+                      <p>No hotlists yet, Add one</p>
                     )}
                   </div>
                 )}
               />
             </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"
diff --git a/src/components/SightingsWidget/SightingWidget.tsx b/src/components/SightingsWidget/SightingWidget.tsx
index 0fd8c81..2ea65b7 100644
--- a/src/components/SightingsWidget/SightingWidget.tsx
+++ b/src/components/SightingsWidget/SightingWidget.tsx
@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useMemo, useRef, useState } from "react";
 import type { SightingType } from "../../types/types";
-import { BLANK_IMG } from "../../utils/utils";
+import { BLANK_IMG, getSoundFileName } from "../../utils/utils";
 import NumberPlate from "../PlateStack/NumberPlate";
 import Card from "../UI/Card";
 import CardHeader from "../UI/CardHeader";
@@ -15,6 +15,7 @@ import NPED_CAT_C from "/NPED_Cat_C.svg";
 import popup from "../../assets/sounds/ui/popup_open.mp3";
 import { useSound } from "react-sounds";
 import { useNPEDContext } from "../../context/NPEDUserContext";
+import { useSoundContext } from "../../context/SoundContext";
 
 function useNow(tickMs = 1000) {
   const [, setNow] = useState(() => Date.now());
@@ -39,7 +40,13 @@ export default function SightingHistoryWidget({
   title,
 }: SightingHistoryProps) {
   useNow(1000);
-  const { play } = useSound(popup);
+  const { state } = useSoundContext();
+
+  const soundSrc = useMemo(() => {
+    return getSoundFileName(state.sightingSound) ?? popup;
+  }, [state.sightingSound]);
+
+  const { play } = useSound(soundSrc);
   const {
     sightings,
     setSelectedSighting,
diff --git a/src/components/UI/NavigationArrow.tsx b/src/components/UI/NavigationArrow.tsx
index a879255..f7b9935 100644
--- a/src/components/UI/NavigationArrow.tsx
+++ b/src/components/UI/NavigationArrow.tsx
@@ -9,6 +9,7 @@ type NavigationArrowProps = {
 
 const NavigationArrow = ({ side, settingsPage }: NavigationArrowProps) => {
   const navigate = useNavigate();
+
   const navigationDest = (side: string | undefined) => {
     if (settingsPage) {
       navigate("/");
@@ -25,7 +26,7 @@ const NavigationArrow = ({ side, settingsPage }: NavigationArrowProps) => {
   if (settingsPage) {
     return (
       <>
-        {side === "CameraFront" ? (
+        {side === "CameraA" ? (
           <FontAwesomeIcon
             icon={faArrowRight}
             className="absolute top-[50%] right-[2%] backdrop-blur-lg hover:cursor-pointer animate-bounce z-30"
diff --git a/src/context/reducers/SoundContextReducer.ts b/src/context/reducers/SoundContextReducer.ts
index 2b7bf4b..1887518 100644
--- a/src/context/reducers/SoundContextReducer.ts
+++ b/src/context/reducers/SoundContextReducer.ts
@@ -13,6 +13,10 @@ export function reducer(state: SoundState, action: SoundPayload) {
         ...state,
         sightingSound: action.payload.sightingSound,
         NPEDsound: action.payload.NPEDsound,
+        hotlists: action.payload.hotlists.map((hotlist) => ({
+          name: hotlist.name,
+          sound: hotlist.sound,
+        })),
       };
   }
   return state;
diff --git a/src/hooks/useSightingFeed.ts b/src/hooks/useSightingFeed.ts
index 0722cfa..102fb46 100644
--- a/src/hooks/useSightingFeed.ts
+++ b/src/hooks/useSightingFeed.ts
@@ -2,10 +2,10 @@ import { useEffect, useMemo, useRef, useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import type { SightingType } from "../types/types";
 import { useSoundOnChange } from "react-sounds";
-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 { useSoundContext } from "../context/SoundContext";
+import { getSoundFileName } from "../utils/utils";
+import switchSound from "../assets/sounds/ui/switch.mp3";
 
 async function fetchSighting(
   url: string | undefined,
@@ -16,15 +16,6 @@ async function fetchSighting(
   return res.json();
 }
 
-function getSoundFileName(name: string) {
-  const sounds: Record<string, string> = {
-    switch: switchSound,
-    popup: popup,
-    notification: notification,
-  };
-  return sounds[name] ?? null;
-}
-
 export function useSightingFeed(url: string | undefined) {
   const { state } = useSoundContext();
   const [sightings, setSightings] = useState<SightingType[]>([]);
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 4792b8c..fd4a7d3 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,3 +1,16 @@
+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";
+
+export function getSoundFileName(name: string) {
+  const sounds: Record<string, string> = {
+    switch: switchSound,
+    popup: popup,
+    notification: notification,
+  };
+  return sounds[name] ?? null;
+}
+
 const randomChars = () => {
   const uppercaseAsciiStart = 65;
   const letterIndex = Math.floor(Math.random() * 26);