From d1fa898a649506261a3dc0a335f27d71e17c6aeb Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 9 Apr 2024 16:38:42 +0700 Subject: [PATCH 1/3] fix @expensify.sms is copied along with phone number --- src/pages/home/report/ContextMenu/ContextMenuActions.tsx | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx index 4aba9e43b1c0..acad3dcf2e1b 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx @@ -1,4 +1,5 @@ import ExpensiMark from 'expensify-common/lib/ExpensiMark'; +import Str from 'expensify-common/lib/str'; import type {MutableRefObject} from 'react'; import React from 'react'; import {InteractionManager} from 'react-native'; @@ -388,7 +389,12 @@ const ContextMenuActions: ContextMenuAction[] = [ } else if (reportAction?.actionName === CONST.REPORT.ACTIONS.TYPE.UNHOLD) { Clipboard.setString(Localize.translateLocal('iou.unheldRequest')); } else if (content) { - setClipboardMessage(content); + setClipboardMessage( + content.replace(/()(.*?)(<\/mention-user>)/gi, function (match, openTag, content, closeTag) { + content = Str.removeSMSDomain(content); + return openTag + content + closeTag; + }), + ); } else if (messageText) { Clipboard.setString(messageText); } From 0eca3688a65187315503e6b58c241f031d575c96 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 9 Apr 2024 17:02:12 +0700 Subject: [PATCH 2/3] fix lint --- src/pages/home/report/ContextMenu/ContextMenuActions.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx index acad3dcf2e1b..3bc93fb034c0 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx @@ -390,9 +390,9 @@ const ContextMenuActions: ContextMenuAction[] = [ Clipboard.setString(Localize.translateLocal('iou.unheldRequest')); } else if (content) { setClipboardMessage( - content.replace(/()(.*?)(<\/mention-user>)/gi, function (match, openTag, content, closeTag) { - content = Str.removeSMSDomain(content); - return openTag + content + closeTag; + content.replace(/()(.*?)(<\/mention-user>)/gi, function (match, openTag, innerContent, closeTag) { + innerContent = Str.removeSMSDomain(content); + return openTag + innerContent + closeTag; }), ); } else if (messageText) { From a2c39145b0f8be0b74fd1410424021c106c39a18 Mon Sep 17 00:00:00 2001 From: nkdengineer Date: Tue, 9 Apr 2024 17:09:33 +0700 Subject: [PATCH 3/3] fix lint --- src/pages/home/report/ContextMenu/ContextMenuActions.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx index 3bc93fb034c0..155e82a48208 100644 --- a/src/pages/home/report/ContextMenu/ContextMenuActions.tsx +++ b/src/pages/home/report/ContextMenu/ContextMenuActions.tsx @@ -390,9 +390,9 @@ const ContextMenuActions: ContextMenuAction[] = [ Clipboard.setString(Localize.translateLocal('iou.unheldRequest')); } else if (content) { setClipboardMessage( - content.replace(/()(.*?)(<\/mention-user>)/gi, function (match, openTag, innerContent, closeTag) { - innerContent = Str.removeSMSDomain(content); - return openTag + innerContent + closeTag; + content.replace(/()(.*?)(<\/mention-user>)/gi, (match, openTag, innerContent, closeTag): string => { + const modifiedContent = Str.removeSMSDomain(innerContent) || ''; + return openTag + modifiedContent + closeTag || ''; }), ); } else if (messageText) {