Sort favorite channels alphabetically regardless of type (#5739)

webapp/components/sidebar.jsx

@@ -636,7 +636,9 @@ 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) => {
+        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);
                 }