@adyen/kyc-components 4.15.0-beta.1 → 4.16.0-beta.0

package/dist/{useBusinessDetailsData-DBmj3nNJ.js → useBusinessDetailsData-C3mDLYw0.js}

@@ -1,9 +1,9 @@
 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] = "9d609f03-7a60-44f2-8369-93b74ca0ab40", e._sentryDebugIdIdentifier = "sentry-dbid-9d609f03-7a60-44f2-8369-93b74ca0ab40");
+	n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "84fca8d7-2add-41ab-9b71-d3923cbf5b45", e._sentryDebugIdIdentifier = "sentry-dbid-84fca8d7-2add-41ab-9b71-d3923cbf5b45");
 } catch (e) {}
 import { i as Typography, o as createLogger, r as useTranslation } from "./translation-BR3rLb4m.js";
-import { E as useAllowedCountries, T as datasetUtilities, at as isUndefinedOrNull, ft as useAccountHolder, j as useToggleContext, k as Header, nt as isEmpty, rt as isISIN, x as Alert } from "./resolveEnvironment-BO-j8Bwm.js";
+import { E as useAllowedCountries, T as datasetUtilities, at as isUndefinedOrNull, ft as useAccountHolder, j as useToggleContext, k as Header, nt as isEmpty, rt as isISIN, x as Alert } from "./resolveEnvironment-l2TGYFxw.js";
 import { r as Loader, t as Button } from "./Button-3qGOI53m.js";
 import { r as httpPost, s as useApiContext } from "./http-DeQp0G69.js";
 import { r as useLegalEntity, t as ROOT_LE } from "./useLegalEntity-BXk2tzGe.js";
@@ -14,7 +14,7 @@ import { t as StackLayout } from "./StackLayout-IUdNMDgW.js";
 import { t as TaskVerificationStatus } from "./TaskVerificationStatus-DTHF8B9j.js";
 import { n as TASK_STATUS_POLLING_INTERVAL_MS } from "./taskStatus-BtekPA8E.js";
 import { t as CountryCodes } from "./country-code-CJk2hdPu.js";
-import { _ as businessDetailsDocumentMapping, f as solePropBusinessDetailsApiKeyMapping, g as businessDetailsComponentsKeyMapping, h as businessDetailsApiKeyMapping, m as solePropBusinessDetailsKeyMapping, p as solePropBusinessDetailsDocumentMapping } from "./processCapabilities-hLmRus8U.js";
+import { _ as businessDetailsKeyMapping, f as solePropBusinessDetailsApiKeyMapping, g as businessDetailsDocumentMapping, h as businessDetailsApiKeyMapping, m as solePropBusinessDetailsKeyMapping, p as solePropBusinessDetailsDocumentMapping } from "./processCapabilities-fPuXc9gL.js";
 import { t as TaskTypes } from "./taskTypes-NawDTp5n.js";
 import { r as filterOutUnwantedAssociationsIfRootLE, s as getOwnEntityAssociations } from "./entityAssociationUtil-C-wflW8q.js";
 import { t as Scenarios } from "./get-scenarios-Bb-paHmJ.js";
@@ -22,35 +22,35 @@ import { t as useBusinessLines } from "./useBusinessLines-B2iCcDej.js";
 import { t as Card } from "./Card-BCGLpdw7.js";
 import { i as useAnalyticsContext, n as ModalContent, r as KEYBOARD_KEYS, t as Modal } from "./Modal-C__-5LgI.js";
 import { t as SettingNames } from "./types-Cwq1JAWT.js";
-import { n as useToastContext, t as useInvalidateRootLegalEntity } from "./invalidateRootLegalEntity-DfF59VHE.js";
+import { n as useToastContext, t as useInvalidateRootLegalEntity } from "./invalidateRootLegalEntity-DUOCxqZR.js";
 import { c as CompanyTypesValues } from "./bafinUtils-BKq-s1Ka.js";
 import { r as LoaderWrapper } from "./utils-BtyrxTzp.js";
 import { t as Confirm } from "./Confirm-6QfuYcA7.js";
 import { t as HandlerContext } from "./HandlerContext-DeMa68z0.js";
 import { t as useScenarios } from "./useScenarios-BRGMIufX.js";
 import { t as useCreateLegalEntity } from "./useCreateLegalEntity-zPjl13U3.js";
-import { t as useUpdateLegalEntity } from "./useUpdateLegalEntity-De_ohp9A.js";
-import { a as defaultFieldMetadata, i as defaultFieldConfig, l as formatAddressForCleanse, n as STATE_FIELD, r as StateField, t as Address, u as useAddressCleanse } from "./Address-ByNnIfrX.js";
-import { i as FormFlow, n as addValidityToForms, o as useFormComposer, s as FormContextProvider, t as useFormContext } from "./useFormContext-D9UmS1Tj.js";
-import { n as composePerScenarioFormConfigurations, r as getPropsFromConfigurations } from "./process-field-configurations-n3ecaPQ8.js";
+import { t as useUpdateLegalEntity } from "./useUpdateLegalEntity-GCDgDdeE.js";
+import { a as defaultFieldMetadata, i as defaultFieldConfig, l as formatAddressForCleanse, n as STATE_FIELD, r as StateField, t as Address, u as useAddressCleanse } from "./Address-BAE2QQ-5.js";
+import { i as FormFlow, n as addValidityToForms, o as useFormComposer, s as FormContextProvider, t as useFormContext } from "./useFormContext-1h2DlUxb.js";
+import { n as composePerScenarioFormConfigurations, r as getPropsFromConfigurations } from "./process-field-configurations-uFcwmzTd.js";
 import { t as StructuredList } from "./StructuredList-CUyo9-3i.js";
-import { t as ErrorPanel } from "./ErrorPanel-CbTDpmpi.js";
+import { t as ErrorPanel } from "./ErrorPanel-B5GuGh_o.js";
 import { n as mergeFieldMetadataIntoProps, t as createFormUtils } from "./formUtils-DVc3a6gf.js";
-import { n as summaryStep, r as Summary_module_default } from "./Summary-8V5EZBd4.js";
-import { t as useMultiForm } from "./useMultiForm-Ch5yvl-v.js";
+import { n as summaryStep, r as Summary_module_default } from "./Summary-CunMdpUq.js";
+import { t as useMultiForm } from "./useMultiForm-C0Mz4Mm6.js";
 import { i as useScenarioConfiguration, r as getPageName, t as mapExistingFile } from "./mapExistingFile-BmyzNoup.js";
 import { t as useTaskLandedEvent } from "./useTaskLandedEvent-Doq80YT8.js";
-import { a as alphanumericInputs, i as alphaInputs, l as numericInputs, s as makeMask, t as MaskedInput } from "./MaskedInput-CPYBS2wP.js";
+import { a as alphanumericInputs, i as alphaInputs, l as numericInputs, s as makeMask, t as MaskedInput } from "./MaskedInput-VtgquqE0.js";
 import { i as mapJpAddressSummaryNewSummary, n as toFullWidth, t as mapJpAddressSchemaToAddressLocalizations } from "./mapJpAddressSchemaToAddressLocalizations-BGLDkUt1.js";
 import { a as mapAddressLabelsNewSummary, c as COUNTRIES_WITH_STATES_DATASET, n as getAddressSchemaLabelsByCountry, r as getKeyForField, t as getAddressSchemaForCountry } from "./utils-DNIZ6F6L.js";
-import { i as isValidationError, n as isBusinessSelectionLegalArrangementError, o as processValidationErrors, s as isMaintenanceModeError } from "./validationError-DqjDv5Q-.js";
+import { i as isValidationError, n as isBusinessSelectionLegalArrangementError, o as processValidationErrors, s as isMaintenanceModeError } from "./validationError-COmWiy16.js";
 import { a as createDocumentRequest, c as getDocuments, f as mergeProofOfOwnershipAttachments, l as getFileExtention, o as documentApiUtils, s as getDocument } from "./validate-B2bZh_uL.js";
 import { r as formatObject } from "./utils-DdHbAadK.js";
-import { a as getFieldsWithExistingData, n as TaxInformationField, r as MemoizedDocumentUpload, t as TAX_INFORMATION_FIELD } from "./TaxInformationField-7C6iLtFs.js";
+import { a as getFieldsWithExistingData, n as TaxInformationField, r as MemoizedDocumentUpload, t as TAX_INFORMATION_FIELD } from "./TaxInformationField-BKnequKz.js";
 import { a as isJapanLocalizationEnabled } from "./Individual.rules-Cc2Uigav.js";
 import { t as uppercase } from "./uppercase-DvjwUM0n.js";
-import { a as validateNotEmptyOnBlur, n as validateJaKanaLegalCompanyName, o as validatePatternOnBlur, t as validateJaHaniLegalCompanyName } from "./patternValidators-Dg_UvQs9.js";
-import { A as taxInformationDefaultFieldMetadata, C as getTaxIdNumberOptions, O as getTaxInformationPlaceholderText, _ as COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_SOLE_PROPS, b as REGISTRATION_NUMBER_EXEMPTION_RULES, c as COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP, d as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, g as COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_COMPANIES, h as COUNTRIES_WITH_POSSIBLE_REGISTRATION_EXEMPTIONS_FOR_SOLE_PROPS, i as COUNTRIES_REQUIRING_E_INVOICING_CODE, k as taxInformationDefaultFieldConfig, l as COUNTRIES_THAT_REQUIRE_DATE_OF_INCORPORATION, m as COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER_SOLE_PROPS, o as COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION, p as COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER, s as COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION, u as COUNTRIES_THAT_USES_UEN_OR_GST, v as COUNTRIES_WITH_POSSIBLE_TRUSTEE_TAXID_ABSENT_V4, w as getValidCompanyTypesForTaxIdNumberType, x as TAX_ID_REQUIRED_COUNTRIES_ORGANIZATION, y as COUNTRY_OF_GOVERNING_LAW_POSSIBLE } from "./utils-ztjLNfgn.js";
+import { a as validateNotEmptyOnBlur, n as validateJaKanaLegalCompanyName, o as validatePatternOnBlur, t as validateJaHaniLegalCompanyName } from "./patternValidators-Bza9mezL.js";
+import { A as taxInformationDefaultFieldMetadata, C as getTaxIdNumberOptions, O as getTaxInformationPlaceholderText, _ as COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_SOLE_PROPS, b as REGISTRATION_NUMBER_EXEMPTION_RULES, c as COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP, d as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, g as COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_COMPANIES, h as COUNTRIES_WITH_POSSIBLE_REGISTRATION_EXEMPTIONS_FOR_SOLE_PROPS, i as COUNTRIES_REQUIRING_E_INVOICING_CODE, k as taxInformationDefaultFieldConfig, l as COUNTRIES_THAT_REQUIRE_DATE_OF_INCORPORATION, m as COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER_SOLE_PROPS, o as COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION, p as COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER, s as COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION, u as COUNTRIES_THAT_USES_UEN_OR_GST, v as COUNTRIES_WITH_POSSIBLE_TRUSTEE_TAXID_ABSENT_V4, w as getValidCompanyTypesForTaxIdNumberType, x as TAX_ID_REQUIRED_COUNTRIES_ORGANIZATION, y as COUNTRY_OF_GOVERNING_LAW_POSSIBLE } from "./utils-Dizf4Xxc.js";
 import { t as resolveFieldMetadata } from "./fieldConfigurations-CZCFghnK.js";
 import { t as Field } from "./Field-DAUlw0M5.js";
 import { t as TileGroup } from "./TileGroup-B8II9Mip.js";
@@ -61,7 +61,7 @@ import { n as convertFullToHalf } from "./TextArea-BvphlYOu.js";
 import { t as Link } from "./Link-C0jrInxa.js";
 import { t as InputText } from "./InputText-B-ebylm4.js";
 import { n as formatDateObj, t as InputDate } from "./InputDate-B_jtgBB5.js";
-import { n as CountryField, t as COUNTRY_FIELD } from "./CountryField-D3T5pszb.js";
+import { n as CountryField, t as COUNTRY_FIELD } from "./CountryField-DSI1tYm2.js";
 import { t as RadioGroup } from "./RadioGroup-CMiBSXCA.js";
 import { t as createFormRules } from "./form-rules-CUUQGacJ.js";
 import { t as isEmpty$1 } from "./isEmpty-BVlBH98t.js";
@@ -69,17 +69,17 @@ import { n as mapApiScriptLocalizationToSchemaFields, r as mapSchemaFieldsToApiS
 import { t as currencyByCountry } from "./types-KjTYEnAG.js";
 import { t as Divider } from "./Divider-BENvVRnz.js";
 import { t as DetailViewLayout } from "./DetailViewLayout-DNCGEd7b.js";
-import { a as LegalFormField, c as getNestedTrustedFields, i as InputCurrency, l as isDateOlderThanAYear, n as Currency, o as mapFinancialReportsToFinancialInformation, r as InputNumber, s as mapFinancialInformationToFinancialReport, t as CURRENCY_FIELD, u as mapAddressData } from "./Currency-C9smd9hj.js";
-import { n as SummarySection, t as NewSummary } from "./NewSummary-Cgebw71K.js";
+import { a as LegalFormField, c as getNestedTrustedFields, i as InputCurrency, l as isDateOlderThanAYear, n as Currency, o as mapFinancialReportsToFinancialInformation, r as InputNumber, s as mapFinancialInformationToFinancialReport, t as CURRENCY_FIELD, u as mapAddressData } from "./Currency-Bfjuo_qU.js";
+import { n as SummarySection, t as NewSummary } from "./NewSummary-CaV_Faij.js";
 import { t as useTaskStatus } from "./useTaskStatus-BLkHjMgm.js";
 import { t as ListItem } from "./ListItem-C_g-4xPP.js";
-import { a as getValidCompanyTypesForRegistrationNumberType, c as getRegistrationNumberHelperText, i as getCompanyRegistrationNumberOptions, l as registrationNumberDefaultFieldConfig, n as getDefaultRegistrationNumberType, r as inferCompanyRegistrationNumberType, s as exemptFromRegistrationNumberDefaultFieldMetadata, u as registrationNumberDefaultFieldMetadata } from "./CompanyRegistrationNumberTypeSelector-B72MvtCt.js";
+import { a as getValidCompanyTypesForRegistrationNumberType, c as getRegistrationNumberHelperText, i as getCompanyRegistrationNumberOptions, l as registrationNumberDefaultFieldConfig, n as getDefaultRegistrationNumberType, r as inferCompanyRegistrationNumberType, s as exemptFromRegistrationNumberDefaultFieldMetadata, u as registrationNumberDefaultFieldMetadata } from "./CompanyRegistrationNumberTypeSelector-CFqyuzoH.js";
 import { n as useCreateBusinessLine, r as useIndustryCodes, t as useUpdateBusinessLine } from "./useUpdateBusinessLines-jlXfi57a.js";
 import { n as formatCurrency } from "./formatCurrency-Cq3WFpdZ.js";
-import { S as BusinessRegistrationNumberField, _ as isFinancialInformationRequired, a as VAT_NUMBER_FIELD, b as isUsingCompanySearch, c as defaultFieldConfig$1, d as doingBusinessAsAbsentFieldMetadata, f as doingBusinessAsFieldMetadata, g as getCountryOfGoverningLaw, h as countryToTaxInfoTypeMap, l as defaultFieldMetadata$1, m as DBA_NAME_FIELD, n as registrationAddressFields, o as VatNumberField, p as DBANameField, r as operationalAddressIsSameIds, s as getDefaultVatNumberType, t as MemoizedConstitutionalDocument, u as vatAbsenceReasonMetadata, v as isRegistrationExemptionAllowed, x as BUSINESS_REGISTRATION_NUMBER_FIELD, y as isRegistrationNumberAbsentStateV4Scenario } from "./ConstitutionalDocument-FDgHtu1v.js";
-import { f as industryCodeFieldMetadata, l as IndustryCodeField, t as INDUSTRY_CODE_FIELD } from "./constants-DvK9RVMD.js";
-import { a as defaultFieldMetadata$2, i as defaultFieldConfigV4, o as defaultFieldMetadataV4, r as defaultFieldConfig$2, s as getLegalCompanyNameGuidanceText, t as LEGAL_COMPANY_NAME_FIELD } from "./LegalCompanyNameField-BxLhDFZ4.js";
-import { s as organizationTypesToSkipCompanyStructureForm } from "./utils-X8YwekZF.js";
+import { S as DBA_NAME_FIELD, _ as defaultFieldMetadata$1, a as isRegistrationNumberAbsentStateV4Scenario, b as doingBusinessAsFieldMetadata, c as BusinessRegistrationNumberField, g as defaultFieldConfig$1, h as getDefaultVatNumberType, i as isRegistrationExemptionAllowed, l as MemoizedConstitutionalDocument, m as VatNumberField, n as getCountryOfGoverningLaw, o as isUsingCompanySearch, p as VAT_NUMBER_FIELD, r as isFinancialInformationRequired, s as BUSINESS_REGISTRATION_NUMBER_FIELD, t as countryToTaxInfoTypeMap, u as registrationAddressFields, v as vatAbsenceReasonMetadata, x as DBANameField, y as doingBusinessAsAbsentFieldMetadata } from "./utils-uuBaXnz-.js";
+import { f as industryCodeFieldMetadata, l as IndustryCodeField, t as INDUSTRY_CODE_FIELD } from "./constants-BMNUJ3-d.js";
+import { a as defaultFieldMetadata$2, i as defaultFieldConfigV4, o as defaultFieldMetadataV4, r as defaultFieldConfig$2, s as getLegalCompanyNameGuidanceText, t as LEGAL_COMPANY_NAME_FIELD } from "./LegalCompanyNameField-B9Cwuyju.js";
+import { s as organizationTypesToSkipCompanyStructureForm } from "./utils-BAgsI56z.js";
 import { Suspense, lazy } from "preact/compat";
 import { useCallback as useCallback$1, useContext as useContext$1, useEffect as useEffect$1, useMemo as useMemo$1, useRef as useRef$1, useState as useState$1 } from "preact/hooks";
 import cx from "classnames";
@@ -175,6 +175,79 @@ var eInvoicingCodeFieldMetadata = {
 		transformOnType: uppercase
 	}
 };
+var legalEntityIdentifierFieldMetadata = {
+	validators: [{
+		modes: ["blur"],
+		validate: (val) => {
+			const isValidLength = val ? val.length === 20 : false;
+			const hasLettersAndNumbers = val ? /[a-zA-Z]/.test(val) && /[0-9]/.test(val) : false;
+			return isValidLength && hasLettersAndNumbers;
+		},
+		errorMessage: {
+			key: "enterNCharactersWithAMixForExample",
+			values: {
+				numChars: "20",
+				example: "529900T8BM49AURSDO55"
+			}
+		}
+	}],
+	mask: {
+		mask: makeMask(...alphanumericInputs(20)),
+		transformOnType: uppercase
+	}
+};
+//#endregion
+//#region src/components/Shared/fields/LegalEntityIdentifierField/LegalEntityIdentifierField.tsx
+var LEGAL_ENTITY_IDENTIFIER_FIELD = ["legalEntityIdentifier", "exemptedFromLegalEntityIdentifier"];
+function LegalEntityIdentifierField({ data, valid, errors, handleChangeFor, canExempt = true }) {
+	const { t } = useTranslation("common");
+	const placeholder = data.exemptedFromLegalEntityIdentifier ? "" : "529900T8BM49AURSDO55";
+	const isExempted = Boolean(data.exemptedFromLegalEntityIdentifier);
+	const handleExemptedChange = (isChecked) => {
+		handleChangeFor("exemptedFromLegalEntityIdentifier", "blur")(isChecked);
+		if (isChecked) handleChangeFor("legalEntityIdentifier", "input")("");
+	};
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(MaskedInput, {
+		type: "text",
+		name: "legalEntityIdentifier",
+		label: t(($) => $["legalEntityIdentifier"]),
+		onInput: handleChangeFor("legalEntityIdentifier", "input"),
+		onBlur: handleChangeFor("legalEntityIdentifier", "blur"),
+		value: data.legalEntityIdentifier ?? "",
+		isValid: Boolean(valid?.legalEntityIdentifier),
+		errorMessage: errors.legalEntityIdentifier,
+		disabled: isExempted,
+		helper: /* @__PURE__ */ jsxs(Typography, {
+			variant: "caption",
+			color: "secondary",
+			children: [
+				t(($) => $["aUniqueIdentifierForGlobalFinancialReporting"]),
+				" ",
+				/* @__PURE__ */ jsx(Link, {
+					href: "https://search.gleif.org/#/search/",
+					external: true,
+					inline: true,
+					children: t(($) => $["lookUpYourLEI"])
+				})
+			]
+		}),
+		helperPosition: "below",
+		persistHelper: true,
+		placeholder,
+		mask: legalEntityIdentifierFieldMetadata.mask?.mask,
+		transformOnType: legalEntityIdentifierFieldMetadata.mask?.transformOnType
+	}), canExempt && /* @__PURE__ */ jsx(Field, {
+		name: "exemptedFromLegalEntityIdentifier",
+		children: (childProps) => /* @__PURE__ */ jsx(Checkbox, {
+			...childProps,
+			name: "exemptedFromLegalEntityIdentifier",
+			value: "exemptedFromLegalEntityIdentifier",
+			checked: isExempted,
+			label: t(($) => $["iDontHaveAnLEI"]),
+			onChange: handleExemptedChange
+		})
+	})] });
+}
 //#endregion
 //#region src/components/Shared/fields/StockExchangeMICField/fieldConfig.ts
 var stockExchangeMICFieldMetadata = {
@@ -427,7 +500,7 @@ function BasicInformation({ id, country, shouldValidate, fieldValidationErrors =
 	const isAllowedEditPrefilledCountry = isSettingEnabled(SettingNames.AllowPrefilledCountryEdit);
 	const state = form.data.basicInformation?.stateOrProvince;
 	const currentCountryTaxInformation = form.data.basicInformation?.taxInformation?.find((tax) => tax.country === country);
-	const handleChangeFor = useCallback$1((fieldName, mode) => form.handleChangeFor(fieldName, "basicInformation", mode), [form]);
+	const handleChangeFor = useCallback$1((fieldName, mode) => form.handleChangeFor("basicInformation", fieldName, mode), [form]);
 	const formUtils = useMemo$1(() => {
 		const initialProps = {
 			data: form.data.basicInformation ?? {},
@@ -580,8 +653,7 @@ function BasicInformation({ id, country, shouldValidate, fieldValidationErrors =
 					registrationNumber: form.data.basicInformation?.registrationNumber,
 					country,
 					entityType: companyType,
-					defaultData: form.defaultData?.basicInformation?.taxInformation,
-					invertCompanyTypeFilter: isFeatureEnabled("EnableUnifiedCompanySearch")
+					defaultData: form.defaultData?.basicInformation?.taxInformation
 				}),
 				showField(BUSINESS_REGISTRATION_NUMBER_FIELD) && /* @__PURE__ */ jsx(BusinessRegistrationNumberField, {
 					data: formUtils.getFieldData(form.data.basicInformation ?? {}, BUSINESS_REGISTRATION_NUMBER_FIELD),
@@ -598,8 +670,7 @@ function BasicInformation({ id, country, shouldValidate, fieldValidationErrors =
 					country,
 					state,
 					canExempt: showField(["exemptedFromRegistrationNumber"]),
-					companyType,
-					invertCompanyTypeFilter: isFeatureEnabled("EnableUnifiedCompanySearch")
+					companyType
 				})
 			] })
 		]
@@ -953,7 +1024,7 @@ function BusinessSelection({ id, country, fieldValidationErrors = EMPTY_OBJ$4, f
 	const { data: selectData, error: selectError, mutateAsync: selectCompany, reset: resetSelectMutationState } = useCompanySelection();
 	const { mutateAsync: clearCompanyData } = useClearCompanyData();
 	const currentTin = form.data.basicInformation?.taxInformation?.find((taxId) => taxId.country === country)?.number;
-	const handleChange = useCallback$1((fieldName, mode) => form.handleChangeFor(fieldName, "businessSelection", mode), [form]);
+	const handleChange = useCallback$1((fieldName, mode) => form.handleChangeFor("businessSelection", fieldName, mode), [form]);
 	/**
 	* This ID is internal to this form, controlling selection for UI & data flow purposes. The
 	* multiform state is used to determine whether the form is set & valid, ready for the user to progress.
@@ -972,7 +1043,7 @@ function BusinessSelection({ id, country, fieldValidationErrors = EMPTY_OBJ$4, f
 	if (!isInitializedRef.current) {
 		if (form.data.businessSelection?.selectedBusinessId) {
 			handleChange("selectedBusinessId", "blur")("");
-			form.setErrors("selectedBusinessId", null, "businessSelection");
+			form.setErrors("businessSelection", "selectedBusinessId", null);
 		}
 		isInitializedRef.current = true;
 	}
@@ -1201,16 +1272,15 @@ function CompanyStructure({ id, country, fieldValidationErrors = EMPTY_OBJ$3, fo
 	const { rootLegalEntityId } = useApiContext();
 	const { data: legalEntity } = useLegalEntity(rootLegalEntityId.value);
 	const { isSettingEnabled } = useSettingsContext();
-	const { isFeatureEnabled } = useToggleContext();
 	const formUtils = createFormUtils({ requiredFields: form.requiredFields?.companyStructure ?? [] }, t);
 	const registrationNumberType = form.data.basicInformation?.registrationNumberType;
 	const taxIdNumberType = form.data.basicInformation?.taxInformation?.find((taxInformation) => taxInformation.country === country)?.type;
 	const registrationNumberExempt = form.data.basicInformation?.exemptedFromRegistrationNumber;
 	const availableCompanyTypeRadioOptions = getAvailableCompanyStructures({
 		country,
-		registrationNumberType: isFeatureEnabled("EnableUnifiedCompanySearch") ? registrationNumberType : void 0,
-		registrationNumberExempt: isFeatureEnabled("EnableUnifiedCompanySearch") ? registrationNumberExempt : void 0,
-		taxIdNumberType: isFeatureEnabled("EnableUnifiedCompanySearch") ? taxIdNumberType : void 0,
+		registrationNumberType,
+		registrationNumberExempt,
+		taxIdNumberType,
 		legalEntity,
 		accountHolder,
 		isSettingEnabled
@@ -1253,7 +1323,7 @@ function CompanyStructure({ id, country, fieldValidationErrors = EMPTY_OBJ$3, fo
 					name: "entityType",
 					tiles: companyTiles,
 					selected: form.data.companyStructure?.entityType ?? "",
-					onChange: (value) => form.handleChangeFor("entityType", "companyStructure")(value),
+					onChange: (value) => form.handleChangeFor("companyStructure", "entityType")(value),
 					isHorizontal: true,
 					"aria-required": true,
 					"aria-invalid": !form.valid.companyStructure?.entityType
@@ -1418,7 +1488,7 @@ function FinancialInformation({ id, country, fieldValidationErrors = EMPTY_OBJ$2
 	const { t } = useTranslation("common");
 	const { form } = useFormContext();
 	const defaultCurrency = currencyByCountry[country]?.[0] ?? "EUR";
-	const handleChangeFor = useCallback$1((fieldName, mode) => form.handleChangeFor(fieldName, "companyFinancialInformation", mode), [form]);
+	const handleChangeFor = useCallback$1((fieldName, mode) => form.handleChangeFor("companyFinancialInformation", fieldName, mode), [form]);
 	const formUtils = useMemo$1(() => createFormUtils({
 		data: form.data.companyFinancialInformation ?? {},
 		fieldValidationErrors,
@@ -1485,6 +1555,36 @@ function FinancialInformation({ id, country, fieldValidationErrors = EMPTY_OBJ$2
 	});
 }
 //#endregion
+//#region src/components/Business/forms/ProofOfAddressDocument/ProofOfAddressDocument.tsx
+var GuidanceContent$5 = ({ t }) => {
+	return /* @__PURE__ */ jsx("div", {
+		className: "adyen-kyc-upload-field__guidance",
+		children: /* @__PURE__ */ jsxs("div", {
+			className: "u-margin-bottom-24",
+			children: [/* @__PURE__ */ jsx("strong", { children: t(($) => $["documentRequirements"], { ns: "common" }) }), /* @__PURE__ */ jsxs("ul", { children: [
+				/* @__PURE__ */ jsx("li", { children: t(($) => $["yourBusinesssLegalName"], { ns: "business" }) }),
+				/* @__PURE__ */ jsx("li", { children: t(($) => $["theCompleteAddress"], { ns: "business" }) }),
+				/* @__PURE__ */ jsx("li", { children: t(($) => $["anIssueDateWithinTheLast12Months"], { ns: "business" }) }),
+				/* @__PURE__ */ jsx("li", { children: t(($) => $["clearReadableText"], { ns: "business" }) })
+			] })]
+		})
+	});
+};
+function ProofOfAddressDocument({ id, country, ...props }) {
+	const { t } = useTranslation(["common", "business"]);
+	return /* @__PURE__ */ jsx(MemoizedDocumentUpload, {
+		...props,
+		id,
+		heading: t(($) => $["uploadProofOfAddress"], { ns: "business" }),
+		description: t(($) => $["toFinishVerifyingYourBusinessWeNeedAnOfficialDocumentThatConfirmsItsAddress"], { ns: "business" }),
+		documentField: "proofOfAddress",
+		documentType: "proofOfAddress",
+		guidanceContent: /* @__PURE__ */ jsx(GuidanceContent$5, { t }),
+		country,
+		hidePageCount: true
+	});
+}
+//#endregion
 //#region src/components/Business/forms/ProofOfDirectorDocument/ProofOfDirectorDocument.tsx
 var documentTypes$2 = [{
 	id: "Internal company document",
@@ -1881,7 +1981,7 @@ function BusinessDetailsMultiform({ taskType, country, activeForm, shouldValidat
 	const { form } = useFormContext();
 	const companyType = taskType === TaskTypes.SOLE_PROPRIETOR_COMPANY ? CompanyTypesValues.SOLE_PROPRIETORSHIP : form.data.companyStructure?.entityType;
 	function handleChange(formName, fieldName, mode) {
-		return form.handleChangeFor(fieldName, formName, mode);
+		return form.handleChangeFor(formName, fieldName, mode);
 	}
 	const renderActiveForm = (activeForm) => {
 		switch (activeForm.formId) {
@@ -2011,6 +2111,21 @@ function BusinessDetailsMultiform({ taskType, country, activeForm, shouldValidat
 				fieldValidationErrors: problems.validationErrors?.[activeForm.formId] ?? {},
 				formVerificationErrors: problems.verificationErrors?.[activeForm.formId] ?? {}
 			});
+			case "companyProofOfAddressDocument": return /* @__PURE__ */ jsx(ProofOfAddressDocument, {
+				id: activeForm.formId,
+				country,
+				data: form.data.companyProofOfAddressDocument,
+				errors: form.errors.companyProofOfAddressDocument,
+				valid: form.valid.companyProofOfAddressDocument,
+				allFields: form.allFields?.companyProofOfAddressDocument,
+				requiredFields: form.requiredFields?.companyProofOfAddressDocument,
+				optionalFields: form.optionalFields?.companyProofOfAddressDocument,
+				trustedFields: form.trustedFields?.companyProofOfAddressDocument,
+				handleFieldChange: (fieldName) => handleChange("companyProofOfAddressDocument", fieldName),
+				shouldValidate,
+				fieldValidationErrors: problems.validationErrors?.[activeForm.formId] ?? {},
+				formVerificationErrors: problems.verificationErrors?.[activeForm.formId] ?? {}
+			});
 			case "companyProofOfOwnershipDocument": return /* @__PURE__ */ jsx(ProofOfOwnershipDocument, {
 				id: activeForm.formId,
 				country,
@@ -2174,15 +2289,15 @@ var rules = ({ data, defaultData, verifiedBusiness, country, taskType, isFeature
 			if (!COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(country)) return data.additionalInformation?.exemptedFromVat ? "REQUIRED" : "OPTIONAL";
 		},
 		countryUsesTaxId: () => {
-			const isExemptFromTax = Boolean(data.basicInformation?.exemptedFromTax ?? data.additionalInformation?.exemptedFromTax);
+			const isExemptFromTax = Boolean(data.basicInformation?.exemptedFromTax);
 			const isOrgWithBanking = rootLegalEntity?.type === "organization" && keysOf(rootLegalEntity.capabilities ?? {}).includes("issueBankAccount");
-			const registrationNumberType = isFeatureEnabled("EnableUnifiedCompanySearch") ? data.basicInformation?.registrationNumberType : data.additionalInformation?.registrationNumberType;
+			const registrationNumberType = data.basicInformation?.registrationNumberType;
 			if (TAX_ID_REQUIRED_COUNTRIES_ORGANIZATION.includes(country) && isOrgWithBanking) return isExemptFromTax ? "OPTIONAL" : "REQUIRED";
 			if (country === CountryCodes.Italy && isOrgWithBanking && registrationNumberType === "CCIAA") return isExemptFromTax ? "OPTIONAL" : "REQUIRED";
 			if (COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(country) && !(taskType === TaskTypes.SOLE_PROPRIETOR_COMPANY && COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP.includes(country))) return isExemptFromTax ? "OPTIONAL" : "REQUIRED";
 		},
 		companyRegistrationNumberExemptionAllowed: () => {
-			const isExemptFromRegistrationNumber = Boolean(data.basicInformation?.exemptedFromRegistrationNumber ?? data.additionalInformation?.exemptedFromRegistrationNumber);
+			const isExemptFromRegistrationNumber = Boolean(data.basicInformation?.exemptedFromRegistrationNumber);
 			if (taskType === TaskTypes.SOLE_PROPRIETOR_COMPANY) {
 				if (!COUNTRIES_WITH_POSSIBLE_REGISTRATION_EXEMPTIONS_FOR_SOLE_PROPS.includes(country)) return;
 				return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
@@ -2199,7 +2314,7 @@ var rules = ({ data, defaultData, verifiedBusiness, country, taskType, isFeature
 			*/
 			switch (country) {
 				case CountryCodes.HongKong:
-					if (!defaultData?.basicInformation?.registrationNumber && !defaultData?.additionalInformation?.registrationNumber) return;
+					if (!defaultData?.basicInformation?.registrationNumber) return;
 					return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
 				case CountryCodes.Australia:
 				case CountryCodes.NewZealand:
@@ -2212,7 +2327,7 @@ var rules = ({ data, defaultData, verifiedBusiness, country, taskType, isFeature
 			if (isFeatureEnabled("EnableCountryOfGoverningLawForUKCompanies") && COUNTRY_OF_GOVERNING_LAW_POSSIBLE.includes(data.basicInformation?.country)) return "REQUIRED";
 		},
 		countryRequiresRegistrationNumber: () => {
-			const isExemptFromRegistrationNumber = Boolean(data.basicInformation?.exemptedFromRegistrationNumber ?? data.additionalInformation?.exemptedFromRegistrationNumber);
+			const isExemptFromRegistrationNumber = Boolean(data.basicInformation?.exemptedFromRegistrationNumber);
 			switch (taskType) {
 				case TaskTypes.SOLE_PROPRIETOR_COMPANY:
 					if (COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION.includes(country)) return;
@@ -2221,7 +2336,7 @@ var rules = ({ data, defaultData, verifiedBusiness, country, taskType, isFeature
 				default:
 					if (COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER.includes(country)) return "OPTIONAL";
 					if (country === CountryCodes.HongKong) {
-						if (!defaultData?.additionalInformation?.registrationNumber) return;
+						if (!defaultData?.basicInformation?.registrationNumber) return;
 						return isExemptFromRegistrationNumber ? "OPTIONAL" : "REQUIRED";
 					}
 					if (!COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION.includes(country)) return isExemptFromRegistrationNumber ? void 0 : "REQUIRED";
@@ -2243,7 +2358,7 @@ var rules = ({ data, defaultData, verifiedBusiness, country, taskType, isFeature
 			if (COUNTRIES_THAT_USES_UEN_OR_GST.includes(country)) return "REQUIRED";
 		},
 		countryHasTaxExemptions: () => {
-			const isExemptFromTax = Boolean(data.basicInformation?.exemptedFromTax ?? data.additionalInformation?.exemptedFromTax);
+			const isExemptFromTax = Boolean(data.basicInformation?.exemptedFromTax);
 			switch (taskType) {
 				case TaskTypes.SOLE_PROPRIETOR_COMPANY:
 					if (!COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_SOLE_PROPS.includes(country)) return;
@@ -2297,6 +2412,14 @@ var rules = ({ data, defaultData, verifiedBusiness, country, taskType, isFeature
 		},
 		japaneseLegalCompanyName: () => {
 			if (isJapanLocalizationEnabled(isFeatureEnabled, country)) return "REQUIRED";
+		},
+		requireLEI: () => {
+			if (!isFeatureEnabled("EnableLegalEntityIdentifierField")) return;
+			return data.additionalInformation?.exemptedFromLegalEntityIdentifier ? void 0 : "REQUIRED";
+		},
+		requireLEIExemption: () => {
+			if (!isFeatureEnabled("EnableLegalEntityIdentifierField")) return;
+			return data.additionalInformation?.exemptedFromLegalEntityIdentifier ? "REQUIRED" : "OPTIONAL";
 		}
 	});
 };
@@ -2609,7 +2732,7 @@ var shouldReuseRegistrationNumberAsTaxId = (country, registrationNumberType) =>
 //#endregion
 //#region src/components/Business/mapping/businessDetails/mapBusinessDetailsSchemaToLegalEntity.ts
 var mapBusinessDetailsDocumentToApiDocument = async (data, entityId) => {
-	const { companyRegistrationDocument, companyTaxDocument, companyProofOfDirectorDocument, companyConstitutionalDocument, companyProofOfSignatoryDocument, companyProofOfOwnershipDocument, basicInformation } = data;
+	const { companyRegistrationDocument, companyTaxDocument, companyProofOfDirectorDocument, companyConstitutionalDocument, companyProofOfSignatoryDocument, companyProofOfAddressDocument, companyProofOfOwnershipDocument, basicInformation } = data;
 	const taxDocumentType = COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(basicInformation?.country) ? "proofOfOrganizationTaxInfo" : "vatDocument";
 	return (await Promise.all([
 		createDocumentRequest({
@@ -2654,6 +2777,13 @@ var mapBusinessDetailsDocumentToApiDocument = async (data, entityId) => {
 			description: companyProofOfOwnershipDocument?.description,
 			page1: companyProofOfOwnershipDocument?.proofOfOwnership?.[0],
 			page2: companyProofOfOwnershipDocument?.proofOfOwnership?.[1]
+		}),
+		createDocumentRequest({
+			entityId,
+			entityType: "legalEntity",
+			documentType: "proofOfAddress",
+			description: companyProofOfAddressDocument?.description,
+			page1: companyProofOfAddressDocument?.proofOfAddress?.[0]
 		})
 	])).filter(Boolean);
 };
@@ -2661,9 +2791,8 @@ var mapBusinessDetailsSchemaToLegalEntity = (data, accountHolder, isFeatureEnabl
 	const requestObj = { ...formatObject(data, accountHolder === "mySoleProprietorName" ? solePropBusinessDetailsApiKeyMapping : businessDetailsApiKeyMapping) };
 	delete requestObj.organization?.legalFormDescription;
 	const canSaveRegNumberAbsentState = isFeatureEnabled("EnableRegistrationAndTaxAbsentStatesV4") && isRegistrationNumberAbsentStateV4Scenario(data.basicInformation?.country, data.companyStructure?.entityType);
-	const useBasicInformationForTaxAndRegistration = isFeatureEnabled("EnableUnifiedCompanySearch") || isUsingCompanySearch(data.basicInformation?.country, taskType);
-	const [taxData, registrationNumber] = useBasicInformationForTaxAndRegistration ? [data.basicInformation?.taxInformation, data.basicInformation?.registrationNumber] : [data.additionalInformation?.taxInformation, data.additionalInformation?.registrationNumber];
-	const registrationNumberType = useBasicInformationForTaxAndRegistration ? data.basicInformation?.registrationNumberType : data.additionalInformation?.registrationNumberType;
+	const [taxData, registrationNumber] = [data.basicInformation?.taxInformation, data.basicInformation?.registrationNumber];
+	const registrationNumberType = data.basicInformation?.registrationNumberType;
 	const localization = [mapSchemaFieldsToApiScriptLocalization(data.basicInformation ?? {}, "jaHani"), mapSchemaFieldsToApiScriptLocalization(data.basicInformation ?? {}, "jaKana")].filter(({ fields }) => !isEmpty$1(fields)).map(({ script, fields }) => ({
 		script,
 		fields: { legalName: fields.legalCompanyName }
@@ -2687,7 +2816,7 @@ var mapBusinessDetailsSchemaToLegalEntity = (data, accountHolder, isFeatureEnabl
 			if (canSaveRegNumberAbsentState && requestObj.organization) requestObj.organization.registrationNumberAbsent = false;
 		}
 		if (requestObj.organization && localization.length > 0) entityObject.localization = localization;
-		if (data.additionalInformation?.exemptedFromRegistrationNumber && canSaveRegNumberAbsentState && requestObj.organization) requestObj.organization.registrationNumberAbsent = data.additionalInformation.exemptedFromRegistrationNumber;
+		if (data.basicInformation?.exemptedFromRegistrationNumber && canSaveRegNumberAbsentState && requestObj.organization) requestObj.organization.registrationNumberAbsent = data.basicInformation.exemptedFromRegistrationNumber;
 		if (data.additionalInformation?.vatAbsenceReason) entityObject.vatNumber = "";
 		if (isFeatureEnabled("EnableDoingBusinessAsNameV4")) {
 			if (typeof data.additionalInformation?.hasDoingBusinessAs !== "undefined") entityObject.doingBusinessAsAbsent = !data.additionalInformation.hasDoingBusinessAs;
@@ -2695,7 +2824,7 @@ var mapBusinessDetailsSchemaToLegalEntity = (data, accountHolder, isFeatureEnabl
 			entityObject.doingBusinessAs = doingBusinessAs || data.basicInformation?.legalCompanyName;
 			delete entityObject.doingBusinessAsAbsent;
 		}
-		if (data.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME && entityObject.principalPlaceOfBusiness) entityObject.principalPlaceOfBusiness = entityObject.registeredAddress;
+		if (data.additionalInformation?.operationalAddressIsSame && 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 = "";
@@ -2725,16 +2854,16 @@ var mapApiDocumentToBusinessDetailsDocuments = (entityId) => {
 		companyConstitutionalDocument: constitutionalDocument ? { constitutionalDocument: [mapExistingFile(getPageName(constitutionalDocument))] } : void 0
 	};
 };
-var mapBasicInformation = ({ data, legalEntity, taskType, isFeatureEnabled }) => {
+var mapBasicInformation = ({ data, legalEntity, taskType }) => {
 	if (!data || !data.country) return;
 	const companyType = legalEntity?.type === "organization" ? legalEntity.organization?.type : void 0;
 	const isUen = mapIsUen(data.taxInformation, data.registrationNumber, data.country);
-	const registrationNumberType = getDefaultRegistrationNumberType(data.registrationNumber, data.country, void 0, isFeatureEnabled("EnableUnifiedCompanySearch"));
+	const registrationNumberType = getDefaultRegistrationNumberType(data.registrationNumber, data.country, void 0);
 	const registrationNumberExemption = !data.registrationNumber && !!companyType && isRegistrationExemptionAllowed(data.country) && (() => {
 		const allowedEntityTypes = REGISTRATION_NUMBER_EXEMPTION_RULES[data.country];
 		return allowedEntityTypes.length === 0 || allowedEntityTypes.includes(companyType);
 	})() ? { exemptedFromRegistrationNumber: true } : {};
-	if (isFeatureEnabled("EnableUnifiedCompanySearch")) return isUsingCompanySearch(data.country, taskType) ? {
+	return isUsingCompanySearch(data.country, taskType) ? {
 		...data,
 		registrationNumberType,
 		...registrationNumberExemption,
@@ -2750,13 +2879,6 @@ var mapBasicInformation = ({ data, legalEntity, taskType, isFeatureEnabled }) =>
 		...registrationNumberExemption,
 		...isUen
 	});
-	return isUsingCompanySearch(data.country, taskType) ? data : entriesOf(data).reduce((acc, [field]) => {
-		if (!FIELDS_NEEDED_FOR_COMPANY_SEARCH.includes(field)) return {
-			...acc,
-			[field]: data[field]
-		};
-		return acc;
-	}, {});
 };
 var mapDbaName = (legalEntity) => {
 	const entity = legalEntity.type === "organization" ? legalEntity.organization : legalEntity.soleProprietorship;
@@ -2775,16 +2897,13 @@ var mapIsUen = (taxInformation, registrationNumber, country) => {
 		isUen: currentCountryTaxInfo.type === "UEN"
 	};
 };
-var mapAdditionalInformation = ({ data, legalEntity, taskType, isFeatureEnabled }) => {
+var mapAdditionalInformation = ({ data, legalEntity }) => {
 	if (!data) return;
 	const entity = legalEntity.type === "organization" ? legalEntity.organization : legalEntity.soleProprietorship;
 	const currentCountry = entity?.registeredAddress.country;
 	const dbaNameFields = mapDbaName(legalEntity);
-	const isUen = mapIsUen(data.taxInformation, data.registrationNumber, currentCountry);
-	const companyType = legalEntity.type === "organization" ? legalEntity.organization?.type : CompanyTypesValues.SOLE_PROPRIETORSHIP;
-	const registrationNumberType = getDefaultRegistrationNumberType(entity?.registrationNumber, currentCountry, companyType);
 	const vatNumberType = getDefaultVatNumberType(entity?.vatNumber, currentCountry);
-	const operationalAddressIsSame = entity?.principalPlaceOfBusiness && !objectsDeepEqual(entity.principalPlaceOfBusiness, entity.registeredAddress) ? operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME : operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME;
+	const operationalAddressIsSame = !(entity?.principalPlaceOfBusiness && !objectsDeepEqual(entity.principalPlaceOfBusiness, entity.registeredAddress));
 	if (entity?.registeredAddress.localization) data.registrationAddress = {
 		...data.registrationAddress,
 		...mapAddressLocalizationToJpAddressSchema(entity.registeredAddress.localization)
@@ -2793,25 +2912,15 @@ var mapAdditionalInformation = ({ data, legalEntity, taskType, isFeatureEnabled
 		...data.operationalAddress,
 		...mapAddressLocalizationToJpAddressSchema(entity.principalPlaceOfBusiness.localization)
 	};
-	const shouldStripCompanySearchFields = isUsingCompanySearch(currentCountry, taskType) || isFeatureEnabled("EnableUnifiedCompanySearch");
 	return {
-		...entriesOf(data).reduce((acc, [field]) => {
-			if (!shouldStripCompanySearchFields) return {
-				...acc,
-				[field]: data[field]
-			};
-			if (!FIELDS_NEEDED_FOR_COMPANY_SEARCH.includes(field)) return {
-				...acc,
-				[field]: data[field]
-			};
-			return acc;
-		}, {
+		...entriesOf(data).reduce((acc, [field]) => ({
+			...acc,
+			[field]: data[field]
+		}), {
 			operationalAddressIsSame,
-			registrationNumberType,
 			vatNumberType
 		}),
-		...dbaNameFields,
-		...isUen
+		...dbaNameFields
 	};
 };
 var mapLegalNameLocalization = (data) => {
@@ -2847,7 +2956,7 @@ var mapLegalEntityToBusinessDetailsSchema = ({ legalEntity, parentEntity, taskTy
 		};
 	};
 	const orgSchema = {
-		...formatObject(legalEntity, businessDetailsComponentsKeyMapping),
+		...formatObject(legalEntity, businessDetailsKeyMapping),
 		businessSelection: {},
 		companyRegistrationDocument,
 		companyTaxDocument,
@@ -2883,9 +2992,7 @@ var mapLegalEntityToBusinessDetailsSchema = ({ legalEntity, parentEntity, taskTy
 				...componentData,
 				[key]: mapAdditionalInformation({
 					data: businessDetailsSchema[key],
-					legalEntity,
-					taskType,
-					isFeatureEnabled
+					legalEntity
 				})
 			};
 			case "companyRegistrationDocument": return {
@@ -2951,7 +3058,7 @@ function useSubmitBusinessDetails({ country, data, forms, legalEntityResponse, a
 			companyStructure: data.companyStructure?.entityType,
 			countryOfRegistration: data.basicInformation?.country,
 			legalEntityName: accountHolder === "theCompanyIWorkFor" ? data.basicInformation?.legalCompanyName : void 0,
-			usedAdditionalAddress: data.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
+			usedAdditionalAddress: !data.additionalInformation?.operationalAddressIsSame
 		};
 		/**
 		* Root entity is legalEntityResponse,
@@ -3001,7 +3108,7 @@ function useSubmitBusinessDetails({ country, data, forms, legalEntityResponse, a
 			taskType,
 			isFeatureEnabled
 		}));
-		if (filteredData.additionalInformation && !filteredData.additionalInformation.taxInformation) filteredData.additionalInformation.taxInformation = void 0;
+		if (filteredData.basicInformation && !filteredData.basicInformation.taxInformation) filteredData.basicInformation.taxInformation = void 0;
 		const countryOfGoverningLaw = getCountryOfGoverningLaw(isFeatureEnabled("EnableCountryOfGoverningLawForUKCompanies"), filteredData.basicInformation);
 		if (filteredData.basicInformation) if (countryOfGoverningLaw) filteredData.basicInformation.countryOfGoverningLaw = countryOfGoverningLaw;
 		else delete filteredData.basicInformation.countryOfGoverningLaw;
@@ -3043,7 +3150,6 @@ function useSubmitBusinessDetails({ country, data, forms, legalEntityResponse, a
 			});
 			await invalidateRootLegalEntity();
 			onExternalSubmit?.(data);
-			return true;
 		} catch (err) {
 			if (isValidationError(err)) {
 				const getErrors = processValidationErrors(err, TaskTypes.BUSINESS_DETAILS);
@@ -3077,7 +3183,7 @@ function useSubmitBusinessDetails({ country, data, forms, legalEntityResponse, a
 				returnType: err?.errorCode,
 				returnValue: err?.title || "backend"
 			});
-			return false;
+			throw err;
 		} finally {
 			setLoadingStatus("success");
 		}
@@ -3252,13 +3358,11 @@ var formatBasicInformation = (data, datasetUtils, companyType, isCountryOfGovern
 		countryOfGoverningLaw: datasetUtils.getCountryName(getCountryOfGoverningLaw(isCountryOfGoverningLawEnabled, data))
 	};
 };
-var formatAdditionalInformation = (data, country, companyType) => {
+var formatAdditionalInformation = (data) => {
 	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,
@@ -3291,7 +3395,7 @@ var formatDataForSummary = (data, forms, t, language, isFeatureEnabled, version)
 		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 "additionalInformation": return formatAdditionalInformation(data[formId]);
 			case "companyRegistrationDocument": return {
 				fileName: data[formId].registrationDocument?.[0]?.name,
 				description: data[formId].description
@@ -3300,6 +3404,14 @@ var formatDataForSummary = (data, forms, t, language, isFeatureEnabled, version)
 				fileName: data[formId]?.taxDocument?.[0]?.name,
 				description: data[formId].description
 			};
+			case "companyProofOfAddressDocument": return {
+				fileName: data[formId]?.proofOfAddress?.[0]?.name,
+				description: data[formId].description
+			};
+			case "companyConstitutionalDocument": return {
+				fileName: data[formId]?.constitutionalDocument?.[0]?.name,
+				description: data[formId].description
+			};
 			case "companyProofOfDirectorDocument": return {
 				fileName: data[formId]?.proofOfDirector?.[0]?.name,
 				description: data[formId].description
@@ -3340,7 +3452,7 @@ var formatDataForSummary = (data, forms, t, language, isFeatureEnabled, version)
 				label: t(($) => $["registrationAddress"], { ns: "common" }),
 				items: registrationAddressSummaryItems
 			});
-			if (data[form.formId]?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME) {
+			if (!data[form.formId]?.operationalAddressIsSame) {
 				const operationalAddressSummaryItems = translateAndFilterMappedSummary(formatAddress(data.additionalInformation?.operationalAddress, datasetUtils, data.basicInformation?.country, version));
 				if (operationalAddressSummaryItems.length > 0) summarySectionData.push({
 					formId: "operationalAddress",
@@ -3364,6 +3476,8 @@ var businessDetailsBase = {
 	doingBusinessAs: { rule: "requireDoingBusinessAsName" },
 	registrationAddress: { rule: "REQUIRED" },
 	operationalAddressIsSame: { rule: "REQUIRED" },
+	legalEntityIdentifier: { rule: "requireLEI" },
+	exemptedFromLegalEntityIdentifier: { rule: "requireLEIExemption" },
 	operationalAddress: { rule: "OPTIONAL" },
 	selectedBusinessId: { rule: "usingCompanySearch" },
 	stateOrProvince: { rule: "requireStateOrProvinceForCompanySearch" },
@@ -3412,7 +3526,7 @@ var businessDetailsFieldsPerScenario = {
 		...taxInformationBase,
 		...financialInformationBase
 	},
-	L_PROOFOFADDRESS: {},
+	L_PROOFOFADDRESS: { proofOfAddress: { rule: "REQUIRED" } },
 	L_REGDOC: { registrationDocument: { rule: "REQUIRED" } },
 	L_TAXDOC: { taxDocument: { rule: "REQUIRED" } },
 	L_BAFIN: { legalForm: { rule: "REQUIRED" } }
@@ -3504,9 +3618,9 @@ var applyFinancialInformation = (form, verifiedData) => {
 	const verifiedFinancialReportingDate = financialInformation.financialReportingDate;
 	const currentFinancialReportingDate = form.data.companyFinancialInformation?.financialReportingDate;
 	if (!currentFinancialReportingDate || verifiedFinancialReportingDate && verifiedFinancialReportingDate >= currentFinancialReportingDate) {
-		if (financialInformation.numberOfEmployees != null) form.handleChangeFor("numberOfEmployees", "companyFinancialInformation")(financialInformation.numberOfEmployees);
-		if (financialInformation.financialReportingDate) form.handleChangeFor("financialReportingDate", "companyFinancialInformation")(financialInformation.financialReportingDate);
-		if (financialInformation.currency) form.handleChangeFor("currency", "companyFinancialInformation")(financialInformation.currency);
+		if (financialInformation.numberOfEmployees != null) form.handleChangeFor("companyFinancialInformation", "numberOfEmployees")(financialInformation.numberOfEmployees);
+		if (financialInformation.financialReportingDate) form.handleChangeFor("companyFinancialInformation", "financialReportingDate")(financialInformation.financialReportingDate);
+		if (financialInformation.currency) form.handleChangeFor("companyFinancialInformation", "currency")(financialInformation.currency);
 		/**
 		* Determine which reported value option to select based on available data
 		* Priority: balanceSheetTotal > annualTurnover
@@ -3515,18 +3629,18 @@ var applyFinancialInformation = (form, verifiedData) => {
 		if (selectedReportedValueOption) {
 			const selectedReportedValue = selectedReportedValueOption === "balanceSheetTotal" ? financialInformation.balanceSheetTotal : financialInformation.annualTurnover;
 			const nonSelectedReportedValueOption = selectedReportedValueOption === "balanceSheetTotal" ? "annualTurnover" : "balanceSheetTotal";
-			form.handleChangeFor("reportedValueOption", "companyFinancialInformation")(selectedReportedValueOption);
-			form.handleChangeFor(selectedReportedValueOption, "companyFinancialInformation")(selectedReportedValue);
-			form.handleChangeFor(nonSelectedReportedValueOption, "companyFinancialInformation")(null);
+			form.handleChangeFor("companyFinancialInformation", "reportedValueOption")(selectedReportedValueOption);
+			form.handleChangeFor("companyFinancialInformation", selectedReportedValueOption)(selectedReportedValue);
+			form.handleChangeFor("companyFinancialInformation", nonSelectedReportedValueOption)(void 0);
 		}
 	}
 };
 var applyVerifiedBusinessData = (form, country, verifiedData) => {
 	if (!verifiedData) return;
-	form.handleChangeFor("legalCompanyName", "basicInformation")(verifiedData.name);
-	if (country !== CountryCodes.UnitedStates) form.handleChangeFor("registrationNumber", "basicInformation")(verifiedData.registrationNumber);
+	form.handleChangeFor("basicInformation", "legalCompanyName")(verifiedData.name);
+	if (country !== CountryCodes.UnitedStates) form.handleChangeFor("basicInformation", "registrationNumber")(verifiedData.registrationNumber);
 	if (form.defaultData?.additionalInformation?.registrationAddress?.address || form.defaultData?.additionalInformation?.operationalAddress?.address) return;
-	form.handleChangeFor("entityType", "companyStructure")(mapOrganizationTypeToCompanyType(verifiedData.companyType));
+	form.handleChangeFor("companyStructure", "entityType")(mapOrganizationTypeToCompanyType(verifiedData.companyType));
 	const verifiedAddress = {
 		...verifiedData.registeredAddress && { registrationAddress: {
 			...mapAddressData(verifiedData.registeredAddress),
@@ -3537,9 +3651,9 @@ var applyVerifiedBusinessData = (form, country, verifiedData) => {
 			country
 		} }
 	};
-	if (verifiedData.principalPlaceOfBusinessAddress) form.handleChangeFor("operationalAddressIsSame", "additionalInformation", "input")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME);
-	if (verifiedAddress.registrationAddress) form.handleChangeFor("registrationAddress", "additionalInformation")(verifiedAddress.registrationAddress);
-	if (verifiedAddress.operationalAddress) form.handleChangeFor("operationalAddress", "additionalInformation")(verifiedAddress.operationalAddress);
+	if (verifiedData.principalPlaceOfBusinessAddress) form.handleChangeFor("additionalInformation", "operationalAddressIsSame", "input")(false);
+	if (verifiedAddress.registrationAddress) form.handleChangeFor("additionalInformation", "registrationAddress")(verifiedAddress.registrationAddress);
+	if (verifiedAddress.operationalAddress) form.handleChangeFor("additionalInformation", "operationalAddress")(verifiedAddress.operationalAddress);
 	applyFinancialInformation(form, verifiedData);
 };
 //#endregion
@@ -3638,6 +3752,7 @@ function basicInformationValidators({ country, taxIdNumberType, companyType, reg
 			state,
 			isFeatureEnabled
 		}, registrationNumberDefaultFieldMetadata).validators,
+		exemptedFromRegistrationNumber: exemptFromRegistrationNumberDefaultFieldMetadata.validators,
 		jaHaniLegalCompanyName: resolveFieldMetadata(localizedLegalCompanyNameFieldConfig.jaHaniLegalCompanyName.config, {}, localizedLegalCompanyNameFieldConfig.jaHaniLegalCompanyName.metadata).validators,
 		jaKanaLegalCompanyName: resolveFieldMetadata(localizedLegalCompanyNameFieldConfig.jaKanaLegalCompanyName.config, {}, localizedLegalCompanyNameFieldConfig.jaKanaLegalCompanyName.metadata).validators
 	};
@@ -3649,20 +3764,11 @@ function businessSelectionValidators() {
 		errorMessage: "fieldIsRequired"
 	} };
 }
-function additionalInformationValidators({ country, taxIdNumberType, companyType, registrationNumberType, vatNumberType, isFeatureEnabled }) {
+function additionalInformationValidators({ country, vatNumberType }) {
 	return {
 		hasDoingBusinessAs: doingBusinessAsAbsentFieldMetadata.validators,
 		doingBusinessAs: doingBusinessAsFieldMetadata.validators,
-		registrationNumber: resolveFieldMetadata(registrationNumberDefaultFieldConfig[country], {
-			companyType,
-			registrationNumberType,
-			isFeatureEnabled
-		}, registrationNumberDefaultFieldMetadata).validators,
-		exemptedFromRegistrationNumber: exemptFromRegistrationNumberDefaultFieldMetadata.validators,
-		taxInformation: resolveFieldMetadata(taxInformationDefaultFieldConfig[country], {
-			taxIdNumberType,
-			companyType
-		}, taxInformationDefaultFieldMetadata).validators,
+		legalEntityIdentifier: legalEntityIdentifierFieldMetadata.validators,
 		vatNumber: resolveFieldMetadata(defaultFieldConfig$1[country], { vatNumberType }, defaultFieldMetadata$1).validators,
 		vatAbsenceReason: vatAbsenceReasonMetadata.validators,
 		eInvoicingCode: eInvoicingCodeFieldMetadata.validators,
@@ -3680,7 +3786,7 @@ function BusinessDetailsDropin({ taskType, country: propCountry, problems: propP
 	const { t, i18n } = useTranslation(["common", "business"]);
 	const userEvents = useAnalyticsContext();
 	const { isFeatureEnabled } = useToggleContext();
-	const isBusinessDetailsModalEnabled = isFeatureEnabled("EnableBusinessDetailsModal") && taskType === TaskTypes.BUSINESS_DETAILS;
+	const isBusinessDetailsModalEnabled = taskType === TaskTypes.BUSINESS_DETAILS;
 	const { isSettingEnabled } = useSettingsContext();
 	const { accountHolder } = useAccountHolder();
 	const logger = createLogger();
@@ -3709,11 +3815,7 @@ function BusinessDetailsDropin({ taskType, country: propCountry, problems: propP
 	const companySearchStateModel = useModel(() => new CompanySearchStateModel(userEvents));
 	const tinMismatchModalOpen = useSignal(false);
 	const legalArrangementModalOpen = useSignal(false);
-	const defaultForms = useMemo$1(() => getForms(country, taskType, isFeatureEnabled), [
-		country,
-		taskType,
-		isFeatureEnabled
-	]);
+	const defaultForms = useMemo$1(() => getForms(country), [country]);
 	const { data: matchingScenario } = useScenarios(country, LegalEntityTypes.ORGANIZATION);
 	useEffect$1(() => {
 		if (!matchingScenario) return;
@@ -3775,9 +3877,9 @@ function BusinessDetailsDropin({ taskType, country: propCountry, problems: propP
 		documents
 	]);
 	const buildFieldValidations = useCallback$1((data) => {
-		const taxInfo = data?.basicInformation?.taxInformation ?? data?.additionalInformation?.taxInformation;
+		const taxInfo = data?.basicInformation?.taxInformation;
 		const taxIdType = taxInfo?.length ? taxInfo.find((taxId) => taxId.country === country)?.type : void 0;
-		const regNumberType = data?.basicInformation?.registrationNumberType ?? data?.additionalInformation?.registrationNumberType;
+		const regNumberType = data?.basicInformation?.registrationNumberType;
 		const companyType = taskType === TaskTypes.SOLE_PROPRIETOR_COMPANY ? CompanyTypesValues.SOLE_PROPRIETORSHIP : data?.companyStructure?.entityType;
 		return {
 			basicInformation: basicInformationValidators({
@@ -3874,7 +3976,7 @@ function BusinessDetailsDropin({ taskType, country: propCountry, problems: propP
 		setPrevCountry(multiForm.data.basicInformation.country);
 		setTrustedFields(void 0);
 		companySearchStateModel.resetCompanySearchData();
-		multiForm.handleChangeFor("entityType", "companyStructure")(null);
+		multiForm.handleChangeFor("companyStructure", "entityType")(void 0);
 	}
 	/**
 	* Infer the company structure based on the registration number type and tax ID number type
@@ -3882,7 +3984,7 @@ function BusinessDetailsDropin({ taskType, country: propCountry, problems: propP
 	* the necessary information to uniquely identify the company structure
 	*/
 	const inferredCompanyStructure = useMemo$1(() => {
-		if (!isFeatureEnabled("EnableUnifiedCompanySearch") || taskType !== "BUSINESS_DETAILS") return void 0;
+		if (taskType !== "BUSINESS_DETAILS") return void 0;
 		if (multiForm.data.companyStructure?.entityType && multiForm.data.companyStructure?.entityType === "associationIncorporated" || multiForm.data.companyStructure?.entityType === "partnershipIncorporated") return;
 		const registrationNumberType = multiForm.data.basicInformation?.registrationNumberType;
 		const taxIdNumberType = multiForm.data.basicInformation?.taxInformation?.find((taxInformation) => taxInformation.country === country)?.type;
@@ -3900,7 +4002,6 @@ function BusinessDetailsDropin({ taskType, country: propCountry, problems: propP
 	}, [
 		accountHolder,
 		country,
-		isFeatureEnabled,
 		isSettingEnabled,
 		legalEntityResponse,
 		multiForm.data.basicInformation?.exemptedFromRegistrationNumber,
@@ -3912,7 +4013,7 @@ function BusinessDetailsDropin({ taskType, country: propCountry, problems: propP
 	const applyInferredCompanyStructure = () => {
 		if (!inferredCompanyStructure) return;
 		if (multiForm.data.companyStructure?.entityType === inferredCompanyStructure) return;
-		multiForm.handleChangeFor("entityType", "companyStructure")(inferredCompanyStructure);
+		multiForm.handleChangeFor("companyStructure", "entityType")(inferredCompanyStructure);
 	};
 	const getRequiredForms = useCallback$1((options) => {
 		return buildRequiredForms({
@@ -3972,7 +4073,8 @@ function BusinessDetailsDropin({ taskType, country: propCountry, problems: propP
 		forms,
 		onSubmit: useCallback$1(async () => {
 			try {
-				if (await submit()) setIsAddingBusinessDetails(false);
+				await submit();
+				setIsAddingBusinessDetails(false);
 			} catch (error) {
 				logger.error(error);
 			} finally {
@@ -4244,13 +4346,12 @@ function VerifiedBusinessCard({ verifiedBusiness, verifiedAddress }) {
 }
 //#endregion
 //#region src/components/Business/forms/AdditionalInformation/AdditionalInformation.tsx
-var LazyJpAddress = lazy(async () => (await import("./JpAddress-C38zRvZE.js")).JpAddress);
+var LazyJpAddress = lazy(async () => (await import("./JpAddress-BtLxuxr9.js")).JpAddress);
 var ADDITIONAL_INFORMATION_FORM_ID = "additionalInformation";
 var ADDITIONAL_INFORMATION_FIELDS = [
 	...DBA_NAME_FIELD,
-	...BUSINESS_REGISTRATION_NUMBER_FIELD,
-	...TAX_INFORMATION_FIELD,
 	...VAT_NUMBER_FIELD,
+	...LEGAL_ENTITY_IDENTIFIER_FIELD,
 	...INDUSTRY_CODE_FIELD,
 	...DATE_OF_INCORPORATION_FIELD,
 	...STOCK_EXCHANGE_MIC_FIELD,
@@ -4264,7 +4365,6 @@ var ADDITIONAL_INFORMATION_FIELDS = [
 var EMPTY_OBJ = {};
 function AdditionalInformation({ id, country, companyType, shouldValidate, fieldValidationErrors = EMPTY_OBJ, formVerificationErrors = EMPTY_OBJ }) {
 	const { t, i18n } = useTranslation(["common", "business"]);
-	const { t: businessT } = useTranslation("business");
 	const { form } = useFormContext();
 	const { isFeatureEnabled } = useToggleContext();
 	const { data: rootLegalEntity } = useLegalEntity(ROOT_LE);
@@ -4272,7 +4372,6 @@ function AdditionalInformation({ id, country, companyType, shouldValidate, field
 	const showVerified = !!verifiedBusiness;
 	const showStockData = companyType === CompanyTypesValues.PUBLIC_COMPANY;
 	const addressSchema = getAddressSchemaForCountry(country).filter((field) => !COUNTRIES_WITH_STATES_DATASET.includes(country) ? field !== "stateOrProvince" : true);
-	const currentCountryTaxInformation = form.data.additionalInformation?.taxInformation?.find((taxId) => taxId.country === country);
 	const businessLineTypes = [];
 	if (requestingBanking(rootLegalEntity)) businessLineTypes.push("banking");
 	if (requestingIssuing(rootLegalEntity)) businessLineTypes.push("issuing");
@@ -4302,28 +4401,28 @@ function AdditionalInformation({ id, country, companyType, shouldValidate, field
 	]);
 	const registrationAddressValid = useRef$1(false);
 	const operationalAddressValid = useRef$1(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.current) form.setValid("operationalAddress", operationalAddressValid.current, "additionalInformation");
-	const handleChangeFor = useCallback$1((fieldName, mode) => form.handleChangeFor(fieldName, "additionalInformation", mode), [form]);
+	if (form.valid.additionalInformation?.registrationAddress !== registrationAddressValid.current) form.setValid("additionalInformation", "registrationAddress", registrationAddressValid.current);
+	if (!form.data.additionalInformation?.operationalAddressIsSame && form.valid.additionalInformation?.operationalAddress !== operationalAddressValid.current) form.setValid("additionalInformation", "operationalAddress", operationalAddressValid.current);
+	const handleChangeFor = useCallback$1((fieldName, mode) => form.handleChangeFor("additionalInformation", fieldName, mode), [form]);
 	const handleRegistrationAddressChange = (state) => {
 		handleChangeFor("registrationAddress")(state.data);
-		form.setValid("registrationAddress", Boolean(state.isValid), "additionalInformation");
+		form.setValid("additionalInformation", "registrationAddress", Boolean(state.isValid));
 		registrationAddressValid.current = Boolean(state.isValid);
 	};
 	const handleOperationalAddressChange = (state) => {
 		handleChangeFor("operationalAddress")(state.data);
-		form.setValid("operationalAddress", Boolean(state.isValid), "additionalInformation");
+		form.setValid("additionalInformation", "operationalAddress", Boolean(state.isValid));
 		operationalAddressValid.current = Boolean(state.isValid);
 	};
 	const handleOperationalAddressIsSameChange = useCallback$1((isChecked) => {
 		if (isChecked) {
-			handleChangeFor("operationalAddressIsSame")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME);
-			form.setValid("operationalAddress", true, "additionalInformation");
-		} else handleChangeFor("operationalAddressIsSame")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME);
+			handleChangeFor("operationalAddressIsSame")(true);
+			form.setValid("additionalInformation", "operationalAddress", true);
+		} else handleChangeFor("operationalAddressIsSame")(false);
 	}, [form, handleChangeFor]);
 	if (form.data.additionalInformation?.operationalAddressIsSame === null) handleOperationalAddressIsSameChange(true);
 	useEffect$1(() => {
-		if (mustProvideOperationalAddress && form.data.additionalInformation?.operationalAddressIsSame !== operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME) handleOperationalAddressIsSameChange(false);
+		if (mustProvideOperationalAddress && form.data.additionalInformation?.operationalAddressIsSame) handleOperationalAddressIsSameChange(false);
 	}, [
 		handleOperationalAddressIsSameChange,
 		mustProvideOperationalAddress,
@@ -4347,11 +4446,6 @@ function AdditionalInformation({ id, country, companyType, shouldValidate, field
 			switch (field) {
 				case "hasDoingBusinessAs": return mergeFieldMetadataIntoProps("hasDoingBusinessAs", doingBusinessAsAbsentFieldMetadata, acc);
 				case "doingBusinessAs": return mergeFieldMetadataIntoProps("doingBusinessAs", doingBusinessAsFieldMetadata, acc);
-				case "registrationNumber": return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(registrationNumberDefaultFieldConfig[country], { registrationNumberType: form.data.additionalInformation?.registrationNumberType }, registrationNumberDefaultFieldMetadata), acc);
-				case "taxInformation": return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(taxInformationDefaultFieldConfig[country], {
-					taxIdNumberType: currentCountryTaxInformation?.type,
-					companyType
-				}, taxInformationDefaultFieldMetadata), acc);
 				case "vatNumber": return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$1[country], { vatNumberType: form.data.additionalInformation?.vatNumberType }, defaultFieldMetadata$1), acc);
 				case "vatAbsenceReason": return mergeFieldMetadataIntoProps("vatAbsenceReason", vatAbsenceReasonMetadata, acc);
 				case "eInvoicingCode": return mergeFieldMetadataIntoProps("eInvoicingCode", eInvoicingCodeFieldMetadata, acc);
@@ -4366,9 +4460,7 @@ function AdditionalInformation({ id, country, companyType, shouldValidate, field
 		}, initialProps);
 		return createFormUtils(formUtilProps ?? initialProps, t);
 	}, [
-		companyType,
 		country,
-		currentCountryTaxInformation?.type,
 		form.allFields?.additionalInformation,
 		form.data.additionalInformation,
 		form.errors.additionalInformation,
@@ -4454,37 +4546,6 @@ function AdditionalInformation({ id, country, companyType, shouldValidate, field
 							readonly: formUtils.isReadOnly("doingBusinessAs"),
 							handleChangeFor
 						}),
-						showField(BUSINESS_REGISTRATION_NUMBER_FIELD) && /* @__PURE__ */ jsx(BusinessRegistrationNumberField, {
-							data: formUtils.getFieldData(form.data.additionalInformation ?? {}, BUSINESS_REGISTRATION_NUMBER_FIELD),
-							valid: formUtils.getFieldValid(form.valid.additionalInformation ?? {}, BUSINESS_REGISTRATION_NUMBER_FIELD),
-							errors: formUtils.getFieldErrors(form.errors.additionalInformation ?? {}, fieldValidationErrors, BUSINESS_REGISTRATION_NUMBER_FIELD),
-							helperText: getRegistrationNumberHelperText(businessT, {
-								country,
-								companyType
-							}),
-							readonly: formUtils.isReadOnly("registrationNumber"),
-							optional: formUtils.isOptionalField("registrationNumber"),
-							shouldValidate,
-							handleChangeFor,
-							country,
-							canExempt: showField(["exemptedFromRegistrationNumber"]),
-							companyType
-						}),
-						showField(TAX_INFORMATION_FIELD) && /* @__PURE__ */ jsx(TaxInformationField, {
-							data: formUtils.getFieldData(form.data.additionalInformation ?? {}, TAX_INFORMATION_FIELD),
-							valid: formUtils.getFieldValid(form.valid.additionalInformation ?? {}, TAX_INFORMATION_FIELD),
-							errors: formUtils.getFieldErrors(form.errors.additionalInformation ?? {}, fieldValidationErrors, TAX_INFORMATION_FIELD),
-							labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD, { exemptedFromTax: "iDontHaveATaxId" }),
-							mask: formUtils.getMask("taxInformation"),
-							readonly: formUtils.isReadOnly("taxInformation"),
-							shouldValidate,
-							handleChangeFor,
-							canExempt: showField(["exemptedFromTax"]),
-							country,
-							entityType: companyType,
-							defaultData: form.defaultData?.additionalInformation?.taxInformation,
-							registrationNumber: form.data.additionalInformation?.registrationNumber
-						}),
 						showField(VAT_NUMBER_FIELD) && /* @__PURE__ */ jsx(VatNumberField, {
 							data: formUtils.getFieldData(form.data.additionalInformation ?? {}, VAT_NUMBER_FIELD),
 							valid: formUtils.getFieldValid(form.valid.additionalInformation ?? {}, VAT_NUMBER_FIELD),
@@ -4497,6 +4558,12 @@ function AdditionalInformation({ id, country, companyType, shouldValidate, field
 							canExempt: showField(["exemptedFromVat"]),
 							shouldValidate
 						}),
+						showField(LEGAL_ENTITY_IDENTIFIER_FIELD) && /* @__PURE__ */ jsx(LegalEntityIdentifierField, {
+							data: formUtils.getFieldData(form.data.additionalInformation ?? {}, LEGAL_ENTITY_IDENTIFIER_FIELD),
+							valid: formUtils.getFieldValid(form.valid.additionalInformation ?? {}, LEGAL_ENTITY_IDENTIFIER_FIELD),
+							errors: formUtils.getFieldErrors(form.errors.additionalInformation ?? {}, fieldValidationErrors, LEGAL_ENTITY_IDENTIFIER_FIELD),
+							handleChangeFor
+						}),
 						formUtils.isRequiredField("eInvoicingCode", false) && /* @__PURE__ */ jsx(EInvoicingCodeField, {
 							data: formUtils.getFieldData(form.data.additionalInformation ?? {}, EINVOICING_CODE_FIELD),
 							valid: formUtils.getFieldValid(form.valid.additionalInformation ?? {}, EINVOICING_CODE_FIELD),
@@ -4633,17 +4700,17 @@ function AdditionalInformation({ id, country, companyType, shouldValidate, field
 									"aria-invalid": !form.valid.additionalInformation?.operationalAddressIsSame,
 									name: "operationalAddressIsSame",
 									label: formUtils.getLabel("sameAsRegisteredAddress"),
-									checked: form.data.additionalInformation?.operationalAddressIsSame ? form.data.additionalInformation.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME : true,
+									checked: !!form.data.additionalInformation?.operationalAddressIsSame,
 									onChange: handleOperationalAddressIsSameChange
 								})
 							}),
-							form.data.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME && (showJapanLocalization ? /* @__PURE__ */ jsx(Suspense, {
+							!form.data.additionalInformation?.operationalAddressIsSame && (showJapanLocalization ? /* @__PURE__ */ jsx(Suspense, {
 								fallback: /* @__PURE__ */ jsx(Loader, {}),
 								children: /* @__PURE__ */ jsx(LazyJpAddress, {
 									id: ADDITIONAL_INFORMATION_FORM_ID,
 									addressType: "operationalAddress",
 									data: {
-										...form.data.additionalInformation.operationalAddress,
+										...form.data.additionalInformation?.operationalAddress,
 										country
 									},
 									shouldValidate,
@@ -4676,23 +4743,15 @@ function AdditionalInformation({ id, country, companyType, shouldValidate, field
 }
 //#endregion
 //#region src/components/Business/forms/BusinessDetails/forms.ts
-var FIELDS_NEEDED_FOR_COMPANY_SEARCH = [
-	...STATE_FIELD,
-	...TAX_INFORMATION_FIELD,
-	...BUSINESS_REGISTRATION_NUMBER_FIELD
-];
-var getBasicInformationFields = (country, taskType, isFeatureEnabled) => {
-	if (!isUsingCompanySearch(country, taskType)) return isFeatureEnabled("EnableUnifiedCompanySearch") ? BASIC_INFORMATION_FIELDS : BASIC_INFORMATION_FIELDS.filter((field) => !FIELDS_NEEDED_FOR_COMPANY_SEARCH.includes(field));
-	return BASIC_INFORMATION_FIELDS;
-};
-var getAdditionalInformationFields = (country, taskType, isFeatureEnabled) => {
-	if (isUsingCompanySearch(country, taskType) || isFeatureEnabled("EnableUnifiedCompanySearch")) return ADDITIONAL_INFORMATION_FIELDS.filter((field) => !FIELDS_NEEDED_FOR_COMPANY_SEARCH.includes(field));
-	return ADDITIONAL_INFORMATION_FIELDS;
-};
 var getFinancialInformationFields = (country) => {
 	return country === CountryCodes.UnitedKingdom ? financialInformationFields : financialInformationFieldsForEu;
 };
 var staticBusinessDetailsForms = {
+	basicInformation: {
+		formId: "basicInformation",
+		formName: "basicInformationFormName",
+		fields: BASIC_INFORMATION_FIELDS
+	},
 	businessSelection: {
 		formId: "businessSelection",
 		formName: "businessSelectionFormName",
@@ -4703,6 +4762,11 @@ var staticBusinessDetailsForms = {
 		formName: "companyStructureFormName",
 		fields: COMPANY_STRUCTURE_FIELDS
 	},
+	additionalInformation: {
+		formId: "additionalInformation",
+		formName: "additionalInformationFormName",
+		fields: ADDITIONAL_INFORMATION_FIELDS
+	},
 	companyRegistrationDocument: {
 		formId: "companyRegistrationDocument",
 		formName: "companyRegistrationDocumentFormName",
@@ -4723,6 +4787,11 @@ var staticBusinessDetailsForms = {
 		formName: "proofOfSignatoryFormName",
 		fields: ["proofOfSignatory"]
 	},
+	companyProofOfAddressDocument: {
+		formId: "companyProofOfAddressDocument",
+		formName: "proofOfAddressFormName",
+		fields: ["proofOfAddress"]
+	},
 	companyProofOfOwnershipDocument: {
 		formId: "companyProofOfOwnershipDocument",
 		formName: "proofOfOwnershipFormName",
@@ -4734,23 +4803,16 @@ var staticBusinessDetailsForms = {
 		fields: ["constitutionalDocument"]
 	}
 };
-var getForms = (country, taskType, isFeatureEnabled) => ({
-	basicInformation: {
-		formId: "basicInformation",
-		formName: "basicInformationFormName",
-		fields: getBasicInformationFields(country, taskType, isFeatureEnabled)
-	},
+var getForms = (country) => ({
+	basicInformation: staticBusinessDetailsForms.basicInformation,
 	businessSelection: staticBusinessDetailsForms.businessSelection,
 	companyStructure: staticBusinessDetailsForms.companyStructure,
-	additionalInformation: {
-		formId: "additionalInformation",
-		formName: "additionalInformationFormName",
-		fields: getAdditionalInformationFields(country, taskType, isFeatureEnabled)
-	},
+	additionalInformation: staticBusinessDetailsForms.additionalInformation,
 	companyRegistrationDocument: staticBusinessDetailsForms.companyRegistrationDocument,
 	companyTaxDocument: staticBusinessDetailsForms.companyTaxDocument,
 	companyProofOfDirectorDocument: staticBusinessDetailsForms.companyProofOfDirectorDocument,
 	companyProofOfSignatoryDocument: staticBusinessDetailsForms.companyProofOfSignatoryDocument,
+	companyProofOfAddressDocument: staticBusinessDetailsForms.companyProofOfAddressDocument,
 	companyProofOfOwnershipDocument: staticBusinessDetailsForms.companyProofOfOwnershipDocument,
 	companyFinancialInformation: {
 		formId: "companyFinancialInformation",
@@ -4764,6 +4826,7 @@ var documentFormsIds = [
 	"companyTaxDocument",
 	"companyProofOfDirectorDocument",
 	"companyProofOfSignatoryDocument",
+	"companyProofOfAddressDocument",
 	"companyConstitutionalDocument",
 	"companyProofOfOwnershipDocument"
 ];