@adyen/kyc-components 3.89.1 → 3.90.0

package/dist/{OnboardingDropinComponent-Dc5Z3bna.js → OnboardingDropinComponent-HHq3dL3N.js}

@@ -2,39 +2,53 @@
 {
   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] = "582cd106-fb31-4b3c-a94e-67d7a9285dcb", e._sentryDebugIdIdentifier = "sentry-dbid-582cd106-fb31-4b3c-a94e-67d7a9285dcb");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "790fa728-b17f-44b2-a039-31d0c565a6f9", e._sentryDebugIdIdentifier = "sentry-dbid-790fa728-b17f-44b2-a039-31d0c565a6f9");
   } catch (e) {
   }
 }
 ;
-import { b as useApiContext, j as useQuery, k as httpPost, m as httpGet, o as useSettingsContext, p as useLocalStorage, g as getLegalEntityCountry, C as CountryCodes, q as isPartOfTrustFromLegalEntity, r as LegalEntityTypes, t as hasSolePropInLegalEntity, v as getLegalRepresentative, c as useLegalEntity, w as skipToken, x as doesLegalEntityRequiresLegalRepresentative, u as useTranslation, B as Button, y as Skeleton, z as translateStringOrObject, G as Typography, H as hasOwnEntityAssociationOfType, J as isEmptyEntity, K as useAccountHolder, M as EntityTypes, N as DATA_MISSING_DECISION_MAKER_ERROR_CODE_MAPPING, O as TaskTypes, P as createLogger, U as TaskStatuses, V as useI18nContext, W as isEmpty, i as isUndefinedOrNull, X as IconButton, Y as isISIN, Z as useExperimentsContext, R as ROOT_LE, L as Loader, $ as entriesOf, a0 as useAnalyticsContext, a1 as useMutation, a2 as useQueryClient, a3 as Icon, a4 as noop, a5 as isInstantVerifiedAccount, a6 as getObscuredAccountNumber, a7 as useGetTaskStatus, a8 as useGlobalStore, a9 as isPartOfUnincorporatedPartnership, aa as getOwnSignatories, ab as getOwnDecisionMakersLegalEntityIds, ac as getOwnSolePropProblems, ad as getOwnTrustProblems, ae as getOwnUnincorporatedPartnershipProblems, af as getOwnEntityAssociations, ag as TrustMemberTypes, ah as hasAllCapabilitiesResolved, ai as hasRejectedCapabilities, aj as objectsDeepEqual, a as addResourceBundles, _ as __variableDynamicImportRuntimeHelper } from "./StoreProvider-BHckWEYg.js";
+import { b as useApiContext, j as useQuery, k as httpPost, m as httpGet, o as useSettingsContext, p as useLocalStorage, g as getLegalEntityCountry, C as CountryCodes, q as isPartOfTrustFromLegalEntity, r as LegalEntityTypes, t as hasSolePropInLegalEntity, v as getLegalRepresentative, c as useLegalEntity, w as skipToken, x as doesLegalEntityRequiresLegalRepresentative, u as useTranslation, B as Button, y as Skeleton, z as translateStringOrObject, G as Typography, H as hasOwnEntityAssociationOfType, J as isEmptyEntity, K as useAccountHolder, M as EntityTypes, N as DATA_MISSING_DECISION_MAKER_ERROR_CODE_MAPPING, O as TaskTypes, P as createLogger, U as TaskStatuses, V as useI18nContext, W as isEmpty, i as isUndefinedOrNull, X as useExperimentsContext, Y as IconButton, Z as isISIN, R as ROOT_LE, L as Loader, $ as useMutation, a0 as entriesOf, a1 as useQueryClient, a2 as useAnalyticsContext, a3 as Icon, a4 as noop, a5 as isInstantVerifiedAccount, a6 as getObscuredAccountNumber, a7 as useGetTaskStatus, a8 as useGlobalStore, a9 as isPartOfUnincorporatedPartnership, aa as getOwnSignatories, ab as getOwnDecisionMakersLegalEntityIds, ac as getOwnSolePropProblems, ad as getOwnTrustProblems, ae as getOwnUnincorporatedPartnershipProblems, af as getOwnEntityAssociations, ag as TrustMemberTypes, ah as hasAllCapabilitiesResolved, ai as hasRejectedCapabilities, aj as objectsDeepEqual, a as addResourceBundles, _ as __variableDynamicImportRuntimeHelper } from "./StoreProvider-D_0Pta7w.js";
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
 import { lazy, Suspense } from "preact/compat";
 import { useMemo, useReducer, useCallback, useEffect, useState, useRef } from "preact/hooks";
-import { S as SettingNames, I as InputText, T as TaskVerificationStatus } from "./InputText-DmMvZip7.js";
-import { T as TrustedFieldsProviders, I as Image, v as validatePatternOnBlur, a as validateNotEmptyOnBlur, m as makeMask, n as numericInputs, s as spacer, M as MaskedInput, b as alphanumericInputs, u as uppercase, c as nonInputs, d as alphaInputs, S as StateContextSetter, C as ContextGuidance, r as resolveFieldMetadata, e as validateLegalCompanyName, f as validateLatinSpaceMarkPunctuationOnlyOnBlur, g as validateJaKanaLegalCompanyName, h as validateJaHaniLegalCompanyName, R as RadioGroupCard, i as useCapabilityProblems } from "./fieldConfigurations-Kb-fhpg7.js";
-import { g as getTrustedFieldsProvider, C as CompanyTypesValues, a as getCompanyRegistrationNumberOptions, s as stateFormatGuidanceText, b as businessRegistrationNumberMasks, c as businessRegistrationNumberPatterns, v as vatNumberOptions, d as getVatNumberOptions, T as TAX_INFORMATION_FIELD, r as requestingBanking, e as requestingIssuing, f as exemptedFromTaxDefaultFieldMetadata, h as exemptedFromTaxDefaultFieldConfig, t as taxInformationDefaultFieldMetadata, i as taxInformationDefaultFieldConfig, j as TaxInformationField, k as toFullWidth, S as StateCodesUS, l as handleKeys, u as useAllowedCountries, m as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, n as COUNTRIES_USING_COMPANY_SEARCH, o as useSetting, p as individualOnfidoForms, q as individualForms, w as isBafinSignatoryFlow, x as showIdNowModal } from "./IndividualOnfido-BziAZ51z.js";
-import { u as useAssociatedLegalEntity } from "./useAssociatedLegalEntity-qIkD-MFM.js";
+import { S as SettingNames, I as InputText, T as TaskVerificationStatus } from "./InputText-DR70nC51.js";
+import { T as TrustedFieldsProviders, I as Image, v as validatePatternOnBlur, a as validateNotEmptyOnBlur, m as makeMask, n as numericInputs, s as spacer, M as MaskedInput, b as alphanumericInputs, u as uppercase, c as alphaInputs, d as nonInputs, S as StateContextSetter, C as ContextGuidance, r as resolveFieldMetadata, e as validateLegalCompanyName, f as validateLatinSpaceMarkPunctuationOnlyOnBlur, g as validateJaKanaLegalCompanyName, h as validateJaHaniLegalCompanyName, R as RadioGroupCard, i as useCapabilityProblems } from "./Spacer-D-c-0ch_.js";
+import { g as getTrustedFieldsProvider, C as CompanyTypesValues, a as getCompanyRegistrationNumberOptions, s as stateFormatGuidanceText, b as businessRegistrationNumberMasks, c as businessRegistrationNumberPatterns, v as vatNumberOptions, d as getVatNumberOptions, T as TAX_INFORMATION_FIELD, r as requestingBanking, e as requestingIssuing, t as taxInformationDefaultFieldMetadata, f as taxInformationDefaultFieldConfig, h as TaxInformationField, i as toFullWidth, u as useAllowedCountries, j as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, S as StateCodesUS, k as handleKeys, l as COUNTRIES_USING_COMPANY_SEARCH, m as useSetting, n as individualOnfidoForms, o as individualForms, p as isBafinSignatoryFlow, q as showIdNowModal } from "./IndividualOnfido-DH3VYYau.js";
+import { u as useAssociatedLegalEntity } from "./useAssociatedLegalEntity-Pgb7_79V.js";
 import cx from "classnames";
-import { a as Alert } from "./Alert-Dr-PTLt5.js";
-import { u as useTermsOfServiceStatus, a as useTermsOfServiceAcceptanceInfos } from "./useTermsOfServiceStatus-D2rhp6YQ.js";
-import { a as useToastContext } from "./useToastContext-5JlKjAbN.js";
-import { c as createFormUtils, H as Header, L as List, g as getFormProps, E as ErrorPanel, a as Link, m as mergeFieldMetadataIntoProps, C as CountryField, S as StackLayout, b as COUNTRY_FIELD, U as UnincorporatedPartnershipMemberTypes } from "./CountryField-CJeBvrKJ.js";
-import { C as Card } from "./Card-thNJfUJi.js";
+import { a as Alert } from "./Alert-DlSROjS7.js";
+import { u as useTermsOfServiceStatus, a as useTermsOfServiceAcceptanceInfos } from "./useTermsOfServiceStatus-BYJqq3Oi.js";
+import { a as useToastContext } from "./useToastContext-CqIJgGTa.js";
+import { c as createFormUtils, H as Header, L as List, g as getFormProps, E as ErrorPanel, a as Link, m as mergeFieldMetadataIntoProps, C as CountryField, b as COUNTRY_FIELD, S as StackLayout, U as UnincorporatedPartnershipMemberTypes } from "./CountryField-BO-n2nAh.js";
+import { C as Card } from "./Card-I1r9oUx8.js";
 import { signal } from "@preact/signals";
 import { d as downloadFile } from "./file-CiG1D0zy.js";
-import { C as Checkbox, u as useDebouncedCallback } from "./debouncedInputEvent-C-zXYOuE.js";
-import { F as Field, u as useForm, S as Select, L as LoaderWrapper } from "./useForm-DzONzNQu.js";
-import { R as RadioGroup, I as InputDate, f as formatDateObj, o as operationalAddressIsSameIds, A as Address, a as operationalAddressIsSameItems, g as getAddressSchemaForCountry, C as COUNTRIES_WITH_STATES_DATASET, u as useAddressCleanse, b as formatAddressForCleanse, m as mapAddressData, c as applyVerifiedBusinessData$1, d as getNestedTrustedFields, e as getAddressSchemaLabelsByCountry, S as STATE_FIELD, h as StateField, i as useFormContext } from "./Address-CIRweyT6.js";
-import { u as useGlobalDataSlice, a as useGlobalData, b as useStateContext } from "./useGlobalData-B5sNYBl5.js";
-import { I as InputNumber, a as InputCurrency, C as CURRENCY_FIELD, b as Currency, L as LegalFormField } from "./Currency-CJF_TGyQ.js";
-import { c as currencyByCountry } from "./types-1iAHHNsZ.js";
+import { C as Checkbox, u as useDebouncedCallback } from "./debouncedInputEvent-ZbuNEN6W.js";
+import { F as Field, u as useForm, S as Select, L as LoaderWrapper } from "./useForm-C261ZUdn.js";
+import { R as RadioGroup, I as InputDate, f as formatDateObj, A as Address, u as useFormContext, g as getAddressSchemaForCountry, C as COUNTRIES_WITH_STATES_DATASET, a as useAddressCleanse, b as formatAddressForCleanse, m as mapAddressData, c as getNestedTrustedFields, d as getAddressSchemaLabelsByCountry, S as STATE_FIELD, e as StateField } from "./Address-BCTZUD2J.js";
+import { u as useGlobalDataSlice } from "./useGlobalData-COSDbjgb.js";
+import { I as InputNumber, a as InputCurrency, C as CURRENCY_FIELD, b as Currency, L as LegalFormField } from "./Currency-U_NBiYL_.js";
+import { c as currencyByCountry } from "./types-DjTezJBU.js";
 import { createElement } from "preact";
-import { S as StructuredList, a as datasetUtilities, C as Confirm } from "./useDataset-D1AsbWmY.js";
-import { K as KEYBOARD_KEYS } from "./Modal-B-CzUny3.js";
-import { V as VerificationErrorAlert, u as useDeleteTransferInstrument } from "./VerificationErrorAlert-BVoljWxM.js";
-import { A as Avatar } from "./Avatar-DttOKUv4.js";
-import { g as getLegalEntityNameBasedOnType } from "./getName-BUZJBcAE.js";
+import { S as StructuredList, a as datasetUtilities, C as Confirm } from "./useDataset-RNFlX1-i.js";
+import { K as KEYBOARD_KEYS } from "./Modal-W8cfdxrr.js";
+import { V as VerificationErrorAlert, u as useDeleteTransferInstrument } from "./VerificationErrorAlert-COgw5uh1.js";
+import { A as Avatar } from "./Avatar-1DJaB2Fj.js";
+import { g as getLegalEntityNameBasedOnType } from "./getName-B1UTZRuu.js";
+const operationalAddressIsSameIds = {
+  OPERATIONAL_ADDRESS_IS_SAME: "OperationAddressAnswerYes",
+  OPERATIONAL_ADDRESS_IS_NOT_SAME: "OperationAddressAnswerNo"
+};
+const operationalAddressIsSameItems = [
+  {
+    id: operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME,
+    name: "operationalAddressIsSameItemName"
+  },
+  {
+    id: operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME,
+    name: "operationalAddressIsNotSameItemName"
+  }
+];
 const getPciStatus = async (legalEntityId, baseUrl, data) => {
   const filteredData = {
     ...data,
@@ -1584,7 +1598,7 @@ function BusinessRegistrationNumberField({
   const showExemptedOption = canExempt && !!registrationNumberOptions && registrationNumberOptions.length > 1;
   const registrationNumberType = data.exemptedFromRegistrationNumber ? "exempted" : data.registrationNumberType ? data.registrationNumberType : defaultType;
   const handleRegistrationNumberChange = (e, mode) => {
-    const value = typeof e === "string" ? e : e.target?.value;
+    const value = typeof e === "string" ? e : e.currentTarget.value;
     handleChangeFor("registrationNumber", mode)(value);
     handleChangeFor("registrationNumberType")(registrationNumberType);
   };
@@ -2238,62 +2252,420 @@ const eInvoicingCodeFieldMetadata = {
     }
   }
 };
-const vatAbsenceReasonMetadata = {
-  validators: [validateNotEmptyOnBlur]
+const industryCodeFieldValidation = () => ({
+  industryCodes: {
+    modes: ["blur"],
+    validate: (industryCode) => !isEmpty(industryCode),
+    errorMessage: "fieldIsRequired"
+  }
+});
+const industryCodeFieldMetadata = {
+  label: "industry",
+  validators: [
+    industryCodeFieldValidation().industryCodes
+  ]
 };
-const defaultFieldMetadata$2 = {
-  label: "vatNumber"
+const selectedBusinessLine = signal(void 0);
+const shouldSignNewPci = signal(false);
+const industryCodesContent = "adyen-kyc-industry-codes-content";
+const industryCodesSelection = "adyen-kyc-industry-codes-selection";
+const styles$1 = {
+  industryCodesContent,
+  industryCodesSelection
 };
-const defaultFieldConfig$2 = {
-  [CountryCodes.Austria]: {
-    label: "UST-ID",
-    validators: validatePatternOnBlur(/^ATU\d{8}$/),
-    mask: {
-      mask: makeMask(...nonInputs("ATU", { includeInValue: true }), spacer, ...numericInputs(8))
-    },
-    guidanceText: {
-      key: "enterTheRemainingNDigitsForExample",
-      values: {
-        numDigits: "8",
-        example: "ATU51507409"
-      }
+const mapSelectedCodes = (selectedCodes) => {
+  return selectedCodes && selectedCodes.length > 0 ? selectedCodes.map((i) => {
+    return {
+      value: i,
+      touched: !!i.id
+    };
+  }) : [{ value: { id: "", name: "" }, touched: false }];
+};
+function IndustryCodeField({
+  data,
+  valid,
+  errors,
+  labels,
+  placeholders,
+  readonly,
+  handleChangeFor,
+  guidanceText,
+  setErrors,
+  // need to manually set errors due to nested select components
+  setValid,
+  // need to manually set validation due to nested select components
+  businessLineTypes,
+  single = false,
+  industryCodes,
+  existingBusinessLines
+}) {
+  const { t } = useTranslation("ui");
+  const industryCodesRef = useRef(null);
+  const { isExperimentEnabled } = useExperimentsContext();
+  const singleIndustryCode = single || !!selectedBusinessLine.value || // when editing a business line, only single dropdown should render
+  isExperimentEnabled("EnableLimitToSingleBusinessLine");
+  const allIndustryCodeSelectItems = useMemo(
+    () => industryCodes?.map((entry) => ({
+      id: entry.code,
+      name: `${entry.code} - ${entry.description}`
+    })) ?? [],
+    [industryCodes]
+  );
+  const selectableIndustryCodes = useMemo(() => {
+    if (!businessLineTypes.includes("acquiring")) return allIndustryCodeSelectItems;
+    const selectedIds = data.industryCodes?.map((c) => c.id);
+    const existingIds = (existingBusinessLines ?? []).map((b) => b.industryCode);
+    return allIndustryCodeSelectItems.filter((item) => {
+      const isDuplicate = selectedIds?.includes(item.id) || existingIds?.includes(item.id);
+      return !isDuplicate;
+    });
+  }, [allIndustryCodeSelectItems, businessLineTypes, data.industryCodes, existingBusinessLines]);
+  const selectedCodes = data.industryCodes;
+  const [items, setItems] = useState(mapSelectedCodes(selectedCodes));
+  useEffect(() => {
+    setItems(mapSelectedCodes(selectedCodes));
+  }, [selectedCodes]);
+  const updateIndustryCodes = (value) => {
+    handleChangeFor("industryCodes")(value);
+  };
+  const addIndustryCodeField = (e) => {
+    if (items[items.length - 1].value.id === "") {
+      handleIndustryCodeFocusOut(e, items.length - 1);
+      return;
     }
-  },
-  [CountryCodes.Belgium]: {
-    label: "euVatNumber",
-    validators: validatePatternOnBlur(/^BE[10]\d{9}$/),
-    mask: {
-      mask: makeMask(...nonInputs("BE", { includeInValue: true }), spacer, ...numericInputs(10))
-    },
-    guidanceText: {
-      key: "enterTheRemainingNDigitsForExample",
-      values: {
-        numDigits: "10",
-        example: "BE1234567890"
-      }
+    const newItems = [...items, { value: { id: "", name: "" }, touched: false }];
+    setItems(newItems);
+    updateIndustryCodes(newItems.map((item) => item.value));
+  };
+  const removeField = (indexToRemove) => {
+    const newItems = items.filter((_, index) => index !== indexToRemove);
+    setItems(newItems);
+    updateIndustryCodes(newItems.map((item) => item.value));
+  };
+  const handleSelectIndustryCode = (indexToUpdate, selectedItem) => {
+    setItems((prevItems) => {
+      const newItems = [...prevItems];
+      newItems[indexToUpdate] = {
+        value: {
+          id: selectedItem.id,
+          name: selectedItem.name
+        },
+        touched: true
+      };
+      updateIndustryCodes(
+        newItems.map((item) => {
+          return {
+            id: item.value.id,
+            name: item.value.name
+          };
+        })
+      );
+      return newItems;
+    });
+  };
+  const handleIndustryCodeFocusOut = (e, index) => {
+    if (industryCodesRef.current && !industryCodesRef.current.contains(e.relatedTarget)) {
+      setItems((prevItems) => {
+        if (prevItems[index].value.id || prevItems[index].touched) {
+          return prevItems;
+        }
+        const newItems = [...prevItems];
+        newItems[index] = { ...newItems[index], touched: true };
+        const isGroupInvalid = newItems.some((item) => item.value.id === "");
+        if (isGroupInvalid) {
+          setErrors?.(
+            "industryCodes",
+            {
+              isValid: false,
+              errorMessage: "fieldIsRequired",
+              hasError: true
+            },
+            "industryCodesForm"
+          );
+          setValid?.("industryCodes", false, "industryCodesForm");
+        } else {
+          setErrors?.("industryCodes", null, "industryCodesForm");
+          setValid?.("industryCodes", true, "industryCodesForm");
+        }
+        return newItems;
+      });
     }
-  },
-  [CountryCodes.Bulgaria]: {
-    label: "identifikacionenNomerDDS",
-    validators: validatePatternOnBlur(/^BG\d{9,10}$/),
-    mask: {
-      mask: makeMask(
-        ...nonInputs("BG", { includeInValue: true }),
-        spacer,
-        ...numericInputs(9),
-        ...numericInputs(1, true)
-      )
-    },
-    guidanceText: {
-      key: "enterTheRemainingXToYDigitsForExample",
-      values: {
-        minDigits: "9",
-        maxDigits: "10",
-        example: "BG1234567890"
-      }
+  };
+  return /* @__PURE__ */ jsx(
+    Field,
+    {
+      name: "industryCodes",
+      label: labels?.industryCodes || t(($) => $["industry"]),
+      errorMessage: errors.industryCodes,
+      isValid: valid.industryCodes,
+      formatGuidance: guidanceText.industryCodes,
+      showErrorIcon: false,
+      children: (childProps) => /* @__PURE__ */ jsx(Wrapper, { single: singleIndustryCode, children: /* @__PURE__ */ jsx("div", { className: styles$1.industryCodesContent, ref: industryCodesRef, children: items.map((code, index) => {
+        const isInvalid = code.touched && code.value.id === "";
+        return /* @__PURE__ */ jsxs("div", { className: styles$1.industryCodesSelection, children: [
+          /* @__PURE__ */ jsx(
+            Select,
+            {
+              ...childProps,
+              id: `industryCodeSelection-${index}`,
+              name: `industryCodeSelection-${index}`,
+              selected: code.value,
+              placeholder: placeholders?.industryCodes || t(($) => $["industryCode__placeholder"]),
+              items: allIndustryCodeSelectItems,
+              excludedValues: allIndustryCodeSelectItems.filter(
+                (i) => !selectableIndustryCodes.includes(i)
+              ),
+              readonly: !!data.industryCodes && readonly || !!industryCodes && selectableIndustryCodes.length === 0,
+              onSelect: (selectedItem) => handleSelectIndustryCode(index, selectedItem),
+              isInvalid,
+              onBlur: (e) => handleIndustryCodeFocusOut(e, index)
+            }
+          ),
+          !singleIndustryCode && /* @__PURE__ */ jsxs(Fragment, { children: [
+            /* @__PURE__ */ jsx(
+              IconButton,
+              {
+                ariaLabel: t(($) => $["removeIndustryCode"]),
+                variant: "tertiary",
+                icon: "minusCircleFilled",
+                circle: true,
+                onClick: () => removeField(index),
+                disabled: items.length === 1 || readonly
+              }
+            ),
+            /* @__PURE__ */ jsx(
+              IconButton,
+              {
+                ariaLabel: t(($) => $["addIndustryCode"]),
+                variant: "tertiary",
+                icon: "plusCircleFilled",
+                circle: true,
+                onClick: addIndustryCodeField,
+                disabled: readonly || code.value.id === "" || code.value.id !== "" && index !== items.length - 1 || selectableIndustryCodes.length === 0
+              }
+            )
+          ] })
+        ] }, code.value.id);
+      }) }) })
     }
+  );
+}
+function Wrapper({ single, children }) {
+  return single ? children : /* @__PURE__ */ jsx(List, { dividers: false, variant: "grouped-primary", children });
+}
+const stockExchangeMICFieldMetadata = {
+  label: "stockExchangeMIC",
+  validators: [validateNotEmptyOnBlur, validatePatternOnBlur(/^[a-zA-Z0-9]{4}$/)],
+  mask: {
+    mask: makeMask(...alphanumericInputs(4)),
+    transformOnType: uppercase
   },
-  [CountryCodes.Croatia]: {
+  guidanceText: {
+    key: "enterNCharactersForExample",
+    values: {
+      numChars: "4",
+      example: "XNAS"
+    }
+  }
+};
+const STOCK_EXCHANGE_MIC_FIELD = [
+  "stockExchangeMIC"
+];
+function StockExchangeMICField({
+  data,
+  valid,
+  errors,
+  labels,
+  placeholders,
+  readonly,
+  mask,
+  guidanceText,
+  shouldValidate,
+  handleChangeFor
+}) {
+  return /* @__PURE__ */ jsx(
+    MaskedInput,
+    {
+      name: "stockExchangeMIC",
+      type: "text",
+      label: labels.stockExchangeMIC ?? "",
+      formatGuidance: guidanceText?.stockExchangeMIC,
+      placeholder: placeholders?.stockExchangeMIC,
+      ...mask,
+      errorMessage: errors.stockExchangeMIC,
+      isValid: valid.stockExchangeMIC ?? false,
+      value: data.stockExchangeMIC ?? "",
+      readonly,
+      shouldValidate,
+      onInput: handleChangeFor("stockExchangeMIC", "input"),
+      onBlur: handleChangeFor("stockExchangeMIC", "blur"),
+      "aria-required": true,
+      "aria-invalid": !valid.stockExchangeMIC
+    }
+  );
+}
+const stockISINFieldMetadata = {
+  label: "stockISIN",
+  validators: [
+    validateNotEmptyOnBlur,
+    {
+      modes: ["blur"],
+      validate: (value) => !!value && isISIN(value)
+    }
+  ],
+  mask: {
+    mask: makeMask(...alphaInputs(2), ...alphanumericInputs(9), ...numericInputs(1)),
+    transformOnType: uppercase
+  },
+  helperText: "stockISINHelper",
+  guidanceText: {
+    key: "validationPleaseEnterAValidStockISIN",
+    values: {
+      example: "NL0012969182"
+    }
+  }
+};
+const STOCK_ISIN_FIELD = ["stockISIN"];
+function StockISINField({
+  data,
+  valid,
+  errors,
+  labels,
+  placeholders,
+  readonly,
+  mask,
+  guidanceText,
+  shouldValidate,
+  handleChangeFor
+}) {
+  return /* @__PURE__ */ jsx(
+    MaskedInput,
+    {
+      name: "stockISIN",
+      type: "text",
+      label: labels.stockISIN ?? "",
+      formatGuidance: guidanceText?.stockISIN,
+      placeholder: placeholders?.stockISIN,
+      ...mask,
+      errorMessage: errors.stockISIN,
+      isValid: valid.stockISIN ?? false,
+      value: data.stockISIN ?? "",
+      readonly,
+      shouldValidate,
+      onInput: handleChangeFor("stockISIN", "input"),
+      onBlur: handleChangeFor("stockISIN", "blur"),
+      "aria-required": true,
+      "aria-invalid": !valid.stockISIN
+    }
+  );
+}
+const stockTickerSymbolFieldMetadata = {
+  label: "stockTickerSymbol",
+  validators: [validateNotEmptyOnBlur, validatePatternOnBlur(/^[A-Z\d]{1,5}$/)],
+  mask: {
+    mask: makeMask(...alphanumericInputs(1), ...alphanumericInputs(4)),
+    transformOnType: uppercase
+  },
+  guidanceText: {
+    key: "enterAMaximumOfNCharactersForExample",
+    values: {
+      maxChars: "5",
+      example: "ADYEN"
+    }
+  }
+};
+const STOCK_TICKER_SYMBOL_FIELD = [
+  "stockTickerSymbol"
+];
+function StockTickerSymbolField({
+  data,
+  valid,
+  errors,
+  labels,
+  placeholders,
+  readonly,
+  mask,
+  guidanceText,
+  shouldValidate,
+  handleChangeFor
+}) {
+  return /* @__PURE__ */ jsx(
+    MaskedInput,
+    {
+      name: "stockTickerSymbol",
+      type: "text",
+      label: labels.stockTickerSymbol ?? "",
+      formatGuidance: guidanceText?.stockTickerSymbol,
+      placeholder: placeholders?.stockTickerSymbol,
+      ...mask,
+      errorMessage: errors.stockTickerSymbol,
+      isValid: valid.stockTickerSymbol ?? false,
+      value: data.stockTickerSymbol ?? "",
+      readonly,
+      shouldValidate,
+      onInput: handleChangeFor("stockTickerSymbol", "input"),
+      onBlur: handleChangeFor("stockTickerSymbol", "blur"),
+      "aria-required": true,
+      "aria-invalid": !valid.stockTickerSymbol
+    }
+  );
+}
+const vatAbsenceReasonMetadata = {
+  validators: [validateNotEmptyOnBlur]
+};
+const defaultFieldMetadata$2 = {
+  label: "vatNumber"
+};
+const defaultFieldConfig$2 = {
+  [CountryCodes.Austria]: {
+    label: "UST-ID",
+    validators: validatePatternOnBlur(/^ATU\d{8}$/),
+    mask: {
+      mask: makeMask(...nonInputs("ATU", { includeInValue: true }), spacer, ...numericInputs(8))
+    },
+    guidanceText: {
+      key: "enterTheRemainingNDigitsForExample",
+      values: {
+        numDigits: "8",
+        example: "ATU51507409"
+      }
+    }
+  },
+  [CountryCodes.Belgium]: {
+    label: "euVatNumber",
+    validators: validatePatternOnBlur(/^BE[10]\d{9}$/),
+    mask: {
+      mask: makeMask(...nonInputs("BE", { includeInValue: true }), spacer, ...numericInputs(10))
+    },
+    guidanceText: {
+      key: "enterTheRemainingNDigitsForExample",
+      values: {
+        numDigits: "10",
+        example: "BE1234567890"
+      }
+    }
+  },
+  [CountryCodes.Bulgaria]: {
+    label: "identifikacionenNomerDDS",
+    validators: validatePatternOnBlur(/^BG\d{9,10}$/),
+    mask: {
+      mask: makeMask(
+        ...nonInputs("BG", { includeInValue: true }),
+        spacer,
+        ...numericInputs(9),
+        ...numericInputs(1, true)
+      )
+    },
+    guidanceText: {
+      key: "enterTheRemainingXToYDigitsForExample",
+      values: {
+        minDigits: "9",
+        maxDigits: "10",
+        example: "BG1234567890"
+      }
+    }
+  },
+  [CountryCodes.Croatia]: {
     label: "PDVIdBrojOIB",
     validators: validatePatternOnBlur(/^HR\d{11}$/),
     mask: {
@@ -2902,439 +3274,83 @@ const inferVatNumberType = (vatNumber, country) => {
 function getDefaultVatNumberType(vatNumber, country) {
   return vatNumber ? inferVatNumberType(vatNumber, country) : vatNumberOptions[country]?.[0]?.id;
 }
-const industryCodeFieldValidation = () => ({
-  industryCodes: {
-    modes: ["blur"],
-    validate: (industryCode) => !isEmpty(industryCode),
-    errorMessage: "fieldIsRequired"
-  }
-});
-const industryCodeFieldMetadata = {
-  label: "industry",
-  validators: [
-    industryCodeFieldValidation().industryCodes
-  ]
-};
-const selectedBusinessLine = signal(void 0);
-const shouldSignNewPci = signal(false);
-const industryCodesContent = "adyen-kyc-industry-codes-content";
-const industryCodesSelection = "adyen-kyc-industry-codes-selection";
-const styles$1 = {
-  industryCodesContent,
-  industryCodesSelection
-};
-const mapSelectedCodes = (selectedCodes) => {
-  return selectedCodes && selectedCodes.length > 0 ? selectedCodes.map((i) => {
-    return {
-      value: i,
-      touched: !!i.id
-    };
-  }) : [{ value: { id: "", name: "" }, touched: false }];
-};
-function IndustryCodeField({
-  data,
-  valid,
-  errors,
-  labels,
-  placeholders,
-  readonly,
-  handleChangeFor,
-  guidanceText,
-  setErrors,
-  // need to manually set errors due to nested select components
-  setValid,
-  // need to manually set validation due to nested select components
-  businessLineTypes,
-  single = false,
-  industryCodes,
-  existingBusinessLines
-}) {
-  const { t } = useTranslation("ui");
-  const industryCodesRef = useRef(null);
-  const singleIndustryCode = single || !!selectedBusinessLine.value;
-  const allIndustryCodeSelectItems = useMemo(
-    () => industryCodes?.map((entry) => ({
-      id: entry.code,
-      name: `${entry.code} - ${entry.description}`
-    })) ?? [],
-    [industryCodes]
+function VatNumberTypeSelector({
+  country,
+  companyType,
+  selected,
+  setSelected,
+  exemptedOption
+}) {
+  const { t } = useTranslation("common");
+  const handleSelect = useCallback(
+    (selectedStr) => {
+      const newSelected = selectedStr;
+      if (newSelected === "exempted") {
+        if (exemptedOption) {
+          setSelected(newSelected, true);
+        }
+        return;
+      }
+      setSelected(newSelected, false);
+    },
+    [exemptedOption, setSelected]
   );
-  const selectableIndustryCodes = useMemo(() => {
-    if (!businessLineTypes.includes("acquiring")) return allIndustryCodeSelectItems;
-    const selectedIds = data.industryCodes?.map((c) => c.id);
-    const existingIds = (existingBusinessLines ?? []).map((b) => b.industryCode);
-    return allIndustryCodeSelectItems.filter((item) => {
-      const isDuplicate = selectedIds?.includes(item.id) || existingIds?.includes(item.id);
-      return !isDuplicate;
-    });
-  }, [allIndustryCodeSelectItems, businessLineTypes, data.industryCodes, existingBusinessLines]);
-  const selectedCodes = data.industryCodes;
-  const [items, setItems] = useState(mapSelectedCodes(selectedCodes));
+  const options = useMemo(() => {
+    const availableOptions = getVatNumberOptions(country, companyType) ?? [];
+    if (availableOptions.length === 0 || !exemptedOption) return availableOptions;
+    return [
+      ...availableOptions,
+      {
+        id: "exempted",
+        name: exemptedOption
+      }
+    ];
+  }, [country, companyType, exemptedOption]);
   useEffect(() => {
-    setItems(mapSelectedCodes(selectedCodes));
-  }, [selectedCodes]);
-  const updateIndustryCodes = (value) => {
-    handleChangeFor("industryCodes")(value);
-  };
-  const addIndustryCodeField = (e) => {
-    if (items[items.length - 1].value.id === "") {
-      handleIndustryCodeFocusOut(e, items.length - 1);
-      return;
-    }
-    const newItems = [...items, { value: { id: "", name: "" }, touched: false }];
-    setItems(newItems);
-    updateIndustryCodes(newItems.map((item) => item.value));
-  };
-  const removeField = (indexToRemove) => {
-    const newItems = items.filter((_, index) => index !== indexToRemove);
-    setItems(newItems);
-    updateIndustryCodes(newItems.map((item) => item.value));
-  };
-  const handleSelectIndustryCode = (indexToUpdate, selectedItem) => {
-    setItems((prevItems) => {
-      const newItems = [...prevItems];
-      newItems[indexToUpdate] = {
-        value: {
-          id: selectedItem.id,
-          name: selectedItem.name
-        },
-        touched: true
-      };
-      updateIndustryCodes(
-        newItems.map((item) => {
-          return {
-            id: item.value.id,
-            name: item.value.name
-          };
-        })
-      );
-      return newItems;
-    });
-  };
-  const handleIndustryCodeFocusOut = (e, index) => {
-    if (industryCodesRef.current && !industryCodesRef.current.contains(e.relatedTarget)) {
-      setItems((prevItems) => {
-        if (prevItems[index].value.id || prevItems[index].touched) {
-          return prevItems;
-        }
-        const newItems = [...prevItems];
-        newItems[index] = { ...newItems[index], touched: true };
-        const isGroupInvalid = newItems.some((item) => item.value.id === "");
-        if (isGroupInvalid) {
-          setErrors?.(
-            "industryCodes",
-            {
-              isValid: false,
-              errorMessage: "fieldIsRequired",
-              hasError: true
-            },
-            "industryCodesForm"
-          );
-          setValid?.("industryCodes", false, "industryCodesForm");
-        } else {
-          setErrors?.("industryCodes", null, "industryCodesForm");
-          setValid?.("industryCodes", true, "industryCodesForm");
-        }
-        return newItems;
-      });
+    if (!selected && options.length > 0) {
+      handleSelect(options[0].id);
     }
-  };
+  }, [options, selected, handleSelect]);
+  if (options.length <= 1) return null;
   return /* @__PURE__ */ jsx(
     Field,
     {
-      name: "industryCodes",
-      label: labels?.industryCodes || t(($) => $["industry"]),
-      errorMessage: errors.industryCodes,
-      isValid: valid.industryCodes,
-      formatGuidance: guidanceText.industryCodes,
-      showErrorIcon: false,
-      children: (childProps) => /* @__PURE__ */ jsx(Wrapper, { single: singleIndustryCode, children: /* @__PURE__ */ jsx("div", { className: styles$1.industryCodesContent, ref: industryCodesRef, children: items.map((code, index) => {
-        const isInvalid = code.touched && code.value.id === "";
-        return /* @__PURE__ */ jsxs("div", { className: styles$1.industryCodesSelection, children: [
-          /* @__PURE__ */ jsx(
-            Select,
-            {
-              ...childProps,
-              id: `industryCodeSelection-${index}`,
-              name: `industryCodeSelection-${index}`,
-              selected: code.value,
-              placeholder: placeholders?.industryCodes || t(($) => $["industryCode__placeholder"]),
-              items: allIndustryCodeSelectItems,
-              excludedValues: allIndustryCodeSelectItems.filter(
-                (i) => !selectableIndustryCodes.includes(i)
-              ),
-              readonly: !!data.industryCodes && readonly || !!industryCodes && selectableIndustryCodes.length === 0,
-              onSelect: (selectedItem) => handleSelectIndustryCode(index, selectedItem),
-              isInvalid,
-              onBlur: (e) => handleIndustryCodeFocusOut(e, index)
-            }
-          ),
-          !singleIndustryCode && /* @__PURE__ */ jsxs(Fragment, { children: [
-            /* @__PURE__ */ jsx(
-              IconButton,
-              {
-                ariaLabel: t(($) => $["removeIndustryCode"]),
-                variant: "tertiary",
-                icon: "minusCircleFilled",
-                circle: true,
-                onClick: () => removeField(index),
-                disabled: items.length === 1 || readonly
-              }
-            ),
-            /* @__PURE__ */ jsx(
-              IconButton,
-              {
-                ariaLabel: t(($) => $["addIndustryCode"]),
-                variant: "tertiary",
-                icon: "plusCircleFilled",
-                circle: true,
-                onClick: addIndustryCodeField,
-                disabled: readonly || code.value.id === "" || code.value.id !== "" && index !== items.length - 1 || selectableIndustryCodes.length === 0
-              }
-            )
-          ] })
-        ] }, code.value.id);
-      }) }) })
+      el: "fieldset",
+      name: "vatNumberType",
+      label: t(($) => $["whichTypeOfTaxIdNumberDoYouHave"]),
+      children: (childProps) => /* @__PURE__ */ jsx(
+        RadioGroup,
+        {
+          ...childProps,
+          name: "vatNumberType",
+          items: options,
+          value: selected,
+          onChange: handleSelect
+        }
+      )
     }
   );
 }
-function Wrapper({ single, children }) {
-  return single ? children : /* @__PURE__ */ jsx(List, { dividers: false, variant: "grouped-primary", children });
-}
-const stockExchangeMICFieldMetadata = {
-  label: "stockExchangeMIC",
-  validators: [validateNotEmptyOnBlur, validatePatternOnBlur(/^[a-zA-Z0-9]{4}$/)],
-  mask: {
-    mask: makeMask(...alphanumericInputs(4)),
-    transformOnType: uppercase
-  },
-  guidanceText: {
-    key: "enterNCharactersForExample",
-    values: {
-      numChars: "4",
-      example: "XNAS"
-    }
-  }
-};
-const STOCK_EXCHANGE_MIC_FIELD = [
-  "stockExchangeMIC"
+const VAT_NUMBER_FIELD = [
+  "vatNumber",
+  "vatNumberType",
+  "exemptedFromVat",
+  "vatAbsenceReason"
 ];
-function StockExchangeMICField({
+function VatNumberField({
   data,
   valid,
   errors,
   labels,
-  placeholders,
-  readonly,
   mask,
   guidanceText,
+  placeholders,
+  readonly,
+  optional,
   shouldValidate,
-  handleChangeFor
-}) {
-  return /* @__PURE__ */ jsx(
-    MaskedInput,
-    {
-      name: "stockExchangeMIC",
-      type: "text",
-      label: labels.stockExchangeMIC ?? "",
-      formatGuidance: guidanceText?.stockExchangeMIC,
-      placeholder: placeholders?.stockExchangeMIC,
-      ...mask,
-      errorMessage: errors.stockExchangeMIC,
-      isValid: valid.stockExchangeMIC ?? false,
-      value: data.stockExchangeMIC ?? "",
-      readonly,
-      shouldValidate,
-      onInput: handleChangeFor("stockExchangeMIC", "input"),
-      onBlur: handleChangeFor("stockExchangeMIC", "blur"),
-      "aria-required": true,
-      "aria-invalid": !valid.stockExchangeMIC
-    }
-  );
-}
-const stockISINFieldMetadata = {
-  label: "stockISIN",
-  validators: [
-    validateNotEmptyOnBlur,
-    {
-      modes: ["blur"],
-      validate: (value) => !!value && isISIN(value)
-    }
-  ],
-  mask: {
-    mask: makeMask(...alphaInputs(2), ...alphanumericInputs(9), ...numericInputs(1)),
-    transformOnType: uppercase
-  },
-  helperText: "stockISINHelper",
-  guidanceText: {
-    key: "validationPleaseEnterAValidStockISIN",
-    values: {
-      example: "NL0012969182"
-    }
-  }
-};
-const STOCK_ISIN_FIELD = ["stockISIN"];
-function StockISINField({
-  data,
-  valid,
-  errors,
-  labels,
-  placeholders,
-  readonly,
-  mask,
-  guidanceText,
-  shouldValidate,
-  handleChangeFor
-}) {
-  return /* @__PURE__ */ jsx(
-    MaskedInput,
-    {
-      name: "stockISIN",
-      type: "text",
-      label: labels.stockISIN ?? "",
-      formatGuidance: guidanceText?.stockISIN,
-      placeholder: placeholders?.stockISIN,
-      ...mask,
-      errorMessage: errors.stockISIN,
-      isValid: valid.stockISIN ?? false,
-      value: data.stockISIN ?? "",
-      readonly,
-      shouldValidate,
-      onInput: handleChangeFor("stockISIN", "input"),
-      onBlur: handleChangeFor("stockISIN", "blur"),
-      "aria-required": true,
-      "aria-invalid": !valid.stockISIN
-    }
-  );
-}
-const stockTickerSymbolFieldMetadata = {
-  label: "stockTickerSymbol",
-  validators: [validateNotEmptyOnBlur, validatePatternOnBlur(/^[A-Z\d]{1,5}$/)],
-  mask: {
-    mask: makeMask(...alphanumericInputs(1), ...alphanumericInputs(4)),
-    transformOnType: uppercase
-  },
-  guidanceText: {
-    key: "enterAMaximumOfNCharactersForExample",
-    values: {
-      maxChars: "5",
-      example: "ADYEN"
-    }
-  }
-};
-const STOCK_TICKER_SYMBOL_FIELD = [
-  "stockTickerSymbol"
-];
-function StockTickerSymbolField({
-  data,
-  valid,
-  errors,
-  labels,
-  placeholders,
-  readonly,
-  mask,
-  guidanceText,
-  shouldValidate,
-  handleChangeFor
-}) {
-  return /* @__PURE__ */ jsx(
-    MaskedInput,
-    {
-      name: "stockTickerSymbol",
-      type: "text",
-      label: labels.stockTickerSymbol ?? "",
-      formatGuidance: guidanceText?.stockTickerSymbol,
-      placeholder: placeholders?.stockTickerSymbol,
-      ...mask,
-      errorMessage: errors.stockTickerSymbol,
-      isValid: valid.stockTickerSymbol ?? false,
-      value: data.stockTickerSymbol ?? "",
-      readonly,
-      shouldValidate,
-      onInput: handleChangeFor("stockTickerSymbol", "input"),
-      onBlur: handleChangeFor("stockTickerSymbol", "blur"),
-      "aria-required": true,
-      "aria-invalid": !valid.stockTickerSymbol
-    }
-  );
-}
-function VatNumberTypeSelector({
-  country,
-  companyType,
-  selected,
-  setSelected,
-  exemptedOption
-}) {
-  const { t } = useTranslation("common");
-  const handleSelect = useCallback(
-    (selectedStr) => {
-      const newSelected = selectedStr;
-      if (newSelected === "exempted") {
-        if (exemptedOption) {
-          setSelected(newSelected, true);
-        }
-        return;
-      }
-      setSelected(newSelected, false);
-    },
-    [exemptedOption, setSelected]
-  );
-  const options = useMemo(() => {
-    const availableOptions = getVatNumberOptions(country, companyType) ?? [];
-    if (availableOptions.length === 0 || !exemptedOption) return availableOptions;
-    return [
-      ...availableOptions,
-      {
-        id: "exempted",
-        name: exemptedOption
-      }
-    ];
-  }, [country, companyType, exemptedOption]);
-  useEffect(() => {
-    if (!selected && options.length > 0) {
-      handleSelect(options[0].id);
-    }
-  }, [options, selected, handleSelect]);
-  if (options.length <= 1) return null;
-  return /* @__PURE__ */ jsx(
-    Field,
-    {
-      el: "fieldset",
-      name: "vatNumberType",
-      label: t(($) => $["whichTypeOfTaxIdNumberDoYouHave"]),
-      children: (childProps) => /* @__PURE__ */ jsx(
-        RadioGroup,
-        {
-          ...childProps,
-          name: "vatNumberType",
-          items: options,
-          value: selected,
-          onChange: handleSelect
-        }
-      )
-    }
-  );
-}
-const VAT_NUMBER_FIELD = [
-  "vatNumber",
-  "vatNumberType",
-  "exemptedFromVat",
-  "vatAbsenceReason"
-];
-function VatNumberField({
-  data,
-  valid,
-  errors,
-  labels,
-  mask,
-  guidanceText,
-  placeholders,
-  readonly,
-  optional,
-  shouldValidate,
-  handleChangeFor,
-  canExempt,
-  country
+  handleChangeFor,
+  canExempt,
+  country
 }) {
   const { isExperimentEnabled } = useExperimentsContext();
   const options = vatNumberOptions[country];
@@ -3343,7 +3359,7 @@ function VatNumberField({
   const showVatExemptedOptions = canExempt && options?.length > 1;
   const vatNumberType = data.exemptedFromVat ? "exempted" : data.vatNumberType ? data.vatNumberType : defaultType;
   const handleVatNumberChange = (e, mode) => {
-    const value = typeof e === "string" ? e : e.target?.value;
+    const value = typeof e === "string" ? e : e.currentTarget.value;
     handleChangeFor("vatNumber", mode)(value);
     handleChangeFor("vatNumberType")(vatNumberType);
   };
@@ -3641,16 +3657,10 @@ const legalFormFieldMetadata = {
   validators: [validateNotEmptyOnBlur]
 };
 const isBankAccountRequestedForOrganization = signal(void 0);
-const setIsBankAccountRequestedForOrganization = (hasRequest) => {
-  isBankAccountRequestedForOrganization.value = hasRequest;
-};
 const tinMatched = signal(void 0);
 const businessMismatchModalOpen = signal(false);
 const verifiedBusiness = signal(void 0);
 const isVerifiedSingleCompanySearchResult = signal(false);
-const setVerifiedBusiness = (company) => {
-  verifiedBusiness.value = company;
-};
 const divider = "adyen-kyc-divider";
 const styles = {
   divider
@@ -3711,7 +3721,7 @@ function VerifiedBusinessCard({
   ] });
 }
 const LazyJpAddress = lazy(
-  async () => (await import("./JpAddress-Bl9Ppmv5.js")).JpAddress
+  async () => (await import("./JpAddress-CvQyBExq.js")).JpAddress
 );
 const ADDITIONAL_INFORMATION_FORM_ID = "additionalInformation";
 const ADDITIONAL_INFORMATION_FIELDS = [
@@ -3730,38 +3740,25 @@ const ADDITIONAL_INFORMATION_FIELDS = [
   ...registrationAddressFields
 ];
 function AdditionalInformation({
-  data,
-  labels,
-  placeholders,
-  helperText,
-  readOnly,
-  shouldValidate,
-  formVerificationErrors,
-  fieldValidationErrors,
-  allFields,
-  requiredFields,
-  obscuredFields,
-  optionalFields,
-  readOnlyFields,
-  trustedFields,
+  id,
   country,
-  companyType = CompanyTypesValues.PRIVATE_COMPANY,
-  showCompanyStructure
+  companyType,
+  shouldValidate,
+  validationErrors = {},
+  verificationErrors = {}
 }) {
-  const { basicInformation } = useGlobalData();
-  const { sliceData, updateStateSlice } = useGlobalDataSlice(ADDITIONAL_INFORMATION_FORM_ID);
-  const { data: rootLegalEntity } = useLegalEntity(ROOT_LE);
-  const { t, i18n } = useTranslation(["business"]);
-  const { t: commonT } = useTranslation("common");
+  const { t, i18n } = useTranslation(["common", "business"]);
+  const { form } = useFormContext();
   const { isExperimentEnabled } = useExperimentsContext();
+  const { data: rootLegalEntity } = useLegalEntity(ROOT_LE);
   const verifiedBusiness$1 = verifiedBusiness.value;
   const showVerified = !!verifiedBusiness$1;
   const showStockData = companyType === CompanyTypesValues.PUBLIC_COMPANY;
   const addressSchema = getAddressSchemaForCountry(country).filter(
     (field) => !COUNTRIES_WITH_STATES_DATASET.includes(country) ? field !== "stateOrProvince" : true
   );
-  const currentCountryTaxInformation = sliceData?.taxInformation?.find(
-    (tax) => tax.country === country
+  const currentCountryTaxInformation = form.data?.additionalInformation?.taxInformation?.find(
+    (taxId) => taxId.country === country
   );
   const businessLineTypes = [];
   if (requestingBanking(rootLegalEntity)) {
@@ -3770,61 +3767,85 @@ function AdditionalInformation({
   if (requestingIssuing(rootLegalEntity)) {
     businessLineTypes.push("issuing");
   }
-  const initialFormUtilsProps = useMemo(
-    () => ({
-      data,
-      labels,
-      placeholders,
-      helperText,
-      readOnly,
-      allFields,
-      requiredFields,
-      readOnlyFields,
-      optionalFields,
-      obscuredFields,
-      trustedFields,
-      shouldValidate
-    }),
-    [
-      data,
-      labels,
-      placeholders,
-      helperText,
-      readOnly,
-      allFields,
-      requiredFields,
-      readOnlyFields,
-      optionalFields,
-      obscuredFields,
-      trustedFields,
-      shouldValidate
-    ]
+  const [addressToCheck, setAddressToCheck] = useDebouncedState(500);
+  const { data: cleansedRegistrationAddress } = useAddressCleanse(
+    {
+      text: addressToCheck,
+      country
+    },
+    { enabled: Boolean(addressToCheck) }
   );
-  const getFormSchema = useCallback(
-    (currentData) => {
-      const fieldsToRemove = [];
-      if (currentData.exemptedFromVat) {
-        fieldsToRemove.push("vatNumber");
-      } else {
-        fieldsToRemove.push("vatAbsenceReason");
-      }
-      if (currentData.exemptedFromTax && !isExperimentEnabled("EnableRegistrationAndTaxAbsentStatesV4")) {
-        fieldsToRemove.push("taxInformation");
-      }
-      if (currentData.exemptedFromRegistrationNumber) {
-        fieldsToRemove.push("registrationNumber");
+  const mustProvideOperationalAddress = cleansedRegistrationAddress?.poBox ?? false;
+  useEffect(
+    () => setAddressToCheck(
+      formatAddressForCleanse(form.data?.additionalInformation?.registrationAddress ?? {})
+    ),
+    [form.data?.additionalInformation?.registrationAddress, setAddressToCheck]
+  );
+  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 } } : {
+      registrationAddress: {
+        ...mapAddressData(verifiedBusiness$1),
+        country,
+        stateOrProvince: form.data?.basicInformation?.stateOrProvince
       }
-      if (!currentData.hasDoingBusinessAs) {
-        fieldsToRemove.push("doingBusinessAs");
+    };
+  }, [verifiedBusiness$1, form.data?.basicInformation?.stateOrProvince, country]);
+  const handleChangeFor = useCallback(
+    (fieldName, mode) => form.handleChangeFor(fieldName, "additionalInformation", mode),
+    [form]
+  );
+  const handleRegistrationAddressChange = (state) => {
+    handleChangeFor("registrationAddress")(state.data);
+    form.setValid("registrationAddress", Boolean(state.isValid), "additionalInformation");
+  };
+  const handleOperationalAddressChange = (state) => {
+    handleChangeFor("operationalAddress")(state.data);
+    form.setValid("operationalAddress", Boolean(state.isValid), "additionalInformation");
+  };
+  const handleOperationalAddressIsSameChange = useCallback(
+    (isChecked) => {
+      if (isChecked) {
+        handleChangeFor("operationalAddressIsSame")(
+          operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME
+        );
+        form.setValid("operationalAddress", true, "additionalInformation");
+      } else {
+        handleChangeFor("operationalAddressIsSame")(
+          operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
+        );
       }
-      return initialFormUtilsProps.requiredFields?.filter(
-        (field) => !fieldsToRemove.includes(field)
-      ) ?? [...DBA_NAME_FIELD];
     },
-    [initialFormUtilsProps.requiredFields, isExperimentEnabled]
+    [form, handleChangeFor]
   );
-  const mergedFieldProps = useMemo(
-    () => initialFormUtilsProps.allFields?.reduce((acc, field) => {
+  if (form.data?.additionalInformation?.operationalAddressIsSame === null) {
+    handleOperationalAddressIsSameChange(true);
+  }
+  useEffect(() => {
+    if (mustProvideOperationalAddress && form.data?.additionalInformation?.operationalAddressIsSame !== operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME) {
+      handleOperationalAddressIsSameChange(false);
+    }
+  }, [
+    handleOperationalAddressIsSameChange,
+    mustProvideOperationalAddress,
+    form.data?.additionalInformation?.operationalAddressIsSame
+  ]);
+  const formUtils = useMemo(() => {
+    const initialProps = {
+      data: form.data?.additionalInformation ?? {},
+      fieldValidationErrors: validationErrors,
+      formVerificationErrors: verificationErrors,
+      allFields: form.allFields?.additionalInformation ?? [],
+      requiredFields: form.requiredFields?.additionalInformation ?? [],
+      optionalFields: form.optionalFields?.additionalInformation ?? [],
+      trustedFields: form.trustedFields?.additionalInformation ?? [],
+      obscuredFields: form.obscuredFields?.additionalInformation ?? [],
+      errors: form.errors?.additionalInformation ?? {},
+      valid: form.valid?.additionalInformation ?? {},
+      handleFieldChange: handleChangeFor
+    };
+    const formUtilProps = initialProps.allFields?.reduce((acc, field) => {
       switch (field) {
         case "hasDoingBusinessAs":
           return mergeFieldMetadataIntoProps(
@@ -3833,11 +3854,7 @@ function AdditionalInformation({
             acc
           );
         case "doingBusinessAs":
-          return mergeFieldMetadataIntoProps(
-            "doingBusinessAs",
-            doingBusinessAsFieldMetadata,
-            acc
-          );
+          return mergeFieldMetadataIntoProps("doingBusinessAs", doingBusinessAsFieldMetadata, acc);
         case "registrationNumber":
           return mergeFieldMetadataIntoProps(
             field,
@@ -3845,27 +3862,13 @@ function AdditionalInformation({
               registrationNumberDefaultFieldConfig[country],
               {
                 companyType,
-                registrationNumberType: sliceData?.registrationNumberType ?? getDefaultRegistrationNumberType(
-                  sliceData?.registrationNumber,
-                  country,
-                  companyType
-                ),
+                registrationNumberType: form.data?.additionalInformation?.registrationNumberType,
                 isExperimentEnabled
               },
               registrationNumberDefaultFieldMetadata
             ),
             acc
           );
-        case "exemptedFromRegistrationNumber":
-          return mergeFieldMetadataIntoProps(
-            field,
-            resolveFieldMetadata(
-              exemptFromRegistrationNumberDefaultFieldConfig[country],
-              {},
-              exemptFromRegistrationNumberDefaultFieldMetadata
-            ),
-            acc
-          );
         case "taxInformation":
           return mergeFieldMetadataIntoProps(
             field,
@@ -3879,24 +3882,12 @@ function AdditionalInformation({
             ),
             acc
           );
-        case "exemptedFromTax":
-          return mergeFieldMetadataIntoProps(
-            field,
-            resolveFieldMetadata(
-              exemptedFromTaxDefaultFieldConfig[country],
-              {},
-              exemptedFromTaxDefaultFieldMetadata
-            ),
-            acc
-          );
         case "vatNumber":
           return mergeFieldMetadataIntoProps(
             field,
             resolveFieldMetadata(
               defaultFieldConfig$2[country],
-              {
-                vatNumberType: sliceData?.vatNumberType ?? getDefaultVatNumberType(sliceData?.vatNumber, country)
-              },
+              { vatNumberType: form.data?.additionalInformation?.vatNumberType },
               defaultFieldMetadata$2
             ),
             acc
@@ -3932,154 +3923,57 @@ function AdditionalInformation({
         default:
           return acc;
       }
-    }, initialFormUtilsProps),
-    [
-      companyType,
-      country,
-      currentCountryTaxInformation?.type,
-      initialFormUtilsProps,
-      isExperimentEnabled,
-      sliceData
-    ]
-  );
-  const mergedDefaultData = useMemo(() => {
-    if (!verifiedBusiness$1) return data;
-    return {
-      ...data,
-      registrationAddress: {
-        address: verifiedBusiness$1.street,
-        city: verifiedBusiness$1.city,
-        postalCode: verifiedBusiness$1.zipCode,
-        stateOrProvince: verifiedBusiness$1.state,
-        country: verifiedBusiness$1.country
-      }
-    };
-  }, [data, verifiedBusiness$1]);
-  const {
-    schema: formSchema,
-    data: formData,
-    errors: formErrors,
-    valid: formValid,
-    fieldProblems: formFieldProblems,
+    }, initialProps);
+    return createFormUtils(formUtilProps ?? initialProps, t);
+  }, [
+    companyType,
+    country,
+    currentCountryTaxInformation?.type,
+    form.allFields?.additionalInformation,
+    form.data?.additionalInformation,
+    form.errors?.additionalInformation,
+    form.obscuredFields?.additionalInformation,
+    form.optionalFields?.additionalInformation,
+    form.requiredFields?.additionalInformation,
+    form.trustedFields?.additionalInformation,
+    form.valid?.additionalInformation,
     handleChangeFor,
-    resetToDefaultData,
-    setValid
-  } = useForm({
-    schema: getFormSchema,
-    defaultData: mergedDefaultData,
-    rules: mergedFieldProps?.validators,
-    optionalFields: mergedFieldProps?.optionalFields,
-    obscuredFields: mergedFieldProps?.obscuredFields,
-    trustedFields: mergedFieldProps?.trustedFields,
-    fieldProblems: fieldValidationErrors,
-    shouldValidate
-  });
-  const datasetUtils = datasetUtilities(i18n.language);
-  const formUtils = createFormUtils(
-    mergedFieldProps ?? initialFormUtilsProps,
-    commonT
-  );
-  useEffect(() => {
-    updateStateSlice({
-      schema: formSchema,
-      data: formData,
-      errors: formErrors,
-      valid: formValid,
-      fieldProblems: formFieldProblems
-    });
-  }, [formSchema, formData, formErrors, formValid, formFieldProblems, updateStateSlice]);
-  const [addressToCheck, setAddressToCheck] = useDebouncedState(500);
-  const { data: cleansedRegistrationAddress } = useAddressCleanse(
-    {
-      text: addressToCheck,
-      country: formData?.registrationAddress?.country ?? country
-    },
-    { enabled: Boolean(addressToCheck) && country !== CountryCodes.Japan }
-  );
-  const mustProvideOperationalAddress = cleansedRegistrationAddress?.poBox ?? false;
-  useEffect(
-    () => setAddressToCheck(formatAddressForCleanse(formData?.registrationAddress ?? {})),
-    [formData?.registrationAddress, setAddressToCheck]
-  );
-  const verifiedAddress = useMemo(() => {
-    if (!verifiedBusiness$1) return void 0;
-    return verifiedBusiness$1.isPrincipalAddress || verifiedBusiness$1.state && basicInformation?.stateOrProvince !== verifiedBusiness$1.state ? { operationalAddress: { ...mapAddressData(verifiedBusiness$1), country } } : {
-      registrationAddress: {
-        ...mapAddressData(verifiedBusiness$1),
-        country,
-        stateOrProvince: basicInformation?.stateOrProvince
-      }
-    };
-  }, [verifiedBusiness$1, basicInformation?.stateOrProvince, country]);
-  useEffect(() => {
-    applyVerifiedBusinessData$1(verifiedBusiness$1, handleChangeFor);
-    if (basicInformation && verifiedBusiness$1?.name) {
-      basicInformation.legalCompanyName = verifiedBusiness$1.name;
-    }
-  }, [verifiedBusiness$1]);
-  useEffect(() => {
-    if (!verifiedBusiness$1 && !showCompanyStructure) resetToDefaultData();
-  }, [verifiedBusiness$1]);
+    t,
+    isExperimentEnabled,
+    validationErrors,
+    verificationErrors
+  ]);
   const showField = (fieldKeys) => fieldKeys.some((field) => formUtils.isRequiredField(field) || formUtils.isOptionalField(field));
   const { data: industryCodes } = useIndustryCodes(businessLineTypes, i18n.language, {
     enabled: showField(INDUSTRY_CODE_FIELD)
   });
-  const handleRegistrationAddressChange = (state) => {
-    handleChangeFor("registrationAddress")(state.data);
-    setValid("registrationAddress", Boolean(state.isValid));
-  };
-  const handleOperationalAddressChange = (state) => {
-    handleChangeFor("operationalAddress")(state.data);
-    setValid("operationalAddress", Boolean(state.isValid));
-  };
-  const handleOperationalAddressIsSameChange = useCallback(
-    (isChecked) => {
-      if (isChecked) {
-        handleChangeFor("operationalAddressIsSame")(
-          operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME
-        );
-        setValid("operationalAddress", true);
-      } else {
-        handleChangeFor("operationalAddressIsSame")(
-          operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
-        );
-      }
-    },
-    [handleChangeFor, setValid]
-  );
-  useEffect(() => {
-    if (mustProvideOperationalAddress && formData.operationalAddressIsSame !== operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME) {
-      handleOperationalAddressIsSameChange(false);
-    }
-  }, [
-    handleOperationalAddressIsSameChange,
-    mustProvideOperationalAddress,
-    formData.operationalAddressIsSame
-  ]);
+  const datasetUtils = datasetUtilities(i18n.language);
   const registrationAddressDescription = useMemo(() => {
-    if (formData.registrationAddress?.country) {
-      return ["US", "NL", "CZ"].includes(formData.registrationAddress.country) ? t(($) => $["youBusinessOfficalAddressInTheCounty"], {
-        country: datasetUtils.getCountryName(formData.registrationAddress.country)
+    if (country) {
+      return ["US", "NL", "CZ"].includes(country) ? t(($) => $["youBusinessOfficalAddressInTheCounty"], {
+        ns: "business",
+        country: datasetUtils.getCountryName(country)
       }) : t(($) => $["youBusinessOfficalAddressInCounty"], {
-        country: datasetUtils.getCountryName(formData.registrationAddress.country)
+        ns: "business",
+        country: datasetUtils.getCountryName(country)
       });
     }
-    return t(($) => $["youBusinessOfficalAddress"]);
-  }, [datasetUtils, formData?.registrationAddress?.country, i18n]);
-  return /* @__PURE__ */ jsxs("form", { id: ADDITIONAL_INFORMATION_FORM_ID, className: "adyen-kyc-additional-information", children: [
+    return t(($) => $["youBusinessOfficalAddress"], { ns: "business" });
+  }, [country, datasetUtils, t]);
+  return /* @__PURE__ */ jsxs("form", { id, className: "adyen-kyc-additional-information", children: [
     /* @__PURE__ */ jsx(Header, { title: t(($) => $["additionalInformationFormHeading"], { ns: "business" }) }),
     /* @__PURE__ */ jsx(
       ErrorPanel,
       {
         id: "ariaErrorField",
-        verificationErrors: formVerificationErrors,
-        validationErrors: fieldValidationErrors,
+        verificationErrors,
+        validationErrors,
         formUtils
       }
     ),
     /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-additional-information__content", children: [
       showVerified && /* @__PURE__ */ jsxs("section", { children: [
-        /* @__PURE__ */ jsx("div", { className: "adyen-kyc-additional-information__section-heading", children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["verifiedInformation"]) }) }),
+        /* @__PURE__ */ jsx("div", { className: "adyen-kyc-additional-information__section-heading", children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["verifiedInformation"], { ns: "business" }) }) }),
         /* @__PURE__ */ jsx(
           VerifiedBusinessCard,
           {
@@ -4089,7 +3983,7 @@ function AdditionalInformation({
         )
       ] }),
       /* @__PURE__ */ jsxs("section", { children: [
-        showVerified && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-additional-information__section-heading", children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["otherBusinessInformation"]) }) }),
+        showVerified && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-additional-information__section-heading", children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["otherBusinessInformation"], { ns: "business" }) }) }),
         /* @__PURE__ */ jsxs("fieldset", { children: [
           showField(LEGAL_FORM_FIELDS) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             LegalFormField,
@@ -4097,21 +3991,37 @@ function AdditionalInformation({
               name: "legalForm",
               countryCode: country,
               data: {
-                legalForm: formUtils.getFieldData(formData, LEGAL_FORM_FIELDS)?.legalForm
+                legalForm: formUtils.getFieldData(
+                  form.data?.additionalInformation ?? {},
+                  LEGAL_FORM_FIELDS
+                )?.legalForm
               },
-              valid: formUtils.getFieldValid(formValid, LEGAL_FORM_FIELDS),
-              errorMessage: formErrors.legalForm?.errorMessage,
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                LEGAL_FORM_FIELDS
+              ),
+              errorMessage: form.errors.additionalInformation?.legalForm?.errorMessage,
               handleChangeFor,
               readonly: false,
               label: formUtils.getLabel("legalForm", "businessStructure")
             }
           ) }),
-          /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
+          showField(DBA_NAME_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             DBANameField,
             {
-              data: formUtils.getFieldData(formData, DBA_NAME_FIELD),
-              valid: formUtils.getFieldValid(formValid, DBA_NAME_FIELD),
-              errors: formUtils.getFieldErrors(formErrors, formFieldProblems, DBA_NAME_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                DBA_NAME_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                DBA_NAME_FIELD
+              ),
+              errors: formUtils.getFieldErrors(
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
+                DBA_NAME_FIELD
+              ),
               labels: formUtils.getFieldLabels(DBA_NAME_FIELD, {
                 hasDoingBusinessAs: "hasDba"
               }),
@@ -4122,11 +4032,17 @@ function AdditionalInformation({
           showField(BUSINESS_REGISTRATION_NUMBER_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             BusinessRegistrationNumberField,
             {
-              data: formUtils.getFieldData(formData, BUSINESS_REGISTRATION_NUMBER_FIELD),
-              valid: formUtils.getFieldValid(formValid, BUSINESS_REGISTRATION_NUMBER_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                BUSINESS_REGISTRATION_NUMBER_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                BUSINESS_REGISTRATION_NUMBER_FIELD
+              ),
               errors: formUtils.getFieldErrors(
-                formErrors,
-                formFieldProblems,
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
                 BUSINESS_REGISTRATION_NUMBER_FIELD
               ),
               labels: formUtils.getFieldLabels(BUSINESS_REGISTRATION_NUMBER_FIELD, {
@@ -4141,18 +4057,24 @@ function AdditionalInformation({
               shouldValidate,
               handleChangeFor,
               country,
-              canExempt: formUtils.isRequiredField("exemptedFromRegistrationNumber"),
+              canExempt: showField(["exemptedFromRegistrationNumber"]),
               companyType
             }
           ) }),
           showField(TAX_INFORMATION_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             TaxInformationField,
             {
-              data: formUtils.getFieldData(formData, TAX_INFORMATION_FIELD),
-              valid: formUtils.getFieldValid(formValid, TAX_INFORMATION_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                TAX_INFORMATION_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                TAX_INFORMATION_FIELD
+              ),
               errors: formUtils.getFieldErrors(
-                formErrors,
-                formFieldProblems,
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
                 TAX_INFORMATION_FIELD
               ),
               labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD, {
@@ -4163,19 +4085,29 @@ function AdditionalInformation({
               readonly: formUtils.isReadOnly("taxInformation"),
               shouldValidate,
               handleChangeFor,
-              canExempt: formUtils.isRequiredField("exemptedFromTax"),
+              canExempt: showField(["exemptedFromTax"]),
               country,
               entityType: companyType,
-              defaultData: data?.taxInformation,
-              registrationNumber: formData?.registrationNumber
+              defaultData: form.defaultData?.additionalInformation?.taxInformation,
+              registrationNumber: form.data?.additionalInformation?.registrationNumber
             }
           ) }),
           showField(VAT_NUMBER_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             VatNumberField,
             {
-              data: formUtils.getFieldData(formData, VAT_NUMBER_FIELD),
-              valid: formUtils.getFieldValid(formValid, VAT_NUMBER_FIELD),
-              errors: formUtils.getFieldErrors(formErrors, formFieldProblems, VAT_NUMBER_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                VAT_NUMBER_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                VAT_NUMBER_FIELD
+              ),
+              errors: formUtils.getFieldErrors(
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
+                VAT_NUMBER_FIELD
+              ),
               labels: formUtils.getFieldLabels(VAT_NUMBER_FIELD, {
                 exemptedFromVat: "iDontHaveAVatNumber"
               }),
@@ -4185,18 +4117,24 @@ function AdditionalInformation({
               readonly: formUtils.isReadOnly("vatNumber"),
               handleChangeFor,
               country,
-              canExempt: formUtils.isRequiredField("exemptedFromVat") || formUtils.isOptionalField("exemptedFromVat"),
+              canExempt: showField(["exemptedFromVat"]),
               shouldValidate
             }
           ) }),
           formUtils.isRequiredField("eInvoicingCode", false) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             EInvoicingCodeField,
             {
-              data: formUtils.getFieldData(formData, EINVOICING_CODE_FIELD),
-              valid: formUtils.getFieldValid(formValid, EINVOICING_CODE_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                EINVOICING_CODE_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                EINVOICING_CODE_FIELD
+              ),
               errors: formUtils.getFieldErrors(
-                formErrors,
-                formFieldProblems,
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
                 EINVOICING_CODE_FIELD
               ),
               labels: formUtils.getFieldLabels(EINVOICING_CODE_FIELD),
@@ -4210,11 +4148,17 @@ function AdditionalInformation({
           showField(INDUSTRY_CODE_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", "data-testid": "industryCode", children: /* @__PURE__ */ jsx(
             IndustryCodeField,
             {
-              data: formUtils.getFieldData(formData, INDUSTRY_CODE_FIELD),
-              valid: formUtils.getFieldValid(formValid, INDUSTRY_CODE_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                INDUSTRY_CODE_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                INDUSTRY_CODE_FIELD
+              ),
               errors: formUtils.getFieldErrors(
-                formErrors,
-                formFieldProblems,
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
                 INDUSTRY_CODE_FIELD
               ),
               labels: {
@@ -4237,11 +4181,17 @@ function AdditionalInformation({
           showField(DATE_OF_INCORPORATION_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             DateOfIncorporationField,
             {
-              data: formUtils.getFieldData(formData, DATE_OF_INCORPORATION_FIELD),
-              valid: formUtils.getFieldValid(formValid, DATE_OF_INCORPORATION_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                DATE_OF_INCORPORATION_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                DATE_OF_INCORPORATION_FIELD
+              ),
               errors: formUtils.getFieldErrors(
-                formErrors,
-                formFieldProblems,
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
                 DATE_OF_INCORPORATION_FIELD
               ),
               labels: formUtils.getFieldLabels(DATE_OF_INCORPORATION_FIELD),
@@ -4255,16 +4205,22 @@ function AdditionalInformation({
         ] })
       ] }),
       showStockData && /* @__PURE__ */ jsxs("section", { children: [
-        /* @__PURE__ */ jsx("div", { className: "adyen-kyc-additional-information__section-heading", children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["stockExchangeInformation"]) }) }),
+        /* @__PURE__ */ jsx("div", { className: "adyen-kyc-additional-information__section-heading", children: /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["stockExchangeInformation"], { ns: "business" }) }) }),
         /* @__PURE__ */ jsxs("fieldset", { children: [
           showField(STOCK_EXCHANGE_MIC_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             StockExchangeMICField,
             {
-              data: formUtils.getFieldData(formData, STOCK_EXCHANGE_MIC_FIELD),
-              valid: formUtils.getFieldValid(formValid, STOCK_EXCHANGE_MIC_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                STOCK_EXCHANGE_MIC_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                STOCK_EXCHANGE_MIC_FIELD
+              ),
               errors: formUtils.getFieldErrors(
-                formErrors,
-                formFieldProblems,
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
                 STOCK_EXCHANGE_MIC_FIELD
               ),
               labels: formUtils.getFieldLabels(STOCK_EXCHANGE_MIC_FIELD),
@@ -4279,11 +4235,17 @@ function AdditionalInformation({
           showField(STOCK_ISIN_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             StockISINField,
             {
-              data: formUtils.getFieldData(formData, STOCK_ISIN_FIELD),
-              valid: formUtils.getFieldValid(formValid, STOCK_ISIN_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                STOCK_ISIN_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                STOCK_ISIN_FIELD
+              ),
               errors: formUtils.getFieldErrors(
-                formErrors,
-                formFieldProblems,
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
                 STOCK_ISIN_FIELD
               ),
               labels: formUtils.getFieldLabels(STOCK_ISIN_FIELD),
@@ -4298,11 +4260,17 @@ function AdditionalInformation({
           showField(STOCK_TICKER_SYMBOL_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
             StockTickerSymbolField,
             {
-              data: formUtils.getFieldData(formData, STOCK_TICKER_SYMBOL_FIELD),
-              valid: formUtils.getFieldValid(formValid, STOCK_TICKER_SYMBOL_FIELD),
+              data: formUtils.getFieldData(
+                form.data?.additionalInformation ?? {},
+                STOCK_TICKER_SYMBOL_FIELD
+              ),
+              valid: formUtils.getFieldValid(
+                form.valid?.additionalInformation ?? {},
+                STOCK_TICKER_SYMBOL_FIELD
+              ),
               errors: formUtils.getFieldErrors(
-                formErrors,
-                formFieldProblems,
+                form.errors?.additionalInformation ?? {},
+                validationErrors,
                 STOCK_TICKER_SYMBOL_FIELD
               ),
               labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
@@ -4318,7 +4286,7 @@ function AdditionalInformation({
       ] }),
       /* @__PURE__ */ jsxs("section", { "data-testid": "registeredBusinessAddress", children: [
         /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-additional-information__section-heading", children: [
-          /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["registeredBusinessAddress"]) }),
+          /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["registeredBusinessAddress"], { ns: "business" }) }),
           /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: registrationAddressDescription })
         ] }),
         country === CountryCodes.Japan ? /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
@@ -4326,7 +4294,7 @@ function AdditionalInformation({
           {
             id: ADDITIONAL_INFORMATION_FORM_ID,
             addressType: "registrationAddress",
-            data: { ...mergedDefaultData?.registrationAddress, country },
+            data: { ...form.data.additionalInformation?.registrationAddress, country },
             shouldValidate,
             onChange: handleRegistrationAddressChange
           }
@@ -4336,18 +4304,20 @@ function AdditionalInformation({
             id: ADDITIONAL_INFORMATION_FORM_ID,
             addressType: "registrationAddress",
             data: {
-              ...mergedDefaultData?.registrationAddress,
+              ...form.data.additionalInformation?.registrationAddress,
               country
             },
-            labels: getAddressSchemaLabelsByCountry(
-              data?.registrationAddress?.country ?? country
-            ),
+            labels: getAddressSchemaLabelsByCountry(country),
             requiredFields: addressSchema,
             shouldValidate,
             hideCountry: true,
             optionalFields: ["otherAddressInformation"],
-            readOnlyFields: verifiedBusiness$1?.state && verifiedBusiness$1?.state === basicInformation?.stateOrProvince ? ["stateOrProvince"] : [],
-            trustedFields: getNestedTrustedFields("registrationAddress", data, trustedFields),
+            readOnlyFields: verifiedBusiness$1?.state && verifiedBusiness$1?.state === form.data.basicInformation?.stateOrProvince ? ["stateOrProvince"] : [],
+            trustedFields: getNestedTrustedFields(
+              "registrationAddress",
+              form.data.additionalInformation,
+              form.trustedFields?.additionalInformation
+            ),
             onChange: handleRegistrationAddressChange,
             verifiedBusiness: verifiedBusiness$1,
             verifiedAddress: verifiedAddress?.registrationAddress,
@@ -4357,35 +4327,36 @@ function AdditionalInformation({
       ] }),
       /* @__PURE__ */ jsxs("section", { "data-testid": "principalPlaceOfBusiness", children: [
         /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-additional-information__section-heading", children: [
-          /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["principalPlaceOfBusiness"]) }),
-          /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: t(($) => $["thePhysicalLocationWhereABusiness"]) })
+          /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["principalPlaceOfBusiness"], { ns: "business" }) }),
+          /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: t(($) => $["thePhysicalLocationWhereABusiness"], { ns: "business" }) })
         ] }),
         !mustProvideOperationalAddress && /* @__PURE__ */ jsx(
           Field,
           {
+            el: "fieldset",
             name: "operationalAddressIsSame",
-            errorMessage: formErrors.operationalAddressIsSame,
-            isValid: formValid.operationalAddressIsSame,
+            errorMessage: form.errors?.additionalInformation?.operationalAddressIsSame?.errorMessage,
+            isValid: form.valid?.additionalInformation?.operationalAddressIsSame,
             children: (childProps) => /* @__PURE__ */ jsx(
               Checkbox,
               {
                 ...childProps,
                 "aria-required": formUtils.isRequiredField("operationalAddressIsSame"),
-                "aria-invalid": !formValid.operationalAddressIsSame,
+                "aria-invalid": !form.valid?.additionalInformation?.operationalAddressIsSame,
                 name: "operationalAddressIsSame",
                 label: formUtils.getLabel("sameAsRegisteredAddress"),
-                checked: formData.operationalAddressIsSame ? formData.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME : true,
+                checked: form.data?.additionalInformation?.operationalAddressIsSame ? form.data?.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME : true,
                 onChange: handleOperationalAddressIsSameChange
               }
             )
           }
         ),
-        formData.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME && (country === CountryCodes.Japan ? /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
+        form.data?.additionalInformation?.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME && (country === CountryCodes.Japan ? /* @__PURE__ */ jsx(Suspense, { fallback: /* @__PURE__ */ jsx(Loader, {}), children: /* @__PURE__ */ jsx(
           LazyJpAddress,
           {
             id: ADDITIONAL_INFORMATION_FORM_ID,
             addressType: "operationalAddress",
-            data: { ...mergedDefaultData?.operationalAddress, country },
+            data: { ...form.data.additionalInformation.operationalAddress, country },
             shouldValidate,
             onChange: handleOperationalAddressChange
           }
@@ -4395,17 +4366,19 @@ function AdditionalInformation({
             id: ADDITIONAL_INFORMATION_FORM_ID,
             addressType: "operationalAddress",
             data: {
-              ...mergedDefaultData?.operationalAddress,
+              ...form.defaultData?.additionalInformation?.operationalAddress,
               country
             },
-            labels: getAddressSchemaLabelsByCountry(
-              data?.operationalAddress?.country ?? country
-            ),
+            labels: getAddressSchemaLabelsByCountry(country),
             requiredFields: addressSchema,
             shouldValidate,
             hideCountry: true,
             optionalFields: ["otherAddressInformation"],
-            trustedFields: getNestedTrustedFields("operationalAddress", data, trustedFields),
+            trustedFields: getNestedTrustedFields(
+              "operationalAddress",
+              form.data?.additionalInformation,
+              form.trustedFields?.additionalInformation
+            ),
             onChange: handleOperationalAddressChange,
             verifiedBusiness: verifiedBusiness$1,
             verifiedAddress: verifiedAddress?.operationalAddress,
@@ -4515,13 +4488,6 @@ const handleKeyDown = (e) => {
     e.preventDefault();
   }
 };
-const CountryFieldValidation = () => ({
-  country: {
-    modes: ["blur"],
-    validate: (country) => !isEmpty(country),
-    errorMessage: "fieldIsRequired"
-  }
-});
 const COUNTRY_OF_GOVERNING_LAW_FIELD = [
   "countryOfGoverningLaw"
 ];
@@ -4565,13 +4531,6 @@ function CountryOfGoverningLawField({
     }
   );
 }
-const CountryOfGoverningLawFieldValidation = () => ({
-  countryOfGoverningLaw: {
-    modes: ["blur"],
-    validate: (countryOfGoverningLaw) => !isEmpty(countryOfGoverningLaw),
-    errorMessage: "fieldIsRequired"
-  }
-});
 const defaultFieldMetadata$1 = {
   label: "legalCompanyName",
   helperText: "legalCompanyName__helperText",
@@ -4592,483 +4551,110 @@ const defaultFieldConfig$1 = {
     label: "legalCompanyName",
     helperText: "legalCompanyName__helperText__NL",
     validators: validateNotEmptyOnBlur
-  },
-  [CountryCodes.Singapore]: {
-    label: "legalCompanyName",
-    helperText: "legalCompanyName__helperText__SG",
-    validators: validateNotEmptyOnBlur
-  },
-  [CountryCodes.UnitedStates]: ({ isBusiness }) => ({
-    label: "legalCompanyName__US",
-    helperText: isBusiness ? "legalCompanyName__helperText__US__business" : "legalCompanyName__helperText__US",
-    validators: validateNotEmptyOnBlur
-  })
-};
-const defaultFieldMetadataV4 = {
-  label: "legalCompanyName",
-  helperText: "legalCompanyName__helperText",
-  validators: validateLegalCompanyName
-};
-const defaultFieldConfigV4 = {
-  [CountryCodes.Australia]: {
-    label: "legalCompanyName",
-    helperText: "legalCompanyName__helperText__AU",
-    validators: validateLegalCompanyName
-  },
-  [CountryCodes.HongKong]: {
-    label: "legalCompanyName",
-    helperText: "legalCompanyName__helperText__HK",
-    validators: validateLegalCompanyName
-  },
-  [CountryCodes.Netherlands]: {
-    label: "legalCompanyName",
-    helperText: "legalCompanyName__helperText__NL",
-    validators: validateLegalCompanyName
-  },
-  [CountryCodes.Singapore]: {
-    label: "legalCompanyName",
-    helperText: "legalCompanyName__helperText__SG",
-    validators: validateLegalCompanyName
-  },
-  [CountryCodes.UnitedStates]: ({ isBusiness }) => ({
-    label: "legalCompanyName__US",
-    helperText: isBusiness ? "legalCompanyName__helperText__US__business" : "legalCompanyName__helperText__US",
-    validators: validateLegalCompanyName
-  }),
-  [CountryCodes.Japan]: {
-    label: "legalCompanyName__JP",
-    helperText: void 0,
-    validators: [...validateLegalCompanyName, validateLatinSpaceMarkPunctuationOnlyOnBlur]
-  }
-};
-const defaultJaHaniLegalCompanyNameFieldMetadata = {
-  label: "jaHaniLegalCompanyName"
-};
-const defaultJaKanaLegalCompanyNameFieldMetadata = {
-  label: "jaKanaLegalCompanyName"
-};
-const defaultJaHaniLegalCompanyNameFieldConfig = {
-  label: "jaHaniLegalCompanyName",
-  validators: validateJaHaniLegalCompanyName
-};
-const defaultJaKanaLegalCompanyNameFieldConfig = {
-  label: "jaKanaLegalCompanyName",
-  validators: validateJaKanaLegalCompanyName
-};
-const localizedLegalCompanyNameFieldConfig = {
-  jaHaniLegalCompanyName: {
-    config: defaultJaHaniLegalCompanyNameFieldConfig,
-    metadata: defaultJaHaniLegalCompanyNameFieldMetadata
-  },
-  jaKanaLegalCompanyName: {
-    config: defaultJaKanaLegalCompanyNameFieldConfig,
-    metadata: defaultJaKanaLegalCompanyNameFieldMetadata
-  }
-};
-const defaultFieldMetadata = {
-  label: "stateOrProvince",
-  placeholder: "stateOrProvince__placeHolder",
-  validators: validateNotEmptyOnBlur
-};
-const defaultFieldConfig = {
-  [CountryCodes.Australia]: {
-    label: "state",
-    placeholder: "selectState",
-    validators: validateNotEmptyOnBlur
-  },
-  [CountryCodes.Brazil]: {
-    label: "state",
-    placeholder: "selectState",
-    validators: validateNotEmptyOnBlur
-  },
-  [CountryCodes.Canada]: {
-    label: "provinceOrTerritory",
-    placeholder: "selectProvinceOrTerritory",
-    validators: validateNotEmptyOnBlur
-  },
-  [CountryCodes.NewZealand]: {
-    label: "region",
-    validators: validateNotEmptyOnBlur
-  },
-  [CountryCodes.UnitedStates]: ({ isBusiness }) => ({
-    label: isBusiness ? "stateOrProvince__US__business" : "state",
-    placeholder: "stateOrProvince__placeHolder__US",
-    validators: validateNotEmptyOnBlur
-  })
-};
-const LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW = 1577664e5;
-const KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS = [
-  StateCodesUS.Arkansas,
-  StateCodesUS.Connecticut,
-  StateCodesUS.Georgia,
-  StateCodesUS.Hawaii,
-  StateCodesUS.Indiana,
-  StateCodesUS.Kentucky,
-  StateCodesUS.Maryland,
-  StateCodesUS.Minnesota,
-  StateCodesUS.Missouri,
-  StateCodesUS.Montana,
-  StateCodesUS.NewHampshire,
-  StateCodesUS.NewMexico,
-  StateCodesUS.SouthCarolina,
-  StateCodesUS.Utah,
-  StateCodesUS.Vermont,
-  StateCodesUS.Wisconsin,
-  StateCodesUS.Wyoming
-];
-const KNOWN_DISALLOWED_INDEX_DATASET_STATES = [
-  StateCodesUS.California,
-  StateCodesUS.Florida,
-  StateCodesUS.Illinois,
-  StateCodesUS.Texas
-];
-const handleCompanyDataset = async (rootLegalEntityId, baseUrl, data) => {
-  const requestPayload = {
-    companyId: data.company.id,
-    country: "US",
-    state: data.state
-  };
-  const searchRequest = async (path) => {
-    return httpPost(
-      {
-        baseUrl,
-        path: `legalEntities/${rootLegalEntityId}/companyDataset${path ? "/" + path : ""}`
-      },
-      requestPayload
-    );
-  };
-  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;
-  if (data.state) {
-    return isDataCompliant && !KNOWN_DISALLOWED_INDEX_DATASET_STATES.includes(data.state) ? await getCompanyDataset() : await refreshCompanyDataset();
-  }
-  return isDataCompliant ? await getCompanyDataset() : await refreshCompanyDataset();
-};
-const useVerifyTin = (data, options) => {
-  const { rootLegalEntityId, baseUrl } = useApiContext();
-  return useQuery({
-    queryKey: ["verifyTin", data],
-    queryFn: data ? () => verifyTin(rootLegalEntityId.value, baseUrl.value, data) : skipToken,
-    retry: 0,
-    ...options
-  });
-};
-const verifyTin = async (legalEntityId, baseUrl, data) => {
-  return httpPost(
-    {
-      baseUrl,
-      path: `legalEntities/${legalEntityId}/verifyTin`
-    },
-    data
-  );
-};
-const useCompanySelection = (data, options) => {
-  const { rootLegalEntityId, baseUrl } = useApiContext();
-  return useQuery({
-    queryKey: ["companySelection", data],
-    queryFn: data ? () => handleCompanySelection(rootLegalEntityId.value, baseUrl.value, data) : skipToken,
-    retry: 0,
-    ...options,
-    // TODO: Remove this once Moody's resolves &amp; bug
-    select: (data2) => {
-      const transformedResults = {
-        ...data2,
-        name: data2.name.replaceAll("&amp;", "&")
-      };
-      return transformedResults;
-    }
-  });
-};
-const handleCompanySelection = async (rootLegalEntityId, baseUrl, data) => {
-  const [companyDatasetResult, tinMatch] = await Promise.all([
-    handleCompanyDataset(rootLegalEntityId, baseUrl, {
-      company: data.company,
-      state: data.state
-    }),
-    verifyTin(rootLegalEntityId, baseUrl, { name: data.name, tin: data.tin })
-  ]);
-  return {
-    ...companyDatasetResult,
-    tinMatched: tinMatch?.matched
-  };
-};
-const stripWhitespace = (str) => str.replace(/\s/g, "");
-const toNormalizedString = (s) => stripWhitespace(s.toLowerCase());
-const isNormalizedStringMatch = (s1, s2) => toNormalizedString(s1) === toNormalizedString(s2);
-function BusinessInformation({ fetching, selectedBusiness }) {
-  const { t } = useTranslation(["common", "business"]);
-  const businessInformationClasses = cx("adyen-kyc-business-information", {
-    "adyen-kyc-business-information--fetching": fetching
-  });
-  const items = useMemo(
-    () => selectedBusiness ? entriesOf(selectedBusiness).reduce(
-      (acc, [key, value]) => {
-        switch (key) {
-          case "legalForm":
-            if (value) acc[0].details = value;
-            break;
-          case "name":
-            if (value) acc[1].details = value;
-            break;
-          case "address":
-            if (value) acc[2].details = value;
-            break;
-        }
-        return acc;
-      },
-      [
-        {
-          term: t(($) => $["legalForm"], { ns: "common" }),
-          details: ""
-        },
-        {
-          term: t(($) => $["legalCompanyName__US"], { ns: "common" }),
-          details: ""
-        },
-        {
-          term: t(($) => $["address"], { ns: "common" }),
-          details: ""
-        }
-      ]
-    ).filter((item) => !!item.details) : [],
-    [selectedBusiness, t]
-  );
-  if (fetching) {
-    return /* @__PURE__ */ jsx("div", { className: businessInformationClasses, children: /* @__PURE__ */ jsx(Loader, { size: "large" }) });
-  }
-  if (!fetching) {
-    return /* @__PURE__ */ jsx("div", { className: businessInformationClasses, children: /* @__PURE__ */ jsx(StructuredList, { items }) });
-  }
-  return null;
-}
-function BusinessInformationCard({
-  result,
-  selectedBusinessId,
-  currentBusinessSelection,
-  fetching,
-  fetchingError,
-  invalidTin,
-  setIsBusinessSelection,
-  handleSelectBusiness,
-  refetchCompanySelection,
-  handleConfirmSelection,
-  handleBackClick
-}) {
-  const { t } = useTranslation(["common", "business"]);
-  const excludeResultAsGovernmentEntity = useMemo(
-    () => isBankAccountRequestedForOrganization.value && currentBusinessSelection?.organizationType === "GOVERNMENTAL_ORGANIZATION",
-    [currentBusinessSelection]
-  );
-  const showSelectButton = useMemo(
-    () => !fetching && !fetchingError && currentBusinessSelection && !excludeResultAsGovernmentEntity,
-    [currentBusinessSelection, excludeResultAsGovernmentEntity, fetching, fetchingError]
-  );
-  const handleGoBack = () => {
-    if (handleBackClick) {
-      handleBackClick();
-    } else {
-      setIsBusinessSelection?.(false);
-    }
-  };
-  return /* @__PURE__ */ jsx(
-    Card,
-    {
-      "aria-selected": selectedBusinessId === result.id,
-      className: "adyen-kyc-business-information-card",
-      title: result.name,
-      subTitle: result.registrationNumber,
-      stateful: true,
-      fetching: fetching && selectedBusinessId === result.id,
-      active: selectedBusinessId === result.id,
-      headerButton: selectedBusinessId === result.id && showSelectButton ? /* @__PURE__ */ jsx(
-        Button,
-        {
-          onClick: () => handleConfirmSelection(currentBusinessSelection),
-          testId: "selectBusiness",
-          disabled: invalidTin,
-          children: t(($) => $["thisIsMyBusiness"], { ns: "business" })
-        }
-      ) : null,
-      onClick: () => handleSelectBusiness(result),
-      onKeyDown: handleKeys(["Enter"], () => handleSelectBusiness(result)),
-      children: selectedBusinessId === result.id && /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx(Divider, {}),
-        invalidTin && /* @__PURE__ */ jsx(
-          Alert,
-          {
-            variant: "warning",
-            type: "callToAction",
-            title: t(($) => $["businessSelection__invalidTin"], { ns: "business" }),
-            actions: /* @__PURE__ */ jsx(Button, { testId: "backBtn", onClick: handleGoBack, variant: "link", children: t(($) => $["back"], { ns: "common" }) }),
-            testId: "invalidTin"
-          }
-        ),
-        fetchingError && /* @__PURE__ */ jsx(
-          Alert,
-          {
-            variant: "info",
-            type: "callToAction",
-            title: t(($) => $["businessSelection__failedToLoad"], { ns: "business" }),
-            actions: /* @__PURE__ */ jsx(
-              Button,
-              {
-                testId: "reloadBusiness",
-                onClick: () => refetchCompanySelection(),
-                variant: "link",
-                children: t(($) => $["tryAgain"], { ns: "common" })
-              }
-            ),
-            testId: "failedToLoad"
-          }
-        ),
-        excludeResultAsGovernmentEntity && /* @__PURE__ */ jsx(
-          Alert,
-          {
-            variant: "info",
-            type: "callToAction",
-            title: t(($) => $["businessSelection__unableToOnboardGovernmentEntity"], {
-              ns: "business"
-            }),
-            actions: /* @__PURE__ */ jsx(Button, { onClick: handleGoBack, variant: "link", children: t(($) => $["goBack"], { ns: "common" }) })
-          }
-        ),
-        !fetchingError && !excludeResultAsGovernmentEntity && /* @__PURE__ */ jsx(BusinessInformation, { fetching, selectedBusiness: currentBusinessSelection })
-      ] })
-    }
-  );
-}
-function BusinessSelection({
-  showCompanyStructure,
-  loading,
-  searchResults,
-  proceedToManualDataEntry,
-  handleNextClick,
-  setIsBusinessSelection,
-  setShowCompanyStructure
-}) {
-  const { t } = useTranslation(["common", "business"]);
-  const userEvents = useAnalyticsContext();
-  const { basicInformation } = useGlobalData();
-  const {
-    state: { currentState }
-  } = useStateContext();
-  const [selectedBusinessId, setSelectedBusinessId] = useState();
-  const [fetchParams, setFetchParams] = useState();
-  const {
-    data: businessData,
-    isError: fetchingError,
-    isLoading: fetching,
-    refetch: refetchCompanySelection
-  } = useCompanySelection(fetchParams);
-  if (fetching) {
-    setVerifiedBusiness(void 0);
-  }
-  const [prevBusinessData, setPrevBusinessData] = useState(businessData);
-  if (prevBusinessData !== businessData) {
-    if (businessData?.tinMatched === true && !verifiedBusiness.value) {
-      userEvents.addPageEvent("Success", {
-        actionType: "select",
-        returnValue: "companySelection"
-      });
-      if (!businessData?.legalForm) {
-        setShowCompanyStructure(true);
-        handleNextClick();
-      }
-      setVerifiedBusiness(businessData);
-    } else {
-      userEvents.addPageEvent("Encountered error", {
-        actionType: "select",
-        returnValue: "companySelection"
-      });
-    }
-    setPrevBusinessData(businessData);
-  }
-  const currentTin = basicInformation?.taxInformation?.find(
-    (taxId) => taxId.country === basicInformation.country
-  )?.number;
-  const handleSelectBusiness = useCallback(
-    async (result) => {
-      if ((!selectedBusinessId || selectedBusinessId !== result.id) && currentTin) {
-        userEvents.addPageEvent("Clicked button", {
-          actionType: "select",
-          label: "selectBusiness",
-          additionalData: {
-            companyIdx: searchResults?.findIndex((searchResult) => searchResult.id === result.id)
-          }
-        });
-        setSelectedBusinessId(result.id);
-        setFetchParams({
-          company: result,
-          state: basicInformation?.stateOrProvince,
-          name: result.name,
-          tin: currentTin
-        });
-      }
-    },
-    [searchResults, basicInformation?.stateOrProvince, selectedBusinessId, currentTin, userEvents]
-  );
-  const handleConfirmSelection = async () => {
-    handleNextClick();
-  };
-  const showLoader = loading || fetching && searchResults?.length === 1;
-  const businessSelectionClasses = cx("adyen-kyc-business-selection", {
-    "adyen-kyc-business-selection--loading": showLoader
-  });
-  const loaderClasses = cx("adyen-kyc-business-selection__loader", {
-    "adyen-kyc-business-selection__loader--hide": !showLoader
-  });
-  if (searchResults?.length) {
-    const idxNameMatch = searchResults.findIndex(
-      (result) => isNormalizedStringMatch(
-        currentState?.data?.basicInformation?.legalCompanyName || "",
-        result.name
-      )
-    );
-    if (idxNameMatch > -1) {
-      searchResults.unshift(searchResults.splice(idxNameMatch, 1)[0]);
-    }
+  },
+  [CountryCodes.Singapore]: {
+    label: "legalCompanyName",
+    helperText: "legalCompanyName__helperText__SG",
+    validators: validateNotEmptyOnBlur
+  },
+  [CountryCodes.UnitedStates]: ({ isBusiness }) => ({
+    label: "legalCompanyName__US",
+    helperText: isBusiness ? "legalCompanyName__helperText__US__business" : "legalCompanyName__helperText__US",
+    validators: validateNotEmptyOnBlur
+  })
+};
+const defaultFieldMetadataV4 = {
+  label: "legalCompanyName",
+  helperText: "legalCompanyName__helperText",
+  validators: validateLegalCompanyName
+};
+const defaultFieldConfigV4 = {
+  [CountryCodes.Australia]: {
+    label: "legalCompanyName",
+    helperText: "legalCompanyName__helperText__AU",
+    validators: validateLegalCompanyName
+  },
+  [CountryCodes.HongKong]: {
+    label: "legalCompanyName",
+    helperText: "legalCompanyName__helperText__HK",
+    validators: validateLegalCompanyName
+  },
+  [CountryCodes.Netherlands]: {
+    label: "legalCompanyName",
+    helperText: "legalCompanyName__helperText__NL",
+    validators: validateLegalCompanyName
+  },
+  [CountryCodes.Singapore]: {
+    label: "legalCompanyName",
+    helperText: "legalCompanyName__helperText__SG",
+    validators: validateLegalCompanyName
+  },
+  [CountryCodes.UnitedStates]: ({ isBusiness }) => ({
+    label: "legalCompanyName__US",
+    helperText: isBusiness ? "legalCompanyName__helperText__US__business" : "legalCompanyName__helperText__US",
+    validators: validateLegalCompanyName
+  }),
+  [CountryCodes.Japan]: {
+    label: "legalCompanyName__JP",
+    helperText: void 0,
+    validators: [...validateLegalCompanyName, validateLatinSpaceMarkPunctuationOnlyOnBlur]
   }
-  if (searchResults?.length && !showCompanyStructure || showLoader) {
-    return /* @__PURE__ */ jsxs("div", { className: businessSelectionClasses, children: [
-      /* @__PURE__ */ jsx("div", { className: loaderClasses, "data-testId": "business-selection-loader", children: /* @__PURE__ */ jsx(Loader, { size: "large" }) }),
-      !!(searchResults?.length && !showCompanyStructure && !showLoader) && /* @__PURE__ */ jsxs(Fragment, { children: [
-        /* @__PURE__ */ jsx(Header, { title: t(($) => $["businessSelectionFormHeading"], { ns: "common" }) }),
-        /* @__PURE__ */ jsx(StackLayout, { children: searchResults?.map((result) => /* @__PURE__ */ jsx(
-          BusinessInformationCard,
-          {
-            result,
-            selectedBusinessId,
-            currentBusinessSelection: businessData,
-            fetching,
-            fetchingError,
-            invalidTin: businessData?.tinMatched === false,
-            handleSelectBusiness,
-            refetchCompanySelection,
-            handleConfirmSelection,
-            setIsBusinessSelection
-          },
-          result.id
-        )) }),
-        /* @__PURE__ */ jsxs(
-          Typography,
-          {
-            el: "span",
-            color: "secondary",
-            className: "adyen-kyc-business-selection__footer",
-            children: [
-              t(($) => $["businessSelection__footer"], { ns: "business" }),
-              /* @__PURE__ */ jsx(Button, { variant: "link", onClick: proceedToManualDataEntry, testId: "manualDataEntry", children: t(($) => $["businessSelection__footerButton"], { ns: "business" }) })
-            ]
-          }
-        )
-      ] })
-    ] });
+};
+const defaultJaHaniLegalCompanyNameFieldMetadata = {
+  label: "jaHaniLegalCompanyName"
+};
+const defaultJaKanaLegalCompanyNameFieldMetadata = {
+  label: "jaKanaLegalCompanyName"
+};
+const defaultJaHaniLegalCompanyNameFieldConfig = {
+  label: "jaHaniLegalCompanyName",
+  validators: validateJaHaniLegalCompanyName
+};
+const defaultJaKanaLegalCompanyNameFieldConfig = {
+  label: "jaKanaLegalCompanyName",
+  validators: validateJaKanaLegalCompanyName
+};
+const localizedLegalCompanyNameFieldConfig = {
+  jaHaniLegalCompanyName: {
+    config: defaultJaHaniLegalCompanyNameFieldConfig,
+    metadata: defaultJaHaniLegalCompanyNameFieldMetadata
+  },
+  jaKanaLegalCompanyName: {
+    config: defaultJaKanaLegalCompanyNameFieldConfig,
+    metadata: defaultJaKanaLegalCompanyNameFieldMetadata
   }
-  return null;
-}
-const BASIC_INFORMATION_FORM_ID = "basicInformation";
+};
+const defaultFieldMetadata = {
+  label: "stateOrProvince",
+  placeholder: "stateOrProvince__placeHolder",
+  validators: validateNotEmptyOnBlur
+};
+const defaultFieldConfig = {
+  [CountryCodes.Australia]: {
+    label: "state",
+    placeholder: "selectState",
+    validators: validateNotEmptyOnBlur
+  },
+  [CountryCodes.Brazil]: {
+    label: "state",
+    placeholder: "selectState",
+    validators: validateNotEmptyOnBlur
+  },
+  [CountryCodes.Canada]: {
+    label: "provinceOrTerritory",
+    placeholder: "selectProvinceOrTerritory",
+    validators: validateNotEmptyOnBlur
+  },
+  [CountryCodes.NewZealand]: {
+    label: "region",
+    validators: validateNotEmptyOnBlur
+  },
+  [CountryCodes.UnitedStates]: ({ isBusiness }) => ({
+    label: isBusiness ? "stateOrProvince__US__business" : "state",
+    placeholder: "stateOrProvince__placeHolder__US",
+    validators: validateNotEmptyOnBlur
+  })
+};
 const BASIC_INFORMATION_FIELDS = [
   ...COUNTRY_FIELD,
   ...LEGAL_COMPANY_NAME_FIELD,
@@ -5079,98 +4665,58 @@ const BASIC_INFORMATION_FIELDS = [
   ...BUSINESS_REGISTRATION_NUMBER_FIELD,
   ...COUNTRY_OF_GOVERNING_LAW_FIELD
 ];
+const FormDescription = ({
+  description,
+  t
+}) => {
+  return /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-form-header__description", children: [
+    description,
+    " ",
+    /* @__PURE__ */ jsx(Link, { href: "https://www.adyen.com/privacy-policy", external: true, children: t(($) => $["privacyStatement"]) })
+  ] });
+};
 function BasicInformation({
-  data,
-  labels,
-  placeholders,
-  helperText,
-  readOnly,
-  shouldValidate,
-  formVerificationErrors,
-  fieldValidationErrors,
-  allFields,
-  requiredFields,
-  obscuredFields,
-  optionalFields,
-  readOnlyFields,
-  trustedFields,
+  id,
   country,
-  companyType = CompanyTypesValues.PRIVATE_COMPANY,
+  shouldValidate,
+  validationErrors = {},
+  verificationErrors = {},
   isTopLevelEntity,
-  className,
-  showBusinessSelection,
-  showCompanyStructure,
-  isActiveForm,
-  loading,
-  searchResults,
-  proceedToManualDataEntry,
-  handleNextClick,
-  setShowBusinessSelection,
-  setShowCompanyStructure,
-  disableCountry
+  disableCountry,
+  companyType
 }) {
-  const { updateStateSlice, sliceData } = useGlobalDataSlice(BASIC_INFORMATION_FORM_ID);
   const { t } = useTranslation(["common", "business"]);
   const { isSettingEnabled } = useSettingsContext();
   const { isExperimentEnabled } = useExperimentsContext();
+  const { form } = useFormContext();
   const allowedCountries = useAllowedCountries();
   const isAllowedEditPrefilledCountry = isSettingEnabled(SettingNames.AllowPrefilledCountryEdit);
-  const verifiedBusiness$1 = verifiedBusiness.value;
-  const currentCountryTaxInformation = sliceData?.taxInformation?.find(
+  const state = form.data?.basicInformation?.stateOrProvince;
+  const currentCountryTaxInformation = form.data?.basicInformation?.taxInformation?.find(
     (tax) => tax.country === country
   );
-  const getFormSchema = useCallback(
-    (currentData) => {
-      const fieldsToRemove = [];
-      if (currentData.country !== CountryCodes.UnitedKingdom) {
-        fieldsToRemove.push("countryOfGoverningLaw");
-      }
-      if (currentData.exemptedFromTax) {
-        fieldsToRemove.push("taxInformation");
-      }
-      return requiredFields?.filter((field) => !fieldsToRemove.includes(field)) ?? [
-        ...COUNTRY_FIELD,
-        ...LEGAL_COMPANY_NAME_FIELD
-      ];
-    },
-    [requiredFields]
-  );
-  const initialFormUtilsProps = useMemo(
-    () => ({
-      labels,
-      placeholders,
-      helperText,
-      readOnly,
-      allFields,
-      requiredFields,
-      readOnlyFields,
-      optionalFields,
-      obscuredFields,
-      trustedFields,
-      shouldValidate
-    }),
-    [
-      allFields,
-      helperText,
-      labels,
-      obscuredFields,
-      optionalFields,
-      placeholders,
-      readOnly,
-      readOnlyFields,
-      requiredFields,
-      trustedFields,
-      shouldValidate
-    ]
+  const handleChangeFor = useCallback(
+    (fieldName, mode) => form.handleChangeFor(fieldName, "basicInformation", mode),
+    [form]
   );
-  const mergedFieldProps = useMemo(
-    () => initialFormUtilsProps.allFields?.reduce((acc, field) => {
+  const formUtils = useMemo(() => {
+    const initialProps = {
+      data: form.data?.basicInformation ?? {},
+      fieldValidationErrors: validationErrors,
+      formVerificationErrors: verificationErrors,
+      allFields: form.allFields?.basicInformation ?? [],
+      requiredFields: form.requiredFields?.basicInformation ?? [],
+      optionalFields: form.optionalFields?.basicInformation ?? [],
+      trustedFields: form.trustedFields?.basicInformation ?? [],
+      obscuredFields: form.obscuredFields?.basicInformation ?? [],
+      errors: form.errors?.basicInformation ?? {},
+      valid: form.valid?.basicInformation ?? {},
+      handleFieldChange: handleChangeFor
+    };
+    const formUtilProps = initialProps.allFields?.reduce((acc, field) => {
       switch (field) {
         case "country":
-          return {
-            ...acc,
-            validators: { ...acc.validators, ...CountryFieldValidation() }
-          };
+          return acc;
         case "legalCompanyName":
           return mergeFieldMetadataIntoProps(
             field,
@@ -5182,10 +4728,7 @@ function BasicInformation({
             acc
           );
         case "countryOfGoverningLaw":
-          return {
-            ...acc,
-            validators: { ...acc.validators, ...CountryOfGoverningLawFieldValidation() }
-          };
+          return acc;
         case "stateOrProvince":
           return mergeFieldMetadataIntoProps(
             field,
@@ -5216,24 +4759,14 @@ function BasicInformation({
               registrationNumberDefaultFieldConfig[country],
               {
                 companyType,
-                registrationNumberType: sliceData?.registrationNumberType,
-                state: sliceData?.stateOrProvince,
+                registrationNumberType: form.data?.additionalInformation?.registrationNumberType,
+                state,
                 isExperimentEnabled
               },
               registrationNumberDefaultFieldMetadata
             ),
             acc
           );
-        case "exemptedFromRegistrationNumber":
-          return mergeFieldMetadataIntoProps(
-            field,
-            resolveFieldMetadata(
-              exemptFromRegistrationNumberDefaultFieldConfig[country],
-              {},
-              exemptFromRegistrationNumberDefaultFieldMetadata
-            ),
-            acc
-          );
         case "jaHaniLegalCompanyName":
           return mergeFieldMetadataIntoProps(
             field,
@@ -5257,116 +4790,75 @@ function BasicInformation({
         default:
           return acc;
       }
-    }, initialFormUtilsProps),
-    [
-      initialFormUtilsProps,
-      isExperimentEnabled,
-      country,
-      currentCountryTaxInformation?.type,
-      companyType,
-      sliceData
-    ]
-  );
-  const {
-    schema: formSchema,
-    data: formData,
-    errors: formErrors,
-    valid: formValid,
-    fieldProblems: formFieldProblems,
-    handleChangeFor
-  } = useForm({
-    schema: getFormSchema,
-    defaultData: data,
-    rules: mergedFieldProps?.validators,
-    optionalFields: mergedFieldProps?.optionalFields,
-    obscuredFields: mergedFieldProps?.obscuredFields,
-    trustedFields: mergedFieldProps?.trustedFields,
-    fieldProblems: fieldValidationErrors,
-    shouldValidate
-  });
-  const formUtils = createFormUtils(
-    mergedFieldProps ?? initialFormUtilsProps,
-    t
-  );
-  useEffect(() => {
-    updateStateSlice({
-      schema: formSchema,
-      data: formData,
-      errors: formErrors,
-      valid: formValid,
-      fieldProblems: formFieldProblems
-    });
-  }, [formSchema, formData, formErrors, formFieldProblems, formValid, updateStateSlice]);
-  useEffect(() => {
-    if (!isActiveForm && !searchResults?.length) setShowBusinessSelection(false);
-  }, [isActiveForm, searchResults?.length, setShowBusinessSelection]);
-  useEffect(() => {
-    if (showBusinessSelection && showCompanyStructure && isActiveForm) {
-      handleNextClick();
-      if (verifiedBusiness$1) setShowBusinessSelection(false);
-    }
+    }, initialProps);
+    return createFormUtils(formUtilProps ?? initialProps, t);
   }, [
-    showBusinessSelection,
-    showCompanyStructure,
-    handleNextClick,
-    isActiveForm,
-    verifiedBusiness$1,
-    setShowBusinessSelection
+    companyType,
+    country,
+    currentCountryTaxInformation?.type,
+    form.allFields?.basicInformation,
+    form.data?.additionalInformation?.registrationNumberType,
+    form.data?.basicInformation,
+    form.errors?.basicInformation,
+    form.obscuredFields?.basicInformation,
+    form.optionalFields?.basicInformation,
+    form.requiredFields?.basicInformation,
+    form.trustedFields?.basicInformation,
+    form.valid?.basicInformation,
+    handleChangeFor,
+    isExperimentEnabled,
+    state,
+    t,
+    validationErrors,
+    verificationErrors
   ]);
-  const classNames = className ? cx("adyen-kyc-basic-information", className) : "adyen-kyc-basic-information";
   const showField = (fieldKeys) => fieldKeys.some((field) => {
     switch (field) {
+      case "registrationNumberType":
       case "registrationNumber": {
-        return (formUtils.isRequiredField(field) || formUtils.isOptionalField(field)) && formData?.stateOrProvince;
+        return (formUtils.isRequiredField(field) || formUtils.isOptionalField(field)) && form.data.basicInformation?.stateOrProvince;
       }
       default:
         return formUtils.isRequiredField(field) || formUtils.isOptionalField(field);
     }
   });
   const legalCompanyNameFields = useLegalCompanyNameField({
-    data: formData,
-    valid: formValid,
-    errors: formErrors,
-    fieldProblems: formFieldProblems,
+    data: form.data.basicInformation ?? {},
+    valid: form.valid.basicInformation ?? {},
+    errors: form.errors.basicInformation ?? {},
+    fieldProblems: form.fieldProblems.basicInformation ?? {},
     country,
     formUtils,
     handleChange: handleChangeFor
   });
-  if (showBusinessSelection) {
-    return /* @__PURE__ */ jsx(
-      BusinessSelection,
+  return /* @__PURE__ */ jsxs("form", { id, className: "adyen-kyc-basic-information", children: [
+    /* @__PURE__ */ jsx(Header, { title: t(($) => $["basicInformationFormHeading"], { ns: "business" }), children: /* @__PURE__ */ jsx(
+      FormDescription,
       {
-        showCompanyStructure,
-        loading,
-        searchResults,
-        proceedToManualDataEntry,
-        handleNextClick,
-        setIsBusinessSelection: setShowBusinessSelection,
-        setShowCompanyStructure
+        slot: "description",
+        description: t(($) => $["basicInformationFormDescription"], { ns: "business" }),
+        t
       }
-    );
-  }
-  return /* @__PURE__ */ jsxs("form", { id: BASIC_INFORMATION_FORM_ID, className: classNames, children: [
-    /* @__PURE__ */ jsx(Header, { title: t(($) => $["basicInformationFormHeading"], { ns: "business" }), children: /* @__PURE__ */ jsxs("template", { slot: "description", children: [
-      t(($) => $["basicInformationFormDescription"], { ns: "business" }),
-      " ",
-      /* @__PURE__ */ jsx(Link, { href: "https://www.adyen.com/privacy-policy", external: true, children: t(($) => $["privacyStatement"]) })
-    ] }) }),
+    ) }),
     /* @__PURE__ */ jsx(
       ErrorPanel,
       {
         id: "ariaErrorField",
-        verificationErrors: formVerificationErrors,
-        validationErrors: fieldValidationErrors,
+        verificationErrors,
+        validationErrors,
         formUtils
       }
     ),
     /* @__PURE__ */ jsx("fieldset", { children: /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
       CountryField,
       {
-        data: formUtils.getFieldData(formData, COUNTRY_FIELD),
-        valid: formUtils.getFieldValid(formValid, COUNTRY_FIELD),
-        errors: formUtils.getFieldErrors(formErrors, formFieldProblems, COUNTRY_FIELD),
+        data: formUtils.getFieldData(form.data?.basicInformation ?? {}, COUNTRY_FIELD),
+        valid: formUtils.getFieldValid(form.valid?.basicInformation ?? {}, COUNTRY_FIELD),
+        errors: formUtils.getFieldErrors(
+          form.errors?.basicInformation ?? {},
+          validationErrors,
+          COUNTRY_FIELD
+        ),
         labels: formUtils.getFieldLabels(COUNTRY_FIELD, {
           country: "countryRegionOfEstablishment"
         }),
@@ -5375,61 +4867,73 @@ function BasicInformation({
         allowedCountries: isTopLevelEntity ? allowedCountries : void 0
       }
     ) }) }),
-    COUNTRY_OF_GOVERNING_LAW_POSSIBLE.includes(formData.country ?? country) && showField(COUNTRY_OF_GOVERNING_LAW_FIELD) && /* @__PURE__ */ jsx(
-      CountryOfGoverningLawField,
-      {
-        data: formUtils.getFieldData(formData, COUNTRY_OF_GOVERNING_LAW_FIELD),
-        country: sliceData?.country,
-        valid: formUtils.getFieldValid(formValid, COUNTRY_OF_GOVERNING_LAW_FIELD),
-        errors: formUtils.getFieldErrors(
-          formErrors,
-          formFieldProblems,
-          COUNTRY_OF_GOVERNING_LAW_FIELD
-        ),
-        labels: formUtils.getFieldLabels(COUNTRY_OF_GOVERNING_LAW_FIELD),
-        readonly: false,
-        allowedCountries: isTopLevelEntity ? allowedCountries : void 0,
-        handleChangeFor
-      }
-    ),
-    // fields shown here are abstracted by useLegalCompanyNameField
-    legalCompanyNameFields.map((field) => /* @__PURE__ */ jsx(
-      Field,
-      {
-        name: field?.name ?? "",
-        label: field?.label,
-        helper: field?.helper,
-        errorMessage: field?.errorMessage,
-        isValid: field?.isValid,
-        children: (childProps) => /* @__PURE__ */ jsx(
-          InputText,
-          {
-            ...childProps,
-            "aria-required": true,
-            "aria-invalid": !field?.isValid,
-            name: field?.name,
-            value: field?.value,
-            readonly: field?.readonly,
-            onInput: field ? field.onInput : () => {
-            },
-            transformInput: field?.transformInput,
-            transformMode: field?.transformMode,
-            onBlur: field?.onBlur,
-            onKeyDown: field?.onKeyDown
-          }
-        )
-      },
-      field?.name
-    )),
-    COUNTRIES_USING_COMPANY_SEARCH.includes(formData.country ?? country) && /* @__PURE__ */ jsxs("fieldset", { children: [
+    /* @__PURE__ */ jsxs("fieldset", { children: [
+      COUNTRY_OF_GOVERNING_LAW_POSSIBLE.includes(country) && showField(COUNTRY_OF_GOVERNING_LAW_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
+        CountryOfGoverningLawField,
+        {
+          data: formUtils.getFieldData(
+            form.data?.basicInformation ?? {},
+            COUNTRY_OF_GOVERNING_LAW_FIELD
+          ),
+          country,
+          valid: formUtils.getFieldValid(
+            form.valid?.basicInformation ?? {},
+            COUNTRY_OF_GOVERNING_LAW_FIELD
+          ),
+          errors: formUtils.getFieldErrors(
+            form.errors?.basicInformation ?? {},
+            validationErrors,
+            COUNTRY_OF_GOVERNING_LAW_FIELD
+          ),
+          labels: formUtils.getFieldLabels(COUNTRY_OF_GOVERNING_LAW_FIELD),
+          readonly: false,
+          allowedCountries: isTopLevelEntity ? allowedCountries : void 0,
+          handleChangeFor
+        }
+      ) }),
+      // fields shown here are abstracted by useLegalCompanyNameField
+      legalCompanyNameFields.map((field) => /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
+        Field,
+        {
+          name: field?.name ?? "",
+          label: field?.label,
+          helper: field?.helper,
+          errorMessage: field?.errorMessage,
+          isValid: Boolean(field?.isValid),
+          children: (childProps) => /* @__PURE__ */ jsx(
+            InputText,
+            {
+              ...childProps,
+              "aria-required": true,
+              "aria-invalid": !field?.isValid,
+              name: field?.name,
+              value: field?.value,
+              readonly: field?.readonly,
+              onInput: field ? field.onInput : () => {
+              },
+              transformInput: field?.transformInput,
+              transformMode: field?.transformMode,
+              onBlur: field?.onBlur,
+              onKeyDown: field?.onKeyDown
+            }
+          )
+        },
+        field?.name
+      ) }, field?.name)),
       showField(TAX_INFORMATION_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
         TaxInformationField,
         {
-          data: formUtils.getFieldData(formData, TAX_INFORMATION_FIELD),
-          valid: formUtils.getFieldValid(formValid, TAX_INFORMATION_FIELD),
+          data: formUtils.getFieldData(
+            form.data?.basicInformation ?? {},
+            TAX_INFORMATION_FIELD
+          ),
+          valid: formUtils.getFieldValid(
+            form.valid?.basicInformation ?? {},
+            TAX_INFORMATION_FIELD
+          ),
           errors: formUtils.getFieldErrors(
-            formErrors,
-            formFieldProblems,
+            form.errors?.basicInformation ?? {},
+            validationErrors,
             TAX_INFORMATION_FIELD
           ),
           labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD, {
@@ -5442,33 +4946,43 @@ function BasicInformation({
           shouldValidate,
           handleChangeFor,
           canExempt: showField(["exemptedFromTax"]),
-          registrationNumber: formData.registrationNumber,
-          country: formData.country ?? country,
+          registrationNumber: form.data.additionalInformation?.registrationNumber,
+          country,
           entityType: companyType,
-          defaultData: data?.taxInformation
+          defaultData: form.defaultData?.basicInformation?.taxInformation
         }
       ) }),
       showField(STATE_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
         StateField,
         {
-          data: formUtils.getFieldData(formData, STATE_FIELD),
-          valid: formUtils.getFieldValid(formValid, STATE_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STATE_FIELD),
+          data: formUtils.getFieldData(form.data?.basicInformation ?? {}, STATE_FIELD),
+          valid: formUtils.getFieldValid(form.valid?.basicInformation ?? {}, STATE_FIELD),
+          errors: formUtils.getFieldErrors(
+            form.errors?.basicInformation ?? {},
+            validationErrors,
+            STATE_FIELD
+          ),
           labels: formUtils.getFieldLabels(STATE_FIELD),
           placeholders: formUtils.getFieldPlaceholders(STATE_FIELD),
           readonly: formUtils.isReadOnly("stateOrProvince"),
           handleChangeFor,
-          selectedCountry: formData.country
+          selectedCountry: country
         }
       ) }),
       showField(BUSINESS_REGISTRATION_NUMBER_FIELD) && /* @__PURE__ */ jsx("div", { className: "adyen-kyc-field-wrapper", children: /* @__PURE__ */ jsx(
         BusinessRegistrationNumberField,
         {
-          data: formUtils.getFieldData(formData, BUSINESS_REGISTRATION_NUMBER_FIELD),
-          valid: formUtils.getFieldValid(formValid, BUSINESS_REGISTRATION_NUMBER_FIELD),
+          data: formUtils.getFieldData(
+            form.data?.basicInformation ?? {},
+            BUSINESS_REGISTRATION_NUMBER_FIELD
+          ),
+          valid: formUtils.getFieldValid(
+            form.valid?.basicInformation ?? {},
+            BUSINESS_REGISTRATION_NUMBER_FIELD
+          ),
           errors: formUtils.getFieldErrors(
-            formErrors,
-            formFieldProblems,
+            form.errors?.basicInformation ?? {},
+            validationErrors,
             BUSINESS_REGISTRATION_NUMBER_FIELD
           ),
           labels: formUtils.getFieldLabels(BUSINESS_REGISTRATION_NUMBER_FIELD, {
@@ -5482,8 +4996,8 @@ function BasicInformation({
           optional: formUtils.isOptionalField("registrationNumber"),
           shouldValidate,
           handleChangeFor,
-          country: formData.country ?? country,
-          canExempt: formUtils.isRequiredField("exemptedFromRegistrationNumber"),
+          country,
+          canExempt: showField(["exemptedFromRegistrationNumber"]),
           companyType
         }
       ) })
@@ -5506,6 +5020,32 @@ const useClearCompanyData = (options) => {
     ...options
   });
 };
+const LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW = 1577664e5;
+const KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS = [
+  StateCodesUS.Arkansas,
+  StateCodesUS.Connecticut,
+  StateCodesUS.Georgia,
+  StateCodesUS.Hawaii,
+  StateCodesUS.Indiana,
+  StateCodesUS.Kentucky,
+  StateCodesUS.Maryland,
+  StateCodesUS.Minnesota,
+  StateCodesUS.Missouri,
+  StateCodesUS.Montana,
+  StateCodesUS.NewHampshire,
+  StateCodesUS.NewMexico,
+  StateCodesUS.SouthCarolina,
+  StateCodesUS.Utah,
+  StateCodesUS.Vermont,
+  StateCodesUS.Wisconsin,
+  StateCodesUS.Wyoming
+];
+const KNOWN_DISALLOWED_INDEX_DATASET_STATES = [
+  StateCodesUS.California,
+  StateCodesUS.Florida,
+  StateCodesUS.Illinois,
+  StateCodesUS.Texas
+];
 const KOMPANY_SEARCH_FAILURE = "Kompany index and deep search both failed to complete";
 const useCompanySearch = (data, options) => {
   const { rootLegalEntityId, baseUrl } = useApiContext();
@@ -5576,6 +5116,74 @@ const handleCompanySearch = async (rootLegalEntityId, baseUrl, data) => {
   }
   return await searchByCompanyName();
 };
+const handleCompanyDataset = async (rootLegalEntityId, baseUrl, data) => {
+  const requestPayload = {
+    companyId: data.company.id,
+    country: "US",
+    state: data.state
+  };
+  const searchRequest = async (path) => {
+    return httpPost(
+      {
+        baseUrl,
+        path: `legalEntities/${rootLegalEntityId}/companyDataset${path ? "/" + path : ""}`
+      },
+      requestPayload
+    );
+  };
+  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;
+  if (data.state) {
+    return isDataCompliant && !KNOWN_DISALLOWED_INDEX_DATASET_STATES.includes(data.state) ? await getCompanyDataset() : await refreshCompanyDataset();
+  }
+  const companyData = isDataCompliant ? await getCompanyDataset() : await refreshCompanyDataset();
+  return {
+    ...companyData,
+    name: companyData.name.replaceAll("&amp;", "&")
+  };
+};
+const useVerifyTin = (data, options) => {
+  const { rootLegalEntityId, baseUrl } = useApiContext();
+  return useQuery({
+    queryKey: ["verifyTin", data],
+    queryFn: data ? () => verifyTin(rootLegalEntityId.value, baseUrl.value, data) : skipToken,
+    retry: 0,
+    ...options
+  });
+};
+const verifyTin = async (legalEntityId, baseUrl, data) => {
+  return httpPost(
+    {
+      baseUrl,
+      path: `legalEntities/${legalEntityId}/verifyTin`
+    },
+    data
+  );
+};
+const useCompanySelection = (data, options) => {
+  const { rootLegalEntityId, baseUrl } = useApiContext();
+  return useQuery({
+    queryKey: ["companySelection", data],
+    queryFn: data ? () => handleCompanySelection(rootLegalEntityId.value, baseUrl.value, data) : skipToken,
+    retry: 0,
+    ...options
+  });
+};
+const handleCompanySelection = async (rootLegalEntityId, baseUrl, data) => {
+  const [companyDatasetResult, tinMatch] = await Promise.all([
+    handleCompanyDataset(rootLegalEntityId, baseUrl, {
+      company: data.company,
+      state: data.state
+    }),
+    verifyTin(rootLegalEntityId, baseUrl, { name: data.name, tin: data.tin })
+  ]);
+  return {
+    ...companyDatasetResult,
+    tinMatched: tinMatch?.matched
+  };
+};
 const mapOrganizationTypeToCompanyType = (organizationType) => {
   switch (organizationType) {
     case "BUSINESS":
@@ -5634,10 +5242,152 @@ const applyVerifiedBusinessData = (form, country, verifiedData) => {
     )(verifiedAddress.operationalAddress);
   }
 };
+function BusinessInformation({ fetching, selectedBusiness }) {
+  const { t } = useTranslation(["common", "business"]);
+  const businessInformationClasses = cx("adyen-kyc-business-information", {
+    "adyen-kyc-business-information--fetching": fetching
+  });
+  const items = useMemo(
+    () => selectedBusiness ? entriesOf(selectedBusiness).reduce(
+      (acc, [key, value]) => {
+        switch (key) {
+          case "legalForm":
+            if (value) acc[0].details = value;
+            break;
+          case "name":
+            if (value) acc[1].details = value;
+            break;
+          case "address":
+            if (value) acc[2].details = value;
+            break;
+        }
+        return acc;
+      },
+      [
+        {
+          term: t(($) => $["legalForm"], { ns: "common" }),
+          details: ""
+        },
+        {
+          term: t(($) => $["legalCompanyName__US"], { ns: "common" }),
+          details: ""
+        },
+        {
+          term: t(($) => $["address"], { ns: "common" }),
+          details: ""
+        }
+      ]
+    ).filter((item) => !!item.details) : [],
+    [selectedBusiness, t]
+  );
+  if (fetching) {
+    return /* @__PURE__ */ jsx("div", { className: businessInformationClasses, children: /* @__PURE__ */ jsx(Loader, { size: "large" }) });
+  }
+  if (!fetching) {
+    return /* @__PURE__ */ jsx("div", { className: businessInformationClasses, children: /* @__PURE__ */ jsx(StructuredList, { items }) });
+  }
+  return null;
+}
+function BusinessInformationCard({
+  result,
+  selectedBusinessId,
+  currentBusinessSelection,
+  fetching,
+  fetchingError,
+  invalidTin,
+  setIsBusinessSelection,
+  handleSelectBusiness,
+  refetchCompanySelection,
+  handleConfirmSelection,
+  handleBackClick
+}) {
+  const { t } = useTranslation(["common", "business"]);
+  const excludeResultAsGovernmentEntity = useMemo(
+    () => isBankAccountRequestedForOrganization.value && currentBusinessSelection?.organizationType === "GOVERNMENTAL_ORGANIZATION",
+    [currentBusinessSelection]
+  );
+  const showSelectButton = useMemo(
+    () => !fetching && !fetchingError && currentBusinessSelection && !excludeResultAsGovernmentEntity,
+    [currentBusinessSelection, excludeResultAsGovernmentEntity, fetching, fetchingError]
+  );
+  const handleGoBack = () => {
+    if (handleBackClick) {
+      handleBackClick();
+    } else {
+      setIsBusinessSelection?.(false);
+    }
+  };
+  return /* @__PURE__ */ jsx(
+    Card,
+    {
+      "aria-selected": selectedBusinessId === result.id,
+      className: "adyen-kyc-business-information-card",
+      title: result.name,
+      subTitle: result.registrationNumber,
+      stateful: true,
+      fetching: fetching && selectedBusinessId === result.id,
+      active: selectedBusinessId === result.id,
+      headerButton: selectedBusinessId === result.id && showSelectButton ? /* @__PURE__ */ jsx(
+        Button,
+        {
+          onClick: () => handleConfirmSelection(currentBusinessSelection),
+          testId: "selectBusiness",
+          disabled: invalidTin,
+          children: t(($) => $["thisIsMyBusiness"], { ns: "business" })
+        }
+      ) : null,
+      onClick: () => handleSelectBusiness(result),
+      onKeyDown: handleKeys(["Enter"], () => handleSelectBusiness(result)),
+      children: selectedBusinessId === result.id && /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(Divider, {}),
+        invalidTin && /* @__PURE__ */ jsx(
+          Alert,
+          {
+            variant: "warning",
+            type: "callToAction",
+            title: t(($) => $["businessSelection__invalidTin"], { ns: "business" }),
+            actions: /* @__PURE__ */ jsx(Button, { testId: "backBtn", onClick: handleGoBack, variant: "link", children: t(($) => $["back"], { ns: "common" }) }),
+            testId: "invalidTin"
+          }
+        ),
+        fetchingError && /* @__PURE__ */ jsx(
+          Alert,
+          {
+            variant: "info",
+            type: "callToAction",
+            title: t(($) => $["businessSelection__failedToLoad"], { ns: "business" }),
+            actions: /* @__PURE__ */ jsx(
+              Button,
+              {
+                testId: "reloadBusiness",
+                onClick: () => refetchCompanySelection(),
+                variant: "link",
+                children: t(($) => $["tryAgain"], { ns: "common" })
+              }
+            ),
+            testId: "failedToLoad"
+          }
+        ),
+        excludeResultAsGovernmentEntity && /* @__PURE__ */ jsx(
+          Alert,
+          {
+            variant: "info",
+            type: "callToAction",
+            title: t(($) => $["businessSelection__unableToOnboardGovernmentEntity"], {
+              ns: "business"
+            }),
+            actions: /* @__PURE__ */ jsx(Button, { onClick: handleGoBack, variant: "link", children: t(($) => $["goBack"], { ns: "common" }) })
+          }
+        ),
+        !fetchingError && !excludeResultAsGovernmentEntity && /* @__PURE__ */ jsx(BusinessInformation, { fetching, selectedBusiness: currentBusinessSelection })
+      ] })
+    }
+  );
+}
 const BUSINESS_SELECTION_FIELDS = [
   "hasSelectedBusiness"
 ];
-function BusinessSelectionMultiform({
+function BusinessSelection({
   country,
   validationErrors = {},
   verificationErrors = {},
@@ -5900,79 +5650,22 @@ const companyTypeMetadata = {
   }
 };
 const companyTypeOptions = Object.keys(companyTypeMetadata);
-const CompanyStructureValidation = {
-  entityType: {
-    modes: ["blur"],
-    validate: (entityType) => !isEmpty(entityType),
-    errorMessage: "fieldIsRequired"
-  }
-};
-const COMPANY_STRUCTURE_FORM_ID = "companyStructure";
 const companyStructureFields = ["entityType"];
 function CompanyStructure({
-  data,
-  labels,
-  formVerificationErrors,
-  fieldValidationErrors,
-  requiredFields,
+  id,
   country,
-  showCompanyStructure,
-  shouldValidate
+  validationErrors = {},
+  verificationErrors = {}
 }) {
   const { t } = useTranslation(["common", "business"]);
-  const { isExperimentEnabled } = useExperimentsContext();
+  const { form } = useFormContext();
   const { accountHolder } = useAccountHolder();
   const { isSettingEnabled } = useSettingsContext();
   const canChangeEntityType = isSettingEnabled(SettingNames.AllowLegalEntityTypeChange);
-  const verifiedBusiness$1 = verifiedBusiness.value;
-  const { updateStateSlice } = useGlobalDataSlice(COMPANY_STRUCTURE_FORM_ID);
-  const schema = requiredFields ? [...requiredFields] : companyStructureFields;
-  const {
-    schema: formSchema,
-    data: formData,
-    valid: formValid,
-    errors: formErrors,
-    fieldProblems: formFieldProblems,
-    handleChangeFor,
-    setData,
-    setValid
-  } = useForm({
-    schema,
-    defaultData: data,
-    rules: CompanyStructureValidation,
-    fieldProblems: fieldValidationErrors,
-    shouldValidate
-  });
-  const formUtils = createFormUtils({ labels, requiredFields }, t);
-  useEffect(() => {
-    if (!showCompanyStructure && !verifiedBusiness$1 && !data?.entityType) {
-      setValid("entityType", false);
-      return setData("entityType", data?.entityType);
-    }
-    if (!verifiedBusiness$1 && data?.entityType) {
-      return handleChangeFor("entityType")(data?.entityType);
-    }
-    const type = mapOrganizationTypeToCompanyType(verifiedBusiness$1?.organizationType);
-    if (verifiedBusiness$1 && type && data?.entityType !== type) {
-      return handleChangeFor("entityType")(type);
-    }
-  }, [
-    data?.entityType,
-    isExperimentEnabled,
-    setData,
-    setValid,
-    showCompanyStructure,
-    verifiedBusiness$1
-  ]);
-  useEffect(() => {
-    updateStateSlice({
-      schema: formSchema,
-      data: formData,
-      errors: formErrors,
-      valid: formValid,
-      fieldProblems: formFieldProblems
-    });
-  }, [formSchema, formData, formErrors, formValid, formFieldProblems, updateStateSlice]);
+  const formUtils = createFormUtils(
+    { requiredFields: form.requiredFields?.companyStructure ?? [] },
+    t
+  );
   const excludedTypes = [
     CompanyTypesValues.INCORPORATED_PARTNERSHIP,
     CompanyTypesValues.INCORPORATED_ASSOCIATION
@@ -5980,9 +5673,9 @@ function CompanyStructure({
   if (isBankAccountRequestedForOrganization.value) {
     excludedTypes.push(CompanyTypesValues.GOVERNMENTAL_ORGANIZATION);
   }
-  const companyTypeRadioOptions = canChangeEntityType && accountHolder !== "aTrust" ? companyTypeOptions.filter((companyType) => !excludedTypes.includes(companyType)) : companyTypeOptions;
+  const companyTypeRadioOptions = canChangeEntityType && accountHolder !== "aTrust" && accountHolder !== "anUnincorporatedPartnership" ? companyTypeOptions.filter((companyType) => !excludedTypes.includes(companyType)) : companyTypeOptions;
   const companyTypeExamples2 = useCompanyTypeExamples(country);
-  return /* @__PURE__ */ jsxs("form", { children: [
+  return /* @__PURE__ */ jsxs("form", { id, className: "adyen-kyc-company-structure", children: [
     /* @__PURE__ */ jsx(
       Header,
       {
@@ -5993,10 +5686,10 @@ function CompanyStructure({
     /* @__PURE__ */ jsx(
       ErrorPanel,
       {
-        verificationErrors: formVerificationErrors,
-        validationErrors: fieldValidationErrors,
-        formUtils,
-        id: "ariaErrorField"
+        id: "ariaErrorField",
+        verificationErrors,
+        validationErrors,
+        formUtils
       }
     ),
     /* @__PURE__ */ jsx(
@@ -6004,9 +5697,12 @@ function CompanyStructure({
       {
         el: "fieldset",
         name: "entityType",
-        errorMessage: formUtils.getErrorMessage("entityType", formErrors, formFieldProblems),
-        isValid: formValid.entityType,
-        classNameModifiers: ["entityType"],
+        errorMessage: formUtils.getErrorMessage(
+          "entityType",
+          form.errors?.companyStructure,
+          validationErrors
+        ),
+        isValid: form.valid?.companyStructure?.entityType,
         children: (childProps) => /* @__PURE__ */ jsx(
           EntityTypeRadioGroupCard,
           {
@@ -6016,11 +5712,11 @@ function CompanyStructure({
             optionId: (option) => companyTypeMetadata[option].id,
             optionName: (option) => t(($) => $[companyTypeMetadata[option].name], { ns: "business" }),
             optionDescription: (option) => t(($) => $[companyTypeMetadata[option].description], { ns: "business" }),
-            selected: formData.entityType,
-            onSelect: handleChangeFor("entityType"),
+            selected: form.data?.companyStructure?.entityType,
+            onSelect: form.handleChangeFor("entityType", "companyStructure"),
             examples: companyTypeExamples2,
             "aria-required": true,
-            "aria-invalid": !formValid.entityType
+            "aria-invalid": !form.valid?.companyStructure?.entityType
           }
         )
       }
@@ -7100,86 +6796,86 @@ const hasProgressedBeyondEntitySelection = (legalEntity) => {
   return hasOwnEntityAssocation || !!hasOrganizationType;
 };
 const Introduction = lazy(
-  async () => (await import("./Introduction-Wu-LBXX2.js")).Introduction
+  async () => (await import("./Introduction-C2X6DyHw.js")).Introduction
 );
 const BusinessTypeSelectionPage = lazy(
-  async () => (await import("./BusinessTypeSelectionPage-CP0UXFG_.js")).BusinessTypeSelectionPage
+  async () => (await import("./BusinessTypeSelectionPage-DFJqkG5_.js")).BusinessTypeSelectionPage
 );
 const SingpassSelection = lazy(
-  async () => (await import("./SingpassSelection-DR7s4WiD.js")).SingpassSelection
+  async () => (await import("./SingpassSelection-BWdMU1Lv.js")).SingpassSelection
 );
 const AccountSetupRejected = lazy(
-  async () => (await import("./AccountSetupRejected-_IN29uU8.js")).AccountSetupRejected
+  async () => (await import("./AccountSetupRejected-eL8cEb4U.js")).AccountSetupRejected
 );
 const DecisionMakers = lazy(
-  async () => (await import("./DecisionMakers-BShMorMY.js")).DecisionMakers
+  async () => (await import("./DecisionMakers-CXX7UaII.js")).DecisionMakers
 );
 const CustomerSupport = lazy(
-  async () => (await import("./CustomerSupport-C_fh3_q2.js")).CustomerSupport
+  async () => (await import("./CustomerSupport-gUFWyk3X.js")).CustomerSupport
 );
-const Review = lazy(async () => (await import("./Review-CN0zdu0c.js")).Review);
+const Review = lazy(async () => (await import("./Review-CUNKnKSZ.js")).Review);
 const SignPCIComponent = lazy(
-  async () => (await import("./SignPCIComponent-Dm45H-8u.js")).SignPCIComponent
+  async () => (await import("./SignPCIComponent-MnotetIL.js")).SignPCIComponent
 );
 const AcceptTermsOfService = lazy(
-  async () => (await import("./AcceptTermsOfServiceComponent-De5XWtcz.js")).AcceptTermsOfServiceComponent
+  async () => (await import("./AcceptTermsOfServiceComponent-jlzA4hRO.js")).AcceptTermsOfServiceComponent
 );
 const TaxReportingDropin = lazy(
-  async () => (await import("./TaxReportingDropin-CKin6_Er.js")).TaxReportingDropin
+  async () => (await import("./TaxReportingDropin-D2gjRJag.js")).TaxReportingDropin
 );
 const PayoutDetailsPage = lazy(
-  async () => (await import("./PayoutDetailsDropin-DrESJrLF.js").then((n) => n.a)).PayoutDetailsPage
+  async () => (await import("./PayoutDetailsDropin-M9FYw20B.js").then((n) => n.a)).PayoutDetailsPage
 );
 const RootBusinessDetailsPage = lazy(
-  async () => (await import("./RootBusinessDetailsPage-DsCMT0gE.js")).RootBusinessDetailsPage
+  async () => (await import("./RootBusinessDetailsPage-DC0qALED.js")).RootBusinessDetailsPage
 );
 const RootBusinessLinesPage = lazy(
-  async () => (await import("./RootBusinessLinesPage-D0djzhVg.js")).RootBusinessLinesPage
+  async () => (await import("./RootBusinessLinesPage-B8gUQ93t.js")).RootBusinessLinesPage
 );
 const SoleProprietorshipPage = lazy(
-  async () => (await import("./SoleProprietorshipPage-C2_d7XKS.js")).SoleProprietorshipPage
+  async () => (await import("./SoleProprietorshipPage-C9mxOyGm.js")).SoleProprietorshipPage
 );
 const TrustMemberCompanyPage = lazy(
-  async () => (await import("./TrustMemberCompanyPage-Bgh-8J6_.js")).TrustMemberCompanyPage
+  async () => (await import("./TrustMemberCompanyPage-DlnCvpf5.js")).TrustMemberCompanyPage
 );
 const TrustMemberIndividualPage = lazy(
-  async () => (await import("./TrustMemberIndividualPage-2gZsrdqt.js")).TrustMemberIndividualPage
+  async () => (await import("./TrustMemberIndividualPage-D8LSPYGf.js")).TrustMemberIndividualPage
 );
 const TrustMemberRoleAndTypePage = lazy(
-  async () => (await import("./TrustMemberRoleAndTypePage-BB41jjVq.js")).TrustMemberRoleAndTypePage
+  async () => (await import("./TrustMemberRoleAndTypePage-CN7oQduU.js")).TrustMemberRoleAndTypePage
 );
 const TrustMembersOverview = lazy(
-  async () => (await import("./TrustMembersOverview-DkpHLa-c.js")).TrustMembersOverview
+  async () => (await import("./TrustMembersOverview-C2VH8NIl.js")).TrustMembersOverview
 );
 const UnincorporatedPartnershipMemberCompanyPage = lazy(
-  async () => (await import("./UnincorporatedPartnershipMemberCompanyPage-CVa6qF3n.js")).UnincorporatedPartnershipMemberCompanyPage
+  async () => (await import("./UnincorporatedPartnershipMemberCompanyPage-BUEeNfv-.js")).UnincorporatedPartnershipMemberCompanyPage
 );
 const UnincorporatedPartnershipIndividualPage = lazy(
-  async () => (await import("./UnincorporatedPartnershipIndividualPage-uZBKkJwX.js")).UnincorporatedPartnershipIndividualPage
+  async () => (await import("./UnincorporatedPartnershipIndividualPage-fN2QrGh4.js")).UnincorporatedPartnershipIndividualPage
 );
 const UnincorporatedPartnershipMemberRoleAndTypePage = lazy(
-  async () => (await import("./UnincorporatedPartnershipMemberRoleAndTypePage-Ctl2MPKX.js")).UnincorporatedPartnershipMemberRoleAndTypePage
+  async () => (await import("./UnincorporatedPartnershipMemberRoleAndTypePage-DeUAOKnx.js")).UnincorporatedPartnershipMemberRoleAndTypePage
 );
 const UnincorporatedPartnershipMembersOverview = lazy(
-  async () => (await import("./UnincorporatedPartnershipMembersOverview-DZPLX8gp.js")).UnincorporatedPartnershipMembersOverview
+  async () => (await import("./UnincorporatedPartnershipMembersOverview-EeE4JNAc.js")).UnincorporatedPartnershipMembersOverview
 );
 const BusinessFinancingPage = lazy(
-  async () => (await import("./BusinessFinancingPage-C06ar5yw.js")).BusinessFinancingPage
+  async () => (await import("./BusinessFinancingPage-CWkMdnqc.js")).BusinessFinancingPage
 );
 const TrustDetailsPage = lazy(
-  async () => (await import("./TrustDetailsPage-C699_2RX.js")).TrustDetailsPage
+  async () => (await import("./TrustDetailsPage-Dj64OqRJ.js")).TrustDetailsPage
 );
 const SourceOfFundsPage = lazy(
-  async () => (await import("./SourceOfFundsPage-SHeYHpGr.js")).SourceOfFundsPage
+  async () => (await import("./SourceOfFundsPage-bptpOZNp.js")).SourceOfFundsPage
 );
 const RootIndividualDetailsPage = lazy(
-  async () => (await import("./RootIndividualDetailsPage-C49Q1XPl.js")).RootIndividualDetailsPage
+  async () => (await import("./RootIndividualDetailsPage-ULrh2_YN.js")).RootIndividualDetailsPage
 );
 const LegalRepresentativeDetailsPage = lazy(
-  async () => (await import("./LegalRepresentativeDetailsPage-Cxy69AD6.js")).LegalRepresentativeDetailsPage
+  async () => (await import("./LegalRepresentativeDetailsPage-Wf7cQkQn.js")).LegalRepresentativeDetailsPage
 );
 const DecisionMakerDetailsPage = lazy(
-  async () => (await import("./DecisionMakerDetailsPage-BcaNuUzU.js")).DecisionMakerDetailsPage
+  async () => (await import("./DecisionMakerDetailsPage-Y59IaBti.js")).DecisionMakerDetailsPage
 );
 function isIn(values, x) {
   return values.includes(x);
@@ -7721,7 +7417,13 @@ function DropinComposer({
         AcceptTermsOfService,
         {
           legalEntityId: rootLegalEntity.id,
-          onClose: navigateBack,
+          onClose: () => {
+            userEvents.addPageEvent("Clicked button", {
+              actionType: "back",
+              label: "back"
+            });
+            navigateBack();
+          },
           asEmbedded: false,
           handleAddSigner: () => {
             onNavigateToDecisionMakerIndividual(TaskTypes.DECISION_MAKER);
@@ -7774,7 +7476,7 @@ function OnboardingDropinComponent({
   }
   const { i18n } = useTranslation();
   addResourceBundles(i18n, [
-    { ns: "common", importFn: (lang) => __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "../../../language/locales/bg-BG.json": () => import("./bg-BG-4gJjMBoz.js"), "../../../language/locales/cs-CZ.json": () => import("./cs-CZ-CxB0DJQ6.js"), "../../../language/locales/da-DK.json": () => import("./da-DK-DqkN5oIu.js"), "../../../language/locales/de-DE.json": () => import("./de-DE-COuUdtao.js"), "../../../language/locales/el-GR.json": () => import("./el-GR-CjhbnLfE.js"), "../../../language/locales/en-US.instructions.json": () => import("./en-US.instructions-Ddr7AO05.js"), "../../../language/locales/en-US.json": () => import("./StoreProvider-BHckWEYg.js").then((n) => n.bN), "../../../language/locales/es-ES.json": () => import("./es-ES-DNGEW6V_.js"), "../../../language/locales/et-EE.json": () => import("./et-EE-Be9wlXLD.js"), "../../../language/locales/fi-FI.json": () => import("./fi-FI-CoI_94Fv.js"), "../../../language/locales/fr-FR.json": () => import("./fr-FR-Br7OeDIe.js"), "../../../language/locales/hr-HR.json": () => import("./hr-HR-iodfRS4f.js"), "../../../language/locales/hu-HU.json": () => import("./hu-HU-CEb_Wl4I.js"), "../../../language/locales/it-IT.json": () => import("./it-IT-BAvsF2TB.js"), "../../../language/locales/ja-JP.json": () => import("./ja-JP-US4BD67C.js"), "../../../language/locales/lt-LT.json": () => import("./lt-LT-os-nxAb0.js"), "../../../language/locales/lv-LV.json": () => import("./lv-LV-9NRF8DKM.js"), "../../../language/locales/nl-NL.json": () => import("./nl-NL-BwKrj-29.js"), "../../../language/locales/no-NO.json": () => import("./no-NO-B6OPS2CA.js"), "../../../language/locales/pl-PL.json": () => import("./pl-PL-B0BQdtqx.js"), "../../../language/locales/pt-BR.json": () => import("./pt-BR-BKQRvAfq.js"), "../../../language/locales/pt-PT.json": () => import("./pt-PT-D2Xe-OdG.js"), "../../../language/locales/ro-RO.json": () => import("./ro-RO-WGnCVll9.js"), "../../../language/locales/sk-SK.json": () => import("./sk-SK-Cq_DSPZu.js"), "../../../language/locales/sl-SI.json": () => import("./sl-SI-C3gfuen3.js"), "../../../language/locales/sv-SE.json": () => import("./sv-SE-zTiw1bUU.js") }), `../../../language/locales/${lang}.json`, 6) },
+    { ns: "common", importFn: (lang) => __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "../../../language/locales/bg-BG.json": () => import("./bg-BG-4gJjMBoz.js"), "../../../language/locales/cs-CZ.json": () => import("./cs-CZ-CxB0DJQ6.js"), "../../../language/locales/da-DK.json": () => import("./da-DK-DqkN5oIu.js"), "../../../language/locales/de-DE.json": () => import("./de-DE-COuUdtao.js"), "../../../language/locales/el-GR.json": () => import("./el-GR-CjhbnLfE.js"), "../../../language/locales/en-US.instructions.json": () => import("./en-US.instructions-Ddr7AO05.js"), "../../../language/locales/en-US.json": () => import("./StoreProvider-D_0Pta7w.js").then((n) => n.bN), "../../../language/locales/es-ES.json": () => import("./es-ES-DNGEW6V_.js"), "../../../language/locales/et-EE.json": () => import("./et-EE-Be9wlXLD.js"), "../../../language/locales/fi-FI.json": () => import("./fi-FI-CoI_94Fv.js"), "../../../language/locales/fr-FR.json": () => import("./fr-FR-Br7OeDIe.js"), "../../../language/locales/hr-HR.json": () => import("./hr-HR-iodfRS4f.js"), "../../../language/locales/hu-HU.json": () => import("./hu-HU-CEb_Wl4I.js"), "../../../language/locales/it-IT.json": () => import("./it-IT-BAvsF2TB.js"), "../../../language/locales/ja-JP.json": () => import("./ja-JP-US4BD67C.js"), "../../../language/locales/lt-LT.json": () => import("./lt-LT-os-nxAb0.js"), "../../../language/locales/lv-LV.json": () => import("./lv-LV-9NRF8DKM.js"), "../../../language/locales/nl-NL.json": () => import("./nl-NL-BwKrj-29.js"), "../../../language/locales/no-NO.json": () => import("./no-NO-B6OPS2CA.js"), "../../../language/locales/pl-PL.json": () => import("./pl-PL-B0BQdtqx.js"), "../../../language/locales/pt-BR.json": () => import("./pt-BR-BKQRvAfq.js"), "../../../language/locales/pt-PT.json": () => import("./pt-PT-D2Xe-OdG.js"), "../../../language/locales/ro-RO.json": () => import("./ro-RO-WGnCVll9.js"), "../../../language/locales/sk-SK.json": () => import("./sk-SK-Cq_DSPZu.js"), "../../../language/locales/sl-SI.json": () => import("./sl-SI-C3gfuen3.js"), "../../../language/locales/sv-SE.json": () => import("./sv-SE-zTiw1bUU.js") }), `../../../language/locales/${lang}.json`, 6) },
     { ns: "ui", importFn: (lang) => __variableDynamicImportRuntimeHelper(/* @__PURE__ */ Object.assign({ "../../ui/language/bg-BG.json": () => import("./bg-BG-D9J6LnkI.js"), "../../ui/language/cs-CZ.json": () => import("./cs-CZ-DY_pQqAT.js"), "../../ui/language/da-DK.json": () => import("./da-DK-jK7c9UL0.js"), "../../ui/language/de-DE.json": () => import("./de-DE-wmerDL2e.js"), "../../ui/language/el-GR.json": () => import("./el-GR-Btrk_npt.js"), "../../ui/language/en-US.json": () => import("./en-US-gsp7CD_E.js"), "../../ui/language/es-ES.json": () => import("./es-ES-Qnc0Q6JH.js"), "../../ui/language/et-EE.json": () => import("./et-EE-TzXANcP2.js"), "../../ui/language/fi-FI.json": () => import("./fi-FI-Dn2MC8uW.js"), "../../ui/language/fr-FR.json": () => import("./fr-FR-BWX14yb7.js"), "../../ui/language/hr-HR.json": () => import("./hr-HR-CZLSQruE.js"), "../../ui/language/hu-HU.json": () => import("./hu-HU-kp8Go5hZ.js"), "../../ui/language/it-IT.json": () => import("./it-IT-B0YGvVgW.js"), "../../ui/language/ja-JP.json": () => import("./ja-JP-Dz9IVH4p.js"), "../../ui/language/lt-LT.json": () => import("./lt-LT-l9rzkFg9.js"), "../../ui/language/lv-LV.json": () => import("./lv-LV-DYbb5pkt.js"), "../../ui/language/nl-NL.json": () => import("./nl-NL-BMUYBqlF.js"), "../../ui/language/no-NO.json": () => import("./no-NO-DKbWxgF-.js"), "../../ui/language/pl-PL.json": () => import("./pl-PL-B0zGy_b4.js"), "../../ui/language/pt-BR.json": () => import("./pt-BR--kaJvtE6.js"), "../../ui/language/pt-PT.json": () => import("./pt-PT-BZ5ZZm6G.js"), "../../ui/language/ro-RO.json": () => import("./ro-RO-CdSsgoUG.js"), "../../ui/language/sk-SK.json": () => import("./sk-SK-BiBWPJUf.js"), "../../ui/language/sl-SI.json": () => import("./sl-SI-DtdGMD6i.js"), "../../ui/language/sv-SE.json": () => import("./sv-SE-kR514dO1.js") }), `../../ui/language/${lang}.json`, 5) }
   ]);
   const { data: legalEntityData } = useLegalEntity(ROOT_LE);
@@ -7787,111 +7489,84 @@ function OnboardingDropinComponent({
   );
 }
 export {
-  VAT_NUMBER_FIELD as $,
+  salesChannelsWithWebData as $,
   AdditionalInformation as A,
-  BasicInformation as B,
+  BusinessSelection as B,
   CompanyStructure as C,
-  useDebouncedState as D,
+  eInvoicingCodeFieldMetadata as D,
   EntityTypeRadioGroupCard as E,
   FinancialInformation as F,
-  legalFormFieldMetadata as G,
-  stockTickerSymbolFieldMetadata as H,
-  stockISINFieldMetadata as I,
-  stockExchangeMICFieldMetadata as J,
-  dateOfIncorporationFieldMetadata as K,
-  industryCodeFieldMetadata as L,
-  eInvoicingCodeFieldMetadata as M,
-  vatAbsenceReasonMetadata as N,
+  vatAbsenceReasonMetadata as G,
+  exemptFromRegistrationNumberDefaultFieldMetadata as H,
+  doingBusinessAsFieldMetadata as I,
+  doingBusinessAsAbsentFieldMetadata as J,
+  defaultFieldMetadata$2 as K,
+  defaultFieldConfig$2 as L,
+  defaultFieldMetadata as M,
+  defaultFieldConfig as N,
   OnboardingDropinComponent as O,
-  defaultFieldMetadata$2 as P,
-  defaultFieldConfig$2 as Q,
-  doingBusinessAsFieldMetadata as R,
-  doingBusinessAsAbsentFieldMetadata as S,
-  useIndustryCodes as T,
-  INDUSTRY_CODE_FIELD as U,
-  VerifiedBusinessCard as V,
-  LEGAL_FORM_FIELDS as W,
-  DBA_NAME_FIELD as X,
-  DBANameField as Y,
-  BUSINESS_REGISTRATION_NUMBER_FIELD as Z,
-  BusinessRegistrationNumberField as _,
+  defaultFieldMetadataV4 as P,
+  defaultFieldMetadata$1 as Q,
+  defaultFieldConfigV4 as R,
+  defaultFieldConfig$1 as S,
+  useBusinessLines as T,
+  financialInfoValidationWithEmployeesRules as U,
+  tinMatched as V,
+  businessMismatchModalOpen as W,
+  useCompanySearch as X,
+  useVerifyTin as Y,
+  handleCompanySelection as Z,
+  applyVerifiedBusinessData as _,
   usePciStatus as a,
-  VatNumberField as a0,
-  EInvoicingCodeField as a1,
-  EINVOICING_CODE_FIELD as a2,
-  IndustryCodeField as a3,
-  DATE_OF_INCORPORATION_FIELD as a4,
-  DateOfIncorporationField as a5,
-  STOCK_EXCHANGE_MIC_FIELD as a6,
-  StockExchangeMICField as a7,
-  STOCK_ISIN_FIELD as a8,
-  StockISINField as a9,
-  applyVerifiedBusinessData as aA,
-  salesChannelsWithWebData as aB,
-  SALES_CHANNELS_FIELD as aC,
-  WEB_DATA_FIELD as aD,
-  shouldSignNewPci as aE,
-  SCTA_FIELD as aF,
-  Divider as aG,
-  selectedBusinessLine as aH,
-  usePciQuestionnaireList as aI,
-  businessLinesConfigurations as aJ,
-  businessLinesForms as aK,
-  useTrustMembers as aL,
-  isNewEntity as aM,
-  LegalCompanyNameField as aN,
-  exemptFromRegistrationNumberDefaultFieldConfig as aO,
-  registrationAddressFields as aP,
-  RegistrationAddress as aQ,
-  STOCK_TICKER_SYMBOL_FIELD as aa,
-  StockTickerSymbolField as ab,
-  ADDITIONAL_INFORMATION_FORM_ID as ac,
-  localizedLegalCompanyNameFieldConfig as ad,
-  defaultFieldMetadata as ae,
-  defaultFieldConfig as af,
-  defaultFieldMetadataV4 as ag,
-  defaultFieldMetadata$1 as ah,
-  defaultFieldConfigV4 as ai,
-  defaultFieldConfig$1 as aj,
-  useLegalCompanyNameField as ak,
-  COUNTRY_OF_GOVERNING_LAW_FIELD as al,
-  CountryOfGoverningLawField as am,
-  LEGAL_COMPANY_NAME_FIELD as an,
-  isBankAccountRequestedForOrganization as ao,
-  companyTypeOptions as ap,
-  useCompanyTypeExamples as aq,
-  BusinessSelectionMultiform as ar,
-  isVerifiedSingleCompanySearchResult as as,
-  exemptFromRegistrationNumberDefaultFieldMetadata as at,
-  CountryOfGoverningLawFieldValidation as au,
-  CountryFieldValidation as av,
-  financialInfoValidationWithEmployeesRules as aw,
-  CompanyStructureValidation as ax,
-  tinMatched as ay,
-  businessMismatchModalOpen as az,
+  useIndustryCodes as a0,
+  IndustryCodeField as a1,
+  INDUSTRY_CODE_FIELD as a2,
+  SALES_CHANNELS_FIELD as a3,
+  WEB_DATA_FIELD as a4,
+  shouldSignNewPci as a5,
+  SCTA_FIELD as a6,
+  Divider as a7,
+  selectedBusinessLine as a8,
+  usePciQuestionnaireList as a9,
+  businessLinesConfigurations as aa,
+  businessLinesForms as ab,
+  useTrustMembers as ac,
+  isNewEntity as ad,
+  LegalCompanyNameField as ae,
+  LEGAL_COMPANY_NAME_FIELD as af,
+  DBA_NAME_FIELD as ag,
+  BUSINESS_REGISTRATION_NUMBER_FIELD as ah,
+  VAT_NUMBER_FIELD as ai,
+  exemptFromRegistrationNumberDefaultFieldConfig as aj,
+  DBANameField as ak,
+  BusinessRegistrationNumberField as al,
+  VatNumberField as am,
+  registrationAddressFields as an,
+  RegistrationAddress as ao,
+  operationalAddressIsSameItems as ap,
   useCanSeeIntroduction as b,
   useLegalEntityType as c,
   allowIndividualWithoutSoleProp as d,
   useDataMissingRemediations as e,
   filterProblemsByTaskForms as f,
   getForms as g,
-  getDefaultRegistrationNumberType as h,
-  getDefaultVatNumberType as i,
-  FIELDS_NEEDED_FOR_COMPANY_SEARCH as j,
-  companyTypeMetadata as k,
-  documentFormsIds as l,
-  inferCompanyRegistrationNumberType as m,
+  BasicInformation as h,
+  getDefaultRegistrationNumberType as i,
+  getDefaultVatNumberType as j,
+  FIELDS_NEEDED_FOR_COMPANY_SEARCH as k,
+  isVerifiedSingleCompanySearchResult as l,
+  companyTypeMetadata as m,
   normalizedTaskStatusStore as n,
-  registrationNumberDefaultFieldConfig as o,
-  useCompanySearch as p,
-  useCompanySelection as q,
+  operationalAddressIsSameIds as o,
+  documentFormsIds as p,
+  inferCompanyRegistrationNumberType as q,
   registrationNumberDefaultFieldMetadata as r,
-  setIsBankAccountRequestedForOrganization as s,
-  useVerifyTin as t,
+  registrationNumberDefaultFieldConfig as s,
+  stockTickerSymbolFieldMetadata as t,
   useSalesChannels as u,
   verifiedBusiness as v,
-  useClearCompanyData as w,
-  useBusinessLines as x,
-  isNormalizedStringMatch as y,
-  setVerifiedBusiness as z
+  stockISINFieldMetadata as w,
+  stockExchangeMICFieldMetadata as x,
+  dateOfIncorporationFieldMetadata as y,
+  industryCodeFieldMetadata as z
 };