From e582e429abb62f2dd4ef07d765dba7d68ba679b1 Mon Sep 17 00:00:00 2001 From: Shea Duma Date: Mon, 6 Apr 2026 05:26:27 +0300 Subject: [PATCH] update all pages to show the right room image --- src/app/components/room-avatar/RoomAvatar.css.ts | 1 + src/app/features/common-settings/general/RoomProfile.tsx | 5 ++++- src/app/features/room-settings/RoomSettings.tsx | 5 ++++- src/app/features/room/RoomViewHeader.tsx | 3 ++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/components/room-avatar/RoomAvatar.css.ts b/src/app/components/room-avatar/RoomAvatar.css.ts index 7cf6cad0d..c9745a9aa 100644 --- a/src/app/components/room-avatar/RoomAvatar.css.ts +++ b/src/app/components/room-avatar/RoomAvatar.css.ts @@ -5,6 +5,7 @@ export const RoomAvatar = style({ backgroundColor: color.Secondary.Container, color: color.Secondary.OnContainer, textTransform: 'capitalize', + selectors: { '&[data-image-loaded="true"]': { backgroundColor: 'transparent', diff --git a/src/app/features/common-settings/general/RoomProfile.tsx b/src/app/features/common-settings/general/RoomProfile.tsx index cd523f32b..6425d4555 100644 --- a/src/app/features/common-settings/general/RoomProfile.tsx +++ b/src/app/features/common-settings/general/RoomProfile.tsx @@ -35,6 +35,8 @@ import { useFilePicker } from '$hooks/useFilePicker'; import { AsyncStatus, useAsyncCallback } from '$hooks/useAsyncCallback'; import { useAlive } from '$hooks/useAlive'; import { RoomPermissionsAPI } from '$hooks/useRoomPermissions'; +import { useSetting } from '$state/hooks/settings'; +import { settingsAtom } from '$state/settings'; type RoomProfileEditProps = { canEditAvatar: boolean; @@ -294,8 +296,9 @@ export function RoomProfile({ permissions }: RoomProfileProps) { const room = useRoom(); const directs = useAtomValue(mDirectAtom); const isDm = directs.has(room.roomId); + const [customDMCards] = useSetting(settingsAtom, 'customDMCards'); - const avatar = useRoomAvatar(room, directs.has(room.roomId)); + const avatar = useRoomAvatar(room, directs.has(room.roomId) && !customDMCards); const name = useRoomName(room); const topic = useRoomTopic(room); const joinRule = useRoomJoinRule(room); diff --git a/src/app/features/room-settings/RoomSettings.tsx b/src/app/features/room-settings/RoomSettings.tsx index 02fb0e849..def0d4483 100644 --- a/src/app/features/room-settings/RoomSettings.tsx +++ b/src/app/features/room-settings/RoomSettings.tsx @@ -17,6 +17,8 @@ import { Members } from '$features/common-settings/members'; import { EmojisStickers } from '$features/common-settings/emojis-stickers'; import { DeveloperTools } from '$features/common-settings/developer-tools'; import { Cosmetics } from '$features/common-settings/cosmetics/Cosmetics'; +import { settingsAtom } from '$state/settings'; +import { useSetting } from '$state/hooks/settings'; import { Permissions } from './permissions'; import { General } from './general'; import { RoomAbbreviations } from './abbreviations/RoomAbbreviations'; @@ -81,8 +83,9 @@ export function RoomSettings({ initialPage, requestClose }: RoomSettingsProps) { const mx = useMatrixClient(); const useAuthentication = useMediaAuthentication(); const mDirects = useAtomValue(mDirectAtom); + const [customDMCards] = useSetting(settingsAtom, 'customDMCards'); - const roomAvatar = useRoomAvatar(room, mDirects.has(room.roomId)); + const roomAvatar = useRoomAvatar(room, mDirects.has(room.roomId) && !customDMCards); const roomName = useRoomName(room); const joinRuleContent = useRoomJoinRule(room); diff --git a/src/app/features/room/RoomViewHeader.tsx b/src/app/features/room/RoomViewHeader.tsx index 8552332cf..921b517f9 100644 --- a/src/app/features/room/RoomViewHeader.tsx +++ b/src/app/features/room/RoomViewHeader.tsx @@ -350,6 +350,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) { const [menuAnchor, setMenuAnchor] = useState(); const [pinMenuAnchor, setPinMenuAnchor] = useState(); const direct = useIsDirectRoom(); + const [customDMCards] = useSetting(settingsAtom, 'customDMCards'); const [chat, setChat] = useAtom(callChatAtom); const [threadBrowserOpen, setThreadBrowserOpen] = useAtom( @@ -366,7 +367,7 @@ export function RoomViewHeader({ callView }: Readonly<{ callView?: boolean }>) { const encryptionEvent = useStateEvent(room, StateEvent.RoomEncryption); const encryptedRoom = !!encryptionEvent; - const avatarMxc = useRoomAvatar(room, direct); + const avatarMxc = useRoomAvatar(room, direct && !customDMCards); const name = useRoomName(room); const topic = useRoomTopic(room); const avatarUrl = avatarMxc