From 3963993db0a6aef62c9f39c28bf766e5d8e00142 Mon Sep 17 00:00:00 2001 From: Salamandar <6552989+Salamandar@users.noreply.github.com> Date: Sat, 14 Jan 2023 10:07:04 +0100 Subject: [PATCH] Show avatars for non-DM rooms too in the sidebar selectork --- src/app/organisms/navigation/Selector.jsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/app/organisms/navigation/Selector.jsx b/src/app/organisms/navigation/Selector.jsx index cb1086ea..6b699fbc 100644 --- a/src/app/organisms/navigation/Selector.jsx +++ b/src/app/organisms/navigation/Selector.jsx @@ -25,8 +25,9 @@ function Selector({ const noti = initMatrix.notifications; const room = mx.getRoom(roomId); - let imageSrc = room.getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, 24, 24, 'crop') || null; - if (imageSrc === null) imageSrc = room.getAvatarUrl(mx.baseUrl, 24, 24, 'crop') || null; + let imageSrc = (isDM + ? room.getAvatarFallbackMember()?.getAvatarUrl(mx.baseUrl, 24, 24, 'crop') + : room.getAvatarUrl(mx.baseUrl, 24, 24, 'crop')) || null; const isMuted = noti.getNotiType(roomId) === cons.notifs.MUTE; @@ -57,8 +58,8 @@ function Selector({ key={roomId} name={room.name} roomId={roomId} - imageSrc={isDM ? imageSrc : null} - iconSrc={isDM ? null : joinRuleToIconSrc(room.getJoinRule(), room.isSpaceRoom())} + imageSrc={imageSrc} + iconSrc={imageSrc ? null : joinRuleToIconSrc(room.getJoinRule(), room.isSpaceRoom())} isSelected={navigation.selectedRoomId === roomId} isMuted={isMuted} isUnread={!isMuted && noti.hasNoti(roomId)}