pushing to pull on other device

src/registrar/views/domain_request.py

@@ -466,6 +466,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "requested_domain__name": requested_domain_name,
             }
         context["domain_request_id"] = self.domain_request.id
+        context["is_executive"] = self.domain_request.is_federal() and self.domain_request.federal_type == "Executive"
         return context
 
     def get_step_list(self) -> list:
@@ -652,14 +653,52 @@ class CurrentSites(DomainRequestWizard):
 
 class DotgovDomain(DomainRequestWizard):
     template_name = "domain_request_dotgov_domain.html"
-    forms = [forms.DotGovDomainForm, forms.AlternativeDomainFormSet]
+    forms = [
+        forms.DotGovDomainForm, 
+        forms.AlternativeDomainFormSet,
+        forms.ExecutiveNamingRequirementsYesNoForm,
+        forms.ExecutiveNamingRequirementsDetailsForm,
+    ]
 
     def get_context_data(self):
         context = super().get_context_data()
         context["generic_org_type"] = self.domain_request.generic_org_type
-        context["federal_type"] = self.domain_request.federal_type
+        context["is_feb"] = self.domain_request.is_feb()
         return context
 
+    def is_valid(self, forms_list: list) -> bool:
+        """
+        Expected order of forms_list:
+          0: DotGovDomainForm
+          1: AlternativeDomainFormSet
+          2: ExecutiveNamingRequirementsYesNoForm
+          3: ExecutiveNamingRequirementsDetailsForm
+        """
+        # If not a federal executive branch agency, mark executive-related forms for deletion.
+        if not (self.domain_request.is_feb()):
+            forms_list[2].mark_form_for_deletion()
+            forms_list[3].mark_form_for_deletion()
+            return all(form.is_valid() for form in forms_list)
+
+        valid = True
+        yesno_form = forms_list[2]
+        details_form = forms_list[3]
+
+        if yesno_form.cleaned_data.get("feb_naming_requirements") == "yes":
+            # If the user selects "yes", no details are needed.
+            details_form.mark_form_for_deletion()
+            valid = all(
+                form.is_valid() for i, form in enumerate(forms_list) if i != 3
+            )
+        else:
+            # "No" was selected – details are required.
+            valid = (
+                yesno_form.is_valid() and 
+                details_form.is_valid() and 
+                all(form.is_valid() for i, form in enumerate(forms_list) if i not in [2, 3])
+            )
+        return valid
+
 
 class Purpose(DomainRequestWizard):
     template_name = "domain_request_purpose.html"
@@ -711,9 +750,7 @@ class OtherContacts(DomainRequestWizard):
 
 
 class AdditionalDetails(DomainRequestWizard):
-
     template_name = "domain_request_additional_details.html"
-
     forms = [
         forms.CisaRepresentativeYesNoForm,
         forms.CisaRepresentativeForm,