refactor clearCreateChatError, clearTaskErrors and navigateToAndOpenReportWithAccountIDs to use isSelfTourViewed from useOnyx by dukenv0307 · Pull Request #87231 · Expensify/App

dukenv0307 · 2026-04-07T08:21:02Z

Explanation of Change

Fixed Issues

$ #66424
PROPOSAL:

Tests

Open any task report
Run the following command on Chrome console (replace the id with the actual task report id)

Onyx.merge('report_id', {                                
      errorFields: {                                                     
          editTask: {                                                  
              [Date.now()]: 'Failed to create task',                     
          },                                                             
      },                                                                 
      pendingFields: {                                                   
          createChat: 'add',
      },                                                                 
  });

Clear the error
Verify that we'll navigate to concierge chat

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-04-07.at.15.49.42.mov

…eportWithAccountIDs to use isSelfTourViewed from useOnyx

codecov · 2026-04-07T08:29:22Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
src/components/PromotedActionsBar.tsx	`76.00% <100.00%> (ø)`
src/libs/actions/Report/index.ts	`68.63% <100.00%> (-0.12%)`	⬇️
src/pages/inbox/report/ReportActionItemCreated.tsx	`100.00% <100.00%> (ø)`
src/libs/actions/Task.ts	`58.50% <0.00%> (ø)`
...orkspace/workflows/WorkspaceWorkflowsPayerPage.tsx	`0.00% <0.00%> (ø)`
src/components/ReportActionItem/TaskView.tsx	`0.00% <0.00%> (ø)`
... and 11 files with indirect coverage changes

melvin-bot · 2026-04-07T08:51:22Z

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

DylanDylann · 2026-04-08T10:13:19Z

+        TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.OPEN_REPORT, 1);
+    });
+
+    it('clearCreateChatError should pass isSelfTourViewed=true through navigateToConciergeChatAndDeleteReport when deleting optimistic report', async () => {


I confused with these tests. We should simulate scenario where isSelfTourViewed is true or false, then verify the output

cc @dukenv0307

@DylanDylann Done

DylanDylann · 2026-04-08T10:20:15Z

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.2026-04-08.at.17.19.05.mov

DylanDylann · 2026-04-09T10:09:09Z

+        TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.OPEN_REPORT, 1);
+    });
+
+    it('clearCreateChatError should delete optimistic report and navigate to concierge when isSelfTourViewed is true', async () => {


The description looks incorrect, could you check again?

DylanDylann · 2026-04-09T10:10:50Z

            expect(Navigation.navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(EXISTING_REPORT_ID));
        });
+
+        it('should create new chat and call openReport when isSelfTourViewed is true and no existing chat is found', async () => {


same above

should create new chat

dukenv0307 · 2026-04-09T16:19:27Z

@DylanDylann can you please check again?

DylanDylann · 2026-04-10T07:17:29Z

+        TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.OPEN_REPORT, 1);
+    });
+
+    it('clearCreateChatError should call openReport when isSelfTourViewed is true', async () => {


@dukenv0307 I think the test should focus on behavior driven by isSelfTourViewed. In this case, verifying the openReport call doesn’t seem related to isSelfTourViewed. So it looks confused....

DylanDylann · 2026-04-13T11:09:02Z

+    it('clearCreateChatError should call openReport when deleting optimistic report', async () => {
+        const TEST_USER_ACCOUNT_ID = 1;
+        const TEST_USER_LOGIN = 'test@user.com';
+        const REPORT: OnyxTypes.Report = {...createRandomReport(1, undefined), errorFields: {createChat: {error: 'error'}}};
+        const INTRO_SELECTED: OnyxTypes.IntroSelected = {choice: CONST.ONBOARDING_CHOICES.MANAGE_TEAM};
+
+        await TestHelper.signInWithTestUser(TEST_USER_ACCOUNT_ID, TEST_USER_LOGIN);
+        await TestHelper.setPersonalDetails(TEST_USER_LOGIN, TEST_USER_ACCOUNT_ID);
+        await Onyx.merge(ONYXKEYS.PERSONAL_DETAILS_LIST, {
+            [CONST.ACCOUNT_ID.CONCIERGE]: {
+                accountID: CONST.ACCOUNT_ID.CONCIERGE,
+                login: CONST.EMAIL.CONCIERGE,
+                displayName: 'Concierge',
+            },
+        });


Looks like this test is the same as the above one.

DylanDylann · 2026-04-13T11:11:22Z

@MelvinBot Could you please review the unit test change in this PR and suggest an effective way to avoid duplicated test cases?

MelvinBot · 2026-04-13T11:14:34Z

I reviewed the unit test changes. Here are the duplicated tests and how to consolidate them:

1. `navigateToAndOpenReportWithAccountIDs` — 3 tests do the same thing

These three tests have identical setup, identical assertions (OPEN_REPORT called once, navigate called), and only differ in the isSelfTourViewed value:

"should create new chat and pass betas to openReport when no existing chat" → isSelfTourViewed: false
"should call openReport when isSelfTourViewed is true and no existing chat is found" → isSelfTourViewed: true
"should call openReport when isSelfTourViewed is false and no existing chat is found" → isSelfTourViewed: false ← exact duplicate of the first

Fix: Delete the last two tests. isSelfTourViewed is just passed through to openReport — it doesn't change the navigate/create behavior being tested. The first test already covers the code path. If you want to verify both boolean values are forwarded correctly, use it.each:

it.each([true, false])('should pass isSelfTourViewed=%s through to openReport when no existing chat', async (isSelfTourViewed) => {
    // ...shared setup...
    Report.navigateToAndOpenReportWithAccountIDs([PARTICIPANT_ACCOUNT_ID], TEST_USER_ACCOUNT_ID, testIntroSelected, isSelfTourViewed, undefined);
    await waitForBatchedUpdates();

    TestHelper.expectAPICommandToHaveBeenCalled(WRITE_COMMANDS.OPEN_REPORT, 1);
    expect(Navigation.navigate).toHaveBeenCalled();
});

2. `clearCreateChatError` — new test is nearly identical to the one above it

The new test "clearCreateChatError should call openReport when deleting optimistic report" has the same setup and assertion as the existing test right above it — both call clearCreateChatError on an optimistic report with no conciergeReportID and assert OPEN_REPORT is called once. The only difference is testBetas vs undefined.

Fix: Remove the new test. The existing test already covers the "optimistic report deletion triggers openReport" path. If you want to test the betas=undefined variant, fold it into the existing test with it.each:

it.each([['with betas', [CONST.BETAS.ALL]], ['without betas', undefined]] as const)(
    'clearCreateChatError should call openReport when deleting optimistic report %s',
    async (_label, betas) => {
        // ...shared setup using `betas`...
    },
);

3. `getGuidedSetupDataForOpenReport` — good candidate for `it.each`

The two new tests (isSelfTourViewed=true / false) are well-structured and test distinct behavior (task marked complete vs not). They're not true duplicates, but the boilerplate is identical. Collapse with:

it.each([
    [true, 'should be defined'],
    [false, 'should be undefined'],
])('viewTour completedTaskReportActionID when isSelfTourViewed=%s %s', async (isSelfTourViewed, _desc) => {
    await setupUserWithConciergeChat();
    await Onyx.merge(ONYXKEYS.NVP_ONBOARDING, {hasCompletedGuidedSetupFlow: false});
    await waitForBatchedUpdates();

    const introSelected: OnyxTypes.IntroSelected = {choice: CONST.ONBOARDING_CHOICES.SUBMIT, isInviteOnboardingComplete: false};
    const result = Report.getGuidedSetupDataForOpenReport(introSelected, undefined, isSelfTourViewed);

    const guidedSetupData = JSON.parse(result?.guidedSetupData ?? '[]');
    const viewTourTask = guidedSetupData.find((item: {type: string; task?: string}) => item.type === 'task' && item.task === CONST.ONBOARDING_TASK_TYPE.VIEW_TOUR);
    expect(viewTourTask).toBeDefined();

    if (isSelfTourViewed) {
        expect(viewTourTask?.completedTaskReportActionID).toBeDefined();
    } else {
        expect(viewTourTask?.completedTaskReportActionID).toBeUndefined();
    }
});

Summary

Area	Issue	Action
`navigateToAndOpenReportWithAccountIDs`	3rd test is exact duplicate of 1st	Delete 3rd test; optionally merge 1st+2nd with `it.each`
`clearCreateChatError`	New test duplicates existing one above	Delete or merge with `it.each`
`getGuidedSetupDataForOpenReport`	Not duplicated, but heavy boilerplate	Collapse with `it.each` for readability

dukenv0307 · 2026-04-14T05:38:11Z

@MelvinBot Please review again

MelvinBot · 2026-04-14T05:40:35Z

I've re-reviewed the PR after the latest changes. Here's my assessment:

Production code changes ✅

The isSelfTourViewed parameter is correctly threaded through all call sites (PromotedActionsBar, TaskView, ReportActionItemCreated, WorkspaceWorkflowsPayerPage) and the TODO comments are properly removed. No issues here.

Test changes — mostly good, one minor concern

Well addressed from prior feedback:

clearCreateChatError consolidated with it.each for betas ✅
Duplicate navigateToAndOpenReportWithAccountIDs tests removed ✅
viewTour completedTaskReportActionID test properly verifies distinct behavior per isSelfTourViewed value (checking completedTaskReportActionID is defined vs undefined) ✅
PromotedActionsBarTest correctly updated to verify isSelfTourViewed is passed through ✅

Minor concern (non-blocking): The navigateToAndOpenReportWithAccountIDs test at line 6481 uses it.each([true, false]) for isSelfTourViewed, but both iterations assert the exact same thing (OPEN_REPORT called once, navigate called). Since the assertions don't vary by isSelfTourViewed, the parameterization doesn't add meaningful coverage — one iteration would suffice. This is what DylanDylann flagged on April 10: "the test should focus on behavior driven by isSelfTourViewed." That said, the new viewTour completedTaskReportActionID test at line 6585 does properly test isSelfTourViewed-driven behavior, so the overall coverage is fine.

All CI checks passing ✅

dukenv0307 · 2026-04-14T05:41:59Z

@DylanDylann all yours

DylanDylann

LGTM

github-actions · 2026-04-14T12:04:25Z

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

github-actions · 2026-04-14T12:08:50Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-4b5b509-678b3bb-86d3f2457de6cd2aa154228b2875e190c01d12d2/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-4b5b509-678b3bb-1b5e20092daafa5bffb8559ca74baa63a3f09422/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-04-14T12:10:58Z

✋ 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 · 2026-04-16T03:56:44Z

🚀 Deployed to staging by https://github.com/mjasikowski in version: 9.3.60-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

MelvinBot · 2026-04-16T03:57:55Z

No help site changes are required for this PR.

This is a purely internal code refactoring that threads the isSelfTourViewed parameter through several functions (clearCreateChatError, clearTaskErrors, navigateToAndOpenReportWithAccountIDs), removes TODO comments, and updates tests. No user-facing behavior, UI labels, settings, or workflows are affected.

OSBotify · 2026-04-21T11:10:39Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.3.60-22 🚀

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

refactor clearCreateChatError, clearTaskErrors and navigateToAndOpenR…

37b13da

…eportWithAccountIDs to use isSelfTourViewed from useOnyx

melvin-bot Bot assigned dukenv0307 Apr 7, 2026

dukenv0307 marked this pull request as ready for review April 7, 2026 08:51

dukenv0307 requested review from a team as code owners April 7, 2026 08:51

melvin-bot Bot requested review from DylanDylann and joekaufmanexpensify and removed request for a team and joekaufmanexpensify April 7, 2026 08:51

melvin-bot Bot removed the request for review from a team April 7, 2026 08:51

DylanDylann reviewed Apr 8, 2026

View reviewed changes

update des

f591fc6

DylanDylann reviewed Apr 9, 2026

View reviewed changes

dukenv0307 added 2 commits April 9, 2026 22:54

update test description

aed3047

Merge branch 'main' into fix/66424-part-14

bd175bc

DylanDylann reviewed Apr 10, 2026

View reviewed changes

update tests

8662cce

DylanDylann reviewed Apr 13, 2026

View reviewed changes

dukenv0307 added 3 commits April 14, 2026 10:23

add more test

68ba8c2

merge main

f09fb4a

prettier

06d4a86

DylanDylann approved these changes Apr 14, 2026

View reviewed changes

melvin-bot Bot requested a review from mjasikowski April 14, 2026 10:46

mjasikowski approved these changes Apr 14, 2026

View reviewed changes

mjasikowski merged commit 4b5b509 into Expensify:main Apr 14, 2026
33 checks passed

OSBotify mentioned this pull request Apr 16, 2026

Deploy Checklist: New Expensify 2026-04-16 #88022

Closed

melvin-bot Bot mentioned this pull request Apr 21, 2026

[Partial payment $3625] Remove Onyx.connect() for the key: ONYXKEYS.NVP_ONBOARDING in src/libs/ReportUtils.ts #66424

Closed

Conversation

dukenv0307 commented Apr 7, 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!

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

Uh oh!

Codecov Report

Uh oh!

melvin-bot Bot commented Apr 7, 2026

Uh oh!

DylanDylann Apr 8, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

dukenv0307 Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Apr 8, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Apr 9, 2026

Choose a reason for hiding this comment

Uh oh!

dukenv0307 commented Apr 9, 2026

Uh oh!

DylanDylann Apr 10, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann Apr 13, 2026

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Apr 13, 2026

Uh oh!

MelvinBot commented Apr 13, 2026

1. navigateToAndOpenReportWithAccountIDs — 3 tests do the same thing

2. clearCreateChatError — new test is nearly identical to the one above it

3. getGuidedSetupDataForOpenReport — good candidate for it.each

Summary

Uh oh!

dukenv0307 commented Apr 14, 2026

Uh oh!

MelvinBot commented Apr 14, 2026

Production code changes ✅

Test changes — mostly good, one minor concern

All CI checks passing ✅

Uh oh!

dukenv0307 commented Apr 14, 2026

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Apr 14, 2026

Uh oh!

github-actions Bot commented Apr 14, 2026

Uh oh!

OSBotify commented Apr 14, 2026

Uh oh!

OSBotify commented Apr 16, 2026

Uh oh!

MelvinBot commented Apr 16, 2026

Uh oh!

OSBotify commented Apr 21, 2026

Uh oh!

Reviewers

Assignees

Labels

dukenv0307 commented Apr 7, 2026 •

edited

Loading

codecov Bot commented Apr 7, 2026 •

edited by github-actions Bot

Loading

1. `navigateToAndOpenReportWithAccountIDs` — 3 tests do the same thing

2. `clearCreateChatError` — new test is nearly identical to the one above it

3. `getGuidedSetupDataForOpenReport` — good candidate for `it.each`