Skip to content

Fix - Refactor buildOnyxDataForTrackExpense to use a parameter object #57393

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
neil-marcellini merged 3 commits into from
Feb 27, 2025
Merged

Fix - Refactor buildOnyxDataForTrackExpense to use a parameter object #57393

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac0ba20
refactor buildOnyxDataForTrackExpense
FitseTLT Feb 24, 2025
09d4382
broke up params to sub-objects
FitseTLT Feb 26, 2025
0964447
minor update
FitseTLT Feb 27, 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
64 changes: 34 additions & 30 deletions src/libs/actions/IOU.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,23 +1858,31 @@ function buildOnyxDataForInvoice(
return [optimisticData, successData, failureData];
}

type BuildOnyxDataForTrackExpenseParams = {
chat: {report: OnyxInputValue<OnyxTypes.Report>; previewAction: OnyxInputValue<ReportAction>};
iou: {report: OnyxInputValue<OnyxTypes.Report>; createdAction: OptimisticCreatedReportAction; action: OptimisticIOUReportAction};
transactionParams: {transaction: OnyxTypes.Transaction; threadReport: OptimisticChatReport | null; threadCreatedReportAction: OptimisticCreatedReportAction | null};
policyParams: {policy?: OnyxInputValue<OnyxTypes.Policy>; tagList?: OnyxInputValue<OnyxTypes.PolicyTagLists>; categories?: OnyxInputValue<OnyxTypes.PolicyCategories>};
shouldCreateNewMoneyRequestReport: boolean;
existingTransactionThreadReportID?: string;
actionableTrackExpenseWhisper?: OnyxInputValue<OnyxTypes.ReportAction>;
};

/** Builds the Onyx data for track expense */
function buildOnyxDataForTrackExpense(
chatReport: OnyxInputValue<OnyxTypes.Report>,
iouReport: OnyxInputValue<OnyxTypes.Report>,
transaction: OnyxTypes.Transaction,
iouCreatedAction: OptimisticCreatedReportAction,
iouAction: OptimisticIOUReportAction,
reportPreviewAction: OnyxInputValue<ReportAction>,
transactionThreadReport: OptimisticChatReport | null,
transactionThreadCreatedReportAction: OptimisticCreatedReportAction | null,
shouldCreateNewMoneyRequestReport: boolean,
policy?: OnyxInputValue<OnyxTypes.Policy>,
policyTagList?: OnyxInputValue<OnyxTypes.PolicyTagLists>,
policyCategories?: OnyxInputValue<OnyxTypes.PolicyCategories>,
existingTransactionThreadReportID?: string,
actionableTrackExpenseWhisper?: OnyxInputValue<OnyxTypes.ReportAction>,
): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] {
function buildOnyxDataForTrackExpense({
chat,
iou,
transactionParams,
policyParams = {},
shouldCreateNewMoneyRequestReport,
existingTransactionThreadReportID,
actionableTrackExpenseWhisper,
}: BuildOnyxDataForTrackExpenseParams): [OnyxUpdate[], OnyxUpdate[], OnyxUpdate[]] {
const {report: chatReport, previewAction: reportPreviewAction} = chat;
const {report: iouReport, createdAction: iouCreatedAction, action: iouAction} = iou;
const {transaction, threadReport: transactionThreadReport, threadCreatedReportAction: transactionThreadCreatedReportAction} = transactionParams;
const {policy, tagList: policyTagList, categories: policyCategories} = policyParams;

const isScanRequest = isScanRequestTransactionUtils(transaction);
const isDistanceRequest = isDistanceRequestTransactionUtils(transaction);
const clearedPendingFields = Object.fromEntries(Object.keys(transaction.pendingFields ?? {}).map((key) => [key, null]));
Expand Down Expand Up @@ -3256,22 +3264,18 @@ function getTrackExpenseInformation(
}

// STEP 5: Build Onyx Data
const trackExpenseOnyxData = buildOnyxDataForTrackExpense(
chatReport,
iouReport,
optimisticTransaction,
optimisticCreatedActionForIOUReport,
iouAction,
reportPreviewAction,
optimisticTransactionThread ?? {},
optimisticCreatedActionForTransactionThread,
const trackExpenseOnyxData = buildOnyxDataForTrackExpense({
chat: {report: chatReport, previewAction: reportPreviewAction},
iou: {report: iouReport, action: iouAction, createdAction: optimisticCreatedActionForIOUReport},
transactionParams: {
transaction: optimisticTransaction,
threadCreatedReportAction: optimisticCreatedActionForTransactionThread,
threadReport: optimisticTransactionThread ?? {},
},
policyParams: {policy, tagList: policyTagList, categories: policyCategories},
shouldCreateNewMoneyRequestReport,
policy,
policyTagList,
policyCategories,
undefined,
actionableTrackExpenseWhisper,
);
});

return {
createdWorkspaceParams,
Expand Down