feat(payments-next): Cancel free trial on upgrade by david1alvarez · Pull Request #20328 · mozilla/fxa

david1alvarez · 2026-04-06T23:09:10Z

Because:

When a user upgrades a subscription, we update their subscription in Stripe. By default, a user's free trial remains attached to the subscription after its update.
A user can use this to obtain a free trial on an upgraded subscription, regardless of that subscription's free trial eligibility

This commit:

Cancels a free trial when the user upgrades their subscription by setting the trial's end time to "now"
Adds in warning messaging to the upgrade page alerting the user to the fact that they will be billed the full amount

Closes #PAY-3602

Checklist

Put an x in the boxes that apply

My commit is GPG signed.
If applicable, I have modified or added tests which pass locally.
I have added necessary documentation (if appropriate).
I have verified that my changes render correctly in RTL (if appropriate).
I have manually reviewed all AI generated code.

How to review (Optional)

Key files/areas to focus on:
Suggested review order:
Risky or complex parts:

Screenshots (Optional)

Please attach the screenshots of the changes made in case of change in user interface.

Other information (Optional)

Any other information that is important to this pull request.

Copilot

Pull request overview

Updates the upgrade flow so that upgrading from a trialing subscription immediately ends the free trial (preventing users from carrying a free trial onto an upgraded plan) and informs users they’ll be billed today.

Changes:

Ends Stripe trials on subscription upgrade by setting trial_end to “now” for trialing subscriptions.
Adjusts upcoming-invoice previews for upgrades to account for ending trials immediately.
Adds an upgrade-page warning message when upgrading from an active free trial.

Reviewed changes

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

Show a summary per file

File	Description
libs/payments/customer/src/lib/invoice.manager.ts	Adds optional `trialEnd` handling when previewing upcoming invoices for upgrades.
libs/payments/cart/src/lib/checkout.service.ts	Cancels trials on upgrade via Stripe subscription update; passes `trialEnd` for invoice previews.
libs/payments/cart/src/lib/checkout.service.spec.ts	Adds tests asserting `trial_end: 'now'` is passed on upgrades from trialing subscriptions.
libs/payments/cart/src/lib/cart.types.ts	Extends cart DTO with `isUpgradeFromTrial` flag.
libs/payments/cart/src/lib/cart.service.ts	Computes `isUpgradeFromTrial` and passes `trialEnd` into upgrade invoice previews; returns flag to client.
libs/payments/cart/src/lib/cart.service.spec.ts	Adds/updates tests to validate `isUpgradeFromTrial` behavior.
apps/payments/next/app/[locale]/[offeringId]/[interval]/upgrade/[cartId]/(startLayout)/start/page.tsx	Displays different acknowledgment text when upgrading from a trial.
apps/payments/next/app/[locale]/[offeringId]/[interval]/upgrade/[cartId]/(startLayout)/start/en.ftl	Adds localized string for the “upgrade from trial” acknowledgment.

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

Copilot · 2026-04-06T23:13:28Z

@@ -147,6 +149,7 @@ export class InvoiceManager {
        ],
        proration_behavior: 'always_invoice',
        proration_date: Math.floor(Date.now() / 1000),
+        ...(trialEnd && { trial_end: trialEnd }),
      },


trialEnd is newly supported here, but there’s no unit test that verifies trial_end is actually forwarded to Stripe when provided. Adding a spec that calls previewUpcomingUpgrade({ trialEnd: <number> }) and asserts stripeClient.invoicesRetrieveUpcoming received subscription_details.trial_end would prevent regressions in this billing-critical behavior.

Copilot · 2026-04-06T23:13:28Z

      const fromSubscription =
        await this.subscriptionManager.retrieveForCustomerAndPrice(
          customer.id,
          eligibility.fromPrice.id
        );
      assert(
        fromSubscription,
        new DetermineCheckoutAmountSubscriptionRequiredError(
          customer.id,
          eligibility.fromPrice.id
        )
      );
+      const isTrialing = fromSubscription.status === 'trialing';
      const fromSubscriptionItem = retrieveSubscriptionItem(fromSubscription);
      const upcomingInvoice =
        await this.invoiceManager.previewUpcomingForUpgrade({
          priceId,
          customer,
          fromSubscriptionItem,
+          ...(isTrialing && {
+            trialEnd: Math.floor(Date.now() / 1000),
+          }),
        });


determineCheckoutAmount now conditionally passes trialEnd when the existing subscription is trialing, but the test suite doesn’t cover this branch (it only asserts the upgrade path calls previewUpcomingForUpgrade). Add a test where retrieveForCustomerAndPrice returns a trialing subscription and assert invoiceManager.previewUpcomingForUpgrade is called with a trialEnd number (e.g. expect.any(Number)).

Copilot · 2026-04-06T23:13:28Z

@@ -928,12 +929,16 @@ export class CartService {
          eligibility.fromPrice.id
        );
      assert(fromSubscription, new GetCartSubscriptionMissingError(cartId));
+      isUpgradeFromTrial = fromSubscription.status === 'trialing';
      const fromSubscriptionItem = retrieveSubscriptionItem(fromSubscription);
      upcomingInvoicePreview =
        await this.invoiceManager.previewUpcomingForUpgrade({
          priceId: price.id,
          customer,
          fromSubscriptionItem,
+          ...(isUpgradeFromTrial && {
+            trialEnd: Math.floor(Date.now() / 1000),
+          }),
        });


getCart now passes trialEnd into previewUpcomingForUpgrade when upgrading from a trialing subscription, but the new spec only asserts isUpgradeFromTrial: true and doesn’t verify the invoice-preview call includes trialEnd. Consider asserting invoiceManager.previewUpcomingForUpgrade was called with trialEnd: expect.any(Number) in the trialing-subscription test to ensure the preview matches the post-upgrade billing behavior.

elizabeth-ilina · 2026-04-07T15:43:56Z

I like the Copilot suggestions to add a couple tests, especially the one in cart.service.spec. Otherwise WFM and LGTM! r+ thanks Davey!

xlisachan · 2026-04-07T16:32:54Z

On main, if the customer does not have a default payment method saved to their Stripe account during Upgrade, the Stripe Payment Method UI appears so the customer can attach a new payment method.

However, if the customer has a free trial and tries to upgrade, the page crashes.

xlisachan

If the customer does not have a default payment method on their account, the Upgrade page crashes. Expected behavior should be the same as on main, in which the customer would be able to select a new payment method.

david1alvarez · 2026-04-07T22:55:02Z

xlisachan

r+wc! Thanks Davey! 🎉

I know you're aiming to get this PR onto stage today, could you add the missing tests in a polish PR?

Because: * When a user upgrades a subscription, we update their subscription in Stripe. By default, a user's free trial remains attached to the subscription after its update. * A user can use this to obtain a free trial on an upgraded subscription, regardless of that subscription's free trial eligibility This commit: * Cancels a free trial when the user upgrades their subscription by setting the trial's end time to "now" * Adds in warning messaging to the upgrade page alerting the user to the fact that they will be billed the full amount Closes #PAY-3602

Copilot AI review requested due to automatic review settings April 6, 2026 23:09

david1alvarez requested review from a team as code owners April 6, 2026 23:09

Copilot started reviewing on behalf of david1alvarez April 6, 2026 23:09 View session

Copilot AI reviewed Apr 6, 2026

View reviewed changes

bcolsson approved these changes Apr 6, 2026

View reviewed changes

elizabeth-ilina approved these changes Apr 7, 2026

View reviewed changes

xlisachan requested changes Apr 7, 2026

View reviewed changes

david1alvarez force-pushed the PAY-3602 branch from 931244f to 7f96616 Compare April 7, 2026 22:54

david1alvarez force-pushed the PAY-3602 branch from 7f96616 to 11b9e31 Compare April 8, 2026 00:59

xlisachan approved these changes Apr 8, 2026

View reviewed changes

david1alvarez force-pushed the PAY-3602 branch from 11b9e31 to 3589556 Compare April 8, 2026 16:06

david1alvarez merged commit 5ab20fd into main Apr 8, 2026
20 of 21 checks passed

david1alvarez deleted the PAY-3602 branch April 8, 2026 16:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(payments-next): Cancel free trial on upgrade#20328

feat(payments-next): Cancel free trial on upgrade#20328
david1alvarez merged 1 commit intomainfrom
PAY-3602

david1alvarez commented Apr 6, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 6, 2026

Uh oh!

Copilot AI Apr 6, 2026

Uh oh!

Copilot AI Apr 6, 2026

Uh oh!

elizabeth-ilina commented Apr 7, 2026

Uh oh!

xlisachan commented Apr 7, 2026

Uh oh!

xlisachan left a comment

Uh oh!

david1alvarez commented Apr 7, 2026

Uh oh!

xlisachan left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Conversation

david1alvarez commented Apr 6, 2026

Checklist

How to review (Optional)

Screenshots (Optional)

Other information (Optional)

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 6, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 6, 2026

Choose a reason for hiding this comment

Uh oh!

elizabeth-ilina commented Apr 7, 2026

Uh oh!

xlisachan commented Apr 7, 2026

Uh oh!

xlisachan left a comment

Choose a reason for hiding this comment

Uh oh!

david1alvarez commented Apr 7, 2026

Uh oh!

xlisachan left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants