From 3e811f80ce3a6b9be342cd77290d73e6d938cf19 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Fri, 15 Dec 2023 11:07:31 -0800
Subject: [PATCH 1/7] Remove middle name and phone number

---
 src/registrar/forms/domain.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index ac96393b4..c08b43ba0 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -227,8 +227,6 @@ class AuthorizingOfficialContactForm(ContactForm):
         self.fields["email"].error_messages = {
             "required": "Enter an email address in the required format, like name@example.com."
         }
-        self.fields["phone"].error_messages["required"] = "Enter a phone number for your authorizing official."
-
 
 class DomainSecurityEmailForm(forms.Form):
     """Form for adding or editing a security email to a domain."""

From 66899da2837c847b7e5f36fe76bd78bd0bbb07c7 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Fri, 15 Dec 2023 11:19:53 -0800
Subject: [PATCH 2/7] Remove from form

---
 src/registrar/forms/domain.py                            | 1 +
 src/registrar/templates/domain_authorizing_official.html | 6 ------
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index c08b43ba0..64a653ff5 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -228,6 +228,7 @@ class AuthorizingOfficialContactForm(ContactForm):
             "required": "Enter an email address in the required format, like name@example.com."
         }
 
+
 class DomainSecurityEmailForm(forms.Form):
     """Form for adding or editing a security email to a domain."""
 
diff --git a/src/registrar/templates/domain_authorizing_official.html b/src/registrar/templates/domain_authorizing_official.html
index 57a315e86..e7fc12a5e 100644
--- a/src/registrar/templates/domain_authorizing_official.html
+++ b/src/registrar/templates/domain_authorizing_official.html
@@ -19,18 +19,12 @@
 
     {% input_with_errors form.first_name %}
 
-    {% input_with_errors form.middle_name %}
-
     {% input_with_errors form.last_name %}
 
     {% input_with_errors form.title %}
 
     {% input_with_errors form.email %}
 
-    {% input_with_errors form.phone %}
-
-
-
     <button
           type="submit"
           class="usa-button"

From 46f4afd362e396a46504ce7c9a1aff80159b93df Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Fri, 15 Dec 2023 12:37:40 -0800
Subject: [PATCH 3/7] Remove middle name and phone number from registrar

---
 .../templates/application_authorizing_official.html         | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html
index 08df404a3..9c364f612 100644
--- a/src/registrar/templates/application_authorizing_official.html
+++ b/src/registrar/templates/application_authorizing_official.html
@@ -25,17 +25,11 @@
 
     {% input_with_errors forms.0.first_name %}
 
-    {% input_with_errors forms.0.middle_name %}
-
     {% input_with_errors forms.0.last_name %}
 
     {% input_with_errors forms.0.title %}
 
     {% input_with_errors forms.0.email %}
 
-    {% with add_class="usa-input--medium" %}
-      {% input_with_errors forms.0.phone %}
-    {% endwith %}
-
   </fieldset>
 {% endblock %}

From da0347f5fe84ca125f89a73fb833572dc1e86755 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Fri, 15 Dec 2023 12:43:49 -0800
Subject: [PATCH 4/7] Remove phone number for AO from tests

---
 src/registrar/tests/test_views.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index 17641636e..ac26315c9 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -254,7 +254,6 @@ class DomainApplicationTests(TestWithUser, WebTest):
         ao_form["authorizing_official-last_name"] = "Tester ATO"
         ao_form["authorizing_official-title"] = "Chief Tester"
         ao_form["authorizing_official-email"] = "testy@town.com"
-        ao_form["authorizing_official-phone"] = "(201) 555 5555"
 
         # test next button
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
@@ -265,7 +264,6 @@ class DomainApplicationTests(TestWithUser, WebTest):
         self.assertEqual(application.authorizing_official.last_name, "Tester ATO")
         self.assertEqual(application.authorizing_official.title, "Chief Tester")
         self.assertEqual(application.authorizing_official.email, "testy@town.com")
-        self.assertEqual(application.authorizing_official.phone, "(201) 555 5555")
         # the post request should return a redirect to the next form in
         # the application
         self.assertEqual(ao_result.status_code, 302)
@@ -875,7 +873,6 @@ class DomainApplicationTests(TestWithUser, WebTest):
         ao_form["authorizing_official-last_name"] = "Tester ATO"
         ao_form["authorizing_official-title"] = "Chief Tester"
         ao_form["authorizing_official-email"] = "testy@town.com"
-        ao_form["authorizing_official-phone"] = "(201) 555 5555"
 
         self.app.set_cookie(settings.SESSION_COOKIE_NAME, session_id)
         ao_result = ao_form.submit()

From a005e5051d559cef368446d9259ff710ff02110f Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Fri, 15 Dec 2023 13:02:43 -0800
Subject: [PATCH 5/7] Remove mid name and phone number from app wizard

---
 src/registrar/forms/application_wizard.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py
index 5310c4610..ffdce7add 100644
--- a/src/registrar/forms/application_wizard.py
+++ b/src/registrar/forms/application_wizard.py
@@ -329,10 +329,6 @@ class AuthorizingOfficialForm(RegistrarForm):
         label="First name / given name",
         error_messages={"required": ("Enter the first name / given name of your authorizing official.")},
     )
-    middle_name = forms.CharField(
-        required=False,
-        label="Middle name (optional)",
-    )
     last_name = forms.CharField(
         label="Last name / family name",
         error_messages={"required": ("Enter the last name / family name of your authorizing official.")},
@@ -350,10 +346,6 @@ class AuthorizingOfficialForm(RegistrarForm):
         label="Email",
         error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")},
     )
-    phone = PhoneNumberField(
-        label="Phone",
-        error_messages={"required": "Enter the phone number for your authorizing official."},
-    )
 
 
 class CurrentSitesForm(RegistrarForm):

From b8e12bc68be47fd27556a4656c380dcc02980eb8 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Fri, 15 Dec 2023 13:07:24 -0800
Subject: [PATCH 6/7] Remove more tests related to the phone number that was
 required for AO

---
 src/registrar/tests/test_forms.py | 5 -----
 src/registrar/tests/test_views.py | 1 -
 2 files changed, 6 deletions(-)

diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py
index 00bb7ce61..d54e81427 100644
--- a/src/registrar/tests/test_forms.py
+++ b/src/registrar/tests/test_forms.py
@@ -196,11 +196,6 @@ class TestFormValidation(MockEppLib):
             ["Response must be less than 1000 characters."],
         )
 
-    def test_authorizing_official_phone_invalid(self):
-        """Must be a valid phone number."""
-        form = AuthorizingOfficialForm(data={"phone": "boss@boss"})
-        self.assertTrue(form.errors["phone"][0].startswith("Enter a valid phone number "))
-
     def test_your_contact_email_invalid(self):
         """must be a valid email address."""
         form = YourContactForm(data={"email": "boss@boss"})
diff --git a/src/registrar/tests/test_views.py b/src/registrar/tests/test_views.py
index ac26315c9..92eaa8142 100644
--- a/src/registrar/tests/test_views.py
+++ b/src/registrar/tests/test_views.py
@@ -453,7 +453,6 @@ class DomainApplicationTests(TestWithUser, WebTest):
         self.assertContains(review_page, "Tester ATO")
         self.assertContains(review_page, "Chief Tester")
         self.assertContains(review_page, "testy@town.com")
-        self.assertContains(review_page, "(201) 555-5555")
         self.assertContains(review_page, "city.com")
         self.assertContains(review_page, "city.gov")
         self.assertContains(review_page, "city1.gov")

From 96390a6de27d014dcf665d51034da7820fc02e1b Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Mon, 18 Dec 2023 17:32:27 -0800
Subject: [PATCH 7/7] Make sure phone number for AO is not required

---
 src/registrar/forms/domain.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py
index 64a653ff5..5977449c3 100644
--- a/src/registrar/forms/domain.py
+++ b/src/registrar/forms/domain.py
@@ -213,6 +213,9 @@ class AuthorizingOfficialContactForm(ContactForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
+        # Overriding bc phone not required in this form
+        self.fields["phone"] = forms.IntegerField(required=False)
+
         # Set custom error messages
         self.fields["first_name"].error_messages = {
             "required": "Enter the first name / given name of your authorizing official."