From cc2d05f776dc7c8d5e04a4435f7b3ff455eb1135 Mon Sep 17 00:00:00 2001
From: Gabriel Henriques <gabriel.henriques@rocket.chat>
Date: Mon, 5 Apr 2021 16:48:09 -0300
Subject: [PATCH 1/2] Inconsistensies in user info

---
 client/views/admin/users/UsersPage.js |  5 ++---
 client/views/room/MemberListRouter.js | 14 +++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/client/views/admin/users/UsersPage.js b/client/views/admin/users/UsersPage.js
index 87c2d3ce83bcb..50385c8360dd5 100644
--- a/client/views/admin/users/UsersPage.js
+++ b/client/views/admin/users/UsersPage.js
@@ -4,7 +4,7 @@ import React from 'react';
 import Page from '../../../components/Page';
 import VerticalBar from '../../../components/VerticalBar';
 import { useTranslation } from '../../../contexts/TranslationContext';
-import { useRouteParameter, useRoute } from '../../../contexts/RouterContext';
+import { useRoute, useCurrentRoute } from '../../../contexts/RouterContext';
 import { UserInfoWithData } from './UserInfo';
 import { EditUserWithData } from './EditUser';
 import { AddUser } from './AddUser';
@@ -28,8 +28,7 @@ function UsersPage() {
 		usersRoute.push({ context: 'invite' });
 	};
 
-	const context = useRouteParameter('context');
-	const id = useRouteParameter('id');
+	const [, { context, id }] = useCurrentRoute();
 
 	return <Page flexDirection='row'>
 		<Page>
diff --git a/client/views/room/MemberListRouter.js b/client/views/room/MemberListRouter.js
index ca3a9a0ec8550..2df496f70e52c 100644
--- a/client/views/room/MemberListRouter.js
+++ b/client/views/room/MemberListRouter.js
@@ -6,6 +6,18 @@ import { useRoom } from './providers/RoomProvider';
 import { useTab, useTabBarClose, useTabContext } from './providers/ToolboxProvider';
 import RoomMembers from './contextualBar/RoomMembers';
 
+const getUid = (room, ownUserId) => {
+	if (room.uids.length === 1) {
+		return room.uids.length;
+	}
+
+	const uid = room.uids.filter((uid) => uid !== ownUserId).shift();
+
+	// Self DMs used to be created with the userId duplicated.
+	// Sometimes rooms can have 2 equal uids, but it's a self DM.
+	return uid ?? room.uids[0];
+};
+
 const MemberListRouter = ({ rid }) => {
 	const username = useTabContext();
 	const room = useRoom();
@@ -19,7 +31,7 @@ const MemberListRouter = ({ rid }) => {
 		return <RoomMembers rid={rid}/>;
 	}
 
-	return <UserInfo width='100%' {...username ? { username } : { uid: room.uids.length === 1 ? room.uids[0] : room.uids.filter((uid) => uid !== ownUserId).shift() }} onClose={onClickClose} rid={rid}/>;
+	return <UserInfo width='100%' {...username ? { username } : { uid: getUid(room, ownUserId) }} onClose={onClickClose} rid={rid}/>;
 };
 
 export default MemberListRouter;

From 8ee88ca98682b750feb15f6a1960a19338ba26e7 Mon Sep 17 00:00:00 2001
From: Gabriel Henriques <gabriel.henriques@rocket.chat>
Date: Thu, 15 Apr 2021 18:49:12 -0300
Subject: [PATCH 2/2] fix wrong return

---
 client/views/room/MemberListRouter.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/views/room/MemberListRouter.js b/client/views/room/MemberListRouter.js
index 89cc1a55b6cc5..666a5fceb5cfe 100644
--- a/client/views/room/MemberListRouter.js
+++ b/client/views/room/MemberListRouter.js
@@ -8,7 +8,7 @@ import { useTab, useTabBarClose, useTabContext } from './providers/ToolboxProvid
 
 const getUid = (room, ownUserId) => {
 	if (room.uids.length === 1) {
-		return room.uids.length;
+		return room.uids[0];
 	}
 
 	const uid = room.uids.filter((uid) => uid !== ownUserId).shift();