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

Fix null-guarding regression around reply_to_event dispatch (#8039)

pull/21833/head
Michael Telatynski 2022-03-11 17:21:28 +00:00 committed by GitHub
parent 5262d5c315
commit 4b0df21b0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/structures/RoomView.tsx
View File

@ -844,7 +844,7 @@ export class RoomView extends React.Component<IRoomProps, IRoomState> {
case 'reply_to_event': case 'reply_to_event':
if (!this.unmounted && if (!this.unmounted &&
this.state.searchResults && this.state.searchResults &&
payload.event.getRoomId() === this.state.roomId && payload.event?.getRoomId() === this.state.roomId &&
payload.context === TimelineRenderingType.Search payload.context === TimelineRenderingType.Search
) { ) {
this.onCancelSearchClick(); this.onCancelSearchClick();

2
src/stores/RoomViewStore.tsx
View File

@ -201,7 +201,7 @@ class RoomViewStore extends Store<ActionPayload> {
// this can happen when performing a search across all rooms. Persist the data from this event for // this can happen when performing a search across all rooms. Persist the data from this event for
// both room and search timeline rendering types, search will get auto-closed by RoomView at this time. // both room and search timeline rendering types, search will get auto-closed by RoomView at this time.
if ([TimelineRenderingType.Room, TimelineRenderingType.Search].includes(payload.context)) { if ([TimelineRenderingType.Room, TimelineRenderingType.Search].includes(payload.context)) {
if (payload.event?.getRoomId() !== this.state.roomId) { if (payload.event && payload.event.getRoomId() !== this.state.roomId) {
dis.dispatch<ViewRoomPayload>({ dis.dispatch<ViewRoomPayload>({
action: Action.ViewRoom, action: Action.ViewRoom,
room_id: payload.event.getRoomId(), room_id: payload.event.getRoomId(),