refactor: Bump @react-navigation/core to 7.21.12 and drop the now-upstream beforeRemove patch

[TaduJR]

Explanation of Change

The discard-changes fix from #93268 was shipped as a patch to @react-navigation/core. That fix is now merged and released upstream in version 7.21.12 (react-navigation/react-navigation#13153), so we no longer need to carry the patch.

This PR bumps @react-navigation/core to 7.21.12 and deletes that patch. The bump also pulled @react-navigation/routers up to 7.6.4.

No new patch is being introduced. patch-package keys a patch to a package by the version in its filename, so the existing patches had to be renamed to the new versions:

• core …003 propagate-beforeremove — deleted (now upstream)
• core …001 fix-failing-jest 7.16.1 → 7.21.12 — rename only
• routers …001 fix-failing-jest 7.5.3 → 7.6.4 — rename only
• core …001 platform-navigation-stack-types 7.16.1 → 7.21.12 (+002) — rename + regenerate

The platform-navigation-stack-types one appears in the diff as a deleted file plus an added file rather than a rename, because 7.21.12 changed the code it patches (RouteProp → ScreenRouteProp in the callbacks, .js import extensions), so it had to be regenerated. Its purpose is unchanged (custom ScreenOptions typing).

No behavior change. The only removed fix is the beforeRemove one, which now comes from the library.

Fixed Issues

$ #84246
PROPOSAL: #84246 (comment)

Tests

Test 1 — Prompt appears when leaving with unsaved input

1. Tap the green + button → Create expense.
2. On the amount keypad, type any amount (e.g. 50).
3. Go back.
4. Expected: the "Discard changes?" prompt appears. Navigation is paused (you have not left yet).

Test 2 — Cancel keeps your input

1. With the prompt open, tap Cancel.
2. Expected: the prompt closes, you stay on the amount screen, and the amount you typed is still there.

Test 3 — Discard leaves the screen

1. Go back again to reopen the prompt.
2. Tap Discard changes.
3. Expected: the prompt closes and you leave the expense flow. Your input is gone.

Test 4 — No prompt when there is nothing to discard

1. Tap + → Create expense.
2. Without typing anything, go back.
3. Expected: you leave immediately, with no prompt.

Test 5 — No prompt after moving forward

1. Tap + → Create expense → type an amount → tap Next.
2. Expected: moving forward with Next does not show the prompt.

Test 6 — Prompt works for other input fields

For each field below: type something, then go back, and confirm the "Discard changes?" prompt appears.

• Merchant — open an expense's Merchant field, type a name, go back.
• Description — open the Description field, type text, go back.
• Distance → Map — start a Distance expense, add a start/stop address, go back.
• Distance → Manual — on the Distance flow's Manual tab, type a distance, go back.
• Odometer / Time / Per diem (if available on your account) — enter a value, go back.
• Profile photo — Settings → your avatar → pick/crop a new photo, go back.

Expected each time: the prompt appears.

Test 7 — Switching tabs, then going back

1. Tap + → Create expense.
2. Switch between the top tabs (Scan, Manual, Distance) a few times.
3. Go back once.
4. Expected: one back press exits the whole expense flow (it does not step back through the tabs you visited).

Test 8 — General navigation sanity (because a core library was updated)

1. Open Settings, go a few levels deep (e.g. Settings → Profile → Display name) and use Back to return each time.
2. Open and close several chats and right-hand panels.
3. On Web, refresh the page while inside a flow, and use the browser Back/Forward buttons.
4. Expected: everything navigates normally — no stuck screens, blank pages, unexpected jumps, or crashes.

• Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

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

• 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: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Mac-Chrome.mp4

[melvin-bot]

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

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

cc @ShridharGoel @MonilBhavsar

[ShridharGoel]

Can you also link the upstream PR for future reference?

[TaduJR]

Sure, updated the description

[ShridharGoel]

@TaduJR Do you think we should include QA testing for this - since other things would have also changed between the library versions?

[ShridharGoel]

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

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-08-10.at.3.32.13.PM.mov

[MonilBhavsar]

Are we adding a new patch here patches/react-navigation/@react-navigation+core+7.21.12+002+platform-navigation-stack-types.patch - why?

[Julesssss]

Could you add tests for review and QA please

[TaduJR]

@MonilBhavsar

Not a new patch. This is the existing platform-navigation-stack-types patch (custom ScreenOptions typing, originally added in #37891), renamed for the core version bump.

patch-package matches a patch to a package by the version in its filename, so bumping core to 7.21.12 means every core patch has to carry 7.21.12. Unlike the fix-failing-jest patches (which were byte-identical and show up as renames), this one couldn't be a pure rename because 7.21.12 changed the files it patches (it renamed RouteProp to ScreenRouteProp in the screenListeners/screenOptions callbacks and added .js import extensions), so I regenerated it against 7.21.12. Because the content changed, git shows it as a deleted file plus an added file instead of a rename, which is why it looks new. The functionality is unchanged.

[TaduJR]

Could you add tests for review and QA please

Done.

[MonilBhavsar]

Thanks!

---

@Julesssss feel free to merge