feat: enable Expensify Card for Collect workspaces and update subscription settings UI for Collect by samranahm · Pull Request #83455 · Expensify/App

samranahm · 2026-02-25T15:25:09Z

Explanation of Change

Fixed Issues

$ #79087
PROPOSAL: #79087 (comment)

Tests

Precondition

User is an admin of a workspace
Workspace type is set to Collect

Steps

Open Account tab > Subscription
Under the "Your plan" card, verify that the "Subscription settings" button is visible
Open the "Subscription settings" page and verify the UI matches the mock design
Click the Expensify code field and enter a valid code (e.g., testing_code)
Verify the code is applied successfully and the field becomes non-editable
Verify that text "You will get a X% discount on your next X billing charges." is displayed below the Expensify code.
Change work type to Control and open the Subscription settings page again
Verify that the Subscription settings UI is not affected by the Collect-specific changes

Verify that no errors appear in the JS console

Offline tests

QA Steps

Same as test

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

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android.Native.mp4

Android: mWeb Chrome

Android.mWeb.Chrome.mp4

iOS: Native

IOS.Native.mp4

iOS: mWeb Safari

IOS.mWeb.Safari.mp4

MacOS: Chrome / Safari

macOS.Chrome.mp4

…and update usages

melvin-bot · 2026-02-25T15:25:17Z

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

Copilot

Pull request overview

This PR updates the Subscription Settings experience to support Collect workspaces (including showing the Expensify Code section where applicable) and aligns the client-side promo code naming with the SET_PROMO_CODE API.

Changes:

Renames stored subscription code field from expensifyCode to promoCode (types, actions, UI, and tests).
Updates Subscription Settings UI for Collect (web + native), including new pricing copy and a Collect-specific layout.
Adjusts OptionItem rendering so selected + disabled options can still show a selection indicator, and adds new i18n strings.

Reviewed changes

Copilot reviewed 19 out of 19 changed files in this pull request and generated 4 comments.

Show a summary per file

File	Description
tests/ui/ExpensifyCodePageTest.tsx	Updates tests to use `promoCode` in Onyx and reflect new applied-code behavior.
src/types/onyx/PrivateSubscription.ts	Renames stored field to `promoCode`.
src/pages/settings/Subscription/SubscriptionSettings/index.tsx	Adds Collect-specific Subscription Settings UI and uses `promoCode`.
src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx	Adds Collect-specific Subscription Settings UI on native.
src/pages/settings/Subscription/SubscriptionPlan/SubscriptionPlanCardActionButton.tsx	Uses `promoCode` in the summary string and removes Team2025-specific action button logic.
src/pages/settings/Subscription/ExpensifyCodePage/index.tsx	Uses `promoCode` and avoids showing NotFound after submit while waiting for Onyx update.
src/libs/actions/Subscription.ts	Sends `promoCode` to `SET_PROMO_CODE` and stores it on `NVP_PRIVATE_SUBSCRIPTION`.
src/libs/API/parameters/SetPromoCodeParams.ts	Renames API parameter to `promoCode`.
src/languages/*	Adds Collect-specific Subscription Settings strings across locales.
src/components/OptionsPicker/OptionItem.tsx	Shows selection indicator when `isSelected` even if the option is disabled.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx

tests/ui/ExpensifyCodePageTest.tsx

src/languages/de.ts

src/pages/settings/Subscription/SubscriptionSettings/index.tsx

github-actions · 2026-02-25T15:32:41Z

Review Summary

Critical Bug Found:

German translations (de.ts) contain Dutch text instead of German. Lines 8115-8117 — the three new keys (collectBillingDescription, pricing, collectPricing) are identical to the Dutch translations in nl.ts. For example, "Collect-werkruimtes worden maandelijks per lid gefactureerd" is Dutch, not German. Suggested corrections:

collectBillingDescription: "Collect-Arbeitsbereiche werden monatlich pro Mitglied abgerechnet, ohne jaehrliche Verpflichtung."
pricing: "Preise"
collectPricing: price + " pro Mitglied pro Monat"

Code duplication note: The expensify code section and tax exempt menu item are duplicated identically in both the isCollect and non-isCollect branches in index.tsx. These could be extracted outside the conditional. See inline comment for details.

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: fd2481eeb7

ℹ️ 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".

src/pages/settings/Subscription/ExpensifyCodePage/index.tsx

codecov · 2026-02-25T15:35:05Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`93.54% <ø> (ø)`
src/ONYXKEYS.ts	`100.00% <ø> (ø)`
.../settings/Subscription/ExpensifyCodePage/index.tsx	`100.00% <100.00%> (ø)`
src/pages/settings/Subscription/utils.ts	`43.75% <100.00%> (+43.75%)`	⬆️
src/components/OptionsPicker/OptionItem.tsx	`0.00% <0.00%> (ø)`
src/libs/actions/Subscription.ts	`0.00% <0.00%> (ø)`
...scriptionPlan/SubscriptionPlanCardActionButton.tsx	`0.00% <0.00%> (ø)`
...Subscription/SubscriptionSettings/index.native.tsx	`0.00% <0.00%> (ø)`
...ttings/Subscription/SubscriptionSettings/index.tsx	`0.00% <0.00%> (ø)`
... and 10 files with indirect coverage changes

src/pages/settings/Subscription/SubscriptionSettings/index.tsx

…ify-code-on-collect-workspaces

samranahm · 2026-03-08T03:07:31Z

@garrettmknight We've added the discountMessage here

Currently we get empty onyxData when call User_SetPromoCode, please update the backend to update relevant fields in private_promoDiscount. Additionally, when we changes subscription plan or does “Clear cache and restart”, the applied Expensify code disappears because the we loses local state. I think updating SetPromoCode’s onyxData and openApp will fix the flow.

garrettmknight · 2026-03-09T20:05:24Z

Bumped @nkuoch in the original issue.

…ify-code-on-collect-workspaces

…nents

…ify-code-on-collect-workspaces

samranahm · 2026-03-16T19:31:43Z

@eVoloshchak PR is ready for re-review.

eVoloshchak · 2026-03-17T14:44:51Z

src/pages/settings/Subscription/SubscriptionSettings/index.native.tsx

        upper: convertToShortDisplayString(subscriptionPrice * CONST.SUBSCRIPTION_PRICE_FACTOR, preferredCurrency),
    });
    const adminsChatReportID = isActivePolicyAdmin && activePolicy?.chatReportIDAdmins ? activePolicy.chatReportIDAdmins?.toString() : undefined;
+    const isCollect = subscriptionPlan === CONST.POLICY.TYPE.TEAM;


We can use isCollectPolicy util

@eVoloshchak This introduces a regression risk when we have Control on the Subscription plan card and click the “Subscription settings” button, it opens the Collect UI. We should keep using subscriptionPlan as the single source of truth.

App/src/pages/settings/Subscription/SubscriptionPlan/index.tsx

Line 20 in be2093b

const subscriptionPlan = useSubscriptionPlan();

eVoloshchak · 2026-03-18T19:18:32Z

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 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-03-18.at.20.16.32.mov

Android: mWeb Chrome

Screen.Recording.2026-03-18.at.20.17.20.mov

iOS: HybridApp

Screen.Recording.2026-03-18.at.20.16.03.mov

iOS: mWeb Safari

Untitled.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-18.at.19.40.24.mov

eVoloshchak

LGTM!

Copilot

Pull request overview

Copilot reviewed 25 out of 25 changed files in this pull request and generated 2 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

samranahm · 2026-03-19T22:01:36Z

src/pages/settings/Subscription/SubscriptionSettings/index.tsx

+
+    const isExpensifyCodeApplied = !!privatePromoCode;
+    const shouldShowExpensifyCodeSection = !isSecretPromoCode;
+    const shouldShowExpensifyCodeHintText = isExpensifyCodeApplied && promoDiscountValue !== undefined;


Good observation but this is intended behaviour.

samranahm · 2026-03-19T22:02:46Z

src/languages/en.ts

            discountCode: 'Discount code',
            enterCode: 'Enter an Expensify code to apply to your subscription.',
+            discountMessage: (promoDiscount: string, validBillingCycles: string) =>
+                `You will get a ${promoDiscount}% discount on your next ${validBillingCycles ? `${validBillingCycles} ` : ''}billing charges.`,


We are following the Expensify classic approch here, and this is intended bahaviour.

github-actions · 2026-03-20T08:13:18Z

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

github-actions · 2026-03-20T08:17:59Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-b89df6b-c58bf3c-85a0504ac1e2c2261939f77ac30c28f0a9bcc461/index.html	https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-ios-device-AdHoc-b89df6b-c58bf3c-55f68a5cf836d8a8634336d73ef8dcc8bec35925/index.html

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-03-20T08:20:20Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2026-03-23T09:50:06Z

🚀 Deployed to staging by https://github.com/nkuoch in version: 9.3.42-0 🚀

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

Bundle Size Analysis (Sentry):

Android
iOS

samranahm added 7 commits February 25, 2026 19:57

refactor SubscriptionSettings page for collect worksapces

63b7723

add isCollect check and update ui on native devices

1ef4eba

update OptionItem to render SelectCircle based on isSelected state

8b03f6e

Add copies in all locals

bf21573

remove AddMembersButton for collect subscription card

ab1b95d

Avoid not found page fliker while navigating back after applying code

09b725d

Rename expensifyCode to promoCode to align with BE in API parameters …

fd2481e

…and update usages

Copilot AI review requested due to automatic review settings February 25, 2026 15:25

samranahm requested review from a team as code owners February 25, 2026 15:25

melvin-bot bot assigned samranahm Feb 25, 2026

melvin-bot bot requested a review from eVoloshchak February 25, 2026 15:25

melvin-bot bot requested a review from heyjennahay February 25, 2026 15:25

samranahm mentioned this pull request Feb 25, 2026

[$500] NEW FEATURE: Display Expensify Code (Optional) field in New Expensify Subscription settings #79087

Open

7 tasks

Copilot started reviewing on behalf of samranahm February 25, 2026 15:26 View session

Copilot AI reviewed Feb 25, 2026

View reviewed changes

github-actions bot reviewed Feb 25, 2026

View reviewed changes

src/pages/settings/Subscription/SubscriptionSettings/index.tsx Outdated Show resolved Hide resolved

chatgpt-codex-connector bot reviewed Feb 25, 2026

View reviewed changes

src/pages/settings/Subscription/ExpensifyCodePage/index.tsx Outdated Show resolved Hide resolved

update copies

0d39046

eVoloshchak suggested changes Mar 1, 2026

View reviewed changes

src/pages/settings/Subscription/SubscriptionSettings/index.tsx Outdated Show resolved Hide resolved

samranahm added 6 commits March 5, 2026 04:03

Merge remote-tracking branch 'upstream/main' into 79087/enable-expens…

6260e77

…ify-code-on-collect-workspaces

remove redundant code

d98141a

Merge remote-tracking branch 'upstream/main' into 79087/enable-expens…

5a3013b

…ify-code-on-collect-workspaces

add promoDiscount and isSecretPromoCode in private_promoDiscount

2e48031

add discountMessage in all locals

e4105fc

fix es translation for collectBillingDescription

dec393d

samranahm added 6 commits March 16, 2026 05:49

Merge remote-tracking branch 'upstream/main' into 79087/enable-expens…

31e5cfa

…ify-code-on-collect-workspaces

Update translation copy to handle undefined validBillingCycles

4d4395b

feat: refactor Expensify promo code handling and update related compo…

7840703

…nents

add tests for getPrivatePromoDiscountInfo function in SubscriptionUtils

15a54e2

Merge remote-tracking branch 'upstream/main' into 79087/enable-expens…

845c701

…ify-code-on-collect-workspaces

fix typecheck

be2093b

eVoloshchak suggested changes Mar 17, 2026

View reviewed changes

eVoloshchak approved these changes Mar 18, 2026

View reviewed changes

melvin-bot bot requested a review from nkuoch March 18, 2026 19:20

nkuoch requested a review from Copilot March 19, 2026 09:49

Copilot AI reviewed Mar 19, 2026

View reviewed changes

nkuoch approved these changes Mar 20, 2026

View reviewed changes

nkuoch merged commit b89df6b into Expensify:main Mar 20, 2026
40 of 42 checks passed

github-actions bot mentioned this pull request Mar 20, 2026

Investigate workflow job failing on main: build (developmentDebug, false) #85911

Open

github-actions bot mentioned this pull request Mar 20, 2026

Investigate workflow job failing on main: build (New Expensify Dev, DebugDevelopment, false) #85914

Open

OSBotify mentioned this pull request Mar 23, 2026

Deploy Checklist: New Expensify 2026-03-23 #86080

Open

69 tasks

Conversation

samranahm commented Feb 25, 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 Feb 25, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Feb 25, 2026

Review Summary

Uh oh!

chatgpt-codex-connector bot left a comment

Choose a reason for hiding this comment

💡 Codex Review

Uh oh!

Uh oh!

codecov bot commented Feb 25, 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!

Uh oh!

samranahm commented Mar 8, 2026

Uh oh!

garrettmknight commented Mar 9, 2026

Uh oh!

samranahm commented Mar 16, 2026

Uh oh!

eVoloshchak Mar 17, 2026

Choose a reason for hiding this comment

Uh oh!

samranahm Mar 18, 2026

Choose a reason for hiding this comment

Uh oh!

eVoloshchak commented Mar 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

eVoloshchak left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

samranahm Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

samranahm Mar 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions bot commented Mar 20, 2026

Uh oh!

github-actions bot commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 20, 2026

Uh oh!

OSBotify commented Mar 23, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

samranahm commented Feb 25, 2026 •

edited

Loading

codecov bot commented Feb 25, 2026 •

edited by github-actions bot

Loading

eVoloshchak commented Mar 18, 2026 •

edited

Loading