Fix `react-native-skia` crash when switching to Old Dot by war-in · Pull Request #93295 · Expensify/App

war-in · 2026-06-11T14:40:32Z

Explanation of Change

Fixes an intermittent native UAF crash (EXC_BAD_ACCESS / SIGSEGV, Sentry APP-AVB) when switching from NewDot to Expensify Classic on iOS HybridApp. @shopify/react-native-skia's RuntimeAwareCache only tracks secondary runtimes; the HybridApp handoff tears down the RN runtime while Skia host objects are still released on the main queue, so ~RuntimeAwareCache destroys cached jsi::Functions into freed runtime memory. Fix: extend skia's secondary-runtime handling to the primary runtime — register a RuntimeLifecycleMonitor listener and clear _primaryCache in onRuntimeDestroyed while the runtime is still valid, guarded by a mutex (no leak). Applied as a patch-package patch to cpp/jsi/RuntimeAwareCache.h.

Fixed Issues

$ #90135
PROPOSAL:

Tests

Prerequisites

HybridApp iOS release build

Log into a HybridApp account that renders a chart
Open a screen with a visible chart and let it fully render (Spend over time chart in the Spend tab)
Go to Account → Troubleshoot → Switch to Expensify Classic
From OldDot, open the menu → Try New Expensify, and navigate back to the chart screen
Repeat steps 2–4 a few times
Verify that the app never crashes during the switch

Offline tests

N/A — native teardown crash, unrelated to network state.

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

github-actions · 2026-06-11T14:40:48Z

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

github-actions · 2026-06-11T16:28:02Z

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

ZhenjaHorbach · 2026-06-11T16:43:36Z

Still have the issue 🥲
Expensify Adhoc-2026-06-11-184217.txt

war-in · 2026-06-12T08:40:33Z

@ZhenjaHorbach I think I founc the cause...
Looks like rock used some old cached native build and my patch wasn't applied at all 💀

@blimpich could you trigger the build once again but with the last option enabled? That will force a fresh build and include the patch 🙏

github-actions · 2026-06-12T08:57:05Z

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

war-in · 2026-06-12T09:09:42Z

@dylanexpensify I think the same thing happened in the latest build :/ Are you sure you checked Force a full native build?

blimpich · 2026-06-12T16:07:39Z

Running again with full native build 🫡

blimpich · 2026-06-12T16:07:57Z

https://github.com/Expensify/App/actions/runs/27427684895

github-actions · 2026-06-12T16:09:00Z

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

ZhenjaHorbach · 2026-06-12T18:04:41Z

Hmmmmm
Interesting
Maybe I'm lucky today, but I can't reproduce
I'll test it again over the weekend
And if it doesn't reproduce
Then it's a win!

war-in · 2026-06-15T11:02:44Z

@blimpich @dylanexpensify I think we'll need another adhoc build because I realised the previous fix was leaking memory :/ Could you trigger it for @ZhenjaHorbach to verify? 🙏

blimpich · 2026-06-15T16:08:14Z

started a new build with full-native build 👍

blimpich · 2026-06-15T16:08:22Z

https://github.com/Expensify/App/actions/runs/27559538636

github-actions · 2026-06-15T16:16:49Z

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

ZhenjaHorbach · 2026-06-15T17:54:25Z

Okay
Still works good
Let's open this PR!

melvin-bot · 2026-06-16T16:07:30Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 4ca66921f3

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

war-in · 2026-06-17T13:05:36Z

@ZhenjaHorbach I think that after the last commit we should retest the PR again, so we're sure it didn't break anything

ZhenjaHorbach · 2026-06-17T13:07:27Z

@blimpich
Can you please help with builds one more time? 😅

blimpich · 2026-06-17T16:09:39Z

https://github.com/Expensify/App/actions/runs/27702895354 🫡

github-actions · 2026-06-17T16:10:45Z

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

ZhenjaHorbach · 2026-06-17T18:01:57Z

Okay
Still works good
I hope it's the last version of the fix!

ZhenjaHorbach · 2026-06-17T18:02: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

NA

Android: mWeb Chrome

NA

iOS: HybridApp

2026-06-17.20.01.25.mp4

iOS: mWeb Safari

NA

MacOS: Chrome / Safari

NA

blimpich

Nice job! This was a tricky one!

OSBotify · 2026-06-17T19:07:02Z

✋ 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-06-17T19:20:40Z

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

github-actions · 2026-06-17T19:32:46Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-1a71bbf3cff-4f54638-616ac1929b418fb308a5f9955e1b70815510d73b/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-1a71bbf-4f54638-f783bf3d86588a2c08a5f261574f414ab910ce34/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-18T17:17:49Z

🚀 Deployed to staging by https://github.com/blimpich in version: 9.4.15-0 🚀

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

OSBotify · 2026-06-19T15:23:41Z

🚀 Deployed to production by https://github.com/puneetlath in version: 9.4.15-3 🚀

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

fix: skia patch

cf74537

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

war-in mentioned this pull request Jun 11, 2026

fix app crashes intermittently when switching to classic view on ios #91828

Draft

51 tasks

blimpich added the Ready To Build label Jun 11, 2026

This comment has been minimized.

Sign in to view

war-in added 2 commits June 15, 2026 11:54

Merge branch 'main' into war-in/fix-skia-crash

89bd208

fix: improve the patch so it no longer leaks memory

0ee2c29

war-in changed the title ~~fix: skia crash~~ Fix react-native-skia crash when switching to Old Dot Jun 15, 2026

This comment has been minimized.

Sign in to view

Merge branch 'refs/heads/main' into war-in/fix-skia-crash

4ca6692

war-in marked this pull request as ready for review June 16, 2026 16:07

war-in requested a review from a team as a code owner June 16, 2026 16:07

melvin-bot Bot requested a review from ZhenjaHorbach June 16, 2026 16:07

melvin-bot Bot removed the request for review from a team June 16, 2026 16:07

chatgpt-codex-connector Bot reviewed Jun 16, 2026

View reviewed changes

Comment thread ...fy/react-native-skia/@shopify+react-native-skia+2.4.14+001+fix-runtime-aware-cache-uaf.patch Outdated

war-in added 2 commits June 17, 2026 14:29

Merge branch 'main' into war-in/fix-skia-crash

6f09a63

fix: lock _primaryCacheMutex earlier

33385cd

This comment has been minimized.

Sign in to view

ZhenjaHorbach approved these changes Jun 17, 2026

View reviewed changes

melvin-bot Bot requested a review from blimpich June 17, 2026 18:05

blimpich approved these changes Jun 17, 2026

View reviewed changes

blimpich merged commit 1a71bbf into Expensify:main Jun 17, 2026
24 of 25 checks passed

OSBotify mentioned this pull request Jun 18, 2026

Deploy Checklist: New Expensify 2026-06-18 #93956

Closed

45 tasks

melvin-bot Bot mentioned this pull request Jun 19, 2026

[Due for payment 2026-06-26] [$250] IOS - App crashes intermittently when switching to classic view #90135

Open

7 tasks

Conversation

war-in commented Jun 11, 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 11, 2026

Uh oh!

github-actions Bot commented Jun 11, 2026

Uh oh!

This comment has been minimized.

ZhenjaHorbach commented Jun 11, 2026

Uh oh!

war-in commented Jun 12, 2026

Uh oh!

github-actions Bot commented Jun 12, 2026

Uh oh!

This comment has been minimized.

war-in commented Jun 12, 2026

Uh oh!

blimpich commented Jun 12, 2026

Uh oh!

blimpich commented Jun 12, 2026

Uh oh!

github-actions Bot commented Jun 12, 2026

Uh oh!

This comment has been minimized.

ZhenjaHorbach commented Jun 12, 2026

Uh oh!

war-in commented Jun 15, 2026

Uh oh!

blimpich commented Jun 15, 2026

Uh oh!

blimpich commented Jun 15, 2026

Uh oh!

github-actions Bot commented Jun 15, 2026

Uh oh!

This comment has been minimized.

ZhenjaHorbach commented Jun 15, 2026

Uh oh!

melvin-bot Bot commented Jun 16, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

war-in commented Jun 17, 2026

Uh oh!

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

Uh oh!

Uh oh!

blimpich commented Jun 17, 2026

Uh oh!

github-actions Bot commented Jun 17, 2026

Uh oh!

This comment has been minimized.

ZhenjaHorbach commented Jun 17, 2026

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

blimpich left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Jun 17, 2026

Uh oh!

github-actions Bot commented Jun 17, 2026

Uh oh!

github-actions Bot commented Jun 17, 2026

Uh oh!

OSBotify commented Jun 18, 2026

war-in commented Jun 11, 2026 •

edited

Loading

ZhenjaHorbach commented Jun 17, 2026 •

edited

Loading

ZhenjaHorbach commented Jun 17, 2026 •

edited

Loading