mirrors/element-web
1
0
Fork 0
mirror of https://github.com/vector-im/element-web.git synced 2025-11-03 01:31:44 +01:00
Code Issues Projects Releases Wiki Activity

Show m.room.create event before the ELS on room upgrade

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2019-11-22 10:24:51 +00:00 committed by David Baker
parent cc79afb99d
commit 5ec4b6efcd
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; 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 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++) { for (;i + 1 < this.props.events.length; i++) {
const collapsedMxEv = this.props.events[i + 1]; const collapsedMxEv = this.props.events[i + 1];