Merge branch 'dev' into room-events
This commit is contained in:
commit
fed0823ee5
1 changed files with 1 additions and 1 deletions
|
@ -216,7 +216,7 @@ function getUsersActionJsx(roomId, userIds, actionStr) {
|
||||||
|
|
||||||
const othersCount = userIds.length - MAX_VISIBLE_COUNT;
|
const othersCount = userIds.length - MAX_VISIBLE_COUNT;
|
||||||
// eslint-disable-next-line react/jsx-one-expression-per-line
|
// eslint-disable-next-line react/jsx-one-expression-per-line
|
||||||
return <>{u1Jsx}, {u2Jsx}, {u3Jsx} and {othersCount} other are {actionStr}</>;
|
return <>{u1Jsx}, {u2Jsx}, {u3Jsx} and {othersCount} others are {actionStr}</>;
|
||||||
}
|
}
|
||||||
|
|
||||||
function parseTimelineChange(mEvent) {
|
function parseTimelineChange(mEvent) {
|
||||||
|
|
Loading…
Reference in a new issue