Allow cancelling events whilst they are encrypting (#7483)

matrix-org · Jan 11, 2022 · f620cf9 · f620cf9
1 parent 59f57e1
commit f620cf9
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx
@@ -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 {
@@ -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);
     }