@dyedurham/search-and-file-widget 2.1.13 → 2.1.15

package/dnd-filing-shell.js

@@ -85137,8 +85137,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 incomingSeed = delta?.registeredOffice ? this.fillEmptyAddresses(delta, incoming) : this.seedFromIncomingAffiliations(task);
-          const seed = this.withCurrentAddresses(incomingSeed, incoming, delta, registeredOffice, recordsOffice);
+          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({
@@ -85210,48 +85209,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           };
         }
-        /**
-         * For an office with neither an incoming address nor a saved draft, 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, delta, registeredOffice, recordsOffice) {
-          const pickBy = BritishColumbiaFormationFormHelper.pickAddress;
-          const current = (office, type) => {
-            const address = pickBy(office?.addresses, type);
-            return address && this.isBritishColumbia(address) ? this.toOfficeAddressDelta(address) : void 0;
-          };
-          const result = __spreadValues({}, seed);
-          if (!delta?.registeredOffice && !incoming.regMailing) {
-            const mailing = current(registeredOffice, "Mailing");
-            const delivery = current(registeredOffice, "Delivery");
-            if (mailing) {
-              const same = !delivery || this.isSameOfficeAddress(delivery, mailing);
-              result.registeredOffice = {
-                mailingAddress: mailing,
-                deliverySameAsMailing: same,
-                deliveryAddress: same ? void 0 : delivery
-              };
-            }
-          }
-          if (!delta?.recordsOffice && !incoming.recMailing) {
-            const mailing = current(recordsOffice, "Mailing");
-            const delivery = current(recordsOffice, "Delivery");
-            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
-              };
-            }
-          }
-          return result;
-        }
         /** 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]));
@@ -87811,20 +87768,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));
@@ -87833,17 +87781,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));
@@ -87852,129 +87800,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\u0275conditional(recordsMailing_r18 ? 3 : -1);
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", row_r7.value || \u0275\u0275pipeBind1(6, 5, "Not specified"), " ");
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 9, "New Delivery Address"));
       \u0275\u0275advance(2);
-      \u0275\u0275conditional(row_r7.previous ? 7 : -1);
+      \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);
@@ -87989,7 +88040,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();
@@ -88002,11 +88053,11 @@ 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();
@@ -88029,38 +88080,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);
-          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."),
-            !regDelivery.value && t("The Registered Office delivery address is missing."),
-            // "Same as Registered Office" is already reported by the registered office messages.
-            !recordsSameAsRegistered && !recMailing.value && t("The Records Office mailing address is missing."),
-            !recordsSameAsRegistered && !recDelivery.value && t("The Records Office delivery address is missing.")
-          ].filter((m) => !!m);
-        }
-        /** The incoming Shared Address supplied no new address for a line (and none is on the register). */
-        isRegisteredMissing() {
-          return this.registeredRows().some((row) => !row.value);
-        }
-        isRecordsMissing() {
-          return 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);
@@ -88078,77 +88108,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"], 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) {
@@ -88156,26 +88137,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();
-            const annualReportReminder_r13 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
+            \u0275\u0275conditional(registeredOffice_r27 ? 9 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(annualReportReminder_r13 ? 14 : -1);
+            const recordsOffice_r28 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.RecordsOfficeAddress));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(recordsOffice_r28 ? 11 : -1);
+            \u0275\u0275advance();
+            const annualReportReminder_r29 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(annualReportReminder_r29 ? 13 : -1);
           }
         }, dependencies: [
           FilingFormGroupComponent,
@@ -88189,7 +88170,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, [{
@@ -88217,13 +88198,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
@@ -88260,24 +88234,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
@@ -88287,24 +88291,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
@@ -88334,11 +88373,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 });
       })();
     }
   });
@@ -90722,7 +90761,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);
@@ -90925,7 +90964,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();
@@ -90950,7 +90989,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);
@@ -101903,12 +101942,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.": "The Registered Office mailing address is missing.",
-        "The Registered Office delivery address is missing.": "The Registered Office delivery address is missing.",
-        "The Records Office mailing address is missing.": "The Records Office mailing address is missing.",
-        "The Records Office delivery address is missing.": "The Records Office delivery address is missing.",
-        "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",
@@ -102265,12 +102298,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.": "L'adresse postale du si\xE8ge social est manquante.",
-        "The Registered Office delivery address is missing.": "L'adresse de livraison du si\xE8ge social est manquante.",
-        "The Records Office mailing address is missing.": "L'adresse postale du bureau des registres est manquante.",
-        "The Records Office delivery address is missing.": "L'adresse de livraison du bureau des registres est manquante.",
-        "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",

package/package.json

@@ -1,11 +1,11 @@
-{
-  "name": "@dyedurham/search-and-file-widget",
-  "version": "2.1.13",
-  "description": "",
-  "main": "dnd-filing-shell.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "",
-  "license": "ISC"
+{
+  "name": "@dyedurham/search-and-file-widget",
+  "version": "2.1.15",
+  "description": "",
+  "main": "dnd-filing-shell.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
 }