Merge branch 'dev' into room-events

This commit is contained in:
tezlm 2022-08-12 10:34:47 +00:00 committed by GitHub
commit fed0823ee5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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) {