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

Merge pull request #3660 from matrix-org/dbkr/fix_m.room.create_upgrade_notice_rel

Browse source 
Show m.room.create event before the ELS on room upgrade
This commit is contained in:
David Baker 2019-11-22 13:43:46 +00:00 committed by GitHub
commit d5011f9382
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -411,6 +411,11 @@ module.exports = createReactClass({
readMarkerInSummary = true;
}
// 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));
}
const summarisedEvents = []; // Don't add m.room.create here as we don't want it inside the summary
for (;i + 1 < this.props.events.length; i++) {
const collapsedMxEv = this.props.events[i + 1];