From f89cc5b311b9ef78b464f6bd0a69636457bb4d50 Mon Sep 17 00:00:00 2001
From: Viktoryia Kliushun <vikstash@gmail.com>
Date: Wed, 6 Dec 2023 13:01:38 +0100
Subject: [PATCH 1/4] [TS migration] Migrate 'ReportActionItemTaskAction.js'
 component

---
 src/components/ReportActionItem/TaskAction.js | 34 -------------------
 .../ReportActionItem/TaskAction.tsx           | 27 +++++++++++++++
 2 files changed, 27 insertions(+), 34 deletions(-)
 delete mode 100644 src/components/ReportActionItem/TaskAction.js
 create mode 100644 src/components/ReportActionItem/TaskAction.tsx

diff --git a/src/components/ReportActionItem/TaskAction.js b/src/components/ReportActionItem/TaskAction.js
deleted file mode 100644
index f30d8c3908de..000000000000
--- a/src/components/ReportActionItem/TaskAction.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import PropTypes from 'prop-types';
-import React from 'react';
-import {View} from 'react-native';
-import Text from '@components/Text';
-import withLocalize, {withLocalizePropTypes} from '@components/withLocalize';
-import useThemeStyles from '@styles/useThemeStyles';
-import * as Task from '@userActions/Task';
-
-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,
-
-    ...withLocalizePropTypes,
-};
-
-function TaskAction(props) {
-    const styles = useThemeStyles();
-    return (
-        <>
-            <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-                <Text style={[styles.chatItemMessage, styles.colorMuted]}>{Task.getTaskReportActionMessage(props.actionName, props.taskReportID, false)}</Text>
-            </View>
-        </>
-    );
-}
-
-TaskAction.propTypes = propTypes;
-TaskAction.displayName = 'TaskAction';
-
-export default withLocalize(TaskAction);
diff --git a/src/components/ReportActionItem/TaskAction.tsx b/src/components/ReportActionItem/TaskAction.tsx
new file mode 100644
index 000000000000..7ce31547d33b
--- /dev/null
+++ b/src/components/ReportActionItem/TaskAction.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import {View} from 'react-native';
+import Text from '@components/Text';
+import useThemeStyles from '@styles/useThemeStyles';
+import * as Task from '@userActions/Task';
+
+type TaskActionProps = {
+    /** Name of the reportAction action */
+    actionName: string;
+
+    /** The ID of the associated taskReport */
+    taskReportID: string;
+};
+
+function TaskAction({actionName, taskReportID}: TaskActionProps) {
+    const styles = useThemeStyles();
+
+    return (
+        <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
+            <Text style={[styles.chatItemMessage, styles.colorMuted]}>{Task.getTaskReportActionMessage(actionName, taskReportID, false)}</Text>
+        </View>
+    );
+}
+
+TaskAction.displayName = 'TaskAction';
+
+export default TaskAction;

From 3c7e77a52ef3672d36d0e0ec89265b3dae0427ff Mon Sep 17 00:00:00 2001
From: Viktoryia Kliushun <vikstash@gmail.com>
Date: Mon, 11 Dec 2023 09:34:45 +0100
Subject: [PATCH 2/4] Updates to follow main branch

---
 src/components/ReportActionItem/TaskAction.tsx | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/ReportActionItem/TaskAction.tsx b/src/components/ReportActionItem/TaskAction.tsx
index 7ce31547d33b..efe7656e38d0 100644
--- a/src/components/ReportActionItem/TaskAction.tsx
+++ b/src/components/ReportActionItem/TaskAction.tsx
@@ -1,23 +1,20 @@
 import React from 'react';
 import {View} from 'react-native';
 import Text from '@components/Text';
+import * as TaskUtils from '@libs/TaskUtils';
 import useThemeStyles from '@styles/useThemeStyles';
-import * as Task from '@userActions/Task';
 
 type TaskActionProps = {
     /** Name of the reportAction action */
     actionName: string;
-
-    /** The ID of the associated taskReport */
-    taskReportID: string;
 };
 
-function TaskAction({actionName, taskReportID}: TaskActionProps) {
+function TaskAction({actionName}: TaskActionProps) {
     const styles = useThemeStyles();
 
     return (
         <View style={[styles.flex1, styles.flexRow, styles.alignItemsCenter]}>
-            <Text style={[styles.chatItemMessage, styles.colorMuted]}>{Task.getTaskReportActionMessage(actionName, taskReportID, false)}</Text>
+            <Text style={[styles.chatItemMessage, styles.colorMuted]}>{TaskUtils.getTaskReportActionMessage(actionName)}</Text>
         </View>
     );
 }

From e486816a2ccde4e425696747ddc5f89b6b8cadf8 Mon Sep 17 00:00:00 2001
From: Viktoryia Kliushun <vikstash@gmail.com>
Date: Wed, 13 Dec 2023 08:56:26 +0100
Subject: [PATCH 3/4] Remove unnecessary taskReportID prop

---
 src/pages/home/report/ReportActionItem.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index e172627d04ef..42d77d565fb0 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -363,12 +363,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 actionName={props.action.actionName} />;
         } else if (ReportActionsUtils.isCreatedTaskReportAction(props.action)) {
             children = (
                 <ShowContextMenuContext.Provider value={contextValue}>

From 3d2e50fe32c2224414a1e846cf6f1a632d3d91f0 Mon Sep 17 00:00:00 2001
From: Viktoryia Kliushun <vikstash@gmail.com>
Date: Thu, 14 Dec 2023 08:42:25 +0100
Subject: [PATCH 4/4] Update useThemeStyles hook import to follow main branch
 updates

---
 src/components/ReportActionItem/TaskAction.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ReportActionItem/TaskAction.tsx b/src/components/ReportActionItem/TaskAction.tsx
index efe7656e38d0..b10be4e86fe8 100644
--- a/src/components/ReportActionItem/TaskAction.tsx
+++ b/src/components/ReportActionItem/TaskAction.tsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import {View} from 'react-native';
 import Text from '@components/Text';
+import useThemeStyles from '@hooks/useThemeStyles';
 import * as TaskUtils from '@libs/TaskUtils';
-import useThemeStyles from '@styles/useThemeStyles';
 
 type TaskActionProps = {
     /** Name of the reportAction action */