Merge pull request #20394 from mozilla/PAY-3650-free-trial-ending-email-displays-duplicated-amount

elizabeth-ilina · web-flow · commit f30c6f28f7d4 · 2026-04-22T09:06:15.000-04:00
fix(payments-next): Free trial ending email displays duplicated amount
diff --git a/libs/accounts/email-renderer/src/templates/freeTrialEndingReminder/en.ftl b/libs/accounts/email-renderer/src/templates/freeTrialEndingReminder/en.ftl
@@ -23,19 +23,23 @@ freeTrialEndingReminder-content-charge-heading = Charge details
 #   $productName (String) - The name of the subscribed product, e.g. Mozilla VPN
 #   $invoiceSubtotal (String) - The subtotal amount of the subscription, e.g. $12.99
 freeTrialEndingReminder-content-charge-subscription = { $productName } subscription: { $invoiceSubtotal }
+freeTrialEndingReminder-content-charge-subscription-2 = { $productName } subscription
 
 # Variables:
 #   $invoiceDiscountAmount (String) - The discount amount, as a negative number, e.g. -$3.00
 freeTrialEndingReminder-content-charge-discount = Discount: { $invoiceDiscountAmount }
+freeTrialEndingReminder-content-charge-discount-2 = Discount
 
 # Variables:
 #   $invoiceTaxAmount (String) - The tax amount, e.g. $1.20
 freeTrialEndingReminder-content-charge-tax = Tax: { $invoiceTaxAmount }
+freeTrialEndingReminder-content-charge-tax-2 = Tax
 
 # Variables:
 #   $serviceLastActiveDateOnly (String) - The date the charge will occur, e.g. January 20, 2016
 #   $invoiceTotal (String) - The total amount due, e.g. $9.99
 freeTrialEndingReminder-content-charge-total = Total due on { $serviceLastActiveDateOnly }: { $invoiceTotal }
+freeTrialEndingReminder-content-charge-total-2 = Total due on { $serviceLastActiveDateOnly }
 
 freeTrialEndingReminder-content-account-link = You can review or update your payment method and account information <a data-l10n-name="freeTrialEndingReminder-update-billing">here</a>.
 freeTrialEndingReminder-content-account-link-plaintext = You can review or update your payment method and account information here:
diff --git a/libs/accounts/email-renderer/src/templates/freeTrialEndingReminder/index.mjml b/libs/accounts/email-renderer/src/templates/freeTrialEndingReminder/index.mjml
@@ -36,7 +36,7 @@
       <table width="100%">
         <tr style="line-height: 24px;">
           <td style="text-align: start;">
-            <span data-l10n-id="freeTrialEndingReminder-content-charge-subscription" data-l10n-args="<%= JSON.stringify({ productName, invoiceSubtotal }) %>">
+            <span data-l10n-id="freeTrialEndingReminder-content-charge-subscription-2" data-l10n-args="<%= JSON.stringify({ productName }) %>">
               <%- productName %> subscription
             </span>
           </td>
@@ -52,7 +52,7 @@
       <table width="100%">
         <tr style="line-height: 24px; border-top: 1px solid #E0E0E6;">
           <td style="text-align: start;">
-            <span data-l10n-id="freeTrialEndingReminder-content-charge-discount" data-l10n-args="<%= JSON.stringify({ invoiceDiscountAmount }) %>">
+            <span data-l10n-id="freeTrialEndingReminder-content-charge-discount-2">
               Discount
             </span>
           </td>
@@ -69,7 +69,7 @@
       <table width="100%">
         <tr style="line-height: 24px; border-top: 1px solid #E0E0E6;">
           <td style="text-align: start;">
-            <span data-l10n-id="freeTrialEndingReminder-content-charge-tax" data-l10n-args="<%= JSON.stringify({ invoiceTaxAmount }) %>">
+            <span data-l10n-id="freeTrialEndingReminder-content-charge-tax-2">
               Tax
             </span>
           </td>
@@ -85,7 +85,7 @@
       <table width="100%">
         <tr style="line-height: 24px; border-top: 1px solid grey;">
           <td style="text-align: start; padding: 4px 0;">
-            <span data-l10n-id="freeTrialEndingReminder-content-charge-total" data-l10n-args="<%= JSON.stringify({ serviceLastActiveDateOnly, invoiceTotal }) %>">
+            <span data-l10n-id="freeTrialEndingReminder-content-charge-total-2" data-l10n-args="<%= JSON.stringify({ serviceLastActiveDateOnly }) %>">
               <b>Total due on <%- serviceLastActiveDateOnly %></b>
             </span>
           </td>
diff --git a/libs/accounts/email-renderer/src/templates/freeTrialEndingReminder/index.ts b/libs/accounts/email-renderer/src/templates/freeTrialEndingReminder/index.ts
@@ -18,7 +18,7 @@ export type TemplateData = {
 };
 
 export const template = 'freeTrialEndingReminder';
-export const version = 1;
+export const version = 2;
 export const layout = 'subscription';
 export const includes = {
   subject: {
diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/_versions.json b/packages/fxa-auth-server/lib/senders/emails/templates/_versions.json
@@ -1,5 +1,5 @@
 {
-  "freeTrialEndingReminder": 1,
+  "freeTrialEndingReminder": 2,
   "subscriptionReactivation": 2,
   "subscriptionRenewalReminder": 4,
   "subscriptionEndingReminder": 2,
diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/freeTrialEndingReminder/en.ftl b/packages/fxa-auth-server/lib/senders/emails/templates/freeTrialEndingReminder/en.ftl
@@ -23,19 +23,23 @@ freeTrialEndingReminder-content-charge-heading = Charge details
 #   $productName (String) - The name of the subscribed product, e.g. Mozilla VPN
 #   $invoiceSubtotal (String) - The subtotal amount of the subscription, e.g. $12.99
 freeTrialEndingReminder-content-charge-subscription = { $productName } subscription: { $invoiceSubtotal }
+freeTrialEndingReminder-content-charge-subscription-2 = { $productName } subscription
 
 # Variables:
 #   $invoiceDiscountAmount (String) - The discount amount, as a negative number, e.g. -$3.00
 freeTrialEndingReminder-content-charge-discount = Discount: { $invoiceDiscountAmount }
+freeTrialEndingReminder-content-charge-discount-2 = Discount
 
 # Variables:
 #   $invoiceTaxAmount (String) - The tax amount, e.g. $1.20
 freeTrialEndingReminder-content-charge-tax = Tax: { $invoiceTaxAmount }
+freeTrialEndingReminder-content-charge-tax-2 = Tax
 
 # Variables:
 #   $serviceLastActiveDateOnly (String) - The date the charge will occur, e.g. January 20, 2016
 #   $invoiceTotal (String) - The total amount due, e.g. $9.99
 freeTrialEndingReminder-content-charge-total = Total due on { $serviceLastActiveDateOnly }: { $invoiceTotal }
+freeTrialEndingReminder-content-charge-total-2 = Total due on { $serviceLastActiveDateOnly }
 
 freeTrialEndingReminder-content-account-link = You can review or update your payment method and account information <a data-l10n-name="freeTrialEndingReminder-update-billing">here</a>.
 freeTrialEndingReminder-content-account-link-plaintext = You can review or update your payment method and account information here:
diff --git a/packages/fxa-auth-server/lib/senders/emails/templates/freeTrialEndingReminder/index.mjml b/packages/fxa-auth-server/lib/senders/emails/templates/freeTrialEndingReminder/index.mjml
@@ -36,7 +36,7 @@
       <table width="100%">
         <tr style="line-height: 24px;">
           <td style="text-align: start;">
-            <span data-l10n-id="freeTrialEndingReminder-content-charge-subscription" data-l10n-args="<%= JSON.stringify({ productName, invoiceSubtotal }) %>">
+            <span data-l10n-id="freeTrialEndingReminder-content-charge-subscription-2" data-l10n-args="<%= JSON.stringify({ productName }) %>">
               <%- productName %> subscription
             </span>
           </td>
@@ -52,7 +52,7 @@
       <table width="100%">
         <tr style="line-height: 24px; border-top: 1px solid #E0E0E6;">
           <td style="text-align: start;">
-            <span data-l10n-id="freeTrialEndingReminder-content-charge-discount" data-l10n-args="<%= JSON.stringify({ invoiceDiscountAmount }) %>">
+            <span data-l10n-id="freeTrialEndingReminder-content-charge-discount-2">
               Discount
             </span>
           </td>
@@ -69,7 +69,7 @@
       <table width="100%">
         <tr style="line-height: 24px; border-top: 1px solid #E0E0E6;">
           <td style="text-align: start;">
-            <span data-l10n-id="freeTrialEndingReminder-content-charge-tax" data-l10n-args="<%= JSON.stringify({ invoiceTaxAmount }) %>">
+            <span data-l10n-id="freeTrialEndingReminder-content-charge-tax-2">
               Tax
             </span>
           </td>
@@ -85,7 +85,7 @@
       <table width="100%">
         <tr style="line-height: 24px; border-top: 1px solid grey;">
           <td style="text-align: start; padding: 4px 0;">
-            <span data-l10n-id="freeTrialEndingReminder-content-charge-total" data-l10n-args="<%= JSON.stringify({ serviceLastActiveDateOnly, invoiceTotal }) %>">
+            <span data-l10n-id="freeTrialEndingReminder-content-charge-total-2" data-l10n-args="<%= JSON.stringify({ serviceLastActiveDateOnly }) %>">
               <b>Total due on <%- serviceLastActiveDateOnly %></b>
             </span>
           </td>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "freeTrialEndingReminder": 1,`
	`2`	`+ "freeTrialEndingReminder": 2,`
`3`	`3`	`"subscriptionReactivation": 2,`
`4`	`4`	`"subscriptionRenewalReminder": 4,`
`5`	`5`	`"subscriptionEndingReminder": 2,`