fix: tag Control-tier upgrade features with requiredPlan for Submit workspaces by neerajbachani · Pull Request #100082 · Expensify/App

neerajbachani · 2026-09-01T21:35:15Z

Add requiredPlan: CORPORATE to Control-gated UPGRADE_FEATURE_INTRO_MAPPING entries that were still defaulting Submit upgrades to Collect (report fields, prevent-members-changing-title, GL/tax codes, multi-level tags, approvals).

Derive the Submit upgrade target from the raw mapping lookup by alias so filtered entries like policyPreventMemberChangingTitle upgrade correctly.

$ #93096

Explanation of Change

Control-tier toggles gate on !isControlPolicy(policy), but Submit workspaces upgrading through WorkspaceUpgradePage defaulted to Collect (TEAM) whenever UPGRADE_FEATURE_INTRO_MAPPING had no requiredPlan. After the first upgrade the workspace was still not Control, so disable → re-enable re-opened the Upgrade RHP (issue #93096).

Product confirmed Submit → Report fields should upgrade to Control, stay Control after disable, and not re-prompt on re-enable.

This PR:

Adds requiredPlan: this.POLICY.TYPE.CORPORATE to all remaining Control-gated mapping entries (reportFields, policyPreventMemberChangingTitle, multiApprovalLevels, glCodes, glAndPayrollCodes, taxCodes, multiLevelTags, approvals).
Derives the Submit upgrade target from the raw mapping lookup by alias in WorkspaceUpgradePage, so filtered entries like policyPreventMemberChangingTitle (excluded from intro UI) still upgrade to Control.

Collect-tier Submit features (travelSubmit, payments, etc.) are unchanged and still default to TEAM.

Fixed Issues

$ #93096
PROPOSAL: #93096 (comment)

Tests

Precondition: Expensifail account with submit2026 beta, Submit workspace.

Go to Workspace settings → Reports.
Enable Report fields → confirm Control upgrade RHP → tap Upgrade → workspace becomes Control.
Disable Report fields → workspace stays Control.
Re-enable Report fields → toggles on without Upgrade RHP.
On a fresh Submit workspace, enable Prevent members from changing custom names first → upgrade → disable → re-enable → no Upgrade loop.
On Submit workspace with tags, enable GL codes → upgrade → disable → re-enable → no Upgrade loop.
More Features → enable Travel on Submit workspace → still upgrades to Collect (regression check).

Verify that no errors appear in the JS console

Offline tests

Same as Tests — the upgrade target is computed locally from the feature mapping, so the correct plan is chosen offline. The upgrade completes once back online.

QA Steps

Precondition: Expensifail account, Submit workspace on staging.

Go to staging.new.expensify.com → Workspace settings → Reports.
Enable Report fields → tap Upgrade on Control upgrade RHP.
Verify workspace upgrades to Control.
Disable, then re-enable Report fields → verify Upgrade RHP does not reappear.
Repeat steps 2–4 for Prevent members from changing custom names on the same page.
On Submit workspace with tags enabled, repeat disable/re-enable for GL codes.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-09-04.at.12.28.33.AM.online-video-cutter.com.mp4

Android: mWeb Chrome

Record_2026-09-04-11-14-33.online-video-cutter.com.mp4

iOS: Native

Simulator.Screen.Recording.-.iPhone.17.Pro.-.2026-09-04.at.00.23.35.online-video-cutter.com.mp4

iOS: mWeb Safari

Screen.Recording.2026-09-04.at.11.40.39.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2026-08-03.at.1.00.36.PM.online-video-cutter.com.mp4

…orkspaces Add requiredPlan: CORPORATE to Control-gated UPGRADE_FEATURE_INTRO_MAPPING entries that were still defaulting Submit upgrades to Collect (report fields, prevent-members-changing-title, GL/tax codes, multi-level tags, approvals). Derive the Submit upgrade target from the raw mapping lookup by alias so filtered entries like policyPreventMemberChangingTitle upgrade correctly. Fixes Expensify#93096

melvin-bot · 2026-09-01T21:35:22Z

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

dylanexpensify

good from a product perspective 👍

thelullabyy · 2026-09-03T18:36:10Z

Reviewer Checklist

Screenshots/Videos

Android: HybridApp

Screen.Recording.2026-09-06.at.21.33.31.mov

Android: mWeb Chrome

Screen.Recording.2026-09-06.at.21.29.07.mov

iOS: HybridApp

Screen.Recording.2026-09-06.at.21.01.05.mov

iOS: mWeb Safari

Screen.Recording.2026-09-06.at.20.54.12.mov

MacOS: Chrome / Safari

Screen.Recording.2026-09-06.at.20.51.43.mov

thelullabyy · 2026-09-04T17:22:00Z

                alias: 'policy-prevent-member-changing-title',
                name: undefined,
                icon: undefined,
+                requiredPlan: this.POLICY.TYPE.CORPORATE,


Why do we need add requiredPlan for others? Isn't the issue only about report fields @neerajbachani

@thelullabyy the issue repro is Report fields, but the root cause is the same across Control-gated features on Submit:

Toggle gates on !isControlPolicy

Submit upgrade defaults to Collect when there's no requiredPlan

After upgrade, isControlPolicy is still false → disable/re-enable loops

That's exactly what #92872 fixed for rules-approval features; Report fields and others were just never tagged.

Why not only reportFields?

Same page, same bug - "Prevent members from changing custom names" uses the same gate and the same mapping pattern (policyPreventMemberChangingTitle). I repro'd the loop there too when testing lorretheboy's one-line fix (only reportFields gets requiredPlan).

Same pattern elsewhere - I also hit it on GL codes / tags on Submit (#93096 comment). Melvin flagged the same list on #92864.

Matches the approved approach - Product confirmed Submit → Report fields should land on Control (#93096 comment). Tagging requiredPlan: CORPORATE on Control-gated entries is the same pattern as Upgrade Submit workspaces to the plan tier required by the unlocked feature #92872, just completing what that PR scoped down for the deploy blocker.

policyPreventMemberChangingTitle needs the alias lookup fix anyway - it's filtered out of feature on the upgrade page, so adding requiredPlan there only works with the WorkspaceUpgradePage change.

The goal is to fix this pattern across the codebase so we don't keep filing duplicate issues for the same root cause

@thelullabyy Here are videos that might make it clearer.

The members toggle (policyPreventMemberChangingTitle) — same loop if we only add requiredPlan on reportFields:

Screen.Recording.2026-08-11.at.4.14.33.PM.online-video-cutter.com.mp4

Same pattern on tags / GL codes — disable → re-enable on Submit loops again:

Screen.Recording.2026-08-18.at.7.33.06.PM.mov

A reportFields-only change doesn’t cover the members toggle on the same page, that’s why policyPreventMemberChangingTitle is in this PR too.

thelullabyy

LGTM

grgia · 2026-09-07T11:46:41Z

        await waitForBatchedUpdates();
    });

+    it('should upgrade a Submit workspace to Corporate when unlocking Report fields', async () => {


NAB. should we add the same test for policyPreventMemberChangingTitle.alias? the two new cases pass without the upgradeFeatureByAlias change, so nothing catches a refactor back to reading requiredPlan off feature

@grgia Added the test for policyPreventMemberChangingTitle.alias

…e alias Add a WorkspaceUpgradeTest case for the filtered alias path so refactors that read requiredPlan from feature instead of upgradeFeatureByAlias fail CI. Also add upgrade-button testID to GenericFeaturesView for test parity with UpgradeIntroView.

neerajbachani · 2026-09-09T16:45:25Z

@grgia Friendly bump on this one :)

neerajbachani · 2026-09-15T12:17:43Z

@grgia Friendly bump, thanks!!

neerajbachani · 2026-09-18T15:19:30Z

@grgia now that the PR is approved, is there anything left to get this merged?

github-actions · 2026-09-18T15:22:20Z

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

OSBotify · 2026-09-18T15:24:55Z

✋ 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-09-18T15:26:18Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-ea3f7d7-7288901-96942956bddc3ed0c7ebd4388cfb586cb24ba2d9/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-ea3f7d7-7288901-0dca4e412f671b5dab721bc89637abf6e891b191/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-09-18T20:19:13Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.4.90-0 🚀

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

MelvinBot · 2026-09-18T20:28:07Z

Yes — help site changes were required. Draft PR: Docs updates for E/A#100082 Submit workspace upgrade plan per feature

Why: this PR makes the upgrade target deterministic for free Submit workspaces — turning on a Control-only feature now upgrades straight to Control instead of Collect, and the workspace keeps that plan if the feature is turned off again. Two articles under docs/articles contradicted or omitted that.

What changed in the docs PR

File	Change
docs/articles/new-expensify/getting-started/Submit-Workspace.md	The upgrade section listed only two paths (switching Plan type in Overview, an approver clicking Approve) and never mentioned upgrading by turning on a feature. Added that path plus a new section naming which plan each feature upgrades to, and that the plan sticks after you turn the feature back off.
docs/articles/new-expensify/workspaces/Enable-Report-Fields.md	Steps pointed at More features > Report Fields, which no longer exists — the Report fields toggle lives on the workspace Reports page. Fixed navigation in all three sections and documented the upgrade prompt, including the direct-to-Control upgrade for Submit workspaces.

How I verified the labels and the plan split

Labels were taken from src/languages/en.ts on main (the source of the rendered strings), not paraphrased: Reports (common.reports), Report fields (workspace.common.reportFields), Prevent members from changing custom report titles, GL codes, GL & Payroll codes, Tax codes, Multi-level tags, Multiple approval levels, Prevent self-approvals, Per diem, Rules, Upgrade (common.upgrade).

The Control vs Collect split in the new section comes from requiredPlan in UPGRADE_FEATURE_INTRO_MAPPING after your change — entries with requiredPlan: CORPORATE are documented as upgrading to Control, and the entries with no requiredPlan (categories, travelSubmit, companyCardSubmit, approvalSubmit, payments) as upgrading to Collect.

Navigation was confirmed in code, not assumed: src/pages/workspace/getWorkspaceMenuItems.ts:221 adds the Reports item, and src/pages/workspace/reports/WorkspaceReportsPage.tsx:186 renders the Report fields section there. The More features page has no report fields toggle.

Written against docs/HELPSITE_NAMING_CONVENTIONS.md, docs/HELP_AUTHORING_GUIDELINES.md, and docs/TEMPLATE.md: one # title per article, task-based ## headings, bolded sentence-case UI labels, relative links with descriptive anchor text, and no links inside numbered steps.

Two things to flag:

I could not add you as an assignee on the docs PR — GitHub rejects it because your permission on Expensify/App is read. The label HelpDot is applied, the PR is a draft, and you're tagged in the body. Someone with write access can assign you if you want it on your list.
Enable-Report-Fields.md still uses three # headings and the prose casing "Report Fields" rather than the UI's "Report fields". Fixing that means restructuring the whole article, which is unrelated to this behavior change, so I left it out and noted it in the docs PR.

@neerajbachani, please review the linked help site PR and confirm it reflects the current behavior. Then mark the linked help site PR Ready for review

OSBotify · 2026-09-21T18:42:56Z

🚀 Deployed to production by https://github.com/lakchote in version: 9.4.90-2 🚀

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

Bundle Size Analysis (Sentry):

Android

neerajbachani requested review from a team as code owners September 1, 2026 21:35

melvin-bot Bot assigned neerajbachani Sep 1, 2026

melvin-bot Bot requested review from dylanexpensify and thelullabyy and removed request for a team September 1, 2026 21:35

melvin-bot Bot removed the request for review from a team September 1, 2026 21:35

dylanexpensify previously approved these changes Sep 3, 2026

View reviewed changes

thelullabyy reviewed Sep 4, 2026

View reviewed changes

thelullabyy approved these changes Sep 6, 2026

View reviewed changes

melvin-bot Bot requested a review from grgia September 6, 2026 13:34

grgia reviewed Sep 7, 2026

View reviewed changes

neerajbachani dismissed dylanexpensify’s stale review via 7d68c1a September 7, 2026 12:16

neerajbachani requested a review from grgia September 7, 2026 12:23

grgia approved these changes Sep 8, 2026

View reviewed changes

grgia merged commit ea3f7d7 into Expensify:main Sep 18, 2026
37 of 39 checks passed

OSBotify mentioned this pull request Sep 18, 2026

Deploy Checklist: New Expensify 2026-09-18 #101620

Closed

74 tasks done

MelvinBot mentioned this pull request Sep 18, 2026

[No QA] Docs updates for E/A#100082 Submit workspace upgrade plan per feature #101627

Closed

3 of 40 tasks

melvin-bot Bot mentioned this pull request Sep 21, 2026

[Due for payment 2026-09-28] [$250] Upgrade page reappears after upgrading Submit WS via Report fields, disabling & reenabling it #93096

Closed

1 of 7 tasks

Conversation

neerajbachani commented Sep 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Sep 1, 2026

Uh oh!

dylanexpensify left a comment

Choose a reason for hiding this comment

Uh oh!

thelullabyy commented Sep 3, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

thelullabyy Sep 4, 2026

Choose a reason for hiding this comment

Uh oh!

neerajbachani Sep 4, 2026

Choose a reason for hiding this comment

Uh oh!

neerajbachani Sep 4, 2026

Choose a reason for hiding this comment

Uh oh!

thelullabyy left a comment

Choose a reason for hiding this comment

Uh oh!

grgia Sep 7, 2026

Choose a reason for hiding this comment

Uh oh!

neerajbachani Sep 7, 2026

Choose a reason for hiding this comment

Uh oh!

neerajbachani commented Sep 9, 2026

Uh oh!

neerajbachani commented Sep 15, 2026

Uh oh!

neerajbachani commented Sep 18, 2026

Uh oh!

Uh oh!

github-actions Bot commented Sep 18, 2026

Uh oh!

OSBotify commented Sep 18, 2026

Uh oh!

github-actions Bot commented Sep 18, 2026

Uh oh!

OSBotify commented Sep 18, 2026

Uh oh!

MelvinBot commented Sep 18, 2026

Uh oh!

OSBotify commented Sep 21, 2026

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

neerajbachani commented Sep 1, 2026 •

edited

Loading

thelullabyy commented Sep 3, 2026 •

edited

Loading