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

Allow cancelling events whilst they are encrypting #7483

Merged
merged 2 commits into from
Jan 11, 2022
Merged

Allow cancelling events whilst they are encrypting #7483

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce43d4d
Allow cancelling events whilst they are encrypting
t3chguy Jan 7, 2022
9259660
Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into…
t3chguy Jan 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/components/views/context_menus/MessageContextMenu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ import EndPollDialog from '../dialogs/EndPollDialog';
import { isPollEnded } from '../messages/MPollBody';
import { createMapSiteLink } from "../messages/MLocationBody";

export function canCancel(eventStatus: EventStatus): boolean {
return eventStatus === EventStatus.QUEUED || eventStatus === EventStatus.NOT_SENT;
export function canCancel(status: EventStatus): boolean {
return status === EventStatus.QUEUED || status === EventStatus.NOT_SENT || status === EventStatus.ENCRYPTING;
}

export interface IEventTileOps {
Expand Down Expand Up @@ -258,10 +258,6 @@ export default class MessageContextMenu extends React.Component<IProps, IState>
});
}

private getPendingReactions(): MatrixEvent[] {
return this.getReactions(e => canCancel(e.status));
}

private getUnsentReactions(): MatrixEvent[] {
return this.getReactions(e => e.status === EventStatus.NOT_SENT);
}
Expand Down