Skip to content

Gate Approvals/Payments isActive on Submit2026 workspaces#92051

Open
MelvinBot wants to merge 1 commit into
mainfrom
claude-fixSubmitWorkspaceWorkflowsToggles
Open

Gate Approvals/Payments isActive on Submit2026 workspaces#92051
MelvinBot wants to merge 1 commit into
mainfrom
claude-fixSubmitWorkspaceWorkflowsToggles

Conversation

@MelvinBot
Copy link
Copy Markdown
Contributor

@MelvinBot MelvinBot commented May 29, 2026

Explanation of Change

On the Workflows tab of a Submit (SUBMIT_2026 beta) workspace, both the Approvals and Make or track payments toggles rendered as on even though they should appear off for Submit workspaces, and tapping them should route the user to the upgrade flow.

Both rows derived their isActive from raw backend policy fields without gating on canAccessSubmit2026Features. The backend intentionally sets approvalMode = ADVANCED and a non-REIMBURSEMENT_NO reimbursementChoice on Submit workspaces to support the Submit submission flow, so those values surfaced as "feature on" in the UI. The lock and upgrade routing were already wired up correctly — only the displayed isActive was wrong.

This PR gates both isActive expressions on !canAccessSubmit2026Features so Submit workspaces render both toggles off, while preserving the existing lock + upgrade-navigation behavior:

  • Approvals → off + locked. Tapping fires the existing disabledAction → upgrade modal (via navigateToSubmitWorkspaceApprovalsUpgrade).
  • Payments → off + interactive. Tapping fires the existing onToggle Submit branch → upgrade modal (no disabled added, because the onToggle already handles Submit redirection).

This is a render-only change. No backend, action, or Onyx changes — the deliberately-set policy values stay untouched.

Fixed Issues

$ #91988
PROPOSAL: #91988 (comment)

Tests

  1. Sign up for an account.
  2. Add it to the SUBMIT_2026 beta.
  3. Switch to Classic.
  4. Navigate to expensify.com/pricing.
  5. Create a Submit workspace.
  6. Go to the Workflows tab via Workspaces > your workspace > Workflows.
  7. Verify the Approvals toggle shows as off and locked. Tap it and verify the upgrade modal appears.
  8. Verify the Make or track payments toggle shows as off. Tap it and verify the upgrade modal appears.
  • Verify that no errors appear in the JS console

Offline tests

Same as Tests above — the change is render-only and uses values already in Onyx, so behavior should be identical when offline.

QA Steps

  1. Sign in as a user in the SUBMIT_2026 beta on a Submit workspace.
  2. Open Workspaces > your Submit workspace > Workflows.
  3. Verify the Approvals toggle is shown as off and locked; tapping it opens the upgrade modal.
  4. Verify the Make or track payments toggle is shown as off; tapping it opens the upgrade modal.
  5. Regression: sign in as a user NOT on a Submit workspace (e.g. a Collect/Control workspace). Verify the Approvals and Payments toggles still show their existing on/off state correctly based on policy.approvalMode and policy.reimbursementChoice.
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (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 followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • 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
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • 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 new assets were added or existing ones were modified, I verified that:
    • The assets are optimized and compressed (for SVG files, run npm run compress-svg)
    • The assets load correctly across all supported platforms.
  • 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.
  • I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native
Android: mWeb Chrome
iOS: Native
iOS: mWeb Safari
MacOS: Chrome / Safari
Screen.Recording.2026-05-29.at.17.55.52.mov

Co-authored-by: Hans <hungvu193@users.noreply.github.com>
@MelvinBot MelvinBot requested a review from a team May 29, 2026 08:38
@MelvinBot
Copy link
Copy Markdown
Contributor Author

🤖 hungvu193 — I created this draft PR from an upstream branch because I don't have push access to your fork at hungvu193/App.

To take ownership of this branch on your fork so you can push updates and let CI run the contributor-flow checks, run:

git remote add upstream https://github.com/Expensify/App.git
git fetch upstream claude-fixSubmitWorkspaceWorkflowsToggles
git checkout -b claude-fixSubmitWorkspaceWorkflowsToggles upstream/claude-fixSubmitWorkspaceWorkflowsToggles
git push -u origin claude-fixSubmitWorkspaceWorkflowsToggles

Then close this PR and open a new one from your fork, or push directly to this branch and let it ride.

@codecov
Copy link
Copy Markdown

codecov Bot commented May 29, 2026

Codecov Report

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

Files with missing lines Coverage Δ
...ges/workspace/workflows/WorkspaceWorkflowsPage.tsx 51.42% <83.33%> (+0.16%) ⬆️
... and 5 files with indirect coverage changes

@hungvu193
Copy link
Copy Markdown
Contributor

@MelvinBot Check all the check from the author checklist, fill the chrome section with this below url:

Screen.Recording.2026-05-29.at.17.55.52.mov

@hungvu193
Copy link
Copy Markdown
Contributor

hungvu193 commented May 29, 2026

@garrettmknight Just want to double check if this looks correct to you?

Screen.Recording.2026-05-29.at.17.55.52.mov

@hungvu193
Copy link
Copy Markdown
Contributor

@MelvinBot Mark this Pr ready for review

@MelvinBot MelvinBot marked this pull request as ready for review May 30, 2026 09:18
@MelvinBot MelvinBot requested a review from a team as a code owner May 30, 2026 09:18
@melvin-bot melvin-bot Bot requested review from abzokhattab and flaviadefaria May 30, 2026 09:19
@melvin-bot
Copy link
Copy Markdown

melvin-bot Bot commented May 30, 2026

@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 melvin-bot Bot removed request for a team May 30, 2026 09:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants