IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

[MM-58778] Fixing white screen for GM conversion (#27385)

Browse Source 
* fixing white screen for GM conversion
---------
Co-authored-by: Mattermost Build <build@mattermost.com>
This commit is contained in:
Ben Cooke 2024-07-11 16:52:44 -04:00 committed by GitHub
parent 7d80b5d04b
commit d249d4d1b0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
webapp/channels/src/components/post_view/gm_conversion_message/gm_conversion_message.tsx
View File

@ -1,7 +1,7 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
import React, {useEffect, useRef} from 'react';
import React, {useEffect, useMemo, useRef} from 'react';
import {FormattedMessage, useIntl} from 'react-intl';
import {useDispatch, useSelector} from 'react-redux';
@ -36,7 +36,20 @@ function GMConversionMessage(props: Props): JSX.Element {
),
);
const convertedByUserUsername = userProfiles.find((user) => user.id === convertedByUserId)!.username;
const convertedByUsername = useMemo(() => {
const convertedByUser = userProfiles.find((user) => user.id === convertedByUserId);
if (!convertedByUser) {
return (
<FormattedMessage
id='api.channel.group_message_converted_to.someone'
defaultMessage='Someone'
/>
);
}
return renderUsername(convertedByUser.username);
}, [convertedByUserId, userProfiles]);
const gmMembersUsernames = userProfiles.map((user) => renderUsername(user.username));
if (!convertedByUserId || !gmMembersDuringConversionIDs || gmMembersDuringConversionIDs.length === 0) {
@ -50,7 +63,7 @@ function GMConversionMessage(props: Props): JSX.Element {
id='api.channel.group_message_converted_to.private_channel'
defaultMessage='{convertedBy} created this channel from a group message with {gmMembers}.'
values={{
convertedBy: renderUsername(convertedByUserUsername),
convertedBy: convertedByUsername,
gmMembers: intl.formatList(gmMembersUsernames),
}}
/>

1
webapp/channels/src/i18n/en.json
View File

@ -2817,6 +2817,7 @@
"api.channel.add_member.added": "{addedUsername} added to the channel by {username}.",
"api.channel.delete_channel.archived": "{username} archived the channel.",
"api.channel.group_message_converted_to.private_channel": "{convertedBy} created this channel from a group message with {gmMembers}.",
"api.channel.group_message_converted_to.someone": "Someone",
"api.channel.guest_join_channel.post_and_forget": "{username} joined the channel as a guest.",
"api.channel.join_channel.post_and_forget": "{username} joined the channel.",
"api.channel.leave.left": "{username} left the channel.",