[Submit] Unnecessary workspace selection on report creation

[garrettmknight]

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:
Reproducible in staging?:
Reproducible in production?:
If this was caught during regression testing, add the test name, ID and link from BrowserStack:
Email or phone of affected tester (no customers):
Logs: https://stackoverflow.com/c/expensify/questions/4856
Expensify/Expensify Issue URL:
Issue reported by:
Slack conversation (hyperlinked to channel name):

Action Performed:

1. Sign up for an account
2. Add it to the Submit2026 beta
3. Switch to Classic
4. Navigate to expensify.com/pricing
5. Create a Submit workspace
6. Go to Spend > Create + > Create report

Expected Result:

Since the user only has one workspace and it's set to default, the report should create automatically

Actual Result:

User is presented with a 'Choose workspace for report` screen with only their Submit workspace on it.

Workaround:

Can the user still use Expensify without this being fixed? Have you informed them of the workaround?

Platforms:

Select the officially supported platforms where the issue was reproduced:

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

Screenshots/Videos

View all open jobs on GitHub

Issue Owner

Current Issue Owner: @abzokhattab

Upwork Automation - Do Not Edit

• Upwork Job URL: https://www.upwork.com/jobs/~022060029959597689854
• Upwork Job ID: 2060029959597689854
• Last Price Increase: 2026-05-28

[MelvinBot]

Proposal

What is the root cause of that problem?

The report creation flow uses isPaidGroupPolicy() to filter eligible workspaces, which only matches TEAM and CORPORATE types — it excludes SUBMIT (submit2026).

In CreateReportMenuItem, chatEnabledPaidGroupPoliciesSelector filters policies using isPaidGroupPolicy, so a Submit workspace is excluded from groupPoliciesWithChatEnabled. This empty array is passed to getDefaultChatEnabledPolicy(), which returns undefined because neither condition is met (activePolicy isn't a paid group policy, and the array length isn't 1).

Back in useCreateReport, !workspaceIDForReportCreation is true, so the user is always routed to the workspace selector — even though they only have one workspace.

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

The chatEnabledPaidGroupPoliciesSelector in CreateReportMenuItem.tsx and getDefaultChatEnabledPolicy in PolicyUtils.ts need to also consider Submit-type policies. Specifically:

1. In chatEnabledPaidGroupPoliciesSelector, replace the isPaidGroupPolicy(policy) check with a condition that also includes Submit policies (e.g., isPaidGroupPolicy(policy) || isSubmitPolicy(policy)).
2. In getDefaultChatEnabledPolicy, similarly update the isPaidGroupPolicy(activePolicy) check to also accept Submit policies.
3. In useCreateReport, the isDefaultPersonal check uses !isPaidGroupPolicy(activePolicy) — this should also accept Submit policies so a Submit workspace isn't treated as "personal".

Note: Modifying isPaidGroupPolicy itself is risky since it's used broadly across the codebase. The safer approach is to update only the specific call sites in the report creation flow.

What alternative solutions did you explore? (Optional)

An alternative would be to modify isPaidGroupPolicy() to include SUBMIT type. However, isPaidGroupPolicy is used in many contexts (billing, permissions, feature gating), and including Submit there could have unintended side effects. Targeted changes to the report creation flow are safer.

---

Next Steps for Contributor+ team:
To accept: @MelvinBot implement [this](https://github.com/Expensify/App/issues/91991#issuecomment-new) to create a draft PR.
To refine: @MelvinBot <your feedback>
To reject: Explain why you are rejecting Melvin's proposal.

[yusufdeveloper2903]

Proposal

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

When a user whose only workspace is a default Submit workspace creates a report via Spend → Create + → Create report, they are shown the "Choose workspace for report" screen listing that single workspace, instead of the report being created automatically.

What is the root cause of that problem?

The "create report" entry point decides whether to skip the workspace picker based on a default chat-enabled policy, but the resolution of that policy excludes Submit workspaces — while the picker screen itself includes them. That inconsistency is the bug.

The gate lives in SearchActionsBarCreateButton. When defaultChatEnabledPolicyID is missing, it routes to the selection screen:

App/src/components/Search/SearchPageHeader/SearchActionsBarCreateButton.tsx

Lines 156 to 172 in 5eb8701

	const workspaceIDForReportCreation = defaultChatEnabledPolicyID;
	// No default or restricted with multiple workspaces → workspace selector
	if (
	!workspaceIDForReportCreation ||
	(shouldRestrictUserBillableActions(
	defaultChatEnabledPolicy,
	ownerBillingGracePeriodEnd,
	userBillingGracePeriodEnds,
	amountOwed,
	currentUserPersonalDetails.accountID,
	) &&
	groupPoliciesWithChatEnabled.length > 1)
	) {
	Navigation.navigate(createDynamicRoute(DYNAMIC_ROUTES.NEW_REPORT_WORKSPACE_SELECTION.path));
	return;
	}

defaultChatEnabledPolicyID comes from two helpers that both gate on isPaidGroupPolicy:

• The selector that builds the candidate list —

  App/src/selectors/Policy.ts

  Lines 91 to 98 in 5eb8701

  	const groupPaidPoliciesWithExpenseChatEnabledSelector = (policies: OnyxCollection<Policy>, currentUserLogin: string | undefined) => {
  	if (isEmptyObject(policies)) {
  	return CONST.EMPTY_ARRAY;
  	}
  	return Object.values(policies ?? {}).filter(
  	(policy): policy is Policy => !!policy?.isPolicyExpenseChatEnabled && !policy?.isJoinRequestPending && isPaidGroupPolicy(policy) && shouldShowPolicy(policy, false, currentUserLogin),
  	);
  	};

• getDefaultChatEnabledPolicy, including its active-policy fast path —

  App/src/libs/PolicyUtils.ts

  Lines 2067 to 2077 in 5eb8701

  	function getDefaultChatEnabledPolicy(groupPoliciesWithChatEnabled: Array<OnyxInputOrEntry<Policy>>, activePolicy?: OnyxInputOrEntry<Policy> | null): OnyxInputOrEntry<Policy> | undefined {
  	if (activePolicy && activePolicy.isPolicyExpenseChatEnabled && isPaidGroupPolicy(activePolicy)) {
  	return activePolicy;
  	}
  	if (groupPoliciesWithChatEnabled.length === 1) {
  	return groupPoliciesWithChatEnabled.at(0);
  	}
  	return undefined;
  	}

But isPaidGroupPolicy returns true only for Team/Corporate, never Submit:

App/src/libs/PolicyUtils.ts

Lines 993 to 999 in 5eb8701

	function isPaidGroupPolicy(policy: OnyxInputOrEntry<Policy>): boolean {
	return policy?.type === CONST.POLICY.TYPE.TEAM || policy?.type === CONST.POLICY.TYPE.CORPORATE;
	}
	function isSubmitPolicy(policy: OnyxInputOrEntry<Policy>): boolean {
	return policy?.type === CONST.POLICY.TYPE.SUBMIT;
	}

So with a single default Submit workspace: the selector returns [], the active-policy guard rejects the Submit policy, the length-1 branch never runs, and getDefaultChatEnabledPolicy returns undefined. defaultChatEnabledPolicyID is therefore undefined, the !workspaceIDForReportCreation branch fires, and the user is pushed to the picker.

Meanwhile the picker screen filters only on isPolicyExpenseChatEnabled + shouldShowPolicy (no isPaidGroupPolicy), so the Submit workspace is listed — yielding the nonsensical "choose from a list of one" screen:

App/src/pages/DynamicNewReportWorkspaceSelectionPage.tsx

Lines 211 to 219 in 5eb8701

	for (const policy of Object.values(policies)) {
	if (
	policy?.isJoinRequestPending ||
	!policy?.isPolicyExpenseChatEnabled ||
	!shouldShowPolicy(policy, false, currentUserPersonalDetails?.login) ||
	(hasPerDiemTransactions && !canSubmitPerDiemExpenseFromWorkspace(policy))
	) {
	continue;
	}

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

Treat Submit workspaces as valid default report workspaces in the resolution path, using the existing isGroupPolicy helper (isPaidGroupPolicy(policy) || isSubmitPolicy(policy)), whose docstring already states it should be used "when Submit workspaces should be treated like paid workspaces" —

App/src/libs/PolicyUtils.ts

Lines 1023 to 1032 in 5eb8701

	/**
	* Returns true for any group workspace: paid (Team/Corporate) or Submit.
	*
	* Note: not to be confused with `ReportUtils.isGroupPolicy(policyType: string)`,
	* which excludes Submit. Use this helper when Submit workspaces should be treated
	* like paid workspaces (e.g. access gating for shared workspace pages).
	*/
	function isGroupPolicy(policy: OnyxInputOrEntry<Policy>): boolean {
	return isPaidGroupPolicy(policy) || isSubmitPolicy(policy);
	}

1. In the selector (src/selectors/Policy.ts):

-        (policy): policy is Policy => !!policy?.isPolicyExpenseChatEnabled && !policy?.isJoinRequestPending && isPaidGroupPolicy(policy) && shouldShowPolicy(policy, false, currentUserLogin),
+        (policy): policy is Policy => !!policy?.isPolicyExpenseChatEnabled && !policy?.isJoinRequestPending && isGroupPolicy(policy) && shouldShowPolicy(policy, false, currentUserLogin),

2. In getDefaultChatEnabledPolicy's active-policy guard (src/libs/PolicyUtils.ts):

-    if (activePolicy && activePolicy.isPolicyExpenseChatEnabled && isPaidGroupPolicy(activePolicy)) {
+    if (activePolicy && activePolicy.isPolicyExpenseChatEnabled && isGroupPolicy(activePolicy)) {

Add isGroupPolicy to the imports in src/selectors/Policy.ts (isPaidGroupPolicy stays — still used at L78). With this, a single default Submit workspace resolves defaultChatEnabledPolicyID and the report creates directly via the existing handleCreateWorkspaceReport → createNewReport, which already accepts Submit policies (the picker passes them today). No beta gate is needed because Submit policies only exist when SUBMIT_2026 is enabled — consistent with how isGroupPolicy is used elsewhere. Because this is the shared resolution path, the same fix corrects the global FAB "Create report" (QuickCreationActionsBar) and the other consumers (useCreateReport, CreateReportMenuItem, EmptySearchView).

What alternative solutions did you explore? (Optional)

• Special-case Submit inside SearchActionsBarCreateButton — rejected; it duplicates the fix across every consumer of the shared selector/helper. Fixing the resolution path is the single source of truth.
• Change isPaidGroupPolicy to include SUBMIT — rejected; that helper is load-bearing across billing/subscription/many flows, so widening it has a large blast radius. isGroupPolicy already exists precisely to mean "paid or Submit."
• Broaden the picker filter instead — rejected; the picker already lists Submit correctly. The defect is the gate, not the list.

[melvin-bot]

Current assignees @hungvu193 and @abzokhattab are eligible for the External assigner, not assigning anyone new.

[aswin-s]

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

On Web, when a user with the Submit2026 beta has only one workspace (a Submit workspace) set as default and creates a report via Spend > Create + > Create report, they are shown the "Choose workspace for report" screen listing only that single workspace. Since there is exactly one default workspace, the report should be created automatically without showing the picker.

What is the root cause of that problem?

isPaidGroupPolicy (src/libs/PolicyUtils.ts:993-994) only returns true for TEAM and CORPORATE types, excluding SUBMIT. As a result, getGroupPaidPoliciesWithExpenseChatEnabled (src/libs/PolicyUtils.ts:2055-2056) filters out the user's lone Submit workspace, leaving groupPoliciesWithChatEnabled empty. getDefaultChatEnabledPolicy (src/libs/PolicyUtils.ts:2067-2077) then returns undefined, so in the Spend create flow (src/components/Search/SearchPageHeader/SearchActionsBarCreateButton.tsx:160) !workspaceIDForReportCreation is true and the user is sent unconditionally to the workspace selector. Meanwhile the selector page itself (src/pages/DynamicNewReportWorkspaceSelectionPage.tsx:212-219) uses a looser predicate (isPolicyExpenseChatEnabled + shouldShowPolicy) that does include the Submit workspace, so it renders that single workspace instead of skipping.

The same predicate mismatch exists in the FAB create-report entry point. chatEnabledPaidGroupPoliciesSelector in src/pages/inbox/sidebar/FABPopoverContent/menuItems/CreateReportMenuItem.tsx:27-45 calls isPaidGroupPolicy as part of its filter, which also excludes Submit workspaces. This means the useCreateReport hook that CreateReportMenuItem feeds also receives an empty groupPoliciesWithChatEnabled list and navigates to the picker instead of creating the report directly.

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

1. In src/libs/PolicyUtils.ts, update isPaidGroupPolicy (lines 993–994) or create a gated helper (e.g. isPaidOrSubmitGroupPolicy) that additionally returns true for SUBMIT type when the SUBMIT_2026 beta is active, mirroring how isSubmitPolicy/canAccessSubmitWorkspaceFeatures (lines 997–1007) already identify Submit policies.

2. Update getGroupPaidPoliciesWithExpenseChatEnabled (src/libs/PolicyUtils.ts:2051-2058) to accept Submit policies (via the helper above) when the SUBMIT_2026 beta is enabled, so a single default Submit workspace yields a non-undefined result from getDefaultChatEnabledPolicy.

3. Apply the same inclusion to every consumer of the paid-policy selector so behavior is consistent across all create-report entry points:

   • Spend header button: src/components/Search/SearchPageHeader/SearchActionsBarCreateButton.tsx:50-64 — the groupPaidPoliciesWithChatEnabledSelector / getDefaultChatEnabledPolicy inputs must include Submit workspaces.
   • FAB popover: src/pages/inbox/sidebar/FABPopoverContent/menuItems/CreateReportMenuItem.tsx:27-45 — chatEnabledPaidGroupPoliciesSelector also calls isPaidGroupPolicy; apply the same beta-gated inclusion so useCreateReport receives the Submit workspace and short-circuits correctly.
   • Quick creation bar: src/components/Navigation/QuickCreationActionsBar/index.tsx:60-64.
   • useCreateReport hook: src/hooks/useCreateReport.tsx:65-68 and its caller src/pages/Search/EmptySearchView.tsx:81.

4. Verify the auto-create path in DynamicNewReportWorkspaceSelectionPage is not reached once the callers short-circuit; no change needed there since its predicate already includes Submit workspaces.

Example adjustment for the shared utility (step 1–2):

// src/libs/PolicyUtils.ts
function isPaidOrSubmitGroupPolicy(policy: OnyxEntry<Policy>, isBetaEnabled: boolean): boolean {
    if (isBetaEnabled && isSubmitPolicy(policy)) {
        return true;
    }
    return isPaidGroupPolicy(policy);
}

function getGroupPaidPoliciesWithExpenseChatEnabled(
    policies: OnyxCollection<Policy>,
    currentUserLogin: string | undefined,
    isSubmit2026BetaEnabled: boolean,
): Policy[] {
    return Object.values(policies ?? {}).filter(
        (policy): policy is Policy =>
            !!policy?.isPolicyExpenseChatEnabled &&
            !policy.isJoinRequestPending &&
            isPaidOrSubmitGroupPolicy(policy, isSubmit2026BetaEnabled) &&
            shouldShowPolicy(policy, false, currentUserLogin),
    );
}

Example adjustment for the FAB selector (step 3, FAB entry point):

// src/pages/inbox/sidebar/FABPopoverContent/menuItems/CreateReportMenuItem.tsx
const chatEnabledPaidGroupPoliciesSelector = (
    policies: OnyxCollection<OnyxTypes.Policy>,
    currentUserLogin: string | undefined,
    isSubmit2026BetaEnabled: boolean,
) => {
    if (isEmptyObject(policies)) {
        return CONST.EMPTY_ARRAY;
    }
    const result: OnyxTypes.Policy[] = [];
    for (const policy of Object.values(policies)) {
        if (
            !policy?.isPolicyExpenseChatEnabled ||
            policy?.isJoinRequestPending ||
            !isPaidOrSubmitGroupPolicy(policy, isSubmit2026BetaEnabled) ||
            !shouldShowPolicy(policy, false, currentUserLogin)
        ) {
            continue;
        }
        result.push(policy);
        if (result.length === 2) {
            break;
        }
    }
    return result;
};

What alternative solutions did you explore? (Optional)

Add auto-skip logic inside DynamicNewReportWorkspaceSelectionPage to create the report directly when filteredAndSortedUserWorkspaces.length === 1; rejected because it diverges from the existing centralized "single default workspace → create directly" logic in the callers and would mask the underlying predicate inconsistency across all entry points (Spend header, FAB, quick creation bar).

[dilshodmackbook-sketch]

🚫 Duplicated proposal withdrawn by 🤖 ProposalPolice.

[melvin-bot]

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