Fix/align workspace selector logic v2 by jmusial · Pull Request #102844 · Expensify/App

jmusial · 2026-10-02T08:31:17Z

Explanation of Change

A follow-up to #98973 (details), and the re-land of #101430, which was reverted in #102134 after deploy blocker #102130.

Aligns "Create report" with the intended workspace selector rules:

When the user's domain security group locks them to a preferred workspace, that workspace is their default (confirmed here). The workspace selector is skipped no matter how many workspaces they belong to.
If that preferred workspace is also billing-restricted, the billing restriction page opens instead of the selector.
The FAB no longer truncates eligible workspaces with .slice(0, 2), so a default workspace that is 3rd or later in the list creates the report directly.

Behaviour change vs production: domain-locked users who see the workspace selector today will stop seeing it. This is intended.

What changed since #101430

Preferred workspace is read by Onyx key. [Due for payment 2026-10-01] Creating new report via FAB automatically uses default WS, not the Preferred one. #102130 searched the caller-provided groupPoliciesWithChatEnabled list for it. When the preferred workspace wasn't in that list, the lock silently did nothing, which is the [Due for payment 2026-10-01] Creating new report via FAB automatically uses default WS, not the Preferred one. #102130 symptom. It is now read directly and validated with the new canCreateReportOnPolicy. A membership-only stub falls back to the normal rules.
Loading gate covers the lock. "Create report" stays hidden and inert until the security group and the preferred workspace have loaded. Before, the lock could read as "not restricted" during hydration.
useCreateReport resolves the default workspace itself. It uses getDefaultChatEnabledPolicySelection selector, and callers no longer pass groupPoliciesWithChatEnabled. Each caller used to build that list differently; for example, the empty Reports view built it without the user's login. This also avoids deep-comparing every eligible policy on each policy_ update, which the FAB started doing once .slice(0, 2) was dropped.
All five entry points share one code path. FAB, Search router and the empty Reports view already used the hook. The Home quick bar "Report" button and the Search header "Create > Create report" item had their own copy of the branching and ignored the lock. They now go through useCreateReport too.

Fixed Issues

$ #101560
PROPOSAL:

Tests

Setup for domain-locked scenarios

Account on a verified domain, member of 3+ workspaces, none owned. A domain admin opens Domains > [domain] > Groups > [account's group], turns on "Preferred Workspace" and picks workspace B. The account's default workspace (Settings > Workspaces, "Default" badge) is a different workspace, A.

Original issue (#101560)

Scenario 1: default workspace 3rd or later in the list

Open app with an account (no domain lock) invited to 3+ workspaces, none owned, no empty report on the third
Navigate to Settings > Workspaces, open the third workspace's menu and choose "Set as default workspace", then FAB > Create report
Verify that the report is created on the third workspace and no workspace selector opens

Scenario 2: domain lock + billing restriction

Open app with the domain-locked account where preferred workspace B's owner is past due beyond the grace period
Navigate to FAB > Create report
Verify that the billing restriction page for workspace B opens instead of the workspace selector

Deploy blocker (#102130)

Scenario 3: domain lock beats the default workspace

Open app with the domain-locked account
Navigate to FAB > Create report
Verify that no workspace selector opens
Verify that the report is created on preferred workspace , not default workspace

Scenario 4: domain lock with a personal default (#101560 (comment))

Open app with the domain-locked account whose default is the personal workspace (e.g. set in Expensify Classic)
Navigate to FAB > Create report
Verify that no workspace selector opens and the report is created on preferred workspace

New in this PR

Scenario 5: domain lock on every Create report entry point

Open app with the domain-locked account on a wide layout (desktop web)
Navigate to Spend > "Create report", the search router (type "Create report", select it), and the empty Reports view "Create report" button
Verify that each one creates the report on preferred workspace B with no workspace selector

Showing selector example

Scenario 6: billing-restricted default with other workspaces (selector expected)

Open app with an account (no domain lock) invited to 2+ workspaces, none owned, default workspace A's owner past due beyond the grace period, workspace B's owner in good standing
Navigate to FAB > Create report
Verify that the workspace selector opens instead of the billing restriction page
Verify that picking workspace B creates the report on workspace B

Offline tests

N/A

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

MacOS: Chrome / Safari

Scenarios 1 - 5

Screen.Recording.2026-10-07.at.12.55.16.mov

Scenario 6

Screen.Recording.2026-10-07.at.12.59.54.mov

…430-fix/align-workspace-selector-logic' + fixed

codecov · 2026-10-02T08:34:42Z

Codecov Report

❌ Looks like you've decreased code coverage for some files. Please write tests to increase, or at least maintain, the existing level of code coverage. See our documentation here for how to interpret this table.

Files with missing lines	Coverage Δ
...nents/Navigation/QuickCreationActionsBar/index.tsx	`95.38% <100.00%> (+3.07%)`	⬆️
.../SearchPageHeader/SearchActionsBarCreateButton.tsx	`93.87% <100.00%> (-2.23%)`	⬇️
...rch/SearchRouter/useCreateNavigationSuggestions.ts	`98.66% <100.00%> (-0.04%)`	⬇️
src/hooks/useCreateReport.tsx	`100.00% <100.00%> (ø)`
src/hooks/usePreferredPolicy.ts	`100.00% <100.00%> (ø)`
src/libs/PolicyUtils/policy.ts	`82.00% <100.00%> (+0.24%)`	⬆️
...BPopoverContent/menuItems/CreateReportMenuItem.tsx	`96.00% <100.00%> (+8.50%)`	⬆️
src/pages/Search/EmptySearchView.tsx	`75.17% <50.00%> (-0.35%)`	⬇️
... and 12 files with indirect coverage changes

Home quick bar and Search header Create menu bypassed the hook and ignored the domain preferred-workspace lock (Expensify#102130). The hook now resolves the default workspace itself via a scalar selector, so callers no longer pass groupPoliciesWithChatEnabled.

jmusial · 2026-10-02T11:07:13Z

@MelvinBot are you able to run web only ad hoc on this PR ?

MelvinBot · 2026-10-02T11:19:39Z

🤖 Web test steps verification results: ⚠️ partial

Every scenario this test account could run passed: each "Create report" entry point went straight to the default workspace, even when it was 3rd in the list, with no workspace selector. Scenarios 2–4 need a domain-locked account with a preferred workspace set by a domain admin, which the test account can't have, so they were not tested.

Step	Status
Scenario 1: 3rd workspace set as default, FAB > Create report (owned workspaces A, B, C used as an approximation) Set Workspace C (3rd) as default. FAB > Create report created the report on Workspace C with no workspace selector.	✅
Scenario 2: domain lock + billing restriction opens the billing restriction page Not tested. This needs a domain-locked account whose preferred workspace owner is past due. The test account isn't on a verified domain.	⚠️
Scenario 3: domain lock beats the default workspace Not tested. This needs a domain admin to set a preferred workspace on a security group.	⚠️
Scenario 4: domain lock with a personal default Not tested. Same domain admin setup as Scenario 3.	⚠️
Scenario 5: Home > "Report" quick action (wide layout, non-locked account) Showed the "You already have an empty report in Workspace C" prompt. Confirming it created the report on Workspace C with no selector.	✅
Reports > "Create" > "Create report" Same empty-report prompt for Workspace C. Confirming it created the report on Workspace C with no selector.	✅
Search router: type "Create report" and select it Same empty-report prompt for Workspace C. Confirming it created the report on Workspace C with no selector.	✅
Empty Reports view "Create report" button After all drafts were deleted, "No reports yet" showed a "Create report" button. Clicking it created the report on Workspace C with no selector. One earlier click showed a billing "Add payment card" nudge modal once. Later clicks worked normally, so this looks like a one-off double-click race. Watch for it in other runs.	✅

jmusial · 2026-10-02T11:41:15Z

@MelvinBot not what I asked for. Run a web ad hoc build so a human can test scenarios you can't

MelvinBot · 2026-10-02T11:44:20Z

Sorry, I misread your first request. I can't start the ad hoc build. The Build and deploy apps for testing workflow only runs when an Expensify employee with write access dispatches it. That person must also confirm they reviewed the PR for malicious code. This PR comes from a fork, so that review is a human check I shouldn't sign off on.

An Expensify employee can start a web-only build by running that workflow with these inputs:

APP_PULL_REQUEST_URL: Fix/align workspace selector logic v2 #102844
REVIEWED_CODE: checked, after reviewing the diff
WEB: checked
IOS and ANDROID: unchecked

The workflow comments on this PR when it starts and posts the web link when the build is ready.

jmusial · 2026-10-05T12:26:00Z

@MelvinBot review please

MelvinBot · 2026-10-05T12:34:29Z

PR review

I found one likely regression and two smaller issues. The rest looks good: all five entry points now share one code path, the preferred workspace is read by key, and canCreateReportOnPolicy keeps the lock check and the eligible list consistent.

1. Empty Reports view now reads policies from the Search snapshot (likely regression)

EmptySearchViewContent renders inside <SearchScopeProvider> (EmptySearchView.tsx:94). In that scope, App's useOnyx wrapper reads policy_* keys from the current search snapshot instead of live Onyx. POLICY is in SEARCH_SNAPSHOT_ONYX_KEYS, and only todo searches use live data.

Before this PR, the empty view built the eligible list and the policy passed to createNewReport from live data in the outer EmptySearchView. Now useCreateReport reads the collection selector, defaultChatEnabledPolicyByKey and preferredPolicy itself (useCreateReport.tsx:64-72). In this view, all three now come from the snapshot. The codebase already warns that snapshot policies can be partial (useTransactionInlineEdit.ts:32).

Possible effects in the empty Reports view:

If the preferred workspace is missing from the snapshot or only partly there, the lock is silently skipped. That is the same symptom as the deploy blocker.
createNewReport can receive a partial policy, so the optimistic report data (for example, currency or approvers) may be wrong.

Suggested fix: In useCreateReport, read the policy keys with useOnyx from react-native-onyx directly, as useTransactionInlineEdit does. Then the hook always uses live data, whatever scope the caller is in. Also add a test that renders the hook inside SearchScopeProvider with a search hash set.

I traced this in the code but didn't confirm it at runtime.

2. Two entry points ignore `isVisible`

QuickCreationActionsBar (index.tsx:104) and SearchActionsBarCreateButton (SearchActionsBarCreateButton.tsx:85) only use createReport. While data hydrates, the button still shows, but createReport returns early, so a tap does nothing. The description says "Create report" stays hidden during this time. Either hide these two entry points with isVisible or update the description.

3. The loading gate only covers storage reads

isLoadingOnyxValue is only true while Onyx reads from local storage. On a fresh sign-in, MY_DOMAIN_SECURITY_GROUPS counts as loaded but stays empty until OpenApp returns, so the lock reads as off during that window. The existing policy gate has the same limit, so this isn't a blocker. I'm flagging it because the description says the gate covers the lock.

melvin-bot · 2026-10-07T11:02:13Z

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

jmusial · 2026-10-07T11:03:41Z

cc. @trjExpensify could you please take a look @ vids and test steps and confirm they're as expected ?

JmillsExpensify

Mostly cleanup here. LGTM

sobitneupane · 2026-10-08T15:08:40Z

@jmusial I could not verify Scenario 3.

The empty report is created in the default workspace instead of the preferred workspace.

Screen.Recording.2026-10-08.at.20.25.35.mov

trjExpensify · 2026-10-08T15:36:26Z

Overall, looks pretty good! I was going to say the same thing. What happens here?

jmusial · 2026-10-09T08:22:41Z

Overall, looks pretty good! I was going to say the same thing. What happens here?

I think the second browser didn't catch the workspace changes yet. On following tries it was g

github-actions · 2026-10-13T11:44:42Z

🚧 mountiny has triggered a test Expensify/App build. You can view the workflow run here.

huult · 2026-10-13T13:30:27Z

I can help review this PR. Slack

huult · 2026-10-13T13:35:50Z

    shouldHandleNavigationBack = true,
    shouldSkipEmptyReportConfirmation = false,
 }: UseCreateReportParams): UseCreateReportResult {
    const [activePolicyID] = useOnyx(ONYXKEYS.NVP_ACTIVE_POLICY_ID);


@jmusial Can we remove this comment? I don't think it's necessary.

huult · 2026-10-13T13:36:01Z

+    // Read the preferred workspace by key rather than searching the caller's list, so the lock does not depend on
+    // how (or whether) a caller filtered its candidates. Same pattern as useDefaultExpensePolicy.


@jmusial Can we remove this comment? I don't think it's necessary.

huult · 2026-10-13T13:36:29Z


-    const defaultChatEnabledPolicy = getDefaultChatEnabledPolicy(groupPoliciesWithChatEnabled as Array<OnyxEntry<OnyxTypes.Policy>>, activePolicy);
+    // A domain security group can lock members to a preferred workspace. When that workspace can take reports it wins over
+    // the active policy and the selector is skipped. An ineligible preferred workspace (not a member, wrong type) falls back to the normal rules.


@jmusial Can we remove this comment? I don't think it's necessary.

huult · 2026-10-14T05:22:48Z

Scenario 1: default workspace 3rd or later in the list

Screen.Recording.2026-10-14.at.11.50.16.mov

Scenario 2: domain lock + billing restriction

Screen.Recording.2026-10-14.at.11.53.38.mov

Scenario 3: domain lock beats the default workspace

Screen.Recording.2026-10-14.at.12.05.33.mov

Scenario 4: domain lock with a personal default (#101560 (comment))

Screen.Recording.2026-10-14.at.12.14.08.mov

Scenario 5: domain lock on every Create report entry point

Screen.Recording.2026-10-14.at.12.17.39.mov

Scenario 6: billing-restricted default with other workspaces (selector expected)

Screen.Recording.2026-10-14.at.12.21.44.mov

huult · 2026-10-14T05:23:27Z

Reviewer Checklist

Screenshots/Videos

Scenario 1: default workspace 3rd or later in the list

Screen.Recording.2026-10-14.at.11.50.16.mov

Scenario 2: domain lock + billing restriction

Screen.Recording.2026-10-14.at.11.53.38.mov

Scenario 3: domain lock beats the default workspace

Screen.Recording.2026-10-14.at.12.05.33.mov

Scenario 4: domain lock with a personal default (#101560 (comment))

Screen.Recording.2026-10-14.at.12.14.08.mov

Scenario 5: domain lock on every Create report entry point

Screen.Recording.2026-10-14.at.12.17.39.mov

Scenario 6: billing-restricted default with other workspaces (selector expected)

Screen.Recording.2026-10-14.at.12.21.44.mov

huult · 2026-10-14T07:19:22Z

@jmusial Could you check my comment above?

jmusial · 2026-10-14T10:12:20Z

@jmusial Could you check my comment above?

@huult trimmed down the comments

huult

LGTM.

huult · 2026-10-15T02:32:44Z

@jmusial could you sync with main?

huult · 2026-10-20T02:45:06Z

@roryabraham all yours

github-actions · 2026-10-20T02:54:31Z

🚧 roryabraham has triggered a test Expensify/App build. You can view the workflow run here.

OSBotify · 2026-10-20T02:58:27Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

github-actions · 2026-10-20T02:58:52Z

🧪🧪 Use the links below to test this adhoc build on Android, iOS, and Web. Happy testing! 🧪🧪
Built from App PR #102844.

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-cb7e082-977e6a4-8432315c184aa40b79267d0ca033a50f991cd4b1/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-cb7e082-977e6a4-45e51cb95c563f8e99b6436f5fd094828baf4389/index.html

Web 🕸️
https://102844.pr-testing.expensify.com

👀 View the workflow run that generated this build 👀

OSBotify · 2026-10-20T19:40:57Z

🚀 Deployed to staging by https://github.com/roryabraham in version: 9.5.15-1 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

MelvinBot · 2026-10-20T19:45:49Z

No help site update needed. This PR makes Create report behave the way the articles already describe: it opens the report on the default or Preferred Workspace without asking you to pick one.

Articles checked

Create-and-Submit-Reports.md:15: "Select Create report to open a draft report on your default workspace."
Create-and-Manage-Domain-Groups.md:73: Preferred Workspace "Ensures a group’s expenses and reports are automatically routed to a specific workspace…"

view run

IuliiaHerets · 2026-10-21T07:59:40Z

Hi @jmusial. Can you please clarify how to set up the Billing Restricted Workspace in the Admin Domain account?

cc @roryabraham @JmillsExpensify @sobitneupane @huult

kavimuru · 2026-10-21T12:09:54Z

@jmusial We were able to test Scenarios 1,3 and 5.

Scenario 2: domain lock + billing restriction, Scenario 4: domain lock with a personal default and Scenario 6: billing-restricted default with other workspaces (selector expected)

Scenario 4: domain lock with a personal default - unable to find the personal workspace in OD
We weren't able to set up the Billing restricted workspace.

jmusial · 2026-10-21T14:39:27Z

Hi @jmusial. Can you please clarify how to set up the Billing Restricted Workspace in the Admin Domain account?

cc @roryabraham @JmillsExpensify @sobitneupane @huult

I think the workspace needs to be owned by an account that is past due and past its billing grace period.

kavimuru · 2026-10-21T17:49:50Z

@jmusial applause.expensifail.com domain accounts does not have have past its billing grace period accounts.

OSBotify · 2026-10-21T19:29:50Z

🚀 Deployed to production by https://github.com/grgia in version: 9.5.15-3 🚀

platform	result
🕸 web 🕸	success ✅
🤖 android 🤖	success ✅
🍎 iOS 🍎	success ✅

Bundle Size Analysis (Sentry):

Android
iOS

jmusial added 2 commits September 24, 2026 16:32

Revert 'Merge pull request Expensify#102134 from Expensify/revert-101…

cdb9615

…430-fix/align-workspace-selector-logic' + fixed

Merge branch 'main' into fix/align-workspace-selector-logic-v2

6420134

melvin-bot Bot assigned jmusial Oct 2, 2026

Merge branch 'main' into fix/align-workspace-selector-logic-v2

4d083eb

jmusial added 4 commits October 5, 2026 17:36

fix Melvins comments

757233a

update comments

9a4191b

Merge branch 'main' into fix/align-workspace-selector-logic-v2

377e306

Merge branch 'main' into fix/align-workspace-selector-logic-v2

b1ac634

jmusial marked this pull request as ready for review October 7, 2026 11:02

jmusial requested review from a team as code owners October 7, 2026 11:02

melvin-bot Bot requested review from JmillsExpensify and sobitneupane and removed request for a team October 7, 2026 11:02

jmusial mentioned this pull request Oct 8, 2026

[Due for payment 2026-10-28] Create report workspace selector ignores domain restrictions and misfires on the FAB #101560

Closed

JmillsExpensify previously approved these changes Oct 8, 2026

View reviewed changes

This comment has been minimized.

Sign in to view

huult reviewed Oct 13, 2026

View reviewed changes

trimm down commetns

b20d6fb

huult approved these changes Oct 15, 2026

View reviewed changes

melvin-bot Bot requested a review from roryabraham October 15, 2026 02:32

Merge branch 'main' into fix/align-workspace-selector-logic-v2

875d088

roryabraham approved these changes Oct 20, 2026

View reviewed changes

roryabraham merged commit cb7e082 into Expensify:main Oct 20, 2026
34 of 35 checks passed

OSBotify mentioned this pull request Oct 20, 2026

Deploy Checklist: New Expensify 2026-10-20 #104495

Closed

81 tasks done

MelvinBot mentioned this pull request Nov 3, 2026

Consolidate the default-workspace eligibility rule across report and expense flows #105701

Open

		// Read the preferred workspace by key rather than searching the caller's list, so the lock does not depend on
		// how (or whether) a caller filtered its candidates. Same pattern as useDefaultExpensePolicy.

Conversation

jmusial commented Oct 2, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Explanation of Change

What changed since #101430

Fixed Issues

Tests

Setup for domain-locked scenarios

Original issue (#101560)

Scenario 1: default workspace 3rd or later in the list

Scenario 2: domain lock + billing restriction

Deploy blocker (#102130)

Scenario 3: domain lock beats the default workspace

Scenario 4: domain lock with a personal default (#101560 (comment))

New in this PR

Scenario 5: domain lock on every Create report entry point

Showing selector example

Scenario 6: billing-restricted default with other workspaces (selector expected)

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

codecov Bot commented Oct 2, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

jmusial commented Oct 2, 2026

Uh oh!

MelvinBot commented Oct 2, 2026

Uh oh!

jmusial commented Oct 2, 2026

Uh oh!

MelvinBot commented Oct 2, 2026

Uh oh!

jmusial commented Oct 5, 2026

Uh oh!

MelvinBot commented Oct 5, 2026

PR review

1. Empty Reports view now reads policies from the Search snapshot (likely regression)

2. Two entry points ignore isVisible

3. The loading gate only covers storage reads

Uh oh!

melvin-bot Bot commented Oct 7, 2026

Uh oh!

jmusial commented Oct 7, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

sobitneupane commented Oct 8, 2026

Uh oh!

trjExpensify commented Oct 8, 2026

Uh oh!

jmusial commented Oct 9, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Oct 13, 2026

Uh oh!

This comment has been minimized.

huult commented Oct 13, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

huult Oct 13, 2026

Choose a reason for hiding this comment

Uh oh!

huult Oct 13, 2026

Choose a reason for hiding this comment

Uh oh!

huult Oct 13, 2026

Choose a reason for hiding this comment

Uh oh!

huult commented Oct 14, 2026

Uh oh!

huult commented Oct 14, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

jmusial commented Oct 2, 2026 •

edited

Loading

codecov Bot commented Oct 2, 2026 •

edited by github-actions Bot

Loading

2. Two entry points ignore `isVisible`

jmusial commented Oct 9, 2026 •

edited

Loading

huult commented Oct 13, 2026 •

edited

Loading

huult commented Oct 14, 2026 •

edited

Loading