From 8632d0ede25e5559586d390e04081b8cd06dbd76 Mon Sep 17 00:00:00 2001
From: Vivek Kumar <35863227+techievivek@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:30:30 +0530
Subject: [PATCH] Merge pull request #30112 from Expensify/vit-30079followup

Skip rendering IOU pay action for non-send money flow if the user needs to enable wallet or add bank account

(cherry picked from commit f42a195b78b524e57b72a8c801583b63498a16bc)
---
 src/pages/home/report/ReportActionItem.js | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/pages/home/report/ReportActionItem.js b/src/pages/home/report/ReportActionItem.js
index 42bcfd49f207..4d73838fc529 100644
--- a/src/pages/home/report/ReportActionItem.js
+++ b/src/pages/home/report/ReportActionItem.js
@@ -150,6 +150,10 @@ function ReportActionItem(props) {
     const isReportActionLinked = props.linkedReportActionID === props.action.reportActionID;
 
     const highlightedBackgroundColorIfNeeded = useMemo(() => (isReportActionLinked ? StyleUtils.getBackgroundColorStyle(themeColors.highlightBG) : {}), [isReportActionLinked]);
+    const originalMessage = lodashGet(props.action, 'originalMessage', {});
+
+    // IOUDetails only exists when we are sending money
+    const isSendingMoney = originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && _.has(originalMessage, 'IOUDetails');
 
     // When active action changes, we need to update the `isContextMenuActive` state
     const isActiveReportActionForMenu = ReportActionContextMenu.isActiveReportAction(props.action.reportActionID);
@@ -301,10 +305,6 @@ function ReportActionItem(props) {
      */
     const renderItemContent = (hovered = false, isWhisper = false, hasErrors = false) => {
         let children;
-        const originalMessage = lodashGet(props.action, 'originalMessage', {});
-
-        // IOUDetails only exists when we are sending money
-        const isSendingMoney = originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY && _.has(originalMessage, 'IOUDetails');
 
         // Show the MoneyRequestPreview for when request was created, bill was split or money was sent
         if (
@@ -623,6 +623,18 @@ function ReportActionItem(props) {
         );
     }
 
+    // For the `pay` IOU action on non-send money flow, we don't want to render anything if `isWaitingOnBankAccount` is true
+    // Otherwise, we will see two system messages informing the payee needs to add a bank account or wallet
+    if (
+        props.action.actionName === CONST.REPORT.ACTIONS.TYPE.IOU &&
+        lodashGet(props.report, 'isWaitingOnBankAccount', false) &&
+        originalMessage &&
+        originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY &&
+        !isSendingMoney
+    ) {
+        return null;
+    }
+
     const hasErrors = !_.isEmpty(props.action.errors);
     const whisperedToAccountIDs = props.action.whisperedToAccountIDs || [];
     const isWhisper = whisperedToAccountIDs.length > 0;