Merge pull request #46001 from truph01/fix/43797

Fix: Send invoice - System message for invoice edit is missing Reply in thread for invoice sender
Expensify · Aug 23, 2024 · cb9dec1 · cb9dec1
2 parents 156f0a2 + 66c2ace
commit cb9dec1
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 2 deletions.
diff --git a/src/libs/API/parameters/SendInvoiceParams.ts b/src/libs/API/parameters/SendInvoiceParams.ts
@@ -20,6 +20,9 @@ type SendInvoiceParams = RequireAtLeastOne<
         transactionThreadReportID: string;
         companyName?: string;
         companyWebsite?: string;
+        createdIOUReportActionID: string;
+        createdReportActionIDForThread: string;
+        reportActionID: string;
     },
     'receiverEmail' | 'receiverInvoiceRoomID'
 >;

diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts
@@ -111,6 +111,9 @@ type SendInvoiceInformation = {
     reportPreviewReportActionID: string;
     transactionID: string;
     transactionThreadReportID: string;
+    createdIOUReportActionID: string;
+    createdReportActionIDForThread: string;
+    reportActionID: string;
     onyxData: OnyxData;
 };
 
@@ -1944,6 +1947,9 @@ function getSendInvoiceInformation(
     );
 
     return {
+        createdIOUReportActionID: optimisticCreatedActionForIOUReport.reportActionID,
+        createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1',
+        reportActionID: iouAction.reportActionID,
         senderWorkspaceID,
         receiver,
         invoiceRoom: chatReport,
@@ -3582,10 +3588,25 @@ function sendInvoice(
     companyName?: string,
     companyWebsite?: string,
 ) {
-    const {senderWorkspaceID, receiver, invoiceRoom, createdChatReportActionID, invoiceReportID, reportPreviewReportActionID, transactionID, transactionThreadReportID, onyxData} =
-        getSendInvoiceInformation(transaction, currentUserAccountID, invoiceChatReport, receiptFile, policy, policyTagList, policyCategories, companyName, companyWebsite);
+    const {
+        senderWorkspaceID,
+        receiver,
+        invoiceRoom,
+        createdChatReportActionID,
+        invoiceReportID,
+        reportPreviewReportActionID,
+        transactionID,
+        transactionThreadReportID,
+        createdIOUReportActionID,
+        createdReportActionIDForThread,
+        reportActionID,
+        onyxData,
+    } = getSendInvoiceInformation(transaction, currentUserAccountID, invoiceChatReport, receiptFile, policy, policyTagList, policyCategories, companyName, companyWebsite);
 
     const parameters: SendInvoiceParams = {
+        createdIOUReportActionID,
+        createdReportActionIDForThread,
+        reportActionID,
         senderWorkspaceID,
         accountID: currentUserAccountID,
         amount: transaction?.amount ?? 0,