[FIX] Toolbox icons order (#21739)

RocketChat · Apr 23, 2021 · 7f33b8a · 7f33b8a
1 parent 27c186b
commit 7f33b8a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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', {