Introduce free trial countdown pop-up by dukenv0307 · Pull Request #84049 · Expensify/App

dukenv0307 · 2026-03-03T16:14:16Z

Explanation of Change

Fixed Issues

$ #84022
PROPOSAL:

Tests

Case 1: With 1, 2, 3, 7 and 15 days

Login with the new account
Create the new WS
Wait for 5 mins, to save time, we can open the Chrome console and run

const today = new Date();
  const firstDay = new Date(today);
  firstDay.setDate(today.getDate() - 1);
  const lastDay = new Date(today);
  lastDay.setDate(today.getDate() + 30);

  const fmt = (d) => d.toISOString().replace('T', ' ').split('.')[0];

  const dismissedDuringDay1 = new Date(firstDay);
  dismissedDuringDay1.setUTCHours(12, 0, 0, 0);

  Onyx.merge('nvp_private_firstDayFreeTrial', fmt(firstDay));
  Onyx.merge('nvp_private_lastDayFreeTrial', fmt(lastDay));
  Onyx.merge('nvp_expensify_billingFundID', null);
  Onyx.merge('nvp_dismissedTrialPaymentReminder',
  dismissedDuringDay1.toISOString());

Verify: on the trial plan the pop-up should contain:
Title: "Stay Ahead of the Deadline”
Subtitle: “Don’t wait until the last minute, add your payment method today to ensure continuous access to your expenses on Expensify.”
Button: “Add payment card” (redirecting to /settings/subscription/add-payment-card)
Button: “Close” (closes the pop-up)

Case 2: With 28, 29

Run the following commands:

const today = new Date();
  const firstDay = new Date(today);
  firstDay.setDate(today.getDate() - 27);
  const lastDay = new Date(firstDay);
  lastDay.setDate(firstDay.getDate() + 30);

  const fmt = (d) => d.toISOString().replace('T', ' ').split('.')[0];

  const dismissedDuringDay15 = new Date(firstDay);
  dismissedDuringDay15.setUTCDate(firstDay.getUTCDate() + 14);
  dismissedDuringDay15.setUTCHours(0, 0, 0, 0);

  Onyx.merge('nvp_private_firstDayFreeTrial', fmt(firstDay));
  Onyx.merge('nvp_private_lastDayFreeTrial', fmt(lastDay));
  Onyx.merge('nvp_expensify_billingFundID', null);
  Onyx.merge('nvp_dismissedTrialPaymentReminder',
  dismissedDuringDay15.toISOString());

Verify: the pop-up should contain:

“Trial ends in X days” (3 or 2 days)
Title: ”Stay Ahead of the Deadline”
Subtitle: “Don’t wait until the last minute, add your payment method today to ensure continuous access to your expenses on Expensify.”
Button: “Add payment card” (to /settings/subscription/add-payment-card)
Button: “Close” (closes the pop-up)

Case 3: On the last 24h

Run the following commands

const today = new Date();
  const firstDay = new Date(today);
  firstDay.setDate(today.getDate() - 29);     // → currentTrialDay = 29
  const lastDay = new Date(firstDay);
lastDay.setDate(firstDay.getDate() + 30);   // → remaining ≈ 2 days (skips last24h)

  const fmt = (d) => d.toISOString().replace('T', ' ').split('.')[0];

  // Dismissed during day 29 (firstDay + 28d at 00:00 UTC)
  const dismissedDuringDay29 = new Date(firstDay);
  dismissedDuringDay29.setUTCDate(firstDay.getUTCDate() + 29);
  dismissedDuringDay29.setUTCHours(0, 0, 0, 0);

  Onyx.merge('nvp_private_firstDayFreeTrial', fmt(firstDay));
  Onyx.merge('nvp_private_lastDayFreeTrial', fmt(lastDay));
  Onyx.merge('nvp_expensify_billingFundID', null);
  Onyx.merge('nvp_dismissedTrialPaymentReminder', dismissedDuringDay29.toISOString());

Verify: the pop-up should contain:

“Trial ends in 00h : 00m : 00s” (Countdown)
Title: ”Stay Ahead of the Deadline”
Subtitle: “Don’t wait until the last minute, add your payment method today to ensure continuous access to your expenses on Expensify.”
Button: “Add payment card” (redirecting to /settings/subscription/add-payment-card)
Button: “Close” (closes the pop-up)

Case 4: Open the free trial countdown popup after the app review modal

Run the following command on the Chrome console to open the app review modal

  Onyx.merge('nvp_appReview', {                                         
      trigger: 'test',                                                  
      lastPrompt: null,                                                 
      response: null,                                                   
      conciergeReportActionID: null,                                    
  });

While opening the app review modal, run one of the commands from the first 3 cases
Close the app review command
Verify that the free trial modal is open

Verify that no errors appear in the JS console

Offline tests

QA Steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

Screen.Recording.2026-03-04.at.21.36.43.mov

MacOS: Chrome / Safari

Screen.Recording.2026-03-03.at.23.13.16.mov

Screen.Recording.2026-03-03.at.23.13.40.mov

melvin-bot · 2026-03-03T16:14:23Z

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-03-03T16:22:30Z

Codecov Report

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

Files with missing lines	Coverage Δ
src/CONST/index.ts	`94.81% <ø> (ø)`
src/GlobalModals.tsx	`100.00% <100.00%> (ø)`
src/ONYXKEYS.ts	`100.00% <ø> (ø)`
src/components/Icon/chunks/illustrations.chunk.ts	`0.00% <ø> (ø)`
src/libs/SubscriptionUtils.ts	`87.37% <100.00%> (+1.06%)`	⬆️
...rc/components/TrialPaymentReminderModalManager.tsx	`83.33% <83.33%> (ø)`
src/components/TrialPaymentReminderModal.tsx	`0.00% <0.00%> (ø)`
src/hooks/useTrialPaymentReminder.ts	`37.39% <37.39%> (ø)`
... and 20 files with indirect coverage changes

melvin-bot · 2026-03-03T16:38:30Z

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

dukenv0307 · 2026-03-03T16:39:17Z

Asking for the Spanish translation: https://expensify.slack.com/archives/C01GTK53T8Q/p1772555174811579

dukenv0307 · 2026-03-03T16:40:25Z

@Expensify/design can you please review this PR to verify the pop-up styles? Thanks

chatgpt-codex-connector

💡 Codex Review

Here are some automated review suggestions for this pull request.

Reviewed commit: f21e45eaa1

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

dukenv0307 · 2026-03-03T17:06:55Z

@dylanexpensify I found 1 issue:

We're checking the trial plan by using nvp_private_firstDayFreeTrial and nvp_private_lastDayFreeTrial, but these values are only available after users create the new workspace. That means if users complete the onboarding without creating the new workspace, we won't have these values. Can you please check how we should handle this case?

dukenv0307 · 2026-03-03T17:09:22Z

@dylanexpensify by the way, we also need BE changes to allow for updating nvp_trialPaymentReminderDismissed name value pair. We need to update it when users close the modal

dubielzyk-expensify · 2026-03-04T01:19:48Z

Can we get mobile screenshots as well? Desktop is looking good

JmillsExpensify

We saw a big uplift with this modal. Let's get it in product!

dylanexpensify · 2026-03-04T12:27:26Z

@dukenv0307

We're checking the trial plan by using nvp_private_firstDayFreeTrial and nvp_private_lastDayFreeTrial, but these values are only available after users create the new workspace. That means if users complete the onboarding without creating the new workspace, we won't have these values. Can you please check how we should handle this case?

Re: this, free trials only apply to workspaces. So if no workspace, no free trial.

dukenv0307 · 2026-03-04T14:39:38Z

Thank you, @dylanexpensify. Can you please request a BE member to handle this issue

dukenv0307 · 2026-03-04T14:40:33Z

Can we get mobile screenshots as well? Desktop is looking good

@dubielzyk-expensify I added the video for iOS Safari. Can you please take a look? I'll record the videos for other platforms when the BE is ready

dubielzyk-expensify · 2026-03-04T23:38:17Z

That looks right to me. @Expensify/design for extra 👀

shubham1206agra · 2026-07-07T12:19:36Z

@dukenv0307 I am not sure what the problem is, sometimes I see the modal like this (with no backdrop). Can you look into this?

shubham1206agra · 2026-07-07T13:36:21Z

@dukenv0307 Your case 3 test is broken. It's not showing countdown

This works for me

const today = new Date();
  const firstDay = new Date(today);
  firstDay.setDate(today.getDate() - 29);     // → currentTrialDay = 29
  const lastDay = new Date(firstDay);
lastDay.setDate(firstDay.getDate() + 30);   // → remaining ≈ 2 days (skips last24h)

  const fmt = (d) => d.toISOString().replace('T', ' ').split('.')[0];

  // Dismissed during day 29 (firstDay + 28d at 00:00 UTC)
  const dismissedDuringDay29 = new Date(firstDay);
  dismissedDuringDay29.setUTCDate(firstDay.getUTCDate() + 29);
  dismissedDuringDay29.setUTCHours(0, 0, 0, 0);

  Onyx.merge('nvp_private_firstDayFreeTrial', fmt(firstDay));
  Onyx.merge('nvp_private_lastDayFreeTrial', fmt(lastDay));
  Onyx.merge('nvp_expensify_billingFundID', null);
  Onyx.merge('nvp_dismissedTrialPaymentReminder', dismissedDuringDay29.toISOString());

shubham1206agra · 2026-07-09T08:57:07Z

@dukenv0307 Bump here

dukenv0307 · 2026-07-09T09:08:16Z

@shubham1206agra I'll check it today

github-actions · 2026-07-10T10:44:26Z

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

dukenv0307 · 2026-07-10T15:43:47Z

@shubham1206agra I tried many times but still can't reproduce. It seems unrelated to this issue

But I found another issue while testing: the modal shows again when I clear cache and restart. And I fixed it

dukenv0307 · 2026-07-10T15:47:42Z

BUG (BE issue): Free trial modal pops up when creating submit2026 modal.

I can check it since I can access BE code

shubham1206agra · 2026-07-12T16:59:59Z

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 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)
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)
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.
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

Screen.Recording.2026-07-07.at.4.55.10.PM.mov

Screen.Recording.2026-07-07.at.6.59.41.PM.mov

Screen.Recording.2026-07-07.at.7.08.04.PM.mov

grgia

please comment on https://github.com/Expensify/App/pull/84049/changes#r3570618992 before we merge
@dukenv0307 @shubham1206agra

github-actions · 2026-07-14T09:12:50Z

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

github-actions · 2026-07-14T09:17:32Z

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

Android 🤖	iOS 🍎
https://ad-hoc-expensify-cash.s3.us-east-1.amazonaws.com/rock-artifacts/ad-hoc/rock-android-Adhoc-ad631aa5f3f-892ce4b-abfee1bf43fd9d708d4a6562a8575d6fc9e415c1/index.html	❌ FAILED ❌
	The QR code can't be generated, because the iOS build failed

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

👀 View the workflow run that generated this build 👀

OSBotify · 2026-07-14T11:35:15Z

🚀 Deployed to staging by https://github.com/grgia in version: 9.4.34-0 🚀

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

MelvinBot · 2026-07-14T11:38:00Z

Help site review — no changes required

I reviewed the changes in this PR against the help articles under App/docs/articles, and no help-site updates are needed.

What this PR does: it introduces the free trial countdown pop-up (Trial Payment Reminder Modal) — an in-app reminder that nudges free-trial users to add a payment card before their trial ends. It's a UX nudge that surfaces an existing action; it doesn't add a new user-facing feature, setting, tab, or workflow that would need documentation.

Why no docs change: the underlying behavior the pop-up promotes is already documented:

Create-a-company-workspace.md — "Monitor Free Trial" already tells trial users to track their trial under Account > Subscription and add a billing card to continue using Expensify.
Add-a-payment-card-and-view-your-subscription.md already covers how to add a payment card.

Per the Help Authoring Guidelines, help articles document how to use features and complete workflows — not every in-app reminder or promotional prompt. This modal adds no capability or step that isn't already covered, so no draft docs PR was created.

Note: browser-based verification of the live UI was unavailable in this run (web prep failed), so feature/label names were confirmed against the PR code and existing help articles rather than the running app.

mitarachim · 2026-07-14T12:45:25Z

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

OSBotify · 2026-07-16T05:11:53Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

OSBotify · 2026-07-16T06:02:46Z

🚀 Deployed to production by https://github.com/roryabraham in version: 9.4.34-14 🚀

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

Bundle Size Analysis (Sentry):

Android

Introduce free trial countdown pop-up

106994b

melvin-bot Bot assigned dukenv0307 Mar 3, 2026

add tests

f21e45e

dukenv0307 marked this pull request as ready for review March 3, 2026 16:38

dukenv0307 requested review from a team as code owners March 3, 2026 16:38

melvin-bot Bot requested review from shubham1206agra and removed request for a team March 3, 2026 16:38

melvin-bot Bot requested review from JmillsExpensify and removed request for a team March 3, 2026 16:38

chatgpt-codex-connector Bot reviewed Mar 3, 2026

View reviewed changes

Comment thread src/hooks/useTrialPaymentReminder.ts Outdated

Comment thread src/hooks/useTrialPaymentReminder.ts Outdated

dukenv0307 added 2 commits March 3, 2026 23:46

update code

905d611

early return if loading state

af73253

add translations

c98fb52

JmillsExpensify previously approved these changes Mar 4, 2026

View reviewed changes

update changes

ae8600c

dukenv0307 dismissed JmillsExpensify’s stale review via ae8600c March 4, 2026 14:37

This comment has been minimized.

Sign in to view

dukenv0307 added 2 commits July 10, 2026 22:06

Merge branch 'main' into fix/84022

829b511

recompute trial reminder variant when trial dates change

2afe1fe

shubham1206agra approved these changes Jul 12, 2026

View reviewed changes

melvin-bot Bot requested a review from grgia July 12, 2026 17:00

grgia approved these changes Jul 13, 2026

View reviewed changes

grgia merged commit ad631aa into Expensify:main Jul 14, 2026
41 checks passed

github-actions Bot mentioned this pull request Jul 14, 2026

Investigate workflow job failing on main: test / test (job 5) #96032

Closed

github-actions Bot mentioned this pull request Jul 14, 2026

Investigate workflow job failing on main: test / test (job 5) #96036

Closed

MelvinBot mentioned this pull request Jul 14, 2026

Pin initially-selected items to the top of long BankAccount and Card filter lists #96031

Merged

53 tasks

OSBotify mentioned this pull request Jul 14, 2026

Deploy Checklist: New Expensify 2026-07-14 #96044

Closed

applause-bot Bot mentioned this pull request Jul 14, 2026

Free trial modal cannot be dismissed by clicking outside #96056

Closed

7 tasks

This was referenced Jul 14, 2026

Android - Add payment card button opens not here page #96069

Closed

Free Trial - Back button on "Add Payment" modal changes page and URL on background. #96077

Closed

jasperhuangg mentioned this pull request Jul 14, 2026

[CP staging] Revert "Introduce free trial countdown pop-up" #96129

Merged

Uh oh!

Conversation

dukenv0307 commented Mar 3, 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 Mar 3, 2026

Uh oh!

codecov Bot commented Mar 3, 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 Mar 3, 2026

Uh oh!

dukenv0307 commented Mar 3, 2026

Uh oh!

dukenv0307 commented Mar 3, 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!

dukenv0307 commented Mar 3, 2026

Uh oh!

dukenv0307 commented Mar 3, 2026

Uh oh!

dubielzyk-expensify commented Mar 4, 2026

Uh oh!

JmillsExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

dylanexpensify commented Mar 4, 2026

Uh oh!

dukenv0307 commented Mar 4, 2026

Uh oh!

dukenv0307 commented Mar 4, 2026

Uh oh!

dubielzyk-expensify commented Mar 4, 2026

Uh oh!

shubham1206agra commented Jul 7, 2026

Uh oh!

shubham1206agra commented Jul 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shubham1206agra commented Jul 9, 2026

Uh oh!

dukenv0307 commented Jul 9, 2026

Uh oh!

github-actions Bot commented Jul 10, 2026

Uh oh!

This comment has been minimized.

dukenv0307 commented Jul 10, 2026

Uh oh!

dukenv0307 commented Jul 10, 2026

Uh oh!

shubham1206agra commented Jul 12, 2026

Reviewer Checklist

Screenshots/Videos

Uh oh!

grgia left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

github-actions Bot commented Jul 14, 2026

Uh oh!

OSBotify commented Jul 14, 2026

Uh oh!

MelvinBot commented Jul 14, 2026

Help site review — no changes required

Uh oh!

dukenv0307 commented Mar 3, 2026 •

edited

Loading

codecov Bot commented Mar 3, 2026 •

edited by github-actions Bot

Loading

shubham1206agra commented Jul 7, 2026 •

edited

Loading