@adyen/kyc-components 3.92.1 → 3.93.0-beta.2

package/dist/{useBusinessDetailsData-D4EbMk7x.js → useBusinessDetailsData-nW3yfjoJ.js}

@@ -2,72 +2,74 @@
 {
   try {
     let e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "97eafdcf-c4a5-4695-8eff-86d9780f4506", e._sentryDebugIdIdentifier = "sentry-dbid-97eafdcf-c4a5-4695-8eff-86d9780f4506");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "40cfd7ac-6372-4e45-8f41-9d6cf761b440", e._sentryDebugIdIdentifier = "sentry-dbid-40cfd7ac-6372-4e45-8f41-9d6cf761b440");
   } catch (e) {
   }
 }
 ;
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
-import { u as useTranslation, aj as useI18nContext, as as isEmpty, i as isUndefinedOrNull, C as CountryCodes, bB as isISIN, B as Button, Z as useExperimentsContext, c as useLegalEntity, R as ROOT_LE, aP as useVersionConfiguration, G as Typography, L as Loader, o as useSettingsContext, b as useApiContext, am as useMutation, k as httpPost, j as useQuery, w as skipToken, al as entriesOf, ao as useQueryClient, V as useAnalyticsContext, H as createLogger, N as useAccountHolder, U as TaskTypes, r as LegalEntityTypes, bC as businessDetailsComponentsKeyMapping, bD as solePropBusinessDetailsKeyMapping, ad as objectsDeepEqual, b0 as keysOf, bE as solePropBusinessDetailsApiKeyMapping, bj as businessDetailsApiKeyMapping, aR as filterOutUnwantedAssociationsIfRootLE, aO as drop, a9 as getOwnEntityAssociations, aW as doArraysMatch, bF as solePropBusinessDetailsDocumentMapping, bG as businessDetailsDocumentMapping } from "./StoreProvider-BY1HQxMn.js";
+import { useMutation, useQuery, skipToken, useQueryClient } from "@tanstack/preact-query";
 import { useEffect, useCallback, useState, useMemo } from "preact/hooks";
-import { D as Divider, I as INDUSTRY_CODE_FIELD, i as industryCodeFieldMetadata, u as useIndustryCodes, a as IndustryCodeField, b as useCreateBusinessLine, c as useUpdateBusinessLine } from "./useUpdateBusinessLines-BWk0eCVS.js";
-import { u as useCreateLegalEntity } from "./useCreateLegalEntity-CmZ_Xs5Y.js";
-import { u as useUpdateLegalEntity } from "./useUpdateLegalEntity-DJomQK33.js";
-import { u as useFormContext, F as FormContextProvider, a as FormFlow } from "./useFormContext-03qTwgil.js";
-import { u as useToastContext } from "./useToastContext-BG3cHfke.js";
-import { C as CompanyTypesValues, h as handleKeys } from "./bafinUtils-BROXAx5r.js";
-import { c as composePerScenarioFormConfigurations, g as getPropsFromConfigurations } from "./process-field-configurations-2fq1Bq8j.js";
-import { a as addValidityToForms, u as useFormComposer } from "./dropinUtils-DqJ1Ds6F.js";
-import { u as useMultiForm } from "./useMultiForm-BNwZbeFz.js";
-import { u as uppercase, m as mapExistingFile, g as getPageName, b as useScenarioConfiguration } from "./mapExistingFile-Bz4_d6_m.js";
-import { C as Confirm } from "./Confirm-Ba5lqFqd.js";
-import { a as getDocument, j as getDocuments, c as createDocumentRequest, k as mergeProofOfOwnershipAttachments, b as getFileExtention, d as documentApiUtils } from "./validate-D5t_i90f.js";
-import { c as TAX_INFORMATION_FIELD, r as requestingBanking, d as requestingIssuing, t as taxInformationDefaultFieldMetadata, b as taxInformationDefaultFieldConfig, T as TaxInformationField, C as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, S as StateCodesUS, e as COUNTRIES_USING_COMPANY_SEARCH, M as MemoizedDocumentUpload, f as isRegistrationNumberAbsentStateV4Scenario, h as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, j as getCompanyRegistrationNumberOptions, k as countryToTaxInfoTypeMap, l as rules, g as getFieldsWithExistingData } from "./TaxInformationField-jCqBsFve.js";
-import { D as DBA_NAME_FIELD, B as BUSINESS_REGISTRATION_NUMBER_FIELD, V as VAT_NUMBER_FIELD, r as registrationAddressFields, o as operationalAddressIsSameIds, v as vatAbsenceReasonMetadata, d as defaultFieldMetadata$1, a as defaultFieldConfig$1, b as registrationNumberDefaultFieldMetadata, c as registrationNumberDefaultFieldConfig, e as doingBusinessAsFieldMetadata, f as doingBusinessAsAbsentFieldMetadata, g as DBANameField, h as BusinessRegistrationNumberField, i as VatNumberField, M as MemoizedConstitutionalDocument, j as getDefaultRegistrationNumberType, k as getDefaultVatNumberType, l as inferCompanyRegistrationNumberType, m as exemptFromRegistrationNumberDefaultFieldMetadata } from "./ConstitutionalDocument-DD5CB7gM.js";
-import { K as KEYBOARD_KEYS, M as Modal, a as ModalContent } from "./Modal-1Hv5tfNy.js";
-import { S as SettingNames } from "./TaskVerificationStatus-D7Yyt06M.js";
-import { t as toFullWidth, u as useAllowedCountries, m as mapJpAddressSchemaToAddressLocalizations, a as mapJpAddressSummary } from "./mapJpAddressSchemaToAddressLocalizations-COA1bDNt.js";
-import { g as getAddressSchemaForCountry, C as COUNTRIES_WITH_STATES_DATASET, a as getAddressSchemaLabelsByCountry, m as mapAddressLabels, c as getKeyForField } from "./utils-CANy0Arr.js";
-import { o as organizationTypesToSkipCompanyStructureForm } from "./utils-B5nzpIMU.js";
-import { f as formatCurrency, A as ALLOWED_SOF_SERVICES } from "./utils-DkGVdk7W.js";
-import { c as useAddressCleanse, f as formatAddressForCleanse, m as mapAddressData, A as Address, g as getNestedTrustedFields, S as STATE_FIELD, d as StateField, i as isDateOlderThanAYear } from "./Address-C8Kqz-2b.js";
+import { D as Divider, I as INDUSTRY_CODE_FIELD, i as industryCodeFieldMetadata, u as useIndustryCodes, a as IndustryCodeField, b as useCreateBusinessLine, c as useUpdateBusinessLine } from "./useUpdateBusinessLines-Ca6VPudz.js";
+import { u as useTranslation, ag as useI18nContext, an as isEmpty, i as isUndefinedOrNull, C as CountryCodes, br as isISIN, B as Button, W as useExperimentsContext, c as useLegalEntity, R as ROOT_LE, aC as useVersionConfiguration, x as Typography, L as Loader, m as useSettingsContext, b as useApiContext, j as httpPost, ai as entriesOf, P as useAnalyticsContext, z as createLogger, K as useAccountHolder, O as TaskTypes, q as LegalEntityTypes, bs as businessDetailsComponentsKeyMapping, bt as solePropBusinessDetailsKeyMapping, aa as objectsDeepEqual, aG as keysOf, bu as solePropBusinessDetailsApiKeyMapping, b5 as businessDetailsApiKeyMapping, aM as filterOutUnwantedAssociationsIfRootLE, aK as drop, a6 as getOwnEntityAssociations, aR as doArraysMatch, bv as solePropBusinessDetailsDocumentMapping, bw as businessDetailsDocumentMapping } from "./StoreProvider-D5FOVv9p.js";
+import { u as useCreateLegalEntity } from "./useCreateLegalEntity-DEc1Kwc9.js";
+import { u as useUpdateLegalEntity } from "./useUpdateLegalEntity-CV9zKmhh.js";
+import { u as useFormContext, F as FormContextProvider, a as FormFlow } from "./useFormContext-7UjLuyeC.js";
+import { u as useToastContext } from "./useToastContext-CY5gBg6O.js";
+import { C as CompanyTypesValues } from "./bafinUtils-D-iUsb1z.js";
+import { c as composePerScenarioFormConfigurations, g as getPropsFromConfigurations } from "./process-field-configurations-DGERpLQI.js";
+import { a as addValidityToForms, u as useFormComposer } from "./dropinUtils-D59ldyqp.js";
+import { u as useMultiForm } from "./useMultiForm-B3D5YMQv.js";
+import { u as uppercase, m as mapExistingFile, g as getPageName, b as useScenarioConfiguration } from "./mapExistingFile-DF8ylI3D.js";
+import { C as Confirm } from "./Confirm-DvCDgyAD.js";
+import { a as getDocument, j as getDocuments, c as createDocumentRequest, k as mergeProofOfOwnershipAttachments, b as getFileExtention, d as documentApiUtils } from "./validate-CDvp3PSV.js";
+import { c as TAX_INFORMATION_FIELD, r as requestingBanking, d as requestingIssuing, t as taxInformationDefaultFieldMetadata, a as taxInformationDefaultFieldConfig, T as TaxInformationField, C as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, S as StateCodesUS, e as isUsingCompanySearch, M as MemoizedDocumentUpload, f as isRegistrationNumberAbsentStateV4Scenario, h as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, j as getCompanyRegistrationNumberOptions, k as countryToTaxInfoTypeMap, l as rules, g as getFieldsWithExistingData } from "./TaxInformationField-AcI4laLZ.js";
+import { D as DBA_NAME_FIELD, B as BUSINESS_REGISTRATION_NUMBER_FIELD, V as VAT_NUMBER_FIELD, r as registrationAddressFields, o as operationalAddressIsSameIds, v as vatAbsenceReasonMetadata, d as defaultFieldMetadata$1, a as defaultFieldConfig$1, b as registrationNumberDefaultFieldMetadata, c as registrationNumberDefaultFieldConfig, e as doingBusinessAsFieldMetadata, f as doingBusinessAsAbsentFieldMetadata, g as DBANameField, h as BusinessRegistrationNumberField, i as VatNumberField, M as MemoizedConstitutionalDocument, j as getDefaultRegistrationNumberType, k as getDefaultVatNumberType, l as inferCompanyRegistrationNumberType, m as exemptFromRegistrationNumberDefaultFieldMetadata } from "./ConstitutionalDocument-BXepv2HE.js";
+import { K as KEYBOARD_KEYS, M as Modal, a as ModalContent } from "./Modal-DjqZRXyy.js";
+import { S as SettingNames } from "./TaskVerificationStatus-5hk86s25.js";
+import { t as toFullWidth, u as useAllowedCountries, m as mapJpAddressSchemaToAddressLocalizations, a as mapJpAddressSummary } from "./mapJpAddressSchemaToAddressLocalizations-Y24lCOu6.js";
+import { g as getAddressSchemaForCountry, C as COUNTRIES_WITH_STATES_DATASET, a as getAddressSchemaLabelsByCountry, m as mapAddressLabels, c as getKeyForField } from "./utils-kwRyi0uY.js";
+import { o as organizationTypesToSkipCompanyStructureForm } from "./utils-DJ11eWHJ.js";
+import { f as formatCurrency, A as ALLOWED_SOF_SERVICES } from "./utils-9A5Vx0Md.js";
+import { b as useAddressCleanse, f as formatAddressForCleanse, m as mapAddressData, A as Address, g as getNestedTrustedFields, S as STATE_FIELD, c as StateField, i as isDateOlderThanAYear } from "./Address-Bu9zOvAM.js";
 import { s as summaryItem } from "./summaryItem-CAQCQSkt.js";
-import { s as summaryStep } from "./Summary-Dt4LcwGJ.js";
-import { i as isValidationError, p as processValidationErrors, a as isMaintenanceModeError } from "./validationError-BkGOdtDT.js";
+import { s as summaryStep } from "./Summary-v4P9Y5kQ.js";
+import { i as isValidationError, p as processValidationErrors, a as isMaintenanceModeError } from "./validationError-BSalUIny.js";
 import { a as datasetUtilities } from "./datasetUtil-BHQp0-xL.js";
 import { r as resolveFieldMetadata } from "./fieldConfigurations-BUT9DTUH.js";
-import { I as InputNumber, c as InputCurrency, b as CURRENCY_FIELD, C as Currency, L as LegalFormField, m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./Currency-DXgu9MoR.js";
-import { i as isEmpty$1 } from "./isEmpty-COLZr49P.js";
+import { I as InputNumber, c as InputCurrency, b as CURRENCY_FIELD, C as Currency, L as LegalFormField, m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./Currency-DARtu8dS.js";
+import { i as isEmpty$1 } from "./isEmpty-BCB0E6W3.js";
 import { f as formatObject } from "./utils-DNSfZiio.js";
 import { b as mapAddressLocalizationToJpAddressSchema, a as mapApiScriptLocalizationToSchemaFields, m as mapSchemaFieldsToApiScriptLocalization } from "./mapAddressLocalizationToJpAddressSchema-vJWbpAyq.js";
-import { L as LEGAL_COMPANY_NAME_FIELD, d as defaultFieldMetadataV4, a as defaultFieldMetadata$2, b as defaultFieldConfigV4, c as defaultFieldConfig$2 } from "./fieldConfig-DVdDkF4v.js";
-import { g as useBusinessLines } from "./OnboardingDropinComponent-tQW1hXKP.js";
-import { F as Field } from "./Field-BEoeMy3u.js";
-import { H as Header } from "./Header-87H731cQ.js";
-import { R as RadioGroup } from "./RadioGroup-Bg_8BEDn.js";
-import { u as useGlobalDataSlice } from "./useGlobalData-Dk70ESMH.js";
-import { u as useForm } from "./useForm-DpYu-ydO.js";
-import { c as createFormUtils, m as mergeFieldMetadataIntoProps } from "./formUtils-6n_sAj9f.js";
-import { c as currencyByCountry } from "./types-CGYmPCYj.js";
-import { I as InputDate, f as formatDateObj } from "./InputDate-BcSMepXz.js";
+import { L as LEGAL_COMPANY_NAME_FIELD, d as defaultFieldMetadataV4, a as defaultFieldMetadata$2, b as defaultFieldConfigV4, c as defaultFieldConfig$2 } from "./fieldConfig-1wEVw6MW.js";
+import { i as useBusinessLines } from "./OnboardingDropinComponent-Druuv3sE.js";
+import { F as Field } from "./Field-QQ5BBCkn.js";
+import { H as Header } from "./Header-DVxe8YCk.js";
+import { R as RadioGroup } from "./RadioGroup-DUYNpTgM.js";
+import { u as useGlobalDataSlice } from "./useGlobalData-DS2ZGdGI.js";
+import { u as useForm } from "./useForm-C6Y--Xun.js";
+import { c as createFormUtils, m as mergeFieldMetadataIntoProps } from "./formUtils-BUyxO4Zy.js";
+import { c as currencyByCountry } from "./types-vqz1MZ1F.js";
+import { I as InputDate, f as formatDateObj } from "./InputDate-DplEveci.js";
 import { Suspense, lazy } from "preact/compat";
-import { C as Checkbox } from "./Checkbox-Bp4HrJKI.js";
-import { E as ErrorPanel } from "./ErrorPanel-DNtK56tD.js";
-import { a as validateNotEmptyOnBlur, v as validatePatternOnBlur, b as validateJaKanaLegalCompanyName, c as validateJaHaniLegalCompanyName } from "./patternValidators-DSKvrLlO.js";
-import { M as MaskedInput, m as makeMask, d as alphanumericInputs, b as alphaInputs, n as numericInputs } from "./MaskedInput-Bet0abik.js";
-import { i as isCompatibleJapanVersion } from "./japanSupportUtils-DHTmTrsj.js";
+import { C as Checkbox } from "./Checkbox-DBN0bHrR.js";
+import { E as ErrorPanel } from "./ErrorPanel-CQ5mK5uz.js";
+import { a as validateNotEmptyOnBlur, v as validatePatternOnBlur, b as validateJaKanaLegalCompanyName, c as validateJaHaniLegalCompanyName } from "./patternValidators-DbUGFIUU.js";
+import { M as MaskedInput, m as makeMask, d as alphanumericInputs, b as alphaInputs, n as numericInputs } from "./MaskedInput-Dtui0pFL.js";
+import { i as isCompatibleJapanVersion } from "./japanSupportUtils-CNwDfN86.js";
 import { u as useDebouncedCallback } from "./debouncedInputEvent-Cv2S512Y.js";
 import { signal } from "@preact/signals";
 import cx from "classnames";
-import { L as Link } from "./Link-BTTClZw-.js";
+import { L as Link } from "./Link-s00fWIPD.js";
 import { S as StructuredList } from "./StructuredList-9dnJRdx_.js";
-import { I as InputText } from "./InputText-D0zIJLdp.js";
-import { C as CountryField, a as COUNTRY_FIELD } from "./CountryField-B0daMnwW.js";
-import { L as LoaderWrapper } from "./LoaderWrapper-Dl2oV2v2.js";
+import { I as InputText } from "./InputText-V4X24bPM.js";
+import { C as CountryField, a as COUNTRY_FIELD } from "./CountryField-DelOJ_90.js";
+import { L as LoaderWrapper } from "./LoaderWrapper-lbUTZxip.js";
 import { S as StackLayout } from "./unincorporated-partnership-MeN1dp53.js";
-import { a as Alert } from "./Alert-E_a_csSs.js";
-import { C as Card } from "./Card-BSfGetza.js";
-import { T as TileGroup } from "./TileGroup-B9NP0xL_.js";
+import { C as Card } from "./Card-OQuFzmxm.js";
+import { L as ListItem } from "./ListItem-BOjfMtNh.js";
+import { a as Alert } from "./Alert-0L9Okc_j.js";
+import { T as TileGroup } from "./TileGroup-CZWfBoyM.js";
 const FINANCIAL_REPORTING_DATE_FIELD = [
   "financialReportingDate"
 ];
@@ -145,12 +147,12 @@ function NumberOfEmployees({
   ) });
 }
 const financialInformationReportedValueOptions = "adyen-kyc-financial-information-reported-value-options";
-const styles$6 = {
+const styles$5 = {
   financialInformationReportedValueOptions
 };
 const reportedValue = "adyen-kyc-reported-value";
 const reportedValueInput = "adyen-kyc-reported-value-input";
-const styles$5 = {
+const styles$4 = {
   reportedValue,
   reportedValueInput
 };
@@ -165,7 +167,7 @@ const ReportedValue = ({
   isValid
 }) => {
   const { i18n } = useI18nContext();
-  return /* @__PURE__ */ jsx("div", { className: styles$5.reportedValue, children: /* @__PURE__ */ jsx(Field, { name: fieldName, errorMessage, isValid, helper, children: (childProps) => /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx("div", { className: styles$4.reportedValue, children: /* @__PURE__ */ jsx(Field, { name: fieldName, errorMessage, isValid, helper, children: (childProps) => /* @__PURE__ */ jsx(
     InputCurrency,
     {
       ...childProps,
@@ -173,7 +175,7 @@ const ReportedValue = ({
       currency,
       amount,
       onAmountChanged,
-      className: styles$5.reportedValueInput,
+      className: styles$4.reportedValueInput,
       "aria-label": label
     }
   ) }) });
@@ -402,7 +404,7 @@ function FinancialInformation(props) {
               ],
               onChange: updateReportedValueOption,
               showContentOnlyOnSelected: true,
-              className: styles$6.financialInformationReportedValueOptions
+              className: styles$5.financialInformationReportedValueOptions
             }
           )
         }
@@ -708,7 +710,7 @@ const verifiedBusiness = signal(void 0);
 const isVerifiedSingleCompanySearchResult = signal(false);
 const additionalInformationContent = "adyen-kyc-additional-information-content";
 const additionalInformationSectionHeading = "adyen-kyc-additional-information-section-heading";
-const styles$4 = {
+const styles$3 = {
   additionalInformationContent,
   additionalInformationSectionHeading
 };
@@ -717,7 +719,7 @@ const verifiedBusinessCardContent = "adyen-kyc-verified-business-card-content";
 const verifiedBusinessCardContentCollapsed = "adyen-kyc-verified-business-card-content-collapsed";
 const verifiedBusinessCardContentExpanded = "adyen-kyc-verified-business-card-content-expanded";
 const verifiedBusinessCardExpandButton = "adyen-kyc-verified-business-card-expand-button";
-const styles$3 = {
+const styles$2 = {
   verifiedBusinessCard,
   verifiedBusinessCardContent,
   verifiedBusinessCardContentCollapsed,
@@ -762,12 +764,12 @@ function VerifiedBusinessCard({
     ].filter((item) => !!item.details),
     [address, addressLink, t, verifiedBusiness2?.legalForm]
   );
-  const expandedContentClasses = cx(styles$3.verifiedBusinessCardContent, {
-    [styles$3.verifiedBusinessCardContentCollapsed]: !expanded,
-    [styles$3.verifiedBusinessCardContentExpanded]: expanded
+  const expandedContentClasses = cx(styles$2.verifiedBusinessCardContent, {
+    [styles$2.verifiedBusinessCardContentCollapsed]: !expanded,
+    [styles$2.verifiedBusinessCardContentExpanded]: expanded
   });
-  return /* @__PURE__ */ jsxs("section", { className: styles$3.verifiedBusinessCard, children: [
-    /* @__PURE__ */ jsxs("div", { className: styles$3.verifiedBusinessCardContent, children: [
+  return /* @__PURE__ */ jsxs("section", { className: styles$2.verifiedBusinessCard, children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$2.verifiedBusinessCardContent, children: [
       /* @__PURE__ */ jsx(StructuredList, { items: baseItems }),
       /* @__PURE__ */ jsx(Divider, {})
     ] }),
@@ -775,11 +777,11 @@ function VerifiedBusinessCard({
       /* @__PURE__ */ jsx(StructuredList, { items: expandedItems }),
       /* @__PURE__ */ jsx(Divider, {})
     ] }),
-    /* @__PURE__ */ jsx("div", { className: styles$3.verifiedBusinessCardExpandButton, children: /* @__PURE__ */ jsx(Button, { variant: "link", onClick: () => setExpanded(!expanded), children: expanded ? t(($) => $["hideDetails"], { ns: "common" }) : t(($) => $["showDetails"], { ns: "common" }) }) })
+    /* @__PURE__ */ jsx("div", { className: styles$2.verifiedBusinessCardExpandButton, children: /* @__PURE__ */ jsx(Button, { variant: "link", onClick: () => setExpanded(!expanded), children: expanded ? t(($) => $["hideDetails"], { ns: "common" }) : t(($) => $["showDetails"], { ns: "common" }) }) })
   ] });
 }
 const LazyJpAddress = lazy(
-  async () => (await import("./JpAddress-C0Q47X_G.js")).JpAddress
+  async () => (await import("./JpAddress-BKT0w3jl.js")).JpAddress
 );
 const ADDITIONAL_INFORMATION_FORM_ID = "additionalInformation";
 const ADDITIONAL_INFORMATION_FIELDS = [
@@ -851,6 +853,14 @@ function AdditionalInformation({
       }
     };
   }, [verifiedBusiness$1, form.data?.basicInformation?.stateOrProvince, country]);
+  const [registrationAddressValid, setRegistrationAddressValid] = useState(false);
+  const [operationalAddressValid, setOperationalAddressValid] = useState(false);
+  if (form.valid.additionalInformation?.registrationAddress !== registrationAddressValid) {
+    form.setValid("registrationAddress", registrationAddressValid, "additionalInformation");
+  }
+  if (form.data.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME && form.valid.additionalInformation?.operationalAddress !== operationalAddressValid) {
+    form.setValid("operationalAddress", operationalAddressValid, "additionalInformation");
+  }
   const handleChangeFor = useCallback(
     (fieldName, mode) => form.handleChangeFor(fieldName, "additionalInformation", mode),
     [form]
@@ -858,10 +868,12 @@ function AdditionalInformation({
   const handleRegistrationAddressChange = (state) => {
     handleChangeFor("registrationAddress")(state.data);
     form.setValid("registrationAddress", Boolean(state.isValid), "additionalInformation");
+    setRegistrationAddressValid(Boolean(state.isValid));
   };
   const handleOperationalAddressChange = (state) => {
     handleChangeFor("operationalAddress")(state.data);
     form.setValid("operationalAddress", Boolean(state.isValid), "additionalInformation");
+    setOperationalAddressValid(Boolean(state.isValid));
   };
   const handleOperationalAddressIsSameChange = useCallback(
     (isChecked) => {
@@ -1030,9 +1042,9 @@ function AdditionalInformation({
         formUtils
       }
     ),
-    /* @__PURE__ */ jsxs("div", { className: styles$4.additionalInformationContent, children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$3.additionalInformationContent, children: [
       showVerified && /* @__PURE__ */ jsxs("section", { children: [
-        /* @__PURE__ */ jsx("div", { className: styles$4.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["verifiedInformation"], { ns: "business" }) }) }),
+        /* @__PURE__ */ jsx("div", { className: styles$3.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["verifiedInformation"], { ns: "business" }) }) }),
         /* @__PURE__ */ jsx(
           VerifiedBusinessCard,
           {
@@ -1042,7 +1054,7 @@ function AdditionalInformation({
         )
       ] }),
       /* @__PURE__ */ jsxs("section", { children: [
-        showVerified && /* @__PURE__ */ jsx("div", { className: styles$4.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["otherBusinessInformation"], { ns: "business" }) }) }),
+        showVerified && /* @__PURE__ */ jsx("div", { className: styles$3.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["otherBusinessInformation"], { ns: "business" }) }) }),
         /* @__PURE__ */ jsxs("fieldset", { children: [
           showField(LEGAL_FORM_FIELDS) && /* @__PURE__ */ jsx(
             LegalFormField,
@@ -1264,7 +1276,7 @@ function AdditionalInformation({
         ] })
       ] }),
       showStockData && /* @__PURE__ */ jsxs("section", { children: [
-        /* @__PURE__ */ jsx("div", { className: styles$4.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["stockExchangeInformation"], { ns: "business" }) }) }),
+        /* @__PURE__ */ jsx("div", { className: styles$3.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["stockExchangeInformation"], { ns: "business" }) }) }),
         /* @__PURE__ */ jsxs("fieldset", { children: [
           showField(STOCK_EXCHANGE_MIC_FIELD) && /* @__PURE__ */ jsx(
             StockExchangeMICField,
@@ -1344,7 +1356,7 @@ function AdditionalInformation({
         ] })
       ] }),
       /* @__PURE__ */ jsxs("section", { "data-testid": "registeredBusinessAddress", children: [
-        /* @__PURE__ */ jsxs("div", { className: styles$4.additionalInformationSectionHeading, children: [
+        /* @__PURE__ */ jsxs("div", { className: styles$3.additionalInformationSectionHeading, children: [
           /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["registeredBusinessAddress"], { ns: "business" }) }),
           /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: registrationAddressDescription })
         ] }),
@@ -1385,7 +1397,7 @@ function AdditionalInformation({
         )
       ] }),
       /* @__PURE__ */ jsxs("section", { "data-testid": "principalPlaceOfBusiness", children: [
-        /* @__PURE__ */ jsxs("div", { className: styles$4.additionalInformationSectionHeading, children: [
+        /* @__PURE__ */ jsxs("div", { className: styles$3.additionalInformationSectionHeading, children: [
           /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["principalPlaceOfBusiness"], { ns: "business" }) }),
           /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: t(($) => $["thePhysicalLocationWhereABusiness"], { ns: "business" }) })
         ] }),
@@ -1608,7 +1620,7 @@ const defaultFieldConfig = {
   })
 };
 const basicInformation = "adyen-kyc-basic-information";
-const styles$2 = {
+const styles$1 = {
   basicInformation
 };
 const BASIC_INFORMATION_FIELDS = [
@@ -1787,7 +1799,7 @@ function BasicInformation({
     formUtils,
     handleChange: handleChangeFor
   });
-  return /* @__PURE__ */ jsxs("form", { id, className: styles$2.basicInformation, children: [
+  return /* @__PURE__ */ jsxs("form", { id, className: styles$1.basicInformation, children: [
     /* @__PURE__ */ jsx(Header, { title: t(($) => $["basicInformationFormHeading"], { ns: "business" }), children: /* @__PURE__ */ jsx(
       FormDescription,
       {
@@ -2195,19 +2207,8 @@ const applyVerifiedBusinessData = (form, country, verifiedData) => {
     )(verifiedAddress.operationalAddress);
   }
 };
-const businessInformation = "adyen-kyc-business-information";
-const businessInformationContent = "adyen-kyc-business-information-content";
-const businessInformationContentFetching = "adyen-kyc-business-information-content-fetching";
-const styles$1 = {
-  businessInformation,
-  businessInformationContent,
-  businessInformationContentFetching
-};
 function BusinessInformation({ fetching, selectedBusiness }) {
   const { t } = useTranslation(["common", "business"]);
-  const businessInformationClasses = cx(styles$1.businessInformationContent, {
-    [styles$1.businessInformationContentFetching]: fetching
-  });
   const items = useMemo(
     () => selectedBusiness ? entriesOf(selectedBusiness).reduce(
       (acc, [key, value]) => {
@@ -2242,10 +2243,10 @@ function BusinessInformation({ fetching, selectedBusiness }) {
     [selectedBusiness, t]
   );
   if (fetching) {
-    return /* @__PURE__ */ jsx("div", { className: businessInformationClasses, children: /* @__PURE__ */ jsx(Loader, { size: "large" }) });
+    return /* @__PURE__ */ jsx(Loader, { size: "large" });
   }
   if (!fetching) {
-    return /* @__PURE__ */ jsx("div", { className: businessInformationClasses, children: /* @__PURE__ */ jsx(StructuredList, { items }) });
+    return /* @__PURE__ */ jsx(StructuredList, { items });
   }
   return null;
 }
@@ -2263,6 +2264,7 @@ function BusinessInformationCard({
   handleBackClick
 }) {
   const { t } = useTranslation(["common", "business"]);
+  const isSelected = selectedBusinessId === result.id;
   const excludeResultAsGovernmentEntity = useMemo(
     () => isBankAccountRequestedForOrganization.value && currentBusinessSelection?.organizationType === "GOVERNMENTAL_ORGANIZATION",
     [currentBusinessSelection]
@@ -2278,77 +2280,78 @@ function BusinessInformationCard({
       setIsBusinessSelection?.(false);
     }
   };
-  return /* @__PURE__ */ jsx(
-    Card,
-    {
-      "aria-selected": selectedBusinessId === result.id,
-      title: result.name,
-      subTitle: result.registrationNumber,
-      stateful: true,
-      fetching: fetching && selectedBusinessId === result.id,
-      active: selectedBusinessId === result.id,
-      headerButton: selectedBusinessId === result.id && showSelectButton ? /* @__PURE__ */ jsx(
+  const handleCardClick = () => {
+    handleSelectBusiness(result);
+  };
+  return /* @__PURE__ */ jsx(Card, { selected: isSelected, onClick: isSelected ? void 0 : handleCardClick, children: /* @__PURE__ */ jsxs(StackLayout, { children: [
+    /* @__PURE__ */ jsx(
+      ListItem,
+      {
+        avatar: { iconName: "company", circle: true },
+        title: result.name,
+        description: result.registrationNumber,
+        accessory: fetching && isSelected ? /* @__PURE__ */ jsx(Loader, { size: "medium" }) : null
+      }
+    ),
+    isSelected && !fetching && /* @__PURE__ */ jsxs(StackLayout, { children: [
+      invalidTin && /* @__PURE__ */ jsx(
+        Alert,
+        {
+          variant: "warning",
+          type: "callToAction",
+          title: t(($) => $["businessSelection__invalidTin"], { ns: "business" }),
+          actions: /* @__PURE__ */ jsx(Button, { testId: "backBtn", onClick: handleGoBack, variant: "link", children: t(($) => $["back"], { ns: "common" }) }),
+          testId: "invalidTin"
+        }
+      ),
+      fetchingError && /* @__PURE__ */ jsx(
+        Alert,
+        {
+          variant: "info",
+          type: "callToAction",
+          title: t(($) => $["businessSelection__failedToLoad"], { ns: "business" }),
+          actions: /* @__PURE__ */ jsx(
+            Button,
+            {
+              testId: "reloadBusiness",
+              onClick: () => refetchCompanySelection(),
+              variant: "link",
+              children: t(($) => $["tryAgain"], { ns: "common" })
+            }
+          ),
+          testId: "failedToLoad"
+        }
+      ),
+      excludeResultAsGovernmentEntity && /* @__PURE__ */ jsx(
+        Alert,
+        {
+          variant: "info",
+          type: "callToAction",
+          title: t(($) => $["businessSelection__unableToOnboardGovernmentEntity"], {
+            ns: "business"
+          }),
+          actions: /* @__PURE__ */ jsx(Button, { onClick: handleGoBack, variant: "link", children: t(($) => $["goBack"], { ns: "common" }) })
+        }
+      ),
+      !fetchingError && !excludeResultAsGovernmentEntity && /* @__PURE__ */ jsx(Card, { variant: "secondary", padding: "large", children: /* @__PURE__ */ jsx(
+        BusinessInformation,
+        {
+          fetching,
+          selectedBusiness: currentBusinessSelection
+        }
+      ) }),
+      showSelectButton && /* @__PURE__ */ jsx(
         Button,
         {
           onClick: () => handleConfirmSelection(currentBusinessSelection),
           testId: "selectBusiness",
           disabled: invalidTin,
+          fullWidth: true,
           children: t(($) => $["thisIsMyBusiness"], { ns: "business" })
         }
-      ) : null,
-      onClick: () => handleSelectBusiness(result),
-      onKeyDown: handleKeys(["Enter"], () => handleSelectBusiness(result)),
-      children: selectedBusinessId === result.id && /* @__PURE__ */ jsx(Fragment, { children: /* @__PURE__ */ jsxs("div", { className: styles$1.businessInformation, children: [
-        /* @__PURE__ */ jsx(Divider, {}),
-        invalidTin && /* @__PURE__ */ jsx(
-          Alert,
-          {
-            variant: "warning",
-            type: "callToAction",
-            title: t(($) => $["businessSelection__invalidTin"], { ns: "business" }),
-            actions: /* @__PURE__ */ jsx(Button, { testId: "backBtn", onClick: handleGoBack, variant: "link", children: t(($) => $["back"], { ns: "common" }) }),
-            testId: "invalidTin"
-          }
-        ),
-        fetchingError && /* @__PURE__ */ jsx(
-          Alert,
-          {
-            variant: "info",
-            type: "callToAction",
-            title: t(($) => $["businessSelection__failedToLoad"], { ns: "business" }),
-            actions: /* @__PURE__ */ jsx(
-              Button,
-              {
-                testId: "reloadBusiness",
-                onClick: () => refetchCompanySelection(),
-                variant: "link",
-                children: t(($) => $["tryAgain"], { ns: "common" })
-              }
-            ),
-            testId: "failedToLoad"
-          }
-        ),
-        excludeResultAsGovernmentEntity && /* @__PURE__ */ jsx(
-          Alert,
-          {
-            variant: "info",
-            type: "callToAction",
-            title: t(($) => $["businessSelection__unableToOnboardGovernmentEntity"], {
-              ns: "business"
-            }),
-            actions: /* @__PURE__ */ jsx(Button, { onClick: handleGoBack, variant: "link", children: t(($) => $["goBack"], { ns: "common" }) })
-          }
-        ),
-        !fetchingError && !excludeResultAsGovernmentEntity && /* @__PURE__ */ jsx(
-          BusinessInformation,
-          {
-            fetching,
-            selectedBusiness: currentBusinessSelection
-          }
-        )
-      ] }) })
-    }
-  );
+      )
+    ] })
+  ] }) });
 }
 const businessSelectionFooter = "adyen-kyc-business-selection-footer";
 const styles = {
@@ -2589,7 +2592,7 @@ function CompanyStructure({
   validationErrors = {},
   verificationErrors = {}
 }) {
-  const { t } = useTranslation(["common", "business"]);
+  const { t } = useTranslation(["common", "business", "ui"]);
   const { form } = useFormContext();
   const { accountHolder } = useAccountHolder();
   const { isSettingEnabled } = useSettingsContext();
@@ -2669,9 +2672,9 @@ function CompanyStructure({
   ] });
 }
 const FIELDS_NEEDED_FOR_COMPANY_SEARCH = [...STATE_FIELD, ...TAX_INFORMATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD];
-const getBasicInformationFields = (country) => {
+const getBasicInformationFields = (country, taskType) => {
   let fields = [...BASIC_INFORMATION_FIELDS];
-  if (!COUNTRIES_USING_COMPANY_SEARCH.includes(country)) {
+  if (!isUsingCompanySearch(country, taskType)) {
     fields = fields.filter((field) => !FIELDS_NEEDED_FOR_COMPANY_SEARCH.includes(field));
   }
   return fields;
@@ -2722,18 +2725,18 @@ const staticBusinessDetailsForms = {
     fields: ["constitutionalDocument"]
   }
 };
-const getForms = (country) => ({
+const getForms = (country, taskType) => ({
   basicInformation: {
     formId: "basicInformation",
     formName: "basicInformationFormName",
-    fields: getBasicInformationFields(country)
+    fields: getBasicInformationFields(country, taskType)
   },
   businessSelection: staticBusinessDetailsForms.businessSelection,
   companyStructure: staticBusinessDetailsForms.companyStructure,
   additionalInformation: {
     formId: "additionalInformation",
     formName: "additionalInformationFormName",
-    fields: COUNTRIES_USING_COMPANY_SEARCH.includes(country) ? ADDITIONAL_INFORMATION_FIELDS.filter(
+    fields: isUsingCompanySearch(country, taskType) ? ADDITIONAL_INFORMATION_FIELDS.filter(
       (field) => !FIELDS_NEEDED_FOR_COMPANY_SEARCH.includes(field)
     ) : ADDITIONAL_INFORMATION_FIELDS
   },
@@ -2760,6 +2763,52 @@ const documentFormsIds = [
 const stripWhitespace = (str) => str.replace(/\s/g, "");
 const toNormalizedString = (s) => stripWhitespace(s.toLowerCase());
 const isNormalizedStringMatch = (s1, s2) => toNormalizedString(s1) === toNormalizedString(s2);
+const startTiming = (key, timings = /* @__PURE__ */ new Map()) => {
+  const startTime = Date.now();
+  timings.set(key, { startTime });
+  return startTime;
+};
+const endTiming = (key, timings) => {
+  const timing = timings.get(key);
+  if (!timing || timing.endTime) {
+    return void 0;
+  }
+  const endTime = Date.now();
+  const duration = endTime - timing.startTime;
+  const updatedTiming = { ...timing, endTime, duration };
+  timings.set(key, updatedTiming);
+  return duration;
+};
+const withTiming = async (key, fn, analytics, timings = /* @__PURE__ */ new Map()) => {
+  startTiming(key, timings);
+  try {
+    const result = await fn();
+    const duration = endTiming(key, timings) || 0;
+    analytics.addEvent("Performance", {
+      actionType: "resolve",
+      actionLevel: "page",
+      label: key,
+      additionalData: {
+        duration
+      }
+    });
+    return { result, duration };
+  } catch (error) {
+    const duration = endTiming(key, timings) || 0;
+    analytics.addEvent("Performance", {
+      actionType: "reject",
+      actionLevel: "page",
+      label: key,
+      additionalData: {
+        duration
+      }
+    });
+    throw error;
+  }
+};
+const trackPerformance = (key, fn, analytics) => {
+  return withTiming(key, fn, analytics);
+};
 const documentTypes$2 = [
   { id: "Internal company document", name: "internalCompanyDocument" },
   { id: "Business registry statement", name: "businessRegistryStatement" }
@@ -3434,9 +3483,9 @@ const mapApiDocumentToBusinessDetailsDocuments = (entityId) => {
     } : void 0
   };
 };
-const mapBasicInformation = (data) => {
+const mapBasicInformation = (data, taskType) => {
   if (!data) return;
-  return !!data.country && COUNTRIES_USING_COMPANY_SEARCH.includes(data.country) ? data : entriesOf(data).reduce((acc, [field]) => {
+  return !!data.country && isUsingCompanySearch(data.country, taskType) ? data : entriesOf(data).reduce((acc, [field]) => {
     if (!FIELDS_NEEDED_FOR_COMPANY_SEARCH.includes(field)) {
       return {
         ...acc,
@@ -3471,7 +3520,7 @@ const mapIsUen = (taxInformation, registrationNumber, country) => {
     isUen: currentCountryTaxInfo.type === "UEN"
   };
 };
-const mapAdditionalInformation = (data, legalEntity) => {
+const mapAdditionalInformation = (data, legalEntity, taskType) => {
   if (!data) return;
   const entity = legalEntity.type === "organization" ? legalEntity.organization : legalEntity.soleProprietorship;
   const currentCountry = entity?.registeredAddress.country;
@@ -3503,7 +3552,7 @@ const mapAdditionalInformation = (data, legalEntity) => {
   }
   const result = entriesOf(data).reduce(
     (acc, [field]) => {
-      if (!COUNTRIES_USING_COMPANY_SEARCH.includes(currentCountry)) {
+      if (!isUsingCompanySearch(currentCountry, taskType)) {
         return {
           ...acc,
           [field]: data[field]
@@ -3540,7 +3589,11 @@ const mapLegalNameLocalization = (data) => {
   }
   return result;
 };
-const mapLegalEntityToBusinessDetailsSchema = (legalEntity, parentEntity) => {
+const mapLegalEntityToBusinessDetailsSchema = ({
+  legalEntity,
+  parentEntity,
+  taskType
+}) => {
   if (!legalEntity) return {};
   const {
     companyRegistrationDocument,
@@ -3587,7 +3640,7 @@ const mapLegalEntityToBusinessDetailsSchema = (legalEntity, parentEntity) => {
         return {
           ...componentData,
           [key]: {
-            ...mapBasicInformation(businessDetailsSchema[key]),
+            ...mapBasicInformation(businessDetailsSchema[key], taskType),
             ...mapLegalNameLocalization(legalEntity)
           }
         };
@@ -3611,7 +3664,7 @@ const mapLegalEntityToBusinessDetailsSchema = (legalEntity, parentEntity) => {
       case "additionalInformation": {
         return {
           ...componentData,
-          [key]: mapAdditionalInformation(businessDetailsSchema[key], legalEntity)
+          [key]: mapAdditionalInformation(businessDetailsSchema[key], legalEntity, taskType)
         };
       }
       case "companyRegistrationDocument": {
@@ -3676,12 +3729,12 @@ const businessDetailsBase = {
   /* Base optional fields */
   operationalAddress: { rule: "OPTIONAL" },
   /* Fields with custom country specific rules */
-  hasSelectedBusiness: { rule: "requireBusinessSelection" },
+  hasSelectedBusiness: { rule: "usingCompanySearch" },
   stockExchangeMIC: { rule: "ifPubliclyTradedCompany" },
   stockISIN: { rule: "ifPubliclyTradedCompany" },
   stockTickerSymbol: { rule: "ifPubliclyTradedCompany" },
   dateOfIncorporation: { rule: "isDateOfIncorporationRequired" },
-  stateOrProvince: { rule: "countryUsingCompanySearch" },
+  stateOrProvince: { rule: "usingCompanySearch" },
   registrationNumber: { rule: "countryRequiresRegistrationNumber" },
   registrationNumberType: { rule: "registrationNumberType" },
   exemptedFromRegistrationNumber: { rule: "companyRegistrationNumberExemptionAllowed" },
@@ -3713,7 +3766,7 @@ const businessDetailsFieldsPerScenario = {
   L0: {
     country: { rule: "REQUIRED" },
     legalCompanyName: { rule: "REQUIRED" },
-    stateOrProvince: { rule: "countryUsingCompanySearch" },
+    stateOrProvince: { rule: "usingCompanySearch" },
     ...financialInformationBase
   },
   L1: {
@@ -3849,7 +3902,7 @@ const mapBusinessDetailsDocumentToApiDocument = async (data, entityId) => {
   ]);
   return documents.filter(Boolean);
 };
-const mapBusinessDetailsSchemaToLegalEntity = (data, accountHolder, isExperimentEnabled) => {
+const mapBusinessDetailsSchemaToLegalEntity = (data, accountHolder, isExperimentEnabled, taskType) => {
   const requestObj = {
     ...formatObject(
       data,
@@ -3861,12 +3914,10 @@ const mapBusinessDetailsSchemaToLegalEntity = (data, accountHolder, isExperiment
     data.basicInformation?.country,
     data.companyStructure?.entityType
   );
-  const taxData = COUNTRIES_USING_COMPANY_SEARCH.includes(
-    data.basicInformation?.country
-  ) ? data.basicInformation?.taxInformation : data.additionalInformation?.taxInformation;
-  const registrationNumber = COUNTRIES_USING_COMPANY_SEARCH.includes(
-    data.basicInformation?.country
-  ) ? data.basicInformation?.registrationNumber : data.additionalInformation?.registrationNumber;
+  const [taxData, registrationNumber] = isUsingCompanySearch(
+    data.basicInformation?.country,
+    taskType
+  ) ? [data.basicInformation?.taxInformation, data.basicInformation?.registrationNumber] : [data.additionalInformation?.taxInformation, data.additionalInformation?.registrationNumber];
   const localization = [
     mapSchemaFieldsToApiScriptLocalization(data.basicInformation ?? {}, "jaHani"),
     mapSchemaFieldsToApiScriptLocalization(data.basicInformation ?? {}, "jaKana")
@@ -4287,7 +4338,11 @@ async function submit({
       await handleUpdateLegalEntity({ ...updatedAssociations, id: legalEntityResponse.id });
     }
   };
-  const savedLegalEntityData = legalEntityResponse ? mapLegalEntityToBusinessDetailsSchema(legalEntityResponse, void 0) : null;
+  const savedLegalEntityData = legalEntityResponse ? mapLegalEntityToBusinessDetailsSchema({
+    legalEntity: legalEntityResponse,
+    parentEntity: void 0,
+    taskType
+  }) : null;
   const filteredData = savedLegalEntityData ? setRemovedFieldsOnSchemaToDeletedValue(data, savedLegalEntityData) : data;
   if (filteredData?.additionalInformation && !filteredData?.additionalInformation?.taxInformation) {
     filteredData.additionalInformation.taxInformation = void 0;
@@ -4381,7 +4436,12 @@ async function submit({
   }
   try {
     const mappedLegalEntity = {
-      ...mapBusinessDetailsSchemaToLegalEntity(filteredData, accountHolder, isExperimentEnabled),
+      ...mapBusinessDetailsSchemaToLegalEntity(
+        filteredData,
+        accountHolder,
+        isExperimentEnabled,
+        taskType
+      ),
       entityAssociations: filterOutUnwantedAssociationsIfRootLE(
         taskType,
         entityToUpdate,
@@ -4629,7 +4689,7 @@ function BusinessDetailsDropin({
   const [loadingStatus, setLoadingStatus] = useState("success");
   const [derivedProps, setDerivedProps] = useState();
   const [trustedFields, setTrustedFields] = useState(subjectEntity?.trustedFields ?? void 0);
-  const defaultForms = useMemo(() => getForms(country), [country]);
+  const defaultForms = useMemo(() => getForms(country, taskType), [country, taskType]);
   const documentUtils = documentApiUtils({
     baseUrl: baseUrl.value,
     rootLegalEntityId: rootLegalEntityId.value
@@ -4651,10 +4711,11 @@ function BusinessDetailsDropin({
     country
   });
   const defaultData = useMemo(() => {
-    const mapped = mapLegalEntityToBusinessDetailsSchema(
-      !isAssociationTaskType ? legalEntityResponse : isSoleProp ? associatedLegalArrangement ?? legalEntityResponse : nestedLegalEntity,
-      isSoleProp ? legalEntityResponse : void 0
-    );
+    const mapped = mapLegalEntityToBusinessDetailsSchema({
+      legalEntity: !isAssociationTaskType ? legalEntityResponse : isSoleProp ? associatedLegalArrangement ?? legalEntityResponse : nestedLegalEntity,
+      parentEntity: isSoleProp ? legalEntityResponse : void 0,
+      taskType
+    });
     const initialEfpBusinessLineData = isSettingEnabled("allowBusinessLines") && efpBusinessLines && efpBusinessLines.length > 0 ? {
       additionalInformation: {
         ...mapped.additionalInformation,
@@ -4677,6 +4738,7 @@ function BusinessDetailsDropin({
     isSoleProp,
     associatedLegalArrangement,
     nestedLegalEntity,
+    taskType,
     documents,
     efpBusinessLines,
     isSettingEnabled
@@ -4945,18 +5007,26 @@ function BusinessDetailsDropin({
   };
   useVerifyTin(verifyTinQueryInput, { enabled: false });
   const attemptBusinessSearch = async () => {
-    if (customRules.countryUsingCompanySearch() !== "REQUIRED") {
+    if (!isUsingCompanySearch(country, taskType)) {
       const currentForms = updateForms({ searchResults: [] });
       return handleNextClick(currentForms);
     }
     try {
+      userEvents.addPageEvent("Triggered async operation", {
+        actionType: "start",
+        returnValue: "companySearch"
+      });
       setLoadingStatus("loading");
       tinMatched.value = void 0;
       verifiedBusiness.value = void 0;
       isVerifiedSingleCompanySearchResult.value = false;
-      const searchResponse = await queryClient.fetchQuery({
-        queryKey: ["companySearch", companySearchQueryInput]
-      });
+      const { result: searchResponse } = await trackPerformance(
+        "companySearch",
+        () => queryClient.fetchQuery({
+          queryKey: ["companySearch", companySearchQueryInput]
+        }),
+        userEvents
+      );
       let currentForms = updateForms({ searchResults: searchResponse.results });
       const handleTinResponse = (matched) => {
         if (matched) {
@@ -5004,7 +5074,7 @@ function BusinessDetailsDropin({
   };
   const overrideNextClick = async () => {
     if (!activeForm.isValid) return handleNextClick();
-    if (!COUNTRIES_USING_COMPANY_SEARCH.includes(country) || isSoleProp) {
+    if (!isUsingCompanySearch(country, taskType) || isSoleProp) {
       return handleNextClick();
     }
     switch (activeForm.formId) {