fix: app does not open admin room after onboarding by mkzie2 · Pull Request #55654 · Expensify/App

mkzie2 · 2025-01-23T13:49:57Z

Explanation of Change

Fixed Issues

$ #55336
PROPOSAL: #55336 (comment)

Tests

Sign up in ND
Choose Manage my team's expenses > 1-10 employees > Any accounting platform
On large screens, verify app navigates to the newly created #admins room
On small screens, verify app navigates to LHN

Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

Same as Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2025-01-30.at.18.52.09.mov

Android: mWeb Chrome

Screen.Recording.2025-01-30.at.18.39.58-compressed.mov

iOS: Native

Screen.Recording.2025-01-30.at.01.23.34-compressed.mov

iOS: mWeb Safari

Screen.Recording.2025-01-30.at.18.37.36-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2025-01-30.at.01.18.31-compressed.mov

MacOS: Desktop

Screen.Recording.2025-01-30.at.01.21.54-compressed.mov

dangrous · 2025-01-28T18:18:21Z

Let @DylanDylann and me know if we can be of any help in getting that unit test done! We're trying to get this merged today if possible!

dangrous · 2025-01-29T14:32:30Z

hey @mkzie2, what's blocking you from getting this PR in review? How can we help? This one's a top priority for us, thanks!

dangrous · 2025-01-29T16:42:07Z

@DylanDylann It looks like this is pretty nearly there, just need the test and the lint errors - do you think you could take this one over to move it along?

DylanDylann · 2025-01-29T17:06:06Z

@dangrous Sure, If @mkzie2 is unavailable, let me create another PR to move it along

mkzie2 · 2025-01-29T17:09:33Z

I had problem with the tests but found a solution. I'm recording evidences. Will be ready in 1 hour.

…e/55336

DylanDylann · 2025-01-30T07:17:03Z

@mkzie2 Is this ready?

mkzie2 · 2025-01-30T11:34:17Z

@DylanDylann @dangrous As I'm still having problems with the unit test (it ran successfully locally but did not through GH actions) and given the urgency, I suggest we separate this PR into 2 parts: The fix for the issue & the unit test. I'll create the follow-up PR later. Wdyt?

melvin-bot · 2025-01-30T11:41:33Z

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

dangrous · 2025-01-30T16:00:20Z

Hrm, I'd really like the tests to ship with it, if at all possible. Playing around with your latest test (reverting your revert), it's not passing for me locally either. Soooo that might help with testing the test? Pressing the employee selection isn't marking the option as pressed. Maybe because it's a selection list not a button/menu? Not sure if that helps, but maybe press isn't the right event?

DylanDylann · 2025-01-30T16:37:17Z

@mkzie2 For simpler, I think we only need to add UTs for navigateAfterOnboarding function instead of simulating the total onboarding flow

src/libs/navigateAfterOnboarding.ts

dangrous · 2025-01-31T17:24:33Z

Yeah @DylanDylann's suggestion sounds good to me - that should make it easier! Only potential weird part about that is the findLastAccessedReport call but I feel like we can probably replicate some of the logic here or here to mock that as needed.

@mkzie2 can you take a look and try to get this into final review on Monday? Thanks!

…e/55336

mkzie2 · 2025-02-03T15:36:27Z

@DylanDylann Updated the UT.

dangrous · 2025-02-03T17:42:07Z

Hi all!

@mkzie2 can you merge main please? that failing jest test looks unrelated to the new code
@DylanDylann can you give this a final review/test today?
I'll take a final look shortly as well

Let's shoot for getting this out today!

dangrous

LGTM!

src/libs/navigateAfterOnboarding.ts

tests/unit/navigateAfterOnboardingTest.ts

DylanDylann · 2025-02-04T06:44:06Z

@mkzie2 Also please merge the latest main to resolve Jest Unit Tests / test (job 3) failure

DylanDylann · 2025-02-04T06:52:14Z

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 tests pass on all platforms & I tested again on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- 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 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 the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- 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.js 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.
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: Native

Screen.Recording.2025-02-04.at.13.57.39.mov

Android: mWeb Chrome

Screen.Recording.2025-02-04.at.13.55.04.mov

iOS: Native

Screen.Recording.2025-02-04.at.13.57.11.mov

iOS: mWeb Safari

Screen.Recording.2025-02-04.at.13.54.36.mov

MacOS: Chrome / Safari

Screen.Recording.2025-02-04.at.13.45.06.mov

MacOS: Desktop

Screen.Recording.2025-02-04.at.13.55.47.mov

DylanDylann · 2025-02-04T06:58:43Z

Some minor comments. The rest looks fine

cc @dangrous

…e/55336

mkzie2 · 2025-02-04T11:27:30Z

Updated.

DylanDylann · 2025-02-04T14:16:53Z

tests/unit/navigateAfterOnboardingTest.ts

        expect(Navigation.navigate).not.toHaveBeenCalled();
    });
+
+    it('should navigate to last accessed report if shouldOpenOnAdminRoom is true on small screens', () => {


It should be "should navigate to last accessed report on small screens"

DylanDylann

Almost done. One minor comment

DylanDylann · 2025-02-04T14:18:53Z

tests/unit/navigateAfterOnboardingTest.ts

+        expect(Navigation.navigate).not.toHaveBeenCalled();
+    });
+
+    it('should navigate to last accessed report if shouldOpenOnAdminRoom is true on small screens', () => {


Suggested change

it('should navigate to last accessed report if shouldOpenOnAdminRoom is true on small screens', () => {

it('should navigate to last accessed report on small screens', () => {

In this case, we don't need to care shouldOpenOnAdminRoom and onboardingAdminsChatReportID param

This is the shouldOpenOnAdminRoom function I mentioned. It returns true when the URL contains openOnAdminRoom param:

App/src/libs/Navigation/shouldOpenOnAdminRoom.ts

Line 3 in 27780d5

export default function shouldOpenOnAdminRoom() {

Not the shouldOpenAdminRoom param we just removed above. So no need to update this comment.

dangrous

This looks good to me!

In the interests of getting this merged, I'm going to go ahead without that comment change - but @mkzie2 can you please create a quick follow up PR to update? What @DylanDylann suggested makes sense.

OSBotify · 2025-02-04T19:12: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.

mkzie2 · 2025-02-05T04:32:36Z

@dangrous @DylanDylann No need for follow-up PR #55654 (comment)

github-actions · 2025-02-06T22:01:24Z

🚀 Deployed to staging by https://github.com/dangrous in version: 9.0.95-0 🚀

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

github-actions · 2025-02-11T02:12:41Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.0.95-6 🚀

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

dominictb · 2025-03-27T16:25:52Z

src/libs/navigateAfterOnboarding.ts

    // On small screens, this removal redirects navigation to HOME. Dismissing the modal doesn't work properly,
    // so we need to specifically navigate to the last accessed report.
    if (!isSmallScreenWidth) {
+        if (onboardingAdminsChatReportID) {


We always open #admins room for Manage my team's expenses but for testing accounts (accounts with + in email), the onboarding tasks show up in Concierge chat instead. Led to this issue #57167

mkzie2 added 2 commits January 23, 2025 20:49

fix: app does not open admin room after onboarding

a747e5f

run prettier

c751d79

muttmuure requested a review from DylanDylann January 28, 2025 16:53

muttmuure mentioned this pull request Jan 28, 2025

[Due for payment 2025-02-18] [$500] In the full story user not redirected to #admins Room After Creating Workspace – Stuck in Concierge #55336

Closed

8 tasks

mkzie2 added 6 commits January 30, 2025 01:17

fix lint

0ca1ee8

add ui test for onboarding navigation

c8cf4f8

fix lint

0949def

replace with fireEvent

a0fd853

get by label text

e30e233

Merge branch 'main' of https://github.com/mkzie2/App into mkzie2-issu…

eb648e6

…e/55336

revert: add unit test

b7c8c15

mkzie2 marked this pull request as ready for review January 30, 2025 11:41

mkzie2 requested a review from a team as a code owner January 30, 2025 11:41

melvin-bot bot requested review from dangrous and removed request for a team January 30, 2025 11:41

dangrous reviewed Jan 31, 2025

View reviewed changes

src/libs/navigateAfterOnboarding.ts Outdated Show resolved Hide resolved

mkzie2 added 3 commits February 3, 2025 18:00

Merge branch 'main' of https://github.com/mkzie2/App into mkzie2-issu…

e2f6faa

…e/55336

update comment

0fce8a1

add unit test for navigateAfterOnboarding

a631139

remove redundant case

b2bbe6b

fix lint

dce0d91

dangrous previously approved these changes Feb 3, 2025

View reviewed changes

DylanDylann reviewed Feb 4, 2025

View reviewed changes

src/libs/navigateAfterOnboarding.ts Outdated Show resolved Hide resolved

DylanDylann reviewed Feb 4, 2025

View reviewed changes

tests/unit/navigateAfterOnboardingTest.ts Show resolved Hide resolved

mkzie2 added 2 commits February 4, 2025 18:22

Merge branch 'main' of https://github.com/mkzie2/App into mkzie2-issu…

ac7016d

…e/55336

remove shouldOpenAdminRoom param and add a test case

7e793ce

mkzie2 dismissed dangrous’s stale review via 7e793ce February 4, 2025 11:27

DylanDylann reviewed Feb 4, 2025

View reviewed changes

DylanDylann approved these changes Feb 4, 2025

View reviewed changes

melvin-bot bot requested a review from dangrous February 4, 2025 14:18

DylanDylann reviewed Feb 4, 2025

View reviewed changes

dangrous approved these changes Feb 4, 2025

View reviewed changes

dangrous merged commit c400da4 into Expensify:main Feb 4, 2025
19 checks passed

github-actions bot mentioned this pull request Feb 6, 2025

Deploy Checklist: New Expensify 2025-02-06 #56482

Closed

Shahidullah-Muffakir mentioned this pull request Feb 20, 2025

[Due for payment 2025-03-31] [$250] Web - Onboarding-User lands on the admins room after selecting the Manage my team's expenses #57167

Closed

8 tasks

dominictb reviewed Mar 27, 2025

View reviewed changes

	it('should navigate to last accessed report if shouldOpenOnAdminRoom is true on small screens', () => {
	it('should navigate to last accessed report on small screens', () => {

Conversation

mkzie2 commented Jan 23, 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!

dangrous commented Jan 28, 2025

Uh oh!

dangrous commented Jan 29, 2025

Uh oh!

dangrous commented Jan 29, 2025

Uh oh!

DylanDylann commented Jan 29, 2025

Uh oh!

mkzie2 commented Jan 29, 2025

Uh oh!

DylanDylann commented Jan 30, 2025

Uh oh!

mkzie2 commented Jan 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

melvin-bot bot commented Jan 30, 2025

Uh oh!

dangrous commented Jan 30, 2025

Uh oh!

DylanDylann commented Jan 30, 2025

Uh oh!

Uh oh!

dangrous commented Jan 31, 2025

Uh oh!

mkzie2 commented Feb 3, 2025

Uh oh!

dangrous commented Feb 3, 2025

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

DylanDylann commented Feb 4, 2025

Uh oh!

mkzie2 commented Feb 4, 2025

Uh oh!

DylanDylann Feb 4, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann left a comment

Choose a reason for hiding this comment

Uh oh!

DylanDylann Feb 4, 2025

Choose a reason for hiding this comment

Uh oh!

DylanDylann Feb 4, 2025

Choose a reason for hiding this comment

Uh oh!

mkzie2 Feb 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DylanDylann Feb 5, 2025

Choose a reason for hiding this comment

Uh oh!

dangrous left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

OSBotify commented Feb 4, 2025

mkzie2 commented Jan 23, 2025 •

edited

Loading

mkzie2 commented Jan 30, 2025 •

edited

Loading

DylanDylann commented Feb 4, 2025 •

edited

Loading

DylanDylann commented Feb 4, 2025 •

edited

Loading

mkzie2 Feb 5, 2025 •

edited

Loading