From fbbdba001dde10a3931b19142e660a8d048172a1 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Thu, 9 Jan 2025 08:40:48 -0800
Subject: [PATCH] Fix status alert, now show expiring soon checkbox filter etc

---
 src/registrar/templates/domain_detail.html          | 4 ++--
 src/registrar/templates/domain_renewal.html         | 6 ++----
 src/registrar/templates/includes/domains_table.html | 2 +-
 src/registrar/templates/includes/summary_item.html  | 3 +--
 4 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index becf46d5b..2cd3e5a5c 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -49,11 +49,11 @@
           </span>
           {% if domain.get_state_help_text %}
             <div class="padding-top-1 text-primary-darker">
-              {% if has_domain_renewal_flag and domain.is_expiring and is_domain_manager %}
+              {% if has_domain_renewal_flag and domain.is_expired and is_domain_manager %}
                 This domain has expired, but it is still online. 
                 {% url 'domain-renewal' pk=domain.id as url %}
                 <a href="{{ url }}">Renew to maintain access.</a>
-              {% elif has_domain_renewal_flag and domain.is_expired and is_domain_manager %}
+              {% elif has_domain_renewal_flag and domain.is_expiring and is_domain_manager %}
                 This domain will expire soon. 
                 {% url 'domain-renewal' pk=domain.id as url %}
                 <a href="{{ url }}">Renew to maintain access.</a>
diff --git a/src/registrar/templates/domain_renewal.html b/src/registrar/templates/domain_renewal.html
index 7867bfce8..e90e4a366 100644
--- a/src/registrar/templates/domain_renewal.html
+++ b/src/registrar/templates/domain_renewal.html
@@ -49,10 +49,8 @@
   </div>
 
     {% url 'user-profile' as url %}
-    {% include "includes/summary_item.html" with title='Your Contact Information' value=user edit_link=url editable=is_editable  contact='true' %}
+    {% include "includes/summary_item.html" with title='Your contact information' value=user edit_link=url editable=is_editable  contact='true' %}
   
-
-
     {% if analyst_action != 'edit' or analyst_action_location != domain.pk %}
       {% if is_portfolio_user and not is_domain_manager %}
       <div class="usa-alert usa-alert--info usa-alert--slim">
@@ -65,6 +63,7 @@
       {% endif %}
     {% endif %}
 
+    <!-- <div class="custom-renewal-heading"> -->
     {% url 'domain-security-email' pk=domain.id as url %}
     {% if security_email is not None and security_email not in hidden_security_emails%}
       {% include "includes/summary_item.html" with title='Security email' value=security_email custom_text_for_value_none='We strongly recommend that you provide a security email. This email will allow the  public to report observed or suspected security issues on your domain.' edit_link=url editable=is_editable %}
@@ -78,7 +77,6 @@
       {% include "includes/summary_item.html" with title='Domain managers' list=True users=True value=domain.permissions.all edit_link=url editable=is_editable %}
     {% endif %}
 
-
     <div class="border-top-1px border-primary-dark padding-top-1 margin-top-3 margin-bottom-2">
 
       <fieldset class="usa-fieldset">
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index f9f8b4c9f..1d7bd7ce6 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -172,7 +172,7 @@
               >Deleted</label
             >
           </div>
-          {% if has_domain_renewal_flag and num_expiring_domains > 0 %}
+          {% if has_domain_renewal_flag %}
           <div class="usa-checkbox">
             <input
               class="usa-checkbox__input"
diff --git a/src/registrar/templates/includes/summary_item.html b/src/registrar/templates/includes/summary_item.html
index df55c2edb..8c02757c1 100644
--- a/src/registrar/templates/includes/summary_item.html
+++ b/src/registrar/templates/includes/summary_item.html
@@ -127,14 +127,13 @@
           </ul>
         {% endif %}
       {% else %}
-      <p class="margin-top-0 margin-bottom-0">
         {% if custom_text_for_value_none %}
           <p class="text-base-dark">{{ custom_text_for_value_none }}</p>
         {% endif %}
         {% if value %}
           {{ value }}
         {% endif %}
-        {% if not value and not custom_text_for_value_none %}
+        {% if not value %}
           None
         {% endif %}
       </p>