dont show remove button for original event in edit history
parent
adc2648b46
commit
1b06b9957a
|
@ -107,11 +107,19 @@ export default class MessageEditHistoryDialog extends React.PureComponent {
|
|||
if (this.state.originalEvent && !this.state.nextBatch) {
|
||||
allEvents = allEvents.concat(this.state.originalEvent);
|
||||
}
|
||||
const baseEventId = this.props.mxEvent.getId();
|
||||
allEvents.forEach(e => {
|
||||
if (!lastEvent || wantsDateSeparator(lastEvent.getDate(), e.getDate())) {
|
||||
nodes.push(<li key={e.getTs() + "~"}><DateSeparator ts={e.getTs()} /></li>);
|
||||
}
|
||||
nodes.push(<EditHistoryMessage key={e.getId()} mxEvent={e} isTwelveHour={this.state.isTwelveHour} />);
|
||||
const isBaseEvent = e.getId() === baseEventId;
|
||||
nodes.push((
|
||||
<EditHistoryMessage
|
||||
key={e.getId()}
|
||||
isBaseEvent={isBaseEvent}
|
||||
mxEvent={e}
|
||||
isTwelveHour={this.state.isTwelveHour}
|
||||
/>));
|
||||
lastEvent = e;
|
||||
});
|
||||
return nodes;
|
||||
|
|
|
@ -94,7 +94,7 @@ export default class EditHistoryMessage extends React.PureComponent {
|
|||
const AccessibleButton = sdk.getComponent('elements.AccessibleButton');
|
||||
// hide the button when already redacted
|
||||
let redactButton;
|
||||
if (!this.props.mxEvent.isRedacted()) {
|
||||
if (!this.props.mxEvent.isRedacted() && !this.props.isBaseEvent) {
|
||||
redactButton = (
|
||||
<AccessibleButton onClick={this._onRedactClick} disabled={!this.state.canRedact}>
|
||||
{_t("Remove")}
|
||||
|
|
Loading…
Reference in New Issue