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

Fix view source from edit history dialog always showing latest event (#10626)

Browse source
This commit is contained in:
Michael Telatynski 2023-04-17 17:09:17 +01:00 committed by GitHub
parent a092a91cd9
commit 270a26d89a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/ViewSource.tsx
View file

@ -31,6 +31,7 @@ import CopyableText from "../views/elements/CopyableText";
interface IProps {
mxEvent: MatrixEvent; // the MatrixEvent associated with the context menu
ignoreEdits?: boolean;
onFinished(): void;
}
@ -58,7 +59,11 @@ export default class ViewSource extends React.Component<IProps, IState> {
// returns the dialog body for viewing the event source
private viewSourceContent(): JSX.Element {
const mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
let mxEvent = this.props.mxEvent.replacingEvent() || this.props.mxEvent; // show the replacing event, not the original, if it is an edit
if (this.props.ignoreEdits) {
mxEvent = this.props.mxEvent;
}
const isEncrypted = mxEvent.isEncrypted();
// @ts-ignore
const decryptedEventSource = mxEvent.clearEvent; // FIXME: clearEvent is private

1
src/components/views/messages/EditHistoryMessage.tsx
View file

@ -92,6 +92,7 @@ export default class EditHistoryMessage extends React.PureComponent<IProps, ISta
ViewSource,
{
mxEvent: this.props.mxEvent,
ignoreEdits: true,
},
"mx_Dialog_viewsource",
);