Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Automated cherry pick of #6493 #6556

Merged
merged 1 commit into from
Sep 25, 2020
Merged

Automated cherry pick of #6493 #6556

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/suggestion/search_channel_provider.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export default class SearchChannelProvider extends Provider {
//
// MM-12677 When this is migrated this needs to be fixed to pull the user's locale
//
channels = channels.sort(sortChannelsByTypeListAndDisplayName.bind(null, 'en', [Constants.DM_CHANNEL, Constants.GM_CHANNEL, Constants.PRIVATE_CHANNEL, Constants.OPEN_CHANNEL]));
channels = channels.sort(sortChannelsByTypeListAndDisplayName.bind(null, 'en', [Constants.OPEN_CHANNEL, Constants.PRIVATE_CHANNEL, Constants.DM_CHANNEL, Constants.GM_CHANNEL]));
const channelNames = channels.map(itemToTerm.bind(null, isAtSearch));

resultsCallback({
Expand Down