toki/mattermost-mobile
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Display own DM avatar in channel intro (#6924)

Browse source
This commit is contained in:
Elias Nahum 2023-01-04 15:28:16 +02:00 committed by GitHub
parent 03dd4477da
commit 3b289c306e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
app/screens/channel/channel_post_list/intro/direct_channel/direct_channel.tsx
View file

@ -11,6 +11,7 @@ import {General} from '@constants';
import {useServerUrl} from '@context/server';
import {makeStyleSheetFromTheme} from '@utils/theme';
import {typography} from '@utils/typography';
import {getUserIdFromChannelName} from '@utils/user';
import IntroOptions from '../options';
@ -98,23 +99,28 @@ const DirectChannel = ({channel, currentUserId, isBot, members, theme}: Props) =
}, [channel.displayName, theme]);
const profiles = useMemo(() => {
const channelMembers = members?.filter((m) => m.userId !== currentUserId);
if (!channelMembers?.length) {
return null;
}
if (channel.type === General.DM_CHANNEL) {
const teammateId = getUserIdFromChannelName(currentUserId, channel.name);
const teammate = members?.find((m) => m.userId === teammateId);
if (!teammate) {
return null;
}
return (
<Member
channelId={channel.id}
containerStyle={{height: 96}}
member={channelMembers[0]}
member={teammate}
size={96}
theme={theme}
/>
);
}
const channelMembers = members?.filter((m) => m.userId !== currentUserId);
if (!channelMembers?.length) {
return null;
}
return (
<Group
theme={theme}