From 1a8d668fb596a4e1f2b142b45de3d11db470b21a Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 20 Sep 2024 11:06:06 -0600
Subject: [PATCH] fix some bugs

---
 .../includes/domain_request_awaiting_review.html    |  8 ++++----
 .../includes/portfolio_request_review_steps.html    | 13 ++++++++++---
 .../portfolio_domain_request_status_viewonly.html   |  2 +-
 src/registrar/utility/enums.py                      |  2 +-
 4 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/registrar/templates/includes/domain_request_awaiting_review.html b/src/registrar/templates/includes/domain_request_awaiting_review.html
index 18afc9903..cc9b31ccb 100644
--- a/src/registrar/templates/includes/domain_request_awaiting_review.html
+++ b/src/registrar/templates/includes/domain_request_awaiting_review.html
@@ -5,10 +5,10 @@
 </h2>
 <p>We received your .gov domain request. Our next step is to review your request. This usually takes 30 business days. We’ll email you if we have questions and when we complete our review. <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'contact' %}">Contact us with any questions</a>.</p>
 
-<h2 class="margin-top-0 margin-bottom-2 text-primary-darker text-semibold">
-  Need to make changes?
-</h2>
-
 {% if show_withdraw_text %}
+  <h2 class="margin-top-0 margin-bottom-2 text-primary-darker text-semibold">
+    Need to make changes?
+  </h2>
+
   <p>If you need to change your request you have to first withdraw it. Once you withdraw the request you can edit it and submit it again. Changing your request might add to the wait time.</p>
 {% endif %}
diff --git a/src/registrar/templates/includes/portfolio_request_review_steps.html b/src/registrar/templates/includes/portfolio_request_review_steps.html
index 303da4675..8f7dba9ac 100644
--- a/src/registrar/templates/includes/portfolio_request_review_steps.html
+++ b/src/registrar/templates/includes/portfolio_request_review_steps.html
@@ -8,9 +8,16 @@
     {% endif %}
 
     {% if step == Step.REQUESTING_ENTITY %}
-        {% with title=form_titles|get_item:step value=domain_request.portfolio|default:"<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe%}
-            {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
-        {% endwith %}
+
+        {% if domain_request.organization_name %}
+            {% with title=form_titles|get_item:step value=domain_request %}
+                {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url address='true' %}
+            {% endwith %}
+        {% else %}
+            {% with title=form_titles|get_item:step value="<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %}
+                {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
+            {% endwith %}
+        {% endif%}
     {% endif %}
 
     {% if step == Step.CURRENT_SITES %}
diff --git a/src/registrar/templates/portfolio_domain_request_status_viewonly.html b/src/registrar/templates/portfolio_domain_request_status_viewonly.html
index bb6ee1e66..0378d1b56 100644
--- a/src/registrar/templates/portfolio_domain_request_status_viewonly.html
+++ b/src/registrar/templates/portfolio_domain_request_status_viewonly.html
@@ -5,5 +5,5 @@
 {% block title %}Domain request status | {{ DomainRequest.requested_domain.name }} | {% endblock %}
 
 {% block content %}
-  {% include "includes/portfolio_domain_request_status_view.html" %}
+  {% include "includes/portfolio_request_status_view.html" %}
 {% endblock %}
diff --git a/src/registrar/utility/enums.py b/src/registrar/utility/enums.py
index ad98489e1..21c03917c 100644
--- a/src/registrar/utility/enums.py
+++ b/src/registrar/utility/enums.py
@@ -72,7 +72,7 @@ class PortfolioDomainRequestStep(StrEnum):
     appear in the order they are defined. (Order matters.)
     """
     # Portfolio
-    REQUESTING_ENTITY = "portfolio"
+    REQUESTING_ENTITY = "organization_name"
     CURRENT_SITES = "current_sites"
     DOTGOV_DOMAIN = "dotgov_domain"
     PURPOSE = "purpose"