Skip to content

fix: correct order of applying Onyx data for convert/share tracked expense #60798

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

Merged
JS00001 merged 4 commits into from
Apr 24, 2025
+10 −20
Merged

fix: correct order of applying Onyx data for convert/share tracked expense #60798

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b20dff
fix: correct order of applying Onyx data for convert tracked expense
daledah Apr 24, 2025
e1fa22e
fix: apply fix for share tracked expense
daledah Apr 24, 2025
7262c12
Update src/libs/actions/IOU.ts
daledah Apr 24, 2025
542db33
Update src/libs/actions/IOU.ts
daledah Apr 24, 2025
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
30 changes: 10 additions & 20 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4705,14 +4705,9 @@ function convertTrackedExpenseToRequest(convertTrackedExpenseParams: ConvertTrac
attendees,
transactionThreadReportID,
} = transactionParams;
const {optimisticData, successData, failureData} = onyxData;
const {optimisticData: convertTransactionOptimisticData = [], successData: convertTransactionSuccessData = [], failureData: convertTransactionFailureData = []} = onyxData;

const {
optimisticData: moveTransactionOptimisticData,
successData: moveTransactionSuccessData,
failureData: moveTransactionFailureData,
modifiedExpenseReportActionID,
} = getConvertTrackedExpenseInformation(
const {optimisticData, successData, failureData, modifiedExpenseReportActionID} = getConvertTrackedExpenseInformation(
transactionID,
actionableWhisperReportActionID,
iouParams.reportID,
Expand All @@ -4722,9 +4717,9 @@ function convertTrackedExpenseToRequest(convertTrackedExpenseParams: ConvertTrac
CONST.IOU.ACTION.SUBMIT,
);

optimisticData?.push(...moveTransactionOptimisticData);
successData?.push(...moveTransactionSuccessData);
failureData?.push(...moveTransactionFailureData);
optimisticData?.push(...convertTransactionOptimisticData);
successData?.push(...convertTransactionSuccessData);
failureData?.push(...convertTransactionFailureData);

if (workspaceParams) {
const params = {
Expand Down Expand Up @@ -4824,7 +4819,7 @@ function categorizeTrackedExpense(trackedExpenseParams: TrackedExpenseParams) {

function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) {
const {onyxData, reportInformation, transactionParams, policyParams, createdWorkspaceParams} = trackedExpenseParams;
const {optimisticData, successData, failureData} = onyxData ?? {};
const {optimisticData: shareTrackedExpenseOptimisticData = [], successData: shareTrackedExpenseSuccessData = [], failureData: shareTrackedExpenseFailureData = []} = onyxData ?? {};
const {transactionID} = transactionParams;
const {
actionableWhisperReportActionID,
Expand All @@ -4837,12 +4832,7 @@ function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) {
transactionThreadReportID,
} = reportInformation;

const {
optimisticData: moveTransactionOptimisticData,
successData: moveTransactionSuccessData,
failureData: moveTransactionFailureData,
modifiedExpenseReportActionID,
} = getConvertTrackedExpenseInformation(
const {optimisticData, successData, failureData, modifiedExpenseReportActionID} = getConvertTrackedExpenseInformation(
transactionID,
actionableWhisperReportActionID,
moneyRequestReportID,
Expand All @@ -4852,9 +4842,9 @@ function shareTrackedExpense(trackedExpenseParams: TrackedExpenseParams) {
CONST.IOU.ACTION.SHARE,
);

optimisticData?.push(...moveTransactionOptimisticData);
successData?.push(...moveTransactionSuccessData);
failureData?.push(...moveTransactionFailureData);
optimisticData?.push(...shareTrackedExpenseOptimisticData);
successData?.push(...shareTrackedExpenseSuccessData);
failureData?.push(...shareTrackedExpenseFailureData);

const parameters: ShareTrackedExpenseParams = {
...transactionParams,
Expand Down