[IMPROVE] System messages consistency (#4461)

* fix sys messages * update snapshot * update snapshot * add username * wip * wip * change to switch and fix types * wip * new translations * update snapshot * Update app/containers/message/utils.ts Co-authored-by: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> * fix types and return * remove unused translation * fix types * remove unused params * minor tweak * update story Co-authored-by: Reinaldo Neto <47038980+reinaldonetof@users.noreply.github.com> Co-authored-by: Reinaldo Neto <reinaldonetof@hotmail.com>
RocketChat · Oct 21, 2022 · 16e11c7 · 16e11c7
1 parent 761aef2
commit 16e11c7
Show file tree

Hide file tree

Showing 19 changed files with 273 additions and 412 deletions.
diff --git a/__tests__/containers/message/__snapshots__/Message.stories.storyshot b/__tests__/containers/message/__snapshots__/Message.stories.storyshot
diff --git a/app/containers/message/Content.tsx b/app/containers/message/Content.tsx
@@ -6,11 +6,12 @@ import I18n from '../../i18n';
 import styles from './styles';
 import Markdown, { MarkdownPreview } from '../markdown';
 import User from './User';
-import { SYSTEM_MESSAGE_TYPES_WITH_AUTHOR_NAME, getInfoMessage } from './utils';
+import { messageHaveAuthorName, getInfoMessage } from './utils';
 import MessageContext from './Context';
 import { IMessageContent } from './interfaces';
 import { useTheme } from '../../theme';
 import { themes } from '../../lib/constants';
+import { MessageTypesValues } from '../../definitions';
 
 const Content = React.memo(
 	(props: IMessageContent) => {
@@ -26,8 +27,7 @@ const Content = React.memo(
 					{infoMessage}
 				</Text>
 			);
-
-			if (SYSTEM_MESSAGE_TYPES_WITH_AUTHOR_NAME.includes(props.type)) {
+			if (messageHaveAuthorName(props.type as MessageTypesValues)) {
 				return (
 					<Text>
 						<User {...props} /> {renderMessageContent}

diff --git a/app/containers/message/User.tsx b/app/containers/message/User.tsx
@@ -7,8 +7,8 @@ import { useTheme } from '../../theme';
 import sharedStyles from '../../views/Styles';
 import messageStyles from './styles';
 import MessageContext from './Context';
-import { SYSTEM_MESSAGE_TYPES_WITH_AUTHOR_NAME } from './utils';
-import { MessageType, SubscriptionType } from '../../definitions';
+import { messageHaveAuthorName } from './utils';
+import { MessageType, MessageTypesValues, SubscriptionType } from '../../definitions';
 import { IRoomInfoParam } from '../../views/SearchMessagesView';
 import RightIcons from './Components/RightIcons';
 
@@ -88,8 +88,7 @@ const User = React.memo(
 					{aliasUsername}
 				</>
 			);
-
-			if (SYSTEM_MESSAGE_TYPES_WITH_AUTHOR_NAME.includes(type)) {
+			if (messageHaveAuthorName(type as MessageTypesValues)) {
 				return (
 					<Text
 						style={[styles.usernameInfoMessage, { color: themes[theme].titleText }]}