From 04c0223c6402b12e67c61474ae310b0a56af6482 Mon Sep 17 00:00:00 2001
From: Ryan Wang <R-Wang97@users.noreply.github.com>
Date: Thu, 16 Mar 2017 14:27:33 -0400
Subject: Sort favorite channels alphabetically regardless of type (#5739)

---
 webapp/components/sidebar.jsx | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'webapp/components/sidebar.jsx')

diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx
index 08d80d363..b9356c5a1 100644
--- a/webapp/components/sidebar.jsx
+++ b/webapp/components/sidebar.jsx
@@ -636,13 +636,15 @@ export default class Sidebar extends React.Component {
         this.lastUnreadChannel = null;
 
         // create elements for all 4 types of channels
-        const favoriteItems = this.state.favoriteChannels.map((channel, index, arr) => {
-            if (channel.type === Constants.DM_CHANNEL) {
-                return this.createChannelElement(channel, index, arr, this.handleLeaveDirectChannel);
-            }
+        const favoriteItems = this.state.favoriteChannels.
+            sort(Utils.sortTeamsByDisplayName).
+            map((channel, index, arr) => {
+                if (channel.type === Constants.DM_CHANNEL) {
+                    return this.createChannelElement(channel, index, arr, this.handleLeaveDirectChannel);
+                }
 
-            return this.createChannelElement(channel);
-        });
+                return this.createChannelElement(channel);
+            });
 
         const publicChannelItems = this.state.publicChannels.map(this.createChannelElement);
 
-- 
cgit v1.2.3-1-g7c22

