Skip to content

Conversation

@TaduJR
Copy link
Contributor

@TaduJR TaduJR commented Dec 7, 2025

Explanation of Change

This PR upgrades react-navigation packages to their latest versions for React Native 0.82 compatibility:

  • @react-navigation/native: 7.1.10 → 7.1.24
  • @react-navigation/stack: 7.3.3 → 7.6.11
  • react-native-safe-area-context: 5.4.0 → 5.6.2

Patch changes:

Patch Status Notes
core+platform-navigation-stack-types Updated Added ScreenOptionsOrCallback and ConvertCustomScreenOptions types to TypeScript declarations; useNavigationBuilder now has 6th type parameter and optional 3rd parameter
core+fix-clearing-preloaded-routes-after-logout Updated Line numbers changed (537 → 473) due to upstream code reorganization
stack+edge-drag-gesture Updated Line numbers changed in Card.js and CardStack.js due to upstream refactoring
stack+dontDetachScreen Updated Line numbers changed in CardStack.js; CardA11yWrapper.js context updated
core+fix-crash-when-parsing-emoji Removed Fixed upstream in react-navigation#12679
core+fix-failing-jest-by-disabling-esmodule Renamed 7.10.0 → 7.13.5, content identical
native+initial Renamed 7.1.10 → 7.1.24, content identical
native+fix-failing-jest-by-disabling-esmodule Renamed 7.1.10 → 7.1.24, content identical
routers+fix-failing-jest-by-disabling-esmodule Renamed 7.4.0 → 7.5.2, content identical
stack+fix-failing-jest-by-disabling-esmodule Renamed 7.3.3 → 7.6.11, content identical
native-stack+added-interaction-manager-integration Unchanged Still v7.3.14
native-stack+fix-failing-jest-by-disabling-esmodule Unchanged Still v7.3.14
elements+fix-failing-jest-by-disabling-esmodule Unchanged Still v2.9.1
material-top-tabs+fix-failing-jest-by-disabling-esmodule Unchanged Still v7.2.13

Type fixes:

  • ScreenOptionsOrCallback is no longer exported from @react-navigation/native in v7.13.5+, so we define it locally in PlatformStackNavigation/types/index.ts
  • Updated DefaultNavigatorOptions usage from 7 to 6 type arguments (breaking change in react-navigation)

Test fix:

  • Added mock for useNavigationState in BottomTabBarTest.tsx to handle behavior changes in the new version

Fixed Issues

$ #75700
PROPOSAL: #75700 (comment)

Tests

  1. Go to workspace settings - more features - enable tax
  2. Tap tax - tax rate 1% - tax code
  3. Tap Upgrade and complete the flow
  4. Tap tax code and replace it with an emoji
  5. Verify App is not crashing on replacing tax code with emoji.
  • Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests
// TODO: These must be filled out, or the issue title must include "[No QA]."

  • 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
    • MacOS: Desktop
  • 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 verified there are no new alerts related to the canBeMissing param for useOnyx
  • 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
Android-Native.mov
Android: mWeb Chrome
Android-mWeb.mov
iOS: Native
iOS-Native.mov
iOS: mWeb Safari
iOS-Safari.mov
MacOS: Chrome / Safari
Mac-Chrome.mov

@TaduJR TaduJR requested a review from a team as a code owner December 7, 2025 11:20
@melvin-bot melvin-bot bot requested review from aimane-chnaif and removed request for a team December 7, 2025 11:20
@melvin-bot
Copy link

melvin-bot bot commented Dec 7, 2025

@aimane-chnaif 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
Copy link
Contributor

github-actions bot commented Dec 7, 2025

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

@TaduJR TaduJR marked this pull request as draft December 7, 2025 11:20
@codecov
Copy link

codecov bot commented Dec 7, 2025

Codecov Report

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

Files with missing lines Coverage Δ
...igationOptions/convertToNativeNavigationOptions.ts 100.00% <ø> (ø)
...navigationOptions/convertToWebNavigationOptions.ts 0.00% <ø> (ø)
.../Navigation/PlatformStackNavigation/types/index.ts 100.00% <ø> (ø)
... and 10 files with indirect coverage changes

@TaduJR TaduJR force-pushed the chore-Upgrade-react-navigation-to-latest branch from d0833c2 to 00742ac Compare December 7, 2025 12:43
@TaduJR TaduJR force-pushed the chore-Upgrade-react-navigation-to-latest branch from 00742ac to 0cac09a Compare December 7, 2025 14:35
@TaduJR TaduJR marked this pull request as ready for review December 8, 2025 04:48
@TaduJR TaduJR requested a review from a team as a code owner December 8, 2025 04:48
@melvin-bot melvin-bot bot requested review from joekaufmanexpensify and removed request for a team December 8, 2025 04:48
@joekaufmanexpensify
Copy link
Contributor

Removing my review

@joekaufmanexpensify joekaufmanexpensify removed their request for review December 8, 2025 16:52
Copy link
Contributor

@aimane-chnaif aimane-chnaif left a comment

Choose a reason for hiding this comment

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

patches/react-navigation/@react-navigation+core+7.10.0+002+fix-crash-when-parsing-emoji.patch

Is this patch not needed anymore?

@aimane-chnaif
Copy link
Contributor

@blazejkustra sorry for the ping but we'd appreciate your review on TS side

@blazejkustra
Copy link
Contributor

@blazejkustra sorry for the ping but we'd appreciate your review on TS side

Sure thing 😄 Btw shouldn't there be a PR updating pods in hybrid app too? Does @TaduJR have access to OldDot?

@blazejkustra
Copy link
Contributor

Also how is this PR 'No QA'? This is a minor upgrade, yes. But still, I would be afraid to just push it to main without QA involvement 😅

Copy link
Contributor

@blazejkustra blazejkustra left a comment

Choose a reason for hiding this comment

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

From TS point of view it looks good, however I see a lot of changes in the patches so I'm going to summon a nav expert @WojtekBoman

@aimane-chnaif
Copy link
Contributor

Sure thing 😄 Btw shouldn't there be a PR updating pods in hybrid app too? Does @TaduJR have access to OldDot?

No access. I will be creating PR for oldDot

Also how is this PR 'No QA'? This is a minor upgrade, yes. But still, I would be afraid to just push it to main without QA involvement 😅

'No QA' makes sense for QA team as this is full regression test but @TaduJR and I will do thorough testing.
@TaduJR please attach screenshots. And if any new changes in patches, add explanations.

@blazejkustra
Copy link
Contributor

No access. I will be creating PR for oldDot

I think it should be created alongside this one, so that both are merged at the same time @aimane-chnaif

@WojtekBoman
Copy link
Contributor

I see, the patch patches/react-navigation/@react-navigation+core+7.10.0+002+fix-crash-when-parsing-emoji.patch has been removed. To me, we should add test steps in the pr description to check if the issue fixed by this patch doesn't occur with the latest version of react-navigation

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Dec 9, 2025

Thanks for the feedback. Agree to add test case (#65709) for missing patch. (though I see that it's fixed in upstream react-navigation/react-navigation#12679)
@WojtekBoman do you think changes in all other patches are good?

@TaduJR let's address all above comments.

@WojtekBoman
Copy link
Contributor

Thanks for the feedback. Agree to add test case (#65709) for missing patch. (though I see that it's fixed in upstream react-navigation/react-navigation#12679) @WojtekBoman do you think changes in all other patches are good?

@TaduJR let's address all above comments.

I see that in many places the patches look the same as before. As Błażej noticed, comments were removed from the patch patches/react-navigation/@react-navigation+stack+7.6.11+001+edge-drag-gesture.patch. What is the reason for their removal?

I would suggest to test flows fixed by the patches. They can be found in details.md.

If any changes were made in the patches, I would suggest including this in the PR description, for example you can describe why the patch patches/react-navigation/@react-navigation+core+7.10.0+002+fix-crash-when-parsing-emoji.patch has been removed

@TaduJR
Copy link
Contributor Author

TaduJR commented Dec 12, 2025

Added Demos.

@aimane-chnaif
Copy link
Contributor

@TaduJR Updated | Migrated to vx.x.x without notes means that original patch code keeps exactly the same but just updated version number? Then what is different from Renamed | xxx -> yyy?

@TaduJR
Copy link
Contributor Author

TaduJR commented Dec 12, 2025

@aimane-chnaif

  • Updated = Patch content changed (line numbers, context, or logic)
  • Renamed = Only version number in filename changed, content identical

@aimane-chnaif
Copy link
Contributor

aimane-chnaif commented Dec 12, 2025

Patch content changed (line numbers, context, or logic)

ok, can you add notes for context or logic changes? I got confused because you didn't add any notes.

@TaduJR
Copy link
Contributor Author

TaduJR commented Dec 12, 2025

Updated the PR Description @aimane-chnaif

@aimane-chnaif
Copy link
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
    • 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.mov
Android: mWeb Chrome
mchrome.mov
iOS: HybridApp
ios.mov
iOS: mWeb Safari
msafari.mov
MacOS: Chrome / Safari
web.mov

@melvin-bot
Copy link

melvin-bot bot commented Dec 12, 2025

We did not find an internal engineer to review this PR, trying to assign a random engineer to #75700 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@melvin-bot melvin-bot bot requested a review from chiragsalian December 12, 2025 13:25
@aimane-chnaif
Copy link
Contributor

@chiragsalian can you please generate adhoc builds before merge?
Dev builds work well but just to make sure we don't have any issues like patch conflict in remote builds.

@chiragsalian
Copy link
Contributor

@github-actions
Copy link
Contributor

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

@github-actions
Copy link
Contributor

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

Android 🤖 iOS 🍎
https://ad-hoc-expensify-cash.s3.amazonaws.com/android/76933/index.html https://ad-hoc-expensify-cash.s3.amazonaws.com/ios/76933/index.html
Android iOS
Desktop 💻 Web 🕸️
https://ad-hoc-expensify-cash.s3.amazonaws.com/desktop/76933/NewExpensify.dmg https://76933.pr-testing.expensify.com
Desktop Web

👀 View the workflow run that generated this build 👀

@aimane-chnaif
Copy link
Contributor

Weird bug in tab bar while swiping:

swipe.mp4

(We're disabling tab swipe behavior here so might not be a blocker)

Copy link
Contributor

@chiragsalian chiragsalian left a comment

Choose a reason for hiding this comment

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

PR looks fine to me. Anyone else wants to final review - @WojtekBoman @blazejkustra @aimane-chnaif?
Or shall we go ahead and merge this. Thoughts?

@aimane-chnaif
Copy link
Contributor

Let's hold a bit for #76343 which will likely to be merged soon.

@aimane-chnaif
Copy link
Contributor

It's merged. We can merge

@aimane-chnaif
Copy link
Contributor

@TaduJR please merge main as branch is too behind

@chiragsalian chiragsalian merged commit 36f055b into Expensify:main Dec 23, 2025
38 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.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/chiragsalian in version: 9.2.87-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.2.87-7 🚀

platform result
🖥 desktop 🖥 success ✅
🕸 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.

7 participants