[WIP][Submit] Add paywall gating for restricted features by hungvu193 · Pull Request #87833 · Expensify/App

hungvu193 · 2026-04-14T04:25:29Z

Explanation of Change

In this PR, we add a paywall to redirect user of submit workspace to upgrade page if they attempt to enable these features:
Roles, Approvals, Payments, Accounting, Company Cards, Expensify Card, Travel, and Invoicing

Fixed Issues

$ #87262
PROPOSAL: N/A

Tests

Same as QA Steps

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

// TODO: These must be filled out, or the issue title must include "[No QA]."

Create a new submit workspace.
Go to More Feature > Try to enable one of these features: Accounting, Company Cards, Expensify Card, Travel, and Invoicing
Verify that there's upgrade modal show up.
Go to Workflows (enable it if it's not) > Approvals
Verify that the Approvals toggle is locked.
Click on Add approval workflows > Verify that there's Upgrade modal shows up.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Screen.Recording.2026-04-17.at.14.11.07.mov

melvin-bot · 2026-04-14T04:25:35Z

Hey, I noticed you changed src/languages/en.ts in a PR from a fork. For security reasons, translations are not generated automatically for PRs from forks.

If you want to automatically generate translations for other locales, an Expensify employee will have to:

Look at the code and make sure there are no malicious changes.
Run the Generate static translations GitHub workflow. If you have write access and the K2 extension, you can simply click: [this button]

Alternatively, if you are an external contributor, you can run the translation script locally with your own OpenAI API key. To learn more, try running:

npx ts-node ./scripts/generateTranslations.ts --help

Typically, you'd want to translate only what you changed by running npx ts-node ./scripts/generateTranslations.ts --compare-ref main

codecov · 2026-04-14T04:34:37Z

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 Δ
src/CONST/index.ts	`92.30% <ø> (ø)`
src/libs/PolicyUtils.ts	`65.19% <100.00%> (-0.04%)`	⬇️
src/pages/workspace/upgrade/UpgradeIntro.tsx	`91.89% <100.00%> (+0.22%)`	⬆️
...s/workspace/accounting/AccountingContext/index.tsx	`0.00% <0.00%> (ø)`
...s/workspace/members/WorkspaceMemberDetailsPage.tsx	`0.00% <0.00%> (ø)`
...ges/workspace/workflows/WorkspaceWorkflowsPage.tsx	`0.00% <0.00%> (ø)`
src/pages/workspace/WorkspaceMoreFeaturesPage.tsx	`0.00% <0.00%> (ø)`
...c/pages/workspace/upgrade/WorkspaceUpgradePage.tsx	`31.17% <3.33%> (-5.97%)`	⬇️
... and 11 files with indirect coverage changes

hungvu193 · 2026-04-14T15:19:20Z

Note copy:

https://docs.google.com/document/d/1C0W-dbt_wfC72-F53jTMuVQ8Kb0Cu34Y5m7z_UfljVs/edit?tab=t.0#heading=h.ojon0vncp4ig

hungvu193 · 2026-04-14T17:18:46Z

@MelvinBot Assign yourself and merge main

hungvu193 · 2026-04-14T17:18:52Z

@codex review

Co-authored-by: Hans <hungvu193@users.noreply.github.com>

MelvinBot · 2026-04-14T17:27:36Z

✅ Done! I've assigned myself and merged main into this branch.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 0a124b7c32

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

hungvu193 · 2026-04-15T03:20:41Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3e5db6ac66

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

melvin-bot · 2026-04-16T02:56:16Z

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

hungvu193 · 2026-04-16T02:57:00Z

@abzokhattab You can review it now 😄

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 44fb130126

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

abzokhattab · 2026-04-16T07:38:05Z

@MelvinBot, review the PR

MelvinBot · 2026-04-16T07:42:00Z

PR Review

Overall this is a clean, well-structured PR. The paywall gating pattern is consistent across all entry points. A few suggestions:

1. Hardcoded string literals in `isSubmitFeature` check

UpgradeIntro.tsx:49-52 — The feature ID list uses raw strings instead of referencing CONST values:

['companyCardSubmit', 'travelSubmit', 'approvalSubmit', 'roles', 'payments', 'accounting', 'expensifyCard', 'invoicing'].includes(feature.id as string)

If any id in CONST.UPGRADE_FEATURE_INTRO_MAPPING changes, this silently breaks. Consider referencing the CONST values directly, e.g.:

[
  CONST.UPGRADE_FEATURE_INTRO_MAPPING.companyCardSubmit.id,
  CONST.UPGRADE_FEATURE_INTRO_MAPPING.travelSubmit.id,
  // ...etc
].includes(feature.id)

2. Expensify Card button text applies globally, not just to submit policies

UpgradeIntro.tsx:170 — The custom "Upgrade and enable" button text triggers for any expensifyCard upgrade, not just submit-policy context:

text={feature.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.expensifyCard.id ? translate('workspace.upgrade.expensifyCard.upgradeButton') : translate('common.upgrade')}

Currently safe since the only navigation path to this feature's upgrade page is behind isSubmitPolicy. But it would be more defensive to guard with isSubmitFeature:

text={isSubmitFeature && feature.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.expensifyCard.id ? ... }

3. Minor: submit check placement in AccountingContext

AccountingContext/index.tsx:55-58 — The isSubmitPolicy check is placed after getAccountingIntegrationData(). That function is pure (no side effects), so this isn't a bug, but moving the check before it would avoid the wasted computation and read more clearly.

4. Approvals toggle missing `isEnabled` guard

WorkspaceWorkflowsPage.tsx:338 — The approvals toggle redirects to upgrade without checking isEnabled:

if (isSubmitPolicy(policy)) {
    Navigation.navigate(...);
    return;
}

Other toggles in WorkspaceMoreFeaturesPage.tsx correctly check isEnabled && isSubmitPolicy(policy) so that disabling a feature still works. The approvals toggle should do the same — otherwise toggling approvals OFF on a submit workspace would also redirect to the upgrade page instead of disabling the feature.

The payments toggle at line 421 correctly uses isEnabled && isSubmitPolicy(policy) — the approvals toggle should match that pattern.

Items 1-3 are nits. Item 4 looks like a bug worth fixing before merge.

JmillsExpensify

LGTM. Part of an existing product initiative.

abzokhattab · 2026-04-16T09:28:18Z

lets also add WIP to the title as the screenshots are not yet there

abzokhattab · 2026-04-16T09:28:37Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 44fb130126

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

hungvu193 · 2026-04-17T06:55:50Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 3a167b4bf5

ℹ️ About Codex in GitHub

Codex has been enabled to automatically review pull requests in this repo. Reviews are triggered when you

Open a pull request for review
Mark a draft as ready
Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

When you sign up for Codex through ChatGPT, Codex can also answer questions or update the PR, like "@codex address that feedback".

hungvu193 · 2026-04-23T03:58:19Z

@MelvinBot merge main and revert change in MobileExpensify

MelvinBot · 2026-04-23T03:59:05Z

⚠️ I can't push changes to this PR because I didn't open it and I'm not listed as an assignee. To have me merge main, add me to the PR assignees and then retry your request.

hungvu193 · 2026-04-23T03:59:51Z

@MelvinBot Assign yourself to this PR, then revert the changes from MobileExpensify

MelvinBot · 2026-04-23T04:01:25Z

⚠️ I can't push changes to this PR because I didn't open it and I'm not listed as an assignee. To have me merge main and revert the MobileExpensify change, add me to the PR assignees and then retry your request.

Co-authored-by: Hans <hungvu193@users.noreply.github.com>

MelvinBot · 2026-04-23T04:03:53Z

Done — assigned myself and reverted the Mobile-Expensify submodule pointer back to main (0acb232).

Add paywall gating for restricted features

b4f31a6

melvin-bot Bot assigned hungvu193 Apr 14, 2026

update copy

0a124b7

MelvinBot assigned OSBotify Apr 14, 2026

Merge remote-tracking branch 'origin/main' into feat-87262

6efb295

Co-authored-by: Hans <hungvu193@users.noreply.github.com>

chatgpt-codex-connector Bot reviewed Apr 14, 2026

View reviewed changes

Comment thread src/libs/PolicyUtils.ts

Comment thread src/pages/workspace/upgrade/UpgradeIntro.tsx

update pricing copy

3e5db6a

chatgpt-codex-connector Bot reviewed Apr 15, 2026

View reviewed changes

Comment thread src/libs/PolicyUtils.ts Outdated

remove deafult value

44fb130

hungvu193 marked this pull request as ready for review April 16, 2026 02:56

hungvu193 requested review from a team as code owners April 16, 2026 02:56

melvin-bot Bot requested a review from abzokhattab April 16, 2026 02:56

melvin-bot Bot requested review from JmillsExpensify and removed request for a team April 16, 2026 02:56

chatgpt-codex-connector Bot reviewed Apr 16, 2026

View reviewed changes

Comment thread src/CONST/index.ts

JmillsExpensify previously approved these changes Apr 16, 2026

View reviewed changes

chatgpt-codex-connector Bot reviewed Apr 16, 2026

View reviewed changes

Comment thread src/CONST/index.ts

Comment thread src/pages/workspace/WorkspaceMoreFeaturesPage.tsx

hungvu193 changed the title ~~[Submit] Add paywall gating for restricted features~~ [WIP][Submit] Add paywall gating for restricted features Apr 16, 2026

update es translations

a486d81

hungvu193 dismissed JmillsExpensify’s stale review via a486d81 April 17, 2026 06:45

add expensify card options

3a167b4

Merge remote-tracking branch 'origin/main' into feat-87262

91e5c62

chatgpt-codex-connector Bot reviewed Apr 17, 2026

View reviewed changes

Comment thread src/CONST/index.ts

Comment thread src/CONST/index.ts

hungvu193 added 5 commits April 22, 2026 16:21

merge main

db820b7

correct member role detatil gating

344c2a9

correct approve gating

2489d8d

Update enable logic for Upgrade Modal

f1930c9

merge main

b3c619a

MelvinBot self-assigned this Apr 23, 2026

Revert Mobile-Expensify submodule to main

bf40f3d

Co-authored-by: Hans <hungvu193@users.noreply.github.com>

Conversation

hungvu193 commented Apr 14, 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 Apr 14, 2026

Uh oh!

codecov Bot commented Apr 14, 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!

hungvu193 commented Apr 14, 2026

Uh oh!

hungvu193 commented Apr 14, 2026

Uh oh!

hungvu193 commented Apr 14, 2026

Uh oh!

MelvinBot commented Apr 14, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

hungvu193 commented Apr 15, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

melvin-bot Bot commented Apr 16, 2026

Uh oh!

hungvu193 commented Apr 16, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

abzokhattab commented Apr 16, 2026

Uh oh!

MelvinBot commented Apr 16, 2026

PR Review

1. Hardcoded string literals in isSubmitFeature check

2. Expensify Card button text applies globally, not just to submit policies

3. Minor: submit check placement in AccountingContext

4. Approvals toggle missing isEnabled guard

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

abzokhattab commented Apr 16, 2026

Uh oh!

abzokhattab commented Apr 16, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

hungvu193 commented Apr 17, 2026

Uh oh!

chatgpt-codex-connector Bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

Uh oh!

hungvu193 commented Apr 23, 2026

Uh oh!

MelvinBot commented Apr 23, 2026

hungvu193 commented Apr 14, 2026 •

edited

Loading

codecov Bot commented Apr 14, 2026 •

edited by github-actions Bot

Loading

1. Hardcoded string literals in `isSubmitFeature` check

4. Approvals toggle missing `isEnabled` guard