@dyedurham/search-and-file-widget 2.0.41 → 2.0.43

package/dnd-filing-shell.js

@@ -84426,7 +84426,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const citizenships = isc.participant?._profile?.["citizenships"];
           const countriesOfCitizenship = citizenships?.map((c) => normalizeCountryCode(c)).join(", ") ?? "";
           const countriesOfResidence = normalizeCountryCode(isc.participant?._profile?.tax_residency?.country ?? "");
-          const address = isc.addresses?.[0] || isc.parent_affiliation?.addresses?.[0];
+          const address = this.getAffiliationAddress(isc);
           return new FormGroup(__spreadValues({
             [FormationFormControls.AffiliationName]: new FormControl({ value: name, disabled: true }),
             [FormationFormControls.Id]: new FormControl({ value: id, disabled: true }),
@@ -84440,11 +84440,18 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             [FederalFormationFormControl.ISCPercentageInterest]: new FormControl(deltaData?.percentageInterest ?? null, requiredIfNotValue(FederalFormationFormControl.ISCTypeOfInterest, ISCTypeOfInterest.ControlWithoutShares))
           }, this.generateAddressFormGroup(address)));
         }
+        static getAffiliationAddress(affiliation) {
+          const addresses = affiliation?.addresses?.filter((address) => this.hasAddressValue(address)) ?? [];
+          const parentAddresses = affiliation?.parent_affiliation?.addresses?.filter((address) => this.hasAddressValue(address)) ?? [];
+          const addressReferences = affiliation?._addresses?.filter((address) => this.hasAddressValue(address)) ?? [];
+          return addresses[0] || parentAddresses[0] || addressReferences[0];
+        }
         static generateAddressFormGroup(address) {
           const config2 = {};
           if (address) {
-            const streetOnly = getAddressComponent(address, "Street Only");
-            const streetNumberOnly = getAddressComponent(address, "Street Number Only");
+            const street = this.resolveStreet(address);
+            const streetOnly = street.name;
+            const streetNumberOnly = street.number;
             const { StreetName, StreetType: StreetType2, StreetDirection: StreetDirection2 } = parseStreetAddress(streetOnly);
             const streetType = StreetType2 ? mapStreetType(StreetType2) : "";
             const streetDirection = StreetDirection2 ? mapStreetDirection(StreetDirection2) : "";
@@ -84490,6 +84497,22 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           }
           return config2;
         }
+        static resolveStreet(address) {
+          const componentStreetName = getAddressComponent(address, "Street Only");
+          const componentStreetNumber = getAddressComponent(address, "Street Number Only");
+          if (componentStreetName || componentStreetNumber) {
+            return {
+              number: componentStreetNumber,
+              name: componentStreetName
+            };
+          }
+          const line = address.street?.trim() || address.display?.line1?.trim() || "";
+          const match = /^(\d[\w-]*)\s+(.+)$/.exec(line);
+          return match ? { number: match[1], name: match[2] } : { number: "", name: line };
+        }
+        static hasAddressValue(address) {
+          return Boolean(address?.components?.some((component) => component.value?.trim()) || address?.street?.trim() || address?.display?.line1?.trim() || address?.display?.line2?.trim() || address?.city?.trim() || address?.province_state?.trim() || address?.country?.trim() || address?.postal_zip?.trim());
+        }
       };
     }
   });
@@ -85007,10 +85030,15 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
           const map2 = /* @__PURE__ */ new Map();
           const individualsWithSignificantControl = this.getSelectableIndividualsWithSignificantControl(affiliations);
           for (const individual of individualsWithSignificantControl) {
-            const addressOptions = individual.addresses.map((address) => ({
+            const addresses = [
+              ...individual.addresses ?? [],
+              ...individual.parent_affiliation?.addresses ?? []
+            ];
+            const resolvedAddress = FederalFormHelper.getAffiliationAddress(individual);
+            const addressOptions = (addresses.length ? addresses : resolvedAddress ? [resolvedAddress] : []).map((address) => ({
               label: this.formatAddressLabel(address),
               value: address.uid
-            }));
+            })).filter((option) => option.label && option.value);
             map2.set(individual._id, addressOptions);
           }
           return map2;
@@ -87936,7 +87964,9 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
       }) : void 0,
       Directors: directors.map((d) => transformDirector(d, directorsDelta[d.participant._id], consentToProvideEmails)),
       Incorporators: incorporators.map((i) => transformIncorporator(i)),
-      CoverLetter: createCoverLetter2(officialBusinessEmail, contactPerson, officerPhone),
+      // Cover letter is the Contact's: name, email and phone must all come from the same person.
+      // officerPhone is the incorporator/signatory's and is empty for a body corporate.
+      CoverLetter: createCoverLetter2(officialBusinessEmail, contactPerson, formatPhone(pickPhone(contactPerson)) || officerPhone),
       DirectorNumberType: isFixedDirectors ? ECoreDirectorNumberType.Fixed : ECoreDirectorNumberType.Range
     }, isFixedDirectors ? { FixedNumberOfDirectors: minDirectors } : {
       MinimumNumberOfDirectors: minDirectors || 1,
@@ -89642,7 +89672,7 @@ Note: Recommended intrinsic image size is calculated assuming a maximum DPR of $
             }
             const federalPayload = buildFederalFormationValidateRequest(task, deltaData);
             const validatedIncorporation = deltaData?.validatedData?.Incorporation;
-            if (!task._ext?._future_filing_date && validatedIncorporation) {
+            if (!task._ext?._future_filing_date && validatedIncorporation?.EffectiveType === federalPayload.Incorporation.EffectiveType) {
               federalPayload.Incorporation.EffectiveDate = validatedIncorporation.EffectiveDate;
               federalPayload.Incorporation.EffectiveType = validatedIncorporation.EffectiveType;
             }

package/package.json

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