Skip to content

Commit 9978ec2

Browse files
JulesssssOSBotify
authored andcommitted
Merge pull request #71493 from Expensify/revert-70694-fix/69929-masrked-as-paid-from-OD
Revert "fixed showing "Marked as paid" in report from OD" (cherry picked from commit 1d849b8) (cherry-picked to staging by Julesssss)
1 parent bf0a419 commit 9978ec2

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/libs/ReportActionsUtils.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,12 @@ function shouldReportActionBeVisible(reportAction: OnyxEntry<ReportAction>, key:
869869
return false;
870870
}
871871

872+
// Ignore markedAsReimbursed action here since we're already display message that explains the expense was paid
873+
// elsewhere in the IOU reportAction
874+
if (reportAction.actionName === CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED) {
875+
return false;
876+
}
877+
872878
if (isWhisperActionTargetedToOthers(reportAction)) {
873879
return false;
874880
}

src/pages/home/report/PureReportActionItem.tsx

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -411,7 +411,6 @@ function PureReportActionItem({
411411
draftMessage,
412412
iouReport,
413413
taskReport,
414-
reportActions,
415414
linkedReport,
416415
iouReportOfLinkedReport,
417416
emojiReactions,
@@ -1147,11 +1146,6 @@ function PureReportActionItem({
11471146
} else {
11481147
children = <ReportActionItemBasicMessage message={translate('iou.paidWithExpensify')} />;
11491148
}
1150-
} else if (
1151-
isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.MARKED_REIMBURSED) &&
1152-
!reportActions.some((reportAction) => isActionOfType(reportAction, CONST.REPORT.ACTIONS.TYPE.IOU))
1153-
) {
1154-
children = <ReportActionItemBasicMessage message={translate('iou.paidElsewhere')} />;
11551149
} else if (isUnapprovedAction(action)) {
11561150
children = <ReportActionItemBasicMessage message={translate('iou.unapproved')} />;
11571151
} else if (isActionOfType(action, CONST.REPORT.ACTIONS.TYPE.FORWARDED)) {

0 commit comments

Comments
 (0)