From 3fc9cf31e9940b5f43340e785f0b8d48f6fba2bc Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 3 Dec 2024 16:21:04 -0500
Subject: [PATCH 1/3] Remove stray JS from org contact template

---
 src/registrar/templates/domain_request_org_contact.html | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/registrar/templates/domain_request_org_contact.html b/src/registrar/templates/domain_request_org_contact.html
index d39fb9f78..d9f39d6fe 100644
--- a/src/registrar/templates/domain_request_org_contact.html
+++ b/src/registrar/templates/domain_request_org_contact.html
@@ -43,6 +43,3 @@
 
   </fieldset>
 {% endblock %}
-
-<script src="{% static 'js/getgov.min.js' %}" defer></script>
-

From f7bbed1f03950bbb06871267a56cff6abdd97e0b Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 3 Dec 2024 16:25:49 -0500
Subject: [PATCH 2/3] remove inline CSS

---
 src/registrar/templates/domain_request_org_contact.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/registrar/templates/domain_request_org_contact.html b/src/registrar/templates/domain_request_org_contact.html
index d9f39d6fe..280d507a9 100644
--- a/src/registrar/templates/domain_request_org_contact.html
+++ b/src/registrar/templates/domain_request_org_contact.html
@@ -37,7 +37,7 @@
       {% input_with_errors forms.0.zipcode %}
     {% endwith %}
 
-    <div id="urbanization-field" style="display: none;">
+    <div id="urbanization-field">
       {% input_with_errors forms.0.urbanization %}
     </div>
 

From 0986295ab304047657cf6a2809acbe02d9d95ece Mon Sep 17 00:00:00 2001
From: Rachid Mrad <rachid.mrad@ecstech.com>
Date: Tue, 3 Dec 2024 16:36:38 -0500
Subject: [PATCH 3/3] cleanup urbanization JS

---
 src/registrar/assets/src/js/getgov/urbanization.js   | 12 +++++++++---
 .../templates/domain_request_org_contact.html        |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/registrar/assets/src/js/getgov/urbanization.js b/src/registrar/assets/src/js/getgov/urbanization.js
index ea38a31e7..75e87628e 100644
--- a/src/registrar/assets/src/js/getgov/urbanization.js
+++ b/src/registrar/assets/src/js/getgov/urbanization.js
@@ -1,12 +1,18 @@
+import { hideElement, showElement } from './helpers.js';
+
 function setupUrbanizationToggle(stateTerritoryField) {
-    var urbanizationField = document.getElementById('urbanization-field');
+    let urbanizationField = document.getElementById('urbanization-field');
+    if (!urbanizationField) {
+        console.error("Cannot find expect field: #urbanization-field");
+        return;
+    }
     
     function toggleUrbanizationField() {
         // Checking specifically for Puerto Rico only
         if (stateTerritoryField.value === 'PR') { 
-        urbanizationField.style.display = 'block';
+            showElement(urbanizationField);
         } else {
-        urbanizationField.style.display = 'none';
+            hideElement(urbanizationField);
         }
     }
     
diff --git a/src/registrar/templates/domain_request_org_contact.html b/src/registrar/templates/domain_request_org_contact.html
index 280d507a9..53e45dd16 100644
--- a/src/registrar/templates/domain_request_org_contact.html
+++ b/src/registrar/templates/domain_request_org_contact.html
@@ -37,7 +37,7 @@
       {% input_with_errors forms.0.zipcode %}
     {% endwith %}
 
-    <div id="urbanization-field">
+    <div id="urbanization-field" class="display-none">
       {% input_with_errors forms.0.urbanization %}
     </div>