fix: misleading of 'total' in team members & members fixed (#29090)

Co-authored-by: Douglas Fabris <27704687+dougfabris@users.noreply.github.com> Co-authored-by: Hugo Costa <20212776+hugocostadev@users.noreply.github.com>
RocketChat · Jul 18, 2023 · 3fb2124 · 3fb2124
1 parent 53822be
commit 3fb2124
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/.changeset/lazy-ghosts-design.md b/.changeset/lazy-ghosts-design.md
@@ -0,0 +1,5 @@
+---
+'@rocket.chat/meteor': patch
+---
+
+Fixed misleading of 'total' in team members list inside Channel
diff --git a/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx b/apps/meteor/client/views/room/contextualBar/RoomMembers/RoomMembers.tsx
@@ -120,15 +120,11 @@ const RoomMembers = ({
 
 				{!loading && members.length <= 0 && <ContextualbarEmptyContent title={t('No_members_found')} />}
 
-				{!loading && members && members.length > 0 && (
+				{!loading && members.length > 0 && (
 					<>
 						<Box pi='x18' pb='x12'>
 							<Box is='span' color='hint' fontScale='p2'>
-								{t('Showing')}: {members.length}
-							</Box>
-
-							<Box is='span' color='hint' fontScale='p2' mis='x8'>
-								{t('Total')}: {total}
+								{t('Showing_current_of_total', { current: members.length, total })}
 							</Box>
 						</Box>
 

diff --git a/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json b/apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
@@ -4640,6 +4640,7 @@
   "Show_video": "Show video",
   "Showing": "Showing",
   "Showing_archived_results": "<p>Showing <b>%s</b> archived results</p>",
+  "Showing_current_of_total":"Showing {{current}} of {{total}}",
   "Showing_online_users": "Showing: <b>{{total_showing}}</b>, Online: {{online}}, Total: {{total}} users",
   "Showing_results": "<p>Showing <b>%s</b> results</p>",
   "Showing_results_of": "Showing results %s - %s of %s",