Merge branch 'main' into billing/PM-31140/consolidate-unpaid-subscription-handling

src/Core/Constants.cs

@@ -262,6 +262,7 @@ public static class FeatureFlagKeys
     public const string EventManagementForDataDogAndCrowdStrike = "event-management-for-datadog-and-crowdstrike";
     public const string EventDiagnosticLogging = "pm-27666-siem-event-log-debugging";
     public const string EventManagementForHuntress = "event-management-for-huntress";
+    public const string Milestone11AppPageImprovements = "pm-30538-dirt-milestone-11-app-page-improvements";
 
     /* UIF Team */
     public const string RouterFocusManagement = "router-focus-management";

src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.html.hbs

@@ -2,17 +2,17 @@
     <table width="100%" border="0" cellpadding="0" cellspacing="0" style="display: table; width:100%; padding: 30px; text-align: left;" align="center">
         <tr>
             <td style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-style: normal; font-weight: 400; font-size: 16px; line-height: 24px; margin-top: 30px; margin-bottom: 25px; margin-left: 35px; margin-right: 35px;">
-                <b>Here's what that means:</b>
+                <b>What this means for you</b>
                 <ul>
-                    <li>Your Bitwarden account is owned by {{OrganizationName}}</li>
+                    <li>Your day-to-day use of Bitwarden remains the same.</li>
-                    <li>Your administrators can delete your account at any time</li>
+                    <li>Only store work-related items in your {{OrganizationName}} vault.</li>
-                    <li>You cannot leave the organization</li>
+                    <li>{{OrganizationName}} admins now manage your account, meaning they can revoke or delete your account.</li>
                 </ul>
             </td>
         </tr>
         <tr>
             <td style="font-family:'Helvetica Neue', Helvetica, Arial, sans-serif; font-style: normal; font-weight: 400; font-size: 16px; line-height: 24px; margin-top: 30px; margin-bottom: 25px; margin-left: 35px; margin-right: 35px;">
-                For more information, please refer to the following help article: <a href="https://bitwarden.com/help/claimed-accounts">Claimed Accounts</a>
+                For more information, please refer to the following help article: <a href="https://bitwarden.com/help/claimed-accounts">Claimed accounts</a>
             </td>
         </tr>
     </table>

src/Core/MailTemplates/Handlebars/AdminConsole/DomainClaimedByOrganization.text.hbs

@@ -1,7 +1,6 @@
-As a member of {{OrganizationName}}, your Bitwarden account is claimed and owned by your organization.
+What this means for you:
+- Your day-to-day use of Bitwarden remains the same.
+- Only store work-related items in your {{OrganizationName}} vault.
+- {{OrganizationName}} admins now manage your account, meaning they can revoke or delete your account.
 
-Here's what that means:
+For more information, please refer to the following help article: Claimed accounts (https://bitwarden.com/help/claimed-accounts)
-- Your administrators can delete your account at any time
-- You cannot leave the organization
-
-For more information, please refer to the following help article: Claimed Accounts (https://bitwarden.com/help/claimed-accounts)

src/Core/Platform/Mail/HandlebarsMailService.cs

@@ -657,11 +657,11 @@ public class HandlebarsMailService : IMailService
         return;
 
         MailQueueMessage CreateMessage(string emailAddress, Organization org) =>
-            new(CreateDefaultMessage($"Your Bitwarden account is claimed by {org.DisplayName()}", emailAddress),
+            new(CreateDefaultMessage($"Important update to your Bitwarden account", emailAddress),
                 "AdminConsole.DomainClaimedByOrganization",
                 new ClaimedDomainUserNotificationViewModel
                 {
-                    TitleFirst = $"Your Bitwarden account is claimed by {org.DisplayName()}",
+                    TitleFirst = $"Important update to your Bitwarden account",
                     OrganizationName = CoreHelpers.SanitizeForEmail(org.DisplayName(), false)
                 });
     }