Merge branch 'develop' into fix/thumbnails-not-deleted

Author: kodiakhq[bot]

.changeset/clean-sloths-greet.md

@@ -0,0 +1,5 @@
+---
+"@rocket.chat/meteor": patch
+---
+
+Fixes the send attachments option not working on iOS browsers by moving it from the composer dropdown menu to the composer primary actions.

apps/meteor/client/views/room/composer/messageBox/MessageBoxActionsToolbar/MessageBoxActionsToolbar.tsx

@@ -81,8 +81,8 @@ const MessageBoxActionsToolbar = ({
 	createNew.push(allActions.createDiscussionAction);
 
 	if (variant === 'small') {
-		featured.push(allActions.audioMessageAction);
-		createNew.push(allActions.videoMessageAction, allActions.fileUploadAction);
+		featured.push(allActions.audioMessageAction, allActions.fileUploadAction);
+		createNew.push(allActions.videoMessageAction);
 	} else {
 		featured.push(allActions.audioMessageAction, allActions.videoMessageAction, allActions.fileUploadAction);
 	}

apps/meteor/tests/e2e/message-composer.spec.ts

@@ -32,7 +32,7 @@ test.describe.serial('message-composer', () => {
 		await page.setViewportSize({ width: 768, height: 600 });
 		await poHomeChannel.sidenav.openChat(targetChannel);
 
-		await expect(poHomeChannel.composerToolbarActions).toHaveCount(5);
+		await expect(poHomeChannel.composerToolbarActions).toHaveCount(6);
 	});
 
 	test('should navigate on toolbar using arrow keys', async ({ page }) => {