From 13c6abbbe4f0a512de276db06133276ffa5b5173 Mon Sep 17 00:00:00 2001
From: Anmol Singh Bhatia <anmolsinghbhatia@plane.so>
Date: Wed, 31 Jul 2024 13:47:34 +0530
Subject: [PATCH] fix: member setting role edit validation

---
 web/core/components/project/settings/member-columns.tsx   | 4 ++--
 web/core/components/workspace/settings/member-columns.tsx | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/core/components/project/settings/member-columns.tsx b/web/core/components/project/settings/member-columns.tsx
index b403e70ade9..0c4184e0eae 100644
--- a/web/core/components/project/settings/member-columns.tsx
+++ b/web/core/components/project/settings/member-columns.tsx
@@ -97,11 +97,11 @@ export const AccountTypeColumn: React.FC<AccountTypeProps> = observer((props) =>
   // derived values
   const isCurrentUser = currentUser?.id === rowData.member.id;
   const isAdminRole = currentProjectRole === EUserProjectRoles.ADMIN;
-  const isRoleEditable = isCurrentUser && isAdminRole;
+  const isRoleNonEditable = isCurrentUser || !isAdminRole;
 
   return (
     <>
-      {isRoleEditable ? (
+      {isRoleNonEditable ? (
         <div className="w-32 flex ">
           <span>{ROLE[rowData.role as keyof typeof ROLE]}</span>
         </div>
diff --git a/web/core/components/workspace/settings/member-columns.tsx b/web/core/components/workspace/settings/member-columns.tsx
index 23e958d2151..85e45feef30 100644
--- a/web/core/components/workspace/settings/member-columns.tsx
+++ b/web/core/components/workspace/settings/member-columns.tsx
@@ -96,11 +96,11 @@ export const AccountTypeColumn: React.FC<AccountTypeProps> = observer((props) =>
   // derived values
   const isCurrentUser = currentUser?.id === rowData.member.id;
   const isAdminRole = currentWorkspaceRole === EUserWorkspaceRoles.ADMIN;
-  const isRoleEditable = isCurrentUser && isAdminRole;
+  const isRoleNonEditable = isCurrentUser || !isAdminRole;
 
   return (
     <>
-      {isRoleEditable ? (
+      {isRoleNonEditable ? (
         <div className="w-32 flex ">
           <span>{ROLE[rowData.role as keyof typeof ROLE]}</span>
         </div>