@dyedurham/search-and-file-widget 2.1.19 → 2.1.21

package/dnd-filing-shell.js

@@ -84312,12 +84312,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const entityDetails = deltaData.entityDetails;
     const isNamed2 = entityDetails?.corporationNameType === BCNameType.Named;
     const nameTranslations = entityDetails?.usesNameTranslation ? (entityDetails.nameTranslations ?? []).filter(Boolean) : [];
-    const registeredOfficeAddresses = collectSharedAddresses(affiliations, AddressTitle2.REGISTERED_OFFICE);
-    const recordsOfficeAddresses = collectSharedAddresses(affiliations, AddressTitle2.RECORDS_OFFICE);
-    const regMailing = pickAddress(registeredOfficeAddresses, "Mailing");
-    const regDelivery = pickAddress(registeredOfficeAddresses, "Delivery");
-    const recMailing = pickAddress(recordsOfficeAddresses, "Mailing");
-    const recDelivery = pickAddress(recordsOfficeAddresses, "Delivery");
+    const registeredOffice = findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
+    const recordsOffice = findSharedAddressAffiliation(affiliations, AddressTitle2.RECORDS_OFFICE);
+    const regMailing = pickAddress(registeredOffice?.addresses, "Mailing");
+    const regDelivery = pickAddress(registeredOffice?.addresses, "Delivery");
+    const recMailing = pickAddress(recordsOffice?.addresses, "Mailing");
+    const recDelivery = pickAddress(recordsOffice?.addresses, "Delivery");
     const regMailingBC = mapAddress(regMailing);
     const regDeliveryBC = regDelivery ? mapAddress(regDelivery) : void 0;
     const recMailingBC = recMailing ? mapAddress(recMailing) : void 0;
@@ -84358,26 +84358,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     };
     return pruneUndefined(request);
   }
-  function findBCOfficeAddressIssues(task) {
-    const affiliations = task.entity.affiliations ?? [];
-    const issues = [];
-    const offices = [
-      { name: "Registered Office", title: AddressTitle2.REGISTERED_OFFICE, required: true },
-      { name: "Records Office", title: AddressTitle2.RECORDS_OFFICE, required: false }
-    ];
-    for (const { name, title, required } of offices) {
-      const addresses = collectSharedAddresses(affiliations, title);
-      if (!addresses.length && !required) {
-        continue;
-      }
-      for (const type of ["Mailing", "Delivery"]) {
-        if (!pickAddress(addresses, type)) {
-          issues.push(`The ${name} has no ${type} address.`);
-        }
-      }
-    }
-    return issues;
-  }
   function findBCRequestIssues(request) {
     const issues = [];
     const email = request.companyEmail?.trim() ?? "";
@@ -84386,17 +84366,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     } else if (email.length > 150) {
       issues.push("Company Email must be 150 characters or fewer.");
     }
+    if (!request.registeredOfficeMailingAddress?.streetAddress?.trim()) {
+      issues.push("The Registered Office has no Mailing address. Add one in Athennian.");
+    }
     for (const director of request.directors ?? []) {
       if (!director.mailingAddress?.streetAddress?.trim()) {
-        issues.push(`Director ${`${director.firstName} ${director.lastName}`.trim()} has no Mailing address.`);
+        issues.push(`Director ${`${director.firstName} ${director.lastName}`.trim()} has no Mailing address. Add one in Athennian.`);
       }
     }
-    if (!request.authorizedShareStructure?.shareClasses?.length) {
-      issues.push("The Authorized Share Structure is required.");
-    }
     const password = request.password ?? "";
     if (password.length < BC_PASSWORD_MIN_LENGTH || password.length > BC_PASSWORD_MAX_LENGTH || !/^[A-Za-z0-9]+$/.test(password)) {
-      issues.push(`The company password (taken from the entity's registry ID) must be ${BC_PASSWORD_MIN_LENGTH} to ${BC_PASSWORD_MAX_LENGTH} letters or digits only.`);
+      issues.push(`The company password (taken from the entity's registry ID) must be ${BC_PASSWORD_MIN_LENGTH} to ${BC_PASSWORD_MAX_LENGTH} letters or digits only. Update the registry ID in Athennian.`);
     }
     return issues;
   }
@@ -84451,8 +84431,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     return {
       incorporatorType: isIndividual ? "individual" : "corporationOrFirm",
       // Names are only accepted for an individual; a corporation or firm is identified by
-      // `corporationOrFirmName` (the deployed API rejects first/last name otherwise, although its
-      // published spec lists them as required).
+      // `corporationOrFirmName` (the API rejects first/last name otherwise).
       firstName: isIndividual ? incorporator.firstName ?? "" : void 0,
       middleName: isIndividual ? incorporator.middleName || void 0 : void 0,
       lastName: isIndividual ? incorporator.lastName ?? "" : void 0,
@@ -84491,9 +84470,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function findSharedAddressAffiliation(affiliations, staticTitle) {
     return affiliations.find((a) => a.role?.role_name === AddressRole2.SHARED_ADDRESS && a.role?.static_title === staticTitle && isActiveAffiliation(a));
   }
-  function collectSharedAddresses(affiliations, staticTitle) {
-    return affiliations.filter((a) => a.role?.role_name === AddressRole2.SHARED_ADDRESS && a.role?.static_title === staticTitle && isActiveAffiliation(a)).flatMap((a) => a.addresses ?? []);
-  }
   function pickAddress(addresses, locationType, fallbackToFirst = false) {
     const match = addresses?.find((a) => (a.computed_location_type ?? a.location_type)?.toLowerCase() === locationType.toLowerCase());
     return match ?? (fallbackToFirst ? addresses?.[0] : void 0);
@@ -84630,8 +84606,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const affiliations = task.entity.affiliations ?? [];
           const delta = task.deltaData;
           const registeredOffice = findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
-          const registeredOfficeAddresses = collectSharedAddresses(affiliations, AddressTitle2.REGISTERED_OFFICE);
-          const recordsOfficeAddresses = collectSharedAddresses(affiliations, AddressTitle2.RECORDS_OFFICE);
+          const recordsOffice = findSharedAddressAffiliation(affiliations, AddressTitle2.RECORDS_OFFICE);
           const companyEmail = task.entity.emailOptions?.[0]?.value ?? registeredOffice?.addresses?.[0]?.communications?.find((c) => c.type === "Business Email")?.value ?? task.entity.communications?.find((c) => c.type === "Business Email")?.value ?? // Email only: the entity may carry its Business Email on another address (e.g. Head
           // Office) when no Registered Office shared address exists.
           task.entity.addresses?.flatMap((a) => a.communications ?? []).find((c) => c.type === "Business Email")?.value ?? "";
@@ -84640,19 +84615,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           config2[BCFormationFormGroups.CorporationDetails] = this.generateCorporationDetailsFormGroup(task, delta?.entityDetails, companyEmail);
           config2[BCFormationFormGroups.RegisteredOfficeAddress] = new FormGroup({
             [BCFormationFormControls.MailingAddress]: new FormControl({
-              value: this.formatFullAddress(this.pickAddress(registeredOfficeAddresses, "Mailing", true)),
+              value: this.formatFullAddress(this.pickAddress(registeredOffice?.addresses, "Mailing", true)),
               disabled: true
             }),
             [BCFormationFormControls.DeliveryAddress]: new FormControl({
-              value: this.formatFullAddress(this.pickAddress(registeredOfficeAddresses, "Delivery", true)),
+              value: this.formatFullAddress(this.pickAddress(registeredOffice?.addresses, "Delivery", true)),
               disabled: true
             }),
             [BCFormationFormControls.RecordsOfficeMailingAddress]: new FormControl({
-              value: this.formatFullAddress(this.pickAddress(recordsOfficeAddresses, "Mailing", true)),
+              value: this.formatFullAddress(this.pickAddress(recordsOffice?.addresses, "Mailing", true)),
               disabled: true
             }),
             [BCFormationFormControls.RecordsOfficeDeliveryAddress]: new FormControl({
-              value: this.formatFullAddress(this.pickAddress(recordsOfficeAddresses, "Delivery", true)),
+              value: this.formatFullAddress(this.pickAddress(recordsOffice?.addresses, "Delivery", true)),
               disabled: true
             })
           });
@@ -85129,7 +85104,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         Controls2.PostalCode
       ];
       BritishColumbiaChangeOfOfficeAddressesFormHelper = class {
-        static generateConfig(task, _translateFn, currentDataExtract) {
+        static generateConfig(task, _translateFn) {
           const affiliations = task.entity.affiliations ?? [];
           const delta = task.deltaData;
           const format = BritishColumbiaFormationFormHelper.formatFullAddress;
@@ -85137,9 +85112,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const registeredOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
           const recordsOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.RECORDS_OFFICE);
           const incoming = this.incomingOfficeAddresses(task);
-          const extract = this.officeExtract(currentDataExtract);
-          const incomingSeed = this.seedFromIncomingAffiliations(task);
-          const seed = this.withCurrentAddresses(incomingSeed, incoming, registeredOffice, recordsOffice, extract);
+          const seed = delta?.registeredOffice ? this.fillEmptyAddresses(delta, incoming) : this.seedFromIncomingAffiliations(task);
           const config2 = {};
           config2[BCChangeOfOfficeAddressesFormGroups.ReferenceNumbers] = this.generateReferenceNumbersFormGroup(delta?.referenceNumbers, task.entity._profile.client_matter_number);
           config2[BCChangeOfOfficeAddressesFormGroups.CorporationDetails] = new FormGroup({
@@ -85152,8 +85125,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           });
           const regDeliverySame = seed.registeredOffice?.deliverySameAsMailing ?? true;
           config2[BCChangeOfOfficeAddressesFormGroups.RegisteredOfficeAddress] = new FormGroup({
-            [Controls2.CurrentMailingAddress]: this.readOnly(this.previousText(extract, "regMailing", format(pick(registeredOffice?.addresses, "Mailing")))),
-            [Controls2.CurrentDeliveryAddress]: this.readOnly(this.previousText(extract, "regDelivery", format(pick(registeredOffice?.addresses, "Delivery")))),
+            [Controls2.CurrentMailingAddress]: this.readOnly(format(pick(registeredOffice?.addresses, "Mailing"))),
+            [Controls2.CurrentDeliveryAddress]: this.readOnly(format(pick(registeredOffice?.addresses, "Delivery"))),
             [Controls2.NewMailingAddress]: this.createOfficeAddressFormGroup(seed.registeredOffice?.mailingAddress, true),
             [Controls2.DeliverySameAsMailing]: new FormControl(regDeliverySame),
             [Controls2.NewDeliveryAddress]: this.createOfficeAddressFormGroup(seed.registeredOffice?.deliveryAddress, !regDeliverySame)
@@ -85161,8 +85134,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const recSameAsRegistered = seed.recordsOffice?.sameAsRegisteredOffice ?? true;
           const recDeliverySame = seed.recordsOffice?.deliverySameAsMailing ?? true;
           config2[BCChangeOfOfficeAddressesFormGroups.RecordsOfficeAddress] = new FormGroup({
-            [Controls2.CurrentMailingAddress]: this.readOnly(this.previousText(extract, "recMailing", format(pick(recordsOffice?.addresses, "Mailing")))),
-            [Controls2.CurrentDeliveryAddress]: this.readOnly(this.previousText(extract, "recDelivery", format(pick(recordsOffice?.addresses, "Delivery")))),
+            [Controls2.CurrentMailingAddress]: this.readOnly(format(pick(recordsOffice?.addresses, "Mailing"))),
+            [Controls2.CurrentDeliveryAddress]: this.readOnly(format(pick(recordsOffice?.addresses, "Delivery"))),
             [Controls2.SameAsRegisteredOffice]: new FormControl(recSameAsRegistered),
             [Controls2.NewMailingAddress]: this.createOfficeAddressFormGroup(seed.recordsOffice?.mailingAddress, !recSameAsRegistered),
             [Controls2.DeliverySameAsMailing]: new FormControl(recDeliverySame),
@@ -85211,96 +85184,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           };
         }
-        /**
-         * For an office without an incoming address, the new address is its
-         * current address on the register (so the filing leaves it unchanged). A current address outside
-         * British Columbia is not used: the office is then reported as missing.
-         */
-        static withCurrentAddresses(seed, incoming, registeredOffice, recordsOffice, extract) {
-          const pickBy = BritishColumbiaFormationFormHelper.pickAddress;
-          const current = (office, type, key) => {
-            if (extract) {
-              const registry = extract[key];
-              return registry && this.isBritishColumbiaExtract(registry) ? this.extractToOfficeAddressDelta(registry) : void 0;
-            }
-            const address = pickBy(office?.addresses, type);
-            return address && this.isBritishColumbia(address) ? this.toOfficeAddressDelta(address) : void 0;
-          };
-          const result = __spreadValues({}, seed);
-          if (!incoming.regMailing) {
-            const mailing = current(registeredOffice, "Mailing", "regMailing");
-            const delivery = current(registeredOffice, "Delivery", "regDelivery");
-            if (mailing) {
-              const same = !delivery || this.isSameOfficeAddress(delivery, mailing);
-              result.registeredOffice = {
-                mailingAddress: mailing,
-                deliverySameAsMailing: same,
-                deliveryAddress: same ? void 0 : delivery
-              };
-            }
-          }
-          if (!incoming.recMailing) {
-            const mailing = current(recordsOffice, "Mailing", "recMailing");
-            const delivery = current(recordsOffice, "Delivery", "recDelivery");
-            if (mailing) {
-              const registeredMailing = result.registeredOffice?.mailingAddress;
-              const registeredDelivery = result.registeredOffice?.deliveryAddress ?? registeredMailing;
-              const sameAsRegistered = this.isSameOfficeAddress(mailing, registeredMailing) && this.isSameOfficeAddress(delivery ?? mailing, registeredDelivery);
-              const deliverySame = !delivery || this.isSameOfficeAddress(delivery, mailing);
-              result.recordsOffice = {
-                sameAsRegisteredOffice: sameAsRegistered,
-                mailingAddress: sameAsRegistered ? void 0 : mailing,
-                deliverySameAsMailing: deliverySame,
-                deliveryAddress: deliverySame ? void 0 : delivery
-              };
-            } else {
-              result.recordsOffice = { sameAsRegisteredOffice: false, deliverySameAsMailing: false };
-            }
-          }
-          return result;
-        }
-        /** The four office addresses of the registry's data extract, or undefined when there is none. */
-        static officeExtract(extract) {
-          const data = extract?.dataExtract;
-          if (!data || !(data["registeredOfficeMailingAddress"] || data["registeredOfficeDeliveryAddress"] || data["recordsOfficeMailingAddress"] || data["recordsOfficeDeliveryAddress"])) {
-            return void 0;
-          }
-          return {
-            regMailing: data["registeredOfficeMailingAddress"],
-            regDelivery: data["registeredOfficeDeliveryAddress"],
-            recMailing: data["recordsOfficeMailingAddress"],
-            recDelivery: data["recordsOfficeDeliveryAddress"]
-          };
-        }
-        /** The "Previous" text of an office line: the registry's address, else the Entity's own. */
-        static previousText(extract, key, fallback) {
-          if (!extract) {
-            return fallback;
-          }
-          const address = extract[key];
-          const province = this.isBritishColumbiaExtract(address) ? BC_DEFAULT_PROVINCE_STATE : address?.provinceOrState;
-          const country = (address?.country ?? "").toUpperCase() === "CA" ? BC_DEFAULT_COUNTRY : address?.country;
-          return [
-            address?.streetAddress,
-            address?.additionalStreetAddress,
-            address?.city,
-            province,
-            address?.postalOrZipCode,
-            country
-          ].filter((part) => Boolean(part?.trim())).join(", ");
-        }
-        static isBritishColumbiaExtract(address) {
-          const province = (address?.provinceOrState ?? "").trim().toLowerCase();
-          return !!address && ["bc", "b.c.", "british columbia"].includes(province);
-        }
-        static extractToOfficeAddressDelta(address) {
+        /** Keeps the saved flags and addresses, but fills an address the draft left empty from `incoming`. */
+        static fillEmptyAddresses(saved, incoming) {
+          const hasValues = (address) => EDITABLE_ADDRESS_CONTROLS.some((name) => Boolean(address?.[name]));
+          const pick = (savedAddress, incomingAddress) => hasValues(savedAddress) ? savedAddress : incomingAddress ?? savedAddress;
           return {
-            addressLine1: address.streetAddress ?? "",
-            addressLine2: address.additionalStreetAddress ?? "",
-            city: address.city ?? "",
-            postalCode: address.postalOrZipCode ?? "",
-            province: BC_DEFAULT_PROVINCE_STATE,
-            country: BC_DEFAULT_COUNTRY
+            registeredOffice: __spreadProps(__spreadValues({}, saved.registeredOffice), {
+              mailingAddress: pick(saved.registeredOffice?.mailingAddress, incoming.regMailing),
+              deliveryAddress: pick(saved.registeredOffice?.deliveryAddress, incoming.regDelivery)
+            }),
+            recordsOffice: __spreadProps(__spreadValues({}, saved.recordsOffice), {
+              mailingAddress: pick(saved.recordsOffice?.mailingAddress, incoming.recMailing),
+              deliveryAddress: pick(saved.recordsOffice?.deliveryAddress, incoming.recDelivery)
+            })
           };
         }
         /** The four office addresses of the task's incoming Shared Address, as form values. */
@@ -86040,14 +85936,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             <strong>{{ 'Incorporation Number' | translate }}:</strong>\r
             {{ corporationDetails.get(controls.IncorporationNumber)?.value }}\r
           </p>\r
-          <div class="company-email-field">\r
-            <filing-form-group\r
-              [form]="corporationDetails"\r
-              [config]="companyEmailFields()"\r
-              [isSubmitted]="isSubmitted()"\r
-              (visiblyValidChange)="onSectionValidChange('corporationDetails', $event)"\r
-            />\r
-          </div>\r
+          <div class="company-email-field">
+            <filing-form-group
+              [form]="corporationDetails"
+              [config]="companyEmailFields()"
+              [isSubmitted]="isSubmitted()"
+              (visiblyValidChange)="onSectionValidChange('corporationDetails', $event)"
+            />
+          </div>
         </div>\r
       </expandable-card>\r
     }\r
@@ -86071,28 +85967,28 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
 \r
           <mat-checkbox\r
             class="directors-change-checkbox"\r
-            [formControlName]="controls.DirectorsAddedOrDeleted"\r
-            (change)="\r
-              filingDetails.get(controls.ChangeDate)?.updateValueAndValidity({ emitEvent: false });\r
-              onSectionValidChange('filingDetails', filingDetails.valid)\r
-            "\r
+            [formControlName]="controls.DirectorsAddedOrDeleted"
+            (change)="
+              filingDetails.get(controls.ChangeDate)?.updateValueAndValidity({ emitEvent: false });
+              onSectionValidChange('filingDetails', filingDetails.valid)
+            "
           >\r
             {{ 'Directors will be added and/or deleted as part of this filing' | translate }}\r
           </mat-checkbox>\r
 \r
           @if (filingDetails.get(controls.DirectorsAddedOrDeleted)?.value) {\r
-            <div class="filing-details-grid">\r
-              <div class="date-field">\r
-                <p class="effective-date-description">\r
-                  {{\r
-                    'The date on which the individual(s) became or ceased to be a director:'\r
-                      | translate\r
-                  }}\r
-                  <strong>{{ getEffectiveDateDisplay(filingDetails.get(controls.ChangeDate)?.value) }}</strong>\r
-                </p>\r
-              </div>\r
-\r
-              <p class="filing-fee">\r
+            <div class="filing-details-grid">
+              <div class="date-field">
+                <p class="effective-date-description">
+                  {{
+                    'The date on which the individual(s) became or ceased to be a director:'
+                      | translate
+                  }}
+                  <strong>{{ getEffectiveDateDisplay(filingDetails.get(controls.ChangeDate)?.value) }}</strong>
+                </p>
+              </div>
+
+              <p class="filing-fee">
                 <strong>{{ 'Filing Fee' | translate }}:</strong>\r
                 {{ filingDetails.get(controls.FilingFee)?.value }}\r
               </p>\r
@@ -86104,8 +86000,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
 \r
     @let directorsArray = getFormArray(groups.Directors);\r
 \r
-    <expandable-card [isStatusIcon]="false" [title]="groups.Directors">\r
-      @if (directorsArray && directorsArray.length) {\r
+    <expandable-card [isStatusIcon]="false" [title]="groups.Directors">
+      @if (directorsArray && directorsArray.length) {
         <div class="directors-table" role="table">\r
           <div class="directors-table-header" role="row">\r
             <div role="columnheader">{{ 'Name' | translate }}</div>\r
@@ -87847,20 +87743,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275property("content", ctx_r0.errors());
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_3_Template(rf, ctx) {
-    if (rf & 1) {
-      \u0275\u0275element(0, "alert", 2);
-    }
-    if (rf & 2) {
-      const ctx_r0 = \u0275\u0275nextContext();
-      \u0275\u0275property("content", ctx_r0.missingMessages());
-    }
-  }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_6_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_5_Template(rf, ctx) {
     if (rf & 1) {
       const _r2 = \u0275\u0275getCurrentView();
       \u0275\u0275elementStart(0, "expandable-card", 4)(1, "filing-form-group", 7);
-      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_6_Template_filing_form_group_visiblyValidChange_1_listener($event) {
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_5_Template_filing_form_group_visiblyValidChange_1_listener($event) {
         \u0275\u0275restoreView(_r2);
         const ctx_r0 = \u0275\u0275nextContext();
         return \u0275\u0275resetView(ctx_r0.onSectionValidChange("refNumbers", $event));
@@ -87869,17 +87756,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
-      const referenceNumbers_r3 = \u0275\u0275readContextLet(5);
+      const referenceNumbers_r3 = \u0275\u0275readContextLet(4);
       \u0275\u0275property("title", ctx_r0.groups.ReferenceNumbers);
       \u0275\u0275advance();
       \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", referenceNumbers_r3)("config", ctx_r0.referenceNumbersFields);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_8_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_7_Template(rf, ctx) {
     if (rf & 1) {
       const _r4 = \u0275\u0275getCurrentView();
       \u0275\u0275elementStart(0, "expandable-card", 5)(1, "filing-form-group", 7);
-      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_8_Template_filing_form_group_visiblyValidChange_1_listener($event) {
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_7_Template_filing_form_group_visiblyValidChange_1_listener($event) {
         \u0275\u0275restoreView(_r4);
         const ctx_r0 = \u0275\u0275nextContext();
         return \u0275\u0275resetView(ctx_r0.onSectionValidChange("corpDetails", $event));
@@ -87888,129 +87775,232 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
-      const corporationDetails_r5 = \u0275\u0275readContextLet(7);
+      const corporationDetails_r5 = \u0275\u0275readContextLet(6);
       \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.sectionValidity["corpDetails"] !== false)("title", ctx_r0.groups.CorporationDetails);
       \u0275\u0275advance();
       \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", corporationDetails_r5)("config", ctx_r0.corporationDetailsFields());
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_For_3_Conditional_7_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_9_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 12);
-      \u0275\u0275text(1);
-      \u0275\u0275pipe(2, "translate");
+      const _r7 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_9_Template_filing_form_group_visiblyValidChange_0_listener() {
+        \u0275\u0275restoreView(_r7);
+        const ctx_r0 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
-      const row_r6 = \u0275\u0275nextContext().$implicit;
+      \u0275\u0275nextContext();
+      const registeredMailing_r8 = \u0275\u0275readContextLet(0);
+      const ctx_r0 = \u0275\u0275nextContext();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredMailing_r8)("config", ctx_r0.addressFields);
+    }
+  }
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_14_Template(rf, ctx) {
+    if (rf & 1) {
+      const _r9 = \u0275\u0275getCurrentView();
+      \u0275\u0275element(0, "filing-form-group", 9);
+      \u0275\u0275elementStart(1, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_14_Template_filing_form_group_visiblyValidChange_1_listener() {
+        \u0275\u0275restoreView(_r9);
+        const ctx_r0 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
+      \u0275\u0275elementEnd();
+    }
+    if (rf & 2) {
+      \u0275\u0275nextContext();
+      const registeredDelivery_r10 = \u0275\u0275readContextLet(1);
+      const ctx_r0 = \u0275\u0275nextContext();
+      const registeredOffice_r11 = \u0275\u0275readContextLet(8);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredOffice_r11)("config", ctx_r0.deliveryNoteFields);
       \u0275\u0275advance();
-      \u0275\u0275textInterpolate2(" ", \u0275\u0275pipeBind1(2, 2, "Previous"), ": ", row_r6.previous, " ");
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredDelivery_r10)("config", ctx_r0.addressFields);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_For_3_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 9)(1, "div", 10)(2, "span", 11);
-      \u0275\u0275text(3);
-      \u0275\u0275pipe(4, "translate");
+      const _r6 = \u0275\u0275getCurrentView();
+      \u0275\u0275declareLet(0)(1)(2);
+      \u0275\u0275elementStart(3, "expandable-card", 5)(4, "div", 8);
+      \u0275\u0275element(5, "filing-form-group", 9);
+      \u0275\u0275elementStart(6, "h4", 10);
+      \u0275\u0275text(7);
+      \u0275\u0275pipe(8, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275text(5);
-      \u0275\u0275pipe(6, "translate");
+      \u0275\u0275template(9, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_9_Template, 1, 3, "filing-form-group", 9);
+      \u0275\u0275elementStart(10, "h4", 10);
+      \u0275\u0275text(11);
+      \u0275\u0275pipe(12, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275template(7, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_For_3_Conditional_7_Template, 3, 4, "div", 12);
+      \u0275\u0275elementStart(13, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Template_filing_form_group_visiblyValidChange_13_listener() {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r0 = \u0275\u0275nextContext();
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
       \u0275\u0275elementEnd();
+      \u0275\u0275template(14, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_14_Template, 2, 6);
+      \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
-      const row_r6 = ctx.$implicit;
-      \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(4, 3, row_r6.label), ":");
+      const ctx_r0 = \u0275\u0275nextContext();
+      const registeredOffice_r11 = \u0275\u0275readContextLet(8);
+      const registeredMailing_r12 = \u0275\u0275storeLet(ctx_r0.getAddressGroup(registeredOffice_r11, ctx_r0.controls.NewMailingAddress));
+      \u0275\u0275advance();
+      const registeredDelivery_r13 = \u0275\u0275storeLet(ctx_r0.getAddressGroup(registeredOffice_r11, ctx_r0.controls.NewDeliveryAddress));
+      const registeredDeliverySame_r14 = ctx_r0.isChecked(registeredOffice_r11, ctx_r0.controls.DeliverySameAsMailing);
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.isRegisteredOfficeValid())("title", ctx_r0.groups.RegisteredOfficeAddress);
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredOffice_r11)("config", ctx_r0.currentAddressesFields);
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", row_r6.value || \u0275\u0275pipeBind1(6, 5, "Not specified"), " ");
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(8, 15, "New Mailing Address"));
       \u0275\u0275advance(2);
-      \u0275\u0275conditional(row_r6.previous ? 7 : -1);
+      \u0275\u0275conditional(registeredMailing_r12 ? 9 : -1);
+      \u0275\u0275advance(2);
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(12, 17, "New Delivery Address"));
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredOffice_r11)("config", ctx_r0.deliverySameAsMailingFields);
+      \u0275\u0275advance();
+      \u0275\u0275conditional(!registeredDeliverySame_r14 && registeredDelivery_r13 ? 14 : -1);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_3_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "expandable-card", 5)(1, "div", 8);
-      \u0275\u0275repeaterCreate(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_For_3_Template, 8, 7, "div", 9, _forTrack05);
-      \u0275\u0275elementEnd()();
+      const _r17 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_3_Template_filing_form_group_visiblyValidChange_0_listener() {
+        \u0275\u0275restoreView(_r17);
+        const ctx_r0 = \u0275\u0275nextContext(3);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
+      \u0275\u0275elementEnd();
     }
     if (rf & 2) {
+      \u0275\u0275nextContext(2);
+      const recordsMailing_r18 = \u0275\u0275readContextLet(0);
       const ctx_r0 = \u0275\u0275nextContext();
-      \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.isRegisteredOfficeValid())("title", ctx_r0.groups.RegisteredOfficeAddress);
-      \u0275\u0275advance(2);
-      \u0275\u0275repeater(ctx_r0.registeredRows());
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsMailing_r18)("config", ctx_r0.addressFields);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_For_3_Conditional_7_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_8_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 12);
-      \u0275\u0275text(1);
-      \u0275\u0275pipe(2, "translate");
+      const _r19 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_8_Template_filing_form_group_visiblyValidChange_0_listener() {
+        \u0275\u0275restoreView(_r19);
+        const ctx_r0 = \u0275\u0275nextContext(3);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
-      const row_r7 = \u0275\u0275nextContext().$implicit;
-      \u0275\u0275advance();
-      \u0275\u0275textInterpolate2(" ", \u0275\u0275pipeBind1(2, 2, "Previous"), ": ", row_r7.previous, " ");
+      \u0275\u0275nextContext(2);
+      const recordsDelivery_r20 = \u0275\u0275readContextLet(1);
+      const ctx_r0 = \u0275\u0275nextContext();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsDelivery_r20)("config", ctx_r0.addressFields);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_For_3_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 9)(1, "div", 10)(2, "span", 11);
-      \u0275\u0275text(3);
-      \u0275\u0275pipe(4, "translate");
+      const _r16 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "h4", 10);
+      \u0275\u0275text(1);
+      \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
+      \u0275\u0275template(3, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_3_Template, 1, 3, "filing-form-group", 9);
+      \u0275\u0275elementStart(4, "h4", 10);
       \u0275\u0275text(5);
       \u0275\u0275pipe(6, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275template(7, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_For_3_Conditional_7_Template, 3, 4, "div", 12);
+      \u0275\u0275elementStart(7, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Template_filing_form_group_visiblyValidChange_7_listener() {
+        \u0275\u0275restoreView(_r16);
+        const ctx_r0 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
       \u0275\u0275elementEnd();
+      \u0275\u0275template(8, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_8_Template, 1, 3, "filing-form-group", 9);
     }
     if (rf & 2) {
-      const row_r7 = ctx.$implicit;
-      \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(4, 3, row_r7.label), ":");
+      \u0275\u0275nextContext();
+      const recordsMailing_r18 = \u0275\u0275readContextLet(0);
+      const recordsDelivery_r20 = \u0275\u0275readContextLet(1);
+      const recordsDeliverySame_r21 = \u0275\u0275readContextLet(3);
+      const ctx_r0 = \u0275\u0275nextContext();
+      const recordsOffice_r22 = \u0275\u0275readContextLet(10);
+      \u0275\u0275advance();
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(2, 7, "New Mailing Address"));
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", row_r7.value || \u0275\u0275pipeBind1(6, 5, "Not specified"), " ");
+      \u0275\u0275conditional(recordsMailing_r18 ? 3 : -1);
       \u0275\u0275advance(2);
-      \u0275\u0275conditional(row_r7.previous ? 7 : -1);
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 9, "New Delivery Address"));
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsOffice_r22)("config", ctx_r0.deliverySameAsMailingFields);
+      \u0275\u0275advance();
+      \u0275\u0275conditional(!recordsDeliverySame_r21 && recordsDelivery_r20 ? 8 : -1);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "expandable-card", 5)(1, "div", 8);
-      \u0275\u0275repeaterCreate(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_For_3_Template, 8, 7, "div", 9, _forTrack05);
+      const _r15 = \u0275\u0275getCurrentView();
+      \u0275\u0275declareLet(0)(1)(2)(3);
+      \u0275\u0275elementStart(4, "expandable-card", 5)(5, "div", 8);
+      \u0275\u0275element(6, "filing-form-group", 9);
+      \u0275\u0275elementStart(7, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Template_filing_form_group_visiblyValidChange_7_listener() {
+        \u0275\u0275restoreView(_r15);
+        const ctx_r0 = \u0275\u0275nextContext();
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
+      \u0275\u0275elementEnd();
+      \u0275\u0275template(8, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Template, 9, 11);
       \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
+      const recordsOffice_r22 = \u0275\u0275readContextLet(10);
+      \u0275\u0275storeLet(ctx_r0.getAddressGroup(recordsOffice_r22, ctx_r0.controls.NewMailingAddress));
+      \u0275\u0275advance();
+      \u0275\u0275storeLet(ctx_r0.getAddressGroup(recordsOffice_r22, ctx_r0.controls.NewDeliveryAddress));
+      const recordsSameAsRegistered_r23 = ctx_r0.isChecked(recordsOffice_r22, ctx_r0.controls.SameAsRegisteredOffice);
+      \u0275\u0275advance(2);
+      \u0275\u0275storeLet(ctx_r0.isChecked(recordsOffice_r22, ctx_r0.controls.DeliverySameAsMailing));
+      \u0275\u0275advance();
       \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.isRecordsOfficeValid())("title", ctx_r0.groups.RecordsOfficeAddress);
       \u0275\u0275advance(2);
-      \u0275\u0275repeater(ctx_r0.recordsRows());
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsOffice_r22)("config", ctx_r0.currentAddressesFields);
+      \u0275\u0275advance();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsOffice_r22)("config", ctx_r0.sameAsRegisteredOfficeFields);
+      \u0275\u0275advance();
+      \u0275\u0275conditional(!recordsSameAsRegistered_r23 ? 8 : -1);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_14_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_13_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 13)(2, "p");
+      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 11)(2, "p");
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(5, "mat-radio-group", 14)(6, "mat-radio-button", 15);
+      \u0275\u0275elementStart(5, "mat-radio-group", 12)(6, "mat-radio-button", 13);
       \u0275\u0275text(7);
       \u0275\u0275pipe(8, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(9, "mat-radio-button", 15);
+      \u0275\u0275elementStart(9, "mat-radio-button", 13);
       \u0275\u0275text(10);
       \u0275\u0275pipe(11, "translate");
       \u0275\u0275elementEnd()()()();
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
-      const annualReportReminder_r8 = \u0275\u0275readContextLet(13);
+      const annualReportReminder_r24 = \u0275\u0275readContextLet(12);
       \u0275\u0275property("isStatusIcon", false)("title", ctx_r0.groups.AnnualReportReminder);
       \u0275\u0275advance();
-      \u0275\u0275property("formGroup", annualReportReminder_r8);
+      \u0275\u0275property("formGroup", annualReportReminder_r24);
       \u0275\u0275advance(2);
       \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(4, 9, "Does this company wish to be reminded to file its annual reports? If an email address is specified, the reminder will be sent to the company's email address. Otherwise, the reminder will be mailed to the registered or head office of the company."), " ");
       \u0275\u0275advance(2);
@@ -88025,7 +88015,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(11, 13, "No, I do not need to be reminded"), " ");
     }
   }
-  var _forTrack05, BritishColumbiaChangeOfOfficeAddressesFormComponent;
+  var BritishColumbiaChangeOfOfficeAddressesFormComponent;
   var init_change_of_office_addresses_form_component = __esm({
     "src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.ts"() {
       init_core();
@@ -88038,18 +88028,16 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_expandable_card_component();
       init_british_columbia_form_enums();
       init_british_columbia_change_of_office_addresses_form_constants();
+      init_forms_utils();
       init_BritishColumbiaConstants();
       init_british_columbia_change_of_office_addresses_form_helper();
       init_core();
       init_forms();
-      _forTrack05 = ($index, $item) => $item.label;
       BritishColumbiaChangeOfOfficeAddressesFormComponent = class _BritishColumbiaChangeOfOfficeAddressesFormComponent {
         form = input.required();
         task = input();
         errors = input([]);
         isNote = input(false);
-        /** True while the registry's current data is loading: addresses are not reported missing yet. */
-        loading = input(false);
         isSubmitted = input(false);
         readonly = input(false);
         visiblyValidChange = output();
@@ -88067,41 +88055,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         deliveryNoteFields = BC_COA_CARD_FORM_DELIVERY_ADDRESS_NOTE_FIELDS;
         deliverySameAsMailingFields = BC_COA_DELTA_CARD_FORM_DELIVERY_SAME_AS_MAILING_FIELDS;
         sameAsRegisteredOfficeFields = BC_COA_DELTA_CARD_FORM_SAME_AS_REGISTERED_OFFICE_FIELDS;
-        translate = inject(TranslateService);
         sectionValidity = {};
         isVisiblyValid() {
           return Object.values(this.sectionValidity).every((v) => v) && this.isRegisteredOfficeValid() && this.isRecordsOfficeValid();
         }
         isRegisteredOfficeValid() {
-          return !this.isRegisteredMissing();
+          const office = this.getFormGroup(this.groups.RegisteredOfficeAddress);
+          return this.isAddressValid(office, this.controls.NewMailingAddress) && this.isAddressValid(office, this.controls.NewDeliveryAddress);
         }
         isRecordsOfficeValid() {
-          return !this.isRecordsMissing();
-        }
-        /** One message per missing office address, shown in the banner at the top of the form. */
-        missingMessages() {
-          const t = (key) => this.translate.instant(key);
-          const records = this.getFormGroup(this.groups.RecordsOfficeAddress);
-          if (this.loading() || !records || !this.getFormGroup(this.groups.RegisteredOfficeAddress)) {
-            return [];
-          }
-          const recordsSameAsRegistered = this.isChecked(records, this.controls.SameAsRegisteredOffice);
-          const [regMailing, regDelivery] = this.registeredRows();
-          const [recMailing, recDelivery] = this.recordsRows();
-          return [
-            !regMailing.value && t("The Registered Office mailing address is missing. Add it in UEM, then try again."),
-            !regDelivery.value && t("The Registered Office delivery address is missing. Add it in UEM, then try again."),
-            // "Same as Registered Office" is already reported by the registered office messages.
-            !recordsSameAsRegistered && !recMailing.value && t("The Records Office mailing address is missing. Add it in UEM, then try again."),
-            !recordsSameAsRegistered && !recDelivery.value && t("The Records Office delivery address is missing. Add it in UEM, then try again.")
-          ].filter((m) => !!m);
-        }
-        /** The incoming Shared Address supplied no new address for a line (and none is on the register). */
-        isRegisteredMissing() {
-          return !!this.getFormGroup(this.groups.RegisteredOfficeAddress) && this.registeredRows().some((row) => !row.value);
-        }
-        isRecordsMissing() {
-          return !!this.getFormGroup(this.groups.RecordsOfficeAddress) && this.recordsRows().some((row) => !row.value);
+          const office = this.getFormGroup(this.groups.RecordsOfficeAddress);
+          return this.isAddressValid(office, this.controls.NewMailingAddress) && this.isAddressValid(office, this.controls.NewDeliveryAddress);
         }
         isChecked(office, control) {
           return Boolean(office?.get(control)?.value);
@@ -88119,77 +88083,28 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         getAddressGroup(office, control) {
           return office?.get(control) ?? null;
         }
-        /** Registered office lines: the new (incoming) address and, if it changed, the previous one. */
-        registeredRows() {
-          const office = this.getFormGroup(this.groups.RegisteredOfficeAddress);
-          return this.buildRows(office, this.isChecked(office, this.controls.DeliverySameAsMailing));
-        }
-        /** Records office lines; "Same as Registered Office" reuses the registered office's new lines. */
-        recordsRows() {
-          const office = this.getFormGroup(this.groups.RecordsOfficeAddress);
-          if (this.isChecked(office, this.controls.SameAsRegisteredOffice)) {
-            const registered = this.registeredRows();
-            const current = this.currentOf(office);
-            return registered.map((row, i) => __spreadProps(__spreadValues({}, row), {
-              previous: this.changedPrevious(row.value, i === 0 ? current.mailing : current.delivery)
-            }));
-          }
-          return this.buildRows(office, this.isChecked(office, this.controls.DeliverySameAsMailing));
-        }
-        buildRows(office, deliverySame) {
-          const current = this.currentOf(office);
-          const mailing = this.formatNew(this.getAddressGroup(office, this.controls.NewMailingAddress));
-          const delivery = deliverySame ? mailing : this.formatNew(this.getAddressGroup(office, this.controls.NewDeliveryAddress));
-          return [
-            {
-              label: "Mailing Address",
-              value: mailing,
-              previous: this.changedPrevious(mailing, current.mailing)
-            },
-            {
-              label: "Delivery Address",
-              value: delivery,
-              previous: this.changedPrevious(delivery, current.delivery)
-            }
-          ];
-        }
-        currentOf(office) {
-          return {
-            mailing: office?.get(this.controls.CurrentMailingAddress)?.value ?? "",
-            delivery: office?.get(this.controls.CurrentDeliveryAddress)?.value ?? ""
-          };
-        }
-        formatNew(group2) {
-          const c = this.controls;
-          const v = group2?.getRawValue() ?? {};
-          if (![v[c.AddressLine1], v[c.City], v[c.PostalCode]].some((part) => part?.trim())) {
-            return "";
-          }
-          return [v[c.AddressLine1], v[c.AddressLine2], v[c.City], v[c.Province], v[c.PostalCode], v[c.Country]].filter((part) => Boolean(part?.trim())).join(", ");
-        }
-        /** The previous address, only when it exists and differs from the new one. */
-        changedPrevious(next, previous) {
-          const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9]/g, "");
-          return previous && normalize(previous) !== normalize(next) ? previous : "";
+        isAddressValid(office, control) {
+          const group2 = this.getAddressGroup(office, control);
+          return !group2 || group2.disabled || isFormGroupVisiblyValid(group2, this.addressFields);
         }
         static \u0275fac = function BritishColumbiaChangeOfOfficeAddressesFormComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _BritishColumbiaChangeOfOfficeAddressesFormComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfOfficeAddressesFormComponent, selectors: [["british-columbia-change-of-office-addresses-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], loading: [1, "loading"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 15, vars: 11, consts: [[1, "change-of-office-addresses-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, "change-of-office-addresses-form-content"], [3, "title"], [3, "isStatusIcon", "isValid", "title"], [3, "isStatusIcon", "title"], [3, "visiblyValidChange", "isSubmitted", "form", "config"], [1, "change-of-office-addresses-form-item"], [1, "change-of-office-addresses-form-address"], [1, "body-1-regular", "grey"], [1, "body-1-semibold"], [1, "change-of-office-addresses-form-previous"], [1, "annual-reminder", 3, "formGroup"], [3, "formControlName"], [3, "value"]], template: function BritishColumbiaChangeOfOfficeAddressesFormComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfOfficeAddressesFormComponent, selectors: [["british-columbia-change-of-office-addresses-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 14, vars: 12, consts: [[1, "change-of-office-addresses-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, "change-of-office-addresses-form-content"], [3, "title"], [3, "isStatusIcon", "isValid", "title"], [3, "isStatusIcon", "title"], [3, "visiblyValidChange", "isSubmitted", "form", "config"], [1, "change-of-office-addresses-form-item"], [3, "isSubmitted", "form", "config"], [1, "change-of-office-addresses-form-item-title"], [1, "annual-reminder", 3, "formGroup"], [3, "formControlName"], [3, "value"]], template: function BritishColumbiaChangeOfOfficeAddressesFormComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275elementStart(0, "div", 0);
-            \u0275\u0275template(1, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_1_Template, 1, 1, "alert", 1)(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_2_Template, 1, 1, "alert", 2)(3, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_3_Template, 1, 1, "alert", 2);
-            \u0275\u0275elementStart(4, "div", 3);
-            \u0275\u0275declareLet(5);
-            \u0275\u0275template(6, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_6_Template, 2, 4, "expandable-card", 4);
-            \u0275\u0275declareLet(7);
-            \u0275\u0275template(8, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_8_Template, 2, 6, "expandable-card", 5);
-            \u0275\u0275declareLet(9);
-            \u0275\u0275template(10, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_Template, 4, 3, "expandable-card", 5);
-            \u0275\u0275declareLet(11);
-            \u0275\u0275template(12, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_Template, 4, 3, "expandable-card", 5);
-            \u0275\u0275declareLet(13);
-            \u0275\u0275template(14, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_14_Template, 12, 15, "expandable-card", 6);
+            \u0275\u0275template(1, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_1_Template, 1, 1, "alert", 1)(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_2_Template, 1, 1, "alert", 2);
+            \u0275\u0275elementStart(3, "div", 3);
+            \u0275\u0275declareLet(4);
+            \u0275\u0275template(5, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_5_Template, 2, 4, "expandable-card", 4);
+            \u0275\u0275declareLet(6);
+            \u0275\u0275template(7, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_7_Template, 2, 6, "expandable-card", 5);
+            \u0275\u0275declareLet(8);
+            \u0275\u0275template(9, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Template, 15, 19, "expandable-card", 5);
+            \u0275\u0275declareLet(10);
+            \u0275\u0275template(11, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Template, 9, 13, "expandable-card", 5);
+            \u0275\u0275declareLet(12);
+            \u0275\u0275template(13, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_13_Template, 12, 15, "expandable-card", 6);
             \u0275\u0275elementEnd()();
           }
           if (rf & 2) {
@@ -88197,26 +88112,26 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275conditional(ctx.isNote() ? 1 : -1);
             \u0275\u0275advance();
             \u0275\u0275conditional(ctx.errors().length ? 2 : -1);
-            \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.missingMessages().length ? 3 : -1);
             \u0275\u0275advance(2);
-            const referenceNumbers_r9 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.ReferenceNumbers));
+            const referenceNumbers_r25 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.ReferenceNumbers));
             \u0275\u0275advance();
-            \u0275\u0275conditional(referenceNumbers_r9 ? 6 : -1);
+            \u0275\u0275conditional(referenceNumbers_r25 ? 5 : -1);
             \u0275\u0275advance();
-            const corporationDetails_r10 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CorporationDetails));
+            const corporationDetails_r26 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CorporationDetails));
             \u0275\u0275advance();
-            \u0275\u0275conditional(corporationDetails_r10 ? 8 : -1);
-            const registeredOffice_r11 = ctx.getFormGroup(ctx.groups.RegisteredOfficeAddress);
-            \u0275\u0275advance(2);
-            \u0275\u0275conditional(registeredOffice_r11 ? 10 : -1);
-            const recordsOffice_r12 = ctx.getFormGroup(ctx.groups.RecordsOfficeAddress);
-            \u0275\u0275advance(2);
-            \u0275\u0275conditional(recordsOffice_r12 ? 12 : -1);
+            \u0275\u0275conditional(corporationDetails_r26 ? 7 : -1);
+            \u0275\u0275advance();
+            const registeredOffice_r27 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.RegisteredOfficeAddress));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(registeredOffice_r27 ? 9 : -1);
+            \u0275\u0275advance();
+            const recordsOffice_r28 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.RecordsOfficeAddress));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(recordsOffice_r28 ? 11 : -1);
             \u0275\u0275advance();
-            const annualReportReminder_r13 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
+            const annualReportReminder_r29 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
             \u0275\u0275advance();
-            \u0275\u0275conditional(annualReportReminder_r13 ? 14 : -1);
+            \u0275\u0275conditional(annualReportReminder_r29 ? 13 : -1);
           }
         }, dependencies: [
           FilingFormGroupComponent,
@@ -88230,7 +88145,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           FormGroupDirective,
           FormControlName,
           TranslatePipe
-        ], styles: ['\n\n[_nghost-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   p[_ngcontent-%COMP%] {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item-title[_ngcontent-%COMP%] {\n  color: var(--filing-modal-color-dark-blue);\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-address[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-previous[_ngcontent-%COMP%] {\n  font-size: 13px !important;\n  line-height: 18px;\n  font-family: "Open Sans";\n  font-style: italic;\n  color: var(--filing-modal-color-grey-mid);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */'], changeDetection: 0 });
+        ], styles: ["\n\n[_nghost-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   p[_ngcontent-%COMP%] {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item-title[_ngcontent-%COMP%] {\n  color: var(--filing-modal-color-dark-blue);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */"], changeDetection: 0 });
       };
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(BritishColumbiaChangeOfOfficeAddressesFormComponent, [{
@@ -88258,13 +88173,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       [content]="errors()"\r
     />\r
   }\r
-\r
-  @if (missingMessages().length) {\r
-    <alert\r
-      title="The following issues need to be resolved before proceeding:"\r
-      [content]="missingMessages()"\r
-    />\r
-  }\r
 \r
   <div class="change-of-office-addresses-form-content">\r
     @let referenceNumbers = getFormGroup(groups.ReferenceNumbers);\r
@@ -88301,24 +88209,54 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     @let registeredOffice = getFormGroup(groups.RegisteredOfficeAddress);\r
 \r
     @if (registeredOffice) {\r
+      @let registeredMailing = getAddressGroup(registeredOffice, controls.NewMailingAddress);\r
+      @let registeredDelivery = getAddressGroup(registeredOffice, controls.NewDeliveryAddress);\r
+      @let registeredDeliverySame = isChecked(registeredOffice, controls.DeliverySameAsMailing);\r
+\r
       <expandable-card\r
         [isStatusIcon]="!readonly()"\r
         [isValid]="isRegisteredOfficeValid()"\r
         [title]="groups.RegisteredOfficeAddress"\r
       >\r
         <div class="change-of-office-addresses-form-item">\r
-          @for (row of registeredRows(); track row.label) {\r
-            <div class="change-of-office-addresses-form-address">\r
-              <div class="body-1-regular grey">\r
-                <span class="body-1-semibold">{{ row.label | translate }}:</span>\r
-                {{ row.value || ('Not specified' | translate) }}\r
-              </div>\r
-              @if (row.previous) {\r
-                <div class="change-of-office-addresses-form-previous">\r
-                  {{ 'Previous' | translate }}: {{ row.previous }}\r
-                </div>\r
-              }\r
-            </div>\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="registeredOffice"\r
+            [config]="currentAddressesFields"\r
+          />\r
+\r
+          <h4 class="change-of-office-addresses-form-item-title">{{ 'New Mailing Address' | translate }}</h4>\r
+\r
+          @if (registeredMailing) {\r
+            <filing-form-group\r
+              [isSubmitted]="isSubmitted()"\r
+              [form]="registeredMailing"\r
+              [config]="addressFields"\r
+              (visiblyValidChange)="emitValidity()"\r
+            />\r
+          }\r
+\r
+          <h4 class="change-of-office-addresses-form-item-title">{{ 'New Delivery Address' | translate }}</h4>\r
+\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="registeredOffice"\r
+            [config]="deliverySameAsMailingFields"\r
+            (visiblyValidChange)="emitValidity()"\r
+          />\r
+\r
+          @if (!registeredDeliverySame && registeredDelivery) {\r
+            <filing-form-group\r
+              [isSubmitted]="isSubmitted()"\r
+              [form]="registeredOffice"\r
+              [config]="deliveryNoteFields"\r
+            />\r
+            <filing-form-group\r
+              [isSubmitted]="isSubmitted()"\r
+              [form]="registeredDelivery"\r
+              [config]="addressFields"\r
+              (visiblyValidChange)="emitValidity()"\r
+            />\r
           }\r
         </div>\r
       </expandable-card>\r
@@ -88328,24 +88266,59 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     @let recordsOffice = getFormGroup(groups.RecordsOfficeAddress);\r
 \r
     @if (recordsOffice) {\r
+      @let recordsMailing = getAddressGroup(recordsOffice, controls.NewMailingAddress);\r
+      @let recordsDelivery = getAddressGroup(recordsOffice, controls.NewDeliveryAddress);\r
+      @let recordsSameAsRegistered = isChecked(recordsOffice, controls.SameAsRegisteredOffice);\r
+      @let recordsDeliverySame = isChecked(recordsOffice, controls.DeliverySameAsMailing);\r
+\r
       <expandable-card\r
         [isStatusIcon]="!readonly()"\r
         [isValid]="isRecordsOfficeValid()"\r
         [title]="groups.RecordsOfficeAddress"\r
       >\r
         <div class="change-of-office-addresses-form-item">\r
-          @for (row of recordsRows(); track row.label) {\r
-            <div class="change-of-office-addresses-form-address">\r
-              <div class="body-1-regular grey">\r
-                <span class="body-1-semibold">{{ row.label | translate }}:</span>\r
-                {{ row.value || ('Not specified' | translate) }}\r
-              </div>\r
-              @if (row.previous) {\r
-                <div class="change-of-office-addresses-form-previous">\r
-                  {{ 'Previous' | translate }}: {{ row.previous }}\r
-                </div>\r
-              }\r
-            </div>\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="recordsOffice"\r
+            [config]="currentAddressesFields"\r
+          />\r
+\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="recordsOffice"\r
+            [config]="sameAsRegisteredOfficeFields"\r
+            (visiblyValidChange)="emitValidity()"\r
+          />\r
+\r
+          @if (!recordsSameAsRegistered) {\r
+            <h4 class="change-of-office-addresses-form-item-title">{{ 'New Mailing Address' | translate }}</h4>\r
+\r
+            @if (recordsMailing) {\r
+              <filing-form-group\r
+                [isSubmitted]="isSubmitted()"\r
+                [form]="recordsMailing"\r
+                [config]="addressFields"\r
+                (visiblyValidChange)="emitValidity()"\r
+              />\r
+            }\r
+\r
+            <h4 class="change-of-office-addresses-form-item-title">{{ 'New Delivery Address' | translate }}</h4>\r
+\r
+            <filing-form-group\r
+              [isSubmitted]="isSubmitted()"\r
+              [form]="recordsOffice"\r
+              [config]="deliverySameAsMailingFields"\r
+              (visiblyValidChange)="emitValidity()"\r
+            />\r
+\r
+            @if (!recordsDeliverySame && recordsDelivery) {\r
+              <filing-form-group\r
+                [isSubmitted]="isSubmitted()"\r
+                [form]="recordsDelivery"\r
+                [config]="addressFields"\r
+                (visiblyValidChange)="emitValidity()"\r
+              />\r
+            }\r
           }\r
         </div>\r
       </expandable-card>\r
@@ -88375,11 +88348,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }\r
   </div>\r
 </div>\r
-`, styles: ['/* src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.scss */\n:host {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .change-of-office-addresses-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .change-of-office-addresses-form .annual-reminder p {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder mat-radio-group {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n:host .change-of-office-addresses-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .change-of-office-addresses-form-item-title {\n  color: var(--filing-modal-color-dark-blue);\n}\n:host .change-of-office-addresses-form-address {\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n:host .change-of-office-addresses-form-previous {\n  font-size: 13px !important;\n  line-height: 18px;\n  font-family: "Open Sans";\n  font-style: italic;\n  color: var(--filing-modal-color-grey-mid);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */\n'] }]
+`, styles: ["/* src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.scss */\n:host {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .change-of-office-addresses-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .change-of-office-addresses-form .annual-reminder p {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder mat-radio-group {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n:host .change-of-office-addresses-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .change-of-office-addresses-form-item-title {\n  color: var(--filing-modal-color-dark-blue);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */\n"] }]
         }], null, null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaChangeOfOfficeAddressesFormComponent, { className: "BritishColumbiaChangeOfOfficeAddressesFormComponent", filePath: "src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.ts", lineNumber: 61 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaChangeOfOfficeAddressesFormComponent, { className: "BritishColumbiaChangeOfOfficeAddressesFormComponent", filePath: "src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.ts", lineNumber: 55 });
       })();
     }
   });
@@ -88433,7 +88406,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent, selectors: [["british-columbia-change-of-office-addresses-delta-form"]], inputs: { form: [1, "form"], actionsDisabled: [1, "actionsDisabled"], isNote: [1, "isNote"], task: [1, "task"], errors: [1, "errors"] }, outputs: { close: "close", save: "save", validate: "validate" }, decls: 15, vars: 19, consts: [[1, "change-of-office-addresses-delta-form"], [1, "change-of-office-addresses-delta-form-content", 3, "visiblyValidChange", "form", "task", "errors", "isNote", "loading", "isSubmitted", "readonly"], [1, "change-of-office-addresses-delta-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click", "disabled"], [1, "body-1-semibold"], ["color", "primary", "mat-flat-button", "", 1, "submit", 3, "click", "disabled"]], template: function BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent, selectors: [["british-columbia-change-of-office-addresses-delta-form"]], inputs: { form: [1, "form"], actionsDisabled: [1, "actionsDisabled"], isNote: [1, "isNote"], task: [1, "task"], errors: [1, "errors"] }, outputs: { close: "close", save: "save", validate: "validate" }, decls: 15, vars: 18, consts: [[1, "change-of-office-addresses-delta-form"], [1, "change-of-office-addresses-delta-form-content", 3, "visiblyValidChange", "form", "task", "errors", "isNote", "isSubmitted", "readonly"], [1, "change-of-office-addresses-delta-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click", "disabled"], [1, "body-1-semibold"], ["color", "primary", "mat-flat-button", "", 1, "submit", 3, "click", "disabled"]], template: function BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275elementStart(0, "div", 0)(1, "british-columbia-change-of-office-addresses-form", 1);
             \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent_Template_british_columbia_change_of_office_addresses_form_visiblyValidChange_1_listener($event) {
@@ -88467,19 +88440,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           }
           if (rf & 2) {
             \u0275\u0275advance();
-            \u0275\u0275property("form", ctx.form())("task", ctx.task())("errors", ctx.combinedErrors())("isNote", ctx.isNote())("loading", ctx.actionsDisabled())("isSubmitted", ctx.submitted())("readonly", false);
+            \u0275\u0275property("form", ctx.form())("task", ctx.task())("errors", ctx.combinedErrors())("isNote", ctx.isNote())("isSubmitted", ctx.submitted())("readonly", false);
             \u0275\u0275advance(2);
             \u0275\u0275property("disabled", ctx.actionsDisabled());
             \u0275\u0275advance(2);
-            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 13, "Close"));
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 12, "Close"));
             \u0275\u0275advance(2);
             \u0275\u0275property("disabled", ctx.actionsDisabled());
             \u0275\u0275advance(2);
-            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(10, 15, "Save Changes"));
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(10, 14, "Save Changes"));
             \u0275\u0275advance(2);
             \u0275\u0275property("disabled", ctx.actionsDisabled());
             \u0275\u0275advance(2);
-            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(14, 17, "Validate & Generate Draft"));
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(14, 16, "Validate & Generate Draft"));
           }
         }, dependencies: [MatButton, TranslatePipe, BritishColumbiaChangeOfOfficeAddressesFormComponent], styles: ["\n\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form-content[_ngcontent-%COMP%] {\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form-actions[_ngcontent-%COMP%] {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form-actions[_ngcontent-%COMP%]   button[_ngcontent-%COMP%] {\n  margin: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form-actions[_ngcontent-%COMP%]   .submit[_ngcontent-%COMP%] {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=change-of-office-addresses-delta-form.component.css.map */"], changeDetection: 0 });
       };
@@ -88493,7 +88466,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     [task]="task()"\r
     [errors]="combinedErrors()"\r
     [isNote]="isNote()"\r
-    [loading]="actionsDisabled()"\r
     [isSubmitted]="submitted()"\r
     [readonly]="false"\r
     (visiblyValidChange)="onVisiblyValidChange($event)"\r
@@ -88820,8 +88792,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         actionsDisabled = input(false);
         errors = input([]);
         currentDataExtract = input();
-        /** False while the registry's current data is loading; the validated-draft preview waits for it. */
-        extractReady = input(true);
         close = output();
         codValidate = output();
         saveCodDeltaData = output();
@@ -88857,7 +88827,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.deltaState.setBCFormationInitialDelta(this.generateFormationDeltaData());
             }
             if (task && isChangeOfAddressTask(task)) {
-              this.deltaForm.set(new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key), this.currentDataExtract())));
+              this.deltaForm.set(new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key))));
               this.deltaState.setBCChangeOfOfficeAddressesInitialDelta(this.generateChangeOfOfficeAddressesDeltaData());
             }
           });
@@ -88883,8 +88853,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 this.nextStep.emit();
               }
             }
-            if (task && isChangeOfAddressTask(task) && deltaData && this.extractReady()) {
-              const form = new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key), this.currentDataExtract()));
+            if (task && isChangeOfAddressTask(task) && deltaData) {
+              const form = new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key)));
               form.disable();
               this.previewForm.set(form);
               const step = untracked2(() => this.activeStep());
@@ -88998,7 +88968,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             annualReportReminder: reminder?.[c.AnnualReportReminder] ?? null,
             directorChanges: {
               addIds: directors.filter((d) => d[c.AffiliationType] === "Add").map((d) => d[c.Id]).filter(Boolean),
-              editIds: directors.filter((d) => d[c.AffiliationType] === "Update").map((d) => d[c.Id]).filter(Boolean),
+              editIds: directors.filter((d) => d[c.AffiliationType] === "Update" || !d[c.AffiliationType]).map((d) => d[c.Id]).filter(Boolean),
               ceaseIds: directors.filter((d) => d[c.AffiliationType] === "Cease").map((d) => d[c.Id]).filter(Boolean)
             }
           };
@@ -89077,7 +89047,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function BritishColumbiaComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _BritishColumbiaComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaComponent, selectors: [["british-columbia"]], inputs: { task: [1, "task"], currentUser: [1, "currentUser"], activeStep: [1, "activeStep"], isNote: [1, "isNote"], actionsDisabled: [1, "actionsDisabled"], errors: [1, "errors"], currentDataExtract: [1, "currentDataExtract"], extractReady: [1, "extractReady"] }, outputs: { close: "close", codValidate: "codValidate", saveCodDeltaData: "saveCodDeltaData", codSubmit: "codSubmit", formationValidate: "formationValidate", formationSubmit: "formationSubmit", saveFormationDeltaData: "saveFormationDeltaData", nextStep: "nextStep", recheckStep: "recheckStep", prevStep: "prevStep", coaValidate: "coaValidate", saveCoaDeltaData: "saveCoaDeltaData", coaSubmit: "coaSubmit" }, decls: 4, vars: 4, consts: [[3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"], [3, "task", "errors", "isNote", "actionsDisabled", "form"], [3, "task", "form", "errors", "actionsDisabled"], [3, "validate", "close", "save", "task", "errors", "isNote", "actionsDisabled", "form"], [3, "next", "close", "task", "form", "errors", "actionsDisabled"]], template: function BritishColumbiaComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaComponent, selectors: [["british-columbia"]], inputs: { task: [1, "task"], currentUser: [1, "currentUser"], activeStep: [1, "activeStep"], isNote: [1, "isNote"], actionsDisabled: [1, "actionsDisabled"], errors: [1, "errors"], currentDataExtract: [1, "currentDataExtract"] }, outputs: { close: "close", codValidate: "codValidate", saveCodDeltaData: "saveCodDeltaData", codSubmit: "codSubmit", formationValidate: "formationValidate", formationSubmit: "formationSubmit", saveFormationDeltaData: "saveFormationDeltaData", nextStep: "nextStep", recheckStep: "recheckStep", prevStep: "prevStep", coaValidate: "coaValidate", saveCoaDeltaData: "saveCoaDeltaData", coaSubmit: "coaSubmit" }, decls: 4, vars: 4, consts: [[3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"], [3, "task", "errors", "isNote", "actionsDisabled", "form"], [3, "task", "form", "errors", "actionsDisabled"], [3, "validate", "close", "save", "task", "errors", "isNote", "actionsDisabled", "form"], [3, "next", "close", "task", "form", "errors", "actionsDisabled"]], template: function BritishColumbiaComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275declareLet(0);
             \u0275\u0275template(1, BritishColumbiaComponent_Conditional_1_Template, 2, 2)(2, BritishColumbiaComponent_Conditional_2_Template, 2, 2)(3, BritishColumbiaComponent_Conditional_3_Template, 2, 2);
@@ -90766,7 +90736,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275pipe(7, "translate");
       \u0275\u0275elementEnd();
       \u0275\u0275elementStart(8, "ul", 16);
-      \u0275\u0275repeaterCreate(9, FederalIncorporationFormComponent_Conditional_7_For_10_Template, 2, 1, "li", 17, _forTrack06);
+      \u0275\u0275repeaterCreate(9, FederalIncorporationFormComponent_Conditional_7_For_10_Template, 2, 1, "li", 17, _forTrack05);
       \u0275\u0275elementEnd()();
       \u0275\u0275elementStart(11, "span", 17);
       \u0275\u0275text(12);
@@ -90969,7 +90939,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", contactForm_r24)("config", ctx_r0.contactControl);
     }
   }
-  var _c016, _forTrack06, FederalIncorporationFormComponent;
+  var _c016, _forTrack05, FederalIncorporationFormComponent;
   var init_federal_incorporation_form_component = __esm({
     "src/app/components/federal/incorporation/federal-incorporation-form/federal-incorporation-form.component.ts"() {
       init_core();
@@ -90994,7 +90964,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_common();
       init_core();
       _c016 = ["*"];
-      _forTrack06 = ($index, $item) => $item.affiliationID;
+      _forTrack05 = ($index, $item) => $item.affiliationID;
       FederalIncorporationFormComponent = class _FederalIncorporationFormComponent {
         form = input.required();
         isNote = input(false);
@@ -95686,7 +95656,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             return String(id);
           });
         }
-        /** Polls the extract until the registry has it ready (`success`) and returns the extract. */
+        /** Polls the extract until the registry has it ready (`success`). */
         waitForCurrentDataExtract(_0, _1) {
           return __async(this, arguments, function* (signature, extractId, opts = {}, poll = {}) {
             const { intervalMs, timeoutMs } = __spreadValues(__spreadValues({}, DEFAULT_EXTRACT_POLL), poll);
@@ -95695,7 +95665,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               const { status, ok, body, raw } = yield this.send(signature, "GET", `${DATA_EXTRACT_PATH}/${encodeURIComponent(extractId)}`, void 0, opts);
               const state2 = String(body?.status ?? "").toLowerCase();
               if (ok && state2 === "success") {
-                return body ?? {};
+                return;
               }
               if (!ok || state2 === "failed" || state2 === "sourceunavailable") {
                 throw this.failure(status, "Retrieving the current data from the registry failed", body, raw);
@@ -95933,7 +95903,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     "src/app/helpers/mappers/british-columbia-change-of-office-addresses.mapper.ts"() {
       init_BritishColumbiaConstants();
       init_british_columbia_change_of_office_addresses_form_helper();
-      TEMP_UAT_TEST_ACCESS_CODE = "xxxxxxxx";
+      TEMP_UAT_TEST_ACCESS_CODE = "12345678";
       BC_PROVINCE_CODE = "BC";
       CANADA_COUNTRY_CODE = "CA";
       clean = (value) => (value ?? "").trim();
@@ -96073,7 +96043,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     if (rf & 2) {
       const ctx_r2 = \u0275\u0275nextContext(2);
       const currentTask_r5 = \u0275\u0275readContextLet(9);
-      \u0275\u0275property("task", currentTask_r5)("currentUser", ctx_r2.currentUser())("activeStep", ctx_r2.activeStep())("isNote", ctx_r2.dataWasChanged())("actionsDisabled", ctx_r2.isLoading())("errors", ctx_r2.errors())("currentDataExtract", ctx_r2.currentDataExtract())("extractReady", ctx_r2.bcCoaExtractReady());
+      \u0275\u0275property("task", currentTask_r5)("currentUser", ctx_r2.currentUser())("activeStep", ctx_r2.activeStep())("isNote", ctx_r2.dataWasChanged())("actionsDisabled", ctx_r2.isLoading())("errors", ctx_r2.errors())("currentDataExtract", ctx_r2.currentDataExtract());
     }
   }
   function FilingComponent_Conditional_10_Conditional_2_Template(rf, ctx) {
@@ -96123,7 +96093,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function FilingComponent_Conditional_10_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275template(0, FilingComponent_Conditional_10_Conditional_0_Template, 1, 7, "ontario", 8)(1, FilingComponent_Conditional_10_Conditional_1_Template, 1, 8, "british-columbia", 9)(2, FilingComponent_Conditional_10_Conditional_2_Template, 1, 5, "federal", 10);
+      \u0275\u0275template(0, FilingComponent_Conditional_10_Conditional_0_Template, 1, 7, "ontario", 8)(1, FilingComponent_Conditional_10_Conditional_1_Template, 1, 7, "british-columbia", 9)(2, FilingComponent_Conditional_10_Conditional_2_Template, 1, 5, "federal", 10);
     }
     if (rf & 2) {
       const ctx_r2 = \u0275\u0275nextContext();
@@ -96245,10 +96215,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         dataWasChanged = signal(false);
         serviceOrderId = "";
         bcCurrentDataServiceOrderId = "";
-        /** The registry's current data ordered for the Change of Office Addresses; reused by Validate. */
-        bcCoaExtractId = "";
-        /** False while the registry's current office addresses are loading. */
-        bcCoaExtractReady = signal(true);
         currentDataExtract = signal(void 0);
         bcDataExtractTaskId = "";
         activeStep = signal(Step.Validate);
@@ -96343,47 +96309,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 this.isLoading.set(false);
               }
             }
-            if (isChangeOfAddressTask(task) && isBritishColumbiaTask(task) && this.bcDataExtractTaskId !== task._id) {
-              this.bcDataExtractTaskId = task._id;
-              yield this.loadBritishColumbiaOfficeAddressExtract(task);
-            }
           }));
         }
-        /**
-         * Orders the registry's current office addresses as soon as the Change of Office Addresses opens,
-         * so each office shows its registry address as "Previous". If the registry is unavailable the form
-         * falls back to the Entity's own addresses, and Validate orders the extract again.
-         */
-        loadBritishColumbiaOfficeAddressExtract(task) {
-          return __async(this, null, function* () {
-            const signature = this._signature();
-            if (!signature) {
-              return;
-            }
-            this.isLoading.set(true);
-            this.bcCoaExtractReady.set(false);
-            try {
-              const opts = this.validateOptions() ?? {};
-              const context2 = this.getBritishColumbiaOfficeAddressContext(task, signature);
-              this.bcCoaExtractId = yield this.bcMaintenanceService.orderCurrentDataExtract(signature, context2, opts);
-              this.currentDataExtract.set(yield this.bcMaintenanceService.waitForCurrentDataExtract(signature, this.bcCoaExtractId, opts));
-            } catch (error) {
-              this.bcCoaExtractId = "";
-              this.currentDataExtract.set(void 0);
-              console.warn("The registry's current office addresses could not be loaded.", error);
-            } finally {
-              this.bcCoaExtractReady.set(true);
-              this.isLoading.set(false);
-            }
-          });
-        }
-        getBritishColumbiaOfficeAddressContext(task, signature) {
-          return {
-            corporationNumber: task.entity._profile.corp_number ?? "",
-            accessCodeOrPassword: getBritishColumbiaAccessCode2(task, signature.env),
-            incorporationDate: String(task.entity._compliance?.incorporation_date ?? "").slice(0, 10)
-          };
-        }
         getCurrentData() {
           return __async(this, null, function* () {
             const signature = this._signature();
@@ -96588,10 +96515,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               const signature = this._signature();
               if (signature) {
                 const requestBody = buildBCFormationValidateRequest(signature.task, deltaData);
-                const issues = [
-                  ...findBCOfficeAddressIssues(signature.task),
-                  ...findBCRequestIssues(requestBody)
-                ];
+                const issues = findBCRequestIssues(requestBody);
                 if (issues.length) {
                   this.errors.set(issues);
                   return;
@@ -96681,13 +96605,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.errors.set([]);
               const requestBody = buildBCChangeOfOfficeAddressesValidateRequest(task, deltaData);
               const opts = this.validateOptions() ?? {};
-              const context2 = this.getBritishColumbiaOfficeAddressContext(task, signature);
-              let extractId = this.bcCoaExtractId;
-              if (!extractId) {
-                extractId = yield this.bcMaintenanceService.orderCurrentDataExtract(signature, context2, opts);
-                yield this.bcMaintenanceService.waitForCurrentDataExtract(signature, extractId, opts);
-                this.bcCoaExtractId = extractId;
-              }
+              const context2 = {
+                corporationNumber: task.entity._profile.corp_number ?? "",
+                accessCodeOrPassword: getBritishColumbiaAccessCode2(task, signature.env),
+                incorporationDate: String(task.entity._compliance?.incorporation_date ?? "").slice(0, 10)
+              };
+              const extractId = yield this.bcMaintenanceService.orderCurrentDataExtract(signature, context2, opts);
+              yield this.bcMaintenanceService.waitForCurrentDataExtract(signature, extractId, opts);
               const response = yield this.bcMaintenanceService.validate(signature, requestBody, extractId, context2, opts);
               if (this.hasResponseErrors(response))
                 return;
@@ -96723,19 +96647,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }
         /**
          * British Columbia Change of Office Addresses save – propagates delta data to the host.
-         * The draft link (ServiceOrderId and the request it was generated from) is kept, so reopening
-         * can tell whether the saved data still matches the draft and show "Entity changed" if not.
          */
         onBritishColumbiaChangeOfOfficeAddressesSave(deltaData) {
           const oldDeltaData = this.task()?.deltaData;
-          const draftLink = oldDeltaData?.serviceOrderId && oldDeltaData?.validatedData ? {
-            serviceOrderId: oldDeltaData.serviceOrderId,
-            validatedData: oldDeltaData.validatedData
-          } : {};
           if (oldDeltaData) {
             delete this.task()?.deltaData;
           }
-          this.deltaDataChange.emit(__spreadValues(__spreadValues({}, deltaData), draftLink));
+          this.deltaDataChange.emit(deltaData);
         }
         /**
          * British Columbia Change of Office Addresses submit/file: submits the filing staged by
@@ -96989,9 +96907,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           } else if (isChangeOfPrincipalsTask(task) && isBritishColumbiaTask(task)) {
             this.bcDataExtractTaskId = "";
             void this.refreshBritishColumbiaCurrentDataExtract();
-          } else if (isChangeOfAddressTask(task) && isBritishColumbiaTask(task)) {
-            this.bcDataExtractTaskId = task._id;
-            void this.loadBritishColumbiaOfficeAddressExtract(task);
           }
           this.activeStep.set(Step.Validate);
         }
@@ -97196,7 +97111,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           if (rf & 2) {
             \u0275\u0275styleProp("height", ctx.modalHeight());
           }
-        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], currentUser: [1, "currentUser"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 9, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract", "extractReady"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "nextStep", "recheckStep", "prevStep", "codValidate", "saveCodDeltaData", "codSubmit", "coaValidate", "saveCoaDeltaData", "coaSubmit", "formationValidate", "saveFormationDeltaData", "formationSubmit", "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract", "extractReady"], [3, "close", "deltaDataChange", "file", "validate", "umSave", "umValidate", "umSubmit", "nextStep", "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "diameter"]], template: function FilingComponent_Template(rf, ctx) {
+        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], currentUser: [1, "currentUser"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 9, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "nextStep", "recheckStep", "prevStep", "codValidate", "saveCodDeltaData", "codSubmit", "coaValidate", "saveCoaDeltaData", "coaSubmit", "formationValidate", "saveFormationDeltaData", "formationSubmit", "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract"], [3, "close", "deltaDataChange", "file", "validate", "umSave", "umValidate", "umSubmit", "nextStep", "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "diameter"]], template: function FilingComponent_Template(rf, ctx) {
           if (rf & 1) {
             const _r1 = \u0275\u0275getCurrentView();
             \u0275\u0275elementStart(0, "div", 0)(1, "div", 1)(2, "h1", 2);
@@ -97300,7 +97215,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           [actionsDisabled]="isLoading()"\r
           [errors]="errors()"\r
           [currentDataExtract]="currentDataExtract()"\r
-          [extractReady]="bcCoaExtractReady()"\r
           (close)="close.emit()"\r
           (nextStep)="onNextStepClick()"\r
           (recheckStep)="defineInitialStep()"\r
@@ -101994,12 +101908,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         "File British Columbia Change of Office Addresses": "File British Columbia Change of Office Addresses",
         "Records Office Address": "Records Office Address",
         "The new addresses will take effect at the beginning of the day following the filing date. The registered and records offices must be located in British Columbia.": "The new addresses will take effect at the beginning of the day following the filing date. The registered and records offices must be located in British Columbia.",
-        "The Registered Office mailing address is missing. Add it in UEM, then try again.": "The Registered Office mailing address is missing. Add it in UEM, then try again.",
-        "The Registered Office delivery address is missing. Add it in UEM, then try again.": "The Registered Office delivery address is missing. Add it in UEM, then try again.",
-        "The Records Office mailing address is missing. Add it in UEM, then try again.": "The Records Office mailing address is missing. Add it in UEM, then try again.",
-        "The Records Office delivery address is missing. Add it in UEM, then try again.": "The Records Office delivery address is missing. Add it in UEM, then try again.",
-        "Mailing Address": "Mailing Address",
-        "Delivery Address": "Delivery Address",
         "Current Mailing Address": "Current Mailing Address",
         "Current Delivery Address": "Current Delivery Address",
         "New Mailing Address": "New Mailing Address",
@@ -102356,12 +102264,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         "Without Par Value": "Sans valeur nominale",
         "File British Columbia Change of Office Addresses": "D\xE9poser le changement d'adresses de bureaux de la Colombie-Britannique",
         "The new addresses will take effect at the beginning of the day following the filing date. The registered and records offices must be located in British Columbia.": "Les nouvelles adresses prendront effet au d\xE9but du jour suivant la date de d\xE9p\xF4t. Le si\xE8ge social et le bureau des registres doivent \xEAtre situ\xE9s en Colombie-Britannique.",
-        "The Registered Office mailing address is missing. Add it in UEM, then try again.": "L'adresse postale du si\xE8ge social est manquante. Ajoutez-la dans UEM, puis r\xE9essayez.",
-        "The Registered Office delivery address is missing. Add it in UEM, then try again.": "L'adresse de livraison du si\xE8ge social est manquante. Ajoutez-la dans UEM, puis r\xE9essayez.",
-        "The Records Office mailing address is missing. Add it in UEM, then try again.": "L'adresse postale du bureau des registres est manquante. Ajoutez-la dans UEM, puis r\xE9essayez.",
-        "The Records Office delivery address is missing. Add it in UEM, then try again.": "L'adresse de livraison du bureau des registres est manquante. Ajoutez-la dans UEM, puis r\xE9essayez.",
-        "Mailing Address": "Adresse postale",
-        "Delivery Address": "Adresse de livraison",
         "Current Mailing Address": "Adresse postale actuelle",
         "Current Delivery Address": "Adresse de livraison actuelle",
         "New Mailing Address": "Nouvelle adresse postale",