[$250] Upgrade opens after upgrading Submit WS via Prevent self-approvals, disabling & reenabling it

[applause-bot]

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: 9.4.0-0
Reproducible in staging?: Yes
Reproducible in production?: N/A - new feature, doesn't exist in prod
If this was caught during regression testing, add the test name, ID and link from BrowserStack: #91258
Email or phone of affected tester (no customers): applausetester+ssndjois2jd1@applause.expensifail.com
Issue reported by: Applause Internal Team
Bug source: Exploratory - Significant User Experience Deterioration
Device used: Mac 26.5 / Chrome
App Component: Workspace Settings

Action Performed:

Precondition:

• Log in with Expensifail account.
• Create a Submit workspace on OD.

1. Go to staging.new.expensify.com
2. Go to workspace settings > Workflows.
3. Enable Prevent self-approvals.
4. Click Upgrade.
5. Close the RHP.
6. Disable and enable Prevent self-approvals.

Expected Result:

Upgrade page will not open after upgrading workspace via Prevent self-approvals, disabling and reenabling it.

Actual Result:

Upgrade page opens after upgrading workspace via Prevent self-approvals, disabling and reenabling it.

Workaround:

Unknown

Platforms:

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

Screenshots/Videos

Bug7173662_1780766173454.24.mp4

View all open jobs on GitHub

Applause Internal Information
Exported by: Julia Ponikarchuk
Bug ID: 7173662

Upwork Automation - Do Not Edit

• Upwork Job URL: https://www.upwork.com/jobs/~022063536468976158396
• Upwork Job ID: 2063536468976158396
• Last Price Increase: 2026-06-07

[applause-bot]

While Applause doesn't embed attachments for this bug, here are the links for quick view:
https://platform.applause.com/services/links/v1/external/64deb3495d471e76616d60c2a855e5802951fbaced82ba146649a5a92f1dd18c

[melvin-bot]

@iwiznia recently merged #91258, but they are OOO right now, so I'll auto-assign someone else.

[melvin-bot]

Triggered auto assignment to @JS00001 (DeployBlockerCash), see https://stackoverflowteams.com/c/expensify/questions/9980/ for more details.

[melvin-bot]

💬 A slack conversation has been started in #expensify-open-source

[github-actions]

👋 Friendly reminder that deploy blockers are time-sensitive ⏱ issues! Check out the open `StagingDeployCash` deploy checklist to see the list of PRs included in this release, then work quickly to do one of the following:

1. Identify the pull request that introduced this issue and revert it.
2. Find someone who can quickly fix the issue.
3. Fix the issue yourself.

[MelvinBot]

Proposal

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

After upgrading a Submit workspace by enabling Prevent self-approvals, disabling and re-enabling that toggle re-opens the Upgrade page, even though the workspace was already upgraded.

What is the root cause of that problem?

The Prevent self-approvals toggle is a Control-tier rule. Its onToggle opens the Upgrade page whenever the policy is not a Control policy:

ExpenseReportRulesSection.tsx:56-62 — if (isEnabled && !isControlPolicy(policy)) { Navigation.navigate(...WORKSPACE_UPGRADE...preventSelfApproval...) }

When a Submit workspace upgrades through this flow, onUpgradeToCorporate only upgrades to Corporate (Control) for a hard-coded list of feature ids — otherwise it upgrades to Team (Collect):

WorkspaceUpgradePage.tsx:174-181

const isCorporateUpgrade =
    feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.perDiem.id ||
    feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.rules.id ||
    feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.hr.id;
const targetType = isCorporateUpgrade ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;
upgradeSubmit(policy, targetType, ...);

preventSelfApproval (and the sibling rules-approval features autoApproveCompliantReports, autoPayApprovedReports) are not in that list, so the workspace is upgraded to Collect/Team, not Control. isControlPolicy(policy) is therefore still false afterward, so re-enabling the toggle re-triggers the Upgrade navigation. This is a regression from #91258.

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

Add the three Control-tier rules-approval feature ids to the isCorporateUpgrade check in WorkspaceUpgradePage.tsx so the Submit→upgrade path targets CORPORATE for them:

const isCorporateUpgrade =
    feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.perDiem.id ||
    feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.rules.id ||
    feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.hr.id ||
    feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.preventSelfApproval.id ||
    feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.autoApproveCompliantReports.id ||
    feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.autoPayApprovedReports.id;

This matches the toggles' own !isControlPolicy(policy) gating, so once upgraded the workspace is Control and the toggle no longer re-opens the Upgrade page. The same fix resolves the identical latent bug for Auto-approve compliant reports and Auto-pay approved reports, which share the gate at ExpenseReportRulesSection.tsx:80 and :128.

Alternative considered

Relaxing the toggle gate from !isControlPolicy(policy) to !isPaidGroupPolicy(policy) would also stop the re-prompt, but that would incorrectly make these Control-only rules available on Collect workspaces (and would diverge from the rules feature, which already upgrades to Corporate). Aligning the upgrade target with the existing Control requirement is the correct scope.

---

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