[IMPROVE] Remove difference between public/private on "Group by type" (#3271)

* Merge channels and private groups

* Remove i18n

app/i18n/locales/ar.json

@@ -387,7 +387,6 @@
   "Preferences_saved": "تم حفظ التفضيلات",
   "Privacy_Policy": "سياسة الخصوصية",
   "Private_Channel": "قناة خاصة",
-  "Private_Groups": "مجموعات خاصة",
   "Private": "خاص",
   "Processing": "جار معالجة...",
   "Profile_saved_successfully": "تم حفظ الملف الشخصي بنجاح!",

app/i18n/locales/de.json

@@ -400,7 +400,6 @@
   "Preferences_saved": "Einstellungen gespeichert!",
   "Privacy_Policy": " Datenschutzbestimmungen",
   "Private_Channel": "Privater Kanal",
-  "Private_Groups": "Private Gruppen",
   "Private": "Privat",
   "Processing": "Bearbeite …",
   "Profile_saved_successfully": "Profil erfolgreich gespeichert!",

app/i18n/locales/en.json

@@ -400,7 +400,6 @@
   "Preferences_saved": "Preferences saved!",
   "Privacy_Policy": " Privacy Policy",
   "Private_Channel": "Private Channel",
-  "Private_Groups": "Private Groups",
   "Private": "Private",
   "Processing": "Processing...",
   "Profile_saved_successfully": "Profile saved successfully!",

app/i18n/locales/es-ES.json

@@ -280,7 +280,6 @@
   "Preferences_saved": "¡Preferencias guardadas!",
   "Privacy_Policy": "Política de privacidad",
   "Private_Channel": "Canal privado",
-  "Private_Groups": "Grupos privados",
   "Private": "Privado",
   "Processing": "Procesando...",
   "Profile_saved_successfully": "¡Perfil guardado correctamente!",

app/i18n/locales/fr.json

@@ -400,7 +400,6 @@
   "Preferences_saved": "Préférences sauvegardées !",
   "Privacy_Policy": " Politique de confidentialité",
   "Private_Channel": "Canal privé",
-  "Private_Groups": "Groupes privés",
   "Private": "Privé",
   "Processing": "Traitement...",
   "Profile_saved_successfully": "Profil enregistré avec succès !",

app/i18n/locales/it.json

@@ -392,7 +392,6 @@
   "Preferences_saved": "Impostazioni salvate!",
   "Privacy_Policy": " Privacy Policy",
   "Private_Channel": "Canale privato",
-  "Private_Groups": "Gruppi privati",
   "Private": "Privato",
   "Processing": "Elaborazione...",
   "Profile_saved_successfully": "Profilo salvato correttamente!",

app/i18n/locales/ja.json

@@ -296,7 +296,6 @@
   "Preferences_saved": "設定が保存されました。",
   "Privacy_Policy": " プライバシーポリシー",
   "Private_Channel": "プライベートチャンネル",
-  "Private_Groups": "プライベートグループ",
   "Private": "プライベート",
   "Processing": "処理中...",
   "Profile_saved_successfully": "プロフィールが保存されました！",

app/i18n/locales/nl.json

@@ -400,7 +400,6 @@
   "Preferences_saved": "Voorkeuren opgeslagen!",
   "Privacy_Policy": " Privacybeleid",
   "Private_Channel": "Privékanaal",
-  "Private_Groups": "Privé groepen",
   "Private": "Privé",
   "Processing": "Verwerking...",
   "Profile_saved_successfully": "Profiel succesvol opgeslagen!",

app/i18n/locales/pt-BR.json

@@ -370,7 +370,6 @@
   "Preferences_saved": "Preferências salvas!",
   "Privacy_Policy": " Política de Privacidade",
   "Private_Channel": "Canal Privado",
-  "Private_Groups": "Grupo Privado",
   "Private": "Privado",
   "Processing": "Processando...",
   "Profile_saved_successfully": "Perfil salvo com sucesso!",

app/i18n/locales/pt-PT.json

@@ -399,7 +399,6 @@
   "Preferences_saved": "Preferências guardadas!",
   "Privacy_Policy": " Política de Privacidade",
   "Private_Channel": "Canal Privado",
-  "Private_Groups": "Grupos Privados",
   "Private": "Privado",
   "Processing": "A processar...",
   "Profile_saved_successfully": "Perfil actualizado com sucesso!",

app/i18n/locales/ru.json

@@ -400,7 +400,6 @@
   "Preferences_saved": "Настройки сохранены!",
   "Privacy_Policy": " Политика конфиденциальности",
   "Private_Channel": "Приватный канал",
-  "Private_Groups": "Приватные группы",
   "Private": "Приватный",
   "Processing": "Обработка...",
   "Profile_saved_successfully": "Профиль успешно сохранен!",

app/i18n/locales/tr.json

@@ -393,7 +393,6 @@
   "Preferences_saved": "Tercihler kaydedildi!",
   "Privacy_Policy": " Privacy Policy",
   "Private_Channel": "Özel Kanal",
-  "Private_Groups": "Özel Gruplar",
   "Private": "Özel",
   "Processing": "İşleniyor...",
   "Profile_saved_successfully": "Profil başarıyla kaydedildi!",

app/i18n/locales/zh-CN.json

@@ -390,7 +390,6 @@
   "Preferences_saved": "偏好已保存!",
   "Privacy_Policy": "隐私政策",
   "Private_Channel": "私人频道",
-  "Private_Groups": "私人群组",
   "Private": "私有的",
   "Processing": "处理中",
   "Profile_saved_successfully": "个人资料保存成功!",

app/i18n/locales/zh-TW.json

@@ -391,7 +391,6 @@
   "Preferences_saved": "偏好設定已被儲存!",
   "Privacy_Policy": "隱私政策",
   "Private_Channel": "私人頻道",
-  "Private_Groups": "私人群組",
   "Private": "私有的",
   "Processing": "處理中",
   "Profile_saved_successfully": "個人資料儲存成功!",

app/views/RoomsListView/index.js

@@ -71,7 +71,6 @@ const DISCUSSIONS_HEADER = 'Discussions';
 const TEAMS_HEADER = 'Teams';
 const CHANNELS_HEADER = 'Channels';
 const DM_HEADER = 'Direct_Messages';
-const GROUPS_HEADER = 'Private_Groups';
 const OMNICHANNEL_HEADER = 'Open_Livechats';
 const QUERY_SIZE = 20;
 
@@ -480,13 +479,11 @@ class RoomsListView extends React.Component {
 			if (groupByType) {
 				const teams = chats.filter(s => filterIsTeam(s));
 				const discussions = chats.filter(s => filterIsDiscussion(s));
-				const channels = chats.filter(s => s.t === 'c' && !filterIsDiscussion(s) && !filterIsTeam(s));
+				const channels = chats.filter(s => (s.t === 'c' || s.t === 'p') && !filterIsDiscussion(s) && !filterIsTeam(s));
-				const privateGroup = chats.filter(s => s.t === 'p' && !filterIsDiscussion(s) && !filterIsTeam(s));
 				const direct = chats.filter(s => s.t === 'd' && !filterIsDiscussion(s) && !filterIsTeam(s));
 				tempChats = this.addRoomsGroup(teams, TEAMS_HEADER, tempChats);
 				tempChats = this.addRoomsGroup(discussions, DISCUSSIONS_HEADER, tempChats);
 				tempChats = this.addRoomsGroup(channels, CHANNELS_HEADER, tempChats);
-				tempChats = this.addRoomsGroup(privateGroup, GROUPS_HEADER, tempChats);
 				tempChats = this.addRoomsGroup(direct, DM_HEADER, tempChats);
 			} else if (showUnread || showFavorites || isOmnichannelAgent) {
 				tempChats = this.addRoomsGroup(chats, CHATS_HEADER, tempChats);