diff --git a/web/src/ui/timeline/menu/EventExtraMenu.tsx b/web/src/ui/timeline/menu/EventExtraMenu.tsx index 77b459d..b035e7d 100644 --- a/web/src/ui/timeline/menu/EventExtraMenu.tsx +++ b/web/src/ui/timeline/menu/EventExtraMenu.tsx @@ -88,6 +88,8 @@ const EventExtraMenu = ({ evt, room, style }: EventExtraMenuProps) => { .catch(err => window.alert(`Failed to unpin message: ${err}`)) }, [closeModal, client, room, evt.event_id]) + const isPending = evt.event_id.startsWith("~") + const pendingTitle = isPending ? "Can't action messages that haven't been sent yet" : undefined const plEvent = useRoomState(room, "m.room.power_levels", "") // We get pins from getPinnedEvents, but use the hook anyway to subscribe to changes useRoomState(room, "m.room.pinned_events", "") @@ -103,9 +105,14 @@ const EventExtraMenu = ({ evt, room, style }: EventExtraMenuProps) => { {ownPL >= pinPL && (pins.includes(evt.event_id) ? - : )} - - {canRedact && } + : )} + + {canRedact && } } diff --git a/web/src/ui/timeline/menu/EventMenu.tsx b/web/src/ui/timeline/menu/EventMenu.tsx index 5406b44..8864bb8 100644 --- a/web/src/ui/timeline/menu/EventMenu.tsx +++ b/web/src/ui/timeline/menu/EventMenu.tsx @@ -84,15 +84,17 @@ const EventMenu = ({ evt, setForceOpen }: EventHoverMenuProps) => { }) }, [evt, roomCtx, setForceOpen, openModal]) const isEditing = useEventAsState(roomCtx.isEditing) + const isPending = evt.event_id.startsWith("~") + const pendingTitle = isPending ? "Can't action messages that haven't been sent yet" : undefined return
- + {evt.sender === userID && evt.type === "m.room.message" && evt.relation_type !== "m.replace" && !evt.redacted_by - && } + && }
}