Split contexts to state and actions - Batch 3 by staszekscp · Pull Request #82631 · Expensify/App

staszekscp · 2026-02-17T10:06:07Z

Explanation of Change

Migration of the following contexts to follow state/actions split pattern:

EnvironmentContext
LockedAccountContext
ThemeStylesContext
FullScreenContextProvider
LoginProvider

Fixed Issues

$ #80271
PROPOSAL: N/A

Tests

Prerequisites:

A freshly created account that can be safely locked

Steps:

Sign out from the account
Verify if the badge next to the Expensify logo is correct (dev on dev.new.expensify.com or stg on staging.new.expensify.com)
Sign in to the account
Go to Account->Security->Report suspicious activity
Lock the account
Try to close the account (Account->Security->Close account)
Verify if you see a warning modal that your account is locked

Offline tests

QA Steps

Prerequisites:

A freshly created account that can be safely locked

Steps:

Sign out from the account
Verify if the badge next to the Expensify logo is correct (dev on dev.new.expensify.com or stg on staging.new.expensify.com)
Sign in to the account
Go to Account->Security->Report suspicious activity
Lock the account
Try to close the account (Account->Security->Close account)
Verify if you see a warning modal that your account is locked

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

Screen.Recording.2026-02-18.at.19.21.49.mov

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-02-18.at.15.39.23.mov

codecov · 2026-02-17T10:25:16Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/App.tsx	`100.00% <ø> (ø)`
...c/components/EnvironmentContextProvider/default.ts	`100.00% <100.00%> (ø)`
...rc/components/EnvironmentContextProvider/index.tsx	`96.77% <100.00%> (ø)`
...rc/components/LockedAccountModalProvider/index.tsx	`100.00% <100.00%> (ø)`
...nents/Search/SearchPageHeader/SearchFiltersBar.tsx	`64.10% <ø> (ø)`
...c/components/ThemeStylesContextProvider/default.ts	`100.00% <100.00%> (ø)`
...rc/components/ThemeStylesContextProvider/index.tsx	`100.00% <100.00%> (ø)`
src/components/VideoPlayer/BaseVideoPlayer.tsx	`47.84% <100.00%> (ø)`
src/hooks/useEnvironment.ts	`100.00% <ø> (ø)`
src/pages/Search/SearchSelectedNarrow.tsx	`0.00% <ø> (ø)`
... and 26 more
... and 96 files with indirect coverage changes

melvin-bot · 2026-02-18T18:23:52Z

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

github-actions · 2026-02-18T18:32:49Z

@@ -0,0 +1,40 @@
+/* eslint-disable react/jsx-no-constructed-context-values */


❌ CONSISTENCY-5 (docs)

This eslint-disable for react/jsx-no-constructed-context-values lacks an accompanying comment explaining why the rule is being disabled.

The sibling file LockedAccountModalProvider/index.tsx correctly includes a justification comment (// This component is compiled by the React Compiler) above its identical eslint-disable. Add the same justification here:

// This component is compiled by the React Compiler /* eslint-disable react/jsx-no-constructed-context-values */

Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.

mkhutornyi · 2026-02-20T15:45:49Z

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

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-02-24.at.7.29.21.am.mov

mkhutornyi · 2026-02-20T15:45:59Z

Please fix conflict

staszekscp · 2026-02-23T13:41:02Z

The conflicts are fixed!

mkhutornyi · 2026-02-23T21:19:16Z

There's still prettier issue

chatgpt-codex-connector · 2026-02-23T21:35:07Z

Codex Review: Didn't find any major issues. Breezy!

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

mkhutornyi · 2026-02-24T07:45:41Z

Bug: I am able to add copilot on new (unverified) locked account. Not reproducible on main

this branch:

Screen.Recording.2026-02-24.at.7.42.32.am.mov

main: (add copilot page closes automatically after verifying magic code)

Screen.Recording.2026-02-24.at.7.38.20.am.mov

mkhutornyi · 2026-02-24T07:24:25Z

+    const stateValue = useMemo(() => ({isFullScreenRef, lockedWindowDimensionsRef}), []);
+    const actionsValue = useMemo(() => ({lockWindowDimensions, unlockWindowDimensions}), [lockWindowDimensions, unlockWindowDimensions]);


This component is react compilable. No need useMemo

mkhutornyi · 2026-02-24T07:27:22Z

+    const stateValue = useMemo<LoginStateContextType>(() => ({login}), [login]);
+    const actionsValue = useMemo<LoginActionsContextType>(() => ({setLogin}), [setLogin]);


staszekscp · 2026-02-25T07:41:34Z

Looking into the bug!

staszekscp · 2026-02-25T08:59:11Z

Hey @mkhutornyi! The bug was a good catch, but it seems like this is something that is unrelated to the PR, because I see exactly the same behaviour on staging:

Screen.Recording.2026-02-25.at.09.55.58.mov

I'm not sure if it's something that is intentional, but somebody probably have changed some logic and the bug has already been introduced

mkhutornyi · 2026-02-25T09:09:26Z

Hey @mkhutornyi! The bug was a good catch, but it seems like this is something that is unrelated to the PR, because I see exactly the same behaviour on staging:

Screen.Recording.2026-02-25.at.09.55.58.mov
I'm not sure if it's something that is intentional, but somebody probably have changed some logic and the bug has already been introduced

oh ok, not sure why I was seeing different behavior on main.

mountiny

Thank you!

github-actions · 2026-02-25T10:05:11Z

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

github-actions · 2026-02-25T10:09:30Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-2ea15f6-b795e6a-8f65bc2f8dc243866de4689a2f3c2c46ccd62f89/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-2ea15f6-b795e6a-187fbbc6e887bd0930e49f7a9a6996796c0b4262/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-02-25T10:10:40Z

✋ 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-02-25T18:25:10Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.3.26-0 🚀

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

OSBotify · 2026-02-27T14:56:30Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.3.26-8 🚀

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

Migrate EnvironmentProvider

af8a21f

melvin-bot Bot assigned staszekscp Feb 17, 2026

staszekscp mentioned this pull request Feb 17, 2026

[Due for payment 2026-03-25] [Due for payment 2026-03-11] Split context providers to return State and Actions separately #80271

Closed

Migrate ThemeStylesProvider

bc77c5d

staszekscp added 7 commits February 17, 2026 13:10

Migrate FullScreenContextProvider

266fbbc

Migrate LockedAccountModalProvider

246b0e1

Merge remote-tracking branch 'origin/main' into perf/migrate-contexts-2

402aaad

Migrate LoginProvider

709fe85

Fix lint errors

6fd2f31

Merge remote-tracking branch 'origin/main' into perf/migrate-contexts-2

f461190

Fix TravelCVVPage.tsx

f83ef13

staszekscp marked this pull request as ready for review February 18, 2026 18:23

staszekscp requested review from a team as code owners February 18, 2026 18:23

melvin-bot Bot requested review from heyjennahay and mkhutornyi and removed request for a team February 18, 2026 18:23

melvin-bot Bot removed the request for review from a team February 18, 2026 18:23

github-actions Bot reviewed Feb 18, 2026

View reviewed changes

staszekscp added 2 commits February 23, 2026 14:38

Merge remote-tracking branch 'origin/main' into perf/migrate-contexts-2

eb6850a

Add comment to ThemetylesContextProvider

1a46c46

staszekscp added 2 commits February 23, 2026 14:45

Fix prettier

840098b

Remove canBeMissing in migrated component

08450d9

Merge remote-tracking branch 'origin/main' into perf/migrate-contexts-2

c858427

mkhutornyi reviewed Feb 24, 2026

View reviewed changes

Merge remote-tracking branch 'origin/main' into perf/migrate-contexts-2

18ae060

staszekscp added 2 commits February 25, 2026 10:01

Merge remote-tracking branch 'origin/main' into perf/migrate-contexts-2

eb74db8

Remove useCallback and useMemo in the compiled components

4290481

mkhutornyi approved these changes Feb 25, 2026

View reviewed changes

melvin-bot Bot requested a review from mountiny February 25, 2026 09:09

mountiny approved these changes Feb 25, 2026

View reviewed changes

mountiny merged commit 2ea15f6 into Expensify:main Feb 25, 2026
28 checks passed

OSBotify mentioned this pull request Feb 25, 2026

Deploy Checklist: New Expensify 2026-02-25 #83466

Closed

		@@ -0,0 +1,40 @@
		/* eslint-disable react/jsx-no-constructed-context-values */

		const stateValue = useMemo(() => ({isFullScreenRef, lockedWindowDimensionsRef}), []);
		const actionsValue = useMemo(() => ({lockWindowDimensions, unlockWindowDimensions}), [lockWindowDimensions, unlockWindowDimensions]);

		const stateValue = useMemo<LoginStateContextType>(() => ({login}), [login]);
		const actionsValue = useMemo<LoginActionsContextType>(() => ({setLogin}), [setLogin]);

Uh oh!

Conversation

staszekscp commented Feb 17, 2026 • edited 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!

codecov Bot commented Feb 17, 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!

melvin-bot Bot commented Feb 18, 2026

Uh oh!

github-actions Bot Feb 18, 2026

Choose a reason for hiding this comment

❌ CONSISTENCY-5 (docs)

Uh oh!

mkhutornyi commented Feb 20, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

mkhutornyi commented Feb 20, 2026

Uh oh!

staszekscp commented Feb 23, 2026

Uh oh!

mkhutornyi commented Feb 23, 2026

Uh oh!

chatgpt-codex-connector Bot commented Feb 23, 2026

Uh oh!

mkhutornyi commented Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mkhutornyi Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

mkhutornyi Feb 24, 2026

Choose a reason for hiding this comment

Uh oh!

staszekscp commented Feb 25, 2026

Uh oh!

staszekscp commented Feb 25, 2026

Uh oh!

mkhutornyi commented Feb 25, 2026

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Feb 25, 2026

Uh oh!

github-actions Bot commented Feb 25, 2026

Uh oh!

OSBotify commented Feb 25, 2026

Uh oh!

OSBotify commented Feb 25, 2026

Uh oh!

OSBotify commented Feb 27, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

staszekscp commented Feb 17, 2026 •

edited

Loading

codecov Bot commented Feb 17, 2026 •

edited by github-actions Bot

Loading

mkhutornyi commented Feb 20, 2026 •

edited

Loading

mkhutornyi commented Feb 24, 2026 •

edited

Loading