From b9a7267c81ead8bf9a96779b8302c7d1ecf94aed Mon Sep 17 00:00:00 2001 From: truph01 Date: Tue, 23 Jul 2024 18:31:02 +0700 Subject: [PATCH 1/4] Fix: Send invoice - System message for invoice edit is missing Reply in thread for invoice sender --- src/libs/actions/IOU.ts | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 5c908129a53..81ceab07d8a 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -1882,6 +1882,7 @@ function getSendInvoiceInformation( return { senderWorkspaceID, + iouReportActionID: iouAction.reportID, receiver, invoiceRoom: chatReport, createdChatReportActionID: optimisticCreatedActionForChat.reportActionID, @@ -3603,10 +3604,21 @@ function sendInvoice( policyTagList?: OnyxEntry, policyCategories?: OnyxEntry, ) { - const {senderWorkspaceID, receiver, invoiceRoom, createdChatReportActionID, invoiceReportID, reportPreviewReportActionID, transactionID, transactionThreadReportID, onyxData} = - getSendInvoiceInformation(transaction, currentUserAccountID, invoiceChatReport, receiptFile, policy, policyTagList, policyCategories); + const { + senderWorkspaceID, + receiver, + invoiceRoom, + createdChatReportActionID, + invoiceReportID, + reportPreviewReportActionID, + transactionID, + transactionThreadReportID, + onyxData, + iouReportActionID, + } = getSendInvoiceInformation(transaction, currentUserAccountID, invoiceChatReport, receiptFile, policy, policyTagList, policyCategories); const parameters: SendInvoiceParams = { + iouReportActionID, senderWorkspaceID, accountID: currentUserAccountID, amount: transaction?.amount ?? 0, From f274b7bcc58f1d3f2d3130a2f23e737e9ea205d8 Mon Sep 17 00:00:00 2001 From: truph01 Date: Wed, 24 Jul 2024 21:52:42 +0700 Subject: [PATCH 2/4] Fix: rename param --- src/libs/actions/IOU.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index f0dccf61567..f9c8e673032 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -1907,7 +1907,7 @@ function getSendInvoiceInformation( return { senderWorkspaceID, - iouReportActionID: iouAction.reportID, + iouReportActionID: iouAction.reportActionID, receiver, invoiceRoom: chatReport, createdChatReportActionID: optimisticCreatedActionForChat.reportActionID, From c1f0ecd7ceb6d0ef9ee5cff9056072bf687a4b20 Mon Sep 17 00:00:00 2001 From: truph01 Date: Wed, 21 Aug 2024 17:49:40 +0700 Subject: [PATCH 3/4] fix sending additional params in SendInvoice --- src/libs/API/parameters/SendInvoiceParams.ts | 3 +++ src/libs/actions/IOU.ts | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/libs/API/parameters/SendInvoiceParams.ts b/src/libs/API/parameters/SendInvoiceParams.ts index f41c85c89b4..3d1c7e81f24 100644 --- a/src/libs/API/parameters/SendInvoiceParams.ts +++ b/src/libs/API/parameters/SendInvoiceParams.ts @@ -21,6 +21,9 @@ type SendInvoiceParams = RequireAtLeastOne< companyName?: string; companyWebsite?: string; iouReportActionID?: string; + createdIOUReportActionID?: string; + createdReportActionIDForThread?: string; + reportActionID?: string; }, 'receiverEmail' | 'receiverInvoiceRoomID' >; diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 728ee90e12c..17a471a6661 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -112,6 +112,9 @@ type SendInvoiceInformation = { transactionID: string; transactionThreadReportID: string; iouReportActionID: string; + createdIOUReportActionID: string; + createdReportActionIDForThread?: string; + reportActionID: string; onyxData: OnyxData; }; @@ -1967,6 +1970,9 @@ function getSendInvoiceInformation( ); return { + createdIOUReportActionID: optimisticCreatedActionForIOUReport.reportActionID, + createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID, + reportActionID: iouAction.reportActionID, senderWorkspaceID, iouReportActionID: iouAction.reportActionID, receiver, @@ -3616,10 +3622,16 @@ function sendInvoice( transactionID, transactionThreadReportID, iouReportActionID, + createdIOUReportActionID, + createdReportActionIDForThread, + reportActionID, onyxData, } = getSendInvoiceInformation(transaction, currentUserAccountID, invoiceChatReport, receiptFile, policy, policyTagList, policyCategories, companyName, companyWebsite); const parameters: SendInvoiceParams = { + createdIOUReportActionID, + createdReportActionIDForThread, + reportActionID, iouReportActionID, senderWorkspaceID, accountID: currentUserAccountID, From 66c2acec6f682d7f0642ab8fb06d44b7cf8fe71b Mon Sep 17 00:00:00 2001 From: truph01 Date: Thu, 22 Aug 2024 19:16:00 +0700 Subject: [PATCH 4/4] fix param types --- src/libs/API/parameters/SendInvoiceParams.ts | 7 +++---- src/libs/actions/IOU.ts | 8 ++------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/libs/API/parameters/SendInvoiceParams.ts b/src/libs/API/parameters/SendInvoiceParams.ts index 3d1c7e81f24..e2cac84e0d1 100644 --- a/src/libs/API/parameters/SendInvoiceParams.ts +++ b/src/libs/API/parameters/SendInvoiceParams.ts @@ -20,10 +20,9 @@ type SendInvoiceParams = RequireAtLeastOne< transactionThreadReportID: string; companyName?: string; companyWebsite?: string; - iouReportActionID?: string; - createdIOUReportActionID?: string; - createdReportActionIDForThread?: string; - reportActionID?: string; + createdIOUReportActionID: string; + createdReportActionIDForThread: string; + reportActionID: string; }, 'receiverEmail' | 'receiverInvoiceRoomID' >; diff --git a/src/libs/actions/IOU.ts b/src/libs/actions/IOU.ts index 17a471a6661..1203657d64c 100644 --- a/src/libs/actions/IOU.ts +++ b/src/libs/actions/IOU.ts @@ -111,9 +111,8 @@ type SendInvoiceInformation = { reportPreviewReportActionID: string; transactionID: string; transactionThreadReportID: string; - iouReportActionID: string; createdIOUReportActionID: string; - createdReportActionIDForThread?: string; + createdReportActionIDForThread: string; reportActionID: string; onyxData: OnyxData; }; @@ -1971,10 +1970,9 @@ function getSendInvoiceInformation( return { createdIOUReportActionID: optimisticCreatedActionForIOUReport.reportActionID, - createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID, + createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1', reportActionID: iouAction.reportActionID, senderWorkspaceID, - iouReportActionID: iouAction.reportActionID, receiver, invoiceRoom: chatReport, createdChatReportActionID: optimisticCreatedActionForChat.reportActionID, @@ -3621,7 +3619,6 @@ function sendInvoice( reportPreviewReportActionID, transactionID, transactionThreadReportID, - iouReportActionID, createdIOUReportActionID, createdReportActionIDForThread, reportActionID, @@ -3632,7 +3629,6 @@ function sendInvoice( createdIOUReportActionID, createdReportActionIDForThread, reportActionID, - iouReportActionID, senderWorkspaceID, accountID: currentUserAccountID, amount: transaction?.amount ?? 0,