PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3662 from matrix-org/bwindels/itsadoubledate

Browse source 
Fix double date separator for room upgrade tiles
This commit is contained in:
Bruno Windels 2019-11-22 16:52:47 +00:00 committed by GitHub
commit 15b5ad7451
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/components/structures/MessagePanel.js
View file

@ -416,7 +416,8 @@ export default class MessagePanel extends React.Component {
// If this m.room.create event should be shown (room upgrade) then show it before the summary // If this m.room.create event should be shown (room upgrade) then show it before the summary
if (this._shouldShowEvent(mxEv)) { if (this._shouldShowEvent(mxEv)) {
ret.push(...this._getTilesForEvent(prevEvent, mxEv, false)); // pass in the mxEv as prevEvent as well so no extra DateSeparator is rendered
ret.push(...this._getTilesForEvent(mxEv, mxEv, false));
} }
const summarisedEvents = []; // Don't add m.room.create here as we don't want it inside the summary const summarisedEvents = []; // Don't add m.room.create here as we don't want it inside the summary