From 1c34f8201cab8ea0cc8df099f348028b35e39ff2 Mon Sep 17 00:00:00 2001
From: AbdBarho <ka70911@gmail.com>
Date: Mon, 9 Jan 2023 20:25:29 +0100
Subject: [PATCH] Simplify messages page

---
 website/src/pages/messages/index.tsx | 34 ++++------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/website/src/pages/messages/index.tsx b/website/src/pages/messages/index.tsx
index 7504cfcb..627a8b18 100644
--- a/website/src/pages/messages/index.tsx
+++ b/website/src/pages/messages/index.tsx
@@ -1,38 +1,16 @@
 import { Box, CircularProgress, SimpleGrid, Text, useColorModeValue } from "@chakra-ui/react";
 import Head from "next/head";
-import { useEffect, useState } from "react";
 import { getDashboardLayout } from "src/components/Layout";
 import { MessageTable } from "src/components/Messages/MessageTable";
 import { get } from "src/lib/api";
-import { Message } from "src/types/Conversation";
 import useSWRImmutable from "swr/immutable";
 
 const MessagesDashboard = () => {
   const boxBgColor = useColorModeValue("white", "gray.800");
   const boxAccentColor = useColorModeValue("gray.200", "gray.900");
 
-  const [messages, setMessages] = useState<Message[]>(null);
-  const [userMessages, setUserMessages] = useState<Message[]>(null);
-
-  const { isLoading: isLoadingAll, mutate: mutateAll } = useSWRImmutable("/api/messages", get, {
-    onSuccess: setMessages,
-  });
-
-  const { isLoading: isLoadingUser, mutate: mutateUser } = useSWRImmutable(`/api/messages/user`, get, {
-    onSuccess: setUserMessages,
-  });
-
-  const receivedMessages = !isLoadingAll && Array.isArray(messages);
-  const receivedUserMessages = !isLoadingUser && Array.isArray(userMessages);
-
-  useEffect(() => {
-    if (!receivedMessages) {
-      mutateAll();
-    }
-    if (!receivedUserMessages) {
-      mutateUser();
-    }
-  }, [receivedMessages, mutateAll, receivedUserMessages, mutateUser]);
+  const { data: messages } = useSWRImmutable("/api/messages", get, { revalidateOnMount: true });
+  const { data: userMessages } = useSWRImmutable(`/api/messages/user`, get, { revalidateOnMount: true });
 
   return (
     <>
@@ -52,7 +30,7 @@ const MessagesDashboard = () => {
             borderRadius="xl"
             className="p-3 sm:p-4 shadow-sm"
           >
-            {receivedMessages ? <MessageTable enableLink messages={messages} /> : <CircularProgress isIndeterminate />}
+            {messages ? <MessageTable enableLink messages={messages} /> : <CircularProgress isIndeterminate />}
           </Box>
         </Box>
         <Box>
@@ -66,11 +44,7 @@ const MessagesDashboard = () => {
             borderRadius="xl"
             className="p-6 shadow-sm"
           >
-            {receivedUserMessages ? (
-              <MessageTable enableLink messages={userMessages} />
-            ) : (
-              <CircularProgress isIndeterminate />
-            )}
+            {userMessages ? <MessageTable enableLink messages={userMessages} /> : <CircularProgress isIndeterminate />}
           </Box>
         </Box>
       </SimpleGrid>