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

Merge branch 'develop' into matthew/twemoji

Browse source
This commit is contained in:
Matthew Hodgson 2019-05-20 16:38:44 +01:00 • committed by GitHub
commit d3f06763b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 236 additions and 60 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21,6 +21,7 @@ import MatrixClientPeg from '../../../MatrixClientPeg';
import sdk from '../../../index';
import { unicodeToShortcode } from '../../../HtmlUtils';
import { _t } from '../../../languageHandler';
import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';
export default class ReactionsRowButtonTooltip extends React.PureComponent {
static propTypes = {
@ -54,7 +55,7 @@ export default class ReactionsRowButtonTooltip extends React.PureComponent {
{
reactors: () => {
return <div className="mx_ReactionsRowButtonTooltip_senders">
{senders.join(", ")}
{formatCommaSeparatedList(senders, 6)}
</div>;
},
reactedWith: (sub) => {