Skip to content

[Home - For You] Tighten payment card required cases#84404

Merged
Gonals merged 7 commits intomainfrom
georgia-grandfathered
Mar 17, 2026
Merged

[Home - For You] Tighten payment card required cases#84404
Gonals merged 7 commits intomainfrom
georgia-grandfathered

Conversation

@grgia
Copy link
Contributor

@grgia grgia commented Mar 6, 2026

Explanation of Change

Only show the payment card time sensitive block to users on the new pricing plan.

https://expensify.slack.com/archives/C07HPDRELLD/p1772800036912489?thread_ts=1772658998.159109&cid=C07HPDRELLD

Confirmed no longer showing on my account:

image

Fixed Issues

$ #84767

Tests

  • Verify that no errors appear in the JS console

Offline tests

QA Steps

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

  • Verify that no errors appear in the JS console

QA Steps

1) Grandfathered user, trial ended, no payment card

Setup

  • Use (or create) a workspace created before the Team 2025 pricing start date (grandfathered).
  • Trial is ended.
  • No payment method on file.

Steps

  1. Open the app.
  2. Go to the Home tab.

Expected

  • The Add Payment Card time-sensitive section does not appear in the Time Sensitive offers area.

2) New user, trial ended, no payment card

Setup

  • Use an account which is >1 month old. I.e. a workspace on Team 2025 pricing where the trial has ended.
    • Example: first policy created on or after the cutoff, or manual override set.
  • Trial is ended.
  • No payment method on file.

Steps

  1. Open the app.
  2. Go to the Home tab.

Expected

  • The Add Payment Card time-sensitive section does appear.

3) Any user, trial not ended

Setup

  • Use any workspace where the free trial is still active (grandfathered or Team 2025).

Steps

  1. Open the app.
  2. Go to the Home tab.

Expected

  • The Add Payment Card section does not appear.

4) Any user, payment card already added

Setup

  • Use any workspace where:
    • Trial is ended
    • A payment card is already on file

Steps

  1. Open the app.
  2. Go to the Home tab.

Expected

  • The Add Payment Card section does not appear.

4) Any user, payment is via invoice feature

Setup

  • Use any workspace where:
    • Trial is ended
    • User has invoice pay
    • No payment card

Steps

  1. Open the app.
  2. Go to the Home tab.

Expected

  • The Add Payment Card section does not appear.

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
      • If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • 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

@grgia grgia requested a review from trjExpensify March 6, 2026 12:35
@grgia grgia self-assigned this Mar 6, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Mar 6, 2026

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

@github-actions

This comment has been minimized.

@codecov
Copy link

codecov bot commented Mar 6, 2026

Codecov Report

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

Files with missing lines Coverage Δ
src/ONYXKEYS.ts 100.00% <ø> (ø)
src/libs/SubscriptionUtils.ts 81.95% <100.00%> (+2.06%) ⬆️
...meSensitiveSection/hooks/useTimeSensitiveOffers.ts 100.00% <100.00%> (ø)
src/selectors/Account.ts 100.00% <100.00%> (ø)
.../settings/Subscription/CardSection/CardSection.tsx 0.00% <0.00%> (ø)
... and 6 files with indirect coverage changes

@grgia grgia marked this pull request as ready for review March 6, 2026 12:52
@grgia grgia requested review from a team as code owners March 6, 2026 12:52
@grgia grgia requested a review from ZhenjaHorbach March 6, 2026 12:52
@melvin-bot melvin-bot bot requested review from heyjennahay and removed request for a team March 6, 2026 12:52
@grgia grgia changed the title dont show to grandfathered users [Home - For You] dont show to paying card required row to grandfathered users Mar 6, 2026
@melvin-bot melvin-bot bot requested review from Gonals and removed request for a team March 6, 2026 12:52
@melvin-bot
Copy link

melvin-bot bot commented Mar 6, 2026

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

@grgia grgia changed the title [Home - For You] dont show to paying card required row to grandfathered users [Home - For You] dont show to payment card required to grandfathered users Mar 6, 2026
@grgia grgia removed the request for review from heyjennahay March 6, 2026 12:53
@grgia grgia changed the title [Home - For You] dont show to payment card required to grandfathered users [Home - For You] No payment card required for grandfathered users Mar 6, 2026
Copy link
Contributor

@trjExpensify trjExpensify left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Discussing here, I'm not sure the team pricing check is the right one to suppress this time sensitive prompt. I think it's:

  • Grandfathered users who are exempt from billing (NVP)
  • Internal domains that are skipped in the billing logic (List of domains)

@grgia grgia changed the title [Home - For You] No payment card required for grandfathered users [WIP][Home - For You] No payment card required for grandfathered users Mar 10, 2026
@@ -594,6 +594,25 @@ function getSubscriptionPlanInfo(
};
}

function shouldShowTrialEndedUI(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add tests for this util!

@ZhenjaHorbach
Copy link
Contributor

ZhenjaHorbach commented Mar 11, 2026

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 Снимок экрана 2026-03-11 в 12 40 30
Android: mWeb Chrome Снимок экрана 2026-03-11 в 12 35 56
iOS: HybridApp Снимок экрана 2026-03-11 в 12 40 30
iOS: mWeb Safari Снимок экрана 2026-03-11 в 12 35 56
MacOS: Chrome / Safari Снимок экрана 2026-03-11 в 12 32 25

@ZhenjaHorbach
Copy link
Contributor

LGTM!

@melvin-bot melvin-bot bot requested a review from dangrous March 11, 2026 11:41
@melvin-bot
Copy link

melvin-bot bot commented Mar 11, 2026

@dangrous 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
Copy link

melvin-bot bot commented Mar 11, 2026

🎯 @ZhenjaHorbach, thanks for reviewing and testing this PR! 🎉

An E/App issue has been created to issue payment here: #84870.

@dangrous
Copy link
Contributor

Is this still WIP or ready for review?

@grgia grgia changed the title [WIP][Home - For You] No payment card required for grandfathered users [WIP][Home - For You] Tighten payment card required cases Mar 12, 2026
@ZhenjaHorbach
Copy link
Contributor

Oh
Sorry
I thought it was ready for review since there were a few commits after this comment 😅

@grgia grgia requested a review from ZhenjaHorbach March 12, 2026 17:49
@grgia
Copy link
Contributor Author

grgia commented Mar 12, 2026

@ZhenjaHorbach good to go now, I'm just going to hold merging on web deploy

@grgia
Copy link
Contributor Author

grgia commented Mar 12, 2026

JK its on staging now!

@grgia grgia changed the title [WIP][Home - For You] Tighten payment card required cases [Home - For You] Tighten payment card required cases Mar 12, 2026
@grgia
Copy link
Contributor Author

grgia commented Mar 13, 2026

Ready for review

@melvin-bot melvin-bot bot requested a review from nkuoch March 16, 2026 11:35
@melvin-bot
Copy link

melvin-bot bot commented Mar 16, 2026

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

Copy link
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR tightens the conditions for showing the “Add Payment Card” time-sensitive offer on Home (and aligns the subscription banner logic) so it only appears for users who actually need to add a billing card—specifically targeting Team 2025 pricing and excluding grandfathered/internal/invoiced cases.

Changes:

  • Gate the Home “Add payment card” offer behind Team 2025 pricing and a consolidated shouldShowTrialEndedUI() decision helper.
  • Add shouldShowTrialEndedUI() in SubscriptionUtils and cover it with unit tests (owned paid policy, trial-ended, no card, not grandfathered/internal/invoicing).
  • Introduce Onyx/state plumbing for isFromInternalDomain and nvp_private_grandfatheredFree, and use them in the UI decision.

Reviewed changes

Copilot reviewed 8 out of 8 changed files in this pull request and generated no comments.

Show a summary per file
File Description
src/pages/home/TimeSensitiveSection/hooks/useTimeSensitiveOffers.ts Uses Team 2025 pricing + shouldShowTrialEndedUI() and new Onyx flags to decide whether to show the “Add payment card” offer.
src/libs/SubscriptionUtils.ts Adds shouldShowTrialEndedUI() helper encapsulating trial-ended/banner eligibility checks.
src/pages/settings/Subscription/CardSection/CardSection.tsx Aligns subscription banner display logic with shouldShowTrialEndedUI().
src/types/onyx/Account.ts Adds isFromInternalDomain to the Account Onyx type.
src/selectors/Account.ts Adds isFromInternalDomainSelector for selector-based Onyx subscriptions.
src/ONYXKEYS.ts Adds NVP_PRIVATE_GRANDFATHERED_FREE Onyx key and typing.
tests/unit/hooks/useTimeSensitiveOffers.test.ts Updates hook tests to validate new add-payment-card gating and dependency call into shouldShowTrialEndedUI().
tests/unit/SubscriptionUtilsTest.ts Adds unit tests for shouldShowTrialEndedUI() across the key scenarios.

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

@Gonals Gonals merged commit 9849067 into main Mar 17, 2026
45 checks passed
@Gonals Gonals deleted the georgia-grandfathered branch March 17, 2026 14:19
@github-actions
Copy link
Contributor

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

@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to staging by https://github.com/Gonals in version: 9.3.40-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/Gonals in version: 9.3.40-0 🚀

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

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.

7 participants