Skip to content

perf: remove draftTransactions collection subscriptions from expense creation flow#84601

Merged
marcaaron merged 21 commits intoExpensify:mainfrom
callstack-internal:perf/remove-draft-transactions-collection-subscriptions
Mar 18, 2026
Merged

perf: remove draftTransactions collection subscriptions from expense creation flow#84601
marcaaron merged 21 commits intoExpensify:mainfrom
callstack-internal:perf/remove-draft-transactions-collection-subscriptions

Conversation

@BartekObudzinski
Copy link
Contributor

@BartekObudzinski BartekObudzinski commented Mar 9, 2026

Explanation of Change

Reduces unnecessary Onyx subscriptions during the expense creation mount path. Removing these subscriptions improves the ManualOpenCreateExpense metric by approximately 12%.

Subscription removal (from earlier commit):

  • Removed useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_DRAFT) full collection subscriptions from 8 components/hooks
  • draftTransactions parameter removed from initMoneyRequest, clearMoneyRequest, and startMoneyRequest since the underlying functions already read from module-level Onyx cache

Additional optimizations:

  • useReceiptScanDrop: replaced full TRANSACTION_DRAFT collection subscription with IDs-only selector
  • initMoneyRequest: accepts draftTransactionIDs instead of full collection, avoids deserializing all draft transaction objects

Fixed Issues

$ #84925
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

  1. Create expense via global (+) > Create expense > Manual tab > enter amount > select participant > submit
  2. Create expense via global (+) > Create expense > Scan tab > scan receipt > submit
  3. Edit an existing expense amount, verify edit saves correctly
  4. Create a split expense, verify it submits correctly
  5. Use quick action button (if configured) to create expense with skip-confirmation
  • 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.15.26.08.mov
Android: mWeb Chrome
Screen.Recording.2026-03-10.at.15.28.48.mov
iOS: Native
Screen.Recording.2026-03-10.at.15.35.22.mov
iOS: mWeb Safari
Screen.Recording.2026-03-10.at.15.31.27.mov
MacOS: Chrome / Safari
Screen.Recording.2026-03-10.at.15.18.49.mov

@codecov
Copy link

codecov bot commented Mar 10, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/hooks/useReceiptScanDrop.tsx 30.43% <100.00%> (+3.16%) ⬆️
src/libs/actions/IOU/index.ts 72.91% <100.00%> (+0.03%) ⬆️
src/pages/Share/SubmitDetailsPage.tsx 0.00% <ø> (ø)
...portActionCompose/useAttachmentUploadValidation.ts 23.33% <100.00%> (+2.64%) ⬆️
src/pages/iou/request/IOURequestStartPage.tsx 71.96% <100.00%> (+0.21%) ⬆️
...rc/pages/iou/request/step/IOURequestStepAmount.tsx 65.34% <100.00%> (+0.34%) ⬆️
...ponents/TestDrive/Modal/EmployeeTestDriveModal.tsx 0.00% <0.00%> (ø)
src/pages/iou/request/DistanceRequestStartPage.tsx 0.00% <0.00%> (ø)
... and 7 files with indirect coverage changes

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

melvin-bot bot commented Mar 10, 2026

@shubham1206agra 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 trjExpensify and removed request for a team March 10, 2026 14:49
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: f9fe4f4904

ℹ️ 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".

Comment on lines +68 to +69
report,
reportDraft,

Choose a reason for hiding this comment

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

P1 Badge Keep fetching report from Onyx in create-expense start page

IOURequestStartPage now reads report/reportDraft from props instead of subscribing to ${ONYXKEYS.COLLECTION.REPORT}${reportID}, but this screen is mounted directly by MoneyRequestModalStackNavigator (no withWritableReportOrNotFound wrapper injects those props), so in normal navigation these values are undefined. In non-global flows (e.g., create/submit expense from an existing chat/policy), this makes the page behave like global create (isFromGlobalCreate becomes true) and initializes the draft without the report/policy context, which can route users through the wrong flow defaults and validations.

Useful? React with 👍 / 👎.

Copy link
Contributor

Choose a reason for hiding this comment

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

@BartekObudzinski Can you please verify this?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Verified and reverted. IOURequestStartPage is not wrapped with withWritableReportOrNotFound, so the report prop was always undefined. Restored useOnyx subscription for both report and reportDraft.

currentUserAccountIDParam,
currentUserEmailParam,
transactionViolations,
transactionViolations: getAllTransactionViolations(),
Copy link
Contributor

Choose a reason for hiding this comment

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

@BartekObudzinski Same here, please don't rely on impure functions.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, restored useOnyx subscriptions for both transactionViolations and transactionDrafts. Also removed the getDraftTransactionByID impure helper and switched back to validTransactionDraftsSelector for direct lookup.

policyRecentlyUsedCurrencies: policyRecentlyUsedCurrencies ?? [],
existingTransactionDraft,
draftTransactionIDs,
draftTransactionIDs: draftTransactionIDs ?? [],
Copy link
Contributor

Choose a reason for hiding this comment

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

@BartekObudzinski Same here, please don't rely on impure functions.

@mountiny mountiny requested a review from ShridharGoel March 10, 2026 17:01
...props
}: AccessOrNotFoundWrapperProps) {
const [report] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportID}`);
const [reportFromOnyx] = useOnyx(`${ONYXKEYS.COLLECTION.REPORT}${reportProp ? undefined : reportID}`);
Copy link
Contributor

Choose a reason for hiding this comment

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

This will make it report_undefined when reportProp is present. I think that's not what is wanted, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Reverted this change entirely. The report prop optimization was not worth the complexity since IOURequestStartPage already needs its own subscription anyway.

@marcaaron marcaaron self-requested a review March 11, 2026 02:53
…ransactions-collection-subscriptions

# Conflicts:
#	src/components/FloatingCameraButton/BaseFloatingCameraButton.tsx
#	src/hooks/useReceiptScanDrop.tsx
#	src/pages/inbox/sidebar/FloatingActionButtonAndPopover.tsx
#	src/pages/iou/request/IOURequestStartPage.tsx
@ShridharGoel
Copy link
Contributor

Looks like the scroll-and-highlight feature is not working properly on mWeb

Screen.Recording.2026-03-13.at.12.46.19.AM.mov

Copy link
Contributor

@marcaaron marcaaron left a comment

Choose a reason for hiding this comment

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

Changes LGTM aside from @ShridharGoel's comment above

@BartekObudzinski
Copy link
Contributor Author

@ShridharGoel Added the improvement metrics to the description. The ManualOpenCreateExpense metric improves by approximately 12% with these subscription removals.

@BartekObudzinski
Copy link
Contributor Author

@ShridharGoel Looking into the scroll-and-highlight issue on mWeb. This PR only modifies Onyx subscription patterns (replacing full collection subscriptions with selectors and removing unused ones), so the scroll-and-highlight regression is likely coming from a different change that got merged into the branch. Will investigate and report back.

@BartekObudzinski
Copy link
Contributor Author

Screen.Recording.2026-03-13.at.09.08.04.mov

I could not reproduce same results on staging and dev my branch

@ShridharGoel
Copy link
Contributor

Just checked on staging, and was able to repro the same issue there as well. So, not related to this change.

@BartekObudzinski
Copy link
Contributor Author

@ShridharGoel @marcaaron Are we good to go?

@ShridharGoel
Copy link
Contributor

Was waiting for this

@BartekObudzinski
Copy link
Contributor Author

@ShridharGoel Sorry Didn't see let me verify again

@BartekObudzinski
Copy link
Contributor Author

@ShridharGoel ready

@BartekObudzinski
Copy link
Contributor Author

@ShridharGoel @marcaaron the pr is ready

@melvin-bot melvin-bot bot requested a review from marcaaron March 17, 2026 13:01
@marcaaron
Copy link
Contributor

LGTM other than the conflicts.

@BartekObudzinski
Copy link
Contributor Author

@marcaaron done

@marcaaron marcaaron merged commit da93289 into Expensify:main Mar 18, 2026
31 checks passed
@OSBotify
Copy link
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.

@github-actions
Copy link
Contributor

🚧 @marcaaron 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/marcaaron in version: 9.3.41-0 🚀

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

Bundle Size Analysis (Sentry):

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.41-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