@dyedurham/search-and-file-widget 2.0.94 → 2.0.96

package/dnd-filing-shell.js

@@ -57885,9 +57885,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
 
   // src/app/utils/common.utils.ts
   function buildValidationError(httpStatus, r) {
-    const msgs = (r.Errors ?? []).map((e) => e.ErrorMessage || e.Message || e.message || e.Code || JSON.stringify(e)).filter(Boolean);
-    const status = r.Status ? String(r.Status) : "ValidationFailed";
-    return new Error(msgs.length ? `eCore validation failed (HTTP ${httpStatus}, ${status}): ${msgs.join(" | ")}` : `eCore validation failed (HTTP ${httpStatus}, ${status}).`);
+    const msgs = (r.Errors ?? r.errors ?? []).map((e) => e.ErrorMessage || e.Message || e.message || e.Code || JSON.stringify(e)).filter(Boolean);
+    return new Error(msgs.length ? msgs.join(" | ") : "Validation failed.");
   }
   function joinUrl(base, path) {
     const b = base.endsWith("/") ? base.slice(0, -1) : base;
@@ -57995,6 +57994,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function isPrincipalAffiliation2(affiliation) {
     return affiliation.kind === "PrincipalAffiliationV3";
   }
+  function getIndividualDirectors(affiliations) {
+    return affiliations.filter((a) => isPrincipalAffiliation2(a) && a.role?.role_name === "Director" && a._participant?.participant_type === "person");
+  }
   function getAddressComponent(address, componentName) {
     if (!address)
       return "";
@@ -58109,6 +58111,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function isAnnualReturnTask(task) {
     return task?._taskType === TaskType.AnnualCompliance;
   }
+  function getFilingProvider(task) {
+    return task && !isOntarioTask(task) ? "federal" : "obr";
+  }
   function getSearchOrFilingType(task) {
     if (!task) {
       return void 0;
@@ -58130,7 +58135,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       return `${prefix}AnnualReturn`;
     }
     if (isChangeOfPrincipalsTask(task)) {
-      return `${prefix}NoticeOfChangeOfDirectors`;
+      return prefix === "bc" ? "bcChangeOfDirectors" : `${prefix}NoticeOfChangeOfDirectors`;
     }
     return void 0;
   }
@@ -58236,13 +58241,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     return incorporator.type?.toLowerCase() === "entity" ? `${incorporator.signatory_first_name} ${incorporator.signatory_last_name} (${incorporator.signatory_title}, ${incorporator.incorporator_name})` : `${incorporator.firstName} ${incorporator.middleName} ${incorporator.lastName}`;
   }
   function getIndividualWithSignificantControl(affiliations) {
-    return affiliations.filter((a) => {
-      const isPerson = a._participant.participant_type === "person";
-      const roleName = a.role?.role_name;
-      const staticTitle = a.role?.static_title;
-      const isSignificantControl = a.kind === "ShareholderAffiliationV3" || a.is_beneficial_owner || roleName === "Ultimate Beneficial Owner" || staticTitle === "Ultimate Beneficial Owner";
-      return isPerson && isSignificantControl;
-    });
+    return affiliations.filter((a) => a.kind === "ShareholderAffiliationV3" && a._participant.participant_type === "person");
   }
   function normalizeSupportingDocuments(value) {
     if (!Array.isArray(value)) {
@@ -84367,7 +84366,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
     const password = request.password ?? "";
     if (password.length < BC_PASSWORD_MIN_LENGTH || password.length > BC_PASSWORD_MAX_LENGTH || !/^[A-Za-z0-9]+$/.test(password)) {
-      issues.push(`Company Password must be ${BC_PASSWORD_MIN_LENGTH} to ${BC_PASSWORD_MAX_LENGTH} letters or digits only. Enter it in Corporation Details.`);
+      issues.push(`The company password (taken from the entity's registry ID) must be ${BC_PASSWORD_MIN_LENGTH} to ${BC_PASSWORD_MAX_LENGTH} letters or digits only. Update the registry ID in Athennian.`);
     }
     return issues;
   }
@@ -84759,14 +84758,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             // Prefilled from the entity's Business Email when Athennian has one; otherwise the user
             // enters it here (the API requires it).
             [BCFormationFormControls.CompanyEmail]: new FormControl(deltaData?.companyEmail ?? companyEmail, [Validators.required, Validators.email, Validators.maxLength(BC_COMPANY_EMAIL_MAX_LENGTH)]),
-            // The registry ID is only a suggestion: it is used when it already satisfies the BC
-            // password rule, otherwise the field starts empty for the user to fill in.
-            [BCFormationFormControls.CompanyPassword]: new FormControl(deltaData?.password ?? this.suggestPassword(task.entity._profile.registry_id), [
-              Validators.required,
-              Validators.minLength(BC_PASSWORD_MIN_LENGTH),
-              Validators.maxLength(BC_PASSWORD_MAX_LENGTH),
-              Validators.pattern(BC_PASSWORD_PATTERN)
-            ]),
+            // Not shown on screen: taken from the registry ID when it satisfies the BC password rule
+            // (otherwise empty). No validators here, as the user cannot fix it; the payload pre-flight
+            // check (`findBCRequestIssues`) reports an unusable value.
+            [BCFormationFormControls.CompanyPassword]: new FormControl(deltaData?.password ?? this.suggestPassword(task.entity._profile.registry_id)),
             [BCFormationFormControls.UsesNameTranslation]: new FormControl(usesNameTranslation),
             [BCFormationFormControls.NameTranslations]: new FormArray(translationRows)
           });
@@ -84868,6 +84863,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             })
           });
         }
+        /**
+         * Company Email dropdown options: the task's `emailOptions` (distinct addresses), plus the
+         * current value when it is not among them (a saved or fallback-prefilled address).
+         */
+        static buildCompanyEmailOptions(task, currentValue) {
+          const emails = (task?.entity.emailOptions ?? []).map((option) => option.value?.trim());
+          const current = currentValue?.trim();
+          return [...new Set([...emails, current].filter((email) => Boolean(email)))].map((email) => ({ label: email, value: email }));
+        }
         static suggestPassword(registryId) {
           const value = registryId?.trim() ?? "";
           return value.length >= BC_PASSWORD_MIN_LENGTH && value.length <= BC_PASSWORD_MAX_LENGTH && BC_PASSWORD_PATTERN.test(value) ? value : "";
@@ -84911,7 +84915,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_british_columbia_formation_form_helper();
       Controls = BCChangeOfDirectorsFormControls;
       BritishColumbiaChangeOfDirectorsFormHelper = class {
-        static generateConfig(task, _translateFn) {
+        static generateConfig(task, _translateFn, currentDataExtract) {
           const affiliations = task.entity.affiliations ?? [];
           const delta = task.deltaData;
           const format = BritishColumbiaFormationFormHelper.formatFullAddress;
@@ -84940,8 +84944,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             ]),
             [Controls.FilingFee]: this.readOnly(BC_CHANGE_OF_DIRECTORS_FILING_FEE)
           });
+          const currentDirectorKeys = this.getCurrentDirectorKeys(currentDataExtract);
           const directors = [
-            ...incoming.filter(isDirector).map((a) => this.generateDirectorFormGroup(a, IRAffiliationType.Add)),
+            ...incoming.filter(isDirector).map((a) => this.generateDirectorFormGroup(a, currentDirectorKeys.has(this.getDirectorKey(a)) ? IRAffiliationType.Update : IRAffiliationType.Add)),
             ...outgoing.filter(isDirector).map((a) => this.generateDirectorFormGroup(a, IRAffiliationType.Ceased))
           ];
           const fallbackDirectors = directors.length ? [] : this.generateDirectorFormGroupsFromChangeDirectors(task);
@@ -84959,6 +84964,45 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           });
           return config2;
         }
+        static getCurrentDirectorKeys(extract) {
+          const keys = /* @__PURE__ */ new Set();
+          const visit = (value) => {
+            if (Array.isArray(value)) {
+              value.forEach((item) => {
+                if (item && typeof item === "object") {
+                  const record = item;
+                  const role = String(record["role"] ?? record["Role"] ?? record["position"] ?? "").toLowerCase();
+                  if (!role || role.includes("director")) {
+                    const person = record["PersonName"] ?? record["personName"] ?? record["person"] ?? record;
+                    const name = [
+                      person.firstName ?? person.FirstName,
+                      person.middleName ?? person.MiddleName,
+                      person.lastName ?? person.LastName
+                    ].filter(Boolean).join(" ");
+                    const id = record["Id"] ?? record["id"] ?? record["affiliationId"] ?? record["AffiliationId"];
+                    if (id)
+                      keys.add(this.normaliseDirectorKey(id));
+                    if (name)
+                      keys.add(this.normaliseDirectorKey(name));
+                  }
+                }
+                visit(item);
+              });
+              return;
+            }
+            if (value && typeof value === "object") {
+              Object.values(value).forEach(visit);
+            }
+          };
+          visit(extract);
+          return keys;
+        }
+        static getDirectorKey(affiliation) {
+          return this.normaliseDirectorKey(generateTaskAffiliationFullName(affiliation));
+        }
+        static normaliseDirectorKey(value) {
+          return String(value ?? "").trim().toLowerCase().replace(/\s+/g, " ");
+        }
         static generateReferenceNumbersFormGroup(deltaData, clientMatterNumber, savedClientMatterNumber) {
           return new FormGroup({
             [Controls.ClientMatterNumber]: new FormControl(clientMatterNumber ?? savedClientMatterNumber ?? ""),
@@ -85018,6 +85062,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const postalAddress = director?.PostalAddress ?? director?.postalAddress;
           const address = postalAddress?.AddressCA ?? postalAddress?.AddressUS ?? postalAddress?.AddressINTL ?? director?.address ?? {};
           return [
+            address.streetAddress,
+            address.additionalStreetAddress,
             address.Address1 ?? address.address1,
             address.Address2 ?? address.address2,
             address.Address3 ?? address.address3,
@@ -85094,7 +85140,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static resolveCompanyEmail(task) {
           const affiliations = task.entity.affiliations ?? [];
           const registeredOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
-          return task.entity.emailOptions?.[0]?.value ?? registeredOffice?.addresses?.[0]?.communications?.find((c) => c.type === "Business Email")?.value ?? task.entity.communications?.find((c) => c.type === "Business Email")?.value ?? task.entity.addresses?.flatMap((a) => a.communications ?? []).find((c) => c.type === "Business Email")?.value ?? "";
+          return task.entity.emailOptions?.[0]?.value || registeredOffice?.addresses?.[0]?.communications?.find((c) => c.type === "Business Email")?.value || task.entity.communications?.find((c) => c.type === "Business Email")?.value || task.entity.addresses?.flatMap((a) => a.communications ?? []).find((c) => c.type === "Business Email")?.value || "";
         }
         /**
          * Address Line 1*, Address Line 2, City*, Postal Code*, Province (BC), Country (Canada).
@@ -85112,22 +85158,30 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           this.setOfficeAddressEnabled(group2, enabled);
           return group2;
         }
-        /** Enables or disables the editable controls of an address grid (used by "Same as…" checkboxes). */
+        /**
+         * Enables or disables the editable controls of an address grid (used by "Same as…" checkboxes).
+         * Hiding a grid also clears it, so un-ticking the checkbox shows an empty address to fill in.
+         */
         static setOfficeAddressEnabled(group2, enabled) {
           if (!group2) {
             return;
           }
           EDITABLE_ADDRESS_CONTROLS.forEach((name) => {
             const control = group2.get(name);
-            enabled ? control?.enable({ emitEvent: false }) : control?.disable({ emitEvent: false });
+            if (enabled) {
+              control?.enable({ emitEvent: false });
+            } else {
+              control?.setValue("", { emitEvent: false });
+              control?.disable({ emitEvent: false });
+            }
           });
           group2.updateValueAndValidity({ emitEvent: false });
         }
         static generateReferenceNumbersFormGroup(deltaData, clientMatterNumber) {
           return new FormGroup({
             [Controls2.ClientMatterNumber]: new FormControl(
-              // `||`, not `??`: a draft saved with the field empty stores '' and must not hide the entity's number.
-              deltaData?.referenceNumber || clientMatterNumber || ""
+              // `??`: an explicitly cleared value ('') in a saved draft must be preserved; the entity default applies only when absent.
+              deltaData?.referenceNumber ?? clientMatterNumber ?? ""
             ),
             [Controls2.DocketNumber]: new FormControl(deltaData?.docketNumber ?? "")
           });
@@ -85140,7 +85194,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/constants/ui/british-columbia-change-of-directors-form.constants.ts
-  var Controls3, labelledValue, readOnlyRow, directorsAddedOrDeleted, isNotifyByMail, BC_COD_DELTA_CARD_FORM_REFERENCE_NUMBERS_FIELDS, BC_COD_CARD_FORM_CORPORATION_DETAILS_FIELDS, BC_COD_DELTA_CARD_FORM_FILING_DETAILS_FIELDS, generateBCChangeOfDirectorsIntroFields, BC_COD_CARD_FORM_DIRECTORS_FIELDS, BC_COD_DELTA_CARD_FORM_ANNUAL_REPORT_REMINDER_FIELDS;
+  var Controls3, labelledValue, readOnlyRow, directorsAddedOrDeleted, isNotifyByMail, BC_COD_DELTA_CARD_FORM_REFERENCE_NUMBERS_FIELDS, BC_COD_CARD_FORM_CORPORATION_DETAILS_FIELDS, BC_COD_DELTA_CARD_FORM_FILING_DETAILS_FIELDS, BC_COD_CARD_FORM_DIRECTORS_FIELDS, BC_COD_DELTA_CARD_FORM_ANNUAL_REPORT_REMINDER_FIELDS;
   var init_british_columbia_change_of_directors_form_constants = __esm({
     "src/app/constants/ui/british-columbia-change-of-directors-form.constants.ts"() {
       init_form_enums();
@@ -85211,14 +85265,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           dynamicLabel: (_, t) => t("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.")
         }
       ];
-      generateBCChangeOfDirectorsIntroFields = (registerAsOf) => [
-        {
-          type: FormType.Text,
-          formControlName: "",
-          class: "span-12",
-          dynamicLabel: (_, t) => t("These are the directors on the corporate register as of {{date}}. Director appointments, cessations and changes to a director's details are made on the task before this filing \u2014 they cannot be added, ceased, or edited here. Ceasing or adding a director requires the checkbox and date in Filing Details above.").replace("{{date}}", registerAsOf)
-        }
-      ];
       BC_COD_CARD_FORM_DIRECTORS_FIELDS = [
         readOnlyRow("Mailing Address - Full Address", Controls3.MailingAddress),
         readOnlyRow("Delivery Address - Full Address", Controls3.DeliveryAddress)
@@ -85292,7 +85338,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", 11);
+      \u0275\u0275elementStart(0, "expandable-card", 5)(1, "filing-form-group", 10);
       \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_5_Template_filing_form_group_visiblyValidChange_1_listener($event) {
         \u0275\u0275restoreView(_r2);
         const ctx_r0 = \u0275\u0275nextContext();
@@ -85310,7 +85356,7 @@ 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", 12)(2, "p")(3, "strong");
+      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 11)(2, "p")(3, "strong");
       \u0275\u0275text(4);
       \u0275\u0275pipe(5, "translate");
       \u0275\u0275elementEnd();
@@ -85353,13 +85399,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template(rf, ctx) {
     if (rf & 1) {
       const _r7 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "div", 16)(1, "div", 17)(2, "label");
+      \u0275\u0275elementStart(0, "div", 15)(1, "div", 16)(2, "label");
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementStart(5, "span");
       \u0275\u0275text(6, "*");
       \u0275\u0275elementEnd()();
-      \u0275\u0275elementStart(7, "mat-form-field", 18)(8, "input", 19);
+      \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);
@@ -85371,21 +85417,21 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         return \u0275\u0275resetView(ctx_r0.onSectionValidChange("filingDetails", filingDetails_r6.valid));
       });
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(9, "button", 20);
+      \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", 21);
+      \u0275\u0275element(10, "span", 20);
       \u0275\u0275elementEnd();
       \u0275\u0275element(11, "mat-datepicker", null, 0);
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(13, "p", 22);
+      \u0275\u0275elementStart(13, "p", 21);
       \u0275\u0275text(14);
       \u0275\u0275pipe(15, "translate");
       \u0275\u0275elementEnd()();
-      \u0275\u0275elementStart(16, "p", 23)(17, "strong");
+      \u0275\u0275elementStart(16, "p", 22)(17, "strong");
       \u0275\u0275text(18);
       \u0275\u0275pipe(19, "translate");
       \u0275\u0275elementEnd();
@@ -85412,14 +85458,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Template(rf, ctx) {
     if (rf & 1) {
       const _r5 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 13)(2, "div", 14)(3, "strong");
+      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 12)(2, "div", 13)(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", 15);
+      \u0275\u0275elementStart(8, "mat-checkbox", 14);
       \u0275\u0275listener("change", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Template_mat_checkbox_change_8_listener() {
         let tmp_7_0;
         let tmp_8_0;
@@ -85433,7 +85479,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275text(9);
       \u0275\u0275pipe(10, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275template(11, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template, 21, 12, "div", 16);
+      \u0275\u0275template(11, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template, 21, 12, "div", 15);
       \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
@@ -85455,9 +85501,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275conditional(((tmp_14_0 = filingDetails_r6.get(ctx_r0.controls.DirectorsAddedOrDeleted)) == null ? null : tmp_14_0.value) ? 11 : -1);
     }
   }
-  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Conditional_4_Template(rf, ctx) {
+  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Conditional_4_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "span", 28);
+      \u0275\u0275elementStart(0, "span", 27);
       \u0275\u0275text(1);
       \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
@@ -85467,9 +85513,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(2, 1, "NEW"));
     }
   }
-  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Conditional_5_Template(rf, ctx) {
+  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Conditional_5_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "span", 29);
+      \u0275\u0275elementStart(0, "span", 28);
       \u0275\u0275text(1);
       \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
@@ -85479,17 +85525,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(2, 1, "CEASE"));
     }
   }
-  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Template(rf, ctx) {
+  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 26)(1, "div", 27)(2, "strong");
+      \u0275\u0275elementStart(0, "div", 25)(1, "div", 26)(2, "strong");
       \u0275\u0275text(3);
       \u0275\u0275elementEnd();
-      \u0275\u0275template(4, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Conditional_4_Template, 3, 3, "span", 28)(5, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Conditional_5_Template, 3, 3, "span", 29);
+      \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\u0275elementEnd();
-      \u0275\u0275elementStart(6, "div", 27);
+      \u0275\u0275elementStart(6, "div", 26);
       \u0275\u0275text(7);
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(8, "div", 27);
+      \u0275\u0275elementStart(8, "div", 26);
       \u0275\u0275text(9);
       \u0275\u0275elementEnd()();
     }
@@ -85512,33 +85558,33 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275textInterpolate((tmp_23_0 = directorForm_r9.get(ctx_r0.controls.DeliveryAddress)) == null ? null : tmp_23_0.value);
     }
   }
-  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Template(rf, ctx) {
+  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Template(rf, ctx) {
     if (rf & 1) {
       \u0275\u0275declareLet(0);
-      \u0275\u0275template(1, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Template, 10, 5, "div", 26);
+      \u0275\u0275template(1, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Conditional_1_Template, 10, 5, "div", 25);
     }
     if (rf & 2) {
-      const \u0275$index_117_r10 = ctx.$index;
-      const directorForm_r11 = \u0275\u0275storeLet(\u0275\u0275nextContext(2).getDirectorForm(\u0275$index_117_r10));
+      const \u0275$index_115_r10 = ctx.$index;
+      const directorForm_r11 = \u0275\u0275storeLet(\u0275\u0275nextContext(2).getDirectorForm(\u0275$index_115_r10));
       \u0275\u0275advance();
       \u0275\u0275conditional(directorForm_r11 ? 1 : -1);
     }
   }
-  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_Template(rf, ctx) {
+  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 9)(1, "div", 24)(2, "div", 25);
+      \u0275\u0275elementStart(0, "div", 8)(1, "div", 23)(2, "div", 24);
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(5, "div", 25);
+      \u0275\u0275elementStart(5, "div", 24);
       \u0275\u0275text(6);
       \u0275\u0275pipe(7, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(8, "div", 25);
+      \u0275\u0275elementStart(8, "div", 24);
       \u0275\u0275text(9);
       \u0275\u0275pipe(10, "translate");
       \u0275\u0275elementEnd()();
-      \u0275\u0275repeaterCreate(11, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Template, 2, 2, null, null, \u0275\u0275repeaterTrackByIdentity);
+      \u0275\u0275repeaterCreate(11, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_For_12_Template, 2, 2, null, null, \u0275\u0275repeaterTrackByIdentity);
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
@@ -85554,9 +85600,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275repeater(directorsArray_r12.controls);
     }
   }
-  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_14_Template(rf, ctx) {
+  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "h2", 10);
+      \u0275\u0275elementStart(0, "h2", 9);
       \u0275\u0275text(1);
       \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
@@ -85566,32 +85612,32 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(2, 1, "Unchanged"));
     }
   }
-  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_16_Template(rf, ctx) {
+  function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_15_Template(rf, ctx) {
     if (rf & 1) {
       const _r13 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 30)(2, "p");
+      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 29)(2, "p");
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(5, "mat-radio-group", 31);
-      \u0275\u0275listener("change", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_16_Template_mat_radio_group_change_5_listener() {
+      \u0275\u0275elementStart(5, "mat-radio-group", 30);
+      \u0275\u0275listener("change", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_15_Template_mat_radio_group_change_5_listener() {
         \u0275\u0275restoreView(_r13);
         const ctx_r0 = \u0275\u0275nextContext();
-        const annualReportReminder_r14 = \u0275\u0275readContextLet(15);
+        const annualReportReminder_r14 = \u0275\u0275readContextLet(14);
         return \u0275\u0275resetView(ctx_r0.onSectionValidChange("annualReportReminder", annualReportReminder_r14.valid));
       });
-      \u0275\u0275elementStart(6, "mat-radio-button", 32);
+      \u0275\u0275elementStart(6, "mat-radio-button", 31);
       \u0275\u0275text(7);
       \u0275\u0275pipe(8, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(9, "mat-radio-button", 32);
+      \u0275\u0275elementStart(9, "mat-radio-button", 31);
       \u0275\u0275text(10);
       \u0275\u0275pipe(11, "translate");
       \u0275\u0275elementEnd()()()();
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
-      const annualReportReminder_r14 = \u0275\u0275readContextLet(15);
+      const annualReportReminder_r14 = \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);
@@ -85646,10 +85692,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         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;
-        directorsIntroFields = computed(() => {
-          const date = this.form().get(this.groups.Notification)?.get(this.controls.RegisterAsOfDate)?.value ?? "";
-          return generateBCChangeOfDirectorsIntroFields(date);
-        });
         initiallyOpenCardsCount = 3;
         sectionValidity = {};
         isVisiblyValid() {
@@ -85684,7 +85726,7 @@ 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: 17, vars: 17, 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"], [3, "isSubmitted", "form", "config"], ["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: [["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) {
           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);
@@ -85697,11 +85739,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275template(9, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Template, 12, 15, "expandable-card", 7);
             \u0275\u0275declareLet(10);
             \u0275\u0275elementStart(11, "expandable-card", 6);
-            \u0275\u0275element(12, "filing-form-group", 8);
-            \u0275\u0275template(13, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_Template, 13, 9, "div", 9)(14, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_14_Template, 3, 3, "h2", 10);
+            \u0275\u0275template(12, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_12_Template, 13, 9, "div", 8)(13, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_Template, 3, 3, "h2", 9);
             \u0275\u0275elementEnd();
-            \u0275\u0275declareLet(15);
-            \u0275\u0275template(16, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_16_Template, 12, 16, "expandable-card", 7);
+            \u0275\u0275declareLet(14);
+            \u0275\u0275template(15, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_15_Template, 12, 16, "expandable-card", 7);
             \u0275\u0275elementEnd()();
           }
           if (rf & 2) {
@@ -85726,13 +85767,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275advance();
             \u0275\u0275property("isStatusIcon", false)("title", ctx.groups.Directors);
             \u0275\u0275advance();
-            \u0275\u0275property("isSubmitted", ctx.isSubmitted())("form", ctx.form())("config", ctx.directorsIntroFields());
-            \u0275\u0275advance();
-            \u0275\u0275conditional(directorsArray_r18 && directorsArray_r18.length ? 13 : 14);
+            \u0275\u0275conditional(directorsArray_r18 && directorsArray_r18.length ? 12 : 13);
             \u0275\u0275advance(2);
             const annualReportReminder_r19 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
             \u0275\u0275advance();
-            \u0275\u0275conditional(annualReportReminder_r19 ? 16 : -1);
+            \u0275\u0275conditional(annualReportReminder_r19 ? 15 : -1);
           }
         }, dependencies: [
           FilingFormGroupComponent,
@@ -85902,12 +85941,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     @let directorsArray = getFormArray(groups.Directors);\r
 \r
     <expandable-card [isStatusIcon]="false" [title]="groups.Directors">\r
-      <filing-form-group\r
-        [isSubmitted]="isSubmitted()"\r
-        [form]="form()"\r
-        [config]="directorsIntroFields()"\r
-      />\r
-\r
       @if (directorsArray && directorsArray.length) {\r
         <div class="directors-table" role="table">\r
           <div class="directors-table-header" role="row">\r
@@ -85975,7 +86008,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }], 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: 61 });
+        (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 });
       })();
     }
   });
@@ -86283,27 +86316,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           dynamicLabel: (_, t) => t("There is an additional fee of {{fee}} for an effective date in the future.").replace("{{fee}}", BC_FUTURE_EFFECTIVE_DATE_FEE)
         },
         {
-          type: FormType.Input,
-          inputType: "email",
+          // Options are filled per task from `task.entity.emailOptions` by the incorporation form.
+          type: FormType.Select,
           label: "Company Email",
           formControlName: BCFormationFormControls.CompanyEmail,
           required: true,
-          maxLength: BC_COMPANY_EMAIL_MAX_LENGTH,
-          errorMessage: "Enter a valid email address",
-          showRequiredMessage: true,
-          class: "span-6"
-        },
-        {
-          type: FormType.Input,
-          inputType: "password",
-          label: "Company Password",
-          formControlName: BCFormationFormControls.CompanyPassword,
-          required: true,
-          maxLength: BC_PASSWORD_MAX_LENGTH,
-          errorMessage: "Company Password must be 8 to 15 characters",
-          showRequiredMessage: true,
+          options: [],
           class: "span-6"
         }
+        // The company password is not shown: it is taken from the entity's registry ID.
       ];
       BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_FIELDS = [
         {
@@ -86662,7 +86683,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       const corporationDetails_r11 = \u0275\u0275readContextLet(6);
       \u0275\u0275property("isValid", ctx_r0.sectionValidity["corpDetails"] && ctx_r0.sectionValidity["nameTranslation"] && ctx_r0.areNameTranslationsValid())("isStatusIcon", ctx_r0.statusIcon())("title", ctx_r0.groups.CorporationDetails);
       \u0275\u0275advance(2);
-      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", corporationDetails_r11)("config", ctx_r0.corporationDetailsFields);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", corporationDetails_r11)("config", ctx_r0.corporationDetailsFields());
       \u0275\u0275advance(2);
       \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(5, 11, "Name Translation"));
       \u0275\u0275advance(2);
@@ -86897,7 +86918,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         groups = BCFormationFormGroups;
         controls = BCFormationFormControls;
         referenceNumbersFields = BC_FORMATION_DELTA_CARD_FORM_REFERENCE_NUMBERS_FIELDS;
-        corporationDetailsFields = BC_FORMATION_DELTA_CARD_FORM_CORPORATION_DETAILS_FIELDS;
+        /** Corporation Details fields, with the Company Email dropdown filled from the task. */
+        corporationDetailsFields = computed(() => {
+          const currentEmail = this.form().get(this.groups.CorporationDetails)?.get(this.controls.CompanyEmail)?.value;
+          const emailOptions = BritishColumbiaFormationFormHelper.buildCompanyEmailOptions(this.task(), currentEmail);
+          return BC_FORMATION_DELTA_CARD_FORM_CORPORATION_DETAILS_FIELDS.map((field) => field.formControlName === this.controls.CompanyEmail ? __spreadProps(__spreadValues({}, field), { options: emailOptions }) : field);
+        });
         nameTranslationFields = BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_FIELDS;
         nameTranslationRowFields = BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_ROW_FIELDS;
         registeredOfficeFields = BC_FORMATION_CARD_FORM_REGISTERED_OFFICE_FIELDS;
@@ -87087,7 +87113,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           <filing-form-group\r
             [isSubmitted]="isSubmitted()"\r
             [form]="corporationDetails"\r
-            [config]="corporationDetailsFields"\r
+            [config]="corporationDetailsFields()"\r
             (visiblyValidChange)="onSectionValidChange('corpDetails', $event)"\r
           />\r
 \r
@@ -88396,7 +88422,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function BritishColumbiaComponent_Conditional_1_Conditional_0_Template(rf, ctx) {
     if (rf & 1) {
       const _r1 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "british-columbia-change-of-directors-delta-form", 3);
+      \u0275\u0275elementStart(0, "british-columbia-change-of-directors-delta-form", 2);
       \u0275\u0275listener("validate", function BritishColumbiaComponent_Conditional_1_Conditional_0_Template_british_columbia_change_of_directors_delta_form_validate_0_listener() {
         \u0275\u0275restoreView(_r1);
         const ctx_r1 = \u0275\u0275nextContext(2);
@@ -88421,7 +88447,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function BritishColumbiaComponent_Conditional_1_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
       const _r4 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "british-columbia-change-of-directors-preview-form", 4);
+      \u0275\u0275elementStart(0, "british-columbia-change-of-directors-preview-form", 3);
       \u0275\u0275listener("close", function BritishColumbiaComponent_Conditional_1_Conditional_1_Template_british_columbia_change_of_directors_preview_form_close_0_listener() {
         \u0275\u0275restoreView(_r4);
         const ctx_r1 = \u0275\u0275nextContext(2);
@@ -88429,7 +88455,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       })("file", function BritishColumbiaComponent_Conditional_1_Conditional_1_Template_british_columbia_change_of_directors_preview_form_file_0_listener() {
         \u0275\u0275restoreView(_r4);
         const ctx_r1 = \u0275\u0275nextContext(2);
-        return \u0275\u0275resetView(ctx_r1.nextStep.emit());
+        return \u0275\u0275resetView(ctx_r1.onChangeOfDirectorsSubmit());
       });
       \u0275\u0275elementEnd();
     }
@@ -88439,57 +88465,31 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275property("task", taskData_r3)("form", ctx_r1.previewForm())("actionsDisabled", ctx_r1.actionsDisabled())("errors", ctx_r1.errors());
     }
   }
-  function BritishColumbiaComponent_Conditional_1_Conditional_2_Template(rf, ctx) {
-    if (rf & 1) {
-      const _r5 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "terms-and-conditions", 5);
-      \u0275\u0275listener("prev", function BritishColumbiaComponent_Conditional_1_Conditional_2_Template_terms_and_conditions_prev_0_listener() {
-        \u0275\u0275restoreView(_r5);
-        const ctx_r1 = \u0275\u0275nextContext(2);
-        return \u0275\u0275resetView(ctx_r1.prevStep.emit());
-      })("close", function BritishColumbiaComponent_Conditional_1_Conditional_2_Template_terms_and_conditions_close_0_listener() {
-        \u0275\u0275restoreView(_r5);
-        const ctx_r1 = \u0275\u0275nextContext(2);
-        return \u0275\u0275resetView(ctx_r1.close.emit());
-      })("confirm", function BritishColumbiaComponent_Conditional_1_Conditional_2_Template_terms_and_conditions_confirm_0_listener($event) {
-        \u0275\u0275restoreView(_r5);
-        const ctx_r1 = \u0275\u0275nextContext(2);
-        return \u0275\u0275resetView(ctx_r1.onChangeOfDirectorsSubmit($event));
-      });
-      \u0275\u0275elementEnd();
-    }
-    if (rf & 2) {
-      const ctx_r1 = \u0275\u0275nextContext(2);
-      \u0275\u0275property("errors", ctx_r1.errors());
-    }
-  }
   function BritishColumbiaComponent_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275template(0, BritishColumbiaComponent_Conditional_1_Conditional_0_Template, 1, 5, "british-columbia-change-of-directors-delta-form", 0)(1, BritishColumbiaComponent_Conditional_1_Conditional_1_Template, 1, 4, "british-columbia-change-of-directors-preview-form", 1)(2, BritishColumbiaComponent_Conditional_1_Conditional_2_Template, 1, 1, "terms-and-conditions", 2);
+      \u0275\u0275template(0, BritishColumbiaComponent_Conditional_1_Conditional_0_Template, 1, 5, "british-columbia-change-of-directors-delta-form", 0)(1, BritishColumbiaComponent_Conditional_1_Conditional_1_Template, 1, 4, "british-columbia-change-of-directors-preview-form", 1);
     }
     if (rf & 2) {
       const ctx_r1 = \u0275\u0275nextContext();
       \u0275\u0275conditional(ctx_r1.activeStep() === ctx_r1.steps.Validate ? 0 : -1);
       \u0275\u0275advance();
       \u0275\u0275conditional(ctx_r1.activeStep() === ctx_r1.steps.FilingPreview ? 1 : -1);
-      \u0275\u0275advance();
-      \u0275\u0275conditional(ctx_r1.activeStep() === ctx_r1.steps.TermsAndConditions ? 2 : -1);
     }
   }
   function BritishColumbiaComponent_Conditional_2_Conditional_0_Template(rf, ctx) {
     if (rf & 1) {
-      const _r6 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "british-columbia-incorporation-delta-form", 8);
+      const _r5 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "british-columbia-incorporation-delta-form", 6);
       \u0275\u0275listener("validate", function BritishColumbiaComponent_Conditional_2_Conditional_0_Template_british_columbia_incorporation_delta_form_validate_0_listener() {
-        \u0275\u0275restoreView(_r6);
+        \u0275\u0275restoreView(_r5);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.onFormationValidate());
       })("close", function BritishColumbiaComponent_Conditional_2_Conditional_0_Template_british_columbia_incorporation_delta_form_close_0_listener() {
-        \u0275\u0275restoreView(_r6);
+        \u0275\u0275restoreView(_r5);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.onClose());
       })("save", function BritishColumbiaComponent_Conditional_2_Conditional_0_Template_british_columbia_incorporation_delta_form_save_0_listener() {
-        \u0275\u0275restoreView(_r6);
+        \u0275\u0275restoreView(_r5);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.onFormationSave());
       });
@@ -88503,14 +88503,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaComponent_Conditional_2_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
-      const _r7 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "british-columbia-incorporation-preview-form", 9);
+      const _r6 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "british-columbia-incorporation-preview-form", 7);
       \u0275\u0275listener("next", function BritishColumbiaComponent_Conditional_2_Conditional_1_Template_british_columbia_incorporation_preview_form_next_0_listener() {
-        \u0275\u0275restoreView(_r7);
+        \u0275\u0275restoreView(_r6);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.onFormationSubmit());
       })("close", function BritishColumbiaComponent_Conditional_2_Conditional_1_Template_british_columbia_incorporation_preview_form_close_0_listener() {
-        \u0275\u0275restoreView(_r7);
+        \u0275\u0275restoreView(_r6);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.close.emit());
       });
@@ -88524,7 +88524,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaComponent_Conditional_2_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275template(0, BritishColumbiaComponent_Conditional_2_Conditional_0_Template, 1, 5, "british-columbia-incorporation-delta-form", 6)(1, BritishColumbiaComponent_Conditional_2_Conditional_1_Template, 1, 4, "british-columbia-incorporation-preview-form", 7);
+      \u0275\u0275template(0, BritishColumbiaComponent_Conditional_2_Conditional_0_Template, 1, 5, "british-columbia-incorporation-delta-form", 4)(1, BritishColumbiaComponent_Conditional_2_Conditional_1_Template, 1, 4, "british-columbia-incorporation-preview-form", 5);
     }
     if (rf & 2) {
       const ctx_r1 = \u0275\u0275nextContext();
@@ -88535,18 +88535,18 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaComponent_Conditional_3_Conditional_0_Template(rf, ctx) {
     if (rf & 1) {
-      const _r8 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "british-columbia-change-of-office-addresses-delta-form", 3);
+      const _r7 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "british-columbia-change-of-office-addresses-delta-form", 2);
       \u0275\u0275listener("validate", function BritishColumbiaComponent_Conditional_3_Conditional_0_Template_british_columbia_change_of_office_addresses_delta_form_validate_0_listener() {
-        \u0275\u0275restoreView(_r8);
+        \u0275\u0275restoreView(_r7);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.onChangeOfOfficeAddressesValidate());
       })("close", function BritishColumbiaComponent_Conditional_3_Conditional_0_Template_british_columbia_change_of_office_addresses_delta_form_close_0_listener() {
-        \u0275\u0275restoreView(_r8);
+        \u0275\u0275restoreView(_r7);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.onClose());
       })("save", function BritishColumbiaComponent_Conditional_3_Conditional_0_Template_british_columbia_change_of_office_addresses_delta_form_save_0_listener() {
-        \u0275\u0275restoreView(_r8);
+        \u0275\u0275restoreView(_r7);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.onChangeOfOfficeAddressesSave());
       });
@@ -88560,14 +88560,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaComponent_Conditional_3_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
-      const _r9 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "british-columbia-change-of-office-addresses-preview-form", 4);
+      const _r8 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "british-columbia-change-of-office-addresses-preview-form", 3);
       \u0275\u0275listener("close", function BritishColumbiaComponent_Conditional_3_Conditional_1_Template_british_columbia_change_of_office_addresses_preview_form_close_0_listener() {
-        \u0275\u0275restoreView(_r9);
+        \u0275\u0275restoreView(_r8);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.close.emit());
       })("file", function BritishColumbiaComponent_Conditional_3_Conditional_1_Template_british_columbia_change_of_office_addresses_preview_form_file_0_listener() {
-        \u0275\u0275restoreView(_r9);
+        \u0275\u0275restoreView(_r8);
         const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.onChangeOfOfficeAddressesFile());
       });
@@ -88606,7 +88606,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_delta_state_service();
       init_common_utils();
       init_confirm_modal_component();
-      init_terms_and_conditions_component();
       init_change_of_directors_delta_form_component();
       init_change_of_directors_preview_form_component();
       init_british_columbia_incorporation_delta_form_component();
@@ -88621,6 +88620,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         isNote = input(false);
         actionsDisabled = input(false);
         errors = input([]);
+        currentDataExtract = input();
         close = output();
         codValidate = output();
         saveCodDeltaData = output();
@@ -88629,6 +88629,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         formationSubmit = output();
         saveFormationDeltaData = output();
         nextStep = output();
+        recheckStep = output();
         prevStep = output();
         // Change of Office Addresses outputs
         coaValidate = output();
@@ -88647,7 +88648,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           effect(() => {
             const task = this.task();
             if (task && isChangeOfPrincipalsTask(task)) {
-              this.deltaForm.set(new FormGroup(BritishColumbiaChangeOfDirectorsFormHelper.generateConfig(task, (key) => this.translate.instant(key))));
+              this.deltaForm.set(new FormGroup(BritishColumbiaChangeOfDirectorsFormHelper.generateConfig(task, (key) => this.translate.instant(key), this.currentDataExtract())));
               this.deltaState.setBCChangeOfDirectorsInitialDelta(this.generateChangeOfDirectorsDeltaData());
             }
             if (task && isFormationTask2(task)) {
@@ -88666,7 +88667,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               return;
             }
             if (isChangeOfPrincipalsTask(task)) {
-              const form = new FormGroup(BritishColumbiaChangeOfDirectorsFormHelper.generateConfig(task, (key) => this.translate.instant(key)));
+              const form = new FormGroup(BritishColumbiaChangeOfDirectorsFormHelper.generateConfig(task, (key) => this.translate.instant(key), this.currentDataExtract()));
               form.disable();
               this.previewForm.set(form);
               if (untracked2(() => this.activeStep()) === Step.Validate) {
@@ -88685,8 +88686,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               const form = new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key)));
               form.disable();
               this.previewForm.set(form);
-              if (untracked2(() => this.activeStep()) === Step.Validate) {
+              const step = untracked2(() => this.activeStep());
+              if (step === Step.Validate) {
                 this.nextStep.emit();
+              } else if (step === Step.FilingPreview) {
+                this.recheckStep.emit();
               }
             }
           });
@@ -88748,11 +88752,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           this.deltaState.setBCChangeOfDirectorsInitialDelta(delta);
           this.saveCodDeltaData.emit(delta);
         }
-        onChangeOfDirectorsSubmit(termsAndConditions) {
-          this.codSubmit.emit(__spreadProps(__spreadValues({}, this.generateChangeOfDirectorsDeltaData()), {
-            signatoryFirstName: termsAndConditions.firstName,
-            signatoryLastName: termsAndConditions.lastName
-          }));
+        onChangeOfDirectorsSubmit() {
+          this.codSubmit.emit();
         }
         onFormationValidate() {
           markFormGroupTouched(this.deltaForm());
@@ -88773,6 +88774,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const filing = formData[BCChangeOfDirectorsFormGroups.FilingDetails];
           const notification = formData[BCChangeOfDirectorsFormGroups.Notification];
           const reminder = formData[BCChangeOfDirectorsFormGroups.AnnualReportReminder];
+          const directors = formData[BCChangeOfDirectorsFormGroups.Directors] ?? [];
           const addedOrDeleted = Boolean(filing?.[c.DirectorsAddedOrDeleted]);
           const notifyByMail = notification?.[c.NotificationMethod] === BCNotificationMethod.Mail;
           return {
@@ -88788,10 +88790,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               method: notification?.[c.NotificationMethod] ?? null,
               email: notifyByMail ? void 0 : notification?.[c.NotificationEmail] ?? null
             },
-            annualReportReminder: reminder?.[c.AnnualReportReminder] ?? null
+            annualReportReminder: reminder?.[c.AnnualReportReminder] ?? null,
+            directorChanges: {
+              addIds: directors.filter((d) => d[c.AffiliationType] === "Add").map((d) => d[c.Id]).filter(Boolean),
+              editIds: directors.filter((d) => d[c.AffiliationType] === "Update").map((d) => d[c.Id]).filter(Boolean),
+              ceaseIds: directors.filter((d) => d[c.AffiliationType] === "Cease").map((d) => d[c.Id]).filter(Boolean)
+            }
           };
         }
-        generateFormationDeltaData(termsAndConditions) {
+        generateFormationDeltaData() {
           const formData = this.deltaForm().getRawValue();
           const refNumbers = formData[BCFormationFormGroups.ReferenceNumbers];
           const corpDetails = formData[BCFormationFormGroups.CorporationDetails];
@@ -88865,19 +88872,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function BritishColumbiaComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _BritishColumbiaComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaComponent, selectors: [["british-columbia"]], inputs: { task: [1, "task"], currentUser: [1, "currentUser"], activeStep: [1, "activeStep"], isNote: [1, "isNote"], actionsDisabled: [1, "actionsDisabled"], errors: [1, "errors"] }, outputs: { close: "close", codValidate: "codValidate", saveCodDeltaData: "saveCodDeltaData", codSubmit: "codSubmit", formationValidate: "formationValidate", formationSubmit: "formationSubmit", saveFormationDeltaData: "saveFormationDeltaData", nextStep: "nextStep", prevStep: "prevStep", coaValidate: "coaValidate", saveCoaDeltaData: "saveCoaDeltaData", coaSubmit: "coaSubmit" }, decls: 4, vars: 4, consts: [[3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"], [3, "prev", "close", "confirm", "errors"], [3, "task", "errors", "isNote", "actionsDisabled", "form"], [3, "task", "form", "errors", "actionsDisabled"], [3, "validate", "close", "save", "task", "errors", "isNote", "actionsDisabled", "form"], [3, "next", "close", "task", "form", "errors", "actionsDisabled"]], template: function BritishColumbiaComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaComponent, selectors: [["british-columbia"]], inputs: { task: [1, "task"], currentUser: [1, "currentUser"], activeStep: [1, "activeStep"], isNote: [1, "isNote"], actionsDisabled: [1, "actionsDisabled"], errors: [1, "errors"], currentDataExtract: [1, "currentDataExtract"] }, outputs: { close: "close", codValidate: "codValidate", saveCodDeltaData: "saveCodDeltaData", codSubmit: "codSubmit", formationValidate: "formationValidate", formationSubmit: "formationSubmit", saveFormationDeltaData: "saveFormationDeltaData", nextStep: "nextStep", recheckStep: "recheckStep", prevStep: "prevStep", coaValidate: "coaValidate", saveCoaDeltaData: "saveCoaDeltaData", coaSubmit: "coaSubmit" }, decls: 4, vars: 4, consts: [[3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"], [3, "task", "errors", "isNote", "actionsDisabled", "form"], [3, "task", "form", "errors", "actionsDisabled"], [3, "validate", "close", "save", "task", "errors", "isNote", "actionsDisabled", "form"], [3, "next", "close", "task", "form", "errors", "actionsDisabled"]], template: function BritishColumbiaComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275declareLet(0);
-            \u0275\u0275template(1, BritishColumbiaComponent_Conditional_1_Template, 3, 3)(2, BritishColumbiaComponent_Conditional_2_Template, 2, 2)(3, BritishColumbiaComponent_Conditional_3_Template, 2, 2);
+            \u0275\u0275template(1, BritishColumbiaComponent_Conditional_1_Template, 2, 2)(2, BritishColumbiaComponent_Conditional_2_Template, 2, 2)(3, BritishColumbiaComponent_Conditional_3_Template, 2, 2);
           }
           if (rf & 2) {
-            const taskData_r10 = \u0275\u0275storeLet(ctx.task());
+            const taskData_r9 = \u0275\u0275storeLet(ctx.task());
             \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.isChangeOfDirectorsTask(taskData_r10) ? 1 : -1);
+            \u0275\u0275conditional(ctx.isChangeOfDirectorsTask(taskData_r9) ? 1 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.isFormationTask(taskData_r10) ? 2 : -1);
+            \u0275\u0275conditional(ctx.isFormationTask(taskData_r9) ? 2 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.isChangeOfOfficeAddressesTask(taskData_r10) ? 3 : -1);
+            \u0275\u0275conditional(ctx.isChangeOfOfficeAddressesTask(taskData_r9) ? 3 : -1);
           }
         }, dependencies: [
           BritishColumbiaChangeOfDirectorsDeltaFormComponent,
@@ -88885,8 +88892,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           BritishColumbiaIncorporationDeltaFormComponent,
           BritishColumbiaIncorporationPreviewFormComponent,
           BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent,
-          BritishColumbiaChangeOfOfficeAddressesPreviewFormComponent,
-          TermsAndConditionsComponent
+          BritishColumbiaChangeOfOfficeAddressesPreviewFormComponent
         ], styles: ["\n\n[_nghost-%COMP%] {\n  display: contents;\n}\n/*# sourceMappingURL=british-columbia.component.css.map */"], changeDetection: 0 });
       };
       (() => {
@@ -88898,13 +88904,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             BritishColumbiaIncorporationDeltaFormComponent,
             BritishColumbiaIncorporationPreviewFormComponent,
             BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent,
-            BritishColumbiaChangeOfOfficeAddressesPreviewFormComponent,
-            TermsAndConditionsComponent
-          ], template: '@let taskData = this.task();\r\n\r\n@if (isChangeOfDirectorsTask(taskData)) {\r\n  @if (activeStep() === steps.Validate) {\r\n    <british-columbia-change-of-directors-delta-form\r\n      [task]="taskData"\r\n      [form]="deltaForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [errors]="errors()"\r\n      [isNote]="isNote()"\r\n      (validate)="onChangeOfDirectorsValidate()"\r\n      (close)="onClose()"\r\n      (save)="onChangeOfDirectorsSave()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.FilingPreview) {\r\n    <british-columbia-change-of-directors-preview-form\r\n      [task]="taskData"\r\n      [form]="previewForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [errors]="errors()"\r\n      (close)="close.emit()"\r\n      (file)="nextStep.emit()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.TermsAndConditions) {\r\n    <terms-and-conditions\r\n      [errors]="errors()"\r\n      (prev)="prevStep.emit()"\r\n      (close)="close.emit()"\r\n      (confirm)="onChangeOfDirectorsSubmit($event)"\r\n    />\r\n  }\r\n}\r\n\r\n@if (isFormationTask(taskData)) {\r\n  @if (activeStep() === steps.Validate) {\r\n    <british-columbia-incorporation-delta-form\r\n      [task]="taskData"\r\n      [errors]="errors()"\r\n      [isNote]="isNote()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [form]="deltaForm()"\r\n      (validate)="onFormationValidate()"\r\n      (close)="onClose()"\r\n      (save)="onFormationSave()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.FilingPreview) {\r\n    <british-columbia-incorporation-preview-form\r\n      [task]="taskData"\r\n      [form]="previewForm()"\r\n      [errors]="errors()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      (next)="onFormationSubmit()"\r\n      (close)="close.emit()"\r\n    />\r\n  }\r\n}\r\n\r\n@if (isChangeOfOfficeAddressesTask(taskData)) {\r\n  @if (activeStep() === steps.Validate) {\r\n    <british-columbia-change-of-office-addresses-delta-form\r\n      [task]="taskData"\r\n      [form]="deltaForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [errors]="errors()"\r\n      [isNote]="isNote()"\r\n      (validate)="onChangeOfOfficeAddressesValidate()"\r\n      (close)="onClose()"\r\n      (save)="onChangeOfOfficeAddressesSave()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.FilingPreview) {\r\n    <british-columbia-change-of-office-addresses-preview-form\r\n      [task]="taskData"\r\n      [form]="previewForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [errors]="errors()"\r\n      (close)="close.emit()"\r\n      (file)="onChangeOfOfficeAddressesFile()"\r\n    />\r\n  }\r\n}\r\n', styles: ["/* src/app/components/british-columbia/british-columbia.component.scss */\n:host {\n  display: contents;\n}\n/*# sourceMappingURL=british-columbia.component.css.map */\n"] }]
+            BritishColumbiaChangeOfOfficeAddressesPreviewFormComponent
+          ], template: '@let taskData = this.task();\r\n\r\n@if (isChangeOfDirectorsTask(taskData)) {\r\n  @if (activeStep() === steps.Validate) {\r\n    <british-columbia-change-of-directors-delta-form\r\n      [task]="taskData"\r\n      [form]="deltaForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [errors]="errors()"\r\n      [isNote]="isNote()"\r\n      (validate)="onChangeOfDirectorsValidate()"\r\n      (close)="onClose()"\r\n      (save)="onChangeOfDirectorsSave()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.FilingPreview) {\r\n    <british-columbia-change-of-directors-preview-form\r\n      [task]="taskData"\r\n      [form]="previewForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [errors]="errors()"\r\n      (close)="close.emit()"\r\n      (file)="onChangeOfDirectorsSubmit()"\r\n    />\r\n  }\r\n}\r\n\r\n@if (isFormationTask(taskData)) {\r\n  @if (activeStep() === steps.Validate) {\r\n    <british-columbia-incorporation-delta-form\r\n      [task]="taskData"\r\n      [errors]="errors()"\r\n      [isNote]="isNote()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [form]="deltaForm()"\r\n      (validate)="onFormationValidate()"\r\n      (close)="onClose()"\r\n      (save)="onFormationSave()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.FilingPreview) {\r\n    <british-columbia-incorporation-preview-form\r\n      [task]="taskData"\r\n      [form]="previewForm()"\r\n      [errors]="errors()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      (next)="onFormationSubmit()"\r\n      (close)="close.emit()"\r\n    />\r\n  }\r\n}\r\n\r\n@if (isChangeOfOfficeAddressesTask(taskData)) {\r\n  @if (activeStep() === steps.Validate) {\r\n    <british-columbia-change-of-office-addresses-delta-form\r\n      [task]="taskData"\r\n      [form]="deltaForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [errors]="errors()"\r\n      [isNote]="isNote()"\r\n      (validate)="onChangeOfOfficeAddressesValidate()"\r\n      (close)="onClose()"\r\n      (save)="onChangeOfOfficeAddressesSave()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.FilingPreview) {\r\n    <british-columbia-change-of-office-addresses-preview-form\r\n      [task]="taskData"\r\n      [form]="previewForm()"\r\n      [actionsDisabled]="actionsDisabled()"\r\n      [errors]="errors()"\r\n      (close)="close.emit()"\r\n      (file)="onChangeOfOfficeAddressesFile()"\r\n    />\r\n  }\r\n}\r\n', styles: ["/* src/app/components/british-columbia/british-columbia.component.scss */\n:host {\n  display: contents;\n}\n/*# sourceMappingURL=british-columbia.component.css.map */\n"] }]
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaComponent, { className: "BritishColumbiaComponent", filePath: "src/app/components/british-columbia/british-columbia.component.ts", lineNumber: 75 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaComponent, { className: "BritishColumbiaComponent", filePath: "src/app/components/british-columbia/british-columbia.component.ts", lineNumber: 72 });
       })();
     }
   });
@@ -90275,7 +90280,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const isNumberedCompany = ext._numbered_company;
           const config2 = {};
           const corporateName = delta?.corporateName;
-          const directors = (task.entity.affiliations ?? []).filter((a) => isPrincipalAffiliation2(a) && a.role?.role_name === "Director");
+          const directors = getIndividualDirectors(task.entity.affiliations ?? []);
           if (directors.length) {
             const deltaDirectorsMap = delta?.directors;
             const directorGroups = directors.map((director) => {
@@ -90856,7 +90861,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           });
           effect(() => {
-            const directors = (this.task()?.entity.affiliations ?? []).filter((a) => isPrincipalAffiliation2(a) && a.role?.role_name === "Director") ?? [];
+            const directors = getIndividualDirectors(this.task()?.entity.affiliations ?? []);
             const directorOptions = directors.map((director) => ({ label: getPersonName(director.participant), value: director.participant._id }));
             this.federalFormationFormInviteDirectorsToBeManagersControl = generateFederalFormationFormInviteDirectorsToBeManagersControl(directorOptions);
           });
@@ -91031,11 +91036,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           exclusionReason.updateValueAndValidity({ emitEvent: false });
         }
         getSelectableIndividualsWithSignificantControl(affiliations) {
-          const significantControlAffiliations = getIndividualWithSignificantControl(affiliations);
-          if (significantControlAffiliations.length) {
-            return significantControlAffiliations;
-          }
-          return affiliations.filter((a) => isPrincipalAffiliation2(a) && a._participant.participant_type === "person" && !["Contact", "Agent", "Responsible"].includes(a.role?.role_name ?? ""));
+          return getIndividualWithSignificantControl(affiliations);
         }
         getFormArray(key) {
           return this.form().get(key);
@@ -91384,7 +91385,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }], () => [], null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FederalIncorporationFormComponent, { className: "FederalIncorporationFormComponent", filePath: "src/app/components/federal/incorporation/federal-incorporation-form/federal-incorporation-form.component.ts", lineNumber: 75 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FederalIncorporationFormComponent, { className: "FederalIncorporationFormComponent", filePath: "src/app/components/federal/incorporation/federal-incorporation-form/federal-incorporation-form.component.ts", lineNumber: 76 });
       })();
     }
   });
@@ -93377,7 +93378,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                   searchOrFilingType,
                   serviceOrderId,
                   validatedOn: /* @__PURE__ */ new Date(),
-                  provider: "obr",
+                  provider: getFilingProvider(signature.task),
                   draftPdf: payload.ReceiptPdf,
                   documentName: "Incorporation Receipt",
                   documentType: "pdf"
@@ -93928,7 +93929,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const mailingAddressUid = deltaData.registeredOfficeAddress?.mailingAddressForCorrespondenceUid;
     const mailingAddress = useDifferentMailingAddress ? task.entity.addresses.find((address) => address.uid === mailingAddressUid) : void 0;
     const registeredOfficeAddress = findRegisteredOfficeAddress(task);
-    const directors = task.entity.affiliations.filter((aff) => aff.kind === "PrincipalAffiliationV3" && aff.role.role_name === DirectorRole.DIRECTOR);
+    const directors = getIndividualDirectors(task.entity.affiliations);
     const incorporators = task._ext._incorporators ?? [];
     const requestedDate = task._ext._future_filing_date ? new Date(task._ext._future_filing_date).toISOString().split("T")[0] : (/* @__PURE__ */ new Date()).toISOString().split("T")[0];
     const officialBusinessEmail = registeredOfficeAddress?.communications?.find((c) => c.type === "Business Email")?.value;
@@ -94240,7 +94241,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   var init_federal_formation_mapper = __esm({
     "src/app/helpers/mappers/federal-formation.mapper.ts"() {
-      init_ECoreInterfaces();
       init_transform_utils();
       init_address_utils();
       init_common_utils();
@@ -95125,9 +95125,55 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_core();
       BritishColumbiaChangeOfDirectorsService = class _BritishColumbiaChangeOfDirectorsService {
         config;
+        currentDataExtract;
         setConfig(config2) {
           this.config = config2;
         }
+        /**
+         * Orders the corporation's current data extract and waits until it is ready, returning the
+         * `currentDataServiceOrderId` that Validate Filing needs. The registry bot can take a while,
+         * so the extract is polled every `intervalMs` for up to `maxAttempts` times.
+         */
+        ensureCurrentDataExtract(_0, _1) {
+          return __async(this, arguments, function* (signature, order, opts = {}, { intervalMs = 3e3, maxAttempts = 40 } = {}) {
+            ensureAuthInputs(signature);
+            const fetchFn = opts.fetchImpl ?? fetch;
+            const dataExtractUrl = `${this.getOnbisOrigin()}/filings/ca/bc/data-extract`;
+            const orderResp = yield fetchWithJwtRetry(signature, () => postJson(fetchFn, signature.proxyApiUrl, signature.jwtToken, order, __spreadValues({
+              "x-target-url": `${dataExtractUrl}/order`
+            }, opts.headers ?? {})));
+            const ordered = yield this.readJson(orderResp, "BC current data extract order");
+            const orderId = ordered.currentDataServiceOrderId;
+            if (!orderResp.ok || !orderId || ordered.status === "failed") {
+              throw buildGenericError(orderResp.status, "BC current data extract order failed", __spreadProps(__spreadValues({}, ordered), {
+                errors: ordered.errors?.length ? ordered.errors : (ordered.additionalInformation ?? []).map((message) => ({ message }))
+              }));
+            }
+            for (let attempt = 0; attempt < maxAttempts; attempt++) {
+              const extractResp = yield fetchWithJwtRetry(signature, () => fetchFn(signature.proxyApiUrl, {
+                method: "GET",
+                headers: __spreadValues({
+                  Authorization: `Bearer ${signature.jwtToken}`,
+                  "x-target-url": `${dataExtractUrl}/${encodeURIComponent(orderId)}`
+                }, opts.headers ?? {})
+              }));
+              const extract = yield this.readJson(extractResp, "BC current data extract");
+              if (extractResp.ok && extract.status === "success") {
+                this.currentDataExtract = extract;
+                return orderId;
+              }
+              if (!extractResp.ok || extract.status === "failed" || extract.status === "sourceUnavailable") {
+                const reasons = extract.additionalInformation ?? [];
+                throw new Error(`BC current data extract ${extract.status ?? "failed"} (HTTP ${extractResp.status})${reasons.length ? `: ${reasons.join(" | ")}` : "."}`);
+              }
+              yield new Promise((resolve) => setTimeout(resolve, intervalMs));
+            }
+            throw new Error("BC current data extract is still processing. Please try again in a moment.");
+          });
+        }
+        getCurrentDataExtract() {
+          return this.currentDataExtract;
+        }
         validate(_0, _1) {
           return __async(this, arguments, function* (signature, requestBody, opts = {}) {
             ensureAuthInputs(signature);
@@ -95145,8 +95191,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               throw err2;
             }
             const payload = unwrapRequestResults(parsed.value);
-            if (resp.ok && !payload.Errors?.length) {
-              return payload;
+            if (resp.ok && !payload.Errors?.length && !payload["errors"]?.length) {
+              return __spreadProps(__spreadValues({}, payload), {
+                Status: payload.Status ?? payload["status"],
+                ServiceOrderId: payload.ServiceOrderId ?? payload["serviceOrderId"],
+                Draft: payload.Draft ?? payload["draft"]
+              });
             }
             const err = buildValidationError(resp.status, payload);
             err.validateResult = payload;
@@ -95206,6 +95256,16 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             throw err;
           });
         }
+        readJson(resp, what) {
+          return __async(this, null, function* () {
+            const raw = yield resp.text();
+            const parsed = tryParseJson(raw);
+            if (!parsed.ok) {
+              throw new Error(`${what} returned ${resp.status} ${resp.statusText}: ${raw || "(empty response)"}`);
+            }
+            return unwrapRequestResults(parsed.value);
+          });
+        }
         getOnbisOrigin() {
           const filingUrl = this.config?.BCFiling;
           if (!filingUrl) {
@@ -95230,7 +95290,30 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/helpers/mappers/british-columbia-change-of-directors.mapper.ts
-  function buildBritishColumbiaChangeOfDirectorsValidationRequest(task, deltaData) {
+  function getBritishColumbiaAccessCode(task, password) {
+    return password?.trim() || task.entity._profile.registry_id?.trim() || "";
+  }
+  function buildBritishColumbiaDataExtractOrder(task, password) {
+    const incorporationDate = toYyyyMmDd(task.entity._compliance.incorporation_date) ?? "";
+    const request = {
+      corporationNumber: task.entity._profile.corp_number?.trim() ?? "",
+      accessCodeOrPassword: getBritishColumbiaAccessCode(task, password),
+      incorporationDate: /^\d{4}-\d{2}-\d{2}$/.test(incorporationDate) ? incorporationDate : "",
+      filingType: "changeOfDirectorsFiling"
+    };
+    const issues = [];
+    if (!request.corporationNumber) {
+      issues.push("The corporation number is missing on the entity.");
+    }
+    if (!/^[A-Za-z0-9]+$/.test(request.accessCodeOrPassword)) {
+      issues.push("The company's BC Online access code or password is missing or contains characters other than letters and numbers.");
+    }
+    if (!request.incorporationDate) {
+      issues.push("The incorporation date is missing on the entity.");
+    }
+    return { request, issues };
+  }
+  function buildBritishColumbiaChangeOfDirectorsValidationRequest(task, deltaData, currentDataServiceOrderId, currentDataExtract) {
     const source = task.changeDirectors ?? task.deltaData?.changeDirectors ?? task.deltaData?.validatedData?.ChangeDirectors ?? task.deltaData?.validatedData?.filing;
     const incomingDirectors = (task.incomingAffiliations ?? []).filter(isDirectorAffiliation);
     const outgoingDirectors = (task.outgoingAffiliations ?? []).filter(isDirectorAffiliation);
@@ -95238,73 +95321,107 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     const ceasedDirectors = [...source?.CeasedDirectors ?? [], ...source?.CeaseDirector ?? [], ...source?.ceaseDirectors ?? []];
     const editedDirectors = [...source?.EditedDirectors ?? [], ...source?.EditDirector ?? [], ...source?.editDirectors ?? []];
     const companyEmail = findCompanyEmail(task);
-    const serviceOrderId = deltaData.serviceOrderId;
-    return __spreadValues({
+    const byId = new Map([
+      ...incomingDirectors,
+      ...outgoingDirectors
+    ].map((affiliation) => [String(affiliation._id), affiliation]));
+    const selected = deltaData.directorChanges;
+    const addSource = selected ? selected.addIds.map((id) => byId.get(String(id))).filter(Boolean) : incomingDirectors.length ? incomingDirectors : addedDirectors;
+    const editSource = selected ? selected.editIds.map((id) => byId.get(String(id))).filter(Boolean) : editedDirectors;
+    const ceaseSource = selected ? selected.ceaseIds.map((id) => byId.get(String(id))).filter(Boolean) : outgoingDirectors.length ? outgoingDirectors : ceasedDirectors;
+    const addDirectors = addSource.map((affiliation) => buildDirector(affiliation));
+    const ceaseDirectors = ceaseSource.map((affiliation) => buildCeasedDirector(affiliation));
+    const editDirectors = editSource.map((director) => {
+      const directorNumber = findDirectorNumber(director, currentDataExtract);
+      return directorNumber === void 0 ? null : buildDirector(director, directorNumber);
+    }).filter((director) => director !== null);
+    const effectiveDate = toYyyyMmDd(deltaData.filingDetails.changeDate);
+    return {
       filingType: "changeOfDirectorsFiling",
-      filing: {
+      currentDataServiceOrderId,
+      filing: __spreadProps(__spreadValues({
+        corporationNumber: task.entity._profile.corp_number ?? "",
+        accessCodeOrPassword: getBritishColumbiaAccessCode(task),
         reference: deltaData.referenceNumbers.referenceNumber ?? null,
-        docket: deltaData.referenceNumbers.docketNumber ?? null,
-        addOrDeleteDirectors: deltaData.filingDetails.directorsAddedOrDeleted,
-        effectiveDate: toYyyyMmDd(deltaData.filingDetails.changeDate) ?? toYyyyMmDd(/* @__PURE__ */ new Date()),
-        addDirectors: (incomingDirectors.length ? incomingDirectors : addedDirectors).map((affiliation) => buildDirector(affiliation)),
-        ceaseDirectors: (outgoingDirectors.length ? outgoingDirectors : ceasedDirectors).map((affiliation) => buildDirector(affiliation)),
-        editDirectors: editedDirectors.length ? editedDirectors.map((director) => buildDirector(director)) : [],
+        docket: deltaData.referenceNumbers.docketNumber ?? null
+      }, (addDirectors.length || ceaseDirectors.length) && effectiveDate ? { effectiveDate } : {}), {
+        addDirectors,
+        ceaseDirectors,
+        editDirectors,
         companyEmail,
         isAnnualReportReminderRequired: deltaData.annualReportReminder === BCAnnualReportReminder.Yes
-      }
-    }, serviceOrderId ? { ServiceOrderId: serviceOrderId } : {});
+      })
+    };
   }
   function isDirectorAffiliation(affiliation) {
     return isPrincipalAffiliation2(affiliation) && affiliation.role?.role_name === "Director";
   }
-  function buildDirector(affiliation) {
+  function buildCeasedDirector(affiliation) {
+    const _a = buildDirector(affiliation), { isDeliveryAddressSameAsMailing: _omitted } = _a, director = __objRest(_a, ["isDeliveryAddressSameAsMailing"]);
+    return __spreadProps(__spreadValues({}, director), { deliveryAddress: director.deliveryAddress ?? director.mailingAddress });
+  }
+  function buildDirector(affiliation, directorNumber) {
     if (affiliation?.PersonName || affiliation?.personName || affiliation?.firstName || affiliation?.FirstName) {
       const name = affiliation.PersonName ?? affiliation.personName ?? affiliation;
-      return {
+      return __spreadProps(__spreadValues({}, directorNumber === void 0 ? {} : { directorNumber }), {
         firstName: name.FirstName ?? name.firstName ?? "",
         middleName: name.MiddleName ?? name.middleName ?? "",
         lastName: name.LastName ?? name.lastName ?? "",
         mailingAddress: affiliation.mailingAddress ?? affiliation.MailingAddress,
-        deliveryAddress: affiliation.deliveryAddress ?? affiliation.DeliveryAddress,
+        deliveryAddress: affiliation.isDeliveryAddressSameAsMailing ? void 0 : affiliation.deliveryAddress ?? affiliation.DeliveryAddress,
         isDeliveryAddressSameAsMailing: affiliation.isDeliveryAddressSameAsMailing
-      };
+      });
     }
     const profile = affiliation.participant?._profile ?? {};
     const addresses = getAffiliationAddresses(affiliation);
     const mailingAddress = mapAddress4(BritishColumbiaFormationFormHelper.pickAddress(addresses, "Mailing"));
     const deliveryAddress = mapAddress4(BritishColumbiaFormationFormHelper.pickAddress(addresses, "Delivery"));
-    return {
+    const isSameAsMailing = isDeliveryAddressSameAsMailing(addresses);
+    return __spreadProps(__spreadValues({}, directorNumber === void 0 ? {} : { directorNumber }), {
       firstName: profile.firstName ?? "",
       middleName: profile.middleName ?? "",
       lastName: profile.lastName ?? "",
       mailingAddress,
-      deliveryAddress,
-      isDeliveryAddressSameAsMailing: isDeliveryAddressSameAsMailing(addresses)
-    };
+      // The API rejects a delivery address when it is the same as the mailing address.
+      deliveryAddress: isSameAsMailing ? void 0 : deliveryAddress,
+      isDeliveryAddressSameAsMailing: isSameAsMailing
+    });
   }
-  function mapAddress4(address) {
-    if (!address)
-      return void 0;
-    const raw = address;
-    const postalAddress = raw.PostalAddress ?? raw.postalAddress;
-    const source = postalAddress?.AddressCA ?? postalAddress?.AddressUS ?? postalAddress?.AddressINTL ?? raw;
-    const streetNumber = address.components?.find((component) => component.name === "Street Number Only")?.value;
-    const streetName = address.components?.find((component) => component.name === "Street Only")?.value;
-    const suite = address.components?.find((component) => component.name === "Suite/Apartment")?.value;
-    const streetAddress = [streetNumber, streetName].filter(Boolean).join(" ") || address.components?.find((component) => component.name === "Street Address")?.value || source.streetAddress || source.Address1 || raw.street || "";
-    const country = source.country ?? source.CountryCodeName ?? raw.country ?? "";
-    const postal = source.postalOrZipCode ?? source.PostCode ?? source.postalZip ?? raw.postal_zip ?? "";
-    return {
-      streetAddress: [streetAddress, suite].filter(Boolean).join(", "),
-      city: source.city ?? source.CityTown ?? raw.city ?? "",
-      provinceState: source.provinceState ?? source.RegionName ?? raw.province_state ?? "",
-      country,
-      postalOrZipCode: country === "CA" ? normalizeCanadianPostal(postal) : postal
+  function findDirectorNumber(affiliation, extract) {
+    const target = normaliseDirectorName(affiliation);
+    let result;
+    const visit = (value) => {
+      if (result !== void 0 || value === null || value === void 0)
+        return;
+      if (Array.isArray(value)) {
+        value.forEach(visit);
+        return;
+      }
+      if (typeof value !== "object")
+        return;
+      const record = value;
+      const number = record["directorNumber"] ?? record["DirectorNumber"];
+      if (number !== void 0 && normaliseDirectorName(record) === target) {
+        const parsed = Number(number);
+        if (Number.isFinite(parsed))
+          result = parsed;
+        return;
+      }
+      Object.values(record).forEach(visit);
     };
+    visit(extract);
+    return result;
   }
-  function normalizeCanadianPostal(value) {
-    const compact = value.replace(/[\s-]+/g, "").toUpperCase();
-    return /^[A-Z]\d[A-Z]\d[A-Z]\d$/.test(compact) ? `${compact.slice(0, 3)} ${compact.slice(3)}` : value;
+  function normaliseDirectorName(value) {
+    const name = value?.PersonName ?? value?.personName ?? value;
+    return [
+      name?.FirstName ?? name?.firstName,
+      name?.MiddleName ?? name?.middleName,
+      name?.LastName ?? name?.lastName
+    ].filter(Boolean).join(" ").trim().toLowerCase();
+  }
+  function mapAddress4(address) {
+    return address ? mapAddress(address) : void 0;
   }
   function findCompanyEmail(task) {
     const affiliations = task.entity.affiliations ?? [];
@@ -95323,6 +95440,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     "src/app/helpers/mappers/british-columbia-change-of-directors.mapper.ts"() {
       init_BritishColumbiaConstants();
       init_common_models();
+      init_british_columbia_formation_mapper();
       init_british_columbia_formation_form_helper();
       init_common_utils();
     }
@@ -95422,29 +95540,29 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               throw new Error("Missing serviceOrderId.");
             }
             const submitted = yield this.send(signature, "POST", `${MAINTENANCE_FILING_PATH}/${encodeURIComponent(serviceOrderId)}/submit`, void 0, opts);
-            if (!submitted.ok || this.normalize(submitted.body).Status === "Failure") {
-              const result = this.normalize(submitted.body);
-              const err = new Error(this.describeFailure(submitted.status, "eCore submit failed", result));
-              err.submitResult = result;
+            const submitResult = this.normalize(submitted.body);
+            if (!submitted.ok || submitResult.Status === "Failure") {
+              const err = new Error(this.describeFailure(submitted.status, "eCore submit failed", submitResult));
+              err.submitResult = submitResult;
               err.httpStatus = submitted.status;
               throw err;
             }
             const { intervalMs, timeoutMs } = __spreadValues(__spreadValues({}, DEFAULT_RESULT_POLL), poll);
             const deadline = Date.now() + timeoutMs;
-            let processing = true;
+            let processing = false;
             let files;
-            while (processing) {
+            for (; ; ) {
               const { status, ok, body, raw } = yield this.send(signature, "GET", `${MAINTENANCE_FILING_PATH}/${encodeURIComponent(serviceOrderId)}`, void 0, opts);
               const state2 = String(body?.status ?? "").toLowerCase();
               if (ok && (state2 === "success" || state2 === "pendingdocuments")) {
                 files = body?.files;
-                processing = false;
                 break;
               }
               if (!ok || state2 === "failed" || state2 === "sourceunavailable") {
                 throw this.failure(status, "The registry could not complete the filing", body, raw);
               }
               if (Date.now() >= deadline) {
+                processing = true;
                 break;
               }
               yield this.sleep(intervalMs);
@@ -95587,7 +95705,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
     return { filingType: "changeOfAddressFiling", filing };
   }
-  function getBritishColumbiaAccessCode(task, env) {
+  function getBritishColumbiaAccessCode2(task, env) {
     const registryId = task.entity._profile.registry_id?.trim() ?? "";
     if (registryId) {
       return registryId;
@@ -95688,6 +95806,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         \u0275\u0275restoreView(_r6);
         const ctx_r2 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r2.onNextStepClick());
+      })("recheckStep", function FilingComponent_Conditional_10_Conditional_1_Template_british_columbia_recheckStep_0_listener() {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r2 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r2.defineInitialStep());
       })("prevStep", function FilingComponent_Conditional_10_Conditional_1_Template_british_columbia_prevStep_0_listener() {
         \u0275\u0275restoreView(_r6);
         const ctx_r2 = \u0275\u0275nextContext(2);
@@ -95734,7 +95856,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     if (rf & 2) {
       const ctx_r2 = \u0275\u0275nextContext(2);
       const currentTask_r5 = \u0275\u0275readContextLet(9);
-      \u0275\u0275property("task", currentTask_r5)("currentUser", ctx_r2.currentUser())("activeStep", ctx_r2.activeStep())("isNote", ctx_r2.dataWasChanged())("actionsDisabled", ctx_r2.isLoading())("errors", ctx_r2.errors());
+      \u0275\u0275property("task", currentTask_r5)("currentUser", ctx_r2.currentUser())("activeStep", ctx_r2.activeStep())("isNote", ctx_r2.dataWasChanged())("actionsDisabled", ctx_r2.isLoading())("errors", ctx_r2.errors())("currentDataExtract", ctx_r2.currentDataExtract());
     }
   }
   function FilingComponent_Conditional_10_Conditional_2_Template(rf, ctx) {
@@ -95784,7 +95906,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function FilingComponent_Conditional_10_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275template(0, FilingComponent_Conditional_10_Conditional_0_Template, 1, 7, "ontario", 8)(1, FilingComponent_Conditional_10_Conditional_1_Template, 1, 6, "british-columbia", 9)(2, FilingComponent_Conditional_10_Conditional_2_Template, 1, 5, "federal", 10);
+      \u0275\u0275template(0, FilingComponent_Conditional_10_Conditional_0_Template, 1, 7, "ontario", 8)(1, FilingComponent_Conditional_10_Conditional_1_Template, 1, 7, "british-columbia", 9)(2, FilingComponent_Conditional_10_Conditional_2_Template, 1, 5, "federal", 10);
     }
     if (rf & 2) {
       const ctx_r2 = \u0275\u0275nextContext();
@@ -95905,6 +96027,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         });
         dataWasChanged = signal(false);
         serviceOrderId = "";
+        bcCurrentDataServiceOrderId = "";
+        currentDataExtract = signal(void 0);
+        bcDataExtractTaskId = "";
         activeStep = signal(Step.Validate);
         isLoading = signal(false);
         validationConfig = signal(null);
@@ -95972,6 +96097,26 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 this.serviceOrderId = serviceOrderId;
               }
             }
+            if (isChangeOfPrincipalsTask(task) && isBritishColumbiaTask(task) && this.bcDataExtractTaskId !== task._id) {
+              const signature = this._signature();
+              if (!signature)
+                return;
+              this.bcDataExtractTaskId = task._id;
+              const { request, issues } = buildBritishColumbiaDataExtractOrder(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());
+              } catch (error) {
+                this.handleCatchError(error);
+              } finally {
+                this.isLoading.set(false);
+              }
+            }
           }));
         }
         getCurrentData() {
@@ -96053,7 +96198,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                   searchOrFilingType,
                   serviceOrderId: response["ServiceOrderId"] ?? "",
                   validatedOn: /* @__PURE__ */ new Date(),
-                  provider: "obr",
+                  provider: getFilingProvider(signature.task),
                   draftPdf: response.Draft ?? "",
                   documentName: this.validateOptions()?.documentName ?? "Incorporation Draft",
                   documentType: "pdf"
@@ -96095,8 +96240,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             try {
               this.isLoading.set(true);
               this.errors.set([]);
-              const requestBody = buildBritishColumbiaChangeOfDirectorsValidationRequest(task, deltaData);
-              const response = yield this.britishColumbiaChangeOfDirectorsService.validate(signature, requestBody, this.validateOptions() ?? {});
+              const options = this.validateOptions() ?? {};
+              const currentDataServiceOrderId = this.bcCurrentDataServiceOrderId;
+              if (!currentDataServiceOrderId) {
+                this.errors.set(["The current BC data extract is not ready yet. Please wait and try again."]);
+                return;
+              }
+              const requestBody = buildBritishColumbiaChangeOfDirectorsValidationRequest(task, deltaData, currentDataServiceOrderId, this.currentDataExtract());
+              const response = yield this.britishColumbiaChangeOfDirectorsService.validate(signature, requestBody, options);
               if (this.hasResponseErrors(response))
                 return;
               const serviceOrderId = response.ServiceOrderId ?? "";
@@ -96105,7 +96256,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                   searchOrFilingType: getSearchOrFilingType(task),
                   serviceOrderId,
                   validatedOn: /* @__PURE__ */ new Date(),
-                  provider: "obr",
+                  provider: "bcreg",
                   draftPdf: response.Draft,
                   documentName: this.validateOptions()?.documentName ?? "BC Change of Directors Draft",
                   documentType: "pdf"
@@ -96264,7 +96415,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               const opts = this.validateOptions() ?? {};
               const context2 = {
                 corporationNumber: task.entity._profile.corp_number ?? "",
-                accessCodeOrPassword: getBritishColumbiaAccessCode(task, signature.env),
+                accessCodeOrPassword: getBritishColumbiaAccessCode2(task, signature.env),
                 incorporationDate: String(task.entity._compliance?.incorporation_date ?? "").slice(0, 10)
               };
               const extractId = yield this.bcMaintenanceService.orderCurrentDataExtract(signature, context2, opts);
@@ -96280,7 +96431,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                   searchOrFilingType,
                   serviceOrderId,
                   validatedOn: /* @__PURE__ */ new Date(),
-                  provider: "obr",
+                  provider: "bcreg",
                   draftPdf,
                   documentName: this.validateOptions()?.documentName ?? "British Columbia Change of Office Addresses Draft",
                   documentType: "pdf"
@@ -96288,7 +96439,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               }
               this.deltaDataChange.emit(__spreadProps(__spreadValues({}, deltaData), {
                 serviceOrderId,
-                validatedData: JSON.parse(JSON.stringify(requestBody))
+                // The corporation number is added by the service, not by the request builder, so it is
+                // stored explicitly (the access code is deliberately left out) to detect entity changes.
+                validatedData: __spreadProps(__spreadValues({}, JSON.parse(JSON.stringify(requestBody))), {
+                  corporationNumber: context2.corporationNumber
+                })
               }));
               this.close.emit();
             } catch (response) {
@@ -96387,7 +96542,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 searchOrFilingType,
                 serviceOrderId,
                 validatedOn: /* @__PURE__ */ new Date(),
-                provider: "obr",
+                provider: getFilingProvider(task),
                 draftPdf,
                 documentName: this.validateOptions()?.documentName ?? "Federal Draft",
                 documentType: "pdf"
@@ -96703,7 +96858,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             return federalPayload;
           }
           if (isChangeOfAddressTask(task) && isBritishColumbiaTask(task)) {
-            return buildBCChangeOfOfficeAddressesValidateRequest(task, deltaData);
+            return __spreadProps(__spreadValues({}, buildBCChangeOfOfficeAddressesValidateRequest(task, deltaData)), {
+              corporationNumber: task.entity._profile.corp_number ?? ""
+            });
           }
           if (isUpdateMaintain(task) && isOntarioTask(task)) {
             const serviceOrderId = deltaData?.serviceOrderId ?? this.serviceOrderId;
@@ -96733,7 +96890,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           if (rf & 2) {
             \u0275\u0275styleProp("height", ctx.modalHeight());
           }
-        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], currentUser: [1, "currentUser"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 9, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "nextStep", "prevStep", "codValidate", "saveCodDeltaData", "codSubmit", "coaValidate", "saveCoaDeltaData", "coaSubmit", "formationValidate", "saveFormationDeltaData", "formationSubmit", "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors"], [3, "close", "deltaDataChange", "file", "validate", "umSave", "umValidate", "umSubmit", "nextStep", "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "diameter"]], template: function FilingComponent_Template(rf, ctx) {
+        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], currentUser: [1, "currentUser"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 9, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "nextStep", "recheckStep", "prevStep", "codValidate", "saveCodDeltaData", "codSubmit", "coaValidate", "saveCoaDeltaData", "coaSubmit", "formationValidate", "saveFormationDeltaData", "formationSubmit", "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract"], [3, "close", "deltaDataChange", "file", "validate", "umSave", "umValidate", "umSubmit", "nextStep", "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "diameter"]], template: function FilingComponent_Template(rf, ctx) {
           if (rf & 1) {
             const _r1 = \u0275\u0275getCurrentView();
             \u0275\u0275elementStart(0, "div", 0)(1, "div", 1)(2, "h1", 2);
@@ -96836,8 +96993,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           [isNote]="dataWasChanged()"\r
           [actionsDisabled]="isLoading()"\r
           [errors]="errors()"\r
+          [currentDataExtract]="currentDataExtract()"\r
           (close)="close.emit()"\r
           (nextStep)="onNextStepClick()"\r
+          (recheckStep)="defineInitialStep()"\r
           (prevStep)="onOntarioPrevStep()"\r
           (codValidate)="onBritishColumbiaChangeOfDirectorsValidate($event)"\r
           (saveCodDeltaData)="onBritishColumbiaChangeOfDirectorsSave($event)"\r
@@ -96878,7 +97037,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: 93 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 97 });
       })();
     }
   });