@dyedurham/search-and-file-widget 1.5.10 → 1.6.0

package/dnd-filing-shell.js

@@ -50682,6 +50682,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const status = r.Status ? String(r.Status) : "ValidationFailed";
     return new Error(msgs.length ? `eCore validation failed (HTTP ${httpStatus}, ${status}): ${msgs.join(" | ")}` : `eCore validation failed (HTTP ${httpStatus}, ${status}).`);
   }
+  function joinUrl(base, path) {
+    const b = base.endsWith("/") ? base.slice(0, -1) : base;
+    const p = path.startsWith("/") ? path : `/${path}`;
+    return `${b}${p}`;
+  }
   function ensureAuthInputs(signature) {
     if (!signature?.proxyApiUrl) {
       const err = new Error("Missing signature.proxyApiUrl (required input from Athennian).");
@@ -50856,6 +50861,25 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function isAnnualReturnTask(task) {
     return task?._taskType === TaskType.AnnualCompliance;
   }
+  function getSearchOrFilingType(task) {
+    if (!task) {
+      return void 0;
+    }
+    const prefix = isOntarioTask(task) ? "ontario" : "federal";
+    if (isFormationTask2(task)) {
+      return `${prefix}Incorporation`;
+    }
+    if (isInitialReturn(task)) {
+      return `${prefix}InitialReturn`;
+    }
+    if (isNoticeOfChangeTask(task)) {
+      return `${prefix}NoticeOfChange`;
+    }
+    if (isAnnualReturnTask(task)) {
+      return `${prefix}AnnualReturn`;
+    }
+    return void 0;
+  }
   function markFormGroupTouched(formGroup) {
     Object.values(formGroup.controls).forEach((control) => {
       control.markAsTouched();
@@ -78786,7 +78810,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function TermsAndConditionsComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _TermsAndConditionsComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _TermsAndConditionsComponent, selectors: [["terms-and-conditions"]], outputs: { confirm: "confirm", prev: "prev", close: "close" }, decls: 71, vars: 14, consts: [[1, "terms-and-conditions"], [1, "terms-and-conditions-content"], ["title", "Terms and Conditions", 1, "terms-and-conditions-card"], [1, "terms-and-conditions-card-content"], [1, "terms-and-conditions-text-wrapper"], [1, "terms-and-conditions-text"], [1, "body-1-regular"], [3, "formControl"], ["title", "Signatory"], [3, "isSubmitted", "form", "config"], [1, "terms-and-conditions-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click"], [1, "body-1-semibold"], ["mat-flat-button", "", "type", "submit", 3, "click", "disabled"]], template: function TermsAndConditionsComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _TermsAndConditionsComponent, selectors: [["terms-and-conditions"]], outputs: { confirm: "confirm", prev: "prev", close: "close" }, decls: 71, vars: 14, consts: [[1, "terms-and-conditions"], [1, "terms-and-conditions-content"], ["title", "Terms and Conditions", 1, "terms-and-conditions-card"], [1, "terms-and-conditions-card-content"], [1, "terms-and-conditions-text-wrapper"], [1, "terms-and-conditions-text"], [1, "body-1-regular"], [3, "formControl"], [1, "body-1-regular", "black"], ["title", "Signatory"], [3, "isSubmitted", "form", "config"], [1, "terms-and-conditions-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click"], [1, "body-1-semibold"], ["mat-flat-button", "", "type", "submit", 3, "click", "disabled"]], template: function TermsAndConditionsComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275elementStart(0, "div", 0)(1, "div", 1)(2, "expandable-card", 2)(3, "div", 3)(4, "div", 4)(5, "div", 5)(6, "span", 6);
             \u0275\u0275text(7, ' The following are the Terms and Conditions for filing with the Ministry of Public and Business Service Delivery ("Ministry") under the Business Corporations Act, Business Names Act, Corporations Act, Corporations Information Act, Extra-Provincial Corporations Act, Limited Partnerships Act and Not-for-Profit Corporations Act, 2010. ');
@@ -78857,33 +78881,33 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275elementStart(50, "span", 6);
             \u0275\u0275text(51, " 17. If this is a filing made in respect of an arrangement under the Business Corporations Act or Not-for-Profit Corporations Act, 2010, the corporation acknowledges that it must give the Director notice of the application to the court and that the Director is entitled to appear in court and be heard in person or by counsel. The corporation agrees to submit the required notice and a draft copy of the Plan of Arrangement under the applicable Act for review through the electronic system maintained by the Ministry at least seven business days before seeking an interim and/or final order with the court. The corporation agrees to make changes required by the Director to ensure that the Plan complies with the applicable Act and Ministry requirements, and is capable of being implemented in the electronic system maintained by the Ministry under the applicable Act. The corporation agrees that if the Ministry does not receive a draft of the application or sufficient notice of the application, additional time may be required for review. The corporation acknowledges that the Ministry may seek an adjournment if the corporation fails to provide a draft of the application or sufficient notice of the application. The corporation agrees that if it obtains a court order without providing the required notice of the application to the Ministry, revisions may be required to any Plan of Arrangement attached to a court order and a further court order may be required before the articles of arrangement are endorsed. ");
             \u0275\u0275elementEnd()()();
-            \u0275\u0275elementStart(52, "mat-checkbox", 7)(53, "div", 6)(54, "span");
+            \u0275\u0275elementStart(52, "mat-checkbox", 7)(53, "div", 8)(54, "span");
             \u0275\u0275text(55, "I agree to the Terms and Conditions and confirm that all required person(s) and/or entities agree to them");
             \u0275\u0275elementEnd()()()()();
-            \u0275\u0275elementStart(56, "expandable-card", 8);
-            \u0275\u0275element(57, "filing-form-group", 9);
+            \u0275\u0275elementStart(56, "expandable-card", 9);
+            \u0275\u0275element(57, "filing-form-group", 10);
             \u0275\u0275elementEnd()();
-            \u0275\u0275elementStart(58, "div", 10)(59, "button", 11);
+            \u0275\u0275elementStart(58, "div", 11)(59, "button", 12);
             \u0275\u0275listener("click", function TermsAndConditionsComponent_Template_button_click_59_listener() {
               return ctx.close.emit();
             });
-            \u0275\u0275elementStart(60, "span", 12);
+            \u0275\u0275elementStart(60, "span", 13);
             \u0275\u0275text(61);
             \u0275\u0275pipe(62, "translate");
             \u0275\u0275elementEnd()();
-            \u0275\u0275elementStart(63, "button", 11);
+            \u0275\u0275elementStart(63, "button", 12);
             \u0275\u0275listener("click", function TermsAndConditionsComponent_Template_button_click_63_listener() {
               return ctx.prev.emit();
             });
-            \u0275\u0275elementStart(64, "span", 12);
+            \u0275\u0275elementStart(64, "span", 13);
             \u0275\u0275text(65);
             \u0275\u0275pipe(66, "translate");
             \u0275\u0275elementEnd()();
-            \u0275\u0275elementStart(67, "button", 13);
+            \u0275\u0275elementStart(67, "button", 14);
             \u0275\u0275listener("click", function TermsAndConditionsComponent_Template_button_click_67_listener() {
               return ctx.onConfirm();
             });
-            \u0275\u0275elementStart(68, "span", 12);
+            \u0275\u0275elementStart(68, "span", 13);
             \u0275\u0275text(69);
             \u0275\u0275pipe(70, "translate");
             \u0275\u0275elementEnd()()()();
@@ -79158,7 +79182,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         </div>\r
 \r
         <mat-checkbox [formControl]="getFormControl(termsAndConditionsControls.AcceptTerms)">\r
-          <div class="body-1-regular">\r
+          <div class="body-1-regular black">\r
             <span>I agree to the Terms and Conditions and confirm that all required person(s) and/or entities agree to them</span>\r
           </div>\r
         </mat-checkbox>\r
@@ -81582,7 +81606,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const registeredOffice = formData[InitialReturnFillingFormGroups.RegisteredOfficeAddress];
           const certifiedBy = formData[InitialReturnFillingFormGroups.CertifiedBy];
           const contact = formData[InitialReturnFillingFormGroups.Contact];
-          const mapAddress2 = (src) => ({
+          const mapAddress3 = (src) => ({
             unitType: src?.[IRFormControls.UnitType] ?? null,
             unitNumber: src?.[IRFormControls.UnitNumber] ?? null,
             streetNumber: src?.[IRFormControls.StreetNumber] ?? null,
@@ -81594,7 +81618,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             const id = item[IRFormControls.ID];
             if (id) {
               acc[id] = {
-                address: mapAddress2(item),
+                address: mapAddress3(item),
                 residentCanadian: item[IRFormControls.IsCanadianResident] ?? false
               };
             }
@@ -81603,11 +81627,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           return {
             referenceNumber: generalInfo?.[IRFormControls.ClientMatterNumber] ?? null,
             docketNumber: generalInfo?.[IRFormControls.Docket] ?? null,
-            registeredOfficeAddress: mapAddress2(registeredOffice),
+            registeredOfficeAddress: mapAddress3(registeredOffice),
             directors: mapPersons(formData[InitialReturnFillingFormGroups.Directors]),
             officers: mapPersons(formData[InitialReturnFillingFormGroups.Officers]),
             certifiedBy: {
-              address: mapAddress2(certifiedBy)
+              address: mapAddress3(certifiedBy)
             },
             contactUid: contact?.[IRFormControls.Contact] ?? null
           };
@@ -81992,7 +82016,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/constants/FederalConstants.ts
-  var NameType2, NameTypeLabel2, LegalElement, LegalElementLabel, ISCOptions, ISCOptionsLabel, ISCExclusionReason, ISCExclusionReasonLabel, ISCTypeOfInterest, ISCTypeOfInterestLabel, ISCShareHoldingMethod, ISCShareHoldingMethodLabel, ISCJointHoldingType, ISCJointHoldingTypeLabel, ISCPercentageInterest, ISCPercentageInterestLabel, EPLLangage, SignatoryRole3, SignatoryRoleLabel;
+  var NameType2, NameTypeLabel2, LegalElement, LegalElementLabel, ISCOptions, ISCOptionsLabel, ISCExclusionReason, ISCExclusionReasonLabel, ISCTypeOfInterest, ISCTypeOfInterestLabel, ISCShareHoldingMethod, ISCShareHoldingMethodLabel, ISCJointHoldingType, ISCJointHoldingTypeLabel, ISCPercentageInterest, ISCPercentageInterestLabel, EPLLangage, CorporationType, CorporationTypeLabel, NumberOfShareholders, NumberOfShareholdersLabel, SignatoryRole3, SignatoryRoleLabel;
   var init_FederalConstants = __esm({
     "src/app/constants/FederalConstants.ts"() {
       (function(NameType3) {
@@ -82105,6 +82129,42 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         EPLLangage2["English"] = "English";
         EPLLangage2["French"] = "French";
       })(EPLLangage || (EPLLangage = {}));
+      (function(CorporationType2) {
+        CorporationType2[CorporationType2["ShareCapital"] = 1] = "ShareCapital";
+        CorporationType2[CorporationType2["NonShareCapital"] = 2] = "NonShareCapital";
+        CorporationType2[CorporationType2["Cooperative"] = 3] = "Cooperative";
+        CorporationType2[CorporationType2["Other"] = 4] = "Other";
+      })(CorporationType || (CorporationType = {}));
+      CorporationTypeLabel = {
+        [CorporationType.ShareCapital]: "Share capital corporation",
+        [CorporationType.NonShareCapital]: "Non-share capital corporation",
+        [CorporationType.Cooperative]: "Co-operative",
+        [CorporationType.Other]: "Other"
+      };
+      (function(NumberOfShareholders2) {
+        NumberOfShareholders2[NumberOfShareholders2["One"] = 1] = "One";
+        NumberOfShareholders2[NumberOfShareholders2["Two"] = 2] = "Two";
+        NumberOfShareholders2[NumberOfShareholders2["Three"] = 3] = "Three";
+        NumberOfShareholders2[NumberOfShareholders2["Four"] = 4] = "Four";
+        NumberOfShareholders2[NumberOfShareholders2["Five"] = 5] = "Five";
+        NumberOfShareholders2[NumberOfShareholders2["Six"] = 6] = "Six";
+        NumberOfShareholders2[NumberOfShareholders2["Seven"] = 7] = "Seven";
+        NumberOfShareholders2[NumberOfShareholders2["Eight"] = 8] = "Eight";
+        NumberOfShareholders2[NumberOfShareholders2["Nine"] = 9] = "Nine";
+        NumberOfShareholders2[NumberOfShareholders2["TenOrMore"] = 10] = "TenOrMore";
+      })(NumberOfShareholders || (NumberOfShareholders = {}));
+      NumberOfShareholdersLabel = {
+        [NumberOfShareholders.One]: "1",
+        [NumberOfShareholders.Two]: "2",
+        [NumberOfShareholders.Three]: "3",
+        [NumberOfShareholders.Four]: "4",
+        [NumberOfShareholders.Five]: "5",
+        [NumberOfShareholders.Six]: "6",
+        [NumberOfShareholders.Seven]: "7",
+        [NumberOfShareholders.Eight]: "8",
+        [NumberOfShareholders.Nine]: "9",
+        [NumberOfShareholders.TenOrMore]: "10+"
+      };
       (function(SignatoryRole4) {
         SignatoryRole4[SignatoryRole4["Director"] = 1] = "Director";
         SignatoryRole4[SignatoryRole4["AuthorizedOfficer"] = 2] = "AuthorizedOfficer";
@@ -82478,9 +82538,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             dynamicLabel: (form, t) => {
               const id = form.get(FederalFormationFormControl.Contact)?.value;
               const contact = contacts.find((contact2) => contact2._id === id);
-              const email = contact?.participant?.communicationEmail ?? contact?.addresses?.[0]?.emails?.primary ?? "";
-              const phone = contact?.participant?.communicationPhone ?? contact?.addresses?.[0]?.contact_numbers?.primary ?? "";
-              return `Contact Details: ${getContactDetailsPreview(email, phone, t)}`;
+              const email = contact?.addresses[0]?.emails?.primary;
+              const phone = contact?.addresses[0]?.contact_numbers?.primary;
+              return `<span class="body-1-semibold">${t("Contact Details")}:</span> ${getContactDetailsPreview(email, phone, t)}`;
             },
             formControlName: "",
             required: false,
@@ -83073,6 +83133,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_address_utils();
       init_transform_utils();
       init_app_enums();
+      init_ontario_formation_form_constants();
       FederalFormHelper = class _FederalFormHelper {
         static generateConfig(task) {
           const delta = task.deltaData;
@@ -83171,10 +83232,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             [FederalFormationFormControl.RestrictionsOnBusiness]: new FormControl({ value: task.entity._articles?.restrictions ?? "", disabled: true }),
             [FederalFormationFormControl.OtherProvisions]: new FormControl({ value: task.entity._articles?.other_provisions ?? "", disabled: true })
           });
-          config2[FederalFormationFormGroups.RegisteredOfficeAddress] = new FormGroup(__spreadValues({
-            [FederalFormationFormControl.UseDifferentMailingAddress]: new FormControl(delta?.registeredOfficeAddress?.useDifferentAddressForCorrespondence ?? false),
-            [FederalFormationFormControl.MailingAddress]: new FormControl(delta?.registeredOfficeAddress?.mailingAddressForCorrespondenceUid ?? null, requiredIfValue(FederalFormationFormControl.UseDifferentMailingAddress, true))
-          }, this.generateAddressFormGroup(findRegisteredOfficeAddress(task))));
+          const registeredOfficeAddressConfig = this.generateAddressFormGroup(findRegisteredOfficeAddress(task));
+          const registeredOfficeAddressForm = new FormGroup(__spreadValues({}, registeredOfficeAddressConfig));
+          const affiliationType = registeredOfficeAddressConfig[FormationFormControls.AffiliationAddressType].value;
+          updateFormControlsEnableState(registeredOfficeAddressForm, addressEnabledFieldsMap[affiliationType]);
+          config2[FederalFormationFormGroups.RegisteredOfficeAddress] = registeredOfficeAddressForm;
+          registeredOfficeAddressForm.addControl(FederalFormationFormControl.UseDifferentMailingAddress, new FormControl(delta?.registeredOfficeAddress?.useDifferentAddressForCorrespondence ?? false));
+          registeredOfficeAddressForm.addControl(FederalFormationFormControl.MailingAddress, new FormControl(delta?.registeredOfficeAddress?.mailingAddressForCorrespondenceUid ?? null, requiredIfValue(FederalFormationFormControl.UseDifferentMailingAddress, true)));
           const invitedDirectorIds = Object.entries(delta?.directors ?? {}).filter(([, d]) => d.inviteForFullAccessManager).map(([id]) => id);
           config2[FederalFormationFormGroups.InviteDirectorToBeFullAccessManager] = new FormGroup({
             [FederalFormationFormControl.InvitedDirectors]: new FormControl(invitedDirectorIds),
@@ -83195,7 +83259,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           return new FormGroup(__spreadValues({
             [FormationFormControls.AffiliationName]: new FormControl({ value: name, disabled: true }),
             [FormationFormControls.Id]: new FormControl({ value: id, disabled: true }),
-            [FederalFormationFormControl.AddressForService]: new FormControl("", Validators.required),
+            [FederalFormationFormControl.AddressForService]: new FormControl(deltaData?.addressForService ?? "", Validators.required),
             [FederalFormationFormControl.DateOfBirth]: new FormControl(isc.participant._profile.date_of_birth, Validators.required),
             [FederalFormationFormControl.CountriesOfCitizenship]: new FormControl(countriesOfCitizenship),
             [FederalFormationFormControl.CountriesOfResidence]: new FormControl(countriesOfResidence),
@@ -84204,6 +84268,227 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
   });
 
+  // src/app/enums/federal-update-maintain.enum.ts
+  var FederalUpdateMaintainFormGroups, FederalUpdateMaintainFormControl;
+  var init_federal_update_maintain_enum = __esm({
+    "src/app/enums/federal-update-maintain.enum.ts"() {
+      (function(FederalUpdateMaintainFormGroups2) {
+        FederalUpdateMaintainFormGroups2["CorporationDetails"] = "Corporation Details";
+        FederalUpdateMaintainFormGroups2["Directors"] = "Directors";
+        FederalUpdateMaintainFormGroups2["AnnualReturn"] = "Annual Return";
+        FederalUpdateMaintainFormGroups2["SignificantControl"] = "Significant Control";
+        FederalUpdateMaintainFormGroups2["IndividualsWithSignificantControl"] = "Individuals With Significant Control";
+        FederalUpdateMaintainFormGroups2["Contact"] = "Contact";
+      })(FederalUpdateMaintainFormGroups || (FederalUpdateMaintainFormGroups = {}));
+      (function(FederalUpdateMaintainFormControl2) {
+        FederalUpdateMaintainFormControl2["CorporationName"] = "corporationName";
+        FederalUpdateMaintainFormControl2["BusinessNumber"] = "businessNumber";
+        FederalUpdateMaintainFormControl2["RegisteredOfficeAddress"] = "registeredOfficeAddress";
+        FederalUpdateMaintainFormControl2["AnniversaryDate"] = "anniversaryDate";
+        FederalUpdateMaintainFormControl2["YearOfFiling"] = "yearOfFiling";
+        FederalUpdateMaintainFormControl2["AnnualMeetingDate"] = "annualMeetingDate";
+        FederalUpdateMaintainFormControl2["CorporationType"] = "corporationType";
+        FederalUpdateMaintainFormControl2["NumberOfShareholders"] = "numberOfShareholders";
+        FederalUpdateMaintainFormControl2["AddressPreview"] = "addressPreview";
+      })(FederalUpdateMaintainFormControl || (FederalUpdateMaintainFormControl = {}));
+    }
+  });
+
+  // src/app/constants/federal-update-maintain-form.constants.ts
+  var FEDERAL_UPDATE_MAINTAIN_CORPORATION_TYPE_OPTIONS, FEDERAL_UPDATE_MAINTAIN_NUMBER_OF_SHAREHOLDERS_OPTIONS, FEDERAL_UPDATE_MAINTAIN_CORPORATION_DETAILS_FIELDS, FEDERAL_UPDATE_MAINTAIN_DIRECTORS_FIELDS, FEDERAL_UPDATE_MAINTAIN_ANNUAL_RETURN_FIELDS, FEDERAL_UPDATE_MAINTAIN_SIGNIFICANT_CONTROL_FIELDS, FEDERAL_UPDATE_MAINTAIN_INDIVIDUALS_WITH_SIGNIFICANT_CONTROL_FIELDS, FEDERAL_UPDATE_MAINTAIN_CONTACT_FIELDS;
+  var init_federal_update_maintain_form_constants = __esm({
+    "src/app/constants/federal-update-maintain-form.constants.ts"() {
+      init_form_enums();
+      init_federal_update_maintain_enum();
+      init_FederalConstants();
+      init_federal_formation_form_contants();
+      FEDERAL_UPDATE_MAINTAIN_CORPORATION_TYPE_OPTIONS = Object.values(CorporationType).filter((v) => typeof v === "number").map((v) => ({ value: v, label: CorporationTypeLabel[v] }));
+      FEDERAL_UPDATE_MAINTAIN_NUMBER_OF_SHAREHOLDERS_OPTIONS = Object.values(NumberOfShareholders).filter((v) => typeof v === "number").map((v) => ({ value: v, label: NumberOfShareholdersLabel[v] }));
+      FEDERAL_UPDATE_MAINTAIN_CORPORATION_DETAILS_FIELDS = [
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-12",
+          dynamicLabel: (form) => `<span class="body-1-semibold">Corporate name:</span> ${form.get(FederalUpdateMaintainFormControl.CorporationName)?.value ?? ""}`
+        },
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-12",
+          dynamicLabel: (form) => `<span class="body-1-semibold">Business Number:</span> ${form.get(FederalUpdateMaintainFormControl.BusinessNumber)?.value ?? ""}`
+        },
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-12",
+          dynamicLabel: (form) => `<span class="body-1-semibold">Registered Office Address:</span> ${form.get(FederalUpdateMaintainFormControl.RegisteredOfficeAddress)?.value ?? ""}`
+        }
+      ];
+      FEDERAL_UPDATE_MAINTAIN_DIRECTORS_FIELDS = [
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-12",
+          dynamicLabel: (form) => `<span class="body-1-semibold">Address:</span> ${form.get(FederalUpdateMaintainFormControl.AddressPreview)?.value ?? ""}`
+        }
+      ];
+      FEDERAL_UPDATE_MAINTAIN_ANNUAL_RETURN_FIELDS = [
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-12",
+          dynamicLabel: (form) => `<span class="body-1-semibold">Anniversary Date:</span> ${form.get(FederalUpdateMaintainFormControl.AnniversaryDate)?.value ?? ""}`
+        },
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-12",
+          dynamicLabel: (form) => `<span class="body-1-semibold">Year of Filing:</span> ${form.get(FederalUpdateMaintainFormControl.YearOfFiling)?.value ?? ""}`
+        },
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-12",
+          dynamicLabel: (form) => `<span class="body-1-semibold">Annual Meeting:</span> ${form.get(FederalUpdateMaintainFormControl.AnnualMeetingDate)?.value ?? ""}`
+        },
+        {
+          type: FormType.Select,
+          label: "Type of Corporation",
+          formControlName: FederalUpdateMaintainFormControl.CorporationType,
+          options: FEDERAL_UPDATE_MAINTAIN_CORPORATION_TYPE_OPTIONS,
+          required: true,
+          class: "span-6"
+        },
+        {
+          type: FormType.Select,
+          label: "Number of Shareholders",
+          formControlName: FederalUpdateMaintainFormControl.NumberOfShareholders,
+          options: FEDERAL_UPDATE_MAINTAIN_NUMBER_OF_SHAREHOLDERS_OPTIONS,
+          required: true,
+          class: "span-6"
+        }
+      ];
+      FEDERAL_UPDATE_MAINTAIN_SIGNIFICANT_CONTROL_FIELDS = FEDERAL_FORMATION_FORM_SIGNIFICANT_CONTROL;
+      FEDERAL_UPDATE_MAINTAIN_INDIVIDUALS_WITH_SIGNIFICANT_CONTROL_FIELDS = federalFormationFormIndividualsWithSignificantControl;
+      FEDERAL_UPDATE_MAINTAIN_CONTACT_FIELDS = generateFederalFormationFormContactControl;
+    }
+  });
+
+  // src/app/helpers/federal-update-maintain.helper.ts
+  var FederalUpdateMaintainFormHelper;
+  var init_federal_update_maintain_helper = __esm({
+    "src/app/helpers/federal-update-maintain.helper.ts"() {
+      init_forms();
+      init_common_utils();
+      init_form_enums();
+      init_federal_update_maintain_enum();
+      init_federal_form_enum();
+      init_FederalConstants();
+      init_custom_validators();
+      init_federal_form_helper();
+      FederalUpdateMaintainFormHelper = class _FederalUpdateMaintainFormHelper {
+        static generateConfig(task) {
+          const delta = task.deltaData;
+          const config2 = {};
+          const regOfficeAddress = _FederalUpdateMaintainFormHelper.findRegisteredOfficeAddressDisplay(task);
+          config2[FederalUpdateMaintainFormGroups.CorporationDetails] = new FormGroup({
+            [FederalUpdateMaintainFormControl.CorporationName]: new FormControl({
+              value: task.entity._profile?.name ?? "",
+              disabled: true
+            }),
+            [FederalUpdateMaintainFormControl.BusinessNumber]: new FormControl({
+              value: task.entity._profile?.taxID_number ?? "",
+              disabled: true
+            }),
+            [FederalUpdateMaintainFormControl.RegisteredOfficeAddress]: new FormControl({
+              value: regOfficeAddress,
+              disabled: true
+            })
+          });
+          const directors = (task.entity.affiliations ?? []).filter((a) => isPrincipalAffiliation2(a) && a.role?.role_name === "Director");
+          config2[FederalUpdateMaintainFormGroups.Directors] = new FormArray(directors.map((director) => {
+            const person = director.participant;
+            const name = getPersonName(person);
+            const address = director.addresses?.[0] || director.parent_affiliation?.addresses?.[0];
+            const display = `${address?.display?.line1 ?? ""}${address?.display?.line2 ?? ""}`.trim();
+            return new FormGroup({
+              [FormationFormControls.Id]: new FormControl({ value: director._id, disabled: true }),
+              [FormationFormControls.AffiliationName]: new FormControl({ value: name, disabled: true }),
+              [FederalUpdateMaintainFormControl.AddressPreview]: new FormControl({
+                value: display,
+                disabled: true
+              })
+            });
+          }));
+          const yearOfFiling = _FederalUpdateMaintainFormHelper.getYearOfFiling(task);
+          const anniversary = _FederalUpdateMaintainFormHelper.getAnniversaryDate(task);
+          const annualMeeting = task?._ext?._agm_date ?? "";
+          config2[FederalUpdateMaintainFormGroups.AnnualReturn] = new FormGroup({
+            [FederalUpdateMaintainFormControl.AnniversaryDate]: new FormControl({ value: anniversary, disabled: true }),
+            [FederalUpdateMaintainFormControl.YearOfFiling]: new FormControl({ value: yearOfFiling, disabled: true }),
+            [FederalUpdateMaintainFormControl.AnnualMeetingDate]: new FormControl({ value: annualMeeting, disabled: true }),
+            [FederalUpdateMaintainFormControl.CorporationType]: new FormControl(delta?.corporationType ?? null, Validators.required),
+            [FederalUpdateMaintainFormControl.NumberOfShareholders]: new FormControl(delta?.numberOfShareholders ?? null, Validators.required)
+          });
+          config2[FederalUpdateMaintainFormGroups.SignificantControl] = new FormGroup({
+            [FederalFormationFormControl.SignificantControlType]: new FormControl(delta?.individualsWithSignificantControl?.type ?? null, Validators.required),
+            [FederalFormationFormControl.ExclusionReason]: new FormControl(delta?.individualsWithSignificantControl?.exclusionReason ?? null, requiredIfValue(FederalFormationFormControl.SignificantControlType, ISCOptions.Excluded))
+          });
+          const iscIndividuals = delta?.individualsWithSignificantControl?.individuals ?? [];
+          const iscGroups = iscIndividuals.map((individualDelta) => {
+            const affiliation = (task.entity.affiliations ?? []).find((a) => a._id === individualDelta.affiliationId);
+            if (!affiliation)
+              return null;
+            return FederalFormHelper.generateIndividualWithSignificantForms(affiliation, individualDelta);
+          }).filter((g) => g !== null);
+          config2[FederalUpdateMaintainFormGroups.IndividualsWithSignificantControl] = new FormArray(iscGroups);
+          config2[FederalUpdateMaintainFormGroups.Contact] = new FormGroup({
+            [FederalFormationFormControl.Contact]: new FormControl(delta?.contactUid ?? null, Validators.required)
+          });
+          return config2;
+        }
+        static getYearOfFiling(task) {
+          const due = task?._due_date;
+          const d = due ? new Date(due) : /* @__PURE__ */ new Date();
+          return String(d.getFullYear());
+        }
+        static getAnniversaryDate(task) {
+          const inc = task.entity?._compliance?.incorporation_date;
+          if (!inc)
+            return "";
+          const parts = inc.split("-");
+          if (parts.length >= 3) {
+            return `${parts[1]}-${parts[2]}`;
+          }
+          return inc;
+        }
+        static findRegisteredOfficeAddressDisplay(task) {
+          const registeredOffice = (task.entity.affiliations ?? []).find((aff) => aff.kind === "EntityAffiliationV3" && aff.role?.role_name === "Shared Address" && aff.role?.static_title === "Registered Office");
+          const address = registeredOffice?.addresses?.[0] || registeredOffice?.parent_affiliation?.addresses?.[0];
+          const line1 = address?.display?.line1 ?? "";
+          const line2 = address?.display?.line2 ?? "";
+          return `${line1}${line2}`.trim();
+        }
+        /** Utility: returns a map of ISC affiliation id -> address options for Address For Service. */
+        static generateISCAddressesMap(affiliations) {
+          const map2 = /* @__PURE__ */ new Map();
+          const individuals = getIndividualWithSignificantControl(affiliations);
+          for (const individual of individuals) {
+            const options = [
+              ...individual.addresses ?? [],
+              ...individual.parent_affiliation?.addresses ?? []
+            ].map((address) => ({
+              value: address.uid,
+              label: `${address.display?.line1 ?? ""}${address.display?.line2 ?? ""}`.trim()
+            }));
+            map2.set(individual._id, options);
+          }
+          return map2;
+        }
+      };
+    }
+  });
+
   // src/app/components/federal/update-maintain/update-maintain-form/update-maintain-form.component.ts
   function FederalUpdateMaintainFormComponent_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
@@ -84223,12 +84508,140 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275property("content", ctx_r0.errors());
     }
   }
+  function FederalUpdateMaintainFormComponent_Conditional_5_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275elementStart(0, "expandable-card", 4);
+      \u0275\u0275element(1, "filing-form-group", 7);
+      \u0275\u0275elementEnd();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const corporationDetails_r2 = \u0275\u0275readContextLet(4);
+      \u0275\u0275property("isValid", !corporationDetails_r2.invalid)("title", ctx_r0.groups.CorporationDetails);
+      \u0275\u0275advance();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", corporationDetails_r2)("config", ctx_r0.corporationDetailsFields);
+    }
+  }
+  function FederalUpdateMaintainFormComponent_Conditional_7_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275element(0, "expandable-list-card", 5);
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const directorsArray_r3 = \u0275\u0275readContextLet(6);
+      \u0275\u0275property("isOpen", true)("isValid", directorsArray_r3.valid)("isSubmitted", ctx_r0.isSubmitted())("fields", ctx_r0.directorsFields)("formArray", directorsArray_r3)("labelKey", ctx_r0.controls.AffiliationName)("title", ctx_r0.groups.Directors);
+    }
+  }
+  function FederalUpdateMaintainFormComponent_Conditional_9_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275elementStart(0, "expandable-card", 4);
+      \u0275\u0275element(1, "filing-form-group", 7);
+      \u0275\u0275elementEnd();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const annualReturn_r4 = \u0275\u0275readContextLet(8);
+      \u0275\u0275property("isValid", !annualReturn_r4.invalid)("title", ctx_r0.groups.AnnualReturn);
+      \u0275\u0275advance();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", annualReturn_r4)("config", ctx_r0.annualReturnFields);
+    }
+  }
+  function FederalUpdateMaintainFormComponent_Conditional_11_Conditional_1_Conditional_1_Template(rf, ctx) {
+    if (rf & 1) {
+      const _r6 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "button", 12);
+      \u0275\u0275listener("click", function FederalUpdateMaintainFormComponent_Conditional_11_Conditional_1_Conditional_1_Template_button_click_0_listener() {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r0 = \u0275\u0275nextContext(3);
+        return \u0275\u0275resetView(ctx_r0.addIndividualWithSignificantControl());
+      });
+      \u0275\u0275elementStart(1, "span", 13);
+      \u0275\u0275text(2);
+      \u0275\u0275pipe(3, "translate");
+      \u0275\u0275elementEnd()();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext(3);
+      \u0275\u0275property("disabled", ctx_r0.isAddIndividualWithSignificantControlDisabled());
+      \u0275\u0275advance(2);
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(3, 2, "Add Individuals With Significant Control"));
+    }
+  }
+  function FederalUpdateMaintainFormComponent_Conditional_11_Conditional_1_Template(rf, ctx) {
+    if (rf & 1) {
+      const _r5 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "expandable-list-card", 9);
+      \u0275\u0275listener("remove", function FederalUpdateMaintainFormComponent_Conditional_11_Conditional_1_Template_expandable_list_card_remove_0_listener($event) {
+        \u0275\u0275restoreView(_r5);
+        const ctx_r0 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r0.onRemoveIndividualWithSignificantForm($event));
+      });
+      \u0275\u0275template(1, FederalUpdateMaintainFormComponent_Conditional_11_Conditional_1_Conditional_1_Template, 4, 4, "button", 10);
+      \u0275\u0275elementStart(2, "div", 11);
+      \u0275\u0275element(3, "filing-form-group", 7);
+      \u0275\u0275elementEnd()();
+    }
+    if (rf & 2) {
+      \u0275\u0275nextContext();
+      const individualsArray_r7 = \u0275\u0275readContextLet(0);
+      const ctx_r0 = \u0275\u0275nextContext();
+      const significantControl_r8 = \u0275\u0275readContextLet(10);
+      \u0275\u0275property("isOpen", ctx_r0.isIndividualsWithSignificantControlOpen())("isValid", individualsArray_r7.valid && significantControl_r8.valid)("isSubmitted", ctx_r0.isSubmitted())("isStatusIcon", true)("removable", !ctx_r0.readonly())("fields", ctx_r0.individualsWithSignificantControlFields())("formArray", individualsArray_r7)("labelKey", ctx_r0.controls.AffiliationName)("title", ctx_r0.groups.IndividualsWithSignificantControl);
+      \u0275\u0275advance();
+      \u0275\u0275conditional(!ctx_r0.readonly() && ctx_r0.isAddIndividualWithSignificantControlAvailable() ? 1 : -1);
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", significantControl_r8)("config", ctx_r0.significantControlFields);
+    }
+  }
+  function FederalUpdateMaintainFormComponent_Conditional_11_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275declareLet(0);
+      \u0275\u0275template(1, FederalUpdateMaintainFormComponent_Conditional_11_Conditional_1_Template, 4, 13, "expandable-list-card", 8);
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const individualsArray_r9 = \u0275\u0275storeLet(ctx_r0.getFormArray(ctx_r0.groups.IndividualsWithSignificantControl));
+      \u0275\u0275advance();
+      \u0275\u0275conditional(individualsArray_r9 ? 1 : -1);
+    }
+  }
+  function FederalUpdateMaintainFormComponent_Conditional_13_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275elementStart(0, "expandable-card", 6);
+      \u0275\u0275element(1, "filing-form-group", 7);
+      \u0275\u0275elementEnd();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const contact_r10 = \u0275\u0275readContextLet(12);
+      \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", !contact_r10.invalid)("title", ctx_r0.groups.Contact);
+      \u0275\u0275advance();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", contact_r10)("config", ctx_r0.contactControl());
+    }
+  }
   var FederalUpdateMaintainFormComponent;
   var init_update_maintain_form_component2 = __esm({
     "src/app/components/federal/update-maintain/update-maintain-form/update-maintain-form.component.ts"() {
       init_core();
+      init_forms();
       init_alert_component();
       init_alert_enum();
+      init_federal_update_maintain_form_constants();
+      init_federal_update_maintain_enum();
+      init_expandable_card_component();
+      init_expandable_list_card_component();
+      init_filing_form_group_component();
+      init_form_enums();
+      init_common_utils();
+      init_federal_update_maintain_helper();
+      init_federal_form_enum();
+      init_FederalConstants();
+      init_button();
+      init_ngx_translate_core();
+      init_dialog2();
+      init_select_modal_component();
+      init_federal_form_helper();
+      init_rxjs_interop();
       init_core();
       FederalUpdateMaintainFormComponent = class _FederalUpdateMaintainFormComponent {
         form = input.required();
@@ -84237,35 +84650,296 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         isNote = input(false);
         isSubmitted = input(false);
         readonly = input(false);
+        dialog = inject(MatDialog);
+        cdr = inject(ChangeDetectorRef);
+        dr = inject(DestroyRef);
         alertType = AlertType;
+        groups = FederalUpdateMaintainFormGroups;
+        controls = FormationFormControls;
+        federalControls = FederalFormationFormControl;
+        iscOptions = ISCOptions;
+        corporationDetailsFields = FEDERAL_UPDATE_MAINTAIN_CORPORATION_DETAILS_FIELDS;
+        annualReturnFields = FEDERAL_UPDATE_MAINTAIN_ANNUAL_RETURN_FIELDS;
+        directorsFields = FEDERAL_UPDATE_MAINTAIN_DIRECTORS_FIELDS;
+        significantControlFields = FEDERAL_UPDATE_MAINTAIN_SIGNIFICANT_CONTROL_FIELDS;
+        contactControl = signal([]);
+        addressForServiceMap = signal(/* @__PURE__ */ new Map());
+        individualsWithSignificantControlFields = computed(() => FEDERAL_UPDATE_MAINTAIN_INDIVIDUALS_WITH_SIGNIFICANT_CONTROL_FIELDS(this.addressForServiceMap()));
+        /**
+         * UX requirement: if total ISC count is <= 3 start expanded, otherwise start collapsed.
+         * Use total available ISC affiliations (not only selected rows) to decide the initial open state.
+         */
+        isIndividualsWithSignificantControlOpen = computed(() => {
+          const task = this.task();
+          if (!task)
+            return true;
+          return getIndividualWithSignificantControl(task.entity.affiliations).length <= 3;
+        });
+        selectedIndividualWithSignificant = signal([]);
+        isListISC = signal(false);
+        isAddIndividualWithSignificantControlAvailable = computed(() => {
+          const task = this.task();
+          const isListISC = this.isListISC();
+          if (!task)
+            return false;
+          const individualWithSignificantControl = getIndividualWithSignificantControl(task.entity.affiliations);
+          return Boolean(individualWithSignificantControl.length) && isListISC;
+        });
+        isAddIndividualWithSignificantControlDisabled = computed(() => {
+          const task = this.task();
+          if (!task)
+            return false;
+          const individualWithSignificantControl = getIndividualWithSignificantControl(task.entity.affiliations);
+          return individualWithSignificantControl.length === this.selectedIndividualWithSignificant().length;
+        });
+        constructor() {
+          effect(() => {
+            const task = this.task();
+            if (!task)
+              return;
+            const contacts = task.entity.affiliations.filter((a) => a.role?.role_name === "Contact");
+            this.contactControl.set(FEDERAL_UPDATE_MAINTAIN_CONTACT_FIELDS(contacts));
+            this.addressForServiceMap.set(FederalUpdateMaintainFormHelper.generateISCAddressesMap(task.entity.affiliations));
+          });
+          effect(() => {
+            const form = this.form();
+            if (!form)
+              return;
+            const iscFormArray = this.getFormArray(FederalUpdateMaintainFormGroups.IndividualsWithSignificantControl);
+            const selected = (iscFormArray?.getRawValue?.() ?? []).map((i) => i[this.controls.AffiliationName]) ?? [];
+            this.selectedIndividualWithSignificant.set(selected);
+            const sigControl = this.getFormGroup(FederalUpdateMaintainFormGroups.SignificantControl);
+            this.isListISC.set(sigControl?.get(this.federalControls.SignificantControlType)?.value === ISCOptions.ListISC);
+            form.valueChanges.pipe(takeUntilDestroyed(this.dr)).subscribe(() => {
+              const sig = this.getFormGroup(FederalUpdateMaintainFormGroups.SignificantControl);
+              this.isListISC.set(sig?.get(this.federalControls.SignificantControlType)?.value === ISCOptions.ListISC);
+            });
+          });
+        }
+        addIndividualWithSignificantControl() {
+          const task = this.task();
+          if (!task)
+            return;
+          const alreadySelected = new Set(this.selectedIndividualWithSignificant());
+          const individualWithSignificantControl = getIndividualWithSignificantControl(task.entity.affiliations);
+          const available = [];
+          const itemsMap = /* @__PURE__ */ new Map();
+          for (const individual of individualWithSignificantControl) {
+            const name = getPersonName(individual.participant);
+            if (!alreadySelected.has(name)) {
+              available.push(name);
+              itemsMap.set(name, individual);
+            }
+          }
+          const data = {
+            items: available,
+            title: "Select Individuals",
+            submitButton: "Add Individuals"
+          };
+          this.dialog.open(SelectModalComponent, {
+            data,
+            panelClass: ["zero-padding-modal"],
+            width: "560px"
+          }).afterClosed().subscribe((selected) => {
+            if (selected?.length) {
+              this.selectedIndividualWithSignificant.update((value) => [
+                ...value,
+                ...selected
+              ]);
+              selected.forEach((name) => {
+                this.onAddIndividualWithSignificantForm(itemsMap.get(name));
+              });
+            }
+          });
+        }
+        onAddIndividualWithSignificantForm(affiliation) {
+          const formArray = this.getFormArray(FederalUpdateMaintainFormGroups.IndividualsWithSignificantControl);
+          formArray.push(FederalFormHelper.generateIndividualWithSignificantForms(affiliation));
+          this.cdr.detectChanges();
+        }
+        onRemoveIndividualWithSignificantForm(index) {
+          const formArray = this.getFormArray(FederalUpdateMaintainFormGroups.IndividualsWithSignificantControl);
+          const row = formArray.controls[index];
+          const affiliationName = row.getRawValue()[this.controls.AffiliationName];
+          this.selectedIndividualWithSignificant.update((items) => items.filter((i) => i !== affiliationName));
+          formArray.removeAt(index);
+        }
+        getFormGroup(key) {
+          return this.form().get(key);
+        }
+        getFormArray(key) {
+          return this.form().get(key);
+        }
         static \u0275fac = function FederalUpdateMaintainFormComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _FederalUpdateMaintainFormComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _FederalUpdateMaintainFormComponent, selectors: [["federal-update-maintain-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"] }, decls: 4, vars: 2, consts: [[1, "federal-update-maintain-form"], ["title", "Entity changed", "content", "A new draft needs to be generated as the Entity was changed since the last draft was produced.", 3, "type"], ["title", "The following issues need to be resolved before proceeding:", 3, "content"], [1, "federal-update-maintain-form-content"]], template: function FederalUpdateMaintainFormComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _FederalUpdateMaintainFormComponent, selectors: [["federal-update-maintain-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"] }, decls: 14, vars: 12, consts: [[1, "federal-update-maintain-form"], ["title", "Entity changed", "content", "A new draft needs to be generated as the Entity was changed since the last draft was produced.", 3, "type"], ["title", "The following issues need to be resolved before proceeding:", 3, "content"], [1, "federal-update-maintain-form-content"], [3, "isValid", "title"], [3, "isOpen", "isValid", "isSubmitted", "fields", "formArray", "labelKey", "title"], [3, "isStatusIcon", "isValid", "title"], [3, "isSubmitted", "form", "config"], [3, "isOpen", "isValid", "isSubmitted", "isStatusIcon", "removable", "fields", "formArray", "labelKey", "title"], [3, "remove", "isOpen", "isValid", "isSubmitted", "isStatusIcon", "removable", "fields", "formArray", "labelKey", "title"], ["slot", "subtitle", "mat-stroked-button", "", "mat-button", "", 3, "disabled"], ["slot", "header-content", 1, "card-header-content"], ["slot", "subtitle", "mat-stroked-button", "", "mat-button", "", 3, "click", "disabled"], [1, "body-1-semibold"]], template: function FederalUpdateMaintainFormComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275elementStart(0, "div", 0);
             \u0275\u0275template(1, FederalUpdateMaintainFormComponent_Conditional_1_Template, 1, 1, "alert", 1)(2, FederalUpdateMaintainFormComponent_Conditional_2_Template, 1, 1, "alert", 2);
-            \u0275\u0275element(3, "div", 3);
-            \u0275\u0275elementEnd();
+            \u0275\u0275elementStart(3, "div", 3);
+            \u0275\u0275declareLet(4);
+            \u0275\u0275template(5, FederalUpdateMaintainFormComponent_Conditional_5_Template, 2, 5, "expandable-card", 4);
+            \u0275\u0275declareLet(6);
+            \u0275\u0275template(7, FederalUpdateMaintainFormComponent_Conditional_7_Template, 1, 7, "expandable-list-card", 5);
+            \u0275\u0275declareLet(8);
+            \u0275\u0275template(9, FederalUpdateMaintainFormComponent_Conditional_9_Template, 2, 5, "expandable-card", 4);
+            \u0275\u0275declareLet(10);
+            \u0275\u0275template(11, FederalUpdateMaintainFormComponent_Conditional_11_Template, 2, 2);
+            \u0275\u0275declareLet(12);
+            \u0275\u0275template(13, FederalUpdateMaintainFormComponent_Conditional_13_Template, 2, 6, "expandable-card", 6);
+            \u0275\u0275elementEnd()();
           }
           if (rf & 2) {
             \u0275\u0275advance();
             \u0275\u0275conditional(ctx.isNote() ? 1 : -1);
             \u0275\u0275advance();
             \u0275\u0275conditional(ctx.errors().length ? 2 : -1);
+            \u0275\u0275advance(2);
+            const corporationDetails_r11 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CorporationDetails));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(corporationDetails_r11 ? 5 : -1);
+            \u0275\u0275advance();
+            const directorsArray_r12 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Directors));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(directorsArray_r12 ? 7 : -1);
+            \u0275\u0275advance();
+            const annualReturn_r13 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReturn));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(annualReturn_r13 ? 9 : -1);
+            \u0275\u0275advance();
+            const significantControl_r14 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.SignificantControl));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(significantControl_r14 ? 11 : -1);
+            \u0275\u0275advance();
+            const contact_r15 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.Contact));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(contact_r15 ? 13 : -1);
           }
-        }, dependencies: [AlertComponent], styles: ["\n\n[_nghost-%COMP%]   .federal-update-maintain-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  overflow-y: auto;\n}\n[_nghost-%COMP%]   .federal-update-maintain-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n/*# sourceMappingURL=update-maintain-form.component.css.map */"], changeDetection: 0 });
+        }, dependencies: [
+          AlertComponent,
+          ExpandableCardComponent,
+          ExpandableListCardComponent,
+          FilingFormGroupComponent,
+          ReactiveFormsModule,
+          MatButton,
+          TranslatePipe
+        ], styles: ["\n\n[_nghost-%COMP%]   .federal-update-maintain-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  overflow-y: auto;\n}\n[_nghost-%COMP%]   .federal-update-maintain-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n[_nghost-%COMP%]   .card-header-content[_ngcontent-%COMP%] {\n  padding: 0 16px;\n}\n/*# sourceMappingURL=update-maintain-form.component.css.map */"], changeDetection: 0 });
       };
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(FederalUpdateMaintainFormComponent, [{
           type: Component,
           args: [{ standalone: true, selector: "federal-update-maintain-form", changeDetection: ChangeDetectionStrategy.OnPush, imports: [
-            AlertComponent
-          ], template: '<div class="federal-update-maintain-form">\r\n  @if (isNote()) {\r\n    <alert [type]="alertType.Info" title="Entity changed"\r\n           content="A new draft needs to be generated as the Entity was changed since the last draft was produced."/>\r\n  }\r\n\r\n  @if (errors().length) {\r\n    <alert title="The following issues need to be resolved before proceeding:" [content]="errors()"/>\r\n  }\r\n\r\n  <div class="federal-update-maintain-form-content">\r\n    <!-- TODO: add form fields -->\r\n  </div>\r\n</div>\r\n\r\n', styles: ["/* src/app/components/federal/update-maintain/update-maintain-form/update-maintain-form.component.scss */\n:host .federal-update-maintain-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  overflow-y: auto;\n}\n:host .federal-update-maintain-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n/*# sourceMappingURL=update-maintain-form.component.css.map */\n"] }]
-        }], null, null);
+            AlertComponent,
+            ExpandableCardComponent,
+            ExpandableListCardComponent,
+            FilingFormGroupComponent,
+            ReactiveFormsModule,
+            MatButton,
+            TranslatePipe
+          ], template: `<div class="federal-update-maintain-form">\r
+  @if (isNote()) {\r
+    <alert [type]="alertType.Info" title="Entity changed"\r
+           content="A new draft needs to be generated as the Entity was changed since the last draft was produced."/>\r
+  }\r
+\r
+  @if (errors().length) {\r
+    <alert title="The following issues need to be resolved before proceeding:" [content]="errors()"/>\r
+  }\r
+\r
+  <div class="federal-update-maintain-form-content">\r
+    @let corporationDetails = getFormGroup(groups.CorporationDetails);\r
+    @if (corporationDetails) {\r
+      <expandable-card [isValid]="!corporationDetails.invalid" [title]="groups.CorporationDetails">\r
+        <filing-form-group\r
+          [isSubmitted]="isSubmitted()"\r
+          [form]="corporationDetails"\r
+          [config]="corporationDetailsFields"\r
+        />\r
+      </expandable-card>\r
+    }\r
+\r
+    @let directorsArray = getFormArray(groups.Directors);\r
+    @if (directorsArray) {\r
+      <expandable-list-card\r
+        [isOpen]="true"\r
+        [isValid]="directorsArray.valid"\r
+        [isSubmitted]="isSubmitted()"\r
+        [fields]="directorsFields"\r
+        [formArray]="directorsArray"\r
+        [labelKey]="controls.AffiliationName"\r
+        [title]="groups.Directors"\r
+      />\r
+    }\r
+\r
+    @let annualReturn = getFormGroup(groups.AnnualReturn);\r
+    @if (annualReturn) {\r
+      <expandable-card [isValid]="!annualReturn.invalid" [title]="groups.AnnualReturn">\r
+        <filing-form-group\r
+          [isSubmitted]="isSubmitted()"\r
+          [form]="annualReturn"\r
+          [config]="annualReturnFields"\r
+        />\r
+      </expandable-card>\r
+    }\r
+\r
+    @let significantControl = getFormGroup(groups.SignificantControl);\r
+    @if (significantControl) {\r
+      @let individualsArray = getFormArray(groups.IndividualsWithSignificantControl);\r
+      @if (individualsArray) {\r
+        <expandable-list-card\r
+          [isOpen]="isIndividualsWithSignificantControlOpen()"\r
+          [isValid]="individualsArray.valid && significantControl.valid"\r
+          [isSubmitted]="isSubmitted()"\r
+          [isStatusIcon]="true"\r
+          [removable]="!readonly()"\r
+          [fields]="individualsWithSignificantControlFields()"\r
+          [formArray]="individualsArray"\r
+          [labelKey]="controls.AffiliationName"\r
+          [title]="groups.IndividualsWithSignificantControl"\r
+          (remove)="onRemoveIndividualWithSignificantForm($event)"\r
+        >\r
+          @if (!readonly() && isAddIndividualWithSignificantControlAvailable()) {\r
+            <button\r
+              [disabled]="isAddIndividualWithSignificantControlDisabled()"\r
+              slot="subtitle"\r
+              mat-stroked-button\r
+              mat-button\r
+              (click)="addIndividualWithSignificantControl()"\r
+            >\r
+              <span class="body-1-semibold">{{ 'Add Individuals With Significant Control' | translate }}</span>\r
+            </button>\r
+          }\r
+\r
+          <div class="card-header-content" slot="header-content">\r
+            <filing-form-group\r
+              [isSubmitted]="isSubmitted()"\r
+              [form]="significantControl"\r
+              [config]="significantControlFields"\r
+            />\r
+          </div>\r
+        </expandable-list-card>\r
+      }\r
+    }\r
+\r
+    @let contact = getFormGroup(groups.Contact);\r
+    @if (contact) {\r
+      <expandable-card [isStatusIcon]="!readonly()" [isValid]="!contact.invalid" [title]="groups.Contact">\r
+        <filing-form-group\r
+          [isSubmitted]="isSubmitted()"\r
+          [form]="contact"\r
+          [config]="contactControl()"\r
+        />\r
+      </expandable-card>\r
+    }\r
+  </div>\r
+</div>\r
+\r
+`, styles: ["/* src/app/components/federal/update-maintain/update-maintain-form/update-maintain-form.component.scss */\n:host .federal-update-maintain-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  overflow-y: auto;\n}\n:host .federal-update-maintain-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .card-header-content {\n  padding: 0 16px;\n}\n/*# sourceMappingURL=update-maintain-form.component.css.map */\n"] }]
+        }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FederalUpdateMaintainFormComponent, { className: "FederalUpdateMaintainFormComponent", filePath: "src/app/components/federal/update-maintain/update-maintain-form/update-maintain-form.component.ts", lineNumber: 17 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FederalUpdateMaintainFormComponent, { className: "FederalUpdateMaintainFormComponent", filePath: "src/app/components/federal/update-maintain/update-maintain-form/update-maintain-form.component.ts", lineNumber: 61 });
       })();
     }
   });
@@ -84593,7 +85267,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       })("file", function FederalComponent_Conditional_1_Conditional_1_Conditional_1_Template_federal_update_maintain_preview_form_file_0_listener() {
         \u0275\u0275restoreView(_r6);
         const ctx_r1 = \u0275\u0275nextContext(3);
-        return \u0275\u0275resetView(ctx_r1.nextStep.emit());
+        return \u0275\u0275resetView(ctx_r1.onUmSubmit());
       });
       \u0275\u0275elementEnd();
     }
@@ -84603,42 +85277,20 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275property("task", currentTask_r3)("form", ctx_r1.umPreviewForm())("actionsDisabled", ctx_r1.actionsDisabled())("errors", ctx_r1.errors());
     }
   }
-  function FederalComponent_Conditional_1_Conditional_1_Conditional_2_Template(rf, ctx) {
-    if (rf & 1) {
-      const _r7 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "terms-and-conditions", 8);
-      \u0275\u0275listener("prev", function FederalComponent_Conditional_1_Conditional_1_Conditional_2_Template_terms_and_conditions_prev_0_listener() {
-        \u0275\u0275restoreView(_r7);
-        const ctx_r1 = \u0275\u0275nextContext(3);
-        return \u0275\u0275resetView(ctx_r1.nextStep.emit());
-      })("close", function FederalComponent_Conditional_1_Conditional_1_Conditional_2_Template_terms_and_conditions_close_0_listener() {
-        \u0275\u0275restoreView(_r7);
-        const ctx_r1 = \u0275\u0275nextContext(3);
-        return \u0275\u0275resetView(ctx_r1.close.emit());
-      })("confirm", function FederalComponent_Conditional_1_Conditional_1_Conditional_2_Template_terms_and_conditions_confirm_0_listener($event) {
-        \u0275\u0275restoreView(_r7);
-        const ctx_r1 = \u0275\u0275nextContext(3);
-        return \u0275\u0275resetView(ctx_r1.onUmSubmit($event));
-      });
-      \u0275\u0275elementEnd();
-    }
-  }
   function FederalComponent_Conditional_1_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275template(0, FederalComponent_Conditional_1_Conditional_1_Conditional_0_Template, 1, 5, "federal-update-maintain-delta-form", 4)(1, FederalComponent_Conditional_1_Conditional_1_Conditional_1_Template, 1, 4, "federal-update-maintain-preview-form", 5)(2, FederalComponent_Conditional_1_Conditional_1_Conditional_2_Template, 1, 0, "terms-and-conditions");
+      \u0275\u0275template(0, FederalComponent_Conditional_1_Conditional_1_Conditional_0_Template, 1, 5, "federal-update-maintain-delta-form", 4)(1, FederalComponent_Conditional_1_Conditional_1_Conditional_1_Template, 1, 4, "federal-update-maintain-preview-form", 5);
     }
     if (rf & 2) {
       const ctx_r1 = \u0275\u0275nextContext(2);
       \u0275\u0275conditional(ctx_r1.activeStep() === ctx_r1.steps.Validate ? 0 : -1);
       \u0275\u0275advance();
       \u0275\u0275conditional(ctx_r1.activeStep() === ctx_r1.steps.FilingPreview ? 1 : -1);
-      \u0275\u0275advance();
-      \u0275\u0275conditional(ctx_r1.activeStep() === ctx_r1.steps.TermsAndConditions ? 2 : -1);
     }
   }
   function FederalComponent_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275template(0, FederalComponent_Conditional_1_Conditional_0_Template, 2, 1)(1, FederalComponent_Conditional_1_Conditional_1_Template, 3, 3);
+      \u0275\u0275template(0, FederalComponent_Conditional_1_Conditional_0_Template, 2, 1)(1, FederalComponent_Conditional_1_Conditional_1_Template, 2, 2);
     }
     if (rf & 2) {
       const ctx_r1 = \u0275\u0275nextContext();
@@ -84666,7 +85318,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_FederalConstants();
       init_update_maintain_delta_form_component2();
       init_update_maintain_preview_form_component2();
-      init_terms_and_conditions_component();
+      init_federal_update_maintain_helper();
+      init_federal_update_maintain_enum();
       init_core();
       FederalComponent = class _FederalComponent {
         actionsDisabled = input(false);
@@ -84705,7 +85358,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 this.initialDeltaValue.set(untracked2(() => this.generateFederalFormationDeltaData()));
               }
               if (isUpdateMaintain(task)) {
-                this.umDeltaForm.set(new FormGroup({}));
+                this.umDeltaForm.set(new FormGroup(FederalUpdateMaintainFormHelper.generateConfig(task)));
                 this.umInitialDeltaValue.set(untracked2(() => this.generateFederalUpdateMaintainDeltaData()));
               }
             }
@@ -84725,7 +85378,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 }
               }
               if (isUpdateMaintain(task)) {
-                const form = new FormGroup({});
+                const form = new FormGroup(FederalUpdateMaintainFormHelper.generateConfig(task));
                 form.disable();
                 this.umPreviewForm.set(form);
                 if (untracked2(this.activeStep) === Step.Validate) {
@@ -84769,11 +85422,33 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           this.umInitialDeltaValue.set(delta);
           this.umSave.emit(delta);
         }
-        onUmSubmit(termsAndConditions) {
-          this.umSubmit.emit(termsAndConditions);
+        onUmSubmit() {
+          this.umSubmit.emit();
         }
         generateFederalUpdateMaintainDeltaData() {
-          return {};
+          const formData = this.umDeltaForm().getRawValue();
+          const annualReturnData = formData[FederalUpdateMaintainFormGroups.AnnualReturn] ?? {};
+          const significantControlData = formData[FederalUpdateMaintainFormGroups.SignificantControl] ?? {};
+          const iscIndividualsData = formData[FederalUpdateMaintainFormGroups.IndividualsWithSignificantControl] ?? [];
+          const contactData = formData[FederalUpdateMaintainFormGroups.Contact] ?? {};
+          const significantControlType = significantControlData[FederalFormationFormControl.SignificantControlType];
+          return {
+            corporationType: annualReturnData[FederalUpdateMaintainFormControl.CorporationType] ?? void 0,
+            numberOfShareholders: annualReturnData[FederalUpdateMaintainFormControl.NumberOfShareholders] ?? void 0,
+            individualsWithSignificantControl: {
+              type: significantControlType,
+              exclusionReason: significantControlType === ISCOptions.Excluded ? significantControlData[FederalFormationFormControl.ExclusionReason] : void 0,
+              individuals: significantControlType === ISCOptions.ListISC ? iscIndividualsData.map((isc) => ({
+                affiliationId: isc[FormationFormControls.Id],
+                typeOfInterest: isc[FederalFormationFormControl.ISCTypeOfInterest],
+                shareHoldingMethod: isc[FederalFormationFormControl.ISCShareHoldingMethod],
+                jointHoldingType: isc[FederalFormationFormControl.ISCJointHoldingType],
+                percentageInterest: isc[FederalFormationFormControl.ISCPercentageInterest],
+                addressForService: isc[FederalFormationFormControl.AddressForService]
+              })) : void 0
+            },
+            contactUid: contactData[FederalFormationFormControl.Contact]
+          };
         }
         generateFederalFormationDeltaData() {
           const formData = this.deltaForm().getRawValue();
@@ -84878,22 +85553,21 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function FederalComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _FederalComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _FederalComponent, selectors: [["federal"]], inputs: { actionsDisabled: [1, "actionsDisabled"], task: [1, "task"], errors: [1, "errors"], activeStep: [1, "activeStep"], isNote: [1, "isNote"] }, outputs: { close: "close", deltaDataChange: "deltaDataChange", file: "file", validate: "validate", nextStep: "nextStep", umValidate: "umValidate", umSave: "umSave", umSubmit: "umSubmit" }, decls: 2, vars: 2, consts: [[3, "documents", "selectedDocuments", "task", "errors", "actionsDisabled", "isNote", "form"], [3, "task", "errors", "actionsDisabled", "form", "selectedDocuments"], [3, "addDocuments", "removeDocument", "close", "validate", "save", "documents", "selectedDocuments", "task", "errors", "actionsDisabled", "isNote", "form"], [3, "close", "file", "task", "errors", "actionsDisabled", "form", "selectedDocuments"], [3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"], [3, "prev", "close", "confirm"]], template: function FederalComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _FederalComponent, selectors: [["federal"]], inputs: { actionsDisabled: [1, "actionsDisabled"], task: [1, "task"], errors: [1, "errors"], activeStep: [1, "activeStep"], isNote: [1, "isNote"] }, outputs: { close: "close", deltaDataChange: "deltaDataChange", file: "file", validate: "validate", nextStep: "nextStep", umValidate: "umValidate", umSave: "umSave", umSubmit: "umSubmit" }, decls: 2, vars: 2, consts: [[3, "documents", "selectedDocuments", "task", "errors", "actionsDisabled", "isNote", "form"], [3, "task", "errors", "actionsDisabled", "form", "selectedDocuments"], [3, "addDocuments", "removeDocument", "close", "validate", "save", "documents", "selectedDocuments", "task", "errors", "actionsDisabled", "isNote", "form"], [3, "close", "file", "task", "errors", "actionsDisabled", "form", "selectedDocuments"], [3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"]], template: function FederalComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275declareLet(0);
             \u0275\u0275template(1, FederalComponent_Conditional_1_Template, 2, 2);
           }
           if (rf & 2) {
-            const currentTask_r8 = \u0275\u0275storeLet(ctx.task());
+            const currentTask_r7 = \u0275\u0275storeLet(ctx.task());
             \u0275\u0275advance();
-            \u0275\u0275conditional(currentTask_r8 ? 1 : -1);
+            \u0275\u0275conditional(currentTask_r7 ? 1 : -1);
           }
         }, dependencies: [
           FederalIncorporationDeltaFormComponent,
           FederalIncorporationPreviewFormComponent,
           FederalUpdateMaintainDeltaFormComponent,
-          FederalUpdateMaintainPreviewFormComponent,
-          TermsAndConditionsComponent
+          FederalUpdateMaintainPreviewFormComponent
         ], styles: ["\n\n[_nghost-%COMP%]   .federal[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n/*# sourceMappingURL=federal.component.css.map */"], changeDetection: 0 });
       };
       (() => {
@@ -84903,13 +85577,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             FederalIncorporationDeltaFormComponent,
             FederalIncorporationPreviewFormComponent,
             FederalUpdateMaintainDeltaFormComponent,
-            FederalUpdateMaintainPreviewFormComponent,
-            TermsAndConditionsComponent
-          ], template: '@let currentTask = task();\r\n\r\n@if (currentTask) {\r\n  @if (isFormationTask(currentTask)) {\r\n    @if (activeStep() === steps.Validate) {\r\n      <federal-incorporation-delta-form\r\n        [documents]="documents"\r\n        [selectedDocuments]="selectedDocuments()"\r\n        (addDocuments)="onAddDocuments($event)"\r\n        (removeDocument)="onRemoveDocument($event)"\r\n        (close)="onClose()"\r\n        (validate)="onValidate()"\r\n        (save)="onSave()"\r\n        [task]="currentTask"\r\n        [errors]="errors()"\r\n        [actionsDisabled]="actionsDisabled()"\r\n        [isNote]="isNote()"\r\n        [form]="deltaForm()"\r\n      />\r\n\r\n    } @else if (activeStep() === steps.FilingPreview) {\r\n      <federal-incorporation-preview-form (close)="close.emit()" (file)="onFile()" [task]="currentTask"\r\n                                          [errors]="errors()"\r\n                                          [actionsDisabled]="actionsDisabled()" [form]="previewForm()"\r\n                                          [selectedDocuments]="selectedDocuments()"/>\r\n    }\r\n  }\r\n\r\n  @if (isUpdateMaintainTask(currentTask)) {\r\n    @if (activeStep() === steps.Validate) {\r\n      <federal-update-maintain-delta-form\r\n        [task]="$any(currentTask)"\r\n        [form]="umDeltaForm()"\r\n        [actionsDisabled]="actionsDisabled()"\r\n        [errors]="errors()"\r\n        [isNote]="isNote()"\r\n        (validate)="onUmValidate()"\r\n        (close)="onClose()"\r\n        (save)="onUmSave()"\r\n      />\r\n    }\r\n\r\n    @if (activeStep() === steps.FilingPreview) {\r\n      <federal-update-maintain-preview-form\r\n        [task]="$any(currentTask)"\r\n        [form]="umPreviewForm()"\r\n        [actionsDisabled]="actionsDisabled()"\r\n        [errors]="errors()"\r\n        (close)="close.emit()"\r\n        (file)="nextStep.emit()"\r\n      />\r\n    }\r\n\r\n    @if (activeStep() === steps.TermsAndConditions) {\r\n      <terms-and-conditions\r\n        (prev)="nextStep.emit()"\r\n        (close)="close.emit()"\r\n        (confirm)="onUmSubmit($event)"\r\n      />\r\n    }\r\n  }\r\n}\r\n\r\n\r\n\r\n\r\n\r\n', styles: ["/* src/app/components/federal/federal.component.scss */\n:host .federal {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n/*# sourceMappingURL=federal.component.css.map */\n"] }]
+            FederalUpdateMaintainPreviewFormComponent
+          ], template: '@let currentTask = task();\r\n\r\n@if (currentTask) {\r\n  @if (isFormationTask(currentTask)) {\r\n    @if (activeStep() === steps.Validate) {\r\n      <federal-incorporation-delta-form\r\n        [documents]="documents"\r\n        [selectedDocuments]="selectedDocuments()"\r\n        (addDocuments)="onAddDocuments($event)"\r\n        (removeDocument)="onRemoveDocument($event)"\r\n        (close)="onClose()"\r\n        (validate)="onValidate()"\r\n        (save)="onSave()"\r\n        [task]="currentTask"\r\n        [errors]="errors()"\r\n        [actionsDisabled]="actionsDisabled()"\r\n        [isNote]="isNote()"\r\n        [form]="deltaForm()"\r\n      />\r\n\r\n    } @else if (activeStep() === steps.FilingPreview) {\r\n      <federal-incorporation-preview-form (close)="close.emit()" (file)="onFile()" [task]="currentTask"\r\n                                          [errors]="errors()"\r\n                                          [actionsDisabled]="actionsDisabled()" [form]="previewForm()"\r\n                                          [selectedDocuments]="selectedDocuments()"/>\r\n    }\r\n  }\r\n\r\n  @if (isUpdateMaintainTask(currentTask)) {\r\n    @if (activeStep() === steps.Validate) {\r\n      <federal-update-maintain-delta-form\r\n        [task]="$any(currentTask)"\r\n        [form]="umDeltaForm()"\r\n        [actionsDisabled]="actionsDisabled()"\r\n        [errors]="errors()"\r\n        [isNote]="isNote()"\r\n        (validate)="onUmValidate()"\r\n        (close)="onClose()"\r\n        (save)="onUmSave()"\r\n      />\r\n    }\r\n\r\n    @if (activeStep() === steps.FilingPreview) {\r\n      <federal-update-maintain-preview-form\r\n        [task]="$any(currentTask)"\r\n        [form]="umPreviewForm()"\r\n        [actionsDisabled]="actionsDisabled()"\r\n        [errors]="errors()"\r\n        (close)="close.emit()"\r\n        (file)="onUmSubmit()"\r\n      />\r\n    }\r\n  }\r\n}\r\n\r\n\r\n\r\n\r\n\r\n', styles: ["/* src/app/components/federal/federal.component.scss */\n:host .federal {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n/*# sourceMappingURL=federal.component.css.map */\n"] }]
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FederalComponent, { className: "FederalComponent", filePath: "src/app/components/federal/federal.component.ts", lineNumber: 39 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FederalComponent, { className: "FederalComponent", filePath: "src/app/components/federal/federal.component.ts", lineNumber: 43 });
       })();
     }
   });
@@ -84936,9 +85609,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             const url = signature.proxyApiUrl;
             const req = requestBody;
             const resp = yield fetchWithJwtRetry(signature, () => postJson(fetchFn, url, signature.jwtToken, req, {
-              "ApiKey": "a759101c-aeac-4fa6-90dc-8b56f01b2939",
+              // 'ApiKey': 'a759101c-aeac-4fa6-90dc-8b56f01b2939',
               Authorization: `Bearer ${signature.jwtToken}`,
-              "AccountKey": "1c3e3a6e-2a8b-4dd2-b906-aec25a1a7227",
+              // 'AccountKey': '1c3e3a6e-2a8b-4dd2-b906-aec25a1a7227',
               "x-target-url": `${this.config.ONAOI}api/Incorporation`,
               "x-access-token": "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJtaWNoZWwubGF2b2llQGF0aGVubmlhbi5jb20iLCJzdWIiOiI2N2RkY2IwNWRjNDAzMjg0ZTdmYTA3ZmIiLCJpYXQiOjE3NzAyMTI2OTQsImV4cCI6MTc3MDIxOTg5NCwiYmlkIjoiIiwiYXV0IjoidHJ1ZSIsIm9yZyI6Imh0dHBzOi8vb2xpdmUtMS50ZXN0LmF0aGVubmlhbi5jb20iLCJwZXIiOiIifQ.0QsFPBVGTA8JyacfEDx4qz5XVQB3AeL2-uCBiCs9qF0",
               Cookie: "AWSALB=PpMRL+JDLimOntn4FPEpJ2ZX9rtRbn/7wOE1Ntyq9RGhYPgnJpjAN8xr8R5TyM4v1tBvC62q0YWVR2fQwDLLKWIIQm+U79VccsjiMHRffNr6an9tJNOOdpX94R53; AWSALBCORS=PpMRL+JDLimOntn4FPEpJ2ZX9rtRbn/7wOE1Ntyq9RGhYPgnJpjAN8xr8R5TyM4v1tBvC62q0YWVR2fQwDLLKWIIQm+U79VccsjiMHRffNr6an9tJNOOdpX94R53"
@@ -85009,15 +85682,18 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               serviceOrderId: payload.ServiceOrderId ?? serviceOrderId
             });
             if (payload?.ReceiptPdf) {
-              signature.filingValidateSuccess?.({
-                searchOrFilingType: "ontarioIncorporation",
-                serviceOrderId,
-                validatedOn: /* @__PURE__ */ new Date(),
-                provider: "obr",
-                draftPdf: payload.ReceiptPdf,
-                documentName: "Incorporation Receipt",
-                documentType: "pdf"
-              });
+              const searchOrFilingType = getSearchOrFilingType(signature.task);
+              if (searchOrFilingType) {
+                signature.filingValidateSuccess?.({
+                  searchOrFilingType,
+                  serviceOrderId,
+                  validatedOn: /* @__PURE__ */ new Date(),
+                  provider: "obr",
+                  draftPdf: payload.ReceiptPdf,
+                  documentName: "Incorporation Receipt",
+                  documentType: "pdf"
+                });
+              }
             }
             return payload;
           });
@@ -85038,6 +85714,116 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
   });
 
+  // src/app/services/federal/federal-update-maintain.service.ts
+  var FederalUpdateMaintainService;
+  var init_federal_update_maintain_service = __esm({
+    "src/app/services/federal/federal-update-maintain.service.ts"() {
+      init_core();
+      init_common_utils();
+      init_core();
+      FederalUpdateMaintainService = class _FederalUpdateMaintainService {
+        config;
+        setConfig(config2) {
+          this.config = config2;
+        }
+        validate(_0, _1) {
+          return __async(this, arguments, function* (signature, requestBody, opts = {}) {
+            if (!isUpdateMaintain(signature.task)) {
+              throw new Error(`Expected Maintain task, got: ${signature.task?._taskType}`);
+            }
+            ensureAuthInputs(signature);
+            const fetchFn = opts.fetchImpl ?? fetch;
+            const url = signature.proxyApiUrl;
+            const targetPath = opts.endpointPath ?? "/api/FilingCD";
+            const req = requestBody;
+            const baseUrl = this.config.ONFiling;
+            if (!baseUrl) {
+              throw new Error("FederalUpdateMaintainService: missing EnvConfig.ONFiling/ONAOI");
+            }
+            const resp = yield fetchWithJwtRetry(signature, () => postJson(fetchFn, url, signature.jwtToken, req, __spreadValues({
+              "x-target-url": joinUrl(baseUrl, targetPath)
+            }, opts.headers ?? {})));
+            const raw = yield resp.text();
+            const parsed = tryParseJson(raw);
+            if (!parsed.ok) {
+              const err2 = new Error(`eCore returned ${resp.status} ${resp.statusText}: ${raw || "(empty response)"}`);
+              err2.httpStatus = resp.status;
+              throw err2;
+            }
+            const payload = unwrapRequestResults(parsed.value);
+            if (resp.ok) {
+              return payload;
+            }
+            const err = buildValidationError(resp.status, payload);
+            err.validateResult = payload;
+            err.httpStatus = resp.status;
+            throw err;
+          });
+        }
+        submitRequest(_0, _1) {
+          return __async(this, arguments, function* (signature, serviceOrderId, opts = {}) {
+            ensureAuthInputs(signature);
+            if (!serviceOrderId) {
+              throw new Error("Missing serviceOrderId.");
+            }
+            const fetchFn = opts.fetchImpl ?? fetch;
+            const url = signature.proxyApiUrl;
+            const resp = yield fetchWithJwtRetry(signature, () => fetchFn(url, {
+              method: "POST",
+              headers: __spreadValues({
+                Authorization: `Bearer ${signature.jwtToken}`,
+                "x-target-url": `${this.config.ONFiling}api/${encodeURIComponent(serviceOrderId)}/submit`
+              }, opts.headers ?? {})
+            }));
+            const raw = yield resp.text();
+            const parsed = tryParseJson(raw);
+            if (!parsed.ok) {
+              if (resp.ok) {
+                const minimal = {
+                  Status: "Success",
+                  ServiceOrderId: serviceOrderId,
+                  raw
+                };
+                signature.filingSubmitSuccess?.({
+                  filedOn: /* @__PURE__ */ new Date(),
+                  serviceOrderId
+                });
+                return minimal;
+              }
+              const err = new Error(`eCore submit returned ${resp.status} ${resp.statusText}: ${raw || "(empty response)"}`);
+              err.httpStatus = resp.status;
+              throw err;
+            }
+            const payload = unwrapRequestResults(parsed.value);
+            if (!resp.ok) {
+              const err = buildGenericError(resp.status, "eCore submit failed", payload);
+              err.submitResult = payload;
+              err.httpStatus = resp.status;
+              throw err;
+            }
+            signature.filingSubmitSuccess?.({
+              filedOn: /* @__PURE__ */ new Date(),
+              serviceOrderId: payload.ServiceOrderId ?? serviceOrderId
+            });
+            return payload;
+          });
+        }
+        static \u0275fac = function FederalUpdateMaintainService_Factory(__ngFactoryType__) {
+          return new (__ngFactoryType__ || _FederalUpdateMaintainService)();
+        };
+        static \u0275prov = /* @__PURE__ */ \u0275\u0275defineInjectable({ token: _FederalUpdateMaintainService, factory: _FederalUpdateMaintainService.\u0275fac, providedIn: "root" });
+      };
+      (() => {
+        (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(FederalUpdateMaintainService, [{
+          type: Injectable,
+          args: [{
+            providedIn: "root"
+          }]
+        }], null, null);
+      })();
+    }
+  });
+
   // src/app/services/ontario/ontario-update-maintain.service.ts
   var OntarioUpdateMaintainService;
   var init_ontario_update_maintain_service = __esm({
@@ -85166,15 +85952,18 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
             const result = parsed.value;
             if (result?.Draft) {
-              signature.filingValidateSuccess?.({
-                searchOrFilingType: "ontarioInitialReturn",
-                serviceOrderId: requestBody.CurrentDataServiceOrderId,
-                validatedOn: /* @__PURE__ */ new Date(),
-                provider: "obr",
-                draftPdf: result.Draft,
-                documentName: opts?.documentName ?? "Initial Return Draft",
-                documentType: "pdf"
-              });
+              const searchOrFilingType = getSearchOrFilingType(signature.task);
+              if (searchOrFilingType) {
+                signature.filingValidateSuccess?.({
+                  searchOrFilingType,
+                  serviceOrderId: requestBody.CurrentDataServiceOrderId,
+                  validatedOn: /* @__PURE__ */ new Date(),
+                  provider: "obr",
+                  draftPdf: result.Draft,
+                  documentName: opts?.documentName ?? "Initial Return Draft",
+                  documentType: "pdf"
+                });
+              }
             }
             if (parsed.ok) {
               return result;
@@ -85517,7 +86306,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       LastName: affiliation.participant._profile.lastName,
       DateOfBirth: affiliation.participant._profile.date_of_birth,
       CountriesOfCitizenship: (affiliation.participant?._profile?.["citizenships"] ?? []).map((c) => normalizeCountryCode(c)),
-      CountriesOfResidence: (affiliation.participant?._profile?.tax_residency ?? []).map((tr) => normalizeCountryCode(tr.country)),
+      CountriesOfResidence: normalizeCountryCode(affiliation.participant?._profile?.tax_residency?.country),
       Address: address ? mapAddress(address) : void 0,
       ServiceAddress: serviceAddress ? mapAddress(serviceAddress) : void 0,
       TypeOfInterest: deltaData.typeOfInterest,
@@ -86108,6 +86897,112 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
   });
 
+  // src/app/helpers/mappers/federal-update-maintain.mapper.ts
+  function buildFederalUpdateMaintainValidationRequest(deltaData, task) {
+    const significantControl = deltaData.individualsWithSignificantControl;
+    const isListIsc = significantControl?.type === ISCOptions.ListISC;
+    const corporationName = task?.entity?._profile?.name ?? "";
+    const corporationNumber = task?.entity?._profile?.corp_number ?? "";
+    const annualComplianceTask = task;
+    const referenceDate = annualComplianceTask?._ext?._reference_date;
+    const annualReturnYear = referenceDate ? new Date(referenceDate).getFullYear().toString() : (/* @__PURE__ */ new Date()).getFullYear().toString();
+    const agmDate = annualComplianceTask?._ext?._agm_date;
+    const annualMeetingDate = agmDate ? new Date(agmDate).toISOString().split("T")[0] : void 0;
+    let signatory;
+    if (task && deltaData.signatoryUid) {
+      const signatoryAff = task.entity.affiliations.find((a) => a._id === deltaData.signatoryUid);
+      if (signatoryAff?.participant) {
+        signatory = {
+          Name: signatoryAff.participant._profile?.name || "",
+          Phone: signatoryAff.participant.communicationPhone || ""
+        };
+      }
+    }
+    let individualsWithSignificantControl;
+    if (task && isListIsc && significantControl?.individuals?.length) {
+      const iscAffiliations = getIndividualWithSignificantControl(task.entity.affiliations);
+      const deltaMap = new Map((significantControl.individuals ?? []).map((d) => [d.affiliationId, d]));
+      individualsWithSignificantControl = iscAffiliations.filter((aff) => deltaMap.has(aff._id)).map((aff) => transformISC(aff, deltaMap.get(aff._id)));
+    }
+    return {
+      CorporationName: corporationName,
+      CorporationNumber: corporationNumber,
+      FilingType: "1",
+      Filing: {
+        AnnualReturn: {
+          AnnualReturnYear: annualReturnYear,
+          AnnualMeetingDate: annualMeetingDate,
+          TypeOfCorporation: deltaData.corporationType,
+          NumberOfShareholders: deltaData.numberOfShareholders,
+          Signatory: signatory,
+          SignificantControlType: significantControl?.type,
+          ExclusionReason: significantControl?.exclusionReason,
+          IndividualsWithSignificantControl: individualsWithSignificantControl
+        }
+      }
+    };
+  }
+  function transformISC(affiliation, deltaData) {
+    const address = affiliation.addresses[0] || affiliation.parent_affiliation?.addresses?.[0];
+    const allAddresses = [
+      ...affiliation.addresses ?? [],
+      ...affiliation.parent_affiliation?.addresses ?? []
+    ];
+    const serviceAddress = deltaData.addressForService ? allAddresses.find((a) => a.uid === deltaData.addressForService) : void 0;
+    return {
+      FirstName: affiliation.participant._profile.firstName ?? "",
+      MiddleName: affiliation.participant._profile.middleName ?? "",
+      LastName: affiliation.participant._profile.lastName ?? "",
+      DateOfBirth: affiliation.participant._profile.date_of_birth,
+      CountriesOfCitizenship: (affiliation.participant?._profile?.["citizenships"] ?? []).map((c) => normalizeCountryCode(c)),
+      CountriesOfResidence: [normalizeCountryCode(affiliation.participant?._profile?.tax_residency?.country)],
+      Address: address ? mapAddress2(address) : void 0,
+      ServiceAddress: serviceAddress ? mapServiceAddress(serviceAddress) : void 0,
+      TypeOfInterest: deltaData.typeOfInterest ?? "",
+      ShareHoldingMethod: deltaData.shareHoldingMethod ?? "",
+      JointHoldingType: deltaData.jointHoldingType ?? "",
+      PercentageInterest: deltaData.percentageInterest ?? "",
+      EffectiveDate: affiliation.start_date
+    };
+  }
+  function mapAddress2(address) {
+    const country = normalizeCountryCode(address?.country ?? "");
+    const provinceState = country === "CA" ? CANProvinceToCode(address?.province_state) : country === "US" ? USStateToCode(address?.province_state) : address?.province_state ?? "";
+    return {
+      StreetNumber: address?.components?.find((c) => c.name === "Street Number Only")?.value || "",
+      StreetName: address?.components?.find((c) => c.name === "Street Only")?.value || "",
+      UnitNumber: address?.components?.find((c) => c.name === "Suite/Apartment")?.value || "",
+      AddressLine2: "",
+      City: address?.city ?? "",
+      ProvinceState: provinceState,
+      Code: address?.postal_zip ?? "",
+      Country: country
+    };
+  }
+  function mapServiceAddress(address) {
+    const country = normalizeCountryCode(address?.country ?? "");
+    const provinceState = country === "CA" ? CANProvinceToCode(address?.province_state) : country === "US" ? USStateToCode(address?.province_state) : address?.province_state ?? "";
+    const streetOnly = address?.components?.find((c) => c.name === "Street Only")?.value || "";
+    const parsed = parseStreetAddress(streetOnly);
+    return {
+      StreetNumber: address?.components?.find((c) => c.name === "Street Number Only")?.value || "",
+      StreetName: parsed.StreetName || "",
+      UnitNumber: address?.components?.find((c) => c.name === "Suite/Apartment")?.value || "",
+      AddressLine2: "",
+      City: address?.city ?? "",
+      ProvinceState: provinceState,
+      Code: address?.postal_zip ?? "",
+      Country: country
+    };
+  }
+  var init_federal_update_maintain_mapper = __esm({
+    "src/app/helpers/mappers/federal-update-maintain.mapper.ts"() {
+      init_address_utils();
+      init_common_utils();
+      init_FederalConstants();
+    }
+  });
+
   // src/app/components/filing/filing.component.ts
   function FilingComponent_Conditional_7_Template(rf, ctx) {
     if (rf & 1) {
@@ -86199,6 +87094,18 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         \u0275\u0275restoreView(_r6);
         const ctx_r2 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r2.onFederalValidate($event));
+      })("umSave", function FilingComponent_Conditional_10_Conditional_1_Template_federal_umSave_0_listener($event) {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r2 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r2.onFederalUpdateMaintainSave($event));
+      })("umValidate", function FilingComponent_Conditional_10_Conditional_1_Template_federal_umValidate_0_listener($event) {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r2 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r2.onFederalUpdateMaintainValidate($event));
+      })("umSubmit", function FilingComponent_Conditional_10_Conditional_1_Template_federal_umSubmit_0_listener() {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r2 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r2.onFederalUpdateMaintainSubmit());
       })("nextStep", function FilingComponent_Conditional_10_Conditional_1_Template_federal_nextStep_0_listener() {
         \u0275\u0275restoreView(_r6);
         const ctx_r2 = \u0275\u0275nextContext(2);
@@ -86248,11 +87155,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_icon();
       init_federal_component();
       init_federal_formation_service();
+      init_federal_update_maintain_service();
       init_ontario_update_maintain_service();
       init_initial_return_payload_helper();
       init_ontario_formation_mapper();
       init_federal_formation_mapper();
       init_ontario_update_maintain_mapper();
+      init_federal_update_maintain_mapper();
       init_core();
       init_button();
       FilingComponent = class _FilingComponent {
@@ -86299,6 +87208,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         isInitialReturnTask = isUpdateMaintain;
         ontarioFormationService = inject(OntarioFormationService);
         federalFormationService = inject(FederalFormationService);
+        federalUpdateMaintainService = inject(FederalUpdateMaintainService);
         updateMaintainService = inject(OntarioUpdateMaintainService);
         translate = inject(TranslateService);
         isEditButton = computed(() => {
@@ -86349,6 +87259,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.updateMaintainService.setConfig(config2);
               this.ontarioFormationService.setConfig(config2);
               this.federalFormationService.setConfig(config2);
+              this.federalUpdateMaintainService.setConfig(config2);
             }
           });
           addStylesVariables();
@@ -86364,7 +87275,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             if (!task) {
               return;
             }
-            if (isUpdateMaintain(task)) {
+            if (isUpdateMaintain(task) && isOntarioTask(task)) {
               if (deltaData.serviceOrderId) {
                 this.defineInitialStep();
               }
@@ -86397,8 +87308,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 const requestBody = buildOntarioFormationValidateRequest(signature.task, deltaData);
                 const response = yield this.ontarioFormationService.validate(signature, requestBody, this.validateOptions() ?? {});
                 const serviceOrderId = response["ServiceOrderId"] ?? "";
+                const searchOrFilingType = getSearchOrFilingType(signature.task);
                 this.filingValidateSuccess.emit({
-                  searchOrFilingType: "ontarioIncorporation",
+                  searchOrFilingType,
                   serviceOrderId: response["ServiceOrderId"] ?? "",
                   validatedOn: /* @__PURE__ */ new Date(),
                   provider: "obr",
@@ -86430,8 +87342,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 const requestBody = buildFederalFormationValidateRequest(signature.task, deltaData);
                 const response = yield this.federalFormationService.validate(signature, requestBody, this.validateOptions() ?? {});
                 const serviceOrderId = response["ServiceOrderId"] ?? "";
+                const searchOrFilingType = getSearchOrFilingType(signature.task);
                 this.filingValidateSuccess.emit({
-                  searchOrFilingType: "ontarioIncorporation",
+                  searchOrFilingType,
                   serviceOrderId: response["ServiceOrderId"] ?? "",
                   validatedOn: /* @__PURE__ */ new Date(),
                   provider: "obr",
@@ -86453,6 +87366,80 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           });
         }
+        /**
+         * Federal Update/Maintain (Annual Return / NOC / Initial Return) Save Changes.
+         * For now we just propagate delta data up to the host via deltaDataChange.
+         */
+        onFederalUpdateMaintainSave(deltaData) {
+          this.deltaDataChange.emit(deltaData);
+        }
+        /**
+         * Federal Update/Maintain validate. Backend integration is not implemented yet;
+         * still propagate delta so the host can persist it.
+         */
+        onFederalUpdateMaintainValidate(deltaData) {
+          const task = this.task();
+          const signature = this._signature();
+          if (!task || !signature) {
+            return;
+          }
+          const requestBody = buildFederalUpdateMaintainValidationRequest(deltaData, task);
+          this.isLoading.set(true);
+          this.errors.set([]);
+          this.federalUpdateMaintainService.validate(signature, requestBody, this.validateOptions() ?? {}).then((response) => {
+            const serviceOrderId = response?.ServiceOrderId ?? response?.["ServiceOrderId"] ?? "";
+            const draftPdf = response?.Draft ?? response?.["Draft"] ?? "";
+            const searchOrFilingType = getSearchOrFilingType(task);
+            if (draftPdf && searchOrFilingType) {
+              this.filingValidateSuccess.emit({
+                searchOrFilingType,
+                serviceOrderId,
+                validatedOn: /* @__PURE__ */ new Date(),
+                provider: "obr",
+                draftPdf,
+                documentName: this.validateOptions()?.documentName ?? "Federal Draft",
+                documentType: "pdf"
+              });
+            }
+            this.deltaDataChange.emit(__spreadProps(__spreadValues({}, deltaData), {
+              serviceOrderId,
+              validatedData: JSON.parse(JSON.stringify(requestBody))
+            }));
+            this.close.emit();
+          }).catch((response) => {
+            console.error(response);
+            const errors = JSON.parse(JSON.stringify(response))?.validateResult?.["Errors"];
+            if (errors?.length) {
+              this.errors.set(this.parseError(errors));
+            }
+          }).finally(() => {
+            this.isLoading.set(false);
+          });
+        }
+        /**
+         * Federal Update/Maintain submit/file. Backend integration pending.
+         * Keep the handler to avoid dropped events.
+         */
+        onFederalUpdateMaintainSubmit() {
+          const signature = this._signature();
+          const serviceOrderId = this.task()?.deltaData?.serviceOrderId;
+          if (!signature || !serviceOrderId) {
+            return;
+          }
+          this.isLoading.set(true);
+          this.errors.set([]);
+          this.federalUpdateMaintainService.submitRequest(signature, serviceOrderId, this.validateOptions() ?? {}).then(() => {
+            this.close.emit();
+          }).catch((response) => {
+            console.error(response);
+            const errors = JSON.parse(JSON.stringify(response))?.validateResult?.["Errors"];
+            if (errors?.length) {
+              this.errors.set(this.parseError(errors));
+            }
+          }).finally(() => {
+            this.isLoading.set(false);
+          });
+        }
         onFederalFormationSubmit() {
           return __async(this, null, function* () {
             try {
@@ -86530,8 +87517,21 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             if (signature) {
               try {
                 const requestBody = buildOntarioUpdateMaintainValidationRequest(task, deltaData, this.serviceOrderId);
-                yield this.updateMaintainService.submitInitialReturnValidationToECore(signature, requestBody, this.validateOptions());
+                const response = yield this.updateMaintainService.submitInitialReturnValidationToECore(signature, requestBody, this.validateOptions());
                 this.deltaDataChange.emit(__spreadProps(__spreadValues({}, deltaData), { serviceOrderId: this.serviceOrderId, validatedData: JSON.parse(JSON.stringify(requestBody)) }));
+                const draftPdf = response?.Draft ?? response?.["Draft"] ?? "";
+                const searchOrFilingType = getSearchOrFilingType(task);
+                if (searchOrFilingType) {
+                  this.filingValidateSuccess.emit({
+                    searchOrFilingType,
+                    serviceOrderId: this.serviceOrderId,
+                    validatedOn: /* @__PURE__ */ new Date(),
+                    provider: "obr",
+                    draftPdf,
+                    documentName: this.validateOptions()?.documentName ?? "Federal Draft",
+                    documentType: "pdf"
+                  });
+                }
                 this.close.emit();
               } catch (response) {
                 const errors = JSON.parse(JSON.stringify(response))?.validateResult?.["Errors"];
@@ -86634,6 +87634,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
             return buildOntarioUpdateMaintainValidationRequest(task, deltaData, serviceOrderId);
           }
+          if (isUpdateMaintain(task)) {
+            return buildFederalUpdateMaintainValidationRequest(deltaData, task);
+          }
           return void 0;
         }
         static \u0275fac = function FilingComponent_Factory(__ngFactoryType__) {
@@ -86647,7 +87650,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           if (rf & 2) {
             \u0275\u0275queryAdvance(2);
           }
-        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 11, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "deltaDataChange", "file", "validate", "nextStep", "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "diameter"]], template: function FilingComponent_Template(rf, ctx) {
+        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 11, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "deltaDataChange", "file", "validate", "umSave", "umValidate", "umSubmit", "nextStep", "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "diameter"]], template: function FilingComponent_Template(rf, ctx) {
           if (rf & 1) {
             const _r1 = \u0275\u0275getCurrentView();
             \u0275\u0275elementStart(0, "div", 0)(1, "div", 1)(2, "h1", 2);
@@ -86754,6 +87757,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           (deltaDataChange)="deltaDataChange.emit($event)"\r
           (file)="onFederalFormationSubmit()"\r
           (validate)="onFederalValidate($event)"\r
+          (umSave)="onFederalUpdateMaintainSave($event)"\r
+          (umValidate)="onFederalUpdateMaintainValidate($event)"\r
+          (umSubmit)="onFederalUpdateMaintainSubmit()"\r
           (nextStep)="defineInitialStep()"\r
         />\r
       }\r
@@ -86770,7 +87776,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 65 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 69 });
       })();
     }
   });