Main functionality done

sandboxnu · Nov 12, 2024 · e2d3f7b · e2d3f7b
1 parent feaa11f
commit e2d3f7b
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 19 deletions.
diff --git a/src/components/Messages/MessageContent.tsx b/src/components/Messages/MessageContent.tsx
@@ -54,7 +54,10 @@ const MessageContent = ({ selectedUser }: MessageContentProps) => {
 
   const onSuccess = useCallback(() => {
     utils.user.messages.getUnreadMessageCount.invalidate();
-  }, [utils.user.messages.getUnreadMessageCount]);
+    utils.user.requests.me.invalidate();
+
+    console.log("invalidated :)");
+  }, [utils.user.messages.getUnreadMessageCount, utils.user.requests.me]);
 
   const onError = useCallback((error: any) => {
     console.error("Failed to mark messages as read:", error);
@@ -86,7 +89,7 @@ const MessageContent = ({ selectedUser }: MessageContentProps) => {
         prevUnreadMessageIdsRef.current = unreadMessageIds;
       }
     }
-  }, [user, allMessages]);
+  }, [user, allMessages, markMessagesAsRead]);
 
   // Group messages by date
   const messagesByDate = [];

diff --git a/src/components/Sidebar/RequestSidebar.tsx b/src/components/Sidebar/RequestSidebar.tsx
@@ -32,7 +32,7 @@ const RequestSidebar = (props: RequestSidebarProps) => {
         <div className="flex items-center justify-between">
           <div className="text-2xl  font-bold">Requests</div>
           <CustomSelect
-            className="!w-1/3"
+            className="!w-2/5"
             value={curOption}
             onChange={setCurOption}
             options={options}

diff --git a/src/components/Sidebar/SidebarContent.tsx b/src/components/Sidebar/SidebarContent.tsx
@@ -150,14 +150,12 @@ export const SidebarContent = (props: SidebarContentProps) => {
 
   const sortedUserCards = props.userCardList
     .map((otherUser) => {
-      const latestMessage = otherUser.incomingRequest
-        ? getLatestMessageForRequest(otherUser.incomingRequest, user.id)
-        : null;
       const request = otherUser.incomingRequest || otherUser.outgoingRequest;
 
       if (!request) {
         return { otherUser, isUnread: false, latestActivityDate: new Date(0) };
       }
+      const latestMessage = getLatestMessageForRequest(request, user.id);
 
       const { isUnread, latestActivityDate } = getCardSortingData(
         user.id,
@@ -168,9 +166,6 @@ export const SidebarContent = (props: SidebarContentProps) => {
       return { otherUser, isUnread, latestActivityDate, latestMessage };
     })
     .sort((a, b) => {
-      // Sort by unread
-      if (a.isUnread !== b.isUnread) return a.isUnread ? -1 : 1;
-      // Sort by date
       return b.latestActivityDate.getTime() - a.latestActivityDate.getTime();
     });
   return (

diff --git a/src/components/UserCards/ReceivedCard.tsx b/src/components/UserCards/ReceivedCard.tsx
@@ -1,9 +1,4 @@
-import {
-  ButtonInfo,
-  EnhancedPublicUser,
-  PublicUser,
-  User,
-} from "../../utils/types";
+import { EnhancedPublicUser, PublicUser, User } from "../../utils/types";
 import { UserCard } from "./UserCard";
 import { useContext, useState } from "react";
 import { UserContext } from "../../utils/userContext";

diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -121,7 +121,7 @@ const Home: NextPage<any> = () => {
     refetchOnMount: true,
   });
   const requestsQuery = trpc.user.requests.me.useQuery(undefined, {
-    refetchOnMount: true,
+    refetchOnMount: "always",
   });
   const { data: requests = { sent: [], received: [] } } = requestsQuery;
   const utils = trpc.useContext();

diff --git a/src/utils/latestMessage.ts b/src/utils/latestMessage.ts
@@ -1,6 +1,4 @@
-import { Message, Request, Conversation, EnhancedPublicUser } from "./types";
-import { undefined } from "zod";
-import { User } from "@prisma/client";
+import { Message, Request } from "./types";
 
 export const getLatestMessageForRequest = (
   request: Request,