From 38fc6ec154aade365c19cfd5ae300a006df80e3b Mon Sep 17 00:00:00 2001
From: Renato Becker <renato.augusto.becker@gmail.com>
Date: Mon, 3 Feb 2020 17:39:34 -0300
Subject: [PATCH] [NEW] Sort the Omnichannel Chat list according to the user
 preferences (#16437)

* Fix the order of the Omnichannel chats list, keeping the items sorted by activity.

* Remove invalid console.log.

* Sort the Omnichannel chat list according the user preference.

* Remove unnecessary extra parenthesis.
---
 app/livechat/client/views/sideNav/livechat.js | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/app/livechat/client/views/sideNav/livechat.js b/app/livechat/client/views/sideNav/livechat.js
index aeb1571fab0..d3faba2b309 100644
--- a/app/livechat/client/views/sideNav/livechat.js
+++ b/app/livechat/client/views/sideNav/livechat.js
@@ -37,20 +37,16 @@ Template.livechat.helpers({
 			open: true,
 		};
 
-		const user = Users.findOne(Meteor.userId(), {
-			fields: { 'settings.preferences.sidebarShowUnread': 1 },
-		});
+		const user = Meteor.userId();
 
 		if (getUserPreference(user, 'sidebarShowUnread')) {
 			query.alert = { $ne: true };
 		}
 
-		return ChatSubscription.find(query, {
-			sort: {
-				t: 1,
-				fname: 1,
-			},
-		});
+		const sortBy = getUserPreference(user, 'sidebarSortby');
+		const sort = sortBy === 'activity' ? { _updatedAt: - 1 } : { fname: 1 };
+
+		return ChatSubscription.find(query, { sort });
 	},
 
 	inquiries() {