From a3f7a76ea05ed323952c7b0e6351a0570aad60cd Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Tue, 8 Oct 2024 12:42:57 -0300
Subject: [PATCH 1/2] feat: apply category reorder on
 `sidebarv2/hooks/useRoomList.ts`

---
 .../client/sidebarv2/hooks/useRoomList.ts     | 41 ++++++++++++++++++-
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
index fa5dfd2797cb1..afdc57086dc44 100644
--- a/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
+++ b/apps/meteor/client/sidebarv2/hooks/useRoomList.ts
@@ -12,12 +12,39 @@ const query = { open: { $ne: false } };
 
 const emptyQueue: ILivechatInquiryRecord[] = [];
 
+const order: (
+	| 'Incoming_Calls'
+	| 'Incoming_Livechats'
+	| 'Open_Livechats'
+	| 'On_Hold_Chats'
+	| 'Unread'
+	| 'Favorites'
+	| 'Teams'
+	| 'Discussions'
+	| 'Channels'
+	| 'Direct_Messages'
+	| 'Conversations'
+)[] = [
+	'Incoming_Calls',
+	'Incoming_Livechats',
+	'Open_Livechats',
+	'On_Hold_Chats',
+	'Unread',
+	'Favorites',
+	'Teams',
+	'Discussions',
+	'Channels',
+	'Direct_Messages',
+	'Conversations',
+];
+
 export const useRoomList = (): Array<ISubscription & IRoom> => {
 	const [roomList, setRoomList] = useDebouncedState<(ISubscription & IRoom)[]>([], 150);
 
 	const showOmnichannel = useOmnichannelEnabled();
 	const sidebarGroupByType = useUserPreference('sidebarGroupByType');
 	const favoritesEnabled = useUserPreference('sidebarShowFavorites');
+	const sidebarOrder = useUserPreference<typeof order>('sidebarSectionsOrder') ?? order;
 	const isDiscussionEnabled = useSetting('Discussion_enabled');
 	const sidebarShowUnread = useUserPreference('sidebarShowUnread');
 
@@ -92,7 +119,7 @@ export const useRoomList = (): Array<ISubscription & IRoom> => {
 			});
 
 			const groups = new Map();
-			incomingCall.size && groups.set('Incoming Calls', incomingCall);
+			incomingCall.size && groups.set('Incoming_Calls', incomingCall);
 			showOmnichannel && inquiries.enabled && queue.length && groups.set('Incoming_Livechats', queue);
 			showOmnichannel && omnichannel.size && groups.set('Open_Livechats', omnichannel);
 			showOmnichannel && onHold.size && groups.set('On_Hold_Chats', onHold);
@@ -103,7 +130,16 @@ export const useRoomList = (): Array<ISubscription & IRoom> => {
 			sidebarGroupByType && channels.size && groups.set('Channels', channels);
 			sidebarGroupByType && direct.size && groups.set('Direct_Messages', direct);
 			!sidebarGroupByType && groups.set('Conversations', conversation);
-			return [...groups.entries()].flatMap(([key, group]) => [key, ...group]);
+			return sidebarOrder
+				.map((key) => {
+					const group = groups.get(key);
+					if (!group) {
+						return [];
+					}
+
+					return [key, ...group];
+				})
+				.flat();
 		});
 	}, [
 		rooms,
@@ -116,6 +152,7 @@ export const useRoomList = (): Array<ISubscription & IRoom> => {
 		sidebarGroupByType,
 		setRoomList,
 		isDiscussionEnabled,
+		sidebarOrder,
 	]);
 
 	return roomList;

From f04888edb00583d9cfaced4d3cd78ccac4bbb99f Mon Sep 17 00:00:00 2001
From: juliajforesti <juliajforesti@gmail.com>
Date: Tue, 8 Oct 2024 12:44:27 -0300
Subject: [PATCH 2/2] chore: changeset

---
 .changeset/strange-spies-clean.md | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .changeset/strange-spies-clean.md

diff --git a/.changeset/strange-spies-clean.md b/.changeset/strange-spies-clean.md
new file mode 100644
index 0000000000000..68ec261509f6c
--- /dev/null
+++ b/.changeset/strange-spies-clean.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': minor
+---
+
+Applied category reorder from admin setting also on new sidebar - Enhanced navigation feature preview