Skip to content

Refactor: make changeMoneyRequestHoldStatus pure function receive iouTransaction#84507

Merged
tgolen merged 13 commits intoExpensify:mainfrom
linhvovan29546:refactor/66418-make-changeMoneyRequestHoldStatus-pure-function
Mar 13, 2026
Merged

Refactor: make changeMoneyRequestHoldStatus pure function receive iouTransaction#84507
tgolen merged 13 commits intoExpensify:mainfrom
linhvovan29546:refactor/66418-make-changeMoneyRequestHoldStatus-pure-function

Conversation

@linhvovan29546
Copy link
Contributor

@linhvovan29546 linhvovan29546 commented Mar 8, 2026

Explanation of Change

This PR refactors changeMoneyRequestHoldStatus in ReportUtils.ts to be a pure function by receiving the iouTransaction as an explicit parameter instead of looking it up internally from the module-level allTransactions Onyx cache. And also rename module-level variables — allTransactionsdeprecatedAllTransactions and reportsTransactionsdeprecatedReportsTransactions

Fixed Issues

$ #66418
PROPOSAL: N/A

Tests

Test 1:

  1. Create a new expense.
  2. Open the expense detail view.
  3. Tap More > Hold.
  4. Verify that the expense is successfully held
  5. Tap Remove Hold.
  6. Verify that the expense is successfully unheld (status returns to normal).

Test 2:

  1. Create a new expense.
  2. Right-click (or long-press) on report review.
  3. Select Hold.
  4. Verify that the expense is successfully held.
  5. Tap Remove Hold.
  6. Verify that the expense is successfully unheld.

Test 3:

  1. Create a new expense.
  2. Go to Reports > Reports list.
  3. Select the expense just created.
  4. Tap the selected items dropdown > Hold.
  5. Verify that the expense is successfully held.
  6. Repeat step 3 then Remove Hold.
  7. Verify that the expense is successfully unheld.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests above

QA Steps

Same as tests above

  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Screen.Recording.2026-03-10.at.21.09.57.mov
Android: mWeb Chrome
Screen.Recording.2026-03-10.at.21.05.02.mov
iOS: Native
Screen.Recording.2026-03-10.at.21.01.10.mov
iOS: mWeb Safari
Screen.Recording.2026-03-10.at.20.57.39.mov
MacOS: Chrome / Safari
Screen.Recording.2026-03-10.at.20.50.07.mov

@codecov
Copy link

codecov bot commented Mar 8, 2026

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines Coverage Δ
src/components/MoneyRequestHeader.tsx 0.00% <ø> (ø)
...report/ContextMenu/BaseReportActionContextMenu.tsx 83.78% <ø> (+83.78%) ⬆️
src/libs/ReportUtils.ts 77.14% <90.00%> (+0.72%) ⬆️
...es/inbox/report/ContextMenu/ContextMenuActions.tsx 41.22% <66.66%> (+15.72%) ⬆️
src/components/MoneyReportHeader.tsx 0.00% <0.00%> (ø)
... and 170 files with indirect coverage changes

@linhvovan29546 linhvovan29546 changed the title chore: make changeMoneyRequestHoldStatus pure function receive iouTra… Refactor: make changeMoneyRequestHoldStatus pure function receive iouTransaction Mar 10, 2026
@linhvovan29546
Copy link
Contributor Author

@codex review

Copy link

@chatgpt-codex-connector chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: b42db89c13

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@linhvovan29546

This comment was marked as outdated.

@linhvovan29546
Copy link
Contributor Author

@codex review

@chatgpt-codex-connector
Copy link

Codex Review: Didn't find any major issues. Already looking forward to the next diff.

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

@linhvovan29546 linhvovan29546 marked this pull request as ready for review March 10, 2026 14:14
@linhvovan29546 linhvovan29546 requested review from a team as code owners March 10, 2026 14:14
@melvin-bot melvin-bot bot requested review from DylanDylann and trjExpensify and removed request for a team March 10, 2026 14:14
@melvin-bot
Copy link

melvin-bot bot commented Mar 10, 2026

@DylanDylann Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

@melvin-bot melvin-bot bot removed the request for review from a team March 10, 2026 14:14
@trjExpensify trjExpensify removed their request for review March 11, 2026 23:14
@trjExpensify
Copy link
Contributor

PR doesn’t need product input as a refactor PR. Unassigning and unsubscribing myself.

@DylanDylann
Copy link
Contributor

@MelvinBot Could you please review this PR?

@DylanDylann
Copy link
Contributor

The rest looks fine to me

@linhvovan29546
Copy link
Contributor Author

The test failure is not related to this PR.

@linhvovan29546
Copy link
Contributor Author

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

I've added more tests. I think that's sufficient now, they should cover the UI cases properly.

@MelvinBot
Copy link
Contributor

The statement is partially correct but incomplete. Here's the code evidence:

What IS correct

isRemoveHoldAction at ReportPrimaryActionUtils.ts:278-301 does return false when transactionThreadReportID is falsy:

function isRemoveHoldAction(report, chatReport, reportTransactions) {
    // ...
    const transactionThreadReportID = getOneTransactionThreadReportID(report, chatReport, reportActions);
    if (!transactionThreadReportID) {
        return false;  // ← confirmed
    }
    const isHolder = reportTransactions.some((transaction) => isHoldCreator(transaction, transactionThreadReportID));
    return isHolder;
}

What the statement MISSES

isRemoveHoldAction is not the only path that returns REMOVE_HOLD. In getReportPrimaryAction, there are three paths that return REMOVE_HOLD:

Path 1 — line 471 (left side of OR): isRemoveHoldAction(...) — requires transactionThreadReportID to be truthy (single-transaction reports).

Path 2 — line 471 (right side of OR): isPayActionWithAllExpensesHeld && expensesToHold.length — does NOT require transactionThreadReportID. Fires on multi-transaction reports where all expenses are held and the report is payable.

// line 471-472
if (isRemoveHoldAction(report, chatReport, reportTransactions) || (isPayActionWithAllExpensesHeld && expensesToHold.length)) {
    return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
}

Path 3 — line 491: expensesToHold.length (standalone fallthrough) — also does NOT require transactionThreadReportID. Fires when no higher-priority action applies but there are held expenses.

// line 491-493
if (expensesToHold.length) {
    return CONST.REPORT.PRIMARY_ACTIONS.REMOVE_HOLD;
}

Both paths 2 and 3 use getAllExpensesToHoldIfApplicable, which iterates over all report actions and does not depend on transactionThreadReportID.

Is the parentReportAction fallback reachable?

Looking at the REMOVE_HOLD button handler in MoneyReportHeader.tsx:1246-1268:

onPress={() => {
    const parentReportAction = getReportAction(moneyRequestReport?.parentReportID, moneyRequestReport?.parentReportActionID);
    const IOUActions = getAllExpensesToHoldIfApplicable(moneyRequestReport, reportActions, transactions, policy);

    if (IOUActions.length) {
        // Batch unhold — handles multi-transaction cases (paths 2 & 3)
        for (const action of IOUActions) {
            changeMoneyRequestHoldStatus(action, getLinkedIOUTransaction(action, transactions));
        }
        return;  // ← early return, line 1263 is NOT reached
    }

    // Fallback to single-action unhold
    const moneyRequestAction = transactionThreadReportID ? requestParentReportAction : parentReportAction;
    // ...
}}

When REMOVE_HOLD is triggered via paths 2 or 3, the IOUActions.length branch at line 1256 would typically handle it with the batch unhold and return early before reaching line 1263. So in practice, line 1263's parentReportAction fallback is unlikely to be hit — but it's not impossible if there's a state/timing difference between when getReportPrimaryAction computed REMOVE_HOLD (with non-empty expensesToHold) and when the button is pressed (where getAllExpensesToHoldIfApplicable could return empty due to state changes between renders).

Conclusion

The statement that "parentReportAction fallback is a defensive path that shouldn't be reachable in practice" is mostly accurate for path 1 (single-transaction, isRemoveHoldAction), but not fully accurate because paths 2 and 3 can show the REMOVE_HOLD button on multi-transaction reports where transactionThreadReportID is falsy. The IOUActions batch branch usually handles those cases before the fallback is reached, making the fallback rare but not provably unreachable.

@DylanDylann
Copy link
Contributor

@MelvinBot Many thanks. You did a great job

@DylanDylann
Copy link
Contributor

Reviewer Checklist

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I included screenshots or videos for tests on all platforms
  • I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
  • I verified tests pass on all platforms & I tested again on:
    • Android: HybridApp
    • Android: mWeb Chrome
    • iOS: HybridApp
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified there are no new alerts related to the canBeMissing param for useOnyx
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Screen.Recording.2026-03-12.at.18.30.45.mov
Screen.Recording.2026-03-12.at.18.29.52.mov

@DylanDylann
Copy link
Contributor

@linhvovan29546 We got conflict

Copy link
Contributor

@DylanDylann DylanDylann left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@melvin-bot
Copy link

melvin-bot bot commented Mar 12, 2026

We did not find an internal engineer to review this PR, trying to assign a random engineer to #66418 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot melvin-bot bot requested a review from Valforte March 12, 2026 11:33
@linhvovan29546
Copy link
Contributor Author

The test failure is not related to this PR.

@DylanDylann
Copy link
Contributor

cc @tgolen

@tgolen
Copy link
Contributor

tgolen commented Mar 12, 2026

@linhvovan29546 I don't want to merge this with the failing test. Can you see if it's fixed in main or reach out on Slack and see if someone is fixing it?

@linhvovan29546
Copy link
Contributor Author

@tgolen all tests passed👍

@tgolen tgolen merged commit c5fca4f into Expensify:main Mar 13, 2026
30 checks passed
@github-actions
Copy link
Contributor

🚧 @tgolen has triggered a test Expensify/App build. You can view the workflow run here.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/tgolen in version: 9.3.38-0 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.38-4 🚀

platform result
🕸 web 🕸 success ✅
🤖 android 🤖 success ✅
🍎 iOS 🍎 success ✅

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants