[NO QA] Remove redundant manual memoization from ModalProvider by MelvinBot · Pull Request #85035 · Expensify/App

MelvinBot · 2026-03-12T08:31:23Z

Explanation of Change

Follow-up to #84799. ModalProvider is compiled with React Compiler (babel-plugin-react-compiler), which automatically memoizes values and functions. The manual useCallback and useMemo wrappers added in that PR for showModal, closeModal, and the context value are redundant and unnecessary.

This PR removes the manual memoization, reverting ModalContext.tsx to plain function declarations and an inline context value object — matching the style before #84799 and letting React Compiler handle optimization.

Fixed Issues

$ #85479

Tests

Open any flow that uses the global modal system (e.g., Workspace > Members > Import spreadsheet)
Trigger a confirm modal (e.g., complete the import flow)
Verify the modal appears and functions correctly (confirm/close)
Verify no infinite re-render or crash occurs

Verify that no errors appear in the JS console

Offline tests

N/A — this change removes redundant memoization wrappers and does not affect offline behavior.

QA Steps

Same as tests above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

N/A — no UI changes, only removing redundant memoization wrappers.

Android: mWeb Chrome

N/A

iOS: Native

N/A

iOS: mWeb Safari

N/A

MacOS: Chrome / Safari

N/A

ModalProvider is compiled with React Compiler, which automatically handles memoization. The manual useCallback/useMemo wrappers added in #84799 are redundant and unnecessary. Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>

MelvinBot · 2026-03-12T08:45:37Z

The failing checks are unrelated to this PR.

Failing tests:

tests/ui/components/IOURequestStepConfirmationPageTest.tsx — TypeError: Cannot read properties of undefined (reading 'GRANTED') in __mocks__/react-native-permissions.ts:11
tests/ui/SessionTest.tsx — ReferenceError: You are trying to import a file after the Jest environment has been torn down

Analysis: This PR only modifies src/components/Modal/Global/ModalContext.tsx (removing redundant memoization wrappers). The failing tests are in completely unrelated areas (IOU request confirmation and session management) and involve mock/environment teardown issues that have nothing to do with modal context.

Evidence: The exact same two tests are also failing on multiple other unrelated PRs right now (e.g., 83368-migrate-REPORT_SETTINGS_NAME, rohansasne/phase3-remove-flat-fallbacks), confirming these are pre-existing flaky test failures across CI, not caused by this PR's changes.

ZhenjaHorbach · 2026-03-13T08:44:33Z

@MelvinBot
Update the branch to the latest version of main and open the PR
And add here the correct link for the issue

Fixed Issues
$

…tModalContextMemoization Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>

MelvinBot · 2026-03-13T08:49:03Z

Branch has been updated by merging the latest main into it. The PR is already open: #85035

ZhenjaHorbach · 2026-03-13T08:52:19Z

@MelvinBot
The PR is in draft

MelvinBot · 2026-03-13T08:53:39Z

PR has been marked as ready for review.

melvin-bot · 2026-03-13T08:54:14Z

@srikarparsi 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]

ZhenjaHorbach · 2026-03-13T08:54:30Z

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 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

Android: HybridApp

2026-03-11.13.53.19.mov

Android: mWeb Chrome

2026-03-11.13.51.58.mov

iOS: HybridApp

2026-03-11.13.53.19.mov

iOS: mWeb Safari

2026-03-11.13.51.58.mov

MacOS: Chrome / Safari

2026-03-11.13.48.56.mov

ZhenjaHorbach · 2026-03-13T09:17:26Z

@MelvinBot
Also, check the original PR and remove the passing ID to showConfirmModal
We don't need it

The id parameter was never passed by any caller except ImportSpreadsheetConfirmModal, where it had no practical effect. This simplifies the showModal logic by always auto-generating IDs. Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>

MelvinBot · 2026-03-13T09:23:19Z

Removed the unused id parameter from showModal and showConfirmModal:

ModalContext.tsx: Removed id from the showModal type signature and simplified the implementation to always auto-generate modal IDs (the id-based deduplication logic was unused)
useConfirmModal.ts: Removed id from ConfirmModalOptions type and the showConfirmModal function
ImportSpreadsheetConfirmModal.tsx: Removed the only caller that was passing id: 'import-spreadsheet-confirm' (it had no practical effect)

TypeScript type check passes.

melvin-bot · 2026-03-13T09:23:51Z

@srikarparsi 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]

ZhenjaHorbach · 2026-03-13T09:29:20Z

@MelvinBot
Recheck this PR
https://github.com/Expensify/App/pull/84799/changes
And revert only those changes that were made in this PR
Except changes for ImportedMembersConfirmationPage.tsx‎

MelvinBot · 2026-03-13T09:34:01Z

I've rechecked PR #84799 and verified the current state of this PR against it.

PR #84799 changed 5 files. Here's the revert status on this branch:

File	#84799 Change	Status
`ModalContext.tsx`	Added `useCallback`/`useMemo`, `id` param, dedup logic	✅ Reverted
`useConfirmModal.ts`	Added `id` option passthrough	✅ Reverted
`ImportSpreadsheetConfirmModal.tsx`	Added `id: 'import-spreadsheet-confirm'`	✅ Reverted
`CONST/index.ts`	Added `IMPORTED_MEMBERS_CONFIRMATION_PRIVACY_LINK`	⏭️ Kept (dependency of `ImportedMembersConfirmationPage.tsx:211`)
`ImportedMembersConfirmationPage.tsx`	Multiple fixes (isFocused, ref, shouldShowConfirmModal, etc.)	⏭️ Kept (per request)

All changes from #84799 are correctly reverted except ImportedMembersConfirmationPage.tsx and the one CONST it depends on (reverting the constant would cause a compile error). The branch has also been updated to the latest main. No additional code changes are needed.

ZhenjaHorbach · 2026-03-13T09:35:09Z

@MelvinBot
These changes were not in the original PR

This reverts commit 0b73818.

MelvinBot · 2026-03-13T09:41:48Z

You're right — the commit "Remove unused id parameter from showModal and showConfirmModal" was not part of the original scope. I've reverted it. The PR now only contains the original change: removing redundant useCallback, useMemo, and contextValue memoization wrappers from ModalContext.tsx.

ZhenjaHorbach · 2026-03-13T09:43:40Z

@MelvinBot
Please
Remove these changes that were in the original PR

https://github.com/Expensify/App/pull/84799/changes#diff-2e654fcd988801932956a8b77457d56c355d9fc77e101d850a77cee600321aa9R37

https://github.com/Expensify/App/pull/84799/changes#diff-5ecada2f93598cc157d6e483ff4b43dc623ece537e93cd2fb3e2c2004c5ec1a5R5

https://github.com/Expensify/App/pull/84799/changes#diff-5ecada2f93598cc157d6e483ff4b43dc623ece537e93cd2fb3e2c2004c5ec1a5R10

https://github.com/Expensify/App/pull/84799/changes#diff-5ecada2f93598cc157d6e483ff4b43dc623ece537e93cd2fb3e2c2004c5ec1a5R13

MelvinBot · 2026-03-13T09:58:38Z

The failing check is unrelated to this PR.

Failing test: tests/ui/components/IOURequestStepConfirmationPageTest.tsx — should route unreported distance expense to requestMoney and skip createDistanceRequest

Error: TypeError: Cannot read properties of undefined (reading 'GRANTED') at __mocks__/react-native-permissions.ts:11

Analysis: This PR only modifies src/components/Modal/Global/ModalContext.tsx, src/components/ImportSpreadsheetConfirmModal.tsx, and src/hooks/useConfirmModal.ts. None of these files are related to the failing test, which involves IOU request step confirmation and react-native-permissions mocking. The mock file and test file are identical between this branch and main.

Evidence: The same test (job 7) passes on the latest main CI run (run 22883635643). This is a flaky test — the RESULTS import from react-native-permissions/dist/commonjs/permissions is sometimes undefined during module initialization in CI.

Re-running the failed job should resolve this.

ZhenjaHorbach · 2026-03-13T10:12:30Z

Okay
After removing unnecessary changes, the original bug is still fixed

2026-03-13.11.10.54.mov

ZhenjaHorbach · 2026-03-13T10:14:37Z

Jest issue is not related to this PR

ZhenjaHorbach · 2026-03-13T10:14:52Z

@MelvinBot
And could you add [NO QA] in the label?

MelvinBot · 2026-03-13T10:16:07Z

Added [NO QA] to the PR title. (There's no [NO QA] label in the repo — it's conveyed via the PR title instead.)

melvin-bot · 2026-03-13T10:18:30Z

🎯 @ZhenjaHorbach, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #85215.

trjExpensify · 2026-03-13T13:50:43Z

PR doesn’t need product input as a code clean-up PR. Unassigning and unsubscribing myself.

srikarparsi · 2026-03-16T06:59:30Z

Looks like a job is failing @ZhenjaHorbach, could you merge main into the branch and push again?

ZhenjaHorbach · 2026-03-16T07:51:44Z

Jest issue is not related to our changes

ZhenjaHorbach · 2026-03-16T07:51:48Z

@MelvinBot
But could you update the branch to the latest version of main?

…tModalContextMemoization Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>

MelvinBot · 2026-03-16T07:56:47Z

Branch has been updated — merged the latest main into it (253 files updated). The PR remains open at #85035.

ZhenjaHorbach · 2026-03-16T11:33:42Z

@srikarparsi
Now is good!

ZhenjaHorbach · 2026-03-16T11:34:28Z

@MelvinBot
Could you add [NO QA] before the PR title?

MelvinBot · 2026-03-16T11:35:38Z

Updated the PR title to: [NO QA] Remove redundant manual memoization from ModalProvider

codecov · 2026-03-16T22:27:10Z

Codecov Report

❌ 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.

Files with missing lines	Coverage Δ
src/components/ImportSpreadsheetConfirmModal.tsx	`0.00% <ø> (ø)`
src/components/Modal/Global/ModalContext.tsx	`83.33% <100.00%> (-0.88%)`	⬇️
src/hooks/useConfirmModal.ts	`100.00% <100.00%> (ø)`
... and 13 files with indirect coverage changes

github-actions · 2026-03-16T22:27:22Z

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

github-actions · 2026-03-16T22:32:12Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #85035.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-264dc16-03346cd-6e767c9c7e5e45305f3fabe687886df6dead7db1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-264dc16-03346cd-17cb72b46ff698009f95e6deec623d99527dd40a/index.html

Web 🕸️
https://85035.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-16T22:35:45Z

✋ 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 · 2026-03-17T11:56:08Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 9.3.39-0 🚀

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

OSBotify · 2026-03-18T13:03:14Z

🚀 Deployed to production by https://github.com/cristipaval in version: 9.3.39-3 🚀

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

MelvinBot assigned ZhenjaHorbach Mar 12, 2026

MelvinBot requested a review from a team March 12, 2026 08:31

MelvinBot mentioned this pull request Mar 12, 2026

Fix member import crash and missing navigation after confirmation #84799

Merged

52 tasks

Merge remote-tracking branch 'origin/main' into claude-removeRedundan…

c9e72fa

…tModalContextMemoization Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>

MelvinBot marked this pull request as ready for review March 13, 2026 08:53

MelvinBot requested a review from a team as a code owner March 13, 2026 08:53

melvin-bot bot requested review from srikarparsi and trjExpensify and removed request for a team March 13, 2026 08:53

MelvinBot requested a review from a team as a code owner March 13, 2026 09:23

melvin-bot bot removed the request for review from a team March 13, 2026 09:23

Revert "Remove unused id parameter from showModal and showConfirmModal"

3342636

This reverts commit 0b73818.

MelvinBot changed the title ~~Remove redundant manual memoization from ModalProvider~~ Remove redundant manual memoization from ModalProvider [NO QA] Mar 13, 2026

ZhenjaHorbach approved these changes Mar 13, 2026

View reviewed changes

melvin-bot bot mentioned this pull request Mar 13, 2026

Payment issue for E/App PR#85035 #85215

Closed

trjExpensify removed their request for review March 13, 2026 13:50

Merge remote-tracking branch 'origin/main' into claude-removeRedundan…

12cd41e

…tModalContextMemoization Co-authored-by: Yauheni Horbach <ZhenjaHorbach@users.noreply.github.com>

MelvinBot changed the title ~~Remove redundant manual memoization from ModalProvider [NO QA]~~ [NO QA] Remove redundant manual memoization from ModalProvider Mar 16, 2026

srikarparsi approved these changes Mar 16, 2026

View reviewed changes

srikarparsi merged commit 264dc16 into main Mar 16, 2026
39 checks passed

srikarparsi deleted the claude-removeRedundantModalContextMemoization branch March 16, 2026 22:26

OSBotify mentioned this pull request Mar 17, 2026

Deploy Checklist: New Expensify 2026-03-17 #85529

Closed

75 tasks

Conversation

MelvinBot commented Mar 12, 2026 • edited by srikarparsi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

MelvinBot commented Mar 12, 2026

Uh oh!

ZhenjaHorbach commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

ZhenjaHorbach commented Mar 13, 2026

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

melvin-bot bot commented Mar 13, 2026

Uh oh!

ZhenjaHorbach commented Mar 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented Mar 13, 2026

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

melvin-bot bot commented Mar 13, 2026

Uh oh!

ZhenjaHorbach commented Mar 13, 2026

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

ZhenjaHorbach commented Mar 13, 2026

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

ZhenjaHorbach commented Mar 13, 2026

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

ZhenjaHorbach commented Mar 13, 2026

Uh oh!

ZhenjaHorbach commented Mar 13, 2026

Uh oh!

ZhenjaHorbach commented Mar 13, 2026

Uh oh!

MelvinBot commented Mar 13, 2026

Uh oh!

melvin-bot bot commented Mar 13, 2026

Uh oh!

trjExpensify commented Mar 13, 2026

Uh oh!

srikarparsi commented Mar 16, 2026

Uh oh!

ZhenjaHorbach commented Mar 16, 2026

Uh oh!

ZhenjaHorbach commented Mar 16, 2026

Uh oh!

MelvinBot commented Mar 16, 2026

Uh oh!

ZhenjaHorbach commented Mar 16, 2026

Uh oh!

ZhenjaHorbach commented Mar 16, 2026

Uh oh!

MelvinBot commented Mar 16, 2026

Uh oh!

Uh oh!

codecov bot commented Mar 16, 2026 • edited by github-actions bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

github-actions bot commented Mar 16, 2026

Uh oh!

MelvinBot commented Mar 12, 2026 •

edited by srikarparsi

Loading

ZhenjaHorbach commented Mar 13, 2026 •

edited

Loading

ZhenjaHorbach commented Mar 13, 2026 •

edited

Loading

codecov bot commented Mar 16, 2026 •

edited by github-actions bot

Loading