Skip to content

[HOLD on #103978] fix(deps): update Onyx to persist native merges consistently - #105482

Open
chrispader wants to merge 4 commits into
Expensify:mainfrom
margelo:@chrispader/fix/onyx-native-merge-persistence
Open

[HOLD on #103978] fix(deps): update Onyx to persist native merges consistently#105482
chrispader wants to merge 4 commits into
Expensify:mainfrom
margelo:@chrispader/fix/onyx-native-merge-persistence

Conversation

@chrispader

@chrispader chrispader commented Oct 30, 2026 •
edited
Loading

Copy link
Copy Markdown
Contributor

On native, Onyx.merge can write a different value to SQLite than the one it keeps in the cache. A new key keeps its null properties in storage, and a batched null reset leaves the old fields behind, so the app can load stale data after a restart. Expensify/react-native-onyx#883 fixes this, and this PR brings that fix into App.

Explanation of Change

This PR updates react-native-onyx from 3.0.121 to 3.0.146, the published release containing Expensify/react-native-onyx#883. It is on hold for #103978, the last preceding Onyx version bump.

Earlier Onyx upgrade PRs, in release order:

For a new key, null should remove the property:

await Onyx.merge('test', {keep: true, remove: null});

// Before
// Cache:  {keep: true}
// SQLite: {keep: true, remove: null}

// After
// Cache:  {keep: true}
// SQLite: {keep: true}

Fixed Issues

$ #105485
PROPOSAL: N/A

Tests

Android: Native and iOS: Native

  1. Sign in with any account.
  2. Open any chat.
  3. Send a message and verify it appears in the chat.
  4. Force-close the app.
  5. Reopen the app and verify the message still appears in the chat.
  6. Sign out and verify the sign-in page appears.

Android: mWeb Chrome, iOS: mWeb Safari and MacOS: Chrome / Safari

  1. Sign in with any account.
  2. Open any chat.
  3. Send a message and verify it appears in the chat.
  4. Refresh the page and verify the message still appears in the chat.
  5. Sign out and verify the sign-in page appears.
  • Verify that no errors appear in the JS console

Offline tests

Android: Native and iOS: Native

  1. Sign in with any account.
  2. Turn off the network connection.
  3. Open any chat.
  4. Send a message and verify it appears in the chat.
  5. Force-close the app.
  6. Reopen the app and verify the message still appears in the chat.
  7. Turn on the network connection and verify the message is no longer greyed out.

QA Steps

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
  • 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 any copy / text that was added to the app 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 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)
  • 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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.mp4
iOS: Native
ios.mp4
MacOS: Chrome / Safari
web.mp4

@github-actions

github-actions Bot commented Oct 30, 2026

Copy link
Copy Markdown
Contributor

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

@chrispader

chrispader commented Oct 30, 2026

Copy link
Copy Markdown
Contributor Author

Chris's AI understudy stepping in. 🤖

@MelvinBot please create an issue for this PR, assign @chrispader, and link it in the ### Fixed Issues section of the PR description. The issue is the native Onyx.merge persistence bug fixed in Expensify/react-native-onyx#883.

@chrispader chrispader mentioned this pull request Oct 30, 2026
Merged
42 tasks done
@MelvinBot MelvinBot mentioned this pull request Oct 30, 2026
Open
@MelvinBot

MelvinBot commented Oct 30, 2026

Copy link
Copy Markdown
Contributor

I created [Onyx] Native Onyx.merge persists different values to SQLite than the cache, assigned it to chrispader, and linked it in the ### Fixed Issues section of this PR. I didn't find an existing issue for this bug.

view run

@chrispader
chrispader marked this pull request as ready for review October 30, 2026 22:59
@chrispader
chrispader requested a review from a team as a code owner October 30, 2026 22:59
@melvin-bot
melvin-bot Bot requested review from ZhenjaHorbach and removed request for a team October 30, 2026 22:59
@melvin-bot

melvin-bot Bot commented Oct 30, 2026

Copy link
Copy Markdown

@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

chatgpt-codex-connector Bot commented Oct 30, 2026 •
edited
Loading

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ⚠️ Failed 2026-10-30T23:25:23.838618Z
We couldn’t complete this review. Comment @codex review to try again.		 63495dd Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to 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" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chrispader @claude
chore: merge main into fix/onyx-native-merge-persistence
8fcc8ee 
Main moved to Onyx 3.0.120, so the test pin now points at the native merge fix rebuilt on top of 3.0.120.

Co-Authored-By: Claude Opus 5.5 <[email protected]>
@ZhenjaHorbach

ZhenjaHorbach commented Nov 3, 2026 •
edited
Loading

Copy link
Copy Markdown
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
  • 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 any copy / text that was added to the app 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 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
    • 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
    • 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 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 the PR adds or modifies the UI:
    • I asked an AI agent to review the changes for accessibility issues and addressed its findings.
    • I tested with a screen reader (VoiceOver on macOS) and verified all new/changed elements are reachable with a logical focus order.
    • I verified all new/changed elements have meaningful accessible names and roles.
    • I verified state changes are announced (e.g. checked/unchecked, expanded/collapsed, selected).
  • 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
Screen.Recording.2026-11-03.at.17.18.01.mov
Android: mWeb Chrome
Screen.Recording.2026-11-03.at.16.10.15.mov
iOS: HybridApp
Screen.Recording.2026-11-03.at.17.18.01.mov
iOS: mWeb Safari
Screen.Recording.2026-11-03.at.16.10.15.mov
MacOS: Chrome / Safari
Screen.Recording.2026-11-03.at.16.08.46.mov

@ZhenjaHorbach

ZhenjaHorbach commented Nov 3, 2026

Copy link
Copy Markdown
Contributor

Changes work good
But let's fix conflicts!

@chrispader

chrispader commented Nov 3, 2026

Copy link
Copy Markdown
Contributor Author

Thanks @ZhenjaHorbach. Resolving conflicts, though we'll also need to wait for any prior Onyx bump PR

@chrispader chrispader changed the title [HOLD on https://github.com/Expensify/react-native-onyx/pull/883] fix(deps): update Onyx to persist native merges consistently [HOLD on #103978] fix(deps): update Onyx to persist native merges consistently Nov 3, 2026

This branch has not been deployed

No deployments
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ZhenjaHorbach ZhenjaHorbach Awaiting requested review from ZhenjaHorbach

At least 1 approving review is required to merge this pull request.

Assignees

@chrispader chrispader

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@chrispader @MelvinBot @ZhenjaHorbach