[Submit] Feat: Update the upgrade flow (Wave 2) by hungvu193 · Pull Request #91258 · Expensify/App

hungvu193 · 2026-05-21T04:11:51Z

Explanation of Change

Docs section
In this PR, we added UpgradeSubmit logic, when a user of a submit workspace presses Upgrade, we will:

Make them the owner.
Change the policy type from submit to either coperate or team (based on the feature they selected).
Convert all the existing member role from Editor to User.
Enable Payments and Company Cards on the workspace (to match a newly created Collect workspace)

Fixed Issues

$ #90797
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]."
Prerequisite:
You're member of a Submit workspace.

Try to enable one of these features in your Submit workspace (Per diem, Expensify card, Travel, Invoicing, Accounting, Payment, Approval)
You will be redirected to Upgrade page.
Try to Upgrade.
Verify that you're now the owner of that workspace, the type of the workspace will change to either Control or Collect.
Verify that all the members of the workspace role are USER

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2026-05-28.at.11.11.07.mov

Android: mWeb Chrome

Screen.Recording.2026-05-28.at.11.11.07.mov

iOS: Native

Screen.Recording.2026-05-28.at.10.57.22.mov

iOS: mWeb Safari

Screen.Recording.2026-05-28.at.11.03.49.mov

MacOS: Chrome / Safari

Screen.Recording.2026-05-28.at.10.41.06.mov

codecov · 2026-05-21T04:27:21Z

Codecov Report

✅ Changes either increased or maintained existing code coverage, great job!

Files with missing lines	Coverage Δ
src/libs/API/types.ts	`100.00% <ø> (ø)`
src/libs/actions/Policy/Policy.ts	`71.16% <98.30%> (+1.07%)`	⬆️
...c/pages/workspace/upgrade/WorkspaceUpgradePage.tsx	`36.08% <80.00%> (+4.53%)`	⬆️
... and 109 files with indirect coverage changes

melvin-bot · 2026-05-21T10:22: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]

melvin-bot · 2026-05-21T10:22:22Z

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

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 42b6feee3d

ℹ️ 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-05-21T10:31:25Z

@codex review

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: 53a3bd0ef3

ℹ️ 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-05-22T22:47:56Z

Let me know when the PR is ready and the screenshots are filled @hungvu193

hungvu193 · 2026-05-23T14:32:00Z

Let me know when the PR is ready and the screenshots are filled @hungvu193

Sure. The API is down, so we can wait till then.

hungvu193 · 2026-05-28T03:41:47Z

@abzokhattab It's ready for review!

abzokhattab · 2026-05-28T08:45:34Z

@MelvinBot review the PR. Check for other issues or regressions

abzokhattab · 2026-05-28T08:45:45Z

@codex review the PR. Check for other issues or regressions

chatgpt-codex-connector · 2026-05-28T08:50:33Z

Codex Review: Didn't find any major issues. Breezy!

ℹ️ 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-05-28T08:51:44Z

Great i will review it later today 🔥

MelvinBot · 2026-05-28T08:54:06Z

PR Review

Bug: Feature-to-targetType mapping is incomplete for corporate-only features

In WorkspaceUpgradePage.tsx:173-176, only perDiem is mapped to CORPORATE:

const isPerDiemUpgrade = feature?.id === CONST.UPGRADE_FEATURE_INTRO_MAPPING.perDiem.id;
const targetType = isPerDiemUpgrade ? CONST.POLICY.TYPE.CORPORATE : CONST.POLICY.TYPE.TEAM;

However, rules and HR are also gated by !isControlPolicy(policy) in WorkspaceMoreFeaturesPage (lines ~459 and ~342), meaning they require CORPORATE. A submit workspace user enabling rules or HR would be upgraded to TEAM, which still doesn't unlock those features. The confirmUpgrade callback would then try to enable rules/HR on a TEAM policy that doesn't support them.

Fix: Also map rules and hr feature IDs to CONST.POLICY.TYPE.CORPORATE.

Issue: Missing null-policy guard in `upgradeSubmit`

Unlike upgradeToCorporate (which has if (!policy) return), upgradeSubmit falls through with CONST.POLICY.ID_FAKE when policy is null. The caller guards against this, but the function itself should be defensive — add an early if (!policy) return;.

Issue: `UpgradeSubmitParams.targetType` is too broad

Policy['type'] includes 'personal' and 'submit2026', which are invalid upgrade targets. Consider narrowing to typeof CONST.POLICY.TYPE.TEAM | typeof CONST.POLICY.TYPE.CORPORATE.

Minor: `canDowngrade` failure rollback hardcodes `true`

The failure data sets canDowngrade: true, but submit policies may not have canDowngrade set at all. Consider using policy?.canDowngrade ?? true to restore the original value.

Test coverage gap

The new upgradeSubmit function (~120 lines of business logic) has no unit tests. The existing upgradeToCorporate tests in tests/actions/PolicyTest.ts:2888-2970 provide a clear template pattern. Key branches to cover:

Employee list role assignment (admin vs user)
Owner transfer
Corporate vs team conditional fields
Reimbursement choice logic

Confirmed correct

isUpgraded detection logic correctly handles all upgrade paths
useFocusEffect ref pattern avoids stale closures
getCorporateUpgradeOnyxFields refactor preserves behavior
Test cleanup/unmount changes properly prevent test interference

abzokhattab · 2026-05-28T15:47:20Z

@hungvu193 looks like we have few comments from melvin .. are those valid issues?

guard hr and rules under coporate fix: double upgrade submit Add test for upgradeSubmit Align Mobile-Expensify submodule with main Drop feature-branch submodule pointer changes to avoid merge conflicts when syncing with main.

JmillsExpensify

LGTM

abzokhattab · 2026-06-03T10:35:55Z

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified that the composer does not automatically focus or open the keyboard on mobile unless explicitly intended. This includes checking that returning the app from the background does not unexpectedly open the keyboard.
I verified tests pass on all platforms & I tested again on:
- Android: HybridApp
- Android: mWeb Chrome
- iOS: HybridApp
- iOS: mWeb Safari
- MacOS: Chrome / Safari
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified there are no new alerts related to the canBeMissing param for useOnyx
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.ts or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design so the design team can review the changes.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: HybridApp

Screen.Recording.2026-05-30.at.01.47.49.mov

Android: mWeb Chrome

Screen.Recording.2026-05-30.at.01.51.56.mov

iOS: HybridApp

Screen.Recording.2026-05-30.at.01.47.49.mov

iOS: mWeb Safari

Screen.Recording.2026-05-30.at.01.51.56.mov

MacOS: Chrome / Safari

Screen.Recording.2026-05-30.at.01.18.31.mov

hungvu193 · 2026-06-03T16:17:11Z

@iwiznia Addressed your comments

github-actions · 2026-06-04T10:17:13Z

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

github-actions · 2026-06-04T10:22:29Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-84c06986596-4d18f39-4847fe077829919b47d9c085a075255f7a172994/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-84c0698-4d18f39-6561e328da93dbfbb7a36848b9da2e25e8d1641c/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-06-05T18:15:13Z

🚀 Deployed to staging by https://github.com/iwiznia in version: 9.4.0-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

jponikarchuk · 2026-06-06T19:49:43Z

Deploy Blocker #92863 was identified to be related to this PR.

jponikarchuk · 2026-06-06T20:13:11Z

Deploy Blocker #92864 was identified to be related to this PR.

mitarachim · 2026-06-08T15:22:41Z

Deploy Blocker #92943 was identified to be related to this PR.

OSBotify · 2026-06-09T04:09:27Z

🚀 Deployed to production by https://github.com/Julesssss in version: 9.4.0-7 🚀

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

situchan · 2026-08-16T10:51:48Z

Coming from Submit workspace - Unable to upgrade workspace when importing member spreadsheet:

This PR rebuilt the upgrade flow in WorkspaceUpgradePage to key on the SUBMIT_2026 beta (canAccessSubmitWorkspaceFeatures = isSubmitPolicy && SUBMIT_2026 beta) instead of the policy's actual type.
So a Submit workspace without the beta (the QA repro — created on OldDot) fell through to upgradeToCorporate → UPGRADE_TO_CORPORATE, which Auth 402‑rejects for submit2026 policies, and the editor‑owner couldn't even fire the button — exactly the "shows Upgrade page after trying to upgrade" loop.

melvin-bot Bot assigned hungvu193 May 21, 2026

hungvu193 mentioned this pull request May 21, 2026

[Due for payment 2026-06-16] [Submit] Update the upgrade flow (Wave 2) #90797

Closed

hungvu193 marked this pull request as ready for review May 21, 2026 10:22

hungvu193 requested review from a team as code owners May 21, 2026 10:22

melvin-bot Bot requested review from a team, JmillsExpensify and abzokhattab and removed request for a team and abzokhattab May 21, 2026 10:22

melvin-bot Bot requested review from abzokhattab and removed request for a team May 21, 2026 10:22

github-actions Bot reviewed May 21, 2026

View reviewed changes

Comment thread src/libs/actions/Policy/Policy.ts

github-actions Bot reviewed May 21, 2026

View reviewed changes

Comment thread src/libs/actions/Policy/Policy.ts

chatgpt-codex-connector Bot reviewed May 21, 2026

View reviewed changes

Comment thread src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx Outdated

Comment thread src/libs/actions/Policy/Policy.ts Outdated

chatgpt-codex-connector Bot reviewed May 21, 2026

View reviewed changes

Comment thread src/pages/workspace/upgrade/WorkspaceUpgradePage.tsx Outdated

hungvu193 added 4 commits June 2, 2026 22:27

Address comment

1287f39

fix submit upgrade case

40eced2

fix test

73b5a6d

early return when policy is invalid

1e48d48

guard hr and rules under coporate fix: double upgrade submit Add test for upgradeSubmit Align Mobile-Expensify submodule with main Drop feature-branch submodule pointer changes to avoid merge conflicts when syncing with main.

hungvu193 force-pushed the feat-90797 branch from 62a77d5 to 1e48d48 Compare June 2, 2026 15:27

JmillsExpensify previously approved these changes Jun 3, 2026

View reviewed changes

abzokhattab approved these changes Jun 3, 2026

View reviewed changes

melvin-bot Bot requested a review from iwiznia June 3, 2026 10:36

iwiznia reviewed Jun 3, 2026

View reviewed changes

Comment thread src/libs/actions/Policy/Policy.ts Outdated

Comment thread src/libs/actions/Policy/Policy.ts

Comment thread src/libs/actions/Policy/Policy.ts Outdated

Comment thread src/libs/actions/Policy/Policy.ts Outdated

Address comments

68dd8c2

hungvu193 dismissed JmillsExpensify’s stale review via 68dd8c2 June 3, 2026 15:47

iwiznia approved these changes Jun 4, 2026

View reviewed changes

iwiznia merged commit 84c0698 into Expensify:main Jun 4, 2026
34 checks passed

github-actions Bot mentioned this pull request Jun 4, 2026

Investigate workflow job failing on main: test / test (job 4) #92654

Closed

OSBotify mentioned this pull request Jun 5, 2026

Deploy Checklist: New Expensify 2026-06-05 #92792

Closed

applause-bot Bot mentioned this pull request Jun 6, 2026

[Due for payment 2026-06-17] [$250] Workspace-After upgrading Submit workspace, success page shows Control plan instead of Collect #92863

Closed

7 tasks

applause-bot Bot mentioned this pull request Jun 6, 2026

[Due for payment 2026-06-17] [$250] Upgrade opens after upgrading Submit WS via Prevent self-approvals, disabling & reenabling it #92864

Closed

7 tasks

applause-bot Bot mentioned this pull request Jun 8, 2026

[Due for payment 2026-07-23 ?] [$250] [Submit] Workspace - Upgrade page reopens after upgrading workspace and importing spreadsheet #92943

Closed

7 tasks

quinthar added the #convert label Aug 11, 2026

MelvinBot mentioned this pull request Aug 16, 2026

[Due for payment 2026-08-21] [$250] Submit workspace - Unable to upgrade workspace when importing member spreadsheet #96334

Closed

7 tasks

Conversation

hungvu193 commented May 21, 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!

codecov Bot commented May 21, 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!

melvin-bot Bot commented May 21, 2026

Uh oh!

melvin-bot Bot commented May 21, 2026

Uh oh!

Uh oh!

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 May 21, 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 May 22, 2026

Uh oh!

hungvu193 commented May 23, 2026

Uh oh!

hungvu193 commented May 28, 2026

Uh oh!

abzokhattab commented May 28, 2026

Uh oh!

abzokhattab commented May 28, 2026

Uh oh!

chatgpt-codex-connector Bot commented May 28, 2026

Uh oh!

abzokhattab commented May 28, 2026

Uh oh!

MelvinBot commented May 28, 2026

PR Review

Bug: Feature-to-targetType mapping is incomplete for corporate-only features

Issue: Missing null-policy guard in upgradeSubmit

Issue: UpgradeSubmitParams.targetType is too broad

Minor: canDowngrade failure rollback hardcodes true

Test coverage gap

Confirmed correct

Uh oh!

abzokhattab commented May 28, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

abzokhattab commented Jun 3, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hungvu193 commented Jun 3, 2026

Uh oh!

Uh oh!

github-actions Bot commented Jun 4, 2026

Uh oh!

github-actions Bot commented Jun 4, 2026

Uh oh!

OSBotify commented Jun 5, 2026

Uh oh!

jponikarchuk commented Jun 6, 2026

hungvu193 commented May 21, 2026 •

edited

Loading

codecov Bot commented May 21, 2026 •

edited by github-actions Bot

Loading

Issue: Missing null-policy guard in `upgradeSubmit`

Issue: `UpgradeSubmitParams.targetType` is too broad

Minor: `canDowngrade` failure rollback hardcodes `true`

mitarachim commented Jun 8, 2026 •

edited

Loading