90 deactivation email clarity (#551)

* SRCH-1300 - Change 90 day warning text
GSA · Mar 23, 2020 · e53ab59 · e53ab59
1 parent 6b07d0c
commit e53ab59
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/app/mailers/emailer.rb b/app/mailers/emailer.rb
@@ -32,7 +32,8 @@ def new_feature_adoption_to_admin
 
   def account_deactivation_warning(user, date)
     @user = user
-    @remaining_days = (date - 90.days.ago.to_date).to_i
+    days_remaining = (date - 90.days.ago.to_date).to_i
+    @deactivation_date = days_remaining.days.from_now.strftime('%m/%d/%Y')
     @user_contact_name = get_contact_name(user)
     generic_user_html_email(user, __method__)
   end

diff --git a/db/email_templates/account_deactivation_warning.html.erb b/db/email_templates/account_deactivation_warning.html.erb
@@ -614,8 +614,9 @@
                                           <div style="text-align: left;"><br>
                                             <span style="font-family:helvetica neue,helvetica,arial,verdana,sans-serif">
                                               <p>Hello <%= @user_contact_name %>,</p>
-                                              <p> This is a notification to let you know that our system will automatically deactivate your account in the next <%= @remaining_days %> days due to inactivity.</p>
-                                              <p>Please log in today to maintain access to your search.gov account.</p>
+                                              <p>Search.gov user accounts must be accessed at least once every 90 days to remain active. Please log in before <%= @deactivation_date %>, or your account will automatically be deactivated due to inactivity.
+                                              <p>Your search sites will continue to function normally.</p>
+                                              <p>Please log in today to maintain access to your Search.gov account.</p>
                                               <p>Thank you!</p>
                                             </span>
                                           </div>
@@ -741,7 +742,7 @@
                                             <div style="line-height: 20.8px; text-align: center;">
                                               <span style="font-size:12px">
                                                 <span style="font-family:helvetica neue,helvetica,arial,verdana,sans-serif">
-                                                  <span style="line-height:20.8px">You received this message because you have an account&nbsp;on&nbsp;
+                                                  <span style="line-height:20.8px">You received this message because you have an account on
                                                     <a href="https://search.gov" target="_blank">Search.gov</a> that is set to expire soon.&nbsp;
                                                   </span><br>
                                                   <br>

diff --git a/spec/mailers/emailer_spec.rb b/spec/mailers/emailer_spec.rb
@@ -8,8 +8,9 @@
 
   describe '.account_deactivation_warning' do
     let(:user) { users(:not_active_76_days) }
+    let(:expected_date) { 14.days.from_now.strftime("%m/%d/%Y") }
     let(:message) do
-      'automatically deactivate your account in the next 14 days due to inactivity.'
+      "at least once every 90 days to remain active. Please log in before #{expected_date}"
     end
 
     subject(:account_deactivation_warning) do