@dyedurham/search-and-file-widget 1.6.16 → 1.6.17

package/dnd-filing-shell.js

@@ -56029,6 +56029,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         IRFormControls2["OfficerPosition"] = "OfficerPosition";
         IRFormControls2["OfficerPositionName"] = "OfficerPositionName";
         IRFormControls2["OfficerPositionSpecified"] = "OfficerPositionSpecified";
+        IRFormControls2["Contact"] = "contact";
         IRFormControls2["CountryTelephoneCode"] = "CountryTelephoneCode";
         IRFormControls2["AreaCode"] = "AreaCode";
         IRFormControls2["TelephoneNumber"] = "TelephoneNumber";
@@ -56039,6 +56040,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         IRFormControls2["Fax"] = "Fax";
         IRFormControls2["AffiliationAddressType"] = "affiliationAddressType";
         IRFormControls2["AffiliationType"] = "AffiliationType";
+        IRFormControls2["CurrentName"] = "currentName";
       })(IRFormControls || (IRFormControls = {}));
       (function(FormationFormGroups2) {
         FormationFormGroups2["ReferenceNumbers"] = "Reference Numbers";
@@ -56056,6 +56058,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         InitialReturnFillingFormGroups2["Directors"] = "Directors";
         InitialReturnFillingFormGroups2["Officers"] = "Officers";
         InitialReturnFillingFormGroups2["CertifiedBy"] = "Certified By";
+        InitialReturnFillingFormGroups2["Contact"] = "Contact";
       })(InitialReturnFillingFormGroups || (InitialReturnFillingFormGroups = {}));
     }
   });
@@ -56957,14 +56960,16 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     } else if (country === "US") {
       provinceState = USStateToCode(address.province_state) || address.province_state;
     }
+    const isCanadianAddress = country === "CA";
+    const mappedStreetName = isCanadianAddress ? deltaData?.streetName ?? StreetName : streetOnly ?? "";
     return __spreadProps(__spreadValues(__spreadProps(__spreadValues({}, careOf && { CareOf: careOf }), {
       AddressStandardLot: "Standard",
-      StreetNumber: streetNumber,
-      StreetName: deltaData?.streetName ?? StreetName,
-      CanadianStreetType: deltaData?.streetType ?? (StreetType2 ? mapStreetType(StreetType2) : void 0),
-      CanadianStreetDirectionType: deltaData?.streetDirection ?? (StreetDirection2 ? mapStreetDirection(StreetDirection2) : null)
+      StreetNumber: deltaData?.streetNumber ?? streetNumber,
+      StreetName: mappedStreetName,
+      CanadianStreetType: isCanadianAddress ? deltaData?.streetType ?? (StreetType2 ? mapStreetType(StreetType2) : void 0) : null,
+      CanadianStreetDirectionType: isCanadianAddress ? deltaData?.streetDirection ?? (StreetDirection2 ? mapStreetDirection(StreetDirection2) : null) : null
     }), suite && { UnitNumber: suite }), {
-      CanadianUnitType: deltaData?.unitType ?? null,
+      CanadianUnitType: isCanadianAddress ? deltaData?.unitType ?? null : null,
       UnitNumber: deltaData?.unitNumber ?? null,
       City: address.city,
       ProvinceState: provinceState,
@@ -57064,8 +57069,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const legalEnding = entityDetails?.legalIdentifier ?? "";
     const incorporatorIds = new Set(task._ext._incorporators?.map((inc) => inc.profileID?.toString()).filter(Boolean) ?? []);
     const registeredOfficeAddress = findRegisteredOfficeAddress(task);
+    const directorIds = new Set(task.entity.affiliations.filter((aff) => aff.kind === "PrincipalAffiliationV3" && aff.role.role_name === DirectorRole.DIRECTOR).map((aff) => aff.participant._id).filter(Boolean));
+    const incorporatorsNotDirectors = (task._ext._incorporators ?? []).filter((inc) => !directorIds.has(inc.profileID?.toString() ?? ""));
     const directors = transformDirectors(task.entity.affiliations, incorporatorIds, deltaData);
-    const incorporators = transformIncorporators(task._ext._incorporators ?? [], deltaData);
+    const incorporators = transformIncorporators(incorporatorsNotDirectors, deltaData);
     const officialBusinessEmail = registeredOfficeAddress?.communications?.find((c) => c.type === "Business Email")?.value;
     const naicsData = task.entity._profile?.naics;
     const requestedDate = task._ext._future_filing_date ? new Date(task._ext._future_filing_date).toISOString().split("T")[0] : (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
@@ -57102,6 +57109,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     });
     return eCorePayload;
   }
+  function getPhoneData(phone) {
+    const resultNumber = phone.length === 11 ? phone.slice(1) : phone;
+    return {
+      countryCode: "1",
+      areaCode: resultNumber.slice(0, 3),
+      number: resultNumber.slice(3),
+      fullNumber: phone
+    };
+  }
   var ECoreIncorporationType, ECoreDirectorNumberType, ECoreEffectiveType, ECoreDirectorResidencyType, ECoreIncorporatorType, ECoreStreetType, ECoreCanadianStreetDirectionType, ECoreCanadianUnitType;
   var init_transform_utils = __esm({
     "src/app/utils/transform.utils.ts"() {
@@ -57895,6 +57911,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       }
       return d.length >= 10 ? d.slice(0, 10) : d;
     }
+    if (isNaN(d.getTime())) {
+      return "Not specified";
+    }
     return d.toISOString().slice(0, 10);
   }
   function isPrincipalAffiliation2(affiliation) {
@@ -57970,7 +57989,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     return task.entity._compliance.home_jurisdiction === "Ontario";
   }
   function buildValidateError(httpStatus, r) {
-    const msgs = (r.Errors ?? []).map((e) => e.Message || e["message"] || e.Code || JSON.stringify(e)).filter(Boolean);
+    const msgs = (r.Errors ?? []).map((e) => e["ErrorMessage"] || e.Message || e["message"] || e.Code || JSON.stringify(e)).filter(Boolean);
     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}).`);
   }
@@ -58025,7 +58044,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function getCurrentAddressPreview(data) {
     const unitType = data.unitType;
-    const unitTypeValue = UNIT_TYPE_OPTIONS.find((option) => option.value === unitType)?.label;
+    const unitTypeValue = UNIT_TYPE_OPTIONS.find((option) => option.value?.toString() === unitType?.toString())?.label;
     const unitNumber = data.unitNumber;
     const careOf = data.careOf;
     const streetType = data.streetType;
@@ -58039,7 +58058,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function getAddressPreview(data) {
     const unitType = data[FormationFormControls.UnitType];
-    const unitTypeValue = UNIT_TYPE_OPTIONS.find((option) => option.value === unitType)?.label;
+    const unitTypeValue = UNIT_TYPE_OPTIONS.find((option) => option.value?.toString() === unitType?.toString())?.label;
     const unitNumber = data[FormationFormControls.UnitNumber];
     const careOf = data[FormationFormControls.CareOf];
     const streetType = data[FormationFormControls.StreetType];
@@ -58097,6 +58116,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       return "";
     return str.toLowerCase().replace(/(?:^|\s|[-/])\S/g, (match) => match.toUpperCase());
   }
+  function generateAffiliationTitle(affiliation) {
+    const person = affiliation.participant;
+    const firstName = person._profile.firstName || "";
+    const lastName = person._profile.lastName || "";
+    const middleName = person._profile.middleName || "";
+    return [firstName, middleName, lastName].filter(Boolean).join(" ");
+  }
   var init_common_utils = __esm({
     "src/app/utils/common.utils.ts"() {
       init_app_constants();
@@ -59111,16 +59137,32 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_app_enums();
       init_ontario_formation_form_constants();
       OntarioUpdateMaintainFormHelper = class _OntarioUpdateMaintainFormHelper {
-        static generateInitialForm(task) {
+        static generateInitialForm(task, comparisonData) {
           const config2 = {};
-          const { _ext, incomingAffiliations, outgoingAffiliations, editedAffiliations = [] } = task;
+          const { _ext, incomingAffiliations, outgoingAffiliations } = task;
           const deltaData = task.deltaData;
-          const addedOfficers = incomingAffiliations?.filter((aff) => isPrincipalAffiliation(aff) && aff.role.role_name === "Officer") || [];
+          const addedOfficers = incomingAffiliations?.filter((aff) => {
+            const key = generateAffiliationTitle(aff);
+            const currentData = comparisonData?.officers.get(key);
+            return !currentData && isPrincipalAffiliation(aff) && aff.role.role_name === "Officer";
+          }) || [];
           const ceasedOfficers = outgoingAffiliations?.filter((aff) => isPrincipalAffiliation(aff) && aff.role.role_name === "Officer") || [];
-          const editedOfficers = editedAffiliations?.filter((aff) => isPrincipalAffiliation(aff) && aff.role.role_name === "Officer") || [];
-          const addedDirectors = incomingAffiliations?.filter((aff) => isPrincipalAffiliation(aff) && aff.role.role_name === "Director") || [];
+          const editedOfficers = incomingAffiliations?.filter((aff) => {
+            const key = generateAffiliationTitle(aff);
+            const currentData = comparisonData?.officers.get(key);
+            return currentData && isPrincipalAffiliation(aff) && aff.role.role_name === "Officer";
+          }) || [];
+          const addedDirectors = incomingAffiliations?.filter((aff) => {
+            const key = generateAffiliationTitle(aff);
+            const currentData = comparisonData?.directors.get(key);
+            return !currentData && isPrincipalAffiliation(aff) && aff.role.role_name === "Director";
+          }) || [];
           const ceasedDirectors = outgoingAffiliations?.filter((aff) => isPrincipalAffiliation(aff) && aff.role.role_name === "Director") || [];
-          const editedDirectors = editedAffiliations?.filter((aff) => isPrincipalAffiliation(aff) && aff.role.role_name === "Director") || [];
+          const editedDirectors = incomingAffiliations?.filter((aff) => {
+            const key = generateAffiliationTitle(aff);
+            const currentData = comparisonData?.directors.get(key);
+            return currentData && isPrincipalAffiliation(aff) && aff.role.role_name === "Director";
+          }) || [];
           const address = findRegisteredOffice(task.entity.affiliations);
           const cert = _ext.certified;
           config2[InitialReturnFillingFormGroups.General] = _OntarioUpdateMaintainFormHelper.generateGeneralInfo(task);
@@ -59156,6 +59198,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           if (cert) {
             config2[InitialReturnFillingFormGroups.CertifiedBy] = _OntarioUpdateMaintainFormHelper.generateCertification(cert, deltaData?.certifiedBy);
           }
+          config2[InitialReturnFillingFormGroups.Contact] = new FormGroup({
+            [IRFormControls.Contact]: new FormControl(deltaData?.contactUid ?? "", Validators.required)
+          });
           return config2;
         }
         static generateGeneralInfo(task) {
@@ -59182,6 +59227,27 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             [IRFormControls.AffiliationName]: new FormControl(cert.incorporator_name)
           }, this.generateAddressFormConfig(cert.address, _OntarioUpdateMaintainFormHelper.mapAddressDelta(deltaData?.address))));
         }
+        static generateContact(contactAffiliation) {
+          const contactProfile = contactAffiliation?.participant._profile ?? {};
+          const communications = contactAffiliation?.participant.communications;
+          const contactEmailAddress = communications?.find((item) => item.type.toLowerCase().includes("email"))?.value ?? "";
+          const contactPhone = communications?.find((item) => item.type.toLowerCase().includes("phone"))?.value ?? "";
+          const { countryCode, areaCode, number } = getPhoneData(contactPhone.replace(/\D/g, ""));
+          return {
+            EmailAddress: contactEmailAddress,
+            PersonName: {
+              FirstName: contactProfile?.firstName,
+              LastName: contactProfile?.lastName,
+              MiddleName: contactProfile?.middleName
+            },
+            PhoneNumber: {
+              AreaCode: areaCode,
+              CountryTelephoneCode: countryCode,
+              Extension: "",
+              TelephoneNumber: number
+            }
+          };
+        }
         static generateAddressFormConfig(address, delta) {
           const config2 = {};
           if (address) {
@@ -59231,23 +59297,30 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const address = affiliation.addresses.at(0) || affiliation.parent_affiliation?.addresses?.at(0);
           const communications = affiliation.participant.communications;
           const emailAddress = affiliation.participant.communicationEmail ?? communications?.find((item) => item.type.toLowerCase().includes("email"))?.value;
-          const person = affiliation.participant;
-          const firstName = person._profile.firstName || "";
-          const lastName = person._profile.lastName || "";
-          const middleName = person._profile.middleName || "";
-          const name = [firstName, middleName, lastName].filter(Boolean).join(" ");
+          const name = generateAffiliationTitle(affiliation);
+          let correctedAffiliationType = affiliationType;
+          if (deltaData) {
+            if (deltaData.currentName) {
+              correctedAffiliationType = IRAffiliationType.Update;
+            } else {
+              if (affiliationType === IRAffiliationType.Update) {
+                correctedAffiliationType = IRAffiliationType.Add;
+              }
+            }
+          }
           const config2 = {
             [IRFormControls.ID]: new FormControl(affiliation._id),
             [IRFormControls.AffiliationName]: new FormControl(name),
             [IRFormControls.Role]: new FormControl(affiliation.role.static_title),
-            [IRFormControls.EffectiveDate]: new FormControl(affiliation.start_date),
+            [IRFormControls.EffectiveDate]: new FormControl(affiliation.start_date ? toYyyyMmDd(affiliation.start_date) : ""),
             [IRFormControls.CeaseDate]: new FormControl(affiliation.end_date ? toYyyyMmDd(affiliation.end_date) : ""),
             [IRFormControls.Email]: new FormControl(emailAddress ?? ""),
-            [IRFormControls.AffiliationType]: new FormControl(affiliationType)
+            [IRFormControls.AffiliationType]: new FormControl(correctedAffiliationType),
+            [IRFormControls.CurrentName]: new FormControl(deltaData ? deltaData.currentName : IRAffiliationType.Update === affiliationType ? name : "")
           };
           const form = new FormGroup(__spreadValues(__spreadValues({}, config2), this.generateAddressFormConfig(address, _OntarioUpdateMaintainFormHelper.mapAddressDelta(deltaData?.address))));
           const affiliationAddressType = form.get(IRFormControls.AffiliationAddressType)?.value;
-          updateFormControlsEnableState(form, addressEnabledFieldsMap[affiliationAddressType]);
+          updateFormControlsEnableState(form, [...addressEnabledFieldsMap[affiliationAddressType], IRFormControls.CurrentName]);
           return form;
         }
         static mapAddressDelta(addr) {
@@ -60550,7 +60623,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(ConfirmModalComponent, [{
           type: Component,
-          args: [{ selector: "confirm-modal", changeDetection: ChangeDetectionStrategy.OnPush, imports: [MatButtonModule, TranslatePipe], template: '@let config = modalConfig();\r\n<div class="confirm-modal">\r\n  <div class="confirm-modal-header">\r\n    <h1 class="confirm-modal-header-title d-flex align-items-center">\r\n      @if (config.icon) {\r\n        <span class="material-icons-outlined icon mr-s">delete</span>\r\n      }\r\n\r\n      {{ config.title | translate }}\r\n    </h1>\r\n  </div>\r\n\r\n  <div class="confirm-modal-text">{{ config.text | translate }}</div>\r\n\r\n  <div class="confirm-modal-actions">\r\n    <button mat-stroked-button (click)="closeModal()">\r\n      <span class="body-1-semibold">{{ config.cancelButton | translate }}</span>\r\n    </button>\r\n    <button\r\n      class="confirm-modal-actions-submit"\r\n      mat-flat-button\r\n      color="primary"\r\n      (click)="closeModal(true)"\r\n    >\r\n      <span class="body-1-semibold">{{ config.confirmButton | translate}}</span>\r\n    </button>\r\n  </div>\r\n</div>\r\n', styles: ['/* src/app/components/confirm-modal/confirm-modal.component.scss */\n:host {\n  --filing-modal-color-grey: #444444;\n  --filing-modal-color-dark-blue: #485673;\n  --filing-modal-color-grey-mid: #A0A0A0;\n  --filing-modal-color-light-blue: #3778E4;\n  --filing-modal-color-black: #444444;\n}\nmat-icon {\n  font-family: "Material Icons" !important;\n  font-size: 20px;\n  height: 20px;\n  width: 20px;\n  line-height: 20px;\n}\nh1 {\n  font-size: 24px;\n  line-height: 28px;\n  font-weight: 700;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh2 {\n  font-size: 22px;\n  line-height: 26px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh3 {\n  font-size: 18px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin-top: 0;\n  margin-bottom: 0;\n}\nh4 {\n  font-size: 16px;\n  line-height: 22px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh4 {\n  font-size: 16px;\n  line-height: 20px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\n.body-1-regular {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-1-bold {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\n.body-1-semibold {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 600;\n  font-family: "Open Sans";\n}\n.body-2-regular {\n  line-height: 20px;\n  font-size: 12px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-2-bold {\n  line-height: 20px;\n  font-size: 12px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\n.body-3-regular {\n  line-height: 20px;\n  font-size: 16px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-4-regular {\n  line-height: 18px;\n  font-size: 18px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-4-bold {\n  line-height: 20px;\n  font-size: 20px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  margin: 0;\n}\n.black {\n  color: var(--filing-modal-color-black);\n}\n.grey {\n  color: var(--filing-modal-color-grey);\n}\n.dark-blue {\n  color: var(--filing-modal-color-dark-blue);\n}\n.grey-mid {\n  color: var(--filing-modal-color-grey-mid);\n}\n.light-blue {\n  color: var(--filing-modal-color-light-blue);\n}\n.filling {\n  height: 100%;\n  overflow: hidden;\n}\n* {\n  box-sizing: border-box;\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n  margin: 0;\n}\n.filling {\n  margin: 0;\n  font-family: "Helvetica Neue", sans-serif;\n}\n.filing {\n  --app-font-family:\n    -apple-system,\n    BlinkMacSystemFont,\n    "Helvetica Neue",\n    Helvetica,\n    Arial,\n    sans-serif;\n  --mat-sys-background: #faf9fd;\n  --mat-sys-error: #ba1a1a;\n  --mat-sys-error-container: #ffdad6;\n  --mat-sys-inverse-on-surface: #f2f0f4;\n  --mat-sys-inverse-primary: #abc7ff;\n  --mat-sys-inverse-surface: #2f3033;\n  --mat-sys-on-background: #1a1b1f;\n  --mat-sys-on-error: #ffffff;\n  --mat-sys-on-error-container: #93000a;\n  --mat-sys-on-primary: #ffffff;\n  --mat-sys-on-primary-container: #00458f;\n  --mat-sys-on-primary-fixed: #001b3f;\n  --mat-sys-on-primary-fixed-variant: #00458f;\n  --mat-sys-on-secondary: #ffffff;\n  --mat-sys-on-secondary-container: #3e4759;\n  --mat-sys-on-secondary-fixed: #131c2b;\n  --mat-sys-on-secondary-fixed-variant: #3e4759;\n  --mat-sys-on-surface: #1a1b1f;\n  --mat-sys-on-surface-variant: var(--filing-modal-color-grey);\n  --mat-sys-on-tertiary: #ffffff;\n  --mat-sys-on-tertiary-container: #0000ef;\n  --mat-sys-on-tertiary-fixed: #00006e;\n  --mat-sys-on-tertiary-fixed-variant: #0000ef;\n  --mat-sys-outline: #74777f;\n  --mat-sys-outline-variant: #c4c6d0;\n  --mat-sys-primary: #3778e4;\n  --mat-sys-primary-container: #d7e3ff;\n  --mat-sys-primary-fixed: #d7e3ff;\n  --mat-sys-primary-fixed-dim: #abc7ff;\n  --mat-sys-scrim: #000000;\n  --mat-sys-secondary: #565e71;\n  --mat-sys-secondary-container: #dae2f9;\n  --mat-sys-secondary-fixed: #dae2f9;\n  --mat-sys-secondary-fixed-dim: #bec6dc;\n  --mat-sys-shadow: #000000;\n  --mat-sys-surface: #faf9fd;\n  --mat-sys-surface-bright: #faf9fd;\n  --mat-sys-surface-container: #efedf0;\n  --mat-sys-surface-container-high: #e9e7eb;\n  --mat-sys-surface-container-highest: #e3e2e6;\n  --mat-sys-surface-container-low: #f4f3f6;\n  --mat-sys-surface-container-lowest: #ffffff;\n  --mat-sys-surface-dim: #dbd9dd;\n  --mat-sys-surface-tint: #005cbb;\n  --mat-sys-surface-variant: #e0e2ec;\n  --mat-sys-tertiary: #343dff;\n  --mat-sys-tertiary-container: #e0e0ff;\n  --mat-sys-tertiary-fixed: #e0e0ff;\n  --mat-sys-tertiary-fixed-dim: #bec2ff;\n  --mat-sys-neutral-variant20: #2d3038;\n  --mat-sys-neutral10: #1a1b1f;\n  --mdc-filled-button-container-height: 35px;\n  --mdc-outlined-button-container-height: 35px;\n  --mdc-text-button-label-text-color: #808090;\n  --mdc-filled-button-label-text-weight: 600;\n  --mdc-text-button-label-text-weight: 600;\n  --mdc-filled-button-container-shape: 4px;\n  --mdc-outlined-button-outline-color: none;\n  --mdc-outlined-button-container-shape: 6px;\n  --mat-sys-level0:\n    0px 0px 0px 0px rgba(0, 0, 0, 0.2),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.14),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level1:\n    0px 2px 1px -1px rgba(0, 0, 0, 0.2),\n    0px 1px 1px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 3px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level2:\n    0px 3px 3px -2px rgba(0, 0, 0, 0.2),\n    0px 3px 4px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 8px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level3:\n    0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n    0px 6px 10px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level4:\n    0px 5px 5px -3px rgba(0, 0, 0, 0.2),\n    0px 8px 10px 1px rgba(0, 0, 0, 0.14),\n    0px 3px 14px 2px rgba(0, 0, 0, 0.12);\n  --mat-sys-level5:\n    0px 7px 8px -4px rgba(0, 0, 0, 0.2),\n    0px 12px 17px 2px rgba(0, 0, 0, 0.14),\n    0px 5px 22px 4px rgba(0, 0, 0, 0.12);\n  --mdc-outlined-button-label-text-size: 14px;\n  --mdc-filled-button-label-text-size: 14px;\n  --mdc-filled-text-field-label-text-size: 16px;\n  --mat-sys-body-large: 400 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-body-large-font: var(--app-font-family);\n  --mat-sys-body-large-line-height: 1.5rem;\n  --mat-sys-body-large-size: 14px;\n  --mat-sys-body-large-tracking: 0.031rem;\n  --mat-sys-body-large-weight: 400;\n  --mat-sys-body-medium: 400 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-body-medium-font: var(--app-font-family);\n  --mat-sys-body-medium-line-height: 1.25rem;\n  --mat-sys-body-medium-size: 0.875rem;\n  --mat-sys-body-medium-tracking: 0.016rem;\n  --mat-sys-body-medium-weight: 400;\n  --mat-sys-body-small: 400 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-body-small-font: var(--app-font-family);\n  --mat-sys-body-small-line-height: 1rem;\n  --mat-sys-body-small-size: 0.75rem;\n  --mat-sys-body-small-tracking: 0.025rem;\n  --mat-sys-body-small-weight: 400;\n  --mat-sys-display-large: 400 3.562rem / 4rem var(--app-font-family);\n  --mat-sys-display-large-font: var(--app-font-family);\n  --mat-sys-display-large-line-height: 4rem;\n  --mat-sys-display-large-size: 3.562rem;\n  --mat-sys-display-large-tracking: -0.016rem;\n  --mat-sys-display-large-weight: 400;\n  --mat-sys-display-medium: 400 2.812rem / 3.25rem var(--app-font-family);\n  --mat-sys-display-medium-font: var(--app-font-family);\n  --mat-sys-display-medium-line-height: 3.25rem;\n  --mat-sys-display-medium-size: 2.812rem;\n  --mat-sys-display-medium-tracking: 0;\n  --mat-sys-display-medium-weight: 400;\n  --mat-sys-display-small: 400 2.25rem / 2.75rem var(--app-font-family);\n  --mat-sys-display-small-font: var(--app-font-family);\n  --mat-sys-display-small-line-height: 2.75rem;\n  --mat-sys-display-small-size: 2.25rem;\n  --mat-sys-display-small-tracking: 0;\n  --mat-sys-display-small-weight: 400;\n  --mat-sys-headline-large: 400 2rem / 2.5rem var(--app-font-family);\n  --mat-sys-headline-large-font: var(--app-font-family);\n  --mat-sys-headline-large-line-height: 2.5rem;\n  --mat-sys-headline-large-size: 2rem;\n  --mat-sys-headline-large-tracking: 0;\n  --mat-sys-headline-large-weight: 400;\n  --mat-sys-headline-medium: 400 1.75rem / 2.25rem var(--app-font-family);\n  --mat-sys-headline-medium-font: var(--app-font-family);\n  --mat-sys-headline-medium-line-height: 2.25rem;\n  --mat-sys-headline-medium-size: 1.75rem;\n  --mat-sys-headline-medium-tracking: 0;\n  --mat-sys-headline-medium-weight: 400;\n  --mat-sys-headline-small: 400 1.5rem / 2rem var(--app-font-family);\n  --mat-sys-headline-small-font: var(--app-font-family);\n  --mat-sys-headline-small-line-height: 2rem;\n  --mat-sys-headline-small-size: 1.5rem;\n  --mat-sys-headline-small-tracking: 0;\n  --mat-sys-headline-small-weight: 400;\n  --mat-sys-label-large: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-label-large-font: var(--app-font-family);\n  --mat-sys-label-large-line-height: 1.25rem;\n  --mat-sys-label-large-size: 0.875rem;\n  --mat-sys-label-large-tracking: 0.006rem;\n  --mat-sys-label-large-weight: 500;\n  --mat-sys-label-large-weight-prominent: 700;\n  --mat-sys-label-medium: 500 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-label-medium-font: var(--app-font-family);\n  --mat-sys-label-medium-line-height: 1rem;\n  --mat-sys-label-medium-size: 0.75rem;\n  --mat-sys-label-medium-tracking: 0.031rem;\n  --mat-sys-label-medium-weight: 500;\n  --mat-sys-label-medium-weight-prominent: 700;\n  --mat-sys-label-small: 500 0.688rem / 1rem var(--app-font-family);\n  --mat-sys-label-small-font: var(--app-font-family);\n  --mat-sys-label-small-line-height: 1rem;\n  --mat-sys-label-small-size: 0.688rem;\n  --mat-sys-label-small-tracking: 0.031rem;\n  --mat-sys-label-small-weight: 500;\n  --mat-sys-title-large: 400 1.375rem / 1.75rem var(--app-font-family);\n  --mat-sys-title-large-font: var(--app-font-family);\n  --mat-sys-title-large-line-height: 1.75rem;\n  --mat-sys-title-large-size: 1.375rem;\n  --mat-sys-title-large-tracking: 0;\n  --mat-sys-title-large-weight: 400;\n  --mat-sys-title-medium: 500 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-title-medium-font: var(--app-font-family);\n  --mat-sys-title-medium-line-height: 1.5rem;\n  --mat-sys-title-medium-size: 1rem;\n  --mat-sys-title-medium-tracking: 0.009rem;\n  --mat-sys-title-medium-weight: 500;\n  --mat-sys-title-small: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-title-small-font: var(--app-font-family);\n  --mat-sys-title-small-line-height: 1.25rem;\n  --mat-sys-title-small-size: 0.875rem;\n  --mat-sys-title-small-tracking: 0.006rem;\n  --mat-sys-title-small-weight: 500;\n  --mat-sys-corner-extra-large: 28px;\n  --mat-sys-corner-extra-large-top: 28px 28px 0 0;\n  --mat-sys-corner-extra-small: 4px;\n  --mat-sys-corner-extra-small-top: 4px 4px 0 0;\n  --mat-sys-corner-full: 9999px;\n  --mat-sys-corner-large: 16px;\n  --mat-sys-corner-large-end: 0 16px 16px 0;\n  --mat-sys-corner-large-start: 16px 0 0 16px;\n  --mat-sys-corner-large-top: 16px 16px 0 0;\n  --mat-sys-corner-medium: 12px;\n  --mat-sys-corner-none: 0;\n  --mat-sys-corner-small: 8px;\n  --mat-sys-dragged-state-layer-opacity: 0.16;\n  --mat-sys-focus-state-layer-opacity: 0.12;\n  --mat-sys-hover-state-layer-opacity: 0.08;\n  --mat-sys-pressed-state-layer-opacity: 0.12;\n}\n.filing .mat-primary .mat-pseudo-checkbox-checked,\n.filing .mat-primary .mat-pseudo-checkbox-indeterminate {\n  background: transparent !important;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox {\n  width: 24px;\n  height: 24px;\n  flex-basis: 24px;\n  padding: 0;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__background {\n  width: 24px;\n  height: 24px;\n  border-radius: 6px;\n  top: 0;\n  left: 0;\n  border: 3px solid var(--filing-modal-color-grey);\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__checkmark {\n  height: 20px;\n  width: 20px;\n  font-size: 20px;\n  top: 1px;\n  left: 1px;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__ripple,\n.filing .mat-mdc-checkbox[cardView] .mat-ripple {\n  display: none;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-label {\n  padding-left: 8px;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-button__label {\n  line-height: 10px;\n}\n:host {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n  height: 100%;\n  padding: 12px;\n}\n:host .confirm-modal {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  gap: 16px;\n}\n:host .confirm-modal-header {\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n}\n:host .confirm-modal-header-title {\n  font-size: 20px;\n  color: var(--neutral-20);\n}\n:host .confirm-modal-header-icon {\n  font-size: 14px;\n  height: 20px;\n}\n:host .confirm-modal-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n}\n:host .confirm-modal-actions button {\n  margin: 0;\n}\n:host .confirm-modal-actions-submit {\n  padding-left: 30px;\n  padding-right: 30px;\n  background-color: #3778e4;\n  color: white;\n  border-radius: 4px !important;\n}\n/*# sourceMappingURL=confirm-modal.component.css.map */\n'] }]
+          args: [{ selector: "confirm-modal", changeDetection: ChangeDetectionStrategy.OnPush, imports: [MatButtonModule, TranslatePipe], template: '@let config = modalConfig();\n<div class="confirm-modal">\n  <div class="confirm-modal-header">\n    <h1 class="confirm-modal-header-title d-flex align-items-center">\n      @if (config.icon) {\n        <span class="material-icons-outlined icon mr-s">delete</span>\n      }\n\n      {{ config.title | translate }}\n    </h1>\n  </div>\n\n  <div class="confirm-modal-text">{{ config.text | translate }}</div>\n\n  <div class="confirm-modal-actions">\n    <button mat-stroked-button (click)="closeModal()">\n      <span class="body-1-semibold">{{ config.cancelButton | translate }}</span>\n    </button>\n    <button\n      class="confirm-modal-actions-submit"\n      mat-flat-button\n      color="primary"\n      (click)="closeModal(true)"\n    >\n      <span class="body-1-semibold">{{ config.confirmButton | translate}}</span>\n    </button>\n  </div>\n</div>\n', styles: ['/* src/app/components/confirm-modal/confirm-modal.component.scss */\n:host {\n  --filing-modal-color-grey: #444444;\n  --filing-modal-color-dark-blue: #485673;\n  --filing-modal-color-grey-mid: #A0A0A0;\n  --filing-modal-color-light-blue: #3778E4;\n  --filing-modal-color-black: #444444;\n}\nmat-icon {\n  font-family: "Material Icons" !important;\n  font-size: 20px;\n  height: 20px;\n  width: 20px;\n  line-height: 20px;\n}\nh1 {\n  font-size: 24px;\n  line-height: 28px;\n  font-weight: 700;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh2 {\n  font-size: 22px;\n  line-height: 26px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh3 {\n  font-size: 18px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin-top: 0;\n  margin-bottom: 0;\n}\nh4 {\n  font-size: 16px;\n  line-height: 22px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh4 {\n  font-size: 16px;\n  line-height: 20px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\n.body-1-regular {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-1-bold {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\n.body-1-semibold {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 600;\n  font-family: "Open Sans";\n}\n.body-2-regular {\n  line-height: 20px;\n  font-size: 12px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-2-bold {\n  line-height: 20px;\n  font-size: 12px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\n.body-3-regular {\n  line-height: 20px;\n  font-size: 16px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-4-regular {\n  line-height: 18px;\n  font-size: 18px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-4-bold {\n  line-height: 20px;\n  font-size: 20px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  margin: 0;\n}\n.black {\n  color: var(--filing-modal-color-black);\n}\n.grey {\n  color: var(--filing-modal-color-grey);\n}\n.dark-blue {\n  color: var(--filing-modal-color-dark-blue);\n}\n.grey-mid {\n  color: var(--filing-modal-color-grey-mid);\n}\n.light-blue {\n  color: var(--filing-modal-color-light-blue);\n}\n.filling {\n  height: 100%;\n  overflow: hidden;\n}\n* {\n  box-sizing: border-box;\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n  margin: 0;\n}\n.filling {\n  margin: 0;\n  font-family: "Helvetica Neue", sans-serif;\n}\n.filing {\n  --app-font-family:\n    -apple-system,\n    BlinkMacSystemFont,\n    "Helvetica Neue",\n    Helvetica,\n    Arial,\n    sans-serif;\n  --mat-sys-background: #faf9fd;\n  --mat-sys-error: #ba1a1a;\n  --mat-sys-error-container: #ffdad6;\n  --mat-sys-inverse-on-surface: #f2f0f4;\n  --mat-sys-inverse-primary: #abc7ff;\n  --mat-sys-inverse-surface: #2f3033;\n  --mat-sys-on-background: #1a1b1f;\n  --mat-sys-on-error: #ffffff;\n  --mat-sys-on-error-container: #93000a;\n  --mat-sys-on-primary: #ffffff;\n  --mat-sys-on-primary-container: #00458f;\n  --mat-sys-on-primary-fixed: #001b3f;\n  --mat-sys-on-primary-fixed-variant: #00458f;\n  --mat-sys-on-secondary: #ffffff;\n  --mat-sys-on-secondary-container: #3e4759;\n  --mat-sys-on-secondary-fixed: #131c2b;\n  --mat-sys-on-secondary-fixed-variant: #3e4759;\n  --mat-sys-on-surface: #1a1b1f;\n  --mat-sys-on-surface-variant: var(--filing-modal-color-grey);\n  --mat-sys-on-tertiary: #ffffff;\n  --mat-sys-on-tertiary-container: #0000ef;\n  --mat-sys-on-tertiary-fixed: #00006e;\n  --mat-sys-on-tertiary-fixed-variant: #0000ef;\n  --mat-sys-outline: #74777f;\n  --mat-sys-outline-variant: #c4c6d0;\n  --mat-sys-primary: #3778e4;\n  --mat-sys-primary-container: #d7e3ff;\n  --mat-sys-primary-fixed: #d7e3ff;\n  --mat-sys-primary-fixed-dim: #abc7ff;\n  --mat-sys-scrim: #000000;\n  --mat-sys-secondary: #565e71;\n  --mat-sys-secondary-container: #dae2f9;\n  --mat-sys-secondary-fixed: #dae2f9;\n  --mat-sys-secondary-fixed-dim: #bec6dc;\n  --mat-sys-shadow: #000000;\n  --mat-sys-surface: #faf9fd;\n  --mat-sys-surface-bright: #faf9fd;\n  --mat-sys-surface-container: #efedf0;\n  --mat-sys-surface-container-high: #e9e7eb;\n  --mat-sys-surface-container-highest: #e3e2e6;\n  --mat-sys-surface-container-low: #f4f3f6;\n  --mat-sys-surface-container-lowest: #ffffff;\n  --mat-sys-surface-dim: #dbd9dd;\n  --mat-sys-surface-tint: #005cbb;\n  --mat-sys-surface-variant: #e0e2ec;\n  --mat-sys-tertiary: #343dff;\n  --mat-sys-tertiary-container: #e0e0ff;\n  --mat-sys-tertiary-fixed: #e0e0ff;\n  --mat-sys-tertiary-fixed-dim: #bec2ff;\n  --mat-sys-neutral-variant20: #2d3038;\n  --mat-sys-neutral10: #1a1b1f;\n  --mdc-filled-button-container-height: 35px;\n  --mdc-outlined-button-container-height: 35px;\n  --mdc-text-button-label-text-color: #808090;\n  --mdc-filled-button-label-text-weight: 600;\n  --mdc-text-button-label-text-weight: 600;\n  --mdc-filled-button-container-shape: 4px;\n  --mdc-outlined-button-outline-color: none;\n  --mdc-outlined-button-container-shape: 6px;\n  --mat-sys-level0:\n    0px 0px 0px 0px rgba(0, 0, 0, 0.2),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.14),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level1:\n    0px 2px 1px -1px rgba(0, 0, 0, 0.2),\n    0px 1px 1px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 3px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level2:\n    0px 3px 3px -2px rgba(0, 0, 0, 0.2),\n    0px 3px 4px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 8px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level3:\n    0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n    0px 6px 10px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level4:\n    0px 5px 5px -3px rgba(0, 0, 0, 0.2),\n    0px 8px 10px 1px rgba(0, 0, 0, 0.14),\n    0px 3px 14px 2px rgba(0, 0, 0, 0.12);\n  --mat-sys-level5:\n    0px 7px 8px -4px rgba(0, 0, 0, 0.2),\n    0px 12px 17px 2px rgba(0, 0, 0, 0.14),\n    0px 5px 22px 4px rgba(0, 0, 0, 0.12);\n  --mdc-outlined-button-label-text-size: 14px;\n  --mdc-filled-button-label-text-size: 14px;\n  --mdc-filled-text-field-label-text-size: 16px;\n  --mat-sys-body-large: 400 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-body-large-font: var(--app-font-family);\n  --mat-sys-body-large-line-height: 1.5rem;\n  --mat-sys-body-large-size: 14px;\n  --mat-sys-body-large-tracking: 0.031rem;\n  --mat-sys-body-large-weight: 400;\n  --mat-sys-body-medium: 400 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-body-medium-font: var(--app-font-family);\n  --mat-sys-body-medium-line-height: 1.25rem;\n  --mat-sys-body-medium-size: 0.875rem;\n  --mat-sys-body-medium-tracking: 0.016rem;\n  --mat-sys-body-medium-weight: 400;\n  --mat-sys-body-small: 400 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-body-small-font: var(--app-font-family);\n  --mat-sys-body-small-line-height: 1rem;\n  --mat-sys-body-small-size: 0.75rem;\n  --mat-sys-body-small-tracking: 0.025rem;\n  --mat-sys-body-small-weight: 400;\n  --mat-sys-display-large: 400 3.562rem / 4rem var(--app-font-family);\n  --mat-sys-display-large-font: var(--app-font-family);\n  --mat-sys-display-large-line-height: 4rem;\n  --mat-sys-display-large-size: 3.562rem;\n  --mat-sys-display-large-tracking: -0.016rem;\n  --mat-sys-display-large-weight: 400;\n  --mat-sys-display-medium: 400 2.812rem / 3.25rem var(--app-font-family);\n  --mat-sys-display-medium-font: var(--app-font-family);\n  --mat-sys-display-medium-line-height: 3.25rem;\n  --mat-sys-display-medium-size: 2.812rem;\n  --mat-sys-display-medium-tracking: 0;\n  --mat-sys-display-medium-weight: 400;\n  --mat-sys-display-small: 400 2.25rem / 2.75rem var(--app-font-family);\n  --mat-sys-display-small-font: var(--app-font-family);\n  --mat-sys-display-small-line-height: 2.75rem;\n  --mat-sys-display-small-size: 2.25rem;\n  --mat-sys-display-small-tracking: 0;\n  --mat-sys-display-small-weight: 400;\n  --mat-sys-headline-large: 400 2rem / 2.5rem var(--app-font-family);\n  --mat-sys-headline-large-font: var(--app-font-family);\n  --mat-sys-headline-large-line-height: 2.5rem;\n  --mat-sys-headline-large-size: 2rem;\n  --mat-sys-headline-large-tracking: 0;\n  --mat-sys-headline-large-weight: 400;\n  --mat-sys-headline-medium: 400 1.75rem / 2.25rem var(--app-font-family);\n  --mat-sys-headline-medium-font: var(--app-font-family);\n  --mat-sys-headline-medium-line-height: 2.25rem;\n  --mat-sys-headline-medium-size: 1.75rem;\n  --mat-sys-headline-medium-tracking: 0;\n  --mat-sys-headline-medium-weight: 400;\n  --mat-sys-headline-small: 400 1.5rem / 2rem var(--app-font-family);\n  --mat-sys-headline-small-font: var(--app-font-family);\n  --mat-sys-headline-small-line-height: 2rem;\n  --mat-sys-headline-small-size: 1.5rem;\n  --mat-sys-headline-small-tracking: 0;\n  --mat-sys-headline-small-weight: 400;\n  --mat-sys-label-large: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-label-large-font: var(--app-font-family);\n  --mat-sys-label-large-line-height: 1.25rem;\n  --mat-sys-label-large-size: 0.875rem;\n  --mat-sys-label-large-tracking: 0.006rem;\n  --mat-sys-label-large-weight: 500;\n  --mat-sys-label-large-weight-prominent: 700;\n  --mat-sys-label-medium: 500 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-label-medium-font: var(--app-font-family);\n  --mat-sys-label-medium-line-height: 1rem;\n  --mat-sys-label-medium-size: 0.75rem;\n  --mat-sys-label-medium-tracking: 0.031rem;\n  --mat-sys-label-medium-weight: 500;\n  --mat-sys-label-medium-weight-prominent: 700;\n  --mat-sys-label-small: 500 0.688rem / 1rem var(--app-font-family);\n  --mat-sys-label-small-font: var(--app-font-family);\n  --mat-sys-label-small-line-height: 1rem;\n  --mat-sys-label-small-size: 0.688rem;\n  --mat-sys-label-small-tracking: 0.031rem;\n  --mat-sys-label-small-weight: 500;\n  --mat-sys-title-large: 400 1.375rem / 1.75rem var(--app-font-family);\n  --mat-sys-title-large-font: var(--app-font-family);\n  --mat-sys-title-large-line-height: 1.75rem;\n  --mat-sys-title-large-size: 1.375rem;\n  --mat-sys-title-large-tracking: 0;\n  --mat-sys-title-large-weight: 400;\n  --mat-sys-title-medium: 500 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-title-medium-font: var(--app-font-family);\n  --mat-sys-title-medium-line-height: 1.5rem;\n  --mat-sys-title-medium-size: 1rem;\n  --mat-sys-title-medium-tracking: 0.009rem;\n  --mat-sys-title-medium-weight: 500;\n  --mat-sys-title-small: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-title-small-font: var(--app-font-family);\n  --mat-sys-title-small-line-height: 1.25rem;\n  --mat-sys-title-small-size: 0.875rem;\n  --mat-sys-title-small-tracking: 0.006rem;\n  --mat-sys-title-small-weight: 500;\n  --mat-sys-corner-extra-large: 28px;\n  --mat-sys-corner-extra-large-top: 28px 28px 0 0;\n  --mat-sys-corner-extra-small: 4px;\n  --mat-sys-corner-extra-small-top: 4px 4px 0 0;\n  --mat-sys-corner-full: 9999px;\n  --mat-sys-corner-large: 16px;\n  --mat-sys-corner-large-end: 0 16px 16px 0;\n  --mat-sys-corner-large-start: 16px 0 0 16px;\n  --mat-sys-corner-large-top: 16px 16px 0 0;\n  --mat-sys-corner-medium: 12px;\n  --mat-sys-corner-none: 0;\n  --mat-sys-corner-small: 8px;\n  --mat-sys-dragged-state-layer-opacity: 0.16;\n  --mat-sys-focus-state-layer-opacity: 0.12;\n  --mat-sys-hover-state-layer-opacity: 0.08;\n  --mat-sys-pressed-state-layer-opacity: 0.12;\n}\n.filing .mat-primary .mat-pseudo-checkbox-checked,\n.filing .mat-primary .mat-pseudo-checkbox-indeterminate {\n  background: transparent !important;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox {\n  width: 24px;\n  height: 24px;\n  flex-basis: 24px;\n  padding: 0;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__background {\n  width: 24px;\n  height: 24px;\n  border-radius: 6px;\n  top: 0;\n  left: 0;\n  border: 3px solid var(--filing-modal-color-grey);\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__checkmark {\n  height: 20px;\n  width: 20px;\n  font-size: 20px;\n  top: 1px;\n  left: 1px;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__ripple,\n.filing .mat-mdc-checkbox[cardView] .mat-ripple {\n  display: none;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-label {\n  padding-left: 8px;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-button__label {\n  line-height: 10px;\n}\n:host {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n  height: 100%;\n  padding: 12px;\n}\n:host .confirm-modal {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  gap: 16px;\n}\n:host .confirm-modal-header {\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n}\n:host .confirm-modal-header-title {\n  font-size: 20px;\n  color: var(--neutral-20);\n}\n:host .confirm-modal-header-icon {\n  font-size: 14px;\n  height: 20px;\n}\n:host .confirm-modal-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n}\n:host .confirm-modal-actions button {\n  margin: 0;\n}\n:host .confirm-modal-actions-submit {\n  padding-left: 30px;\n  padding-right: 30px;\n  background-color: #3778e4;\n  color: white;\n  border-radius: 4px !important;\n}\n/*# sourceMappingURL=confirm-modal.component.css.map */\n'] }]
         }], null, null);
       })();
       (() => {
@@ -62794,7 +62867,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(ChipComponent, [{
           type: Component,
-          args: [{ selector: "chip", changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [MatIconModule, TranslatePipe], template: '<div class="chip {{type()}}">\r\n  <span class="body-1-semibold">{{title() | translate}}</span>\r\n</div>\r\n', styles: ["/* src/app/components/chip/chip.component.scss */\n:host .chip {\n  padding: 0 15px;\n  height: 20px;\n  display: flex;\n  align-items: center;\n  border-radius: 4px;\n  border: 1px solid #A1B5C7;\n}\n:host .chip.warning {\n  color: #CFB95A;\n}\n:host .chip.danger {\n  color: #C56868;\n}\n:host .chip.success {\n  color: #4CAF51;\n}\n/*# sourceMappingURL=chip.component.css.map */\n"] }]
+          args: [{ selector: "chip", changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [MatIconModule, TranslatePipe], template: '<div class="chip {{type()}}">\n  <span class="body-1-semibold">{{title() | translate}}</span>\n</div>\n', styles: ["/* src/app/components/chip/chip.component.scss */\n:host .chip {\n  padding: 0 15px;\n  height: 20px;\n  display: flex;\n  align-items: center;\n  border-radius: 4px;\n  border: 1px solid #A1B5C7;\n}\n:host .chip.warning {\n  color: #CFB95A;\n}\n:host .chip.danger {\n  color: #C56868;\n}\n:host .chip.success {\n  color: #4CAF51;\n}\n/*# sourceMappingURL=chip.component.css.map */\n"] }]
         }], null, null);
       })();
       (() => {
@@ -63013,45 +63086,45 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 animate("100ms cubic-bezier(0.4, 0.0, 0.2, 1)")
               ])
             ])
-          ], template: `<div [class.padded]="padded()" [class.border]="border()" class="expandable-card">\r
-  <div (click)="toggle()" class="expandable-card-header">\r
-    <h2 [class.list-item]="isListItem()" class="expandable-card-header-title">{{title() | translate}}\r
-      @if (role()) {\r
-        <span>({{role()}})</span>\r
-      }\r
-    </h2>\r
-    <div [class.list-item]="isListItem()" class="expandable-card-header-container">\r
-      @if (isStatusIcon()) {\r
-        @if (!isValid()) {\r
-          <mat-icon class="expandable-card-header-status-icon"> error_outline </mat-icon>\r
-        }\r
-      }\r
-\r
-      @if(chipType()) {\r
-        <chip [type]="chipType()" [title]="chipText()"/>\r
-      }\r
-\r
-      @if (isExpandable()) {\r
-        <mat-icon [class.rotated]="!isExpanded()">arrow_forward_ios</mat-icon>\r
-      }\r
-    </div>\r
-  </div>\r
-\r
-  <div class="expandable-card-content"\r
-    [@expandCollapse]="isExpanded()">\r
-    <div class="expandable-card-content-item">\r
-      <ng-content></ng-content>\r
-\r
-      @if (removable()) {\r
-        <div class="expandable-card-content-item-actions">\r
-          <span (click)="remove.emit()" class="body-1-regular light-blue pointer">{{'Remove' | translate}}</span>\r
-        </div>\r
-      }\r
-\r
-\r
-    </div>\r
-  </div>\r
-</div>\r
+          ], template: `<div [class.padded]="padded()" [class.border]="border()" class="expandable-card">
+  <div (click)="toggle()" class="expandable-card-header">
+    <h2 [class.list-item]="isListItem()" class="expandable-card-header-title">{{title() | translate}}
+      @if (role()) {
+        <span>({{role()}})</span>
+      }
+    </h2>
+    <div [class.list-item]="isListItem()" class="expandable-card-header-container">
+      @if (isStatusIcon()) {
+        @if (!isValid()) {
+          <mat-icon class="expandable-card-header-status-icon"> error_outline </mat-icon>
+        }
+      }
+
+      @if(chipType()) {
+        <chip [type]="chipType()" [title]="chipText()"/>
+      }
+
+      @if (isExpandable()) {
+        <mat-icon [class.rotated]="!isExpanded()">arrow_forward_ios</mat-icon>
+      }
+    </div>
+  </div>
+
+  <div class="expandable-card-content"
+    [@expandCollapse]="isExpanded()">
+    <div class="expandable-card-content-item">
+      <ng-content></ng-content>
+
+      @if (removable()) {
+        <div class="expandable-card-content-item-actions">
+          <span (click)="remove.emit()" class="body-1-regular light-blue pointer">{{'Remove' | translate}}</span>
+        </div>
+      }
+
+
+    </div>
+  </div>
+</div>
 `, styles: ["/* src/app/components/expandable-card/expandable-card.component.scss */\n:host .expandable-card {\n  border-radius: 8px;\n  height: 100%;\n}\n:host .expandable-card-header {\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n}\n:host .expandable-card-header-status-icon {\n  font-weight: 400;\n  color: #F1D01E;\n  font-size: 22px;\n  height: 22px;\n  width: 22px;\n}\n:host .expandable-card-header-status-icon.added {\n  color: #44aa00;\n}\n:host .expandable-card-header-icon {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n:host .expandable-card-header-title {\n  color: #666666;\n  font-weight: 700;\n  font-size: 14px;\n}\n:host .expandable-card-header-title.list-item {\n  color: var(--filing-modal-color-dark-blue);\n  font-weight: 600;\n}\n:host .expandable-card-header-container {\n  display: flex;\n  align-items: center;\n  gap: 16px;\n}\n:host .expandable-card-header-container.list-item mat-icon {\n  font-size: 16px;\n}\n:host .expandable-card-header mat-icon:not(.expandable-card-header-status-icon) {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  transition: transform 100ms cubic-bezier(0.4, 0, 0.2, 1);\n  transform: rotate(-90deg);\n}\n:host .expandable-card-header mat-icon:not(.expandable-card-header-status-icon).rotated {\n  transform: rotate(90deg);\n}\n:host .expandable-card-content {\n  height: 100%;\n}\n:host .expandable-card-content-item {\n  display: flex;\n  flex-direction: column;\n  height: 100%;\n}\n:host .expandable-card-content-item-actions {\n  display: flex;\n  justify-content: flex-end;\n  width: 100%;\n}\n:host .expandable-card.border {\n  box-shadow:\n    0 1px 2px rgba(0, 0, 0, 0.08),\n    0 2px 4px rgba(0, 0, 0, 0.12),\n    0 0 0 1px rgba(0, 0, 0, 0.04);\n  margin: 1px;\n}\n:host .expandable-card.padded {\n  padding: 16px;\n}\n/*# sourceMappingURL=expandable-card.component.css.map */\n"] }]
         }], () => [], null);
       })();
@@ -74316,7 +74389,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatFormFieldModule,
             MatInputModule,
             MatAutocompleteModule
-          ], template: '<mat-form-field appearance="outline">\r\n  <input\r\n    matInput\r\n    [formControl]="control()"\r\n    [placeholder]="placeholder()"\r\n    [required]="required()"\r\n    [matAutocomplete]="auto"\r\n  />\r\n\r\n  <mat-autocomplete #auto="matAutocomplete">\r\n    @for (option of filteredOptions(); track option) {\r\n      <mat-option [value]="option.value">\r\n        {{ option.label }}\r\n      </mat-option>\r\n    }\r\n  </mat-autocomplete>\r\n</mat-form-field>\r\n' }]
+          ], template: '<mat-form-field appearance="outline">\n  <input\n    matInput\n    [formControl]="control()"\n    [placeholder]="placeholder()"\n    [required]="required()"\n    [matAutocomplete]="auto"\n  />\n\n  <mat-autocomplete #auto="matAutocomplete">\n    @for (option of filteredOptions(); track option) {\n      <mat-option [value]="option.value">\n        {{ option.label }}\n      </mat-option>\n    }\n  </mat-autocomplete>\n</mat-form-field>\n' }]
         }], null, null);
       })();
       (() => {
@@ -78459,7 +78532,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           ], imports: [
             MatCheckbox
-          ], template: '<div class="checkbox-list">\r\n  <div class="body-1-regular grey">{{ title() }}</div>\r\n\r\n  @for (item of items(); track item.value) {\r\n    <label class="checkbox-list-item">\r\n      <mat-checkbox\r\n        [checked]="isChecked(item.value)"\r\n        [disabled]="disabled"\r\n        (change)="toggle(item.value)"\r\n      >\r\n        <span class="body-1-regular grey">{{ item.label }}</span>\r\n      </mat-checkbox>\r\n    </label>\r\n  }\r\n</div>\r\n', styles: ["/* src/app/components/checkbox-list/checkbox-list.component.scss */\n:host .checkbox-list {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n  padding-bottom: 16px;\n}\n:host .checkbox-list-item {\n  padding-left: 16px;\n}\n/*# sourceMappingURL=checkbox-list.component.css.map */\n"] }]
+          ], template: '<div class="checkbox-list">\n  <div class="body-1-regular grey">{{ title() }}</div>\n\n  @for (item of items(); track item.value) {\n    <label class="checkbox-list-item">\n      <mat-checkbox\n        [checked]="isChecked(item.value)"\n        [disabled]="disabled"\n        (change)="toggle(item.value)"\n      >\n        <span class="body-1-regular grey">{{ item.label }}</span>\n      </mat-checkbox>\n    </label>\n  }\n</div>\n', styles: ["/* src/app/components/checkbox-list/checkbox-list.component.scss */\n:host .checkbox-list {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n  padding-bottom: 16px;\n}\n:host .checkbox-list-item {\n  padding-left: 16px;\n}\n/*# sourceMappingURL=checkbox-list.component.css.map */\n"] }]
         }], null, null);
       })();
       (() => {
@@ -78518,7 +78591,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         \u0275\u0275restoreView(_r6);
         \u0275\u0275nextContext();
         const control_r7 = \u0275\u0275readContextLet(4);
-        return \u0275\u0275resetView(control_r7 == null ? null : control_r7.reset());
+        const field_r3 = \u0275\u0275nextContext(2).$implicit;
+        \u0275\u0275nextContext();
+        const form_r4 = \u0275\u0275readContextLet(1);
+        control_r7 == null ? null : control_r7.reset();
+        return \u0275\u0275resetView(field_r3.onChange && field_r3.onChange(form_r4));
       });
       \u0275\u0275elementStart(2, "mat-icon");
       \u0275\u0275text(3, "close");
@@ -79167,234 +79244,234 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             { provide: DateAdapter, useClass: MomentDateAdapter },
             { provide: MAT_DATE_FORMATS, useValue: MY_DATE_FORMATS },
             { provide: MAT_DATE_LOCALE, useValue: "en-GB" }
-          ], template: `@let fields = this.config();\r
-@let form = this.form();\r
-\r
-<section>\r
-  <div [class.submitted]="isSubmitted()" class="filling-form-fields" [formGroup]="form">\r
-    @for (field of fields; track field.formControlName + $index; let last = $last) {\r
-      @if (!field.isVisible || field.isVisible(form)) {\r
-        @let previousValue = validationConfig()?.[field.formControlName];\r
-\r
-        @switch (field.type) {\r
-          @case (types.Select) {\r
-            <div class="filling-form-fields-item {{field.class ?? 'span-6'}}">\r
-              @let label = field.dynamicLabel ? field.dynamicLabel(form, translateFn) : field.label;\r
-              @if (label) {\r
-                <span class="filling-form-fields-item-label body-1-regular">\r
-                    {{ (label | translate) + (field.required ? " *" : "") }}\r
-                  </span>\r
-              }\r
-              <mat-form-field appearance="outline">\r
-                @let control = form.get(field.formControlName);\r
-\r
-                <input\r
-                  matInput\r
-                  [formControlName]="field.formControlName"\r
-                  [matAutocomplete]="autocompleteRef"\r
-                  (change)="field.onChange && field.onChange(form)"\r
-                />\r
-\r
-                <mat-autocomplete\r
-                  #autocompleteRef="matAutocomplete"\r
-                  [displayWith]="getDisplayFn(field)"\r
-                  (optionSelected)="field.onChange && field.onChange(form)"\r
-                >\r
-                  @for (option of getFilteredOptions(field); track option.value) {\r
-                    <mat-option\r
-                      class="filing-form-group-select-option"\r
-                      [value]="option.value"\r
-                    >\r
-                      {{ option.label | translate }}\r
-                    </mat-option>\r
-                  }\r
-                  @if (getFilteredOptions(field).length === 0) {\r
-                    <mat-option disabled>{{ 'No options found' | translate }}</mat-option>\r
-                  }\r
-                </mat-autocomplete>\r
-\r
-                @if (control?.value && !control?.disabled) {\r
-                  <div matSuffix class="suffix-container">\r
-                    <button mat-icon-button (click)="control?.reset()">\r
-                      <mat-icon>close</mat-icon>\r
-                    </button>\r
-\r
-                    <mat-icon class="arrow-icon">arrow_drop_down</mat-icon>\r
-                  </div>\r
-                } @else {\r
-                  <mat-icon matSuffix>arrow_drop_down</mat-icon>\r
-                }\r
-\r
-                <mat-error>{{ (field.label | translate) + ' ' + ('is required' | translate) }}</mat-error>\r
-              </mat-form-field>\r
-            </div>\r
-          }\r
-\r
-          @case (types.Checkbox) {\r
-            <div [class.last]="last" class="filling-form-fields-checkbox {{field.class ?? 'span-6'}}">\r
-              <mat-checkbox\r
-                (change)="field.onChange && field.onChange(form)"\r
-                [formControlName]="field.formControlName"\r
-              >\r
-                @let label = field.dynamicLabel ? field.dynamicLabel(form, translateFn) : field.label;\r
-                <div>\r
-                    <span class="body-1-regular black"  [class.warning]="!!previousValue">{{\r
-                        label | translate\r
-                      }}</span>\r
-                  @if (previousValue != null) {\r
-                    <mat-icon\r
-                      [class.warning]="true"\r
-                      class="filling-form-fields-item-icon"\r
-                      matSuffix\r
-                    >warning_amber</mat-icon\r
-                    >\r
-                  }\r
-                </div>\r
-              </mat-checkbox>\r
-\r
-              @if (previousValue != null) {\r
-                <mat-hint\r
-                  [class.warning]="true"\r
-                  class="filling-form-fields-item-hint"\r
-                >{{ 'Previously saved value' | translate }}: {{ previousValue ? ('checked' | translate) : ('unchecked' | translate) }}</mat-hint\r
-                >\r
-              }\r
-            </div>\r
-          }\r
-\r
-          @case (types.Empty) {\r
-            <div class="filling-form-fields-empty {{field.class ?? 'span-6'}}"></div>\r
-          }\r
-          @case (types.Autocomplete) {\r
-            <div class="filling-form-fields-item {{field.class ?? 'span-6'}}">\r
-              @if (field.label) {\r
-                <span class="filling-form-fields-item-label body-1-regular">\r
-                    {{ (field.label | translate) + (field.required ? " *" : "") }}\r
-                  </span>\r
-              }\r
-              <autocomplete-field\r
-                [options]="field.options ?? []"\r
-                [control]="getFormControl(field.formControlName)"\r
-                [required]="field.required ?? false"\r
-              />\r
-            </div>\r
-          }\r
-\r
-          @case (types.Date) {\r
-            <div\r
-              class="filling-form-fields-item {{field.class ?? 'span-6'}}"\r
-              [class.warning]="!!previousValue"\r
-            >\r
-              @if (field.label) {\r
-                <span\r
-                  class="filling-form-fields-item-label body-1-regular"\r
-                  [class.warning]="!!previousValue"\r
-                >\r
-                    {{ (field.label | translate) + (field.required ? " *" : "") }}\r
-                  </span>\r
-              }\r
-\r
-              <mat-form-field appearance="outline">\r
-                <input\r
-                  matInput\r
-                  [matDatepicker]="picker"\r
-                  [formControlName]="field.formControlName"\r
-                  (dateChange)="field.onChange && field.onChange(form)"\r
-                />\r
-                <mat-datepicker-toggle matSuffix [for]="picker">\r
-                  <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon>\r
-                </mat-datepicker-toggle>\r
-                <mat-datepicker #picker></mat-datepicker>\r
-\r
-                @if (previousValue != null) {\r
-                  <mat-hint\r
-                    [class.warning]="true"\r
-                    class="filling-form-fields-item-hint"\r
-                  >\r
-                    {{ 'Previously saved value' | translate }}: {{ previousValue }}\r
-                  </mat-hint>\r
-                }\r
-\r
-                <mat-error>{{ (field.label | translate) + ' ' + ('is required' | translate) }}</mat-error>\r
-              </mat-form-field>\r
-            </div>\r
-          }\r
-\r
-          @case (types.Input) {\r
-            <div\r
-              [class.warning]="!!previousValue"\r
-              class="filling-form-fields-item {{field.class ?? 'span-6'}}"\r
-            >\r
-              @if (field.label) {\r
-                <span\r
-                  [class.warning]="!!previousValue"\r
-                  class="filling-form-fields-item-label body-1-regular"\r
-                >\r
-                    {{ (field.label | translate) + (field.required ? " *" : "") }}\r
-                  </span>\r
-\r
-                <mat-form-field appearance="outline">\r
-                  <input\r
-                    matInput\r
-                    [readonly]="field.readonly"\r
-                    [formControlName]="field.formControlName"\r
-                    (input)="field.onChange && field.onChange(form)"\r
-                  />\r
-\r
-                  @if (previousValue != null) {\r
-                    <mat-hint\r
-                      [class.warning]="true"\r
-                      class="filling-form-fields-item-hint"\r
-                    >{{ 'Previously saved value' | translate }}: {{ previousValue }}</mat-hint\r
-                    >\r
-                  }\r
-\r
-                  @if (previousValue != null) {\r
-                    <mat-icon\r
-                      [class.warning]="true"\r
-                      class="filling-form-fields-item-icon"\r
-                      matSuffix\r
-                    >warning_amber</mat-icon\r
-                    >\r
-                  }\r
-\r
-                  <mat-error>{{ (field.label | translate) + ' ' + ('is required' | translate) }}</mat-error>\r
-                </mat-form-field>\r
-              }\r
-            </div>\r
-          }\r
-          @case (types.TextArea) {\r
-            <div class="filling-form-fields-item text-area {{field.class ?? 'span-6'}}">\r
-              @if (field.label) {\r
-                <span class="filling-form-fields-item-label body-1-regular">\r
-                    {{ (field.label | translate) + (field.required ? " *" : "") }}\r
-                  </span>\r
-\r
-                <mat-form-field appearance="outline">\r
-                    <textarea\r
-                      matInput\r
-                      [readonly]="field.readonly"\r
-                      [formControlName]="field.formControlName"\r
-                      (change)="field.onChange && field.onChange(form)"\r
-                    ></textarea>\r
-                </mat-form-field>\r
-              }\r
-            </div>\r
-          }\r
-          @case (types.CheckboxList) {\r
-            <checkbox-list class="{{field.class}}" [formControlName]="field.formControlName" [items]="field.options ?? []"/>\r
-          }\r
-          @case (types.Text) {\r
-            @let label = field.dynamicLabel ? field.dynamicLabel(form, translateFn, prevData()) : field.label;\r
-            @if (label) {\r
-              <p [class.last]="last" class="filling-form-fields-item-text body-1-regular grey" [class]="field.class" [innerHTML]="label" ></p>\r
-            }\r
-          }\r
-        }\r
-      }\r
-    }\r
-  </div>\r
-</section>\r
+          ], template: `@let fields = this.config();
+@let form = this.form();
+
+<section>
+  <div [class.submitted]="isSubmitted()" class="filling-form-fields" [formGroup]="form">
+    @for (field of fields; track field.formControlName + $index; let last = $last) {
+      @if (!field.isVisible || field.isVisible(form)) {
+        @let previousValue = validationConfig()?.[field.formControlName];
+
+        @switch (field.type) {
+          @case (types.Select) {
+            <div class="filling-form-fields-item {{field.class ?? 'span-6'}}">
+              @let label = field.dynamicLabel ? field.dynamicLabel(form, translateFn) : field.label;
+              @if (label) {
+                <span class="filling-form-fields-item-label body-1-regular">
+                    {{ (label | translate) + (field.required ? " *" : "") }}
+                  </span>
+              }
+              <mat-form-field appearance="outline">
+                @let control = form.get(field.formControlName);
+
+                <input
+                  matInput
+                  [formControlName]="field.formControlName"
+                  [matAutocomplete]="autocompleteRef"
+                  (change)="field.onChange && field.onChange(form)"
+                />
+
+                <mat-autocomplete
+                  #autocompleteRef="matAutocomplete"
+                  [displayWith]="getDisplayFn(field)"
+                  (optionSelected)="field.onChange && field.onChange(form)"
+                >
+                  @for (option of getFilteredOptions(field); track option.value) {
+                    <mat-option
+                      class="filing-form-group-select-option"
+                      [value]="option.value"
+                    >
+                      {{ option.label | translate }}
+                    </mat-option>
+                  }
+                  @if (getFilteredOptions(field).length === 0) {
+                    <mat-option disabled>{{ 'No options found' | translate }}</mat-option>
+                  }
+                </mat-autocomplete>
+
+                @if (control?.value && !control?.disabled) {
+                  <div matSuffix class="suffix-container">
+                    <button mat-icon-button (click)="control?.reset(); field.onChange && field.onChange(form)">
+                      <mat-icon>close</mat-icon>
+                    </button>
+
+                    <mat-icon class="arrow-icon">arrow_drop_down</mat-icon>
+                  </div>
+                } @else {
+                  <mat-icon matSuffix>arrow_drop_down</mat-icon>
+                }
+
+                <mat-error>{{ (field.label | translate) + ' ' + ('is required' | translate) }}</mat-error>
+              </mat-form-field>
+            </div>
+          }
+
+          @case (types.Checkbox) {
+            <div [class.last]="last" class="filling-form-fields-checkbox {{field.class ?? 'span-6'}}">
+              <mat-checkbox
+                (change)="field.onChange && field.onChange(form)"
+                [formControlName]="field.formControlName"
+              >
+                @let label = field.dynamicLabel ? field.dynamicLabel(form, translateFn) : field.label;
+                <div>
+                    <span class="body-1-regular black"  [class.warning]="!!previousValue">{{
+                        label | translate
+                      }}</span>
+                  @if (previousValue != null) {
+                    <mat-icon
+                      [class.warning]="true"
+                      class="filling-form-fields-item-icon"
+                      matSuffix
+                    >warning_amber</mat-icon
+                    >
+                  }
+                </div>
+              </mat-checkbox>
+
+              @if (previousValue != null) {
+                <mat-hint
+                  [class.warning]="true"
+                  class="filling-form-fields-item-hint"
+                >{{ 'Previously saved value' | translate }}: {{ previousValue ? ('checked' | translate) : ('unchecked' | translate) }}</mat-hint
+                >
+              }
+            </div>
+          }
+
+          @case (types.Empty) {
+            <div class="filling-form-fields-empty {{field.class ?? 'span-6'}}"></div>
+          }
+          @case (types.Autocomplete) {
+            <div class="filling-form-fields-item {{field.class ?? 'span-6'}}">
+              @if (field.label) {
+                <span class="filling-form-fields-item-label body-1-regular">
+                    {{ (field.label | translate) + (field.required ? " *" : "") }}
+                  </span>
+              }
+              <autocomplete-field
+                [options]="field.options ?? []"
+                [control]="getFormControl(field.formControlName)"
+                [required]="field.required ?? false"
+              />
+            </div>
+          }
+
+          @case (types.Date) {
+            <div
+              class="filling-form-fields-item {{field.class ?? 'span-6'}}"
+              [class.warning]="!!previousValue"
+            >
+              @if (field.label) {
+                <span
+                  class="filling-form-fields-item-label body-1-regular"
+                  [class.warning]="!!previousValue"
+                >
+                    {{ (field.label | translate) + (field.required ? " *" : "") }}
+                  </span>
+              }
+
+              <mat-form-field appearance="outline">
+                <input
+                  matInput
+                  [matDatepicker]="picker"
+                  [formControlName]="field.formControlName"
+                  (dateChange)="field.onChange && field.onChange(form)"
+                />
+                <mat-datepicker-toggle matSuffix [for]="picker">
+                  <mat-icon matDatepickerToggleIcon>calendar_today</mat-icon>
+                </mat-datepicker-toggle>
+                <mat-datepicker #picker></mat-datepicker>
+
+                @if (previousValue != null) {
+                  <mat-hint
+                    [class.warning]="true"
+                    class="filling-form-fields-item-hint"
+                  >
+                    {{ 'Previously saved value' | translate }}: {{ previousValue }}
+                  </mat-hint>
+                }
+
+                <mat-error>{{ (field.label | translate) + ' ' + ('is required' | translate) }}</mat-error>
+              </mat-form-field>
+            </div>
+          }
+
+          @case (types.Input) {
+            <div
+              [class.warning]="!!previousValue"
+              class="filling-form-fields-item {{field.class ?? 'span-6'}}"
+            >
+              @if (field.label) {
+                <span
+                  [class.warning]="!!previousValue"
+                  class="filling-form-fields-item-label body-1-regular"
+                >
+                    {{ (field.label | translate) + (field.required ? " *" : "") }}
+                  </span>
+
+                <mat-form-field appearance="outline">
+                  <input
+                    matInput
+                    [readonly]="field.readonly"
+                    [formControlName]="field.formControlName"
+                    (input)="field.onChange && field.onChange(form)"
+                  />
+
+                  @if (previousValue != null) {
+                    <mat-hint
+                      [class.warning]="true"
+                      class="filling-form-fields-item-hint"
+                    >{{ 'Previously saved value' | translate }}: {{ previousValue }}</mat-hint
+                    >
+                  }
+
+                  @if (previousValue != null) {
+                    <mat-icon
+                      [class.warning]="true"
+                      class="filling-form-fields-item-icon"
+                      matSuffix
+                    >warning_amber</mat-icon
+                    >
+                  }
+
+                  <mat-error>{{ (field.label | translate) + ' ' + ('is required' | translate) }}</mat-error>
+                </mat-form-field>
+              }
+            </div>
+          }
+          @case (types.TextArea) {
+            <div class="filling-form-fields-item text-area {{field.class ?? 'span-6'}}">
+              @if (field.label) {
+                <span class="filling-form-fields-item-label body-1-regular">
+                    {{ (field.label | translate) + (field.required ? " *" : "") }}
+                  </span>
+
+                <mat-form-field appearance="outline">
+                    <textarea
+                      matInput
+                      [readonly]="field.readonly"
+                      [formControlName]="field.formControlName"
+                      (change)="field.onChange && field.onChange(form)"
+                    ></textarea>
+                </mat-form-field>
+              }
+            </div>
+          }
+          @case (types.CheckboxList) {
+            <checkbox-list class="{{field.class}}" [formControlName]="field.formControlName" [items]="field.options ?? []"/>
+          }
+          @case (types.Text) {
+            @let label = field.dynamicLabel ? field.dynamicLabel(form, translateFn, prevData()) : field.label;
+            @if (label) {
+              <p [class.last]="last" class="filling-form-fields-item-text body-1-regular grey" [class]="field.class" [innerHTML]="label" ></p>
+            }
+          }
+        }
+      }
+    }
+  </div>
+</section>
 `, styles: ['/* src/app/components/form/filing-form-group/filing-form-group.component.scss */\n:host {\n  overflow: hidden;\n}\n:host .filling-form-fields {\n  display: grid;\n  grid-template-columns: repeat(12, 1fr);\n  column-gap: 16px;\n}\n:host .filling-form-fields ::ng-deep .mat-mdc-select {\n  display: flex;\n}\n:host .filling-form-fields ::ng-deep .mdc-checkbox__background {\n  border: 3px solid #6a6c6f;\n}\n:host .filling-form-fields ::ng-deep .mat-mdc-select-arrow-wrapper {\n  display: none;\n}\n:host .filling-form-fields ::ng-deep .suffix-container {\n  display: flex;\n  align-items: center;\n  padding-right: 12px;\n}\n:host .filling-form-fields ::ng-deep .mat-mdc-form-field-icon-suffix {\n  display: flex;\n  align-items: center;\n}\n:host .filling-form-fields ::ng-deep .mat-mdc-form-field-icon-suffix .mat-icon {\n  display: flex;\n  align-items: center;\n}\n:host .filling-form-fields ::ng-deep .arrow-icon {\n  pointer-events: none;\n}\n:host .filling-form-fields ::ng-deep .mat-mdc-form-field-infix {\n  display: flex !important;\n  font-size: 14px !important;\n}\n:host .filling-form-fields ::ng-deep .mat-mdc-select-value-text {\n  font-size: 14px !important;\n}\n:host .filling-form-fields ::ng-deep .mat-mdc-select-value {\n  font-size: 14px !important;\n}\n:host .filling-form-fields ::ng-deep .mdc-label {\n  font-size: 14px !important;\n}\n:host .filling-form-fields-checkbox {\n  display: flex;\n  flex-direction: column;\n  justify-content: center;\n  line-height: 2rem;\n}\n:host .filling-form-fields-checkbox:not(.last) {\n  padding-bottom: 16px;\n}\n:host .filling-form-fields-checkbox-text {\n  display: flex;\n  align-items: center;\n  gap: 8px;\n  line-height: 20px;\n  color: var(--filing-modal-color-grey);\n}\n:host .filling-form-fields-empty {\n  width: 100%;\n  height: 80px;\n}\n:host .filling-form-fields-item {\n  --mat-sys-primary: #6b6f76;\n  --mat-sys-primary-container: #e4e5e8;\n  --mat-sys-surface-tint: #6b6f76;\n  --mat-sys-outline: #c7c9cf;\n  --mat-sys-outline-variant: #dfe1e6;\n  --mdc-icon-button-state-layer-size: 36px;\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n:host .filling-form-fields-item.text-area ::ng-deep .mat-mdc-text-field-wrapper {\n  padding: 0 !important;\n}\n:host .filling-form-fields-item.text-area ::ng-deep .mat-mdc-input-element {\n  padding: 0 12px;\n  min-height: 230px !important;\n  max-height: 230px !important;\n}\n:host .filling-form-fields-item-text {\n  font-size: 14px !important;\n}\n:host .filling-form-fields-item-text:not(.last) {\n  padding-bottom: 16px;\n}\n:host .filling-form-fields-item-hint {\n  display: flex;\n  align-items: center;\n  font-size: 12px;\n}\n:host .filling-form-fields-item.warning {\n  --mdc-outlined-text-field-outline-color: #845400;\n  --mdc-outlined-text-field-outline-width: 2px;\n  --mat-sys-on-surface: #845400;\n  color: #845400;\n  padding-bottom: 16px;\n}\n:host .filling-form-fields-item-label {\n  color: var(--filing-modal-color-grey);\n}\n:host .filling-form-fields-item-label.warning {\n  color: #845400;\n}\n:host .filling-form-fields-item-hint.warning {\n  color: #845400;\n}\n:host .filling-form-fields-item-icon {\n  font-size: 22px;\n  line-height: 22px;\n  height: 22px;\n  width: 22px;\n}\n:host .filling-form-fields-item-icon.warning {\n  color: #845400;\n}\n:host .filling-form-fields.submitted ::ng-deep .mat-form-field-invalid {\n  padding: 0 0 12px;\n}\n:host .filling-form-fields.submitted ::ng-deep .mat-form-field-invalid .mdc-notched-outline__leading {\n  border-color: #ff3e3e !important;\n}\n:host .filling-form-fields.submitted ::ng-deep .mat-form-field-invalid .mdc-notched-outline__trailing {\n  border-color: #E22222 !important;\n}\n:host .filling-form-fields.submitted ::ng-deep .mat-form-field-invalid .mat-datepicker-toggle-default-icon {\n  color: #E22222 !important;\n}\n:host .filling-form-fields.submitted ::ng-deep .mat-form-field-invalid .mat-mdc-form-field-error-wrapper {\n  padding: 0;\n}\n:host .filling-form-fields.submitted ::ng-deep .mat-form-field-invalid .mat-mdc-form-field-error {\n  color: #E22222 !important;\n  font-size: 12px;\n  font-family: "Open Sans";\n}\n:host .filling-form-fields.submitted ::ng-deep .mat-form-field-invalid .mat-mdc-select-arrow {\n  color: #E22222 !important;\n}\n:host .filling-form-fields:not(.submitted) ::ng-deep .mat-icon {\n  color: #4a4a4a !important;\n}\n:host .filling-form-fields:not(.submitted) ::ng-deep .mdc-notched-outline__leading {\n  border-color: #d6d6d6 !important;\n}\n:host .filling-form-fields:not(.submitted) ::ng-deep .mdc-notched-outline__trailing {\n  border-color: #d6d6d6 !important;\n}\n:host .filling-form-fields:not(.submitted) ::ng-deep .mat-datepicker-toggle-default-icon {\n  color: #4a4a4a !important;\n}\n:host .filling-form-fields:not(.submitted) ::ng-deep .mat-mdc-form-field-error {\n  display: none;\n}\n:host .filling-form-fields:not(.submitted) ::ng-deep .mat-mdc-select-arrow {\n  color: #d6d6d6 !important;\n}\n:host .filling-form-fields ::ng-deep {\n  --mat-form-field-container-vertical-padding: 6px;\n  --mat-form-field-container-height: 36px;\n}\n:host .filling-form-fields ::ng-deep .mat-mdc-select-value {\n  line-height: 18px;\n}\n:host .filling-form-fields ::ng-deep input,\n:host .filling-form-fields ::ng-deep textarea {\n  font-family: "Open Sans";\n}\n:host .filling-form-fields ::ng-deep .mat-mdc-select-value-text {\n  font-family: "Open Sans";\n}\n:host .filling-form-fields ::ng-deep .mdc-text-field--disabled {\n  background-color: #F5F5F5 !important;\n}\n:host .filling-form-fields ::ng-deep .mdc-notched-outline__leading {\n  border-width: 1px !important;\n  border-color: #d6d6d6 !important;\n  border-top-left-radius: 8px;\n  border-bottom-left-radius: 8px;\n}\n:host .filling-form-fields ::ng-deep .mdc-notched-outline__trailing {\n  border-width: 1px !important;\n  border-color: #d6d6d6 !important;\n  border-top-right-radius: 8px;\n  border-bottom-right-radius: 8px;\n}\n:host .filling-form-fields ::ng-deep .mdc-icon-button .mat-icon {\n  display: flex !important;\n  align-items: center !important;\n  justify-content: center !important;\n}\n:host .span-1 {\n  grid-column: span 1;\n}\n:host .span-2 {\n  grid-column: span 2;\n}\n:host .span-3 {\n  grid-column: span 3;\n}\n:host .span-4 {\n  grid-column: span 4;\n}\n:host .span-5 {\n  grid-column: span 5;\n}\n:host .span-6 {\n  grid-column: span 6;\n}\n:host .span-8 {\n  grid-column: span 8;\n}\n:host .span-12 {\n  grid-column: span 12;\n}\n:host .column-1 {\n  grid-column: 1/span 2;\n}\n:host .column-2 {\n  grid-column: 1/span 4;\n}\n:host .column-3 {\n  grid-column: 1/span 6;\n}\n:host ::ng-deep input {\n  font-size: 14px !important;\n  color: var(--filing-modal-color-grey) !important;\n}\n.filing-form-group-select-option {\n  background: white !important;\n}\n.filing-form-group-select-option ::ng-deep .mat-pseudo-checkbox-checked {\n  background: transparent !important;\n}\n.filing-form-group-select-option ::ng-deep .mdc-list-item__primary-text {\n  font-family: "Open Sans";\n  font-size: 14px !important;\n}\n/*# sourceMappingURL=filing-form-group.component.css.map */\n'] }]
         }], () => [], null);
       })();
@@ -79654,70 +79731,70 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             FilingFormGroupComponent,
             TranslatePipe,
             MatButton
-          ], template: `<div class="terms-and-conditions">\r
-  <div class="terms-and-conditions-content">\r
-    <expandable-card class="terms-and-conditions-card" title="Terms and Conditions">\r
-\r
-      <div class="terms-and-conditions-card-content">\r
-        <div class="terms-and-conditions-text-wrapper">\r
-          <div class="terms-and-conditions-text">\r
-            <span class="body-1-regular">{{ 'TERMS.intro' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.agreement_mandatory' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.clause_i' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.clause_ii' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.authority' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.bound' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_1' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_2' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_3' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_4' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_5' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_6' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_7' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_8' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_9' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_10' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_11' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_12' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_13' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_14' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_15' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_16' | translate }}</span>\r
-            <span class="body-1-regular">{{ 'TERMS.section_17' | translate }}</span>\r
-          </div>\r
-        </div>\r
-\r
-        <mat-checkbox [formControl]="getFormControl(termsAndConditionsControls.AcceptTerms)">\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' | translate }}</span>\r
-          </div>\r
-        </mat-checkbox>\r
-      </div>\r
-\r
-    </expandable-card>\r
-\r
-    <expandable-card title="Signatory">\r
-      <filing-form-group [isSubmitted]="true" [form]="form" [config]="termsAndConditionsFields"/>\r
-    </expandable-card>\r
-  </div>\r
-\r
-  <div class="terms-and-conditions-form-actions">\r
-    <button mat-stroked-button mat-button (click)="close.emit()">\r
-      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
-    </button>\r
-\r
-    <button mat-stroked-button mat-button (click)="prev.emit()"><span class="body-1-semibold">{{ 'Back' | translate }}</span></button>\r
-\r
-    <button\r
-      mat-flat-button\r
-      type="submit"\r
-      (click)="onConfirm()"\r
-      [disabled]="form.invalid"\r
-    >\r
-      <span class="body-1-semibold">{{ 'Proceed' | translate }}</span>\r
-    </button>\r
-  </div>\r
-</div>\r
+          ], template: `<div class="terms-and-conditions">
+  <div class="terms-and-conditions-content">
+    <expandable-card class="terms-and-conditions-card" title="Terms and Conditions">
+
+      <div class="terms-and-conditions-card-content">
+        <div class="terms-and-conditions-text-wrapper">
+          <div class="terms-and-conditions-text">
+            <span class="body-1-regular">{{ 'TERMS.intro' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.agreement_mandatory' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.clause_i' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.clause_ii' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.authority' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.bound' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_1' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_2' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_3' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_4' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_5' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_6' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_7' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_8' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_9' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_10' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_11' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_12' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_13' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_14' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_15' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_16' | translate }}</span>
+            <span class="body-1-regular">{{ 'TERMS.section_17' | translate }}</span>
+          </div>
+        </div>
+
+        <mat-checkbox [formControl]="getFormControl(termsAndConditionsControls.AcceptTerms)">
+          <div class="body-1-regular black">
+            <span>{{ 'I agree to the Terms and Conditions and confirm that all required person(s) and/or entities agree to them' | translate }}</span>
+          </div>
+        </mat-checkbox>
+      </div>
+
+    </expandable-card>
+
+    <expandable-card title="Signatory">
+      <filing-form-group [isSubmitted]="true" [form]="form" [config]="termsAndConditionsFields"/>
+    </expandable-card>
+  </div>
+
+  <div class="terms-and-conditions-form-actions">
+    <button mat-stroked-button mat-button (click)="close.emit()">
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>
+    </button>
+
+    <button mat-stroked-button mat-button (click)="prev.emit()"><span class="body-1-semibold">{{ 'Back' | translate }}</span></button>
+
+    <button
+      mat-flat-button
+      type="submit"
+      (click)="onConfirm()"
+      [disabled]="form.invalid"
+    >
+      <span class="body-1-semibold">{{ 'Proceed' | translate }}</span>
+    </button>
+  </div>
+</div>
 `, styles: ["/* src/app/components/terms-and-conditions/terms-and-conditions.component.scss */\n:host .terms-and-conditions {\n  --mdc-outlined-text-field-outline-color: #e8e8e8;\n  --mat-form-field-filled-with-label-container-padding-top: 12px;\n  --mat-form-field-filled-with-label-container-padding-bottom: 2px;\n  --mat-form-field-container-height: 36px;\n  --mdc-filled-text-field-container-color: transparent;\n  height: 100%;\n  color: #8c8e90;\n}\n:host .terms-and-conditions ::ng-deep .mdc-label {\n  font-size: 14px !important;\n}\n:host .terms-and-conditions-card-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: calc(100% - 25px);\n}\n:host .terms-and-conditions-text-wrapper {\n  border: 1px solid #A1B5C7;\n  border-radius: 8px;\n  overflow: hidden;\n}\n:host .terms-and-conditions-text {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  overflow: auto;\n  max-height: 420px;\n  padding: 8px;\n  color: var(--filing-modal-color-grey);\n}\n:host .terms-and-conditions-form {\n  height: 100%;\n  padding-top: 16px;\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n}\n:host .terms-and-conditions-form-title {\n  color: black;\n  margin: 0;\n}\n:host .terms-and-conditions-form-input {\n  width: 100%;\n}\n:host .terms-and-conditions-form-input::ng-deep .mdc-text-field,\n:host .terms-and-conditions-form-input::ng-deep .mat-mdc-form-field-error-wrapper {\n  padding: 0;\n}\n:host .terms-and-conditions-form-container {\n  display: flex;\n  gap: 16px;\n}\n:host .terms-and-conditions-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .terms-and-conditions-form-actions button {\n  margin: 0;\n}\n:host .terms-and-conditions-content {\n  height: calc(100% - 67px);\n  overflow: auto;\n  display: flex;\n  flex-direction: column;\n  gap: 8px;\n}\n/*# sourceMappingURL=terms-and-conditions.component.css.map */\n"] }]
         }], null, null);
       })();
@@ -79997,83 +80074,83 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 animate("100ms cubic-bezier(0.4, 0.0, 0.2, 1)")
               ])
             ])
-          ], template: `<div class="expandable-card">\r
-  <div\r
-    [class.expanded]="isExpanded()"\r
-    (click)="toggle()"\r
-    class="expandable-card-header"\r
-  >\r
-    <h2 class="expandable-card-header-title">{{ title() | translate }}</h2>\r
-\r
-    <div class="expandable-card-header-container">\r
-      @if (isStatusIcon()) {\r
-        @if (!isValid()) {\r
-          <mat-icon class="expandable-card-header-status-icon">\r
-            error_outline\r
-          </mat-icon>\r
-        }\r
-      }\r
-\r
-      <mat-icon [class.rotated]="!isExpanded()">arrow_forward_ios</mat-icon>\r
-    </div>\r
-  </div>\r
-\r
-  <div class="expandable-card-content" [@expandCollapse]="isExpanded()">\r
-    <ng-content select="[slot='header-content']"></ng-content>\r
-    <div class="expandable-card-actions">\r
-      <div>\r
-        <ng-content select="[slot='subtitle']"></ng-content>\r
-      </div>\r
-\r
-      @if (controlsCount() !== 0) {\r
-        <div class="expandable-card-actions-items">\r
-          <h3 class="expandable-card-actions-item" (click)="expandAll()">\r
-            {{ "Expand all" | translate }}\r
-          </h3>\r
-          <h3 class="expandable-card-actions-separator">|</h3>\r
-          <h3 class="expandable-card-actions-item" (click)="collapseAll()">\r
-            {{ "Collapse all" | translate }}\r
-          </h3>\r
-        </div>\r
-      }\r
-    </div>\r
-\r
-    @for (formGroup of formArray().controls; let i = $index; track formGroup) {\r
-      <div class="expandable-card-separator">\r
-        <div class="expandable-card-separator-line"></div>\r
-      </div>\r
-\r
-      <expandable-card\r
-        [isListItem]="true"\r
-        [title]="getFormGroup(i).get(labelKey())?.value"\r
-        [role]="getFormGroup(i).get(roleKey())?.value"\r
-        [isStatusIcon]="isStatusIcon()"\r
-        [isValid]="getFormGroupValid(i)"\r
-        [isOpen]="isItemExpanded(i)"\r
-        [border]="false"\r
-        [padded]="false"\r
-        [chipType]="\r
-          affiliationTypeToChipType(\r
-            formGroup.get(controls.AffiliationType)?.value\r
-          )\r
-        "\r
-        [removable]="removable()"\r
-        (toggled)="toggleItem(i)"\r
-        (remove)="remove.emit(i)"\r
-      >\r
-        @let form = getFormGroup(i);\r
-        @let configValue =\r
-          fields() ?? config()?.[form.get(configKey())?.value] ?? [];\r
-        <filing-form-group\r
-          [prevData]="prevData()"\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="form"\r
-          [config]="configValue"\r
-        />\r
-      </expandable-card>\r
-    }\r
-  </div>\r
-</div>\r
+          ], template: `<div class="expandable-card">
+  <div
+    [class.expanded]="isExpanded()"
+    (click)="toggle()"
+    class="expandable-card-header"
+  >
+    <h2 class="expandable-card-header-title">{{ title() | translate }}</h2>
+
+    <div class="expandable-card-header-container">
+      @if (isStatusIcon()) {
+        @if (!isValid()) {
+          <mat-icon class="expandable-card-header-status-icon">
+            error_outline
+          </mat-icon>
+        }
+      }
+
+      <mat-icon [class.rotated]="!isExpanded()">arrow_forward_ios</mat-icon>
+    </div>
+  </div>
+
+  <div class="expandable-card-content" [@expandCollapse]="isExpanded()">
+    <ng-content select="[slot='header-content']"></ng-content>
+    <div class="expandable-card-actions">
+      <div>
+        <ng-content select="[slot='subtitle']"></ng-content>
+      </div>
+
+      @if (controlsCount() !== 0) {
+        <div class="expandable-card-actions-items">
+          <h3 class="expandable-card-actions-item" (click)="expandAll()">
+            {{ "Expand all" | translate }}
+          </h3>
+          <h3 class="expandable-card-actions-separator">|</h3>
+          <h3 class="expandable-card-actions-item" (click)="collapseAll()">
+            {{ "Collapse all" | translate }}
+          </h3>
+        </div>
+      }
+    </div>
+
+    @for (formGroup of formArray().controls; let i = $index; track formGroup) {
+      <div class="expandable-card-separator">
+        <div class="expandable-card-separator-line"></div>
+      </div>
+
+      <expandable-card
+        [isListItem]="true"
+        [title]="getFormGroup(i).get(labelKey())?.value"
+        [role]="getFormGroup(i).get(roleKey())?.value"
+        [isStatusIcon]="isStatusIcon()"
+        [isValid]="getFormGroupValid(i)"
+        [isOpen]="isItemExpanded(i)"
+        [border]="false"
+        [padded]="false"
+        [chipType]="
+          affiliationTypeToChipType(
+            formGroup.get(controls.AffiliationType)?.value
+          )
+        "
+        [removable]="removable()"
+        (toggled)="toggleItem(i)"
+        (remove)="remove.emit(i)"
+      >
+        @let form = getFormGroup(i);
+        @let configValue =
+          fields() ?? config()?.[form.get(configKey())?.value] ?? [];
+        <filing-form-group
+          [prevData]="prevData()"
+          [isSubmitted]="isSubmitted()"
+          [form]="form"
+          [config]="configValue"
+        />
+      </expandable-card>
+    }
+  </div>
+</div>
 `, styles: ["/* src/app/components/expandable-list-card/expandable-list-card.component.scss */\n:host .expandable-card {\n  padding: 16px 0;\n  box-shadow:\n    0 1px 2px rgba(0, 0, 0, 0.08),\n    0 2px 4px rgba(0, 0, 0, 0.12),\n    0 0 0 1px rgba(0, 0, 0, 0.04);\n  border-radius: 8px;\n  margin: 1px;\n}\n:host .expandable-card-header {\n  padding: 0 16px;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n  transition: padding-bottom ease-in-out 250ms;\n}\n:host .expandable-card-header.expanded {\n  padding-bottom: 16px;\n}\n:host .expandable-card-header-icon {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n}\n:host .expandable-card-header-title {\n  color: #666666;\n  font-weight: 700;\n  font-size: 14px;\n}\n:host .expandable-card-header-container {\n  display: flex;\n  align-items: center;\n  gap: 16px;\n}\n:host .expandable-card-header-status-icon {\n  font-weight: 400;\n  color: #F1D01E;\n  font-size: 22px;\n  height: 22px;\n  width: 22px;\n}\n:host .expandable-card-header-status-icon.added {\n  color: #44aa00;\n}\n:host .expandable-card-header mat-icon:not(.expandable-card-header-status-icon) {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  transition: transform 100ms cubic-bezier(0.4, 0, 0.2, 1);\n  transform: rotate(-90deg);\n}\n:host .expandable-card-header mat-icon:not(.expandable-card-header-status-icon).rotated {\n  transform: rotate(90deg);\n}\n:host .expandable-card-actions {\n  padding: 0 16px 0 16px;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n}\n:host .expandable-card-actions-items {\n  display: flex;\n  align-items: center;\n  gap: 4px;\n  font-size: 14px;\n}\n:host .expandable-card-actions-separator {\n  padding: 0 2px;\n  color: var(--filing-modal-color-grey);\n  font-size: 14px;\n}\n:host .expandable-card-actions-item {\n  color: var(--filing-modal-color-light-blue);\n  cursor: pointer;\n  font-size: 14px;\n}\n:host .expandable-card-actions-item:hover {\n  text-decoration: underline;\n}\n:host .expandable-card expandable-card {\n  display: block;\n  padding: 0 16px;\n}\n:host .expandable-card-separator {\n  width: 100%;\n  padding: 18px 16px;\n}\n:host .expandable-card-separator-line {\n  background-color: var(--filing-modal-color-grey-mid);\n  height: 1px;\n  width: 100%;\n}\n/*# sourceMappingURL=expandable-list-card.component.css.map */\n"] }]
         }], () => [], null);
       })();
@@ -80192,7 +80269,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(AlertComponent, [{
           type: Component,
-          args: [{ selector: "alert", changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [MatIconModule, TranslatePipe], template: '<div class="alert {{type()}}">\r\n  @switch (type()) {\r\n    @case (alertType.Warning) {\r\n      <mat-icon class="alert-icon">warning</mat-icon>\r\n\r\n    }\r\n    @case (alertType.Info) {\r\n      <mat-icon class="alert-icon">info_outlined</mat-icon>\r\n    }\r\n  }\r\n  <div class="alert-text">\r\n    <span class="alert-text-title">{{title() | translate}}</span>\r\n\r\n    @if (isArray()) {\r\n      <ul class="alert-options">\r\n        @for(option of content(); track option) {\r\n          <li>{{option}}</li>\r\n        }\r\n      </ul>\r\n    }@else {\r\n      <span>{{$any(content()) | translate}}</span>\r\n    }\r\n  </div>\r\n\r\n</div>\r\n', styles: ["/* src/app/components/alert/alert.component.scss */\n:host .alert {\n  display: flex;\n  align-items: center;\n  padding: 12px 10px;\n  border-radius: 12px;\n  gap: 8px;\n  border: 1px solid var(--filing-modal-color-grey);\n}\n:host .alert.warning {\n  border: 1px solid #F1D01E;\n}\n:host .alert.warning .alert-icon {\n  color: #F1D01E;\n  font-size: 20px;\n}\n:host .alert-text {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n  color: var(--filing-modal-color-grey);\n  font-size: 14px;\n}\n:host .alert-text-title {\n  font-weight: 600;\n}\n:host .alert-options {\n  margin: 0;\n  padding: 0 24px;\n}\n/*# sourceMappingURL=alert.component.css.map */\n"] }]
+          args: [{ selector: "alert", changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [MatIconModule, TranslatePipe], template: '<div class="alert {{type()}}">\n  @switch (type()) {\n    @case (alertType.Warning) {\n      <mat-icon class="alert-icon">warning</mat-icon>\n\n    }\n    @case (alertType.Info) {\n      <mat-icon class="alert-icon">info_outlined</mat-icon>\n    }\n  }\n  <div class="alert-text">\n    <span class="alert-text-title">{{title() | translate}}</span>\n\n    @if (isArray()) {\n      <ul class="alert-options">\n        @for(option of content(); track option) {\n          <li>{{option}}</li>\n        }\n      </ul>\n    }@else {\n      <span>{{$any(content()) | translate}}</span>\n    }\n  </div>\n\n</div>\n', styles: ["/* src/app/components/alert/alert.component.scss */\n:host .alert {\n  display: flex;\n  align-items: center;\n  padding: 12px 10px;\n  border-radius: 12px;\n  gap: 8px;\n  border: 1px solid var(--filing-modal-color-grey);\n}\n:host .alert.warning {\n  border: 1px solid #F1D01E;\n}\n:host .alert.warning .alert-icon {\n  color: #F1D01E;\n  font-size: 20px;\n}\n:host .alert-text {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n  color: var(--filing-modal-color-grey);\n  font-size: 14px;\n}\n:host .alert-text-title {\n  font-weight: 600;\n}\n:host .alert-options {\n  margin: 0;\n  padding: 0 24px;\n}\n/*# sourceMappingURL=alert.component.css.map */\n"] }]
         }], null, null);
       })();
       (() => {
@@ -80570,183 +80647,183 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             ExpandableListCardComponent,
             AlertComponent,
             TranslatePipe
-          ], template: `<div class="incorporation-form">\r
-  @if (isNote()) {\r
-    <alert\r
-      [type]="alertType.Info"\r
-      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
-\r
-  @if (errors().length) {\r
-    <alert\r
-      title="The following issues need to be resolved before proceeding:"\r
-      [content]="errors()"\r
-    />\r
-  }\r
-\r
-  <div class="incorporation-form-content">\r
-    @let referenceNumbers = getFormGroup(groups.ReferenceNumbers);\r
-\r
-    @if (referenceNumbers) {\r
-      <expandable-card [title]="groups.ReferenceNumbers">\r
-        <div class="incorporation-form-item">\r
-          <filing-form-group\r
-            [isSubmitted]="isSubmitted()"\r
-            [form]="referenceNumbers"\r
-            [config]="referenceNumbersFields"\r
-            (visiblyValidChange)="onSectionValidChange('refNumbers', $event)"\r
-          />\r
-        </div>\r
-      </expandable-card>\r
-    }\r
-\r
-    @let corporationDetails = getFormGroup(groups.CorporationDetails);\r
-\r
-    @if (corporationDetails) {\r
-      <expandable-card\r
-        [isValid]="sectionValidity['corpDetails']"\r
-        [isStatusIcon]="statusIcon()"\r
-        [title]="groups.CorporationDetails"\r
-      >\r
-        <div class="incorporation-form-item">\r
-          <filing-form-group\r
-            [isSubmitted]="isSubmitted()"\r
-            [form]="corporationDetails"\r
-            [config]="corporationDetailsCardFields"\r
-            (visiblyValidChange)="onSectionValidChange('corpDetails', $event)"\r
-          />\r
-        </div>\r
-      </expandable-card>\r
-    }\r
-\r
-    @if (isLegalOpinion) {\r
-      @let legalOpinion = getFormGroup(groups.LegalOpinion);\r
-\r
-      @if (legalOpinion) {\r
-        <expandable-card\r
-          [isValid]="\r
-            sectionValidity['legalOpinionLawyer'] &&\r
-            sectionValidity['legalOpinionAddress']\r
-          "\r
-          [isStatusIcon]="statusIcon()"\r
-          [title]="groups.LegalOpinion"\r
-        >\r
-          <filing-form-group\r
-            [isSubmitted]="isSubmitted()"\r
-            [form]="legalOpinion"\r
-            [config]="legalOpinionLawyerFields()"\r
-            (visiblyValidChange)="\r
-              onSectionValidChange('legalOpinionLawyer', $event)\r
-            "\r
-          />\r
-\r
-          @if (legalOpinion.get(controls.LawyerSigningOpinion)?.value) {\r
-            <filing-form-group\r
-              [isSubmitted]="isSubmitted()"\r
-              [form]="legalOpinion"\r
-              [config]="legalOpinionConfirmAddressFieldsMap[legalOpinion.get(controls.AffiliationAddressType)?.value]"\r
-              (visiblyValidChange)="\r
-              onSectionValidChange('legalOpinionAddress', $event)\r
-            "\r
-            />\r
-          }\r
-\r
-        </expandable-card>\r
-      }\r
-    }\r
-\r
-    @let registeredOfficeForm = getFormGroup(groups.RegisteredOfficeAddress);\r
-\r
-    @if (registeredOfficeForm) {\r
-      <expandable-card\r
-        [isValid]="sectionValidity['registeredOffice']"\r
-        [isStatusIcon]="statusIcon()"\r
-        [title]="groups.RegisteredOfficeAddress"\r
-      >\r
-        <filing-form-group\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="registeredOfficeForm"\r
-          [config]="\r
-            affiliationCardFieldsMap[\r
-              registeredOfficeForm.get(\r
-                formationFormControls.AffiliationAddressType\r
-              )?.value\r
-            ]\r
-          "\r
-          (visiblyValidChange)="\r
-            onSectionValidChange('registeredOffice', $event)\r
-          "\r
-        />\r
-      </expandable-card>\r
-    }\r
-\r
-    @let incorporatorsArray = getFormArray(groups.Incorporators);\r
-    @let directorsArray = getFormArray(groups.Directors);\r
-\r
-    @let isOpenDirectors =\r
-      (directorsArray?.length ?? 0) <= initiallyOpenCardsCount;\r
-    @if (directorsArray && directorsArray.length) {\r
-      <expandable-list-card\r
-        [isValid]="sectionValidity['directors']"\r
-        [areItemsOpen]="isOpenDirectors"\r
-        [isStatusIcon]="statusIcon()"\r
-        [config]="directorsCardFieldsMap"\r
-        [configKey]="controls.AffiliationAddressType"\r
-        [formArray]="directorsArray"\r
-        [title]="groups.Directors"\r
-        (visiblyValidChange)="onSectionValidChange('directors', $event)"\r
-      >\r
-        <p\r
-          slot="subtitle"\r
-          class="body-1-regular black"\r
-          [innerHTML]="directorsSubtitle()"\r
-        ></p>\r
-      </expandable-list-card>\r
-    } @else {\r
-      <expandable-card [title]="groups.Directors">\r
-        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>\r
-      </expandable-card>\r
-    }\r
-\r
-    @let sharesAndProvisions = getFormGroup(groups.SharesAndProvisions);\r
-\r
-    @if (sharesAndProvisions) {\r
-      <expandable-card\r
-        [isStatusIcon]="false"\r
-        [title]="groups.SharesAndProvisions"\r
-      >\r
-        <filing-form-group\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="sharesAndProvisions"\r
-          [config]="sharesAndProvincesFields"\r
-        />\r
-      </expandable-card>\r
-    }\r
-\r
-    @let isOpenIncorporators =\r
-      (incorporatorsArray?.length ?? 0) <= initiallyOpenCardsCount;\r
-\r
-    @if (incorporatorsArray && incorporatorsArray.length) {\r
-      <expandable-list-card\r
-        [isValid]="sectionValidity['incorporators']"\r
-        [areItemsOpen]="isOpenIncorporators"\r
-        [isStatusIcon]="statusIcon()"\r
-        [config]="incorporatorsCardFieldsMap"\r
-        [configKey]="controls.AffiliationAddressType"\r
-        [formArray]="incorporatorsArray"\r
-        [isSubmitted]="isSubmitted()"\r
-        [title]="groups.Incorporators"\r
-        (visiblyValidChange)="onSectionValidChange('incorporators', $event)"\r
-      />\r
-    } @else {\r
-      <expandable-card [title]="groups.Incorporators">\r
-        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>\r
-      </expandable-card>\r
-    }\r
-  </div>\r
-</div>\r
+          ], template: `<div class="incorporation-form">
+  @if (isNote()) {
+    <alert
+      [type]="alertType.Info"
+      title="Entity changed"
+      content="A new draft needs to be generated as the Entity was changed since the last draft was produced."
+    />
+  }
+
+  @if (errors().length) {
+    <alert
+      title="The following issues need to be resolved before proceeding:"
+      [content]="errors()"
+    />
+  }
+
+  <div class="incorporation-form-content">
+    @let referenceNumbers = getFormGroup(groups.ReferenceNumbers);
+
+    @if (referenceNumbers) {
+      <expandable-card [title]="groups.ReferenceNumbers">
+        <div class="incorporation-form-item">
+          <filing-form-group
+            [isSubmitted]="isSubmitted()"
+            [form]="referenceNumbers"
+            [config]="referenceNumbersFields"
+            (visiblyValidChange)="onSectionValidChange('refNumbers', $event)"
+          />
+        </div>
+      </expandable-card>
+    }
+
+    @let corporationDetails = getFormGroup(groups.CorporationDetails);
+
+    @if (corporationDetails) {
+      <expandable-card
+        [isValid]="sectionValidity['corpDetails']"
+        [isStatusIcon]="statusIcon()"
+        [title]="groups.CorporationDetails"
+      >
+        <div class="incorporation-form-item">
+          <filing-form-group
+            [isSubmitted]="isSubmitted()"
+            [form]="corporationDetails"
+            [config]="corporationDetailsCardFields"
+            (visiblyValidChange)="onSectionValidChange('corpDetails', $event)"
+          />
+        </div>
+      </expandable-card>
+    }
+
+    @if (isLegalOpinion) {
+      @let legalOpinion = getFormGroup(groups.LegalOpinion);
+
+      @if (legalOpinion) {
+        <expandable-card
+          [isValid]="
+            sectionValidity['legalOpinionLawyer'] &&
+            sectionValidity['legalOpinionAddress']
+          "
+          [isStatusIcon]="statusIcon()"
+          [title]="groups.LegalOpinion"
+        >
+          <filing-form-group
+            [isSubmitted]="isSubmitted()"
+            [form]="legalOpinion"
+            [config]="legalOpinionLawyerFields()"
+            (visiblyValidChange)="
+              onSectionValidChange('legalOpinionLawyer', $event)
+            "
+          />
+
+          @if (legalOpinion.get(controls.LawyerSigningOpinion)?.value) {
+            <filing-form-group
+              [isSubmitted]="isSubmitted()"
+              [form]="legalOpinion"
+              [config]="legalOpinionConfirmAddressFieldsMap[legalOpinion.get(controls.AffiliationAddressType)?.value]"
+              (visiblyValidChange)="
+              onSectionValidChange('legalOpinionAddress', $event)
+            "
+            />
+          }
+
+        </expandable-card>
+      }
+    }
+
+    @let registeredOfficeForm = getFormGroup(groups.RegisteredOfficeAddress);
+
+    @if (registeredOfficeForm) {
+      <expandable-card
+        [isValid]="sectionValidity['registeredOffice']"
+        [isStatusIcon]="statusIcon()"
+        [title]="groups.RegisteredOfficeAddress"
+      >
+        <filing-form-group
+          [isSubmitted]="isSubmitted()"
+          [form]="registeredOfficeForm"
+          [config]="
+            affiliationCardFieldsMap[
+              registeredOfficeForm.get(
+                formationFormControls.AffiliationAddressType
+              )?.value
+            ]
+          "
+          (visiblyValidChange)="
+            onSectionValidChange('registeredOffice', $event)
+          "
+        />
+      </expandable-card>
+    }
+
+    @let incorporatorsArray = getFormArray(groups.Incorporators);
+    @let directorsArray = getFormArray(groups.Directors);
+
+    @let isOpenDirectors =
+      (directorsArray?.length ?? 0) <= initiallyOpenCardsCount;
+    @if (directorsArray && directorsArray.length) {
+      <expandable-list-card
+        [isValid]="sectionValidity['directors']"
+        [areItemsOpen]="isOpenDirectors"
+        [isStatusIcon]="statusIcon()"
+        [config]="directorsCardFieldsMap"
+        [configKey]="controls.AffiliationAddressType"
+        [formArray]="directorsArray"
+        [title]="groups.Directors"
+        (visiblyValidChange)="onSectionValidChange('directors', $event)"
+      >
+        <p
+          slot="subtitle"
+          class="body-1-regular black"
+          [innerHTML]="directorsSubtitle()"
+        ></p>
+      </expandable-list-card>
+    } @else {
+      <expandable-card [title]="groups.Directors">
+        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>
+      </expandable-card>
+    }
+
+    @let sharesAndProvisions = getFormGroup(groups.SharesAndProvisions);
+
+    @if (sharesAndProvisions) {
+      <expandable-card
+        [isStatusIcon]="false"
+        [title]="groups.SharesAndProvisions"
+      >
+        <filing-form-group
+          [isSubmitted]="isSubmitted()"
+          [form]="sharesAndProvisions"
+          [config]="sharesAndProvincesFields"
+        />
+      </expandable-card>
+    }
+
+    @let isOpenIncorporators =
+      (incorporatorsArray?.length ?? 0) <= initiallyOpenCardsCount;
+
+    @if (incorporatorsArray && incorporatorsArray.length) {
+      <expandable-list-card
+        [isValid]="sectionValidity['incorporators']"
+        [areItemsOpen]="isOpenIncorporators"
+        [isStatusIcon]="statusIcon()"
+        [config]="incorporatorsCardFieldsMap"
+        [configKey]="controls.AffiliationAddressType"
+        [formArray]="incorporatorsArray"
+        [isSubmitted]="isSubmitted()"
+        [title]="groups.Incorporators"
+        (visiblyValidChange)="onSectionValidChange('incorporators', $event)"
+      />
+    } @else {
+      <expandable-card [title]="groups.Incorporators">
+        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>
+      </expandable-card>
+    }
+  </div>
+</div>
 `, styles: ["/* src/app/components/ontario/incorporation/ontario-incorporation-form/ontario-incorporation-form.component.scss */\n:host {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n:host .incorporation-form {\n  display: flex;\n  height: 100%;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .incorporation-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow: auto;\n  min-height: 0;\n}\n:host .incorporation-form-content-subtitle {\n  color: var(--filing-modal-color-grey);\n  padding-bottom: 8px;\n}\n:host .incorporation-form-subtitle {\n  color: #666666;\n}\n:host .incorporation-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .incorporation-form-item-title {\n  color: var(--filing-modal-color-dark-blue);\n}\n/*# sourceMappingURL=ontario-incorporation-form.component.css.map */\n"] }]
         }], () => [], null);
       })();
@@ -80852,36 +80929,36 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(OntarioIncorporationDeltaFormComponent, [{
           type: Component,
-          args: [{ standalone: true, selector: "ontario-incorporation-delta-form", changeDetection: ChangeDetectionStrategy.OnPush, imports: [MatButton, TranslatePipe, OntarioIncorporationFormComponent], template: `<div class="incorporation-delta-form">\r
-  <ontario-incorporation-form\r
-    class="incorporation-delta-form-content"\r
-    [form]="form()"\r
-    [task]="task()"\r
-    [errors]="combinedErrors()"\r
-    [isNote]="isNote()"\r
-    [isSubmitted]="submitted()"\r
-    [statusIcon]="true"\r
-    (visiblyValidChange)="onVisiblyValidChange($event)"\r
-  />\r
-\r
-  <div class="incorporation-delta-form-actions">\r
-    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
-      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
-    </button>\r
-    <button (click)="save.emit()" [disabled]="actionsDisabled()" mat-stroked-button mat-button>\r
-      <span class="body-1-semibold">{{ 'Save Changes' | translate }}</span>\r
-    </button>\r
-    <button\r
-      class="submit"\r
-      color="primary"\r
-      mat-flat-button\r
-      [disabled]="actionsDisabled()"\r
-      (click)="onValidate()"\r
-    >\r
-      <span class="body-1-semibold">{{ 'Validate & Generate Draft' | translate }}</span>\r
-    </button>\r
-  </div>\r
-</div>\r
+          args: [{ standalone: true, selector: "ontario-incorporation-delta-form", changeDetection: ChangeDetectionStrategy.OnPush, imports: [MatButton, TranslatePipe, OntarioIncorporationFormComponent], template: `<div class="incorporation-delta-form">
+  <ontario-incorporation-form
+    class="incorporation-delta-form-content"
+    [form]="form()"
+    [task]="task()"
+    [errors]="combinedErrors()"
+    [isNote]="isNote()"
+    [isSubmitted]="submitted()"
+    [statusIcon]="true"
+    (visiblyValidChange)="onVisiblyValidChange($event)"
+  />
+
+  <div class="incorporation-delta-form-actions">
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>
+    </button>
+    <button (click)="save.emit()" [disabled]="actionsDisabled()" mat-stroked-button mat-button>
+      <span class="body-1-semibold">{{ 'Save Changes' | translate }}</span>
+    </button>
+    <button
+      class="submit"
+      color="primary"
+      mat-flat-button
+      [disabled]="actionsDisabled()"
+      (click)="onValidate()"
+    >
+      <span class="body-1-semibold">{{ 'Validate & Generate Draft' | translate }}</span>
+    </button>
+  </div>
+</div>
 `, styles: ["/* src/app/components/ontario/incorporation/steps/delta/ontario-incorporation-delta-form.component.scss */\n:host .incorporation-delta-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .incorporation-delta-form-content {\n  flex: 1;\n  min-height: 0;\n}\n:host .incorporation-delta-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .incorporation-delta-form-actions button {\n  margin: 0;\n}\n:host .incorporation-delta-form-actions .submit {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=ontario-incorporation-delta-form.component.css.map */\n"] }]
         }], null, null);
       })();
@@ -80958,29 +81035,29 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatButton,
             TranslatePipe,
             OntarioIncorporationFormComponent
-          ], template: `<div class="incorporation-preview-form">\r
-  <ontario-incorporation-form\r
-    class="incorporation-preview-form-content"\r
-    [form]="form()"\r
-    [task]="task()"\r
-    [statusIcon]="false"\r
-  />\r
-\r
-  <div class="incorporation-preview-form-actions">\r
-    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
-      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
-    </button>\r
-    <button\r
-      class="submit"\r
-      color="primary"\r
-      mat-flat-button\r
-      [disabled]="actionsDisabled()"\r
-      (click)="next.emit()"\r
-    >\r
-      <span class="body-1-semibold">{{ 'File' | translate }}</span>\r
-    </button>\r
-  </div>\r
-</div>\r
+          ], template: `<div class="incorporation-preview-form">
+  <ontario-incorporation-form
+    class="incorporation-preview-form-content"
+    [form]="form()"
+    [task]="task()"
+    [statusIcon]="false"
+  />
+
+  <div class="incorporation-preview-form-actions">
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>
+    </button>
+    <button
+      class="submit"
+      color="primary"
+      mat-flat-button
+      [disabled]="actionsDisabled()"
+      (click)="next.emit()"
+    >
+      <span class="body-1-semibold">{{ 'File' | translate }}</span>
+    </button>
+  </div>
+</div>
 `, styles: ["/* src/app/components/ontario/incorporation/steps/preview/ontario-incorporation-preview-form.component.scss */\n:host .incorporation-preview-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .incorporation-preview-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .incorporation-preview-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .incorporation-preview-form-errors {\n  padding: 0 16px;\n}\n:host .incorporation-preview-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .incorporation-preview-form-actions button {\n  margin: 0;\n}\n/*# sourceMappingURL=ontario-incorporation-preview-form.component.css.map */\n"] }]
         }], null, null);
       })();
@@ -80991,7 +81068,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/constants/initial-return-form.constants.ts
-  var personFullAddressFormField, fullAddressFormField, certifiedByAddressFormField, checkboxFormField, ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, ONTARIO_INITIAL_RETURN_FORM_GENERAL_FIELDS, ONTARIO_INITIAL_RETURN_CARD_FORM_ADDRESS_FIELDS_MAP, generatePersonFields, ONTARIO_INITIAL_RETURN_FORM_DIRECTORS_FIELDS_MAP, ONTARIO_INITIAL_RETURN_FORM_OFFICER_FIELDS_MAP, generateCertifiedByFields, ONTARIO_INITIAL_RETURN_FORM_CERTIFIED_BY_FIELDS_MAP;
+  var personFullAddressFormField, fullAddressFormField, currentNameSelect, certifiedByAddressFormField, checkboxFormField, ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, ONTARIO_INITIAL_RETURN_FORM_GENERAL_FIELDS, ONTARIO_INITIAL_RETURN_CARD_FORM_ADDRESS_FIELDS_MAP, generatePersonFields, generateOntarioInitialReturnFormDirectorsFieldsMap, generateOntarioInitialReturnFormOfficerFieldsMap, generateCertifiedByFields, ONTARIO_INITIAL_RETURN_FORM_CERTIFIED_BY_FIELDS_MAP, generateOntarioInitialReturnFormContactControl;
   var init_initial_return_form_constants = __esm({
     "src/app/constants/initial-return-form.constants.ts"() {
       init_form_enums();
@@ -81010,7 +81087,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           if (!prevValueMap) {
             return baseResult;
           }
-          const key = formValue[IRFormControls.AffiliationName];
+          const key = formValue[IRFormControls.CurrentName];
           const prevValue = prevValueMap.get(key);
           if (!prevValue) {
             return baseResult;
@@ -81046,6 +81123,20 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         },
         class: "span-12"
       };
+      currentNameSelect = (label, options) => ({
+        type: FormType.Select,
+        label,
+        formControlName: IRFormControls.CurrentName,
+        options,
+        isVisible: (form) => {
+          return form.get(IRFormControls.AffiliationType)?.value !== IRAffiliationType.Ceased && (options.length > 0 || form.get(IRFormControls.CurrentName)?.value);
+        },
+        onChange: (form) => {
+          const currentName = form.get(IRFormControls.CurrentName)?.value;
+          form.get(IRFormControls.AffiliationType)?.setValue(currentName ? IRAffiliationType.Update : IRAffiliationType.Add);
+        },
+        class: "span-12"
+      });
       certifiedByAddressFormField = {
         type: FormType.Text,
         label: "",
@@ -81210,7 +81301,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             const prevValueData = prevValue;
             const result = `<span class="body-1-semibold">${t("Primary Activity")}:</span> ${primaryActivity}`;
             if (prevValueData?.primaryActivity) {
-              if (prevValueData.primaryActivity !== primaryActivity) {
+              if (prevValueData.primaryActivity?.toLowerCase() !== primaryActivity?.toLowerCase()) {
                 return result + `<span class="grey-mid"><br/><span class="body-1-semibold">${t("Previous Activity")}:</span> ${prevValueData.primaryActivity}</span>`;
               }
             }
@@ -81294,7 +81385,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             if (!prevValueMap || !isUpdate) {
               return baseEmail ? baseResult : "";
             }
-            const key = formValue[IRFormControls.AffiliationName];
+            const key = formValue[IRFormControls.CurrentName];
             const prevValue = prevValueMap.get(key);
             if (!prevValue) {
               return baseEmail ? baseResult : "";
@@ -81307,18 +81398,18 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           }
         }
       ];
-      ONTARIO_INITIAL_RETURN_FORM_DIRECTORS_FIELDS_MAP = {
-        [AffiliationAddressType.CanadianNoSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, checkboxFormField, personFullAddressFormField]),
-        [AffiliationAddressType.CanadianSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, checkboxFormField, personFullAddressFormField]),
-        [AffiliationAddressType.InternationalNoSuite]: generatePersonFields([checkboxFormField, personFullAddressFormField]),
-        [AffiliationAddressType.InternationalSuite]: generatePersonFields([checkboxFormField, personFullAddressFormField])
-      };
-      ONTARIO_INITIAL_RETURN_FORM_OFFICER_FIELDS_MAP = {
-        [AffiliationAddressType.CanadianNoSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, personFullAddressFormField]),
-        [AffiliationAddressType.CanadianSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, personFullAddressFormField]),
-        [AffiliationAddressType.InternationalNoSuite]: generatePersonFields([personFullAddressFormField]),
-        [AffiliationAddressType.InternationalSuite]: generatePersonFields([personFullAddressFormField])
-      };
+      generateOntarioInitialReturnFormDirectorsFieldsMap = (currentNameOptions) => ({
+        [AffiliationAddressType.CanadianNoSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, checkboxFormField, personFullAddressFormField, currentNameSelect("Existing Director", currentNameOptions)]),
+        [AffiliationAddressType.CanadianSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, checkboxFormField, personFullAddressFormField, currentNameSelect("Existing Director", currentNameOptions)]),
+        [AffiliationAddressType.InternationalNoSuite]: generatePersonFields([checkboxFormField, personFullAddressFormField, currentNameSelect("Existing Director", currentNameOptions)]),
+        [AffiliationAddressType.InternationalSuite]: generatePersonFields([checkboxFormField, personFullAddressFormField, currentNameSelect("Existing Director", currentNameOptions)])
+      });
+      generateOntarioInitialReturnFormOfficerFieldsMap = (currentNameOptions) => ({
+        [AffiliationAddressType.CanadianNoSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, personFullAddressFormField, currentNameSelect("Existing Officer", currentNameOptions)]),
+        [AffiliationAddressType.CanadianSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, personFullAddressFormField, currentNameSelect("Existing Officer", currentNameOptions)]),
+        [AffiliationAddressType.InternationalNoSuite]: generatePersonFields([personFullAddressFormField, currentNameSelect("Existing Officer", currentNameOptions)]),
+        [AffiliationAddressType.InternationalSuite]: generatePersonFields([personFullAddressFormField, currentNameSelect("Existing Officer", currentNameOptions)])
+      });
       generateCertifiedByFields = (fields) => [
         {
           type: FormType.Text,
@@ -81334,6 +81425,36 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         [AffiliationAddressType.InternationalNoSuite]: generateCertifiedByFields([certifiedByAddressFormField]),
         [AffiliationAddressType.InternationalSuite]: generateCertifiedByFields([certifiedByAddressFormField])
       };
+      generateOntarioInitialReturnFormContactControl = (contacts) => {
+        const contactsOptions = contacts.map((contact) => ({
+          label: contact.participant._profile.name ?? "",
+          value: contact._id
+        }));
+        return [
+          {
+            type: FormType.Select,
+            label: "Contact",
+            formControlName: IRFormControls.Contact,
+            required: true,
+            options: contactsOptions,
+            class: "span-12"
+          },
+          {
+            type: FormType.Text,
+            dynamicLabel: (form, t) => {
+              const id = form.get(IRFormControls.Contact)?.value;
+              const contact = contacts.find((item) => item._id === id);
+              const email = contact?.participant?.communications?.find((c) => c.type.toLowerCase().includes("email"))?.value;
+              const phone = contact?.participant?.communications?.find((c) => c.type.toLowerCase().includes("phone"))?.value;
+              return `<span class="body-1-semibold">${t("Contact Details")}:</span> ${getContactDetailsPreview(email, phone, t)}`;
+            },
+            formControlName: "",
+            required: false,
+            isVisible: (form) => form.get(IRFormControls.Contact)?.value,
+            class: "span-12"
+          }
+        ];
+      };
     }
   });
 
@@ -81368,12 +81489,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
-      let tmp_9_0;
+      let tmp_10_0;
       const ctx_r0 = \u0275\u0275nextContext();
       const generalInfoForm_r3 = \u0275\u0275readContextLet(4);
       \u0275\u0275property("title", ctx_r0.groups.General)("isStatusIcon", !ctx_r0.readonly());
       \u0275\u0275advance();
-      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("prevData", (tmp_9_0 = ctx_r0.prevData()) == null ? null : tmp_9_0.corporationInfo)("form", generalInfoForm_r3)("config", ctx_r0.generalCardFields)("label", ctx_r0.groups.General);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("prevData", (tmp_10_0 = ctx_r0.prevData()) == null ? null : tmp_10_0.corporationInfo)("form", generalInfoForm_r3)("config", ctx_r0.generalCardFields)("label", ctx_r0.groups.General);
     }
   }
   function OntarioUpdateMaintainFormComponent_Conditional_7_Template(rf, ctx) {
@@ -81388,13 +81509,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
-      let tmp_9_0;
-      let tmp_12_0;
+      let tmp_10_0;
+      let tmp_13_0;
       const ctx_r0 = \u0275\u0275nextContext();
       const registeredOfficeAddress_r5 = \u0275\u0275readContextLet(6);
       \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.sectionValidity["registeredOffice"])("title", ctx_r0.groups.RegisteredOfficeAddress);
       \u0275\u0275advance();
-      \u0275\u0275property("prevData", (tmp_9_0 = ctx_r0.prevData()) == null ? null : tmp_9_0.corporationInfo)("isSubmitted", ctx_r0.isSubmitted())("form", registeredOfficeAddress_r5)("config", ctx_r0.addressFieldsMap[(tmp_12_0 = registeredOfficeAddress_r5.get(ctx_r0.controls.AffiliationAddressType)) == null ? null : tmp_12_0.value]);
+      \u0275\u0275property("prevData", (tmp_10_0 = ctx_r0.prevData()) == null ? null : tmp_10_0.corporationInfo)("isSubmitted", ctx_r0.isSubmitted())("form", registeredOfficeAddress_r5)("config", ctx_r0.addressFieldsMap[(tmp_13_0 = registeredOfficeAddress_r5.get(ctx_r0.controls.AffiliationAddressType)) == null ? null : tmp_13_0.value]);
     }
   }
   function OntarioUpdateMaintainFormComponent_Conditional_9_Template(rf, ctx) {
@@ -81410,13 +81531,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
-      let tmp_6_0;
       let tmp_7_0;
+      let tmp_8_0;
       const ctx_r0 = \u0275\u0275nextContext();
       const directorsArray_r7 = \u0275\u0275readContextLet(8);
-      const isOpen_r8 = ((tmp_6_0 = directorsArray_r7 == null ? null : directorsArray_r7.length) !== null && tmp_6_0 !== void 0 ? tmp_6_0 : 0) <= ctx_r0.initiallyOpenCardsCount;
+      const isOpen_r8 = ((tmp_7_0 = directorsArray_r7 == null ? null : directorsArray_r7.length) !== null && tmp_7_0 !== void 0 ? tmp_7_0 : 0) <= ctx_r0.initiallyOpenCardsCount;
       \u0275\u0275advance();
-      \u0275\u0275property("prevData", (tmp_7_0 = ctx_r0.prevData()) == null ? null : tmp_7_0.directors)("isSubmitted", ctx_r0.isSubmitted())("isValid", ctx_r0.sectionValidity["directors"])("areItemsOpen", isOpen_r8)("isStatusIcon", !ctx_r0.readonly())("config", ctx_r0.directorsFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", directorsArray_r7)("title", ctx_r0.groups.Directors);
+      \u0275\u0275property("prevData", (tmp_8_0 = ctx_r0.prevData()) == null ? null : tmp_8_0.directors)("isSubmitted", ctx_r0.isSubmitted())("isValid", ctx_r0.sectionValidity["directors"])("areItemsOpen", isOpen_r8)("isStatusIcon", !ctx_r0.readonly())("config", ctx_r0.directorsFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", directorsArray_r7)("title", ctx_r0.groups.Directors);
     }
   }
   function OntarioUpdateMaintainFormComponent_Conditional_10_Template(rf, ctx) {
@@ -81446,13 +81567,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
-      let tmp_6_0;
       let tmp_7_0;
+      let tmp_8_0;
       const ctx_r0 = \u0275\u0275nextContext();
       const officersArray_r10 = \u0275\u0275readContextLet(11);
-      const isOpen_r11 = ((tmp_6_0 = officersArray_r10 == null ? null : officersArray_r10.length) !== null && tmp_6_0 !== void 0 ? tmp_6_0 : 0) <= ctx_r0.initiallyOpenCardsCount;
+      const isOpen_r11 = ((tmp_7_0 = officersArray_r10 == null ? null : officersArray_r10.length) !== null && tmp_7_0 !== void 0 ? tmp_7_0 : 0) <= ctx_r0.initiallyOpenCardsCount;
       \u0275\u0275advance();
-      \u0275\u0275property("prevData", (tmp_7_0 = ctx_r0.prevData()) == null ? null : tmp_7_0.officers)("isSubmitted", ctx_r0.isSubmitted())("areItemsOpen", isOpen_r11)("isStatusIcon", !ctx_r0.readonly())("config", ctx_r0.officersFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", officersArray_r10)("title", ctx_r0.groups.Officers)("isValid", ctx_r0.sectionValidity["officers"]);
+      \u0275\u0275property("prevData", (tmp_8_0 = ctx_r0.prevData()) == null ? null : tmp_8_0.officers)("isSubmitted", ctx_r0.isSubmitted())("areItemsOpen", isOpen_r11)("isStatusIcon", !ctx_r0.readonly())("config", ctx_r0.officersFieldsMap)("configKey", ctx_r0.controls.AffiliationAddressType)("formArray", officersArray_r10)("title", ctx_r0.groups.Officers)("isValid", ctx_r0.sectionValidity["officers"]);
     }
   }
   function OntarioUpdateMaintainFormComponent_Conditional_13_Template(rf, ctx) {
@@ -81481,11 +81602,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
-      let tmp_6_0;
-      let tmp_9_0;
+      let tmp_7_0;
+      let tmp_10_0;
       const ctx_r0 = \u0275\u0275nextContext();
       const certifiedBy_r13 = \u0275\u0275readContextLet(14);
-      \u0275\u0275property("prevData", (tmp_6_0 = ctx_r0.prevData()) == null ? null : tmp_6_0.corporationInfo)("isSubmitted", ctx_r0.isSubmitted())("form", certifiedBy_r13)("config", ctx_r0.certifiedByFieldsMap[(tmp_9_0 = certifiedBy_r13.get(ctx_r0.controls.AffiliationAddressType)) == null ? null : tmp_9_0.value]);
+      \u0275\u0275property("prevData", (tmp_7_0 = ctx_r0.prevData()) == null ? null : tmp_7_0.corporationInfo)("isSubmitted", ctx_r0.isSubmitted())("form", certifiedBy_r13)("config", ctx_r0.certifiedByFieldsMap[(tmp_10_0 = certifiedBy_r13.get(ctx_r0.controls.AffiliationAddressType)) == null ? null : tmp_10_0.value]);
     }
   }
   function OntarioUpdateMaintainFormComponent_Conditional_17_Template(rf, ctx) {
@@ -81500,6 +81621,20 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(2, 1, "Not specified"));
     }
   }
+  function OntarioUpdateMaintainFormComponent_Conditional_19_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275elementStart(0, "expandable-card", 5);
+      \u0275\u0275element(1, "filing-form-group", 15);
+      \u0275\u0275elementEnd();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const contact_r14 = \u0275\u0275readContextLet(18);
+      \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", !contact_r14.invalid)("title", ctx_r0.groups.Contact);
+      \u0275\u0275advance();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", contact_r14)("config", ctx_r0.contactsFields);
+    }
+  }
   var OntarioUpdateMaintainFormComponent;
   var init_update_maintain_form_component = __esm({
     "src/app/components/ontario/update-maintain/update-maintain-form/update-maintain-form.component.ts"() {
@@ -81525,13 +81660,32 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         groups = InitialReturnFillingFormGroups;
         generalCardFields = ONTARIO_INITIAL_RETURN_FORM_GENERAL_FIELDS;
         addressFieldsMap = ONTARIO_INITIAL_RETURN_CARD_FORM_ADDRESS_FIELDS_MAP;
-        directorsFieldsMap = ONTARIO_INITIAL_RETURN_FORM_DIRECTORS_FIELDS_MAP;
-        officersFieldsMap = ONTARIO_INITIAL_RETURN_FORM_OFFICER_FIELDS_MAP;
+        directorsFieldsMap = {};
+        officersFieldsMap = {};
         certifiedByFieldsMap = ONTARIO_INITIAL_RETURN_FORM_CERTIFIED_BY_FIELDS_MAP;
+        contactsFields = [];
         alertType = AlertType;
         controls = InitialReturnFormControls;
         sectionValidity = {};
         initiallyOpenCardsCount = 3;
+        constructor() {
+          effect(() => {
+            const prevData = this.prevData();
+            const directorsKeys = Array.from(prevData?.directors?.keys() ?? []);
+            const directorsOptions = directorsKeys.map((key) => ({ label: key, value: key }));
+            const officersKeys = Array.from(prevData?.officers?.keys() ?? []);
+            const officersOptions = officersKeys.map((key) => ({ label: key, value: key }));
+            this.directorsFieldsMap = generateOntarioInitialReturnFormDirectorsFieldsMap(directorsOptions);
+            this.officersFieldsMap = generateOntarioInitialReturnFormOfficerFieldsMap(officersOptions);
+          });
+          effect(() => {
+            const task = this.task();
+            if (task) {
+              const contacts = task.entity.affiliations.filter((a) => a.role.role_name === "Contact");
+              this.contactsFields = generateOntarioInitialReturnFormContactControl(contacts);
+            }
+          });
+        }
         isVisiblyValid() {
           return Object.values(this.sectionValidity).every((v) => v);
         }
@@ -81548,7 +81702,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function OntarioUpdateMaintainFormComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _OntarioUpdateMaintainFormComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _OntarioUpdateMaintainFormComponent, selectors: [["ontario-update-maintain-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"], prevData: [1, "prevData"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 18, vars: 15, consts: [[1, "ontario-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, "ontario-update-maintain-form-content"], [3, "title", "isStatusIcon"], [3, "isStatusIcon", "isValid", "title"], [3, "prevData", "isSubmitted", "isValid", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title"], [3, "title"], [3, "prevData", "isSubmitted", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title", "isValid"], [3, "prevData", "isSubmitted", "form", "config"], [1, "body-1-regular"], [3, "visiblyValidChange", "isSubmitted", "prevData", "form", "config", "label"], [3, "visiblyValidChange", "prevData", "isSubmitted", "form", "config"], [3, "visiblyValidChange", "prevData", "isSubmitted", "isValid", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title"], [3, "visiblyValidChange", "prevData", "isSubmitted", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title", "isValid"]], template: function OntarioUpdateMaintainFormComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _OntarioUpdateMaintainFormComponent, selectors: [["ontario-update-maintain-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"], prevData: [1, "prevData"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 20, vars: 17, consts: [[1, "ontario-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, "ontario-update-maintain-form-content"], [3, "title", "isStatusIcon"], [3, "isStatusIcon", "isValid", "title"], [3, "prevData", "isSubmitted", "isValid", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title"], [3, "title"], [3, "prevData", "isSubmitted", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title", "isValid"], [3, "prevData", "isSubmitted", "form", "config"], [1, "body-1-regular"], [3, "visiblyValidChange", "isSubmitted", "prevData", "form", "config", "label"], [3, "visiblyValidChange", "prevData", "isSubmitted", "form", "config"], [3, "visiblyValidChange", "prevData", "isSubmitted", "isValid", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title"], [3, "visiblyValidChange", "prevData", "isSubmitted", "areItemsOpen", "isStatusIcon", "config", "configKey", "formArray", "title", "isValid"], [3, "isSubmitted", "form", "config"]], template: function OntarioUpdateMaintainFormComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275elementStart(0, "div", 0);
             \u0275\u0275template(1, OntarioUpdateMaintainFormComponent_Conditional_1_Template, 1, 1, "alert", 1)(2, OntarioUpdateMaintainFormComponent_Conditional_2_Template, 1, 1, "alert", 2);
@@ -81564,7 +81718,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275declareLet(14);
             \u0275\u0275elementStart(15, "expandable-card", 5);
             \u0275\u0275template(16, OntarioUpdateMaintainFormComponent_Conditional_16_Template, 1, 4, "filing-form-group", 9)(17, OntarioUpdateMaintainFormComponent_Conditional_17_Template, 3, 3, "h2", 10);
-            \u0275\u0275elementEnd()()();
+            \u0275\u0275elementEnd();
+            \u0275\u0275declareLet(18);
+            \u0275\u0275template(19, OntarioUpdateMaintainFormComponent_Conditional_19_Template, 2, 6, "expandable-card", 5);
+            \u0275\u0275elementEnd()();
           }
           if (rf & 2) {
             \u0275\u0275advance();
@@ -81572,27 +81729,31 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275advance();
             \u0275\u0275conditional(ctx.errors().length ? 2 : -1);
             \u0275\u0275advance(2);
-            const generalInfoForm_r14 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.General));
+            const generalInfoForm_r15 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.General));
             \u0275\u0275advance();
-            \u0275\u0275conditional(generalInfoForm_r14 ? 5 : -1);
+            \u0275\u0275conditional(generalInfoForm_r15 ? 5 : -1);
             \u0275\u0275advance();
-            const registeredOfficeAddress_r15 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.RegisteredOfficeAddress));
+            const registeredOfficeAddress_r16 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.RegisteredOfficeAddress));
             \u0275\u0275advance();
-            \u0275\u0275conditional(registeredOfficeAddress_r15 ? 7 : -1);
+            \u0275\u0275conditional(registeredOfficeAddress_r16 ? 7 : -1);
             \u0275\u0275advance();
-            const directorsArray_r16 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Directors));
+            const directorsArray_r17 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Directors));
             \u0275\u0275advance();
-            \u0275\u0275conditional(directorsArray_r16 && directorsArray_r16.length ? 9 : 10);
+            \u0275\u0275conditional(directorsArray_r17 && directorsArray_r17.length ? 9 : 10);
             \u0275\u0275advance(2);
-            const officersArray_r17 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Officers));
+            const officersArray_r18 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Officers));
             \u0275\u0275advance();
-            \u0275\u0275conditional(officersArray_r17 && officersArray_r17.length ? 12 : 13);
+            \u0275\u0275conditional(officersArray_r18 && officersArray_r18.length ? 12 : 13);
             \u0275\u0275advance(2);
-            const certifiedBy_r18 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CertifiedBy));
+            const certifiedBy_r19 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CertifiedBy));
             \u0275\u0275advance();
-            \u0275\u0275property("isStatusIcon", !ctx.readonly())("isValid", certifiedBy_r18 ? ctx.sectionValidity["certifiedBy"] : true)("title", ctx.groups.CertifiedBy);
+            \u0275\u0275property("isStatusIcon", !ctx.readonly())("isValid", certifiedBy_r19 ? ctx.sectionValidity["certifiedBy"] : true)("title", ctx.groups.CertifiedBy);
             \u0275\u0275advance();
-            \u0275\u0275conditional(certifiedBy_r18 ? 16 : 17);
+            \u0275\u0275conditional(certifiedBy_r19 ? 16 : 17);
+            \u0275\u0275advance(2);
+            const contact_r20 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.Contact));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(contact_r20 ? 19 : -1);
           }
         }, dependencies: [
           FilingFormGroupComponent,
@@ -81611,143 +81772,158 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             ExpandableCardComponent,
             ExpandableListCardComponent,
             TranslatePipe
-          ], template: `<div class="ontario-update-maintain-form">\r
-  @if (isNote()) {\r
-    <alert\r
-      [type]="alertType.Info"\r
-      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
-\r
-  @if (errors().length) {\r
-    <alert\r
-      title="The following issues need to be resolved before proceeding:"\r
-      [content]="errors()"\r
-    />\r
-  }\r
-\r
-  <div class="ontario-update-maintain-form-content">\r
-    <!-- ===== GENERAL INFO ===== -->\r
-    @let generalInfoForm = getFormGroup(groups.General);\r
-    @if (generalInfoForm) {\r
-      <expandable-card\r
-        [title]="groups.General"\r
-        [isStatusIcon]="!readonly()"\r
-      >\r
-        <filing-form-group\r
-          [isSubmitted]="isSubmitted()"\r
-          [prevData]="prevData()?.corporationInfo"\r
-          [form]="generalInfoForm"\r
-          [config]="generalCardFields"\r
-          [label]="groups.General"\r
-          (visiblyValidChange)="onSectionValidChange('generalInfo', $event)"\r
-        />\r
-      </expandable-card>\r
-    }\r
-\r
-    <!-- =====REGISTERED OFFICE ADDRESS===== -->\r
-    @let registeredOfficeAddress = getFormGroup(groups.RegisteredOfficeAddress);\r
-    @if (registeredOfficeAddress) {\r
-      <expandable-card\r
-        [isStatusIcon]="!readonly()"\r
-        [isValid]="sectionValidity['registeredOffice']"\r
-        [title]="groups.RegisteredOfficeAddress"\r
-      >\r
-        <filing-form-group\r
-          [prevData]="prevData()?.corporationInfo"\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="registeredOfficeAddress"\r
-          [config]="\r
-            addressFieldsMap[\r
-              registeredOfficeAddress.get(controls.AffiliationAddressType)\r
-                ?.value\r
-            ]\r
-          "\r
-          (visiblyValidChange)="\r
-            onSectionValidChange('registeredOffice', $event)\r
-          "\r
-        />\r
-      </expandable-card>\r
-    }\r
-\r
-    @let directorsArray = getFormArray(groups.Directors);\r
-    @if (directorsArray && directorsArray.length) {\r
-      @let isOpen =\r
-        (directorsArray?.length ?? 0) <= initiallyOpenCardsCount;\r
-      <expandable-list-card\r
-        [prevData]="prevData()?.directors"\r
-        [isSubmitted]="isSubmitted()"\r
-        [isValid]="sectionValidity['directors']"\r
-        [areItemsOpen]="isOpen"\r
-        [isStatusIcon]="!readonly()"\r
-        [config]="directorsFieldsMap"\r
-        [configKey]="controls.AffiliationAddressType"\r
-        [formArray]="directorsArray"\r
-        [title]="groups.Directors"\r
-        (visiblyValidChange)="onSectionValidChange('directors', $event)"\r
-      />\r
-    } @else {\r
-      <expandable-card [title]="groups.Directors">\r
-        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>\r
-      </expandable-card>\r
-    }\r
-\r
-    @let officersArray = getFormArray(groups.Officers);\r
-\r
-\r
-    @if (officersArray && officersArray.length) {\r
-      @let isOpen =\r
-        (officersArray?.length ?? 0) <= initiallyOpenCardsCount;\r
-\r
-      <expandable-list-card\r
-        [prevData]="prevData()?.officers"\r
-        [isSubmitted]="isSubmitted()"\r
-        [areItemsOpen]="isOpen"\r
-        [isStatusIcon]="!readonly()"\r
-        [config]="officersFieldsMap"\r
-        [configKey]="controls.AffiliationAddressType"\r
-        [formArray]="officersArray"\r
-        [title]="groups.Officers"\r
-        [isValid]="sectionValidity['officers']"\r
-        (visiblyValidChange)="onSectionValidChange('officers', $event)"\r
-      />\r
-    } @else {\r
-      <expandable-card [title]="groups.Officers">\r
-        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>\r
-      </expandable-card>\r
-    }\r
-\r
-    @let certifiedBy = getFormGroup(groups.CertifiedBy);\r
-    <expandable-card\r
-      [isStatusIcon]="!readonly()"\r
-      [isValid]="certifiedBy ? sectionValidity['certifiedBy'] : true"\r
-      [title]="groups.CertifiedBy"\r
-    >\r
-      @if (certifiedBy) {\r
-        <filing-form-group\r
-          [prevData]="prevData()?.corporationInfo"\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="certifiedBy"\r
-          [config]="\r
-            certifiedByFieldsMap[\r
-              certifiedBy.get(controls.AffiliationAddressType)?.value\r
-            ]\r
-          "\r
-          (visiblyValidChange)="onSectionValidChange('certifiedBy', $event)"\r
-        />\r
-      } @else {\r
-        <h2 class="body-1-regular">{{ 'Not specified' | translate }}</h2>\r
-      }\r
-\r
-    </expandable-card>\r
-  </div>\r
-</div>\r
+          ], template: `<div class="ontario-update-maintain-form">
+  @if (isNote()) {
+    <alert
+      [type]="alertType.Info"
+      title="Entity changed"
+      content="A new draft needs to be generated as the Entity was changed since the last draft was produced."
+    />
+  }
+
+  @if (errors().length) {
+    <alert
+      title="The following issues need to be resolved before proceeding:"
+      [content]="errors()"
+    />
+  }
+
+  <div class="ontario-update-maintain-form-content">
+    <!-- ===== GENERAL INFO ===== -->
+    @let generalInfoForm = getFormGroup(groups.General);
+    @if (generalInfoForm) {
+      <expandable-card
+        [title]="groups.General"
+        [isStatusIcon]="!readonly()"
+      >
+        <filing-form-group
+          [isSubmitted]="isSubmitted()"
+          [prevData]="prevData()?.corporationInfo"
+          [form]="generalInfoForm"
+          [config]="generalCardFields"
+          [label]="groups.General"
+          (visiblyValidChange)="onSectionValidChange('generalInfo', $event)"
+        />
+      </expandable-card>
+    }
+
+    <!-- =====REGISTERED OFFICE ADDRESS===== -->
+    @let registeredOfficeAddress = getFormGroup(groups.RegisteredOfficeAddress);
+    @if (registeredOfficeAddress) {
+      <expandable-card
+        [isStatusIcon]="!readonly()"
+        [isValid]="sectionValidity['registeredOffice']"
+        [title]="groups.RegisteredOfficeAddress"
+      >
+        <filing-form-group
+          [prevData]="prevData()?.corporationInfo"
+          [isSubmitted]="isSubmitted()"
+          [form]="registeredOfficeAddress"
+          [config]="
+            addressFieldsMap[
+              registeredOfficeAddress.get(controls.AffiliationAddressType)
+                ?.value
+            ]
+          "
+          (visiblyValidChange)="
+            onSectionValidChange('registeredOffice', $event)
+          "
+        />
+      </expandable-card>
+    }
+
+    @let directorsArray = getFormArray(groups.Directors);
+    @if (directorsArray && directorsArray.length) {
+      @let isOpen =
+        (directorsArray?.length ?? 0) <= initiallyOpenCardsCount;
+      <expandable-list-card
+        [prevData]="prevData()?.directors"
+        [isSubmitted]="isSubmitted()"
+        [isValid]="sectionValidity['directors']"
+        [areItemsOpen]="isOpen"
+        [isStatusIcon]="!readonly()"
+        [config]="directorsFieldsMap"
+        [configKey]="controls.AffiliationAddressType"
+        [formArray]="directorsArray"
+        [title]="groups.Directors"
+        (visiblyValidChange)="onSectionValidChange('directors', $event)"
+      />
+    } @else {
+      <expandable-card [title]="groups.Directors">
+        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>
+      </expandable-card>
+    }
+
+    @let officersArray = getFormArray(groups.Officers);
+
+
+    @if (officersArray && officersArray.length) {
+      @let isOpen =
+        (officersArray?.length ?? 0) <= initiallyOpenCardsCount;
+
+      <expandable-list-card
+        [prevData]="prevData()?.officers"
+        [isSubmitted]="isSubmitted()"
+        [areItemsOpen]="isOpen"
+        [isStatusIcon]="!readonly()"
+        [config]="officersFieldsMap"
+        [configKey]="controls.AffiliationAddressType"
+        [formArray]="officersArray"
+        [title]="groups.Officers"
+        [isValid]="sectionValidity['officers']"
+        (visiblyValidChange)="onSectionValidChange('officers', $event)"
+      />
+    } @else {
+      <expandable-card [title]="groups.Officers">
+        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>
+      </expandable-card>
+    }
+
+    @let certifiedBy = getFormGroup(groups.CertifiedBy);
+    <expandable-card
+      [isStatusIcon]="!readonly()"
+      [isValid]="certifiedBy ? sectionValidity['certifiedBy'] : true"
+      [title]="groups.CertifiedBy"
+    >
+      @if (certifiedBy) {
+        <filing-form-group
+          [prevData]="prevData()?.corporationInfo"
+          [isSubmitted]="isSubmitted()"
+          [form]="certifiedBy"
+          [config]="
+            certifiedByFieldsMap[
+              certifiedBy.get(controls.AffiliationAddressType)?.value
+            ]
+          "
+          (visiblyValidChange)="onSectionValidChange('certifiedBy', $event)"
+        />
+      } @else {
+        <h2 class="body-1-regular">{{ 'Not specified' | translate }}</h2>
+      }
+
+    </expandable-card>
+
+    @let contact = getFormGroup(groups.Contact);
+    @if (contact) {
+      <expandable-card
+        [isStatusIcon]="!readonly()"
+        [isValid]="!contact.invalid"
+        [title]="groups.Contact"
+      >
+        <filing-form-group
+          [isSubmitted]="isSubmitted()"
+          [form]="contact"
+          [config]="contactsFields"
+        />
+      </expandable-card>
+    }
+  </div>
+</div>
 `, styles: ["/* src/app/components/ontario/update-maintain/update-maintain-form/update-maintain-form.component.scss */\n:host .ontario-update-maintain-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  overflow-y: auto;\n}\n:host .ontario-update-maintain-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .ontario-update-maintain-form-section {\n  display: flex;\n  flex-direction: column;\n  gap: 12px;\n}\n:host .ontario-update-maintain-form-section-title {\n  font-size: 14px;\n  font-weight: 600;\n  color: var(--filing-modal-color-dark-blue, #1a2e5a);\n  margin: 0;\n  padding-bottom: 8px;\n  border-bottom: 1px solid var(--color-border, #e0e0e0);\n}\n:host .ontario-update-maintain-form-principal {\n  padding: 12px 0;\n  border-bottom: 1px solid var(--color-border, #e0e0e0);\n}\n:host .ontario-update-maintain-form-principal:last-child {\n  border-bottom: none;\n}\n/*# sourceMappingURL=update-maintain-form.component.css.map */\n"] }]
-        }], null, null);
+        }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(OntarioUpdateMaintainFormComponent, { className: "OntarioUpdateMaintainFormComponent", filePath: "src/app/components/ontario/update-maintain/update-maintain-form/update-maintain-form.component.ts", lineNumber: 41 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(OntarioUpdateMaintainFormComponent, { className: "OntarioUpdateMaintainFormComponent", filePath: "src/app/components/ontario/update-maintain/update-maintain-form/update-maintain-form.component.ts", lineNumber: 43 });
       })();
     }
   });
@@ -81857,38 +82033,38 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatButton,
             TranslatePipe,
             OntarioUpdateMaintainFormComponent
-          ], template: `<div class="ontario-update-maintain-delta-form">\r
-  <ontario-update-maintain-form\r
-    class="ontario-update-maintain-delta-form-content"\r
-    [form]="form()"\r
-    [task]="task()"\r
-    [errors]="combinedErrors()"\r
-    [isNote]="isNote()"\r
-    [isSubmitted]="submitted()"\r
-    [readonly]="false"\r
-    [prevData]="prevData()"\r
-    (visiblyValidChange)="onVisiblyValidChange($event)"\r
-  />\r
-\r
-  <div class="ontario-update-maintain-delta-form-actions">\r
-    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
-      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
-    </button>\r
-    <button (click)="save.emit()" [disabled]="actionsDisabled()" mat-stroked-button mat-button>\r
-      <span class="body-1-semibold">{{ 'Save Changes' | translate }}</span>\r
-    </button>\r
-    <button\r
-      class="submit"\r
-      color="primary"\r
-      mat-flat-button\r
-      [disabled]="actionsDisabled()"\r
-      (click)="onValidate()"\r
-    >\r
-      <span class="body-1-semibold">{{ 'Validate & Generate Draft' | translate }}</span>\r
-    </button>\r
-  </div>\r
-</div>\r
-\r
+          ], template: `<div class="ontario-update-maintain-delta-form">
+  <ontario-update-maintain-form
+    class="ontario-update-maintain-delta-form-content"
+    [form]="form()"
+    [task]="task()"
+    [errors]="combinedErrors()"
+    [isNote]="isNote()"
+    [isSubmitted]="submitted()"
+    [readonly]="false"
+    [prevData]="prevData()"
+    (visiblyValidChange)="onVisiblyValidChange($event)"
+  />
+
+  <div class="ontario-update-maintain-delta-form-actions">
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>
+    </button>
+    <button (click)="save.emit()" [disabled]="actionsDisabled()" mat-stroked-button mat-button>
+      <span class="body-1-semibold">{{ 'Save Changes' | translate }}</span>
+    </button>
+    <button
+      class="submit"
+      color="primary"
+      mat-flat-button
+      [disabled]="actionsDisabled()"
+      (click)="onValidate()"
+    >
+      <span class="body-1-semibold">{{ 'Validate & Generate Draft' | translate }}</span>
+    </button>
+  </div>
+</div>
+
 `, styles: ["/* src/app/components/ontario/update-maintain/steps/delta/update-maintain-delta-form.component.scss */\n:host .ontario-update-maintain-delta-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .ontario-update-maintain-delta-form-content {\n  flex: 1;\n  min-height: 0;\n}\n:host .ontario-update-maintain-delta-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .ontario-update-maintain-delta-form-actions button {\n  margin: 0;\n}\n:host .ontario-update-maintain-delta-form-actions .submit {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=update-maintain-delta-form.component.css.map */\n"] }]
         }], null, null);
       })();
@@ -81963,32 +82139,32 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatButton,
             OntarioUpdateMaintainFormComponent,
             TranslatePipe
-          ], template: `<div class="ontario-update-maintain-preview-form">\r
-  <ontario-update-maintain-form\r
-    class="ontario-update-maintain-preview-form-content"\r
-    [form]="form()"\r
-    [task]="task()"\r
-    [errors]="errors()"\r
-    [isSubmitted]="false"\r
-    [readonly]="false"\r
-  />\r
-\r
-  <div class="ontario-update-maintain-preview-form-actions">\r
-    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
-      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
-    </button>\r
-    <button\r
-      class="submit"\r
-      color="primary"\r
-      mat-flat-button\r
-      [disabled]="actionsDisabled()"\r
-      (click)="file.emit()"\r
-    >\r
-      <span class="body-1-semibold">{{ 'File' | translate }}</span>\r
-    </button>\r
-  </div>\r
-</div>\r
-\r
+          ], template: `<div class="ontario-update-maintain-preview-form">
+  <ontario-update-maintain-form
+    class="ontario-update-maintain-preview-form-content"
+    [form]="form()"
+    [task]="task()"
+    [errors]="errors()"
+    [isSubmitted]="false"
+    [readonly]="false"
+  />
+
+  <div class="ontario-update-maintain-preview-form-actions">
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>
+    </button>
+    <button
+      class="submit"
+      color="primary"
+      mat-flat-button
+      [disabled]="actionsDisabled()"
+      (click)="file.emit()"
+    >
+      <span class="body-1-semibold">{{ 'File' | translate }}</span>
+    </button>
+  </div>
+</div>
+
 `, styles: ["/* src/app/components/ontario/update-maintain/steps/preview/update-maintain-preview-form.component.scss */\n:host .ontario-update-maintain-preview-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .ontario-update-maintain-preview-form-content {\n  flex: 1;\n  min-height: 0;\n}\n:host .ontario-update-maintain-preview-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .ontario-update-maintain-preview-form-actions button {\n  margin: 0;\n}\n:host .ontario-update-maintain-preview-form-actions .submit {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=update-maintain-preview-form.component.css.map */\n"] }]
         }], null, null);
       })();
@@ -82209,7 +82385,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.formationInitialDeltaValue.set(this.generateFormationDeltaData());
             }
             if (task && isUpdateMaintain(task)) {
-              const fieldsConfig = OntarioUpdateMaintainFormHelper.generateInitialForm(task);
+              const fieldsConfig = OntarioUpdateMaintainFormHelper.generateInitialForm(task, this.prevData());
               this.deltaForm.set(new FormGroup(fieldsConfig));
               this.initialReturnInitialDeltaValue.set(this.generateInitialReturnDeltaData());
             }
@@ -82226,13 +82402,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               }
             }
             if (task && isUpdateMaintain(task) && deltaData) {
-              const fieldsConfig = OntarioUpdateMaintainFormHelper.generateInitialForm(task);
+              const fieldsConfig = OntarioUpdateMaintainFormHelper.generateInitialForm(task, this.prevData());
               const form = new FormGroup(fieldsConfig);
               form.disable();
               this.previewForm.set(form);
-              if (untracked2(() => this.activeStep()) === Step.Validate) {
-                this.nextStep.emit();
-              }
             }
           });
         }
@@ -82263,42 +82436,90 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         onIrSubmit(termsAndConditions) {
           this.irSubmit.emit();
         }
+        isInternationalAddress(src, addressTypeControl, countryCodeControl) {
+          const addressType = src?.[addressTypeControl];
+          if (addressType === AffiliationAddressType.InternationalNoSuite || addressType === AffiliationAddressType.InternationalSuite) {
+            return true;
+          }
+          const countryCode = (src?.[countryCodeControl] ?? "").toString().toUpperCase();
+          return Boolean(countryCode) && !["CA", "US"].includes(countryCode);
+        }
+        mapAddressDelta(src, controls) {
+          if (this.isInternationalAddress(src, controls.addressType, controls.countryCode)) {
+            return {
+              unitType: null,
+              unitNumber: null,
+              streetNumber: null,
+              streetName: null,
+              streetType: null,
+              streetDirection: null
+            };
+          }
+          return {
+            unitType: src?.[controls.unitType] ?? null,
+            unitNumber: src?.[controls.unitNumber] ?? null,
+            streetNumber: src?.[controls.streetNumber] ?? null,
+            streetName: src?.[controls.streetName] ?? null,
+            streetType: src?.[controls.streetType] ?? null,
+            streetDirection: src?.[controls.streetDirection] ?? null
+          };
+        }
+        mapIRAddressDelta(src) {
+          return this.mapAddressDelta(src, {
+            unitType: IRFormControls.UnitType,
+            unitNumber: IRFormControls.UnitNumber,
+            streetNumber: IRFormControls.StreetNumber,
+            streetName: IRFormControls.StreetName,
+            streetType: IRFormControls.StreetType,
+            streetDirection: IRFormControls.StreetDirection,
+            addressType: IRFormControls.AffiliationAddressType,
+            countryCode: IRFormControls.CountryCode
+          });
+        }
+        mapFormationAddressDelta(src) {
+          return this.mapAddressDelta(src, {
+            unitType: FormationFormControls.UnitType,
+            unitNumber: FormationFormControls.UnitNumber,
+            streetNumber: FormationFormControls.StreetNumber,
+            streetName: FormationFormControls.StreetName,
+            streetType: FormationFormControls.StreetType,
+            streetDirection: FormationFormControls.StreetDirection,
+            addressType: FormationFormControls.AffiliationAddressType,
+            countryCode: FormationFormControls.CountryCode
+          });
+        }
         generateInitialReturnDeltaData() {
           const formData = this.deltaForm().getRawValue();
           const generalInfo = formData[InitialReturnFillingFormGroups.General];
           const registeredOffice = formData[InitialReturnFillingFormGroups.RegisteredOfficeAddress];
           const certifiedBy = formData[InitialReturnFillingFormGroups.CertifiedBy];
-          const mapAddress3 = (src) => ({
-            unitType: src?.[IRFormControls.UnitType] ?? null,
-            unitNumber: src?.[IRFormControls.UnitNumber] ?? null,
-            streetNumber: src?.[IRFormControls.StreetNumber] ?? null,
-            streetName: src?.[IRFormControls.StreetName] ?? null,
-            streetType: src?.[IRFormControls.StreetType] ?? null,
-            streetDirection: src?.[IRFormControls.StreetDirection] ?? null
-          });
+          const contact = formData[InitialReturnFillingFormGroups.Contact];
           const mapPersons = (items) => (items ?? []).reduce((acc, item) => {
             const id = item[IRFormControls.ID];
             if (id) {
               acc[id] = {
-                address: mapAddress3(item),
+                address: this.mapIRAddressDelta(item),
+                currentName: item[IRFormControls.CurrentName] ?? "",
                 residentCanadian: item[IRFormControls.IsCanadianResident] ?? false
               };
             }
             return acc;
           }, {});
-          return __spreadValues({
+          return __spreadProps(__spreadValues({
             referenceNumbers: {
               referenceNumber: generalInfo?.[IRFormControls.ClientMatterNumber] ?? null,
               docketNumber: generalInfo?.[IRFormControls.Docket] ?? null
             },
-            registeredOfficeAddress: mapAddress3(registeredOffice),
+            registeredOfficeAddress: this.mapIRAddressDelta(registeredOffice),
             directors: mapPersons(formData[InitialReturnFillingFormGroups.Directors]),
             officers: mapPersons(formData[InitialReturnFillingFormGroups.Officers])
           }, certifiedBy ? {
             certifiedBy: {
-              address: mapAddress3(certifiedBy)
+              address: this.mapIRAddressDelta(certifiedBy)
             }
-          } : {});
+          } : {}), {
+            contactUid: contact?.[IRFormControls.Contact] ?? null
+          });
         }
         generateFormationDeltaData(termsAndConditions) {
           const formData = this.deltaForm().getRawValue();
@@ -82322,26 +82543,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               nuansReportFrenchReferenceNumber: corpDetails?.[FormationFormControls.NuansReportReferenceFr] ?? null,
               nuansReportFrenchReferenceDate: corpDetails?.[FormationFormControls.NuansReportDateFr] ?? null
             },
-            registeredOfficeAddress: {
-              unitType: registeredOffice?.[FormationFormControls.UnitType] ?? null,
-              unitNumber: registeredOffice?.[FormationFormControls.UnitNumber] ?? null,
-              streetNumber: registeredOffice?.[FormationFormControls.StreetNumber] ?? null,
-              streetName: registeredOffice?.[FormationFormControls.StreetName] ?? null,
-              streetType: registeredOffice?.[FormationFormControls.StreetType] ?? null,
-              streetDirection: registeredOffice?.[FormationFormControls.StreetDirection] ?? null
-            },
+            registeredOfficeAddress: this.mapFormationAddressDelta(registeredOffice),
             directors: (formData[FormationFormGroups.Directors] ?? []).reduce((acc, d) => {
               const id = d[FormationFormControls.Id];
               if (id) {
                 acc[id] = {
-                  address: {
-                    unitType: d[FormationFormControls.UnitType] ?? null,
-                    unitNumber: d[FormationFormControls.UnitNumber] ?? null,
-                    streetNumber: d[FormationFormControls.StreetNumber] ?? null,
-                    streetName: d[FormationFormControls.StreetName] ?? null,
-                    streetType: d[FormationFormControls.StreetType] ?? null,
-                    streetDirection: d[FormationFormControls.StreetDirection] ?? null
-                  },
+                  address: this.mapFormationAddressDelta(d),
                   residentCanadian: d[FormationFormControls.IsResident] ?? false
                 };
               }
@@ -82351,14 +82558,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               const id = inc[FormationFormControls.Id];
               if (id) {
                 acc[id] = {
-                  address: {
-                    unitType: inc[FormationFormControls.UnitType] ?? null,
-                    unitNumber: inc[FormationFormControls.UnitNumber] ?? null,
-                    streetNumber: inc[FormationFormControls.StreetNumber] ?? null,
-                    streetName: inc[FormationFormControls.StreetName] ?? null,
-                    streetType: inc[FormationFormControls.StreetType] ?? null,
-                    streetDirection: inc[FormationFormControls.StreetDirection] ?? null
-                  },
+                  address: this.mapFormationAddressDelta(inc),
                   residentCanadian: inc[FormationFormControls.IsResident] ?? false
                 };
               }
@@ -82369,14 +82569,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             data.legalOpinion = {
               wasLegalOpinionObtained: corpDetails?.[FormationFormControls.wasLegalOpinionObtained] ?? false,
               lawyerSigning: legalOpinionData?.[FormationFormControls.LawyerSigningOpinion] ?? null,
-              address: {
-                unitType: legalOpinionData?.[FormationFormControls.UnitType] ?? null,
-                unitNumber: legalOpinionData?.[FormationFormControls.UnitNumber] ?? null,
-                streetNumber: legalOpinionData?.[FormationFormControls.StreetNumber] ?? null,
-                streetName: legalOpinionData?.[FormationFormControls.StreetName] ?? null,
-                streetType: legalOpinionData?.[FormationFormControls.StreetType] ?? null,
-                streetDirection: legalOpinionData?.[FormationFormControls.StreetDirection] ?? null
-              }
+              address: this.mapFormationAddressDelta(legalOpinionData)
             };
           }
           if (termsAndConditions) {
@@ -82441,7 +82634,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             OntarioIncorporationDeltaFormComponent,
             OntarioIncorporationPreviewFormComponent,
             TermsAndConditionsComponent
-          ], template: '@let taskData = this.task();\r\n\r\n@if (isFormationTask(taskData)) {\r\n  @if (activeStep() === steps.Validate) {\r\n    <ontario-incorporation-delta-form\r\n      [task]="taskData"\r\n      [errors]="errors()"\r\n      [isNote]="isNote()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [form]="deltaForm()"\r\n      (validate)="onFormationValidate()"\r\n      (close)="onClose()"\r\n      (save)="onFormationSave()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.FilingPreview) {\r\n    <ontario-incorporation-preview-form\r\n      [task]="taskData"\r\n      [form]="previewForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      (next)="nextStep.emit()"\r\n      (close)="close.emit()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.TermsAndConditions) {\r\n    <terms-and-conditions\r\n      (prev)="prevStep.emit()"\r\n      (close)="close.emit()"\r\n      (confirm)="onFormationSubmit($event)"\r\n    />\r\n  }\r\n}\r\n\r\n@if (isInitialReturnTask(task())) {\r\n  @if (activeStep() === steps.Validate) {\r\n    <ontario-update-maintain-delta-form\r\n      [task]="$any(task())"\r\n      [form]="deltaForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [prevData]="prevData()"\r\n      [errors]="errors()"\r\n      [isNote]="isNote()"\r\n      (validate)="onInitialReturnValidate()"\r\n      (close)="onClose()"\r\n      (save)="onInitialReturnSave()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.FilingPreview) {\r\n    <ontario-update-maintain-preview-form\r\n      [task]="$any(task())"\r\n      [form]="previewForm()"\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)="prevStep.emit()"\r\n      (close)="close.emit()"\r\n      (confirm)="onIrSubmit($event)"\r\n    />\r\n  }\r\n}\r\n', styles: ["/* src/app/components/ontario/ontario.component.scss */\n:host {\n  display: contents;\n}\n/*# sourceMappingURL=ontario.component.css.map */\n"] }]
+          ], template: '@let taskData = this.task();\n\n@if (isFormationTask(taskData)) {\n  @if (activeStep() === steps.Validate) {\n    <ontario-incorporation-delta-form\n      [task]="taskData"\n      [errors]="errors()"\n      [isNote]="isNote()"\n      [actionsDisabled]="actionsDisabled()"\n      [form]="deltaForm()"\n      (validate)="onFormationValidate()"\n      (close)="onClose()"\n      (save)="onFormationSave()"\n    />\n  }\n\n  @if (activeStep() === steps.FilingPreview) {\n    <ontario-incorporation-preview-form\n      [task]="taskData"\n      [form]="previewForm()"\n      [actionsDisabled]="actionsDisabled()"\n      (next)="nextStep.emit()"\n      (close)="close.emit()"\n    />\n  }\n\n  @if (activeStep() === steps.TermsAndConditions) {\n    <terms-and-conditions\n      (prev)="prevStep.emit()"\n      (close)="close.emit()"\n      (confirm)="onFormationSubmit($event)"\n    />\n  }\n}\n\n@if (isInitialReturnTask(task())) {\n  @if (activeStep() === steps.Validate) {\n    <ontario-update-maintain-delta-form\n      [task]="$any(task())"\n      [form]="deltaForm()"\n      [actionsDisabled]="actionsDisabled()"\n      [prevData]="prevData()"\n      [errors]="errors()"\n      [isNote]="isNote()"\n      (validate)="onInitialReturnValidate()"\n      (close)="onClose()"\n      (save)="onInitialReturnSave()"\n    />\n  }\n\n  @if (activeStep() === steps.FilingPreview) {\n    <ontario-update-maintain-preview-form\n      [task]="$any(task())"\n      [form]="previewForm()"\n      [actionsDisabled]="actionsDisabled()"\n      [errors]="errors()"\n      (close)="close.emit()"\n      (file)="nextStep.emit()"\n    />\n  }\n\n  @if (activeStep() === steps.TermsAndConditions) {\n    <terms-and-conditions\n      (prev)="prevStep.emit()"\n      (close)="close.emit()"\n      (confirm)="onIrSubmit($event)"\n    />\n  }\n}\n', styles: ["/* src/app/components/ontario/ontario.component.scss */\n:host {\n  display: contents;\n}\n/*# sourceMappingURL=ontario.component.css.map */\n"] }]
         }], () => [], null);
       })();
       (() => {
@@ -83546,39 +83739,39 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(SelectModalComponent, [{
           type: Component,
-          args: [{ standalone: true, selector: "add-documents-modal", changeDetection: ChangeDetectionStrategy.OnPush, imports: [MatButtonModule, MatDialogModule, MatIconModule, TranslatePipe, MatCheckbox], template: `<div class="add-documents-modal">\r
-  <div class="add-documents-modal-header">\r
-    <h2 class="grey">{{ dialogData.title | translate }}</h2>\r
-  </div>\r
-\r
-  <div class="add-documents-modal-list">\r
-    @for (doc of dialogData.items; track doc) {\r
-      <div (click)="toggleDocument(doc)" class="add-documents-modal-list-item">\r
-        <mat-checkbox [checked]="isSelected(doc)"/>\r
-        <span class="body-1-regular">{{ doc }}</span>\r
-      </div>\r
-    }\r
-  </div>\r
-\r
-  <div class="add-documents-modal-actions">\r
-    <button\r
-      mat-stroked-button mat-button\r
-      (click)="closeModal()"\r
-    >\r
-      <span class="body-1-semibold">{{ 'Cancel' | translate }}</span>\r
-    </button>\r
-\r
-    <button\r
-      class="submit"\r
-      mat-flat-button\r
-      [disabled]="!hasSelection()"\r
-      (click)="addSelectedDocuments()"\r
-    >\r
-      <span class="body-1-semibold">{{ dialogData.submitButton | translate }}</span>\r
-    </button>\r
-  </div>\r
-\r
-</div>\r
+          args: [{ standalone: true, selector: "add-documents-modal", changeDetection: ChangeDetectionStrategy.OnPush, imports: [MatButtonModule, MatDialogModule, MatIconModule, TranslatePipe, MatCheckbox], template: `<div class="add-documents-modal">
+  <div class="add-documents-modal-header">
+    <h2 class="grey">{{ dialogData.title | translate }}</h2>
+  </div>
+
+  <div class="add-documents-modal-list">
+    @for (doc of dialogData.items; track doc) {
+      <div (click)="toggleDocument(doc)" class="add-documents-modal-list-item">
+        <mat-checkbox [checked]="isSelected(doc)"/>
+        <span class="body-1-regular">{{ doc }}</span>
+      </div>
+    }
+  </div>
+
+  <div class="add-documents-modal-actions">
+    <button
+      mat-stroked-button mat-button
+      (click)="closeModal()"
+    >
+      <span class="body-1-semibold">{{ 'Cancel' | translate }}</span>
+    </button>
+
+    <button
+      class="submit"
+      mat-flat-button
+      [disabled]="!hasSelection()"
+      (click)="addSelectedDocuments()"
+    >
+      <span class="body-1-semibold">{{ dialogData.submitButton | translate }}</span>
+    </button>
+  </div>
+
+</div>
 `, styles: ['/* src/app/components/federal/components/select-modal/select-modal.component.scss */\n.filling {\n  height: 100%;\n  overflow: hidden;\n}\n* {\n  box-sizing: border-box;\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n  margin: 0;\n}\n.filling {\n  margin: 0;\n  font-family: "Helvetica Neue", sans-serif;\n}\n.filing {\n  --app-font-family:\n    -apple-system,\n    BlinkMacSystemFont,\n    "Helvetica Neue",\n    Helvetica,\n    Arial,\n    sans-serif;\n  --mat-sys-background: #faf9fd;\n  --mat-sys-error: #ba1a1a;\n  --mat-sys-error-container: #ffdad6;\n  --mat-sys-inverse-on-surface: #f2f0f4;\n  --mat-sys-inverse-primary: #abc7ff;\n  --mat-sys-inverse-surface: #2f3033;\n  --mat-sys-on-background: #1a1b1f;\n  --mat-sys-on-error: #ffffff;\n  --mat-sys-on-error-container: #93000a;\n  --mat-sys-on-primary: #ffffff;\n  --mat-sys-on-primary-container: #00458f;\n  --mat-sys-on-primary-fixed: #001b3f;\n  --mat-sys-on-primary-fixed-variant: #00458f;\n  --mat-sys-on-secondary: #ffffff;\n  --mat-sys-on-secondary-container: #3e4759;\n  --mat-sys-on-secondary-fixed: #131c2b;\n  --mat-sys-on-secondary-fixed-variant: #3e4759;\n  --mat-sys-on-surface: #1a1b1f;\n  --mat-sys-on-surface-variant: var(--filing-modal-color-grey);\n  --mat-sys-on-tertiary: #ffffff;\n  --mat-sys-on-tertiary-container: #0000ef;\n  --mat-sys-on-tertiary-fixed: #00006e;\n  --mat-sys-on-tertiary-fixed-variant: #0000ef;\n  --mat-sys-outline: #74777f;\n  --mat-sys-outline-variant: #c4c6d0;\n  --mat-sys-primary: #3778e4;\n  --mat-sys-primary-container: #d7e3ff;\n  --mat-sys-primary-fixed: #d7e3ff;\n  --mat-sys-primary-fixed-dim: #abc7ff;\n  --mat-sys-scrim: #000000;\n  --mat-sys-secondary: #565e71;\n  --mat-sys-secondary-container: #dae2f9;\n  --mat-sys-secondary-fixed: #dae2f9;\n  --mat-sys-secondary-fixed-dim: #bec6dc;\n  --mat-sys-shadow: #000000;\n  --mat-sys-surface: #faf9fd;\n  --mat-sys-surface-bright: #faf9fd;\n  --mat-sys-surface-container: #efedf0;\n  --mat-sys-surface-container-high: #e9e7eb;\n  --mat-sys-surface-container-highest: #e3e2e6;\n  --mat-sys-surface-container-low: #f4f3f6;\n  --mat-sys-surface-container-lowest: #ffffff;\n  --mat-sys-surface-dim: #dbd9dd;\n  --mat-sys-surface-tint: #005cbb;\n  --mat-sys-surface-variant: #e0e2ec;\n  --mat-sys-tertiary: #343dff;\n  --mat-sys-tertiary-container: #e0e0ff;\n  --mat-sys-tertiary-fixed: #e0e0ff;\n  --mat-sys-tertiary-fixed-dim: #bec2ff;\n  --mat-sys-neutral-variant20: #2d3038;\n  --mat-sys-neutral10: #1a1b1f;\n  --mdc-filled-button-container-height: 35px;\n  --mdc-outlined-button-container-height: 35px;\n  --mdc-text-button-label-text-color: #808090;\n  --mdc-filled-button-label-text-weight: 600;\n  --mdc-text-button-label-text-weight: 600;\n  --mdc-filled-button-container-shape: 4px;\n  --mdc-outlined-button-outline-color: none;\n  --mdc-outlined-button-container-shape: 6px;\n  --mat-sys-level0:\n    0px 0px 0px 0px rgba(0, 0, 0, 0.2),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.14),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level1:\n    0px 2px 1px -1px rgba(0, 0, 0, 0.2),\n    0px 1px 1px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 3px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level2:\n    0px 3px 3px -2px rgba(0, 0, 0, 0.2),\n    0px 3px 4px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 8px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level3:\n    0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n    0px 6px 10px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level4:\n    0px 5px 5px -3px rgba(0, 0, 0, 0.2),\n    0px 8px 10px 1px rgba(0, 0, 0, 0.14),\n    0px 3px 14px 2px rgba(0, 0, 0, 0.12);\n  --mat-sys-level5:\n    0px 7px 8px -4px rgba(0, 0, 0, 0.2),\n    0px 12px 17px 2px rgba(0, 0, 0, 0.14),\n    0px 5px 22px 4px rgba(0, 0, 0, 0.12);\n  --mdc-outlined-button-label-text-size: 14px;\n  --mdc-filled-button-label-text-size: 14px;\n  --mdc-filled-text-field-label-text-size: 16px;\n  --mat-sys-body-large: 400 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-body-large-font: var(--app-font-family);\n  --mat-sys-body-large-line-height: 1.5rem;\n  --mat-sys-body-large-size: 14px;\n  --mat-sys-body-large-tracking: 0.031rem;\n  --mat-sys-body-large-weight: 400;\n  --mat-sys-body-medium: 400 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-body-medium-font: var(--app-font-family);\n  --mat-sys-body-medium-line-height: 1.25rem;\n  --mat-sys-body-medium-size: 0.875rem;\n  --mat-sys-body-medium-tracking: 0.016rem;\n  --mat-sys-body-medium-weight: 400;\n  --mat-sys-body-small: 400 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-body-small-font: var(--app-font-family);\n  --mat-sys-body-small-line-height: 1rem;\n  --mat-sys-body-small-size: 0.75rem;\n  --mat-sys-body-small-tracking: 0.025rem;\n  --mat-sys-body-small-weight: 400;\n  --mat-sys-display-large: 400 3.562rem / 4rem var(--app-font-family);\n  --mat-sys-display-large-font: var(--app-font-family);\n  --mat-sys-display-large-line-height: 4rem;\n  --mat-sys-display-large-size: 3.562rem;\n  --mat-sys-display-large-tracking: -0.016rem;\n  --mat-sys-display-large-weight: 400;\n  --mat-sys-display-medium: 400 2.812rem / 3.25rem var(--app-font-family);\n  --mat-sys-display-medium-font: var(--app-font-family);\n  --mat-sys-display-medium-line-height: 3.25rem;\n  --mat-sys-display-medium-size: 2.812rem;\n  --mat-sys-display-medium-tracking: 0;\n  --mat-sys-display-medium-weight: 400;\n  --mat-sys-display-small: 400 2.25rem / 2.75rem var(--app-font-family);\n  --mat-sys-display-small-font: var(--app-font-family);\n  --mat-sys-display-small-line-height: 2.75rem;\n  --mat-sys-display-small-size: 2.25rem;\n  --mat-sys-display-small-tracking: 0;\n  --mat-sys-display-small-weight: 400;\n  --mat-sys-headline-large: 400 2rem / 2.5rem var(--app-font-family);\n  --mat-sys-headline-large-font: var(--app-font-family);\n  --mat-sys-headline-large-line-height: 2.5rem;\n  --mat-sys-headline-large-size: 2rem;\n  --mat-sys-headline-large-tracking: 0;\n  --mat-sys-headline-large-weight: 400;\n  --mat-sys-headline-medium: 400 1.75rem / 2.25rem var(--app-font-family);\n  --mat-sys-headline-medium-font: var(--app-font-family);\n  --mat-sys-headline-medium-line-height: 2.25rem;\n  --mat-sys-headline-medium-size: 1.75rem;\n  --mat-sys-headline-medium-tracking: 0;\n  --mat-sys-headline-medium-weight: 400;\n  --mat-sys-headline-small: 400 1.5rem / 2rem var(--app-font-family);\n  --mat-sys-headline-small-font: var(--app-font-family);\n  --mat-sys-headline-small-line-height: 2rem;\n  --mat-sys-headline-small-size: 1.5rem;\n  --mat-sys-headline-small-tracking: 0;\n  --mat-sys-headline-small-weight: 400;\n  --mat-sys-label-large: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-label-large-font: var(--app-font-family);\n  --mat-sys-label-large-line-height: 1.25rem;\n  --mat-sys-label-large-size: 0.875rem;\n  --mat-sys-label-large-tracking: 0.006rem;\n  --mat-sys-label-large-weight: 500;\n  --mat-sys-label-large-weight-prominent: 700;\n  --mat-sys-label-medium: 500 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-label-medium-font: var(--app-font-family);\n  --mat-sys-label-medium-line-height: 1rem;\n  --mat-sys-label-medium-size: 0.75rem;\n  --mat-sys-label-medium-tracking: 0.031rem;\n  --mat-sys-label-medium-weight: 500;\n  --mat-sys-label-medium-weight-prominent: 700;\n  --mat-sys-label-small: 500 0.688rem / 1rem var(--app-font-family);\n  --mat-sys-label-small-font: var(--app-font-family);\n  --mat-sys-label-small-line-height: 1rem;\n  --mat-sys-label-small-size: 0.688rem;\n  --mat-sys-label-small-tracking: 0.031rem;\n  --mat-sys-label-small-weight: 500;\n  --mat-sys-title-large: 400 1.375rem / 1.75rem var(--app-font-family);\n  --mat-sys-title-large-font: var(--app-font-family);\n  --mat-sys-title-large-line-height: 1.75rem;\n  --mat-sys-title-large-size: 1.375rem;\n  --mat-sys-title-large-tracking: 0;\n  --mat-sys-title-large-weight: 400;\n  --mat-sys-title-medium: 500 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-title-medium-font: var(--app-font-family);\n  --mat-sys-title-medium-line-height: 1.5rem;\n  --mat-sys-title-medium-size: 1rem;\n  --mat-sys-title-medium-tracking: 0.009rem;\n  --mat-sys-title-medium-weight: 500;\n  --mat-sys-title-small: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-title-small-font: var(--app-font-family);\n  --mat-sys-title-small-line-height: 1.25rem;\n  --mat-sys-title-small-size: 0.875rem;\n  --mat-sys-title-small-tracking: 0.006rem;\n  --mat-sys-title-small-weight: 500;\n  --mat-sys-corner-extra-large: 28px;\n  --mat-sys-corner-extra-large-top: 28px 28px 0 0;\n  --mat-sys-corner-extra-small: 4px;\n  --mat-sys-corner-extra-small-top: 4px 4px 0 0;\n  --mat-sys-corner-full: 9999px;\n  --mat-sys-corner-large: 16px;\n  --mat-sys-corner-large-end: 0 16px 16px 0;\n  --mat-sys-corner-large-start: 16px 0 0 16px;\n  --mat-sys-corner-large-top: 16px 16px 0 0;\n  --mat-sys-corner-medium: 12px;\n  --mat-sys-corner-none: 0;\n  --mat-sys-corner-small: 8px;\n  --mat-sys-dragged-state-layer-opacity: 0.16;\n  --mat-sys-focus-state-layer-opacity: 0.12;\n  --mat-sys-hover-state-layer-opacity: 0.08;\n  --mat-sys-pressed-state-layer-opacity: 0.12;\n}\n.filing .mat-primary .mat-pseudo-checkbox-checked,\n.filing .mat-primary .mat-pseudo-checkbox-indeterminate {\n  background: transparent !important;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox {\n  width: 24px;\n  height: 24px;\n  flex-basis: 24px;\n  padding: 0;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__background {\n  width: 24px;\n  height: 24px;\n  border-radius: 6px;\n  top: 0;\n  left: 0;\n  border: 3px solid var(--filing-modal-color-grey);\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__checkmark {\n  height: 20px;\n  width: 20px;\n  font-size: 20px;\n  top: 1px;\n  left: 1px;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__ripple,\n.filing .mat-mdc-checkbox[cardView] .mat-ripple {\n  display: none;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-label {\n  padding-left: 8px;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-button__label {\n  line-height: 10px;\n}\n:host {\n  --filing-modal-color-grey: #444444;\n  --filing-modal-color-dark-blue: #485673;\n  --filing-modal-color-grey-mid: #A0A0A0;\n  --filing-modal-color-light-blue: #3778E4;\n  --filing-modal-color-black: #444444;\n}\nmat-icon {\n  font-family: "Material Icons" !important;\n  font-size: 20px;\n  height: 20px;\n  width: 20px;\n  line-height: 20px;\n}\nh1 {\n  font-size: 24px;\n  line-height: 28px;\n  font-weight: 700;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh2 {\n  font-size: 22px;\n  line-height: 26px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh3 {\n  font-size: 18px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin-top: 0;\n  margin-bottom: 0;\n}\nh4 {\n  font-size: 16px;\n  line-height: 22px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh4 {\n  font-size: 16px;\n  line-height: 20px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\n.body-1-regular {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-1-bold {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\n.body-1-semibold {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 600;\n  font-family: "Open Sans";\n}\n.body-2-regular {\n  line-height: 20px;\n  font-size: 12px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-2-bold {\n  line-height: 20px;\n  font-size: 12px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\n.body-3-regular {\n  line-height: 20px;\n  font-size: 16px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-4-regular {\n  line-height: 18px;\n  font-size: 18px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-4-bold {\n  line-height: 20px;\n  font-size: 20px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  margin: 0;\n}\n.black {\n  color: var(--filing-modal-color-black);\n}\n.grey {\n  color: var(--filing-modal-color-grey);\n}\n.dark-blue {\n  color: var(--filing-modal-color-dark-blue);\n}\n.grey-mid {\n  color: var(--filing-modal-color-grey-mid);\n}\n.light-blue {\n  color: var(--filing-modal-color-light-blue);\n}\n:host ::ng-deep {\n  --app-font-family:\n    -apple-system,\n    BlinkMacSystemFont,\n    "Helvetica Neue",\n    Helvetica,\n    Arial,\n    sans-serif;\n  --mat-sys-background: #faf9fd;\n  --mat-sys-error: #ba1a1a;\n  --mat-sys-error-container: #ffdad6;\n  --mat-sys-inverse-on-surface: #f2f0f4;\n  --mat-sys-inverse-primary: #abc7ff;\n  --mat-sys-inverse-surface: #2f3033;\n  --mat-sys-on-background: #1a1b1f;\n  --mat-sys-on-error: #ffffff;\n  --mat-sys-on-error-container: #93000a;\n  --mat-sys-on-primary: #ffffff;\n  --mat-sys-on-primary-container: #00458f;\n  --mat-sys-on-primary-fixed: #001b3f;\n  --mat-sys-on-primary-fixed-variant: #00458f;\n  --mat-sys-on-secondary: #ffffff;\n  --mat-sys-on-secondary-container: #3e4759;\n  --mat-sys-on-secondary-fixed: #131c2b;\n  --mat-sys-on-secondary-fixed-variant: #3e4759;\n  --mat-sys-on-surface: #1a1b1f;\n  --mat-sys-on-surface-variant: var(--filing-modal-color-grey);\n  --mat-sys-on-tertiary: #ffffff;\n  --mat-sys-on-tertiary-container: #0000ef;\n  --mat-sys-on-tertiary-fixed: #00006e;\n  --mat-sys-on-tertiary-fixed-variant: #0000ef;\n  --mat-sys-outline: #74777f;\n  --mat-sys-outline-variant: #c4c6d0;\n  --mat-sys-primary: #3778e4;\n  --mat-sys-primary-container: #d7e3ff;\n  --mat-sys-primary-fixed: #d7e3ff;\n  --mat-sys-primary-fixed-dim: #abc7ff;\n  --mat-sys-scrim: #000000;\n  --mat-sys-secondary: #565e71;\n  --mat-sys-secondary-container: #dae2f9;\n  --mat-sys-secondary-fixed: #dae2f9;\n  --mat-sys-secondary-fixed-dim: #bec6dc;\n  --mat-sys-shadow: #000000;\n  --mat-sys-surface: #faf9fd;\n  --mat-sys-surface-bright: #faf9fd;\n  --mat-sys-surface-container: #efedf0;\n  --mat-sys-surface-container-high: #e9e7eb;\n  --mat-sys-surface-container-highest: #e3e2e6;\n  --mat-sys-surface-container-low: #f4f3f6;\n  --mat-sys-surface-container-lowest: #ffffff;\n  --mat-sys-surface-dim: #dbd9dd;\n  --mat-sys-surface-tint: #005cbb;\n  --mat-sys-surface-variant: #e0e2ec;\n  --mat-sys-tertiary: #343dff;\n  --mat-sys-tertiary-container: #e0e0ff;\n  --mat-sys-tertiary-fixed: #e0e0ff;\n  --mat-sys-tertiary-fixed-dim: #bec2ff;\n  --mat-sys-neutral-variant20: #2d3038;\n  --mat-sys-neutral10: #1a1b1f;\n  --mdc-filled-button-container-height: 35px;\n  --mdc-outlined-button-container-height: 35px;\n  --mdc-text-button-label-text-color: #808090;\n  --mdc-filled-button-label-text-weight: 600;\n  --mdc-text-button-label-text-weight: 600;\n  --mdc-filled-button-container-shape: 4px;\n  --mdc-outlined-button-outline-color: none;\n  --mdc-outlined-button-container-shape: 6px;\n  --mat-sys-level0:\n    0px 0px 0px 0px rgba(0, 0, 0, 0.2),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.14),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level1:\n    0px 2px 1px -1px rgba(0, 0, 0, 0.2),\n    0px 1px 1px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 3px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level2:\n    0px 3px 3px -2px rgba(0, 0, 0, 0.2),\n    0px 3px 4px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 8px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level3:\n    0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n    0px 6px 10px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level4:\n    0px 5px 5px -3px rgba(0, 0, 0, 0.2),\n    0px 8px 10px 1px rgba(0, 0, 0, 0.14),\n    0px 3px 14px 2px rgba(0, 0, 0, 0.12);\n  --mat-sys-level5:\n    0px 7px 8px -4px rgba(0, 0, 0, 0.2),\n    0px 12px 17px 2px rgba(0, 0, 0, 0.14),\n    0px 5px 22px 4px rgba(0, 0, 0, 0.12);\n  --mdc-outlined-button-label-text-size: 14px;\n  --mdc-filled-button-label-text-size: 14px;\n  --mdc-filled-text-field-label-text-size: 16px;\n  --mat-sys-body-large: 400 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-body-large-font: var(--app-font-family);\n  --mat-sys-body-large-line-height: 1.5rem;\n  --mat-sys-body-large-size: 14px;\n  --mat-sys-body-large-tracking: 0.031rem;\n  --mat-sys-body-large-weight: 400;\n  --mat-sys-body-medium: 400 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-body-medium-font: var(--app-font-family);\n  --mat-sys-body-medium-line-height: 1.25rem;\n  --mat-sys-body-medium-size: 0.875rem;\n  --mat-sys-body-medium-tracking: 0.016rem;\n  --mat-sys-body-medium-weight: 400;\n  --mat-sys-body-small: 400 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-body-small-font: var(--app-font-family);\n  --mat-sys-body-small-line-height: 1rem;\n  --mat-sys-body-small-size: 0.75rem;\n  --mat-sys-body-small-tracking: 0.025rem;\n  --mat-sys-body-small-weight: 400;\n  --mat-sys-display-large: 400 3.562rem / 4rem var(--app-font-family);\n  --mat-sys-display-large-font: var(--app-font-family);\n  --mat-sys-display-large-line-height: 4rem;\n  --mat-sys-display-large-size: 3.562rem;\n  --mat-sys-display-large-tracking: -0.016rem;\n  --mat-sys-display-large-weight: 400;\n  --mat-sys-display-medium: 400 2.812rem / 3.25rem var(--app-font-family);\n  --mat-sys-display-medium-font: var(--app-font-family);\n  --mat-sys-display-medium-line-height: 3.25rem;\n  --mat-sys-display-medium-size: 2.812rem;\n  --mat-sys-display-medium-tracking: 0;\n  --mat-sys-display-medium-weight: 400;\n  --mat-sys-display-small: 400 2.25rem / 2.75rem var(--app-font-family);\n  --mat-sys-display-small-font: var(--app-font-family);\n  --mat-sys-display-small-line-height: 2.75rem;\n  --mat-sys-display-small-size: 2.25rem;\n  --mat-sys-display-small-tracking: 0;\n  --mat-sys-display-small-weight: 400;\n  --mat-sys-headline-large: 400 2rem / 2.5rem var(--app-font-family);\n  --mat-sys-headline-large-font: var(--app-font-family);\n  --mat-sys-headline-large-line-height: 2.5rem;\n  --mat-sys-headline-large-size: 2rem;\n  --mat-sys-headline-large-tracking: 0;\n  --mat-sys-headline-large-weight: 400;\n  --mat-sys-headline-medium: 400 1.75rem / 2.25rem var(--app-font-family);\n  --mat-sys-headline-medium-font: var(--app-font-family);\n  --mat-sys-headline-medium-line-height: 2.25rem;\n  --mat-sys-headline-medium-size: 1.75rem;\n  --mat-sys-headline-medium-tracking: 0;\n  --mat-sys-headline-medium-weight: 400;\n  --mat-sys-headline-small: 400 1.5rem / 2rem var(--app-font-family);\n  --mat-sys-headline-small-font: var(--app-font-family);\n  --mat-sys-headline-small-line-height: 2rem;\n  --mat-sys-headline-small-size: 1.5rem;\n  --mat-sys-headline-small-tracking: 0;\n  --mat-sys-headline-small-weight: 400;\n  --mat-sys-label-large: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-label-large-font: var(--app-font-family);\n  --mat-sys-label-large-line-height: 1.25rem;\n  --mat-sys-label-large-size: 0.875rem;\n  --mat-sys-label-large-tracking: 0.006rem;\n  --mat-sys-label-large-weight: 500;\n  --mat-sys-label-large-weight-prominent: 700;\n  --mat-sys-label-medium: 500 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-label-medium-font: var(--app-font-family);\n  --mat-sys-label-medium-line-height: 1rem;\n  --mat-sys-label-medium-size: 0.75rem;\n  --mat-sys-label-medium-tracking: 0.031rem;\n  --mat-sys-label-medium-weight: 500;\n  --mat-sys-label-medium-weight-prominent: 700;\n  --mat-sys-label-small: 500 0.688rem / 1rem var(--app-font-family);\n  --mat-sys-label-small-font: var(--app-font-family);\n  --mat-sys-label-small-line-height: 1rem;\n  --mat-sys-label-small-size: 0.688rem;\n  --mat-sys-label-small-tracking: 0.031rem;\n  --mat-sys-label-small-weight: 500;\n  --mat-sys-title-large: 400 1.375rem / 1.75rem var(--app-font-family);\n  --mat-sys-title-large-font: var(--app-font-family);\n  --mat-sys-title-large-line-height: 1.75rem;\n  --mat-sys-title-large-size: 1.375rem;\n  --mat-sys-title-large-tracking: 0;\n  --mat-sys-title-large-weight: 400;\n  --mat-sys-title-medium: 500 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-title-medium-font: var(--app-font-family);\n  --mat-sys-title-medium-line-height: 1.5rem;\n  --mat-sys-title-medium-size: 1rem;\n  --mat-sys-title-medium-tracking: 0.009rem;\n  --mat-sys-title-medium-weight: 500;\n  --mat-sys-title-small: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-title-small-font: var(--app-font-family);\n  --mat-sys-title-small-line-height: 1.25rem;\n  --mat-sys-title-small-size: 0.875rem;\n  --mat-sys-title-small-tracking: 0.006rem;\n  --mat-sys-title-small-weight: 500;\n  --mat-sys-corner-extra-large: 28px;\n  --mat-sys-corner-extra-large-top: 28px 28px 0 0;\n  --mat-sys-corner-extra-small: 4px;\n  --mat-sys-corner-extra-small-top: 4px 4px 0 0;\n  --mat-sys-corner-full: 9999px;\n  --mat-sys-corner-large: 16px;\n  --mat-sys-corner-large-end: 0 16px 16px 0;\n  --mat-sys-corner-large-start: 16px 0 0 16px;\n  --mat-sys-corner-large-top: 16px 16px 0 0;\n  --mat-sys-corner-medium: 12px;\n  --mat-sys-corner-none: 0;\n  --mat-sys-corner-small: 8px;\n  --mat-sys-dragged-state-layer-opacity: 0.16;\n  --mat-sys-focus-state-layer-opacity: 0.12;\n  --mat-sys-hover-state-layer-opacity: 0.08;\n  --mat-sys-pressed-state-layer-opacity: 0.12;\n}\n:host ::ng-deep .mat-primary .mat-pseudo-checkbox-checked,\n:host ::ng-deep .mat-primary .mat-pseudo-checkbox-indeterminate {\n  background: transparent !important;\n}\n:host ::ng-deep .mat-mdc-checkbox[cardView] .mdc-checkbox {\n  width: 24px;\n  height: 24px;\n  flex-basis: 24px;\n  padding: 0;\n}\n:host ::ng-deep .mat-mdc-checkbox[cardView] .mdc-checkbox__background {\n  width: 24px;\n  height: 24px;\n  border-radius: 6px;\n  top: 0;\n  left: 0;\n  border: 3px solid var(--filing-modal-color-grey);\n}\n:host ::ng-deep .mat-mdc-checkbox[cardView] .mdc-checkbox__checkmark {\n  height: 20px;\n  width: 20px;\n  font-size: 20px;\n  top: 1px;\n  left: 1px;\n}\n:host ::ng-deep .mat-mdc-checkbox[cardView] .mdc-checkbox__ripple,\n:host ::ng-deep .mat-mdc-checkbox[cardView] .mat-ripple {\n  display: none;\n}\n:host ::ng-deep .mat-mdc-checkbox[cardView] .mdc-label {\n  padding-left: 8px;\n}\n:host ::ng-deep .mat-mdc-checkbox[cardView] .mdc-button__label {\n  line-height: 10px;\n}\n:host .add-documents-modal {\n  padding: 24px 0;\n  border: 2px solid #ededed;\n  border-radius: 16px;\n  width: 100%;\n  background: white;\n}\n:host .add-documents-modal-header {\n  padding: 0 24px;\n}\n:host .add-documents-modal-list {\n  display: flex;\n  flex-direction: column;\n  max-height: 300px;\n  overflow: auto;\n  padding: 24px;\n}\n:host .add-documents-modal-list-item {\n  display: flex;\n  align-items: center;\n  font-size: 18px;\n  cursor: pointer;\n  width: 100%;\n  -webkit-user-select: none;\n  user-select: none;\n}\n:host .add-documents-modal-actions {\n  display: flex;\n  justify-content: flex-end;\n  gap: 8px;\n  padding-right: 16px;\n}\n::ng-deep .mat-mdc-dialog-surface {\n  background: transparent !important;\n  padding: 2px;\n  min-width: 660px;\n}\n/*# sourceMappingURL=select-modal.component.css.map */\n'] }]
         }], null, null);
       })();
@@ -83723,34 +83916,34 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatButton,
             TranslatePipe,
             MatIcon
-          ], template: `<div class="documents">\r
-  <span class="body-1-regular">{{ 'Supporting documents relevant to the proposed name, including consent letters' | translate }}</span>\r
-\r
-  @let selectedDocuments = this.selectedDocuments();\r
-  @if (selectedDocuments.length) {\r
-    <div class="documents-list">\r
-      @for(document of selectedDocuments; track document) {\r
-        <div class="documents-list-item body-1-regular">\r
-          <mat-icon class="documents-list-item-document">description_outline</mat-icon>\r
-          <span class="body-1-regular">{{document}}</span>\r
-\r
-          @if (!readonly()) {\r
-            <div class="documents-list-icon-wrapper" (click)="removeDocument.emit(document)">\r
-              <mat-icon class="documents-list-item-close">close</mat-icon>\r
-            </div>\r
-          }\r
-\r
-        </div>\r
-      }\r
-    </div>\r
-  }\r
-\r
-  @if (!readonly()) {\r
-    <button mat-stroked-button class="outlined" (click)="onAddDocuments()">\r
-      <span class="body-1-semibold">{{ 'Add Supporting Documents' | translate }}</span>\r
-    </button>\r
-  }\r
-</div>\r
+          ], template: `<div class="documents">
+  <span class="body-1-regular">{{ 'Supporting documents relevant to the proposed name, including consent letters' | translate }}</span>
+
+  @let selectedDocuments = this.selectedDocuments();
+  @if (selectedDocuments.length) {
+    <div class="documents-list">
+      @for(document of selectedDocuments; track document) {
+        <div class="documents-list-item body-1-regular">
+          <mat-icon class="documents-list-item-document">description_outline</mat-icon>
+          <span class="body-1-regular">{{document}}</span>
+
+          @if (!readonly()) {
+            <div class="documents-list-icon-wrapper" (click)="removeDocument.emit(document)">
+              <mat-icon class="documents-list-item-close">close</mat-icon>
+            </div>
+          }
+
+        </div>
+      }
+    </div>
+  }
+
+  @if (!readonly()) {
+    <button mat-stroked-button class="outlined" (click)="onAddDocuments()">
+      <span class="body-1-semibold">{{ 'Add Supporting Documents' | translate }}</span>
+    </button>
+  }
+</div>
 `, styles: ["/* src/app/components/federal/components/documents/documents.component.scss */\n:host .documents {\n  display: flex;\n  flex-direction: column;\n  justify-content: flex-start;\n  align-items: flex-start;\n  gap: 16px;\n}\n:host .documents-list {\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n  padding-left: 16px;\n}\n:host .documents-list-item {\n  display: flex;\n  align-items: center;\n  gap: 8px;\n  color: var(--filing-modal-color-grey);\n}\n:host .documents-list-item mat-icon {\n  color: var(--filing-modal-color-grey);\n  display: flex;\n  align-items: center;\n}\n:host .documents-list-item-document {\n  font-size: 24px;\n}\n:host .documents-list-item-close {\n  font-size: 18px;\n  height: 18px;\n  width: 18px;\n  line-height: 18px;\n}\n:host .documents-list-icon-wrapper {\n  cursor: pointer;\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  margin-left: 32px;\n}\n/*# sourceMappingURL=documents.component.css.map */\n"] }]
         }], null, null);
       })();
@@ -84576,246 +84769,246 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             TranslatePipe,
             ReactiveFormsModule,
             DatePipe
-          ], template: `<div class="incorporation-form">\r
-  @if (isNote()) {\r
-    <alert\r
-      [type]="alertType.Info"\r
-      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
-\r
-  @if (errors().length) {\r
-    <alert\r
-      title="The following issues need to be resolved before proceeding:"\r
-      [content]="errors()"\r
-    />\r
-  }\r
-\r
-  <div class="incorporation-form-content">\r
-    @let corporateName = getFormGroup(groups.CorporateName);\r
-\r
-    @if (corporateName) {\r
-      <expandable-card\r
-        [isValid]="sectionValidity['corporateName']"\r
-        [isStatusIcon]="isStatusIcon()"\r
-        [title]="groups.CorporateName"\r
-      >\r
-        <div class="incorporation-form-item">\r
-          <filing-form-group\r
-            [isSubmitted]="isSubmitted()"\r
-            [form]="corporateName"\r
-            [config]="incorporationFields"\r
-            (visiblyValidChange)="onSectionValidChange('corporateName', $event)"\r
-          />\r
-\r
-          @if (isNonPreapprovedNameType() || selectedDocuments().length) {\r
-            <documents\r
-              [documents]="documents()"\r
-              [readonly]="isReadonly()"\r
-              [selectedDocuments]="selectedDocuments()"\r
-              (addDocuments)="addDocuments.emit($event)"\r
-              (removeDocument)="removeDocument.emit($event)"\r
-            />\r
-          }\r
-        </div>\r
-      </expandable-card>\r
-    }\r
-\r
-    @let articlesOfIncorporation = getFormGroup(groups.ArticlesOfIncorporation);\r
-\r
-    @if (articlesOfIncorporation) {\r
-      <expandable-card\r
-        [isValid]="sectionValidity['articles']"\r
-        [isStatusIcon]="isStatusIcon()"\r
-        [title]="groups.ArticlesOfIncorporation"\r
-      >\r
-        <div class="incorporation-form-item">\r
-          <span\r
-            class="body-1-regular black"\r
-            [innerHTML]="directorsSubtitle()"\r
-          ></span>\r
-\r
-          <filing-form-group\r
-            [isSubmitted]="isSubmitted()"\r
-            [form]="articlesOfIncorporation"\r
-            [config]="articlesOfIncorporationFields"\r
-            (visiblyValidChange)="onSectionValidChange('articles', $event)"\r
-          />\r
-          <div>\r
-            <span class="body-1-semibold dark-blue">{{ 'Incorporators' | translate }}</span>\r
-\r
-            <ul class="incorporators-list">\r
-              @for (\r
-                incorporator of task()?._ext?._incorporators;\r
-                track incorporator.affiliationID\r
-              ) {\r
-                <li class="body-1-regular grey">\r
-                  {{ getIncorporatorName(incorporator) }}\r
-                </li>\r
-              }\r
-            </ul>\r
-          </div>\r
-\r
-          <span class="body-1-regular grey"\r
-            >{{ 'Effective Date' | translate }}:\r
-            {{\r
-              task()?._ext?._future_filing_date\r
-                ? (task()!._ext!._future_filing_date | date: "yyyy-MM-dd")\r
-                : (today | date: "yyyy-MM-dd")\r
-            }}</span\r
-          >\r
-        </div>\r
-      </expandable-card>\r
-    }\r
-\r
-    @let registeredOfficeAddress = getFormGroup(groups.RegisteredOfficeAddress);\r
-\r
-    @if (registeredOfficeAddress) {\r
-      <expandable-card\r
-        [isValid]="sectionValidity['registeredOffice']"\r
-        [isStatusIcon]="isStatusIcon()"\r
-        [title]="groups.RegisteredOfficeAddress"\r
-      >\r
-        <div class="incorporation-form-item">\r
-          <filing-form-group\r
-            [isSubmitted]="isSubmitted()"\r
-            [form]="registeredOfficeAddress"\r
-            [config]="registeredOfficeAddressFields"\r
-            (visiblyValidChange)="\r
-              onSectionValidChange('registeredOffice', $event)\r
-            "\r
-          />\r
-        </div>\r
-      </expandable-card>\r
-    }\r
-\r
-    @let directorsArray = getFormArray(groups.Directors);\r
-\r
-    @if (directorsArray && directorsArray.length) {\r
-      @let directorsFormArray = getFormArray(groups.Directors);\r
-      <expandable-list-card\r
-        [isValid]="sectionValidity['directors']"\r
-        [isSubmitted]="isSubmitted()"\r
-        [areItemsOpen]="directorsArray.length <= initiallyOpenCardsCount"\r
-        [fields]="directorsFields"\r
-        [formArray]="directorsFormArray"\r
-        [title]="groups.Directors"\r
-        (visiblyValidChange)="onSectionValidChange('directors', $event)"\r
-      />\r
-    } @else {\r
-      <expandable-card [title]="groups.Directors">\r
-        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>\r
-      </expandable-card>\r
-    }\r
-\r
-    @let significantControl = getFormGroup(groups.SignificantControl);\r
-    @if (significantControl) {\r
-      @let individualsWithSignificantControlArray =\r
-        getFormArray(groups.IndividualsWithSignificantControl);\r
-\r
-      @if (individualsWithSignificantControlArray) {\r
-        <expandable-list-card\r
-          [areItemsOpen]="\r
-            individualsWithSignificantControlArray.length <=\r
-            initiallyOpenCardsCount\r
-          "\r
-          [isValid]="\r
-            sectionValidity['isc'] &&\r
-            sectionValidity['significantControl']\r
-          "\r
-          (remove)="onRemoveIndividualWithSignificantForm($event)"\r
-          [removable]="!isReadonly()"\r
-          [isSubmitted]="isSubmitted()"\r
-          [isStatusIcon]="isStatusIcon()"\r
-          [fields]="individualsWithSignificantControlFields"\r
-          [formArray]="individualsWithSignificantControlArray"\r
-          [title]="groups.IndividualsWithSignificantControl"\r
-          (visiblyValidChange)="onSectionValidChange('isc', $event)"\r
-        >\r
-          @if (\r
-            !isReadonly() && isAddIndividualWithSignificantControlAvailable()\r
-          ) {\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">{{\r
-                "Add Individuals With Significant Control" | translate\r
-              }}</span>\r
-            </button>\r
-          }\r
-\r
-          <div class="significant-control" slot="header-content">\r
-            <filing-form-group\r
-              [isSubmitted]="isSubmitted()"\r
-              [form]="significantControl"\r
-              [config]="significantControlFields"\r
-              (visiblyValidChange)="\r
-                onSectionValidChange('significantControl', $event)\r
-              "\r
-            />\r
-          </div>\r
-        </expandable-list-card>\r
-      }\r
-    }\r
-\r
-    @let inviteDirectorToBeFullAccessManager =\r
-      getFormGroup(groups.InviteDirectorToBeFullAccessManager);\r
-    @if (inviteDirectorToBeFullAccessManager) {\r
-      <expandable-card\r
-        [isValid]="sectionValidity['inviteDirector']"\r
-        [title]="groups.InviteDirectorToBeFullAccessManager"\r
-      >\r
-        <filing-form-group\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="inviteDirectorToBeFullAccessManager"\r
-          [config]="federalFormationFormInviteDirectorsToBeManagersControl"\r
-          (visiblyValidChange)="onSectionValidChange('inviteDirector', $event)"\r
-        />\r
-      </expandable-card>\r
-    }\r
-\r
-    @let extraProvincialLicensesArray =\r
-      getFormArray(groups.ExtraProvincialRegistrations);\r
-    @let extraProvincialLicensesControlsLength =\r
-      extraProvincialLicensesArray?.length;\r
-\r
-    @if (extraProvincialLicensesControlsLength) {\r
-      <expandable-list-card\r
-        [areItemsOpen]="extraProvincialLicensesControlsLength === 1"\r
-        [isValid]="sectionValidity['epl']"\r
-        [isSubmitted]="isSubmitted()"\r
-        [isStatusIcon]="isStatusIcon()"\r
-        [fields]="extraProvincialLicensesFields"\r
-        [formArray]="extraProvincialLicensesArray"\r
-        [title]="groups.ExtraProvincialRegistrations"\r
-        (visiblyValidChange)="onSectionValidChange('epl', $event)"\r
-      />\r
-    }\r
-\r
-    @let contactForm = getFormGroup(groups.Contact);\r
-    @if (contactForm) {\r
-      <expandable-card\r
-        [isStatusIcon]="isStatusIcon()"\r
-        [isValid]="sectionValidity['contact']"\r
-        [title]="groups.Contact"\r
-      >\r
-        <filing-form-group\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="contactForm"\r
-          [config]="contactControl"\r
-          (visiblyValidChange)="onSectionValidChange('contact', $event)"\r
-        />\r
-      </expandable-card>\r
-    }\r
-\r
-    <ng-content></ng-content>\r
-  </div>\r
-</div>\r
+          ], template: `<div class="incorporation-form">
+  @if (isNote()) {
+    <alert
+      [type]="alertType.Info"
+      title="Entity changed"
+      content="A new draft needs to be generated as the Entity was changed since the last draft was produced."
+    />
+  }
+
+  @if (errors().length) {
+    <alert
+      title="The following issues need to be resolved before proceeding:"
+      [content]="errors()"
+    />
+  }
+
+  <div class="incorporation-form-content">
+    @let corporateName = getFormGroup(groups.CorporateName);
+
+    @if (corporateName) {
+      <expandable-card
+        [isValid]="sectionValidity['corporateName']"
+        [isStatusIcon]="isStatusIcon()"
+        [title]="groups.CorporateName"
+      >
+        <div class="incorporation-form-item">
+          <filing-form-group
+            [isSubmitted]="isSubmitted()"
+            [form]="corporateName"
+            [config]="incorporationFields"
+            (visiblyValidChange)="onSectionValidChange('corporateName', $event)"
+          />
+
+          @if (isNonPreapprovedNameType() || selectedDocuments().length) {
+            <documents
+              [documents]="documents()"
+              [readonly]="isReadonly()"
+              [selectedDocuments]="selectedDocuments()"
+              (addDocuments)="addDocuments.emit($event)"
+              (removeDocument)="removeDocument.emit($event)"
+            />
+          }
+        </div>
+      </expandable-card>
+    }
+
+    @let articlesOfIncorporation = getFormGroup(groups.ArticlesOfIncorporation);
+
+    @if (articlesOfIncorporation) {
+      <expandable-card
+        [isValid]="sectionValidity['articles']"
+        [isStatusIcon]="isStatusIcon()"
+        [title]="groups.ArticlesOfIncorporation"
+      >
+        <div class="incorporation-form-item">
+          <span
+            class="body-1-regular black"
+            [innerHTML]="directorsSubtitle()"
+          ></span>
+
+          <filing-form-group
+            [isSubmitted]="isSubmitted()"
+            [form]="articlesOfIncorporation"
+            [config]="articlesOfIncorporationFields"
+            (visiblyValidChange)="onSectionValidChange('articles', $event)"
+          />
+          <div>
+            <span class="body-1-semibold dark-blue">{{ 'Incorporators' | translate }}</span>
+
+            <ul class="incorporators-list">
+              @for (
+                incorporator of task()?._ext?._incorporators;
+                track incorporator.affiliationID
+              ) {
+                <li class="body-1-regular grey">
+                  {{ getIncorporatorName(incorporator) }}
+                </li>
+              }
+            </ul>
+          </div>
+
+          <span class="body-1-regular grey"
+            >{{ 'Effective Date' | translate }}:
+            {{
+              task()?._ext?._future_filing_date
+                ? (task()!._ext!._future_filing_date | date: "yyyy-MM-dd")
+                : (today | date: "yyyy-MM-dd")
+            }}</span
+          >
+        </div>
+      </expandable-card>
+    }
+
+    @let registeredOfficeAddress = getFormGroup(groups.RegisteredOfficeAddress);
+
+    @if (registeredOfficeAddress) {
+      <expandable-card
+        [isValid]="sectionValidity['registeredOffice']"
+        [isStatusIcon]="isStatusIcon()"
+        [title]="groups.RegisteredOfficeAddress"
+      >
+        <div class="incorporation-form-item">
+          <filing-form-group
+            [isSubmitted]="isSubmitted()"
+            [form]="registeredOfficeAddress"
+            [config]="registeredOfficeAddressFields"
+            (visiblyValidChange)="
+              onSectionValidChange('registeredOffice', $event)
+            "
+          />
+        </div>
+      </expandable-card>
+    }
+
+    @let directorsArray = getFormArray(groups.Directors);
+
+    @if (directorsArray && directorsArray.length) {
+      @let directorsFormArray = getFormArray(groups.Directors);
+      <expandable-list-card
+        [isValid]="sectionValidity['directors']"
+        [isSubmitted]="isSubmitted()"
+        [areItemsOpen]="directorsArray.length <= initiallyOpenCardsCount"
+        [fields]="directorsFields"
+        [formArray]="directorsFormArray"
+        [title]="groups.Directors"
+        (visiblyValidChange)="onSectionValidChange('directors', $event)"
+      />
+    } @else {
+      <expandable-card [title]="groups.Directors">
+        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>
+      </expandable-card>
+    }
+
+    @let significantControl = getFormGroup(groups.SignificantControl);
+    @if (significantControl) {
+      @let individualsWithSignificantControlArray =
+        getFormArray(groups.IndividualsWithSignificantControl);
+
+      @if (individualsWithSignificantControlArray) {
+        <expandable-list-card
+          [areItemsOpen]="
+            individualsWithSignificantControlArray.length <=
+            initiallyOpenCardsCount
+          "
+          [isValid]="
+            sectionValidity['isc'] &&
+            sectionValidity['significantControl']
+          "
+          (remove)="onRemoveIndividualWithSignificantForm($event)"
+          [removable]="!isReadonly()"
+          [isSubmitted]="isSubmitted()"
+          [isStatusIcon]="isStatusIcon()"
+          [fields]="individualsWithSignificantControlFields"
+          [formArray]="individualsWithSignificantControlArray"
+          [title]="groups.IndividualsWithSignificantControl"
+          (visiblyValidChange)="onSectionValidChange('isc', $event)"
+        >
+          @if (
+            !isReadonly() && isAddIndividualWithSignificantControlAvailable()
+          ) {
+            <button
+              [disabled]="isAddIndividualWithSignificantControlDisabled()"
+              slot="subtitle"
+              mat-stroked-button
+              mat-button
+              (click)="addIndividualWithSignificantControl()"
+            >
+              <span class="body-1-semibold">{{
+                "Add Individuals With Significant Control" | translate
+              }}</span>
+            </button>
+          }
+
+          <div class="significant-control" slot="header-content">
+            <filing-form-group
+              [isSubmitted]="isSubmitted()"
+              [form]="significantControl"
+              [config]="significantControlFields"
+              (visiblyValidChange)="
+                onSectionValidChange('significantControl', $event)
+              "
+            />
+          </div>
+        </expandable-list-card>
+      }
+    }
+
+    @let inviteDirectorToBeFullAccessManager =
+      getFormGroup(groups.InviteDirectorToBeFullAccessManager);
+    @if (inviteDirectorToBeFullAccessManager) {
+      <expandable-card
+        [isValid]="sectionValidity['inviteDirector']"
+        [title]="groups.InviteDirectorToBeFullAccessManager"
+      >
+        <filing-form-group
+          [isSubmitted]="isSubmitted()"
+          [form]="inviteDirectorToBeFullAccessManager"
+          [config]="federalFormationFormInviteDirectorsToBeManagersControl"
+          (visiblyValidChange)="onSectionValidChange('inviteDirector', $event)"
+        />
+      </expandable-card>
+    }
+
+    @let extraProvincialLicensesArray =
+      getFormArray(groups.ExtraProvincialRegistrations);
+    @let extraProvincialLicensesControlsLength =
+      extraProvincialLicensesArray?.length;
+
+    @if (extraProvincialLicensesControlsLength) {
+      <expandable-list-card
+        [areItemsOpen]="extraProvincialLicensesControlsLength === 1"
+        [isValid]="sectionValidity['epl']"
+        [isSubmitted]="isSubmitted()"
+        [isStatusIcon]="isStatusIcon()"
+        [fields]="extraProvincialLicensesFields"
+        [formArray]="extraProvincialLicensesArray"
+        [title]="groups.ExtraProvincialRegistrations"
+        (visiblyValidChange)="onSectionValidChange('epl', $event)"
+      />
+    }
+
+    @let contactForm = getFormGroup(groups.Contact);
+    @if (contactForm) {
+      <expandable-card
+        [isStatusIcon]="isStatusIcon()"
+        [isValid]="sectionValidity['contact']"
+        [title]="groups.Contact"
+      >
+        <filing-form-group
+          [isSubmitted]="isSubmitted()"
+          [form]="contactForm"
+          [config]="contactControl"
+          (visiblyValidChange)="onSectionValidChange('contact', $event)"
+        />
+      </expandable-card>
+    }
+
+    <ng-content></ng-content>
+  </div>
+</div>
 `, styles: ["/* src/app/components/federal/incorporation/federal-incorporation-form/federal-incorporation-form.component.scss */\n:host {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n:host .incorporation-form {\n  display: flex;\n  height: 100%;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .incorporation-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow: auto;\n  min-height: 0;\n}\n:host .incorporation-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .incorporation-form .significant-control {\n  padding: 0 16px;\n}\n:host .incorporators-list {\n  margin: 8px;\n  padding-inline-start: 25px;\n}\n/*# sourceMappingURL=federal-incorporation-form.component.css.map */\n"] }]
         }], () => [], null);
       })();
@@ -84937,39 +85130,39 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatButton,
             TranslatePipe,
             FederalIncorporationFormComponent
-          ], template: `<div class="incorporation-delta-form">\r
-  <federal-incorporation-form\r
-    class="incorporation-delta-form-content"\r
-    [form]="form()"\r
-    [task]="task()"\r
-    [errors]="combinedErrors()"\r
-    [isNote]="isNote()"\r
-    [isSubmitted]="submitted()"\r
-    [documents]="documents()"\r
-    [selectedDocuments]="selectedDocuments()"\r
-    (addDocuments)="addDocuments.emit($event)"\r
-    (removeDocument)="removeDocument.emit($event)"\r
-    (visiblyValidChange)="onVisiblyValidChange($event)"\r
-  />\r
-\r
-  <div class="incorporation-delta-form-actions">\r
-    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
-      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
-    </button>\r
-    <button (click)="save.emit()" [disabled]="actionsDisabled()" mat-stroked-button mat-button>\r
-      <span class="body-1-semibold">{{ 'Save Changes' | translate }}</span>\r
-    </button>\r
-    <button\r
-      class="submit"\r
-      color="primary"\r
-      mat-flat-button\r
-      [disabled]="actionsDisabled()"\r
-      (click)="onValidate()"\r
-    >\r
-      <span class="body-1-semibold">{{ 'Validate & Generate Draft' | translate }}</span>\r
-    </button>\r
-  </div>\r
-</div>\r
+          ], template: `<div class="incorporation-delta-form">
+  <federal-incorporation-form
+    class="incorporation-delta-form-content"
+    [form]="form()"
+    [task]="task()"
+    [errors]="combinedErrors()"
+    [isNote]="isNote()"
+    [isSubmitted]="submitted()"
+    [documents]="documents()"
+    [selectedDocuments]="selectedDocuments()"
+    (addDocuments)="addDocuments.emit($event)"
+    (removeDocument)="removeDocument.emit($event)"
+    (visiblyValidChange)="onVisiblyValidChange($event)"
+  />
+
+  <div class="incorporation-delta-form-actions">
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>
+    </button>
+    <button (click)="save.emit()" [disabled]="actionsDisabled()" mat-stroked-button mat-button>
+      <span class="body-1-semibold">{{ 'Save Changes' | translate }}</span>
+    </button>
+    <button
+      class="submit"
+      color="primary"
+      mat-flat-button
+      [disabled]="actionsDisabled()"
+      (click)="onValidate()"
+    >
+      <span class="body-1-semibold">{{ 'Validate & Generate Draft' | translate }}</span>
+    </button>
+  </div>
+</div>
 `, styles: ["/* src/app/components/federal/incorporation/steps/delta/federal-incorporation-delta-form.component.scss */\n:host .incorporation-delta-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .incorporation-delta-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  overflow: auto;\n}\n:host .incorporation-delta-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .incorporation-delta-form-errors {\n  padding: 0 16px;\n}\n:host .incorporation-delta-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .incorporation-delta-form-actions button {\n  margin: 0;\n}\n:host .incorporation-delta-form-actions .submit {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=federal-incorporation-delta-form.component.css.map */\n"] }]
         }], null, null);
       })();
@@ -85088,39 +85281,39 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             FederalIncorporationFormComponent,
             ExpandableCardComponent,
             FilingFormGroupComponent
-          ], template: `<div class="incorporation-delta-form">\r
-    <federal-incorporation-form\r
-      class="incorporation-delta-form-content"\r
-      [form]="form()"\r
-      [task]="task()"\r
-      [errors]="errors()"\r
-      [selectedDocuments]="selectedDocuments()"\r
-      [isStatusIcon]="false"\r
-      [isReadonly]="true"\r
-    >\r
-      @let signatoryInformation = getFormGroup(groups.Signatory);\r
-\r
-      <expandable-card [isExpandable]="false">\r
-        <filing-form-group [isSubmitted]="true" [form]="signatoryInformation" [config]="signatoryFields"/>\r
-      </expandable-card>\r
-\r
-    </federal-incorporation-form>\r
-\r
-  <div class="incorporation-delta-form-actions">\r
-    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
-      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
-    </button>\r
-    <button\r
-      class="submit"\r
-      color="primary"\r
-      mat-flat-button\r
-      [disabled]="actionsDisabled() || !getFormGroup(groups.Signatory).get(controls.Signatory)?.value"\r
-      (click)="file.emit()"\r
-    >\r
-      <span class="body-1-semibold">{{ 'File' | translate }}</span>\r
-    </button>\r
-  </div>\r
-</div>\r
+          ], template: `<div class="incorporation-delta-form">
+    <federal-incorporation-form
+      class="incorporation-delta-form-content"
+      [form]="form()"
+      [task]="task()"
+      [errors]="errors()"
+      [selectedDocuments]="selectedDocuments()"
+      [isStatusIcon]="false"
+      [isReadonly]="true"
+    >
+      @let signatoryInformation = getFormGroup(groups.Signatory);
+
+      <expandable-card [isExpandable]="false">
+        <filing-form-group [isSubmitted]="true" [form]="signatoryInformation" [config]="signatoryFields"/>
+      </expandable-card>
+
+    </federal-incorporation-form>
+
+  <div class="incorporation-delta-form-actions">
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>
+    </button>
+    <button
+      class="submit"
+      color="primary"
+      mat-flat-button
+      [disabled]="actionsDisabled() || !getFormGroup(groups.Signatory).get(controls.Signatory)?.value"
+      (click)="file.emit()"
+    >
+      <span class="body-1-semibold">{{ 'File' | translate }}</span>
+    </button>
+  </div>
+</div>
 `, styles: ["/* src/app/components/federal/incorporation/steps/preview/federal-incorporation-preview-form.component.scss */\n:host .incorporation-delta-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .incorporation-delta-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  overflow: auto;\n}\n:host .incorporation-delta-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .incorporation-delta-form-errors {\n  padding: 0 16px;\n}\n:host .incorporation-delta-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .incorporation-delta-form-actions button {\n  margin: 0;\n}\n/*# sourceMappingURL=federal-incorporation-preview-form.component.css.map */\n"] }]
         }], () => [], null);
       })();
@@ -85752,139 +85945,139 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             ReactiveFormsModule,
             MatButton,
             TranslatePipe
-          ], template: `<div class="federal-update-maintain-form">\r
-  @if (isNote()) {\r
-    <alert\r
-      [type]="alertType.Info"\r
-      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
-\r
-  @if (errors().length) {\r
-    <alert\r
-      title="The following issues need to be resolved before proceeding:"\r
-      [content]="errors()"\r
-    />\r
-  }\r
-\r
-  <div class="federal-update-maintain-form-content">\r
-    @let corporationDetails = getFormGroup(groups.CorporationDetails);\r
-    @if (corporationDetails) {\r
-      <expandable-card\r
-        [isValid]="sectionValidity['corporationDetails']"\r
-        [title]="groups.CorporationDetails"\r
-      >\r
-        <filing-form-group\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="corporationDetails"\r
-          [config]="corporationDetailsFields"\r
-          (visiblyValidChange)="\r
-            onSectionValidChange('corporationDetails', $event)\r
-          "\r
-        />\r
-      </expandable-card>\r
-    }\r
-\r
-    @let directorsArray = getFormArray(groups.Directors);\r
-    @if (directorsArray && directorsArray.length) {\r
-      <expandable-list-card\r
-        [isValid]="sectionValidity['directors']"\r
-        [isSubmitted]="isSubmitted()"\r
-        [fields]="directorsFields"\r
-        [formArray]="directorsArray"\r
-        [labelKey]="controls.AffiliationName"\r
-        [title]="groups.Directors"\r
-        (visiblyValidChange)="onSectionValidChange('directors', $event)"\r
-      />\r
-    } @else {\r
-      <expandable-card [title]="groups.Directors">\r
-        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>\r
-      </expandable-card>\r
-    }\r
-\r
-    @let annualReturn = getFormGroup(groups.AnnualReturn);\r
-    @if (annualReturn) {\r
-      <expandable-card\r
-        [isValid]="sectionValidity['annualReturn']"\r
-        [title]="groups.AnnualReturn"\r
-      >\r
-        <filing-form-group\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="annualReturn"\r
-          [config]="annualReturnFields"\r
-          (visiblyValidChange)="onSectionValidChange('annualReturn', $event)"\r
-        />\r
-      </expandable-card>\r
-    }\r
-\r
-    @let significantControl = getFormGroup(groups.SignificantControl);\r
-    @if (significantControl) {\r
-      @let individualsArray =\r
-        getFormArray(groups.IndividualsWithSignificantControl);\r
-      @if (individualsArray) {\r
-        <expandable-list-card\r
-          [areItemsOpen]="isIndividualsWithSignificantControlOpen()"\r
-          [isValid]="\r
-            sectionValidity['isc'] && sectionValidity['significantControl']\r
-          "\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
-          (visiblyValidChange)="onSectionValidChange('isc', $event)"\r
-        >\r
-          @if (\r
-            !readonly() && isAddIndividualWithSignificantControlAvailable()\r
-          ) {\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">{{\r
-                "Add Individuals With Significant Control" | translate\r
-              }}</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
-              (visiblyValidChange)="\r
-                onSectionValidChange('significantControl', $event)\r
-              "\r
-            />\r
-          </div>\r
-        </expandable-list-card>\r
-      }\r
-    }\r
-\r
-    @let contact = getFormGroup(groups.Contact);\r
-    @if (contact) {\r
-      <expandable-card\r
-        [isStatusIcon]="!readonly()"\r
-        [isValid]="sectionValidity['contact']"\r
-        [title]="groups.Contact"\r
-      >\r
-        <filing-form-group\r
-          [isSubmitted]="isSubmitted()"\r
-          [form]="contact"\r
-          [config]="contactControl()"\r
-          (visiblyValidChange)="onSectionValidChange('contact', $event)"\r
-        />\r
-      </expandable-card>\r
-    }\r
-  </div>\r
-</div>\r
+          ], template: `<div class="federal-update-maintain-form">
+  @if (isNote()) {
+    <alert
+      [type]="alertType.Info"
+      title="Entity changed"
+      content="A new draft needs to be generated as the Entity was changed since the last draft was produced."
+    />
+  }
+
+  @if (errors().length) {
+    <alert
+      title="The following issues need to be resolved before proceeding:"
+      [content]="errors()"
+    />
+  }
+
+  <div class="federal-update-maintain-form-content">
+    @let corporationDetails = getFormGroup(groups.CorporationDetails);
+    @if (corporationDetails) {
+      <expandable-card
+        [isValid]="sectionValidity['corporationDetails']"
+        [title]="groups.CorporationDetails"
+      >
+        <filing-form-group
+          [isSubmitted]="isSubmitted()"
+          [form]="corporationDetails"
+          [config]="corporationDetailsFields"
+          (visiblyValidChange)="
+            onSectionValidChange('corporationDetails', $event)
+          "
+        />
+      </expandable-card>
+    }
+
+    @let directorsArray = getFormArray(groups.Directors);
+    @if (directorsArray && directorsArray.length) {
+      <expandable-list-card
+        [isValid]="sectionValidity['directors']"
+        [isSubmitted]="isSubmitted()"
+        [fields]="directorsFields"
+        [formArray]="directorsArray"
+        [labelKey]="controls.AffiliationName"
+        [title]="groups.Directors"
+        (visiblyValidChange)="onSectionValidChange('directors', $event)"
+      />
+    } @else {
+      <expandable-card [title]="groups.Directors">
+        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>
+      </expandable-card>
+    }
+
+    @let annualReturn = getFormGroup(groups.AnnualReturn);
+    @if (annualReturn) {
+      <expandable-card
+        [isValid]="sectionValidity['annualReturn']"
+        [title]="groups.AnnualReturn"
+      >
+        <filing-form-group
+          [isSubmitted]="isSubmitted()"
+          [form]="annualReturn"
+          [config]="annualReturnFields"
+          (visiblyValidChange)="onSectionValidChange('annualReturn', $event)"
+        />
+      </expandable-card>
+    }
+
+    @let significantControl = getFormGroup(groups.SignificantControl);
+    @if (significantControl) {
+      @let individualsArray =
+        getFormArray(groups.IndividualsWithSignificantControl);
+      @if (individualsArray) {
+        <expandable-list-card
+          [areItemsOpen]="isIndividualsWithSignificantControlOpen()"
+          [isValid]="
+            sectionValidity['isc'] && sectionValidity['significantControl']
+          "
+          [isSubmitted]="isSubmitted()"
+          [isStatusIcon]="true"
+          [removable]="!readonly()"
+          [fields]="individualsWithSignificantControlFields()"
+          [formArray]="individualsArray"
+          [labelKey]="controls.AffiliationName"
+          [title]="groups.IndividualsWithSignificantControl"
+          (remove)="onRemoveIndividualWithSignificantForm($event)"
+          (visiblyValidChange)="onSectionValidChange('isc', $event)"
+        >
+          @if (
+            !readonly() && isAddIndividualWithSignificantControlAvailable()
+          ) {
+            <button
+              [disabled]="isAddIndividualWithSignificantControlDisabled()"
+              slot="subtitle"
+              mat-stroked-button
+              mat-button
+              (click)="addIndividualWithSignificantControl()"
+            >
+              <span class="body-1-semibold">{{
+                "Add Individuals With Significant Control" | translate
+              }}</span>
+            </button>
+          }
+
+          <div class="card-header-content" slot="header-content">
+            <filing-form-group
+              [isSubmitted]="isSubmitted()"
+              [form]="significantControl"
+              [config]="significantControlFields"
+              (visiblyValidChange)="
+                onSectionValidChange('significantControl', $event)
+              "
+            />
+          </div>
+        </expandable-list-card>
+      }
+    }
+
+    @let contact = getFormGroup(groups.Contact);
+    @if (contact) {
+      <expandable-card
+        [isStatusIcon]="!readonly()"
+        [isValid]="sectionValidity['contact']"
+        [title]="groups.Contact"
+      >
+        <filing-form-group
+          [isSubmitted]="isSubmitted()"
+          [form]="contact"
+          [config]="contactControl()"
+          (visiblyValidChange)="onSectionValidChange('contact', $event)"
+        />
+      </expandable-card>
+    }
+  </div>
+</div>
 `, 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);
       })();
@@ -85998,37 +86191,37 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatButton,
             TranslatePipe,
             FederalUpdateMaintainFormComponent
-          ], template: `<div class="federal-update-maintain-delta-form">\r
-  <federal-update-maintain-form\r
-    class="federal-update-maintain-delta-form-content"\r
-    [form]="form()"\r
-    [task]="task()"\r
-    [errors]="combinedErrors()"\r
-    [isNote]="isNote()"\r
-    [isSubmitted]="submitted()"\r
-    [readonly]="false"\r
-    (visiblyValidChange)="onVisiblyValidChange($event)"\r
-  />\r
-\r
-  <div class="federal-update-maintain-delta-form-actions">\r
-    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
-      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
-    </button>\r
-    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="save.emit()">\r
-      <span class="body-1-semibold">{{ 'Save Changes' | translate }}</span>\r
-    </button>\r
-    <button\r
-      class="submit"\r
-      color="primary"\r
-      mat-flat-button\r
-      [disabled]="actionsDisabled()"\r
-      (click)="onValidate()"\r
-    >\r
-      <span class="body-1-semibold">{{ 'Validate & Generate Draft' | translate }}</span>\r
-    </button>\r
-  </div>\r
-</div>\r
-\r
+          ], template: `<div class="federal-update-maintain-delta-form">
+  <federal-update-maintain-form
+    class="federal-update-maintain-delta-form-content"
+    [form]="form()"
+    [task]="task()"
+    [errors]="combinedErrors()"
+    [isNote]="isNote()"
+    [isSubmitted]="submitted()"
+    [readonly]="false"
+    (visiblyValidChange)="onVisiblyValidChange($event)"
+  />
+
+  <div class="federal-update-maintain-delta-form-actions">
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>
+    </button>
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="save.emit()">
+      <span class="body-1-semibold">{{ 'Save Changes' | translate }}</span>
+    </button>
+    <button
+      class="submit"
+      color="primary"
+      mat-flat-button
+      [disabled]="actionsDisabled()"
+      (click)="onValidate()"
+    >
+      <span class="body-1-semibold">{{ 'Validate & Generate Draft' | translate }}</span>
+    </button>
+  </div>
+</div>
+
 `, styles: ["/* src/app/components/federal/update-maintain/steps/delta/update-maintain-delta-form.component.scss */\n:host .federal-update-maintain-delta-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .federal-update-maintain-delta-form-content {\n  flex: 1;\n  min-height: 0;\n}\n:host .federal-update-maintain-delta-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .federal-update-maintain-delta-form-actions button {\n  margin: 0;\n}\n:host .federal-update-maintain-delta-form-actions .submit {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=update-maintain-delta-form.component.css.map */\n"] }]
         }], null, null);
       })();
@@ -86103,32 +86296,32 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatButton,
             TranslatePipe,
             FederalUpdateMaintainFormComponent
-          ], template: `<div class="federal-update-maintain-preview-form">\r
-  <federal-update-maintain-form\r
-    class="federal-update-maintain-preview-form-content"\r
-    [form]="form()"\r
-    [task]="task()"\r
-    [errors]="errors()"\r
-    [isSubmitted]="false"\r
-    [readonly]="true"\r
-  />\r
-\r
-  <div class="federal-update-maintain-preview-form-actions">\r
-    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
-      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
-    </button>\r
-    <button\r
-      class="submit"\r
-      color="primary"\r
-      mat-flat-button\r
-      [disabled]="actionsDisabled()"\r
-      (click)="file.emit()"\r
-    >\r
-      <span class="body-1-semibold">{{ 'File' | translate }}</span>\r
-    </button>\r
-  </div>\r
-</div>\r
-\r
+          ], template: `<div class="federal-update-maintain-preview-form">
+  <federal-update-maintain-form
+    class="federal-update-maintain-preview-form-content"
+    [form]="form()"
+    [task]="task()"
+    [errors]="errors()"
+    [isSubmitted]="false"
+    [readonly]="true"
+  />
+
+  <div class="federal-update-maintain-preview-form-actions">
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>
+    </button>
+    <button
+      class="submit"
+      color="primary"
+      mat-flat-button
+      [disabled]="actionsDisabled()"
+      (click)="file.emit()"
+    >
+      <span class="body-1-semibold">{{ 'File' | translate }}</span>
+    </button>
+  </div>
+</div>
+
 `, styles: ["/* src/app/components/federal/update-maintain/steps/preview/update-maintain-preview-form.component.scss */\n:host .federal-update-maintain-preview-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .federal-update-maintain-preview-form-content {\n  flex: 1;\n  min-height: 0;\n}\n:host .federal-update-maintain-preview-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .federal-update-maintain-preview-form-actions button {\n  margin: 0;\n}\n:host .federal-update-maintain-preview-form-actions .submit {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=update-maintain-preview-form.component.css.map */\n"] }]
         }], null, null);
       })();
@@ -86549,7 +86742,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             FederalIncorporationPreviewFormComponent,
             FederalUpdateMaintainDeltaFormComponent,
             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"] }]
+          ], template: '@let currentTask = task();\n\n@if (currentTask) {\n  @if (isFormationTask(currentTask)) {\n    @if (activeStep() === steps.Validate) {\n      <federal-incorporation-delta-form\n        [documents]="documents"\n        [selectedDocuments]="selectedDocuments()"\n        (addDocuments)="onAddDocuments($event)"\n        (removeDocument)="onRemoveDocument($event)"\n        (close)="onClose()"\n        (validate)="onValidate()"\n        (save)="onSave()"\n        [task]="currentTask"\n        [errors]="errors()"\n        [actionsDisabled]="actionsDisabled()"\n        [isNote]="isNote()"\n        [form]="deltaForm()"\n      />\n\n    } @else if (activeStep() === steps.FilingPreview) {\n      <federal-incorporation-preview-form (close)="close.emit()" (file)="onFile()" [task]="currentTask"\n                                          [errors]="errors()"\n                                          [actionsDisabled]="actionsDisabled()" [form]="previewForm()"\n                                          [selectedDocuments]="selectedDocuments()"/>\n    }\n  }\n\n  @if (isUpdateMaintainTask(currentTask)) {\n    @if (activeStep() === steps.Validate) {\n      <federal-update-maintain-delta-form\n        [task]="$any(currentTask)"\n        [form]="umDeltaForm()"\n        [actionsDisabled]="actionsDisabled()"\n        [errors]="errors()"\n        [isNote]="isNote()"\n        (validate)="onUmValidate()"\n        (close)="onClose()"\n        (save)="onUmSave()"\n      />\n    }\n\n    @if (activeStep() === steps.FilingPreview) {\n      <federal-update-maintain-preview-form\n        [task]="$any(currentTask)"\n        [form]="umPreviewForm()"\n        [actionsDisabled]="actionsDisabled()"\n        [errors]="errors()"\n        (close)="close.emit()"\n        (file)="onUmSubmit()"\n      />\n    }\n  }\n}\n\n\n\n\n\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);
       })();
       (() => {
@@ -86831,14 +87024,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               throw new Error(`submitInitialReturnValidationToECore: task is not InitialReturn (${signature.task?._taskType})`);
             }
             const fetchFn = opts?.fetchImpl ?? fetch;
+            const entityKey = signature.task.entity._profile.registry_id;
             const CorporationInformation = {
               FilingFormType: _OntarioUpdateMaintainService.getFilingFormType(signature.task),
               Jurisdiction: "ON",
-              CorporationInformation: {
+              CorporationInformation: __spreadValues({
                 CorporationNumber: signature.task.entity._profile.corp_number,
                 CorporationName: signature.task.entity._profile.name,
                 IncorporationDate: signature.task.entity._compliance.incorporation_date
-              }
+              }, entityKey ? { EntityKey: entityKey } : {})
             };
             const url = signature.proxyApiUrl;
             const resp = yield fetchFn(url, {
@@ -86854,15 +87048,25 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               }, opts?.headers ?? {}),
               body: JSON.stringify(CorporationInformation)
             });
-            const data = yield resp.json();
-            return data["ServiceOrderId"];
+            const raw = yield resp.text();
+            const parsed = tryParseJson(raw);
+            if (!parsed.ok) {
+              throw new Error(`eCore returned ${resp.status} ${resp.statusText}: ${raw || "(empty body)"}`);
+            }
+            const data = parsed.value;
+            if (!resp.ok || data?.Errors?.length) {
+              const err = buildValidateError(resp.status, data);
+              err.validateResult = data;
+              throw err;
+            }
+            return data.ServiceOrderId ?? "";
           });
         }
         submitData(signature, id, opts) {
           return __async(this, null, function* () {
             const fetchFn = opts?.fetchImpl ?? fetch;
             const url = signature.proxyApiUrl;
-            yield fetchFn(url, {
+            const resp = yield fetchFn(url, {
               method: "POST",
               headers: __spreadValues({
                 "Content-Type": "application/json",
@@ -86874,6 +87078,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 Cookie: "AWSALB=PpMRL+JDLimOntn4FPEpJ2ZX9rtRbn/7wOE1Ntyq9RGhYPgnJpjAN8xr8R5TyM4v1tBvC62q0YWVR2fQwDLLKWIIQm+U79VccsjiMHRffNr6an9tJNOOdpX94R53; AWSALBCORS=PpMRL+JDLimOntn4FPEpJ2ZX9rtRbn/7wOE1Ntyq9RGhYPgnJpjAN8xr8R5TyM4v1tBvC62q0YWVR2fQwDLLKWIIQm+U79VccsjiMHRffNr6an9tJNOOdpX94R53"
               }, opts?.headers ?? {})
             });
+            const raw = yield resp.text();
+            const parsed = tryParseJson(raw);
+            const errors = parsed.ok ? parsed.value?.Errors : void 0;
+            if (!resp.ok || errors?.length) {
+              const result = parsed.ok ? parsed.value : { Errors: errors ?? [] };
+              const err = buildValidateError(resp.status, result);
+              err.validateResult = result;
+              throw err;
+            }
           });
         }
         getCurrentData(signature, id, opts) {
@@ -86999,6 +87212,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/helpers/initial-return-payload.helper.ts
+  function parseUnitTypeToEnumNumeric(raw) {
+    if (raw === null || raw === void 0 || raw === "")
+      return void 0;
+    const numeric = Number(raw);
+    if (!isNaN(numeric))
+      return numeric;
+    const upper = raw.toString().toUpperCase();
+    const match = Object.entries(ECoreCanadianUnitType).find(([name]) => name.toUpperCase() === upper);
+    if (!match)
+      return void 0;
+    const value = Number(match[1]);
+    return isNaN(value) ? void 0 : value;
+  }
   function irPersonPayloadToDeltaData(payload) {
     if (!payload) {
       return null;
@@ -87014,15 +87240,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     };
   }
   function extractAddressDeltaDataFromInitialReturnAdditionalDetails(details) {
-    const toNum = (v) => {
-      if (v === null || v === void 0 || v === "")
-        return void 0;
-      const n = Number(v);
-      return isNaN(n) ? void 0 : n;
-    };
     const region = details.RegionName ?? details.Region ?? details.Prov ?? "";
     const country = details.CountryCode ?? "";
     const province = country === "CA" ? CANCodeToProvince(region) : country === "US" ? USCodeToState(region) : region;
+    const unitType = parseUnitTypeToEnumNumeric(details.UnitType);
     return __spreadValues(__spreadValues(__spreadValues(__spreadValues({
       streetNumber: details.StreetNumber ?? "",
       streetName: details.StreetName ?? "",
@@ -87031,18 +87252,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       postalCode: details.PostCode ?? void 0,
       country,
       careOf: details.CareOf ?? void 0
-    }, details.StreetType != null && { streetType: details.StreetType }), details.StreetDirection != null && { streetDirection: details.StreetDirection }), toNum(details.UnitType) !== void 0 && { unitType: toNum(details.UnitType) }), details.UnitNumber != null && { unitNumber: details.UnitNumber });
+    }, details.StreetType != null && { streetType: details.StreetType }), details.StreetDirection != null && { streetDirection: details.StreetDirection }), unitType !== void 0 && { unitType }), details.UnitNumber != null && { unitNumber: details.UnitNumber });
   }
   function extractAddressDeltaDataFromInitialReturnAddressContainer(postalAddress) {
     const { AddressLocale, AddressCA, AddressUS, AddressINTL } = postalAddress;
-    const toNum = (v) => {
-      if (v === null || v === void 0 || v === "")
-        return void 0;
-      const n = Number(v);
-      return isNaN(n) ? void 0 : n;
-    };
     if (AddressLocale === "CA" && AddressCA) {
       const region = AddressCA.RegionName ?? AddressCA.Region ?? "";
+      const unitType = parseUnitTypeToEnumNumeric(AddressCA.UnitType);
+      const unitNumber = AddressCA.Address3 ?? AddressCA.Suite ?? null;
       return __spreadValues(__spreadValues(__spreadValues(__spreadValues({
         streetNumber: postalAddress.StreetNumber ?? AddressCA.Address1 ?? "",
         streetName: postalAddress.StreetName ?? AddressCA.Address2 ?? "",
@@ -87051,7 +87268,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         postalCode: postalAddress.PostCode ?? AddressCA.PostCode ?? void 0,
         country: postalAddress.CountryCode ?? AddressCA.CountryCode,
         careOf: postalAddress.CareOf ?? AddressCA.CareOf ?? void 0
-      }, AddressCA.StreetType !== void 0 && { streetType: AddressCA.StreetType ?? "" }), AddressCA.StreetDirection !== void 0 && { streetDirection: AddressCA.StreetDirection ?? "" }), toNum(AddressCA.UnitType) !== void 0 && { unitType: toNum(AddressCA.UnitType) }), AddressCA.Suite != null && { unitNumber: AddressCA.Suite });
+      }, AddressCA.StreetType !== void 0 && { streetType: AddressCA.StreetType ?? "" }), AddressCA.StreetDirection !== void 0 && { streetDirection: AddressCA.StreetDirection ?? "" }), unitType !== void 0 && { unitType }), unitNumber != null && unitNumber !== "" && { unitNumber });
     }
     if (AddressLocale === "US" && AddressUS) {
       const region = AddressUS.RegionName ?? AddressUS.Region ?? "";
@@ -87065,6 +87282,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       };
     }
     if (AddressLocale === "INTL" && AddressINTL) {
+      const unitNumber = AddressINTL.Suite ?? AddressINTL.Address3 ?? null;
       return __spreadValues({
         streetNumber: postalAddress.StreetNumber ?? AddressINTL.Address1 ?? "",
         streetName: postalAddress.StreetName ?? AddressINTL.Address2 ?? "",
@@ -87072,7 +87290,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         province: postalAddress.RegionName ?? AddressINTL.RegionName ?? AddressINTL.Region,
         postalCode: postalAddress.PostCode ?? AddressINTL.PostCode ?? void 0,
         country: postalAddress.CountryCode ?? AddressINTL.CountryCode
-      }, AddressINTL.Suite != null && { unitNumber: AddressINTL.Suite });
+      }, unitNumber != null && unitNumber !== "" && { unitNumber });
     }
     return {
       streetNumber: postalAddress.StreetNumber ?? "",
@@ -87086,14 +87304,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function extractAddressDeltaData(postalAddress) {
     const { AddressLocale, AddressCA, AddressUS, AddressINTL } = postalAddress;
-    const toNum = (v) => {
-      if (v === null || v === void 0 || v === "")
-        return void 0;
-      const n = Number(v);
-      return isNaN(n) ? void 0 : n;
-    };
     if (AddressLocale === "CA" && AddressCA) {
       const region = AddressCA.RegionName ?? AddressCA.Region ?? "";
+      const unitType = parseUnitTypeToEnumNumeric(AddressCA.UnitType);
+      const unitNumber = AddressCA.Suite ?? AddressCA.Address3 ?? null;
       return __spreadValues(__spreadValues(__spreadValues(__spreadValues({
         streetNumber: AddressCA.Address1,
         streetName: AddressCA.Address2,
@@ -87102,7 +87316,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         postalCode: AddressCA.PostCode ?? void 0,
         country: AddressCA.CountryCode,
         careOf: AddressCA.CareOf ?? void 0
-      }, AddressCA.StreetType !== void 0 && { streetType: AddressCA.StreetType ?? "" }), AddressCA.StreetDirection !== void 0 && { streetDirection: AddressCA.StreetDirection ?? "" }), toNum(AddressCA.UnitType) !== void 0 && { unitType: toNum(AddressCA.UnitType) }), AddressCA.Suite != null && { unitNumber: AddressCA.Suite });
+      }, AddressCA.StreetType !== void 0 && { streetType: AddressCA.StreetType ?? "" }), AddressCA.StreetDirection !== void 0 && { streetDirection: AddressCA.StreetDirection ?? "" }), unitType !== void 0 && { unitType }), unitNumber != null && unitNumber !== "" && { unitNumber });
     }
     if (AddressLocale === "US" && AddressUS) {
       const region = AddressUS.RegionName ?? AddressUS.Region ?? "";
@@ -87116,6 +87330,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       };
     }
     if (AddressLocale === "INTL" && AddressINTL) {
+      const unitNumber = AddressINTL.Suite ?? AddressINTL.Address3 ?? null;
       return __spreadValues({
         streetNumber: AddressINTL.Address1,
         streetName: AddressINTL.Address2,
@@ -87123,7 +87338,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         province: AddressINTL.RegionName ?? AddressINTL.Region,
         postalCode: AddressINTL.PostCode ?? void 0,
         country: AddressINTL.CountryCode
-      }, AddressINTL.Suite != null && { unitNumber: AddressINTL.Suite });
+      }, unitNumber != null && unitNumber !== "" && { unitNumber });
     }
     return { streetNumber: "", streetName: "" };
   }
@@ -87177,6 +87392,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   var init_initial_return_payload_helper = __esm({
     "src/app/helpers/initial-return-payload.helper.ts"() {
       init_address_utils();
+      init_transform_utils();
     }
   });
 
@@ -87545,7 +87761,27 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         return ECoreFilingFormType.InitialReturn;
     }
   }
-  function buildOntarioUpdateMaintainValidationRequest(task, deltaData, serviceOrderId) {
+  function buildOntarioUpdateMaintainValidationRequest(task, deltaData, serviceOrderId, corporationInfo) {
+    const initialAdministrators = corporationInfo?.CurrentData.InitialAdministrators;
+    const normalizePersonTitle = (name) => (name ?? "").trim().replace(/\s+/g, " ").toLowerCase();
+    const getCurrentDataAdministrator = (aff, isOfficer) => {
+      const affiliationTitle = normalizePersonTitle(generateAffiliationTitle(aff));
+      if (!affiliationTitle || !initialAdministrators?.length) {
+        return null;
+      }
+      const matchedOfficer = initialAdministrators.find((admin) => {
+        if (!admin || Boolean(admin.IsDirector) === isOfficer) {
+          return false;
+        }
+        const adminTitle = normalizePersonTitle([
+          admin.PersonName?.FirstName,
+          admin.PersonName?.MiddleName,
+          admin.PersonName?.LastName
+        ].filter(Boolean).join(" "));
+        return adminTitle === affiliationTitle;
+      });
+      return matchedOfficer ?? null;
+    };
     const getEmail = (aff) => aff.participant?.communications?.find((c) => c.type.toLowerCase().includes("email"))?.value ?? "";
     const buildPostalAddress = (entityAddress, deltaAddr) => {
       const country = normalizeCountryCode(entityAddress?.country ?? "");
@@ -87553,11 +87789,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       const Region = country === "CA" ? CANProvinceToCode(province) : country === "US" ? USStateToCode(province) : province;
       const streetOnly = getAddressComponent(entityAddress, "Street Only");
       const { StreetName, StreetType: StreetType2, StreetDirection: StreetDirection2 } = parseStreetAddress(streetOnly);
+      const isCanadianAddress = country === "CA";
       const streetNumber = deltaAddr?.streetNumber ?? getAddressComponent(entityAddress, "Street Number Only") ?? "";
-      const streetName = deltaAddr?.streetName ?? StreetName ?? "";
-      const streetType = deltaAddr?.streetType ?? StreetType2 ?? null;
-      const streetDir = deltaAddr?.streetDirection ?? (StreetDirection2 ? StreetDirection2 : null);
-      const unitType = deltaAddr?.unitType ?? null;
+      const streetName = isCanadianAddress ? deltaAddr?.streetName ?? StreetName ?? "" : streetOnly ?? "";
+      const streetType = isCanadianAddress ? deltaAddr?.streetType ?? StreetType2 ?? null : null;
+      const streetDir = isCanadianAddress ? deltaAddr?.streetDirection ?? (StreetDirection2 ? StreetDirection2 : null) : null;
+      const unitType = isCanadianAddress ? deltaAddr?.unitType ?? null : null;
       const unitNumber = deltaAddr?.unitNumber ?? getAddressComponent(entityAddress, "Suite/Apartment") ?? null;
       const careOf = getAddressComponent(entityAddress, "Attention") || entityAddress?.attention || "";
       const AddressLocale = country === "CA" ? "CA" : country === "US" ? "US" : "INTL";
@@ -87576,7 +87813,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           RegionName: Region,
           CareOf: careOf,
           StreetNumberSuffix: "",
-          StreetType: streetType.toString(),
+          StreetType: streetType?.toString(),
           StreetDirection: streetDir,
           UnitType: mapUnitTypeToEcore(unitType)
         } : null,
@@ -87611,92 +87848,106 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       const middleName = profile.middleName ?? "";
       const lastName = profile.lastName ?? "";
       const email = getEmail(aff);
-      const electedDate = toYyyyMmDd(new Date(aff.start_date)) ?? "";
+      const electedDate = toYyyyMmDd(aff.start_date) ?? "";
       const ceaseDate = toYyyyMmDd(aff.end_date) ?? "";
       const residentCanadian = String(deltaEntry?.residentCanadian ?? false);
       const entityAddr = aff.addresses?.at(0) || aff.parent_affiliation?.addresses?.at(0);
       const PostalAddress = buildPostalAddress(entityAddr, deltaEntry?.address);
       const PersonName = { FirstName: firstName, MiddleName: middleName, LastName: lastName };
-      const position = isOfficer ? OFFICER_TITLE_TO_ECORE_POSITION_CODE[aff.role?.static_title ?? ""] ?? "" : "Director";
-      const positionName = ECORE_POSITION_CODE_TO_POSITION_NAME[position] ?? "Director";
+      const position = isOfficer ? OFFICER_TITLE_TO_ECORE_POSITION_CODE[toTitleCase(aff.role?.static_title ?? "")] ?? "" : "Director";
+      const matchingAdmin = getCurrentDataAdministrator(aff, isOfficer);
+      const isCeaseAction = currentState === IRCurrentState.Ceased;
+      const isDirectorFromRole = aff.role?.role_name === "Director";
+      const mappedCurrentStateName = currentState === IRCurrentState.Added ? "Added" : currentState === IRCurrentState.Ceased ? "Ceased" : "Edited";
+      const mappedId = matchingAdmin?.Id ?? "";
+      const mappedRoleId = matchingAdmin?.RoleId ?? "";
+      const personNameRoleId = isOfficer ? matchingAdmin?.RoleId ?? null : null;
+      const mappedCeaseDate = currentState === IRCurrentState.Ceased ? ceaseDate : "";
+      const mappedElectedDate = currentState === IRCurrentState.Added ? electedDate : "";
+      const positionName = ECORE_POSITION_CODE_TO_POSITION_NAME[position?.toUpperCase()];
       if (!isOfficer) {
         switch (currentState) {
           case IRCurrentState.Added:
             return {
-              Id: 5,
-              CeaseDate: "",
+              Id: mappedId,
+              RoleId: mappedRoleId,
+              CeaseDate: mappedCeaseDate,
               CeasedAppointedRoles: [
                 {
-                  Id: aff._id,
-                  Position: position,
-                  PositionFullName: positionName,
+                  State: "",
+                  StateName: "",
+                  Position: "Director",
+                  PositionFullName: "Director",
+                  CeasedDate: "",
                   AppointedDate: electedDate
                 }
               ],
-              ElectedDate: electedDate,
+              ElectedDate: mappedElectedDate,
               EmailAddress: email,
-              IsDirector: true,
-              PersonName: __spreadProps(__spreadValues({}, PersonName), { Position: null }),
+              IsDirector: isDirectorFromRole,
+              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: personNameRoleId, Position: null }),
               OfficerPosition: "",
               OfficerPositionName: "",
               OfficerPositionSpecified: false,
               PostalAddress,
               ResidentCanadian: residentCanadian,
               IsInvalid: false,
-              CurrentState: currentState
+              CurrentState: currentState,
+              CurrentStateName: mappedCurrentStateName
             };
           case IRCurrentState.Ceased:
             return {
-              OfficerPosition: 0,
+              OfficerPosition: "",
               OfficerPositionSpecified: false,
               OfficerId: null,
+              CeaseDate: mappedCeaseDate,
+              ElectedDate: mappedElectedDate,
               CeasedAppointedRoles: [
                 {
-                  State: IRCurrentState.Added,
-                  StateName: "Changed",
-                  Position: null,
+                  State: matchingAdmin && isCeaseAction ? IRCurrentState.Ceased : "",
+                  StateName: matchingAdmin && isCeaseAction ? "Ceased" : "",
+                  Position: "Director",
                   PositionFullName: "Director",
-                  CeasedDate: ceaseDate,
-                  AppointedDate: electedDate,
-                  AppointedDateSpecified: true,
-                  EditAppointedDate: false
+                  CeasedDate: matchingAdmin && isCeaseAction ? ceaseDate : "",
+                  AppointedDate: ""
                 }
               ],
               CurrentState: currentState,
-              CurrentStateName: "Unchanged",
-              OfficerPositionName: "Director",
-              Id: aff._id,
-              RoleId: aff.role?.role_name ?? "",
-              IsDirector: true,
+              CurrentStateName: mappedCurrentStateName,
+              OfficerPositionName: "",
+              Id: mappedId,
+              RoleId: mappedRoleId,
+              IsDirector: isDirectorFromRole,
               ResidentCanadian: residentCanadian,
-              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: aff.role?.role_name ?? "", Position: null })
+              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: personNameRoleId, Position: null }),
+              PostalAddress,
+              EmailAddress: email
             };
           case IRCurrentState.Changed:
             return {
-              OfficerPosition: 0,
+              OfficerPosition: "",
+              OfficerPositionSpecified: false,
               OfficerId: null,
               CeasedAppointedRoles: [
                 {
-                  State: 1,
-                  StateName: "Unchanged",
-                  Position: null,
+                  State: matchingAdmin && isCeaseAction ? IRCurrentState.Ceased : "",
+                  StateName: matchingAdmin && isCeaseAction ? "Ceased" : "",
+                  Position: "Director",
                   PositionFullName: "Director",
-                  CeasedDate: ceaseDate,
-                  AppointedDate: electedDate,
-                  AppointedDateSpecified: true,
-                  EditAppointedDate: false
+                  CeasedDate: matchingAdmin && isCeaseAction ? ceaseDate : "",
+                  AppointedDate: ""
                 }
               ],
-              CurrentState: 1,
-              CurrentStateName: "Unchanged",
-              OfficerPositionName: "Director",
-              Id: aff._id,
-              RoleId: aff.role?.role_name ?? "",
-              IsDirector: true,
+              CurrentState: currentState,
+              CurrentStateName: mappedCurrentStateName,
+              OfficerPositionName: "",
+              Id: mappedId,
+              RoleId: mappedRoleId,
+              IsDirector: isDirectorFromRole,
               ResidentCanadian: residentCanadian,
-              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: aff.role?.role_name ?? "", Position: null }),
-              CeaseDate: "",
-              ElectedDate: "",
+              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: personNameRoleId, Position: null }),
+              CeaseDate: mappedCeaseDate,
+              ElectedDate: mappedElectedDate,
               CeasedDateSpecified: false,
               PostalAddress,
               EmailAddress: email,
@@ -87708,80 +87959,87 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         switch (currentState) {
           case IRCurrentState.Added:
             return {
-              Id: aff._id,
-              CeaseDate: "",
+              Id: mappedId,
+              RoleId: mappedRoleId,
+              OfficerId: matchingAdmin?.Id ?? "",
+              CeaseDate: mappedCeaseDate,
               CeasedAppointedRoles: [
                 {
-                  Id: aff._id,
+                  State: "",
+                  StateName: "",
                   Position: position,
                   PositionFullName: positionName,
+                  CeasedDate: "",
                   AppointedDate: electedDate
                 }
               ],
-              ElectedDate: electedDate,
+              ElectedDate: mappedElectedDate,
               EmailAddress: email,
-              IsDirector: false,
-              PersonName,
+              IsDirector: isDirectorFromRole,
+              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: personNameRoleId }),
               OfficerPosition: position,
+              Position: position,
+              PositionName: positionName,
               OfficerPositionName: positionName,
               OfficerPositionSpecified: true,
               PostalAddress,
               ResidentCanadian: residentCanadian,
               IsInvalid: false,
-              CurrentState: 5
+              CurrentState: currentState,
+              CurrentStateName: mappedCurrentStateName
             };
           case IRCurrentState.Ceased:
             return {
               OfficerPosition: 0,
               OfficerPositionSpecified: true,
-              OfficerId: null,
+              OfficerId: matchingAdmin?.Id ?? "",
+              CeaseDate: mappedCeaseDate,
+              ElectedDate: mappedElectedDate,
               CeasedAppointedRoles: [
                 {
-                  State: 2,
-                  StateName: "Changed",
+                  State: matchingAdmin && isCeaseAction ? IRCurrentState.Ceased : "",
+                  StateName: matchingAdmin && isCeaseAction ? "Ceased" : "",
                   Position: position,
                   PositionFullName: positionName,
-                  CeasedDate: ceaseDate,
-                  AppointedDate: electedDate,
-                  AppointedDateSpecified: true,
-                  EditAppointedDate: false
+                  CeasedDate: matchingAdmin && isCeaseAction ? ceaseDate : "",
+                  AppointedDate: ""
                 }
               ],
               CurrentState: IRCurrentState.Ceased,
-              CurrentStateName: "Unchanged",
+              CurrentStateName: mappedCurrentStateName,
               OfficerPositionName: positionName,
-              Id: aff._id,
-              RoleId: aff.role?.role_name ?? "",
-              IsDirector: false,
+              Id: mappedId,
+              RoleId: mappedRoleId,
+              IsDirector: isDirectorFromRole,
               ResidentCanadian: residentCanadian,
-              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: aff.role?.role_name ?? "", Position: null })
+              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: personNameRoleId, Position: null }),
+              PostalAddress,
+              EmailAddress: email
             };
           case IRCurrentState.Changed:
             return {
               OfficerPosition: 0,
-              OfficerId: null,
+              OfficerId: matchingAdmin?.Id ?? "",
               CeasedAppointedRoles: [
                 {
-                  State: 1,
-                  StateName: "Unchanged",
+                  State: matchingAdmin && isCeaseAction ? IRCurrentState.Ceased : "",
+                  StateName: matchingAdmin && isCeaseAction ? "Ceased" : "",
                   Position: position,
                   PositionFullName: positionName,
-                  CeasedDate: ceaseDate,
-                  AppointedDate: electedDate,
-                  AppointedDateSpecified: true,
-                  EditAppointedDate: false
+                  CeasedDate: matchingAdmin && isCeaseAction ? ceaseDate : "",
+                  AppointedDate: ""
                 }
               ],
-              CurrentState: 1,
-              CurrentStateName: "Unchanged",
+              CurrentState: currentState,
+              CurrentStateName: mappedCurrentStateName,
               OfficerPositionName: positionName,
-              Id: aff._id,
-              RoleId: aff.role?.role_name ?? "",
-              IsDirector: false,
+              Id: mappedId,
+              RoleId: mappedRoleId,
+              IsDirector: isDirectorFromRole,
               ResidentCanadian: residentCanadian,
-              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: aff.role?.role_name ?? "", Position: position }),
-              CeaseDate: ceaseDate,
-              ElectedDate: electedDate,
+              PersonName: __spreadProps(__spreadValues({}, PersonName), { RoleId: personNameRoleId, Position: position }),
+              CeaseDate: mappedCeaseDate,
+              ElectedDate: mappedElectedDate,
               CeasedDateSpecified: false,
               PostalAddress,
               EmailAddress: email,
@@ -87792,18 +88050,30 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       }
       return null;
     };
-    const { incomingAffiliations = [], outgoingAffiliations = [], editedAffiliations = [] } = task;
+    const { incomingAffiliations = [], outgoingAffiliations = [] } = task;
     const isDirectorAff = (aff) => isPrincipalAffiliation2(aff) && aff.role.role_name === "Director";
     const isOfficerAff = (aff) => isPrincipalAffiliation2(aff) && aff.role.role_name === "Officer";
+    const hasCurrentName = (deltaEntry) => {
+      const currentName = deltaEntry?.currentName;
+      return typeof currentName === "string" && currentName.trim().length > 0;
+    };
+    const incomingDirectors = incomingAffiliations.filter(isDirectorAff);
+    const outgoingDirectors = outgoingAffiliations.filter(isDirectorAff);
+    const addedDirectors = incomingDirectors.filter((a) => !hasCurrentName(deltaData.directors?.[a._id]));
+    const editedDirectors = incomingDirectors.filter((a) => hasCurrentName(deltaData.directors?.[a._id]));
+    const incomingOfficers = incomingAffiliations.filter(isOfficerAff);
+    const outgoingOfficers = outgoingAffiliations.filter(isOfficerAff);
+    const addedOfficers = incomingOfficers.filter((a) => !hasCurrentName(deltaData.officers?.[a._id]));
+    const editedOfficers = incomingOfficers.filter((a) => hasCurrentName(deltaData.officers?.[a._id]));
     const ChangeDirectors = {
-      AddedDirectors: incomingAffiliations.filter(isDirectorAff).map((a) => buildPersonPayload(a, IRCurrentState.Added, deltaData.directors[a._id])),
-      CeasedDirectors: outgoingAffiliations.filter(isDirectorAff).map((a) => buildPersonPayload(a, IRCurrentState.Ceased, deltaData.directors[a._id])),
-      EditedDirectors: editedAffiliations.filter(isDirectorAff).map((a) => buildPersonPayload(a, IRCurrentState.Changed, deltaData.directors[a._id]))
+      AddedDirectors: addedDirectors.map((a) => buildPersonPayload(a, IRCurrentState.Added, deltaData.directors?.[a._id])),
+      CeasedDirectors: outgoingDirectors.map((a) => buildPersonPayload(a, IRCurrentState.Ceased, deltaData.directors?.[a._id])),
+      EditedDirectors: editedDirectors.map((a) => buildPersonPayload(a, IRCurrentState.Changed, deltaData.directors?.[a._id]))
     };
     const ChangeOfficers = {
-      AddedOfficers: incomingAffiliations.filter(isOfficerAff).map((a) => buildPersonPayload(a, IRCurrentState.Added, deltaData.officers[a._id], true)),
-      CeasedOfficers: outgoingAffiliations.filter(isOfficerAff).map((a) => buildPersonPayload(a, IRCurrentState.Ceased, deltaData.officers[a._id], true)),
-      EditedOfficers: editedAffiliations.filter(isOfficerAff).map((a) => buildPersonPayload(a, IRCurrentState.Changed, deltaData.officers[a._id], true))
+      AddedOfficers: addedOfficers.map((a) => buildPersonPayload(a, IRCurrentState.Added, deltaData.officers?.[a._id], true)),
+      CeasedOfficers: outgoingOfficers.map((a) => buildPersonPayload(a, IRCurrentState.Ceased, deltaData.officers?.[a._id], true)),
+      EditedOfficers: editedOfficers.map((a) => buildPersonPayload(a, IRCurrentState.Changed, deltaData.officers?.[a._id], true))
     };
     const cert = task._ext?.certified ?? {};
     const certEntityAddr = cert.address;
@@ -87813,7 +88083,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const isOfficerCert = cert.type !== "Director";
     const certDeltaAddr = deltaData.certifiedBy?.address;
     const certStreetOnly = getAddressComponent(certEntityAddr, "Street Only");
-    const { StreetType: certStreetType, StreetDirection: certStreetDir } = parseStreetAddress(certStreetOnly);
+    const { StreetName: certStreetName, StreetType: certStreetType, StreetDirection: certStreetDir } = parseStreetAddress(certStreetOnly);
+    const isCanadianCertifierAddress = certifierCountry === "CA";
     const certifier = {
       PersonName: {
         FirstName: cert.firstName,
@@ -87828,13 +88099,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         AddressType: "standard",
         StreetNumberSuffix: "",
         StreetNumber: certDeltaAddr?.streetNumber ?? getAddressComponent(certEntityAddr, "Street Number Only") ?? "",
-        StreetName: (() => {
-          const { StreetName } = parseStreetAddress(certStreetOnly);
-          return certDeltaAddr?.streetName ?? StreetName ?? "";
-        })(),
-        StreetType: certDeltaAddr?.streetType ?? certStreetType ?? null,
-        StreetDirection: certDeltaAddr?.streetDirection ?? (certStreetDir ? certStreetDir : null),
-        UnitType: mapUnitTypeToEcore((certDeltaAddr?.unitType ?? "").toString()) ?? null,
+        StreetName: isCanadianCertifierAddress ? certDeltaAddr?.streetName ?? certStreetName ?? "" : certStreetOnly ?? "",
+        StreetType: isCanadianCertifierAddress ? certDeltaAddr?.streetType ?? certStreetType ?? null : null,
+        StreetDirection: isCanadianCertifierAddress ? certDeltaAddr?.streetDirection ?? (certStreetDir ? certStreetDir : null) : null,
+        UnitType: isCanadianCertifierAddress ? mapUnitTypeToEcore((certDeltaAddr?.unitType ?? "").toString()) ?? null : null,
         UnitNumber: certDeltaAddr?.unitNumber ?? getAddressComponent(certEntityAddr, "Suite/Apartment") ?? null,
         CityTown: certEntityAddr?.city ?? null,
         PostCode: certEntityAddr?.postal_zip ?? null,
@@ -87848,16 +88116,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const regRegion = regCountry === "CA" ? CANProvinceToCode(regProvince) : regCountry === "US" ? USStateToCode(regProvince) : regProvince;
     const regDelta = deltaData.registeredOfficeAddress;
     const initType = ["CA", "US"].includes(regCountry) ? `address${regCountry}` : "addressINTL";
+    const regStreetOnly = getAddressComponent(regOfficeEntityAddr, "Street Only");
+    const { StreetName: regStreetName, StreetType: regStreetType, StreetDirection: regStreetDirection } = parseStreetAddress(regStreetOnly);
+    const isCanadianRegisteredOffice = regCountry === "CA";
     const RegisteredHeadOfficeAddress = {
       AddressStandardLot: "standard",
       CareOf: getAddressComponent(regOfficeEntityAddr, "Attention") || regOfficeEntityAddr?.attention || null,
-      UnitType: mapUnitTypeToEcore((regDelta?.unitType ?? "").toString()) ?? null,
-      UnitNumber: regDelta.unitNumber ?? null,
-      StreetNumber: regDelta.streetNumber,
+      UnitType: isCanadianRegisteredOffice ? mapUnitTypeToEcore((regDelta?.unitType ?? "").toString()) ?? null : null,
+      UnitNumber: regDelta?.unitNumber ?? null,
+      StreetNumber: regDelta?.streetNumber,
       StreetNumberSuffix: "",
-      StreetName: regDelta.streetName,
-      StreetType: regDelta.streetType ?? null,
-      StreetDirection: regDelta.streetDirection ?? null,
+      StreetName: isCanadianRegisteredOffice ? regDelta?.streetName ?? regStreetName ?? "" : regStreetOnly ?? "",
+      StreetType: isCanadianRegisteredOffice ? regDelta?.streetType ?? regStreetType ?? null : null,
+      StreetDirection: isCanadianRegisteredOffice ? regDelta?.streetDirection ?? regStreetDirection ?? null : null,
       StreetAddressContinued: getAddressComponent(regOfficeEntityAddr, "Suite/Apartment") ?? "",
       CityTown: regOfficeEntityAddr?.city ?? null,
       Region: regRegion,
@@ -87868,11 +88139,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     };
     const authorizationType = ["Director", "Officer"].includes(cert.type ?? "") ? AuthorizationType.DirectorOrOfficer : AuthorizationType.Other;
     const isOther = authorizationType === AuthorizationType.Other;
+    const contactAffiliation = deltaData.contactUid ? task.entity.affiliations?.find((aff) => aff._id === deltaData.contactUid) : void 0;
+    const ContactInformation = contactAffiliation ? OntarioUpdateMaintainFormHelper.generateContact(contactAffiliation) : null;
     const filingFormKey = getFilingFormKey(task);
     const filingFormType = getFilingFormType(task);
     const eCoreFilingFormType = getInnerECoreFilingFormType(task);
     const isAnnualReturn = isAnnualReturnTask(task);
     const annualReturnYear = isAnnualReturn ? (new Date(task._ext?._reference_date).getFullYear() || (/* @__PURE__ */ new Date()).getFullYear()).toString() : void 0;
+    const officialBusinessEmail = regOfficeEntityAddr?.communications?.find((c) => c.type === "Business Email")?.value;
+    const OfficialEmail = officialBusinessEmail ? { Email: officialBusinessEmail, ConfirmEmail: officialBusinessEmail } : corporationInfo?.CurrentData?.OfficialEmail ?? null;
+    const naics = task.entity._profile?.naics;
+    const PrimaryBusinessActivity = naics?.code ? { NAICSCode: naics.code, PrimaryActivity: naics.description } : corporationInfo?.CurrentData?.PrimaryBusinessActivity ?? null;
     return {
       Jurisdiction: "ON",
       FilingFormType: filingFormType,
@@ -87889,10 +88166,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 MiddleName: cert.middleName
               },
               CurrentData: __spreadProps(__spreadValues({
-                Reference: deltaData.referenceNumbers?.referenceNumber ?? null,
-                Docket: deltaData.referenceNumbers?.docketNumber ?? null,
+                Reference: deltaData.referenceNumbers?.referenceNumber ?? corporationInfo?.CurrentData?.Reference ?? null,
+                Docket: deltaData.referenceNumbers?.docketNumber ?? corporationInfo?.CurrentData?.Docket ?? null,
                 EntityIdentifier: Number(task.entity._profile.corp_number)
               }, isAnnualReturn ? { AnnualReturnYear: annualReturnYear } : {}), {
+                OfficialEmail,
+                PrimaryBusinessActivity,
                 ChangeCertification: {
                   DirectorOfficerCertifier: !isOther ? __spreadProps(__spreadValues({}, certifier), {
                     directorOrOfficer: isOfficerCert ? "officer" : "director"
@@ -87900,20 +88179,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                   IndividualCertifier: isOther ? certifier : null,
                   AuthorizationType: authorizationType
                 },
-                ContactInformation: {
-                  EmailAddress: "noreply@dyedurham.com",
-                  PersonName: {
-                    FirstName: "test",
-                    LastName: "test",
-                    MiddleName: "test"
-                  },
-                  PhoneNumber: {
-                    AreaCode: "100",
-                    CountryTelephoneCode: "0000000",
-                    Extension: "",
-                    TelephoneNumber: "0000000"
-                  }
-                },
+                ContactInformation,
                 RegisteredHeadOfficeAddress,
                 ChangeDirectors,
                 ChangeOfficers
@@ -87932,6 +88198,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_address_utils();
       init_common_models();
       init_initial_return_enums();
+      init_ontario_update_maintain_helper();
       init_InitialReturnMapping();
     }
   });
@@ -88220,6 +88487,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         isOntarioTask = isOntarioTask;
         ontario = viewChild(OntarioComponent);
         federal = viewChild(FederalComponent);
+        currentData = null;
         _signature = computed(() => {
           const task = this.task();
           const config2 = this.config();
@@ -88308,7 +88576,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.translate.use(this.language() || "en");
             }
           });
-          effect(() => {
+          effect(() => __async(this, null, function* () {
             const task = this.task();
             const deltaData = task?.deltaData;
             if (!task) {
@@ -88321,19 +88589,30 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               }
               if (serviceOrderId && !this.dataWasChanged()) {
                 this.serviceOrderId = serviceOrderId;
-              } else {
-                this.isLoading.set(true);
-                this.getInitialReturnServiceId().then((id) => __async(this, null, function* () {
-                  this.serviceOrderId = id;
-                  const signature = this._signature();
-                  if (signature) {
-                    yield this.updateMaintainService.submitData(signature, id, this.validateOptions());
-                    const data = yield this.updateMaintainService.getCurrentData(signature, id, this.validateOptions());
-                    this.prevData.set(corporationInfoToPersonnelDeltaData(data));
-                    this.isLoading.set(false);
-                  }
-                }));
               }
+              yield this.getCurrentData();
+            }
+          }));
+        }
+        getCurrentData() {
+          return __async(this, null, function* () {
+            const signature = this._signature();
+            if (!signature) {
+              return;
+            }
+            this.isLoading.set(true);
+            this.errors.set([]);
+            try {
+              if (!this.serviceOrderId) {
+                this.serviceOrderId = yield this.getInitialReturnServiceId();
+                yield this.updateMaintainService.submitData(signature, this.serviceOrderId, this.validateOptions());
+                this.currentData = yield this.updateMaintainService.getCurrentData(signature, this.serviceOrderId, this.validateOptions());
+                this.prevData.set(corporationInfoToPersonnelDeltaData(this.currentData));
+              }
+            } catch (error) {
+              this.handleCatchError(error);
+            } finally {
+              this.isLoading.set(false);
             }
           });
         }
@@ -88595,7 +88874,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             const signature = this._signature();
             if (signature) {
               try {
-                const requestBody = buildOntarioUpdateMaintainValidationRequest(task, deltaData, this.serviceOrderId);
+                const requestBody = buildOntarioUpdateMaintainValidationRequest(task, deltaData, this.serviceOrderId, this.currentData);
                 const response = yield this.updateMaintainService.submitInitialReturnValidationToECore(signature, requestBody, this.validateOptions());
                 if (this.hasResponseErrors(response))
                   return;
@@ -88631,8 +88910,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }
         onEditClick() {
           if (isUpdateMaintain(this.task())) {
-            this.activeStep.set(Step.Validate);
-            return;
+            this.serviceOrderId = "";
+            void this.getCurrentData();
           }
           this.activeStep.set(Step.Validate);
         }
@@ -88656,10 +88935,23 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
          */
         handleCatchError(response) {
           console.error(response);
-          const errors = JSON.parse(JSON.stringify(response))?.validateResult?.["Errors"];
+          if (response instanceof Error) {
+            this.errors.set([response.message]);
+            return;
+          }
+          let parsed = response;
+          try {
+            parsed = JSON.parse(JSON.stringify(response));
+          } catch {
+            parsed = void 0;
+          }
+          const errors = parsed?.validateResult?.["Errors"];
           if (errors?.length) {
             this.errors.set(this.parseError(errors));
+            return;
           }
+          const fallbackMessage = parsed?.message || (typeof parsed === "string" ? parsed : "") || "An unexpected error occurred. Please try again.";
+          this.errors.set([fallbackMessage]);
         }
         onClose() {
           const task = this.task();
@@ -88738,7 +89030,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             if (!serviceOrderId) {
               return void 0;
             }
-            return buildOntarioUpdateMaintainValidationRequest(task, deltaData, serviceOrderId);
+            return buildOntarioUpdateMaintainValidationRequest(task, deltaData, serviceOrderId, this.currentData);
           }
           if (isUpdateMaintain(task)) {
             return buildFederalUpdateMaintainValidationRequest(deltaData, task);
@@ -88816,78 +89108,78 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             OntarioComponent
           ], encapsulation: ViewEncapsulation.ShadowDom, host: {
             "[style.height]": "modalHeight()"
-          }, template: `<div class="filing">\r
-  <div class="filing-title">\r
-    <h1 class="filing-title-text">{{title() | translate}}</h1>\r
-    <mat-icon (click)="onClose()" class="filing-title-action">close</mat-icon>\r
-  </div>\r
-\r
-  @if (isEditButton()) {\r
-  <div class="filing-header">\r
-      <button\r
-        mat-stroked-button\r
-        [disabled]="isLoading()"\r
-        (click)="onEditClick()"\r
-      >\r
-        {{ 'Edit' | translate }}\r
-      </button>\r
-  </div>\r
-  }\r
-\r
-  <div [class.edit]="isEditButton()" class="filing-content">\r
-    @let currentTask = task();\r
-\r
-    @if (currentTask) {\r
-      @if (isOntarioTask(currentTask)) {\r
-        <ontario\r
-          [task]="currentTask"\r
-          [activeStep]="activeStep()"\r
-          [isNote]="dataWasChanged()"\r
-          [actionsDisabled]="isLoading()"\r
-          [errors]="errors()"\r
-          [prevData]="prevData()"\r
-          (close)="close.emit()"\r
-          (formationValidate)="onOntarioFormationValidate($event)"\r
-          (saveFormationDeltaData)="onOntarioFormationSave($event)"\r
-          (formationSubmit)="onOntarioFormationSubmit()"\r
-          (nextStep)="onNextStepClick()"\r
-          (prevStep)="onOntarioPrevStep()"\r
-          [irValidationConfig]="validationConfig()"\r
-          (irValidate)="validateAndFileInitialReturnTask($event)"\r
-          (saveIrDeltaData)="onOntarioUpdateMaintainSave($event)"\r
-          (irSubmit)="onInitialReturnSubmit()"\r
-        />\r
-      } @else {\r
-        <federal\r
-          [actionsDisabled]="isLoading()"\r
-          [isNote]="dataWasChanged()"\r
-          [activeStep]="activeStep()"\r
-          [task]="currentTask"\r
-          [errors]="errors()"\r
-          (close)="close.emit()"\r
-          (deltaDataChange)="onFederalFormationSave($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
-    }\r
-\r
-    @if (isLoading()) {\r
-      <div class="filing-content-loading">\r
-        <mat-spinner [diameter]="40" />\r
-      </div>\r
-    }\r
-  </div>\r
-</div>\r
+          }, template: `<div class="filing">
+  <div class="filing-title">
+    <h1 class="filing-title-text">{{title() | translate}}</h1>
+    <mat-icon (click)="onClose()" class="filing-title-action">close</mat-icon>
+  </div>
+
+  @if (isEditButton()) {
+  <div class="filing-header">
+      <button
+        mat-stroked-button
+        [disabled]="isLoading()"
+        (click)="onEditClick()"
+      >
+        {{ 'Edit' | translate }}
+      </button>
+  </div>
+  }
+
+  <div [class.edit]="isEditButton()" class="filing-content">
+    @let currentTask = task();
+
+    @if (currentTask) {
+      @if (isOntarioTask(currentTask)) {
+        <ontario
+          [task]="currentTask"
+          [activeStep]="activeStep()"
+          [isNote]="dataWasChanged()"
+          [actionsDisabled]="isLoading()"
+          [errors]="errors()"
+          [prevData]="prevData()"
+          (close)="close.emit()"
+          (formationValidate)="onOntarioFormationValidate($event)"
+          (saveFormationDeltaData)="onOntarioFormationSave($event)"
+          (formationSubmit)="onOntarioFormationSubmit()"
+          (nextStep)="onNextStepClick()"
+          (prevStep)="onOntarioPrevStep()"
+          [irValidationConfig]="validationConfig()"
+          (irValidate)="validateAndFileInitialReturnTask($event)"
+          (saveIrDeltaData)="onOntarioUpdateMaintainSave($event)"
+          (irSubmit)="onInitialReturnSubmit()"
+        />
+      } @else {
+        <federal
+          [actionsDisabled]="isLoading()"
+          [isNote]="dataWasChanged()"
+          [activeStep]="activeStep()"
+          [task]="currentTask"
+          [errors]="errors()"
+          (close)="close.emit()"
+          (deltaDataChange)="onFederalFormationSave($event)"
+          (file)="onFederalFormationSubmit()"
+          (validate)="onFederalValidate($event)"
+          (umSave)="onFederalUpdateMaintainSave($event)"
+          (umValidate)="onFederalUpdateMaintainValidate($event)"
+          (umSubmit)="onFederalUpdateMaintainSubmit()"
+          (nextStep)="defineInitialStep()"
+        />
+      }
+    }
+
+    @if (isLoading()) {
+      <div class="filing-content-loading">
+        <mat-spinner [diameter]="40" />
+      </div>
+    }
+  </div>
+</div>
 `, styles: ["/* src/app/components/filing/filing.component.scss */\n:host {\n  display: flex;\n}\n:host .filing {\n  position: relative;\n  height: 100%;\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .filing-title {\n  width: 100%;\n  display: flex;\n  align-items: center;\n  justify-content: space-between;\n}\n:host .filing-title-text {\n  color: #666666;\n}\n:host .filing-title-action {\n  cursor: pointer;\n}\n:host .filing-header {\n  display: flex;\n  width: 100%;\n  justify-content: flex-end;\n}\n:host .filing-content {\n  height: calc(100% - 44px);\n}\n:host .filing-content.edit {\n  height: calc(100% - 95px);\n}\n:host .filing-content-loading {\n  display: flex;\n  align-items: center;\n  justify-content: center;\n  position: absolute;\n  background: transparent;\n  top: 0;\n  left: 0;\n  right: 0;\n  bottom: 0;\n}\n.pointer {\n  cursor: pointer;\n}\n/*# sourceMappingURL=filing.component.css.map */\n", '/* src/app/components/filing/typography.scss */\n:host {\n  --filing-modal-color-grey: #444444;\n  --filing-modal-color-dark-blue: #485673;\n  --filing-modal-color-grey-mid: #A0A0A0;\n  --filing-modal-color-light-blue: #3778E4;\n  --filing-modal-color-black: #444444;\n}\nmat-icon {\n  font-family: "Material Icons" !important;\n  font-size: 20px;\n  height: 20px;\n  width: 20px;\n  line-height: 20px;\n}\nh1 {\n  font-size: 24px;\n  line-height: 28px;\n  font-weight: 700;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh2 {\n  font-size: 22px;\n  line-height: 26px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh3 {\n  font-size: 18px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin-top: 0;\n  margin-bottom: 0;\n}\nh4 {\n  font-size: 16px;\n  line-height: 22px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\nh4 {\n  font-size: 16px;\n  line-height: 20px;\n  font-weight: 600;\n  font-family: "Open Sans";\n  margin: 0;\n}\n.body-1-regular {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-1-bold {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\n.body-1-semibold {\n  line-height: 20px;\n  font-size: 14px !important;\n  font-weight: 600;\n  font-family: "Open Sans";\n}\n.body-2-regular {\n  line-height: 20px;\n  font-size: 12px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-2-bold {\n  line-height: 20px;\n  font-size: 12px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\n.body-3-regular {\n  line-height: 20px;\n  font-size: 16px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-4-regular {\n  line-height: 18px;\n  font-size: 18px !important;\n  font-weight: 400;\n  font-family: "Open Sans";\n}\n.body-4-bold {\n  line-height: 20px;\n  font-size: 20px !important;\n  font-weight: 700;\n  font-family: "Open Sans";\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6,\np {\n  margin: 0;\n}\n.black {\n  color: var(--filing-modal-color-black);\n}\n.grey {\n  color: var(--filing-modal-color-grey);\n}\n.dark-blue {\n  color: var(--filing-modal-color-dark-blue);\n}\n.grey-mid {\n  color: var(--filing-modal-color-grey-mid);\n}\n.light-blue {\n  color: var(--filing-modal-color-light-blue);\n}\n/*# sourceMappingURL=typography.css.map */\n', '/* src/app/components/filing/material-theme.scss */\n.filling {\n  height: 100%;\n  overflow: hidden;\n}\n* {\n  box-sizing: border-box;\n}\nh1,\nh2,\nh3,\nh4,\nh5,\nh6 {\n  margin: 0;\n}\n.filling {\n  margin: 0;\n  font-family: "Helvetica Neue", sans-serif;\n}\n.filing {\n  --app-font-family:\n    -apple-system,\n    BlinkMacSystemFont,\n    "Helvetica Neue",\n    Helvetica,\n    Arial,\n    sans-serif;\n  --mat-sys-background: #faf9fd;\n  --mat-sys-error: #ba1a1a;\n  --mat-sys-error-container: #ffdad6;\n  --mat-sys-inverse-on-surface: #f2f0f4;\n  --mat-sys-inverse-primary: #abc7ff;\n  --mat-sys-inverse-surface: #2f3033;\n  --mat-sys-on-background: #1a1b1f;\n  --mat-sys-on-error: #ffffff;\n  --mat-sys-on-error-container: #93000a;\n  --mat-sys-on-primary: #ffffff;\n  --mat-sys-on-primary-container: #00458f;\n  --mat-sys-on-primary-fixed: #001b3f;\n  --mat-sys-on-primary-fixed-variant: #00458f;\n  --mat-sys-on-secondary: #ffffff;\n  --mat-sys-on-secondary-container: #3e4759;\n  --mat-sys-on-secondary-fixed: #131c2b;\n  --mat-sys-on-secondary-fixed-variant: #3e4759;\n  --mat-sys-on-surface: #1a1b1f;\n  --mat-sys-on-surface-variant: var(--filing-modal-color-grey);\n  --mat-sys-on-tertiary: #ffffff;\n  --mat-sys-on-tertiary-container: #0000ef;\n  --mat-sys-on-tertiary-fixed: #00006e;\n  --mat-sys-on-tertiary-fixed-variant: #0000ef;\n  --mat-sys-outline: #74777f;\n  --mat-sys-outline-variant: #c4c6d0;\n  --mat-sys-primary: #3778e4;\n  --mat-sys-primary-container: #d7e3ff;\n  --mat-sys-primary-fixed: #d7e3ff;\n  --mat-sys-primary-fixed-dim: #abc7ff;\n  --mat-sys-scrim: #000000;\n  --mat-sys-secondary: #565e71;\n  --mat-sys-secondary-container: #dae2f9;\n  --mat-sys-secondary-fixed: #dae2f9;\n  --mat-sys-secondary-fixed-dim: #bec6dc;\n  --mat-sys-shadow: #000000;\n  --mat-sys-surface: #faf9fd;\n  --mat-sys-surface-bright: #faf9fd;\n  --mat-sys-surface-container: #efedf0;\n  --mat-sys-surface-container-high: #e9e7eb;\n  --mat-sys-surface-container-highest: #e3e2e6;\n  --mat-sys-surface-container-low: #f4f3f6;\n  --mat-sys-surface-container-lowest: #ffffff;\n  --mat-sys-surface-dim: #dbd9dd;\n  --mat-sys-surface-tint: #005cbb;\n  --mat-sys-surface-variant: #e0e2ec;\n  --mat-sys-tertiary: #343dff;\n  --mat-sys-tertiary-container: #e0e0ff;\n  --mat-sys-tertiary-fixed: #e0e0ff;\n  --mat-sys-tertiary-fixed-dim: #bec2ff;\n  --mat-sys-neutral-variant20: #2d3038;\n  --mat-sys-neutral10: #1a1b1f;\n  --mdc-filled-button-container-height: 35px;\n  --mdc-outlined-button-container-height: 35px;\n  --mdc-text-button-label-text-color: #808090;\n  --mdc-filled-button-label-text-weight: 600;\n  --mdc-text-button-label-text-weight: 600;\n  --mdc-filled-button-container-shape: 4px;\n  --mdc-outlined-button-outline-color: none;\n  --mdc-outlined-button-container-shape: 6px;\n  --mat-sys-level0:\n    0px 0px 0px 0px rgba(0, 0, 0, 0.2),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.14),\n    0px 0px 0px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level1:\n    0px 2px 1px -1px rgba(0, 0, 0, 0.2),\n    0px 1px 1px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 3px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level2:\n    0px 3px 3px -2px rgba(0, 0, 0, 0.2),\n    0px 3px 4px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 8px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level3:\n    0px 3px 5px -1px rgba(0, 0, 0, 0.2),\n    0px 6px 10px 0px rgba(0, 0, 0, 0.14),\n    0px 1px 18px 0px rgba(0, 0, 0, 0.12);\n  --mat-sys-level4:\n    0px 5px 5px -3px rgba(0, 0, 0, 0.2),\n    0px 8px 10px 1px rgba(0, 0, 0, 0.14),\n    0px 3px 14px 2px rgba(0, 0, 0, 0.12);\n  --mat-sys-level5:\n    0px 7px 8px -4px rgba(0, 0, 0, 0.2),\n    0px 12px 17px 2px rgba(0, 0, 0, 0.14),\n    0px 5px 22px 4px rgba(0, 0, 0, 0.12);\n  --mdc-outlined-button-label-text-size: 14px;\n  --mdc-filled-button-label-text-size: 14px;\n  --mdc-filled-text-field-label-text-size: 16px;\n  --mat-sys-body-large: 400 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-body-large-font: var(--app-font-family);\n  --mat-sys-body-large-line-height: 1.5rem;\n  --mat-sys-body-large-size: 14px;\n  --mat-sys-body-large-tracking: 0.031rem;\n  --mat-sys-body-large-weight: 400;\n  --mat-sys-body-medium: 400 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-body-medium-font: var(--app-font-family);\n  --mat-sys-body-medium-line-height: 1.25rem;\n  --mat-sys-body-medium-size: 0.875rem;\n  --mat-sys-body-medium-tracking: 0.016rem;\n  --mat-sys-body-medium-weight: 400;\n  --mat-sys-body-small: 400 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-body-small-font: var(--app-font-family);\n  --mat-sys-body-small-line-height: 1rem;\n  --mat-sys-body-small-size: 0.75rem;\n  --mat-sys-body-small-tracking: 0.025rem;\n  --mat-sys-body-small-weight: 400;\n  --mat-sys-display-large: 400 3.562rem / 4rem var(--app-font-family);\n  --mat-sys-display-large-font: var(--app-font-family);\n  --mat-sys-display-large-line-height: 4rem;\n  --mat-sys-display-large-size: 3.562rem;\n  --mat-sys-display-large-tracking: -0.016rem;\n  --mat-sys-display-large-weight: 400;\n  --mat-sys-display-medium: 400 2.812rem / 3.25rem var(--app-font-family);\n  --mat-sys-display-medium-font: var(--app-font-family);\n  --mat-sys-display-medium-line-height: 3.25rem;\n  --mat-sys-display-medium-size: 2.812rem;\n  --mat-sys-display-medium-tracking: 0;\n  --mat-sys-display-medium-weight: 400;\n  --mat-sys-display-small: 400 2.25rem / 2.75rem var(--app-font-family);\n  --mat-sys-display-small-font: var(--app-font-family);\n  --mat-sys-display-small-line-height: 2.75rem;\n  --mat-sys-display-small-size: 2.25rem;\n  --mat-sys-display-small-tracking: 0;\n  --mat-sys-display-small-weight: 400;\n  --mat-sys-headline-large: 400 2rem / 2.5rem var(--app-font-family);\n  --mat-sys-headline-large-font: var(--app-font-family);\n  --mat-sys-headline-large-line-height: 2.5rem;\n  --mat-sys-headline-large-size: 2rem;\n  --mat-sys-headline-large-tracking: 0;\n  --mat-sys-headline-large-weight: 400;\n  --mat-sys-headline-medium: 400 1.75rem / 2.25rem var(--app-font-family);\n  --mat-sys-headline-medium-font: var(--app-font-family);\n  --mat-sys-headline-medium-line-height: 2.25rem;\n  --mat-sys-headline-medium-size: 1.75rem;\n  --mat-sys-headline-medium-tracking: 0;\n  --mat-sys-headline-medium-weight: 400;\n  --mat-sys-headline-small: 400 1.5rem / 2rem var(--app-font-family);\n  --mat-sys-headline-small-font: var(--app-font-family);\n  --mat-sys-headline-small-line-height: 2rem;\n  --mat-sys-headline-small-size: 1.5rem;\n  --mat-sys-headline-small-tracking: 0;\n  --mat-sys-headline-small-weight: 400;\n  --mat-sys-label-large: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-label-large-font: var(--app-font-family);\n  --mat-sys-label-large-line-height: 1.25rem;\n  --mat-sys-label-large-size: 0.875rem;\n  --mat-sys-label-large-tracking: 0.006rem;\n  --mat-sys-label-large-weight: 500;\n  --mat-sys-label-large-weight-prominent: 700;\n  --mat-sys-label-medium: 500 0.75rem / 1rem var(--app-font-family);\n  --mat-sys-label-medium-font: var(--app-font-family);\n  --mat-sys-label-medium-line-height: 1rem;\n  --mat-sys-label-medium-size: 0.75rem;\n  --mat-sys-label-medium-tracking: 0.031rem;\n  --mat-sys-label-medium-weight: 500;\n  --mat-sys-label-medium-weight-prominent: 700;\n  --mat-sys-label-small: 500 0.688rem / 1rem var(--app-font-family);\n  --mat-sys-label-small-font: var(--app-font-family);\n  --mat-sys-label-small-line-height: 1rem;\n  --mat-sys-label-small-size: 0.688rem;\n  --mat-sys-label-small-tracking: 0.031rem;\n  --mat-sys-label-small-weight: 500;\n  --mat-sys-title-large: 400 1.375rem / 1.75rem var(--app-font-family);\n  --mat-sys-title-large-font: var(--app-font-family);\n  --mat-sys-title-large-line-height: 1.75rem;\n  --mat-sys-title-large-size: 1.375rem;\n  --mat-sys-title-large-tracking: 0;\n  --mat-sys-title-large-weight: 400;\n  --mat-sys-title-medium: 500 1rem / 1.5rem var(--app-font-family);\n  --mat-sys-title-medium-font: var(--app-font-family);\n  --mat-sys-title-medium-line-height: 1.5rem;\n  --mat-sys-title-medium-size: 1rem;\n  --mat-sys-title-medium-tracking: 0.009rem;\n  --mat-sys-title-medium-weight: 500;\n  --mat-sys-title-small: 500 0.875rem / 1.25rem var(--app-font-family);\n  --mat-sys-title-small-font: var(--app-font-family);\n  --mat-sys-title-small-line-height: 1.25rem;\n  --mat-sys-title-small-size: 0.875rem;\n  --mat-sys-title-small-tracking: 0.006rem;\n  --mat-sys-title-small-weight: 500;\n  --mat-sys-corner-extra-large: 28px;\n  --mat-sys-corner-extra-large-top: 28px 28px 0 0;\n  --mat-sys-corner-extra-small: 4px;\n  --mat-sys-corner-extra-small-top: 4px 4px 0 0;\n  --mat-sys-corner-full: 9999px;\n  --mat-sys-corner-large: 16px;\n  --mat-sys-corner-large-end: 0 16px 16px 0;\n  --mat-sys-corner-large-start: 16px 0 0 16px;\n  --mat-sys-corner-large-top: 16px 16px 0 0;\n  --mat-sys-corner-medium: 12px;\n  --mat-sys-corner-none: 0;\n  --mat-sys-corner-small: 8px;\n  --mat-sys-dragged-state-layer-opacity: 0.16;\n  --mat-sys-focus-state-layer-opacity: 0.12;\n  --mat-sys-hover-state-layer-opacity: 0.08;\n  --mat-sys-pressed-state-layer-opacity: 0.12;\n}\n.filing .mat-primary .mat-pseudo-checkbox-checked,\n.filing .mat-primary .mat-pseudo-checkbox-indeterminate {\n  background: transparent !important;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox {\n  width: 24px;\n  height: 24px;\n  flex-basis: 24px;\n  padding: 0;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__background {\n  width: 24px;\n  height: 24px;\n  border-radius: 6px;\n  top: 0;\n  left: 0;\n  border: 3px solid var(--filing-modal-color-grey);\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__checkmark {\n  height: 20px;\n  width: 20px;\n  font-size: 20px;\n  top: 1px;\n  left: 1px;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-checkbox__ripple,\n.filing .mat-mdc-checkbox[cardView] .mat-ripple {\n  display: none;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-label {\n  padding-left: 8px;\n}\n.filing .mat-mdc-checkbox[cardView] .mdc-button__label {\n  line-height: 10px;\n}\n/*# sourceMappingURL=material-theme.css.map */\n'] }]
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 83 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 70 });
       })();
     }
   });