@adyen/kyc-components 4.0.0-compact.8 → 4.0.0-compact.9

package/dist/{useBusinessDetailsData-CAiFFs88.js → useBusinessDetailsData-CgfVRRNG.js}

@@ -2,75 +2,69 @@
 {
   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] = "56364b98-55ba-4e04-8f12-d2e57f40bc8b", e._sentryDebugIdIdentifier = "sentry-dbid-56364b98-55ba-4e04-8f12-d2e57f40bc8b");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "1c12032c-5f3e-4a39-b472-402db1745b1b", e._sentryDebugIdIdentifier = "sentry-dbid-1c12032c-5f3e-4a39-b472-402db1745b1b");
   } catch (e) {
   }
 }
 ;
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
 import { useMutation, useQuery, skipToken, useQueryClient } from "@tanstack/preact-query";
-import { useState, useMemo, useEffect, useCallback } 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-CdYUvjtv.js";
-import { u as useScenarios } from "./useScenarios-BE647UZ3.js";
-import { u as useCreateLegalEntity } from "./useCreateLegalEntity-BzRbiLpn.js";
-import { u as useUpdateLegalEntity } from "./useUpdateLegalEntity-3og4ank0.js";
-import { u as useTranslation, bt as isISIN, V as Button, v as useExperimentsContext, c as useLegalEntity, R as ROOT_LE, z as Typography, L as Loader, a0 as CountryCodes, B as useSettingsContext, b as useApiContext, $ as httpPost, ac as entriesOf, p as useAnalyticsContext, a3 as createLogger, m as useAccountHolder, aa as useI18nContext, ai as isEmpty, i as isUndefinedOrNull, j as TaskTypes, o as LegalEntityTypes, bu as businessDetailsComponentsKeyMapping, bv as solePropBusinessDetailsKeyMapping, a6 as objectsDeepEqual, aD as keysOf, bw as solePropBusinessDetailsApiKeyMapping, b4 as businessDetailsApiKeyMapping, ay as Scenarios, aJ as filterOutUnwantedAssociationsIfRootLE, aH as drop, ae as getOwnEntityAssociations, aO as doArraysMatch, bx as solePropBusinessDetailsDocumentMapping, by as businessDetailsDocumentMapping } from "./StoreProvider-DwuHWsNs.js";
-import { u as useFormContext, F as FormContextProvider, a as FormFlow } from "./useFormContext-BPBBPKhK.js";
-import { u as useToastContext } from "./useToastContext-B1vl-x5N.js";
-import { C as CompanyTypesValues } from "./company-types-value-D_mKv5PT.js";
-import { c as composePerScenarioFormConfigurations, g as getPropsFromConfigurations } from "./process-field-configurations-CAtKO6CG.js";
-import { a as addValidityToForms, u as useFormComposer } from "./dropinUtils-NHYW3kj5.js";
-import { u as useMultiForm } from "./useMultiForm-Cs0-iUXR.js";
-import { u as uppercase, m as mapExistingFile, g as getPageName, b as useScenarioConfiguration } from "./mapExistingFile-euVcQ8wC.js";
-import { C as Confirm } from "./Confirm-DqMkw97y.js";
-import { a as getDocument, j as getDocuments, c as createDocumentRequest, k as mergeProofOfOwnershipAttachments, b as getFileExtention, d as documentApiUtils } from "./validate-CoZiS4Ny.js";
-import { d as TAX_INFORMATION_FIELD, r as requestingBanking, e as requestingIssuing, t as taxInformationDefaultFieldMetadata, a as taxInformationDefaultFieldConfig, T as TaxInformationField, C as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, f as getTaxInformationPlaceholderText, S as StateCodesUS, h as isUsingCompanySearch, M as MemoizedDocumentUpload, j as isRegistrationNumberAbsentStateV4Scenario, k as getTaxIdNumberOptions, l as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, m as getCompanyRegistrationNumberOptions, n as countryToTaxInfoTypeMap, o as rules, g as getFieldsWithExistingData } from "./TaxInformationField-QyHTiEoc.js";
-import { u as usePageLandedEvent, s as summaryStep } from "./Summary-BtqxXkko.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, a as defaultFieldConfig, b as registrationNumberDefaultFieldMetadata, c as registrationNumberDefaultFieldConfig, e as doingBusinessAsFieldMetadata, f as doingBusinessAsAbsentFieldMetadata, g as DBANameField, h as BusinessRegistrationNumberField, i as getRegistrationNumberHelperText, j as VatNumberField, M as MemoizedConstitutionalDocument, k as getDefaultRegistrationNumberType, l as getDefaultVatNumberType, m as inferCompanyRegistrationNumberType, n as exemptFromRegistrationNumberDefaultFieldMetadata } from "./ConstitutionalDocument-B1vSvDTu.js";
-import { K as KEYBOARD_KEYS, M as Modal, a as ModalContent } from "./Modal-BRPW5V15.js";
-import { S as SettingNames } from "./TaskVerificationStatus-DQVG3_xF.js";
-import { t as toFullWidth, u as useAllowedCountries, m as mapJpAddressSchemaToAddressLocalizations, a as mapJpAddressSummary } from "./mapJpAddressSchemaToAddressLocalizations-A0yOTAyr.js";
-import { g as getAddressSchemaForCountry, C as COUNTRIES_WITH_STATES_DATASET, a as getAddressSchemaLabelsByCountry, m as mapAddressLabels, c as getKeyForField } from "./utils-CHdXRuoO.js";
-import { o as organizationTypesToSkipCompanyStructureForm } from "./utils-CXUBcmhg.js";
-import { i as isValidationError, p as processValidationErrors, a as isMaintenanceModeError } from "./validationError-DozI7J9X.js";
-import { a as datasetUtilities } from "./datasetUtil-BHQp0-xL.js";
+import { useState, useMemo, useEffect, useRef, useCallback } 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-CFgADcSW.js";
+import { u as useScenarios } from "./useScenarios-C5uruC52.js";
+import { u as useCreateLegalEntity } from "./useCreateLegalEntity-C5daQcez.js";
+import { u as useToastContext, a as useInvalidateRootLegalEntity } from "./useToastContext-C2BAjZxO.js";
+import { u as useUpdateLegalEntity } from "./useUpdateLegalEntity-vK1vTzAB.js";
+import { u as useTranslation, bH as isISIN, W as Button, J as useExperimentsContext, R as useLegalEntity, U as ROOT_LE, am as datasetUtilities, aB as Header, O as Typography, V as Loader, aa as CountryCodes, k as useSettingsContext, aN as useAllowedCountries, b as useApiContext, h as httpPost, P as StackLayout, G as Alert, ao as entriesOf, z as useAnalyticsContext, m as createLogger, v as useAccountHolder, y as TaskTypes, L as LegalEntityTypes, ax as isEmpty, i as isUndefinedOrNull, bI as businessDetailsComponentsKeyMapping, bJ as solePropBusinessDetailsKeyMapping, ah as objectsDeepEqual, aS as keysOf, bK as solePropBusinessDetailsApiKeyMapping, bl as businessDetailsApiKeyMapping, at as Scenarios, aZ as filterOutUnwantedAssociationsIfRootLE, aX as drop, ad as getOwnEntityAssociations, b2 as doArraysMatch, bL as solePropBusinessDetailsDocumentMapping, bM as businessDetailsDocumentMapping } from "./StoreProvider-CBB99upB.js";
+import { u as useFormContext, F as FormContextProvider, a as FormFlow } from "./useFormContext-CX6rQNws.js";
+import { C as CompanyTypesValues } from "./bafinUtils-B1LygAFl.js";
+import { c as composePerScenarioFormConfigurations, g as getPropsFromConfigurations } from "./process-field-configurations-BnIbMyYt.js";
+import { a as addValidityToForms, u as useFormComposer } from "./dropinUtils-D44Paj5u.js";
+import { u as useMultiForm } from "./useMultiForm-DRZSxmEa.js";
+import { u as uppercase, m as mapExistingFile, g as getPageName, b as useScenarioConfiguration } from "./mapExistingFile-BigOdLU3.js";
+import { C as Confirm } from "./Confirm-NubmSSR7.js";
+import { E as ErrorPanel } from "./ErrorPanel-D4kO8XQ8.js";
+import { N as NewSummary } from "./NewSummary-D-9PYaY6.js";
+import { u as usePageLandedEvent, s as summaryStep, a as summaryStyles } from "./Summary-C5uRwUKn.js";
+import { a as getDocument, j as getDocuments, c as createDocumentRequest, k as mergeProofOfOwnershipAttachments, b as getFileExtention, d as documentApiUtils } from "./validate-DDCTmBf4.js";
+import { m as mergeFieldMetadataIntoProps, c as createFormUtils } from "./formUtils-BEcbGHkz.js";
+import { d as TAX_INFORMATION_FIELD, r as requestingBanking, e as requestingIssuing, t as taxInformationDefaultFieldMetadata, a as taxInformationDefaultFieldConfig, T as TaxInformationField, C as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, f as getTaxInformationPlaceholderText, S as StateCodesUS, h as isUsingCompanySearch, M as MemoizedDocumentUpload, j as countryToTaxInfoTypeMap, k as getCompanyRegistrationNumberOptions, l as isRegistrationNumberAbsentStateV4Scenario, m as getTaxIdNumberOptions, n as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, o as rules, g as getFieldsWithExistingData } from "./TaxInformationField-B7AVdVgf.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, a as defaultFieldConfig, b as registrationNumberDefaultFieldMetadata, c as registrationNumberDefaultFieldConfig, e as doingBusinessAsFieldMetadata, f as doingBusinessAsAbsentFieldMetadata, g as DBANameField, h as BusinessRegistrationNumberField, i as getRegistrationNumberHelperText, j as VatNumberField, M as MemoizedConstitutionalDocument, k as getDefaultRegistrationNumberType, l as getDefaultVatNumberType, m as inferCompanyRegistrationNumberType, n as exemptFromRegistrationNumberDefaultFieldMetadata } from "./ConstitutionalDocument-Djj_JCy4.js";
+import { K as KEYBOARD_KEYS, M as Modal, a as ModalContent } from "./Modal-BMdWqd0Y.js";
+import { g as getAddressSchemaForCountry, C as COUNTRIES_WITH_STATES_DATASET, a as getAddressSchemaLabelsByCountry, f as mapAddressLabelsNewSummary, c as getKeyForField } from "./utils-BvFIL5qs.js";
 import { r as resolveFieldMetadata } from "./fieldConfigurations-BUT9DTUH.js";
-import { s as summaryItem } from "./summaryItem-CAQCQSkt.js";
-import { f as formatCurrency, A as ALLOWED_SOF_SERVICES } from "./utils-Ds83U_vM.js";
-import { b as useAddressCleanse, f as formatAddressForCleanse, m as mapAddressData, A as Address, g as getNestedTrustedFields, S as STATE_FIELD, d as defaultFieldMetadata$1, c as defaultFieldConfig$1, e as StateField, i as isDateOlderThanAYear } from "./Address-DfQEZqfV.js";
-import { i as isEmpty$1 } from "./isEmpty-CzqpRnGb.js";
+import { f as formatCurrency, A as ALLOWED_SOF_SERVICES } from "./utils-Bh3VtXaW.js";
+import { b as useAddressCleanse, f as formatAddressForCleanse, m as mapAddressData, A as Address, g as getNestedTrustedFields, S as STATE_FIELD, d as defaultFieldMetadata$1, c as defaultFieldConfig$1, e as StateField, i as isDateOlderThanAYear } from "./Address-DaePmCRZ.js";
+import { S as SettingNames } from "./types-CQ2p58-6.js";
+import { o as organizationTypesToSkipCompanyStructureForm } from "./utils-Bo1WrnnM.js";
+import { i as isValidationError, p as processValidationErrors, a as isMaintenanceModeError } from "./validationError-DmAD3_AN.js";
+import { t as toFullWidth, m as mapJpAddressSchemaToAddressLocalizations } from "./mapJpAddressSchemaToAddressLocalizations-DUoJIoRm.js";
+import { i as isEmpty$1 } from "./isEmpty-3U9fSQsY.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 LegalFormField, I as InputNumber, c as InputCurrency, b as CURRENCY_FIELD, C as Currency, m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./Currency-8vOxnPYI.js";
-import { g as getLegalCompanyNameHelperText, L as LEGAL_COMPANY_NAME_FIELD, d as defaultFieldMetadataV4, a as defaultFieldMetadata$2, b as defaultFieldConfigV4, c as defaultFieldConfig$2 } from "./LegalCompanyNameField-Z2dNj0Qq.js";
-import { u as useBusinessLines } from "./useBusinessLines-DG-LapFA.js";
+import { L as LegalFormField, I as InputNumber, c as InputCurrency, b as CURRENCY_FIELD, C as Currency, m as mapFinancialReportsToFinancialInformation, a as mapFinancialInformationToFinancialReport } from "./Currency-B4udmJgX.js";
+import { g as getLegalCompanyNameHelperText, L as LEGAL_COMPANY_NAME_FIELD, d as defaultFieldMetadataV4, a as defaultFieldMetadata$2, b as defaultFieldConfigV4, c as defaultFieldConfig$2 } from "./LegalCompanyNameField-DBiJbXem.js";
+import { j as useBusinessLines } from "./OnboardingDropinComponent-CxUcB7IU.js";
 import { Suspense, lazy } from "preact/compat";
-import { C as Checkbox } from "./Checkbox-CQQWg0dg.js";
-import { F as Field } from "./Field-GFhXhBL7.js";
-import { H as Header } from "./Header-B9Tv_mvA.js";
-import { E as ErrorPanel } from "./ErrorPanel-8g7vzs2J.js";
-import { I as InputDate, f as formatDateObj } from "./InputDate-D741B4uo.js";
-import { a as validateNotEmptyOnBlur, v as validatePatternOnBlur, b as validateJaKanaLegalCompanyName, c as validateJaHaniLegalCompanyName } from "./patternValidators-EfBVKdNn.js";
-import { M as MaskedInput, m as makeMask, d as alphanumericInputs, b as alphaInputs, n as numericInputs } from "./MaskedInput-D1fbApUW.js";
-import { m as mergeFieldMetadataIntoProps, c as createFormUtils } from "./formUtils-Dg7QeiCj.js";
-import { i as isJapanLocalizationEnabled } from "./japanSupportUtils-Bn6j_2Iu.js";
+import { C as Checkbox } from "./Checkbox-DmYVTVOD.js";
+import { F as Field } from "./Field-CPoHG0G-.js";
+import { I as InputDate, f as formatDateObj } from "./InputDate-BVYQZZuX.js";
+import { a as validateNotEmptyOnBlur, v as validatePatternOnBlur, b as validateJaKanaLegalCompanyName, c as validateJaHaniLegalCompanyName } from "./patternValidators-BkY5yvNa.js";
+import { M as MaskedInput, m as makeMask, d as alphanumericInputs, b as alphaInputs, n as numericInputs } from "./MaskedInput-1f16YE1z.js";
+import { i as isJapanLocalizationEnabled } from "./japanSupportUtils-CaeglTl1.js";
 import { u as useDebouncedCallback } from "./debouncedInputEvent-Cv2S512Y.js";
 import { signal } from "@preact/signals";
 import cx from "classnames";
-import { L as Link } from "./Link-hYPpX6dq.js";
-import { S as StructuredList } from "./StructuredList-CVMZBzwq.js";
-import { I as InputText } from "./InputText-BstgOD1h.js";
-import { C as CountryField, a as COUNTRY_FIELD } from "./CountryField-61GLcHq3.js";
-import { L as LoaderWrapper } from "./LoaderWrapper-Brwtj1ws.js";
-import { S as StackLayout } from "./unincorporated-partnership-MeN1dp53.js";
+import { L as Link } from "./Link-ru5UMRxt.js";
+import { S as StructuredList } from "./StructuredList-EKVbq_i3.js";
+import { I as InputText } from "./InputText-C55stM8O.js";
+import { C as CountryField, a as COUNTRY_FIELD } from "./CountryField-C7SjQFv_.js";
+import { L as LoaderWrapper } from "./LoaderWrapper-BL7Hc_DC.js";
 import { C as Card } from "./Card-OQuFzmxm.js";
-import { L as ListItem } from "./ListItem-DCNK7Kw1.js";
-import { a as Alert } from "./Alert-_9nVl6uE.js";
-import { T as TileGroup } from "./TileGroup-6wc032O1.js";
-import { R as RadioGroup } from "./RadioGroup-BLGCNZj6.js";
-import { u as useGlobalDataSlice } from "./useGlobalData-DemxVumJ.js";
-import { u as useForm } from "./useForm-De1DLL-w.js";
-import { c as currencyByCountry } from "./types-COOK2jmb.js";
+import { L as ListItem } from "./ListItem-C6ALEoR-.js";
+import { T as TileGroup } from "./TileGroup-oKbh_YGv.js";
+import { c as currencyByCountry } from "./types-CcxS0801.js";
+import { R as RadioGroup } from "./RadioGroup-BuAX_NLA.js";
 const DATE_OF_INCORPORATION_FIELD = [
   "dateOfIncorporation"
 ];
@@ -135,7 +129,6 @@ function EInvoicingCodeField({
   labels,
   readonly,
   mask,
-  guidanceText,
   shouldValidate,
   handleChangeFor
 }) {
@@ -152,7 +145,9 @@ function EInvoicingCodeField({
         name: "eInvoicingCode",
         type: "text",
         label: labels.eInvoicingCode ?? "",
-        formatGuidance: guidanceText?.eInvoicingCode,
+        formatGuidance: t(($) => $["the7CharacterIdentifierAssignedToThis"], {
+          example: "MP10YNU"
+        }),
         errorMessage: errors.eInvoicingCode,
         isValid: valid.eInvoicingCode ?? false,
         value: data.eInvoicingCode ?? "",
@@ -185,12 +180,6 @@ const eInvoicingCodeFieldMetadata = {
   mask: {
     mask: makeMask(...alphanumericInputs(16)),
     transformOnType: uppercase
-  },
-  guidanceText: {
-    key: "the7CharacterIdentifierAssignedToThis",
-    values: {
-      example: "MP10YNU"
-    }
   }
 };
 const stockExchangeMICFieldMetadata = {
@@ -199,13 +188,6 @@ const stockExchangeMICFieldMetadata = {
   mask: {
     mask: makeMask(...alphanumericInputs(4)),
     transformOnType: uppercase
-  },
-  guidanceText: {
-    key: "enterNCharactersForExample",
-    values: {
-      numChars: "4",
-      example: "XNAS"
-    }
   }
 };
 const STOCK_EXCHANGE_MIC_FIELD = [
@@ -218,17 +200,17 @@ function StockExchangeMICField({
   labels,
   readonly,
   mask,
-  guidanceText,
   shouldValidate,
   handleChangeFor
 }) {
+  const { t } = useTranslation("common");
   return /* @__PURE__ */ jsx(
     MaskedInput,
     {
       name: "stockExchangeMIC",
       type: "text",
       label: labels.stockExchangeMIC ?? "",
-      formatGuidance: guidanceText?.stockExchangeMIC,
+      formatGuidance: t(($) => $["enterNCharactersForExample"], { numChars: "4", example: "XNAS" }),
       ...mask,
       errorMessage: errors.stockExchangeMIC,
       isValid: valid.stockExchangeMIC ?? false,
@@ -254,12 +236,6 @@ const stockISINFieldMetadata = {
   mask: {
     mask: makeMask(...alphaInputs(2), ...alphanumericInputs(9), ...numericInputs(1)),
     transformOnType: uppercase
-  },
-  guidanceText: {
-    key: "validationPleaseEnterAValidStockISIN",
-    values: {
-      example: "NL0012969182"
-    }
   }
 };
 const STOCK_ISIN_FIELD = ["stockISIN"];
@@ -270,17 +246,19 @@ function StockISINField({
   labels,
   readonly,
   mask,
-  guidanceText,
   shouldValidate,
   handleChangeFor
 }) {
+  const { t } = useTranslation("common");
   return /* @__PURE__ */ jsx(
     MaskedInput,
     {
       name: "stockISIN",
       type: "text",
       label: labels.stockISIN ?? "",
-      formatGuidance: guidanceText?.stockISIN,
+      formatGuidance: t(($) => $["validationPleaseEnterAValidStockISIN"], {
+        example: "NL0012969182"
+      }),
       ...mask,
       errorMessage: errors.stockISIN,
       isValid: valid.stockISIN ?? false,
@@ -300,13 +278,6 @@ const stockTickerSymbolFieldMetadata = {
   mask: {
     mask: makeMask(...alphanumericInputs(1), ...alphanumericInputs(4)),
     transformOnType: uppercase
-  },
-  guidanceText: {
-    key: "enterAMaximumOfNCharactersForExample",
-    values: {
-      maxChars: "5",
-      example: "ADYEN"
-    }
   }
 };
 const STOCK_TICKER_SYMBOL_FIELD = [
@@ -319,17 +290,20 @@ function StockTickerSymbolField({
   labels,
   readonly,
   mask,
-  guidanceText,
   shouldValidate,
   handleChangeFor
 }) {
+  const { t } = useTranslation("common");
   return /* @__PURE__ */ jsx(
     MaskedInput,
     {
       name: "stockTickerSymbol",
       type: "text",
       label: labels.stockTickerSymbol ?? "",
-      formatGuidance: guidanceText?.stockTickerSymbol,
+      formatGuidance: t(($) => $["enterAMaximumOfNCharactersForExample"], {
+        maxChars: "5",
+        example: "ADYEN"
+      }),
       ...mask,
       errorMessage: errors.stockTickerSymbol,
       isValid: valid.stockTickerSymbol ?? false,
@@ -360,7 +334,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$5 = {
+const styles$4 = {
   additionalInformationContent,
   additionalInformationSectionHeading
 };
@@ -369,7 +343,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$4 = {
+const styles$3 = {
   verifiedBusinessCard,
   verifiedBusinessCardContent,
   verifiedBusinessCardContentCollapsed,
@@ -382,7 +356,7 @@ function VerifiedBusinessCard({
 }) {
   const { t } = useTranslation(["common"]);
   const [expanded, setExpanded] = useState(false);
-  const address = verifiedAddress?.address && verifiedAddress.city && verifiedAddress.stateOrProvince && verifiedAddress.postalCode ? `${verifiedAddress.address} ${verifiedAddress.city} ${verifiedAddress.stateOrProvince} ${verifiedAddress.postalCode}` : verifiedBusiness2?.address;
+  const address = verifiedAddress?.address && verifiedAddress.city && verifiedAddress.stateOrProvince && verifiedAddress.postalCode ? `${verifiedAddress.address} ${verifiedAddress.city} ${verifiedAddress.stateOrProvince} ${verifiedAddress.postalCode}` : verifiedAddress?.address;
   const addressLink = `https://www.google.com/maps/place/${address?.replaceAll(" ", "+")}`;
   const baseItems = useMemo(
     () => [
@@ -414,12 +388,12 @@ function VerifiedBusinessCard({
     ].filter((item) => !!item.details),
     [address, addressLink, t, verifiedBusiness2?.legalForm]
   );
-  const expandedContentClasses = cx(styles$4.verifiedBusinessCardContent, {
-    [styles$4.verifiedBusinessCardContentCollapsed]: !expanded,
-    [styles$4.verifiedBusinessCardContentExpanded]: expanded
+  const expandedContentClasses = cx(styles$3.verifiedBusinessCardContent, {
+    [styles$3.verifiedBusinessCardContentCollapsed]: !expanded,
+    [styles$3.verifiedBusinessCardContentExpanded]: expanded
   });
-  return /* @__PURE__ */ jsxs("section", { className: styles$4.verifiedBusinessCard, children: [
-    /* @__PURE__ */ jsxs("div", { className: styles$4.verifiedBusinessCardContent, children: [
+  return /* @__PURE__ */ jsxs("section", { className: styles$3.verifiedBusinessCard, children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$3.verifiedBusinessCardContent, children: [
       /* @__PURE__ */ jsx(StructuredList, { items: baseItems }),
       /* @__PURE__ */ jsx(Divider, {})
     ] }),
@@ -427,11 +401,11 @@ function VerifiedBusinessCard({
       /* @__PURE__ */ jsx(StructuredList, { items: expandedItems }),
       /* @__PURE__ */ jsx(Divider, {})
     ] }),
-    /* @__PURE__ */ jsx("div", { className: styles$4.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$3.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-D5DwOic-.js")).JpAddress
+  async () => (await import("./JpAddress-B3HjxunW.js")).JpAddress
 );
 const ADDITIONAL_INFORMATION_FORM_ID = "additionalInformation";
 const ADDITIONAL_INFORMATION_FIELDS = [
@@ -496,21 +470,44 @@ function AdditionalInformation({
   );
   const verifiedAddress = useMemo(() => {
     if (!verifiedBusiness$1) return void 0;
-    return verifiedBusiness$1.isPrincipalAddress || verifiedBusiness$1.state && form.data.basicInformation?.stateOrProvince !== verifiedBusiness$1.state ? { operationalAddress: { ...mapAddressData(verifiedBusiness$1), country } } : {
+    if (form.defaultData?.additionalInformation?.registrationAddress?.address || form.defaultData?.additionalInformation?.operationalAddress?.address) {
+      return { override: { address: "" } };
+    }
+    if (isExperimentEnabled("EnableProviderAgnosticCompanySearchAndSelect")) {
+      const _verifiedBusiness2 = verifiedBusiness$1;
+      return {
+        ..._verifiedBusiness2.registeredAddress && {
+          registrationAddress: mapAddressData(_verifiedBusiness2.registeredAddress)
+        },
+        ..._verifiedBusiness2.principalPlaceOfBusinessAddress && {
+          operationalAddress: mapAddressData(_verifiedBusiness2.principalPlaceOfBusinessAddress)
+        }
+      };
+    }
+    const _verifiedBusiness = verifiedBusiness$1;
+    const isVerifiedAddressNotRegistrationAddress = _verifiedBusiness.isPrincipalAddress || _verifiedBusiness.state && form.data.basicInformation?.stateOrProvince !== _verifiedBusiness.state;
+    return isVerifiedAddressNotRegistrationAddress ? { operationalAddress: { ...mapAddressData(_verifiedBusiness), country } } : {
       registrationAddress: {
-        ...mapAddressData(verifiedBusiness$1),
+        ...mapAddressData(_verifiedBusiness),
         country,
         stateOrProvince: form.data.basicInformation?.stateOrProvince
       }
     };
-  }, [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");
+  }, [
+    verifiedBusiness$1,
+    form.defaultData?.additionalInformation?.registrationAddress?.address,
+    form.defaultData?.additionalInformation?.operationalAddress?.address,
+    form.data.basicInformation?.stateOrProvince,
+    isExperimentEnabled,
+    country
+  ]);
+  const registrationAddressValid = useRef(false);
+  const operationalAddressValid = useRef(false);
+  if (form.valid.additionalInformation?.registrationAddress !== registrationAddressValid.current) {
+    form.setValid("registrationAddress", registrationAddressValid.current, "additionalInformation");
   }
-  if (form.data.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME && form.valid.additionalInformation?.operationalAddress !== operationalAddressValid) {
-    form.setValid("operationalAddress", operationalAddressValid, "additionalInformation");
+  if (form.data.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME && form.valid.additionalInformation?.operationalAddress !== operationalAddressValid.current) {
+    form.setValid("operationalAddress", operationalAddressValid.current, "additionalInformation");
   }
   const handleChangeFor = useCallback(
     (fieldName, mode) => form.handleChangeFor(fieldName, "additionalInformation", mode),
@@ -519,12 +516,12 @@ function AdditionalInformation({
   const handleRegistrationAddressChange = (state) => {
     handleChangeFor("registrationAddress")(state.data);
     form.setValid("registrationAddress", Boolean(state.isValid), "additionalInformation");
-    setRegistrationAddressValid(Boolean(state.isValid));
+    registrationAddressValid.current = Boolean(state.isValid);
   };
   const handleOperationalAddressChange = (state) => {
     handleChangeFor("operationalAddress")(state.data);
     form.setValid("operationalAddress", Boolean(state.isValid), "additionalInformation");
-    setOperationalAddressValid(Boolean(state.isValid));
+    operationalAddressValid.current = Boolean(state.isValid);
   };
   const handleOperationalAddressIsSameChange = useCallback(
     (isChecked) => {
@@ -584,8 +581,7 @@ function AdditionalInformation({
               registrationNumberDefaultFieldConfig[country],
               {
                 companyType,
-                registrationNumberType: form.data.additionalInformation?.registrationNumberType,
-                isExperimentEnabled
+                registrationNumberType: form.data.additionalInformation?.registrationNumberType
               },
               registrationNumberDefaultFieldMetadata
             ),
@@ -661,7 +657,6 @@ function AdditionalInformation({
     form.valid.additionalInformation,
     handleChangeFor,
     t,
-    isExperimentEnabled,
     validationErrors,
     verificationErrors
   ]);
@@ -680,6 +675,18 @@ function AdditionalInformation({
     });
   }, [country, datasetUtils, t]);
   const showJapanLocalization = isJapanLocalizationEnabled(isExperimentEnabled, country);
+  let readOnlyAddressFields = [];
+  if (isExperimentEnabled("EnableProviderAgnosticCompanySearchAndSelect")) {
+    const _verifiedBusiness = verifiedBusiness$1;
+    if (_verifiedBusiness?.registeredAddress?.state && _verifiedBusiness.registeredAddress.state === form.data.basicInformation?.stateOrProvince) {
+      readOnlyAddressFields = ["stateOrProvince"];
+    }
+  } else {
+    const _verifiedBusiness = verifiedBusiness$1;
+    if (_verifiedBusiness?.state && _verifiedBusiness.state === form.data.basicInformation?.stateOrProvince) {
+      readOnlyAddressFields = ["stateOrProvince"];
+    }
+  }
   return /* @__PURE__ */ jsxs("form", { id, children: [
     /* @__PURE__ */ jsx(Header, { title: t(($) => $["additionalInformationFormHeading"], { ns: "business" }) }),
     /* @__PURE__ */ jsx(
@@ -691,19 +698,19 @@ function AdditionalInformation({
         formUtils
       }
     ),
-    /* @__PURE__ */ jsxs("div", { className: styles$5.additionalInformationContent, children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$4.additionalInformationContent, children: [
       showVerified && /* @__PURE__ */ jsxs("section", { children: [
-        /* @__PURE__ */ jsx("div", { className: styles$5.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["verifiedInformation"], { ns: "business" }) }) }),
+        /* @__PURE__ */ jsx("div", { className: styles$4.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["verifiedInformation"], { ns: "business" }) }) }),
         /* @__PURE__ */ jsx(
           VerifiedBusinessCard,
           {
             verifiedBusiness: verifiedBusiness$1,
-            verifiedAddress: verifiedAddress?.registrationAddress ?? verifiedAddress?.operationalAddress
+            verifiedAddress: verifiedAddress?.override ?? verifiedAddress?.registrationAddress ?? verifiedAddress?.operationalAddress
           }
         )
       ] }),
       /* @__PURE__ */ jsxs("section", { children: [
-        showVerified && /* @__PURE__ */ jsx("div", { className: styles$5.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["otherBusinessInformation"], { ns: "business" }) }) }),
+        showVerified && /* @__PURE__ */ jsx("div", { className: styles$4.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,
@@ -766,7 +773,6 @@ function AdditionalInformation({
                 exemptedFromRegistrationNumber: "iDontHaveARegistrationNumber"
               }),
               mask: formUtils.getMask("registrationNumber"),
-              guidanceText: formUtils.getFieldGuidanceText(BUSINESS_REGISTRATION_NUMBER_FIELD),
               helperText: getRegistrationNumberHelperText(businessT, { country, companyType }),
               readonly: formUtils.isReadOnly("registrationNumber"),
               optional: formUtils.isOptionalField("registrationNumber"),
@@ -797,7 +803,6 @@ function AdditionalInformation({
                 exemptedFromTax: "iDontHaveATaxId"
               }),
               mask: formUtils.getMask("taxInformation"),
-              guidanceText: formUtils.getFieldGuidanceText(TAX_INFORMATION_FIELD),
               readonly: formUtils.isReadOnly("taxInformation"),
               shouldValidate,
               handleChangeFor,
@@ -828,7 +833,6 @@ function AdditionalInformation({
                 exemptedFromVat: "iDontHaveAVatNumber"
               }),
               mask: formUtils.getMask("vatNumber"),
-              guidanceText: formUtils.getFieldGuidanceText(VAT_NUMBER_FIELD),
               readonly: formUtils.isReadOnly("vatNumber"),
               handleChangeFor,
               country,
@@ -854,7 +858,6 @@ function AdditionalInformation({
               ),
               labels: formUtils.getFieldLabels(EINVOICING_CODE_FIELD),
               mask: formUtils.getMask("eInvoicingCode"),
-              guidanceText: formUtils.getFieldGuidanceText(EINVOICING_CODE_FIELD),
               readonly: formUtils.isReadOnly("eInvoicingCode"),
               handleChangeFor
             }
@@ -880,11 +883,7 @@ function AdditionalInformation({
                   ns: "business"
                 })
               },
-              guidanceText: {
-                industryCodes: t(($) => $["primaryIndustryCodeGuidance"], {
-                  ns: "business"
-                })
-              },
+              guidanceText: t(($) => $["primaryIndustryCodeGuidance"], { ns: "business" }),
               readonly: formUtils.isReadOnly("industryCodes"),
               handleChangeFor,
               businessLineTypes,
@@ -917,7 +916,7 @@ function AdditionalInformation({
         ] })
       ] }),
       showStockData && /* @__PURE__ */ jsxs("section", { children: [
-        /* @__PURE__ */ jsx("div", { className: styles$5.additionalInformationSectionHeading, children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["stockExchangeInformation"], { ns: "business" }) }) }),
+        /* @__PURE__ */ jsx("div", { className: styles$4.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,
@@ -937,7 +936,6 @@ function AdditionalInformation({
               ),
               labels: formUtils.getFieldLabels(STOCK_EXCHANGE_MIC_FIELD),
               mask: formUtils.getMask("stockExchangeMIC"),
-              guidanceText: formUtils.getFieldGuidanceText(STOCK_EXCHANGE_MIC_FIELD),
               readonly: formUtils.isReadOnly("stockExchangeMIC"),
               shouldValidate,
               handleChangeFor
@@ -961,7 +959,6 @@ function AdditionalInformation({
               ),
               labels: formUtils.getFieldLabels(STOCK_ISIN_FIELD),
               mask: formUtils.getMask("stockISIN"),
-              guidanceText: formUtils.getFieldGuidanceText(STOCK_ISIN_FIELD),
               readonly: formUtils.isReadOnly("stockISIN"),
               shouldValidate,
               handleChangeFor
@@ -985,7 +982,6 @@ function AdditionalInformation({
               ),
               labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
               mask: formUtils.getMask("stockTickerSymbol"),
-              guidanceText: formUtils.getFieldGuidanceText(STOCK_TICKER_SYMBOL_FIELD),
               readonly: formUtils.isReadOnly("stockTickerSymbol"),
               shouldValidate,
               handleChangeFor
@@ -994,7 +990,7 @@ function AdditionalInformation({
         ] })
       ] }),
       /* @__PURE__ */ jsxs("section", { "data-testid": "registeredBusinessAddress", children: [
-        /* @__PURE__ */ jsxs("div", { className: styles$5.additionalInformationSectionHeading, children: [
+        /* @__PURE__ */ jsxs("div", { className: styles$4.additionalInformationSectionHeading, children: [
           /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["registeredBusinessAddress"], { ns: "business" }) }),
           /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: registrationAddressDescription })
         ] }),
@@ -1021,7 +1017,7 @@ function AdditionalInformation({
             shouldValidate,
             hideCountry: true,
             optionalFields: ["otherAddressInformation"],
-            readOnlyFields: verifiedBusiness$1?.state && verifiedBusiness$1.state === form.data.basicInformation?.stateOrProvince ? ["stateOrProvince"] : [],
+            readOnlyFields: readOnlyAddressFields,
             trustedFields: getNestedTrustedFields(
               "registrationAddress",
               form.data.additionalInformation,
@@ -1035,7 +1031,7 @@ function AdditionalInformation({
         )
       ] }),
       /* @__PURE__ */ jsxs("section", { "data-testid": "principalPlaceOfBusiness", children: [
-        /* @__PURE__ */ jsxs("div", { className: styles$5.additionalInformationSectionHeading, children: [
+        /* @__PURE__ */ jsxs("div", { className: styles$4.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" }) })
         ] }),
@@ -1114,8 +1110,8 @@ function useLegalCompanyNameField({
   const labels = formUtils.getFieldLabels(fieldKeys);
   const fieldErrors = formUtils.getFieldErrors(errors, fieldProblems, fieldKeys);
   const fieldsTransformInput = {
-    jaHaniLegalCompanyName: (value) => toFullWidth(value),
-    jaKanaLegalCompanyName: (value) => toFullWidth(value)
+    jaHaniLegalCompanyName: toFullWidth,
+    jaKanaLegalCompanyName: toFullWidth
   };
   const fieldsTransformMode = {
     jaHaniLegalCompanyName: "blur",
@@ -1219,7 +1215,7 @@ const localizedLegalCompanyNameFieldConfig = {
   }
 };
 const basicInformation = "adyen-kyc-basic-information";
-const styles$3 = {
+const styles$2 = {
   basicInformation
 };
 const BASIC_INFORMATION_FIELDS = [
@@ -1329,8 +1325,7 @@ function BasicInformation({
               {
                 companyType,
                 registrationNumberType: form.data.additionalInformation?.registrationNumberType,
-                state,
-                isExperimentEnabled
+                state
               },
               registrationNumberDefaultFieldMetadata
             ),
@@ -1401,7 +1396,7 @@ function BasicInformation({
     handleChange: handleChangeFor,
     t: businessT
   });
-  return /* @__PURE__ */ jsxs("form", { id, className: styles$3.basicInformation, children: [
+  return /* @__PURE__ */ jsxs("form", { id, className: styles$2.basicInformation, children: [
     /* @__PURE__ */ jsx(Header, { title: t(($) => $["basicInformationFormHeading"], { ns: "business" }), children: /* @__PURE__ */ jsx(
       FormDescription,
       {
@@ -1512,7 +1507,6 @@ function BasicInformation({
             companyType,
             taxIdNumberType: currentCountryTaxInformation?.type
           }),
-          guidanceText: formUtils.getFieldGuidanceText(TAX_INFORMATION_FIELD),
           readonly: formUtils.isReadOnly("taxInformation"),
           shouldValidate,
           handleChangeFor,
@@ -1559,13 +1553,13 @@ function BasicInformation({
             exemptedFromRegistrationNumber: "iDontHaveARegistrationNumber"
           }),
           mask: formUtils.getMask("registrationNumber"),
-          guidanceText: formUtils.getFieldGuidanceText(BUSINESS_REGISTRATION_NUMBER_FIELD),
           helperText: getRegistrationNumberHelperText(businessT, { country, companyType }),
           readonly: formUtils.isReadOnly("registrationNumber"),
           optional: formUtils.isOptionalField("registrationNumber"),
           shouldValidate,
           handleChangeFor,
           country,
+          state,
           canExempt: showField(["exemptedFromRegistrationNumber"]),
           companyType
         }
@@ -1589,6 +1583,12 @@ const useClearCompanyData = (options) => {
     ...options
   });
 };
+function useCompanySearchExperiments() {
+  const { isExperimentEnabled } = useExperimentsContext();
+  return {
+    isAgnosticEndpointEnabled: isExperimentEnabled("EnableProviderAgnosticCompanySearchAndSelect")
+  };
+}
 const LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW = 1577664e5;
 const KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS = [
   StateCodesUS.Arkansas,
@@ -1618,22 +1618,40 @@ const KNOWN_DISALLOWED_INDEX_DATASET_STATES = [
 const KOMPANY_SEARCH_FAILURE = "Kompany index and deep search both failed to complete";
 const useCompanySearch = (data, options) => {
   const { rootLegalEntityId, baseUrl } = useApiContext();
+  const { isAgnosticEndpointEnabled } = useCompanySearchExperiments();
   return useQuery({
     queryKey: ["companySearch", data],
-    queryFn: () => handleCompanySearch(rootLegalEntityId.value, baseUrl.value, data),
+    queryFn: () => handleCompanySearch(rootLegalEntityId.value, baseUrl.value, data, isAgnosticEndpointEnabled),
     retry: 0,
     ...options
   });
 };
-const handleCompanySearch = async (rootLegalEntityId, baseUrl, data) => {
+const handleCompanySearch = async (rootLegalEntityId, baseUrl, data, isAgnosticEndpointEnabled) => {
+  if (isAgnosticEndpointEnabled) {
+    const _data2 = {
+      name: data.name,
+      country: data.country,
+      stateOrProvince: data.state,
+      ...data.registrationNumber ? { registrationNumber: data.registrationNumber } : {},
+      resultSizeLimit: data.resultSizeLimit ?? 15
+    };
+    return httpPost(
+      {
+        baseUrl,
+        path: `legalEntities/${rootLegalEntityId}/companySearch/search`
+      },
+      _data2
+    );
+  }
+  const _data = data;
   const getRequestPayload = (text) => ({
     text,
-    country: data.country,
-    state: data.state,
-    limit: data.limit ?? 15
+    country: _data.country,
+    state: _data.state,
+    limit: _data.limit ?? 15
   });
-  const nameSearchPayload = getRequestPayload(data.name);
-  const registrationSearchPayload = getRequestPayload(data.registrationNumber);
+  const nameSearchPayload = getRequestPayload(_data.name);
+  const registrationSearchPayload = getRequestPayload(_data.registrationNumber);
   const searchRequest = async (requestPayload, path) => {
     return httpPost(
       {
@@ -1661,25 +1679,35 @@ const handleCompanySearch = async (rootLegalEntityId, baseUrl, data) => {
     return response;
   };
   const searchByRegistrationNumber = async () => {
-    return KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS.includes(data.state) ? await companyRegistrationNumberIndexSearch() : await primarySourceSearch(
+    return KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS.includes(_data.state) ? await companyRegistrationNumberIndexSearch() : await primarySourceSearch(
       companyRegistrationNumberIndexSearch,
       companyRegistrationNumberDeepSearch
     );
   };
   const searchByCompanyName = async () => {
-    return KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS.includes(data.state) ? await companyIndexSearch() : await primarySourceSearch(companyIndexSearch, companyDeepSearch);
+    return KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS.includes(_data.state) ? await companyIndexSearch() : await primarySourceSearch(companyIndexSearch, companyDeepSearch);
   };
-  if (data.registrationNumber) {
+  if (_data.registrationNumber) {
     const registrationNumberResponse = await searchByRegistrationNumber();
     return registrationNumberResponse.results.length > 0 ? registrationNumberResponse : await searchByCompanyName();
   }
   return await searchByCompanyName();
 };
-const handleCompanyDataset = async (rootLegalEntityId, baseUrl, data) => {
+const handleCompanyDataset = async (rootLegalEntityId, baseUrl, data, isAgnosticEndpointEnabled) => {
+  if (isAgnosticEndpointEnabled) {
+    return httpPost(
+      {
+        baseUrl,
+        path: `legalEntities/${rootLegalEntityId}/companyDataset/select`
+      },
+      data
+    );
+  }
+  const _data = data;
   const requestPayload = {
-    companyId: data.company.id,
+    companyId: _data.company.id,
     country: "US",
-    state: data.state
+    state: _data.state
   };
   const searchRequest = async (path) => {
     return httpPost(
@@ -1693,8 +1721,8 @@ const handleCompanyDataset = async (rootLegalEntityId, baseUrl, data) => {
   const getCompanyDataset = async () => await searchRequest();
   const refreshCompanyDataset = async () => await searchRequest("refreshed");
   const date = (/* @__PURE__ */ new Date()).toDateString();
-  const isDataCompliant = data.company.lastUpdate ? Date.parse(date) - Date.parse(data.company.lastUpdate) < LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW : false;
-  return isDataCompliant && !KNOWN_DISALLOWED_INDEX_DATASET_STATES.includes(data.state) ? await getCompanyDataset() : await refreshCompanyDataset();
+  const isDataCompliant = _data.company.lastUpdate ? Date.parse(date) - Date.parse(_data.company.lastUpdate) < LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW : false;
+  return isDataCompliant && !KNOWN_DISALLOWED_INDEX_DATASET_STATES.includes(_data.state) ? await getCompanyDataset() : await refreshCompanyDataset();
 };
 const useVerifyTin = (data, options) => {
   const { rootLegalEntityId, baseUrl } = useApiContext();
@@ -1716,19 +1744,32 @@ const verifyTin = async (legalEntityId, baseUrl, data) => {
 };
 const useCompanySelection = (data, options) => {
   const { rootLegalEntityId, baseUrl } = useApiContext();
+  const { isAgnosticEndpointEnabled } = useCompanySearchExperiments();
   return useQuery({
     queryKey: ["companySelection", data],
-    queryFn: data ? () => handleCompanySelection(rootLegalEntityId.value, baseUrl.value, data) : skipToken,
+    queryFn: data ? () => handleCompanySelection(
+      rootLegalEntityId.value,
+      baseUrl.value,
+      data,
+      isAgnosticEndpointEnabled
+    ) : skipToken,
     retry: 0,
     ...options
   });
 };
-const handleCompanySelection = async (rootLegalEntityId, baseUrl, data) => {
+const handleCompanySelection = async (rootLegalEntityId, baseUrl, data, isAgnosticEndpointEnabled) => {
   const [companyDatasetResult, tinMatch] = await Promise.all([
-    handleCompanyDataset(rootLegalEntityId, baseUrl, {
-      company: data.company,
-      state: data.state
-    }),
+    handleCompanyDataset(
+      rootLegalEntityId,
+      baseUrl,
+      isAgnosticEndpointEnabled ? {
+        id: data.id
+      } : {
+        company: data.company,
+        state: data.state
+      },
+      isAgnosticEndpointEnabled
+    ),
     verifyTin(rootLegalEntityId, baseUrl, { name: data.name, tin: data.tin })
   ]);
   return {
@@ -1759,27 +1800,54 @@ const mapOrganizationTypeToCompanyType = (organizationType) => {
       return CompanyTypesValues.PRIVATE_COMPANY;
   }
 };
-const applyVerifiedBusinessData = (form, country, verifiedData) => {
+const applyVerifiedBusinessData = (form, country, verifiedData, isAgnosticEndpointEnabled) => {
   if (!verifiedData) return;
   form.handleChangeFor("legalCompanyName", "basicInformation")(verifiedData.name);
-  form.handleChangeFor(
-    "entityType",
-    "companyStructure"
-  )(mapOrganizationTypeToCompanyType(verifiedData.organizationType));
-  const isVerifiedAddressNotRegistrationAddress = verifiedData.isPrincipalAddress || verifiedData.state && form.data.basicInformation?.stateOrProvince !== verifiedData.state;
-  const verifiedAddress = isVerifiedAddressNotRegistrationAddress ? { operationalAddress: { ...mapAddressData(verifiedData), country } } : {
-    registrationAddress: {
-      ...mapAddressData(verifiedData),
-      country,
-      stateOrProvince: form.data.basicInformation?.stateOrProvince
+  if (form.defaultData?.additionalInformation?.registrationAddress?.address || form.defaultData?.additionalInformation?.operationalAddress?.address)
+    return;
+  let verifiedAddress;
+  if (isAgnosticEndpointEnabled) {
+    const _verifiedData = verifiedData;
+    form.handleChangeFor(
+      "entityType",
+      "companyStructure"
+    )(mapOrganizationTypeToCompanyType(_verifiedData.companyType));
+    verifiedAddress = {
+      ..._verifiedData.registeredAddress && {
+        registrationAddress: mapAddressData(_verifiedData.registeredAddress)
+      },
+      ..._verifiedData.principalPlaceOfBusinessAddress && {
+        operationalAddress: mapAddressData(_verifiedData.principalPlaceOfBusinessAddress)
+      }
+    };
+    if (_verifiedData.principalPlaceOfBusinessAddress) {
+      form.handleChangeFor(
+        "operationalAddressIsSame",
+        "additionalInformation",
+        "input"
+      )(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME);
     }
-  };
-  if (isVerifiedAddressNotRegistrationAddress) {
+  } else {
+    const _verifiedData = verifiedData;
     form.handleChangeFor(
-      "operationalAddressIsSame",
-      "additionalInformation",
-      "input"
-    )(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME);
+      "entityType",
+      "companyStructure"
+    )(mapOrganizationTypeToCompanyType(_verifiedData.organizationType));
+    const isVerifiedAddressNotRegistrationAddress = _verifiedData.isPrincipalAddress || _verifiedData.state && form.data.basicInformation?.stateOrProvince !== _verifiedData.state;
+    verifiedAddress = isVerifiedAddressNotRegistrationAddress ? { operationalAddress: { ...mapAddressData(_verifiedData), country } } : {
+      registrationAddress: {
+        ...mapAddressData(_verifiedData),
+        country,
+        stateOrProvince: form.data.basicInformation?.stateOrProvince
+      }
+    };
+    if (isVerifiedAddressNotRegistrationAddress) {
+      form.handleChangeFor(
+        "operationalAddressIsSame",
+        "additionalInformation",
+        "input"
+      )(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME);
+    }
   }
   if (verifiedAddress.registrationAddress) {
     form.handleChangeFor(
@@ -1809,6 +1877,10 @@ function BusinessInformation({ fetching, selectedBusiness }) {
           case "address":
             if (value) acc[2].details = value;
             break;
+          case "registeredAddress":
+            if (value && typeof value !== "string")
+              acc[2].details = value?.fullAddress;
+            break;
         }
         return acc;
       },
@@ -1848,10 +1920,14 @@ function BusinessInformationCard({
   handleBackClick
 }) {
   const { t } = useTranslation(["common", "business"]);
-  const isSelected = selectedBusinessId === result.id;
+  const { isExperimentEnabled } = useExperimentsContext();
+  const providerAgnosticEndpointsEnabled = isExperimentEnabled(
+    "EnableProviderAgnosticCompanySearchAndSelect"
+  );
+  const isSelected = selectedBusinessId === (providerAgnosticEndpointsEnabled ? result.resultId : result.id);
   const excludeResultAsGovernmentEntity = useMemo(
-    () => isBankAccountRequestedForOrganization.value && currentBusinessSelection?.organizationType === "GOVERNMENTAL_ORGANIZATION",
-    [currentBusinessSelection]
+    () => isBankAccountRequestedForOrganization.value && currentBusinessSelection && (providerAgnosticEndpointsEnabled ? currentBusinessSelection.companyType : currentBusinessSelection.organizationType) === "GOVERNMENTAL_ORGANIZATION",
+    [currentBusinessSelection, providerAgnosticEndpointsEnabled]
   );
   const showSelectButton = useMemo(
     () => !fetching && !fetchingError && currentBusinessSelection && !excludeResultAsGovernmentEntity,
@@ -1938,7 +2014,7 @@ function BusinessInformationCard({
   ] }) });
 }
 const businessSelectionFooter = "adyen-kyc-business-selection-footer";
-const styles$2 = {
+const styles$1 = {
   businessSelectionFooter
 };
 const BUSINESS_SELECTION_FIELDS = [
@@ -1957,9 +2033,13 @@ function BusinessSelection({
   const { form } = useFormContext();
   const queryClient = useQueryClient();
   const userEvents = useAnalyticsContext();
+  const { isExperimentEnabled } = useExperimentsContext();
   const [selectedBusinessId, setSelectedBusinessId] = useState();
   const [fetchParams, setFetchParams] = useState();
   usePageLandedEvent();
+  const providerAgnosticEndpointsEnabled = isExperimentEnabled(
+    "EnableProviderAgnosticCompanySearchAndSelect"
+  );
   const { data: companySearchResponse, isLoading: searching } = useCompanySearch({
     name: form.data.basicInformation?.legalCompanyName ?? "",
     country,
@@ -2000,28 +2080,35 @@ function BusinessSelection({
     [form]
   );
   const handleSelectBusiness = (result) => {
-    if ((!selectedBusinessId || selectedBusinessId !== result.id) && currentTin) {
+    const resultId = providerAgnosticEndpointsEnabled ? result.resultId : result.id;
+    if ((!selectedBusinessId || selectedBusinessId !== resultId) && currentTin) {
       userEvents.addPageEvent("Clicked button", {
         actionType: "select",
         label: "selectBusiness",
         additionalData: {
           companyIdx: companySearchResponse?.results.findIndex(
-            (searchResult) => searchResult.id === result.id
+            (searchResult) => (providerAgnosticEndpointsEnabled ? searchResult.resultId : searchResult.id) === resultId
           )
         }
       });
-      setSelectedBusinessId(result.id);
-      setFetchParams({
-        company: result,
-        state: form.data.basicInformation?.stateOrProvince,
-        name: result.name,
-        tin: currentTin
-      });
+      setSelectedBusinessId(resultId);
+      setFetchParams(
+        providerAgnosticEndpointsEnabled ? {
+          id: result.resultId,
+          name: result.name,
+          tin: currentTin
+        } : {
+          company: result,
+          state: form.data.basicInformation?.stateOrProvince,
+          name: result.name,
+          tin: currentTin
+        }
+      );
     }
   };
   const handleConfirmSelection = () => {
     verifiedBusiness.value = businessData;
-    applyVerifiedBusinessData(form, country, businessData);
+    applyVerifiedBusinessData(form, country, businessData, providerAgnosticEndpointsEnabled);
     handleChange("hasSelectedBusiness", "blur")(true);
     handleNextClick();
   };
@@ -2112,9 +2199,9 @@ function BusinessSelection({
         refetchCompanySelection,
         handleBackClick
       },
-      result.id
+      providerAgnosticEndpointsEnabled ? result.resultId : result.id
     )) }),
-    /* @__PURE__ */ jsxs(Typography, { el: "span", color: "secondary", className: styles$2.businessSelectionFooter, children: [
+    /* @__PURE__ */ jsxs(Typography, { el: "span", color: "secondary", className: styles$1.businessSelectionFooter, children: [
       t(($) => $["businessSelection__footer"], { ns: "business" }),
       /* @__PURE__ */ jsx(Button, { variant: "link", onClick: proceedToManualDataEntry, testId: "manualDataEntry", children: t(($) => $["businessSelection__footerButton"], { ns: "business" }) })
     ] })
@@ -2269,7 +2356,7 @@ function FinancialReportingDate({
   handleChangeFor
 }) {
   const { t } = useTranslation("common");
-  return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(
     Field,
     {
       name: "financialReportingDate",
@@ -2293,7 +2380,7 @@ function FinancialReportingDate({
         }
       )
     }
-  ) });
+  );
 }
 const NUMBER_OF_EMPLOYEES_FIELD = [
   "numberOfEmployees"
@@ -2306,7 +2393,7 @@ function NumberOfEmployees({
   readonly,
   handleChangeFor
 }) {
-  return /* @__PURE__ */ jsx("div", { children: /* @__PURE__ */ jsx(
+  return /* @__PURE__ */ jsx(
     Field,
     {
       name: "numberOfEmployees",
@@ -2329,15 +2416,13 @@ function NumberOfEmployees({
         }
       )
     }
-  ) });
+  );
 }
-const financialInformationReportedValueOptions = "adyen-kyc-financial-information-reported-value-options";
-const styles$1 = {
-  financialInformationReportedValueOptions
-};
+const reportedValueOptions = "adyen-kyc-reported-value-options";
 const reportedValue = "adyen-kyc-reported-value";
 const reportedValueInput = "adyen-kyc-reported-value-input";
 const styles = {
+  reportedValueOptions,
   reportedValue,
   reportedValueInput
 };
@@ -2351,12 +2436,12 @@ const ReportedValue = ({
   errorMessage,
   isValid
 }) => {
-  const { i18n } = useI18nContext();
+  const { i18n } = useTranslation();
   return /* @__PURE__ */ jsx("div", { className: styles.reportedValue, children: /* @__PURE__ */ jsx(Field, { name: fieldName, errorMessage, isValid, helper, children: (childProps) => /* @__PURE__ */ jsx(
     InputCurrency,
     {
       ...childProps,
-      locale: i18n.locale,
+      locale: i18n.language,
       currency,
       amount,
       onAmountChanged,
@@ -2365,237 +2450,217 @@ const ReportedValue = ({
     }
   ) }) });
 };
-const financialInfoValidationRules = {
-  financialReportingDate: [
-    {
-      modes: ["blur"],
-      validate: (date) => !isEmpty(date),
-      errorMessage: "fieldIsRequired"
-    },
-    {
-      modes: ["blur"],
-      validate: (date) => date ? new Date(date) < /* @__PURE__ */ new Date() : false,
-      errorMessage: "invalidFinancialReportingDate"
-    }
-  ],
-  currency: [
-    {
-      modes: ["blur"],
-      validate: (currency) => !isEmpty(currency),
-      errorMessage: "fieldIsRequired"
+const REPORTED_VALUE_OPTION_FIELD = [
+  "reportedValueOption",
+  "balanceSheetTotal",
+  "annualTurnover"
+];
+function ReportedValueOptionField({
+  data,
+  valid,
+  errors,
+  handleChangeFor,
+  currency
+}) {
+  const { t } = useTranslation("common");
+  const updateReportedValueOption = (option) => {
+    if (data.reportedValueOption) {
+      handleChangeFor(data.reportedValueOption)(null);
     }
-  ],
-  reportedValueOption: {
-    modes: ["blur"],
-    validate: (option) => !isEmpty(option),
-    errorMessage: "fieldIsRequired"
-  },
-  balanceSheetTotal: {
-    modes: ["blur"],
-    validate: (amount) => !isUndefinedOrNull(amount),
-    errorMessage: "fieldIsRequired"
-  },
-  annualTurnover: {
-    modes: ["blur"],
-    validate: (amount) => !isUndefinedOrNull(amount),
-    errorMessage: "fieldIsRequired"
-  }
-};
-const financialInfoValidationEmployeesOnlyRules = {
-  numberOfEmployees: [
-    {
-      modes: ["blur"],
-      validate: (numberOfEmployees) => !isEmpty(numberOfEmployees),
-      errorMessage: "fieldIsRequired"
-    },
+    const newReportedValue = option;
+    handleChangeFor("reportedValueOption")(newReportedValue);
+  };
+  return /* @__PURE__ */ jsx(
+    Field,
     {
-      modes: ["blur"],
-      validate: (numberOfEmployees) => Number.isInteger(Number(numberOfEmployees)) && Number(numberOfEmployees) > 0,
-      errorMessage: "pleaseEnterAValidWholeNumber"
+      el: "fieldset",
+      name: "reportedValueOption",
+      label: t(($) => $["reportedValue"]),
+      errorMessage: errors.reportedValueOption,
+      helper: t(($) => $["useFiguresFromTheMostRecentYearAvailable"]),
+      isValid: Boolean(valid.reportedValueOption),
+      children: (childProps) => /* @__PURE__ */ jsx(
+        RadioGroup,
+        {
+          name: "reportedValueOption",
+          ...childProps,
+          value: data.reportedValueOption,
+          items: [
+            {
+              id: "balanceSheetTotal",
+              name: "balanceSheetTotal",
+              content: /* @__PURE__ */ jsx(
+                ReportedValue,
+                {
+                  label: t(($) => $["balanceSheetTotal"]),
+                  currency,
+                  amount: data.balanceSheetTotal,
+                  onAmountChanged: handleChangeFor("balanceSheetTotal"),
+                  fieldName: "balanceSheetTotal",
+                  isValid: valid.balanceSheetTotal,
+                  errorMessage: errors.balanceSheetTotal
+                }
+              )
+            },
+            {
+              id: "annualTurnover",
+              name: "annualTurnover",
+              content: /* @__PURE__ */ jsx(
+                ReportedValue,
+                {
+                  label: t(($) => $["annualTurnover"]),
+                  currency,
+                  amount: data.annualTurnover,
+                  onAmountChanged: handleChangeFor("annualTurnover"),
+                  fieldName: "annualTurnover",
+                  isValid: valid.annualTurnover,
+                  errorMessage: errors.annualTurnover
+                }
+              )
+            }
+          ],
+          onChange: updateReportedValueOption,
+          showContentOnlyOnSelected: true,
+          className: styles.reportedValueOptions
+        }
+      )
     }
-  ]
-};
-const financialInfoValidationWithEmployeesRules = {
-  ...financialInfoValidationRules,
-  ...financialInfoValidationEmployeesOnlyRules
-};
+  );
+}
 const financialInformationFieldsForEu = [
   ...FINANCIAL_REPORTING_DATE_FIELD,
   ...CURRENCY_FIELD,
-  "reportedValueOption"
+  ...REPORTED_VALUE_OPTION_FIELD
 ];
 const financialInformationFields = [
   ...NUMBER_OF_EMPLOYEES_FIELD,
   ...FINANCIAL_REPORTING_DATE_FIELD,
   ...CURRENCY_FIELD,
-  "reportedValueOption"
+  ...REPORTED_VALUE_OPTION_FIELD
 ];
-function FinancialInformation(props) {
+function FinancialInformation({
+  id,
+  country,
+  validationErrors = {},
+  verificationErrors = {}
+}) {
   const { t } = useTranslation("common");
+  const { form } = useFormContext();
   usePageLandedEvent();
-  const { id, country, data: financialInformationData, multiForm, fieldValidationErrors } = props;
   const defaultCurrency = currencyByCountry[country]?.[0] ?? "EUR";
-  const formUtils = createFormUtils(props, t);
-  const showReportingFields = formUtils.isRequiredField("financialReportingDate");
-  const getSchema = (data2) => [
-    ...financialInformationFields,
-    ...data2.reportedValueOption ? [data2.reportedValueOption] : []
-  ];
-  const getValidator = () => {
-    if (!showReportingFields) {
-      return financialInfoValidationEmployeesOnlyRules;
-    }
-    if (country === CountryCodes.UnitedKingdom) {
-      return financialInfoValidationWithEmployeesRules;
-    }
-    return financialInfoValidationRules;
-  };
-  const { handleChangeFor, data, valid, errors, fieldProblems, schema } = useForm({
-    ...props,
-    schema: getSchema,
-    defaultData: financialInformationData,
-    rules: getValidator(),
-    fieldProblems: fieldValidationErrors
-  });
-  const { updateStateSlice } = useGlobalDataSlice(id);
-  useEffect(() => {
-    updateStateSlice({
-      data,
-      valid,
-      errors,
-      fieldProblems,
-      schema
-    });
-  }, [data, valid, errors, fieldProblems, schema, updateStateSlice]);
-  const handleChange = useCallback(
-    (fieldName, mode) => multiForm ? multiForm.handleChangeFor(fieldName, "companyFinancialInformation", mode) : handleChangeFor(fieldName, mode),
-    [handleChangeFor, multiForm]
+  const handleChangeFor = useCallback(
+    (fieldName, mode) => form.handleChangeFor(fieldName, "companyFinancialInformation", mode),
+    [form]
   );
-  const formData = multiForm ? multiForm.data?.companyFinancialInformation ?? {} : data;
-  const formErrors = multiForm ? multiForm.errors?.companyFinancialInformation ?? {} : errors;
-  const formValid = multiForm ? multiForm.valid?.companyFinancialInformation ?? {} : valid;
-  const formFieldProblems = multiForm ? multiForm.fieldProblems.companyFinancialInformation ?? {} : fieldProblems;
-  const updateReportedValueOption = (option) => {
-    if (formData.reportedValueOption) {
-      handleChange(formData.reportedValueOption)(null);
-    }
-    const newReportedValue = option;
-    handleChange("reportedValueOption")(newReportedValue);
-  };
-  return /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-company-financial-information", children: [
+  const formUtils = useMemo(
+    () => createFormUtils(
+      {
+        data: form.data.companyFinancialInformation ?? {},
+        allFields: form.allFields?.companyFinancialInformation ?? [],
+        requiredFields: form.requiredFields?.companyFinancialInformation ?? [],
+        optionalFields: form.optionalFields?.companyFinancialInformation ?? [],
+        trustedFields: form.trustedFields?.companyFinancialInformation ?? [],
+        obscuredFields: form.obscuredFields?.companyFinancialInformation ?? [],
+        errors: form.errors.companyFinancialInformation ?? {},
+        valid: form.valid.companyFinancialInformation ?? {}
+      },
+      t
+    ),
+    [form, handleChangeFor, t, validationErrors, verificationErrors]
+  );
+  const showField = (fieldKeys) => fieldKeys.some((field) => formUtils.isRequiredField(field) || formUtils.isOptionalField(field));
+  return /* @__PURE__ */ jsxs("form", { id, className: "adyen-kyc-company-financial-information", children: [
     /* @__PURE__ */ jsx(Header, { title: t(($) => $["companyFinancialInformationFormHeading"], { ns: "business" }) }),
+    /* @__PURE__ */ jsx(
+      ErrorPanel,
+      {
+        id: "ariaErrorField",
+        verificationErrors,
+        validationErrors,
+        formUtils
+      }
+    ),
     country === CountryCodes.UnitedKingdom && /* @__PURE__ */ jsx(
       NumberOfEmployees,
       {
-        data: formUtils.getFieldData(formData, NUMBER_OF_EMPLOYEES_FIELD),
+        data: formUtils.getFieldData(
+          form.data.companyFinancialInformation ?? {},
+          NUMBER_OF_EMPLOYEES_FIELD
+        ),
         errors: formUtils.getFieldErrors(
-          formErrors,
-          formFieldProblems,
+          form.errors.companyFinancialInformation ?? {},
+          form.fieldProblems.companyFinancialInformation,
           NUMBER_OF_EMPLOYEES_FIELD
         ),
-        handleChangeFor: handleChange,
+        handleChangeFor,
         labels: formUtils.getFieldLabels(NUMBER_OF_EMPLOYEES_FIELD),
         readonly: formUtils.isReadOnly("numberOfEmployees"),
-        valid: formUtils.getFieldValid(formValid, NUMBER_OF_EMPLOYEES_FIELD)
+        valid: formUtils.getFieldValid(
+          form.valid.companyFinancialInformation ?? {},
+          NUMBER_OF_EMPLOYEES_FIELD
+        )
       }
     ),
-    showReportingFields && /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx(
-        FinancialReportingDate,
-        {
-          data: formUtils.getFieldData(formData, FINANCIAL_REPORTING_DATE_FIELD),
-          errors: formUtils.getFieldErrors(
-            formErrors,
-            formFieldProblems,
-            FINANCIAL_REPORTING_DATE_FIELD
-          ),
-          handleChangeFor: handleChange,
-          labels: formUtils.getFieldLabels(FINANCIAL_REPORTING_DATE_FIELD),
-          readonly: formUtils.isReadOnly("financialReportingDate"),
-          valid: formUtils.getFieldValid(formValid, FINANCIAL_REPORTING_DATE_FIELD)
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Currency,
-        {
-          country,
-          labels: { currency: t(($) => $["reportingCurrency"]) },
-          data: formUtils.getFieldData(formData, CURRENCY_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, CURRENCY_FIELD),
-          handleChangeFor: handleChange,
-          readonly: formUtils.isReadOnly("currency"),
-          valid: formUtils.getFieldValid(formValid, CURRENCY_FIELD)
-        }
-      ),
-      /* @__PURE__ */ jsx(
-        Field,
-        {
-          el: "fieldset",
-          name: "reportedValueOption",
-          label: t(($) => $["reportedValue"]),
-          errorMessage: formUtils.getErrorMessage(
-            "reportedValueOption",
-            formErrors,
-            formFieldProblems
-          ),
-          helper: t(($) => $["useFiguresFromTheMostRecentYearAvailable"]),
-          isValid: formValid.reportedValueOption,
-          children: (childProps) => /* @__PURE__ */ jsx(
-            RadioGroup,
-            {
-              name: "reportedValueOption",
-              ...childProps,
-              value: formData.reportedValueOption,
-              items: [
-                {
-                  id: "balanceSheetTotal",
-                  name: "balanceSheetTotal",
-                  content: /* @__PURE__ */ jsx(
-                    ReportedValue,
-                    {
-                      label: t(($) => $["balanceSheetTotal"]),
-                      currency: formData.currency ?? defaultCurrency,
-                      amount: formData.balanceSheetTotal,
-                      onAmountChanged: handleChange("balanceSheetTotal"),
-                      fieldName: "balanceSheetTotal",
-                      isValid: formValid.balanceSheetTotal,
-                      errorMessage: formUtils.getErrorMessage(
-                        "balanceSheetTotal",
-                        formErrors,
-                        formFieldProblems
-                      )
-                    }
-                  )
-                },
-                {
-                  id: "annualTurnover",
-                  name: "annualTurnover",
-                  content: /* @__PURE__ */ jsx(
-                    ReportedValue,
-                    {
-                      label: t(($) => $["annualTurnover"]),
-                      currency: formData.currency ?? defaultCurrency,
-                      amount: formData.annualTurnover,
-                      onAmountChanged: handleChange("annualTurnover"),
-                      fieldName: "annualTurnover",
-                      isValid: formValid.annualTurnover,
-                      errorMessage: formUtils.getErrorMessage(
-                        "annualTurnover",
-                        formErrors,
-                        formFieldProblems
-                      )
-                    }
-                  )
-                }
-              ],
-              onChange: updateReportedValueOption,
-              showContentOnlyOnSelected: true,
-              className: styles$1.financialInformationReportedValueOptions
-            }
-          )
-        }
-      )
-    ] })
+    showField(FINANCIAL_REPORTING_DATE_FIELD) && /* @__PURE__ */ jsx(
+      FinancialReportingDate,
+      {
+        data: formUtils.getFieldData(
+          form.data.companyFinancialInformation ?? {},
+          FINANCIAL_REPORTING_DATE_FIELD
+        ),
+        errors: formUtils.getFieldErrors(
+          form.errors.companyFinancialInformation ?? {},
+          form.fieldProblems.companyFinancialInformation,
+          FINANCIAL_REPORTING_DATE_FIELD
+        ),
+        handleChangeFor,
+        labels: formUtils.getFieldLabels(FINANCIAL_REPORTING_DATE_FIELD),
+        readonly: formUtils.isReadOnly("financialReportingDate"),
+        valid: formUtils.getFieldValid(
+          form.valid.companyFinancialInformation ?? {},
+          FINANCIAL_REPORTING_DATE_FIELD
+        )
+      }
+    ),
+    showField(CURRENCY_FIELD) && /* @__PURE__ */ jsx(
+      Currency,
+      {
+        country,
+        labels: { currency: t(($) => $["reportingCurrency"]) },
+        data: formUtils.getFieldData(form.data.companyFinancialInformation ?? {}, CURRENCY_FIELD),
+        errors: formUtils.getFieldErrors(
+          form.errors.companyFinancialInformation ?? {},
+          form.fieldProblems.companyFinancialInformation,
+          CURRENCY_FIELD
+        ),
+        handleChangeFor,
+        readonly: formUtils.isReadOnly("currency"),
+        valid: formUtils.getFieldValid(
+          form.valid.companyFinancialInformation ?? {},
+          CURRENCY_FIELD
+        )
+      }
+    ),
+    showField(REPORTED_VALUE_OPTION_FIELD) && /* @__PURE__ */ jsx(
+      ReportedValueOptionField,
+      {
+        data: formUtils.getFieldData(
+          form.data.companyFinancialInformation ?? {},
+          REPORTED_VALUE_OPTION_FIELD
+        ),
+        valid: formUtils.getFieldValid(
+          form.valid.companyFinancialInformation ?? {},
+          REPORTED_VALUE_OPTION_FIELD
+        ),
+        errors: formUtils.getFieldErrors(
+          form.errors.companyFinancialInformation ?? {},
+          form.fieldProblems.companyFinancialInformation,
+          REPORTED_VALUE_OPTION_FIELD
+        ),
+        handleChangeFor,
+        currency: form.data.companyFinancialInformation?.currency ?? defaultCurrency
+      }
+    )
   ] });
 }
 const FIELDS_NEEDED_FOR_COMPANY_SEARCH = [...STATE_FIELD, ...TAX_INFORMATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD];
@@ -2607,8 +2672,7 @@ const getBasicInformationFields = (country, taskType) => {
   return fields;
 };
 const getFinancialInformationFields = (country) => {
-  const fields = country === CountryCodes.UnitedKingdom ? financialInformationFields : financialInformationFieldsForEu;
-  return [...fields, "netAssets", "balanceSheetTotal", "annualTurnover"];
+  return country === CountryCodes.UnitedKingdom ? financialInformationFields : financialInformationFieldsForEu;
 };
 const staticBusinessDetailsForms = {
   businessSelection: {
@@ -3234,7 +3298,7 @@ function BusinessDetailsMultiform({
             requiredFields: form.requiredFields?.companyTaxDocument,
             optionalFields: form.optionalFields?.companyTaxDocument,
             trustedFields: form.trustedFields?.companyTaxDocument,
-            handleFieldChange: () => handleChange("companyTaxDocument", "taxDocument")
+            handleFieldChange: (fieldName) => handleChange("companyTaxDocument", fieldName)
           }
         ) : /* @__PURE__ */ jsx(VatDocument, { children: /* @__PURE__ */ jsx(
           MemoizedDocumentUpload,
@@ -3372,15 +3436,11 @@ function BusinessDetailsMultiform({
         return /* @__PURE__ */ jsx(
           FinancialInformation,
           {
-            multiForm: form,
             id: activeForm2.formId,
             country,
-            data: form.data.companyFinancialInformation,
-            allFields: form.allFields?.companyFinancialInformation,
-            requiredFields: form.requiredFields?.companyFinancialInformation,
-            optionalFields: form.optionalFields?.companyFinancialInformation,
-            trustedFields: form.trustedFields?.companyFinancialInformation,
-            shouldValidate
+            shouldValidate,
+            validationErrors: problems.validationErrors?.[activeForm2.formId] ?? {},
+            verificationErrors: problems.verificationErrors?.[activeForm2.formId] ?? {}
           }
         );
       default:
@@ -3396,8 +3456,78 @@ const CompanyStructureValidation = {
     errorMessage: "fieldIsRequired"
   }
 };
-const mapApiDocumentToBusinessDetailsDocuments = (entityId) => {
-  const registrationDocument = getDocument(entityId, "registrationDocument");
+const currencyMetadata = {
+  validators: {
+    modes: ["blur"],
+    validate: (currency) => !isEmpty(currency),
+    errorMessage: "fieldIsRequired"
+  }
+};
+const financialReportingDateMetadata = {
+  validators: [
+    {
+      modes: ["blur"],
+      validate: (date) => !isEmpty(date),
+      errorMessage: "fieldIsRequired"
+    },
+    {
+      modes: ["blur"],
+      validate: (date) => date ? new Date(date) < /* @__PURE__ */ new Date() : false,
+      errorMessage: "invalidFinancialReportingDate"
+    }
+  ]
+};
+const numberOfEmployeesMetadata = {
+  validators: [
+    {
+      modes: ["blur"],
+      validate: (numberOfEmployees) => !isEmpty(numberOfEmployees),
+      errorMessage: "fieldIsRequired"
+    },
+    {
+      modes: ["blur"],
+      validate: (numberOfEmployees) => Number.isInteger(Number(numberOfEmployees)) && Number(numberOfEmployees) > 0,
+      errorMessage: "pleaseEnterAValidWholeNumber"
+    }
+  ]
+};
+const reportedValueOptionMetadata = {
+  validators: {
+    modes: ["blur"],
+    validate: (option) => !isEmpty(option),
+    errorMessage: "fieldIsRequired"
+  }
+};
+const balanceSheetTotalMetadata = {
+  validators: {
+    modes: ["blur"],
+    validate: (amount) => !isUndefinedOrNull(amount),
+    errorMessage: "fieldIsRequired"
+  }
+};
+const annualTurnoverMetadata = {
+  validators: {
+    modes: ["blur"],
+    validate: (amount) => !isUndefinedOrNull(amount),
+    errorMessage: "fieldIsRequired"
+  }
+};
+const financialInfoValidationRules = {
+  financialReportingDate: financialReportingDateMetadata.validators,
+  currency: currencyMetadata.validators,
+  reportedValueOption: reportedValueOptionMetadata.validators,
+  balanceSheetTotal: balanceSheetTotalMetadata.validators,
+  annualTurnover: annualTurnoverMetadata.validators
+};
+const financialInfoValidationEmployeesOnlyRules = {
+  numberOfEmployees: numberOfEmployeesMetadata.validators
+};
+const financialInfoValidationWithEmployeesRules = {
+  ...financialInfoValidationRules,
+  ...financialInfoValidationEmployeesOnlyRules
+};
+const mapApiDocumentToBusinessDetailsDocuments = (entityId) => {
+  const registrationDocument = getDocument(entityId, "registrationDocument");
   const taxDocument = getDocument(entityId, "vatDocument") ?? getDocument(entityId, "proofOfOrganizationTaxInfo");
   const proofOfDirector = getDocument(entityId, "proofOfDirector");
   const proofOfSignatory = getDocument(entityId, "proofOfSignatory");
@@ -3651,84 +3781,244 @@ const mapLegalEntityToBusinessDetailsSchema = ({
     }
   }, {});
 };
-const businessDetailsBase = {
-  /* Base required fields */
-  country: { rule: "REQUIRED" },
-  entityType: { rule: "businessRequiresCompanyType" },
-  legalCompanyName: { rule: "REQUIRED" },
-  jaHaniLegalCompanyName: { rule: "japaneseLegalCompanyName" },
-  jaKanaLegalCompanyName: { rule: "japaneseLegalCompanyName" },
-  hasDoingBusinessAs: { rule: "REQUIRED" },
-  doingBusinessAs: { rule: "requireDoingBusinessAsName" },
-  registrationAddress: { rule: "REQUIRED" },
-  operationalAddressIsSame: { rule: "REQUIRED" },
-  /* Base optional fields */
-  operationalAddress: { rule: "OPTIONAL" },
-  /* Fields with custom country specific rules */
-  hasSelectedBusiness: { rule: "usingCompanySearch" },
-  stockExchangeMIC: { rule: "ifPubliclyTradedCompany" },
-  stockISIN: { rule: "ifPubliclyTradedCompany" },
-  stockTickerSymbol: { rule: "ifPubliclyTradedCompany" },
-  dateOfIncorporation: { rule: "isDateOfIncorporationRequired" },
-  stateOrProvince: { rule: "usingCompanySearch" },
-  registrationNumber: { rule: "countryRequiresRegistrationNumber" },
-  registrationNumberType: { rule: "registrationNumberType" },
-  exemptedFromRegistrationNumber: { rule: "companyRegistrationNumberExemptionAllowed" },
-  eInvoicingCode: { rule: "isEInvoicingCodeEnabled" },
-  countryOfGoverningLaw: { rule: "countryOfGoverningLawRequired" },
-  taxDocument: { rule: "ifCountryUsAndTinFailed" },
-  /* Fields derived from capabilities */
-  industryCodes: { rule: "isIndustryCodeRequired" }
+function buildRequiredForms({
+  config: {
+    forms,
+    requiredFields,
+    optionalFields,
+    isValid,
+    problems,
+    isSettingEnabled,
+    accountHolder,
+    legalEntityResponse
+  },
+  options
+}) {
+  const skipCompanyStructure = !!verifiedBusiness.value?.legalForm || isSettingEnabled(SettingNames.AllowLegalEntityTypeChange) && organizationTypesToSkipCompanyStructureForm.includes(
+    legalEntityResponse.organization?.type ?? ""
+  ) && accountHolder !== "aTrust" && accountHolder !== "anUnincorporatedPartnership";
+  const filteredForms = Object.values(forms).filter(({ formId }) => {
+    if (formId === "businessSelection") {
+      if (options?.hasNoSearchResults || isVerifiedSingleCompanySearchResult.value) return false;
+    }
+    if (formId === "companyStructure") {
+      if (skipCompanyStructure) return false;
+    }
+    if (requiredFields || optionalFields) {
+      return Boolean(requiredFields?.[formId]) || Boolean(optionalFields?.[formId]);
+    }
+    return true;
+  });
+  const requiredForms = options?.skipSummary ? filteredForms : [...filteredForms, summaryStep];
+  return addValidityToForms(requiredForms, isValid, problems);
+}
+const isDocumentsRequired = (forms) => forms.some((form) => documentFormsIds.includes(form.formId));
+const getCountryOfGoverningLaw = (isCountryOfGoverningLawEnabled, basicData) => {
+  if (!isCountryOfGoverningLawEnabled || basicData?.country !== CountryCodes.UnitedKingdom) {
+    return void 0;
+  }
+  return !basicData.countryOfGoverningLaw ? CountryCodes.UnitedKingdom : basicData.countryOfGoverningLaw;
 };
-const taxInformationBase = {
-  vatNumber: { rule: "countryUsesVat" },
-  vatNumberType: { rule: "vatNumberType" },
-  exemptedFromVat: { rule: "isVatExempt" },
-  vatAbsenceReason: { rule: "isVatExempt" },
-  taxInformation: { rule: "countryUsesTaxId" },
-  exemptedFromTax: { rule: "countryHasTaxExemptions" },
-  isUen: { rule: "countryUsesUenOrGst" }
+function createStructuredListItem(term, details, t) {
+  if (!details) return;
+  return {
+    term: t(($) => $[term], { ns: "common" }),
+    details
+  };
+}
+function getRegistrationNumberLabel(country, companyType, data) {
+  return resolveFieldMetadata(
+    registrationNumberDefaultFieldConfig[country],
+    {
+      companyType,
+      registrationNumberType: data.registrationNumber ? inferCompanyRegistrationNumberType(data.registrationNumber, country, companyType) : getCompanyRegistrationNumberOptions(country, companyType)?.[0]?.id
+    },
+    registrationNumberDefaultFieldMetadata
+  ).label ?? "";
+}
+function getTaxIdLabel(country) {
+  return resolveFieldMetadata(
+    taxInformationDefaultFieldConfig[country],
+    {
+      taxIdNumberType: countryToTaxInfoTypeMap[country] ?? void 0,
+      // TODO use type selector
+      companyType: void 0
+    },
+    taxInformationDefaultFieldMetadata
+  ).label ?? "";
+}
+const formatBasicInformation = (data, datasetUtils, companyType, isCountryOfGoverningLawEnabled) => {
+  const country = data.country;
+  return {
+    legalCompanyName: data.legalCompanyName,
+    country: datasetUtils.getCountryName(data.country),
+    [getKeyForField("stateOrProvince", data.country)]: datasetUtils.getStateName(
+      data.stateOrProvince,
+      data.country
+    ),
+    [getTaxIdLabel(country)]: data.taxInformation?.find((taxId) => data.country === taxId.country)?.number,
+    [getRegistrationNumberLabel(country, companyType, data)]: data.registrationNumber,
+    countryOfGoverningLaw: datasetUtils.getCountryName(
+      getCountryOfGoverningLaw(isCountryOfGoverningLawEnabled, data)
+    )
+  };
 };
-const financialInformationBase = {
-  numberOfEmployees: { rule: "countryRequiresFinancialInformation" },
-  financialReportingDate: { rule: "isFinancialReportingFieldsRequired" },
-  currency: { rule: "isFinancialReportingFieldsRequired" },
-  reportedValueOption: { rule: "isFinancialReportingFieldsRequired" },
-  annualTurnover: { rule: "annualTurnoverRequired" },
-  netAssets: { rule: "netAssetsRequired" },
-  balanceSheetTotal: { rule: "balanceSheetTotalRequired" }
+const formatAdditionalInformation = (data, country, companyType) => {
+  return {
+    businessStructure: data.legalFormLabel,
+    doingBusinessAs: data.doingBusinessAs,
+    industry: data.industryCodes?.[0].name,
+    [getRegistrationNumberLabel(country, companyType, data)]: data.registrationNumber,
+    [getTaxIdLabel(country)]: !data.isUen && data.taxInformation?.find((taxId) => country === taxId.country)?.number,
+    vatNumber: data.vatNumber,
+    vatAbsenceReason: data.vatAbsenceReason,
+    dateOfIncorporation: data.dateOfIncorporation,
+    stockExchangeMIC: data.stockExchangeMIC,
+    stockISIN: data.stockISIN,
+    stockTickerSymbol: data.stockTickerSymbol,
+    eInvoicingCode: data.eInvoicingCode
+  };
 };
-const businessDetailsFieldsPerScenario = {
-  L0: {
-    country: { rule: "REQUIRED" },
-    legalCompanyName: { rule: "REQUIRED" },
-    stateOrProvince: { rule: "usingCompanySearch" },
-    ...financialInformationBase
-  },
-  L1: {
-    ...businessDetailsBase,
-    ...financialInformationBase
-  },
-  // L for org is basically L_TAXINFO for Individuals (we will fix this in the near future
-  // to make them aligned and less confusing)
-  L: {
-    ...businessDetailsBase,
-    ...taxInformationBase,
-    ...financialInformationBase
-  },
-  L_PROOFOFADDRESS: {
-    // TODO this field does not exist
-    // proofOfAddressDocument: { rule: 'REQUIRED' },
-  },
-  L_REGDOC: {
-    registrationDocument: { rule: "REQUIRED" }
-  },
-  L_TAXDOC: {
-    taxDocument: { rule: "REQUIRED" }
-  },
-  L_BAFIN: {
-    legalForm: { rule: "REQUIRED" }
+const formatAddress = (data, datasetUtils, country, version) => {
+  return mapAddressLabelsNewSummary(data, datasetUtils);
+};
+const formatFinancialInformationSummary = (data, language, country, dateOfIncorporation) => {
+  if (!data) return {};
+  if (dateOfIncorporation && !isDateOlderThanAYear(dateOfIncorporation)) {
+    return country === CountryCodes.UnitedKingdom ? { numberOfEmployees: data.numberOfEmployees } : {};
   }
+  return {
+    currency: data.currency,
+    financialReportingDate: data.financialReportingDate,
+    ...country === CountryCodes.UnitedKingdom ? { numberOfEmployees: data.numberOfEmployees } : {},
+    ...data.balanceSheetTotal ? { balanceSheetTotal: formatCurrency(data.balanceSheetTotal, data.currency, language) } : {},
+    ...data.annualTurnover ? { annualTurnover: formatCurrency(data.annualTurnover, data.currency, language) } : {}
+  };
+};
+const formatDataForSummary = (data, forms, t, language, isExperimentEnabled, version) => {
+  const OMITTED_FORMS = ["businessSelection", "summary"];
+  const datasetUtils = datasetUtilities(language);
+  const isCountryOfGoverningLawEnabled = isExperimentEnabled(
+    "EnableCountryOfGoverningLawForUKCompanies"
+  );
+  const getSummaryItemsForForm = (formId) => {
+    if (!data[formId]) return {};
+    switch (formId) {
+      case "basicInformation":
+        return formatBasicInformation(
+          data[formId],
+          datasetUtils,
+          data.companyStructure?.entityType,
+          isCountryOfGoverningLawEnabled
+        );
+      case "companyStructure":
+        return {
+          entityType: t(
+            ($) => $[companyTypeMetadata[data[formId]?.entityType]?.name],
+            { ns: "business" }
+          )
+        };
+      case "additionalInformation":
+        return formatAdditionalInformation(
+          data[formId],
+          data.basicInformation?.country,
+          data.companyStructure?.entityType
+        );
+      case "companyRegistrationDocument":
+        return {
+          fileName: data[formId].registrationDocument?.[0]?.name,
+          description: data[formId].description
+        };
+      case "companyTaxDocument":
+        return {
+          fileName: data[formId]?.taxDocument?.[0]?.name,
+          description: data[formId].description
+        };
+      case "companyProofOfDirectorDocument":
+        return {
+          fileName: data[formId]?.proofOfDirector?.[0]?.name,
+          description: data[formId].description
+        };
+      case "companyProofOfSignatoryDocument":
+        return {
+          fileName: data[formId]?.proofOfSignatory?.[0]?.name,
+          description: data[formId].description
+        };
+      case "companyProofOfOwnershipDocument":
+        return {
+          fileName: data[formId].proofOfOwnership?.map((doc) => doc.name).join("\n"),
+          description: data[formId].description
+        };
+      case "companyFinancialInformation":
+        return formatFinancialInformationSummary(
+          data[formId],
+          language,
+          data.basicInformation?.country,
+          data.additionalInformation?.dateOfIncorporation
+        );
+      default:
+        return {};
+    }
+  };
+  const translateAndFilterMappedSummary = (data2) => {
+    const tmp = [];
+    for (const summaryItem in data2) {
+      const item = createStructuredListItem(
+        summaryItem,
+        data2[summaryItem],
+        t
+      );
+      if (item) tmp.push(item);
+    }
+    return tmp;
+  };
+  const summarySections = [];
+  for (const form of forms) {
+    if (OMITTED_FORMS.includes(form.formId)) continue;
+    const summaryItems = translateAndFilterMappedSummary(
+      getSummaryItemsForForm(form.formId)
+    );
+    if (summaryItems.length > 0) {
+      summarySections.push({
+        formId: form.formId,
+        label: t(($) => $[form.formName], { ns: "common" }),
+        items: summaryItems
+      });
+    }
+    if (form.formId === "additionalInformation") {
+      const registrationAddressSummaryItems = translateAndFilterMappedSummary(
+        formatAddress(
+          data.additionalInformation?.registrationAddress,
+          datasetUtils,
+          data.basicInformation?.country
+        )
+      );
+      if (registrationAddressSummaryItems.length > 0) {
+        summarySections.push({
+          formId: "registrationAddress",
+          label: t(($) => $["registrationAddress"], { ns: "common" }),
+          items: registrationAddressSummaryItems
+        });
+      }
+      if (data[form.formId]?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME) {
+        const operationalAddressSummaryItems = translateAndFilterMappedSummary(
+          formatAddress(
+            data.additionalInformation?.operationalAddress,
+            datasetUtils,
+            data.basicInformation?.country
+          )
+        );
+        if (operationalAddressSummaryItems.length > 0) {
+          summarySections.push({
+            formId: "operationAddress",
+            label: t(($) => $["operationalAddress"], { ns: "common" }),
+            items: operationalAddressSummaryItems
+          });
+        }
+      }
+    }
+  }
+  return summarySections;
 };
 const adjustFormData = (oldFormData, newFormData) => {
   const schema = Array.from((/* @__PURE__ */ new Set([...keysOf(oldFormData), ...keysOf(newFormData)])).keys());
@@ -3752,34 +4042,6 @@ const setRemovedFieldsOnSchemaToDeletedValue = (newData, existingData) => {
     return { ...adjusted, [formId]: adjustFormData(oldFormData, newFormData) };
   }, {});
 };
-const formatFinancialInformationSummary = (data, language, country, dateOfIncorporation) => {
-  let summary;
-  if (!data) return void 0;
-  if (dateOfIncorporation && !isDateOlderThanAYear(dateOfIncorporation)) {
-    if (country === CountryCodes.UnitedKingdom) {
-      summary = { numberOfEmployees: `${data.numberOfEmployees}` };
-      return summary;
-    }
-    return void 0;
-  }
-  summary = {
-    currency: data.currency,
-    financialReportingDate: data.financialReportingDate
-  };
-  if (country === CountryCodes.UnitedKingdom) {
-    summary.numberOfEmployees = `${data.numberOfEmployees}`;
-  }
-  if (data.balanceSheetTotal) {
-    summary.balanceSheetTotal = summaryItem(
-      "balanceSheetTotal",
-      formatCurrency(data.balanceSheetTotal, data.currency, language)
-    );
-  }
-  if (data.annualTurnover) {
-    summary.annualTurnover = formatCurrency(data.annualTurnover, data.currency, language);
-  }
-  return summary;
-};
 const BUSINESS_BANK_ACCOUNT_TAX_ID_COUNTRIES = [
   CountryCodes.Estonia,
   CountryCodes.Finland,
@@ -3920,295 +4182,39 @@ const mapBusinessDetailsSchemaToLegalEntity = (data, accountHolder, isExperiment
       if (typeof data.additionalInformation?.hasDoingBusinessAs !== "undefined") {
         entityObject.doingBusinessAsAbsent = !data.additionalInformation.hasDoingBusinessAs;
       }
-    } else {
-      entityObject.doingBusinessAs = doingBusinessAs || data.basicInformation?.legalCompanyName;
-      delete entityObject.doingBusinessAsAbsent;
-    }
-    if (data.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME && entityObject.principalPlaceOfBusiness) {
-      entityObject.principalPlaceOfBusiness = entityObject.registeredAddress;
-    }
-    const addressLocalizations = mapJpAddressSchemaToAddressLocalizations(
-      data.additionalInformation?.registrationAddress
-    );
-    if (addressLocalizations.length > 0)
-      entityObject.registeredAddress.localization = addressLocalizations;
-    if (entityObject.registeredAddress?.country && entityObject.registeredAddress?.stateOrProvince && !COUNTRIES_WITH_STATES_DATASET.includes(entityObject.registeredAddress?.country)) {
-      entityObject.registeredAddress.stateOrProvince = "";
-    }
-    if (!isEmpty$1(data.companyFinancialInformation)) {
-      const isIncorporationDateDependencyEnabled = isExperimentEnabled(
-        "EnableIncorporationDateBasedFinancialValidationForHO"
-      );
-      entityObject.financialReports = [
-        mapFinancialInformationToFinancialReport(
-          data.companyFinancialInformation,
-          isIncorporationDateDependencyEnabled ? data.additionalInformation?.dateOfIncorporation : void 0
-        )
-      ];
-    }
-  }
-  requestObj.type = requestObj.organization ? LegalEntityTypes.ORGANIZATION : LegalEntityTypes.SOLE_PROPRIETORSHIP;
-  if (entityObject?.registeredAddress.country === "US") {
-    delete entityObject.registrationNumber;
-  }
-  if (!canSaveRegNumberAbsentState) {
-    delete requestObj.organization?.registrationNumberAbsent;
-  }
-  return requestObj;
-};
-function buildRequiredForms({
-  config: {
-    forms,
-    requiredFields,
-    optionalFields,
-    isValid,
-    problems,
-    isSettingEnabled,
-    accountHolder,
-    legalEntityResponse
-  },
-  options
-}) {
-  const skipCompanyStructure = !!verifiedBusiness.value?.legalForm || isSettingEnabled(SettingNames.AllowLegalEntityTypeChange) && organizationTypesToSkipCompanyStructureForm.includes(
-    legalEntityResponse.organization?.type ?? ""
-  ) && accountHolder !== "aTrust" && accountHolder !== "anUnincorporatedPartnership";
-  const filteredForms = Object.values(forms).filter(({ formId }) => {
-    if (formId === "businessSelection") {
-      if (options?.hasNoSearchResults || isVerifiedSingleCompanySearchResult.value) return false;
-    }
-    if (formId === "companyStructure") {
-      if (skipCompanyStructure) return false;
-    }
-    if (requiredFields || optionalFields) {
-      return Boolean(requiredFields?.[formId]) || Boolean(optionalFields?.[formId]);
-    }
-    return true;
-  });
-  const requiredForms = options?.skipSummary ? filteredForms : [...filteredForms, summaryStep];
-  return addValidityToForms(requiredForms, isValid, problems);
-}
-const isDocumentsRequired = (forms) => forms.some((form) => documentFormsIds.includes(form.formId));
-const formatBasicInformation = (data, datasetUtils, companyType, isCountryOfGoverningLawEnabled) => {
-  const country = data.country;
-  const registrationNumberLabel = resolveFieldMetadata(
-    registrationNumberDefaultFieldConfig[country],
-    {
-      companyType,
-      registrationNumberType: data.registrationNumber ? inferCompanyRegistrationNumberType(data.registrationNumber, country, companyType) : getCompanyRegistrationNumberOptions(country, companyType)?.[0]?.id
-    },
-    registrationNumberDefaultFieldMetadata
-  ).label;
-  const taxIdLabel = resolveFieldMetadata(
-    taxInformationDefaultFieldConfig[country],
-    {
-      taxIdNumberType: countryToTaxInfoTypeMap[country] ?? void 0,
-      // TODO use type selector
-      companyType: void 0
-    },
-    taxInformationDefaultFieldMetadata
-  ).label;
-  const countryOfGoverningLaw = getCountryOfGoverningLaw(isCountryOfGoverningLawEnabled, data);
-  return {
-    ["legalCompanyName"]: data.legalCompanyName,
-    country: datasetUtils.getCountryName(data.country),
-    [getKeyForField("stateOrProvince", data.country)]: datasetUtils.getStateName(
-      data.stateOrProvince,
-      data.country
-    ),
-    [taxIdLabel]: data.taxInformation?.find((taxId) => data.country === taxId.country)?.number,
-    [registrationNumberLabel]: data.registrationNumber,
-    countryOfGoverningLaw: datasetUtils.getCountryName(countryOfGoverningLaw)
-  };
-};
-const formatAdditionalInformation = (data, country, companyType, t) => {
-  const registrationNumberLabel = resolveFieldMetadata(
-    registrationNumberDefaultFieldConfig[country],
-    {
-      companyType,
-      registrationNumberType: data.registrationNumber ? inferCompanyRegistrationNumberType(data.registrationNumber, country, companyType) : getCompanyRegistrationNumberOptions(country, companyType)?.[0]?.id
-    },
-    registrationNumberDefaultFieldMetadata
-  ).label;
-  const taxIdLabel = resolveFieldMetadata(
-    taxInformationDefaultFieldConfig[country],
-    {
-      taxIdNumberType: countryToTaxInfoTypeMap[country] ?? void 0,
-      // TODO use type selector
-      companyType: void 0
-    },
-    taxInformationDefaultFieldMetadata
-  ).label;
-  return {
-    ["businessStructure"]: data.legalFormLabel,
-    ["doingBusinessAs"]: data.doingBusinessAs,
-    ["industry"]: data.industryCodes?.[0].name,
-    [registrationNumberLabel]: data.registrationNumber,
-    [taxIdLabel]: data.isUen ? void 0 : data.taxInformation?.find((taxId) => country === taxId.country)?.number,
-    ["vatNumber"]: data.vatNumber,
-    ["vatAbsenceReason"]: data.vatAbsenceReason ? t(($) => $[data.vatAbsenceReason], { ns: "common" }) : void 0,
-    ["dateOfIncorporation"]: data.dateOfIncorporation,
-    ["stockExchangeMIC"]: data.stockExchangeMIC,
-    ["stockISIN"]: data.stockISIN,
-    ["stockTickerSymbol"]: data.stockTickerSymbol,
-    ["eInvoicingCode"]: data.eInvoicingCode
-  };
-};
-const formatDataForSummary = (data, forms, t, language, isExperimentEnabled, version) => {
-  const datasetUtils = datasetUtilities(language);
-  return entriesOf(data).reduce((summaryData, [form]) => {
-    if (!data[form]) return summaryData;
-    const isCountryOfGoverningLawEnabled = isExperimentEnabled(
-      "EnableCountryOfGoverningLawForUKCompanies"
-    );
-    switch (form) {
-      case "basicInformation":
-        return {
-          ...summaryData,
-          [form]: formatBasicInformation(
-            data[form],
-            datasetUtils,
-            data.companyStructure?.entityType,
-            isCountryOfGoverningLawEnabled
-          )
-        };
-      case "companyStructure":
-        return {
-          ...summaryData,
-          [form]: {
-            entityType: t(
-              ($) => $[companyTypeMetadata[data["companyStructure"]?.entityType]?.name],
-              {
-                ns: "business"
-              }
-            )
-          }
-        };
-      case "additionalInformation":
-        return {
-          ...summaryData,
-          [form]: {
-            hasInnerForms: true,
-            additionalInformationFormName: formatAdditionalInformation(
-              data[form],
-              data.basicInformation?.country,
-              data.companyStructure?.entityType,
-              t
-            ),
-            registrationAddress: data.basicInformation?.country === CountryCodes.Japan && version === 4 ? mapJpAddressSummary(data[form].registrationAddress, datasetUtils) : mapAddressLabels(data[form].registrationAddress, datasetUtils),
-            operationalAddress: data[form].operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME ? data.basicInformation?.country === CountryCodes.Japan && version === 4 ? mapJpAddressSummary(data[form].operationalAddress, datasetUtils) : mapAddressLabels(data[form].operationalAddress, datasetUtils) : void 0
-          }
-        };
-      case "companyRegistrationDocument":
-        if (!isDocumentsRequired(forms)) return summaryData;
-        return {
-          ...summaryData,
-          [form]: {
-            companyRegistrationDocument: {
-              fileName: data[form].registrationDocument?.[0]?.name,
-              description: data[form].description
-            }
-          }
-        };
-      case "companyTaxDocument":
-        if (!isDocumentsRequired(forms)) return summaryData;
-        return {
-          ...summaryData,
-          [form]: {
-            companyTaxDocument: {
-              fileName: data[form].taxDocument?.[0]?.name,
-              description: data[form].description
-            }
-          }
-        };
-      case "companyProofOfDirectorDocument":
-        if (!isDocumentsRequired(forms)) return summaryData;
-        return {
-          ...summaryData,
-          [form]: {
-            companyProofOfDirectorDocument: {
-              fileName: data[form].proofOfDirector?.[0]?.name,
-              description: data[form].description
-            }
-          }
-        };
-      case "companyProofOfSignatoryDocument":
-        if (!isDocumentsRequired(forms)) return summaryData;
-        return {
-          ...summaryData,
-          [form]: {
-            companyProofOfSignatoryDocument: {
-              fileName: data[form].proofOfSignatory?.[0]?.name,
-              description: data[form].description
-            }
-          }
-        };
-      case "companyProofOfOwnershipDocument":
-        if (!isDocumentsRequired(forms)) return summaryData;
-        return {
-          ...summaryData,
-          [form]: {
-            companyProofOfOwnershipDocument: {
-              fileName: data[form].proofOfOwnership?.map((doc) => doc.name).join("\n"),
-              description: data[form].description
-            }
-          }
-        };
-      case "companyFinancialInformation": {
-        const isIncorporationDateDependencyEnabled = isExperimentEnabled(
-          "EnableIncorporationDateBasedFinancialValidationForHO"
-        );
-        return {
-          ...summaryData,
-          [form]: formatFinancialInformationSummary(
-            data[form],
-            language,
-            data.basicInformation?.country,
-            isIncorporationDateDependencyEnabled ? data.additionalInformation?.dateOfIncorporation : void 0
-          )
-        };
-      }
-      default:
-        return summaryData;
-    }
-  }, {});
-};
-async function submitDocuments({
-  data,
-  legalEntity,
-  forms,
-  documentUtils,
-  userEvents
-}) {
-  if (!isDocumentsRequired(forms)) return;
-  const logger2 = createLogger();
-  const formattedDocument = await mapBusinessDetailsDocumentToApiDocument(data, legalEntity.id);
-  formattedDocument.forEach((doc) => {
-    const existingDoc = getDocument(legalEntity.id, doc.type);
-    if (doc.type === "proofOfOwnership" && existingDoc && doc.attachments?.length) {
-      doc.attachments = mergeProofOfOwnershipAttachments(
-        existingDoc.attachments,
-        doc.attachments
-      ).filter((attachment) => attachment.pageName);
+    } else {
+      entityObject.doingBusinessAs = doingBusinessAs || data.basicInformation?.legalCompanyName;
+      delete entityObject.doingBusinessAsAbsent;
+    }
+    if (data.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME && entityObject.principalPlaceOfBusiness) {
+      entityObject.principalPlaceOfBusiness = entityObject.registeredAddress;
+    }
+    const addressLocalizations = mapJpAddressSchemaToAddressLocalizations(
+      data.additionalInformation?.registrationAddress
+    );
+    if (addressLocalizations.length > 0)
+      entityObject.registeredAddress.localization = addressLocalizations;
+    if (entityObject.registeredAddress?.country && entityObject.registeredAddress?.stateOrProvince && !COUNTRIES_WITH_STATES_DATASET.includes(entityObject.registeredAddress?.country)) {
+      entityObject.registeredAddress.stateOrProvince = "";
+    }
+    if (!isEmpty$1(data.companyFinancialInformation)) {
+      entityObject.financialReports = [
+        mapFinancialInformationToFinancialReport(
+          data.companyFinancialInformation,
+          data.additionalInformation?.dateOfIncorporation
+        )
+      ];
     }
-  });
-  try {
-    await documentUtils.uploadDocuments(formattedDocument, legalEntity.id);
-    formattedDocument.forEach((doc) => {
-      userEvents.addTaskEvent("Success", {
-        actionType: "upload",
-        documentType: doc.type,
-        fileExtention: doc.attachments?.map((item) => getFileExtention(item.pageName)).filter((item) => item !== void 0) ?? []
-      });
-    });
-  } catch (err) {
-    logger2.error(err);
-    userEvents.addTaskEvent("Encountered error", {
-      actionType: "upload",
-      returnType: err.errorCode,
-      returnValue: err.title ?? err.message
-    });
   }
-}
+  requestObj.type = requestObj.organization ? LegalEntityTypes.ORGANIZATION : LegalEntityTypes.SOLE_PROPRIETORSHIP;
+  if (entityObject?.registeredAddress.country === "US") {
+    delete entityObject.registrationNumber;
+  }
+  if (!canSaveRegNumberAbsentState) {
+    delete requestObj.organization?.registrationNumberAbsent;
+  }
+  return requestObj;
+};
 async function submit({
   data,
   legalEntityResponse,
@@ -4232,7 +4238,8 @@ async function submit({
   efpBusinessLines,
   createBusinessLine,
   updateBusinessLine,
-  matchingScenario
+  matchingScenario,
+  invalidateRootLegalEntity
 }) {
   const logger2 = createLogger();
   setLoadingStatus("loading");
@@ -4277,7 +4284,8 @@ async function submit({
       const newRoles = nestedLegalEntityDetails2.roles;
       const rolesChanged = !doArraysMatch(existingRoles, newRoles);
       if (rolesChanged) {
-        const updatedAssociations = {
+        await handleUpdateLegalEntity({
+          id: associatedLegalArrangement2.id,
           entityAssociations: [
             ...newRoles.map((role) => ({
               type: role,
@@ -4285,10 +4293,6 @@ async function submit({
             })),
             ...existingEntityAssociations.filter((ea) => ea.legalEntityId !== legalEntity.id)
           ]
-        };
-        await handleUpdateLegalEntity({
-          ...updatedAssociations,
-          id: associatedLegalArrangement2.id
         });
       }
       return;
@@ -4327,79 +4331,6 @@ async function submit({
       delete filteredData.basicInformation.countryOfGoverningLaw;
     }
   }
-  const primaryIndustryCode = data.additionalInformation?.industryCodes && data.additionalInformation.industryCodes[0].id;
-  if (createBusinessLine && updateBusinessLine && primaryIndustryCode) {
-    const bankingBusinessLines = [];
-    const issuingBusinessLines = [];
-    if (efpBusinessLines) {
-      for (const bl of efpBusinessLines) {
-        if (bl.service === "banking") bankingBusinessLines.push(bl);
-        else issuingBusinessLines.push(bl);
-      }
-    }
-    const promises = [];
-    const operations = [];
-    const updateOrCreateBusinessLinesIfNeeded = (businessLines, requestedCapability, service) => {
-      if (businessLines.length) {
-        for (const bl of businessLines) {
-          if (bl.industryCode === primaryIndustryCode) continue;
-          const payload = {
-            id: bl.id,
-            legalEntityId: legalEntityResponse.id,
-            industryCode: primaryIndustryCode,
-            service
-          };
-          promises.push(updateBusinessLine(payload));
-          operations.push(payload);
-        }
-      } else if (requestedCapability) {
-        const payload = {
-          legalEntityId: legalEntityResponse.id,
-          industryCode: primaryIndustryCode,
-          service
-        };
-        promises.push(createBusinessLine(payload));
-        operations.push(payload);
-      }
-    };
-    updateOrCreateBusinessLinesIfNeeded(
-      bankingBusinessLines,
-      requestingBanking(legalEntityResponse),
-      "banking"
-    );
-    updateOrCreateBusinessLinesIfNeeded(
-      issuingBusinessLines,
-      requestingIssuing(legalEntityResponse),
-      "issuing"
-    );
-    let hadRejection = false;
-    (await Promise.allSettled(promises)).forEach((result, idx) => {
-      if (result.status !== "rejected") return;
-      const op = operations[idx];
-      logger2.log(
-        `Failed to ${op.id ? "update" : "create"} business line with payload: ${JSON.stringify(op)}`
-      );
-      hadRejection = true;
-    });
-    const eventPayload = {
-      actionType: trackingPayload.actionType,
-      legalEntityName: trackingPayload.legalEntityName
-    };
-    if (!hadRejection) {
-      userEvents.addTaskEvent("Success", eventPayload);
-    } else {
-      userEvents.addTaskEvent("Encountered error", {
-        ...eventPayload,
-        returnType: "businessLines",
-        returnValue: "couldNotCreateOrUpdateBusinessLine"
-      });
-      showToast({
-        label: t(($) => $["failedToUpdateEfpBusinessLines"], { ns: "business" }),
-        variant: "error"
-      });
-      return setLoadingStatus("success");
-    }
-  }
   try {
     const mappedLegalEntity = {
       ...mapBusinessDetailsSchemaToLegalEntity(
@@ -4437,11 +4368,23 @@ async function submit({
       forms,
       userEvents
     });
+    await submitBusinessLines({
+      data,
+      legalEntity,
+      trackingPayload,
+      efpBusinessLines,
+      createBusinessLine,
+      updateBusinessLine,
+      t,
+      showToast,
+      userEvents
+    });
     userEvents.addTaskEvent("Success", trackingPayload);
     showToast({
       label: t(($) => $["successfullyUpdatedDetails"], { ns: "common" }),
       variant: "success"
     });
+    await invalidateRootLegalEntity();
     onExternalSubmit?.(data);
   } catch (err) {
     if (isValidationError(err)) {
@@ -4488,12 +4431,127 @@ async function submit({
     setLoadingStatus("success");
   }
 }
-const getCountryOfGoverningLaw = (isCountryOfGoverningLawEnabled, basicData) => {
-  if (!isCountryOfGoverningLawEnabled || basicData?.country !== CountryCodes.UnitedKingdom) {
-    return void 0;
+async function submitDocuments({
+  data,
+  legalEntity,
+  forms,
+  documentUtils,
+  userEvents
+}) {
+  if (!isDocumentsRequired(forms)) return;
+  const logger2 = createLogger();
+  const formattedDocument = await mapBusinessDetailsDocumentToApiDocument(data, legalEntity.id);
+  formattedDocument.forEach((doc) => {
+    const existingDoc = getDocument(legalEntity.id, doc.type);
+    if (doc.type === "proofOfOwnership" && existingDoc && doc.attachments?.length) {
+      doc.attachments = mergeProofOfOwnershipAttachments(
+        existingDoc.attachments,
+        doc.attachments
+      ).filter((attachment) => attachment.pageName);
+    }
+  });
+  try {
+    await documentUtils.uploadDocuments(formattedDocument, legalEntity.id);
+    formattedDocument.forEach((doc) => {
+      userEvents.addTaskEvent("Success", {
+        actionType: "upload",
+        documentType: doc.type,
+        fileExtention: doc.attachments?.map((item) => getFileExtention(item.pageName)).filter((item) => item !== void 0) ?? []
+      });
+    });
+  } catch (err) {
+    logger2.error(err);
+    userEvents.addTaskEvent("Encountered error", {
+      actionType: "upload",
+      returnType: err.errorCode,
+      returnValue: err.title ?? err.message
+    });
   }
-  return !basicData.countryOfGoverningLaw ? CountryCodes.UnitedKingdom : basicData.countryOfGoverningLaw;
-};
+}
+async function submitBusinessLines({
+  data,
+  legalEntity,
+  efpBusinessLines,
+  createBusinessLine,
+  updateBusinessLine,
+  trackingPayload,
+  userEvents,
+  t,
+  showToast
+}) {
+  const primaryIndustryCode = data.additionalInformation?.industryCodes && data.additionalInformation.industryCodes[0].id;
+  if (!primaryIndustryCode || !createBusinessLine || !updateBusinessLine) return;
+  const logger2 = createLogger();
+  const bankingBusinessLines = [];
+  const issuingBusinessLines = [];
+  if (efpBusinessLines) {
+    for (const bl of efpBusinessLines) {
+      if (bl.service === "banking") bankingBusinessLines.push(bl);
+      else issuingBusinessLines.push(bl);
+    }
+  }
+  const promises = [];
+  const operations = [];
+  const updateOrCreateBusinessLinesIfNeeded = (businessLines, requestedCapability, service) => {
+    if (businessLines.length) {
+      for (const bl of businessLines) {
+        if (bl.industryCode === primaryIndustryCode) continue;
+        const payload = {
+          id: bl.id,
+          legalEntityId: legalEntity.id,
+          industryCode: primaryIndustryCode,
+          service
+        };
+        promises.push(updateBusinessLine(payload));
+        operations.push(payload);
+      }
+    } else if (requestedCapability) {
+      const payload = {
+        legalEntityId: legalEntity.id,
+        industryCode: primaryIndustryCode,
+        service
+      };
+      promises.push(createBusinessLine(payload));
+      operations.push(payload);
+    }
+  };
+  updateOrCreateBusinessLinesIfNeeded(
+    bankingBusinessLines,
+    requestingBanking(legalEntity),
+    "banking"
+  );
+  updateOrCreateBusinessLinesIfNeeded(
+    issuingBusinessLines,
+    requestingIssuing(legalEntity),
+    "issuing"
+  );
+  let hadRejection = false;
+  (await Promise.allSettled(promises)).forEach((result, idx) => {
+    if (result.status !== "rejected") return;
+    const op = operations[idx];
+    logger2.log(
+      `Failed to ${op.id ? "update" : "create"} business line with payload: ${JSON.stringify(op)}`
+    );
+    hadRejection = true;
+  });
+  const eventPayload = {
+    actionType: trackingPayload.actionType,
+    legalEntityName: trackingPayload.legalEntityName
+  };
+  if (!hadRejection) {
+    userEvents.addTaskEvent("Success", eventPayload);
+  } else {
+    userEvents.addTaskEvent("Encountered error", {
+      ...eventPayload,
+      returnType: "businessLines",
+      returnValue: "couldNotCreateOrUpdateBusinessLine"
+    });
+    showToast({
+      label: t(($) => $["failedToUpdateEfpBusinessLines"], { ns: "business" }),
+      variant: "error"
+    });
+  }
+}
 const determineCustomerSupport = (customerSupport, country) => {
   switch (country) {
     case CountryCodes.Japan:
@@ -4508,6 +4566,84 @@ const unsetCustomerSupportNumber = (customerSupport) => {
     phone: { number: "", type: "mobile" }
   } : void 0;
 };
+const businessDetailsBase = {
+  /* Base required fields */
+  country: { rule: "REQUIRED" },
+  entityType: { rule: "businessRequiresCompanyType" },
+  legalCompanyName: { rule: "REQUIRED" },
+  jaHaniLegalCompanyName: { rule: "japaneseLegalCompanyName" },
+  jaKanaLegalCompanyName: { rule: "japaneseLegalCompanyName" },
+  hasDoingBusinessAs: { rule: "REQUIRED" },
+  doingBusinessAs: { rule: "requireDoingBusinessAsName" },
+  registrationAddress: { rule: "REQUIRED" },
+  operationalAddressIsSame: { rule: "REQUIRED" },
+  /* Base optional fields */
+  operationalAddress: { rule: "OPTIONAL" },
+  /* Fields with custom country specific rules */
+  hasSelectedBusiness: { rule: "usingCompanySearch" },
+  stockExchangeMIC: { rule: "ifPubliclyTradedCompany" },
+  stockISIN: { rule: "ifPubliclyTradedCompany" },
+  stockTickerSymbol: { rule: "ifPubliclyTradedCompany" },
+  dateOfIncorporation: { rule: "isDateOfIncorporationRequired" },
+  stateOrProvince: { rule: "usingCompanySearch" },
+  registrationNumber: { rule: "countryRequiresRegistrationNumber" },
+  registrationNumberType: { rule: "registrationNumberType" },
+  exemptedFromRegistrationNumber: { rule: "companyRegistrationNumberExemptionAllowed" },
+  eInvoicingCode: { rule: "isEInvoicingCodeEnabled" },
+  countryOfGoverningLaw: { rule: "countryOfGoverningLawRequired" },
+  taxDocument: { rule: "ifCountryUsAndTinFailed" },
+  /* Fields derived from capabilities */
+  industryCodes: { rule: "isIndustryCodeRequired" }
+};
+const taxInformationBase = {
+  vatNumber: { rule: "countryUsesVat" },
+  vatNumberType: { rule: "vatNumberType" },
+  exemptedFromVat: { rule: "isVatExempt" },
+  vatAbsenceReason: { rule: "isVatExempt" },
+  taxInformation: { rule: "countryUsesTaxId" },
+  exemptedFromTax: { rule: "countryHasTaxExemptions" },
+  isUen: { rule: "countryUsesUenOrGst" }
+};
+const financialInformationBase = {
+  numberOfEmployees: { rule: "countryRequiresFinancialInformation" },
+  financialReportingDate: { rule: "isFinancialReportingFieldsRequired" },
+  currency: { rule: "isFinancialReportingFieldsRequired" },
+  reportedValueOption: { rule: "isFinancialReportingFieldsRequired" },
+  annualTurnover: { rule: "annualTurnoverRequired" },
+  balanceSheetTotal: { rule: "balanceSheetTotalRequired" }
+};
+const businessDetailsFieldsPerScenario = {
+  L0: {
+    country: { rule: "REQUIRED" },
+    legalCompanyName: { rule: "REQUIRED" },
+    stateOrProvince: { rule: "usingCompanySearch" },
+    ...financialInformationBase
+  },
+  L1: {
+    ...businessDetailsBase,
+    ...financialInformationBase
+  },
+  // L for org is basically L_TAXINFO for Individuals (we will fix this in the near future
+  // to make them aligned and less confusing)
+  L: {
+    ...businessDetailsBase,
+    ...taxInformationBase,
+    ...financialInformationBase
+  },
+  L_PROOFOFADDRESS: {
+    // TODO this field does not exist
+    // proofOfAddressDocument: { rule: 'REQUIRED' },
+  },
+  L_REGDOC: {
+    registrationDocument: { rule: "REQUIRED" }
+  },
+  L_TAXDOC: {
+    taxDocument: { rule: "REQUIRED" }
+  },
+  L_BAFIN: {
+    legalForm: { rule: "REQUIRED" }
+  }
+};
 const CountryFieldValidation = () => ({
   country: {
     modes: ["blur"],
@@ -4643,6 +4779,7 @@ function BusinessDetailsDropin({
   const { accountHolder, setAccountHolder } = useAccountHolder();
   const { mutateAsync: createLegalEntity } = useCreateLegalEntity();
   const { mutateAsync: updateLegalEntity } = useUpdateLegalEntity();
+  const invalidateRootLegalEntity = useInvalidateRootLegalEntity();
   const logger2 = createLogger();
   const isSoleProp = accountHolder === "mySoleProprietorName";
   const isAssociationTaskType = taskType !== TaskTypes.BUSINESS_DETAILS;
@@ -4659,6 +4796,7 @@ function BusinessDetailsDropin({
     rootLegalEntityId: rootLegalEntityId.value
   });
   const { data: matchingScenario } = useScenarios(country, LegalEntityTypes.ORGANIZATION);
+  const { isAgnosticEndpointEnabled } = useCompanySearchExperiments();
   useEffect(() => {
     userEvents.updateBaseTrackingPayload({ task: taskType });
     userEvents.addTaskEvent("Landed on page", {
@@ -4751,6 +4889,7 @@ function BusinessDetailsDropin({
   const customRules = useMemo(
     () => rules({
       data: multiForm.data,
+      defaultData,
       country,
       taskType,
       isExperimentEnabled,
@@ -4761,6 +4900,7 @@ function BusinessDetailsDropin({
     }),
     [
       multiForm.data,
+      defaultData,
       matchingScenario,
       country,
       taskType,
@@ -4827,7 +4967,9 @@ function BusinessDetailsDropin({
     })
   );
   const updateForms = useCallback(
-    ({ searchResults }) => {
+    ({
+      searchResults
+    }) => {
       const updatedForms = buildRequiredForms({
         config: {
           forms: defaultForms,
@@ -4857,10 +4999,6 @@ function BusinessDetailsDropin({
       legalEntityResponse
     ]
   );
-  const summaryData = useMemo(
-    () => formatDataForSummary(multiForm.data, forms, t, i18n.language, isExperimentEnabled),
-    [multiForm.data, forms, t, i18n.language, isExperimentEnabled]
-  );
   const { mutateAsync: createBusinessLine } = useCreateBusinessLine();
   const { mutateAsync: updateBusinessLine } = useUpdateBusinessLine();
   const submitTask = useCallback(() => {
@@ -4888,7 +5026,8 @@ function BusinessDetailsDropin({
       efpBusinessLines,
       createBusinessLine,
       updateBusinessLine,
-      matchingScenario
+      matchingScenario,
+      invalidateRootLegalEntity
     });
   }, [
     setAccountHolder,
@@ -4912,7 +5051,8 @@ function BusinessDetailsDropin({
     efpBusinessLines,
     createBusinessLine,
     updateBusinessLine,
-    matchingScenario
+    matchingScenario,
+    invalidateRootLegalEntity
   ]);
   const {
     handleNextClick,
@@ -4957,7 +5097,7 @@ function BusinessDetailsDropin({
   useEffect(() => {
     if (!searchingCompanies && companySearchResponse?.results) {
       userEvents.addPageEvent("Success", {
-        actionType: "submit",
+        actionType: "resolve",
         returnValue: "companySearch",
         additionalData: {
           numberOfResults: companySearchResponse.results.length
@@ -4978,10 +5118,6 @@ function BusinessDetailsDropin({
       return handleNextClick(currentForms);
     }
     try {
-      userEvents.addPageEvent("Triggered async operation", {
-        actionType: "start",
-        returnValue: "companySearch"
-      });
       setLoadingStatus("loading");
       tinMatched.value = void 0;
       verifiedBusiness.value = void 0;
@@ -5010,12 +5146,23 @@ function BusinessDetailsDropin({
         const companySelectionResponse = await handleCompanySelection(
           rootLegalEntityId.peek(),
           baseUrl.peek(),
-          { ...companySelectionInput, company: searchResponse.results[0] }
+          {
+            ...companySelectionInput,
+            ...isAgnosticEndpointEnabled ? {
+              id: searchResponse.results[0].resultId
+            } : { company: searchResponse.results[0] }
+          },
+          isAgnosticEndpointEnabled
         );
         if (handleTinResponse(!!companySelectionResponse.tinMatched)) {
           verifiedBusiness.value = companySelectionResponse;
           isVerifiedSingleCompanySearchResult.value = true;
-          applyVerifiedBusinessData(multiForm, country, verifiedBusiness.peek());
+          applyVerifiedBusinessData(
+            multiForm,
+            country,
+            verifiedBusiness.peek(),
+            isAgnosticEndpointEnabled
+          );
           currentForms = updateForms({ searchResults: searchResponse.results });
         } else {
           return setLoadingStatus("success");
@@ -5062,18 +5209,44 @@ function BusinessDetailsDropin({
       searchResults: searchingError ? [] : companySearchResponse?.results
     });
   }, [updateForms, companySearchResponse?.results, searchingError]);
+  const summarySections = useMemo(() => {
+    if (activeForm.formId !== "summary") return [];
+    return formatDataForSummary(multiForm.data, forms, t, i18n.language, isExperimentEnabled);
+  }, [multiForm.data, forms, t, i18n.language, isExperimentEnabled, activeForm]);
+  const handleEditForm = (formId) => {
+    const formIdx = forms.findIndex((form) => form.formId === formId);
+    if (formIdx > -1) {
+      gotoFormByFormIndex(formIdx);
+    }
+  };
+  const allValidationErrors = {};
+  for (const form in problems.validationErrors) {
+    for (const validationError in problems.validationErrors[form]) {
+      allValidationErrors[validationError] = problems.validationErrors[form][validationError];
+    }
+  }
+  const allVerificationErrors = {};
+  for (const form in problems.verificationErrors) {
+    for (const verificationError in problems.verificationErrors[form]) {
+      allVerificationErrors[verificationError] = problems.verificationErrors[form][verificationError];
+    }
+  }
   return /* @__PURE__ */ jsx(FormContextProvider, { form: multiForm, children: /* @__PURE__ */ jsxs(
     FormFlow,
     {
-      summary: {
-        data: summaryData,
-        omitted: {
-          keys: ["operationalAddressIsSame"],
-          forms: ["businessSelection"]
-        },
-        problems,
-        showLegalCaption: true
-      },
+      summaryComponent: /* @__PURE__ */ jsxs(NewSummary, { sections: summarySections, handleEditForm, children: [
+        /* @__PURE__ */ jsx(
+          ErrorPanel,
+          {
+            validationErrors: allValidationErrors,
+            verificationErrors: allVerificationErrors,
+            formUtils: createFormUtils({ labels: {} }, t),
+            id: "ariaErrorField",
+            slot: "errorPanel"
+          }
+        ),
+        /* @__PURE__ */ jsx("div", { className: summaryStyles.summaryContentLegalCaption, slot: "extraContent", children: t(($) => $["summaryLegalCaption"]) })
+      ] }),
       asModal,
       currentStep: steps.current,
       totalSteps: steps.total,