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

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,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         IRFormControls2["Fax"] = "Fax";
         IRFormControls2["AffiliationAddressType"] = "affiliationAddressType";
         IRFormControls2["AffiliationType"] = "AffiliationType";
+        IRFormControls2["CurrentName"] = "currentName";
+        IRFormControls2["IsThisChangeToAnExistingEntity"] = "isThisChangeToAnExistingEntity";
+        IRFormControls2["IsThisChangeToAnExistingEntityVisible"] = "isThisChangeToAnExistingEntityVisible";
       })(IRFormControls || (IRFormControls = {}));
       (function(FormationFormGroups2) {
         FormationFormGroups2["ReferenceNumbers"] = "Reference Numbers";
@@ -56056,6 +56060,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 +56962,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,
@@ -56998,17 +57005,21 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function transformIncorporators(incorporators, deltaData) {
     return incorporators?.map((incorporator) => {
       const isEntity = incorporator.type?.toLowerCase() === "entity";
+      const id = incorporator.profileID?.toString();
+      const incorporatorDelta = id ? deltaData.incorporators?.[id] : void 0;
       if (isEntity) {
-        return {
+        return __spreadProps(__spreadValues({
           FirstName: incorporator.signatory_first_name,
           LastName: incorporator.signatory_last_name,
-          IncorporatorType: ECoreIncorporatorType.BodyCorporate,
+          IncorporatorType: ECoreIncorporatorType.NonRegCorporate,
           Title: incorporator.signatory_title,
+          CompanyName: incorporator.incorporator_name
+        }, incorporator.incorporator_reg_number && {
           CompanyNumber: incorporator.incorporator_reg_number
-        };
+        }), {
+          Address: transformAddress(incorporator, incorporatorDelta?.address)
+        });
       } else {
-        const id = incorporator.profileID?.toString();
-        const incorporatorDelta = id ? deltaData.incorporators?.[id] : void 0;
         return __spreadProps(__spreadValues({
           FirstName: incorporator.firstName,
           LastName: incorporator.lastName
@@ -57064,8 +57075,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 +57115,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 +57917,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 +57995,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 +58050,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 +58064,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 +58122,21 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       return "";
     return str.toLowerCase().replace(/(?:^|\s|[-/])\S/g, (match) => match.toUpperCase());
   }
+  function generateAffiliationKey(affiliation) {
+    const person = affiliation.participant;
+    const firstName = person._profile.firstName || "";
+    const lastName = person._profile.lastName || "";
+    const middleName = person._profile.middleName || "";
+    const role = affiliation.role.static_title || "";
+    return [firstName.toLowerCase(), middleName.toLowerCase(), lastName.toLowerCase(), role.toLowerCase()].filter(Boolean).join(" ");
+  }
+  function generateAffiliationFullName(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 +59151,34 @@ 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 normalizePersonKey(value) {
+          return (value ?? "").toLowerCase().replace(/\s+/g, " ").trim();
+        }
+        static getCurrentPersonData(comparisonData, affiliation) {
+          const lookupName = _OntarioUpdateMaintainFormHelper.normalizePersonKey(generateAffiliationFullName(affiliation));
+          if (!lookupName || !comparisonData?.persons?.size) {
+            return void 0;
+          }
+          for (const [personKey, personData] of comparisonData.persons.entries()) {
+            const normalizedKey = _OntarioUpdateMaintainFormHelper.normalizePersonKey(personKey);
+            if (normalizedKey === lookupName || normalizedKey.startsWith(`${lookupName} -`)) {
+              return personData;
+            }
+          }
+          return void 0;
+        }
+        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) => {
+            return 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 addedDirectors = incomingAffiliations?.filter((aff) => {
+            return 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 address = findRegisteredOffice(task.entity.affiliations);
           const cert = _ext.certified;
           config2[InitialReturnFillingFormGroups.General] = _OntarioUpdateMaintainFormHelper.generateGeneralInfo(task);
@@ -59132,30 +59190,27 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const directorDeltaData = deltaData?.directors ?? {};
           config2[InitialReturnFillingFormGroups.Directors] = new FormArray([
             ...addedDirectors.map((admin) => {
-              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, directorDeltaData[admin._id]);
+              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, comparisonData, directorDeltaData[admin._id]);
               form.addControl(IRFormControls.IsCanadianResident, new FormControl(directorDeltaData[admin._id]?.residentCanadian ?? false));
               return form;
             }),
             ...ceasedDirectors.map((admin) => {
-              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, directorDeltaData[admin._id]);
-              form.addControl(IRFormControls.IsCanadianResident, new FormControl(directorDeltaData[admin._id]?.residentCanadian ?? false));
-              return form;
-            }),
-            ...editedDirectors.map((admin) => {
-              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Update, directorDeltaData[admin._id]);
+              const form = _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, comparisonData, directorDeltaData[admin._id]);
               form.addControl(IRFormControls.IsCanadianResident, new FormControl(directorDeltaData[admin._id]?.residentCanadian ?? false));
               return form;
             })
           ]);
           const officerDeltaData = deltaData?.officers ?? {};
           config2[InitialReturnFillingFormGroups.Officers] = new FormArray([
-            ...addedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, officerDeltaData[admin._id])),
-            ...ceasedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, officerDeltaData[admin._id])),
-            ...editedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Update, officerDeltaData[admin._id]))
+            ...addedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Add, comparisonData, officerDeltaData[admin._id])),
+            ...ceasedOfficers.map((admin) => _OntarioUpdateMaintainFormHelper.generateAffiliationForm(admin, IRAffiliationType.Ceased, comparisonData, officerDeltaData[admin._id]))
           ]);
           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 +59237,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) {
@@ -59227,27 +59303,45 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           config2[IRFormControls.AffiliationAddressType] = new FormControl(AffiliationAddressType.CanadianSuite);
           return config2;
         }
-        static generateAffiliationForm(affiliation, affiliationType, deltaData) {
+        static generateAffiliationForm(affiliation, affiliationType, comparisonData, deltaData) {
           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 = generateAffiliationFullName(affiliation);
+          const key = generateAffiliationKey(affiliation).toLowerCase();
+          const currentData = _OntarioUpdateMaintainFormHelper.getCurrentPersonData(comparisonData, affiliation);
+          let correctedAffiliationType = affiliationType;
+          let isThisChangeToAnExistingEntity = false;
+          let isThisChangeToAnExistingEntityVisible = false;
+          if (deltaData) {
+            if (deltaData.currentName) {
+              isThisChangeToAnExistingEntity = true;
+              isThisChangeToAnExistingEntityVisible = true;
+            }
+            correctedAffiliationType = IRAffiliationType.Update;
+          } else {
+            if (currentData) {
+              correctedAffiliationType = IRAffiliationType.Update;
+            } else {
+              isThisChangeToAnExistingEntity = false;
+              isThisChangeToAnExistingEntityVisible = true;
+            }
+          }
           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 === correctedAffiliationType ? key : "", requiredIf(IRFormControls.IsThisChangeToAnExistingEntity)),
+            [IRFormControls.IsThisChangeToAnExistingEntity]: new FormControl(isThisChangeToAnExistingEntity),
+            [IRFormControls.IsThisChangeToAnExistingEntityVisible]: new FormControl(isThisChangeToAnExistingEntityVisible)
           };
           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, IRFormControls.IsThisChangeToAnExistingEntity]);
           return form;
         }
         static mapAddressDelta(addr) {
@@ -78518,7 +78612,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");
@@ -79215,7 +79313,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
 \r
                 @if (control?.value && !control?.disabled) {\r
                   <div matSuffix class="suffix-container">\r
-                    <button mat-icon-button (click)="control?.reset()">\r
+                    <button mat-icon-button (click)="control?.reset(); field.onChange && field.onChange(form)">\r
                       <mat-icon>close</mat-icon>\r
                     </button>\r
 \r
@@ -80991,7 +81089,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, currentNameFields, 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 +81108,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 +81144,35 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         },
         class: "span-12"
       };
+      currentNameFields = (label, options) => [
+        {
+          type: FormType.Checkbox,
+          label: `Is this a change to an existing ${label}?`,
+          class: "span-12",
+          formControlName: IRFormControls.IsThisChangeToAnExistingEntity,
+          isVisible: (form) => {
+            return form.get(IRFormControls.IsThisChangeToAnExistingEntityVisible)?.value;
+          },
+          onChange: (form) => {
+            const val = form.get(IRFormControls.IsThisChangeToAnExistingEntity)?.value;
+            form.get(IRFormControls.AffiliationType)?.setValue(val ? IRAffiliationType.Update : IRAffiliationType.Add);
+            if (!val) {
+              form.get(IRFormControls.CurrentName)?.setValue("");
+            }
+          }
+        },
+        {
+          type: FormType.Select,
+          label: `Existing ${label}`,
+          formControlName: IRFormControls.CurrentName,
+          required: true,
+          dynamicOptions: (form) => options.filter((option) => option.label.toLowerCase().includes(form.get(IRFormControls.AffiliationName)?.value.toLowerCase())),
+          isVisible: (form) => {
+            return form.get(IRFormControls.AffiliationType)?.value !== IRAffiliationType.Ceased && form.get(IRFormControls.IsThisChangeToAnExistingEntity)?.value;
+          },
+          class: "span-6"
+        }
+      ];
       certifiedByAddressFormField = {
         type: FormType.Text,
         label: "",
@@ -81210,7 +81337,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 +81421,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 +81434,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, ...currentNameFields("Director", currentNameOptions)]),
+        [AffiliationAddressType.CanadianSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, checkboxFormField, personFullAddressFormField, ...currentNameFields("Director", currentNameOptions)]),
+        [AffiliationAddressType.InternationalNoSuite]: generatePersonFields([checkboxFormField, personFullAddressFormField, ...currentNameFields("Director", currentNameOptions)]),
+        [AffiliationAddressType.InternationalSuite]: generatePersonFields([checkboxFormField, personFullAddressFormField, ...currentNameFields("Director", currentNameOptions)])
+      });
+      generateOntarioInitialReturnFormOfficerFieldsMap = (currentNameOptions) => ({
+        [AffiliationAddressType.CanadianNoSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_NO_SUIT, personFullAddressFormField, ...currentNameFields("Officer", currentNameOptions)]),
+        [AffiliationAddressType.CanadianSuite]: generatePersonFields([...ONTARIO_DELTA_CARD_FORM_AFFILIATION_FIELDS_CANADIAN_SUIT, personFullAddressFormField, ...currentNameFields("Officer", currentNameOptions)]),
+        [AffiliationAddressType.InternationalNoSuite]: generatePersonFields([personFullAddressFormField, ...currentNameFields("Officer", currentNameOptions)]),
+        [AffiliationAddressType.InternationalSuite]: generatePersonFields([personFullAddressFormField, ...currentNameFields("Officer", currentNameOptions)])
+      });
       generateCertifiedByFields = (fields) => [
         {
           type: FormType.Text,
@@ -81334,6 +81461,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 +81525,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 +81545,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 +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 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.persons)("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 +81603,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.persons)("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 +81638,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 +81657,25 @@ 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) {
+      const _r14 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "expandable-card", 5)(1, "filing-form-group", 15);
+      \u0275\u0275listener("visiblyValidChange", function OntarioUpdateMaintainFormComponent_Conditional_19_Template_filing_form_group_visiblyValidChange_1_listener($event) {
+        \u0275\u0275restoreView(_r14);
+        const ctx_r0 = \u0275\u0275nextContext();
+        return \u0275\u0275resetView(ctx_r0.onSectionValidChange("contact", $event));
+      });
+      \u0275\u0275elementEnd()();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const contact_r15 = \u0275\u0275readContextLet(18);
+      \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.sectionValidity["contact"])("title", ctx_r0.groups.Contact);
+      \u0275\u0275advance();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", contact_r15)("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"() {
@@ -81512,6 +81688,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_expandable_card_component();
       init_expandable_list_card_component();
       init_ngx_translate_core();
+      init_common_utils();
       init_core();
       OntarioUpdateMaintainFormComponent = class _OntarioUpdateMaintainFormComponent {
         form = input.required();
@@ -81525,13 +81702,33 @@ 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 personKeys = Array.from(prevData?.persons?.keys() ?? []);
+            const options = personKeys.map((key) => {
+              const person = prevData?.persons.get(key);
+              return { label: `${person?.fullName}, ${toTitleCase(person?.position ?? "")}`.trim(), value: key };
+            });
+            this.directorsFieldsMap = generateOntarioInitialReturnFormDirectorsFieldsMap(options);
+            this.officersFieldsMap = generateOntarioInitialReturnFormOfficerFieldsMap(options);
+          });
+          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 +81745,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, "visiblyValidChange", "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 +81761,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 +81772,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_r16 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.General));
             \u0275\u0275advance();
-            \u0275\u0275conditional(generalInfoForm_r14 ? 5 : -1);
+            \u0275\u0275conditional(generalInfoForm_r16 ? 5 : -1);
             \u0275\u0275advance();
-            const registeredOfficeAddress_r15 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.RegisteredOfficeAddress));
+            const registeredOfficeAddress_r17 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.RegisteredOfficeAddress));
             \u0275\u0275advance();
-            \u0275\u0275conditional(registeredOfficeAddress_r15 ? 7 : -1);
+            \u0275\u0275conditional(registeredOfficeAddress_r17 ? 7 : -1);
             \u0275\u0275advance();
-            const directorsArray_r16 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Directors));
+            const directorsArray_r18 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Directors));
             \u0275\u0275advance();
-            \u0275\u0275conditional(directorsArray_r16 && directorsArray_r16.length ? 9 : 10);
+            \u0275\u0275conditional(directorsArray_r18 && directorsArray_r18.length ? 9 : 10);
             \u0275\u0275advance(2);
-            const officersArray_r17 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Officers));
+            const officersArray_r19 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Officers));
             \u0275\u0275advance();
-            \u0275\u0275conditional(officersArray_r17 && officersArray_r17.length ? 12 : 13);
+            \u0275\u0275conditional(officersArray_r19 && officersArray_r19.length ? 12 : 13);
             \u0275\u0275advance(2);
-            const certifiedBy_r18 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CertifiedBy));
+            const certifiedBy_r20 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CertifiedBy));
+            \u0275\u0275advance();
+            \u0275\u0275property("isStatusIcon", !ctx.readonly())("isValid", certifiedBy_r20 ? ctx.sectionValidity["certifiedBy"] : true)("title", ctx.groups.CertifiedBy);
             \u0275\u0275advance();
-            \u0275\u0275property("isStatusIcon", !ctx.readonly())("isValid", certifiedBy_r18 ? ctx.sectionValidity["certifiedBy"] : true)("title", ctx.groups.CertifiedBy);
+            \u0275\u0275conditional(certifiedBy_r20 ? 16 : 17);
+            \u0275\u0275advance(2);
+            const contact_r21 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.Contact));
             \u0275\u0275advance();
-            \u0275\u0275conditional(certifiedBy_r18 ? 16 : 17);
+            \u0275\u0275conditional(contact_r21 ? 19 : -1);
           }
         }, dependencies: [
           FilingFormGroupComponent,
@@ -81676,7 +81880,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       @let isOpen =\r
         (directorsArray?.length ?? 0) <= initiallyOpenCardsCount;\r
       <expandable-list-card\r
-        [prevData]="prevData()?.directors"\r
+        [prevData]="prevData()?.persons"\r
         [isSubmitted]="isSubmitted()"\r
         [isValid]="sectionValidity['directors']"\r
         [areItemsOpen]="isOpen"\r
@@ -81701,7 +81905,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         (officersArray?.length ?? 0) <= initiallyOpenCardsCount;\r
 \r
       <expandable-list-card\r
-        [prevData]="prevData()?.officers"\r
+        [prevData]="prevData()?.persons"\r
         [isSubmitted]="isSubmitted()"\r
         [areItemsOpen]="isOpen"\r
         [isStatusIcon]="!readonly()"\r
@@ -81741,13 +81945,29 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       }\r
 \r
     </expandable-card>\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]="contactsFields"\r
+          (visiblyValidChange)="onSectionValidChange('contact', $event)"\r
+        />\r
+      </expandable-card>\r
+    }\r
   </div>\r
 </div>\r
 `, 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: 44 });
       })();
     }
   });
@@ -82209,7 +82429,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 +82446,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 +82480,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 +82587,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 +82602,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 +82613,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) {
@@ -86831,14 +87068,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 +87092,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 +87122,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 +87256,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 +87284,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 +87296,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 +87312,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 +87326,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 +87334,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 +87348,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 +87360,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 +87374,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,60 +87382,44 @@ 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: "" };
   }
   function corporationInfoToPersonnelDeltaData(corporationInfo) {
-    const directorsMap = /* @__PURE__ */ new Map();
-    const officersMap = /* @__PURE__ */ new Map();
+    const personsMap = /* @__PURE__ */ new Map();
     if (!corporationInfo)
-      return { directors: directorsMap, officers: officersMap, corporationInfo: { primaryActivity: "", email: "" } };
-    const { ChangeDirectors: cd, ChangeOfficers: co } = corporationInfo.CurrentData;
+      return { persons: personsMap, corporationInfo: { primaryActivity: "", email: "" } };
+    const initialAdministrators = corporationInfo.CurrentData.InitialAdministrators;
     const fullName = (payload) => {
       return [
-        payload.PersonName.FirstName,
-        payload.PersonName.MiddleName,
-        payload.PersonName.LastName
+        payload.PersonName.FirstName?.toLowerCase() ?? "",
+        payload.PersonName.MiddleName?.toLowerCase() ?? "",
+        payload.PersonName.LastName?.toLowerCase() ?? "",
+        payload.OfficerPositionName?.toLowerCase() ?? ""
       ].filter(Boolean).join(" ");
     };
-    const populatePersonsMap = (lists, target) => {
-      for (const list of lists) {
-        for (const payload of list ?? []) {
-          if (!payload)
-            continue;
-          const deltaData = irPersonPayloadToDeltaData(payload);
-          if (!deltaData)
-            continue;
-          const email = ("EmailAddress" in payload ? payload.EmailAddress : "") ?? "";
-          const ceasedRoles = "CeasedAppointedRoles" in payload && Array.isArray(payload.CeasedAppointedRoles) ? payload.CeasedAppointedRoles.map((role) => `${role.PositionFullName} - ${role.CeasedDate} (Appointed ${role.AppointedDate})`) : void 0;
-          target.set(fullName(payload), __spreadProps(__spreadValues({}, deltaData), { email, ceasedRoles }));
-        }
+    const populatePersonsMap = (list) => {
+      for (const payload of list ?? []) {
+        if (!payload)
+          continue;
+        const deltaData = irPersonPayloadToDeltaData(payload);
+        if (!deltaData)
+          continue;
+        const email = ("EmailAddress" in payload ? payload.EmailAddress : "") ?? "";
+        const ceasedRoles = "CeasedAppointedRoles" in payload && Array.isArray(payload.CeasedAppointedRoles) ? payload.CeasedAppointedRoles.map((role) => `${role.PositionFullName} - ${role.CeasedDate} (Appointed ${role.AppointedDate})`) : void 0;
+        personsMap.set(fullName(payload), __spreadProps(__spreadValues({}, deltaData), { email, ceasedRoles }));
       }
     };
-    populatePersonsMap([
-      cd?.AddedDirectors,
-      cd?.CeasedDirectors,
-      cd?.EditedDirectors,
-      cd?.AddDirector,
-      cd?.CeaseDirector,
-      cd?.EditDirector
-    ], directorsMap);
-    populatePersonsMap([
-      co?.AddedOfficers,
-      co?.CeasedOfficers,
-      co?.EditedOfficers,
-      co?.AddOfficer,
-      co?.CeaseOfficer,
-      co?.EditOfficer
-    ], officersMap);
+    populatePersonsMap(initialAdministrators);
     const primaryActivity = [corporationInfo?.CurrentData.PrimaryBusinessActivity.NAICSCode, corporationInfo?.CurrentData.PrimaryBusinessActivity.PrimaryActivity].join(" - ");
     const additionalDetails = corporationInfo?.CurrentData.AdditionalDetails;
-    return { directors: directorsMap, officers: officersMap, corporationInfo: { email: corporationInfo.CurrentData.OfficialEmail.Email, primaryActivity, registeredOfficeAddress: extractAddressDeltaDataFromInitialReturnAddressContainer(corporationInfo?.CurrentData.RegisteredHeadOfficeAddress), additionalInfo: additionalDetails ? extractAddressDeltaDataFromInitialReturnAdditionalDetails(additionalDetails) : null } };
+    return { persons: personsMap, corporationInfo: { email: corporationInfo.CurrentData.OfficialEmail.Email, primaryActivity, registeredOfficeAddress: extractAddressDeltaDataFromInitialReturnAddressContainer(corporationInfo?.CurrentData.RegisteredHeadOfficeAddress), additionalInfo: additionalDetails ? extractAddressDeltaDataFromInitialReturnAdditionalDetails(additionalDetails) : null } };
   }
   var init_initial_return_payload_helper = __esm({
     "src/app/helpers/initial-return-payload.helper.ts"() {
       init_address_utils();
+      init_transform_utils();
     }
   });
 
@@ -87345,13 +87588,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function transformIncorporator(incorporator) {
     const isIndividual = incorporator.type === "person";
-    const incorporationType = isIndividual ? ECoreIncorporatorType.Individual : ECoreIncorporatorType.BodyCorporate;
+    const incorporationType = isIndividual ? ECoreIncorporatorType.Individual : ECoreIncorporatorType.NonRegCorporate;
     return {
       IncorporatorType: incorporationType,
       FirstName: isIndividual ? incorporator.firstName : void 0,
       MiddleName: isIndividual ? incorporator.middleName : void 0,
       LastName: isIndividual ? incorporator.lastName : void 0,
-      BodyCorporate: !isIndividual ? incorporator.incorporator_name : void 0,
+      CompanyName: !isIndividual ? incorporator.incorporator_name : void 0,
       Signature: `${incorporator.signatory_first_name ?? ""} ${incorporator.signatory_last_name ?? ""}, ${incorporator.signatory_title ?? ""}`,
       Address: mapAddress(incorporator)
     };
@@ -87545,7 +87788,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 = (name, isOfficer) => {
+      if (!name || !initialAdministrators?.length) {
+        return null;
+      }
+      const matchedOfficer = initialAdministrators.find((admin) => {
+        if (!admin || Boolean(admin.IsDirector) === isOfficer) {
+          return false;
+        }
+        const adminTitle = normalizePersonTitle([
+          admin.PersonName?.FirstName?.toLowerCase(),
+          admin.PersonName?.MiddleName?.toLowerCase(),
+          admin.PersonName?.LastName?.toLowerCase(),
+          admin.OfficerPositionName?.toLowerCase()
+        ].filter(Boolean).join(" "));
+        return adminTitle === name;
+      });
+      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 +87816,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 +87840,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 +87875,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(deltaEntry.currentName ?? "", 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,
+              Id: "",
+              RoleId: "",
               CeaseDate: "",
               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 +87986,87 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         switch (currentState) {
           case IRCurrentState.Added:
             return {
-              Id: aff._id,
+              Id: "",
+              RoleId: "",
+              OfficerId: "",
               CeaseDate: "",
               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 +88077,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 +88110,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 +88126,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 +88143,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 +88166,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 +88193,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 +88206,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 +88225,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 +88514,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,33 +88603,44 @@ 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) {
               return;
             }
             if (isUpdateMaintain(task) && isOntarioTask(task)) {
+              yield this.getCurrentData();
               const serviceOrderId = deltaData?.serviceOrderId;
               if (serviceOrderId) {
                 this.defineInitialStep();
               }
               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);
-                  }
-                }));
               }
             }
+          }));
+        }
+        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);
+            }
           });
         }
         onOntarioFormationValidate(deltaData) {
@@ -88595,7 +88901,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 +88937,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 +88962,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 +89057,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);
@@ -88887,7 +89206,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 83 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 73 });
       })();
     }
   });
@@ -93616,132 +93935,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         "Submit request": "Soumettre la demande",
         "UI Mode": "Mode d'interface",
         "UI mode": "Mode d'interface",
-        North: "Nord",
-        South: "Sud",
-        East: "Est",
-        West: "Ouest",
-        Northeast: "Nord-Est",
-        Northwest: "Nord-Ouest",
-        Southeast: "Sud-Est",
-        Southwest: "Sud-Ouest",
         None: "Aucun",
-        Limited: "Limit\xE9e",
-        Ltd: "Lt\xE9e",
-        Incorporated: "Incorpor\xE9e",
-        Inc: "Inc.",
-        Corporation: "Corporation",
-        Corp: "Corp.",
-        Abbey: "Abbaye",
-        Acres: "Acres",
-        Alley: "Ruelle",
-        Avenue: "Avenue",
-        Bay: "Baie",
-        Beach: "Plage",
-        Bend: "Courbe",
-        Boulevard: "Boulevard",
-        "By-pass": "Contournement",
-        Byway: "Chemin secondaire",
-        Campus: "Campus",
-        Cape: "Cap",
-        Centre: "Centre",
-        Chase: "All\xE9e",
-        Circle: "Cercle",
-        Circuit: "Circuit",
-        Close: "Fermer",
-        Common: "Terrain commun",
-        Concession: "Concession",
-        Corners: "Carrefour",
-        Court: "Cour",
-        Cove: "Anse",
-        Crescent: "Croissant",
-        Crossing: "Croisement",
-        "Cul-de-sac": "Cul-de-sac",
-        Dale: "Vall\xE9e",
-        Dell: "Vallon",
-        Diversion: "D\xE9viation",
-        Downs: "Collines",
-        Drive: "All\xE9e priv\xE9e",
-        Farm: "Ferme",
-        Field: "Champ",
-        Forest: "For\xEAt",
-        Freeway: "Autoroute",
-        Front: "Front",
-        Gardens: "Jardins",
-        Gate: "Portail",
-        Glade: "Clairi\xE8re",
-        Glen: "Vallon bois\xE9",
-        Green: "Vert",
-        Grounds: "Terrain",
-        Grove: "Bosquet",
-        Harbour: "Port",
-        Heath: "Lande",
-        Heights: "Hauteurs",
-        Highlands: "Hautes-terres",
-        Highway: "Route",
-        Hill: "Colline",
-        Hollow: "Creux",
-        Inlet: "Anse",
-        Island: "\xCEle",
-        Key: "Quai",
-        Knoll: "Monticule",
-        Landing: "D\xE9barcad\xE8re",
-        Lane: "Voie",
-        Limits: "Limites",
-        Line: "Ligne",
-        Link: "Liaison",
-        Lookout: "Belv\xE9d\xE8re",
-        Loop: "Boucle",
-        Mall: "Mail",
-        Manor: "Manoir",
-        Maze: "Labyrinthe",
-        Meadow: "Prairie",
-        Mews: "Ruelle",
-        Moor: "Lande",
-        Mount: "Mont",
-        Mountain: "Montagne",
-        Orchard: "Verger",
-        Parade: "Promenade",
-        Park: "Parc",
-        Parkway: "Promenade parc",
-        Passage: "Passage",
-        Path: "Sentier",
-        Pathway: "Sentier",
-        Pines: "Pins",
-        Place: "Place",
-        Plateau: "Plateau",
-        Plaza: "Plaza",
-        Point: "Pointe",
-        Port: "Port",
-        Private: "Priv\xE9e",
-        Promenade: "Promenade",
-        Quay: "Quai",
-        Ramp: "Rampe",
-        Ridge: "Cr\xEAte",
-        Rise: "Mont\xE9e",
-        Road: "Route",
-        Route: "Route",
-        Row: "Rang\xE9e",
-        Run: "Ruisseau",
-        Square: "Square",
-        Street: "Rue",
-        Subdivision: "Subdivision",
-        Terrace: "Terrasse",
-        Thicket: "Hallier",
-        Towers: "Tours",
-        Townline: "Limite de canton",
-        Trail: "Sentier",
-        Turnabout: "Rond-point",
-        Vale: "Val",
-        Via: "Via",
-        View: "Vue",
-        Village: "Village",
-        Villas: "Villas",
-        Vista: "Panorama",
-        Walk: "Promenade",
-        Way: "Voie",
-        Wharf: "Quai",
-        Wood: "Bois",
-        Wynd: "Ruelle",
         "Save Changes": "Enregistrer les modifications",
         "Supporting Documents": "Documents justificatifs",
         "Upload supporting documents, e.g. Consents": "T\xE9l\xE9verser des documents justificatifs, p. ex. des consentements",