From 8dcaa23a12133a2228bc9e9868b6658c6bbbfcf0 Mon Sep 17 00:00:00 2001 From: Sibtain Ali Date: Thu, 25 May 2023 15:48:29 +0500 Subject: [PATCH 1/2] fix: show correct copy to clipboard option for linked emails --- .../AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js index 6796d93a5d48..beef366083de 100644 --- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js +++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js @@ -50,7 +50,9 @@ const BaseAnchorForCommentsOnly = (props) => { inline onSecondaryInteraction={(event) => { ReportActionContextMenu.showContextMenu( - Str.isValidEmailMarkdown(props.displayName) ? ContextMenuActions.CONTEXT_MENU_TYPES.EMAIL : ContextMenuActions.CONTEXT_MENU_TYPES.LINK, + props.href.indexOf('mailto:') === 0 && Str.isValidEmailMarkdown(props.displayName) + ? ContextMenuActions.CONTEXT_MENU_TYPES.EMAIL + : ContextMenuActions.CONTEXT_MENU_TYPES.LINK, event, props.href, lodashGet(linkRef, 'current'), From 2b1e82517345bb8ed6a8e99d4eafaecd703ac032 Mon Sep 17 00:00:00 2001 From: Sibtain Ali Date: Mon, 29 May 2023 14:08:12 +0500 Subject: [PATCH 2/2] fix: show context menu with email option based on message href --- .../AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js index beef366083de..5db89d96516f 100644 --- a/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js +++ b/src/components/AnchorForCommentsOnly/BaseAnchorForCommentsOnly.js @@ -50,9 +50,7 @@ const BaseAnchorForCommentsOnly = (props) => { inline onSecondaryInteraction={(event) => { ReportActionContextMenu.showContextMenu( - props.href.indexOf('mailto:') === 0 && Str.isValidEmailMarkdown(props.displayName) - ? ContextMenuActions.CONTEXT_MENU_TYPES.EMAIL - : ContextMenuActions.CONTEXT_MENU_TYPES.LINK, + Str.isValidEmailMarkdown(props.href.replace(/mailto:/i, '')) ? ContextMenuActions.CONTEXT_MENU_TYPES.EMAIL : ContextMenuActions.CONTEXT_MENU_TYPES.LINK, event, props.href, lodashGet(linkRef, 'current'),