From 6e6432c1d0cc05e096c0b8e7a57150100bae7f85 Mon Sep 17 00:00:00 2001
From: cyprain-okeke <108260115+cyprain-okeke@users.noreply.github.com>
Date: Tue, 30 May 2023 15:30:37 +0100
Subject: [PATCH] [PM 1538] Update subscription renewal reminder email message
 templates (#2865)

* Making changes for the help link

* Making changes for the PR comment

* default value in the view model itself

* Adjusting the image position

* Add more information to the plain text
---
 src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs | 5 ++++-
 src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs | 2 +-
 src/Core/Models/Mail/InvoiceUpcomingViewModel.cs           | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs
index fcfc51ab6b..0d6dde4136 100644
--- a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs
+++ b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.html.hbs
@@ -17,7 +17,10 @@
     {{/if}}
     <tr style="margin: 0; font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none;">
         <td class="content-block" style="font-family: 'Helvetica Neue', Helvetica, Arial, sans-serif; box-sizing: border-box; font-size: 16px; color: #333; line-height: 25px; margin: 0; -webkit-font-smoothing: antialiased; padding: 0 0 10px; -webkit-text-size-adjust: none;" valign="top">
-            To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription, payment method, and invoices by logging into the web vault at {{{link WebVaultUrl}}}.
+            To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription, payment method, and invoices by logging into the web vault.
+            <a href="{{{UpdateBillingInfoUrl}}}" style="text-decoration: none">
+                <img src="https://assets.bitwarden.com/email/v1/BillingLearnMore.png" alt="update-billing-info" width="20" height="20" style="display: inline-block;vertical-align: top;">
+            </a>
         </td>
     </tr>
     {{#if MentionInvoices}}
diff --git a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs
index 93120cc432..9c70920189 100644
--- a/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs
+++ b/src/Core/MailTemplates/Handlebars/InvoiceUpcoming.text.hbs
@@ -9,7 +9,7 @@ Summary Of Charges
 {{/each}}
 {{/if}}
 
-To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription, payment method, and invoices by logging into the web vault at {{{WebVaultUrl}}}.
+To avoid any interruption in service, please ensure that your payment method on file is up to date and can be charged for the above amount. You can manage your subscription, payment method, and invoices by logging into the web vault. For more information, please visit {{{UpdateBillingInfoUrl}}}.
 {{#if MentionInvoices}}
 {{/if}}
 
diff --git a/src/Core/Models/Mail/InvoiceUpcomingViewModel.cs b/src/Core/Models/Mail/InvoiceUpcomingViewModel.cs
index 29c40bf920..db62178a0a 100644
--- a/src/Core/Models/Mail/InvoiceUpcomingViewModel.cs
+++ b/src/Core/Models/Mail/InvoiceUpcomingViewModel.cs
@@ -6,4 +6,5 @@ public class InvoiceUpcomingViewModel : BaseMailModel
     public DateTime DueDate { get; set; }
     public List<string> Items { get; set; }
     public bool MentionInvoices { get; set; }
+    public string UpdateBillingInfoUrl { get; set; } = "https://bitwarden.com/help/update-billing-info/";
 }