Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix: Send invoice - System message for invoice edit is missing Reply in thread for invoice sender #46001

Merged
merged 8 commits into from
Aug 23, 2024
Merged

Fix: Send invoice - System message for invoice edit is missing Reply in thread for invoice sender #46001

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b9a7267
Fix: Send invoice - System message for invoice edit is missing Reply …
truph01 Jul 23, 2024
50e88c6
merge main
truph01 Jul 24, 2024
f274b7b
Fix: rename param
truph01 Jul 24, 2024
29acdc7
merge latest main
truph01 Jul 30, 2024
e7fd087
resolve conflicts
truph01 Aug 12, 2024
3df8a69
merge main
truph01 Aug 21, 2024
c1f0ecd
fix sending additional params in SendInvoice
truph01 Aug 21, 2024
66c2ace
fix param types
truph01 Aug 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/libs/API/parameters/SendInvoiceParams.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ type SendInvoiceParams = RequireAtLeastOne<
transactionThreadReportID: string;
companyName?: string;
companyWebsite?: string;
createdIOUReportActionID: string;
createdReportActionIDForThread: string;
reportActionID: string;
},
'receiverEmail' | 'receiverInvoiceRoomID'
>;
Expand Down
25 changes: 23 additions & 2 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,9 @@ type SendInvoiceInformation = {
reportPreviewReportActionID: string;
transactionID: string;
transactionThreadReportID: string;
createdIOUReportActionID: string;
createdReportActionIDForThread: string;
reportActionID: string;
onyxData: OnyxData;
};

Expand Down Expand Up @@ -1966,6 +1969,9 @@ function getSendInvoiceInformation(
);

return {
createdIOUReportActionID: optimisticCreatedActionForIOUReport.reportActionID,
createdReportActionIDForThread: optimisticCreatedActionForTransactionThread?.reportActionID ?? '-1',
reportActionID: iouAction.reportActionID,
senderWorkspaceID,
receiver,
invoiceRoom: chatReport,
Expand Down Expand Up @@ -3604,10 +3610,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,
Expand Down
Loading