Skip to content

Skip empty report scan while create menus are closed - #103340

Merged
rlinoz merged 1 commit into
Expensify:mainfrom
callstack-internal:perf/skip-empty-report-scan-when-menu-closed
Oct 7, 2026
Merged

rlinoz merged 1 commit into
Expensify:mainfrom
callstack-internal:perf/skip-empty-report-scan-when-menu-closed

Conversation

@TMisiukiewicz

@TMisiukiewicz TMisiukiewicz commented Oct 7, 2026 •

Copy link
Copy Markdown
Contributor

Explanation of Change

Opening a report was slow on accounts with many expenses. Before a user creates a new report, the app checks whether they already have an empty one, so it can ask "are you sure?". To answer that, it went through every expense the user has. It did this again on every expense update, even while the "Create report" option was hidden. On an account with about 52,000 expenses that took about 80ms each time. Several screens each ran their own copy of the check, many times while a report loads.

The answer is only needed when the user can actually press "Create report", and that option lives inside a menu. This PR skips the check while the menu is closed and runs it as soon as the menu opens:

  • Report composer: the + menu.
  • Search page header: the Create menu.

The check itself is unchanged, so the confirmation shows up in exactly the same cases as before. Opening a report in a dev build with 4x CPU slowdown went from about 3982ms to about 3491ms on average, roughly 12% faster.

Fixed Issues

$ #103343
PROPOSAL:

Tests

  1. Log in with an account that belongs to a workspace and has an open expense report with no expenses in that workspace.
  2. Open the workspace chat, press the + button in the composer and choose "Create report".
  3. Verify the "you already have an empty report" confirmation appears.
  4. Close it, add an expense to that empty report, then press + > "Create report" again.
  5. Verify no confirmation appears and a new report is created.
  6. Go to Reports (Search), press the Create button in the header and choose "Create report".
  7. Verify the confirmation appears when an empty report exists, and does not appear when there is none.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests, but with the network connection turned off. Verify the app behaves the same and no errors appear.

QA Steps

Same as tests

  • 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 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 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)
  • 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari

🤖 Generated with Claude Code

@melvin-bot

melvin-bot Bot commented Oct 7, 2026

Copy link
Copy Markdown

@daledah 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 requested review from a team and removed request for a team October 7, 2026 13:53
@rlinoz
rlinoz requested review from situchan and removed request for daledah October 7, 2026 13:54
@rlinoz

rlinoz commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

sorry for the ping, I messed up assignment

@situchan

situchan commented Oct 7, 2026 •

Copy link
Copy Markdown
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
  • 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 proper code patterns were followed (see Reviewing the code)
    • 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 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)
  • 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)
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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

Android: HybridApp
Android: mWeb Chrome
iOS: HybridApp
ios.mp4
iOS: mWeb Safari
MacOS: Chrome / Safari
test.mov

@situchan situchan left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Looks good.

Left NAB comments in tests files

await waitForBatchedUpdatesWithAct();

// Then no confirmation opens, because the report is no longer empty
expect(mockOpenCreateReportConfirmation).not.toHaveBeenCalled();

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The new "does not open" test only checks that something didn't happen

It asserts that the confirmation wasn't opened, so it would still pass if tapping "Create report" did nothing at all.

jest.mock('@libs/actions/Report', () => ({

createNewReport is already mocked, so the test should also assert that it was called, as the Search test does:

expect(mockCreateNewReport).not.toHaveBeenCalled();

Comment on lines +99 to +109
const EMPTY_REPORT_ID = 'empty-report';
const EMPTY_REPORT: Report = {
reportID: EMPTY_REPORT_ID,
policyID: MOCK_POLICY_ID,
ownerAccountID: CURRENT_USER_ACCOUNT_ID,
type: CONST.REPORT.TYPE.EXPENSE,
stateNum: CONST.REPORT.STATE_NUM.OPEN,
statusNum: CONST.REPORT.STATUS_NUM.OPEN,
total: 0,
nonReimbursableTotal: 0,
};

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

**The new EMPTY_REPORT constant is only used in one

Only the new test uses EMPTY_REPORT_ID / EMPTY_REPORT

await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}${EMPTY_REPORT_ID}`, EMPTY_REPORT);

The two existing tests in the same file still inline the same object with a hardcoded 'empty-report':

await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}empty-report`, {

await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}empty-report`, {

Either use the constant in those tests too or remove it.


// And an empty open expense report owned by the user appears while the menu is closed
await act(async () => {
await Onyx.merge(`${ONYXKEYS.COLLECTION.REPORT}empty-report`, {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

The empty report is set up differently in the two test files

The Search test's copy (also at L399 and L438) leaves out total: 0 / nonReimbursableTotal: 0, but the
AttachmentPicker copy includes them.

Both count as empty today.
Two different definitions could drift apart, though, if hasEmptyReportsForPolicy starts checking totals.

};

function renderComponent() {
function renderPicker(isMenuVisible: boolean) {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

renderPicker doesn't render anything

This returns the element and renderComponent calls render.
A name like getPickerElement would make the rerender(renderPicker(true)) calls easier to read.


expect(mockOpenCreateReportConfirmation).not.toHaveBeenCalled();
});
it('opens confirmation modal when an empty report appears while the menu is closed', async () => {

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Missing blank line between 2 tests

@melvin-bot
melvin-bot Bot requested a review from rlinoz October 7, 2026 14:26
@rlinoz

rlinoz commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

@TMisiukiewicz feel free to address the relevant NABs in a follow up 🙇

@rlinoz
rlinoz merged commit a965a3b into Expensify:main Oct 7, 2026
46 of 48 checks passed
@github-actions

github-actions Bot commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

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

@OSBotify

OSBotify commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify OSBotify mentioned this pull request Oct 7, 2026
68 tasks done
@OSBotify

OSBotify commented Oct 7, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to staging by https://github.com/rlinoz in version: 9.5.5-0 🚀

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

@MelvinBot

MelvinBot commented Oct 7, 2026 •

Copy link
Copy Markdown
Contributor

No help site update needed. This PR only delays the empty-report check until the + menu or the Create menu opens, which is a performance change. The confirmation still appears in the same cases, so no existing article is now wrong.

@OSBotify

OSBotify commented Oct 8, 2026

Copy link
Copy Markdown
Contributor

🚀 Deployed to production by https://github.com/puneetlath in version: 9.5.5-2 🚀

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

Bundle Size Analysis (Sentry):

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.

5 participants