@dyedurham/search-and-file-widget 2.1.11 → 2.1.12

package/dnd-filing-shell.js

@@ -84931,17 +84931,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/helpers/british-columbia/change-of-directors/british-columbia-change-of-directors-form.helper.ts
-  function notInFuture() {
-    return (control) => {
-      if (!control.value) {
-        return null;
-      }
-      const value = new Date(control.value);
-      const today = /* @__PURE__ */ new Date();
-      today.setHours(23, 59, 59, 999);
-      return value > today ? { futureDate: true } : null;
-    };
-  }
   var Controls, BritishColumbiaChangeOfDirectorsFormHelper;
   var init_british_columbia_change_of_directors_form_helper = __esm({
     "src/app/helpers/british-columbia/change-of-directors/british-columbia-change-of-directors-form.helper.ts"() {
@@ -84963,13 +84952,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const registeredOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
           const companyEmail = registeredOffice?.addresses?.[0]?.communications?.find((c) => c.type === "Business Email")?.value ?? task.entity.communications?.find((c) => c.type === "Business Email")?.value ?? "";
           const registeredMailing = format(pick(registeredOffice?.addresses, "Mailing"));
+          const effectiveDate = task._ext._effective_date ?? "";
           const today = (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
           const config2 = {};
           config2[BCChangeOfDirectorsFormGroups.ReferenceNumbers] = this.generateReferenceNumbersFormGroup(delta?.referenceNumbers, task.entity._profile?.client_matter_number, delta?.referenceNumbers?.referenceNumber);
           config2[BCChangeOfDirectorsFormGroups.CorporationDetails] = new FormGroup({
             [Controls.CorporationName]: this.readOnly(task.entity._profile.name),
             [Controls.IncorporationNumber]: this.readOnly(task.entity._profile.corp_number),
-            [Controls.CompanyEmail]: this.readOnly(companyEmail)
+            [Controls.CompanyEmail]: new FormControl(companyEmail, [Validators.required, Validators.email])
           });
           const isDirector = (a) => isPrincipalAffiliation2(a) && a.role?.role_name === "Director";
           const incoming = task.incomingAffiliations ?? [];
@@ -84978,10 +84968,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const hasAddOrCease = ceasedIds.size > 0 || incoming.filter(isDirector).length > 0;
           config2[BCChangeOfDirectorsFormGroups.FilingDetails] = new FormGroup({
             [Controls.DirectorsAddedOrDeleted]: new FormControl(delta?.filingDetails?.directorsAddedOrDeleted ?? hasAddOrCease),
-            [Controls.ChangeDate]: new FormControl(delta?.filingDetails?.changeDate ?? "", [
-              requiredIfValue(Controls.DirectorsAddedOrDeleted, true),
-              notInFuture()
-            ]),
+            [Controls.ChangeDate]: this.readOnly(effectiveDate),
             [Controls.FilingFee]: this.readOnly(BC_CHANGE_OF_DIRECTORS_FILING_FEE)
           });
           const currentDirectorKeys = this.getCurrentDirectorKeys(currentDataExtract);
@@ -85373,7 +85360,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       BC_COD_CARD_FORM_CORPORATION_DETAILS_FIELDS = [
         readOnlyRow("Corporation Name", Controls3.CorporationName),
         readOnlyRow("Incorporation Number", Controls3.IncorporationNumber),
-        readOnlyRow("Company Email", Controls3.CompanyEmail)
+        {
+          type: FormType.Select,
+          label: "Company Email",
+          formControlName: Controls3.CompanyEmail,
+          required: true,
+          options: [],
+          class: "span-12"
+        }
       ];
       BC_COD_DELTA_CARD_FORM_FILING_DETAILS_FIELDS = [
         {
@@ -85388,20 +85382,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           formControlName: Controls3.DirectorsAddedOrDeleted,
           class: "span-12",
           onChange: (form) => {
-            if (!directorsAddedOrDeleted(form)) {
-              form.get(Controls3.ChangeDate)?.setValue("", { emitEvent: false });
-            }
             form.get(Controls3.ChangeDate)?.updateValueAndValidity({ emitEvent: false });
           }
         },
-        {
-          type: FormType.Date,
-          label: "Date Directors were added or deleted",
-          formControlName: Controls3.ChangeDate,
-          required: true,
-          isVisible: directorsAddedOrDeleted,
-          class: "span-8"
-        },
+        __spreadProps(__spreadValues({}, readOnlyRow("Date Directors were added or deleted", Controls3.ChangeDate, "span-8")), {
+          isVisible: directorsAddedOrDeleted
+        }),
         __spreadProps(__spreadValues({}, readOnlyRow("Filing Fee", Controls3.FilingFee, "span-4")), {
           isVisible: directorsAddedOrDeleted
         }),
@@ -85467,7 +85453,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   // src/app/components/british-columbia/change-of-directors/change-of-directors-form/change-of-directors-form.component.ts
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275element(0, "alert", 2);
+      \u0275\u0275element(0, "alert", 1);
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
@@ -85476,7 +85462,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_2_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275element(0, "alert", 3);
+      \u0275\u0275element(0, "alert", 2);
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
@@ -85486,7 +85472,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_5_Template(rf, ctx) {
     if (rf & 1) {
       const _r2 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "expandable-card", 5)(1, "filing-form-group", 10);
+      \u0275\u0275elementStart(0, "expandable-card", 4)(1, "filing-form-group", 9);
       \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_5_Template_filing_form_group_visiblyValidChange_1_listener($event) {
         \u0275\u0275restoreView(_r2);
         const ctx_r0 = \u0275\u0275nextContext();
@@ -85504,7 +85490,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_7_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 11)(2, "p")(3, "strong");
+      const _r4 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "expandable-card", 5)(1, "div", 10)(2, "p")(3, "strong");
       \u0275\u0275text(4);
       \u0275\u0275pipe(5, "translate");
       \u0275\u0275elementEnd();
@@ -85516,127 +85503,94 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275elementEnd();
       \u0275\u0275text(11);
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(12, "p")(13, "strong");
-      \u0275\u0275text(14);
-      \u0275\u0275pipe(15, "translate");
-      \u0275\u0275elementEnd();
-      \u0275\u0275text(16);
-      \u0275\u0275elementEnd()()();
+      \u0275\u0275elementStart(12, "div", 11)(13, "filing-form-group", 12);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_7_Template_filing_form_group_visiblyValidChange_13_listener($event) {
+        \u0275\u0275restoreView(_r4);
+        const ctx_r0 = \u0275\u0275nextContext();
+        return \u0275\u0275resetView(ctx_r0.onSectionValidChange("corporationDetails", $event));
+      });
+      \u0275\u0275elementEnd()()()();
     }
     if (rf & 2) {
       let tmp_9_0;
       let tmp_11_0;
-      let tmp_13_0;
       const ctx_r0 = \u0275\u0275nextContext();
-      const corporationDetails_r4 = \u0275\u0275readContextLet(6);
+      const corporationDetails_r5 = \u0275\u0275readContextLet(6);
       \u0275\u0275property("isStatusIcon", false)("title", ctx_r0.groups.CorporationDetails);
       \u0275\u0275advance(4);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(5, 8, "Corporation Name"), ":");
+      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(5, 9, "Corporation Name"), ":");
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", (tmp_9_0 = corporationDetails_r4.get(ctx_r0.controls.CorporationName)) == null ? null : tmp_9_0.value, " ");
+      \u0275\u0275textInterpolate1(" ", (tmp_9_0 = corporationDetails_r5.get(ctx_r0.controls.CorporationName)) == null ? null : tmp_9_0.value, " ");
       \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(10, 10, "Incorporation Number"), ":");
+      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(10, 11, "Incorporation Number"), ":");
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", (tmp_11_0 = corporationDetails_r4.get(ctx_r0.controls.IncorporationNumber)) == null ? null : tmp_11_0.value, " ");
-      \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(15, 12, "Company Email"), ":");
+      \u0275\u0275textInterpolate1(" ", (tmp_11_0 = corporationDetails_r5.get(ctx_r0.controls.IncorporationNumber)) == null ? null : tmp_11_0.value, " ");
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", (tmp_13_0 = corporationDetails_r4.get(ctx_r0.controls.CompanyEmail)) == null ? null : tmp_13_0.value, " ");
+      \u0275\u0275property("form", corporationDetails_r5)("config", ctx_r0.companyEmailFields())("isSubmitted", ctx_r0.isSubmitted());
     }
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template(rf, ctx) {
     if (rf & 1) {
-      const _r7 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "div", 15)(1, "div", 16)(2, "label");
+      \u0275\u0275elementStart(0, "div", 16)(1, "div", 17)(2, "p", 18);
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
-      \u0275\u0275elementStart(5, "span");
-      \u0275\u0275text(6, "*");
-      \u0275\u0275elementEnd()();
-      \u0275\u0275elementStart(7, "mat-form-field", 17)(8, "input", 18);
-      \u0275\u0275listener("click", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template_input_click_8_listener() {
-        \u0275\u0275restoreView(_r7);
-        const changeDatePicker_r8 = \u0275\u0275reference(12);
-        return \u0275\u0275resetView(changeDatePicker_r8.open());
-      })("dateChange", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template_input_dateChange_8_listener() {
-        \u0275\u0275restoreView(_r7);
-        const ctx_r0 = \u0275\u0275nextContext(2);
-        const filingDetails_r6 = \u0275\u0275readContextLet(8);
-        return \u0275\u0275resetView(ctx_r0.onSectionValidChange("filingDetails", filingDetails_r6.valid));
-      });
-      \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(9, "button", 19);
-      \u0275\u0275listener("click", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template_button_click_9_listener() {
-        \u0275\u0275restoreView(_r7);
-        const changeDatePicker_r8 = \u0275\u0275reference(12);
-        return \u0275\u0275resetView(changeDatePicker_r8.open());
-      });
-      \u0275\u0275element(10, "span", 20);
-      \u0275\u0275elementEnd();
-      \u0275\u0275element(11, "mat-datepicker", null, 0);
-      \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(13, "p", 21);
-      \u0275\u0275text(14);
-      \u0275\u0275pipe(15, "translate");
-      \u0275\u0275elementEnd()();
-      \u0275\u0275elementStart(16, "p", 22)(17, "strong");
-      \u0275\u0275text(18);
-      \u0275\u0275pipe(19, "translate");
+      \u0275\u0275elementStart(5, "strong");
+      \u0275\u0275text(6);
+      \u0275\u0275elementEnd()()();
+      \u0275\u0275elementStart(7, "p", 19)(8, "strong");
+      \u0275\u0275text(9);
+      \u0275\u0275pipe(10, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275text(20);
+      \u0275\u0275text(11);
       \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
-      let tmp_13_0;
-      const changeDatePicker_r8 = \u0275\u0275reference(12);
+      let tmp_8_0;
+      let tmp_10_0;
       const ctx_r0 = \u0275\u0275nextContext(2);
-      const filingDetails_r6 = \u0275\u0275readContextLet(8);
+      const filingDetails_r7 = \u0275\u0275readContextLet(8);
       \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(4, 6, "Date Directors were added or deleted"), "");
-      \u0275\u0275advance(5);
-      \u0275\u0275property("matDatepicker", changeDatePicker_r8)("formControlName", ctx_r0.controls.ChangeDate);
-      \u0275\u0275advance(6);
-      \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(15, 8, "The date on which the individual(s) became or ceased to be a director. This date must be today's date or in the past."), " ");
-      \u0275\u0275advance(4);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(19, 10, "Filing Fee"), ":");
+      \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(4, 4, "The date on which the individual(s) became or ceased to be a director:"), " ");
+      \u0275\u0275advance(3);
+      \u0275\u0275textInterpolate(ctx_r0.getEffectiveDateDisplay((tmp_8_0 = filingDetails_r7.get(ctx_r0.controls.ChangeDate)) == null ? null : tmp_8_0.value));
+      \u0275\u0275advance(3);
+      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(10, 6, "Filing Fee"), ":");
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", (tmp_13_0 = filingDetails_r6.get(ctx_r0.controls.FilingFee)) == null ? null : tmp_13_0.value, " ");
+      \u0275\u0275textInterpolate1(" ", (tmp_10_0 = filingDetails_r7.get(ctx_r0.controls.FilingFee)) == null ? null : tmp_10_0.value, " ");
     }
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Template(rf, ctx) {
     if (rf & 1) {
-      const _r5 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 12)(2, "div", 13)(3, "strong");
+      const _r6 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 13)(2, "div", 14)(3, "strong");
       \u0275\u0275text(4);
       \u0275\u0275pipe(5, "translate");
       \u0275\u0275elementEnd();
       \u0275\u0275text(6);
       \u0275\u0275pipe(7, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(8, "mat-checkbox", 14);
+      \u0275\u0275elementStart(8, "mat-checkbox", 15);
       \u0275\u0275listener("change", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Template_mat_checkbox_change_8_listener() {
         let tmp_7_0;
-        let tmp_8_0;
-        \u0275\u0275restoreView(_r5);
+        \u0275\u0275restoreView(_r6);
         const ctx_r0 = \u0275\u0275nextContext();
-        const filingDetails_r6 = \u0275\u0275readContextLet(8);
-        (tmp_7_0 = filingDetails_r6.get(ctx_r0.controls.ChangeDate)) == null ? null : tmp_7_0.reset(((tmp_7_0 = filingDetails_r6.get(ctx_r0.controls.DirectorsAddedOrDeleted)) == null ? null : tmp_7_0.value) ? (tmp_7_0 = filingDetails_r6.get(ctx_r0.controls.ChangeDate)) == null ? null : tmp_7_0.value : null, { emitEvent: false });
-        (tmp_8_0 = filingDetails_r6.get(ctx_r0.controls.ChangeDate)) == null ? null : tmp_8_0.updateValueAndValidity({ emitEvent: false });
-        return \u0275\u0275resetView(ctx_r0.onSectionValidChange("filingDetails", filingDetails_r6.valid));
+        const filingDetails_r7 = \u0275\u0275readContextLet(8);
+        (tmp_7_0 = filingDetails_r7.get(ctx_r0.controls.ChangeDate)) == null ? null : tmp_7_0.updateValueAndValidity({ emitEvent: false });
+        return \u0275\u0275resetView(ctx_r0.onSectionValidChange("filingDetails", filingDetails_r7.valid));
       });
       \u0275\u0275text(9);
       \u0275\u0275pipe(10, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275template(11, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template, 21, 12, "div", 15);
+      \u0275\u0275template(11, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template, 12, 8, "div", 16);
       \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
       let tmp_14_0;
       const ctx_r0 = \u0275\u0275nextContext();
-      const filingDetails_r6 = \u0275\u0275readContextLet(8);
+      const filingDetails_r7 = \u0275\u0275readContextLet(8);
       \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.sectionValidity["filingDetails"])("title", ctx_r0.groups.FilingDetails);
       \u0275\u0275advance();
-      \u0275\u0275property("formGroup", filingDetails_r6);
+      \u0275\u0275property("formGroup", filingDetails_r7);
       \u0275\u0275advance(3);
       \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(5, 9, "Note"), ":");
       \u0275\u0275advance(2);
@@ -85646,12 +85600,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275advance();
       \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(10, 13, "Directors will be added and/or deleted as part of this filing"), " ");
       \u0275\u0275advance(2);
-      \u0275\u0275conditional(((tmp_14_0 = filingDetails_r6.get(ctx_r0.controls.DirectorsAddedOrDeleted)) == null ? null : tmp_14_0.value) ? 11 : -1);
+      \u0275\u0275conditional(((tmp_14_0 = filingDetails_r7.get(ctx_r0.controls.DirectorsAddedOrDeleted)) == null ? null : tmp_14_0.value) ? 11 : -1);
     }
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Conditional_4_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "span", 27);
+      \u0275\u0275elementStart(0, "span", 24);
       \u0275\u0275text(1);
       \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
@@ -85663,7 +85617,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Conditional_5_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "span", 28);
+      \u0275\u0275elementStart(0, "span", 25);
       \u0275\u0275text(1);
       \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
@@ -85675,15 +85629,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 25)(1, "div", 26)(2, "strong");
+      \u0275\u0275elementStart(0, "div", 22)(1, "div", 23)(2, "strong");
       \u0275\u0275text(3);
       \u0275\u0275elementEnd();
-      \u0275\u0275template(4, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Conditional_4_Template, 3, 3, "span", 27)(5, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Conditional_5_Template, 3, 3, "span", 28);
+      \u0275\u0275template(4, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Conditional_4_Template, 3, 3, "span", 24)(5, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Conditional_5_Template, 3, 3, "span", 25);
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(6, "div", 26);
+      \u0275\u0275elementStart(6, "div", 23);
       \u0275\u0275text(7);
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(8, "div", 26);
+      \u0275\u0275elementStart(8, "div", 23);
       \u0275\u0275text(9);
       \u0275\u0275elementEnd()();
     }
@@ -85692,43 +85646,43 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       let tmp_22_0;
       let tmp_23_0;
       \u0275\u0275nextContext();
-      const directorForm_r9 = \u0275\u0275readContextLet(0);
+      const directorForm_r8 = \u0275\u0275readContextLet(0);
       const ctx_r0 = \u0275\u0275nextContext(2);
       \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate((tmp_19_0 = directorForm_r9.get(ctx_r0.controls.AffiliationName)) == null ? null : tmp_19_0.value);
+      \u0275\u0275textInterpolate((tmp_19_0 = directorForm_r8.get(ctx_r0.controls.AffiliationName)) == null ? null : tmp_19_0.value);
       \u0275\u0275advance();
-      \u0275\u0275conditional(ctx_r0.isNewDirector(directorForm_r9) ? 4 : -1);
+      \u0275\u0275conditional(ctx_r0.isNewDirector(directorForm_r8) ? 4 : -1);
       \u0275\u0275advance();
-      \u0275\u0275conditional(ctx_r0.isCeasedDirector(directorForm_r9) ? 5 : -1);
+      \u0275\u0275conditional(ctx_r0.isCeasedDirector(directorForm_r8) ? 5 : -1);
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate((tmp_22_0 = directorForm_r9.get(ctx_r0.controls.MailingAddress)) == null ? null : tmp_22_0.value);
+      \u0275\u0275textInterpolate((tmp_22_0 = directorForm_r8.get(ctx_r0.controls.MailingAddress)) == null ? null : tmp_22_0.value);
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate((tmp_23_0 = directorForm_r9.get(ctx_r0.controls.DeliveryAddress)) == null ? null : tmp_23_0.value);
+      \u0275\u0275textInterpolate((tmp_23_0 = directorForm_r8.get(ctx_r0.controls.DeliveryAddress)) == null ? null : tmp_23_0.value);
     }
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Template(rf, ctx) {
     if (rf & 1) {
       \u0275\u0275declareLet(0);
-      \u0275\u0275template(1, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Template, 10, 5, "div", 25);
+      \u0275\u0275template(1, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Template, 10, 5, "div", 22);
     }
     if (rf & 2) {
-      const \u0275$index_115_r10 = ctx.$index;
-      const directorForm_r11 = \u0275\u0275storeLet(\u0275\u0275nextContext(2).getDirectorForm(\u0275$index_115_r10));
+      const \u0275$index_98_r9 = ctx.$index;
+      const directorForm_r10 = \u0275\u0275storeLet(\u0275\u0275nextContext(2).getDirectorForm(\u0275$index_98_r9));
       \u0275\u0275advance();
-      \u0275\u0275conditional(directorForm_r11 ? 1 : -1);
+      \u0275\u0275conditional(directorForm_r10 ? 1 : -1);
     }
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 8)(1, "div", 23)(2, "div", 24);
+      \u0275\u0275elementStart(0, "div", 7)(1, "div", 20)(2, "div", 21);
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(5, "div", 24);
+      \u0275\u0275elementStart(5, "div", 21);
       \u0275\u0275text(6);
       \u0275\u0275pipe(7, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(8, "div", 24);
+      \u0275\u0275elementStart(8, "div", 21);
       \u0275\u0275text(9);
       \u0275\u0275pipe(10, "translate");
       \u0275\u0275elementEnd()();
@@ -85737,7 +85691,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
     if (rf & 2) {
       \u0275\u0275nextContext();
-      const directorsArray_r12 = \u0275\u0275readContextLet(10);
+      const directorsArray_r11 = \u0275\u0275readContextLet(10);
       \u0275\u0275advance(3);
       \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(4, 3, "Name"));
       \u0275\u0275advance(3);
@@ -85745,12 +85699,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275advance(3);
       \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(10, 7, "Delivery Address"));
       \u0275\u0275advance(2);
-      \u0275\u0275repeater(directorsArray_r12.controls);
+      \u0275\u0275repeater(directorsArray_r11.controls);
     }
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "h2", 9);
+      \u0275\u0275elementStart(0, "h2", 8);
       \u0275\u0275text(1);
       \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
@@ -85762,33 +85716,33 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_15_Template(rf, ctx) {
     if (rf & 1) {
-      const _r13 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 29)(2, "p");
+      const _r12 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 26)(2, "p");
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(5, "mat-radio-group", 30);
+      \u0275\u0275elementStart(5, "mat-radio-group", 27);
       \u0275\u0275listener("change", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_15_Template_mat_radio_group_change_5_listener() {
-        \u0275\u0275restoreView(_r13);
+        \u0275\u0275restoreView(_r12);
         const ctx_r0 = \u0275\u0275nextContext();
-        const annualReportReminder_r14 = \u0275\u0275readContextLet(14);
-        return \u0275\u0275resetView(ctx_r0.onSectionValidChange("annualReportReminder", annualReportReminder_r14.valid));
+        const annualReportReminder_r13 = \u0275\u0275readContextLet(14);
+        return \u0275\u0275resetView(ctx_r0.onSectionValidChange("annualReportReminder", annualReportReminder_r13.valid));
       });
-      \u0275\u0275elementStart(6, "mat-radio-button", 31);
+      \u0275\u0275elementStart(6, "mat-radio-button", 28);
       \u0275\u0275text(7);
       \u0275\u0275pipe(8, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(9, "mat-radio-button", 31);
+      \u0275\u0275elementStart(9, "mat-radio-button", 28);
       \u0275\u0275text(10);
       \u0275\u0275pipe(11, "translate");
       \u0275\u0275elementEnd()()()();
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
-      const annualReportReminder_r14 = \u0275\u0275readContextLet(14);
+      const annualReportReminder_r13 = \u0275\u0275readContextLet(14);
       \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.sectionValidity["annualReportReminder"])("title", ctx_r0.groups.AnnualReportReminder);
       \u0275\u0275advance();
-      \u0275\u0275property("formGroup", annualReportReminder_r14);
+      \u0275\u0275property("formGroup", annualReportReminder_r13);
       \u0275\u0275advance(2);
       \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(4, 10, "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);
@@ -85821,6 +85775,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_british_columbia_form_enums();
       init_british_columbia_change_of_directors_form_constants();
       init_BritishColumbiaConstants();
+      init_british_columbia_formation_form_helper();
       init_core();
       init_forms();
       BritishColumbiaChangeOfDirectorsFormComponent = class _BritishColumbiaChangeOfDirectorsFormComponent {
@@ -85836,7 +85791,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         controls = BCChangeOfDirectorsFormControls;
         annualReportReminderOption = BCAnnualReportReminder;
         referenceNumbersFields = BC_COD_DELTA_CARD_FORM_REFERENCE_NUMBERS_FIELDS;
-        corporationDetailsFields = BC_COD_CARD_FORM_CORPORATION_DETAILS_FIELDS;
+        corporationDetailsFields = computed(() => {
+          const corporationDetails = this.form().get(this.groups.CorporationDetails);
+          const currentEmail = corporationDetails?.get(this.controls.CompanyEmail)?.value;
+          const emailOptions = BritishColumbiaFormationFormHelper.buildCompanyEmailOptions(this.task(), currentEmail);
+          return BC_COD_CARD_FORM_CORPORATION_DETAILS_FIELDS.map((field) => field.formControlName === this.controls.CompanyEmail ? __spreadProps(__spreadValues({}, field), { options: emailOptions }) : field);
+        });
+        companyEmailFields = computed(() => this.corporationDetailsFields().filter((field) => field.formControlName === this.controls.CompanyEmail));
         filingDetailsFields = BC_COD_DELTA_CARD_FORM_FILING_DETAILS_FIELDS;
         directorsFields = BC_COD_CARD_FORM_DIRECTORS_FIELDS;
         annualReportReminderFields = BC_COD_DELTA_CARD_FORM_ANNUAL_REPORT_REMINDER_FIELDS;
@@ -85849,6 +85810,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const annualReportReminder = this.getFormGroup(this.groups.AnnualReportReminder);
           return Object.values(this.sectionValidity).every((v) => v) && !filingDetails?.invalid && !dateInvalid && !annualReportReminder?.invalid;
         }
+        getEffectiveDateDisplay(value) {
+          const date = String(value ?? "").split("T")[0];
+          const [year, month, day] = date.split("-");
+          return year && month && day ? `${year}-${month}-${day}` : "\u2014";
+        }
         onSectionValidChange(section, valid) {
           this.sectionValidity = __spreadProps(__spreadValues({}, this.sectionValidity), { [section]: valid });
           this.visiblyValidChange.emit(this.isVisiblyValid());
@@ -85874,23 +85840,23 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function BritishColumbiaChangeOfDirectorsFormComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _BritishColumbiaChangeOfDirectorsFormComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfDirectorsFormComponent, selectors: [["british-columbia-change-of-directors-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 16, vars: 14, consts: [["changeDatePicker", ""], [1, "change-of-directors-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-directors-form-content"], [3, "title"], [3, "isStatusIcon", "title"], [3, "isStatusIcon", "isValid", "title"], ["role", "table", 1, "directors-table"], [1, "body-1-regular"], [3, "visiblyValidChange", "isSubmitted", "form", "config"], [1, "readonly-summary"], [1, "filing-details", 3, "formGroup"], [1, "note-box"], [1, "directors-change-checkbox", 3, "change", "formControlName"], [1, "filing-details-grid"], [1, "date-field"], ["appearance", "outline"], ["matInput", "", "placeholder", "dd/mm/yyyy", "readonly", "", 3, "click", "dateChange", "matDatepicker", "formControlName"], ["type", "button", "aria-label", "Open date picker", 1, "calendar-trigger", 3, "click"], ["aria-hidden", "true", 1, "calendar-icon"], [1, "hint"], [1, "filing-fee"], ["role", "row", 1, "directors-table-header"], ["role", "columnheader"], ["role", "row", 1, "directors-table-row"], ["role", "cell"], [1, "status-pill", "new"], [1, "status-pill", "ceased"], [1, "annual-reminder", 3, "formGroup"], [3, "change", "formControlName"], [3, "value"]], template: function BritishColumbiaChangeOfDirectorsFormComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfDirectorsFormComponent, selectors: [["british-columbia-change-of-directors-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 16, vars: 14, consts: [[1, "change-of-directors-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-directors-form-content"], [3, "title"], [3, "isStatusIcon", "title"], [3, "isStatusIcon", "isValid", "title"], ["role", "table", 1, "directors-table"], [1, "body-1-regular"], [3, "visiblyValidChange", "isSubmitted", "form", "config"], [1, "readonly-summary"], [1, "company-email-field"], [3, "visiblyValidChange", "form", "config", "isSubmitted"], [1, "filing-details", 3, "formGroup"], [1, "note-box"], [1, "directors-change-checkbox", 3, "change", "formControlName"], [1, "filing-details-grid"], [1, "date-field"], [1, "effective-date-description"], [1, "filing-fee"], ["role", "row", 1, "directors-table-header"], ["role", "columnheader"], ["role", "row", 1, "directors-table-row"], ["role", "cell"], [1, "status-pill", "new"], [1, "status-pill", "ceased"], [1, "annual-reminder", 3, "formGroup"], [3, "change", "formControlName"], [3, "value"]], template: function BritishColumbiaChangeOfDirectorsFormComponent_Template(rf, ctx) {
           if (rf & 1) {
-            \u0275\u0275elementStart(0, "div", 1);
-            \u0275\u0275template(1, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_1_Template, 1, 1, "alert", 2)(2, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_2_Template, 1, 1, "alert", 3);
-            \u0275\u0275elementStart(3, "div", 4);
+            \u0275\u0275elementStart(0, "div", 0);
+            \u0275\u0275template(1, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_1_Template, 1, 1, "alert", 1)(2, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_2_Template, 1, 1, "alert", 2);
+            \u0275\u0275elementStart(3, "div", 3);
             \u0275\u0275declareLet(4);
-            \u0275\u0275template(5, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_5_Template, 2, 4, "expandable-card", 5);
+            \u0275\u0275template(5, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_5_Template, 2, 4, "expandable-card", 4);
             \u0275\u0275declareLet(6);
-            \u0275\u0275template(7, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_7_Template, 17, 14, "expandable-card", 6);
+            \u0275\u0275template(7, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_7_Template, 14, 13, "expandable-card", 5);
             \u0275\u0275declareLet(8);
-            \u0275\u0275template(9, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Template, 12, 15, "expandable-card", 7);
+            \u0275\u0275template(9, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Template, 12, 15, "expandable-card", 6);
             \u0275\u0275declareLet(10);
-            \u0275\u0275elementStart(11, "expandable-card", 6);
-            \u0275\u0275template(12, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_Template, 13, 9, "div", 8)(13, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_Template, 3, 3, "h2", 9);
+            \u0275\u0275elementStart(11, "expandable-card", 5);
+            \u0275\u0275template(12, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_Template, 13, 9, "div", 7)(13, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_Template, 3, 3, "h2", 8);
             \u0275\u0275elementEnd();
             \u0275\u0275declareLet(14);
-            \u0275\u0275template(15, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_15_Template, 12, 16, "expandable-card", 7);
+            \u0275\u0275template(15, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_15_Template, 12, 16, "expandable-card", 6);
             \u0275\u0275elementEnd()();
           }
           if (rf & 2) {
@@ -85899,47 +85865,42 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275advance();
             \u0275\u0275conditional(ctx.errors().length ? 2 : -1);
             \u0275\u0275advance(2);
-            const referenceNumbers_r15 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.ReferenceNumbers));
+            const referenceNumbers_r14 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.ReferenceNumbers));
             \u0275\u0275advance();
-            \u0275\u0275conditional(referenceNumbers_r15 ? 5 : -1);
+            \u0275\u0275conditional(referenceNumbers_r14 ? 5 : -1);
             \u0275\u0275advance();
-            const corporationDetails_r16 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CorporationDetails));
+            const corporationDetails_r15 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CorporationDetails));
             \u0275\u0275advance();
-            \u0275\u0275conditional(corporationDetails_r16 ? 7 : -1);
+            \u0275\u0275conditional(corporationDetails_r15 ? 7 : -1);
             \u0275\u0275advance();
-            const filingDetails_r17 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.FilingDetails));
+            const filingDetails_r16 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.FilingDetails));
             \u0275\u0275advance();
-            \u0275\u0275conditional(filingDetails_r17 ? 9 : -1);
+            \u0275\u0275conditional(filingDetails_r16 ? 9 : -1);
             \u0275\u0275advance();
-            const directorsArray_r18 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Directors));
+            const directorsArray_r17 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Directors));
             \u0275\u0275advance();
             \u0275\u0275property("isStatusIcon", false)("title", ctx.groups.Directors);
             \u0275\u0275advance();
-            \u0275\u0275conditional(directorsArray_r18 && directorsArray_r18.length ? 12 : 13);
+            \u0275\u0275conditional(directorsArray_r17 && directorsArray_r17.length ? 12 : 13);
             \u0275\u0275advance(2);
-            const annualReportReminder_r19 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
+            const annualReportReminder_r18 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
             \u0275\u0275advance();
-            \u0275\u0275conditional(annualReportReminder_r19 ? 15 : -1);
+            \u0275\u0275conditional(annualReportReminder_r18 ? 15 : -1);
           }
         }, dependencies: [
           FilingFormGroupComponent,
           AlertComponent,
           ExpandableCardComponent,
           MatCheckbox,
-          MatDatepicker,
-          MatDatepickerInput,
-          MatFormField,
-          MatInput,
           MatRadioButton,
           MatRadioGroup,
           ReactiveFormsModule,
-          DefaultValueAccessor,
           NgControlStatus,
           NgControlStatusGroup,
           FormGroupDirective,
           FormControlName,
           TranslatePipe
-        ], styles: ['\n\n[_nghost-%COMP%] {\n  display: flex;\n  flex: 1;\n  min-height: 0;\n  color: #2f343b;\n}\n[_nghost-%COMP%]   .change-of-directors-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  min-height: 0;\n  width: 100%;\n}\n[_nghost-%COMP%]   .change-of-directors-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex: 1;\n  flex-direction: column;\n  gap: 20px;\n  min-height: 0;\n  overflow-y: auto;\n  padding-right: 8px;\n}\n[_nghost-%COMP%]     .expandable-card {\n  border: 1px solid #e1e6ee;\n  border-radius: 8px;\n  box-shadow: 0 1px 4px rgba(15, 23, 42, 0.12) !important;\n  margin: 0 !important;\n  padding: 24px 28px !important;\n}\n[_nghost-%COMP%]     .expandable-card-header-title {\n  color: #2f343b !important;\n  font-weight: 700 !important;\n  line-height: 1.2;\n  margin: 0;\n}\n[_nghost-%COMP%]     .expandable-card-header mat-icon {\n  color: #66717f !important;\n}\n[_nghost-%COMP%]     .expandable-card-content {\n  padding-top: 20px !important;\n}\n[_nghost-%COMP%]     .filling-form-fields {\n  column-gap: 42px !important;\n}\n[_nghost-%COMP%]     .filling-form-fields-item-label, \n[_nghost-%COMP%]     .mat-mdc-radio-button .mdc-label, \n[_nghost-%COMP%]     .mat-mdc-checkbox .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]     .mat-mdc-radio-button, \n[_nghost-%COMP%]     .mat-mdc-checkbox {\n  --mdc-radio-state-layer-size: 40px;\n  --mdc-checkbox-state-layer-size: 40px;\n}\n[_nghost-%COMP%]     .mat-mdc-form-field {\n  width: 100%;\n}\n[_nghost-%COMP%]     .mat-mdc-text-field-wrapper {\n  min-height: 46px;\n}\n[_nghost-%COMP%]     .mat-mdc-form-field-infix {\n  align-items: center;\n  display: flex !important;\n  min-height: 46px;\n  padding-bottom: 0 !important;\n  padding-top: 0 !important;\n}\n[_nghost-%COMP%]     .mdc-notched-outline__leading {\n  border-bottom-left-radius: 6px !important;\n  border-top-left-radius: 6px !important;\n}\n[_nghost-%COMP%]     .mdc-notched-outline__trailing {\n  border-bottom-right-radius: 6px !important;\n  border-top-right-radius: 6px !important;\n}\n[_nghost-%COMP%]   .readonly-summary[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 18px;\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n}\n[_nghost-%COMP%]   .readonly-summary[_ngcontent-%COMP%]   p[_ngcontent-%COMP%] {\n  margin: 0;\n}\n[_nghost-%COMP%]   .readonly-summary[_ngcontent-%COMP%]   strong[_ngcontent-%COMP%] {\n  color: #2f343b;\n  font-weight: 700;\n}\n[_nghost-%COMP%]   .filing-details[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .annual-reminder[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n[_nghost-%COMP%]   .note-box[_ngcontent-%COMP%] {\n  border: 1px solid #f3d27a;\n  border-radius: 6px;\n  background: #fffaf0;\n  color: #84610d;\n  font-size: 14px;\n  line-height: 1.55;\n  padding: 16px 20px;\n}\n[_nghost-%COMP%]   .note-box[_ngcontent-%COMP%]   strong[_ngcontent-%COMP%] {\n  font-weight: 700;\n}\n[_nghost-%COMP%]   .directors-change-checkbox[_ngcontent-%COMP%] {\n  align-self: flex-start;\n}\n[_nghost-%COMP%]   .filing-details-grid[_ngcontent-%COMP%] {\n  display: grid;\n  grid-template-columns: minmax(280px, 1fr) minmax(220px, 1fr);\n  column-gap: 56px;\n  align-items: start;\n  max-width: 980px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .email-field[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   label[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .email-field[_ngcontent-%COMP%]   label[_ngcontent-%COMP%] {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   span[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .email-field[_ngcontent-%COMP%]   span[_ngcontent-%COMP%] {\n  color: #e22222;\n}\n[_nghost-%COMP%]   .hint[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   p[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .mailing-copy[_ngcontent-%COMP%] {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n[_nghost-%COMP%]   .filing-fee[_ngcontent-%COMP%] {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n  margin: 46px 0 0;\n}\n[_nghost-%COMP%]   .filing-fee[_ngcontent-%COMP%]   strong[_ngcontent-%COMP%] {\n  color: #2f343b;\n  font-weight: 700;\n}\n[_nghost-%COMP%]   .directors-table[_ngcontent-%COMP%] {\n  display: grid;\n  grid-template-columns: minmax(180px, 0.7fr) minmax(280px, 1.65fr) minmax(280px, 1.65fr);\n  margin-top: 28px;\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%] {\n  display: contents;\n}\n[_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%] {\n  border-bottom: 1px solid #e1e6ee;\n  padding: 16px 24px;\n}\n[_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%]:not(:first-child), \n[_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%]:not(:first-child) {\n  border-left: 1px solid #e1e6ee;\n}\n[_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%] {\n  color: #2f343b;\n  font-weight: 700;\n  padding-top: 0;\n}\n[_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%]   strong[_ngcontent-%COMP%] {\n  color: #2f343b;\n  display: block;\n  font-weight: 700;\n  margin-bottom: 8px;\n}\n[_nghost-%COMP%]   .status-pill[_ngcontent-%COMP%] {\n  border-radius: 999px;\n  display: inline-flex;\n  font-size: 12px;\n  font-weight: 700;\n  line-height: 1;\n  padding: 6px 12px;\n}\n[_nghost-%COMP%]   .status-pill.new[_ngcontent-%COMP%] {\n  background: #eaf7ef;\n  border: 1px solid #b8e3c7;\n  color: #15803d;\n}\n[_nghost-%COMP%]   .status-pill.ceased[_ngcontent-%COMP%] {\n  background: #fff1f2;\n  border: 1px solid #fecdd3;\n  color: #be123c;\n}\n[_nghost-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  display: flex;\n  gap: 48px;\n}\n[_nghost-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  align-items: flex-start;\n  flex-direction: column;\n  gap: 14px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%] {\n  position: relative;\n  width: 100%;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]     .calendar-icon {\n  border: 2px solid #4b5563;\n  border-radius: 3px;\n  box-sizing: border-box;\n  display: block;\n  height: 17px;\n  position: relative;\n  width: 17px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]     .calendar-icon::before {\n  border-top: 2px solid #4b5563;\n  content: "";\n  left: 0;\n  position: absolute;\n  right: 0;\n  top: 4px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]     .calendar-icon::after {\n  background: #4b5563;\n  border-radius: 1px;\n  box-shadow: 6px 0 #4b5563;\n  content: "";\n  height: 3px;\n  left: 3px;\n  position: absolute;\n  top: -3px;\n  width: 2px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   .calendar-trigger[_ngcontent-%COMP%] {\n  align-items: center;\n  background: transparent;\n  border: 0;\n  cursor: pointer;\n  display: flex;\n  height: 40px;\n  justify-content: center;\n  padding: 0;\n  position: absolute;\n  right: 8px;\n  top: 50%;\n  transform: translateY(-50%);\n  width: 40px;\n  z-index: 2;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   .calendar-trigger[_ngcontent-%COMP%]:hover {\n  background: #f3f4f6;\n  border-radius: 50%;\n}\n@media (max-width: 900px) {\n  [_nghost-%COMP%]   .filing-details-grid[_ngcontent-%COMP%], \n   [_nghost-%COMP%]   .directors-table[_ngcontent-%COMP%] {\n    grid-template-columns: 1fr;\n  }\n  [_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%] {\n    display: none;\n  }\n  [_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%] {\n    display: grid;\n    grid-template-columns: 1fr;\n    border-bottom: 1px solid #e1e6ee;\n  }\n  [_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%] {\n    border: 0;\n    padding: 14px 0;\n  }\n  [_nghost-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n    flex-direction: column;\n    gap: 14px;\n  }\n}\n/*# sourceMappingURL=change-of-directors-form.component.css.map */'], changeDetection: 0 });
+        ], styles: ['\n\n[_nghost-%COMP%] {\n  display: flex;\n  flex: 1;\n  min-height: 0;\n  color: #2f343b;\n}\n[_nghost-%COMP%]   .change-of-directors-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  min-height: 0;\n  width: 100%;\n}\n[_nghost-%COMP%]   .change-of-directors-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex: 1;\n  flex-direction: column;\n  gap: 20px;\n  min-height: 0;\n  overflow-y: auto;\n  padding-right: 8px;\n}\n[_nghost-%COMP%]     .expandable-card {\n  border: 1px solid #e1e6ee;\n  border-radius: 8px;\n  box-shadow: 0 1px 4px rgba(15, 23, 42, 0.12) !important;\n  margin: 0 !important;\n  padding: 24px 28px !important;\n}\n[_nghost-%COMP%]     .expandable-card-header-title {\n  color: #2f343b !important;\n  font-weight: 700 !important;\n  line-height: 1.2;\n  margin: 0;\n}\n[_nghost-%COMP%]     .expandable-card-header mat-icon {\n  color: #66717f !important;\n}\n[_nghost-%COMP%]     .expandable-card-content {\n  padding-top: 20px !important;\n}\n[_nghost-%COMP%]     .filling-form-fields {\n  column-gap: 42px !important;\n}\n[_nghost-%COMP%]     .filling-form-fields-item-label, \n[_nghost-%COMP%]     .mat-mdc-radio-button .mdc-label, \n[_nghost-%COMP%]     .mat-mdc-checkbox .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]     .mat-mdc-radio-button, \n[_nghost-%COMP%]     .mat-mdc-checkbox {\n  --mdc-radio-state-layer-size: 40px;\n  --mdc-checkbox-state-layer-size: 40px;\n}\n[_nghost-%COMP%]     .mat-mdc-form-field {\n  width: 100%;\n}\n[_nghost-%COMP%]     .mat-mdc-text-field-wrapper {\n  min-height: 46px;\n}\n[_nghost-%COMP%]     .mat-mdc-form-field-infix {\n  align-items: center;\n  display: flex !important;\n  min-height: 46px;\n  padding-bottom: 0 !important;\n  padding-top: 0 !important;\n}\n[_nghost-%COMP%]     .mdc-notched-outline__leading {\n  border-bottom-left-radius: 6px !important;\n  border-top-left-radius: 6px !important;\n}\n[_nghost-%COMP%]     .mdc-notched-outline__trailing {\n  border-bottom-right-radius: 6px !important;\n  border-top-right-radius: 6px !important;\n}\n[_nghost-%COMP%]   .readonly-summary[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 18px;\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n}\n[_nghost-%COMP%]   .readonly-summary[_ngcontent-%COMP%]   p[_ngcontent-%COMP%] {\n  margin: 0;\n}\n[_nghost-%COMP%]   .readonly-summary[_ngcontent-%COMP%]   strong[_ngcontent-%COMP%] {\n  color: #2f343b;\n  font-weight: 700;\n}\n[_nghost-%COMP%]   .filing-details[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .annual-reminder[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n[_nghost-%COMP%]   .note-box[_ngcontent-%COMP%] {\n  border: 1px solid #f3d27a;\n  border-radius: 6px;\n  background: #fffaf0;\n  color: #84610d;\n  font-size: 14px;\n  line-height: 1.55;\n  padding: 16px 20px;\n}\n[_nghost-%COMP%]   .note-box[_ngcontent-%COMP%]   strong[_ngcontent-%COMP%] {\n  font-weight: 700;\n}\n[_nghost-%COMP%]   .directors-change-checkbox[_ngcontent-%COMP%] {\n  align-self: flex-start;\n}\n[_nghost-%COMP%]   .filing-details-grid[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 8px;\n  max-width: 100%;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .email-field[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   label[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .email-field[_ngcontent-%COMP%]   label[_ngcontent-%COMP%] {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   span[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .email-field[_ngcontent-%COMP%]   span[_ngcontent-%COMP%] {\n  color: #e22222;\n}\n[_nghost-%COMP%]   .hint[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   p[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .mailing-copy[_ngcontent-%COMP%] {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n[_nghost-%COMP%]   .filing-fee[_ngcontent-%COMP%] {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n  margin: 0;\n}\n[_nghost-%COMP%]   .filing-fee[_ngcontent-%COMP%]   strong[_ngcontent-%COMP%] {\n  color: #2f343b;\n  font-weight: 700;\n}\n[_nghost-%COMP%]   .company-email-field[_ngcontent-%COMP%] {\n  width: 50%;\n}\n[_nghost-%COMP%]   .effective-date-description[_ngcontent-%COMP%] {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.45;\n  margin: 0;\n}\n[_nghost-%COMP%]   .effective-date-description[_ngcontent-%COMP%]   strong[_ngcontent-%COMP%] {\n  color: #2f343b;\n  font-weight: 700;\n}\n[_nghost-%COMP%]   .directors-table[_ngcontent-%COMP%] {\n  display: grid;\n  grid-template-columns: minmax(180px, 0.7fr) minmax(280px, 1.65fr) minmax(280px, 1.65fr);\n  margin-top: 28px;\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%] {\n  display: contents;\n}\n[_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%], \n[_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%] {\n  border-bottom: 1px solid #e1e6ee;\n  padding: 16px 24px;\n}\n[_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%]:not(:first-child), \n[_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%]:not(:first-child) {\n  border-left: 1px solid #e1e6ee;\n}\n[_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%] {\n  color: #2f343b;\n  font-weight: 700;\n  padding-top: 0;\n}\n[_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%]   strong[_ngcontent-%COMP%] {\n  color: #2f343b;\n  display: block;\n  font-weight: 700;\n  margin-bottom: 8px;\n}\n[_nghost-%COMP%]   .status-pill[_ngcontent-%COMP%] {\n  border-radius: 999px;\n  display: inline-flex;\n  font-size: 12px;\n  font-weight: 700;\n  line-height: 1;\n  padding: 6px 12px;\n}\n[_nghost-%COMP%]   .status-pill.new[_ngcontent-%COMP%] {\n  background: #eaf7ef;\n  border: 1px solid #b8e3c7;\n  color: #15803d;\n}\n[_nghost-%COMP%]   .status-pill.ceased[_ngcontent-%COMP%] {\n  background: #fff1f2;\n  border: 1px solid #fecdd3;\n  color: #be123c;\n}\n[_nghost-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  display: flex;\n  gap: 48px;\n}\n[_nghost-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  align-items: flex-start;\n  flex-direction: column;\n  gap: 14px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   mat-form-field[_ngcontent-%COMP%] {\n  position: relative;\n  width: 100%;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]     .calendar-icon {\n  border: 2px solid #4b5563;\n  border-radius: 3px;\n  box-sizing: border-box;\n  display: block;\n  height: 17px;\n  position: relative;\n  width: 17px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]     .calendar-icon::before {\n  border-top: 2px solid #4b5563;\n  content: "";\n  left: 0;\n  position: absolute;\n  right: 0;\n  top: 4px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]     .calendar-icon::after {\n  background: #4b5563;\n  border-radius: 1px;\n  box-shadow: 6px 0 #4b5563;\n  content: "";\n  height: 3px;\n  left: 3px;\n  position: absolute;\n  top: -3px;\n  width: 2px;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   .calendar-trigger[_ngcontent-%COMP%] {\n  align-items: center;\n  background: transparent;\n  border: 0;\n  cursor: pointer;\n  display: flex;\n  height: 40px;\n  justify-content: center;\n  padding: 0;\n  position: absolute;\n  right: 8px;\n  top: 50%;\n  transform: translateY(-50%);\n  width: 40px;\n  z-index: 2;\n}\n[_nghost-%COMP%]   .date-field[_ngcontent-%COMP%]   .calendar-trigger[_ngcontent-%COMP%]:hover {\n  background: #f3f4f6;\n  border-radius: 50%;\n}\n@media (max-width: 900px) {\n  [_nghost-%COMP%]   .filing-details-grid[_ngcontent-%COMP%], \n   [_nghost-%COMP%]   .directors-table[_ngcontent-%COMP%] {\n    grid-template-columns: 1fr;\n  }\n  [_nghost-%COMP%]   .directors-table-header[_ngcontent-%COMP%] {\n    display: none;\n  }\n  [_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%] {\n    display: grid;\n    grid-template-columns: 1fr;\n    border-bottom: 1px solid #e1e6ee;\n  }\n  [_nghost-%COMP%]   .directors-table-row[_ngcontent-%COMP%]    > div[_ngcontent-%COMP%] {\n    border: 0;\n    padding: 14px 0;\n  }\n  [_nghost-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n    flex-direction: column;\n    gap: 14px;\n  }\n}\n@media (max-width: 900px) and (max-width: 700px) {\n  .company-email-field[_ngcontent-%COMP%] {\n    width: 100%;\n  }\n}\n/*# sourceMappingURL=change-of-directors-form.component.css.map */'], changeDetection: 0 });
       };
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(BritishColumbiaChangeOfDirectorsFormComponent, [{
@@ -86000,10 +85961,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
-          <p>\r
-            <strong>{{ 'Company Email' | translate }}:</strong>\r
-            {{ corporationDetails.get(controls.CompanyEmail)?.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>\r
       </expandable-card>\r
     }\r
@@ -86029,12 +85994,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             class="directors-change-checkbox"\r
             [formControlName]="controls.DirectorsAddedOrDeleted"\r
             (change)="\r
-              filingDetails.get(controls.ChangeDate)?.reset(\r
-                filingDetails.get(controls.DirectorsAddedOrDeleted)?.value\r
-                  ? filingDetails.get(controls.ChangeDate)?.value\r
-                  : null,\r
-                { emitEvent: false }\r
-              );\r
               filingDetails.get(controls.ChangeDate)?.updateValueAndValidity({ emitEvent: false });\r
               onSectionValidChange('filingDetails', filingDetails.valid)\r
             "\r
@@ -86045,34 +86004,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           @if (filingDetails.get(controls.DirectorsAddedOrDeleted)?.value) {\r
             <div class="filing-details-grid">\r
               <div class="date-field">\r
-                <label>\r
-                  {{ 'Date Directors were added or deleted' | translate }}<span>*</span>\r
-                </label>\r
-                <mat-form-field appearance="outline">\r
-                  <input\r
-                    matInput\r
-                    [matDatepicker]="changeDatePicker"\r
-                    [formControlName]="controls.ChangeDate"\r
-                    placeholder="dd/mm/yyyy"\r
-                    readonly\r
-                    (click)="changeDatePicker.open()"\r
-                    (dateChange)="onSectionValidChange('filingDetails', filingDetails.valid)"\r
-                  />\r
-                  <button\r
-                    type="button"\r
-                    class="calendar-trigger"\r
-                    aria-label="Open date picker"\r
-                    (click)="changeDatePicker.open()"\r
-                  >\r
-                    <span class="calendar-icon" aria-hidden="true"></span>\r
-                  </button>\r
-                  <mat-datepicker #changeDatePicker></mat-datepicker>\r
-                </mat-form-field>\r
-                <p class="hint">\r
+                <p class="effective-date-description">\r
                   {{\r
-                    "The date on which the individual(s) became or ceased to be a director. This date must be today's date or in the past."\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
@@ -86152,11 +86089,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-directors/change-of-directors-form/change-of-directors-form.component.scss */\n:host {\n  display: flex;\n  flex: 1;\n  min-height: 0;\n  color: #2f343b;\n}\n:host .change-of-directors-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  min-height: 0;\n  width: 100%;\n}\n:host .change-of-directors-form-content {\n  display: flex;\n  flex: 1;\n  flex-direction: column;\n  gap: 20px;\n  min-height: 0;\n  overflow-y: auto;\n  padding-right: 8px;\n}\n:host ::ng-deep .expandable-card {\n  border: 1px solid #e1e6ee;\n  border-radius: 8px;\n  box-shadow: 0 1px 4px rgba(15, 23, 42, 0.12) !important;\n  margin: 0 !important;\n  padding: 24px 28px !important;\n}\n:host ::ng-deep .expandable-card-header-title {\n  color: #2f343b !important;\n  font-weight: 700 !important;\n  line-height: 1.2;\n  margin: 0;\n}\n:host ::ng-deep .expandable-card-header mat-icon {\n  color: #66717f !important;\n}\n:host ::ng-deep .expandable-card-content {\n  padding-top: 20px !important;\n}\n:host ::ng-deep .filling-form-fields {\n  column-gap: 42px !important;\n}\n:host ::ng-deep .filling-form-fields-item-label,\n:host ::ng-deep .mat-mdc-radio-button .mdc-label,\n:host ::ng-deep .mat-mdc-checkbox .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n:host ::ng-deep .mat-mdc-radio-button,\n:host ::ng-deep .mat-mdc-checkbox {\n  --mdc-radio-state-layer-size: 40px;\n  --mdc-checkbox-state-layer-size: 40px;\n}\n:host ::ng-deep .mat-mdc-form-field {\n  width: 100%;\n}\n:host ::ng-deep .mat-mdc-text-field-wrapper {\n  min-height: 46px;\n}\n:host ::ng-deep .mat-mdc-form-field-infix {\n  align-items: center;\n  display: flex !important;\n  min-height: 46px;\n  padding-bottom: 0 !important;\n  padding-top: 0 !important;\n}\n:host ::ng-deep .mdc-notched-outline__leading {\n  border-bottom-left-radius: 6px !important;\n  border-top-left-radius: 6px !important;\n}\n:host ::ng-deep .mdc-notched-outline__trailing {\n  border-bottom-right-radius: 6px !important;\n  border-top-right-radius: 6px !important;\n}\n:host .readonly-summary {\n  display: flex;\n  flex-direction: column;\n  gap: 18px;\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n}\n:host .readonly-summary p {\n  margin: 0;\n}\n:host .readonly-summary strong {\n  color: #2f343b;\n  font-weight: 700;\n}\n:host .filing-details,\n:host .annual-reminder {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .note-box {\n  border: 1px solid #f3d27a;\n  border-radius: 6px;\n  background: #fffaf0;\n  color: #84610d;\n  font-size: 14px;\n  line-height: 1.55;\n  padding: 16px 20px;\n}\n:host .note-box strong {\n  font-weight: 700;\n}\n:host .directors-change-checkbox {\n  align-self: flex-start;\n}\n:host .filing-details-grid {\n  display: grid;\n  grid-template-columns: minmax(280px, 1fr) minmax(220px, 1fr);\n  column-gap: 56px;\n  align-items: start;\n  max-width: 980px;\n}\n:host .date-field,\n:host .email-field {\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n:host .date-field label,\n:host .email-field label {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n}\n:host .date-field span,\n:host .email-field span {\n  color: #e22222;\n}\n:host .hint,\n:host .annual-reminder p,\n:host .mailing-copy {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n:host .filing-fee {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n  margin: 46px 0 0;\n}\n:host .filing-fee strong {\n  color: #2f343b;\n  font-weight: 700;\n}\n:host .directors-table {\n  display: grid;\n  grid-template-columns: minmax(180px, 0.7fr) minmax(280px, 1.65fr) minmax(280px, 1.65fr);\n  margin-top: 28px;\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.45;\n}\n:host .directors-table-header,\n:host .directors-table-row {\n  display: contents;\n}\n:host .directors-table-header > div,\n:host .directors-table-row > div {\n  border-bottom: 1px solid #e1e6ee;\n  padding: 16px 24px;\n}\n:host .directors-table-header > div:not(:first-child),\n:host .directors-table-row > div:not(:first-child) {\n  border-left: 1px solid #e1e6ee;\n}\n:host .directors-table-header > div {\n  color: #2f343b;\n  font-weight: 700;\n  padding-top: 0;\n}\n:host .directors-table-row strong {\n  color: #2f343b;\n  display: block;\n  font-weight: 700;\n  margin-bottom: 8px;\n}\n:host .status-pill {\n  border-radius: 999px;\n  display: inline-flex;\n  font-size: 12px;\n  font-weight: 700;\n  line-height: 1;\n  padding: 6px 12px;\n}\n:host .status-pill.new {\n  background: #eaf7ef;\n  border: 1px solid #b8e3c7;\n  color: #15803d;\n}\n:host .status-pill.ceased {\n  background: #fff1f2;\n  border: 1px solid #fecdd3;\n  color: #be123c;\n}\n:host mat-radio-group {\n  display: flex;\n  gap: 48px;\n}\n:host .annual-reminder mat-radio-group {\n  align-items: flex-start;\n  flex-direction: column;\n  gap: 14px;\n}\n:host .date-field mat-form-field {\n  position: relative;\n  width: 100%;\n}\n:host .date-field ::ng-deep .calendar-icon {\n  border: 2px solid #4b5563;\n  border-radius: 3px;\n  box-sizing: border-box;\n  display: block;\n  height: 17px;\n  position: relative;\n  width: 17px;\n}\n:host .date-field ::ng-deep .calendar-icon::before {\n  border-top: 2px solid #4b5563;\n  content: "";\n  left: 0;\n  position: absolute;\n  right: 0;\n  top: 4px;\n}\n:host .date-field ::ng-deep .calendar-icon::after {\n  background: #4b5563;\n  border-radius: 1px;\n  box-shadow: 6px 0 #4b5563;\n  content: "";\n  height: 3px;\n  left: 3px;\n  position: absolute;\n  top: -3px;\n  width: 2px;\n}\n:host .date-field .calendar-trigger {\n  align-items: center;\n  background: transparent;\n  border: 0;\n  cursor: pointer;\n  display: flex;\n  height: 40px;\n  justify-content: center;\n  padding: 0;\n  position: absolute;\n  right: 8px;\n  top: 50%;\n  transform: translateY(-50%);\n  width: 40px;\n  z-index: 2;\n}\n:host .date-field .calendar-trigger:hover {\n  background: #f3f4f6;\n  border-radius: 50%;\n}\n@media (max-width: 900px) {\n  :host .filing-details-grid,\n  :host .directors-table {\n    grid-template-columns: 1fr;\n  }\n  :host .directors-table-header {\n    display: none;\n  }\n  :host .directors-table-row {\n    display: grid;\n    grid-template-columns: 1fr;\n    border-bottom: 1px solid #e1e6ee;\n  }\n  :host .directors-table-row > div {\n    border: 0;\n    padding: 14px 0;\n  }\n  :host mat-radio-group {\n    flex-direction: column;\n    gap: 14px;\n  }\n}\n/*# sourceMappingURL=change-of-directors-form.component.css.map */\n'] }]
+`, styles: ['/* src/app/components/british-columbia/change-of-directors/change-of-directors-form/change-of-directors-form.component.scss */\n:host {\n  display: flex;\n  flex: 1;\n  min-height: 0;\n  color: #2f343b;\n}\n:host .change-of-directors-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n  min-height: 0;\n  width: 100%;\n}\n:host .change-of-directors-form-content {\n  display: flex;\n  flex: 1;\n  flex-direction: column;\n  gap: 20px;\n  min-height: 0;\n  overflow-y: auto;\n  padding-right: 8px;\n}\n:host ::ng-deep .expandable-card {\n  border: 1px solid #e1e6ee;\n  border-radius: 8px;\n  box-shadow: 0 1px 4px rgba(15, 23, 42, 0.12) !important;\n  margin: 0 !important;\n  padding: 24px 28px !important;\n}\n:host ::ng-deep .expandable-card-header-title {\n  color: #2f343b !important;\n  font-weight: 700 !important;\n  line-height: 1.2;\n  margin: 0;\n}\n:host ::ng-deep .expandable-card-header mat-icon {\n  color: #66717f !important;\n}\n:host ::ng-deep .expandable-card-content {\n  padding-top: 20px !important;\n}\n:host ::ng-deep .filling-form-fields {\n  column-gap: 42px !important;\n}\n:host ::ng-deep .filling-form-fields-item-label,\n:host ::ng-deep .mat-mdc-radio-button .mdc-label,\n:host ::ng-deep .mat-mdc-checkbox .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n:host ::ng-deep .mat-mdc-radio-button,\n:host ::ng-deep .mat-mdc-checkbox {\n  --mdc-radio-state-layer-size: 40px;\n  --mdc-checkbox-state-layer-size: 40px;\n}\n:host ::ng-deep .mat-mdc-form-field {\n  width: 100%;\n}\n:host ::ng-deep .mat-mdc-text-field-wrapper {\n  min-height: 46px;\n}\n:host ::ng-deep .mat-mdc-form-field-infix {\n  align-items: center;\n  display: flex !important;\n  min-height: 46px;\n  padding-bottom: 0 !important;\n  padding-top: 0 !important;\n}\n:host ::ng-deep .mdc-notched-outline__leading {\n  border-bottom-left-radius: 6px !important;\n  border-top-left-radius: 6px !important;\n}\n:host ::ng-deep .mdc-notched-outline__trailing {\n  border-bottom-right-radius: 6px !important;\n  border-top-right-radius: 6px !important;\n}\n:host .readonly-summary {\n  display: flex;\n  flex-direction: column;\n  gap: 18px;\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n}\n:host .readonly-summary p {\n  margin: 0;\n}\n:host .readonly-summary strong {\n  color: #2f343b;\n  font-weight: 700;\n}\n:host .filing-details,\n:host .annual-reminder {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .note-box {\n  border: 1px solid #f3d27a;\n  border-radius: 6px;\n  background: #fffaf0;\n  color: #84610d;\n  font-size: 14px;\n  line-height: 1.55;\n  padding: 16px 20px;\n}\n:host .note-box strong {\n  font-weight: 700;\n}\n:host .directors-change-checkbox {\n  align-self: flex-start;\n}\n:host .filing-details-grid {\n  display: flex;\n  flex-direction: column;\n  gap: 8px;\n  max-width: 100%;\n}\n:host .date-field,\n:host .email-field {\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n:host .date-field label,\n:host .email-field label {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n}\n:host .date-field span,\n:host .email-field span {\n  color: #e22222;\n}\n:host .hint,\n:host .annual-reminder p,\n:host .mailing-copy {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n:host .filing-fee {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.35;\n  margin: 0;\n}\n:host .filing-fee strong {\n  color: #2f343b;\n  font-weight: 700;\n}\n:host .company-email-field {\n  width: 50%;\n}\n:host .effective-date-description {\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.45;\n  margin: 0;\n}\n:host .effective-date-description strong {\n  color: #2f343b;\n  font-weight: 700;\n}\n:host .directors-table {\n  display: grid;\n  grid-template-columns: minmax(180px, 0.7fr) minmax(280px, 1.65fr) minmax(280px, 1.65fr);\n  margin-top: 28px;\n  color: #4b5563;\n  font-size: 14px;\n  line-height: 1.45;\n}\n:host .directors-table-header,\n:host .directors-table-row {\n  display: contents;\n}\n:host .directors-table-header > div,\n:host .directors-table-row > div {\n  border-bottom: 1px solid #e1e6ee;\n  padding: 16px 24px;\n}\n:host .directors-table-header > div:not(:first-child),\n:host .directors-table-row > div:not(:first-child) {\n  border-left: 1px solid #e1e6ee;\n}\n:host .directors-table-header > div {\n  color: #2f343b;\n  font-weight: 700;\n  padding-top: 0;\n}\n:host .directors-table-row strong {\n  color: #2f343b;\n  display: block;\n  font-weight: 700;\n  margin-bottom: 8px;\n}\n:host .status-pill {\n  border-radius: 999px;\n  display: inline-flex;\n  font-size: 12px;\n  font-weight: 700;\n  line-height: 1;\n  padding: 6px 12px;\n}\n:host .status-pill.new {\n  background: #eaf7ef;\n  border: 1px solid #b8e3c7;\n  color: #15803d;\n}\n:host .status-pill.ceased {\n  background: #fff1f2;\n  border: 1px solid #fecdd3;\n  color: #be123c;\n}\n:host mat-radio-group {\n  display: flex;\n  gap: 48px;\n}\n:host .annual-reminder mat-radio-group {\n  align-items: flex-start;\n  flex-direction: column;\n  gap: 14px;\n}\n:host .date-field mat-form-field {\n  position: relative;\n  width: 100%;\n}\n:host .date-field ::ng-deep .calendar-icon {\n  border: 2px solid #4b5563;\n  border-radius: 3px;\n  box-sizing: border-box;\n  display: block;\n  height: 17px;\n  position: relative;\n  width: 17px;\n}\n:host .date-field ::ng-deep .calendar-icon::before {\n  border-top: 2px solid #4b5563;\n  content: "";\n  left: 0;\n  position: absolute;\n  right: 0;\n  top: 4px;\n}\n:host .date-field ::ng-deep .calendar-icon::after {\n  background: #4b5563;\n  border-radius: 1px;\n  box-shadow: 6px 0 #4b5563;\n  content: "";\n  height: 3px;\n  left: 3px;\n  position: absolute;\n  top: -3px;\n  width: 2px;\n}\n:host .date-field .calendar-trigger {\n  align-items: center;\n  background: transparent;\n  border: 0;\n  cursor: pointer;\n  display: flex;\n  height: 40px;\n  justify-content: center;\n  padding: 0;\n  position: absolute;\n  right: 8px;\n  top: 50%;\n  transform: translateY(-50%);\n  width: 40px;\n  z-index: 2;\n}\n:host .date-field .calendar-trigger:hover {\n  background: #f3f4f6;\n  border-radius: 50%;\n}\n@media (max-width: 900px) {\n  :host .filing-details-grid,\n  :host .directors-table {\n    grid-template-columns: 1fr;\n  }\n  :host .directors-table-header {\n    display: none;\n  }\n  :host .directors-table-row {\n    display: grid;\n    grid-template-columns: 1fr;\n    border-bottom: 1px solid #e1e6ee;\n  }\n  :host .directors-table-row > div {\n    border: 0;\n    padding: 14px 0;\n  }\n  :host mat-radio-group {\n    flex-direction: column;\n    gap: 14px;\n  }\n}\n@media (max-width: 900px) and (max-width: 700px) {\n  .company-email-field {\n    width: 100%;\n  }\n}\n/*# sourceMappingURL=change-of-directors-form.component.css.map */\n'] }]
         }], null, null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaChangeOfDirectorsFormComponent, { className: "BritishColumbiaChangeOfDirectorsFormComponent", filePath: "src/app/components/british-columbia/change-of-directors/change-of-directors-form/change-of-directors-form.component.ts", lineNumber: 59 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaChangeOfDirectorsFormComponent, { className: "BritishColumbiaChangeOfDirectorsFormComponent", filePath: "src/app/components/british-columbia/change-of-directors/change-of-directors-form/change-of-directors-form.component.ts", lineNumber: 61 });
       })();
     }
   });
@@ -87869,226 +87806,139 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", corporationDetails_r5)("config", ctx_r0.corporationDetailsFields());
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_9_Template(rf, ctx) {
-    if (rf & 1) {
-      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) {
-      \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) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_For_3_Conditional_7_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\u0275elementStart(0, "div", 13);
+      \u0275\u0275text(1);
+      \u0275\u0275pipe(2, "translate");
       \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);
+      const row_r6 = \u0275\u0275nextContext().$implicit;
       \u0275\u0275advance();
-      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredDelivery_r10)("config", ctx_r0.addressFields);
+      \u0275\u0275textInterpolate2(" ", \u0275\u0275pipeBind1(2, 2, "Previous"), ": ", row_r6.previous, " ");
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_For_3_Template(rf, ctx) {
     if (rf & 1) {
-      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\u0275elementStart(0, "div", 9)(1, "div", 11)(2, "span", 12);
+      \u0275\u0275text(3);
+      \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \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\u0275text(5);
+      \u0275\u0275pipe(6, "translate");
       \u0275\u0275elementEnd();
-      \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\u0275template(7, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_For_3_Conditional_7_Template, 3, 4, "div", 13);
       \u0275\u0275elementEnd();
-      \u0275\u0275template(14, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_14_Template, 2, 6);
-      \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
-      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\u0275textInterpolate(\u0275\u0275pipeBind1(8, 15, "New Mailing Address"));
-      \u0275\u0275advance(2);
-      \u0275\u0275conditional(registeredMailing_r12 ? 9 : -1);
+      const row_r6 = ctx.$implicit;
+      \u0275\u0275advance(3);
+      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(4, 3, row_r6.label), ":");
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(12, 17, "New Delivery Address"));
+      \u0275\u0275textInterpolate1(" ", row_r6.value || \u0275\u0275pipeBind1(6, 5, "Not specified"), " ");
       \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);
+      \u0275\u0275conditional(row_r6.previous ? 7 : -1);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_3_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_4_Template(rf, ctx) {
     if (rf & 1) {
-      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();
+      \u0275\u0275element(0, "alert", 10);
+    }
+  }
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275elementStart(0, "expandable-card", 5)(1, "div", 8);
+      \u0275\u0275repeaterCreate(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_For_3_Template, 8, 7, "div", 9, _forTrack05);
+      \u0275\u0275template(4, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_4_Template, 1, 0, "alert", 10);
+      \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
-      \u0275\u0275nextContext(2);
-      const recordsMailing_r18 = \u0275\u0275readContextLet(0);
       const ctx_r0 = \u0275\u0275nextContext();
-      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsMailing_r18)("config", ctx_r0.addressFields);
+      \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.isRegisteredOfficeValid())("title", ctx_r0.groups.RegisteredOfficeAddress);
+      \u0275\u0275advance(2);
+      \u0275\u0275repeater(ctx_r0.registeredRows());
+      \u0275\u0275advance(2);
+      \u0275\u0275conditional(ctx_r0.isRegisteredMissing() ? 4 : -1);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_8_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_For_3_Conditional_7_Template(rf, ctx) {
     if (rf & 1) {
-      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\u0275elementStart(0, "div", 13);
+      \u0275\u0275text(1);
+      \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
-      \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);
+      const row_r7 = \u0275\u0275nextContext().$implicit;
+      \u0275\u0275advance();
+      \u0275\u0275textInterpolate2(" ", \u0275\u0275pipeBind1(2, 2, "Previous"), ": ", row_r7.previous, " ");
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_For_3_Template(rf, ctx) {
     if (rf & 1) {
-      const _r16 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "h4", 10);
-      \u0275\u0275text(1);
-      \u0275\u0275pipe(2, "translate");
+      \u0275\u0275elementStart(0, "div", 9)(1, "div", 11)(2, "span", 12);
+      \u0275\u0275text(3);
+      \u0275\u0275pipe(4, "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\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\u0275template(7, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_For_3_Conditional_7_Template, 3, 4, "div", 13);
       \u0275\u0275elementEnd();
-      \u0275\u0275template(8, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_8_Template, 1, 3, "filing-form-group", 9);
     }
     if (rf & 2) {
-      \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);
+      const row_r7 = ctx.$implicit;
+      \u0275\u0275advance(3);
+      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(4, 3, row_r7.label), ":");
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 9, "New Delivery Address"));
+      \u0275\u0275textInterpolate1(" ", row_r7.value || \u0275\u0275pipeBind1(6, 5, "Not specified"), " ");
       \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);
+      \u0275\u0275conditional(row_r7.previous ? 7 : -1);
+    }
+  }
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_4_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275element(0, "alert", 10);
     }
   }
   function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Template(rf, ctx) {
     if (rf & 1) {
-      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\u0275elementStart(0, "expandable-card", 5)(1, "div", 8);
+      \u0275\u0275repeaterCreate(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_For_3_Template, 8, 7, "div", 9, _forTrack05);
+      \u0275\u0275template(4, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_4_Template, 1, 0, "alert", 10);
       \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\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);
+      \u0275\u0275repeater(ctx_r0.recordsRows());
+      \u0275\u0275advance(2);
+      \u0275\u0275conditional(ctx_r0.isRecordsMissing() ? 4 : -1);
     }
   }
   function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_13_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 11)(2, "p");
+      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 14)(2, "p");
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(5, "mat-radio-group", 12)(6, "mat-radio-button", 13);
+      \u0275\u0275elementStart(5, "mat-radio-group", 15)(6, "mat-radio-button", 16);
       \u0275\u0275text(7);
       \u0275\u0275pipe(8, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(9, "mat-radio-button", 13);
+      \u0275\u0275elementStart(9, "mat-radio-button", 16);
       \u0275\u0275text(10);
       \u0275\u0275pipe(11, "translate");
       \u0275\u0275elementEnd()()()();
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
-      const annualReportReminder_r24 = \u0275\u0275readContextLet(12);
+      const annualReportReminder_r8 = \u0275\u0275readContextLet(12);
       \u0275\u0275property("isStatusIcon", false)("title", ctx_r0.groups.AnnualReportReminder);
       \u0275\u0275advance();
-      \u0275\u0275property("formGroup", annualReportReminder_r24);
+      \u0275\u0275property("formGroup", annualReportReminder_r8);
       \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);
@@ -88103,7 +87953,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 BritishColumbiaChangeOfOfficeAddressesFormComponent;
+  var _forTrack05, 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();
@@ -88116,11 +87966,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();
@@ -88148,12 +87998,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           return Object.values(this.sectionValidity).every((v) => v) && this.isRegisteredOfficeValid() && this.isRecordsOfficeValid();
         }
         isRegisteredOfficeValid() {
-          const office = this.getFormGroup(this.groups.RegisteredOfficeAddress);
-          return this.isAddressValid(office, this.controls.NewMailingAddress) && this.isAddressValid(office, this.controls.NewDeliveryAddress);
+          return !this.isRegisteredMissing();
         }
         isRecordsOfficeValid() {
-          const office = this.getFormGroup(this.groups.RecordsOfficeAddress);
-          return this.isAddressValid(office, this.controls.NewMailingAddress) && this.isAddressValid(office, this.controls.NewDeliveryAddress);
+          return !this.isRecordsMissing();
+        }
+        /** 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);
         }
         isChecked(office, control) {
           return Boolean(office?.get(control)?.value);
@@ -88171,14 +88026,63 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         getAddressGroup(office, control) {
           return office?.get(control) ?? null;
         }
-        isAddressValid(office, control) {
-          const group2 = this.getAddressGroup(office, control);
-          return !group2 || group2.disabled || isFormGroupVisiblyValid(group2, this.addressFields);
+        /** 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 : "";
         }
         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: 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) {
+        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: 10, 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"], ["title", "New address missing", "content", "No new address was found for this office. Add it in Athennian, then try again."], [1, "body-1-regular", "grey"], [1, "body-1-semibold"], [1, "change-of-office-addresses-form-previous", "body-2-regular"], [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);
@@ -88188,9 +88092,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \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\u0275template(9, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Template, 5, 4, "expandable-card", 5);
             \u0275\u0275declareLet(10);
-            \u0275\u0275template(11, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Template, 9, 13, "expandable-card", 5);
+            \u0275\u0275template(11, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Template, 5, 4, "expandable-card", 5);
             \u0275\u0275declareLet(12);
             \u0275\u0275template(13, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_13_Template, 12, 15, "expandable-card", 6);
             \u0275\u0275elementEnd()();
@@ -88201,25 +88105,23 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275advance();
             \u0275\u0275conditional(ctx.errors().length ? 2 : -1);
             \u0275\u0275advance(2);
-            const referenceNumbers_r25 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.ReferenceNumbers));
-            \u0275\u0275advance();
-            \u0275\u0275conditional(referenceNumbers_r25 ? 5 : -1);
+            const referenceNumbers_r9 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.ReferenceNumbers));
             \u0275\u0275advance();
-            const corporationDetails_r26 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CorporationDetails));
+            \u0275\u0275conditional(referenceNumbers_r9 ? 5 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(corporationDetails_r26 ? 7 : -1);
+            const corporationDetails_r10 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CorporationDetails));
             \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\u0275conditional(corporationDetails_r10 ? 7 : -1);
+            const registeredOffice_r11 = ctx.getFormGroup(ctx.groups.RegisteredOfficeAddress);
+            \u0275\u0275advance(2);
+            \u0275\u0275conditional(registeredOffice_r11 ? 9 : -1);
+            const recordsOffice_r12 = ctx.getFormGroup(ctx.groups.RecordsOfficeAddress);
+            \u0275\u0275advance(2);
+            \u0275\u0275conditional(recordsOffice_r12 ? 11 : -1);
             \u0275\u0275advance();
-            const annualReportReminder_r29 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
+            const annualReportReminder_r13 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
             \u0275\u0275advance();
-            \u0275\u0275conditional(annualReportReminder_r29 ? 13 : -1);
+            \u0275\u0275conditional(annualReportReminder_r13 ? 13 : -1);
           }
         }, dependencies: [
           FilingFormGroupComponent,
@@ -88233,7 +88135,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/*# 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[_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-style: italic;\n  color: var(--filing-modal-color-grey-mid);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */"], changeDetection: 0 });
       };
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(BritishColumbiaChangeOfOfficeAddressesFormComponent, [{
@@ -88297,53 +88199,30 @@ 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
-          <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
+          @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 body-2-regular">\r
+                  {{ 'Previous' | translate }}: {{ row.previous }}\r
+                </div>\r
+              }\r
+            </div>\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
+          @if (isRegisteredMissing()) {\r
+            <alert\r
+              title="New address missing"\r
+              content="No new address was found for this office. Add it in Athennian, then try again."\r
             />\r
           }\r
         </div>\r
@@ -88354,59 +88233,31 @@ 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
-          <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
+          @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 body-2-regular">\r
+                  {{ 'Previous' | translate }}: {{ row.previous }}\r
+                </div>\r
+              }\r
+            </div>\r
+          }\r
 \r
-            <filing-form-group\r
-              [isSubmitted]="isSubmitted()"\r
-              [form]="recordsOffice"\r
-              [config]="deliverySameAsMailingFields"\r
-              (visiblyValidChange)="emitValidity()"\r
+          @if (isRecordsMissing()) {\r
+            <alert\r
+              title="New address missing"\r
+              content="No new address was found for this office. Add it in Athennian, then try again."\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
@@ -88436,11 +88287,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/*# 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: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-style: italic;\n  color: var(--filing-modal-color-grey-mid);\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: 55 });
+        (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: 60 });
       })();
     }
   });
@@ -90824,7 +90675,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, _forTrack05);
+      \u0275\u0275repeaterCreate(9, FederalIncorporationFormComponent_Conditional_7_For_10_Template, 2, 1, "li", 17, _forTrack06);
       \u0275\u0275elementEnd()();
       \u0275\u0275elementStart(11, "span", 17);
       \u0275\u0275text(12);
@@ -91027,7 +90878,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, _forTrack05, FederalIncorporationFormComponent;
+  var _c016, _forTrack06, FederalIncorporationFormComponent;
   var init_federal_incorporation_form_component = __esm({
     "src/app/components/federal/incorporation/federal-incorporation-form/federal-incorporation-form.component.ts"() {
       init_core();
@@ -91052,7 +90903,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_common();
       init_core();
       _c016 = ["*"];
-      _forTrack05 = ($index, $item) => $item.affiliationID;
+      _forTrack06 = ($index, $item) => $item.affiliationID;
       FederalIncorporationFormComponent = class _FederalIncorporationFormComponent {
         form = input.required();
         isNote = input(false);
@@ -95652,6 +95503,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function findDirectorNumber(affiliation, extract) {
     const target = normaliseDirectorName(affiliation);
+    const targetId = String(affiliation?._id ?? affiliation?.id ?? "").trim();
     let result;
     const visit = (value) => {
       if (result !== void 0 || value === null || value === void 0)
@@ -95664,7 +95516,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         return;
       const record = value;
       const number = record["directorNumber"] ?? record["DirectorNumber"];
-      if (number !== void 0 && normaliseDirectorName(record) === target) {
+      const recordId = String(record["_id"] ?? record["id"] ?? record["affiliationId"] ?? "").trim();
+      if (number !== void 0 && (targetId && recordId === targetId || normaliseDirectorName(record) === target)) {
         const parsed = Number(number);
         if (Number.isFinite(parsed))
           result = parsed;
@@ -96371,6 +96224,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               }
             }
             if (isChangeOfPrincipalsTask(task) && isBritishColumbiaTask(task) && this.bcDataExtractTaskId !== task._id) {
+              if (task.deltaData?.validatedData) {
+                this.bcCurrentDataServiceOrderId = task.deltaData.validatedData.currentDataServiceOrderId ?? "";
+                this.bcDataExtractTaskId = task._id;
+                return;
+              }
               const signature = this._signature();
               if (!signature)
                 return;
@@ -96988,12 +96846,41 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           return "Initial Return Draft";
         }
         onEditClick() {
-          if (isUpdateMaintain(this.task())) {
+          const task = this.task();
+          if (!task)
+            return;
+          if (isUpdateMaintain(task)) {
             this.serviceOrderId = "";
             void this.getCurrentData();
+          } else if (isChangeOfPrincipalsTask(task) && isBritishColumbiaTask(task)) {
+            this.bcDataExtractTaskId = "";
+            void this.refreshBritishColumbiaCurrentDataExtract();
           }
           this.activeStep.set(Step.Validate);
         }
+        refreshBritishColumbiaCurrentDataExtract() {
+          return __async(this, null, function* () {
+            const task = this.task();
+            const signature = this._signature();
+            if (!task || !signature || !isChangeOfPrincipalsTask(task))
+              return;
+            const { request, issues } = buildBritishColumbiaDataExtractOrder(task, task.deltaData?.companyPassword);
+            if (issues.length) {
+              this.errors.set(issues);
+              return;
+            }
+            this.isLoading.set(true);
+            try {
+              this.bcCurrentDataServiceOrderId = yield this.britishColumbiaChangeOfDirectorsService.ensureCurrentDataExtract(signature, request, this.validateOptions() ?? {});
+              this.currentDataExtract.set(this.britishColumbiaChangeOfDirectorsService.getCurrentDataExtract());
+              this.bcDataExtractTaskId = task._id;
+            } catch (error) {
+              this.handleCatchError(error);
+            } finally {
+              this.isLoading.set(false);
+            }
+          });
+        }
         parseError(errors) {
           return errors.map((item) => (item["ErrorMessage"] ?? item["Message"] ?? "").toString().trim()).filter((message) => message.length > 0);
         }
@@ -97319,7 +97206,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 97 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 98 });
       })();
     }
   });
@@ -101969,6 +101856,8 @@ 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.",
+        "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",
@@ -102325,6 +102214,8 @@ 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.",
+        "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",