OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

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

Fix double date separator for room upgrade tiles
pull/21833/head
Bruno Windels 2019-11-22 16:52:47 +00:00 committed by GitHub
parent 4a684d01a4 32b6fccbfc
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._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