refactor: isolate markAsCash from Onyx.connect data by Skalakid · Pull Request #73758 · Expensify/App

Skalakid · 2025-10-29T14:14:22Z

Explanation of Change

This PR is part of a refactor to remove Onyx.connect for the ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS key from the src/libs/actions/Transaction.ts file and replace it with useOnyx.

It isolates the markAsCash function from the Onyx.connect data.

To ensure this refactor doesn't break anything, it adds automated tests to the markAsCash function.

Fixed Issues

$ #67780
PROPOSAL:

Tests

Go to the open report - a workspace for example
Submit an expense and retrieve its transactionId
Go to the report screen and in the console, update the onyx entries containing the mocked card that will be used for the transaction, the given transaction and the corresponding violation.

Onyx.merge('cardList', {
        1: {
            bank: 'Expensify Card',
            lastFourPAN: 3458,
        },
    });

Onyx.merge(`transactions_<transaction_id>`, {cardID: 1, merchant: 'violation test'});

Onyx.merge(`transactionViolations_<transaction_id>`, [{type: 'test', name: CONST.VIOLATIONS.RTER, data: {pendingPattern: true}}]);

The mark as cash button should appear
After pressing it the button and the violation message should disappear and there should be a response in the thread confirming that there was a conversion to cash

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

web.mov

…nnect/markAsCash-src-libs-actions-Transaction.ts

codecov · 2025-10-31T12:35:06Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/components/MoneyRequestHeader.tsx	`0.74% <ø> (ø)`
src/libs/actions/Transaction.ts	`59.45% <100.00%> (+4.47%)`	⬆️
src/components/MoneyReportHeader.tsx	`0.15% <0.00%> (ø)`
... and 74 files with indirect coverage changes

…nnect/markAsCash-src-libs-actions-Transaction.ts

blazejkustra

Looks good to me!

melvin-bot · 2025-11-05T10:44:07Z

@DylanDylann 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 · 2025-11-05T10:46:51Z

LGTM . Thank you for your hard work!

DylanDylann · 2025-11-05T10:53:31Z

@Skalakid Could you merge the new main?

JmillsExpensify

Out of scope for product reviews, so I'm unsubscribing.

dariusz-biela · 2025-11-05T13:54:49Z

+function markAsCash(transactionID: string | undefined, transactionThreadReportID: string | undefined, transactionViolations: TransactionViolations = []) {
    if (!transactionID || !transactionThreadReportID) {
        return;
    }


This function uses Onyx.connect to retrieve the currentUserAccountID and currentUserPersonalDetails.

I think you could initially add optional props to it, with these data, and use the props.currentUserAccountID ?? fromOnyxConnect.currentUserAccountID inside buildOptimisticDismissedViolationReportAction.

I'd add a comment for the person who will be unbinding Onyx.connect in src/libs/ReportUtils.ts about why this implementation is there.

const optimisticReportAction = buildOptimisticDismissedViolationReportAction({ reason: 'manual', violationName: CONST.VIOLATIONS.RTER, });

DylanDylann · 2025-11-11T07:18:33Z

@Skalakid Kindly bump

Guccio163 · 2025-11-12T16:14:54Z

Hi, I'm Wiktor Gut from SWM agency and I'll be replacing @Skalakid in Onyx.connect issues, right now I'm also working on expo-video migration, but I'llcome back here ASAP

Guccio163 · 2025-12-15T12:23:28Z

Hi @dariusz-biela and @DylanDylann, it looks like I'm getting close to ending expo-video, so I came back to finishing Onyx.connect issues after Michał in the meantime.

@dariusz-biela do I understand correctly, that the change proposed by you aims to make markAsCash completely free from Onyx.connect, including functions used inside? If so:

Should I also add an optional currentUserEmail since it is being used inside getCurrentUserDisplayNameOrEmail() called inside buildOptimisticDismissedViolationReportAction?
Have you had a case of adding optional props for an analogous situation and can you give me a sample of the comment left there (for future unbinding devs)? It would substantially help me in getting this issue done 👍

…-fork into @Skalakid/refactor/useonyx-deprecate-onyx-connect/markAsCash-src-libs-actions-Transaction.ts

dariusz-biela · 2025-12-15T15:36:11Z

@dariusz-biela do I understand correctly, that the change proposed by you aims to make markAsCash completely free from Onyx.connect, including functions used inside? If so:

Should I also add an optional currentUserEmail since it is being used inside getCurrentUserDisplayNameOrEmail() called inside buildOptimisticDismissedViolationReportAction?
Have you had a case of adding optional props for an analogous situation and can you give me a sample of the comment left there (for future unbinding devs)? It would substantially help me in getting this issue done

@Guccio163

Overall, this is a new pattern that Michał and I planned to introduce.

The assumptions for this pattern are as follows:

In each PR, we refactor only one function.
We detach that function from all Onyx.connect usages so we never have to revisit it again.
If the function is used inside another function that is not a component, we move the relevant Onyx.connect call higher up.
If this function depends on another function that still uses Onyx.connect, we prepare a way to pass the necessary data into it — which means adding an optional prop and passing the data obtained from useOnyx.
For the main refactored function, we add appropriate unit tests to increase test coverage. We also include one integration test with useOnyx to ensure that the implementation will work correctly with useOnyx.

I’m not sure if this explains everything clearly, so if anything is still unclear, we can always jump on a call and talk it through.

Guccio163 · 2025-12-15T16:54:53Z

OK @dariusz-biela thank you for a quick reply; I went through some Onyx.connect issues (especially smaller ones, each one focused on a single function) and I didn't see any implementing similar design - each issue handled only specified function's parameters and usages + tests. I'm ambivalent on this topic because it could be a good idea, but it would also add quite a lot of comments that could be messy to clean. Moreover, the same way that we would offload next issues refactoring these helper functions, we would potentially bloat earlier PRs with optional props, comments and logic.

@tgolen @DylanDylann it would be great to see if you're with this idea, otherwise I'd stick with leaving this PR like it's now.

tgolen · 2025-12-15T19:32:17Z

I am not quite following exactly what the question for me is, so you might need to be a little more direct in what you are asking.

From looking at the PR, I think the code change here is fine and it's inline with all the refactorings that have been done to remove Onyx.connect() and make everything to be pure functions.

Guccio163 · 2025-12-15T19:46:11Z

Hi @tgolen I'll try to rephrase it:

What @dariusz-biela and @Skalakid were thinking about is adding optional props to all the functions that are used inside of the function we are working on here and that are using Onyx.connect themselves, so to currentUserAccountID, currentUserPersonalDetails and getCurrentUserDisplayNameOrEmail. Then, we would pass values through this function to them.

Because these functions are yet to be migrated from Onyx.connect to useOnyx, when migrating them, devs will need to do just that - add props to all the functions using them and pass values extracted from useOnyx down from the components.

The proposed solution would potentially speed up the process of migrating the mentioned functions, since some of the props and usages would already be done (all that would need to be done is removing 'optinality' from these props), though I think it would be less clear and ultimately lead to potential misunderstanding and more work.

If you agree with me, than I think that this issue is ready for merge ✅

tgolen · 2025-12-15T20:00:04Z

OK, I see what you're saying now. Thanks.

I agree it could be a small time-saver, but I think it's riskier for the future refactorings because they might not catch that they need to update the params to be strictly required. In that case, it think it's better to just not have the optional params for now.

I think the only way I would be OK with that is if YOU were for sure the one doing those future refactorings.

DylanDylann · 2025-12-16T03:57:46Z

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

Screen.Recording.2025-12-16.at.11.04.53.mov

Android: HybridApp

Android: mWeb Chrome

iOS: HybridApp

iOS: mWeb Safari

MacOS: Chrome / Safari

melvin-bot · 2025-12-16T04:05:18Z

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

DylanDylann · 2025-12-16T04:06:34Z

cc @tgolen

thienlnam

Leaving it to you @tgolen!

OSBotify · 2025-12-16T17:33:25Z

✋ 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 · 2025-12-16T22:46:13Z

🚀 Deployed to staging by https://github.com/tgolen in version: 9.2.79-0 🚀

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

OSBotify · 2025-12-17T12:23:55Z

🚀 Deployed to staging by https://github.com/tgolen in version: 9.2.81-0 🚀

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

OSBotify · 2025-12-18T18:45:24Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.81-5 🚀

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

OSBotify · 2025-12-18T21:08:48Z

🚀 Deployed to production by https://github.com/AndrewGable in version: 9.2.81-5 🚀

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

Skalakid added 4 commits October 29, 2025 14:24

refactor: isolate markAsCash from Onyx.connect data

41d9bb5

refacatore: add tests

9cd8338

fix: fix prop type

ee508f5

refactor: update markAsCash usages in components

a9edc65

melvin-bot Bot assigned Skalakid Oct 29, 2025

Merge branch 'main' into @Skalakid/refactor/useonyx-deprecate-onyx-co…

924237e

…nnect/markAsCash-src-libs-actions-Transaction.ts

Merge branch 'main' into @Skalakid/refactor/useonyx-deprecate-onyx-co…

ff9e515

…nnect/markAsCash-src-libs-actions-Transaction.ts

blazejkustra approved these changes Nov 5, 2025

View reviewed changes

Skalakid marked this pull request as ready for review November 5, 2025 10:44

Skalakid requested review from a team as code owners November 5, 2025 10:44

melvin-bot Bot requested review from DylanDylann and JmillsExpensify and removed request for a team November 5, 2025 10:44

melvin-bot Bot removed the request for review from a team November 5, 2025 10:44

JmillsExpensify reviewed Nov 5, 2025

View reviewed changes

dariusz-biela approved these changes Nov 5, 2025

View reviewed changes

Guccio163 added 2 commits December 15, 2025 13:59

Merge branch 'main' of github.com:software-mansion-labs/expensify-app…

62fd3ae

…-fork into @Skalakid/refactor/useonyx-deprecate-onyx-connect/markAsCash-src-libs-actions-Transaction.ts

type issue present

fdd5529

prettier

0541ca7

DylanDylann approved these changes Dec 16, 2025

View reviewed changes

melvin-bot Bot requested a review from thienlnam December 16, 2025 04:05

thienlnam approved these changes Dec 16, 2025

View reviewed changes

tgolen approved these changes Dec 16, 2025

View reviewed changes

tgolen merged commit 0e00534 into Expensify:main Dec 16, 2025
32 checks passed

OSBotify mentioned this pull request Dec 16, 2025

Deploy Checklist: New Expensify 2025-12-16 #77818

Closed

Conversation

Skalakid commented Oct 29, 2025 • 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!

codecov Bot commented Oct 31, 2025 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

blazejkustra left a comment

Choose a reason for hiding this comment

Uh oh!

melvin-bot Bot commented Nov 5, 2025

Uh oh!

github-actions Bot commented Nov 5, 2025

Uh oh!

DylanDylann commented Nov 5, 2025

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

dariusz-biela Nov 5, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Nov 11, 2025

Uh oh!

Guccio163 commented Nov 12, 2025

Uh oh!

Guccio163 commented Dec 15, 2025

Uh oh!

dariusz-biela commented Dec 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Guccio163 commented Dec 15, 2025

Uh oh!

tgolen commented Dec 15, 2025

Uh oh!

Guccio163 commented Dec 15, 2025

Uh oh!

tgolen commented Dec 15, 2025

Uh oh!

DylanDylann commented Dec 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Dec 16, 2025

Uh oh!

DylanDylann commented Dec 16, 2025

Uh oh!

thienlnam left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Dec 16, 2025

Uh oh!

OSBotify commented Dec 16, 2025

Uh oh!

OSBotify commented Dec 17, 2025

Uh oh!

OSBotify commented Dec 18, 2025

Uh oh!

OSBotify commented Dec 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Skalakid commented Oct 29, 2025 •

edited

Loading

codecov Bot commented Oct 31, 2025 •

edited by github-actions Bot

Loading

dariusz-biela commented Dec 15, 2025 •

edited

Loading

DylanDylann commented Dec 16, 2025 •

edited

Loading