Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Shown own sent state indicator even when showReadReceipts is disabled (
Browse files Browse the repository at this point in the history
…#12540)

Signed-off-by: Michael Telatynski <[email protected]>
  • Loading branch information
t3chguy authored May 15, 2024
1 parent 8b8b75e commit 0c04ec1
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions src/components/views/rooms/EventTile.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1162,20 +1162,18 @@ export class UnwrappedEventTile extends React.Component<EventTileProps, IState>
const ircPadlock = useIRCLayout && !isBubbleMessage && this.renderE2EPadlock();

let msgOption: JSX.Element | undefined;
if (this.props.showReadReceipts) {
if (this.shouldShowSentReceipt || this.shouldShowSendingReceipt) {
msgOption = <SentReceipt messageState={this.props.mxEvent.getAssociatedStatus()} />;
} else {
msgOption = (
<ReadReceiptGroup
readReceipts={this.props.readReceipts ?? []}
readReceiptMap={this.props.readReceiptMap ?? {}}
checkUnmounting={this.props.checkUnmounting}
suppressAnimation={this.suppressReadReceiptAnimation}
isTwelveHour={this.props.isTwelveHour}
/>
);
}
if (this.shouldShowSentReceipt || this.shouldShowSendingReceipt) {
msgOption = <SentReceipt messageState={this.props.mxEvent.getAssociatedStatus()} />;
} else if (this.props.showReadReceipts) {
msgOption = (
<ReadReceiptGroup
readReceipts={this.props.readReceipts ?? []}
readReceiptMap={this.props.readReceiptMap ?? {}}
checkUnmounting={this.props.checkUnmounting}
suppressAnimation={this.suppressReadReceiptAnimation}
isTwelveHour={this.props.isTwelveHour}
/>
);
}

let replyChain: JSX.Element | undefined;
Expand Down

0 comments on commit 0c04ec1

Please sign in to comment.