imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove reacted with text when shortcode missing

Browse source 
If we don't have the shortcode for some emoji, don't show any "reacted with X"
text in the reaction tooltip.

Fixes https://github.com/vector-im/riot-web/issues/9786
This commit is contained in:
J. Ryan Stinnett 2019-05-21 13:54:06 +01:00
parent 2d4d608ed6
commit 18d444d2e7
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/messages/ReactionsRowButtonTooltip.js
View file

@ -46,7 +46,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
const { name } = room.getMember(reactionEvent.getSender()); const { name } = room.getMember(reactionEvent.getSender());
senders.push(name); senders.push(name);
} }
const shortName = unicodeToShortcode(content) || content; const shortName = unicodeToShortcode(content);
tooltipLabel = <div>{_t( tooltipLabel = <div>{_t(
"<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>", "<reactors/><reactedWith>reacted with %(shortName)s</reactedWith>",
{ {
@ -59,6 +59,9 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
</div>; </div>;
}, },
reactedWith: (sub) => { reactedWith: (sub) => {
if (!shortName) {
return null;
}
return <div className="mx_ReactionsRowButtonTooltip_reactedWith"> return <div className="mx_ReactionsRowButtonTooltip_reactedWith">
{sub} {sub}
</div>; </div>;