remove report prop from SimpleMessageContent

Author: LukasMod

src/pages/inbox/report/actionContents/ActionContentRouter.tsx

@@ -57,6 +57,7 @@ import MentionWhisperContent from './MentionWhisperContent';
 import ModifiedExpenseContent from './ModifiedExpenseContent';
 import PaymentContent from './PaymentContent';
 import PolicyChangeLogContent, {isHandledPolicyChangeLogAction} from './PolicyChangeLogContent';
+import ReceiptScanFailedContent from './ReceiptScanFailedContent';
 import ReimbursedContent from './ReimbursedContent';
 import ReimbursementDeQueuedContent from './ReimbursementDeQueuedContent';
 import ReimbursementQueuedContent from './ReimbursementQueuedContent';
@@ -286,14 +287,17 @@ function ActionContentRouter({
             />
         );
     }
-    if (isSimpleMessageAction(action)) {
+    if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.RECEIPT_SCAN_FAILED)) {
         return (
-            <SimpleMessageContent
-                action={action}
-                report={report}
+            <ReceiptScanFailedContent
+                parentReportID={report?.parentReportID}
+                parentReportActionID={report?.parentReportActionID}
             />
         );
     }
+    if (isSimpleMessageAction(action)) {
+        return <SimpleMessageContent action={action} />;
+    }
     if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.FORWARDED)) {
         const wasAutoForwarded = getOriginalMessage(action)?.automaticAction ?? false;
         if (wasAutoForwarded) {

src/pages/inbox/report/actionContents/ReceiptScanFailedContent.tsx

@@ -0,0 +1,18 @@
+import React from 'react';
+import useLocalize from '@hooks/useLocalize';
+import {getReportAction, wasActionTakenByCurrentUser} from '@libs/ReportActionsUtils';
+import ReportActionItemBasicMessage from '@pages/inbox/report/ReportActionItemBasicMessage';
+
+type ReceiptScanFailedContentProps = {
+    parentReportID: string | undefined;
+    parentReportActionID: string | undefined;
+};
+
+// RECEIPT_SCAN_FAILED is submitted by Concierge, so use the parent IOU action to determine edit permission.
+function ReceiptScanFailedContent({parentReportID, parentReportActionID}: ReceiptScanFailedContentProps) {
+    const {translate} = useLocalize();
+    const iouAction = getReportAction(parentReportID, parentReportActionID);
+    return <ReportActionItemBasicMessage message={translate('violations.smartscanFailed', {canEdit: wasActionTakenByCurrentUser(iouAction)})} />;
+}
+
+export default ReceiptScanFailedContent;

src/pages/inbox/report/actionContents/SimpleMessageContent.tsx

@@ -1,5 +1,4 @@
 import React from 'react';
-import type {OnyxEntry} from 'react-native-onyx';
 import useLocalize from '@hooks/useLocalize';
 import {
     getActionableCard3DSTransactionApprovalMessage,
@@ -9,12 +8,10 @@ import {
     getMessageOfOldDotReportAction,
     getOriginalMessage,
     getRemovedFromApprovalChainMessage,
-    getReportAction,
     getReportActionText,
     isActionOfType,
     isRejectedAction,
     isUnapprovedAction,
-    wasActionTakenByCurrentUser,
 } from '@libs/ReportActionsUtils';
 import {getDeletedTransactionMessage, getPolicyChangeMessage} from '@libs/ReportUtils';
 import ReportActionItemBasicMessage from '@pages/inbox/report/ReportActionItemBasicMessage';
@@ -23,7 +20,6 @@ import type * as OnyxTypes from '@src/types/onyx';
 
 type SimpleMessageContentProps = {
     action: OnyxTypes.ReportAction;
-    report: OnyxEntry<OnyxTypes.Report>;
 };
 
 const SIMPLE_MESSAGE_ACTION_TYPES = new Set<string>([
@@ -40,7 +36,6 @@ const SIMPLE_MESSAGE_ACTION_TYPES = new Set<string>([
     CONST.REPORT.ACTIONS.TYPE.MERGED_WITH_CASH_TRANSACTION,
     CONST.REPORT.ACTIONS.TYPE.DISMISSED_VIOLATION,
     CONST.REPORT.ACTIONS.TYPE.RESOLVED_DUPLICATES,
-    CONST.REPORT.ACTIONS.TYPE.RECEIPT_SCAN_FAILED,
     CONST.REPORT.ACTIONS.TYPE.DEMOTED_FROM_WORKSPACE,
     CONST.REPORT.ACTIONS.TYPE.ACTIONABLE_CARD_3DS_TRANSACTION_APPROVAL,
     CONST.REPORT.ACTIONS.TYPE.REMOVED_FROM_APPROVAL_CHAIN,
@@ -51,7 +46,7 @@ function isSimpleMessageAction(action: OnyxTypes.ReportAction): boolean {
     return SIMPLE_MESSAGE_ACTION_TYPES.has(action.actionName) || isUnapprovedAction(action) || isRejectedAction(action);
 }
 
-function SimpleMessageContent({action, report}: SimpleMessageContentProps) {
+function SimpleMessageContent({action}: SimpleMessageContentProps) {
     const {translate} = useLocalize();
 
     if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED)) {
@@ -93,11 +88,6 @@ function SimpleMessageContent({action, report}: SimpleMessageContentProps) {
     if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.RESOLVED_DUPLICATES)) {
         return <ReportActionItemBasicMessage message={translate('violations.resolvedDuplicates')} />;
     }
-    if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.RECEIPT_SCAN_FAILED)) {
-        // RECEIPT_SCAN_FAILED is submitted by Concierge, so use the IOU action to determine edit permission
-        const iouAction = getReportAction(report?.parentReportID, report?.parentReportActionID);
-        return <ReportActionItemBasicMessage message={translate('violations.smartscanFailed', {canEdit: wasActionTakenByCurrentUser(iouAction)})} />;
-    }
     if (isUnapprovedAction(action)) {
         return <ReportActionItemBasicMessage message={translate('iou.unapproved')} />;
     }
@@ -120,7 +110,5 @@ function SimpleMessageContent({action, report}: SimpleMessageContentProps) {
     return null;
 }
 
-SimpleMessageContent.displayName = 'SimpleMessageContent';
-
 export default SimpleMessageContent;
 export {isSimpleMessageAction};