diff --git a/src/hooks/useSelectedTransactionsActions.ts b/src/hooks/useSelectedTransactionsActions.ts index ffef95432a11..73a0b6aa3b8b 100644 --- a/src/hooks/useSelectedTransactionsActions.ts +++ b/src/hooks/useSelectedTransactionsActions.ts @@ -216,7 +216,7 @@ function useSelectedTransactionsActions({ if (!action?.childReportID) { continue; } - unholdRequest(transactionID, action?.childReportID); + unholdRequest(transactionID, action?.childReportID, policy); } clearSelectedTransactions(true); }, diff --git a/src/libs/NextStepUtils.ts b/src/libs/NextStepUtils.ts index 998d886d6017..a8c08aa5b79f 100644 --- a/src/libs/NextStepUtils.ts +++ b/src/libs/NextStepUtils.ts @@ -139,7 +139,7 @@ function buildOptimisticNextStep(params: BuildNextStepNewParams): ReportNextStep }; // Scheduled submit enabled - if (policy?.harvesting?.enabled && autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL && isReportContainingTransactions) { + if (policy?.harvesting?.enabled && isReportContainingTransactions) { nextStep = { messageKey: CONST.NEXT_STEP.MESSAGE_KEY.WAITING_FOR_AUTOMATIC_SUBMIT, icon: CONST.NEXT_STEP.ICONS.HOURGLASS, @@ -183,7 +183,7 @@ function buildOptimisticNextStep(params: BuildNextStepNewParams): ReportNextStep } // Manual submission - if (report?.total !== 0 && !policy?.harvesting?.enabled && autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL) { + if (report?.total !== 0 && !policy?.harvesting?.enabled) { nextStep = { messageKey: CONST.NEXT_STEP.MESSAGE_KEY.WAITING_TO_SUBMIT, icon: CONST.NEXT_STEP.ICONS.HOURGLASS, @@ -520,7 +520,7 @@ function buildNextStepNew(params: BuildNextStepNewParams): ReportNextStepDepreca text: ' to ', }, { - text: 'add', + text: isReportContainingTransactions ? 'submit' : 'add', }, { text: ' %expenses.', @@ -529,7 +529,7 @@ function buildNextStepNew(params: BuildNextStepNewParams): ReportNextStepDepreca }; // Scheduled submit enabled - if (policy?.harvesting?.enabled && autoReportingFrequency !== CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL && isReportContainingTransactions) { + if (policy?.harvesting?.enabled && isReportContainingTransactions) { optimisticNextStep.message = [ { text: 'Waiting for ', @@ -583,7 +583,7 @@ function buildNextStepNew(params: BuildNextStepNewParams): ReportNextStepDepreca } // Manual submission - if (report?.total !== 0 && !policy?.harvesting?.enabled && autoReportingFrequency === CONST.POLICY.AUTO_REPORTING_FREQUENCIES.MANUAL) { + if (report?.total !== 0 && !policy?.harvesting?.enabled) { optimisticNextStep.message = [ { text: 'Waiting for ', diff --git a/src/libs/ReportUtils.ts b/src/libs/ReportUtils.ts index ff7ed7589f9c..a89c08ab12b3 100644 --- a/src/libs/ReportUtils.ts +++ b/src/libs/ReportUtils.ts @@ -4878,11 +4878,11 @@ const changeMoneyRequestHoldStatus = (reportAction: OnyxEntry): vo const transaction = allTransactions?.[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`] ?? ({} as Transaction); const isOnHold = isOnHoldTransactionUtils(transaction); - const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport.policyID}`] ?? null; + const policy = allPolicies?.[`${ONYXKEYS.COLLECTION.POLICY}${moneyRequestReport.policyID}`]; if (isOnHold) { if (reportAction.childReportID) { - unholdRequest(transactionID, reportAction.childReportID); + unholdRequest(transactionID, reportAction.childReportID, policy); } else { Log.warn('Missing reportAction.childReportID during money request unhold'); } diff --git a/src/libs/actions/IOU/index.ts b/src/libs/actions/IOU/index.ts index 0598e3e5018e..b703815057e3 100644 --- a/src/libs/actions/IOU/index.ts +++ b/src/libs/actions/IOU/index.ts @@ -11823,7 +11823,9 @@ function putOnHold(transactionID: string, comment: string, initialReportID: stri optimisticData.push(parentActionData); } - const successData: Array> = [ + const successData: Array< + OnyxUpdate + > = [ { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, @@ -11834,7 +11836,13 @@ function putOnHold(transactionID: string, comment: string, initialReportID: stri ]; const failureData: Array< - OnyxUpdate + OnyxUpdate< + | typeof ONYXKEYS.COLLECTION.TRANSACTION + | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS + | typeof ONYXKEYS.COLLECTION.REPORT + | typeof ONYXKEYS.COLLECTION.REPORT_METADATA + | typeof ONYXKEYS.COLLECTION.NEXT_STEP + > > = [ { onyxMethod: Onyx.METHOD.MERGE, @@ -11938,6 +11946,67 @@ function putOnHold(transactionID: string, comment: string, initialReportID: stri ); } + if (iouReport) { + // buildOptimisticNextStep is used in parallel + // eslint-disable-next-line @typescript-eslint/no-deprecated + const optimisticNextStepDeprecated = buildNextStepNew({ + report: iouReport, + predictedNextStatus: iouReport.statusNum ?? CONST.REPORT.STATUS_NUM.OPEN, + shouldFixViolations: true, + currentUserAccountIDParam: userAccountID, + currentUserEmailParam: currentUserEmail, + }); + const optimisticNextStep = buildOptimisticNextStep({ + report: iouReport, + predictedNextStatus: iouReport.statusNum ?? CONST.REPORT.STATUS_NUM.OPEN, + shouldFixViolations: true, + currentUserAccountIDParam: userAccountID, + currentUserEmailParam: currentUserEmail, + }); + + optimisticData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`, + value: optimisticNextStepDeprecated, + }); + optimisticData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, + value: { + nextStep: optimisticNextStep, + pendingFields: { + nextStep: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }, + }, + }); + + successData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, + value: { + pendingFields: { + nextStep: null, + }, + }, + }); + + failureData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`, + value: null, + }); + failureData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, + value: { + nextStep: iouReport.nextStep ?? null, + pendingFields: { + nextStep: null, + }, + }, + }); + } + const params: HoldMoneyRequestParams = { transactionID, comment, @@ -11966,15 +12035,22 @@ function putTransactionsOnHold(transactionsID: string[], comment: string, report /** * Remove expense from HOLD */ -function unholdRequest(transactionID: string, reportID: string) { +function unholdRequest(transactionID: string, reportID: string, policy: OnyxEntry) { const createdReportAction = buildOptimisticUnHoldReportAction(); const transactionViolations = allTransactionViolations[`${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`]; + const updatedTransactionViolations = transactionViolations?.filter((violation) => violation.name !== CONST.VIOLATIONS.HOLD) ?? []; const transaction = allTransactions[`${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`]; const iouReport = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${transaction?.reportID}`]; const report = allReports?.[`${ONYXKEYS.COLLECTION.REPORT}${reportID}`]; const optimisticData: Array< - OnyxUpdate + OnyxUpdate< + | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS + | typeof ONYXKEYS.COLLECTION.TRANSACTION + | typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + | typeof ONYXKEYS.COLLECTION.REPORT + | typeof ONYXKEYS.COLLECTION.NEXT_STEP + > > = [ { onyxMethod: Onyx.METHOD.MERGE, @@ -11996,7 +12072,7 @@ function unholdRequest(transactionID: string, reportID: string) { { onyxMethod: Onyx.METHOD.SET, key: `${ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS}${transactionID}`, - value: transactionViolations?.filter((violation) => violation.name !== CONST.VIOLATIONS.HOLD) ?? [], + value: updatedTransactionViolations, }, { onyxMethod: Onyx.METHOD.MERGE, @@ -12021,7 +12097,7 @@ function unholdRequest(transactionID: string, reportID: string) { }); } - const successData: Array> = [ + const successData: Array> = [ { onyxMethod: Onyx.METHOD.MERGE, key: `${ONYXKEYS.COLLECTION.TRANSACTION}${transactionID}`, @@ -12035,7 +12111,13 @@ function unholdRequest(transactionID: string, reportID: string) { ]; const failureData: Array< - OnyxUpdate + OnyxUpdate< + | typeof ONYXKEYS.COLLECTION.REPORT_ACTIONS + | typeof ONYXKEYS.COLLECTION.TRANSACTION + | typeof ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS + | typeof ONYXKEYS.COLLECTION.REPORT + | typeof ONYXKEYS.COLLECTION.NEXT_STEP + > > = [ { onyxMethod: Onyx.METHOD.MERGE, @@ -12069,6 +12151,69 @@ function unholdRequest(transactionID: string, reportID: string) { }, ]; + if (iouReport) { + // buildOptimisticNextStep is used in parallel + // eslint-disable-next-line @typescript-eslint/no-deprecated + const optimisticNextStepDeprecated = buildNextStepNew({ + report: iouReport, + policy, + predictedNextStatus: iouReport.statusNum ?? CONST.REPORT.STATUS_NUM.OPEN, + shouldFixViolations: updatedTransactionViolations.length > 0, + currentUserAccountIDParam: userAccountID, + currentUserEmailParam: currentUserEmail, + }); + const optimisticNextStep = buildOptimisticNextStep({ + report: iouReport, + policy, + predictedNextStatus: iouReport.statusNum ?? CONST.REPORT.STATUS_NUM.OPEN, + shouldFixViolations: updatedTransactionViolations.length > 0, + currentUserAccountIDParam: userAccountID, + currentUserEmailParam: currentUserEmail, + }); + + optimisticData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`, + value: optimisticNextStepDeprecated, + }); + optimisticData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, + value: { + nextStep: optimisticNextStep, + pendingFields: { + nextStep: CONST.RED_BRICK_ROAD_PENDING_ACTION.UPDATE, + }, + }, + }); + + successData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, + value: { + pendingFields: { + nextStep: null, + }, + }, + }); + + failureData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.NEXT_STEP}${iouReport.reportID}`, + value: null, + }); + failureData.push({ + onyxMethod: Onyx.METHOD.MERGE, + key: `${ONYXKEYS.COLLECTION.REPORT}${iouReport.reportID}`, + value: { + nextStep: iouReport.nextStep ?? null, + pendingFields: { + nextStep: null, + }, + }, + }); + } + API.write( WRITE_COMMANDS.UNHOLD_MONEY_REQUEST, { diff --git a/tests/actions/IOUTest.ts b/tests/actions/IOUTest.ts index 6d44fe44f2ce..2382ece50061 100644 --- a/tests/actions/IOUTest.ts +++ b/tests/actions/IOUTest.ts @@ -6634,7 +6634,14 @@ describe('actions/IOU', () => { describe('unHoldRequest', () => { test("should update the transaction thread report's lastVisibleActionCreated to the optimistically added unhold report action created timestamp", () => { - const iouReport = buildOptimisticIOUReport(1, 2, 100, '1', 'USD'); + const policyID = '577'; + const policy: Policy = { + ...createRandomPolicy(Number(policyID)), + }; + const iouReport: Report = { + ...buildOptimisticIOUReport(1, 2, 100, '1', 'USD'), + policyID, + }; const transaction = buildOptimisticTransaction({ transactionParams: { amount: 100, @@ -6672,7 +6679,7 @@ describe('actions/IOU', () => { }) .then(() => { // When an expense is unhold - unholdRequest(transaction.transactionID, transactionThread.reportID); + unholdRequest(transaction.transactionID, transactionThread.reportID, policy); return waitForBatchedUpdates(); }) .then(() => { @@ -6700,7 +6707,14 @@ describe('actions/IOU', () => { }); test('should rollback unhold request on API failure', () => { - const iouReport = buildOptimisticIOUReport(1, 2, 100, '1', 'USD'); + const policyID = '577'; + const policy: Policy = { + ...createRandomPolicy(Number(policyID)), + }; + const iouReport: Report = { + ...buildOptimisticIOUReport(1, 2, 100, '1', 'USD'), + policyID, + }; const transaction = buildOptimisticTransaction({ transactionParams: { amount: 100, @@ -6739,7 +6753,7 @@ describe('actions/IOU', () => { .then(() => { mockFetch.fail(); mockFetch?.resume?.(); - unholdRequest(transaction.transactionID, transactionThread.reportID); + unholdRequest(transaction.transactionID, transactionThread.reportID, policy); return waitForBatchedUpdates(); }) .then(() => { diff --git a/tests/unit/NextStepUtilsTest.ts b/tests/unit/NextStepUtilsTest.ts index af2b4c5d192b..1a7f19c0d006 100644 --- a/tests/unit/NextStepUtilsTest.ts +++ b/tests/unit/NextStepUtilsTest.ts @@ -162,7 +162,7 @@ describe('libs/NextStepUtils', () => { test('self review', () => { optimisticNextStep.icon = CONST.NEXT_STEP.ICONS.HOURGLASS; - // Waiting for userSubmitter to add expense(s). + // Waiting for userSubmitter to submit expense(s). optimisticNextStep.message = [ { text: 'Waiting for ', @@ -175,7 +175,7 @@ describe('libs/NextStepUtils', () => { text: ' to ', }, { - text: 'add', + text: 'submit', }, { text: ' %expenses.', diff --git a/tests/unit/hooks/useSelectedTransactionsActions.test.ts b/tests/unit/hooks/useSelectedTransactionsActions.test.ts index de954957ddf5..d3c8ccfd682f 100644 --- a/tests/unit/hooks/useSelectedTransactionsActions.test.ts +++ b/tests/unit/hooks/useSelectedTransactionsActions.test.ts @@ -518,7 +518,7 @@ describe('useSelectedTransactionsActions', () => { unholdOption?.onSelected?.(); - expect(unholdRequest).toHaveBeenCalledWith(transactionID, 'child123'); + expect(unholdRequest).toHaveBeenCalledWith(transactionID, 'child123', undefined); expect(mockClearSelectedTransactions).toHaveBeenCalledWith(true); });