diff --git a/app/screens/channel/channel_post_list/intro/direct_channel/direct_channel.tsx b/app/screens/channel/channel_post_list/intro/direct_channel/direct_channel.tsx
index 1ca2637b6..895b4cc56 100644
--- a/app/screens/channel/channel_post_list/intro/direct_channel/direct_channel.tsx
+++ b/app/screens/channel/channel_post_list/intro/direct_channel/direct_channel.tsx
@@ -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 (
);
}
+ const channelMembers = members?.filter((m) => m.userId !== currentUserId);
+ if (!channelMembers?.length) {
+ return null;
+ }
return (