OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Shown own sent state indicator even when showReadReceipts is disabled (#12540) 

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
pull/28217/head
Michael Telatynski 2024-05-16 00:34:02 +01:00 committed by GitHub
parent 8b8b75e4a5
commit 0c04ec1def
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/views/rooms/EventTile.tsx
View File

@ -1162,20 +1162,18 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
const ircPadlock = useIRCLayout && !isBubbleMessage && this.renderE2EPadlock(); const ircPadlock = useIRCLayout && !isBubbleMessage && this.renderE2EPadlock();
let msgOption: JSX.Element | undefined; let msgOption: JSX.Element | undefined;
if (this.props.showReadReceipts) { if (this.shouldShowSentReceipt || this.shouldShowSendingReceipt) {
if (this.shouldShowSentReceipt || this.shouldShowSendingReceipt) { msgOption = <SentReceipt messageState={this.props.mxEvent.getAssociatedStatus()} />;
msgOption = <SentReceipt messageState={this.props.mxEvent.getAssociatedStatus()} />; } else if (this.props.showReadReceipts) {
} else { msgOption = (
msgOption = ( <ReadReceiptGroup
<ReadReceiptGroup readReceipts={this.props.readReceipts ?? []}
readReceipts={this.props.readReceipts ?? []} readReceiptMap={this.props.readReceiptMap ?? {}}
readReceiptMap={this.props.readReceiptMap ?? {}} checkUnmounting={this.props.checkUnmounting}
checkUnmounting={this.props.checkUnmounting} suppressAnimation={this.suppressReadReceiptAnimation}
suppressAnimation={this.suppressReadReceiptAnimation} isTwelveHour={this.props.isTwelveHour}
isTwelveHour={this.props.isTwelveHour} />
/> );
);
}
} }
let replyChain: JSX.Element | undefined; let replyChain: JSX.Element | undefined;