Skip to content

Commit b09709d

Browse files
committed
added encrypted room support
1 parent e933a45 commit b09709d

2 files changed

Lines changed: 5 additions & 8 deletions

File tree

src/app/components/event-history/EventHistory.tsx

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ export const EventHistory = as<'div', EventHistoryProps>(
123123
<Box className={css.Content} direction="Column">
124124
{mEvents.map((mEvent) => {
125125
if (!mEvent.event.sender) return <div />;
126-
126+
const EventContent = mEvent.getOriginalContent();
127127
return (
128128
<Box className={css.EventItem}>
129129
<Time
@@ -133,14 +133,10 @@ export const EventHistory = as<'div', EventHistoryProps>(
133133
/>
134134
<Text size="T400" style={{ paddingLeft: '10px', wordBreak: 'break-word' }}>
135135
<RenderBody
136-
body={
137-
mEvent?.event?.content?.['m.new_content']?.body ??
138-
mEvent.event?.content?.body ??
139-
''
140-
}
136+
body={EventContent?.['m.new_content']?.body ?? EventContent?.body ?? ''}
141137
customBody={
142-
mEvent?.event?.content?.['m.new_content']?.formatted_body ??
143-
mEvent.event?.content?.formatted_body ??
138+
EventContent?.['m.new_content']?.formatted_body ??
139+
EventContent?.formatted_body ??
144140
''
145141
}
146142
htmlReactParserOptions={htmlReactParserOptions}

src/app/components/message/modals/MessageEditHistory.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ export function MessageEditHistoryInternal({
5050
evtTimeline &&
5151
getEventEdits(evtTimeline.getTimelineSet(), evtId, mEvent.getType())?.getRelations();
5252
if (!edits) return [mEvent];
53+
edits.sort((a, b) => a.getTs() - b.getTs());
5354
return [mEvent, ...edits];
5455
};
5556

0 commit comments

Comments
 (0)