From 6a4690a9bb20c8ae7243ee05599686cb30a60a3e Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Thu, 20 Aug 2020 10:40:35 +0200
Subject: [PATCH] Add a combined settings tab

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 src/components/RightSidebar/RightSidebar.vue | 22 +++++++-------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index 6d694bdcb3..faef52e657 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -49,27 +49,21 @@
 			<ParticipantsTab :display-search-box="displaySearchBox" />
 		</AppSidebarTab>
 		<AppSidebarTab
-			v-if="getUserId"
-			id="projects"
+			id="settings-tab"
 			:order="3"
-			:name="t('spreed', 'Projects')"
-			icon="icon-projects">
-			<CollectionList v-if="conversation.token"
+			:name="t('spreed', 'Settings')"
+			icon="icon-settings">
+			<SetGuestUsername
+				v-if="!getUserId" />
+			<CollectionList
+				v-if="getUserId && conversation.token"
 				:id="conversation.token"
 				type="room"
 				:name="conversation.displayName" />
 		</AppSidebarTab>
-		<AppSidebarTab
-			v-if="!getUserId"
-			id="settings"
-			:order="4"
-			:name="t('spreed', 'Settings')"
-			icon="icon-settings">
-			<SetGuestUsername />
-		</AppSidebarTab>
 		<AppSidebarTab
 			id="preview"
-			:order="5"
+			:order="4"
 			:name="t('spreed', 'Preview')"
 			icon="icon-video">
 			<MediaDevicesPreview :enabled="!showChatInSidebar && activeTab === 'preview'" />