Regression: Channel type icon on Engagement Dashboard (#26269)

Co-authored-by: Tasso Evangelista <tasso.evangelista@rocket.chat> Co-authored-by: Guilherme Gazzo <guilhermegazzo@gmail.com>
RocketChat · Jul 20, 2022 · ddf7d0e · ddf7d0e
1 parent 7422924
commit ddf7d0e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/channels/ChannelsTab.tsx
@@ -84,7 +84,7 @@ const ChannelsTab = (): ReactElement => {
 									<Table.Cell>{i + 1}.</Table.Cell>
 									<Table.Cell>
 										<Margins inlineEnd='x4'>
-											{(t === 'd' && <Icon name='at' />) || (t === 'c' && <Icon name='lock' />) || (t === 'p' && <Icon name='hashtag' />)}
+											{(t === 'd' && <Icon name='at' />) || (t === 'p' && <Icon name='lock' />) || (t === 'c' && <Icon name='hashtag' />)}
 										</Margins>
 										{name}
 									</Table.Cell>

diff --git a/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx b/apps/meteor/ee/client/views/admin/engagementDashboard/messages/MessagesPerChannelSection.tsx
@@ -86,15 +86,15 @@ const MessagesPerChannelSection = (): ReactElement => {
 																			color: colors.w500,
 																		},
 																		{
-																			id: 'c',
+																			id: 'p',
 																			label: t('Private_Channels'),
-																			value: pie.c,
+																			value: pie.p,
 																			color: colors.s500,
 																		},
 																		{
-																			id: 'p',
+																			id: 'c',
 																			label: t('Public_Channels'),
-																			value: pie.p,
+																			value: pie.c,
 																			color: colors.p500,
 																		},
 																	]}
@@ -130,10 +130,9 @@ const MessagesPerChannelSection = (): ReactElement => {
 																			},
 																		},
 																	}}
-																	// @ts-ignore
-																	tooltip={({ value }): ReactElement => (
+																	tooltip={({ datum }): ReactElement => (
 																		<Box fontScale='p1m' color='alternative'>
-																			{t('Value_messages', { value })}
+																			{t('Value_messages', { value: datum.value })}
 																		</Box>
 																	)}
 																/>
@@ -194,8 +193,8 @@ const MessagesPerChannelSection = (): ReactElement => {
 														<Table.Cell>
 															<Margins inlineEnd='x4'>
 																{(t === 'd' && <Icon name='at' />) ||
-																	(t === 'c' && <Icon name='lock' />) ||
-																	(t === 'p' && <Icon name='hashtag' />)}
+																	(t === 'p' && <Icon name='lock' />) ||
+																	(t === 'c' && <Icon name='hashtag' />)}
 															</Margins>
 															{name}
 														</Table.Cell>