From 6dedcd47d5365fda537418daebd75fb8a6cda7fc Mon Sep 17 00:00:00 2001
From: Nicolas Mowen <nickmowen213@gmail.com>
Date: Thu, 11 Jul 2024 07:48:14 -0600
Subject: [PATCH] Simplify return values

---
 web/src/api/ws.tsx                          | 10 ++++------
 web/src/components/navigation/Bottombar.tsx |  2 +-
 web/src/hooks/use-stats.ts                  |  2 +-
 web/src/views/live/LiveDashboardView.tsx    |  3 +--
 web/src/views/system/CameraMetrics.tsx      |  2 +-
 web/src/views/system/GeneralMetrics.tsx     |  2 +-
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/web/src/api/ws.tsx b/web/src/api/ws.tsx
index 02acd7c7d..afcbaa0c0 100644
--- a/web/src/api/ws.tsx
+++ b/web/src/api/ws.tsx
@@ -207,20 +207,18 @@ export function useFrigateEvents(): { payload: FrigateEvent } {
   return { payload: JSON.parse(payload as string) };
 }
 
-export function useFrigateReviews(): { payload: FrigateReview } {
+export function useFrigateReviews(): FrigateReview {
   const {
     value: { payload },
   } = useWs("reviews", "");
-  const review = useDeepMemo(JSON.parse(payload as string));
-  return { payload: review };
+  return useDeepMemo(JSON.parse(payload as string));
 }
 
-export function useFrigateStats(): { payload: FrigateStats } {
+export function useFrigateStats(): FrigateStats {
   const {
     value: { payload },
   } = useWs("stats", "");
-  const stats = useDeepMemo(JSON.parse(payload as string));
-  return { payload: stats };
+  return useDeepMemo(JSON.parse(payload as string));
 }
 
 export function useInitialCameraState(
diff --git a/web/src/components/navigation/Bottombar.tsx b/web/src/components/navigation/Bottombar.tsx
index c3a5ff1ca..b6432bd6c 100644
--- a/web/src/components/navigation/Bottombar.tsx
+++ b/web/src/components/navigation/Bottombar.tsx
@@ -48,7 +48,7 @@ function StatusAlertNav({ className }: StatusAlertNavProps) {
   const { data: initialStats } = useSWR<FrigateStats>("stats", {
     revalidateOnFocus: false,
   });
-  const { payload: latestStats } = useFrigateStats();
+  const latestStats = useFrigateStats();
 
   const { messages, addMessage, clearMessages } = useContext(
     StatusBarMessagesContext,
diff --git a/web/src/hooks/use-stats.ts b/web/src/hooks/use-stats.ts
index 099f057c0..23b819327 100644
--- a/web/src/hooks/use-stats.ts
+++ b/web/src/hooks/use-stats.ts
@@ -97,7 +97,7 @@ export function useAutoFrigateStats() {
   const { data: initialStats } = useSWR<FrigateStats>("stats", {
     revalidateOnFocus: false,
   });
-  const { payload: latestStats } = useFrigateStats();
+  const latestStats = useFrigateStats();
 
   const stats = useMemo(() => {
     if (latestStats) {
diff --git a/web/src/views/live/LiveDashboardView.tsx b/web/src/views/live/LiveDashboardView.tsx
index a70783410..82fbfb523 100644
--- a/web/src/views/live/LiveDashboardView.tsx
+++ b/web/src/views/live/LiveDashboardView.tsx
@@ -31,7 +31,6 @@ import { cn } from "@/lib/utils";
 import { LivePlayerError, LivePlayerMode } from "@/types/live";
 import { FaCompress, FaExpand } from "react-icons/fa";
 import { useResizeObserver } from "@/hooks/resize-observer";
-import useDeepMemo from "@/hooks/use-deep-memo";
 
 type LiveDashboardViewProps = {
   cameras: CameraConfig[];
@@ -64,7 +63,7 @@ export default function LiveDashboardView({
 
   // recent events
 
-  const { payload: eventUpdate } = useFrigateReviews();
+  const eventUpdate = useFrigateReviews();
   const { data: allEvents, mutate: updateEvents } = useSWR<ReviewSegment[]>([
     "review",
     { limit: 10, severity: "alert" },
diff --git a/web/src/views/system/CameraMetrics.tsx b/web/src/views/system/CameraMetrics.tsx
index e54b64dde..9b53413f2 100644
--- a/web/src/views/system/CameraMetrics.tsx
+++ b/web/src/views/system/CameraMetrics.tsx
@@ -26,7 +26,7 @@ export default function CameraMetrics({
   );
 
   const [statsHistory, setStatsHistory] = useState<FrigateStats[]>([]);
-  const { payload: updatedStats } = useFrigateStats();
+  const updatedStats = useFrigateStats();
 
   useEffect(() => {
     if (initialStats == undefined || initialStats.length == 0) {
diff --git a/web/src/views/system/GeneralMetrics.tsx b/web/src/views/system/GeneralMetrics.tsx
index 76bf9a537..fa23d47b0 100644
--- a/web/src/views/system/GeneralMetrics.tsx
+++ b/web/src/views/system/GeneralMetrics.tsx
@@ -40,7 +40,7 @@ export default function GeneralMetrics({
   );
 
   const [statsHistory, setStatsHistory] = useState<FrigateStats[]>([]);
-  const { payload: updatedStats } = useFrigateStats();
+  const updatedStats = useFrigateStats();
 
   useEffect(() => {
     if (initialStats == undefined || initialStats.length == 0) {