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

Fix workspace switcher is reset to "Expensify" when sending invoice on the same WS #42197

Merged
merged 2 commits into from
May 27, 2024
Merged

Fix workspace switcher is reset to "Expensify" when sending invoice on the same WS #42197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
493cafc
fix send invoice switch to all workspace
bernhardoj May 15, 2024
246541c
Merge branch 'main' into fix/41575-send-invoice-reset-workspace-switcher
bernhardoj May 15, 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
12 changes: 6 additions & 6 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ type TrackExpenseInformation = {
type SendInvoiceInformation = {
senderWorkspaceID: string;
receiver: Partial<OnyxTypes.PersonalDetails>;
invoiceRoomReportID: string;
invoiceRoom: OnyxTypes.Report;
createdChatReportActionID: string;
invoiceReportID: string;
reportPreviewReportActionID: string;
Expand Down Expand Up @@ -1758,7 +1758,7 @@ function getSendInvoiceInformation(
return {
senderWorkspaceID,
receiver,
invoiceRoomReportID: chatReport.reportID,
invoiceRoom: chatReport,
createdChatReportActionID: optimisticCreatedActionForChat.reportActionID,
invoiceReportID: optimisticInvoiceReport.reportID,
reportPreviewReportActionID: reportPreviewAction.reportActionID,
Expand Down Expand Up @@ -3442,7 +3442,7 @@ function sendInvoice(
policyTagList?: OnyxEntry<OnyxTypes.PolicyTagList>,
policyCategories?: OnyxEntry<OnyxTypes.PolicyCategories>,
) {
const {senderWorkspaceID, receiver, invoiceRoomReportID, createdChatReportActionID, invoiceReportID, reportPreviewReportActionID, transactionID, transactionThreadReportID, onyxData} =
const {senderWorkspaceID, receiver, invoiceRoom, createdChatReportActionID, invoiceReportID, reportPreviewReportActionID, transactionID, transactionThreadReportID, onyxData} =
getSendInvoiceInformation(transaction, currentUserAccountID, invoiceChatReport, receiptFile, policy, policyTagList, policyCategories);

let parameters: SendInvoiceParams = {
Expand All @@ -3454,7 +3454,7 @@ function sendInvoice(
merchant: transaction?.merchant ?? '',
category: transaction?.category,
date: transaction?.created ?? '',
invoiceRoomReportID,
invoiceRoomReportID: invoiceRoom.reportID,
createdChatReportActionID,
invoiceReportID,
reportPreviewReportActionID,
Expand All @@ -3476,8 +3476,8 @@ function sendInvoice(

API.write(WRITE_COMMANDS.SEND_INVOICE, parameters, onyxData);

Navigation.dismissModal(invoiceRoomReportID);
Report.notifyNewAction(invoiceRoomReportID, receiver.accountID);
Navigation.dismissModalWithReport(invoiceRoom);
Report.notifyNewAction(invoiceRoom.reportID, receiver.accountID);
}

/**
Expand Down
Loading