diff --git a/platforms/blabsy/src/components/sidebar/sidebar.tsx b/platforms/blabsy/src/components/sidebar/sidebar.tsx index 9b0c99d8d..7a7b0dd6b 100644 --- a/platforms/blabsy/src/components/sidebar/sidebar.tsx +++ b/platforms/blabsy/src/components/sidebar/sidebar.tsx @@ -1,4 +1,5 @@ import Link from 'next/link'; +import { useRouter } from 'next/router'; import { useAuth } from '@lib/context/auth-context'; import { useWindow } from '@lib/context/window-context'; import { useModal } from '@lib/hooks/useModal'; @@ -61,10 +62,12 @@ const navLinks: Readonly = [ export function Sidebar(): JSX.Element { const { user } = useAuth(); const { isMobile } = useWindow(); + const { pathname } = useRouter(); const { open, openModal, closeModal } = useModal(); const username = user?.username as string; + const isOnChatPage = pathname.startsWith('/chat'); return (
} - + {!(isMobile && isOnChatPage) && ( + + )} {!isMobile && } diff --git a/platforms/pictique/src/lib/fragments/ChatMessage/ChatMessage.svelte b/platforms/pictique/src/lib/fragments/ChatMessage/ChatMessage.svelte index 8d7d2e9b4..a9e690a28 100644 --- a/platforms/pictique/src/lib/fragments/ChatMessage/ChatMessage.svelte +++ b/platforms/pictique/src/lib/fragments/ChatMessage/ChatMessage.svelte @@ -74,8 +74,8 @@
- {#if isHeadNeeded && !isOwn && sender} -

+ {#if isHeadNeeded && sender} +

{sender.name}

{/if} diff --git a/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte b/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte index 3f5ab9755..baf671f15 100644 --- a/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte +++ b/platforms/pictique/src/routes/(protected)/messages/[id]/+page.svelte @@ -96,11 +96,11 @@ }; } - // Handle regular user messages - const sender = m.sender as Record; - const isOwn = sender.id !== userId; + // Handle regular user messages + const sender = m.sender as Record; + const isOwn = sender.id !== userId; - console.log('Message sender ID:', sender.id, 'User ID:', userId, 'IsOwn:', isOwn); + console.log('Message sender ID:', sender.id, 'User ID:', userId, 'IsOwn:', isOwn); return { id: m.id,