Upgrade React Native to 0.85.3 by war-in · Pull Request #92484 · Expensify/App

war-in · 2026-06-03T09:17:12Z

Explanation of Change

PR upgrades React Native to v0.85.3 and Expo SDK to v56, along with the related RN, Expo, Metro, Hermes, and React dependencies needed for the upgrade.

The change also:

Ports and audits the existing React Native and Expo patches for the new versions, removing obsolete patch entries where applicable.
Updates native build tooling/configuration, including Gradle 9.3.1, CocoaPods/RN source-build flags, and iOS header search paths required by the upgraded RN toolchain.
Keeps React Native fetch enabled for Expo SDK 56 builds and adapts Metro source-map handling for Expo packed maps.
Updates the Mobile-Expensify submodule to align with the paired RN 0.85.3 Mobile-Expensify PR.

Fixed Issues

$ #91629
PROPOSAL:
MOBILE-EXPENSIFY: https://github.com/Expensify/Mobile-Expensify/pull/13959

Tests

Requires full regression tests on the entire app.

Offline tests

Requires full regression tests on the entire app in offline, spotty connection, and slow internet states where the tested flows support those modes.

QA Steps

Requires full regression tests on the entire app.

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

github-actions · 2026-06-03T09:17:26Z

⚠️ This PR is possibly changing native code and/or updating libraries, it may cause problems with HybridApp. Please check if any patch updates are required in the HybridApp repo and run an AdHoc build to verify that HybridApp will not break. Ask Contributor Plus for help if you are not sure how to handle this. ⚠️

…temporary metro overrides for rock, patch metro-source-map

# Conflicts: # package-lock.json # patches/react-native/react-native+0.85.3+036+rounded-inline-code-background.patch

codecov · 2026-06-16T13:21:29Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/FullscreenLoadingIndicator.tsx	`100.00% <100.00%> (ø)`
src/components/LoadingIndicator.tsx	`100.00% <100.00%> (ø)`
src/components/RenderHTML.tsx	`95.23% <100.00%> (+0.23%)`	⬆️
...pages/inbox/report/comment/TextCommentFragment.tsx	`80.39% <100.00%> (+1.22%)`	⬆️
src/styles/index.ts	`60.30% <ø> (ø)`
src/components/SAMLLoadingIndicator.tsx	`0.00% <0.00%> (ø)`
...ents/HTMLEngineProvider/BaseHTMLEngineProvider.tsx	`81.69% <79.31%> (ø)`
... and 12 files with indirect coverage changes

war-in · 2026-07-09T11:41:50Z

@parasharrajat have you tried switching to this branch? Looks like your Mobile-Expensify submodule was not updated

mountiny · 2026-07-09T11:44:06Z

Sorry more confclits

parasharrajat · 2026-07-09T11:51:16Z

Checking..

# Conflicts: # patches/react-native/details.md # patches/react-native/react-native+0.85.3+008+iOSCoreAnimationBorderRendering.patch

war-in · 2026-07-09T12:03:59Z

@mountiny conflicts resolved and I also updated patches, so the ordering is now correct

parasharrajat

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

🔲 iOS / native

09.07.2026_18.08.43_REC.mp4

🔲 MacOS / Chrome

09.07.2026_18.10.56_REC.mp4

🔲 Android / native

09.07.2026_18.35.09_REC.mp4

🎀 👀 🎀 C+ reviewed

parasharrajat

LGTM. Didn't find any issues during my testing.

parasharrajat · 2026-07-09T13:12:40Z

THere is synk error here @war-in

war-in · 2026-07-09T13:14:17Z

THere is synk error here @war-in

Yeah, I don't have access to snyk so I can't verify it. I already asked @mountiny and I'm waiting for him to jump in

Julesssss · 2026-07-09T16:27:24Z

The error is simply 0009 invalid packages which I believe we expect. Similarly the Mobile-Expensify test check will fail until both PRs are merged.

So we should be good to merge... But of course as I was writing this comment a new conflict arose on this App PR 😞

# Conflicts: # cspell.json # tests/unit/scheduleMacrotaskTest.ts

mountiny

The knip failure is stale from main, this pr does not touch the file it is complaining about

melvin-bot · 2026-07-09T17:32:13Z

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

Julesssss · 2026-07-09T17:34:14Z

@mountiny looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

Expected. Removing label

OSBotify · 2026-07-09T17:42:39Z

✋ 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 · 2026-07-09T19:23:18Z

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

github-actions · 2026-07-09T19:43:54Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-3e5238b24da-54ebcb2-2b27b9fef52c251bf265896632f86d43e837bc94/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-10T16:17:38Z

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

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

war-in and others added 9 commits June 2, 2026 10:52

chore: migrate most of the patches to 0.85.3

07c5d5f

chore: migrate rest of the patches to 0.85.3

eb0a6ab

patch 002 fixMVCPAndroid

f48b890

Merge branch 'refs/heads/main' into war-in/upgrade-to-rn-0.85

af2e41d

chore: apply UpgradeHelper changes

081ce8c

chore: update expo version

f78ffb1

chore: update expo-related packages

ac2e9bd

Merge branch 'refs/heads/main' into war-in/upgrade-to-rn-0.85

37d55ca

fix: update deps to build iOS

8c31a01

melvin-bot Bot assigned war-in Jun 3, 2026

fix: replace absoluteFillObject with new absoluteFill

46a5ec0

jakubstec mentioned this pull request Jun 11, 2026

fix(android): update reject overrides to use nullable code param for … Expensify/react-native-wallet#85

Merged

jakubstec and others added 14 commits June 11, 2026 11:50

fix: override metro dependency versions to support rn 0.85.3

3ef63c4

fix: restore global fetch replaced by expo/fetch in Expo SDK 56, add …

2961636

…temporary metro overrides for rock, patch metro-source-map

Merge branch 'main' into war-in/upgrade-to-rn-0.85

5c6b327

# Conflicts: # package-lock.json # patches/react-native/react-native+0.85.3+036+rounded-inline-code-background.patch

chore: post-merge fixes

3d36c39

chore: update native deps

6066eb0

fix: apply global fetch instead of expo/fetch on release builds

4c97332

Merge branch 'main' into war-in/upgrade-to-rn-0.85

00069ab

chore: update details.md

7a2c340

chore: update react-native-wallet

038653f

chore: update details.md

a16c238

fix: validate actions

0c0523b

fix: prettier

fa35129

Merge branch 'main' into war-in/upgrade-to-rn-0.85

b10496b

fix: tests

ddad968

war-in added 2 commits June 16, 2026 17:50

chore: bump rock

3ce35b1

chore: update Podfile.lock

0a0ded0

fix: lint

33c9063

Merge branch 'main' into war-in/upgrade-to-rn-0.85

316798a

war-in added 2 commits July 9, 2026 13:53

Merge branch 'main' into war-in/upgrade-to-rn-0.85

a1ee384

# Conflicts: # patches/react-native/details.md # patches/react-native/react-native+0.85.3+008+iOSCoreAnimationBorderRendering.patch

chore: update RN patch names

79bf993

parasharrajat reviewed Jul 9, 2026

View reviewed changes

parasharrajat approved these changes Jul 9, 2026

View reviewed changes

melvin-bot Bot requested review from mountiny and roryabraham July 9, 2026 13:12

Merge branch 'main' into war-in/upgrade-to-rn-0.85

b3d58c2

# Conflicts: # cspell.json # tests/unit/scheduleMacrotaskTest.ts

mountiny approved these changes Jul 9, 2026

View reviewed changes

mountiny merged commit 3e5238b into Expensify:main Jul 9, 2026
44 of 45 checks passed

melvin-bot Bot added the Emergency label Jul 9, 2026

Julesssss removed the Emergency label Jul 9, 2026

github-actions Bot mentioned this pull request Jul 9, 2026

Investigate workflow job failing on main: build (Expensify Dev, Debug, true) #95739

Closed

github-actions Bot mentioned this pull request Jul 9, 2026

Investigate workflow job failing on main: build (Debug, true) #95741

Closed

OSBotify mentioned this pull request Jul 10, 2026

Deploy Checklist: New Expensify 2026-07-10 #95814

Open

74 tasks

Uh oh!

Conversation

war-in commented Jun 3, 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!

github-actions Bot commented Jun 3, 2026

Uh oh!

codecov Bot commented Jun 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!

war-in commented Jul 9, 2026

Uh oh!

mountiny commented Jul 9, 2026

Uh oh!

parasharrajat commented Jul 9, 2026

Uh oh!

war-in commented Jul 9, 2026

Uh oh!

parasharrajat left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Reviewer Checklist

Screenshots

🔲 iOS / native

🔲 MacOS / Chrome

🔲 Android / native

Uh oh!

parasharrajat left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

parasharrajat commented Jul 9, 2026

Uh oh!

war-in commented Jul 9, 2026

Uh oh!

Julesssss commented Jul 9, 2026

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

melvin-bot Bot commented Jul 9, 2026

Uh oh!

Julesssss commented Jul 9, 2026

Uh oh!

OSBotify commented Jul 9, 2026

Uh oh!

github-actions Bot commented Jul 9, 2026

Uh oh!

github-actions Bot commented Jul 9, 2026

Uh oh!

OSBotify commented Jul 10, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

war-in commented Jun 3, 2026 •

edited

Loading

codecov Bot commented Jun 16, 2026 •

edited by github-actions Bot

Loading

parasharrajat left a comment •

edited

Loading

parasharrajat left a comment •

edited

Loading