From ff547ea1e5d42ad0add3dd0466be405038852717 Mon Sep 17 00:00:00 2001
From: Timofey Boyko <55255132+TimofeyBoyko@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:25:32 +0300
Subject: [PATCH] Web:Client:InfoPanel:Members: show active user role

---
 .../pages/Home/InfoPanel/Body/views/Members/User.js  | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
index 93a36976b4..0a3b1f48ab 100644
--- a/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
+++ b/packages/client/src/pages/Home/InfoPanel/Body/views/Members/User.js
@@ -33,10 +33,7 @@ const User = ({
     canChangeUserRole
   );
 
-  const userRole = membersHelper.getOptionByUserAccess(user.access);
-  const userRoleOptions = fullRoomRoleOptions?.filter(
-    (role) => role.key !== userRole.key
-  );
+  const userRole = membersHelper.getOptionByUserAccess(user.access, user);
 
   const updateRole = (option) => {
     return updateRoomMemberRole(selectionParentRoom.id, {
@@ -82,6 +79,8 @@ const User = ({
   };
 
   const onOptionClick = (option) => {
+    if (option.access === userRole.access) return;
+
     const userType =
       option.key === "owner"
         ? "admin"
@@ -119,13 +118,13 @@ const User = ({
         <div className="me-label">&nbsp;{`(${t("Common:MeLabel")})`}</div>
       )}
 
-      {userRole && userRoleOptions && (
+      {userRole && fullRoomRoleOptions && (
         <div className="role-wrapper">
           {canChangeUserRole ? (
             <ComboBox
               className="role-combobox"
               selectedOption={userRole}
-              options={userRoleOptions}
+              options={fullRoomRoleOptions}
               onSelect={onOptionClick}
               scaled={false}
               withBackdrop={isMobileOnly}
@@ -135,6 +134,7 @@ const User = ({
               manualWidth={"fit-content"}
               isLoading={isLoading}
               isMobileView={isMobileOnly}
+              displaySelectedOption
             />
           ) : (
             <div className="disabled-role-combobox" title={t("Common:Role")}>