Client: fix

packages/client/src/HOCs/withHotkeys.js

@@ -89,6 +89,8 @@ const withHotkeys = (Component) => {
       security,
       copyToClipboard,
       uploadClipboardFiles,
+
+      isGroupMenuBlocked,
     } = props;
 
     const navigate = useNavigate();
@@ -317,7 +319,7 @@ const withHotkeys = (Component) => {
           return;
         }
 
-        if (isAvailableOption("delete")) {
+        if (isAvailableOption("delete") && !isGroupMenuBlocked) {
           if (isRecentFolder) return;
 
           if (isFavoritesFolder) {
@@ -460,6 +462,7 @@ const withHotkeys = (Component) => {
         setFavoriteAction,
         deleteRooms,
         archiveRooms,
+        isGroupMenuBlocked,
       } = filesActionsStore;
 
       const { visible: mediaViewerIsVisible } = mediaViewerDataStore;
@@ -533,6 +536,8 @@ const withHotkeys = (Component) => {
         copyToClipboard,
 
         uploadClipboardFiles,
+
+        isGroupMenuBlocked,
       };
     },
   )(observer(WithHotkeys));

packages/client/src/store/FilesActionsStore.js

@@ -1690,12 +1690,7 @@ class FilesActionStore {
       case "delete":
         const canDelete = selection.every((s) => s.security?.Delete);
 
-        return (
+        return !allFilesIsEditing && canDelete && hasSelection;
-          !allFilesIsEditing &&
-          !this.isGroupMenuBlocked &&
-          canDelete &&
-          hasSelection
-        );
       case "create-room":
         const canCreateRoom = selection.some((s) => s.security?.CreateRoomFrom);
         return canCreateRoom;