From 7f33b8a2d1da7ca4be162aeaeefb75e28bd5e6b7 Mon Sep 17 00:00:00 2001
From: Tiago Evangelista Pinto <tiago.evangelista@rocket.chat>
Date: Thu, 22 Apr 2021 22:42:01 -0300
Subject: [PATCH] [FIX] Toolbox icons order (#21739)

---
 app/channel-settings/client/tabBar.ts           |  2 +-
 app/discussion/client/tabBar.ts                 |  2 +-
 app/threads/client/flextab/threadlist.tsx       |  2 +-
 app/videobridge/client/tabBar.tsx               |  4 ++--
 client/views/room/lib/Toolbox/defaultActions.ts | 10 +++++-----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/channel-settings/client/tabBar.ts b/app/channel-settings/client/tabBar.ts
index e94f08c7b17..91dc8aa1fe7 100644
--- a/app/channel-settings/client/tabBar.ts
+++ b/app/channel-settings/client/tabBar.ts
@@ -10,5 +10,5 @@ addAction('channel-settings', {
 	title: 'Room_Info',
 	icon: 'info-circled',
 	template: lazy(() => import('../../../client/views/room/contextualBar/Info')) as LazyExoticComponent<FC>,
-	order: 7,
+	order: 1,
 });
diff --git a/app/discussion/client/tabBar.ts b/app/discussion/client/tabBar.ts
index 14bfe145c43..658fe5d797b 100644
--- a/app/discussion/client/tabBar.ts
+++ b/app/discussion/client/tabBar.ts
@@ -15,6 +15,6 @@ addAction('discussions', () => {
 		icon: 'discussion',
 		template,
 		full: true,
-		order: 7,
+		order: 3,
 	} : null), [discussionEnabled]);
 });
diff --git a/app/threads/client/flextab/threadlist.tsx b/app/threads/client/flextab/threadlist.tsx
index 75650d3dd6c..2041d2777d8 100644
--- a/app/threads/client/flextab/threadlist.tsx
+++ b/app/threads/client/flextab/threadlist.tsx
@@ -35,6 +35,6 @@ addAction('thread', (options) => {
 				{ unread > 0 && <Header.Badge variant={variant}>{unread}</Header.Badge> }
 			</Header.ToolBoxAction>;
 		},
-		order: 4,
+		order: 2,
 	} : null), [threadsEnabled, room.tunread?.length, room.tunreadUser?.length, room.tunreadGroup?.length]);
 });
diff --git a/app/videobridge/client/tabBar.tsx b/app/videobridge/client/tabBar.tsx
index b52fcb20b66..6e747adb1be 100644
--- a/app/videobridge/client/tabBar.tsx
+++ b/app/videobridge/client/tabBar.tsx
@@ -31,7 +31,7 @@ addAction('bbb_video', ({ room }) => {
 		title: 'BBB_Video_Call',
 		icon: 'phone',
 		template: templateBBB,
-		order: live ? -1 : 0,
+		order: live ? -1 : 4,
 		renderAction: (props): ReactNode => <Header.ToolBoxAction {...props}>
 			{live ? <Header.Badge title={t('Started_a_video_call')} variant='primary'>!</Header.Badge> : null}
 		</Header.ToolBoxAction>,
@@ -65,7 +65,7 @@ addAction('video', ({ room }) => {
 		icon: 'phone',
 		template: templateJitsi,
 		full: true,
-		order: live ? -1 : 0,
+		order: live ? -1 : 4,
 		renderAction: (props): ReactNode => <Header.ToolBoxAction {...props}>
 			{live && <Header.Badge title={t('Started_a_video_call')} variant='primary'>!</Header.Badge>}
 		</Header.ToolBoxAction>,
diff --git a/client/views/room/lib/Toolbox/defaultActions.ts b/client/views/room/lib/Toolbox/defaultActions.ts
index dcdafbc5c6b..3c8f6913f04 100644
--- a/client/views/room/lib/Toolbox/defaultActions.ts
+++ b/client/views/room/lib/Toolbox/defaultActions.ts
@@ -9,7 +9,7 @@ addAction('rocket-search', {
 	title: 'Search_Messages',
 	icon: 'magnifier',
 	template: 'RocketSearch',
-	order: 4,
+	order: 6,
 });
 
 addAction('user-info', {
@@ -18,7 +18,7 @@ addAction('user-info', {
 	title: 'User_Info',
 	icon: 'user',
 	template: lazy(() => import('../../MemberListRouter')),
-	order: 5,
+	order: 1,
 });
 
 addAction('contact-profile', {
@@ -29,7 +29,7 @@ addAction('contact-profile', {
 	template: lazy(
 		() => import('../../../omnichannel/directory/contacts/contextualBar/ContactsContextualBar'),
 	),
-	order: 5,
+	order: 1,
 });
 
 addAction('user-info-group', {
@@ -38,7 +38,7 @@ addAction('user-info-group', {
 	title: 'Members',
 	icon: 'team',
 	template: lazy(() => import('../../MemberListRouter')),
-	order: 5,
+	order: 1,
 });
 
 addAction('members-list', ({ room }) => {
@@ -65,7 +65,7 @@ addAction('uploaded-files-list', {
 	title: 'Files',
 	icon: 'clip',
 	template: lazy(() => import('../../contextualBar/RoomFiles')),
-	order: 6,
+	order: 7,
 });
 
 addAction('keyboard-shortcut-list', {