@dyedurham/search-and-file-widget 2.0.86 → 2.0.88

package/dnd-filing-shell.js

@@ -57885,8 +57885,7 @@ 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 ?? 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}).`);
+    return new Error(msgs.length ? msgs.join(" | ") : "Validation failed.");
   }
   function joinUrl(base, path) {
     const b = base.endsWith("/") ? base.slice(0, -1) : base;
@@ -57994,9 +57993,6 @@ 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 "";
@@ -58108,12 +58104,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function isAnnualReturnTask(task) {
     return task?._taskType === TaskType.AnnualCompliance;
   }
-  function getFilingProvider(task) {
-    if (task && isBritishColumbiaTask(task)) {
-      return "bcreg";
-    }
-    return task && !isOntarioTask(task) ? "federal" : "obr";
-  }
   function getSearchOrFilingType(task) {
     if (!task) {
       return void 0;
@@ -58132,7 +58122,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;
   }
@@ -58238,7 +58228,13 @@ 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) => a.kind === "ShareholderAffiliationV3" && a._participant.participant_type === "person");
+    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;
+    });
   }
   function normalizeSupportingDocuments(value) {
     if (!Array.isArray(value)) {
@@ -84206,7 +84202,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         BCChangeOfDirectorsFormControls2["CorporationName"] = "corporationName";
         BCChangeOfDirectorsFormControls2["IncorporationNumber"] = "incorporationNumber";
         BCChangeOfDirectorsFormControls2["CompanyEmail"] = "companyEmail";
-        BCChangeOfDirectorsFormControls2["CompanyPassword"] = "companyPassword";
         BCChangeOfDirectorsFormControls2["DirectorsAddedOrDeleted"] = "directorsAddedOrDeleted";
         BCChangeOfDirectorsFormControls2["ChangeDate"] = "changeDate";
         BCChangeOfDirectorsFormControls2["FilingFee"] = "filingFee";
@@ -84883,7 +84878,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;
@@ -84897,8 +84892,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           config2[BCChangeOfDirectorsFormGroups.CorporationDetails] = new FormGroup({
             [Controls.CorporationName]: this.readOnly(task.entity._profile.name),
             [Controls.IncorporationNumber]: this.readOnly(task.entity._profile.corp_number),
-            [Controls.CompanyEmail]: this.readOnly(companyEmail),
-            [Controls.CompanyPassword]: new FormControl(delta?.companyPassword ?? task.entity._profile.registry_id ?? "", Validators.required)
+            [Controls.CompanyEmail]: this.readOnly(companyEmail)
           });
           const isDirector = (a) => isPrincipalAffiliation2(a) && a.role?.role_name === "Director";
           const incoming = task.incomingAffiliations ?? [];
@@ -84913,8 +84907,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);
@@ -84932,6 +84927,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 ?? ""),
@@ -84991,6 +85025,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,
@@ -85195,51 +85231,39 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275pipe(15, "translate");
       \u0275\u0275elementEnd();
       \u0275\u0275text(16);
-      \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(17, "mat-form-field", 13)(18, "mat-label");
-      \u0275\u0275text(19);
-      \u0275\u0275pipe(20, "translate");
-      \u0275\u0275elementEnd();
-      \u0275\u0275element(21, "input", 14);
       \u0275\u0275elementEnd()()();
     }
     if (rf & 2) {
-      let tmp_10_0;
-      let tmp_12_0;
-      let tmp_14_0;
+      let tmp_9_0;
+      let tmp_11_0;
+      let tmp_13_0;
       const ctx_r0 = \u0275\u0275nextContext();
       const corporationDetails_r4 = \u0275\u0275readContextLet(6);
       \u0275\u0275property("isStatusIcon", false)("title", ctx_r0.groups.CorporationDetails);
-      \u0275\u0275advance();
-      \u0275\u0275property("formGroup", corporationDetails_r4);
-      \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(5, 11, "Corporation Name"), ":");
-      \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", (tmp_10_0 = corporationDetails_r4.get(ctx_r0.controls.CorporationName)) == null ? null : tmp_10_0.value, " ");
-      \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(10, 13, "Incorporation Number"), ":");
+      \u0275\u0275advance(4);
+      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(5, 8, "Corporation Name"), ":");
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", (tmp_12_0 = corporationDetails_r4.get(ctx_r0.controls.IncorporationNumber)) == null ? null : tmp_12_0.value, " ");
+      \u0275\u0275textInterpolate1(" ", (tmp_9_0 = corporationDetails_r4.get(ctx_r0.controls.CorporationName)) == null ? null : tmp_9_0.value, " ");
       \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(15, 15, "Company Email"), ":");
+      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(10, 10, "Incorporation Number"), ":");
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", (tmp_14_0 = corporationDetails_r4.get(ctx_r0.controls.CompanyEmail)) == null ? null : tmp_14_0.value, " ");
+      \u0275\u0275textInterpolate1(" ", (tmp_11_0 = corporationDetails_r4.get(ctx_r0.controls.IncorporationNumber)) == null ? null : tmp_11_0.value, " ");
       \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(20, 17, "Company Password"));
+      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(15, 12, "Company Email"), ":");
       \u0275\u0275advance(2);
-      \u0275\u0275property("formControlName", ctx_r0.controls.CompanyPassword);
+      \u0275\u0275textInterpolate1(" ", (tmp_13_0 = corporationDetails_r4.get(ctx_r0.controls.CompanyEmail)) == null ? null : tmp_13_0.value, " ");
     }
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template(rf, ctx) {
     if (rf & 1) {
       const _r7 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "div", 18)(1, "div", 19)(2, "label");
+      \u0275\u0275elementStart(0, "div", 16)(1, "div", 17)(2, "label");
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementStart(5, "span");
       \u0275\u0275text(6, "*");
       \u0275\u0275elementEnd()();
-      \u0275\u0275elementStart(7, "mat-form-field", 20)(8, "input", 21);
+      \u0275\u0275elementStart(7, "mat-form-field", 18)(8, "input", 19);
       \u0275\u0275listener("click", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template_input_click_8_listener() {
         \u0275\u0275restoreView(_r7);
         const changeDatePicker_r8 = \u0275\u0275reference(12);
@@ -85251,21 +85275,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", 22);
+      \u0275\u0275elementStart(9, "button", 20);
       \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", 23);
+      \u0275\u0275element(10, "span", 21);
       \u0275\u0275elementEnd();
       \u0275\u0275element(11, "mat-datepicker", null, 0);
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(13, "p", 24);
+      \u0275\u0275elementStart(13, "p", 22);
       \u0275\u0275text(14);
       \u0275\u0275pipe(15, "translate");
       \u0275\u0275elementEnd()();
-      \u0275\u0275elementStart(16, "p", 25)(17, "strong");
+      \u0275\u0275elementStart(16, "p", 23)(17, "strong");
       \u0275\u0275text(18);
       \u0275\u0275pipe(19, "translate");
       \u0275\u0275elementEnd();
@@ -85292,14 +85316,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", 15)(2, "div", 16)(3, "strong");
+      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 13)(2, "div", 14)(3, "strong");
       \u0275\u0275text(4);
       \u0275\u0275pipe(5, "translate");
       \u0275\u0275elementEnd();
       \u0275\u0275text(6);
       \u0275\u0275pipe(7, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(8, "mat-checkbox", 17);
+      \u0275\u0275elementStart(8, "mat-checkbox", 15);
       \u0275\u0275listener("change", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Template_mat_checkbox_change_8_listener() {
         let tmp_7_0;
         let tmp_8_0;
@@ -85313,7 +85337,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", 18);
+      \u0275\u0275template(11, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Conditional_11_Template, 21, 12, "div", 16);
       \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
@@ -85337,7 +85361,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Conditional_4_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "span", 30);
+      \u0275\u0275elementStart(0, "span", 28);
       \u0275\u0275text(1);
       \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
@@ -85349,7 +85373,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Conditional_5_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "span", 31);
+      \u0275\u0275elementStart(0, "span", 29);
       \u0275\u0275text(1);
       \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
@@ -85361,15 +85385,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 28)(1, "div", 29)(2, "strong");
+      \u0275\u0275elementStart(0, "div", 26)(1, "div", 27)(2, "strong");
       \u0275\u0275text(3);
       \u0275\u0275elementEnd();
-      \u0275\u0275template(4, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Conditional_4_Template, 3, 3, "span", 30)(5, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Conditional_5_Template, 3, 3, "span", 31);
+      \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\u0275elementEnd();
-      \u0275\u0275elementStart(6, "div", 29);
+      \u0275\u0275elementStart(6, "div", 27);
       \u0275\u0275text(7);
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(8, "div", 29);
+      \u0275\u0275elementStart(8, "div", 27);
       \u0275\u0275text(9);
       \u0275\u0275elementEnd()();
     }
@@ -85395,26 +85419,26 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_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", 28);
+      \u0275\u0275template(1, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_For_12_Conditional_1_Template, 10, 5, "div", 26);
     }
     if (rf & 2) {
-      const \u0275$index_125_r10 = ctx.$index;
-      const directorForm_r11 = \u0275\u0275storeLet(\u0275\u0275nextContext(2).getDirectorForm(\u0275$index_125_r10));
+      const \u0275$index_117_r10 = ctx.$index;
+      const directorForm_r11 = \u0275\u0275storeLet(\u0275\u0275nextContext(2).getDirectorForm(\u0275$index_117_r10));
       \u0275\u0275advance();
       \u0275\u0275conditional(directorForm_r11 ? 1 : -1);
     }
   }
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_13_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 9)(1, "div", 26)(2, "div", 27);
+      \u0275\u0275elementStart(0, "div", 9)(1, "div", 24)(2, "div", 25);
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(5, "div", 27);
+      \u0275\u0275elementStart(5, "div", 25);
       \u0275\u0275text(6);
       \u0275\u0275pipe(7, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(8, "div", 27);
+      \u0275\u0275elementStart(8, "div", 25);
       \u0275\u0275text(9);
       \u0275\u0275pipe(10, "translate");
       \u0275\u0275elementEnd()();
@@ -85449,22 +85473,22 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_16_Template(rf, ctx) {
     if (rf & 1) {
       const _r13 = \u0275\u0275getCurrentView();
-      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 32)(2, "p");
+      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 30)(2, "p");
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(5, "mat-radio-group", 33);
+      \u0275\u0275elementStart(5, "mat-radio-group", 31);
       \u0275\u0275listener("change", function BritishColumbiaChangeOfDirectorsFormComponent_Conditional_16_Template_mat_radio_group_change_5_listener() {
         \u0275\u0275restoreView(_r13);
         const ctx_r0 = \u0275\u0275nextContext();
         const annualReportReminder_r14 = \u0275\u0275readContextLet(15);
         return \u0275\u0275resetView(ctx_r0.onSectionValidChange("annualReportReminder", annualReportReminder_r14.valid));
       });
-      \u0275\u0275elementStart(6, "mat-radio-button", 34);
+      \u0275\u0275elementStart(6, "mat-radio-button", 32);
       \u0275\u0275text(7);
       \u0275\u0275pipe(8, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(9, "mat-radio-button", 34);
+      \u0275\u0275elementStart(9, "mat-radio-button", 32);
       \u0275\u0275text(10);
       \u0275\u0275pipe(11, "translate");
       \u0275\u0275elementEnd()()()();
@@ -85564,7 +85588,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", 3, "formGroup"], ["appearance", "outline", 1, "company-password-field"], ["matInput", "", "type", "password", 3, "formControlName"], [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: 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) {
           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);
@@ -85572,7 +85596,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275declareLet(4);
             \u0275\u0275template(5, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_5_Template, 2, 4, "expandable-card", 5);
             \u0275\u0275declareLet(6);
-            \u0275\u0275template(7, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_7_Template, 22, 19, "expandable-card", 6);
+            \u0275\u0275template(7, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_7_Template, 17, 14, "expandable-card", 6);
             \u0275\u0275declareLet(8);
             \u0275\u0275template(9, BritishColumbiaChangeOfDirectorsFormComponent_Conditional_9_Template, 12, 15, "expandable-card", 7);
             \u0275\u0275declareLet(10);
@@ -85623,7 +85647,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           MatDatepickerInput,
           MatFormField,
           MatInput,
-          MatLabel,
           MatRadioButton,
           MatRadioGroup,
           ReactiveFormsModule,
@@ -85647,7 +85670,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             MatDatepickerInput,
             MatFormField,
             MatInput,
-            MatLabel,
             MatRadioButton,
             MatRadioGroup,
             ReactiveFormsModule,
@@ -85686,7 +85708,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
 \r
     @if (corporationDetails) {\r
       <expandable-card [isStatusIcon]="false" [title]="groups.CorporationDetails">\r
-        <div class="readonly-summary" [formGroup]="corporationDetails">
+        <div class="readonly-summary">\r
           <p>\r
             <strong>{{ 'Corporation Name' | translate }}:</strong>\r
             {{ corporationDetails.get(controls.CorporationName)?.value }}\r
@@ -85695,19 +85717,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             <strong>{{ 'Incorporation Number' | translate }}:</strong>\r
             {{ corporationDetails.get(controls.IncorporationNumber)?.value }}\r
           </p>\r
-          <p>
-            <strong>{{ 'Company Email' | translate }}:</strong>
-            {{ corporationDetails.get(controls.CompanyEmail)?.value }}
-          </p>
-          <mat-form-field appearance="outline" class="company-password-field">
-            <mat-label>{{ 'Company Password' | translate }}</mat-label>
-            <input
-              matInput
-              type="password"
-              [formControlName]="controls.CompanyPassword"
-            />
-          </mat-form-field>
-        </div>
+          <p>\r
+            <strong>{{ 'Company Email' | translate }}:</strong>\r
+            {{ corporationDetails.get(controls.CompanyEmail)?.value }}\r
+          </p>\r
+        </div>\r
       </expandable-card>\r
     }\r
 \r
@@ -85865,7 +85879,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: 62 });
+        (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 });
       })();
     }
   });
@@ -87395,7 +87409,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);
@@ -87420,7 +87434,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);
@@ -87428,7 +87442,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();
     }
@@ -87438,57 +87452,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());
       });
@@ -87502,14 +87490,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());
       });
@@ -87523,7 +87511,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();
@@ -87547,7 +87535,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();
@@ -87560,6 +87547,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();
@@ -87581,7 +87569,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)) {
@@ -87596,7 +87584,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) {
@@ -87622,11 +87610,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());
@@ -87644,10 +87629,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const c = BCChangeOfDirectorsFormControls;
           const formData = this.deltaForm().getRawValue();
           const refNumbers = formData[BCChangeOfDirectorsFormGroups.ReferenceNumbers];
-          const corpDetails = formData[BCChangeOfDirectorsFormGroups.CorporationDetails];
           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 {
@@ -87655,7 +87640,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               referenceNumber: refNumbers?.[c.ClientMatterNumber] ?? null,
               docketNumber: refNumbers?.[c.DocketNumber] ?? null
             },
-            companyPassword: corpDetails?.[c.CompanyPassword] ?? null,
             filingDetails: {
               directorsAddedOrDeleted: addedOrDeleted,
               changeDate: addedOrDeleted ? filing?.[c.ChangeDate] ?? null : void 0
@@ -87664,7 +87648,12 @@ 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() {
@@ -87739,24 +87728,23 @@ 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" }, decls: 3, vars: 3, 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", prevStep: "prevStep" }, decls: 3, vars: 3, 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);
+            \u0275\u0275template(1, BritishColumbiaComponent_Conditional_1_Template, 2, 2)(2, BritishColumbiaComponent_Conditional_2_Template, 2, 2);
           }
           if (rf & 2) {
-            const taskData_r8 = \u0275\u0275storeLet(ctx.task());
+            const taskData_r7 = \u0275\u0275storeLet(ctx.task());
             \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.isChangeOfDirectorsTask(taskData_r8) ? 1 : -1);
+            \u0275\u0275conditional(ctx.isChangeOfDirectorsTask(taskData_r7) ? 1 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.isFormationTask(taskData_r8) ? 2 : -1);
+            \u0275\u0275conditional(ctx.isFormationTask(taskData_r7) ? 2 : -1);
           }
         }, dependencies: [
           BritishColumbiaChangeOfDirectorsDeltaFormComponent,
           BritishColumbiaChangeOfDirectorsPreviewFormComponent,
           BritishColumbiaIncorporationDeltaFormComponent,
-          BritishColumbiaIncorporationPreviewFormComponent,
-          TermsAndConditionsComponent
+          BritishColumbiaIncorporationPreviewFormComponent
         ], styles: ["\n\n[_nghost-%COMP%] {\n  display: contents;\n}\n/*# sourceMappingURL=british-columbia.component.css.map */"], changeDetection: 0 });
       };
       (() => {
@@ -87766,13 +87754,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             BritishColumbiaChangeOfDirectorsDeltaFormComponent,
             BritishColumbiaChangeOfDirectorsPreviewFormComponent,
             BritishColumbiaIncorporationDeltaFormComponent,
-            BritishColumbiaIncorporationPreviewFormComponent,
-            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', styles: ["/* src/app/components/british-columbia/british-columbia.component.scss */\n:host {\n  display: contents;\n}\n/*# sourceMappingURL=british-columbia.component.css.map */\n"] }]
+            BritishColumbiaIncorporationPreviewFormComponent
+          ], 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', 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: 65 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaComponent, { className: "BritishColumbiaComponent", filePath: "src/app/components/british-columbia/british-columbia.component.ts", lineNumber: 62 });
       })();
     }
   });
@@ -89143,7 +89130,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 = getIndividualDirectors(task.entity.affiliations ?? []);
+          const directors = (task.entity.affiliations ?? []).filter((a) => isPrincipalAffiliation2(a) && a.role?.role_name === "Director");
           if (directors.length) {
             const deltaDirectorsMap = delta?.directors;
             const directorGroups = directors.map((director) => {
@@ -89724,7 +89711,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           });
           effect(() => {
-            const directors = getIndividualDirectors(this.task()?.entity.affiliations ?? []);
+            const directors = (this.task()?.entity.affiliations ?? []).filter((a) => isPrincipalAffiliation2(a) && a.role?.role_name === "Director") ?? [];
             const directorOptions = directors.map((director) => ({ label: getPersonName(director.participant), value: director.participant._id }));
             this.federalFormationFormInviteDirectorsToBeManagersControl = generateFederalFormationFormInviteDirectorsToBeManagersControl(directorOptions);
           });
@@ -89899,7 +89886,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           exclusionReason.updateValueAndValidity({ emitEvent: false });
         }
         getSelectableIndividualsWithSignificantControl(affiliations) {
-          return getIndividualWithSignificantControl(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 ?? ""));
         }
         getFormArray(key) {
           return this.form().get(key);
@@ -90248,7 +90239,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: 76 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FederalIncorporationFormComponent, { className: "FederalIncorporationFormComponent", filePath: "src/app/components/federal/incorporation/federal-incorporation-form/federal-incorporation-form.component.ts", lineNumber: 75 });
       })();
     }
   });
@@ -92241,7 +92232,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                   searchOrFilingType,
                   serviceOrderId,
                   validatedOn: /* @__PURE__ */ new Date(),
-                  provider: getFilingProvider(signature.task),
+                  provider: "obr",
                   draftPdf: payload.ReceiptPdf,
                   documentName: "Incorporation Receipt",
                   documentType: "pdf"
@@ -92792,7 +92783,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 = getIndividualDirectors(task.entity.affiliations);
+    const directors = task.entity.affiliations.filter((aff) => aff.kind === "PrincipalAffiliationV3" && aff.role.role_name === DirectorRole.DIRECTOR);
     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;
@@ -93104,6 +93095,7 @@ 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();
@@ -93988,36 +93980,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 = {}) {
+          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 orderResponse = yield fetchWithJwtRetry(signature, () => postJson(fetchFn, signature.proxyApiUrl, signature.jwtToken, order, __spreadValues({
+            const orderResp = yield fetchWithJwtRetry(signature, () => postJson(fetchFn, signature.proxyApiUrl, signature.jwtToken, order, __spreadValues({
               "x-target-url": `${dataExtractUrl}/order`
             }, opts.headers ?? {})));
-            const orderPayload = yield this.readJson(orderResponse, "BC current data extract order");
-            const orderId = orderPayload.currentDataServiceOrderId;
-            if (!orderResponse.ok || !orderId || orderPayload.status === "failed") {
-              throw buildGenericError(orderResponse.status, "BC current data extract order failed", orderPayload);
+            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 }))
+              }));
             }
-            const extractResponse = yield fetchWithJwtRetry(signature, () => fetchFn(signature.proxyApiUrl, {
-              method: "GET",
-              headers: __spreadValues({
-                Authorization: `Bearer ${signature.jwtToken}`,
-                "x-target-url": `${dataExtractUrl}/${encodeURIComponent(orderId)}`
-              }, opts.headers ?? {})
-            }));
-            const extractPayload = yield this.readJson(extractResponse, "BC current data extract");
-            if (!extractResponse.ok || extractPayload.status !== "success") {
-              throw buildGenericError(extractResponse.status, "BC current data extract failed", extractPayload);
+            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));
             }
-            return orderId;
+            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);
@@ -94035,10 +94046,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               throw err2;
             }
             const payload = unwrapRequestResults(parsed.value);
-            const responseErrors = payload.Errors ?? payload.errors ?? [];
-            payload.Errors = responseErrors;
-            if (resp.ok && !responseErrors.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;
@@ -94098,12 +94111,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             throw err;
           });
         }
-        readJson(response, description) {
+        readJson(resp, what) {
           return __async(this, null, function* () {
-            const raw = yield response.text();
+            const raw = yield resp.text();
             const parsed = tryParseJson(raw);
-            if (!parsed.ok)
-              throw new Error(`${description} returned ${response.status} ${response.statusText}.`);
+            if (!parsed.ok) {
+              throw new Error(`${what} returned ${resp.status} ${resp.statusText}: ${raw || "(empty response)"}`);
+            }
             return unwrapRequestResults(parsed.value);
           });
         }
@@ -94143,13 +94157,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       filingType: "changeOfDirectorsFiling"
     };
     const issues = [];
-    if (!request.corporationNumber)
+    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 invalid.");
+      issues.push("The company's BC Online access code or password is missing or contains characters other than letters and numbers.");
     }
-    if (!request.incorporationDate)
+    if (!request.incorporationDate) {
       issues.push("The incorporation date is missing on the entity.");
+    }
     return { request, issues };
   }
   function buildBritishColumbiaChangeOfDirectorsValidationRequest(task, deltaData, currentDataServiceOrderId) {
@@ -94160,32 +94176,40 @@ 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 addDirectors = (incomingDirectors.length ? incomingDirectors : addedDirectors).map((affiliation) => buildDirector(affiliation));
-    const ceaseDirectors = (outgoingDirectors.length ? outgoingDirectors : ceasedDirectors).map((affiliation) => buildCeasedDirector(affiliation));
+    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));
     return {
       filingType: "changeOfDirectorsFiling",
       currentDataServiceOrderId,
       filing: __spreadProps(__spreadValues({
         corporationNumber: task.entity._profile.corp_number ?? "",
-        accessCodeOrPassword: getBritishColumbiaAccessCode(task, deltaData.companyPassword),
+        accessCodeOrPassword: getBritishColumbiaAccessCode(task),
         reference: deltaData.referenceNumbers.referenceNumber ?? null,
         docket: deltaData.referenceNumbers.docketNumber ?? null
       }, addDirectors.length || ceaseDirectors.length ? { effectiveDate: toYyyyMmDd(deltaData.filingDetails.changeDate) ?? toYyyyMmDd(/* @__PURE__ */ new Date()) } : {}), {
         addDirectors,
         ceaseDirectors,
-        editDirectors: editedDirectors.length ? editedDirectors.map((director) => buildDirector(director)) : [],
+        editDirectors: editSource.map((director) => buildDirector(director)),
         companyEmail,
         isAnnualReportReminderRequired: deltaData.annualReportReminder === BCAnnualReportReminder.Yes
       })
     };
   }
-  function buildCeasedDirector(affiliation) {
-    const _a = buildDirector(affiliation), { isDeliveryAddressSameAsMailing: _same } = _a, director = __objRest(_a, ["isDeliveryAddressSameAsMailing"]);
-    return __spreadProps(__spreadValues({}, director), { deliveryAddress: director.deliveryAddress ?? director.mailingAddress });
-  }
   function isDirectorAffiliation(affiliation) {
     return isPrincipalAffiliation2(affiliation) && affiliation.role?.role_name === "Director";
   }
+  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) {
     if (affiliation?.PersonName || affiliation?.personName || affiliation?.firstName || affiliation?.FirstName) {
       const name = affiliation.PersonName ?? affiliation.personName ?? affiliation;
@@ -94194,7 +94218,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         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
       };
     }
@@ -94208,6 +94232,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       middleName: profile.middleName ?? "",
       lastName: profile.lastName ?? "",
       mailingAddress,
+      // The API rejects a delivery address when it is the same as the mailing address.
       deliveryAddress: isSameAsMailing ? void 0 : deliveryAddress,
       isDeliveryAddressSameAsMailing: isSameAsMailing
     };
@@ -94355,7 +94380,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) {
@@ -94405,7 +94430,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();
@@ -94523,6 +94548,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);
@@ -94586,6 +94614,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() {
@@ -94667,7 +94715,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                   searchOrFilingType,
                   serviceOrderId: response["ServiceOrderId"] ?? "",
                   validatedOn: /* @__PURE__ */ new Date(),
-                  provider: getFilingProvider(signature.task),
+                  provider: "obr",
                   draftPdf: response.Draft ?? "",
                   documentName: this.validateOptions()?.documentName ?? "Incorporation Draft",
                   documentType: "pdf"
@@ -94710,12 +94758,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.isLoading.set(true);
               this.errors.set([]);
               const options = this.validateOptions() ?? {};
-              const { request: extractOrder, issues } = buildBritishColumbiaDataExtractOrder(task, deltaData.companyPassword);
-              if (issues.length) {
-                this.errors.set(issues);
+              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 currentDataServiceOrderId = yield this.britishColumbiaChangeOfDirectorsService.ensureCurrentDataExtract(signature, extractOrder, options);
               const requestBody = buildBritishColumbiaChangeOfDirectorsValidationRequest(task, deltaData, currentDataServiceOrderId);
               const response = yield this.britishColumbiaChangeOfDirectorsService.validate(signature, requestBody, options);
               if (this.hasResponseErrors(response))
@@ -94726,7 +94773,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                   searchOrFilingType: getSearchOrFilingType(task),
                   serviceOrderId,
                   validatedOn: /* @__PURE__ */ new Date(),
-                  provider: getFilingProvider(task),
+                  provider: "bcreg",
                   draftPdf: response.Draft,
                   documentName: this.validateOptions()?.documentName ?? "BC Change of Directors Draft",
                   documentType: "pdf"
@@ -94807,7 +94854,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                   searchOrFilingType,
                   serviceOrderId,
                   validatedOn: /* @__PURE__ */ new Date(),
-                  provider: getFilingProvider(signature.task),
+                  provider: "bcreg",
                   draftPdf: response.Draft ?? "",
                   documentName: this.validateOptions()?.documentName ?? "Incorporation Draft",
                   documentType: "pdf"
@@ -94921,7 +94968,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 searchOrFilingType,
                 serviceOrderId,
                 validatedOn: /* @__PURE__ */ new Date(),
-                provider: getFilingProvider(task),
+                provider: "obr",
                 draftPdf,
                 documentName: this.validateOptions()?.documentName ?? "Federal Draft",
                 documentType: "pdf"
@@ -95092,17 +95139,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           this.activeStep.set(Step.Validate);
         }
         parseError(errors) {
-          return errors.map((item) => (item["ErrorMessage"] ?? item["Message"] ?? item["message"] ?? item["code"] ?? "").toString().trim()).filter((message) => message.length > 0);
-        }
-        getResponseErrors(response) {
-          return response?.Errors ?? response?.errors ?? [];
+          return errors.map((item) => (item["ErrorMessage"] ?? item["Message"] ?? "").toString().trim()).filter((message) => message.length > 0);
         }
         /**
          * Checks a successful response for validation errors.
          * Returns true if errors were found (and sets them), false otherwise.
          */
         hasResponseErrors(response) {
-          const errors = this.getResponseErrors(response);
+          const errors = response?.["Errors"] ?? response?.Errors;
           if (errors?.length) {
             this.errors.set(this.parseError(errors));
             return true;
@@ -95113,8 +95157,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
          * Extracts and sets validation errors from a caught exception.
          */
         handleCatchError(response) {
-          const result = response?.validateResult || response?.submitResult;
-          const validateErrors = this.getResponseErrors(result);
+          const validateErrors = (response?.validateResult || response?.submitResult)?.["Errors"];
           if (validateErrors?.length) {
             const messages = this.parseError(validateErrors);
             if (messages.length) {
@@ -95133,7 +95176,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           } catch {
             parsed = void 0;
           }
-          const errors = this.getResponseErrors(parsed?.validateResult ?? parsed?.submitResult);
+          const errors = parsed?.validateResult?.["Errors"];
           if (errors?.length) {
             this.errors.set(this.parseError(errors));
             return;
@@ -95266,7 +95309,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", "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", "prevStep", "codValidate", "saveCodDeltaData", "codSubmit", "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);
@@ -95348,7 +95391,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           [activeStep]="activeStep()"\r
           [isNote]="dataWasChanged()"\r
           [actionsDisabled]="isLoading()"\r
-          [errors]="errors()"\r
+          [errors]="errors()"
           [prevData]="prevData()"\r
           (close)="close.emit()"\r
           (formationValidate)="onOntarioFormationValidate($event)"\r
@@ -95367,8 +95410,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           [currentUser]="currentUser()"\r
           [activeStep]="activeStep()"\r
           [isNote]="dataWasChanged()"\r
-          [actionsDisabled]="isLoading()"\r
-          [errors]="errors()"\r
+          [actionsDisabled]="isLoading()"
+          [errors]="errors()"
+          [currentDataExtract]="currentDataExtract()"
           (close)="close.emit()"\r
           (nextStep)="onNextStepClick()"\r
           (prevStep)="onOntarioPrevStep()"\r
@@ -95409,7 +95453,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: 90 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 89 });
       })();
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dyedurham/search-and-file-widget",
-  "version": "2.0.86",
+  "version": "2.0.88",
   "description": "",
   "main": "dnd-filing-shell.js",
   "scripts": {