Skip to content

Fix - Manage my team expenses - The user is redirected to Concierge chat instead of #admins #62671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
FitseTLT wants to merge 2 commits into from
Closed

Fix - Manage my team expenses - The user is redirected to Concierge chat instead of #admins #62671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ce2524
navigate to admin room for manage team onboarding
FitseTLT May 23, 2025
f3ddc8b
added test
FitseTLT May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/libs/navigateAfterOnboarding.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,20 @@ const navigateAfterOnboarding = (
setDisableDismissOnEscape(false);
Navigation.dismissModal();

if (onboardingPurposeSelected === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) {
InteractionManager.runAfterInteractions(() => Navigation.navigate(ROUTES.TEST_DRIVE_MODAL_ROOT));
return;
}

// When hasCompletedGuidedSetupFlow is true, OnboardingModalNavigator in AuthScreen is removed from the navigation stack.
// 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 && !shouldPreventOpenAdminRoom) {
Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(onboardingAdminsChatReportID));
}
if (onboardingPurposeSelected !== CONST.ONBOARDING_CHOICES.MANAGE_TEAM) {
return;
}
}

if (onboardingPurposeSelected === CONST.ONBOARDING_CHOICES.MANAGE_TEAM) {
InteractionManager.runAfterInteractions(() => Navigation.navigate(ROUTES.TEST_DRIVE_MODAL_ROOT));
return;
}

Expand Down
5 changes: 3 additions & 2 deletions tests/unit/navigateAfterOnboardingTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,9 @@ describe('navigateAfterOnboarding', () => {
it('should navigate to Test Drive Modal if user wants to manage a small team', async () => {
const navigate = jest.spyOn(Navigation, 'navigate');
jest.spyOn(Navigation, 'isNavigationReady').mockReturnValue(Promise.resolve());

navigateAfterOnboarding(CONST.ONBOARDING_CHOICES.MANAGE_TEAM, true, true);
const onboardingAdminsChatReportID = '1';
navigateAfterOnboarding(CONST.ONBOARDING_CHOICES.MANAGE_TEAM, false, true, undefined, undefined, onboardingAdminsChatReportID);
await waitFor(() => expect(navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(onboardingAdminsChatReportID)));
await waitFor(() => expect(navigate).toHaveBeenCalledWith(ROUTES.TEST_DRIVE_MODAL_ROOT));
});
});