matrix/matrix-react-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-react-sdk.git synced 2025-11-04 11:51:45 +03:00
Code Activity

Fix message load in Thread list (#7124)

Browse Source
This commit is contained in:
Germain
2021-11-12 12:44:03 +00:00
committed by GitHub
parent 77c79467c6
commit 894ae6ab88
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1165,12 +1165,15 @@ export default class EventTile extends React.Component<IProps, IState> {
|| this.state.hover || this.state.hover
|| this.state.actionBarFocused); || this.state.actionBarFocused);
const room = MatrixClientPeg.get().getRoom(this.props.mxEvent.getRoomId());
const thread = room.findThreadForEvent?.(this.props.mxEvent);
// Thread panel shows the timestamp of the last reply in that thread // Thread panel shows the timestamp of the last reply in that thread
const ts = this.props.tileShape !== TileShape.ThreadPanel const ts = this.props.tileShape !== TileShape.ThreadPanel
? this.props.mxEvent.getTs() ? this.props.mxEvent.getTs()
: this.props.mxEvent.getThread().lastReply.getTs(); : thread?.lastReply.getTs();
const timestamp = showTimestamp ? const timestamp = showTimestamp && ts ?
<MessageTimestamp <MessageTimestamp
showRelative={this.props.tileShape === TileShape.ThreadPanel} showRelative={this.props.tileShape === TileShape.ThreadPanel}
showTwelveHour={this.props.isTwelveHour} showTwelveHour={this.props.isTwelveHour}