fix colon added to completed reopened task messages when copy pasting

Expensify · Sep 11, 2023 · 02f6e74 · 02f6e74
1 parent 1810c8e
commit 02f6e74
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 31 deletions.
diff --git a/src/components/ReportActionItem/TaskAction.js b/src/components/ReportActionItem/TaskAction.js
@@ -7,12 +7,9 @@ import compose from '../../libs/compose';
 import ONYXKEYS from '../../ONYXKEYS';
 import Text from '../Text';
 import styles from '../../styles/styles';
-import CONST from '../../CONST';
+import getTaskReportActionMessage from '../../libs/getTaskReportActionMessage';
 
 const propTypes = {
-    /** Name of the reportAction action */
-    actionName: PropTypes.string.isRequired,
-
     /** The ID of the associated taskReport */
     // eslint-disable-next-line react/no-unused-prop-types -- This is used in the withOnyx HOC
     taskReportID: PropTypes.string.isRequired,
@@ -36,27 +33,10 @@ const defaultProps = {
     taskReport: {},
 };
 function TaskAction(props) {
-    const taskReportName = props.taskReport.reportName || '';
-
-    let taskStatusText = '';
-    switch (props.actionName) {
-        case CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED:
-            taskStatusText = props.translate('task.messages.completed');
-            break;
-        case CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED:
-            taskStatusText = props.translate('task.messages.canceled');
-            break;
-        case CONST.REPORT.ACTIONS.TYPE.TASKREOPENED:
-            taskStatusText = props.translate('task.messages.reopened');
-            break;
-        default:
-            taskStatusText = props.translate('task.task');
-    }
-
     return (
         <>
             <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{`${taskStatusText} ${taskReportName}`}</Text>
+                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{getTaskReportActionMessage(props.reportAction, props.translate)}</Text>
             </View>
         </>
     );

diff --git a/src/libs/getTaskReportActionMessage.js b/src/libs/getTaskReportActionMessage.js
@@ -0,0 +1,29 @@
+import CONST from '../CONST';
+import * as ReportUtils from './ReportUtils';
+/**
+ * @param {Object} reportAction
+ * @param {Function} translate
+ * @returns {string}
+ */
+function getTaskReportActionMessage(reportAction, translate) {
+    const taskReport = ReportUtils.getReport(reportAction.originalMessage.taskReportID.toString());
+    const taskReportName = taskReport.reportName || '';
+
+    let taskStatusText = '';
+    switch (reportAction.actionName) {
+        case CONST.REPORT.ACTIONS.TYPE.TASKCOMPLETED:
+            taskStatusText = translate('task.messages.completed');
+            break;
+        case CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED:
+            taskStatusText = translate('task.messages.canceled');
+            break;
+        case CONST.REPORT.ACTIONS.TYPE.TASKREOPENED:
+            taskStatusText = translate('task.messages.reopened');
+            break;
+        default:
+            taskStatusText = translate('task.task');
+    }
+    return `${taskStatusText} ${taskReportName}`;
+}
+
+export default getTaskReportActionMessage;
diff --git a/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js b/src/pages/home/report/ContextMenu/BaseReportActionContextMenu.js
@@ -92,6 +92,7 @@ function BaseReportActionContextMenu(props) {
                         close: () => setShouldKeepOpen(false),
                         openContextMenu: () => setShouldKeepOpen(true),
                         interceptAnonymousUser,
+                        translate: props.translate,
                     };
 
                     if (contextAction.renderContent) {

diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -21,6 +21,7 @@ import QuickEmojiReactions from '../../../../components/Reactions/QuickEmojiReac
 import MiniQuickEmojiReactions from '../../../../components/Reactions/MiniQuickEmojiReactions';
 import Navigation from '../../../../libs/Navigation/Navigation';
 import ROUTES from '../../../../ROUTES';
+import getTaskReportActionMessage from '../../../../libs/getTaskReportActionMessage';
 
 /**
  * Gets the HTML version of the message in an action.
@@ -182,12 +183,11 @@ export default [
         // If return value is true, we switch the `text` and `icon` on
         // `ContextMenuItem` with `successText` and `successIcon` which will fallback to
         // the `text` and `icon`
-        onPress: (closePopover, {reportAction, selection}) => {
+        onPress: (closePopover, {reportAction, selection, translate}) => {
             const isTaskAction = ReportActionsUtils.isTaskAction(reportAction);
             const isReportPreviewAction = ReportActionsUtils.isReportPreviewAction(reportAction);
             const message = _.last(lodashGet(reportAction, 'message', [{}]));
-            const originalMessage = _.get(reportAction, 'originalMessage', {});
-            const messageHtml = isTaskAction ? lodashGet(originalMessage, 'html', '') : lodashGet(message, 'html', '');
+            const messageHtml = isTaskAction ? getTaskReportActionMessage(reportAction, translate) : lodashGet(message, 'html', '');
 
             const isAttachment = _.has(reportAction, 'isAttachment') ? reportAction.isAttachment : ReportUtils.isReportMessageAttachment(message);
             if (!isAttachment) {

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
@@ -296,12 +296,7 @@ function ReportActionItem(props) {
             props.action.actionName === CONST.REPORT.ACTIONS.TYPE.TASKCANCELLED ||
             props.action.actionName === CONST.REPORT.ACTIONS.TYPE.TASKREOPENED
         ) {
-            children = (
-                <TaskAction
-                    taskReportID={props.action.originalMessage.taskReportID.toString()}
-                    actionName={props.action.actionName}
-                />
-            );
+            children = <TaskAction reportAction={props.action} />;
         } else if (ReportActionsUtils.isCreatedTaskReportAction(props.action)) {
             children = (
                 <TaskPreview