Fix current conversation css

jamakase · Sep 13, 2024 · 8a6a590 · 8a6a590
1 parent e77d7c6
commit 8a6a590
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/frontend/src/app/_components/MainSidebar.tsx b/frontend/src/app/_components/MainSidebar.tsx
@@ -35,9 +35,9 @@ export default function MainSidebar({ data }: SidebarProps) {
               <Link
                 href={item.href}
                 className={
-                  `${pathname.includes(item.href) ? "bg-black text-white pointer-events-none" : "bg-transparent"} 
+                  `${pathname.includes(item.href) ? "bg-black text-white pointer-events-none" : "bg-transparent text-black"} 
                   flex justify-center items-center 
-                  w-full h-12 text-balack rounded-lg
+                  w-full h-12 rounded-lg
                   transition-all duration-500
                   hover:bg-white/70 active:scale-90`
                 }

diff --git a/frontend/src/app/_components/Sidebar.tsx b/frontend/src/app/_components/Sidebar.tsx
@@ -4,7 +4,7 @@ import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@/comp
 import { AnimatePresence, motion } from "framer-motion";
 import { X, MessageCirclePlus } from 'lucide-react';
 import Link from "next/link";
-import { useRouter } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import { useMutation, useQuery, useQueryClient } from "react-query";
 
 type Conversation = {
@@ -26,6 +26,7 @@ export default function Sidebar({
   const config = useConfig();
 
   const queryClient = useQueryClient();
+  const params = useParams();
 
   const { data: conversations = [] } = useQuery("conversations", async () => {
     const response = await api.get_messages__user_id_(config.ENDPOINT);
@@ -91,7 +92,7 @@ export default function Sidebar({
                   <label
                     htmlFor={`chat-${conversation.id}`}
                     className={`flex cursor-pointer items-center justify-between gap-4 border-b px-2 py-3 md:p-4 text-sm font-medium ${
-                      currentConversationId == conversation.id
+                      params.id == conversation.id
                         ? "bg-[#5d76f7]/20 text-black font-semibold"
                         : "text-black"
                     }`}