Merge branch 'main' into bob/3019-portfolio-invitation-email

src/registrar/templates/domain_add_user.html

@@ -37,6 +37,9 @@
     </nav>
     {% endif %}
   {% endblock breadcrumb %}
+
+  {% include "includes/form_errors.html" with form=form %}
+
   <h1>Add a domain manager</h1>
 {% if has_organization_feature_flag %}
   <p>

src/registrar/templates/includes/senior_official.html

@@ -26,7 +26,6 @@
     </form>
 {% elif not form.full_name.value and not form.title.value and not form.email.value %}
     <p>
-        Your senior official is a person within your organization who can authorize domain requests.
         We don't have information about your organization's senior official. To suggest an update, email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
     </p>
 {% else %}

src/registrar/templates/portfolio_organization.html

@@ -23,6 +23,8 @@
             {% include "includes/form_messages.html" %}
         {% endblock %}
 
+        {% include "includes/form_errors.html" with form=form %}
+
         <h1>Organization</h1>
 
         <p>The name of your organization will be publicly listed as the domain registrant.</p>
@@ -33,7 +35,6 @@
                 To suggest an update, email <a href="mailto:help@get.gov" class="usa-link">help@get.gov</a>.
             </p>
 
-            {% include "includes/form_errors.html" with form=form %}
             {% include "includes/required_fields.html" %}
             <form class="usa-form usa-form--large desktop:margin-top-4" method="post" novalidate>
                 {% csrf_token %}