Merge branch 'hotfix/v2.6.1' into feature/modal-dialog-icon

packages/client/src/components/Main/index.js

@@ -76,10 +76,12 @@ const Main = (props) => {
       if (mainBarVisible && isMobileUtils()) {
         const mainBar = document.getElementById("main-bar");
 
-        if (!mainBar.offsetHeight)
-          return (updateSizeRef.current = setTimeout(() => onResize(), 0));
+        if (mainBar) {
+          if (!mainBar?.offsetHeight)
+            return (updateSizeRef.current = setTimeout(() => onResize(), 0));
 
-        correctHeight -= mainBar.offsetHeight;
+          correctHeight -= mainBar?.offsetHeight;
+        }
       }
 
       const isTouchDevice =

packages/client/src/components/dialogs/EditGroupMembersDialog/sub-components/GroupMember/index.tsx

@@ -43,7 +43,7 @@ import { toastr } from "@docspace/shared/components/toast";
 import { HelpButton } from "@docspace/shared/components/help-button";
 import { getUserRoleOptions } from "@docspace/shared/utils/room-members/getUserRoleOptions";
 import { ShareAccessRights } from "@docspace/shared/enums";
-import { getUserRole } from "@docspace/shared/utils/common";
+import { getUserRole, getUserTypeLabel } from "@docspace/shared/utils/common";
 import { TGroupMemberInvitedInRoom } from "@docspace/shared/api/groups/types";
 
 import * as Styled from "./index.styled";
@@ -59,7 +59,7 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => {
   const [isLoading, setIsLoading] = useState(false);
   const { t } = useTranslation("Common");
 
-  const userRole = user.isOwner
+  const userRole = member.owner
     ? getUserRoleOptions(t).portalAdmin
     : getUserRoleOptionsByUserAccess(
         t,
@@ -74,6 +74,10 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => {
 
   const userRoleOptions = filterUserRoleOptions(fullRoomRoleOptions, user);
 
+  const hasIndividualRightsInRoom =
+    member.owner ||
+    (member.userAccess && member.userAccess !== member.groupAccess);
+
   let type;
   if (user.isOwner) type = "owner";
   else if (user.isAdmin) type = "admin";
@@ -83,6 +87,11 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => {
 
   const role = getUserRole(user, userRole?.type);
 
+  const typeLabel = getUserTypeLabel(
+    role as "owner" | "admin" | "user" | "collaborator" | "manager",
+    t,
+  );
+
   let selectedUserRoleCBOption;
   if (user.isOwner)
     selectedUserRoleCBOption = {
@@ -140,26 +149,25 @@ const GroupMember = ({ member, infoPanelSelection }: GroupMemberProps) => {
             {decode(user.displayName)}
           </Text>
           <Text className="email" noSelect>
-            {user.email}
+            <span dir="auto">{typeLabel}</span> |{" "}
+            <span dir="ltr">{user.email}</span>
           </Text>
         </div>
       </div>
 
       <div className="individual-rights-tooltip">
-        {member.userAccess &&
-          member.userAccess !== member.groupAccess &&
-          !user.isOwner && (
-            <HelpButton
-              place="left"
-              offsetRight={0}
-              openOnClick={false}
-              tooltipContent={
-                <Text fontSize="12px" fontWeight={600}>
-                  {t("PeopleTranslations:IndividualRights")}
-                </Text>
-              }
-            />
-          )}
+        {hasIndividualRightsInRoom && (
+          <HelpButton
+            place="left"
+            offsetRight={0}
+            openOnClick={false}
+            tooltipContent={
+              <Text fontSize="12px" fontWeight={600}>
+                {t("PeopleTranslations:IndividualRights")}
+              </Text>
+            }
+          />
+        )}
       </div>
 
       {userRole && userRoleOptions && (

packages/client/src/pages/FormGallery/Filter/SortFilter/index.js

@@ -98,6 +98,7 @@ const SortFilter = ({ t, oformsFilter, sortOforms }) => {
           fillIcon={false}
           options={[]}
           selectedOption={{}}
+          manualWidth={"auto"}
           advancedOptions={
             <>
               {sortData?.map((item) => (