@dyedurham/search-and-file-widget 2.1.20 → 2.1.22

package/dnd-filing-shell.js

@@ -58112,6 +58112,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     return task?._taskType === TaskType.AnnualCompliance;
   }
   function getFilingProvider(task) {
+    if (task && isBritishColumbiaTask(task)) {
+      return "bcreg";
+    }
     return task && !isOntarioTask(task) ? "federal" : "obr";
   }
   function getSearchOrFilingType(task) {
@@ -81313,12 +81316,16 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         bcChangeOfDirectorsInitialDelta = signal(null);
         bcFormationInitialDelta = signal(null);
         bcChangeOfOfficeAddressesInitialDelta = signal(null);
+        bcAnnualReportInitialDelta = signal(null);
         setFormationInitialDelta(delta) {
           this.formationInitialDelta.set(delta);
         }
         setBCFormationInitialDelta(delta) {
           this.bcFormationInitialDelta.set(delta);
         }
+        setBCAnnualReportInitialDelta(delta) {
+          this.bcAnnualReportInitialDelta.set(delta);
+        }
         setBCChangeOfOfficeAddressesInitialDelta(delta) {
           this.bcChangeOfOfficeAddressesInitialDelta.set(delta);
         }
@@ -81342,6 +81349,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           this.bcChangeOfDirectorsInitialDelta.set(null);
           this.bcFormationInitialDelta.set(null);
           this.bcChangeOfOfficeAddressesInitialDelta.set(null);
+          this.bcAnnualReportInitialDelta.set(null);
         }
         static \u0275fac = function DeltaStateService_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _DeltaStateService)();
@@ -84202,7 +84210,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/enums/british-columbia-form.enums.ts
-  var BCChangeOfDirectorsFormControls, BCChangeOfDirectorsFormGroups, BCFormationFormControls, BCChangeOfOfficeAddressesFormControls, BCChangeOfOfficeAddressesFormGroups, BCFormationFormGroups;
+  var BCChangeOfDirectorsFormControls, BCChangeOfDirectorsFormGroups, BCFormationFormControls, BCChangeOfOfficeAddressesFormControls, BCChangeOfOfficeAddressesFormGroups, BCAnnualReportFormControls, BCAnnualReportFormGroups, BCFormationFormGroups;
   var init_british_columbia_form_enums = __esm({
     "src/app/enums/british-columbia-form.enums.ts"() {
       (function(BCChangeOfDirectorsFormControls2) {
@@ -84294,6 +84302,26 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         BCChangeOfOfficeAddressesFormGroups2["RecordsOfficeAddress"] = "Records Office Address";
         BCChangeOfOfficeAddressesFormGroups2["AnnualReportReminder"] = "Annual Report Reminder";
       })(BCChangeOfOfficeAddressesFormGroups || (BCChangeOfOfficeAddressesFormGroups = {}));
+      (function(BCAnnualReportFormControls2) {
+        BCAnnualReportFormControls2["Id"] = "id";
+        BCAnnualReportFormControls2["AffiliationName"] = "entityName";
+        BCAnnualReportFormControls2["Role"] = "Role";
+        BCAnnualReportFormControls2["AffiliationType"] = "AffiliationType";
+        BCAnnualReportFormControls2["ClientMatterNumber"] = "ClientMatterNumber";
+        BCAnnualReportFormControls2["DocketNumber"] = "docketNumber";
+        BCAnnualReportFormControls2["EntityIdentifier"] = "entityIdentifier";
+        BCAnnualReportFormControls2["EffectiveDate"] = "effectiveDate";
+        BCAnnualReportFormControls2["CeaseDate"] = "ceaseDate";
+        BCAnnualReportFormControls2["FullAddress"] = "fullAddress";
+        BCAnnualReportFormControls2["CompanyEmail"] = "companyEmail";
+        BCAnnualReportFormControls2["IsAnnualReportReminderRequired"] = "isAnnualReportReminderRequired";
+      })(BCAnnualReportFormControls || (BCAnnualReportFormControls = {}));
+      (function(BCAnnualReportFormGroups2) {
+        BCAnnualReportFormGroups2["General"] = "General";
+        BCAnnualReportFormGroups2["Officers"] = "Officers";
+        BCAnnualReportFormGroups2["CompanyEmail"] = "Company Email";
+        BCAnnualReportFormGroups2["AnnualReportReminder"] = "Annual Report Reminder";
+      })(BCAnnualReportFormGroups || (BCAnnualReportFormGroups = {}));
       (function(BCFormationFormGroups2) {
         BCFormationFormGroups2["ReferenceNumbers"] = "Reference Numbers";
         BCFormationFormGroups2["CorporationDetails"] = "Corporation Details";
@@ -84930,8 +84958,479 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
   });
 
+  // src/app/helpers/british-columbia/change-of-office-addresses/british-columbia-change-of-office-addresses-form.helper.ts
+  var Controls, COMPANY_EMAIL_TYPES, isCompanyEmail, incomingAddressByGrid, EDITABLE_ADDRESS_CONTROLS, BritishColumbiaChangeOfOfficeAddressesFormHelper;
+  var init_british_columbia_change_of_office_addresses_form_helper = __esm({
+    "src/app/helpers/british-columbia/change-of-office-addresses/british-columbia-change-of-office-addresses-form.helper.ts"() {
+      init_forms();
+      init_common_models();
+      init_british_columbia_form_enums();
+      init_BritishColumbiaConstants();
+      init_british_columbia_formation_form_helper();
+      init_BritishColumbiaConstants();
+      init_common_utils();
+      Controls = BCChangeOfOfficeAddressesFormControls;
+      COMPANY_EMAIL_TYPES = ["Business Email", "Email"];
+      isCompanyEmail = (communication) => Boolean(communication?.value) && COMPANY_EMAIL_TYPES.includes(communication?.type ?? "");
+      incomingAddressByGrid = /* @__PURE__ */ new WeakMap();
+      EDITABLE_ADDRESS_CONTROLS = [
+        Controls.AddressLine1,
+        Controls.AddressLine2,
+        Controls.City,
+        Controls.PostalCode
+      ];
+      BritishColumbiaChangeOfOfficeAddressesFormHelper = class {
+        static generateConfig(task, _translateFn) {
+          const affiliations = task.entity.affiliations ?? [];
+          const delta = task.deltaData;
+          const format = BritishColumbiaFormationFormHelper.formatFullAddress;
+          const pick = BritishColumbiaFormationFormHelper.pickAddress;
+          const registeredOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
+          const recordsOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.RECORDS_OFFICE);
+          const incoming = this.incomingOfficeAddresses(task);
+          const seed = delta?.registeredOffice ? this.fillEmptyAddresses(delta, incoming) : this.seedFromIncomingAffiliations(task);
+          const config2 = {};
+          config2[BCChangeOfOfficeAddressesFormGroups.ReferenceNumbers] = this.generateReferenceNumbersFormGroup(delta?.referenceNumbers, task.entity._profile.client_matter_number);
+          config2[BCChangeOfOfficeAddressesFormGroups.CorporationDetails] = new FormGroup({
+            [Controls.CorporationName]: this.readOnly(task.entity._profile.name),
+            [Controls.IncorporationNumber]: this.readOnly(task.entity._profile.corp_number),
+            [Controls.CompanyEmail]: new FormControl(delta?.companyEmail || this.resolveCompanyEmail(task), Validators.required)
+          });
+          config2[BCChangeOfOfficeAddressesFormGroups.AnnualReportReminder] = new FormGroup({
+            [Controls.AnnualReportReminder]: new FormControl(delta?.annualReportReminder ?? BCAnnualReportReminder.Yes, Validators.required)
+          });
+          const regDeliverySame = seed.registeredOffice?.deliverySameAsMailing ?? true;
+          config2[BCChangeOfOfficeAddressesFormGroups.RegisteredOfficeAddress] = new FormGroup({
+            [Controls.CurrentMailingAddress]: this.readOnly(format(pick(registeredOffice?.addresses, "Mailing"))),
+            [Controls.CurrentDeliveryAddress]: this.readOnly(format(pick(registeredOffice?.addresses, "Delivery"))),
+            [Controls.NewMailingAddress]: this.createOfficeAddressFormGroup(seed.registeredOffice?.mailingAddress, true),
+            [Controls.DeliverySameAsMailing]: new FormControl(regDeliverySame),
+            [Controls.NewDeliveryAddress]: this.createOfficeAddressFormGroup(seed.registeredOffice?.deliveryAddress, !regDeliverySame)
+          });
+          const recSameAsRegistered = seed.recordsOffice?.sameAsRegisteredOffice ?? true;
+          const recDeliverySame = seed.recordsOffice?.deliverySameAsMailing ?? true;
+          config2[BCChangeOfOfficeAddressesFormGroups.RecordsOfficeAddress] = new FormGroup({
+            [Controls.CurrentMailingAddress]: this.readOnly(format(pick(recordsOffice?.addresses, "Mailing"))),
+            [Controls.CurrentDeliveryAddress]: this.readOnly(format(pick(recordsOffice?.addresses, "Delivery"))),
+            [Controls.SameAsRegisteredOffice]: new FormControl(recSameAsRegistered),
+            [Controls.NewMailingAddress]: this.createOfficeAddressFormGroup(seed.recordsOffice?.mailingAddress, !recSameAsRegistered),
+            [Controls.DeliverySameAsMailing]: new FormControl(recDeliverySame),
+            [Controls.NewDeliveryAddress]: this.createOfficeAddressFormGroup(seed.recordsOffice?.deliveryAddress, !recSameAsRegistered && !recDeliverySame)
+          });
+          const grid = (group2, control) => config2[group2].get(control);
+          const register = (target, address) => address && incomingAddressByGrid.set(target, address);
+          register(grid(BCChangeOfOfficeAddressesFormGroups.RegisteredOfficeAddress, Controls.NewDeliveryAddress), incoming.regDelivery);
+          register(grid(BCChangeOfOfficeAddressesFormGroups.RecordsOfficeAddress, Controls.NewMailingAddress), incoming.recMailing);
+          register(grid(BCChangeOfOfficeAddressesFormGroups.RecordsOfficeAddress, Controls.NewDeliveryAddress), incoming.recDelivery);
+          return config2;
+        }
+        /** The company email choices: the entity's email options, plus the resolved default if it isn't one. */
+        static getCompanyEmailOptions(task) {
+          const values = (task.entity.emailOptions ?? []).filter(isCompanyEmail).map((o) => o.value);
+          const fallback = this.resolveCompanyEmail(task);
+          return [...new Set(fallback ? [...values, fallback] : values)].map((value) => ({
+            value,
+            label: value
+          }));
+        }
+        /**
+         * Pre-fills the new addresses from the task's incoming "Shared Address" affiliations (Registered
+         * Office / Records Office), taking each Mailing / Delivery address from the affiliation or, when
+         * it has none, from its parent affiliation. Nothing is pre-filled without an incoming address.
+         */
+        static seedFromIncomingAffiliations(task) {
+          const { regMailing, regDelivery, recMailing, recDelivery } = this.incomingOfficeAddresses(task);
+          if (!regMailing && !recMailing) {
+            return {};
+          }
+          const regDeliverySame = !regDelivery || this.isSameOfficeAddress(regDelivery, regMailing);
+          const recDeliverySame = !recDelivery || this.isSameOfficeAddress(recDelivery, recMailing);
+          const recSameAsRegistered = !recMailing || this.isSameOfficeAddress(recMailing, regMailing) && this.isSameOfficeAddress(recDelivery ?? recMailing, regDelivery ?? regMailing);
+          return {
+            registeredOffice: {
+              mailingAddress: regMailing,
+              deliverySameAsMailing: regDeliverySame,
+              deliveryAddress: regDeliverySame ? void 0 : regDelivery
+            },
+            recordsOffice: {
+              sameAsRegisteredOffice: recSameAsRegistered,
+              mailingAddress: recSameAsRegistered ? void 0 : recMailing,
+              deliverySameAsMailing: recDeliverySame,
+              deliveryAddress: recDeliverySame ? void 0 : recDelivery
+            }
+          };
+        }
+        /** Keeps the saved flags and addresses, but fills an address the draft left empty from `incoming`. */
+        static fillEmptyAddresses(saved, incoming) {
+          const hasValues = (address) => EDITABLE_ADDRESS_CONTROLS.some((name) => Boolean(address?.[name]));
+          const pick = (savedAddress, incomingAddress) => hasValues(savedAddress) ? savedAddress : incomingAddress ?? savedAddress;
+          return {
+            registeredOffice: __spreadProps(__spreadValues({}, saved.registeredOffice), {
+              mailingAddress: pick(saved.registeredOffice?.mailingAddress, incoming.regMailing),
+              deliveryAddress: pick(saved.registeredOffice?.deliveryAddress, incoming.regDelivery)
+            }),
+            recordsOffice: __spreadProps(__spreadValues({}, saved.recordsOffice), {
+              mailingAddress: pick(saved.recordsOffice?.mailingAddress, incoming.recMailing),
+              deliveryAddress: pick(saved.recordsOffice?.deliveryAddress, incoming.recDelivery)
+            })
+          };
+        }
+        /** The four office addresses of the task's incoming Shared Address, as form values. */
+        static incomingOfficeAddresses(task) {
+          const incoming = task.incomingAffiliations ?? [];
+          const pickBy = (title, locationType) => {
+            const pool = incoming.filter((a) => a.role?.role_name === AddressRole2.SHARED_ADDRESS && a.role?.static_title === title).flatMap((a) => a.addresses?.length ? a.addresses : a.parent_affiliation?.addresses ?? []);
+            const wanted = locationType.toLowerCase();
+            const address = pool.find((a) => (a.computed_location_type ?? "").toLowerCase() === wanted || (a.location_type ?? "").toLowerCase() === wanted);
+            return address && this.isBritishColumbia(address) ? this.toOfficeAddressDelta(address) : void 0;
+          };
+          return {
+            regMailing: pickBy(AddressTitle2.REGISTERED_OFFICE, "Mailing"),
+            regDelivery: pickBy(AddressTitle2.REGISTERED_OFFICE, "Delivery"),
+            recMailing: pickBy(AddressTitle2.RECORDS_OFFICE, "Mailing"),
+            recDelivery: pickBy(AddressTitle2.RECORDS_OFFICE, "Delivery")
+          };
+        }
+        /** Street = street number + street name; the suite goes to Address Line 2. */
+        static toOfficeAddressDelta(address) {
+          const street = [getAddressComponent(address, "Street Number Only"), getAddressComponent(address, "Street Only")].filter(Boolean).join(" ") || getAddressComponent(address, "Street Address") || address.street || "";
+          return {
+            addressLine1: street,
+            addressLine2: getAddressComponent(address, "Suite/Apartment") || address.address2 || "",
+            city: address.city ?? "",
+            postalCode: address.postal_zip ?? "",
+            province: BC_DEFAULT_PROVINCE_STATE,
+            country: BC_DEFAULT_COUNTRY
+          };
+        }
+        /** An address with no province is accepted; the form only ever deals in British Columbia. */
+        static isBritishColumbia(address) {
+          const province = (address.province_state ?? "").trim().toLowerCase();
+          return !province || ["bc", "b.c.", "british columbia"].includes(province);
+        }
+        static isSameOfficeAddress(a, b) {
+          const key = (x) => [x?.addressLine1, x?.addressLine2, x?.city, x?.postalCode].map((v) => (v ?? "").trim().toLowerCase().replace(/\s+/g, " ")).join("|");
+          return key(a) === key(b);
+        }
+        /**
+         * The company's email: the entity's email options, then the Registered Office's email, then the
+         * entity's own, then any other address of the entity (e.g. a Head Office). Only a Business Email
+         * or an Email counts; a Personal Email never does.
+         */
+        static resolveCompanyEmail(task) {
+          const affiliations = task.entity.affiliations ?? [];
+          const registeredOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
+          return task.entity.emailOptions?.find(isCompanyEmail)?.value || registeredOffice?.addresses?.[0]?.communications?.find(isCompanyEmail)?.value || task.entity.communications?.find(isCompanyEmail)?.value || task.entity.addresses?.flatMap((a) => a.communications ?? []).find(isCompanyEmail)?.value || "";
+        }
+        /**
+         * Address Line 1*, Address Line 2, City*, Postal Code*, Province (BC), Country (Canada).
+         * Province and Country are always disabled; the rest follow `enabled`.
+         */
+        static createOfficeAddressFormGroup(delta, enabled = true) {
+          const group2 = new FormGroup({
+            [Controls.AddressLine1]: new FormControl(delta?.addressLine1 ?? "", Validators.required),
+            [Controls.AddressLine2]: new FormControl(delta?.addressLine2 ?? ""),
+            [Controls.City]: new FormControl(delta?.city ?? "", Validators.required),
+            [Controls.PostalCode]: new FormControl(delta?.postalCode ?? "", Validators.required),
+            [Controls.Province]: this.readOnly(delta?.province ?? BC_DEFAULT_PROVINCE_STATE),
+            [Controls.Country]: this.readOnly(delta?.country ?? BC_DEFAULT_COUNTRY)
+          });
+          this.setOfficeAddressEnabled(group2, enabled);
+          return group2;
+        }
+        /**
+         * Enables or disables the editable controls of an address grid (used by "Same as…" checkboxes).
+         * Hiding a grid also clears it. Showing it again refills it with the address Athennian sent for
+         * it, or leaves it empty when there is none (and when the user has already typed something).
+         */
+        static setOfficeAddressEnabled(group2, enabled) {
+          if (!group2) {
+            return;
+          }
+          const restore = incomingAddressByGrid.get(group2);
+          const isEmpty = EDITABLE_ADDRESS_CONTROLS.every((name) => !group2.get(name)?.value);
+          EDITABLE_ADDRESS_CONTROLS.forEach((name) => {
+            const control = group2.get(name);
+            if (enabled) {
+              control?.enable({ emitEvent: false });
+              if (restore && isEmpty) {
+                control?.setValue(restore[name] ?? "", { emitEvent: false });
+              }
+            } else {
+              control?.setValue("", { emitEvent: false });
+              control?.disable({ emitEvent: false });
+            }
+          });
+          group2.updateValueAndValidity({ emitEvent: false });
+        }
+        static generateReferenceNumbersFormGroup(deltaData, clientMatterNumber) {
+          return new FormGroup({
+            [Controls.ClientMatterNumber]: new FormControl(
+              // `??`: an explicitly cleared value ('') in a saved draft must be preserved; the entity default applies only when absent.
+              deltaData?.referenceNumber ?? clientMatterNumber ?? ""
+            ),
+            [Controls.DocketNumber]: new FormControl(deltaData?.docketNumber ?? "")
+          });
+        }
+        static readOnly(value) {
+          return new FormControl({ value: value ?? "", disabled: true });
+        }
+      };
+    }
+  });
+
+  // src/app/helpers/mappers/british-columbia-change-of-office-addresses.mapper.ts
+  function formatPostalCode(value) {
+    const compact = clean(value).replace(/[\s-]+/g, "").toUpperCase();
+    return compact.length === 6 ? `${compact.slice(0, 3)} ${compact.slice(3)}` : clean(value).toUpperCase();
+  }
+  function toEcoreAddress(address) {
+    const line2 = clean(address?.addressLine2);
+    return __spreadProps(__spreadValues({
+      streetAddress: clean(address?.addressLine1)
+    }, line2 ? { additionalStreetAddress: line2 } : {}), {
+      city: clean(address?.city),
+      provinceOrState: BC_PROVINCE_CODE,
+      postalOrZipCode: formatPostalCode(address?.postalCode),
+      country: CANADA_COUNTRY_CODE
+    });
+  }
+  function isSameAddress(a, b) {
+    const key = (x) => [x.streetAddress, x.additionalStreetAddress, x.city, x.provinceOrState, x.postalOrZipCode, x.country].map((v) => (v ?? "").trim().toLowerCase().replace(/\s+/g, " ")).join("|");
+    return key(a) === key(b);
+  }
+  function buildBCChangeOfOfficeAddressesValidateRequest(task, deltaData) {
+    const registered = deltaData.registeredOffice;
+    const records = deltaData.recordsOffice;
+    const registeredMailing = toEcoreAddress(registered?.mailingAddress);
+    const registeredDelivery = registered?.deliverySameAsMailing ? registeredMailing : toEcoreAddress(registered?.deliveryAddress);
+    const recordsMailing = records?.sameAsRegisteredOffice ? registeredMailing : toEcoreAddress(records?.mailingAddress);
+    const recordsDelivery = records?.sameAsRegisteredOffice ? registeredDelivery : records?.deliverySameAsMailing ? recordsMailing : toEcoreAddress(records?.deliveryAddress);
+    const registeredDeliverySame = isSameAddress(registeredDelivery, registeredMailing);
+    const recordsSameAsRegistered = isSameAddress(recordsMailing, registeredMailing);
+    const recordsDeliverySame = isSameAddress(recordsDelivery, recordsMailing);
+    const filing = {
+      registeredOfficeMailingAddress: registeredMailing,
+      isRegisteredOfficeDeliveryAddressSameAsMailing: registeredDeliverySame,
+      isRecordsOfficeMailingAddressSameAsRegisteredOfficeMailing: recordsSameAsRegistered,
+      isRecordsOfficeDeliveryAddressSameAsRecordsOfficeMailing: recordsDeliverySame,
+      // Both are picked on the form; the fallbacks only cover data saved before they were added.
+      companyEmail: clean(deltaData.companyEmail) || BritishColumbiaChangeOfOfficeAddressesFormHelper.resolveCompanyEmail(task),
+      isAnnualReportReminderRequired: deltaData.annualReportReminder === BCAnnualReportReminder.Yes
+    };
+    const reference = clean(deltaData.referenceNumbers?.referenceNumber);
+    const docket = clean(deltaData.referenceNumbers?.docketNumber);
+    if (reference) {
+      filing.reference = reference;
+    }
+    if (docket) {
+      filing.docket = docket;
+    }
+    if (!registeredDeliverySame) {
+      filing.registeredOfficeDeliveryAddress = registeredDelivery;
+    }
+    if (!recordsSameAsRegistered) {
+      filing.recordsOfficeMailingAddress = recordsMailing;
+    }
+    if (!recordsDeliverySame) {
+      filing.recordsOfficeDeliveryAddress = recordsDelivery;
+    }
+    return { filingType: "changeOfAddressFiling", filing };
+  }
+  function getBritishColumbiaAccessCode(task, env) {
+    const registryId = task.entity._profile.registry_id?.trim() ?? "";
+    if (registryId) {
+      return registryId;
+    }
+    return env === "TEST" ? TEMP_UAT_TEST_ACCESS_CODE : "";
+  }
+  var TEMP_UAT_TEST_ACCESS_CODE, BC_PROVINCE_CODE, CANADA_COUNTRY_CODE, clean;
+  var init_british_columbia_change_of_office_addresses_mapper = __esm({
+    "src/app/helpers/mappers/british-columbia-change-of-office-addresses.mapper.ts"() {
+      init_BritishColumbiaConstants();
+      init_british_columbia_change_of_office_addresses_form_helper();
+      TEMP_UAT_TEST_ACCESS_CODE = "12345678";
+      BC_PROVINCE_CODE = "BC";
+      CANADA_COUNTRY_CODE = "CA";
+      clean = (value) => (value ?? "").trim();
+    }
+  });
+
+  // src/app/helpers/mappers/british-columbia-annual-report.mapper.ts
+  function toBCOfficerPosition(title) {
+    return OFFICER_POSITIONS.get((title ?? "").trim().toLowerCase()) ?? "otherOffices";
+  }
+  function getBCAnnualReportOfficerChanges(task) {
+    const isOfficer = (a) => isPrincipalAffiliation2(a) && a.role?.role_name === OFFICER_ROLE_NAME && a._participant?.participant_type === "person";
+    return {
+      added: (task.incomingAffiliations ?? []).filter(isOfficer),
+      ceased: (task.outgoingAffiliations ?? []).filter(isOfficer)
+    };
+  }
+  function buildBCAnnualReportContext(task, env) {
+    return {
+      corporationNumber: task.entity._profile.corp_number ?? "",
+      accessCodeOrPassword: getBritishColumbiaAccessCode(task, env),
+      incorporationDate: String(task.entity._compliance?.incorporation_date ?? "").slice(0, 10),
+      filingType: "annualReportFiling"
+    };
+  }
+  function buildBCAnnualReportValidateRequest(task, deltaData) {
+    const { added, ceased } = getBCAnnualReportOfficerChanges(task);
+    return pruneUndefined({
+      filingType: "annualReportFiling",
+      filing: {
+        reference: deltaData.referenceNumbers?.referenceNumber || void 0,
+        docket: deltaData.referenceNumbers?.docketNumber || void 0,
+        addOfficers: added.map(mapAddedOfficer),
+        ceaseOfficers: ceased.map(mapCeasedOfficer),
+        // Athennian does not populate edits (UEM-235 mapping: `editOfficers: []`).
+        editOfficers: [],
+        companyEmail: deltaData.companyEmail?.trim() ?? "",
+        isAnnualReportReminderRequired: Boolean(deltaData.isAnnualReportReminderRequired)
+      }
+    });
+  }
+  function officerAddresses(affiliation) {
+    const addresses = affiliation.addresses?.length ? affiliation.addresses : affiliation.parent_affiliation?.addresses ?? [];
+    const delivery = pickAddress(addresses, "Delivery");
+    return {
+      // Falls back to the first address when none is typed "Mailing", like the other BC filings.
+      mailing: mapAddress(pickAddress(addresses, "Mailing", true)),
+      delivery: delivery ? mapAddress(delivery) : void 0
+    };
+  }
+  function officerName(affiliation) {
+    const profile = affiliation.participant?._profile;
+    return {
+      firstName: profile?.firstName ?? "",
+      middleName: profile?.middleName || void 0,
+      lastName: profile?.lastName ?? ""
+    };
+  }
+  function mapAddedOfficer(affiliation) {
+    const { mailing, delivery } = officerAddresses(affiliation);
+    const isSame = !delivery || sameAddress(delivery, mailing);
+    return __spreadProps(__spreadValues({}, officerName(affiliation)), {
+      positions: toBCOfficerPosition(affiliation.role?.static_title),
+      mailingAddress: mailing,
+      isDeliveryAddressSameAsMailing: isSame,
+      deliveryAddress: isSame ? void 0 : delivery
+    });
+  }
+  function mapCeasedOfficer(affiliation) {
+    const { mailing, delivery } = officerAddresses(affiliation);
+    return __spreadProps(__spreadValues({}, officerName(affiliation)), {
+      mailingAddress: mailing,
+      // The API requires a delivery address to cease an officer; send the mailing address again.
+      deliveryAddress: delivery ?? mailing
+    });
+  }
+  var OFFICER_ROLE_NAME, OFFICER_POSITIONS;
+  var init_british_columbia_annual_report_mapper = __esm({
+    "src/app/helpers/mappers/british-columbia-annual-report.mapper.ts"() {
+      init_common_utils();
+      init_british_columbia_change_of_office_addresses_mapper();
+      init_british_columbia_formation_mapper();
+      OFFICER_ROLE_NAME = "Officer";
+      OFFICER_POSITIONS = /* @__PURE__ */ new Map([
+        ["chairman", "chair"],
+        ["chair", "chair"],
+        ["chair person", "chair"],
+        ["chairwoman", "chair"],
+        ["president", "president"],
+        ["vice-president", "vicePresident"],
+        ["chief executive officer", "ceo"],
+        ["chief financial officer", "cfo"],
+        ["assistant secretary", "assistantSecretary"],
+        ["secretary", "secretary"],
+        ["treasurer", "treasurer"]
+      ]);
+    }
+  });
+
+  // src/app/helpers/british-columbia/annual-report/british-columbia-annual-report-form.helper.ts
+  var BritishColumbiaAnnualReportFormHelper;
+  var init_british_columbia_annual_report_form_helper = __esm({
+    "src/app/helpers/british-columbia/annual-report/british-columbia-annual-report-form.helper.ts"() {
+      init_forms();
+      init_british_columbia_form_enums();
+      init_initial_return_enums();
+      init_BritishColumbiaConstants();
+      init_common_utils();
+      init_british_columbia_annual_report_mapper();
+      init_british_columbia_formation_mapper();
+      init_british_columbia_formation_form_helper();
+      BritishColumbiaAnnualReportFormHelper = class {
+        static generateConfig(task) {
+          const delta = task.deltaData;
+          const { added, ceased } = getBCAnnualReportOfficerChanges(task);
+          const config2 = {};
+          config2[BCAnnualReportFormGroups.General] = new FormGroup({
+            [BCAnnualReportFormControls.ClientMatterNumber]: new FormControl(delta?.referenceNumbers?.referenceNumber ?? task.entity._profile.client_matter_number ?? ""),
+            [BCAnnualReportFormControls.DocketNumber]: new FormControl(delta?.referenceNumbers?.docketNumber ?? ""),
+            [BCAnnualReportFormControls.EntityIdentifier]: new FormControl({
+              value: task.entity._profile.corp_number ?? "",
+              disabled: true
+            })
+          });
+          config2[BCAnnualReportFormGroups.Officers] = new FormArray([
+            ...added.map((officer) => this.generateOfficerFormGroup(officer, IRAffiliationType.Add)),
+            ...ceased.map((officer) => this.generateOfficerFormGroup(officer, IRAffiliationType.Ceased))
+          ]);
+          const emailOptions = this.getCompanyEmailOptions(task);
+          config2[BCAnnualReportFormGroups.CompanyEmail] = new FormGroup({
+            // A saved choice wins; otherwise a lone entity email is preselected, else the user picks one.
+            [BCAnnualReportFormControls.CompanyEmail]: new FormControl(delta?.companyEmail ?? (emailOptions.length === 1 ? emailOptions[0].value : ""), [Validators.required, Validators.email, Validators.maxLength(BC_COMPANY_EMAIL_MAX_LENGTH)])
+          });
+          config2[BCAnnualReportFormGroups.AnnualReportReminder] = new FormGroup({
+            [BCAnnualReportFormControls.IsAnnualReportReminderRequired]: new FormControl(delta?.isAnnualReportReminderRequired ?? false)
+          });
+          return config2;
+        }
+        /** The entity's own emails (built by Athennian), plus a previously saved value that is no longer among them. */
+        static getCompanyEmailOptions(task) {
+          const options = (task.entity.emailOptions ?? []).filter((option) => option.value).map((option) => ({ value: option.value, label: option.value }));
+          const saved = task.deltaData?.companyEmail;
+          if (saved && !options.some((option) => option.value === saved)) {
+            options.push({ value: saved, label: saved });
+          }
+          return options.filter((option, index) => options.findIndex((other) => other.value === option.value) === index);
+        }
+        /** One read-only officer row; `AffiliationType` drives the Add / Cease chip. */
+        static generateOfficerFormGroup(affiliation, affiliationType) {
+          const addresses = affiliation.addresses?.length ? affiliation.addresses : affiliation.parent_affiliation?.addresses ?? [];
+          return new FormGroup({
+            [BCAnnualReportFormControls.Id]: new FormControl(affiliation._id),
+            [BCAnnualReportFormControls.AffiliationName]: new FormControl({
+              value: generateTaskAffiliationFullName(affiliation),
+              disabled: true
+            }),
+            [BCAnnualReportFormControls.Role]: new FormControl({
+              value: affiliation.role?.static_title ?? "",
+              disabled: true
+            }),
+            [BCAnnualReportFormControls.AffiliationType]: new FormControl(affiliationType),
+            [BCAnnualReportFormControls.EffectiveDate]: new FormControl({
+              value: affiliation.start_date ? toYyyyMmDd(affiliation.start_date) ?? "" : "",
+              disabled: true
+            }),
+            [BCAnnualReportFormControls.CeaseDate]: new FormControl({
+              value: affiliation.end_date ? toYyyyMmDd(affiliation.end_date) ?? "" : "",
+              disabled: true
+            }),
+            [BCAnnualReportFormControls.FullAddress]: new FormControl({
+              value: BritishColumbiaFormationFormHelper.formatFullAddress(pickAddress(addresses, "Mailing", true)),
+              disabled: true
+            })
+          });
+        }
+      };
+    }
+  });
+
   // src/app/helpers/british-columbia/change-of-directors/british-columbia-change-of-directors-form.helper.ts
-  var Controls, BritishColumbiaChangeOfDirectorsFormHelper;
+  var Controls2, BritishColumbiaChangeOfDirectorsFormHelper;
   var init_british_columbia_change_of_directors_form_helper = __esm({
     "src/app/helpers/british-columbia/change-of-directors/british-columbia-change-of-directors-form.helper.ts"() {
       init_forms();
@@ -84942,7 +85441,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_BritishColumbiaConstants();
       init_custom_validators();
       init_british_columbia_formation_form_helper();
-      Controls = BCChangeOfDirectorsFormControls;
+      Controls2 = BCChangeOfDirectorsFormControls;
       BritishColumbiaChangeOfDirectorsFormHelper = class {
         static generateConfig(task, _translateFn, currentDataExtract) {
           const affiliations = task.entity.affiliations ?? [];
@@ -84957,9 +85456,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const config2 = {};
           config2[BCChangeOfDirectorsFormGroups.ReferenceNumbers] = this.generateReferenceNumbersFormGroup(delta?.referenceNumbers, task.entity._profile?.client_matter_number, delta?.referenceNumbers?.referenceNumber);
           config2[BCChangeOfDirectorsFormGroups.CorporationDetails] = new FormGroup({
-            [Controls.CorporationName]: this.readOnly(task.entity._profile.name),
-            [Controls.IncorporationNumber]: this.readOnly(task.entity._profile.corp_number),
-            [Controls.CompanyEmail]: new FormControl(companyEmail, [Validators.required, Validators.email])
+            [Controls2.CorporationName]: this.readOnly(task.entity._profile.name),
+            [Controls2.IncorporationNumber]: this.readOnly(task.entity._profile.corp_number),
+            [Controls2.CompanyEmail]: new FormControl(companyEmail, [Validators.required, Validators.email])
           });
           const isDirector = (a) => isPrincipalAffiliation2(a) && a.role?.role_name === "Director";
           const incoming = task.incomingAffiliations ?? [];
@@ -84967,9 +85466,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const ceasedIds = new Set(outgoing.filter(isDirector).map((a) => a._id));
           const hasAddOrCease = ceasedIds.size > 0 || incoming.filter(isDirector).length > 0;
           config2[BCChangeOfDirectorsFormGroups.FilingDetails] = new FormGroup({
-            [Controls.DirectorsAddedOrDeleted]: new FormControl(delta?.filingDetails?.directorsAddedOrDeleted ?? hasAddOrCease),
-            [Controls.ChangeDate]: this.readOnly(effectiveDate),
-            [Controls.FilingFee]: this.readOnly(BC_CHANGE_OF_DIRECTORS_FILING_FEE)
+            [Controls2.DirectorsAddedOrDeleted]: new FormControl(delta?.filingDetails?.directorsAddedOrDeleted ?? hasAddOrCease),
+            [Controls2.ChangeDate]: this.readOnly(effectiveDate),
+            [Controls2.FilingFee]: this.readOnly(BC_CHANGE_OF_DIRECTORS_FILING_FEE)
           });
           const currentDirectorKeys = this.getCurrentDirectorKeys(currentDataExtract);
           const directors = [
@@ -84981,13 +85480,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             config2[BCChangeOfDirectorsFormGroups.Directors] = new FormArray(directors.length ? directors : fallbackDirectors);
           }
           config2[BCChangeOfDirectorsFormGroups.Notification] = new FormGroup({
-            [Controls.RegisterAsOfDate]: this.readOnly(today),
-            [Controls.NotificationMethod]: new FormControl(delta?.notification?.method ?? BCNotificationMethod.Email, Validators.required),
-            [Controls.NotificationEmail]: new FormControl(delta?.notification?.email ?? companyEmail, requiredIfValue(Controls.NotificationMethod, BCNotificationMethod.Email)),
-            [Controls.NotificationMailingAddress]: this.readOnly(registeredMailing)
+            [Controls2.RegisterAsOfDate]: this.readOnly(today),
+            [Controls2.NotificationMethod]: new FormControl(delta?.notification?.method ?? BCNotificationMethod.Email, Validators.required),
+            [Controls2.NotificationEmail]: new FormControl(delta?.notification?.email ?? companyEmail, requiredIfValue(Controls2.NotificationMethod, BCNotificationMethod.Email)),
+            [Controls2.NotificationMailingAddress]: this.readOnly(registeredMailing)
           });
           config2[BCChangeOfDirectorsFormGroups.AnnualReportReminder] = new FormGroup({
-            [Controls.AnnualReportReminder]: new FormControl(delta?.annualReportReminder ?? BCAnnualReportReminder.Yes, Validators.required)
+            [Controls2.AnnualReportReminder]: new FormControl(delta?.annualReportReminder ?? BCAnnualReportReminder.Yes, Validators.required)
           });
           return config2;
         }
@@ -85032,18 +85531,18 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }
         static generateReferenceNumbersFormGroup(deltaData, clientMatterNumber, savedClientMatterNumber) {
           return new FormGroup({
-            [Controls.ClientMatterNumber]: new FormControl(clientMatterNumber ?? savedClientMatterNumber ?? ""),
-            [Controls.DocketNumber]: new FormControl(deltaData?.docketNumber ?? "")
+            [Controls2.ClientMatterNumber]: new FormControl(clientMatterNumber ?? savedClientMatterNumber ?? ""),
+            [Controls2.DocketNumber]: new FormControl(deltaData?.docketNumber ?? "")
           });
         }
         static generateDirectorFormGroup(affiliation, affiliationType) {
           const addresses = affiliation.addresses?.length ? affiliation.addresses : affiliation.parent_affiliation?.addresses ?? [];
           return new FormGroup({
-            [Controls.Id]: new FormControl(affiliation._id),
-            [Controls.AffiliationName]: this.readOnly(generateTaskAffiliationFullName(affiliation)),
-            [Controls.AffiliationType]: this.readOnly(affiliationType),
-            [Controls.MailingAddress]: this.readOnly(BritishColumbiaFormationFormHelper.formatFullAddress(BritishColumbiaFormationFormHelper.pickAddress(addresses, "Mailing"))),
-            [Controls.DeliveryAddress]: this.readOnly(BritishColumbiaFormationFormHelper.formatFullAddress(BritishColumbiaFormationFormHelper.pickAddress(addresses, "Delivery")))
+            [Controls2.Id]: new FormControl(affiliation._id),
+            [Controls2.AffiliationName]: this.readOnly(generateTaskAffiliationFullName(affiliation)),
+            [Controls2.AffiliationType]: this.readOnly(affiliationType),
+            [Controls2.MailingAddress]: this.readOnly(BritishColumbiaFormationFormHelper.formatFullAddress(BritishColumbiaFormationFormHelper.pickAddress(addresses, "Mailing"))),
+            [Controls2.DeliveryAddress]: this.readOnly(BritishColumbiaFormationFormHelper.formatFullAddress(BritishColumbiaFormationFormHelper.pickAddress(addresses, "Delivery")))
           });
         }
         static generateDirectorFormGroupsFromChangeDirectors(task) {
@@ -85074,11 +85573,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static generateDirectorFormGroupFromPayload(director, affiliationType) {
           const name = director?.PersonName ?? director?.personName ?? director;
           return new FormGroup({
-            [Controls.Id]: new FormControl(director?.Id ?? director?.id ?? ""),
-            [Controls.AffiliationName]: this.readOnly(this.formatDirectorName(name?.FirstName ?? name?.firstName, name?.MiddleName ?? name?.middleName, name?.LastName ?? name?.lastName)),
-            [Controls.AffiliationType]: this.readOnly(affiliationType),
-            [Controls.MailingAddress]: this.readOnly(this.formatPayloadAddress(director?.mailingAddress ?? director?.MailingAddress ?? director)),
-            [Controls.DeliveryAddress]: this.readOnly(this.formatPayloadAddress(director?.deliveryAddress ?? director?.DeliveryAddress ?? director))
+            [Controls2.Id]: new FormControl(director?.Id ?? director?.id ?? ""),
+            [Controls2.AffiliationName]: this.readOnly(this.formatDirectorName(name?.FirstName ?? name?.firstName, name?.MiddleName ?? name?.middleName, name?.LastName ?? name?.lastName)),
+            [Controls2.AffiliationType]: this.readOnly(affiliationType),
+            [Controls2.MailingAddress]: this.readOnly(this.formatPayloadAddress(director?.mailingAddress ?? director?.MailingAddress ?? director)),
+            [Controls2.DeliveryAddress]: this.readOnly(this.formatPayloadAddress(director?.deliveryAddress ?? director?.DeliveryAddress ?? director))
           });
         }
         static formatDirectorName(firstName, middleName, lastName) {
@@ -85107,320 +85606,891 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
   });
 
-  // src/app/helpers/british-columbia/change-of-office-addresses/british-columbia-change-of-office-addresses-form.helper.ts
-  var Controls2, COMPANY_EMAIL_TYPES, isCompanyEmail, incomingAddressByGrid, EDITABLE_ADDRESS_CONTROLS, BritishColumbiaChangeOfOfficeAddressesFormHelper;
-  var init_british_columbia_change_of_office_addresses_form_helper = __esm({
-    "src/app/helpers/british-columbia/change-of-office-addresses/british-columbia-change-of-office-addresses-form.helper.ts"() {
-      init_forms();
-      init_common_models();
+  // src/app/constants/ui/british-columbia-formation-form.constants.ts
+  var BC_NAME_TYPE_OPTIONS, labelledValue, isNamed, BC_FORMATION_DELTA_CARD_FORM_REFERENCE_NUMBERS_FIELDS, BC_FORMATION_DELTA_CARD_FORM_CORPORATION_DETAILS_FIELDS, BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_FIELDS, BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_ROW_FIELDS, BC_FORMATION_CARD_FORM_REGISTERED_OFFICE_FIELDS, BC_FORMATION_CARD_FORM_RECORDS_OFFICE_FIELDS, BC_FORMATION_DELTA_CARD_FORM_COMPLETING_PARTY_FIELDS, BC_FORMATION_CARD_FORM_DIRECTORS_FIELDS, BC_FORMATION_CARD_FORM_INCORPORATORS_FIELDS;
+  var init_british_columbia_formation_form_constants = __esm({
+    "src/app/constants/ui/british-columbia-formation-form.constants.ts"() {
+      init_form_enums();
       init_british_columbia_form_enums();
       init_BritishColumbiaConstants();
       init_british_columbia_formation_form_helper();
-      init_BritishColumbiaConstants();
-      init_common_utils();
-      Controls2 = BCChangeOfOfficeAddressesFormControls;
-      COMPANY_EMAIL_TYPES = ["Business Email", "Email"];
-      isCompanyEmail = (communication) => Boolean(communication?.value) && COMPANY_EMAIL_TYPES.includes(communication?.type ?? "");
-      incomingAddressByGrid = /* @__PURE__ */ new WeakMap();
-      EDITABLE_ADDRESS_CONTROLS = [
-        Controls2.AddressLine1,
-        Controls2.AddressLine2,
-        Controls2.City,
-        Controls2.PostalCode
-      ];
-      BritishColumbiaChangeOfOfficeAddressesFormHelper = class {
-        static generateConfig(task, _translateFn, currentDataExtract) {
-          const affiliations = task.entity.affiliations ?? [];
-          const delta = task.deltaData;
-          const format = BritishColumbiaFormationFormHelper.formatFullAddress;
-          const pick = BritishColumbiaFormationFormHelper.pickAddress;
-          const registeredOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
-          const recordsOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.RECORDS_OFFICE);
-          const incoming = this.incomingOfficeAddresses(task);
-          const extract = this.officeExtract(currentDataExtract);
-          const incomingSeed = this.seedFromIncomingAffiliations(task);
-          const seed = this.withCurrentAddresses(incomingSeed, incoming, registeredOffice, recordsOffice, extract);
-          const config2 = {};
-          config2[BCChangeOfOfficeAddressesFormGroups.ReferenceNumbers] = this.generateReferenceNumbersFormGroup(delta?.referenceNumbers, task.entity._profile.client_matter_number);
-          config2[BCChangeOfOfficeAddressesFormGroups.CorporationDetails] = new FormGroup({
-            [Controls2.CorporationName]: this.readOnly(task.entity._profile.name),
-            [Controls2.IncorporationNumber]: this.readOnly(task.entity._profile.corp_number),
-            [Controls2.CompanyEmail]: new FormControl(delta?.companyEmail || this.resolveCompanyEmail(task), Validators.required)
-          });
-          config2[BCChangeOfOfficeAddressesFormGroups.AnnualReportReminder] = new FormGroup({
-            [Controls2.AnnualReportReminder]: new FormControl(delta?.annualReportReminder ?? BCAnnualReportReminder.Yes, Validators.required)
-          });
-          const regDeliverySame = seed.registeredOffice?.deliverySameAsMailing ?? true;
-          config2[BCChangeOfOfficeAddressesFormGroups.RegisteredOfficeAddress] = new FormGroup({
-            [Controls2.CurrentMailingAddress]: this.readOnly(this.previousText(extract, "regMailing", format(pick(registeredOffice?.addresses, "Mailing")))),
-            [Controls2.CurrentDeliveryAddress]: this.readOnly(this.previousText(extract, "regDelivery", format(pick(registeredOffice?.addresses, "Delivery")))),
-            [Controls2.NewMailingAddress]: this.createOfficeAddressFormGroup(seed.registeredOffice?.mailingAddress, true),
-            [Controls2.DeliverySameAsMailing]: new FormControl(regDeliverySame),
-            [Controls2.NewDeliveryAddress]: this.createOfficeAddressFormGroup(seed.registeredOffice?.deliveryAddress, !regDeliverySame)
-          });
-          const recSameAsRegistered = seed.recordsOffice?.sameAsRegisteredOffice ?? true;
-          const recDeliverySame = seed.recordsOffice?.deliverySameAsMailing ?? true;
-          config2[BCChangeOfOfficeAddressesFormGroups.RecordsOfficeAddress] = new FormGroup({
-            [Controls2.CurrentMailingAddress]: this.readOnly(this.previousText(extract, "recMailing", format(pick(recordsOffice?.addresses, "Mailing")))),
-            [Controls2.CurrentDeliveryAddress]: this.readOnly(this.previousText(extract, "recDelivery", format(pick(recordsOffice?.addresses, "Delivery")))),
-            [Controls2.SameAsRegisteredOffice]: new FormControl(recSameAsRegistered),
-            [Controls2.NewMailingAddress]: this.createOfficeAddressFormGroup(seed.recordsOffice?.mailingAddress, !recSameAsRegistered),
-            [Controls2.DeliverySameAsMailing]: new FormControl(recDeliverySame),
-            [Controls2.NewDeliveryAddress]: this.createOfficeAddressFormGroup(seed.recordsOffice?.deliveryAddress, !recSameAsRegistered && !recDeliverySame)
-          });
-          const grid = (group2, control) => config2[group2].get(control);
-          const register = (target, address) => address && incomingAddressByGrid.set(target, address);
-          register(grid(BCChangeOfOfficeAddressesFormGroups.RegisteredOfficeAddress, Controls2.NewDeliveryAddress), incoming.regDelivery);
-          register(grid(BCChangeOfOfficeAddressesFormGroups.RecordsOfficeAddress, Controls2.NewMailingAddress), incoming.recMailing);
-          register(grid(BCChangeOfOfficeAddressesFormGroups.RecordsOfficeAddress, Controls2.NewDeliveryAddress), incoming.recDelivery);
-          return config2;
-        }
-        /** The company email choices: the entity's email options, plus the resolved default if it isn't one. */
-        static getCompanyEmailOptions(task) {
-          const values = (task.entity.emailOptions ?? []).filter(isCompanyEmail).map((o) => o.value);
-          const fallback = this.resolveCompanyEmail(task);
-          return [...new Set(fallback ? [...values, fallback] : values)].map((value) => ({
-            value,
-            label: value
-          }));
+      BC_NAME_TYPE_OPTIONS = Object.values(BCNameType).filter((v) => typeof v === "number").map((v) => ({ label: BCNameTypeLabel[v], value: v }));
+      labelledValue = (label, value, t) => `<span class="body-1-semibold">${t(label)}:</span> ${value || t("None")}`;
+      isNamed = (form) => form.get(BCFormationFormControls.CorporationNameType)?.value === BCNameType.Named;
+      BC_FORMATION_DELTA_CARD_FORM_REFERENCE_NUMBERS_FIELDS = [
+        {
+          type: FormType.Input,
+          label: "Client/Matter Number",
+          formControlName: BCFormationFormControls.ClientMatterNumber
+        },
+        {
+          type: FormType.Input,
+          label: "Docket Number",
+          formControlName: BCFormationFormControls.DocketNumber
         }
-        /**
-         * Pre-fills the new addresses from the task's incoming "Shared Address" affiliations (Registered
-         * Office / Records Office), taking each Mailing / Delivery address from the affiliation or, when
-         * it has none, from its parent affiliation. Nothing is pre-filled without an incoming address.
-         */
-        static seedFromIncomingAffiliations(task) {
-          const { regMailing, regDelivery, recMailing, recDelivery } = this.incomingOfficeAddresses(task);
-          if (!regMailing && !recMailing) {
-            return {};
+      ];
+      BC_FORMATION_DELTA_CARD_FORM_CORPORATION_DETAILS_FIELDS = [
+        {
+          type: FormType.Select,
+          label: "Corporation Name Type",
+          formControlName: BCFormationFormControls.CorporationNameType,
+          required: true,
+          options: BC_NAME_TYPE_OPTIONS,
+          needTranslate: true,
+          onChange: (form) => {
+            form.get(BCFormationFormControls.CompanyName)?.updateValueAndValidity({ emitEvent: false });
+            form.get(BCFormationFormControls.NameReservationNumber)?.updateValueAndValidity({ emitEvent: false });
           }
-          const regDeliverySame = !regDelivery || this.isSameOfficeAddress(regDelivery, regMailing);
-          const recDeliverySame = !recDelivery || this.isSameOfficeAddress(recDelivery, recMailing);
-          const recSameAsRegistered = !recMailing || this.isSameOfficeAddress(recMailing, regMailing) && this.isSameOfficeAddress(recDelivery ?? recMailing, regDelivery ?? regMailing);
-          return {
-            registeredOffice: {
-              mailingAddress: regMailing,
-              deliverySameAsMailing: regDeliverySame,
-              deliveryAddress: regDeliverySame ? void 0 : regDelivery
-            },
-            recordsOffice: {
-              sameAsRegisteredOffice: recSameAsRegistered,
-              mailingAddress: recSameAsRegistered ? void 0 : recMailing,
-              deliverySameAsMailing: recDeliverySame,
-              deliveryAddress: recDeliverySame ? void 0 : recDelivery
-            }
-          };
+        },
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-6 beside-select",
+          // Numbered only: a Named company shows no preview of the typed name.
+          isVisible: (form) => !isNamed(form),
+          dynamicLabel: () => BC_NUMBERED_NAME_PREVIEW
+        },
+        {
+          type: FormType.Input,
+          label: "Proposed Corporate Name",
+          formControlName: BCFormationFormControls.CompanyName,
+          required: true,
+          isVisible: isNamed,
+          class: "column-3"
+        },
+        {
+          type: FormType.Input,
+          label: "Name Reservation #",
+          formControlName: BCFormationFormControls.NameReservationNumber,
+          required: true,
+          maxLength: 9,
+          errorMessage: "Enter a valid Name Reservation number (for example NR1234567)",
+          showRequiredMessage: true,
+          isVisible: isNamed,
+          class: "span-6"
+        },
+        {
+          type: FormType.Text,
+          formControlName: BCFormationFormControls.RequestedDateForIncorporation,
+          class: "span-12 spaced-text",
+          dynamicLabel: (form, t) => labelledValue("Requested Date for Incorporation", form.get(BCFormationFormControls.RequestedDateForIncorporation)?.value, t)
+        },
+        {
+          type: FormType.Text,
+          formControlName: BCFormationFormControls.IsFutureEffectiveDate,
+          class: "span-12 fee-warning",
+          isVisible: (form) => Boolean(form.get(BCFormationFormControls.IsFutureEffectiveDate)?.value),
+          dynamicLabel: (_, t) => t("There is an additional fee of {{fee}} for an effective date in the future.").replace("{{fee}}", BC_FUTURE_EFFECTIVE_DATE_FEE)
+        },
+        {
+          // Options are filled per task from `task.entity.emailOptions` by the incorporation form.
+          type: FormType.Select,
+          label: "Company Email",
+          formControlName: BCFormationFormControls.CompanyEmail,
+          required: true,
+          options: [],
+          class: "span-6"
         }
-        /**
-         * For an office without an incoming address, the new address is its
-         * current address on the register (so the filing leaves it unchanged). A current address outside
-         * British Columbia is not used: the office is then reported as missing.
-         */
-        static withCurrentAddresses(seed, incoming, registeredOffice, recordsOffice, extract) {
-          const pickBy = BritishColumbiaFormationFormHelper.pickAddress;
-          const current = (office, type, key) => {
-            if (extract) {
-              const registry = extract[key];
-              return registry && this.isBritishColumbiaExtract(registry) ? this.extractToOfficeAddressDelta(registry) : void 0;
+        // The company password is not shown: it is taken from the entity's registry ID.
+      ];
+      BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_FIELDS = [
+        {
+          type: FormType.Checkbox,
+          label: "This company uses one or more translations of its name outside of Canada.",
+          formControlName: BCFormationFormControls.UsesNameTranslation,
+          class: "span-12",
+          onChange: (form) => {
+            const rows = form.get(BCFormationFormControls.NameTranslations);
+            const enabled = Boolean(form.get(BCFormationFormControls.UsesNameTranslation)?.value);
+            if (!rows) {
+              return;
             }
-            const address = pickBy(office?.addresses, type);
-            return address && this.isBritishColumbia(address) ? this.toOfficeAddressDelta(address) : void 0;
-          };
-          const result = __spreadValues({}, seed);
-          if (!incoming.regMailing) {
-            const mailing = current(registeredOffice, "Mailing", "regMailing");
-            const delivery = current(registeredOffice, "Delivery", "regDelivery");
-            if (mailing) {
-              const same = !delivery || this.isSameOfficeAddress(delivery, mailing);
-              result.registeredOffice = {
-                mailingAddress: mailing,
-                deliverySameAsMailing: same,
-                deliveryAddress: same ? void 0 : delivery
-              };
+            if (enabled && rows.length === 0) {
+              rows.push(BritishColumbiaFormationFormHelper.createNameTranslationFormGroup());
             }
-          }
-          if (!incoming.recMailing) {
-            const mailing = current(recordsOffice, "Mailing", "recMailing");
-            const delivery = current(recordsOffice, "Delivery", "recDelivery");
-            if (mailing) {
-              const registeredMailing = result.registeredOffice?.mailingAddress;
-              const registeredDelivery = result.registeredOffice?.deliveryAddress ?? registeredMailing;
-              const sameAsRegistered = this.isSameOfficeAddress(mailing, registeredMailing) && this.isSameOfficeAddress(delivery ?? mailing, registeredDelivery);
-              const deliverySame = !delivery || this.isSameOfficeAddress(delivery, mailing);
-              result.recordsOffice = {
-                sameAsRegisteredOffice: sameAsRegistered,
-                mailingAddress: sameAsRegistered ? void 0 : mailing,
-                deliverySameAsMailing: deliverySame,
-                deliveryAddress: deliverySame ? void 0 : delivery
-              };
-            } else {
-              result.recordsOffice = { sameAsRegisteredOffice: false, deliverySameAsMailing: false };
+            if (!enabled) {
+              rows.clear();
             }
           }
-          return result;
+        },
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-12",
+          isVisible: (form) => Boolean(form.get(BCFormationFormControls.UsesNameTranslation)?.value),
+          dynamicLabel: (_, t) => `<span class="body-1-semibold">${t("Note")}:</span> ${t("Name translations must use the Latin Alphabet (English, French, etc.). Names that use other writing systems must spell the name phonetically in English or French.")}`
         }
-        /** The four office addresses of the registry's data extract, or undefined when there is none. */
-        static officeExtract(extract) {
-          const data = extract?.dataExtract;
-          if (!data || !(data["registeredOfficeMailingAddress"] || data["registeredOfficeDeliveryAddress"] || data["recordsOfficeMailingAddress"] || data["recordsOfficeDeliveryAddress"])) {
-            return void 0;
-          }
-          return {
-            regMailing: data["registeredOfficeMailingAddress"],
-            regDelivery: data["registeredOfficeDeliveryAddress"],
-            recMailing: data["recordsOfficeMailingAddress"],
-            recDelivery: data["recordsOfficeDeliveryAddress"]
-          };
+      ];
+      BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_ROW_FIELDS = [
+        {
+          type: FormType.Input,
+          label: "Name Translation",
+          formControlName: BCFormationFormControls.NameTranslation,
+          required: true,
+          class: "span-6"
         }
-        /** The "Previous" text of an office line: the registry's address, else the Entity's own. */
-        static previousText(extract, key, fallback) {
-          if (!extract) {
-            return fallback;
+      ];
+      BC_FORMATION_CARD_FORM_REGISTERED_OFFICE_FIELDS = [
+        {
+          type: FormType.Text,
+          formControlName: BCFormationFormControls.MailingAddress,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Mailing Address - Full Address", form.get(BCFormationFormControls.MailingAddress)?.value, t)
+        },
+        {
+          type: FormType.Text,
+          formControlName: BCFormationFormControls.DeliveryAddress,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Delivery Address - Full Address", form.get(BCFormationFormControls.DeliveryAddress)?.value, t)
+        }
+      ];
+      BC_FORMATION_CARD_FORM_RECORDS_OFFICE_FIELDS = [
+        {
+          type: FormType.Text,
+          formControlName: BCFormationFormControls.RecordsOfficeMailingAddress,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Mailing Address - Full Address", form.get(BCFormationFormControls.RecordsOfficeMailingAddress)?.value, t)
+        },
+        {
+          type: FormType.Text,
+          formControlName: BCFormationFormControls.RecordsOfficeDeliveryAddress,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Delivery Address - Full Address", form.get(BCFormationFormControls.RecordsOfficeDeliveryAddress)?.value, t)
+        }
+      ];
+      BC_FORMATION_DELTA_CARD_FORM_COMPLETING_PARTY_FIELDS = [
+        {
+          type: FormType.Input,
+          label: "First Name",
+          formControlName: BCFormationFormControls.CompletingPartyFirstName,
+          required: true,
+          class: "column-3"
+        },
+        {
+          type: FormType.Input,
+          label: "Middle Name",
+          formControlName: BCFormationFormControls.CompletingPartyMiddleName,
+          class: "column-3"
+        },
+        {
+          type: FormType.Input,
+          label: "Last Name",
+          formControlName: BCFormationFormControls.CompletingPartyLastName,
+          required: true,
+          class: "column-3"
+        },
+        {
+          type: FormType.Input,
+          inputType: "email",
+          label: "Email",
+          formControlName: BCFormationFormControls.CompletingPartyEmail,
+          required: true,
+          errorMessage: "Enter a valid email address",
+          showRequiredMessage: true,
+          class: "column-3"
+        },
+        {
+          type: FormType.Text,
+          formControlName: "",
+          class: "span-12",
+          dynamicLabel: (_, t) => t("A copy of the filed Incorporation Application is emailed to this address.")
+        },
+        {
+          type: FormType.Input,
+          label: "Street Address",
+          formControlName: BCFormationFormControls.AddressLine1,
+          required: true,
+          class: "column-3"
+        },
+        {
+          type: FormType.Input,
+          label: "Additional Street Address",
+          formControlName: BCFormationFormControls.AddressLine2,
+          class: "column-3"
+        },
+        {
+          type: FormType.Input,
+          label: "City",
+          formControlName: BCFormationFormControls.City,
+          required: true,
+          class: "column-2"
+        },
+        {
+          type: FormType.Input,
+          label: "Province / State",
+          formControlName: BCFormationFormControls.ProvinceState,
+          required: true,
+          class: "column-2"
+        },
+        {
+          type: FormType.Input,
+          label: "Postal / Zip Code",
+          formControlName: BCFormationFormControls.PostalZip,
+          required: true,
+          errorMessage: "Enter a valid Canadian postal code (for example V8W 1X4)",
+          showRequiredMessage: true,
+          class: "column-2"
+        },
+        {
+          type: FormType.Select,
+          label: "Country",
+          formControlName: BCFormationFormControls.Country,
+          required: true,
+          options: BC_COMPLETING_PARTY_COUNTRY_OPTIONS,
+          class: "span-4",
+          // Province / State is required for Canada and the US, and the postal code format is Canada-only.
+          onChange: (form) => {
+            [BCFormationFormControls.ProvinceState, BCFormationFormControls.PostalZip].forEach((control) => form.get(control)?.updateValueAndValidity({ emitEvent: false }));
           }
-          const address = extract[key];
-          const province = this.isBritishColumbiaExtract(address) ? BC_DEFAULT_PROVINCE_STATE : address?.provinceOrState;
-          const country = (address?.country ?? "").toUpperCase() === "CA" ? BC_DEFAULT_COUNTRY : address?.country;
-          return [
-            address?.streetAddress,
-            address?.additionalStreetAddress,
-            address?.city,
-            province,
-            address?.postalOrZipCode,
-            country
-          ].filter((part) => Boolean(part?.trim())).join(", ");
+        },
+        {
+          type: FormType.Checkbox,
+          // Checkbox labels don't get the renderer's required asterisk, so it is added here (AC2).
+          dynamicLabel: (_, t) => `${t("The Completing Party confirms they have examined the Articles and the Incorporation Agreement, and the signature requirements have been met.")} *`,
+          formControlName: BCFormationFormControls.HasConfirmedCompletion,
+          required: true,
+          class: "span-12"
+        },
+        {
+          type: FormType.Checkbox,
+          // Checkbox labels don't get the renderer's required asterisk, so it is added here (AC2).
+          dynamicLabel: (_, t) => `${t("I have a signed Incorporation Agreement and a set of Articles for the company to be incorporated.")} *`,
+          formControlName: BCFormationFormControls.HasRequiredDocuments,
+          required: true,
+          class: "span-12"
         }
-        static isBritishColumbiaExtract(address) {
-          const province = (address?.provinceOrState ?? "").trim().toLowerCase();
-          return !!address && ["bc", "b.c.", "british columbia"].includes(province);
+      ];
+      BC_FORMATION_CARD_FORM_DIRECTORS_FIELDS = [
+        {
+          type: FormType.Text,
+          formControlName: BCFormationFormControls.MailingAddress,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Mailing Address - Full Address", form.get(BCFormationFormControls.MailingAddress)?.value, t)
+        },
+        {
+          type: FormType.Text,
+          formControlName: BCFormationFormControls.DeliveryAddress,
+          class: "span-12",
+          // A director without a Delivery address is filed with "delivery same as mailing", so the
+          // Mailing address is shown, as in the draft.
+          dynamicLabel: (form, t) => labelledValue("Delivery Address - Full Address", form.get(BCFormationFormControls.DeliveryAddress)?.value || form.get(BCFormationFormControls.MailingAddress)?.value, t)
         }
-        static extractToOfficeAddressDelta(address) {
-          return {
-            addressLine1: address.streetAddress ?? "",
-            addressLine2: address.additionalStreetAddress ?? "",
-            city: address.city ?? "",
-            postalCode: address.postalOrZipCode ?? "",
-            province: BC_DEFAULT_PROVINCE_STATE,
-            country: BC_DEFAULT_COUNTRY
-          };
+      ];
+      BC_FORMATION_CARD_FORM_INCORPORATORS_FIELDS = [
+        {
+          type: FormType.Text,
+          formControlName: BCFormationFormControls.FullAddress,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Full Address", form.get(BCFormationFormControls.FullAddress)?.value, t)
         }
-        /** The four office addresses of the task's incoming Shared Address, as form values. */
-        static incomingOfficeAddresses(task) {
-          const incoming = task.incomingAffiliations ?? [];
-          const pickBy = (title, locationType) => {
-            const pool = incoming.filter((a) => a.role?.role_name === AddressRole2.SHARED_ADDRESS && a.role?.static_title === title).flatMap((a) => a.addresses?.length ? a.addresses : a.parent_affiliation?.addresses ?? []);
-            const wanted = locationType.toLowerCase();
-            const address = pool.find((a) => (a.computed_location_type ?? "").toLowerCase() === wanted || (a.location_type ?? "").toLowerCase() === wanted);
-            return address && this.isBritishColumbia(address) ? this.toOfficeAddressDelta(address) : void 0;
-          };
-          return {
-            regMailing: pickBy(AddressTitle2.REGISTERED_OFFICE, "Mailing"),
-            regDelivery: pickBy(AddressTitle2.REGISTERED_OFFICE, "Delivery"),
-            recMailing: pickBy(AddressTitle2.RECORDS_OFFICE, "Mailing"),
-            recDelivery: pickBy(AddressTitle2.RECORDS_OFFICE, "Delivery")
-          };
+      ];
+    }
+  });
+
+  // src/app/constants/ui/british-columbia-annual-report-form.constants.ts
+  var BC_ANNUAL_REPORT_GENERAL_FIELDS, BC_ANNUAL_REPORT_OFFICERS_FIELDS, buildBCAnnualReportCompanyEmailFields, BC_ANNUAL_REPORT_REMINDER_FIELDS;
+  var init_british_columbia_annual_report_form_constants = __esm({
+    "src/app/constants/ui/british-columbia-annual-report-form.constants.ts"() {
+      init_form_enums();
+      init_british_columbia_form_enums();
+      init_british_columbia_formation_form_constants();
+      BC_ANNUAL_REPORT_GENERAL_FIELDS = [
+        {
+          type: FormType.Input,
+          label: "Client/Matter Number",
+          formControlName: BCAnnualReportFormControls.ClientMatterNumber
+        },
+        {
+          type: FormType.Input,
+          label: "Docket Number",
+          formControlName: BCAnnualReportFormControls.DocketNumber
+        },
+        {
+          type: FormType.Text,
+          formControlName: BCAnnualReportFormControls.EntityIdentifier,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Entity Identifier", form.get(BCAnnualReportFormControls.EntityIdentifier)?.value, t)
         }
-        /** Street = street number + street name; the suite goes to Address Line 2. */
-        static toOfficeAddressDelta(address) {
-          const street = [getAddressComponent(address, "Street Number Only"), getAddressComponent(address, "Street Only")].filter(Boolean).join(" ") || getAddressComponent(address, "Street Address") || address.street || "";
-          return {
-            addressLine1: street,
-            addressLine2: getAddressComponent(address, "Suite/Apartment") || address.address2 || "",
-            city: address.city ?? "",
-            postalCode: address.postal_zip ?? "",
-            province: BC_DEFAULT_PROVINCE_STATE,
-            country: BC_DEFAULT_COUNTRY
-          };
+      ];
+      BC_ANNUAL_REPORT_OFFICERS_FIELDS = [
+        {
+          type: FormType.Text,
+          formControlName: BCAnnualReportFormControls.EffectiveDate,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Effective Date", form.get(BCAnnualReportFormControls.EffectiveDate)?.value, t)
+        },
+        {
+          type: FormType.Text,
+          formControlName: BCAnnualReportFormControls.CeaseDate,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Cease Date", form.get(BCAnnualReportFormControls.CeaseDate)?.value, t)
+        },
+        {
+          type: FormType.Text,
+          formControlName: BCAnnualReportFormControls.FullAddress,
+          class: "span-12",
+          dynamicLabel: (form, t) => labelledValue("Full Address", form.get(BCAnnualReportFormControls.FullAddress)?.value, t)
         }
-        /** An address with no province is accepted; the form only ever deals in British Columbia. */
-        static isBritishColumbia(address) {
-          const province = (address.province_state ?? "").trim().toLowerCase();
-          return !province || ["bc", "b.c.", "british columbia"].includes(province);
+      ];
+      buildBCAnnualReportCompanyEmailFields = (options) => [
+        {
+          type: FormType.Select,
+          label: "Company Email",
+          formControlName: BCAnnualReportFormControls.CompanyEmail,
+          required: true,
+          options,
+          errorMessage: "Company Email is required",
+          class: "span-6"
         }
-        static isSameOfficeAddress(a, b) {
-          const key = (x) => [x?.addressLine1, x?.addressLine2, x?.city, x?.postalCode].map((v) => (v ?? "").trim().toLowerCase().replace(/\s+/g, " ")).join("|");
-          return key(a) === key(b);
+      ];
+      BC_ANNUAL_REPORT_REMINDER_FIELDS = [
+        {
+          type: FormType.Checkbox,
+          label: "Would the company like to receive reminders to file its annual reports",
+          formControlName: BCAnnualReportFormControls.IsAnnualReportReminderRequired,
+          class: "span-12"
         }
-        /**
-         * The company's email: the entity's email options, then the Registered Office's email, then the
-         * entity's own, then any other address of the entity (e.g. a Head Office). Only a Business Email
-         * or an Email counts; a Personal Email never does.
-         */
-        static resolveCompanyEmail(task) {
-          const affiliations = task.entity.affiliations ?? [];
-          const registeredOffice = BritishColumbiaFormationFormHelper.findSharedAddressAffiliation(affiliations, AddressTitle2.REGISTERED_OFFICE);
-          return task.entity.emailOptions?.find(isCompanyEmail)?.value || registeredOffice?.addresses?.[0]?.communications?.find(isCompanyEmail)?.value || task.entity.communications?.find(isCompanyEmail)?.value || task.entity.addresses?.flatMap((a) => a.communications ?? []).find(isCompanyEmail)?.value || "";
+      ];
+    }
+  });
+
+  // src/app/components/british-columbia/annual-report/british-columbia-annual-report-form/british-columbia-annual-report-form.component.ts
+  function BritishColumbiaAnnualReportFormComponent_Conditional_1_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275element(0, "alert", 1);
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      \u0275\u0275property("type", ctx_r0.alertType.Info);
+    }
+  }
+  function BritishColumbiaAnnualReportFormComponent_Conditional_2_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275element(0, "alert", 2);
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      \u0275\u0275property("content", ctx_r0.errors());
+    }
+  }
+  function BritishColumbiaAnnualReportFormComponent_Conditional_5_Template(rf, ctx) {
+    if (rf & 1) {
+      const _r2 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "expandable-card", 4)(1, "div", 8)(2, "filing-form-group", 9);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaAnnualReportFormComponent_Conditional_5_Template_filing_form_group_visiblyValidChange_2_listener($event) {
+        \u0275\u0275restoreView(_r2);
+        const ctx_r0 = \u0275\u0275nextContext();
+        return \u0275\u0275resetView(ctx_r0.onSectionValidChange("general", $event));
+      });
+      \u0275\u0275elementEnd()()();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const general_r3 = \u0275\u0275readContextLet(4);
+      \u0275\u0275property("isStatusIcon", false)("title", ctx_r0.groups.General);
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", general_r3)("config", ctx_r0.generalFields);
+    }
+  }
+  function BritishColumbiaAnnualReportFormComponent_Conditional_8_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275element(0, "expandable-list-card", 5);
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const officersArray_r4 = \u0275\u0275readContextLet(6);
+      const isOpenOfficers_r5 = \u0275\u0275readContextLet(7);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("isValid", true)("areItemsOpen", isOpenOfficers_r5)("isStatusIcon", false)("fields", ctx_r0.officersFields)("formArray", officersArray_r4)("title", ctx_r0.groups.Officers);
+    }
+  }
+  function BritishColumbiaAnnualReportFormComponent_Conditional_9_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "h2", 10);
+      \u0275\u0275text(2);
+      \u0275\u0275pipe(3, "translate");
+      \u0275\u0275elementEnd()();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      \u0275\u0275property("title", ctx_r0.groups.Officers);
+      \u0275\u0275advance(2);
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(3, 2, "Unchanged"));
+    }
+  }
+  function BritishColumbiaAnnualReportFormComponent_Conditional_11_Template(rf, ctx) {
+    if (rf & 1) {
+      const _r6 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "expandable-card", 7)(1, "div", 8)(2, "filing-form-group", 9);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaAnnualReportFormComponent_Conditional_11_Template_filing_form_group_visiblyValidChange_2_listener($event) {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r0 = \u0275\u0275nextContext();
+        return \u0275\u0275resetView(ctx_r0.onSectionValidChange("companyEmail", $event));
+      });
+      \u0275\u0275elementEnd()()();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const companyEmail_r7 = \u0275\u0275readContextLet(10);
+      \u0275\u0275property("isValid", ctx_r0.sectionValidity["companyEmail"])("isStatusIcon", ctx_r0.statusIcon())("title", ctx_r0.groups.CompanyEmail);
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", companyEmail_r7)("config", ctx_r0.companyEmailFields());
+    }
+  }
+  function BritishColumbiaAnnualReportFormComponent_Conditional_13_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275elementStart(0, "expandable-card", 4)(1, "div", 8);
+      \u0275\u0275element(2, "filing-form-group", 11);
+      \u0275\u0275elementEnd()();
+    }
+    if (rf & 2) {
+      const ctx_r0 = \u0275\u0275nextContext();
+      const reminder_r8 = \u0275\u0275readContextLet(12);
+      \u0275\u0275property("isStatusIcon", false)("title", ctx_r0.groups.AnnualReportReminder);
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", reminder_r8)("config", ctx_r0.reminderFields);
+    }
+  }
+  var BritishColumbiaAnnualReportFormComponent;
+  var init_british_columbia_annual_report_form_component = __esm({
+    "src/app/components/british-columbia/annual-report/british-columbia-annual-report-form/british-columbia-annual-report-form.component.ts"() {
+      init_core();
+      init_ngx_translate_core();
+      init_expandable_card_component();
+      init_expandable_list_card_component();
+      init_filing_form_group_component();
+      init_alert_component();
+      init_alert_enum();
+      init_british_columbia_form_enums();
+      init_british_columbia_annual_report_form_constants();
+      init_british_columbia_annual_report_form_helper();
+      init_core();
+      BritishColumbiaAnnualReportFormComponent = class _BritishColumbiaAnnualReportFormComponent {
+        form = input.required();
+        task = input();
+        errors = input([]);
+        isNote = input(false);
+        statusIcon = input(true);
+        isSubmitted = input(false);
+        visiblyValidChange = output();
+        alertType = AlertType;
+        groups = BCAnnualReportFormGroups;
+        generalFields = BC_ANNUAL_REPORT_GENERAL_FIELDS;
+        officersFields = BC_ANNUAL_REPORT_OFFICERS_FIELDS;
+        reminderFields = BC_ANNUAL_REPORT_REMINDER_FIELDS;
+        companyEmailFields = computed(() => {
+          const task = this.task();
+          return buildBCAnnualReportCompanyEmailFields(task ? BritishColumbiaAnnualReportFormHelper.getCompanyEmailOptions(task) : []);
+        });
+        /** AC2: the Officers section starts expanded for 3 officers or fewer, collapsed for more. */
+        initiallyOpenCardsCount = 3;
+        sectionValidity = {};
+        isVisiblyValid() {
+          return Object.values(this.sectionValidity).every((v) => v);
         }
-        /**
-         * Address Line 1*, Address Line 2, City*, Postal Code*, Province (BC), Country (Canada).
-         * Province and Country are always disabled; the rest follow `enabled`.
-         */
-        static createOfficeAddressFormGroup(delta, enabled = true) {
-          const group2 = new FormGroup({
-            [Controls2.AddressLine1]: new FormControl(delta?.addressLine1 ?? "", Validators.required),
-            [Controls2.AddressLine2]: new FormControl(delta?.addressLine2 ?? ""),
-            [Controls2.City]: new FormControl(delta?.city ?? "", Validators.required),
-            [Controls2.PostalCode]: new FormControl(delta?.postalCode ?? "", Validators.required),
-            [Controls2.Province]: this.readOnly(delta?.province ?? BC_DEFAULT_PROVINCE_STATE),
-            [Controls2.Country]: this.readOnly(delta?.country ?? BC_DEFAULT_COUNTRY)
-          });
-          this.setOfficeAddressEnabled(group2, enabled);
-          return group2;
+        onSectionValidChange(section, valid) {
+          this.sectionValidity = __spreadProps(__spreadValues({}, this.sectionValidity), { [section]: valid });
+          this.visiblyValidChange.emit(this.isVisiblyValid());
         }
-        /**
-         * Enables or disables the editable controls of an address grid (used by "Same as…" checkboxes).
-         * Hiding a grid also clears it. Showing it again refills it with the address Athennian sent for
-         * it, or leaves it empty when there is none (and when the user has already typed something).
-         */
-        static setOfficeAddressEnabled(group2, enabled) {
-          if (!group2) {
-            return;
-          }
-          const restore = incomingAddressByGrid.get(group2);
-          const isEmpty = EDITABLE_ADDRESS_CONTROLS.every((name) => !group2.get(name)?.value);
-          EDITABLE_ADDRESS_CONTROLS.forEach((name) => {
-            const control = group2.get(name);
-            if (enabled) {
-              control?.enable({ emitEvent: false });
-              if (restore && isEmpty) {
-                control?.setValue(restore[name] ?? "", { emitEvent: false });
-              }
-            } else {
-              control?.setValue("", { emitEvent: false });
-              control?.disable({ emitEvent: false });
-            }
-          });
-          group2.updateValueAndValidity({ emitEvent: false });
+        getFormGroup(key) {
+          return this.form().get(key);
         }
-        static generateReferenceNumbersFormGroup(deltaData, clientMatterNumber) {
-          return new FormGroup({
-            [Controls2.ClientMatterNumber]: new FormControl(
-              // `??`: 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 ?? "")
-          });
+        getFormArray(key) {
+          return this.form().get(key);
         }
-        static readOnly(value) {
-          return new FormControl({ value: value ?? "", disabled: true });
+        static \u0275fac = function BritishColumbiaAnnualReportFormComponent_Factory(__ngFactoryType__) {
+          return new (__ngFactoryType__ || _BritishColumbiaAnnualReportFormComponent)();
+        };
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaAnnualReportFormComponent, selectors: [["british-columbia-annual-report-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], statusIcon: [1, "statusIcon"], isSubmitted: [1, "isSubmitted"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 14, vars: 11, consts: [[1, "annual-report-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, "annual-report-form-content"], [3, "isStatusIcon", "title"], [3, "isSubmitted", "isValid", "areItemsOpen", "isStatusIcon", "fields", "formArray", "title"], [3, "title"], [3, "isValid", "isStatusIcon", "title"], [1, "annual-report-form-item"], [3, "visiblyValidChange", "isSubmitted", "form", "config"], [1, "body-1-regular"], [3, "isSubmitted", "form", "config"]], template: function BritishColumbiaAnnualReportFormComponent_Template(rf, ctx) {
+          if (rf & 1) {
+            \u0275\u0275elementStart(0, "div", 0);
+            \u0275\u0275template(1, BritishColumbiaAnnualReportFormComponent_Conditional_1_Template, 1, 1, "alert", 1)(2, BritishColumbiaAnnualReportFormComponent_Conditional_2_Template, 1, 1, "alert", 2);
+            \u0275\u0275elementStart(3, "div", 3);
+            \u0275\u0275declareLet(4);
+            \u0275\u0275template(5, BritishColumbiaAnnualReportFormComponent_Conditional_5_Template, 3, 5, "expandable-card", 4);
+            \u0275\u0275declareLet(6)(7);
+            \u0275\u0275template(8, BritishColumbiaAnnualReportFormComponent_Conditional_8_Template, 1, 7, "expandable-list-card", 5)(9, BritishColumbiaAnnualReportFormComponent_Conditional_9_Template, 4, 4, "expandable-card", 6);
+            \u0275\u0275declareLet(10);
+            \u0275\u0275template(11, BritishColumbiaAnnualReportFormComponent_Conditional_11_Template, 3, 6, "expandable-card", 7);
+            \u0275\u0275declareLet(12);
+            \u0275\u0275template(13, BritishColumbiaAnnualReportFormComponent_Conditional_13_Template, 3, 5, "expandable-card", 4);
+            \u0275\u0275elementEnd()();
+          }
+          if (rf & 2) {
+            let tmp_5_0;
+            \u0275\u0275advance();
+            \u0275\u0275conditional(ctx.isNote() ? 1 : -1);
+            \u0275\u0275advance();
+            \u0275\u0275conditional(ctx.errors().length ? 2 : -1);
+            \u0275\u0275advance(2);
+            const general_r9 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.General));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(general_r9 ? 5 : -1);
+            \u0275\u0275advance();
+            const officersArray_r10 = \u0275\u0275storeLet(ctx.getFormArray(ctx.groups.Officers));
+            \u0275\u0275advance();
+            \u0275\u0275storeLet(((tmp_5_0 = officersArray_r10 == null ? null : officersArray_r10.length) !== null && tmp_5_0 !== void 0 ? tmp_5_0 : 0) <= ctx.initiallyOpenCardsCount);
+            \u0275\u0275advance();
+            \u0275\u0275conditional(officersArray_r10 && officersArray_r10.length ? 8 : 9);
+            \u0275\u0275advance(2);
+            const companyEmail_r11 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CompanyEmail));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(companyEmail_r11 ? 11 : -1);
+            \u0275\u0275advance();
+            const reminder_r12 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(reminder_r12 ? 13 : -1);
+          }
+        }, dependencies: [
+          ExpandableCardComponent,
+          ExpandableListCardComponent,
+          FilingFormGroupComponent,
+          AlertComponent,
+          TranslatePipe
+        ], styles: ["\n\n[_nghost-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .annual-report-form[_ngcontent-%COMP%] {\n  display: flex;\n  height: 100%;\n  flex-direction: column;\n  gap: 16px;\n}\n[_nghost-%COMP%]   .annual-report-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow: auto;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .annual-report-form-item[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n/*# sourceMappingURL=british-columbia-annual-report-form.component.css.map */"], changeDetection: 0 });
+      };
+      (() => {
+        (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(BritishColumbiaAnnualReportFormComponent, [{
+          type: Component,
+          args: [{ standalone: true, selector: "british-columbia-annual-report-form", changeDetection: ChangeDetectionStrategy.OnPush, imports: [
+            ExpandableCardComponent,
+            ExpandableListCardComponent,
+            FilingFormGroupComponent,
+            AlertComponent,
+            TranslatePipe
+          ], template: `<div class="annual-report-form">\r
+  @if (isNote()) {\r
+    <alert\r
+      [type]="alertType.Info"\r
+      title="Entity changed"\r
+      content="A new draft needs to be generated as the Entity was changed since the last draft was produced."\r
+    />\r
+  }\r
+\r
+  @if (errors().length) {\r
+    <alert\r
+      title="The following issues need to be resolved before proceeding:"\r
+      [content]="errors()"\r
+    />\r
+  }\r
+\r
+  <div class="annual-report-form-content">\r
+    @let general = getFormGroup(groups.General);\r
+\r
+    @if (general) {\r
+      <expandable-card [isStatusIcon]="false" [title]="groups.General">\r
+        <div class="annual-report-form-item">\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="general"\r
+            [config]="generalFields"\r
+            (visiblyValidChange)="onSectionValidChange('general', $event)"\r
+          />\r
+        </div>\r
+      </expandable-card>\r
+    }\r
+\r
+    @let officersArray = getFormArray(groups.Officers);\r
+    @let isOpenOfficers = (officersArray?.length ?? 0) <= initiallyOpenCardsCount;\r
+\r
+    @if (officersArray && officersArray.length) {\r
+      <expandable-list-card\r
+        [isSubmitted]="isSubmitted()"\r
+        [isValid]="true"\r
+        [areItemsOpen]="isOpenOfficers"\r
+        [isStatusIcon]="false"\r
+        [fields]="officersFields"\r
+        [formArray]="officersArray"\r
+        [title]="groups.Officers"\r
+      />\r
+    } @else {\r
+      <expandable-card [title]="groups.Officers">\r
+        <h2 class="body-1-regular">{{ 'Unchanged' | translate }}</h2>\r
+      </expandable-card>\r
+    }\r
+\r
+    @let companyEmail = getFormGroup(groups.CompanyEmail);\r
+\r
+    @if (companyEmail) {\r
+      <expandable-card\r
+        [isValid]="sectionValidity['companyEmail']"\r
+        [isStatusIcon]="statusIcon()"\r
+        [title]="groups.CompanyEmail"\r
+      >\r
+        <div class="annual-report-form-item">\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="companyEmail"\r
+            [config]="companyEmailFields()"\r
+            (visiblyValidChange)="onSectionValidChange('companyEmail', $event)"\r
+          />\r
+        </div>\r
+      </expandable-card>\r
+    }\r
+\r
+    @let reminder = getFormGroup(groups.AnnualReportReminder);\r
+\r
+    @if (reminder) {\r
+      <expandable-card [isStatusIcon]="false" [title]="groups.AnnualReportReminder">\r
+        <div class="annual-report-form-item">\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="reminder"\r
+            [config]="reminderFields"\r
+          />\r
+        </div>\r
+      </expandable-card>\r
+    }\r
+  </div>\r
+</div>\r
+`, styles: ["/* src/app/components/british-columbia/annual-report/british-columbia-annual-report-form/british-columbia-annual-report-form.component.scss */\n:host {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n:host .annual-report-form {\n  display: flex;\n  height: 100%;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .annual-report-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow: auto;\n  min-height: 0;\n}\n:host .annual-report-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n/*# sourceMappingURL=british-columbia-annual-report-form.component.css.map */\n"] }]
+        }], null, null);
+      })();
+      (() => {
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaAnnualReportFormComponent, { className: "BritishColumbiaAnnualReportFormComponent", filePath: "src/app/components/british-columbia/annual-report/british-columbia-annual-report-form/british-columbia-annual-report-form.component.ts", lineNumber: 43 });
+      })();
+    }
+  });
+
+  // src/app/components/british-columbia/annual-report/steps/delta/british-columbia-annual-report-delta-form.component.ts
+  var BritishColumbiaAnnualReportDeltaFormComponent;
+  var init_british_columbia_annual_report_delta_form_component = __esm({
+    "src/app/components/british-columbia/annual-report/steps/delta/british-columbia-annual-report-delta-form.component.ts"() {
+      init_core();
+      init_button();
+      init_ngx_translate_core();
+      init_british_columbia_annual_report_form_component();
+      init_common_utils();
+      init_core();
+      BritishColumbiaAnnualReportDeltaFormComponent = class _BritishColumbiaAnnualReportDeltaFormComponent {
+        form = input.required();
+        actionsDisabled = input(false);
+        isNote = input(true);
+        task = input();
+        errors = input([]);
+        close = output();
+        save = output();
+        validate = output();
+        submitted = signal(false);
+        visiblyValid = signal(true);
+        clientErrors = signal([]);
+        translate = inject(TranslateService);
+        combinedErrors = computed(() => {
+          const client = this.clientErrors();
+          return client.length ? client : this.errors();
+        });
+        onVisiblyValidChange(valid) {
+          this.visiblyValid.set(valid);
         }
+        /** AC5: highlights the incomplete fields and shows the "required fields" banner instead of calling the API. */
+        onValidate() {
+          this.submitted.set(true);
+          this.clientErrors.set([]);
+          markFormGroupTouched(this.form());
+          if (!this.visiblyValid()) {
+            this.clientErrors.set([this.translate.instant("Some required fields aren't completed.")]);
+            return;
+          }
+          this.validate.emit();
+        }
+        static \u0275fac = function BritishColumbiaAnnualReportDeltaFormComponent_Factory(__ngFactoryType__) {
+          return new (__ngFactoryType__ || _BritishColumbiaAnnualReportDeltaFormComponent)();
+        };
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaAnnualReportDeltaFormComponent, selectors: [["british-columbia-annual-report-delta-form"]], inputs: { form: [1, "form"], actionsDisabled: [1, "actionsDisabled"], isNote: [1, "isNote"], task: [1, "task"], errors: [1, "errors"] }, outputs: { close: "close", save: "save", validate: "validate" }, decls: 15, vars: 18, consts: [[1, "annual-report-delta-form"], [1, "annual-report-delta-form-content", 3, "visiblyValidChange", "form", "task", "errors", "isNote", "isSubmitted", "statusIcon"], [1, "annual-report-delta-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click", "disabled"], [1, "body-1-semibold"], ["color", "primary", "mat-flat-button", "", 1, "submit", 3, "click", "disabled"]], template: function BritishColumbiaAnnualReportDeltaFormComponent_Template(rf, ctx) {
+          if (rf & 1) {
+            \u0275\u0275elementStart(0, "div", 0)(1, "british-columbia-annual-report-form", 1);
+            \u0275\u0275listener("visiblyValidChange", function BritishColumbiaAnnualReportDeltaFormComponent_Template_british_columbia_annual_report_form_visiblyValidChange_1_listener($event) {
+              return ctx.onVisiblyValidChange($event);
+            });
+            \u0275\u0275elementEnd();
+            \u0275\u0275elementStart(2, "div", 2)(3, "button", 3);
+            \u0275\u0275listener("click", function BritishColumbiaAnnualReportDeltaFormComponent_Template_button_click_3_listener() {
+              return ctx.close.emit();
+            });
+            \u0275\u0275elementStart(4, "span", 4);
+            \u0275\u0275text(5);
+            \u0275\u0275pipe(6, "translate");
+            \u0275\u0275elementEnd()();
+            \u0275\u0275elementStart(7, "button", 3);
+            \u0275\u0275listener("click", function BritishColumbiaAnnualReportDeltaFormComponent_Template_button_click_7_listener() {
+              return ctx.save.emit();
+            });
+            \u0275\u0275elementStart(8, "span", 4);
+            \u0275\u0275text(9);
+            \u0275\u0275pipe(10, "translate");
+            \u0275\u0275elementEnd()();
+            \u0275\u0275elementStart(11, "button", 5);
+            \u0275\u0275listener("click", function BritishColumbiaAnnualReportDeltaFormComponent_Template_button_click_11_listener() {
+              return ctx.onValidate();
+            });
+            \u0275\u0275elementStart(12, "span", 4);
+            \u0275\u0275text(13);
+            \u0275\u0275pipe(14, "translate");
+            \u0275\u0275elementEnd()()()();
+          }
+          if (rf & 2) {
+            \u0275\u0275advance();
+            \u0275\u0275property("form", ctx.form())("task", ctx.task())("errors", ctx.combinedErrors())("isNote", ctx.isNote())("isSubmitted", ctx.submitted())("statusIcon", true);
+            \u0275\u0275advance(2);
+            \u0275\u0275property("disabled", ctx.actionsDisabled());
+            \u0275\u0275advance(2);
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 12, "Close"));
+            \u0275\u0275advance(2);
+            \u0275\u0275property("disabled", ctx.actionsDisabled());
+            \u0275\u0275advance(2);
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(10, 14, "Save Changes"));
+            \u0275\u0275advance(2);
+            \u0275\u0275property("disabled", ctx.actionsDisabled());
+            \u0275\u0275advance(2);
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(14, 16, "Validate & Generate Draft"));
+          }
+        }, dependencies: [MatButton, TranslatePipe, BritishColumbiaAnnualReportFormComponent], styles: ["\n\n[_nghost-%COMP%]   .annual-report-delta-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .annual-report-delta-form-content[_ngcontent-%COMP%] {\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .annual-report-delta-form-actions[_ngcontent-%COMP%] {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n[_nghost-%COMP%]   .annual-report-delta-form-actions[_ngcontent-%COMP%]   button[_ngcontent-%COMP%] {\n  margin: 0;\n}\n[_nghost-%COMP%]   .annual-report-delta-form-actions[_ngcontent-%COMP%]   .submit[_ngcontent-%COMP%] {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=british-columbia-annual-report-delta-form.component.css.map */"], changeDetection: 0 });
       };
+      (() => {
+        (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(BritishColumbiaAnnualReportDeltaFormComponent, [{
+          type: Component,
+          args: [{ standalone: true, selector: "british-columbia-annual-report-delta-form", changeDetection: ChangeDetectionStrategy.OnPush, imports: [MatButton, TranslatePipe, BritishColumbiaAnnualReportFormComponent], template: `<div class="annual-report-delta-form">\r
+  <british-columbia-annual-report-form\r
+    class="annual-report-delta-form-content"\r
+    [form]="form()"\r
+    [task]="task()"\r
+    [errors]="combinedErrors()"\r
+    [isNote]="isNote()"\r
+    [isSubmitted]="submitted()"\r
+    [statusIcon]="true"\r
+    (visiblyValidChange)="onVisiblyValidChange($event)"\r
+  />\r
+\r
+  <div class="annual-report-delta-form-actions">\r
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
+    </button>\r
+    <button (click)="save.emit()" [disabled]="actionsDisabled()" mat-stroked-button mat-button>\r
+      <span class="body-1-semibold">{{ 'Save Changes' | translate }}</span>\r
+    </button>\r
+    <button\r
+      class="submit"\r
+      color="primary"\r
+      mat-flat-button\r
+      [disabled]="actionsDisabled()"\r
+      (click)="onValidate()"\r
+    >\r
+      <span class="body-1-semibold">{{ 'Validate & Generate Draft' | translate }}</span>\r
+    </button>\r
+  </div>\r
+</div>\r
+`, styles: ["/* src/app/components/british-columbia/annual-report/steps/delta/british-columbia-annual-report-delta-form.component.scss */\n:host .annual-report-delta-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .annual-report-delta-form-content {\n  flex: 1;\n  min-height: 0;\n}\n:host .annual-report-delta-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .annual-report-delta-form-actions button {\n  margin: 0;\n}\n:host .annual-report-delta-form-actions .submit {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=british-columbia-annual-report-delta-form.component.css.map */\n"] }]
+        }], null, null);
+      })();
+      (() => {
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaAnnualReportDeltaFormComponent, { className: "BritishColumbiaAnnualReportDeltaFormComponent", filePath: "src/app/components/british-columbia/annual-report/steps/delta/british-columbia-annual-report-delta-form.component.ts", lineNumber: 25 });
+      })();
+    }
+  });
+
+  // src/app/components/british-columbia/annual-report/steps/preview/british-columbia-annual-report-preview-form.component.ts
+  var BritishColumbiaAnnualReportPreviewFormComponent;
+  var init_british_columbia_annual_report_preview_form_component = __esm({
+    "src/app/components/british-columbia/annual-report/steps/preview/british-columbia-annual-report-preview-form.component.ts"() {
+      init_core();
+      init_button();
+      init_ngx_translate_core();
+      init_british_columbia_annual_report_form_component();
+      init_core();
+      BritishColumbiaAnnualReportPreviewFormComponent = class _BritishColumbiaAnnualReportPreviewFormComponent {
+        form = input.required();
+        actionsDisabled = input(false);
+        task = input();
+        errors = input([]);
+        close = output();
+        file = output();
+        static \u0275fac = function BritishColumbiaAnnualReportPreviewFormComponent_Factory(__ngFactoryType__) {
+          return new (__ngFactoryType__ || _BritishColumbiaAnnualReportPreviewFormComponent)();
+        };
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaAnnualReportPreviewFormComponent, selectors: [["british-columbia-annual-report-preview-form"]], inputs: { form: [1, "form"], actionsDisabled: [1, "actionsDisabled"], task: [1, "task"], errors: [1, "errors"] }, outputs: { close: "close", file: "file" }, decls: 11, vars: 12, consts: [[1, "annual-report-preview-form"], [1, "annual-report-preview-form-content", 3, "form", "task", "errors", "statusIcon"], [1, "annual-report-preview-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click", "disabled"], [1, "body-1-semibold"], ["color", "primary", "mat-flat-button", "", 1, "submit", 3, "click", "disabled"]], template: function BritishColumbiaAnnualReportPreviewFormComponent_Template(rf, ctx) {
+          if (rf & 1) {
+            \u0275\u0275elementStart(0, "div", 0);
+            \u0275\u0275element(1, "british-columbia-annual-report-form", 1);
+            \u0275\u0275elementStart(2, "div", 2)(3, "button", 3);
+            \u0275\u0275listener("click", function BritishColumbiaAnnualReportPreviewFormComponent_Template_button_click_3_listener() {
+              return ctx.close.emit();
+            });
+            \u0275\u0275elementStart(4, "span", 4);
+            \u0275\u0275text(5);
+            \u0275\u0275pipe(6, "translate");
+            \u0275\u0275elementEnd()();
+            \u0275\u0275elementStart(7, "button", 5);
+            \u0275\u0275listener("click", function BritishColumbiaAnnualReportPreviewFormComponent_Template_button_click_7_listener() {
+              return ctx.file.emit();
+            });
+            \u0275\u0275elementStart(8, "span", 4);
+            \u0275\u0275text(9);
+            \u0275\u0275pipe(10, "translate");
+            \u0275\u0275elementEnd()()()();
+          }
+          if (rf & 2) {
+            \u0275\u0275advance();
+            \u0275\u0275property("form", ctx.form())("task", ctx.task())("errors", ctx.errors())("statusIcon", false);
+            \u0275\u0275advance(2);
+            \u0275\u0275property("disabled", ctx.actionsDisabled());
+            \u0275\u0275advance(2);
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 8, "Close"));
+            \u0275\u0275advance(2);
+            \u0275\u0275property("disabled", ctx.actionsDisabled());
+            \u0275\u0275advance(2);
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(10, 10, "File"));
+          }
+        }, dependencies: [MatButton, TranslatePipe, BritishColumbiaAnnualReportFormComponent], styles: ["\n\n[_nghost-%COMP%]   .annual-report-preview-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .annual-report-preview-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .annual-report-preview-form-actions[_ngcontent-%COMP%] {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n[_nghost-%COMP%]   .annual-report-preview-form-actions[_ngcontent-%COMP%]   button[_ngcontent-%COMP%] {\n  margin: 0;\n}\n/*# sourceMappingURL=british-columbia-annual-report-preview-form.component.css.map */"], changeDetection: 0 });
+      };
+      (() => {
+        (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(BritishColumbiaAnnualReportPreviewFormComponent, [{
+          type: Component,
+          args: [{ standalone: true, selector: "british-columbia-annual-report-preview-form", changeDetection: ChangeDetectionStrategy.OnPush, imports: [MatButton, TranslatePipe, BritishColumbiaAnnualReportFormComponent], template: `<div class="annual-report-preview-form">\r
+  <british-columbia-annual-report-form\r
+    class="annual-report-preview-form-content"\r
+    [form]="form()"\r
+    [task]="task()"\r
+    [errors]="errors()"\r
+    [statusIcon]="false"\r
+  />\r
+\r
+  <div class="annual-report-preview-form-actions">\r
+    <button [disabled]="actionsDisabled()" mat-stroked-button mat-button (click)="close.emit()">\r
+      <span class="body-1-semibold">{{ 'Close' | translate }}</span>\r
+    </button>\r
+    <button\r
+      class="submit"\r
+      color="primary"\r
+      mat-flat-button\r
+      [disabled]="actionsDisabled()"\r
+      (click)="file.emit()"\r
+    >\r
+      <span class="body-1-semibold">{{ 'File' | translate }}</span>\r
+    </button>\r
+  </div>\r
+</div>\r
+`, styles: ["/* src/app/components/british-columbia/annual-report/steps/preview/british-columbia-annual-report-preview-form.component.scss */\n:host .annual-report-preview-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .annual-report-preview-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .annual-report-preview-form-actions {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n:host .annual-report-preview-form-actions button {\n  margin: 0;\n}\n/*# sourceMappingURL=british-columbia-annual-report-preview-form.component.css.map */\n"] }]
+        }], null, null);
+      })();
+      (() => {
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaAnnualReportPreviewFormComponent, { className: "BritishColumbiaAnnualReportPreviewFormComponent", filePath: "src/app/components/british-columbia/annual-report/steps/preview/british-columbia-annual-report-preview-form.component.ts", lineNumber: 25 });
+      })();
     }
   });
 
   // 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, BC_COD_CARD_FORM_DIRECTORS_FIELDS, BC_COD_DELTA_CARD_FORM_ANNUAL_REPORT_REMINDER_FIELDS;
+  var Controls3, labelledValue2, 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();
       init_british_columbia_form_enums();
       init_BritishColumbiaConstants();
       Controls3 = BCChangeOfDirectorsFormControls;
-      labelledValue = (label, value, t) => `<span class="body-1-semibold">${t(label)}:</span> ${value || t("Not specified")}`;
+      labelledValue2 = (label, value, t) => `<span class="body-1-semibold">${t(label)}:</span> ${value || t("Not specified")}`;
       readOnlyRow = (label, control, className = "span-12") => ({
         type: FormType.Text,
         formControlName: control,
         class: className,
-        dynamicLabel: (form, t) => labelledValue(label, form.get(control)?.value, t)
+        dynamicLabel: (form, t) => labelledValue2(label, form.get(control)?.value, t)
       });
       directorsAddedOrDeleted = (form) => Boolean(form.get(Controls3.DirectorsAddedOrDeleted)?.value);
       isNotifyByMail = (form) => form.get(Controls3.NotificationMethod)?.value === BCNotificationMethod.Mail;
@@ -86403,285 +87473,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
   });
 
-  // src/app/constants/ui/british-columbia-formation-form.constants.ts
-  var BC_NAME_TYPE_OPTIONS, labelledValue2, isNamed, BC_FORMATION_DELTA_CARD_FORM_REFERENCE_NUMBERS_FIELDS, BC_FORMATION_DELTA_CARD_FORM_CORPORATION_DETAILS_FIELDS, BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_FIELDS, BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_ROW_FIELDS, BC_FORMATION_CARD_FORM_REGISTERED_OFFICE_FIELDS, BC_FORMATION_CARD_FORM_RECORDS_OFFICE_FIELDS, BC_FORMATION_DELTA_CARD_FORM_COMPLETING_PARTY_FIELDS, BC_FORMATION_CARD_FORM_DIRECTORS_FIELDS, BC_FORMATION_CARD_FORM_INCORPORATORS_FIELDS;
-  var init_british_columbia_formation_form_constants = __esm({
-    "src/app/constants/ui/british-columbia-formation-form.constants.ts"() {
-      init_form_enums();
-      init_british_columbia_form_enums();
-      init_BritishColumbiaConstants();
-      init_british_columbia_formation_form_helper();
-      BC_NAME_TYPE_OPTIONS = Object.values(BCNameType).filter((v) => typeof v === "number").map((v) => ({ label: BCNameTypeLabel[v], value: v }));
-      labelledValue2 = (label, value, t) => `<span class="body-1-semibold">${t(label)}:</span> ${value || t("None")}`;
-      isNamed = (form) => form.get(BCFormationFormControls.CorporationNameType)?.value === BCNameType.Named;
-      BC_FORMATION_DELTA_CARD_FORM_REFERENCE_NUMBERS_FIELDS = [
-        {
-          type: FormType.Input,
-          label: "Client/Matter Number",
-          formControlName: BCFormationFormControls.ClientMatterNumber
-        },
-        {
-          type: FormType.Input,
-          label: "Docket Number",
-          formControlName: BCFormationFormControls.DocketNumber
-        }
-      ];
-      BC_FORMATION_DELTA_CARD_FORM_CORPORATION_DETAILS_FIELDS = [
-        {
-          type: FormType.Select,
-          label: "Corporation Name Type",
-          formControlName: BCFormationFormControls.CorporationNameType,
-          required: true,
-          options: BC_NAME_TYPE_OPTIONS,
-          needTranslate: true,
-          onChange: (form) => {
-            form.get(BCFormationFormControls.CompanyName)?.updateValueAndValidity({ emitEvent: false });
-            form.get(BCFormationFormControls.NameReservationNumber)?.updateValueAndValidity({ emitEvent: false });
-          }
-        },
-        {
-          type: FormType.Text,
-          formControlName: "",
-          class: "span-6 beside-select",
-          // Numbered only: a Named company shows no preview of the typed name.
-          isVisible: (form) => !isNamed(form),
-          dynamicLabel: () => BC_NUMBERED_NAME_PREVIEW
-        },
-        {
-          type: FormType.Input,
-          label: "Proposed Corporate Name",
-          formControlName: BCFormationFormControls.CompanyName,
-          required: true,
-          isVisible: isNamed,
-          class: "column-3"
-        },
-        {
-          type: FormType.Input,
-          label: "Name Reservation #",
-          formControlName: BCFormationFormControls.NameReservationNumber,
-          required: true,
-          maxLength: 9,
-          errorMessage: "Enter a valid Name Reservation number (for example NR1234567)",
-          showRequiredMessage: true,
-          isVisible: isNamed,
-          class: "span-6"
-        },
-        {
-          type: FormType.Text,
-          formControlName: BCFormationFormControls.RequestedDateForIncorporation,
-          class: "span-12 spaced-text",
-          dynamicLabel: (form, t) => labelledValue2("Requested Date for Incorporation", form.get(BCFormationFormControls.RequestedDateForIncorporation)?.value, t)
-        },
-        {
-          type: FormType.Text,
-          formControlName: BCFormationFormControls.IsFutureEffectiveDate,
-          class: "span-12 fee-warning",
-          isVisible: (form) => Boolean(form.get(BCFormationFormControls.IsFutureEffectiveDate)?.value),
-          dynamicLabel: (_, t) => t("There is an additional fee of {{fee}} for an effective date in the future.").replace("{{fee}}", BC_FUTURE_EFFECTIVE_DATE_FEE)
-        },
-        {
-          // Options are filled per task from `task.entity.emailOptions` by the incorporation form.
-          type: FormType.Select,
-          label: "Company Email",
-          formControlName: BCFormationFormControls.CompanyEmail,
-          required: 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 = [
-        {
-          type: FormType.Checkbox,
-          label: "This company uses one or more translations of its name outside of Canada.",
-          formControlName: BCFormationFormControls.UsesNameTranslation,
-          class: "span-12",
-          onChange: (form) => {
-            const rows = form.get(BCFormationFormControls.NameTranslations);
-            const enabled = Boolean(form.get(BCFormationFormControls.UsesNameTranslation)?.value);
-            if (!rows) {
-              return;
-            }
-            if (enabled && rows.length === 0) {
-              rows.push(BritishColumbiaFormationFormHelper.createNameTranslationFormGroup());
-            }
-            if (!enabled) {
-              rows.clear();
-            }
-          }
-        },
-        {
-          type: FormType.Text,
-          formControlName: "",
-          class: "span-12",
-          isVisible: (form) => Boolean(form.get(BCFormationFormControls.UsesNameTranslation)?.value),
-          dynamicLabel: (_, t) => `<span class="body-1-semibold">${t("Note")}:</span> ${t("Name translations must use the Latin Alphabet (English, French, etc.). Names that use other writing systems must spell the name phonetically in English or French.")}`
-        }
-      ];
-      BC_FORMATION_DELTA_CARD_FORM_NAME_TRANSLATION_ROW_FIELDS = [
-        {
-          type: FormType.Input,
-          label: "Name Translation",
-          formControlName: BCFormationFormControls.NameTranslation,
-          required: true,
-          class: "span-6"
-        }
-      ];
-      BC_FORMATION_CARD_FORM_REGISTERED_OFFICE_FIELDS = [
-        {
-          type: FormType.Text,
-          formControlName: BCFormationFormControls.MailingAddress,
-          class: "span-12",
-          dynamicLabel: (form, t) => labelledValue2("Mailing Address - Full Address", form.get(BCFormationFormControls.MailingAddress)?.value, t)
-        },
-        {
-          type: FormType.Text,
-          formControlName: BCFormationFormControls.DeliveryAddress,
-          class: "span-12",
-          dynamicLabel: (form, t) => labelledValue2("Delivery Address - Full Address", form.get(BCFormationFormControls.DeliveryAddress)?.value, t)
-        }
-      ];
-      BC_FORMATION_CARD_FORM_RECORDS_OFFICE_FIELDS = [
-        {
-          type: FormType.Text,
-          formControlName: BCFormationFormControls.RecordsOfficeMailingAddress,
-          class: "span-12",
-          dynamicLabel: (form, t) => labelledValue2("Mailing Address - Full Address", form.get(BCFormationFormControls.RecordsOfficeMailingAddress)?.value, t)
-        },
-        {
-          type: FormType.Text,
-          formControlName: BCFormationFormControls.RecordsOfficeDeliveryAddress,
-          class: "span-12",
-          dynamicLabel: (form, t) => labelledValue2("Delivery Address - Full Address", form.get(BCFormationFormControls.RecordsOfficeDeliveryAddress)?.value, t)
-        }
-      ];
-      BC_FORMATION_DELTA_CARD_FORM_COMPLETING_PARTY_FIELDS = [
-        {
-          type: FormType.Input,
-          label: "First Name",
-          formControlName: BCFormationFormControls.CompletingPartyFirstName,
-          required: true,
-          class: "column-3"
-        },
-        {
-          type: FormType.Input,
-          label: "Middle Name",
-          formControlName: BCFormationFormControls.CompletingPartyMiddleName,
-          class: "column-3"
-        },
-        {
-          type: FormType.Input,
-          label: "Last Name",
-          formControlName: BCFormationFormControls.CompletingPartyLastName,
-          required: true,
-          class: "column-3"
-        },
-        {
-          type: FormType.Input,
-          inputType: "email",
-          label: "Email",
-          formControlName: BCFormationFormControls.CompletingPartyEmail,
-          required: true,
-          errorMessage: "Enter a valid email address",
-          showRequiredMessage: true,
-          class: "column-3"
-        },
-        {
-          type: FormType.Text,
-          formControlName: "",
-          class: "span-12",
-          dynamicLabel: (_, t) => t("A copy of the filed Incorporation Application is emailed to this address.")
-        },
-        {
-          type: FormType.Input,
-          label: "Street Address",
-          formControlName: BCFormationFormControls.AddressLine1,
-          required: true,
-          class: "column-3"
-        },
-        {
-          type: FormType.Input,
-          label: "Additional Street Address",
-          formControlName: BCFormationFormControls.AddressLine2,
-          class: "column-3"
-        },
-        {
-          type: FormType.Input,
-          label: "City",
-          formControlName: BCFormationFormControls.City,
-          required: true,
-          class: "column-2"
-        },
-        {
-          type: FormType.Input,
-          label: "Province / State",
-          formControlName: BCFormationFormControls.ProvinceState,
-          required: true,
-          class: "column-2"
-        },
-        {
-          type: FormType.Input,
-          label: "Postal / Zip Code",
-          formControlName: BCFormationFormControls.PostalZip,
-          required: true,
-          errorMessage: "Enter a valid Canadian postal code (for example V8W 1X4)",
-          showRequiredMessage: true,
-          class: "column-2"
-        },
-        {
-          type: FormType.Select,
-          label: "Country",
-          formControlName: BCFormationFormControls.Country,
-          required: true,
-          options: BC_COMPLETING_PARTY_COUNTRY_OPTIONS,
-          class: "span-4",
-          // Province / State is required for Canada and the US, and the postal code format is Canada-only.
-          onChange: (form) => {
-            [BCFormationFormControls.ProvinceState, BCFormationFormControls.PostalZip].forEach((control) => form.get(control)?.updateValueAndValidity({ emitEvent: false }));
-          }
-        },
-        {
-          type: FormType.Checkbox,
-          // Checkbox labels don't get the renderer's required asterisk, so it is added here (AC2).
-          dynamicLabel: (_, t) => `${t("The Completing Party confirms they have examined the Articles and the Incorporation Agreement, and the signature requirements have been met.")} *`,
-          formControlName: BCFormationFormControls.HasConfirmedCompletion,
-          required: true,
-          class: "span-12"
-        },
-        {
-          type: FormType.Checkbox,
-          // Checkbox labels don't get the renderer's required asterisk, so it is added here (AC2).
-          dynamicLabel: (_, t) => `${t("I have a signed Incorporation Agreement and a set of Articles for the company to be incorporated.")} *`,
-          formControlName: BCFormationFormControls.HasRequiredDocuments,
-          required: true,
-          class: "span-12"
-        }
-      ];
-      BC_FORMATION_CARD_FORM_DIRECTORS_FIELDS = [
-        {
-          type: FormType.Text,
-          formControlName: BCFormationFormControls.MailingAddress,
-          class: "span-12",
-          dynamicLabel: (form, t) => labelledValue2("Mailing Address - Full Address", form.get(BCFormationFormControls.MailingAddress)?.value, t)
-        },
-        {
-          type: FormType.Text,
-          formControlName: BCFormationFormControls.DeliveryAddress,
-          class: "span-12",
-          dynamicLabel: (form, t) => labelledValue2("Delivery Address - Full Address", form.get(BCFormationFormControls.DeliveryAddress)?.value, t)
-        }
-      ];
-      BC_FORMATION_CARD_FORM_INCORPORATORS_FIELDS = [
-        {
-          type: FormType.Text,
-          formControlName: BCFormationFormControls.FullAddress,
-          class: "span-12",
-          dynamicLabel: (form, t) => labelledValue2("Full Address", form.get(BCFormationFormControls.FullAddress)?.value, t)
-        }
-      ];
-    }
-  });
-
   // src/app/components/british-columbia/incorporation/british-columbia-incorporation-form/british-columbia-incorporation-form.component.ts
   function BritishColumbiaIncorporationFormComponent_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
@@ -87847,20 +88638,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275property("content", ctx_r0.errors());
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_3_Template(rf, ctx) {
-    if (rf & 1) {
-      \u0275\u0275element(0, "alert", 2);
-    }
-    if (rf & 2) {
-      const ctx_r0 = \u0275\u0275nextContext();
-      \u0275\u0275property("content", ctx_r0.missingMessages());
-    }
-  }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_6_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_5_Template(rf, ctx) {
     if (rf & 1) {
       const _r2 = \u0275\u0275getCurrentView();
       \u0275\u0275elementStart(0, "expandable-card", 4)(1, "filing-form-group", 7);
-      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_6_Template_filing_form_group_visiblyValidChange_1_listener($event) {
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_5_Template_filing_form_group_visiblyValidChange_1_listener($event) {
         \u0275\u0275restoreView(_r2);
         const ctx_r0 = \u0275\u0275nextContext();
         return \u0275\u0275resetView(ctx_r0.onSectionValidChange("refNumbers", $event));
@@ -87869,17 +88651,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
-      const referenceNumbers_r3 = \u0275\u0275readContextLet(5);
+      const referenceNumbers_r3 = \u0275\u0275readContextLet(4);
       \u0275\u0275property("title", ctx_r0.groups.ReferenceNumbers);
       \u0275\u0275advance();
       \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", referenceNumbers_r3)("config", ctx_r0.referenceNumbersFields);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_8_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_7_Template(rf, ctx) {
     if (rf & 1) {
       const _r4 = \u0275\u0275getCurrentView();
       \u0275\u0275elementStart(0, "expandable-card", 5)(1, "filing-form-group", 7);
-      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_8_Template_filing_form_group_visiblyValidChange_1_listener($event) {
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_7_Template_filing_form_group_visiblyValidChange_1_listener($event) {
         \u0275\u0275restoreView(_r4);
         const ctx_r0 = \u0275\u0275nextContext();
         return \u0275\u0275resetView(ctx_r0.onSectionValidChange("corpDetails", $event));
@@ -87888,129 +88670,232 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
-      const corporationDetails_r5 = \u0275\u0275readContextLet(7);
+      const corporationDetails_r5 = \u0275\u0275readContextLet(6);
       \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.sectionValidity["corpDetails"] !== false)("title", ctx_r0.groups.CorporationDetails);
       \u0275\u0275advance();
       \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", corporationDetails_r5)("config", ctx_r0.corporationDetailsFields());
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_For_3_Conditional_7_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_9_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 12);
-      \u0275\u0275text(1);
-      \u0275\u0275pipe(2, "translate");
+      const _r7 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_9_Template_filing_form_group_visiblyValidChange_0_listener() {
+        \u0275\u0275restoreView(_r7);
+        const ctx_r0 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
-      const row_r6 = \u0275\u0275nextContext().$implicit;
+      \u0275\u0275nextContext();
+      const registeredMailing_r8 = \u0275\u0275readContextLet(0);
+      const ctx_r0 = \u0275\u0275nextContext();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredMailing_r8)("config", ctx_r0.addressFields);
+    }
+  }
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_14_Template(rf, ctx) {
+    if (rf & 1) {
+      const _r9 = \u0275\u0275getCurrentView();
+      \u0275\u0275element(0, "filing-form-group", 9);
+      \u0275\u0275elementStart(1, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_14_Template_filing_form_group_visiblyValidChange_1_listener() {
+        \u0275\u0275restoreView(_r9);
+        const ctx_r0 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
+      \u0275\u0275elementEnd();
+    }
+    if (rf & 2) {
+      \u0275\u0275nextContext();
+      const registeredDelivery_r10 = \u0275\u0275readContextLet(1);
+      const ctx_r0 = \u0275\u0275nextContext();
+      const registeredOffice_r11 = \u0275\u0275readContextLet(8);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredOffice_r11)("config", ctx_r0.deliveryNoteFields);
       \u0275\u0275advance();
-      \u0275\u0275textInterpolate2(" ", \u0275\u0275pipeBind1(2, 2, "Previous"), ": ", row_r6.previous, " ");
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredDelivery_r10)("config", ctx_r0.addressFields);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_For_3_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 9)(1, "div", 10)(2, "span", 11);
-      \u0275\u0275text(3);
-      \u0275\u0275pipe(4, "translate");
+      const _r6 = \u0275\u0275getCurrentView();
+      \u0275\u0275declareLet(0)(1)(2);
+      \u0275\u0275elementStart(3, "expandable-card", 5)(4, "div", 8);
+      \u0275\u0275element(5, "filing-form-group", 9);
+      \u0275\u0275elementStart(6, "h4", 10);
+      \u0275\u0275text(7);
+      \u0275\u0275pipe(8, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275text(5);
-      \u0275\u0275pipe(6, "translate");
+      \u0275\u0275template(9, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_9_Template, 1, 3, "filing-form-group", 9);
+      \u0275\u0275elementStart(10, "h4", 10);
+      \u0275\u0275text(11);
+      \u0275\u0275pipe(12, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275template(7, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_For_3_Conditional_7_Template, 3, 4, "div", 12);
+      \u0275\u0275elementStart(13, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Template_filing_form_group_visiblyValidChange_13_listener() {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r0 = \u0275\u0275nextContext();
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
       \u0275\u0275elementEnd();
+      \u0275\u0275template(14, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Conditional_14_Template, 2, 6);
+      \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
-      const row_r6 = ctx.$implicit;
-      \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(4, 3, row_r6.label), ":");
+      const ctx_r0 = \u0275\u0275nextContext();
+      const registeredOffice_r11 = \u0275\u0275readContextLet(8);
+      const registeredMailing_r12 = \u0275\u0275storeLet(ctx_r0.getAddressGroup(registeredOffice_r11, ctx_r0.controls.NewMailingAddress));
+      \u0275\u0275advance();
+      const registeredDelivery_r13 = \u0275\u0275storeLet(ctx_r0.getAddressGroup(registeredOffice_r11, ctx_r0.controls.NewDeliveryAddress));
+      const registeredDeliverySame_r14 = ctx_r0.isChecked(registeredOffice_r11, ctx_r0.controls.DeliverySameAsMailing);
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.isRegisteredOfficeValid())("title", ctx_r0.groups.RegisteredOfficeAddress);
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredOffice_r11)("config", ctx_r0.currentAddressesFields);
+      \u0275\u0275advance(2);
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(8, 15, "New Mailing Address"));
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", row_r6.value || \u0275\u0275pipeBind1(6, 5, "Not specified"), " ");
+      \u0275\u0275conditional(registeredMailing_r12 ? 9 : -1);
       \u0275\u0275advance(2);
-      \u0275\u0275conditional(row_r6.previous ? 7 : -1);
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(12, 17, "New Delivery Address"));
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", registeredOffice_r11)("config", ctx_r0.deliverySameAsMailingFields);
+      \u0275\u0275advance();
+      \u0275\u0275conditional(!registeredDeliverySame_r14 && registeredDelivery_r13 ? 14 : -1);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_3_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "expandable-card", 5)(1, "div", 8);
-      \u0275\u0275repeaterCreate(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_For_3_Template, 8, 7, "div", 9, _forTrack05);
-      \u0275\u0275elementEnd()();
+      const _r17 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_3_Template_filing_form_group_visiblyValidChange_0_listener() {
+        \u0275\u0275restoreView(_r17);
+        const ctx_r0 = \u0275\u0275nextContext(3);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
+      \u0275\u0275elementEnd();
     }
     if (rf & 2) {
+      \u0275\u0275nextContext(2);
+      const recordsMailing_r18 = \u0275\u0275readContextLet(0);
       const ctx_r0 = \u0275\u0275nextContext();
-      \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.isRegisteredOfficeValid())("title", ctx_r0.groups.RegisteredOfficeAddress);
-      \u0275\u0275advance(2);
-      \u0275\u0275repeater(ctx_r0.registeredRows());
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsMailing_r18)("config", ctx_r0.addressFields);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_For_3_Conditional_7_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_8_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 12);
-      \u0275\u0275text(1);
-      \u0275\u0275pipe(2, "translate");
+      const _r19 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_8_Template_filing_form_group_visiblyValidChange_0_listener() {
+        \u0275\u0275restoreView(_r19);
+        const ctx_r0 = \u0275\u0275nextContext(3);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
-      const row_r7 = \u0275\u0275nextContext().$implicit;
-      \u0275\u0275advance();
-      \u0275\u0275textInterpolate2(" ", \u0275\u0275pipeBind1(2, 2, "Previous"), ": ", row_r7.previous, " ");
+      \u0275\u0275nextContext(2);
+      const recordsDelivery_r20 = \u0275\u0275readContextLet(1);
+      const ctx_r0 = \u0275\u0275nextContext();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsDelivery_r20)("config", ctx_r0.addressFields);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_For_3_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "div", 9)(1, "div", 10)(2, "span", 11);
-      \u0275\u0275text(3);
-      \u0275\u0275pipe(4, "translate");
+      const _r16 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "h4", 10);
+      \u0275\u0275text(1);
+      \u0275\u0275pipe(2, "translate");
       \u0275\u0275elementEnd();
+      \u0275\u0275template(3, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_3_Template, 1, 3, "filing-form-group", 9);
+      \u0275\u0275elementStart(4, "h4", 10);
       \u0275\u0275text(5);
       \u0275\u0275pipe(6, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275template(7, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_For_3_Conditional_7_Template, 3, 4, "div", 12);
+      \u0275\u0275elementStart(7, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Template_filing_form_group_visiblyValidChange_7_listener() {
+        \u0275\u0275restoreView(_r16);
+        const ctx_r0 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
       \u0275\u0275elementEnd();
+      \u0275\u0275template(8, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Conditional_8_Template, 1, 3, "filing-form-group", 9);
     }
     if (rf & 2) {
-      const row_r7 = ctx.$implicit;
-      \u0275\u0275advance(3);
-      \u0275\u0275textInterpolate1("", \u0275\u0275pipeBind1(4, 3, row_r7.label), ":");
+      \u0275\u0275nextContext();
+      const recordsMailing_r18 = \u0275\u0275readContextLet(0);
+      const recordsDelivery_r20 = \u0275\u0275readContextLet(1);
+      const recordsDeliverySame_r21 = \u0275\u0275readContextLet(3);
+      const ctx_r0 = \u0275\u0275nextContext();
+      const recordsOffice_r22 = \u0275\u0275readContextLet(10);
+      \u0275\u0275advance();
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(2, 7, "New Mailing Address"));
       \u0275\u0275advance(2);
-      \u0275\u0275textInterpolate1(" ", row_r7.value || \u0275\u0275pipeBind1(6, 5, "Not specified"), " ");
+      \u0275\u0275conditional(recordsMailing_r18 ? 3 : -1);
       \u0275\u0275advance(2);
-      \u0275\u0275conditional(row_r7.previous ? 7 : -1);
+      \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 9, "New Delivery Address"));
+      \u0275\u0275advance(2);
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsOffice_r22)("config", ctx_r0.deliverySameAsMailingFields);
+      \u0275\u0275advance();
+      \u0275\u0275conditional(!recordsDeliverySame_r21 && recordsDelivery_r20 ? 8 : -1);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "expandable-card", 5)(1, "div", 8);
-      \u0275\u0275repeaterCreate(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_For_3_Template, 8, 7, "div", 9, _forTrack05);
+      const _r15 = \u0275\u0275getCurrentView();
+      \u0275\u0275declareLet(0)(1)(2)(3);
+      \u0275\u0275elementStart(4, "expandable-card", 5)(5, "div", 8);
+      \u0275\u0275element(6, "filing-form-group", 9);
+      \u0275\u0275elementStart(7, "filing-form-group", 7);
+      \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Template_filing_form_group_visiblyValidChange_7_listener() {
+        \u0275\u0275restoreView(_r15);
+        const ctx_r0 = \u0275\u0275nextContext();
+        return \u0275\u0275resetView(ctx_r0.emitValidity());
+      });
+      \u0275\u0275elementEnd();
+      \u0275\u0275template(8, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Conditional_8_Template, 9, 11);
       \u0275\u0275elementEnd()();
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
+      const recordsOffice_r22 = \u0275\u0275readContextLet(10);
+      \u0275\u0275storeLet(ctx_r0.getAddressGroup(recordsOffice_r22, ctx_r0.controls.NewMailingAddress));
+      \u0275\u0275advance();
+      \u0275\u0275storeLet(ctx_r0.getAddressGroup(recordsOffice_r22, ctx_r0.controls.NewDeliveryAddress));
+      const recordsSameAsRegistered_r23 = ctx_r0.isChecked(recordsOffice_r22, ctx_r0.controls.SameAsRegisteredOffice);
+      \u0275\u0275advance(2);
+      \u0275\u0275storeLet(ctx_r0.isChecked(recordsOffice_r22, ctx_r0.controls.DeliverySameAsMailing));
+      \u0275\u0275advance();
       \u0275\u0275property("isStatusIcon", !ctx_r0.readonly())("isValid", ctx_r0.isRecordsOfficeValid())("title", ctx_r0.groups.RecordsOfficeAddress);
       \u0275\u0275advance(2);
-      \u0275\u0275repeater(ctx_r0.recordsRows());
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsOffice_r22)("config", ctx_r0.currentAddressesFields);
+      \u0275\u0275advance();
+      \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", recordsOffice_r22)("config", ctx_r0.sameAsRegisteredOfficeFields);
+      \u0275\u0275advance();
+      \u0275\u0275conditional(!recordsSameAsRegistered_r23 ? 8 : -1);
     }
   }
-  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_14_Template(rf, ctx) {
+  function BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_13_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 13)(2, "p");
+      \u0275\u0275elementStart(0, "expandable-card", 6)(1, "div", 11)(2, "p");
       \u0275\u0275text(3);
       \u0275\u0275pipe(4, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(5, "mat-radio-group", 14)(6, "mat-radio-button", 15);
+      \u0275\u0275elementStart(5, "mat-radio-group", 12)(6, "mat-radio-button", 13);
       \u0275\u0275text(7);
       \u0275\u0275pipe(8, "translate");
       \u0275\u0275elementEnd();
-      \u0275\u0275elementStart(9, "mat-radio-button", 15);
+      \u0275\u0275elementStart(9, "mat-radio-button", 13);
       \u0275\u0275text(10);
       \u0275\u0275pipe(11, "translate");
       \u0275\u0275elementEnd()()()();
     }
     if (rf & 2) {
       const ctx_r0 = \u0275\u0275nextContext();
-      const annualReportReminder_r8 = \u0275\u0275readContextLet(13);
+      const annualReportReminder_r24 = \u0275\u0275readContextLet(12);
       \u0275\u0275property("isStatusIcon", false)("title", ctx_r0.groups.AnnualReportReminder);
       \u0275\u0275advance();
-      \u0275\u0275property("formGroup", annualReportReminder_r8);
+      \u0275\u0275property("formGroup", annualReportReminder_r24);
       \u0275\u0275advance(2);
       \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(4, 9, "Does this company wish to be reminded to file its annual reports? If an email address is specified, the reminder will be sent to the company's email address. Otherwise, the reminder will be mailed to the registered or head office of the company."), " ");
       \u0275\u0275advance(2);
@@ -88025,7 +88910,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275textInterpolate1(" ", \u0275\u0275pipeBind1(11, 13, "No, I do not need to be reminded"), " ");
     }
   }
-  var _forTrack05, BritishColumbiaChangeOfOfficeAddressesFormComponent;
+  var BritishColumbiaChangeOfOfficeAddressesFormComponent;
   var init_change_of_office_addresses_form_component = __esm({
     "src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.ts"() {
       init_core();
@@ -88038,18 +88923,16 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_expandable_card_component();
       init_british_columbia_form_enums();
       init_british_columbia_change_of_office_addresses_form_constants();
+      init_forms_utils();
       init_BritishColumbiaConstants();
       init_british_columbia_change_of_office_addresses_form_helper();
       init_core();
       init_forms();
-      _forTrack05 = ($index, $item) => $item.label;
       BritishColumbiaChangeOfOfficeAddressesFormComponent = class _BritishColumbiaChangeOfOfficeAddressesFormComponent {
         form = input.required();
         task = input();
         errors = input([]);
         isNote = input(false);
-        /** True while the registry's current data is loading: addresses are not reported missing yet. */
-        loading = input(false);
         isSubmitted = input(false);
         readonly = input(false);
         visiblyValidChange = output();
@@ -88067,41 +88950,17 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         deliveryNoteFields = BC_COA_CARD_FORM_DELIVERY_ADDRESS_NOTE_FIELDS;
         deliverySameAsMailingFields = BC_COA_DELTA_CARD_FORM_DELIVERY_SAME_AS_MAILING_FIELDS;
         sameAsRegisteredOfficeFields = BC_COA_DELTA_CARD_FORM_SAME_AS_REGISTERED_OFFICE_FIELDS;
-        translate = inject(TranslateService);
         sectionValidity = {};
         isVisiblyValid() {
           return Object.values(this.sectionValidity).every((v) => v) && this.isRegisteredOfficeValid() && this.isRecordsOfficeValid();
         }
         isRegisteredOfficeValid() {
-          return !this.isRegisteredMissing();
+          const office = this.getFormGroup(this.groups.RegisteredOfficeAddress);
+          return this.isAddressValid(office, this.controls.NewMailingAddress) && this.isAddressValid(office, this.controls.NewDeliveryAddress);
         }
         isRecordsOfficeValid() {
-          return !this.isRecordsMissing();
-        }
-        /** One message per missing office address, shown in the banner at the top of the form. */
-        missingMessages() {
-          const t = (key) => this.translate.instant(key);
-          const records = this.getFormGroup(this.groups.RecordsOfficeAddress);
-          if (this.loading() || !records || !this.getFormGroup(this.groups.RegisteredOfficeAddress)) {
-            return [];
-          }
-          const recordsSameAsRegistered = this.isChecked(records, this.controls.SameAsRegisteredOffice);
-          const [regMailing, regDelivery] = this.registeredRows();
-          const [recMailing, recDelivery] = this.recordsRows();
-          return [
-            !regMailing.value && t("The Registered Office mailing address is missing. Add it in UEM, then try again."),
-            !regDelivery.value && t("The Registered Office delivery address is missing. Add it in UEM, then try again."),
-            // "Same as Registered Office" is already reported by the registered office messages.
-            !recordsSameAsRegistered && !recMailing.value && t("The Records Office mailing address is missing. Add it in UEM, then try again."),
-            !recordsSameAsRegistered && !recDelivery.value && t("The Records Office delivery address is missing. Add it in UEM, then try again.")
-          ].filter((m) => !!m);
-        }
-        /** The incoming Shared Address supplied no new address for a line (and none is on the register). */
-        isRegisteredMissing() {
-          return !!this.getFormGroup(this.groups.RegisteredOfficeAddress) && this.registeredRows().some((row) => !row.value);
-        }
-        isRecordsMissing() {
-          return !!this.getFormGroup(this.groups.RecordsOfficeAddress) && this.recordsRows().some((row) => !row.value);
+          const office = this.getFormGroup(this.groups.RecordsOfficeAddress);
+          return this.isAddressValid(office, this.controls.NewMailingAddress) && this.isAddressValid(office, this.controls.NewDeliveryAddress);
         }
         isChecked(office, control) {
           return Boolean(office?.get(control)?.value);
@@ -88119,77 +88978,28 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         getAddressGroup(office, control) {
           return office?.get(control) ?? null;
         }
-        /** Registered office lines: the new (incoming) address and, if it changed, the previous one. */
-        registeredRows() {
-          const office = this.getFormGroup(this.groups.RegisteredOfficeAddress);
-          return this.buildRows(office, this.isChecked(office, this.controls.DeliverySameAsMailing));
-        }
-        /** Records office lines; "Same as Registered Office" reuses the registered office's new lines. */
-        recordsRows() {
-          const office = this.getFormGroup(this.groups.RecordsOfficeAddress);
-          if (this.isChecked(office, this.controls.SameAsRegisteredOffice)) {
-            const registered = this.registeredRows();
-            const current = this.currentOf(office);
-            return registered.map((row, i) => __spreadProps(__spreadValues({}, row), {
-              previous: this.changedPrevious(row.value, i === 0 ? current.mailing : current.delivery)
-            }));
-          }
-          return this.buildRows(office, this.isChecked(office, this.controls.DeliverySameAsMailing));
-        }
-        buildRows(office, deliverySame) {
-          const current = this.currentOf(office);
-          const mailing = this.formatNew(this.getAddressGroup(office, this.controls.NewMailingAddress));
-          const delivery = deliverySame ? mailing : this.formatNew(this.getAddressGroup(office, this.controls.NewDeliveryAddress));
-          return [
-            {
-              label: "Mailing Address",
-              value: mailing,
-              previous: this.changedPrevious(mailing, current.mailing)
-            },
-            {
-              label: "Delivery Address",
-              value: delivery,
-              previous: this.changedPrevious(delivery, current.delivery)
-            }
-          ];
-        }
-        currentOf(office) {
-          return {
-            mailing: office?.get(this.controls.CurrentMailingAddress)?.value ?? "",
-            delivery: office?.get(this.controls.CurrentDeliveryAddress)?.value ?? ""
-          };
-        }
-        formatNew(group2) {
-          const c = this.controls;
-          const v = group2?.getRawValue() ?? {};
-          if (![v[c.AddressLine1], v[c.City], v[c.PostalCode]].some((part) => part?.trim())) {
-            return "";
-          }
-          return [v[c.AddressLine1], v[c.AddressLine2], v[c.City], v[c.Province], v[c.PostalCode], v[c.Country]].filter((part) => Boolean(part?.trim())).join(", ");
-        }
-        /** The previous address, only when it exists and differs from the new one. */
-        changedPrevious(next, previous) {
-          const normalize = (s) => s.toLowerCase().replace(/[^a-z0-9]/g, "");
-          return previous && normalize(previous) !== normalize(next) ? previous : "";
+        isAddressValid(office, control) {
+          const group2 = this.getAddressGroup(office, control);
+          return !group2 || group2.disabled || isFormGroupVisiblyValid(group2, this.addressFields);
         }
         static \u0275fac = function BritishColumbiaChangeOfOfficeAddressesFormComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _BritishColumbiaChangeOfOfficeAddressesFormComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfOfficeAddressesFormComponent, selectors: [["british-columbia-change-of-office-addresses-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], loading: [1, "loading"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 15, vars: 11, consts: [[1, "change-of-office-addresses-form"], ["title", "Entity changed", "content", "A new draft needs to be generated as the Entity was changed since the last draft was produced.", 3, "type"], ["title", "The following issues need to be resolved before proceeding:", 3, "content"], [1, "change-of-office-addresses-form-content"], [3, "title"], [3, "isStatusIcon", "isValid", "title"], [3, "isStatusIcon", "title"], [3, "visiblyValidChange", "isSubmitted", "form", "config"], [1, "change-of-office-addresses-form-item"], [1, "change-of-office-addresses-form-address"], [1, "body-1-regular", "grey"], [1, "body-1-semibold"], [1, "change-of-office-addresses-form-previous"], [1, "annual-reminder", 3, "formGroup"], [3, "formControlName"], [3, "value"]], template: function BritishColumbiaChangeOfOfficeAddressesFormComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfOfficeAddressesFormComponent, selectors: [["british-columbia-change-of-office-addresses-form"]], inputs: { form: [1, "form"], task: [1, "task"], errors: [1, "errors"], isNote: [1, "isNote"], isSubmitted: [1, "isSubmitted"], readonly: [1, "readonly"] }, outputs: { visiblyValidChange: "visiblyValidChange" }, decls: 14, vars: 12, consts: [[1, "change-of-office-addresses-form"], ["title", "Entity changed", "content", "A new draft needs to be generated as the Entity was changed since the last draft was produced.", 3, "type"], ["title", "The following issues need to be resolved before proceeding:", 3, "content"], [1, "change-of-office-addresses-form-content"], [3, "title"], [3, "isStatusIcon", "isValid", "title"], [3, "isStatusIcon", "title"], [3, "visiblyValidChange", "isSubmitted", "form", "config"], [1, "change-of-office-addresses-form-item"], [3, "isSubmitted", "form", "config"], [1, "change-of-office-addresses-form-item-title"], [1, "annual-reminder", 3, "formGroup"], [3, "formControlName"], [3, "value"]], template: function BritishColumbiaChangeOfOfficeAddressesFormComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275elementStart(0, "div", 0);
-            \u0275\u0275template(1, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_1_Template, 1, 1, "alert", 1)(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_2_Template, 1, 1, "alert", 2)(3, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_3_Template, 1, 1, "alert", 2);
-            \u0275\u0275elementStart(4, "div", 3);
-            \u0275\u0275declareLet(5);
-            \u0275\u0275template(6, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_6_Template, 2, 4, "expandable-card", 4);
-            \u0275\u0275declareLet(7);
-            \u0275\u0275template(8, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_8_Template, 2, 6, "expandable-card", 5);
-            \u0275\u0275declareLet(9);
-            \u0275\u0275template(10, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_10_Template, 4, 3, "expandable-card", 5);
-            \u0275\u0275declareLet(11);
-            \u0275\u0275template(12, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_12_Template, 4, 3, "expandable-card", 5);
-            \u0275\u0275declareLet(13);
-            \u0275\u0275template(14, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_14_Template, 12, 15, "expandable-card", 6);
+            \u0275\u0275template(1, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_1_Template, 1, 1, "alert", 1)(2, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_2_Template, 1, 1, "alert", 2);
+            \u0275\u0275elementStart(3, "div", 3);
+            \u0275\u0275declareLet(4);
+            \u0275\u0275template(5, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_5_Template, 2, 4, "expandable-card", 4);
+            \u0275\u0275declareLet(6);
+            \u0275\u0275template(7, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_7_Template, 2, 6, "expandable-card", 5);
+            \u0275\u0275declareLet(8);
+            \u0275\u0275template(9, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_9_Template, 15, 19, "expandable-card", 5);
+            \u0275\u0275declareLet(10);
+            \u0275\u0275template(11, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_11_Template, 9, 13, "expandable-card", 5);
+            \u0275\u0275declareLet(12);
+            \u0275\u0275template(13, BritishColumbiaChangeOfOfficeAddressesFormComponent_Conditional_13_Template, 12, 15, "expandable-card", 6);
             \u0275\u0275elementEnd()();
           }
           if (rf & 2) {
@@ -88197,26 +89007,26 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             \u0275\u0275conditional(ctx.isNote() ? 1 : -1);
             \u0275\u0275advance();
             \u0275\u0275conditional(ctx.errors().length ? 2 : -1);
-            \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.missingMessages().length ? 3 : -1);
             \u0275\u0275advance(2);
-            const referenceNumbers_r9 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.ReferenceNumbers));
+            const referenceNumbers_r25 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.ReferenceNumbers));
             \u0275\u0275advance();
-            \u0275\u0275conditional(referenceNumbers_r9 ? 6 : -1);
+            \u0275\u0275conditional(referenceNumbers_r25 ? 5 : -1);
             \u0275\u0275advance();
-            const corporationDetails_r10 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CorporationDetails));
+            const corporationDetails_r26 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.CorporationDetails));
             \u0275\u0275advance();
-            \u0275\u0275conditional(corporationDetails_r10 ? 8 : -1);
-            const registeredOffice_r11 = ctx.getFormGroup(ctx.groups.RegisteredOfficeAddress);
-            \u0275\u0275advance(2);
-            \u0275\u0275conditional(registeredOffice_r11 ? 10 : -1);
-            const recordsOffice_r12 = ctx.getFormGroup(ctx.groups.RecordsOfficeAddress);
-            \u0275\u0275advance(2);
-            \u0275\u0275conditional(recordsOffice_r12 ? 12 : -1);
+            \u0275\u0275conditional(corporationDetails_r26 ? 7 : -1);
+            \u0275\u0275advance();
+            const registeredOffice_r27 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.RegisteredOfficeAddress));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(registeredOffice_r27 ? 9 : -1);
+            \u0275\u0275advance();
+            const recordsOffice_r28 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.RecordsOfficeAddress));
             \u0275\u0275advance();
-            const annualReportReminder_r13 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
+            \u0275\u0275conditional(recordsOffice_r28 ? 11 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(annualReportReminder_r13 ? 14 : -1);
+            const annualReportReminder_r29 = \u0275\u0275storeLet(ctx.getFormGroup(ctx.groups.AnnualReportReminder));
+            \u0275\u0275advance();
+            \u0275\u0275conditional(annualReportReminder_r29 ? 13 : -1);
           }
         }, dependencies: [
           FilingFormGroupComponent,
@@ -88230,7 +89040,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           FormGroupDirective,
           FormControlName,
           TranslatePipe
-        ], styles: ['\n\n[_nghost-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   p[_ngcontent-%COMP%] {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item-title[_ngcontent-%COMP%] {\n  color: var(--filing-modal-color-dark-blue);\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-address[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-previous[_ngcontent-%COMP%] {\n  font-size: 13px !important;\n  line-height: 18px;\n  font-family: "Open Sans";\n  font-style: italic;\n  color: var(--filing-modal-color-grey-mid);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */'], changeDetection: 0 });
+        ], styles: ["\n\n[_nghost-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-content[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   p[_ngcontent-%COMP%] {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]   mat-radio-group[_ngcontent-%COMP%] {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form[_ngcontent-%COMP%]   .annual-reminder[_ngcontent-%COMP%]     .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-form-item-title[_ngcontent-%COMP%] {\n  color: var(--filing-modal-color-dark-blue);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */"], changeDetection: 0 });
       };
       (() => {
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(BritishColumbiaChangeOfOfficeAddressesFormComponent, [{
@@ -88258,13 +89068,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       [content]="errors()"\r
     />\r
   }\r
-\r
-  @if (missingMessages().length) {\r
-    <alert\r
-      title="The following issues need to be resolved before proceeding:"\r
-      [content]="missingMessages()"\r
-    />\r
-  }\r
 \r
   <div class="change-of-office-addresses-form-content">\r
     @let referenceNumbers = getFormGroup(groups.ReferenceNumbers);\r
@@ -88301,24 +89104,54 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     @let registeredOffice = getFormGroup(groups.RegisteredOfficeAddress);\r
 \r
     @if (registeredOffice) {\r
+      @let registeredMailing = getAddressGroup(registeredOffice, controls.NewMailingAddress);\r
+      @let registeredDelivery = getAddressGroup(registeredOffice, controls.NewDeliveryAddress);\r
+      @let registeredDeliverySame = isChecked(registeredOffice, controls.DeliverySameAsMailing);\r
+\r
       <expandable-card\r
         [isStatusIcon]="!readonly()"\r
         [isValid]="isRegisteredOfficeValid()"\r
         [title]="groups.RegisteredOfficeAddress"\r
       >\r
         <div class="change-of-office-addresses-form-item">\r
-          @for (row of registeredRows(); track row.label) {\r
-            <div class="change-of-office-addresses-form-address">\r
-              <div class="body-1-regular grey">\r
-                <span class="body-1-semibold">{{ row.label | translate }}:</span>\r
-                {{ row.value || ('Not specified' | translate) }}\r
-              </div>\r
-              @if (row.previous) {\r
-                <div class="change-of-office-addresses-form-previous">\r
-                  {{ 'Previous' | translate }}: {{ row.previous }}\r
-                </div>\r
-              }\r
-            </div>\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="registeredOffice"\r
+            [config]="currentAddressesFields"\r
+          />\r
+\r
+          <h4 class="change-of-office-addresses-form-item-title">{{ 'New Mailing Address' | translate }}</h4>\r
+\r
+          @if (registeredMailing) {\r
+            <filing-form-group\r
+              [isSubmitted]="isSubmitted()"\r
+              [form]="registeredMailing"\r
+              [config]="addressFields"\r
+              (visiblyValidChange)="emitValidity()"\r
+            />\r
+          }\r
+\r
+          <h4 class="change-of-office-addresses-form-item-title">{{ 'New Delivery Address' | translate }}</h4>\r
+\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="registeredOffice"\r
+            [config]="deliverySameAsMailingFields"\r
+            (visiblyValidChange)="emitValidity()"\r
+          />\r
+\r
+          @if (!registeredDeliverySame && registeredDelivery) {\r
+            <filing-form-group\r
+              [isSubmitted]="isSubmitted()"\r
+              [form]="registeredOffice"\r
+              [config]="deliveryNoteFields"\r
+            />\r
+            <filing-form-group\r
+              [isSubmitted]="isSubmitted()"\r
+              [form]="registeredDelivery"\r
+              [config]="addressFields"\r
+              (visiblyValidChange)="emitValidity()"\r
+            />\r
           }\r
         </div>\r
       </expandable-card>\r
@@ -88328,24 +89161,59 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     @let recordsOffice = getFormGroup(groups.RecordsOfficeAddress);\r
 \r
     @if (recordsOffice) {\r
+      @let recordsMailing = getAddressGroup(recordsOffice, controls.NewMailingAddress);\r
+      @let recordsDelivery = getAddressGroup(recordsOffice, controls.NewDeliveryAddress);\r
+      @let recordsSameAsRegistered = isChecked(recordsOffice, controls.SameAsRegisteredOffice);\r
+      @let recordsDeliverySame = isChecked(recordsOffice, controls.DeliverySameAsMailing);\r
+\r
       <expandable-card\r
         [isStatusIcon]="!readonly()"\r
         [isValid]="isRecordsOfficeValid()"\r
         [title]="groups.RecordsOfficeAddress"\r
       >\r
         <div class="change-of-office-addresses-form-item">\r
-          @for (row of recordsRows(); track row.label) {\r
-            <div class="change-of-office-addresses-form-address">\r
-              <div class="body-1-regular grey">\r
-                <span class="body-1-semibold">{{ row.label | translate }}:</span>\r
-                {{ row.value || ('Not specified' | translate) }}\r
-              </div>\r
-              @if (row.previous) {\r
-                <div class="change-of-office-addresses-form-previous">\r
-                  {{ 'Previous' | translate }}: {{ row.previous }}\r
-                </div>\r
-              }\r
-            </div>\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="recordsOffice"\r
+            [config]="currentAddressesFields"\r
+          />\r
+\r
+          <filing-form-group\r
+            [isSubmitted]="isSubmitted()"\r
+            [form]="recordsOffice"\r
+            [config]="sameAsRegisteredOfficeFields"\r
+            (visiblyValidChange)="emitValidity()"\r
+          />\r
+\r
+          @if (!recordsSameAsRegistered) {\r
+            <h4 class="change-of-office-addresses-form-item-title">{{ 'New Mailing Address' | translate }}</h4>\r
+\r
+            @if (recordsMailing) {\r
+              <filing-form-group\r
+                [isSubmitted]="isSubmitted()"\r
+                [form]="recordsMailing"\r
+                [config]="addressFields"\r
+                (visiblyValidChange)="emitValidity()"\r
+              />\r
+            }\r
+\r
+            <h4 class="change-of-office-addresses-form-item-title">{{ 'New Delivery Address' | translate }}</h4>\r
+\r
+            <filing-form-group\r
+              [isSubmitted]="isSubmitted()"\r
+              [form]="recordsOffice"\r
+              [config]="deliverySameAsMailingFields"\r
+              (visiblyValidChange)="emitValidity()"\r
+            />\r
+\r
+            @if (!recordsDeliverySame && recordsDelivery) {\r
+              <filing-form-group\r
+                [isSubmitted]="isSubmitted()"\r
+                [form]="recordsDelivery"\r
+                [config]="addressFields"\r
+                (visiblyValidChange)="emitValidity()"\r
+              />\r
+            }\r
           }\r
         </div>\r
       </expandable-card>\r
@@ -88375,11 +89243,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }\r
   </div>\r
 </div>\r
-`, styles: ['/* src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.scss */\n:host {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .change-of-office-addresses-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .change-of-office-addresses-form .annual-reminder p {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder mat-radio-group {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n:host .change-of-office-addresses-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .change-of-office-addresses-form-item-title {\n  color: var(--filing-modal-color-dark-blue);\n}\n:host .change-of-office-addresses-form-address {\n  display: flex;\n  flex-direction: column;\n  gap: 4px;\n}\n:host .change-of-office-addresses-form-previous {\n  font-size: 13px !important;\n  line-height: 18px;\n  font-family: "Open Sans";\n  font-style: italic;\n  color: var(--filing-modal-color-grey-mid);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */\n'] }]
+`, styles: ["/* src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.scss */\n:host {\n  display: flex;\n  flex-direction: column;\n  flex: 1;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n:host .change-of-office-addresses-form-content {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  flex: 1;\n  overflow-y: auto;\n  min-height: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder {\n  display: flex;\n  flex-direction: column;\n  gap: 24px;\n}\n:host .change-of-office-addresses-form .annual-reminder p {\n  color: #6b7280;\n  font-size: 14px;\n  line-height: 1.5;\n  margin: 0;\n}\n:host .change-of-office-addresses-form .annual-reminder mat-radio-group {\n  align-items: flex-start;\n  display: flex;\n  flex-direction: column;\n  gap: 14px;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button .mdc-label {\n  color: #4b5563 !important;\n  font-size: 14px !important;\n  line-height: 1.45;\n}\n:host .change-of-office-addresses-form .annual-reminder ::ng-deep .mat-mdc-radio-button {\n  --mdc-radio-state-layer-size: 40px;\n}\n:host .change-of-office-addresses-form-item {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n}\n:host .change-of-office-addresses-form-item-title {\n  color: var(--filing-modal-color-dark-blue);\n}\n/*# sourceMappingURL=change-of-office-addresses-form.component.css.map */\n"] }]
         }], null, null);
       })();
       (() => {
-        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaChangeOfOfficeAddressesFormComponent, { className: "BritishColumbiaChangeOfOfficeAddressesFormComponent", filePath: "src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.ts", lineNumber: 61 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaChangeOfOfficeAddressesFormComponent, { className: "BritishColumbiaChangeOfOfficeAddressesFormComponent", filePath: "src/app/components/british-columbia/change-of-office-addresses/change-of-office-addresses-form/change-of-office-addresses-form.component.ts", lineNumber: 55 });
       })();
     }
   });
@@ -88433,7 +89301,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent, selectors: [["british-columbia-change-of-office-addresses-delta-form"]], inputs: { form: [1, "form"], actionsDisabled: [1, "actionsDisabled"], isNote: [1, "isNote"], task: [1, "task"], errors: [1, "errors"] }, outputs: { close: "close", save: "save", validate: "validate" }, decls: 15, vars: 19, consts: [[1, "change-of-office-addresses-delta-form"], [1, "change-of-office-addresses-delta-form-content", 3, "visiblyValidChange", "form", "task", "errors", "isNote", "loading", "isSubmitted", "readonly"], [1, "change-of-office-addresses-delta-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click", "disabled"], [1, "body-1-semibold"], ["color", "primary", "mat-flat-button", "", 1, "submit", 3, "click", "disabled"]], template: function BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent, selectors: [["british-columbia-change-of-office-addresses-delta-form"]], inputs: { form: [1, "form"], actionsDisabled: [1, "actionsDisabled"], isNote: [1, "isNote"], task: [1, "task"], errors: [1, "errors"] }, outputs: { close: "close", save: "save", validate: "validate" }, decls: 15, vars: 18, consts: [[1, "change-of-office-addresses-delta-form"], [1, "change-of-office-addresses-delta-form-content", 3, "visiblyValidChange", "form", "task", "errors", "isNote", "isSubmitted", "readonly"], [1, "change-of-office-addresses-delta-form-actions"], ["mat-stroked-button", "", "mat-button", "", 3, "click", "disabled"], [1, "body-1-semibold"], ["color", "primary", "mat-flat-button", "", 1, "submit", 3, "click", "disabled"]], template: function BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275elementStart(0, "div", 0)(1, "british-columbia-change-of-office-addresses-form", 1);
             \u0275\u0275listener("visiblyValidChange", function BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent_Template_british_columbia_change_of_office_addresses_form_visiblyValidChange_1_listener($event) {
@@ -88467,19 +89335,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           }
           if (rf & 2) {
             \u0275\u0275advance();
-            \u0275\u0275property("form", ctx.form())("task", ctx.task())("errors", ctx.combinedErrors())("isNote", ctx.isNote())("loading", ctx.actionsDisabled())("isSubmitted", ctx.submitted())("readonly", false);
+            \u0275\u0275property("form", ctx.form())("task", ctx.task())("errors", ctx.combinedErrors())("isNote", ctx.isNote())("isSubmitted", ctx.submitted())("readonly", false);
             \u0275\u0275advance(2);
             \u0275\u0275property("disabled", ctx.actionsDisabled());
             \u0275\u0275advance(2);
-            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 13, "Close"));
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(6, 12, "Close"));
             \u0275\u0275advance(2);
             \u0275\u0275property("disabled", ctx.actionsDisabled());
             \u0275\u0275advance(2);
-            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(10, 15, "Save Changes"));
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(10, 14, "Save Changes"));
             \u0275\u0275advance(2);
             \u0275\u0275property("disabled", ctx.actionsDisabled());
             \u0275\u0275advance(2);
-            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(14, 17, "Validate & Generate Draft"));
+            \u0275\u0275textInterpolate(\u0275\u0275pipeBind1(14, 16, "Validate & Generate Draft"));
           }
         }, dependencies: [MatButton, TranslatePipe, BritishColumbiaChangeOfOfficeAddressesFormComponent], styles: ["\n\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form[_ngcontent-%COMP%] {\n  display: flex;\n  flex-direction: column;\n  gap: 16px;\n  height: 100%;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form-content[_ngcontent-%COMP%] {\n  flex: 1;\n  min-height: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form-actions[_ngcontent-%COMP%] {\n  display: flex;\n  justify-content: flex-end;\n  align-items: center;\n  gap: 8px;\n  padding-top: 16px;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form-actions[_ngcontent-%COMP%]   button[_ngcontent-%COMP%] {\n  margin: 0;\n}\n[_nghost-%COMP%]   .change-of-office-addresses-delta-form-actions[_ngcontent-%COMP%]   .submit[_ngcontent-%COMP%] {\n  padding-left: 30px;\n  padding-right: 30px;\n}\n/*# sourceMappingURL=change-of-office-addresses-delta-form.component.css.map */"], changeDetection: 0 });
       };
@@ -88493,7 +89361,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     [task]="task()"\r
     [errors]="combinedErrors()"\r
     [isNote]="isNote()"\r
-    [loading]="actionsDisabled()"\r
     [isSubmitted]="submitted()"\r
     [readonly]="false"\r
     (visiblyValidChange)="onVisiblyValidChange($event)"\r
@@ -88678,52 +89545,52 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   function BritishColumbiaComponent_Conditional_2_Conditional_0_Template(rf, ctx) {
     if (rf & 1) {
       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\u0275elementStart(0, "british-columbia-annual-report-delta-form", 2);
+      \u0275\u0275listener("validate", function BritishColumbiaComponent_Conditional_2_Conditional_0_Template_british_columbia_annual_report_delta_form_validate_0_listener() {
         \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() {
+        return \u0275\u0275resetView(ctx_r1.onAnnualReportValidate());
+      })("close", function BritishColumbiaComponent_Conditional_2_Conditional_0_Template_british_columbia_annual_report_delta_form_close_0_listener() {
         \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() {
+      })("save", function BritishColumbiaComponent_Conditional_2_Conditional_0_Template_british_columbia_annual_report_delta_form_save_0_listener() {
         \u0275\u0275restoreView(_r5);
         const ctx_r1 = \u0275\u0275nextContext(2);
-        return \u0275\u0275resetView(ctx_r1.onFormationSave());
+        return \u0275\u0275resetView(ctx_r1.onAnnualReportSave());
       });
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
       const ctx_r1 = \u0275\u0275nextContext(2);
       const taskData_r3 = \u0275\u0275readContextLet(0);
-      \u0275\u0275property("task", taskData_r3)("errors", ctx_r1.errors())("isNote", ctx_r1.isNote())("actionsDisabled", ctx_r1.actionsDisabled())("form", ctx_r1.deltaForm());
+      \u0275\u0275property("task", taskData_r3)("form", ctx_r1.deltaForm())("actionsDisabled", ctx_r1.actionsDisabled())("errors", ctx_r1.errors())("isNote", ctx_r1.isNote());
     }
   }
   function BritishColumbiaComponent_Conditional_2_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
       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\u0275elementStart(0, "british-columbia-annual-report-preview-form", 3);
+      \u0275\u0275listener("close", function BritishColumbiaComponent_Conditional_2_Conditional_1_Template_british_columbia_annual_report_preview_form_close_0_listener() {
         \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() {
+        return \u0275\u0275resetView(ctx_r1.close.emit());
+      })("file", function BritishColumbiaComponent_Conditional_2_Conditional_1_Template_british_columbia_annual_report_preview_form_file_0_listener() {
         \u0275\u0275restoreView(_r6);
         const ctx_r1 = \u0275\u0275nextContext(2);
-        return \u0275\u0275resetView(ctx_r1.close.emit());
+        return \u0275\u0275resetView(ctx_r1.onAnnualReportSubmit());
       });
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
       const ctx_r1 = \u0275\u0275nextContext(2);
       const taskData_r3 = \u0275\u0275readContextLet(0);
-      \u0275\u0275property("task", taskData_r3)("form", ctx_r1.previewForm())("errors", ctx_r1.errors())("actionsDisabled", ctx_r1.actionsDisabled());
+      \u0275\u0275property("task", taskData_r3)("form", ctx_r1.previewForm())("actionsDisabled", ctx_r1.actionsDisabled())("errors", ctx_r1.errors());
     }
   }
   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", 4)(1, BritishColumbiaComponent_Conditional_2_Conditional_1_Template, 1, 4, "british-columbia-incorporation-preview-form", 5);
+      \u0275\u0275template(0, BritishColumbiaComponent_Conditional_2_Conditional_0_Template, 1, 5, "british-columbia-annual-report-delta-form", 0)(1, BritishColumbiaComponent_Conditional_2_Conditional_1_Template, 1, 4, "british-columbia-annual-report-preview-form", 1);
     }
     if (rf & 2) {
       const ctx_r1 = \u0275\u0275nextContext();
@@ -88735,39 +89602,96 @@ 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 _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\u0275elementStart(0, "british-columbia-incorporation-delta-form", 6);
+      \u0275\u0275listener("validate", function BritishColumbiaComponent_Conditional_3_Conditional_0_Template_british_columbia_incorporation_delta_form_validate_0_listener() {
         \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() {
+        return \u0275\u0275resetView(ctx_r1.onFormationValidate());
+      })("close", function BritishColumbiaComponent_Conditional_3_Conditional_0_Template_british_columbia_incorporation_delta_form_close_0_listener() {
         \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() {
+      })("save", function BritishColumbiaComponent_Conditional_3_Conditional_0_Template_british_columbia_incorporation_delta_form_save_0_listener() {
         \u0275\u0275restoreView(_r7);
         const ctx_r1 = \u0275\u0275nextContext(2);
-        return \u0275\u0275resetView(ctx_r1.onChangeOfOfficeAddressesSave());
+        return \u0275\u0275resetView(ctx_r1.onFormationSave());
       });
       \u0275\u0275elementEnd();
     }
     if (rf & 2) {
       const ctx_r1 = \u0275\u0275nextContext(2);
       const taskData_r3 = \u0275\u0275readContextLet(0);
-      \u0275\u0275property("task", taskData_r3)("form", ctx_r1.deltaForm())("actionsDisabled", ctx_r1.actionsDisabled())("errors", ctx_r1.errors())("isNote", ctx_r1.isNote());
+      \u0275\u0275property("task", taskData_r3)("errors", ctx_r1.errors())("isNote", ctx_r1.isNote())("actionsDisabled", ctx_r1.actionsDisabled())("form", ctx_r1.deltaForm());
     }
   }
   function BritishColumbiaComponent_Conditional_3_Conditional_1_Template(rf, ctx) {
     if (rf & 1) {
       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\u0275elementStart(0, "british-columbia-incorporation-preview-form", 7);
+      \u0275\u0275listener("next", function BritishColumbiaComponent_Conditional_3_Conditional_1_Template_british_columbia_incorporation_preview_form_next_0_listener() {
         \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() {
+        return \u0275\u0275resetView(ctx_r1.onFormationSubmit());
+      })("close", function BritishColumbiaComponent_Conditional_3_Conditional_1_Template_british_columbia_incorporation_preview_form_close_0_listener() {
         \u0275\u0275restoreView(_r8);
         const ctx_r1 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r1.close.emit());
+      });
+      \u0275\u0275elementEnd();
+    }
+    if (rf & 2) {
+      const ctx_r1 = \u0275\u0275nextContext(2);
+      const taskData_r3 = \u0275\u0275readContextLet(0);
+      \u0275\u0275property("task", taskData_r3)("form", ctx_r1.previewForm())("errors", ctx_r1.errors())("actionsDisabled", ctx_r1.actionsDisabled());
+    }
+  }
+  function BritishColumbiaComponent_Conditional_3_Template(rf, ctx) {
+    if (rf & 1) {
+      \u0275\u0275template(0, BritishColumbiaComponent_Conditional_3_Conditional_0_Template, 1, 5, "british-columbia-incorporation-delta-form", 4)(1, BritishColumbiaComponent_Conditional_3_Conditional_1_Template, 1, 4, "british-columbia-incorporation-preview-form", 5);
+    }
+    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);
+    }
+  }
+  function BritishColumbiaComponent_Conditional_4_Conditional_0_Template(rf, ctx) {
+    if (rf & 1) {
+      const _r9 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "british-columbia-change-of-office-addresses-delta-form", 2);
+      \u0275\u0275listener("validate", function BritishColumbiaComponent_Conditional_4_Conditional_0_Template_british_columbia_change_of_office_addresses_delta_form_validate_0_listener() {
+        \u0275\u0275restoreView(_r9);
+        const ctx_r1 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r1.onChangeOfOfficeAddressesValidate());
+      })("close", function BritishColumbiaComponent_Conditional_4_Conditional_0_Template_british_columbia_change_of_office_addresses_delta_form_close_0_listener() {
+        \u0275\u0275restoreView(_r9);
+        const ctx_r1 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r1.onClose());
+      })("save", function BritishColumbiaComponent_Conditional_4_Conditional_0_Template_british_columbia_change_of_office_addresses_delta_form_save_0_listener() {
+        \u0275\u0275restoreView(_r9);
+        const ctx_r1 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r1.onChangeOfOfficeAddressesSave());
+      });
+      \u0275\u0275elementEnd();
+    }
+    if (rf & 2) {
+      const ctx_r1 = \u0275\u0275nextContext(2);
+      const taskData_r3 = \u0275\u0275readContextLet(0);
+      \u0275\u0275property("task", taskData_r3)("form", ctx_r1.deltaForm())("actionsDisabled", ctx_r1.actionsDisabled())("errors", ctx_r1.errors())("isNote", ctx_r1.isNote());
+    }
+  }
+  function BritishColumbiaComponent_Conditional_4_Conditional_1_Template(rf, ctx) {
+    if (rf & 1) {
+      const _r10 = \u0275\u0275getCurrentView();
+      \u0275\u0275elementStart(0, "british-columbia-change-of-office-addresses-preview-form", 3);
+      \u0275\u0275listener("close", function BritishColumbiaComponent_Conditional_4_Conditional_1_Template_british_columbia_change_of_office_addresses_preview_form_close_0_listener() {
+        \u0275\u0275restoreView(_r10);
+        const ctx_r1 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r1.close.emit());
+      })("file", function BritishColumbiaComponent_Conditional_4_Conditional_1_Template_british_columbia_change_of_office_addresses_preview_form_file_0_listener() {
+        \u0275\u0275restoreView(_r10);
+        const ctx_r1 = \u0275\u0275nextContext(2);
         return \u0275\u0275resetView(ctx_r1.onChangeOfOfficeAddressesFile());
       });
       \u0275\u0275elementEnd();
@@ -88778,9 +89702,9 @@ 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_3_Template(rf, ctx) {
+  function BritishColumbiaComponent_Conditional_4_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275template(0, BritishColumbiaComponent_Conditional_3_Conditional_0_Template, 1, 5, "british-columbia-change-of-office-addresses-delta-form", 0)(1, BritishColumbiaComponent_Conditional_3_Conditional_1_Template, 1, 4, "british-columbia-change-of-office-addresses-preview-form", 1);
+      \u0275\u0275template(0, BritishColumbiaComponent_Conditional_4_Conditional_0_Template, 1, 5, "british-columbia-change-of-office-addresses-delta-form", 0)(1, BritishColumbiaComponent_Conditional_4_Conditional_1_Template, 1, 4, "british-columbia-change-of-office-addresses-preview-form", 1);
     }
     if (rf & 2) {
       const ctx_r1 = \u0275\u0275nextContext();
@@ -88799,12 +89723,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_app_enums();
       init_BritishColumbiaConstants();
       init_british_columbia_form_enums();
+      init_british_columbia_annual_report_form_helper();
       init_british_columbia_change_of_directors_form_helper();
       init_british_columbia_formation_form_helper();
       init_british_columbia_change_of_office_addresses_form_helper();
       init_delta_state_service();
       init_common_utils();
       init_confirm_modal_component();
+      init_british_columbia_annual_report_delta_form_component();
+      init_british_columbia_annual_report_preview_form_component();
       init_change_of_directors_delta_form_component();
       init_change_of_directors_preview_form_component();
       init_british_columbia_incorporation_delta_form_component();
@@ -88820,8 +89747,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         actionsDisabled = input(false);
         errors = input([]);
         currentDataExtract = input();
-        /** False while the registry's current data is loading; the validated-draft preview waits for it. */
-        extractReady = input(true);
         close = output();
         codValidate = output();
         saveCodDeltaData = output();
@@ -88832,6 +89757,10 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         nextStep = output();
         recheckStep = output();
         prevStep = output();
+        // Annual Report outputs
+        arValidate = output();
+        saveArDeltaData = output();
+        arSubmit = output();
         // Change of Office Addresses outputs
         coaValidate = output();
         saveCoaDeltaData = output();
@@ -88842,6 +89771,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         steps = Step;
         isChangeOfDirectorsTask = isChangeOfPrincipalsTask;
         isFormationTask = isFormationTask2;
+        isAnnualReportTask = isAnnualReturnTask;
         isChangeOfOfficeAddressesTask = isChangeOfAddressTask;
         deltaForm = signal(new FormGroup({}));
         previewForm = signal(new FormGroup({}));
@@ -88857,9 +89787,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.deltaState.setBCFormationInitialDelta(this.generateFormationDeltaData());
             }
             if (task && isChangeOfAddressTask(task)) {
-              this.deltaForm.set(new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key), this.currentDataExtract())));
+              this.deltaForm.set(new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key))));
               this.deltaState.setBCChangeOfOfficeAddressesInitialDelta(this.generateChangeOfOfficeAddressesDeltaData());
             }
+            if (task && isAnnualReturnTask(task)) {
+              untracked2(() => {
+                this.deltaForm.set(new FormGroup(BritishColumbiaAnnualReportFormHelper.generateConfig(task)));
+                this.deltaState.setBCAnnualReportInitialDelta(this.generateAnnualReportDeltaData());
+              });
+            }
           });
           effect(() => {
             const task = this.task();
@@ -88883,8 +89819,16 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 this.nextStep.emit();
               }
             }
-            if (task && isChangeOfAddressTask(task) && deltaData && this.extractReady()) {
-              const form = new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key), this.currentDataExtract()));
+            if (isAnnualReturnTask(task)) {
+              const form = new FormGroup(BritishColumbiaAnnualReportFormHelper.generateConfig(task));
+              form.disable();
+              this.previewForm.set(form);
+              if (untracked2(() => this.activeStep()) === Step.Validate) {
+                this.nextStep.emit();
+              }
+            }
+            if (task && isChangeOfAddressTask(task) && deltaData) {
+              const form = new FormGroup(BritishColumbiaChangeOfOfficeAddressesFormHelper.generateConfig(task, (key) => this.translate.instant(key)));
               form.disable();
               this.previewForm.set(form);
               const step = untracked2(() => this.activeStep());
@@ -88896,6 +89840,33 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           });
         }
+        onAnnualReportValidate() {
+          markFormGroupTouched(this.deltaForm());
+          this.arValidate.emit(this.generateAnnualReportDeltaData());
+        }
+        onAnnualReportSave() {
+          const delta = this.generateAnnualReportDeltaData();
+          this.deltaState.setBCAnnualReportInitialDelta(delta);
+          this.saveArDeltaData.emit(delta);
+        }
+        /** No certification step for this filing: "File" submits the staged draft directly. */
+        onAnnualReportSubmit() {
+          this.arSubmit.emit();
+        }
+        generateAnnualReportDeltaData() {
+          const formData = this.deltaForm().getRawValue();
+          const general = formData[BCAnnualReportFormGroups.General];
+          const companyEmail = formData[BCAnnualReportFormGroups.CompanyEmail];
+          const reminder = formData[BCAnnualReportFormGroups.AnnualReportReminder];
+          return {
+            referenceNumbers: {
+              referenceNumber: general?.[BCAnnualReportFormControls.ClientMatterNumber] ?? null,
+              docketNumber: general?.[BCAnnualReportFormControls.DocketNumber] ?? null
+            },
+            companyEmail: companyEmail?.[BCAnnualReportFormControls.CompanyEmail] ?? null,
+            isAnnualReportReminderRequired: Boolean(reminder?.[BCAnnualReportFormControls.IsAnnualReportReminderRequired])
+          };
+        }
         onChangeOfOfficeAddressesValidate() {
           markFormGroupTouched(this.deltaForm());
           this.coaValidate.emit(this.generateChangeOfOfficeAddressesDeltaData());
@@ -89047,7 +90018,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         }
         onClose() {
           const task = this.task();
-          const hasChanges = task && isFormationTask2(task) ? !deepEqual(this.deltaState.bcFormationInitialDelta(), this.generateFormationDeltaData()) : task && isChangeOfAddressTask(task) ? !deepEqual(this.deltaState.bcChangeOfOfficeAddressesInitialDelta(), this.generateChangeOfOfficeAddressesDeltaData()) : !deepEqual(this.deltaState.bcChangeOfDirectorsInitialDelta(), this.generateChangeOfDirectorsDeltaData());
+          const hasChanges = task && isAnnualReturnTask(task) ? !deepEqual(this.deltaState.bcAnnualReportInitialDelta(), this.generateAnnualReportDeltaData()) : task && isFormationTask2(task) ? !deepEqual(this.deltaState.bcFormationInitialDelta(), this.generateFormationDeltaData()) : task && isChangeOfAddressTask(task) ? !deepEqual(this.deltaState.bcChangeOfOfficeAddressesInitialDelta(), this.generateChangeOfOfficeAddressesDeltaData()) : !deepEqual(this.deltaState.bcChangeOfDirectorsInitialDelta(), this.generateChangeOfDirectorsDeltaData());
           if (!hasChanges) {
             this.close.emit();
             return;
@@ -89063,7 +90034,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             width: "65rem"
           }).afterClosed().subscribe((val) => {
             if (val) {
-              if (task && isFormationTask2(task)) {
+              if (task && isAnnualReturnTask(task)) {
+                this.onAnnualReportSave();
+              } else if (task && isFormationTask2(task)) {
                 this.onFormationSave();
               } else if (task && isChangeOfAddressTask(task)) {
                 this.onChangeOfOfficeAddressesSave();
@@ -89077,21 +90050,25 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         static \u0275fac = function BritishColumbiaComponent_Factory(__ngFactoryType__) {
           return new (__ngFactoryType__ || _BritishColumbiaComponent)();
         };
-        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaComponent, selectors: [["british-columbia"]], inputs: { task: [1, "task"], currentUser: [1, "currentUser"], activeStep: [1, "activeStep"], isNote: [1, "isNote"], actionsDisabled: [1, "actionsDisabled"], errors: [1, "errors"], currentDataExtract: [1, "currentDataExtract"], extractReady: [1, "extractReady"] }, outputs: { close: "close", codValidate: "codValidate", saveCodDeltaData: "saveCodDeltaData", codSubmit: "codSubmit", formationValidate: "formationValidate", formationSubmit: "formationSubmit", saveFormationDeltaData: "saveFormationDeltaData", nextStep: "nextStep", recheckStep: "recheckStep", prevStep: "prevStep", coaValidate: "coaValidate", saveCoaDeltaData: "saveCoaDeltaData", coaSubmit: "coaSubmit" }, decls: 4, vars: 4, consts: [[3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"], [3, "task", "errors", "isNote", "actionsDisabled", "form"], [3, "task", "form", "errors", "actionsDisabled"], [3, "validate", "close", "save", "task", "errors", "isNote", "actionsDisabled", "form"], [3, "next", "close", "task", "form", "errors", "actionsDisabled"]], template: function BritishColumbiaComponent_Template(rf, ctx) {
+        static \u0275cmp = /* @__PURE__ */ \u0275\u0275defineComponent({ type: _BritishColumbiaComponent, selectors: [["british-columbia"]], inputs: { task: [1, "task"], currentUser: [1, "currentUser"], activeStep: [1, "activeStep"], isNote: [1, "isNote"], actionsDisabled: [1, "actionsDisabled"], errors: [1, "errors"], currentDataExtract: [1, "currentDataExtract"] }, outputs: { close: "close", codValidate: "codValidate", saveCodDeltaData: "saveCodDeltaData", codSubmit: "codSubmit", formationValidate: "formationValidate", formationSubmit: "formationSubmit", saveFormationDeltaData: "saveFormationDeltaData", nextStep: "nextStep", recheckStep: "recheckStep", prevStep: "prevStep", arValidate: "arValidate", saveArDeltaData: "saveArDeltaData", arSubmit: "arSubmit", coaValidate: "coaValidate", saveCoaDeltaData: "saveCoaDeltaData", coaSubmit: "coaSubmit" }, decls: 5, vars: 5, consts: [[3, "task", "form", "actionsDisabled", "errors", "isNote"], [3, "task", "form", "actionsDisabled", "errors"], [3, "validate", "close", "save", "task", "form", "actionsDisabled", "errors", "isNote"], [3, "close", "file", "task", "form", "actionsDisabled", "errors"], [3, "task", "errors", "isNote", "actionsDisabled", "form"], [3, "task", "form", "errors", "actionsDisabled"], [3, "validate", "close", "save", "task", "errors", "isNote", "actionsDisabled", "form"], [3, "next", "close", "task", "form", "errors", "actionsDisabled"]], template: function BritishColumbiaComponent_Template(rf, ctx) {
           if (rf & 1) {
             \u0275\u0275declareLet(0);
-            \u0275\u0275template(1, BritishColumbiaComponent_Conditional_1_Template, 2, 2)(2, BritishColumbiaComponent_Conditional_2_Template, 2, 2)(3, BritishColumbiaComponent_Conditional_3_Template, 2, 2);
+            \u0275\u0275template(1, BritishColumbiaComponent_Conditional_1_Template, 2, 2)(2, BritishColumbiaComponent_Conditional_2_Template, 2, 2)(3, BritishColumbiaComponent_Conditional_3_Template, 2, 2)(4, BritishColumbiaComponent_Conditional_4_Template, 2, 2);
           }
           if (rf & 2) {
-            const taskData_r9 = \u0275\u0275storeLet(ctx.task());
+            const taskData_r11 = \u0275\u0275storeLet(ctx.task());
+            \u0275\u0275advance();
+            \u0275\u0275conditional(ctx.isChangeOfDirectorsTask(taskData_r11) ? 1 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.isChangeOfDirectorsTask(taskData_r9) ? 1 : -1);
+            \u0275\u0275conditional(ctx.isAnnualReportTask(taskData_r11) ? 2 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.isFormationTask(taskData_r9) ? 2 : -1);
+            \u0275\u0275conditional(ctx.isFormationTask(taskData_r11) ? 3 : -1);
             \u0275\u0275advance();
-            \u0275\u0275conditional(ctx.isChangeOfOfficeAddressesTask(taskData_r9) ? 3 : -1);
+            \u0275\u0275conditional(ctx.isChangeOfOfficeAddressesTask(taskData_r11) ? 4 : -1);
           }
         }, dependencies: [
+          BritishColumbiaAnnualReportDeltaFormComponent,
+          BritishColumbiaAnnualReportPreviewFormComponent,
           BritishColumbiaChangeOfDirectorsDeltaFormComponent,
           BritishColumbiaChangeOfDirectorsPreviewFormComponent,
           BritishColumbiaIncorporationDeltaFormComponent,
@@ -89104,17 +90081,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         (typeof ngDevMode === "undefined" || ngDevMode) && setClassMetadata(BritishColumbiaComponent, [{
           type: Component,
           args: [{ standalone: true, selector: "british-columbia", changeDetection: ChangeDetectionStrategy.OnPush, imports: [
+            BritishColumbiaAnnualReportDeltaFormComponent,
+            BritishColumbiaAnnualReportPreviewFormComponent,
             BritishColumbiaChangeOfDirectorsDeltaFormComponent,
             BritishColumbiaChangeOfDirectorsPreviewFormComponent,
             BritishColumbiaIncorporationDeltaFormComponent,
             BritishColumbiaIncorporationPreviewFormComponent,
             BritishColumbiaChangeOfOfficeAddressesDeltaFormComponent,
             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"] }]
+          ], 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 (isAnnualReportTask(taskData)) {\r\n  @if (activeStep() === steps.Validate) {\r\n    <british-columbia-annual-report-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)="onAnnualReportValidate()"\r\n      (close)="onClose()"\r\n      (save)="onAnnualReportSave()"\r\n    />\r\n  }\r\n\r\n  @if (activeStep() === steps.FilingPreview) {\r\n    <british-columbia-annual-report-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)="onAnnualReportSubmit()"\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: 72 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(BritishColumbiaComponent, { className: "BritishColumbiaComponent", filePath: "src/app/components/british-columbia/british-columbia.component.ts", lineNumber: 82 });
       })();
     }
   });
@@ -90766,7 +91745,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275pipe(7, "translate");
       \u0275\u0275elementEnd();
       \u0275\u0275elementStart(8, "ul", 16);
-      \u0275\u0275repeaterCreate(9, FederalIncorporationFormComponent_Conditional_7_For_10_Template, 2, 1, "li", 17, _forTrack06);
+      \u0275\u0275repeaterCreate(9, FederalIncorporationFormComponent_Conditional_7_For_10_Template, 2, 1, "li", 17, _forTrack05);
       \u0275\u0275elementEnd()();
       \u0275\u0275elementStart(11, "span", 17);
       \u0275\u0275text(12);
@@ -90969,7 +91948,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       \u0275\u0275property("isSubmitted", ctx_r0.isSubmitted())("form", contactForm_r24)("config", ctx_r0.contactControl);
     }
   }
-  var _c016, _forTrack06, FederalIncorporationFormComponent;
+  var _c016, _forTrack05, FederalIncorporationFormComponent;
   var init_federal_incorporation_form_component = __esm({
     "src/app/components/federal/incorporation/federal-incorporation-form/federal-incorporation-form.component.ts"() {
       init_core();
@@ -90994,7 +91973,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_common();
       init_core();
       _c016 = ["*"];
-      _forTrack06 = ($index, $item) => $item.affiliationID;
+      _forTrack05 = ($index, $item) => $item.affiliationID;
       FederalIncorporationFormComponent = class _FederalIncorporationFormComponent {
         form = input.required();
         isNote = input(false);
@@ -95495,14 +96474,14 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/helpers/mappers/british-columbia-change-of-directors.mapper.ts
-  function getBritishColumbiaAccessCode(task, password) {
+  function getBritishColumbiaAccessCode2(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),
+      accessCodeOrPassword: getBritishColumbiaAccessCode2(task, password),
       incorporationDate: /^\d{4}-\d{2}-\d{2}$/.test(incorporationDate) ? incorporationDate : "",
       filingType: "changeOfDirectorsFiling"
     };
@@ -95546,7 +96525,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       currentDataServiceOrderId,
       filing: __spreadProps(__spreadValues({
         corporationNumber: task.entity._profile.corp_number ?? "",
-        accessCodeOrPassword: getBritishColumbiaAccessCode(task),
+        accessCodeOrPassword: getBritishColumbiaAccessCode2(task),
         reference: deltaData.referenceNumbers.referenceNumber ?? null,
         docket: deltaData.referenceNumbers.docketNumber ?? null
       }, (addDirectors.length || ceaseDirectors.length) && effectiveDate ? { effectiveDate } : {}), {
@@ -95654,7 +96633,12 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   });
 
   // src/app/services/british-columbia/british-columbia-maintenance.service.ts
-  var MAINTENANCE_FILING_PATH, TEMP_UAT_BC_FILING_URL2, DATA_EXTRACT_PATH, DEFAULT_EXTRACT_POLL, DEFAULT_RESULT_POLL, BritishColumbiaMaintenanceService;
+  function isExtractNotCompleted(error) {
+    const result = error?.validateResult;
+    const fromResult = (result?.Errors ?? []).some((e) => e.Code === EXTRACT_NOT_COMPLETED_CODE || EXTRACT_NOT_COMPLETED_MESSAGE.test(e.Message ?? ""));
+    return fromResult || EXTRACT_NOT_COMPLETED_MESSAGE.test(error?.message ?? "");
+  }
+  var MAINTENANCE_FILING_PATH, TEMP_UAT_BC_FILING_URL2, DATA_EXTRACT_PATH, DEFAULT_EXTRACT_POLL, DEFAULT_RESULT_POLL, DEFAULT_VALIDATE_RETRY, EXTRACT_NOT_COMPLETED_CODE, EXTRACT_NOT_COMPLETED_MESSAGE, BritishColumbiaMaintenanceService;
   var init_british_columbia_maintenance_service = __esm({
     "src/app/services/british-columbia/british-columbia-maintenance.service.ts"() {
       init_core();
@@ -95665,6 +96649,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       DATA_EXTRACT_PATH = "/filings/ca/bc/data-extract";
       DEFAULT_EXTRACT_POLL = { intervalMs: 3e3, timeoutMs: 6e5 };
       DEFAULT_RESULT_POLL = { intervalMs: 3e3, timeoutMs: 6e5 };
+      DEFAULT_VALIDATE_RETRY = { intervalMs: 3e3, timeoutMs: 12e4 };
+      EXTRACT_NOT_COMPLETED_CODE = "SVC1031";
+      EXTRACT_NOT_COMPLETED_MESSAGE = /extract has not completed/i;
       BritishColumbiaMaintenanceService = class _BritishColumbiaMaintenanceService {
         config;
         setConfig(config2) {
@@ -95677,7 +96664,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               corporationNumber: context2.corporationNumber,
               accessCodeOrPassword: context2.accessCodeOrPassword,
               incorporationDate: context2.incorporationDate,
-              filingType: "changeOfAddressFiling"
+              filingType: context2.filingType ?? "changeOfAddressFiling"
             }, opts);
             const id = body?.currentDataServiceOrderId ?? body?.CurrentDataServiceOrderId;
             if (!ok || !id || String(body?.status ?? "").toLowerCase() === "failed") {
@@ -95686,7 +96673,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             return String(id);
           });
         }
-        /** Polls the extract until the registry has it ready (`success`) and returns the extract. */
+        /** Polls the extract until the registry has it ready (`success`). */
         waitForCurrentDataExtract(_0, _1) {
           return __async(this, arguments, function* (signature, extractId, opts = {}, poll = {}) {
             const { intervalMs, timeoutMs } = __spreadValues(__spreadValues({}, DEFAULT_EXTRACT_POLL), poll);
@@ -95695,7 +96682,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               const { status, ok, body, raw } = yield this.send(signature, "GET", `${DATA_EXTRACT_PATH}/${encodeURIComponent(extractId)}`, void 0, opts);
               const state2 = String(body?.status ?? "").toLowerCase();
               if (ok && state2 === "success") {
-                return body ?? {};
+                return;
               }
               if (!ok || state2 === "failed" || state2 === "sourceunavailable") {
                 throw this.failure(status, "Retrieving the current data from the registry failed", body, raw);
@@ -95713,7 +96700,23 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
          * saved request used to detect Entity changes.
          */
         validate(_0, _1, _2, _3) {
-          return __async(this, arguments, function* (signature, requestBody, extractId, context2, opts = {}) {
+          return __async(this, arguments, function* (signature, requestBody, extractId, context2, opts = {}, retry = {}) {
+            const { intervalMs, timeoutMs } = __spreadValues(__spreadValues({}, DEFAULT_VALIDATE_RETRY), retry);
+            const deadline = Date.now() + timeoutMs;
+            for (; ; ) {
+              try {
+                return yield this.validateOnce(signature, requestBody, extractId, context2, opts);
+              } catch (error) {
+                if (!isExtractNotCompleted(error) || Date.now() >= deadline) {
+                  throw error;
+                }
+                yield this.sleep(intervalMs);
+              }
+            }
+          });
+        }
+        validateOnce(signature, requestBody, extractId, context2, opts) {
+          return __async(this, null, function* () {
             const { status, ok, body, raw } = yield this.send(signature, "POST", MAINTENANCE_FILING_PATH, {
               currentDataServiceOrderId: extractId,
               filingType: requestBody.filingType,
@@ -95863,83 +96866,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     }
   });
 
-  // src/app/helpers/mappers/british-columbia-change-of-office-addresses.mapper.ts
-  function formatPostalCode(value) {
-    const compact = clean(value).replace(/[\s-]+/g, "").toUpperCase();
-    return compact.length === 6 ? `${compact.slice(0, 3)} ${compact.slice(3)}` : clean(value).toUpperCase();
-  }
-  function toEcoreAddress(address) {
-    const line2 = clean(address?.addressLine2);
-    return __spreadProps(__spreadValues({
-      streetAddress: clean(address?.addressLine1)
-    }, line2 ? { additionalStreetAddress: line2 } : {}), {
-      city: clean(address?.city),
-      provinceOrState: BC_PROVINCE_CODE,
-      postalOrZipCode: formatPostalCode(address?.postalCode),
-      country: CANADA_COUNTRY_CODE
-    });
-  }
-  function isSameAddress(a, b) {
-    const key = (x) => [x.streetAddress, x.additionalStreetAddress, x.city, x.provinceOrState, x.postalOrZipCode, x.country].map((v) => (v ?? "").trim().toLowerCase().replace(/\s+/g, " ")).join("|");
-    return key(a) === key(b);
-  }
-  function buildBCChangeOfOfficeAddressesValidateRequest(task, deltaData) {
-    const registered = deltaData.registeredOffice;
-    const records = deltaData.recordsOffice;
-    const registeredMailing = toEcoreAddress(registered?.mailingAddress);
-    const registeredDelivery = registered?.deliverySameAsMailing ? registeredMailing : toEcoreAddress(registered?.deliveryAddress);
-    const recordsMailing = records?.sameAsRegisteredOffice ? registeredMailing : toEcoreAddress(records?.mailingAddress);
-    const recordsDelivery = records?.sameAsRegisteredOffice ? registeredDelivery : records?.deliverySameAsMailing ? recordsMailing : toEcoreAddress(records?.deliveryAddress);
-    const registeredDeliverySame = isSameAddress(registeredDelivery, registeredMailing);
-    const recordsSameAsRegistered = isSameAddress(recordsMailing, registeredMailing);
-    const recordsDeliverySame = isSameAddress(recordsDelivery, recordsMailing);
-    const filing = {
-      registeredOfficeMailingAddress: registeredMailing,
-      isRegisteredOfficeDeliveryAddressSameAsMailing: registeredDeliverySame,
-      isRecordsOfficeMailingAddressSameAsRegisteredOfficeMailing: recordsSameAsRegistered,
-      isRecordsOfficeDeliveryAddressSameAsRecordsOfficeMailing: recordsDeliverySame,
-      // Both are picked on the form; the fallbacks only cover data saved before they were added.
-      companyEmail: clean(deltaData.companyEmail) || BritishColumbiaChangeOfOfficeAddressesFormHelper.resolveCompanyEmail(task),
-      isAnnualReportReminderRequired: deltaData.annualReportReminder === BCAnnualReportReminder.Yes
-    };
-    const reference = clean(deltaData.referenceNumbers?.referenceNumber);
-    const docket = clean(deltaData.referenceNumbers?.docketNumber);
-    if (reference) {
-      filing.reference = reference;
-    }
-    if (docket) {
-      filing.docket = docket;
-    }
-    if (!registeredDeliverySame) {
-      filing.registeredOfficeDeliveryAddress = registeredDelivery;
-    }
-    if (!recordsSameAsRegistered) {
-      filing.recordsOfficeMailingAddress = recordsMailing;
-    }
-    if (!recordsDeliverySame) {
-      filing.recordsOfficeDeliveryAddress = recordsDelivery;
-    }
-    return { filingType: "changeOfAddressFiling", filing };
-  }
-  function getBritishColumbiaAccessCode2(task, env) {
-    const registryId = task.entity._profile.registry_id?.trim() ?? "";
-    if (registryId) {
-      return registryId;
-    }
-    return env === "TEST" ? TEMP_UAT_TEST_ACCESS_CODE : "";
-  }
-  var TEMP_UAT_TEST_ACCESS_CODE, BC_PROVINCE_CODE, CANADA_COUNTRY_CODE, clean;
-  var init_british_columbia_change_of_office_addresses_mapper = __esm({
-    "src/app/helpers/mappers/british-columbia-change-of-office-addresses.mapper.ts"() {
-      init_BritishColumbiaConstants();
-      init_british_columbia_change_of_office_addresses_form_helper();
-      TEMP_UAT_TEST_ACCESS_CODE = "xxxxxxxx";
-      BC_PROVINCE_CODE = "BC";
-      CANADA_COUNTRY_CODE = "CA";
-      clean = (value) => (value ?? "").trim();
-    }
-  });
-
   // src/app/components/filing/filing.component.ts
   function FilingComponent_Conditional_7_Template(rf, ctx) {
     if (rf & 1) {
@@ -96055,6 +96981,18 @@ 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.onBritishColumbiaChangeOfOfficeAddressesSubmit());
+      })("arValidate", function FilingComponent_Conditional_10_Conditional_1_Template_british_columbia_arValidate_0_listener($event) {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r2 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r2.onBritishColumbiaAnnualReportValidate($event));
+      })("saveArDeltaData", function FilingComponent_Conditional_10_Conditional_1_Template_british_columbia_saveArDeltaData_0_listener($event) {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r2 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r2.onBritishColumbiaAnnualReportSave($event));
+      })("arSubmit", function FilingComponent_Conditional_10_Conditional_1_Template_british_columbia_arSubmit_0_listener() {
+        \u0275\u0275restoreView(_r6);
+        const ctx_r2 = \u0275\u0275nextContext(2);
+        return \u0275\u0275resetView(ctx_r2.onBritishColumbiaAnnualReportSubmit());
       })("formationValidate", function FilingComponent_Conditional_10_Conditional_1_Template_british_columbia_formationValidate_0_listener($event) {
         \u0275\u0275restoreView(_r6);
         const ctx_r2 = \u0275\u0275nextContext(2);
@@ -96073,7 +97011,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
     if (rf & 2) {
       const ctx_r2 = \u0275\u0275nextContext(2);
       const currentTask_r5 = \u0275\u0275readContextLet(9);
-      \u0275\u0275property("task", currentTask_r5)("currentUser", ctx_r2.currentUser())("activeStep", ctx_r2.activeStep())("isNote", ctx_r2.dataWasChanged())("actionsDisabled", ctx_r2.isLoading())("errors", ctx_r2.errors())("currentDataExtract", ctx_r2.currentDataExtract())("extractReady", ctx_r2.bcCoaExtractReady());
+      \u0275\u0275property("task", currentTask_r5)("currentUser", ctx_r2.currentUser())("activeStep", ctx_r2.activeStep())("isNote", ctx_r2.dataWasChanged())("actionsDisabled", ctx_r2.isLoading())("errors", ctx_r2.errors())("currentDataExtract", ctx_r2.currentDataExtract());
     }
   }
   function FilingComponent_Conditional_10_Conditional_2_Template(rf, ctx) {
@@ -96123,7 +97061,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
   }
   function FilingComponent_Conditional_10_Template(rf, ctx) {
     if (rf & 1) {
-      \u0275\u0275template(0, FilingComponent_Conditional_10_Conditional_0_Template, 1, 7, "ontario", 8)(1, FilingComponent_Conditional_10_Conditional_1_Template, 1, 8, "british-columbia", 9)(2, FilingComponent_Conditional_10_Conditional_2_Template, 1, 5, "federal", 10);
+      \u0275\u0275template(0, FilingComponent_Conditional_10_Conditional_0_Template, 1, 7, "ontario", 8)(1, FilingComponent_Conditional_10_Conditional_1_Template, 1, 7, "british-columbia", 9)(2, FilingComponent_Conditional_10_Conditional_2_Template, 1, 5, "federal", 10);
     }
     if (rf & 2) {
       const ctx_r2 = \u0275\u0275nextContext();
@@ -96161,6 +97099,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       init_federal_update_maintain_service();
       init_ontario_update_maintain_service();
       init_initial_return_payload_helper();
+      init_british_columbia_annual_report_mapper();
       init_ontario_formation_mapper();
       init_federal_formation_mapper();
       init_ontario_update_maintain_mapper();
@@ -96245,10 +97184,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         dataWasChanged = signal(false);
         serviceOrderId = "";
         bcCurrentDataServiceOrderId = "";
-        /** The registry's current data ordered for the Change of Office Addresses; reused by Validate. */
-        bcCoaExtractId = "";
-        /** False while the registry's current office addresses are loading. */
-        bcCoaExtractReady = signal(true);
         currentDataExtract = signal(void 0);
         bcDataExtractTaskId = "";
         activeStep = signal(Step.Validate);
@@ -96269,7 +97204,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             return `File ${jurisdiction} Notice of Change`;
           }
           if (isAnnualReturnTask(task)) {
-            return `File ${jurisdiction} Annual Return`;
+            return isBritishColumbiaTask(task) ? `File ${jurisdiction} Annual Report` : `File ${jurisdiction} Annual Return`;
           }
           if (isFormationTask2(task)) {
             return `File ${jurisdiction} Articles of Incorporation`;
@@ -96343,47 +97278,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
                 this.isLoading.set(false);
               }
             }
-            if (isChangeOfAddressTask(task) && isBritishColumbiaTask(task) && this.bcDataExtractTaskId !== task._id) {
-              this.bcDataExtractTaskId = task._id;
-              yield this.loadBritishColumbiaOfficeAddressExtract(task);
-            }
           }));
         }
-        /**
-         * Orders the registry's current office addresses as soon as the Change of Office Addresses opens,
-         * so each office shows its registry address as "Previous". If the registry is unavailable the form
-         * falls back to the Entity's own addresses, and Validate orders the extract again.
-         */
-        loadBritishColumbiaOfficeAddressExtract(task) {
-          return __async(this, null, function* () {
-            const signature = this._signature();
-            if (!signature) {
-              return;
-            }
-            this.isLoading.set(true);
-            this.bcCoaExtractReady.set(false);
-            try {
-              const opts = this.validateOptions() ?? {};
-              const context2 = this.getBritishColumbiaOfficeAddressContext(task, signature);
-              this.bcCoaExtractId = yield this.bcMaintenanceService.orderCurrentDataExtract(signature, context2, opts);
-              this.currentDataExtract.set(yield this.bcMaintenanceService.waitForCurrentDataExtract(signature, this.bcCoaExtractId, opts));
-            } catch (error) {
-              this.bcCoaExtractId = "";
-              this.currentDataExtract.set(void 0);
-              console.warn("The registry's current office addresses could not be loaded.", error);
-            } finally {
-              this.bcCoaExtractReady.set(true);
-              this.isLoading.set(false);
-            }
-          });
-        }
-        getBritishColumbiaOfficeAddressContext(task, signature) {
-          return {
-            corporationNumber: task.entity._profile.corp_number ?? "",
-            accessCodeOrPassword: getBritishColumbiaAccessCode2(task, signature.env),
-            incorporationDate: String(task.entity._compliance?.incorporation_date ?? "").slice(0, 10)
-          };
-        }
         getCurrentData() {
           return __async(this, null, function* () {
             const signature = this._signature();
@@ -96664,6 +97560,99 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
           });
         }
+        /**
+         * British Columbia Annual Report "Validate & Generate Draft": orders the registry's current data,
+         * sends the filing to eCore, hands the draft PDF to the host, and saves the delta together with
+         * the ServiceOrderId and the request sent (`validatedData`) used to detect later Entity changes.
+         */
+        onBritishColumbiaAnnualReportValidate(deltaData) {
+          return __async(this, null, function* () {
+            const task = this.task();
+            const signature = this._signature();
+            try {
+              if (!task || !signature || !isAnnualReturnTask(task)) {
+                throw new Error("The filing is not ready yet. Please try again.");
+              }
+              this.isLoading.set(true);
+              this.errors.set([]);
+              const requestBody = buildBCAnnualReportValidateRequest(task, deltaData);
+              const opts = this.validateOptions() ?? {};
+              const context2 = buildBCAnnualReportContext(task, signature.env);
+              const extractId = yield this.bcMaintenanceService.orderCurrentDataExtract(signature, context2, opts);
+              yield this.bcMaintenanceService.waitForCurrentDataExtract(signature, extractId, opts);
+              const response = yield this.bcMaintenanceService.validate(signature, requestBody, extractId, context2, opts);
+              if (this.hasResponseErrors(response))
+                return;
+              const serviceOrderId = response.ServiceOrderId ?? "";
+              const draftPdf = response.Draft ?? "";
+              const searchOrFilingType = getSearchOrFilingType(task);
+              if (draftPdf && searchOrFilingType) {
+                this.filingValidateSuccess.emit({
+                  searchOrFilingType,
+                  serviceOrderId,
+                  validatedOn: /* @__PURE__ */ new Date(),
+                  provider: getFilingProvider(task),
+                  draftPdf,
+                  documentName: this.validateOptions()?.documentName ?? "British Columbia Annual Report Draft",
+                  documentType: "pdf"
+                });
+              }
+              this.deltaDataChange.emit(__spreadProps(__spreadValues({}, deltaData), {
+                serviceOrderId,
+                // 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) {
+              this.handleCatchError(response);
+            } finally {
+              this.isLoading.set(false);
+            }
+          });
+        }
+        /**
+         * British Columbia Annual Report save – propagates delta data to the host.
+         * The draft link (ServiceOrderId and the request it was generated from) is kept, so reopening
+         * can tell whether the saved data still matches the draft and show "Entity changed" if not.
+         */
+        onBritishColumbiaAnnualReportSave(deltaData) {
+          const oldDeltaData = this.task()?.deltaData;
+          const draftLink = oldDeltaData?.serviceOrderId && oldDeltaData?.validatedData ? {
+            serviceOrderId: oldDeltaData.serviceOrderId,
+            validatedData: oldDeltaData.validatedData
+          } : {};
+          if (oldDeltaData) {
+            delete this.task()?.deltaData;
+          }
+          this.deltaDataChange.emit(__spreadValues(__spreadValues({}, deltaData), draftLink));
+        }
+        /**
+         * British Columbia Annual Report submit/file: submits the filing staged by "Validate & Generate
+         * Draft" using the ServiceOrderId saved with the delta. There is no certification step.
+         */
+        onBritishColumbiaAnnualReportSubmit() {
+          return __async(this, null, function* () {
+            const signature = this._signature();
+            const serviceOrderId = this.task()?.deltaData?.serviceOrderId;
+            if (!signature || !serviceOrderId) {
+              this.handleCatchError(new Error("Missing serviceOrderId. Generate a draft before filing."));
+              return;
+            }
+            try {
+              this.isLoading.set(true);
+              this.errors.set([]);
+              yield this.bcMaintenanceService.submitAndWait(signature, serviceOrderId, this.validateOptions() ?? {});
+              this.close.emit();
+            } catch (response) {
+              this.handleCatchError(response);
+            } finally {
+              this.isLoading.set(false);
+            }
+          });
+        }
         /**
          * British Columbia Change of Office Addresses "Validate & Generate Draft": sends the filing
          * to eCore, hands the draft PDF to the host, and saves the delta together with the
@@ -96681,13 +97670,13 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               this.errors.set([]);
               const requestBody = buildBCChangeOfOfficeAddressesValidateRequest(task, deltaData);
               const opts = this.validateOptions() ?? {};
-              const context2 = this.getBritishColumbiaOfficeAddressContext(task, signature);
-              let extractId = this.bcCoaExtractId;
-              if (!extractId) {
-                extractId = yield this.bcMaintenanceService.orderCurrentDataExtract(signature, context2, opts);
-                yield this.bcMaintenanceService.waitForCurrentDataExtract(signature, extractId, opts);
-                this.bcCoaExtractId = extractId;
-              }
+              const context2 = {
+                corporationNumber: task.entity._profile.corp_number ?? "",
+                accessCodeOrPassword: getBritishColumbiaAccessCode(task, signature.env),
+                incorporationDate: String(task.entity._compliance?.incorporation_date ?? "").slice(0, 10)
+              };
+              const extractId = yield this.bcMaintenanceService.orderCurrentDataExtract(signature, context2, opts);
+              yield this.bcMaintenanceService.waitForCurrentDataExtract(signature, extractId, opts);
               const response = yield this.bcMaintenanceService.validate(signature, requestBody, extractId, context2, opts);
               if (this.hasResponseErrors(response))
                 return;
@@ -96983,7 +97972,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const task = this.task();
           if (!task)
             return;
-          if (isUpdateMaintain(task)) {
+          if (isUpdateMaintain(task) && !isBritishColumbiaTask(task)) {
             this.serviceOrderId = "";
             void this.getCurrentData();
           } else if (isChangeOfPrincipalsTask(task) && isBritishColumbiaTask(task)) {
@@ -97127,6 +98116,8 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             initialDelta = isOntarioTask(task) ? this.deltaState.formationInitialDelta() : isBritishColumbiaTask(task) ? this.deltaState.bcFormationInitialDelta() : this.deltaState.federalFormationInitialDelta();
           } else if (isChangeOfAddressTask(task) && isBritishColumbiaTask(task)) {
             initialDelta = this.deltaState.bcChangeOfOfficeAddressesInitialDelta();
+          } else if (isAnnualReturnTask(task) && isBritishColumbiaTask(task)) {
+            initialDelta = this.deltaState.bcAnnualReportInitialDelta();
           } else if (isUpdateMaintain(task)) {
             initialDelta = isOntarioTask(task) ? this.deltaState.initialReturnInitialDelta() : this.deltaState.federalUpdateMaintainInitialDelta();
           } else if (isChangeOfPrincipalsTask(task) && isBritishColumbiaTask(task)) {
@@ -97165,6 +98156,11 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
               corporationNumber: task.entity._profile.corp_number ?? ""
             });
           }
+          if (isAnnualReturnTask(task) && isBritishColumbiaTask(task)) {
+            return __spreadProps(__spreadValues({}, buildBCAnnualReportValidateRequest(task, deltaData)), {
+              corporationNumber: task.entity._profile.corp_number ?? ""
+            });
+          }
           if (isUpdateMaintain(task) && isOntarioTask(task)) {
             const serviceOrderId = deltaData?.serviceOrderId ?? this.serviceOrderId;
             if (!serviceOrderId) {
@@ -97193,7 +98189,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           if (rf & 2) {
             \u0275\u0275styleProp("height", ctx.modalHeight());
           }
-        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], currentUser: [1, "currentUser"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 9, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract", "extractReady"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "nextStep", "recheckStep", "prevStep", "codValidate", "saveCodDeltaData", "codSubmit", "coaValidate", "saveCoaDeltaData", "coaSubmit", "formationValidate", "saveFormationDeltaData", "formationSubmit", "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract", "extractReady"], [3, "close", "deltaDataChange", "file", "validate", "umSave", "umValidate", "umSubmit", "nextStep", "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "diameter"]], template: function FilingComponent_Template(rf, ctx) {
+        }, inputs: { env: [1, "env"], config: [1, "config"], language: [1, "language"], proxyApiUrl: [1, "proxyApiUrl"], jwtToken: [1, "jwtToken"], task: [1, "task"], currentUser: [1, "currentUser"], height: [1, "height"], validateOptions: [1, "validateOptions"], getDocumentBytes: [1, "getDocumentBytes"] }, outputs: { deltaDataChange: "deltaDataChange", filingValidateSuccess: "filingValidateSuccess", filingSubmitSuccess: "filingSubmitSuccess", close: "close" }, decls: 12, vars: 9, consts: [[1, "filing"], [1, "filing-title"], [1, "filing-title-text"], [1, "filing-title-action", 3, "click"], [1, "filing-header"], [1, "filing-content"], [1, "filing-content-loading"], ["mat-stroked-button", "", 3, "click", "disabled"], [3, "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "task", "currentUser", "activeStep", "isNote", "actionsDisabled", "errors", "currentDataExtract"], [3, "actionsDisabled", "isNote", "activeStep", "task", "errors"], [3, "close", "formationValidate", "saveFormationDeltaData", "formationSubmit", "nextStep", "prevStep", "irValidate", "saveIrDeltaData", "irSubmit", "task", "activeStep", "isNote", "actionsDisabled", "errors", "prevData", "irValidationConfig"], [3, "close", "nextStep", "recheckStep", "prevStep", "codValidate", "saveCodDeltaData", "codSubmit", "coaValidate", "saveCoaDeltaData", "coaSubmit", "arValidate", "saveArDeltaData", "arSubmit", "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);
@@ -97297,7 +98293,6 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           [actionsDisabled]="isLoading()"\r
           [errors]="errors()"\r
           [currentDataExtract]="currentDataExtract()"\r
-          [extractReady]="bcCoaExtractReady()"\r
           (close)="close.emit()"\r
           (nextStep)="onNextStepClick()"\r
           (recheckStep)="defineInitialStep()"\r
@@ -97308,6 +98303,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           (coaValidate)="onBritishColumbiaChangeOfOfficeAddressesValidate($event)"\r
           (saveCoaDeltaData)="onBritishColumbiaChangeOfOfficeAddressesSave($event)"\r
           (coaSubmit)="onBritishColumbiaChangeOfOfficeAddressesSubmit()"\r
+          (arValidate)="onBritishColumbiaAnnualReportValidate($event)"\r
+          (saveArDeltaData)="onBritishColumbiaAnnualReportSave($event)"\r
+          (arSubmit)="onBritishColumbiaAnnualReportSubmit()"\r
           (formationValidate)="onBritishColumbiaFormationValidate($event)"\r
           (saveFormationDeltaData)="onBritishColumbiaFormationSave($event)"\r
           (formationSubmit)="onBritishColumbiaFormationSubmit()"\r
@@ -97341,7 +98339,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: 98 });
+        (typeof ngDevMode === "undefined" || ngDevMode) && \u0275setClassDebugInfo(FilingComponent, { className: "FilingComponent", filePath: "src/app/components/filing/filing.component.ts", lineNumber: 103 });
       })();
     }
   });
@@ -101991,19 +102989,19 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         "File British Columbia Change of Office Addresses": "File British Columbia Change of Office Addresses",
         "Records Office Address": "Records Office Address",
         "The new addresses will take effect at the beginning of the day following the filing date. The registered and records offices must be located in British Columbia.": "The new addresses will take effect at the beginning of the day following the filing date. The registered and records offices must be located in British Columbia.",
-        "The Registered Office mailing address is missing. Add it in UEM, then try again.": "The Registered Office mailing address is missing. Add it in UEM, then try again.",
-        "The Registered Office delivery address is missing. Add it in UEM, then try again.": "The Registered Office delivery address is missing. Add it in UEM, then try again.",
-        "The Records Office mailing address is missing. Add it in UEM, then try again.": "The Records Office mailing address is missing. Add it in UEM, then try again.",
-        "The Records Office delivery address is missing. Add it in UEM, then try again.": "The Records Office delivery address is missing. Add it in UEM, then try again.",
-        "Mailing Address": "Mailing Address",
-        "Delivery Address": "Delivery Address",
         "Current Mailing Address": "Current Mailing Address",
         "Current Delivery Address": "Current Delivery Address",
         "New Mailing Address": "New Mailing Address",
         "New Delivery Address": "New Delivery Address",
         "Same as Mailing Address": "Same as Mailing Address",
         "Same as Registered Office": "Same as Registered Office",
-        "The delivery address must be a physical location in British Columbia where documents can be delivered during statutory business hours. A post office box is not acceptable.": "The delivery address must be a physical location in British Columbia where documents can be delivered during statutory business hours. A post office box is not acceptable."
+        "The delivery address must be a physical location in British Columbia where documents can be delivered during statutory business hours. A post office box is not acceptable.": "The delivery address must be a physical location in British Columbia where documents can be delivered during statutory business hours. A post office box is not acceptable.",
+        "Company Name": "Company Name",
+        "Name Reservation (NR) Number": "Name Reservation (NR) Number",
+        "File British Columbia Annual Report": "File British Columbia Annual Report",
+        "Would the company like to receive reminders to file its annual reports": "Would the company like to receive reminders to file its annual reports",
+        "Company Email is required": "Company Email is required",
+        "The draft is missing its Service Order ID. Close this window and generate a new draft.": "The draft is missing its Service Order ID. Close this window and generate a new draft."
       };
     }
   });
@@ -102353,19 +103351,16 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
         "Without Par Value": "Sans valeur nominale",
         "File British Columbia Change of Office Addresses": "D\xE9poser le changement d'adresses de bureaux de la Colombie-Britannique",
         "The new addresses will take effect at the beginning of the day following the filing date. The registered and records offices must be located in British Columbia.": "Les nouvelles adresses prendront effet au d\xE9but du jour suivant la date de d\xE9p\xF4t. Le si\xE8ge social et le bureau des registres doivent \xEAtre situ\xE9s en Colombie-Britannique.",
-        "The Registered Office mailing address is missing. Add it in UEM, then try again.": "L'adresse postale du si\xE8ge social est manquante. Ajoutez-la dans UEM, puis r\xE9essayez.",
-        "The Registered Office delivery address is missing. Add it in UEM, then try again.": "L'adresse de livraison du si\xE8ge social est manquante. Ajoutez-la dans UEM, puis r\xE9essayez.",
-        "The Records Office mailing address is missing. Add it in UEM, then try again.": "L'adresse postale du bureau des registres est manquante. Ajoutez-la dans UEM, puis r\xE9essayez.",
-        "The Records Office delivery address is missing. Add it in UEM, then try again.": "L'adresse de livraison du bureau des registres est manquante. Ajoutez-la dans UEM, puis r\xE9essayez.",
-        "Mailing Address": "Adresse postale",
-        "Delivery Address": "Adresse de livraison",
         "Current Mailing Address": "Adresse postale actuelle",
         "Current Delivery Address": "Adresse de livraison actuelle",
         "New Mailing Address": "Nouvelle adresse postale",
         "New Delivery Address": "Nouvelle adresse de livraison",
         "Same as Mailing Address": "Identique \xE0 l'adresse postale",
         "Same as Registered Office": "Identique au si\xE8ge social",
-        "The delivery address must be a physical location in British Columbia where documents can be delivered during statutory business hours. A post office box is not acceptable.": "L'adresse de livraison doit \xEAtre un lieu physique en Colombie-Britannique o\xF9 des documents peuvent \xEAtre livr\xE9s pendant les heures d'ouverture l\xE9gales. Une case postale n'est pas accept\xE9e."
+        "The delivery address must be a physical location in British Columbia where documents can be delivered during statutory business hours. A post office box is not acceptable.": "L'adresse de livraison doit \xEAtre un lieu physique en Colombie-Britannique o\xF9 des documents peuvent \xEAtre livr\xE9s pendant les heures d'ouverture l\xE9gales. Une case postale n'est pas accept\xE9e.",
+        "File British Columbia Articles of Incorporation": "D\xE9poser les statuts constitutifs de la Colombie-Britannique",
+        "Company Name": "Nom de la soci\xE9t\xE9",
+        "Name Reservation (NR) Number": "Num\xE9ro de r\xE9servation de nom (NR)"
       };
     }
   });