fix: navigate to concierge chat after onboarding on test account

Author: daledah

src/libs/navigateAfterOnboarding.ts

@@ -9,20 +9,21 @@ const navigateAfterOnboarding = (
     onboardingPolicyID?: string,
     activeWorkspaceID?: string,
     onboardingAdminsChatReportID?: string,
+    shouldOpenAdminRoom?: boolean,
 ) => {
     Navigation.dismissModal();
 
     // 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) {
+        if (onboardingAdminsChatReportID && shouldOpenAdminRoom) {
             Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(onboardingAdminsChatReportID));
         }
         return;
     }
 
-    const lastAccessedReport = findLastAccessedReport(!canUseDefaultRooms, shouldOpenOnAdminRoom(), activeWorkspaceID);
+    const lastAccessedReport = findLastAccessedReport(!canUseDefaultRooms, shouldOpenOnAdminRoom() && shouldOpenAdminRoom, activeWorkspaceID);
     const lastAccessedReportID = lastAccessedReport?.reportID;
     // we don't want to navigate to newly created workspaces after onboarding is completed.
     if (!lastAccessedReportID || lastAccessedReport.policyID === onboardingPolicyID || isConciergeChatReport(lastAccessedReport)) {

src/pages/OnboardingAccounting/BaseOnboardingAccounting.tsx

@@ -188,7 +188,14 @@ function BaseOnboardingAccounting({shouldUseNativeStyles}: BaseOnboardingAccount
                         setOnboardingAdminsChatReportID();
                         setOnboardingPolicyID();
                     });
-                    navigateAfterOnboarding(isSmallScreenWidth, canUseDefaultRooms, onboardingPolicyID, activeWorkspaceID, onboardingAdminsChatReportID);
+                    navigateAfterOnboarding(
+                        isSmallScreenWidth,
+                        canUseDefaultRooms,
+                        onboardingPolicyID,
+                        activeWorkspaceID,
+                        onboardingAdminsChatReportID,
+                        !(session?.email ?? '').includes('+'),
+                    );
                 }}
                 pressOnEnter
             />

tests/unit/navigateAfterOnboardingTest.ts

@@ -55,8 +55,9 @@ describe('navigateAfterOnboarding', () => {
 
     it('should navigate to the admin room report if onboardingAdminsChatReportID is provided', () => {
         const navigate = jest.spyOn(Navigation, 'navigate');
+        const testSession = {email: 'realaccount@gmail.com'};
 
-        navigateAfterOnboarding(false, true, undefined, undefined, ONBOARDING_ADMINS_CHAT_REPORT_ID);
+        navigateAfterOnboarding(false, true, undefined, undefined, ONBOARDING_ADMINS_CHAT_REPORT_ID, !(testSession?.email ?? '').includes('+'));
         expect(navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(ONBOARDING_ADMINS_CHAT_REPORT_ID));
     });
 
@@ -102,4 +103,15 @@ describe('navigateAfterOnboarding', () => {
         navigateAfterOnboarding(true, true, ONBOARDING_POLICY_ID, ACTIVE_WORKSPACE_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID);
         expect(navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(REPORT_ID));
     });
+
+    it('should navigate to Concierge room if user uses a test email', () => {
+        const navigate = jest.spyOn(Navigation, 'navigate');
+        const lastAccessedReport = {reportID: REPORT_ID};
+        mockFindLastAccessedReport.mockReturnValue(lastAccessedReport);
+        mockShouldOpenOnAdminRoom.mockReturnValue(true);
+        const testSession = {email: 'test+account@gmail.com'};
+
+        navigateAfterOnboarding(true, true, ONBOARDING_POLICY_ID, ACTIVE_WORKSPACE_ID, ONBOARDING_ADMINS_CHAT_REPORT_ID, !(testSession?.email ?? '').includes('+'));
+        expect(navigate).toHaveBeenCalledWith(ROUTES.REPORT_WITH_ID.getRoute(REPORT_ID));
+    });
 });