Fix approve report partially shows wrong owes amount in LHN

src/components/LHNOptionsList/LHNOptionsList.tsx

@@ -132,6 +132,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
 
             const iouReportIDOfLastAction = OptionsListUtils.getIOUReportIDOfLastAction(itemFullReport);
             const itemIouReportReportActions = iouReportIDOfLastAction ? reportActions?.[`${ONYXKEYS.COLLECTION.REPORT_ACTIONS}${iouReportIDOfLastAction}`] : undefined;
+            const itemIouReport = reports?.[`${ONYXKEYS.COLLECTION.REPORT}${iouReportIDOfLastAction}`];
 
             const itemPolicy = policy?.[`${ONYXKEYS.COLLECTION.POLICY}${itemFullReport?.policyID}`];
             const transactionID = ReportActionsUtils.isMoneyRequestAction(itemParentReportAction)
@@ -162,7 +163,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                       }
                     : null;
             }
-            const lastMessageTextFromReport = OptionsListUtils.getLastMessageTextForReport(itemFullReport, lastActorDetails, itemPolicy);
+            const lastMessageTextFromReport = OptionsListUtils.getLastMessageTextForReport(itemFullReport, itemIouReport, lastActorDetails, itemPolicy);
 
             return (
                 <OptionRowLHNData
@@ -171,6 +172,7 @@ function LHNOptionsList({style, contentContainerStyles, data, onSelectRow, optio
                     reportActions={itemReportActions}
                     parentReportAction={itemParentReportAction}
                     iouReportReportActions={itemIouReportReportActions}
+                    iouReport={itemIouReport}
                     policy={itemPolicy}
                     invoiceReceiverPolicy={itemInvoiceReceiverPolicy}
                     personalDetails={personalDetails ?? {}}

src/components/LHNOptionsList/OptionRowLHNData.tsx

@@ -25,6 +25,7 @@ function OptionRowLHNData({
     receiptTransactions,
     parentReportAction,
     iouReportReportActions,
+    iouReport,
     transaction,
     lastReportActionTransaction,
     transactionViolations,
@@ -44,6 +45,7 @@ function OptionRowLHNData({
         // Note: ideally we'd have this as a dependent selector in onyx!
         const item = SidebarUtils.getOptionData({
             report: fullReport,
+            iouReport,
             reportActions,
             personalDetails,
             preferredLocale: preferredLocale ?? CONST.LOCALES.DEFAULT,
@@ -66,6 +68,7 @@ function OptionRowLHNData({
         // eslint-disable-next-line react-compiler/react-compiler, react-hooks/exhaustive-deps
     }, [
         fullReport,
+        iouReport,
         lastReportActionTransaction,
         reportActions,
         personalDetails,

src/components/LHNOptionsList/types.ts

@@ -82,6 +82,9 @@ type OptionRowLHNDataProps = {
      */
     iouReportReportActions: OnyxEntry<ReportActions>;
 
+    /** IOU report related to the last action of this report */
+    iouReport: OnyxEntry<Report>;
+
     /** List of transaction violation */
     transactionViolations: OnyxCollection<TransactionViolation[]>;
 

src/libs/OptionsListUtils.ts

@@ -588,7 +588,7 @@ function getIOUReportIDOfLastAction(report: OnyxEntry<Report>): string | undefin
 /**
  * Get the last message text from the report directly or from other sources for special cases.
  */
-function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails: Partial<PersonalDetails> | null, policy?: OnyxEntry<Policy>): string {
+function getLastMessageTextForReport(report: OnyxEntry<Report>, iouReport: OnyxEntry<Report>, lastActorDetails: Partial<PersonalDetails> | null, policy?: OnyxEntry<Policy>): string {
     const reportID = report?.reportID ?? '-1';
     const lastReportAction = lastVisibleReportActions[reportID] ?? null;
 
@@ -623,15 +623,15 @@ function getLastMessageTextForReport(report: OnyxEntry<Report>, lastActorDetails
         const properSchemaForMoneyRequestMessage = ReportUtils.getReportPreviewMessage(report, lastReportAction, true, false, null, true);
         lastMessageTextFromReport = ReportUtils.formatReportLastMessageText(properSchemaForMoneyRequestMessage);
     } else if (ReportActionUtils.isReportPreviewAction(lastReportAction)) {
-        const iouReport = ReportUtils.getReportOrDraftReport(ReportActionUtils.getIOUReportIDFromReportActionPreview(lastReportAction));
-        const lastIOUMoneyReportAction = allSortedReportActions[iouReport?.reportID ?? '-1']?.find(
+        const iouReportValue = iouReport ?? ReportUtils.getReportOrDraftReport(ReportActionUtils.getIOUReportIDFromReportActionPreview(lastReportAction));
+        const lastIOUMoneyReportAction = allSortedReportActions[iouReportValue?.reportID ?? '-1']?.find(
             (reportAction, key): reportAction is ReportAction<typeof CONST.REPORT.ACTIONS.TYPE.IOU> =>
                 ReportActionUtils.shouldReportActionBeVisible(reportAction, key) &&
                 reportAction.pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE &&
                 ReportActionUtils.isMoneyRequestAction(reportAction),
         );
         const reportPreviewMessage = ReportUtils.getReportPreviewMessage(
-            !isEmptyObject(iouReport) ? iouReport : null,
+            !isEmptyObject(iouReportValue) ? iouReportValue : null,
             lastIOUMoneyReportAction,
             true,
             ReportUtils.isChatReport(report),
@@ -766,7 +766,7 @@ function createOption(
 
         const lastActorDetails = personalDetailMap[report.lastActorAccountID ?? -1] ?? null;
         const lastActorDisplayName = getLastActorDisplayName(lastActorDetails, hasMultipleParticipants);
-        const lastMessageTextFromReport = getLastMessageTextForReport(report, lastActorDetails);
+        const lastMessageTextFromReport = getLastMessageTextForReport(report, undefined, lastActorDetails);
         let lastMessageText = lastMessageTextFromReport;
 
         const lastAction = lastVisibleReportActions[report.reportID];

src/libs/SidebarUtils.ts

@@ -234,6 +234,7 @@ function getOrderedReportIDs(
  */
 function getOptionData({
     report,
+    iouReport,
     reportActions,
     personalDetails,
     preferredLocale,
@@ -245,6 +246,7 @@ function getOptionData({
     invoiceReceiverPolicy,
 }: {
     report: OnyxEntry<Report>;
+    iouReport: OnyxEntry<Report>;
     reportActions: OnyxEntry<ReportActions>;
     personalDetails: OnyxEntry<PersonalDetailsList>;
     preferredLocale: DeepValueOf<typeof CONST.LOCALES>;
@@ -389,7 +391,7 @@ function getOptionData({
 
     let lastMessageTextFromReport = lastMessageTextFromReportProp;
     if (!lastMessageTextFromReport) {
-        lastMessageTextFromReport = OptionsListUtils.getLastMessageTextForReport(report, lastActorDetails, policy);
+        lastMessageTextFromReport = OptionsListUtils.getLastMessageTextForReport(report, iouReport, lastActorDetails, policy);
     }
 
     // We need to remove sms domain in case the last message text has a phone number mention with sms domain.

src/libs/actions/IOU.ts

@@ -6440,11 +6440,12 @@ function getReportFromHoldRequestsOnyxData(
     const firstHoldTransaction = holdTransactions[0];
     const newParentReportActionID = rand64();
 
+    const holdTotal = iouReport.total && iouReport.unheldTotal ? iouReport.total - iouReport.unheldTotal : 0;
     const optimisticExpenseReport = ReportUtils.buildOptimisticExpenseReport(
         chatReport.reportID,
         chatReport.policyID ?? iouReport.policyID ?? '',
         recipient.accountID ?? 1,
-        (firstHoldTransaction?.amount ?? 0) * -1,
+        holdTotal * -1,
         getCurrency(firstHoldTransaction),
         false,
         newParentReportActionID,
@@ -7044,6 +7045,7 @@ function approveMoneyRequest(expenseReport: OnyxEntry<OnyxTypes.Report>, full?:
         key: `${ONYXKEYS.COLLECTION.REPORT}${expenseReport?.reportID}`,
         value: {
             ...expenseReport,
+            total,
             lastMessageText: ReportActionsUtils.getReportActionText(optimisticApprovedReportAction),
             lastMessageHtml: ReportActionsUtils.getReportActionHtml(optimisticApprovedReportAction),
             stateNum: predictedNextState,