From b02c6c7953de63709da4db3dc13e501c6a49d81a Mon Sep 17 00:00:00 2001 From: Andy Balaam Date: Mon, 24 Jan 2022 12:28:17 +0000 Subject: [PATCH] Re-renable Share option for location messages (#7596) --- .../context_menus/MessageContextMenu.tsx | 42 ++++++++----------- 1 file changed, 18 insertions(+), 24 deletions(-) diff --git a/src/components/views/context_menus/MessageContextMenu.tsx b/src/components/views/context_menus/MessageContextMenu.tsx index 05eac5f1c6..b86be93f2e 100644 --- a/src/components/views/context_menus/MessageContextMenu.tsx +++ b/src/components/views/context_menus/MessageContextMenu.tsx @@ -378,27 +378,25 @@ export default class MessageContextMenu extends React.Component let permalink: string | null = null; let permalinkButton: ReactElement | null = null; - if (canShare(mxEvent)) { - if (this.props.permalinkCreator) { - permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId()); - } - permalinkButton = ( - - ); + if (this.props.permalinkCreator) { + permalink = this.props.permalinkCreator.forEvent(this.props.mxEvent.getId()); } + permalinkButton = ( + + ); if (this.canEndPoll(mxEvent)) { endPollButton = ( @@ -519,10 +517,6 @@ function canForward(event: MatrixEvent): boolean { return !isLocationEvent(event); } -function canShare(event: MatrixEvent): boolean { - return !isLocationEvent(event); -} - function isLocationEvent(event: MatrixEvent): boolean { const eventType = event.getType(); return (