[$250] Onboarding - Manage teams expenses - User land on the Self DM instead of Concierge chat

[jponikarchuk]

If you haven’t already, check out our contributing guidelines for onboarding and email contributors@expensify.com to request to join our Slack channel!

---

Version Number: v9.3.1-0
Reproducible in staging?: Yes
Reproducible in production?: Yes
If this was caught during regression testing, add the test name, ID and link from BrowserStack: https://test-management.browserstack.com/projects/2219752/folder/13176677/test-cases/41237662
Email or phone of affected tester (no customers): N/A
Issue reported by: Applause Internal Team
Bug source: Regression TC Execution
Device used: Windows 11 / Chrome
App Component: Left Hand Navigation (LHN)

Action Performed:

1. Create a new account with '+' in it
2. Select the option "Manage my team's expenses"
3. Select the option of "1-10 employees", and click continue
4. Select the any accounting software (for example, QBD option)
5. Select Continue on the What feature modal, and skip the test drive modal

Expected Result:

According to TC-4266:
15. Verify that SelfDM isn't displayed or pinned in LHN
16. Desktop/Web - Verify you land on the Concierge chat and it's scrolled to the bottom

Actual Result:

SelfDM is displayed in LHN.
User land on the Self DM instead of the Concierge chat

Workaround:

Unknown

Platforms:

• Android: App
• Android: mWeb Chrome
• iOS: App
• iOS: mWeb Safari
• iOS: mWeb Chrome
• Windows: Chrome
• MacOS: Chrome / Safari

Screenshots/Videos

1.mp4

View all open jobs on GitHub

Upwork Automation - Do Not Edit

• Upwork Job URL: https://www.upwork.com/jobs/~022011978125465449279
• Upwork Job ID: 2011978125465449279
• Last Price Increase: 2026-01-30

Issue Owner

Current Issue Owner: @NicMendonca

[melvin-bot]

Triggered auto assignment to @NicMendonca (Bug), see https://stackoverflow.com/c/expensify/questions/14418 for more details. Please add this bug to a GH project, as outlined in the SO.

[MobileMage]

Proposal

Please re-state the problem that we are trying to solve in this issue.

After completing the "Manage my team's expenses" onboarding flow with an email containing '+', the user lands on Self DM instead of Concierge chat. The expected behavior (per TC-4266) is that the user should land on Concierge chat where their onboarding tasks are posted.

What is the root cause of that problem?

The root cause is in src/libs/navigateAfterOnboarding.ts.

For emails with '+', the shouldPreventOpenAdminRoom parameter is set to true (BaseOnboardingInterestedFeatures.tsx:223) because onboarding tasks are posted to Concierge instead of the #admins room for test accounts.

However, the navigation logic at line 30 explicitly filters out Concierge chat:

!isConciergeChatReport(lastAccessedReport) && !isSelfDM(lastAccessedReport)

This creates a contradiction: tasks go to Concierge (correct), but navigation to Concierge is blocked (incorrect). With no valid report to navigate to, reportID stays undefined and the user defaults to Self DM.

What changes do you think we should make in order to solve the problem?

In navigateAfterOnboarding.ts, modify the condition to allow Concierge chat when shouldPreventOpenAdminRoom is true. The logic should be: exclude Concierge only when we're NOT preventing admin room navigation (i.e., when tasks went to #admins room, not Concierge).

The fix updates the filter condition to:

• Still exclude Self DM (always)
• Exclude Concierge only when shouldPreventOpenAdminRoom is false
• Allow Concierge when shouldPreventOpenAdminRoom is true (because that's where tasks were posted)

What alternative solutions did you explore? (Optional)

An alternative would be to explicitly fetch the Concierge chat reportID when shouldPreventOpenAdminRoom is true and no reportID was found, using getChatByParticipants([CONST.ACCOUNT_ID.CONCIERGE], ...). However, modifying the existing filter condition is cleaner and maintains the single code path for determining navigation.

[annaweber830]

🚨 Edited by proposal-police: This proposal was edited at 2026-01-16 04:20:35 UTC.

Proposal

Please re-state the problem that we are trying to solve in this issue.

When a brand-new user signs up with an email containing a + and completes the “Manage my team’s expenses” onboarding flow (skipping the Test Drive modal), they land on Self DM and Self DM appears/pins in the LHN, instead of landing on the Concierge chat (scrolled to bottom) and not showing/pinning Self DM.

What is the root cause of that problem?

For + email onboarding (“test accounts”), we intentionally avoid opening the #admins room, but the post-onboarding navigation logic did not reliably set an explicit destination report. When no destination is set, the app falls back to whatever report is already active/last visited — commonly Self DM — which makes the user “land” on Self DM and causes it to show/pin in the LHN.

App/src/libs/navigateAfterOnboarding.ts

Lines 21 to 43 in 3bf7f14

	if (!isSmallScreenWidth) {
	if (onboardingAdminsChatReportID && !shouldPreventOpenAdminRoom) {
	reportID = onboardingAdminsChatReportID;
	}
	} else {
	const lastAccessedReport = findLastAccessedReport(!canUseDefaultRooms, shouldOpenOnAdminRoom() && !shouldPreventOpenAdminRoom);
	const lastAccessedReportID = lastAccessedReport?.reportID;
	// When the user goes through the onboarding flow, a workspace can be created if the user selects specific options. The user should be taken to the #admins room for that workspace because it is the most natural place for them to start their experience in the app.
	// The user should never go to the self DM or the Concierge chat if a workspace was created during the onboarding flow.
	if (lastAccessedReportID && lastAccessedReport.policyID !== onboardingPolicyID && !isConciergeChatReport(lastAccessedReport) && !isSelfDM(lastAccessedReport)) {
	reportID = lastAccessedReportID;
	}
	}
	if (reportID) {
	Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
	}
	// In this case, we have joined an accessible policy. We would have an onboarding policy, but not an admins chat report.
	// We should skip the Test Drive modal in this case since we already have a policy to join.
	if (onboardingPolicyID && !onboardingAdminsChatReportID) {
	return;
	}

What changes do you think we should make in order to solve the problem?

Update the post-onboarding navigation logic so that when the onboarding flow is in the “prevent open admin room” mode (used for + email test accounts), we explicitly navigate to the onboarding chat (Concierge) before showing/dismissing the Test Drive modal. This ensures:

• The user lands on Concierge (not Self DM).
• Self DM doesn’t become the active chat and therefore doesn’t get pinned/shown as the landing destination in the LHN for this flow.
  

  App/src/libs/navigateAfterOnboarding.ts

  Lines 16 to 33 in 3bf7f14

  	let reportID: string | undefined;
  	// 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) {
  	reportID = onboardingAdminsChatReportID;
  	}
  	} else {
  	const lastAccessedReport = findLastAccessedReport(!canUseDefaultRooms, shouldOpenOnAdminRoom() && !shouldPreventOpenAdminRoom);
  	const lastAccessedReportID = lastAccessedReport?.reportID;
  	// When the user goes through the onboarding flow, a workspace can be created if the user selects specific options. The user should be taken to the #admins room for that workspace because it is the most natural place for them to start their experience in the app.
  	// The user should never go to the self DM or the Concierge chat if a workspace was created during the onboarding flow.
  	if (lastAccessedReportID && lastAccessedReport.policyID !== onboardingPolicyID && !isConciergeChatReport(lastAccessedReport) && !isSelfDM(lastAccessedReport)) {
  	reportID = lastAccessedReportID;
  	}
  	}

let reportID: string | undefined;

    if (shouldPreventOpenAdminRoom) {
        reportID = getChatUsedForOnboarding()?.reportID;
    }

    // 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 (!reportID && onboardingAdminsChatReportID && !shouldPreventOpenAdminRoom) {
            reportID = onboardingAdminsChatReportID;
        }
    } else {
        if (!reportID) {
            const lastAccessedReport = findLastAccessedReport(!canUseDefaultRooms, shouldOpenOnAdminRoom() && !shouldPreventOpenAdminRoom);
            const lastAccessedReportID = lastAccessedReport?.reportID;
            // When the user goes through the onboarding flow, a workspace can be created if the user selects specific options. The user should be taken to the #admins room for that workspace because it is the most natural place for them to start their experience in the app.
            // The user should never go to the self DM or the Concierge chat if a workspace was created during the onboarding flow.
            if (lastAccessedReportID && lastAccessedReport.policyID !== onboardingPolicyID && !isConciergeChatReport(lastAccessedReport) && !isSelfDM(lastAccessedReport)) {
                reportID = lastAccessedReportID;
            }
        }
    }

if (reportID) {
        Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
    } else if (shouldPreventOpenAdminRoom) {
        // As a fallback, explicitly route to Concierge so we don't land on Self DM.
        navigateToConciergeChat();
    }

What alternative solutions did you explore? (Optional)

[duckemiah]

Proposal

Please re-state the problem that we are trying to solve in this issue.

When a user creates an account with '+' in their email (e.g., test+account@gmail.com), goes through the "Manage my team's expenses" onboarding flow, they end up landing on the Self DM instead of the Concierge chat. The Self DM also shows up in the LHN when it shouldn't.

What is the root cause of that problem?

The bug is in src/libs/navigateAfterOnboarding.ts. There's an asymmetry in how navigation is handled between large and small screens.

On large screens (lines 21-24), the logic is straightforward - if we have an onboardingAdminsChatReportID and we're not preventing the admin room, navigate there:

if (!isSmallScreenWidth) {
    if (onboardingAdminsChatReportID && !shouldPreventOpenAdminRoom) {
        reportID = onboardingAdminsChatReportID;
    }
}

On small screens (lines 25-32), the logic tries to find a "last accessed report" but then filters out Self DM and Concierge:

else {
    const lastAccessedReport = findLastAccessedReport(!canUseDefaultRooms, shouldOpenOnAdminRoom() && !shouldPreventOpenAdminRoom);
    const lastAccessedReportID = lastAccessedReport?.reportID;
    if (lastAccessedReportID && lastAccessedReport.policyID !== onboardingPolicyID && !isConciergeChatReport(lastAccessedReport) && !isSelfDM(lastAccessedReport)) {
        reportID = lastAccessedReportID;
    }
    // No fallback here! reportID stays undefined
}

For fresh accounts, the only reports available are Self DM and Concierge. Both get filtered out, reportID stays undefined, no navigation happens, and the user lands on whatever was showing - the Self DM.

For test accounts (email with '+'), shouldPreventOpenAdminRoom is true, meaning they should go to Concierge instead of the admin room. But there's no code path that actually navigates them there on small screens.

What changes do you think we should make in order to solve the problem?

The codebase already has getChatUsedForOnboarding() in ReportUtils which knows exactly which chat should be used for onboarding based on the user's email and onboarding choice. We should add a simple fallback after the existing screen-size logic - if no reportID was set, use the onboarding chat.

diff --git a/src/libs/navigateAfterOnboarding.ts b/src/libs/navigateAfterOnboarding.ts
--- a/src/libs/navigateAfterOnboarding.ts
+++ b/src/libs/navigateAfterOnboarding.ts
@@ -2,7 +2,7 @@ import ROUTES from '@src/ROUTES';
 import {setDisableDismissOnEscape} from './actions/Modal';
 import shouldOpenOnAdminRoom from './Navigation/helpers/shouldOpenOnAdminRoom';
 import Navigation from './Navigation/Navigation';
-import {findLastAccessedReport, isConciergeChatReport, isSelfDM} from './ReportUtils';
+import {findLastAccessedReport, getChatUsedForOnboarding, isConciergeChatReport, isSelfDM} from './ReportUtils';

 const navigateAfterOnboarding = (
     isSmallScreenWidth: boolean,
@@ -31,6 +31,11 @@ const navigateAfterOnboarding = (
         }
     }

+    // Fallback to the onboarding chat (Concierge or #admins depending on user's email)
+    if (!reportID) {
+        reportID = getChatUsedForOnboarding()?.reportID;
+    }
+
     if (reportID) {
         Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
     }

This fixes both large and small screens with minimal changes:

• getChatUsedForOnboarding() already handles whether to return Concierge or admin room based on the user's email ('+' check) and onboarding choice
• Test accounts ('+' email) land on Concierge where their onboarding tasks are posted
• No nesting changes to existing logic, just a simple fallback
• No new parameters needed

What alternative solutions did you explore? (Optional)

Another approach would be to check shouldPreventOpenAdminRoom upfront and set reportID before the screen-size logic, then wrap everything in if (!reportID) blocks. This works but requires more code changes and adds nesting. The fallback approach is simpler.

[dmkt9]

Proposal

Please re-state the problem that we are trying to solve in this issue.

SelfDM is displayed in LHN.
User land on the Self DM instead of the Concierge chat

What is the root cause of that problem?

1. The selfDM report is returned from the openApp API immediately after login.
2. Therefore, right after a successful login, lastAccessedReportID will be selfDMReportID. And selfDM report will be opened:
   https://github.com/Expensify/App/blob/ca8f034c8f5788779546cae80a8af4a9d64408c9/src/pages/home/ReportScreen.tsx#L212
3. When onboarding is completed, we have shouldPreventOpenAdminRoom === true for testing accounts, so lastAccessedReport in getReportIDAfterOnboarding will return selfDMReport. However, since we prevent redirecting to selfDMReport after onboarding is finished, the report opened right after login remains unchanged, and it is the DM report.
   https://github.com/Expensify/App/blob/ca8f034c8f5788779546cae80a8af4a9d64408c9/src/libs/navigateAfterOnboarding.ts#L35

What changes do you think we should make in order to solve the problem?

Right after login, we need to add selfDMReportID as the excludeReportID of findLastAccessedReport if onboarding has not yet been completed.
https://github.com/Expensify/App/blob/ca8f034c8f5788779546cae80a8af4a9d64408c9/src/pages/home/ReportScreen.tsx#L212

const selfDMReportID = onboarding?.hasCompletedGuidedSetupFlow ? undefined : findSelfDMReportID();
const lastAccessedReportID = findLastAccessedReport(
    !isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
    'openOnAdminRoom' in route.params && !!route.params.openOnAdminRoom,
    undefined,
    selfDMReportID,
)?.reportID;

In getReportIDAfterOnboarding, we can also assign selfDMReportID as the excludeReportID in the same way.
https://github.com/Expensify/App/blob/ca8f034c8f5788779546cae80a8af4a9d64408c9/src/libs/navigateAfterOnboarding.ts#L30

What alternative solutions did you explore? (Optional)

Combined with the main solution, we can allow opening the Concierge chat when shouldPreventOpenAdminRoom === true in getReportIDAfterOnboarding.

[abbasifaizan70]

Proposal

Please re-state the problem that we are trying to solve in this issue.

When a user creates an account with '+' in their email (test account) and completes the onboarding flow, they land on Self DM instead of Concierge chat. SelfDM is also displayed in the LHN when it shouldn't be.

What is the root cause of that problem?

The issue is in navigateAfterOnboarding.ts where navigation to Concierge chat is not handled for test accounts.

Flow Analysis:

1. In BaseOnboardingInterestedFeatures.tsx, for test accounts (emails with '+'), shouldPreventOpenAdminRoom is set to true:

App/src/pages/OnboardingInterestedFeatures/BaseOnboardingInterestedFeatures.tsx

Lines 222 to 231 in 232cb11

	// We need to wait the policy is created before navigating out the onboarding flow
	navigateAfterOnboardingWithMicrotaskQueue(
	isSmallScreenWidth,
	isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
	policyID,
	adminsChatReportID,
	// Onboarding tasks would show in Concierge instead of admins room for testing accounts, we should open where onboarding tasks are located
	// See https://github.com/Expensify/App/issues/57167 for more details
	(session?.email ?? '').includes('+'),
	);

2. In getReportIDAfterOnboarding(), for large screens when shouldPreventOpenAdminRoom is true, the function returns undefined instead of navigating to Concierge:

App/src/libs/navigateAfterOnboarding.ts

Lines 23 to 28 in 232cb11

	if (!isSmallScreenWidth) {
	if (onboardingAdminsChatReportID && !shouldPreventOpenAdminRoom) {
	return onboardingAdminsChatReportID;
	}
	return undefined;
	}

3. In navigateAfterOnboarding(), when reportID is undefined, no explicit navigation occurs:

App/src/libs/navigateAfterOnboarding.ts

Lines 56 to 59 in 232cb11

	const reportID = getReportIDAfterOnboarding(isSmallScreenWidth, canUseDefaultRooms, onboardingPolicyID, onboardingAdminsChatReportID, shouldPreventOpenAdminRoom);
	if (reportID) {
	Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
	}

The Race Condition / Navigation Gap:

1. For test accounts, shouldPreventOpenAdminRoom is true
2. getReportIDAfterOnboarding returns undefined for large screens
3. No explicit navigation happens (the if (reportID) check fails)
4. User lands on default screen determined by ReportsSplitNavigator.tsx
5. Default screen can be SelfDM if it's the most recently accessed report

Why This Matters:

For test accounts (emails with '+'), onboarding tasks are posted in Concierge chat instead of the #admins room (as noted in the comment). Therefore, when the admin room navigation is prevented, we need to explicitly navigate to Concierge where the user's onboarding tasks are located.

What changes do you think we should make in order to solve the problem?

Modify navigateAfterOnboarding() in navigateAfterOnboarding.ts to navigate to Concierge chat when shouldPreventOpenAdminRoom is true and no specific report ID is available.

File: App/src/libs/navigateAfterOnboarding.ts

1. Add import for navigateToConciergeChat:

App/src/libs/navigateAfterOnboarding.ts

Lines 1 to 6 in 232cb11

	import {handleRHPVariantNavigation, shouldOpenRHPVariant} from '@components/SidePanel/RHPVariantTest';
	import ROUTES from '@src/ROUTES';
	import {setDisableDismissOnEscape} from './actions/Modal';
	import shouldOpenOnAdminRoom from './Navigation/helpers/shouldOpenOnAdminRoom';
	import Navigation from './Navigation/Navigation';
	import {findLastAccessedReport, isConciergeChatReport, isSelfDM} from './ReportUtils';

// After
import {handleRHPVariantNavigation, shouldOpenRHPVariant} from '@components/SidePanel/RHPVariantTest';
import ROUTES from '@src/ROUTES';
import {setDisableDismissOnEscape} from './actions/Modal';
import {navigateToConciergeChat} from './actions/Report';
import shouldOpenOnAdminRoom from './Navigation/helpers/shouldOpenOnAdminRoom';
import Navigation from './Navigation/Navigation';
import {findLastAccessedReport, isConciergeChatReport, isSelfDM} from './ReportUtils';

2. Add navigation to Concierge for test accounts:

App/src/libs/navigateAfterOnboarding.ts

Lines 56 to 65 in 232cb11

	const reportID = getReportIDAfterOnboarding(isSmallScreenWidth, canUseDefaultRooms, onboardingPolicyID, onboardingAdminsChatReportID, shouldPreventOpenAdminRoom);
	if (reportID) {
	Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
	}
	// In this case, we have joined an accessible policy. We would have an onboarding policy, but not an admins chat report.
	// We should skip the Test Drive modal in this case since we already have a policy to join.
	if (onboardingPolicyID && !onboardingAdminsChatReportID) {
	return;
	}

// After
const reportID = getReportIDAfterOnboarding(isSmallScreenWidth, canUseDefaultRooms, onboardingPolicyID, onboardingAdminsChatReportID, shouldPreventOpenAdminRoom);
if (reportID) {
    Navigation.navigate(ROUTES.REPORT_WITH_ID.getRoute(reportID));
} else if (shouldPreventOpenAdminRoom) {
    // For test accounts (emails with '+'), onboarding tasks are posted in Concierge instead of the admins room.
    // When no specific report is available to navigate to, we should navigate to Concierge chat
    // where the user's onboarding tasks are located.
    // See https://github.com/Expensify/App/issues/57167 for more details
    navigateToConciergeChat();
    return;
}

// In this case, we have joined an accessible policy. We would have an onboarding policy, but not an admins chat report.
// We should skip the Test Drive modal in this case since we already have a policy to join.
if (onboardingPolicyID && !onboardingAdminsChatReportID) {
    return;
}

How the fix works:

1. We import navigateToConciergeChat from ./actions/Report which handles navigation to the Concierge chat
2. After checking if reportID is available, we add an else if check for shouldPreventOpenAdminRoom
3. When shouldPreventOpenAdminRoom is true (test account with '+' in email) and reportID is undefined, we explicitly navigate to Concierge chat
4. We return early to prevent the Test Drive modal from showing (since test accounts should go directly to Concierge)

This ensures that:

• Test accounts with '+' in their email are properly navigated to Concierge chat after onboarding
• Users see their onboarding tasks in Concierge (where they are posted for test accounts)
• SelfDM is not shown as the landing page

[melvin-bot]

Job added to Upwork: https://www.upwork.com/jobs/~022011978125465449279

[melvin-bot]

Triggered auto assignment to Contributor-plus team member for initial proposal review - @akinwale (External)