diff --git a/src/screens/Messages/ChatList.tsx b/src/screens/Messages/ChatList.tsx index a9a74cfec8..92867ccfbe 100644 --- a/src/screens/Messages/ChatList.tsx +++ b/src/screens/Messages/ChatList.tsx @@ -376,6 +376,7 @@ export function ChatList({ }), ] } + contentContainerStyle={isWithinSplitView && a.py_sm} /> ) } diff --git a/src/screens/Messages/components/ChatListItem.tsx b/src/screens/Messages/components/ChatListItem.tsx index 33ad37e8b0..e3537e9a5d 100644 --- a/src/screens/Messages/components/ChatListItem.tsx +++ b/src/screens/Messages/components/ChatListItem.tsx @@ -119,7 +119,7 @@ function DirectChatItem({ }) { const {t: l} = useLingui() const profile = useProfileShadow(convo.primaryMember) - const {isWithinLeftPanel} = useIsWithinSplitView() + const {isWithinSplitView} = useIsWithinSplitView() const moderation = useMemo( () => moderateProfile(profile, moderationOpts), @@ -137,7 +137,7 @@ function DirectChatItem({ avatar={ } @@ -158,7 +158,7 @@ function DirectChatItem({ isBlockedAccount={moderation.blocked} showProfileBadges postAlerts={ - isWithinLeftPanel ? null : ( + isWithinSplitView ? null : ( @@ -198,7 +199,12 @@ function GroupChatItem({ return ( } + avatar={ + + } title={chatName} accessibilityHint={l`Go to the group chat named "${chatName}"`} primaryProfile={groupOwner} @@ -252,6 +258,7 @@ function BaseChatItem({ const leaveConvoControl = useDialogControl() const {mutate: markAsRead} = useMarkAsReadMutation() const {gtMobile} = useBreakpoints() + const {isWithinSplitView} = useIsWithinSplitView() const playHaptic = useHaptics() const queryClient = useQueryClient() @@ -423,6 +430,8 @@ function BaseChatItem({ leftFirst: deleteAction, } + const avatarSize = isWithinSplitView ? 48 : 52 + return ( @@ -432,7 +441,7 @@ function BaseChatItem({ // @ts-expect-error web only onFocus={onFocus} onBlur={onMouseLeave} - style={[a.relative, t.atoms.bg]}> + style={[a.relative, t.atoms.bg, isWithinSplitView && a.mx_sm]}> {/* Avatar goes here */} - + + style={[a.flex_1, a.justify_center, web({paddingRight: 40})]}>