@adyen/kyc-components 2.49.0 → 2.49.1

package/dist/es/adyen-kyc-components.es.js

@@ -2,7 +2,7 @@ import { useContext, useState, useCallback, useEffect, useMemo, useReducer, useR
 import { createContext, isValidElement, createElement, render } from "preact";
 import { sanitize } from "isomorphic-dompurify";
 import cx from "classnames";
-import { lazy, Suspense, useId, forwardRef, memo, useMemo as useMemo$1, useEffect as useEffect$1, useState as useState$1 } from "preact/compat";
+import { lazy, Suspense, useId, forwardRef, memo, useMemo as useMemo$1, useEffect as useEffect$1, useState as useState$1, useCallback as useCallback$1 } from "preact/compat";
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
 import debounce from "lodash-es/debounce";
 import isISIN from "validator/es/lib/isISIN.js";
@@ -7343,27 +7343,6 @@ const CompanyNameAndCountryComponent = memo(CompanyNameAndCountry, (prevProps, n
   var _a, _b;
   return objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.optionalFields, nextProps.optionalFields) && objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && ((_a = prevProps.data) == null ? void 0 : _a.country) === ((_b = nextProps.data) == null ? void 0 : _b.country) && prevProps.shouldValidate === nextProps.shouldValidate;
 });
-function StateContextSetter({
-  stateRef
-}) {
-  if (stateRef.current.setState) {
-    return null;
-  }
-  return jsx(StateContext.Consumer, {
-    children: (stateContextValue) => {
-      if (!stateContextValue) {
-        throw new Error("<StateContextSetter> needs to be mounted inside a <StateProvider>");
-      }
-      const {
-        dispatch,
-        setActiveForms
-      } = stateContextValue;
-      stateRef.current.setState = dispatch;
-      stateRef.current.setActiveForms = setActiveForms;
-      return null;
-    }
-  });
-}
 var CompanyTypesValue = /* @__PURE__ */ ((CompanyTypesValue2) => {
   CompanyTypesValue2["PRIVATE_COMPANY"] = "privateCompany";
   CompanyTypesValue2["PUBLIC_COMPANY"] = "listedPublicCompany";
@@ -7375,22 +7354,12 @@ var CompanyTypesValue = /* @__PURE__ */ ((CompanyTypesValue2) => {
   CompanyTypesValue2["SOLE_PROPRIETORSHIP"] = "soleProprietorship";
   return CompanyTypesValue2;
 })(CompanyTypesValue || {});
-const cachedStripPatterns = /* @__PURE__ */ new Map();
-const makeStripPattern = (mask) => {
-  const inputPatterns = mask.tokens.filter((token) => token.type === "input" && !!token.allow).map((token) => token.allow);
-  const nonInputChars = mask.tokens.filter((token) => token.type === "nonInput" && !token.includeInValue).map((token) => token.char);
-  const strippedChars = [...new Set(nonInputChars.filter((char) => !inputPatterns.some((pattern) => pattern.test(char))))];
-  const stripPattern = new RegExp(`[${strippedChars.join("")}]`, "g");
-  cachedStripPatterns.set(mask, stripPattern);
-  return stripPattern;
-};
-const displayValueToPureValue = (displayValue, mask) => {
-  const stripPattern = cachedStripPatterns.get(mask) ?? makeStripPattern(mask);
-  return displayValue.replaceAll(stripPattern, "");
-};
-const isValueObscured = (value) => {
-  var _a;
-  return typeof value === "string" && !!((_a = value.match(/[*]{1,}/)) == null ? void 0 : _a.length);
+const makeArrayOfRepeatedObjects = (length, obj) => {
+  const array = [];
+  for (let i = 0; i < length; i += 1) {
+    array.push(cloneObject(obj));
+  }
+  return array;
 };
 const shiftRight = (possibleShifts, matchedTokens, remainingTokens) => {
   let shiftsToTry = [...possibleShifts];
@@ -7487,583 +7456,6 @@ const tryShift = (matchedTokens, remainingTokens, fromIndex, shiftDistance) => {
     remainingTokens: newRemainingTokens
   };
 };
-const getAvailableInputTokens = (tokens) => {
-  const availableTokens = [];
-  for (const token of tokens) {
-    if (token.type === "nonInput") {
-      if (token.includeInValue) {
-        availableTokens.push({
-          ...token,
-          offset: tokens.indexOf(token)
-        });
-      }
-      continue;
-    }
-    availableTokens.push({
-      ...token,
-      offset: tokens.indexOf(token)
-    });
-    if (token.type !== "input" || !token.optional) break;
-  }
-  return availableTokens;
-};
-const findMatchingToken = (tokensWithOffset, char) => tokensWithOffset.find((token) => token.type === "nonInput" || !token.allow || token.allow.test(char)) ?? null;
-const getEagerSuffix = (tokens) => {
-  let suffix = "";
-  for (const token of tokens) {
-    if (token.type === "input") {
-      if (token.optional) continue;
-      else break;
-    }
-    if (!token.displayEagerly) break;
-    suffix += token.char;
-  }
-  return suffix;
-};
-const getPotentialForMoreOptionalInput = (tokens) => tokens.some((token) => token.type === "input" && token.optional);
-const matchAgainstMask = (pureValue, mask, acceptObscuredValue = false) => {
-  let tokensToProcess = [...mask.tokens];
-  let charsToProcess = pureValue;
-  let charIndex = 0;
-  let matchedTokens = [];
-  if (acceptObscuredValue && isValueObscured(pureValue)) {
-    return {
-      outcome: "obscureCorrect",
-      displayValue: pureValue
-    };
-  }
-  const shiftChars = (increment) => {
-    charIndex += increment;
-    charsToProcess = charsToProcess.slice(increment);
-  };
-  const shiftTokens = (increment) => {
-    tokensToProcess = tokensToProcess.slice(increment);
-  };
-  const displayValue = () => matchedTokens.map((token) => token.char).join("");
-  while (true) {
-    const char = charsToProcess[0];
-    const token = tokensToProcess[0];
-    if (!char && !tokensToProcess.some((t) => t.type === "input" && !t.optional)) return {
-      outcome: "correct",
-      displayValue: displayValue() + getEagerSuffix(tokensToProcess),
-      potentialForMoreOptionalInput: getPotentialForMoreOptionalInput(tokensToProcess)
-    };
-    if (!char) {
-      const output = shiftRight(mask.possibleShifts, matchedTokens, tokensToProcess);
-      matchedTokens = output.matchedTokens;
-      tokensToProcess = output.remainingTokens;
-      return {
-        outcome: "partialCorrect",
-        displayValue: displayValue() + getEagerSuffix(tokensToProcess)
-      };
-    }
-    if (!token) return {
-      outcome: "mismatch",
-      badChar: char,
-      mismatchAtChar: charIndex,
-      mismatchedToken: "inputTooLong",
-      partialDisplayValue: displayValue()
-    };
-    if (token.type === "nonInput") {
-      if (token.includeInValue) {
-        if (char !== token.char) return {
-          outcome: "mismatch",
-          badChar: char,
-          mismatchAtChar: charIndex,
-          mismatchedToken: token,
-          partialDisplayValue: displayValue()
-        };
-        shiftChars(1);
-      }
-      matchedTokens.push(token);
-      shiftTokens(1);
-    }
-    if (token.type === "input") {
-      const availableTokens = getAvailableInputTokens(tokensToProcess);
-      const matchingToken = findMatchingToken(availableTokens, char);
-      if (!matchingToken) return {
-        outcome: "mismatch",
-        badChar: char,
-        mismatchAtChar: charIndex,
-        mismatchedToken: token,
-        partialDisplayValue: displayValue()
-      };
-      matchedTokens.push({
-        ...matchingToken,
-        char
-      });
-      shiftTokens(matchingToken.offset + 1);
-      shiftChars(1);
-    }
-  }
-};
-const deriveInputState = (isValid, isFocused, isDisabled, isOptional, hasNullishValue, hasBlurred, errorMessage, shouldValidate, potentiallyMoreOptionalCharacters, formatGuidance, i18n) => {
-  if (isDisabled) return {
-    isError: false
-  };
-  if (isOptional && hasNullishValue) {
-    return {
-      isError: false
-    };
-  }
-  if (isValid && (!potentiallyMoreOptionalCharacters || !isFocused)) return {
-    isError: false,
-    text: jsxs(Fragment, {
-      children: [jsx(Icon, {
-        name: "checkmark-small",
-        className: "adyen-kyc-helper-text__valid-format-check"
-      }), i18n.get("formatIsCorrect")]
-    })
-  };
-  if (isFocused && formatGuidance) return {
-    isError: false,
-    text: formatGuidance
-  };
-  if (!isValid && (shouldValidate || hasBlurred)) return {
-    isError: true,
-    text: typeof errorMessage === "string" && errorMessage ? errorMessage : formatGuidance
-  };
-  return {
-    isError: false
-  };
-};
-const MISMATCH_ANIMATION_NAME = "mismatchShake";
-const logger$z = createLogger("MaskedInputText");
-const MaskedInputText = ({
-  value,
-  onInput,
-  onBlur,
-  onMismatch: onMismatchExternal,
-  isValid: validationIsValid,
-  errorMessage,
-  shouldValidate,
-  mask,
-  name,
-  label,
-  placeholder,
-  transformOnType,
-  readonly = false,
-  disabled = false,
-  optional: optional2 = false,
-  formatGuidance,
-  classNameModifiers,
-  acceptObscuredValue = false
-}) => {
-  const hasExistingData = !isEmpty(value);
-  const [isFocused, setIsFocused] = useState(false);
-  const [hasBlurred, setHasBlurred] = useState(hasExistingData);
-  const [caretReturnPosition, setCaretReturnPosition] = useState(null);
-  const inputRef = useRef(null);
-  const [showingMismatch, setShowingMismatch] = useState(false);
-  const {
-    i18n
-  } = useI18nContext();
-  const onMismatch = (mismatch) => {
-    if (!inputRef.current) return;
-    setShowingMismatch(true);
-    inputRef.current.addEventListener("animationend", (event) => {
-      if (event.animationName !== MISMATCH_ANIMATION_NAME) return;
-      setShowingMismatch(false);
-    });
-    onMismatchExternal == null ? void 0 : onMismatchExternal(mismatch);
-  };
-  useEffect(() => {
-    if (!mask) {
-      logger$z.warn("`mask` is undefined. No masking of input will take place.");
-    }
-  }, [mask]);
-  const getMaskResult = useCallback((pureValue) => {
-    if (!mask) return {
-      outcome: "partialCorrect",
-      displayValue: pureValue
-    };
-    return matchAgainstMask(transformOnType ? transformOnType(pureValue) : pureValue, mask, acceptObscuredValue);
-  }, [mask, transformOnType, acceptObscuredValue]);
-  const displayValueToPure = useCallback((displayValue2) => {
-    if (!mask) return displayValue2;
-    return displayValueToPureValue(displayValue2, mask);
-  }, [mask]);
-  const maskResult = useMemo(() => getMaskResult(value), [getMaskResult, value]);
-  const displayValue = maskResult.outcome === "mismatch" ? maskResult.partialDisplayValue : maskResult.displayValue;
-  const inputState = deriveInputState(validationIsValid && maskResult.outcome !== "mismatch", isFocused, disabled, optional2, !displayValue, hasBlurred, errorMessage, shouldValidate, maskResult.outcome === "correct" && !!maskResult.potentialForMoreOptionalInput, formatGuidance, i18n);
-  useEffect(() => {
-    if (mask && maskResult.outcome === "mismatch") {
-      const strippedValue = displayValueToPure(value);
-      if (getMaskResult(strippedValue).outcome !== "mismatch") {
-        onInput(strippedValue);
-        return;
-      }
-      const fallback = displayValueToPure(maskResult.partialDisplayValue);
-      logger$z.warn(`Value received "${value}" does not match mask`, maskResult, `
-Falling back to partially valid value "${fallback}"`);
-      onInput(fallback);
-    }
-  }, [mask, maskResult, value, onInput, displayValueToPure, getMaskResult]);
-  useLayoutEffect(() => {
-    if (caretReturnPosition && inputRef.current && caretReturnPosition !== inputRef.current.selectionStart) {
-      inputRef.current.setSelectionRange(caretReturnPosition, caretReturnPosition, "none");
-      setCaretReturnPosition(null);
-    }
-  }, [caretReturnPosition]);
-  const handleInput = (event) => {
-    const inputEl = event.target;
-    const newPureValue = displayValueToPure(inputEl.value);
-    const newMaskResult = getMaskResult(newPureValue);
-    const returnCaretLater = (offset = 0) => {
-      if (!inputEl.selectionStart) return;
-      setCaretReturnPosition(inputEl.selectionStart + offset);
-    };
-    const cancelInput = () => {
-      returnCaretLater(-1);
-      inputEl.value = displayValue;
-      event.preventDefault();
-      event.stopPropagation();
-    };
-    if (newMaskResult.outcome === "mismatch") {
-      cancelInput();
-      onMismatch(newMaskResult);
-      return;
-    }
-    if (inputEl.selectionStart && inputEl.selectionStart < inputEl.value.length) {
-      returnCaretLater();
-    }
-    inputEl.value = newMaskResult.displayValue;
-    onInput(newPureValue);
-  };
-  return jsx(Field, {
-    name,
-    label,
-    isValid: !inputState.isError,
-    errorMessage: inputState.isError ? inputState.text ?? true : void 0,
-    helper: inputState.isError ? void 0 : inputState.text,
-    helperPosition: "below",
-    classNameModifiers: classNameModifiers == null ? void 0 : classNameModifiers.field,
-    disabled,
-    optional: optional2,
-    children: ({
-      onBlurHandler: fieldOnBlur,
-      onFocusHandler: fieldOnFocus,
-      ...childProps
-    }) => jsx(InputText, {
-      ...childProps,
-      value: displayValue,
-      onInput: handleInput,
-      onPaste: (event) => {
-        var _a;
-        const pasteValue = (_a = event.clipboardData) == null ? void 0 : _a.getData("text/plain");
-        const inputEl = event.target;
-        const {
-          selectionStart,
-          selectionEnd
-        } = inputEl;
-        if (!pasteValue || !selectionStart || selectionStart !== selectionEnd) return;
-        const pureDisplayValue = displayValueToPure(displayValue);
-        const purePasteValue = displayValueToPure(pasteValue);
-        const newPureValue = pureDisplayValue.slice(0, selectionStart) + purePasteValue + pureDisplayValue.slice(selectionStart);
-        if (newPureValue.startsWith(pureDisplayValue + pureDisplayValue)) {
-          const withPrefixRemoved = newPureValue.replace(pureDisplayValue, "");
-          event.preventDefault();
-          handleInput({
-            ...event,
-            target: {
-              ...event.target,
-              value: withPrefixRemoved
-            }
-          });
-        }
-      },
-      onKeyDown: (event) => {
-        const inputEl = event.target;
-        const isCaretAtEndWithNoSelection = inputEl.selectionStart === inputEl.value.length && inputEl.selectionStart === inputEl.selectionEnd;
-        if (event.key !== KEYBOARD_KEYS.backspace || !isCaretAtEndWithNoSelection) return;
-        event.preventDefault();
-        const withLastCharRemoved = value.slice(0, value.length - 1);
-        const newMaskResult = getMaskResult(withLastCharRemoved);
-        if (newMaskResult.outcome === "mismatch") {
-          inputEl.value = newMaskResult.partialDisplayValue;
-          onMismatch(newMaskResult);
-        } else {
-          inputEl.value = newMaskResult.displayValue;
-          onInput(withLastCharRemoved);
-        }
-      },
-      onFocusHandler: (event) => {
-        fieldOnFocus(event);
-        setIsFocused(true);
-      },
-      onBlurHandler: (event) => {
-        fieldOnBlur(event);
-        const eventWithProcessedValue = {
-          ...event,
-          target: {
-            ...event.target,
-            value: displayValueToPure(event.target.value)
-          }
-        };
-        onBlur == null ? void 0 : onBlur(eventWithProcessedValue);
-        setIsFocused(false);
-        setHasBlurred(true);
-      },
-      name,
-      readonly,
-      disabled,
-      placeholder,
-      classNameModifiers: [...(classNameModifiers == null ? void 0 : classNameModifiers.input) ?? [], ...showingMismatch ? ["mismatch"] : []],
-      "aria-required": true,
-      "aria-label": label,
-      "aria-invalid": inputState.isError,
-      "aria-placeholder": placeholder,
-      ref: inputRef
-    })
-  });
-};
-let idCounter = Date.now();
-const getUniqueId = (prefix = "id") => {
-  idCounter += 1;
-  return `${prefix}-${idCounter}`;
-};
-const InputRadio = ({
-  className,
-  ...props
-}) => jsx("input", {
-  ...props,
-  className: cx("adyen-kyc-input-radio__input", className)
-});
-function RadioGroup({
-  items = [],
-  name,
-  onChange = noop,
-  value,
-  isInvalid,
-  uniqueId,
-  className,
-  disabled = false,
-  horizontal = false
-}) {
-  const {
-    i18n
-  } = useI18nContext();
-  const uniqueIdBase = uniqueId == null ? void 0 : uniqueId.replace(/[0-9]/g, "").substring(0, uniqueId.lastIndexOf("-"));
-  const classes = horizontal ? "adyen-kyc-radio-group adyen-kyc-radio-group--horizontal" : "adyen-kyc-radio-group";
-  return jsx("div", {
-    className: classes,
-    children: items.map((item) => {
-      const uniqueId2 = getUniqueId(uniqueIdBase);
-      return jsxs("label", {
-        htmlFor: uniqueId2,
-        className: "adyen-kyc-input-radio",
-        children: [jsx(InputRadio, {
-          id: uniqueId2,
-          type: "radio",
-          checked: value === item.id,
-          "aria-checked": value === item.id,
-          name,
-          onChange,
-          onClick: onChange,
-          value: item.id,
-          disabled
-        }), jsx("span", {
-          className: cx(["adyen-kyc-input-radio__label", "adyen-kyc-label__text", className, {
-            "adyen-kyc-radio-group__label--invalid": isInvalid
-          }]),
-          children: i18n.get(item.name)
-        })]
-      }, item.name || item.id);
-    })
-  });
-}
-const companyRegistrationNumberOptions = {
-  [CountryCodes.Poland]: [{
-    id: "regon",
-    name: "regon"
-  }, {
-    id: "krsNumber",
-    name: "krsNumber"
-  }],
-  [CountryCodes.Italy]: [{
-    id: "partitaIVA",
-    name: "partitaIVA"
-  }, {
-    id: "CCIAA",
-    name: "CCIAA"
-  }],
-  [CountryCodes.Austria]: [{
-    id: "firmenbuchnummer",
-    name: "firmenbuchnummer"
-  }, {
-    id: "ZVR",
-    name: "zentralesVereinsregisterId",
-    applicableOnlyFor: [CompanyTypesValue.NON_PROFIT_OR_CHARITABLE]
-  }],
-  [CountryCodes.France]: [{
-    id: "SIRET",
-    name: "siret"
-  }, {
-    id: "RNA",
-    name: "rnaNumber",
-    applicableOnlyFor: [CompanyTypesValue.NON_PROFIT_OR_CHARITABLE]
-  }],
-  [CountryCodes.NewZealand]: [{
-    id: "NZBN",
-    name: "NZBN"
-  }, {
-    id: "companyNumberNZ",
-    name: "companyNumberNZ",
-    applicableOnlyFor: [CompanyTypesValue.PRIVATE_COMPANY, CompanyTypesValue.PUBLIC_COMPANY, CompanyTypesValue.UNLISTED_PUBLIC_COMPANY]
-  }]
-};
-const getCompanyRegistrationNumberOptions = (country2, companyType2) => {
-  const optionsForCountry = companyRegistrationNumberOptions[country2];
-  if (!companyType2 || !optionsForCountry) return optionsForCountry;
-  return optionsForCountry.filter((option) => {
-    var _a;
-    return ((_a = option.applicableOnlyFor) == null ? void 0 : _a.includes(companyType2)) ?? true;
-  });
-};
-const individualIdNumberOptions = {
-  [CountryCodes.Spain]: [{
-    id: "dni",
-    name: "dni"
-  }, {
-    id: "nie",
-    name: "nie"
-  }]
-};
-const additionallIdNumberOptions = {
-  [CountryCodes.NewZealand]: [{
-    id: "driversLicense",
-    name: "driversLicense"
-  }, {
-    id: "passport",
-    name: "passportNumber"
-  }],
-  [CountryCodes.HongKong]: [{
-    id: "proofOfIdentityCard",
-    name: "stateIssuedProofOfIdentityCard"
-  }, {
-    id: "driversLicense",
-    name: "driversLicense"
-  }, {
-    id: "passport",
-    name: "passportNumber"
-  }],
-  [CountryCodes.Australia]: [{
-    id: "driversLicense",
-    name: "driversLicense"
-  }, {
-    id: "passport",
-    name: "passportNumber"
-  }]
-};
-const taxIdNumberOptions = {
-  [CountryCodes.Denmark]: [{
-    id: "momsregistreringsnummerCVR",
-    name: "momsregistreringsnummerCVR"
-  }, {
-    id: "stamregister",
-    name: "stamregister"
-  }],
-  [CountryCodes.France]: [{
-    id: "numeroDIdentificationALATaxe",
-    name: "numeroDIdentificationALATaxe"
-  }, {
-    id: "NumeroDeTVA",
-    name: "NumeroDeTVA"
-  }],
-  [CountryCodes.Singapore]: [{
-    id: "GST",
-    name: "gst"
-  }, {
-    id: "UEN",
-    name: "uen"
-  }],
-  [CountryCodes.Jersey]: [{
-    id: "taxIdentificationNumber",
-    name: "taxIdentificationNumber"
-  }, {
-    id: "socialSecurityNumber",
-    name: "socialSecurityNumber",
-    applicableOnlyFor: [CompanyTypesValue.SOLE_PROPRIETORSHIP]
-  }],
-  [CountryCodes.PuertoRico]: [{
-    id: "EIN",
-    name: "ein"
-  }, {
-    id: "SSN",
-    name: "ssn",
-    applicableOnlyFor: [CompanyTypesValue.SOLE_PROPRIETORSHIP]
-  }],
-  [CountryCodes.UnitedStates]: [{
-    id: "EIN",
-    name: "ein"
-  }, {
-    id: "SSN",
-    name: "ssn",
-    applicableOnlyFor: [CompanyTypesValue.SOLE_PROPRIETORSHIP]
-  }]
-};
-const getTaxIdNumberOptions = (country2, companyType2) => {
-  const optionsForCountry = taxIdNumberOptions[country2];
-  if (!companyType2 || !optionsForCountry) return optionsForCountry;
-  if (country2 === "US" || country2 === "PR") return optionsForCountry.filter((option) => option.id === "EIN");
-  return optionsForCountry.filter((option) => {
-    var _a;
-    return ((_a = option.applicableOnlyFor) == null ? void 0 : _a.includes(companyType2)) ?? true;
-  });
-};
-function CompanyRegistrationNumberTypeSelector({
-  country: country2,
-  companyType: companyType2,
-  selected,
-  setSelected,
-  exemptedOption
-}) {
-  const {
-    i18n
-  } = useI18nContext();
-  const handleSelect = useCallback((selectedStr) => {
-    const newSelected = selectedStr;
-    if (newSelected === "exempted") {
-      if (exemptedOption) {
-        setSelected(newSelected);
-      }
-      return;
-    }
-    setSelected(newSelected);
-  }, [exemptedOption, setSelected]);
-  const options = useMemo(() => {
-    const availableOptions = getCompanyRegistrationNumberOptions(country2, companyType2) ?? [];
-    if (availableOptions.length === 0 || !exemptedOption) return availableOptions;
-    return [...availableOptions, {
-      id: "exempted",
-      name: exemptedOption
-    }];
-  }, [companyType2, country2, exemptedOption]);
-  useEffect(() => {
-    if (!selected && options.length > 0) {
-      setSelected(options[0].id);
-    }
-  }, [options, selected, setSelected]);
-  if (options.length <= 1) return null;
-  return jsx(Field, {
-    name: "companyRegistrationNumberType",
-    label: i18n.get("whichTypeOfRegistrationNumberDoYouHave"),
-    children: (childProps) => jsx(RadioGroup, {
-      ...childProps,
-      name: "companyRegistrationNumberType",
-      items: options,
-      value: selected,
-      onChange: (e) => handleSelect(e.target.value)
-    })
-  });
-}
-const makeArrayOfRepeatedObjects = (length, obj) => {
-  const array = [];
-  for (let i = 0; i < length; i += 1) {
-    array.push(cloneObject(obj));
-  }
-  return array;
-};
 const nonInputs = (str, options) => Array.from(str).map((char) => ({
   type: "nonInput",
   char,
@@ -9934,154 +9326,685 @@ const defaultFieldConfig$9 = {
             }
           }
         };
-    }
-  },
-  [CountryCodes.UnitedStates]: ({
-    state: state2
-  }) => ({
-    label: "registrationNumber__US",
-    helperText: "registrationNumber__helperText__US",
-    mask: state2 ? businessRegistrationNumberMasks[CountryCodes.UnitedStates][state2] : businessRegistrationNumberMasks[CountryCodes.UnitedStates].default,
-    validators: state2 ? validatePatternOnBlur(businessRegistrationNumberPatterns[CountryCodes.UnitedStates][state2]) : validatePatternOnBlur(businessRegistrationNumberPatterns[CountryCodes.UnitedStates].default),
-    guidanceText: state2 ? stateFormatGuidanceText[state2] : stateFormatGuidanceText.default
-  })
+    }
+  },
+  [CountryCodes.UnitedStates]: ({
+    state: state2
+  }) => ({
+    label: "registrationNumber__US",
+    helperText: "registrationNumber__helperText__US",
+    mask: state2 ? businessRegistrationNumberMasks[CountryCodes.UnitedStates][state2] : businessRegistrationNumberMasks[CountryCodes.UnitedStates].default,
+    validators: state2 ? validatePatternOnBlur(businessRegistrationNumberPatterns[CountryCodes.UnitedStates][state2]) : validatePatternOnBlur(businessRegistrationNumberPatterns[CountryCodes.UnitedStates].default),
+    guidanceText: state2 ? stateFormatGuidanceText[state2] : stateFormatGuidanceText.default
+  })
+};
+const cachedStripPatterns = /* @__PURE__ */ new Map();
+const makeStripPattern = (mask) => {
+  const inputPatterns = mask.tokens.filter((token) => token.type === "input" && !!token.allow).map((token) => token.allow);
+  const nonInputChars = mask.tokens.filter((token) => token.type === "nonInput" && !token.includeInValue).map((token) => token.char);
+  const strippedChars = [...new Set(nonInputChars.filter((char) => !inputPatterns.some((pattern) => pattern.test(char))))];
+  const stripPattern = new RegExp(`[${strippedChars.join("")}]`, "g");
+  cachedStripPatterns.set(mask, stripPattern);
+  return stripPattern;
+};
+const displayValueToPureValue = (displayValue, mask) => {
+  const stripPattern = cachedStripPatterns.get(mask) ?? makeStripPattern(mask);
+  return displayValue.replaceAll(stripPattern, "");
+};
+const isValueObscured = (value) => {
+  var _a;
+  return typeof value === "string" && !!((_a = value.match(/[*]{1,}/)) == null ? void 0 : _a.length);
+};
+const getAvailableInputTokens = (tokens) => {
+  const availableTokens = [];
+  for (const token of tokens) {
+    if (token.type === "nonInput") {
+      if (token.includeInValue) {
+        availableTokens.push({
+          ...token,
+          offset: tokens.indexOf(token)
+        });
+      }
+      continue;
+    }
+    availableTokens.push({
+      ...token,
+      offset: tokens.indexOf(token)
+    });
+    if (token.type !== "input" || !token.optional) break;
+  }
+  return availableTokens;
+};
+const findMatchingToken = (tokensWithOffset, char) => tokensWithOffset.find((token) => token.type === "nonInput" || !token.allow || token.allow.test(char)) ?? null;
+const getEagerSuffix = (tokens) => {
+  let suffix = "";
+  for (const token of tokens) {
+    if (token.type === "input") {
+      if (token.optional) continue;
+      else break;
+    }
+    if (!token.displayEagerly) break;
+    suffix += token.char;
+  }
+  return suffix;
+};
+const getPotentialForMoreOptionalInput = (tokens) => tokens.some((token) => token.type === "input" && token.optional);
+const matchAgainstMask = (pureValue, mask, acceptObscuredValue = false) => {
+  let tokensToProcess = [...mask.tokens];
+  let charsToProcess = pureValue;
+  let charIndex = 0;
+  let matchedTokens = [];
+  if (acceptObscuredValue && isValueObscured(pureValue)) {
+    return {
+      outcome: "obscureCorrect",
+      displayValue: pureValue
+    };
+  }
+  const shiftChars = (increment) => {
+    charIndex += increment;
+    charsToProcess = charsToProcess.slice(increment);
+  };
+  const shiftTokens = (increment) => {
+    tokensToProcess = tokensToProcess.slice(increment);
+  };
+  const displayValue = () => matchedTokens.map((token) => token.char).join("");
+  while (true) {
+    const char = charsToProcess[0];
+    const token = tokensToProcess[0];
+    if (!char && !tokensToProcess.some((t) => t.type === "input" && !t.optional)) return {
+      outcome: "correct",
+      displayValue: displayValue() + getEagerSuffix(tokensToProcess),
+      potentialForMoreOptionalInput: getPotentialForMoreOptionalInput(tokensToProcess)
+    };
+    if (!char) {
+      const output = shiftRight(mask.possibleShifts, matchedTokens, tokensToProcess);
+      matchedTokens = output.matchedTokens;
+      tokensToProcess = output.remainingTokens;
+      return {
+        outcome: "partialCorrect",
+        displayValue: displayValue() + getEagerSuffix(tokensToProcess)
+      };
+    }
+    if (!token) return {
+      outcome: "mismatch",
+      badChar: char,
+      mismatchAtChar: charIndex,
+      mismatchedToken: "inputTooLong",
+      partialDisplayValue: displayValue()
+    };
+    if (token.type === "nonInput") {
+      if (token.includeInValue) {
+        if (char !== token.char) return {
+          outcome: "mismatch",
+          badChar: char,
+          mismatchAtChar: charIndex,
+          mismatchedToken: token,
+          partialDisplayValue: displayValue()
+        };
+        shiftChars(1);
+      }
+      matchedTokens.push(token);
+      shiftTokens(1);
+    }
+    if (token.type === "input") {
+      const availableTokens = getAvailableInputTokens(tokensToProcess);
+      const matchingToken = findMatchingToken(availableTokens, char);
+      if (!matchingToken) return {
+        outcome: "mismatch",
+        badChar: char,
+        mismatchAtChar: charIndex,
+        mismatchedToken: token,
+        partialDisplayValue: displayValue()
+      };
+      matchedTokens.push({
+        ...matchingToken,
+        char
+      });
+      shiftTokens(matchingToken.offset + 1);
+      shiftChars(1);
+    }
+  }
+};
+const deriveInputState = (isValid, isFocused, isDisabled, isOptional, hasNullishValue, hasBlurred, errorMessage, shouldValidate, potentiallyMoreOptionalCharacters, formatGuidance, i18n) => {
+  if (isDisabled) return {
+    isError: false
+  };
+  if (isOptional && hasNullishValue) {
+    return {
+      isError: false
+    };
+  }
+  if (isValid && (!potentiallyMoreOptionalCharacters || !isFocused)) return {
+    isError: false,
+    text: jsxs(Fragment, {
+      children: [jsx(Icon, {
+        name: "checkmark-small",
+        className: "adyen-kyc-helper-text__valid-format-check"
+      }), i18n.get("formatIsCorrect")]
+    })
+  };
+  if (isFocused && formatGuidance) return {
+    isError: false,
+    text: formatGuidance
+  };
+  if (!isValid && (shouldValidate || hasBlurred)) return {
+    isError: true,
+    text: typeof errorMessage === "string" && errorMessage ? errorMessage : formatGuidance
+  };
+  return {
+    isError: false
+  };
+};
+const MISMATCH_ANIMATION_NAME = "mismatchShake";
+const logger$z = createLogger("MaskedInputText");
+const MaskedInputText = ({
+  value,
+  onInput,
+  onBlur,
+  onMismatch: onMismatchExternal,
+  isValid: validationIsValid,
+  errorMessage,
+  shouldValidate,
+  mask,
+  name,
+  label,
+  placeholder,
+  transformOnType,
+  readonly = false,
+  disabled = false,
+  optional: optional2 = false,
+  formatGuidance,
+  classNameModifiers,
+  acceptObscuredValue = false
+}) => {
+  const hasExistingData = !isEmpty(value);
+  const [isFocused, setIsFocused] = useState(false);
+  const [hasBlurred, setHasBlurred] = useState(hasExistingData);
+  const [caretReturnPosition, setCaretReturnPosition] = useState(null);
+  const inputRef = useRef(null);
+  const [showingMismatch, setShowingMismatch] = useState(false);
+  const {
+    i18n
+  } = useI18nContext();
+  const onMismatch = (mismatch) => {
+    if (!inputRef.current) return;
+    setShowingMismatch(true);
+    inputRef.current.addEventListener("animationend", (event) => {
+      if (event.animationName !== MISMATCH_ANIMATION_NAME) return;
+      setShowingMismatch(false);
+    });
+    onMismatchExternal == null ? void 0 : onMismatchExternal(mismatch);
+  };
+  useEffect(() => {
+    if (!mask) {
+      logger$z.warn("`mask` is undefined. No masking of input will take place.");
+    }
+  }, [mask]);
+  const getMaskResult = useCallback((pureValue) => {
+    if (!mask) return {
+      outcome: "partialCorrect",
+      displayValue: pureValue
+    };
+    return matchAgainstMask(transformOnType ? transformOnType(pureValue) : pureValue, mask, acceptObscuredValue);
+  }, [mask, transformOnType, acceptObscuredValue]);
+  const displayValueToPure = useCallback((displayValue2) => {
+    if (!mask) return displayValue2;
+    return displayValueToPureValue(displayValue2, mask);
+  }, [mask]);
+  const maskResult = useMemo(() => getMaskResult(value), [getMaskResult, value]);
+  const displayValue = maskResult.outcome === "mismatch" ? maskResult.partialDisplayValue : maskResult.displayValue;
+  const inputState = deriveInputState(validationIsValid && maskResult.outcome !== "mismatch", isFocused, disabled, optional2, !displayValue, hasBlurred, errorMessage, shouldValidate, maskResult.outcome === "correct" && !!maskResult.potentialForMoreOptionalInput, formatGuidance, i18n);
+  useEffect(() => {
+    if (mask && maskResult.outcome === "mismatch") {
+      const strippedValue = displayValueToPure(value);
+      if (getMaskResult(strippedValue).outcome !== "mismatch") {
+        onInput(strippedValue);
+        return;
+      }
+      const fallback = displayValueToPure(maskResult.partialDisplayValue);
+      logger$z.warn(`Value received "${value}" does not match mask`, maskResult, `
+Falling back to partially valid value "${fallback}"`);
+      onInput(fallback);
+    }
+  }, [mask, maskResult, value, onInput, displayValueToPure, getMaskResult]);
+  useLayoutEffect(() => {
+    if (caretReturnPosition && inputRef.current && caretReturnPosition !== inputRef.current.selectionStart) {
+      inputRef.current.setSelectionRange(caretReturnPosition, caretReturnPosition, "none");
+      setCaretReturnPosition(null);
+    }
+  }, [caretReturnPosition]);
+  const handleInput = (event) => {
+    const inputEl = event.target;
+    const newPureValue = displayValueToPure(inputEl.value);
+    const newMaskResult = getMaskResult(newPureValue);
+    const returnCaretLater = (offset = 0) => {
+      if (!inputEl.selectionStart) return;
+      setCaretReturnPosition(inputEl.selectionStart + offset);
+    };
+    const cancelInput = () => {
+      returnCaretLater(-1);
+      inputEl.value = displayValue;
+      event.preventDefault();
+      event.stopPropagation();
+    };
+    if (newMaskResult.outcome === "mismatch") {
+      cancelInput();
+      onMismatch(newMaskResult);
+      return;
+    }
+    if (inputEl.selectionStart && inputEl.selectionStart < inputEl.value.length) {
+      returnCaretLater();
+    }
+    inputEl.value = newMaskResult.displayValue;
+    onInput(newPureValue);
+  };
+  return jsx(Field, {
+    name,
+    label,
+    isValid: !inputState.isError,
+    errorMessage: inputState.isError ? inputState.text ?? true : void 0,
+    helper: inputState.isError ? void 0 : inputState.text,
+    helperPosition: "below",
+    classNameModifiers: classNameModifiers == null ? void 0 : classNameModifiers.field,
+    disabled,
+    optional: optional2,
+    children: ({
+      onBlurHandler: fieldOnBlur,
+      onFocusHandler: fieldOnFocus,
+      ...childProps
+    }) => jsx(InputText, {
+      ...childProps,
+      value: displayValue,
+      onInput: handleInput,
+      onPaste: (event) => {
+        var _a;
+        const pasteValue = (_a = event.clipboardData) == null ? void 0 : _a.getData("text/plain");
+        const inputEl = event.target;
+        const {
+          selectionStart,
+          selectionEnd
+        } = inputEl;
+        if (!pasteValue || !selectionStart || selectionStart !== selectionEnd) return;
+        const pureDisplayValue = displayValueToPure(displayValue);
+        const purePasteValue = displayValueToPure(pasteValue);
+        const newPureValue = pureDisplayValue.slice(0, selectionStart) + purePasteValue + pureDisplayValue.slice(selectionStart);
+        if (newPureValue.startsWith(pureDisplayValue + pureDisplayValue)) {
+          const withPrefixRemoved = newPureValue.replace(pureDisplayValue, "");
+          event.preventDefault();
+          handleInput({
+            ...event,
+            target: {
+              ...event.target,
+              value: withPrefixRemoved
+            }
+          });
+        }
+      },
+      onKeyDown: (event) => {
+        const inputEl = event.target;
+        const isCaretAtEndWithNoSelection = inputEl.selectionStart === inputEl.value.length && inputEl.selectionStart === inputEl.selectionEnd;
+        if (event.key !== KEYBOARD_KEYS.backspace || !isCaretAtEndWithNoSelection) return;
+        event.preventDefault();
+        const withLastCharRemoved = value.slice(0, value.length - 1);
+        const newMaskResult = getMaskResult(withLastCharRemoved);
+        if (newMaskResult.outcome === "mismatch") {
+          inputEl.value = newMaskResult.partialDisplayValue;
+          onMismatch(newMaskResult);
+        } else {
+          inputEl.value = newMaskResult.displayValue;
+          onInput(withLastCharRemoved);
+        }
+      },
+      onFocusHandler: (event) => {
+        fieldOnFocus(event);
+        setIsFocused(true);
+      },
+      onBlurHandler: (event) => {
+        fieldOnBlur(event);
+        const eventWithProcessedValue = {
+          ...event,
+          target: {
+            ...event.target,
+            value: displayValueToPure(event.target.value)
+          }
+        };
+        onBlur == null ? void 0 : onBlur(eventWithProcessedValue);
+        setIsFocused(false);
+        setHasBlurred(true);
+      },
+      name,
+      readonly,
+      disabled,
+      placeholder,
+      classNameModifiers: [...(classNameModifiers == null ? void 0 : classNameModifiers.input) ?? [], ...showingMismatch ? ["mismatch"] : []],
+      "aria-required": true,
+      "aria-label": label,
+      "aria-invalid": inputState.isError,
+      "aria-placeholder": placeholder,
+      ref: inputRef
+    })
+  });
 };
-const inferCompanyRegistrationNumberType = (registrationNumber2, country2, companyType2) => {
-  const optionsForCountry = companyRegistrationNumberOptions[country2];
-  const metadataFn = defaultFieldConfig$9[country2];
-  if (!optionsForCountry || !metadataFn || typeof metadataFn !== "function") return void 0;
-  for (const option of optionsForCountry) {
-    const fieldMetadata = metadataFn({
-      companyType: companyType2,
-      registrationNumberType: option.id
-    });
-    if (!fieldMetadata.validators) continue;
-    const validators2 = Array.isArray(fieldMetadata.validators) ? fieldMetadata.validators : [fieldMetadata.validators];
-    if (validators2.every((validator) => validator.validate(registrationNumber2))) {
-      return option.id;
-    }
-  }
+let idCounter = Date.now();
+const getUniqueId = (prefix = "id") => {
+  idCounter += 1;
+  return `${prefix}-${idCounter}`;
 };
-const businessRegistrationNumberFields = ["registrationNumber", "exemptedFromRegistrationNumber"];
-function BusinessRegistrationNumber(props) {
-  var _a, _b, _c, _d;
-  const fieldConfig = props.fieldConfig ?? defaultFieldConfig$9;
+const InputRadio = ({
+  className,
+  ...props
+}) => jsx("input", {
+  ...props,
+  className: cx("adyen-kyc-input-radio__input", className)
+});
+function RadioGroup({
+  items = [],
+  name,
+  onChange = noop,
+  value,
+  isInvalid,
+  uniqueId,
+  className,
+  disabled = false,
+  horizontal = false
+}) {
   const {
     i18n
   } = useI18nContext();
-  const stateRef = useRef({
-    setState: null
+  const uniqueIdBase = uniqueId == null ? void 0 : uniqueId.replace(/[0-9]/g, "").substring(0, uniqueId.lastIndexOf("-"));
+  const classes = horizontal ? "adyen-kyc-radio-group adyen-kyc-radio-group--horizontal" : "adyen-kyc-radio-group";
+  return jsx("div", {
+    className: classes,
+    children: items.map((item) => {
+      const uniqueId2 = getUniqueId(uniqueIdBase);
+      return jsxs("label", {
+        htmlFor: uniqueId2,
+        className: "adyen-kyc-input-radio",
+        children: [jsx(InputRadio, {
+          id: uniqueId2,
+          type: "radio",
+          checked: value === item.id,
+          "aria-checked": value === item.id,
+          name,
+          onChange,
+          onClick: onChange,
+          value: item.id,
+          disabled
+        }), jsx("span", {
+          className: cx(["adyen-kyc-input-radio__label", "adyen-kyc-label__text", className, {
+            "adyen-kyc-radio-group__label--invalid": isInvalid
+          }]),
+          children: i18n.get(item.name)
+        })]
+      }, item.name || item.id);
+    })
   });
-  const schema = props.requiredFields || ["registrationNumber"];
-  const {
-    companyType: companyType2,
-    country: country2
-  } = props;
-  const registrationNumberOptions = useMemo(() => getCompanyRegistrationNumberOptions(country2, companyType2), [country2, companyType2]);
-  const defaultRegistrationNumberType = ((_a = props.data) == null ? void 0 : _a.registrationNumber) ? inferCompanyRegistrationNumberType((_b = props.data) == null ? void 0 : _b.registrationNumber, country2, companyType2) : registrationNumberOptions == null ? void 0 : registrationNumberOptions[0].id;
-  const [registrationNumberType, setRegistrationNumberType] = useState(defaultRegistrationNumberType);
-  const metadata = resolveFieldMetadata(fieldConfig[country2], {
-    companyType: companyType2,
-    registrationNumberType
-  }, defaultFieldMetadata$9);
-  const mergedProps = mergeFieldMetadataIntoProps("registrationNumber", metadata, {
-    requiredFields: schema,
-    readOnlyFields: props.readOnlyFields
+}
+const companyRegistrationNumberOptions = {
+  [CountryCodes.Poland]: [{
+    id: "regon",
+    name: "regon"
+  }, {
+    id: "krsNumber",
+    name: "krsNumber"
+  }],
+  [CountryCodes.Italy]: [{
+    id: "partitaIVA",
+    name: "partitaIVA"
+  }, {
+    id: "CCIAA",
+    name: "CCIAA"
+  }],
+  [CountryCodes.Austria]: [{
+    id: "firmenbuchnummer",
+    name: "firmenbuchnummer"
+  }, {
+    id: "ZVR",
+    name: "zentralesVereinsregisterId",
+    applicableOnlyFor: [CompanyTypesValue.NON_PROFIT_OR_CHARITABLE]
+  }],
+  [CountryCodes.France]: [{
+    id: "SIRET",
+    name: "siret"
+  }, {
+    id: "RNA",
+    name: "rnaNumber",
+    applicableOnlyFor: [CompanyTypesValue.NON_PROFIT_OR_CHARITABLE]
+  }],
+  [CountryCodes.NewZealand]: [{
+    id: "NZBN",
+    name: "NZBN"
+  }, {
+    id: "companyNumberNZ",
+    name: "companyNumberNZ",
+    applicableOnlyFor: [CompanyTypesValue.PRIVATE_COMPANY, CompanyTypesValue.PUBLIC_COMPANY, CompanyTypesValue.UNLISTED_PUBLIC_COMPANY]
+  }]
+};
+const getCompanyRegistrationNumberOptions = (country2, companyType2) => {
+  const optionsForCountry = companyRegistrationNumberOptions[country2];
+  if (!companyType2 || !optionsForCountry) return optionsForCountry;
+  return optionsForCountry.filter((option) => {
+    var _a;
+    return ((_a = option.applicableOnlyFor) == null ? void 0 : _a.includes(companyType2)) ?? true;
   });
-  const {
-    handleChangeFor,
-    data,
-    valid,
-    errors,
-    isValid,
-    fieldProblems
-  } = useForm({
-    ...mergedProps,
-    schema: (data2) => data2.exemptedFromRegistrationNumber ? ["exemptedFromRegistrationNumber"] : ["registrationNumber", "exemptedFromRegistrationNumber"],
-    rules: mergedProps.validators,
-    defaultData: {
-      ...props.data,
-      exemptedFromRegistrationNumber: !!((_c = props.data) == null ? void 0 : _c.exemptedFromRegistrationNumber)
-    },
-    // exemptedFromRegistrationNumber should be a boolean
-    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
+};
+const individualIdNumberOptions = {
+  [CountryCodes.Spain]: [{
+    id: "dni",
+    name: "dni"
+  }, {
+    id: "nie",
+    name: "nie"
+  }]
+};
+const additionallIdNumberOptions = {
+  [CountryCodes.NewZealand]: [{
+    id: "driversLicense",
+    name: "driversLicense"
+  }, {
+    id: "passport",
+    name: "passportNumber"
+  }],
+  [CountryCodes.HongKong]: [{
+    id: "proofOfIdentityCard",
+    name: "stateIssuedProofOfIdentityCard"
+  }, {
+    id: "driversLicense",
+    name: "driversLicense"
+  }, {
+    id: "passport",
+    name: "passportNumber"
+  }],
+  [CountryCodes.Australia]: [{
+    id: "driversLicense",
+    name: "driversLicense"
+  }, {
+    id: "passport",
+    name: "passportNumber"
+  }]
+};
+const taxIdNumberOptions = {
+  [CountryCodes.Denmark]: [{
+    id: "momsregistreringsnummerCVR",
+    name: "momsregistreringsnummerCVR"
+  }, {
+    id: "stamregister",
+    name: "stamregister"
+  }],
+  [CountryCodes.France]: [{
+    id: "numeroDIdentificationALATaxe",
+    name: "numeroDIdentificationALATaxe"
+  }, {
+    id: "NumeroDeTVA",
+    name: "NumeroDeTVA"
+  }],
+  [CountryCodes.Singapore]: [{
+    id: "GST",
+    name: "gst"
+  }, {
+    id: "UEN",
+    name: "uen"
+  }],
+  [CountryCodes.Jersey]: [{
+    id: "taxIdentificationNumber",
+    name: "taxIdentificationNumber"
+  }, {
+    id: "socialSecurityNumber",
+    name: "socialSecurityNumber",
+    applicableOnlyFor: [CompanyTypesValue.SOLE_PROPRIETORSHIP]
+  }],
+  [CountryCodes.PuertoRico]: [{
+    id: "EIN",
+    name: "ein"
+  }, {
+    id: "SSN",
+    name: "ssn",
+    applicableOnlyFor: [CompanyTypesValue.SOLE_PROPRIETORSHIP]
+  }],
+  [CountryCodes.UnitedStates]: [{
+    id: "EIN",
+    name: "ein"
+  }, {
+    id: "SSN",
+    name: "ssn",
+    applicableOnlyFor: [CompanyTypesValue.SOLE_PROPRIETORSHIP]
+  }]
+};
+const getTaxIdNumberOptions = (country2, companyType2) => {
+  const optionsForCountry = taxIdNumberOptions[country2];
+  if (!companyType2 || !optionsForCountry) return optionsForCountry;
+  if (country2 === "US" || country2 === "PR") return optionsForCountry.filter((option) => option.id === "EIN");
+  return optionsForCountry.filter((option) => {
+    var _a;
+    return ((_a = option.applicableOnlyFor) == null ? void 0 : _a.includes(companyType2)) ?? true;
   });
-  useEffect(() => {
-    var _a2, _b2;
-    (_b2 = (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.setState) == null ? void 0 : _b2.call(_a2, {
-      type: "addToState",
-      value: {
-        data,
-        valid,
-        errors,
-        caller: "businessRegistration",
-        dataStoreId: props.dataStoreId
+};
+function CompanyRegistrationNumberTypeSelector({
+  country: country2,
+  companyType: companyType2,
+  selected,
+  setSelected,
+  exemptedOption
+}) {
+  const {
+    i18n
+  } = useI18nContext();
+  const handleSelect = useCallback((selectedStr) => {
+    const newSelected = selectedStr;
+    if (newSelected === "exempted") {
+      if (exemptedOption) {
+        setSelected(newSelected);
       }
-    });
-  }, [data, valid, errors, isValid]);
+      return;
+    }
+    setSelected(newSelected);
+  }, [exemptedOption, setSelected]);
+  const options = useMemo(() => {
+    const availableOptions = getCompanyRegistrationNumberOptions(country2, companyType2) ?? [];
+    if (availableOptions.length === 0 || !exemptedOption) return availableOptions;
+    return [...availableOptions, {
+      id: "exempted",
+      name: exemptedOption
+    }];
+  }, [companyType2, country2, exemptedOption]);
   useEffect(() => {
-    if (data.registrationNumber || registrationNumberType) {
-      handleChangeFor("registrationNumber", "blur")(data.registrationNumber);
+    if (!selected && options.length > 0) {
+      setSelected(options[0].id);
     }
-  }, [props.country, registrationNumberType]);
-  const formUtils = formUtilities(mergedProps, i18n);
-  const exemptionIsPossible = ((_d = mergedProps.requiredFields) == null ? void 0 : _d.includes("exemptedFromRegistrationNumber")) ?? false;
-  const showExemptedOption = exemptionIsPossible && !!registrationNumberOptions && registrationNumberOptions.length > 1;
+  }, [options, selected, setSelected]);
+  if (options.length <= 1) return null;
+  return jsx(Field, {
+    name: "companyRegistrationNumberType",
+    label: i18n.get("whichTypeOfRegistrationNumberDoYouHave"),
+    children: (childProps) => jsx(RadioGroup, {
+      ...childProps,
+      name: "companyRegistrationNumberType",
+      items: options,
+      value: selected,
+      onChange: (e) => handleSelect(e.target.value)
+    })
+  });
+}
+const BUSINESS_REGISTRATION_NUMBER_FIELD = ["registrationNumber", "exemptedFromRegistrationNumber"];
+function BusinessRegistrationNumberField({
+  data,
+  valid,
+  errors,
+  labels: labels2,
+  mask,
+  guidanceText,
+  placeholders,
+  readonly,
+  shouldValidate,
+  optional: optional2,
+  handleChangeFor,
+  country: country2,
+  canExempt,
+  companyType: companyType2,
+  registrationNumberOptions,
+  registrationNumberType,
+  setRegistrationNumberType
+}) {
+  const showExemptedOption = canExempt && !!registrationNumberOptions && registrationNumberOptions.length > 1;
   const handleCompanyRegistrationNumberTypeChange = (regNumberType) => {
     if (regNumberType === "exempted") {
-      if (!exemptionIsPossible) {
+      if (!canExempt) {
         throw Error(`${country2} does not allow tax exemptions`);
       }
       handleChangeFor("exemptedFromRegistrationNumber")(true);
       setRegistrationNumberType(void 0);
       return;
     }
-    if (exemptionIsPossible && data.exemptedFromRegistrationNumber === true) {
+    if (canExempt && data.exemptedFromRegistrationNumber === true) {
       handleChangeFor("exemptedFromRegistrationNumber")(false);
     }
     setRegistrationNumberType(regNumberType);
   };
   return jsxs("div", {
-    className: "adyen-kyc-field__business-registration adyen-kyc-u-margin-bottom-16",
-    children: [jsx(StateContextSetter, {
-      stateRef
-    }), jsx(CompanyRegistrationNumberTypeSelector, {
+    className: "adyen-kyc-field__business-registration",
+    children: [jsx(CompanyRegistrationNumberTypeSelector, {
       companyType: companyType2,
       country: country2,
       setSelected: handleCompanyRegistrationNumberTypeChange,
       selected: data.exemptedFromRegistrationNumber ? "exempted" : registrationNumberType,
-      exemptedOption: showExemptedOption ? formUtils.getLabel("exemptedFromRegistrationNumber", "iDontHaveARegistrationNumber") : false
+      exemptedOption: showExemptedOption ? labels2.exemptedFromRegistrationNumber : false
     }), jsx(MaskedInputText, {
-      name: "registrationNumber",
-      label: formUtils.getLabel("registrationNumber", "companyRegistrationNumber"),
-      formatGuidance: formUtils.getGuidanceText("registrationNumber"),
+      "aria-required": true,
+      "aria-label": labels2.registrationNumber,
+      "aria-invalid": !valid.registrationNumber,
       classNameModifiers: {
         field: ["registrationNumber"],
-        input: ["registrationNumber"]
+        input: ["registrationNumberInput"]
       },
-      errorMessage: formUtils.getErrorMessage("registrationNumber", errors, fieldProblems),
-      shouldValidate: props.shouldValidate,
-      isValid: valid.registrationNumber,
-      "aria-required": formUtils.isRequiredField("registrationNumber"),
-      "aria-label": formUtils.getLabel("registrationNumber"),
-      "aria-invalid": !valid.registrationNumber,
-      disabled: data.exemptedFromRegistrationNumber,
-      onBlur: handleChangeFor("registrationNumber", "blur"),
-      readonly: formUtils.isReadOnly("registrationNumber"),
-      value: data.registrationNumber ?? "",
+      name: "registrationNumber",
+      value: (data == null ? void 0 : data.registrationNumber) ?? "",
+      label: labels2.registrationNumber ?? "",
+      formatGuidance: (guidanceText == null ? void 0 : guidanceText.registrationNumber) ?? "",
+      placeholder: placeholders == null ? void 0 : placeholders.registrationNumber,
+      errorMessage: errors.registrationNumber,
+      isValid: Boolean(valid.registrationNumber),
       onInput: handleChangeFor("registrationNumber", "input"),
-      ...formUtils.getMask("registrationNumber")
-    }), formUtils.isRequiredField("exemptedFromRegistrationNumber") && !showExemptedOption && jsx(Checkbox, {
+      onBlur: handleChangeFor("registrationNumber", "blur"),
+      disabled: data.exemptedFromRegistrationNumber,
+      optional: optional2,
+      readonly,
+      shouldValidate: !optional2 && shouldValidate,
+      ...mask
+    }), canExempt && jsx(Field, {
       name: "exemptedFromRegistrationNumber",
-      label: formUtils.getLabel("iDontHaveARegistrationNumber"),
-      value: "exemptedFromRegistrationNumber",
-      readonly: formUtils.isReadOnly("exemptedFromRegistrationNumber"),
-      classNameModifiers: ["exempted-from-registration"],
-      checked: data.exemptedFromRegistrationNumber ?? false,
-      onChange: handleChangeFor("exemptedFromRegistrationNumber"),
-      "aria-required": formUtils.isRequiredField("exemptedFromRegistrationNumber"),
-      "aria-label": formUtils.getLabel("exemptedFromRegistrationNumber"),
-      "aria-invalid": false
+      classNameModifiers: ["exemptedFromRegistrationNumber"],
+      children: (childProps) => jsx(Checkbox, {
+        ...childProps,
+        "aria-required": false,
+        "aria-label": labels2 == null ? void 0 : labels2.exemptedFromRegistrationNumber,
+        "aria-invalid": false,
+        name: "exemptedFromRegistrationNumber",
+        value: "exemptedFromRegistrationNumber",
+        checked: Boolean(data.exemptedFromRegistrationNumber),
+        label: labels2 == null ? void 0 : labels2.exemptedFromRegistrationNumber,
+        readonly,
+        onChange: handleChangeFor("exemptedFromRegistrationNumber")
+      })
     })]
   });
 }
@@ -10255,6 +10178,61 @@ function InputDate(props) {
     maxLength: 10
   });
 }
+const DATE_OF_INCORPORATION_FIELD = ["dateOfIncorporation"];
+function DateOfIncorporationField({
+  data,
+  valid,
+  errors,
+  labels: labels2,
+  placeholders,
+  readonly,
+  handleChangeFor
+}) {
+  return jsx(Field, {
+    name: "dateOfIncorporation",
+    label: labels2.dateOfIncorporation,
+    classNameModifiers: ["dateOfIncorporation"],
+    errorMessage: errors.dateOfIncorporation,
+    isValid: valid.dateOfIncorporation,
+    children: (childProps) => jsx(InputDate, {
+      ...childProps,
+      "aria-required": true,
+      "aria-label": labels2.dateOfIncorporation,
+      "aria-invalid": !valid.dateOfIncorporation,
+      name: "dateOfIncorporation",
+      value: data.dateOfIncorporation,
+      placeholder: placeholders == null ? void 0 : placeholders.dateOfIncorporation,
+      readonly,
+      onInput: handleChangeFor("dateOfIncorporation", "input"),
+      onBlur: handleChangeFor("dateOfIncorporation", "blur"),
+      max: formatDateObj(/* @__PURE__ */ new Date())
+    })
+  });
+}
+const dateOfIncorporationFieldMetadata = {
+  label: "dateOfIncorporation",
+  validators: [validateNotEmptyOnBlur, {
+    modes: ["blur"],
+    validate: (dateOfIncorporation2) => dateOfIncorporation2 ? new Date(dateOfIncorporation2) < /* @__PURE__ */ new Date() : false,
+    errorMessage: "invalidDateOfIncorporation"
+  }]
+};
+const inferCompanyRegistrationNumberType = (registrationNumber2, country2, companyType2) => {
+  const optionsForCountry = companyRegistrationNumberOptions[country2];
+  const metadataFn = defaultFieldConfig$9[country2];
+  if (!optionsForCountry || !metadataFn || typeof metadataFn !== "function") return void 0;
+  for (const option of optionsForCountry) {
+    const fieldMetadata = metadataFn({
+      companyType: companyType2,
+      registrationNumberType: option.id
+    });
+    if (!fieldMetadata.validators) continue;
+    const validators2 = Array.isArray(fieldMetadata.validators) ? fieldMetadata.validators : [fieldMetadata.validators];
+    if (validators2.every((validator) => validator.validate(registrationNumber2))) {
+      return option.id;
+    }
+  }
+};
 const defaultFieldMetadata$8 = {
   label: "taxId"
 };
@@ -10432,7 +10410,7 @@ const defaultFieldConfig$8 = {
         };
       default:
         return {
-          label: "registrationNumber",
+          label: "taxInformationNumber",
           mask: businessRegistrationNumberMasks[CountryCodes.Guernsey].default,
           validators: validatePatternOnBlur(businessRegistrationNumberPatterns[CountryCodes.Guernsey].default),
           guidanceText: {
@@ -11357,6 +11335,80 @@ const stockTickerSymbolFieldMetadata = {
     }
   }
 };
+const countryToTaxInfoTypeMap = {
+  US: "EIN",
+  AU: "ABN",
+  NZ: "IRD",
+  HK: "BRN",
+  SG: "GST"
+};
+const updateTaxInformation = ({
+  taxId: taxId2,
+  country: country2,
+  exemptedFromTax: exemptedFromTax2 = false,
+  isUen,
+  entity
+}) => {
+  var _a;
+  const updatedEntity = cloneObject(entity);
+  const taxInformation = ((_a = entity.taxInformation) == null ? void 0 : _a.reduce((acc, info) => {
+    acc[info.country] = info;
+    return acc;
+  }, {})) ?? {};
+  if (exemptedFromTax2) {
+    delete taxInformation[country2];
+  } else if (isUen !== void 0) {
+    taxInformation[country2] = {
+      country: country2,
+      type: isUen ? "UEN" : "GST",
+      number: taxId2
+    };
+  } else {
+    taxInformation[country2] = {
+      country: country2,
+      type: countryToTaxInfoTypeMap[country2],
+      number: taxId2
+    };
+  }
+  updatedEntity.taxInformation = Object.values(taxInformation);
+  if (country2 === "US") {
+    delete updatedEntity.vatNumber;
+    delete updatedEntity.registrationNumber;
+  }
+  return updatedEntity;
+};
+const getUpdatedCountryOfGoverningLaw = (nameAndCountry) => {
+  if (!nameAndCountry) {
+    return nameAndCountry;
+  }
+  const updatedNameAndCountry = cloneObject(nameAndCountry);
+  if (updatedNameAndCountry.country === "GB" && !updatedNameAndCountry.differentCountryOfGoverningLaw) {
+    updatedNameAndCountry.countryOfGoverningLaw = "GB";
+  } else if (updatedNameAndCountry.country !== "GB") {
+    delete updatedNameAndCountry.countryOfGoverningLaw;
+  }
+  return updatedNameAndCountry;
+};
+const transformCountryOfGoverningLawToLegalEntity = (nameAndCountry, organization) => {
+  const updatedOrganization = cloneObject(organization);
+  if (nameAndCountry.country === "GB") {
+    if (!nameAndCountry.differentCountryOfGoverningLaw) {
+      updatedOrganization.countryOfGoverningLaw = CountryCodes.UnitedKingdom;
+    } else {
+      updatedOrganization.countryOfGoverningLaw = nameAndCountry.countryOfGoverningLaw;
+    }
+  } else {
+    delete updatedOrganization.countryOfGoverningLaw;
+  }
+  return updatedOrganization;
+};
+const transformCountryOfGoverningLawToSchema = (nameAndCountry, organization) => {
+  const updatedNameAndCountry = cloneObject(nameAndCountry);
+  if (organization.registeredAddress.country === CountryCodes.UnitedKingdom && organization.countryOfGoverningLaw !== CountryCodes.UnitedKingdom) {
+    updatedNameAndCountry.differentCountryOfGoverningLaw = true;
+  }
+  return updatedNameAndCountry;
+};
 function TaxIdNumberTypeSelector({
   country: country2,
   companyType: companyType2,
@@ -11404,155 +11456,278 @@ function TaxIdNumberTypeSelector({
     })
   });
 }
-const taxIdFields = ["taxId", "exemptedFromTax", "isUen"];
-function TaxId(props) {
-  var _a, _b, _c;
-  const {
-    data: propData,
-    country: country2,
-    companyType: companyType2,
-    fieldValidationErrors,
-    dataStoreId,
-    fieldConfig = defaultFieldConfig$8
-  } = props;
-  const existingTaxId = propData == null ? void 0 : propData.taxId;
-  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2, companyType2) : (_a = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _a[0].id;
-  const [taxIdNumberType, setTaxIdNumberType] = useState(defaultTaxIdNumberType);
-  const metadata = resolveFieldMetadata(fieldConfig[country2], {
-    taxIdNumberType,
-    companyType: companyType2
-  }, defaultFieldMetadata$8);
-  const mergedProps = mergeFieldMetadataIntoProps("taxId", metadata, props);
-  const {
-    i18n
-  } = useI18nContext();
-  const formUtils = formUtilities(mergedProps, i18n);
-  const stateRef = useRef({
-    setState: null
-  });
-  const {
-    handleChangeFor,
-    data,
-    valid,
-    errors,
-    isValid,
-    fieldProblems
-  } = useForm({
-    ...mergedProps,
-    schema: (data2) => formUtils.isRequiredField("isUen") ? ["taxId", "isUen"] : data2.exemptedFromTax ? ["exemptedFromTax"] : ["taxId", "exemptedFromTax"],
-    rules: mergedProps.validators,
-    defaultData: {
-      ...propData,
-      exemptedFromTax: Boolean(propData == null ? void 0 : propData.exemptedFromTax),
-      // exemptedFromTax should be a boolean
-      isUen: formUtils.isRequiredField("isUen") ? Boolean(propData == null ? void 0 : propData.isUen) : void 0
-    },
-    fieldProblems: fieldValidationErrors
-  });
+const TAX_INFORMATION_FIELD = ["taxInformation", "exemptedFromTax", "isUen"];
+function TaxInformationField({
+  data,
+  valid,
+  errors,
+  labels: labels2,
+  mask,
+  guidanceText,
+  placeholders,
+  readonly,
+  shouldValidate,
+  handleChangeFor,
+  country: country2,
+  canExempt,
+  registrationNumber: registrationNumber2,
+  isUen,
+  companyType: companyType2,
+  taxIdNumberType,
+  setTaxIdNumberType,
+  defaultData
+}) {
+  var _a;
   useEffect(() => {
-    if (data.taxId || taxIdNumberType) {
-      handleChangeFor("taxId", "blur")(data.taxId);
+    handleChangeFor("taxInformation", "input")(defaultData);
+  }, [country2]);
+  const showTaxIdExemptedOptions = canExempt && (((_a = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _a.length) ?? 0) > 1;
+  const currentCountryTaxInformation = useMemo(() => {
+    var _a2;
+    return (_a2 = data == null ? void 0 : data.taxInformation) == null ? void 0 : _a2.find((taxInfo) => taxInfo.country === country2);
+  }, [data, country2]);
+  const removeCurrentCountryTaxInformation = () => {
+    var _a2;
+    const filterdTaxInformation = (_a2 = data.taxInformation) == null ? void 0 : _a2.filter((taxId2) => taxId2.country !== country2);
+    handleChangeFor("taxInformation", "input")(filterdTaxInformation);
+  };
+  const setUenAsTaxId = (uen2) => {
+    if (!data.taxInformation) {
+      return handleChangeFor("taxInformation", "blur")([{
+        country: country2,
+        number: uen2 ?? "",
+        type: "UEN"
+      }]);
     }
-  }, [taxIdNumberType, country2]);
-  useEffect(() => {
-    var _a2, _b2;
-    (_b2 = (_a2 = stateRef.current) == null ? void 0 : _a2.setState) == null ? void 0 : _b2.call(_a2, {
-      type: "addToState",
-      value: {
-        data,
-        valid,
-        errors,
-        caller: "taxId",
-        dataStoreId
-      }
+    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, {
+      country: country2,
+      number: uen2 ?? "",
+      type: "UEN"
+    }];
+    const updatedTaxInformation = taxInformation.map((taxInfo) => {
+      if (taxInfo.country !== country2) return taxInfo;
+      return {
+        country: country2,
+        number: uen2 ?? "",
+        type: "UEN"
+      };
     });
-  }, [data, valid, errors, isValid, dataStoreId]);
-  const {
-    sliceData: companyRegistrationDetails
-  } = useGlobalDataSlice("companyRegistrationDetails");
-  const registrationNumber2 = companyRegistrationDetails == null ? void 0 : companyRegistrationDetails.registrationNumber;
-  const handleUenOrGstChange = (isUen) => {
-    handleChangeFor("isUen", "input")(isUen);
-    if (isUen) {
-      handleChangeFor("taxId", "blur")(registrationNumber2);
-      return;
+    return handleChangeFor("taxInformation", "blur")(updatedTaxInformation);
+  };
+  const handleTaxInformationInput = (value) => {
+    if (!data.taxInformation) {
+      const updatedTaxInformation2 = [{
+        country: country2,
+        number: value,
+        type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
+      }];
+      return handleChangeFor("taxInformation", "input")(updatedTaxInformation2);
     }
-    handleChangeFor("taxId", "blur")("");
+    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, {
+      country: country2,
+      number: value,
+      type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
+    }];
+    const updatedTaxInformation = taxInformation.map((taxInfo) => {
+      if (taxInfo.country !== country2) return taxInfo;
+      return {
+        country: country2,
+        number: value,
+        type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
+      };
+    });
+    return handleChangeFor("taxInformation", "input")(updatedTaxInformation);
   };
-  useEffect(() => {
-    if (data.isUen) {
-      handleChangeFor("taxId", "blur")(registrationNumber2);
+  const handleTaxInformationBlur = (e) => {
+    const {
+      value
+    } = e.target;
+    if (!data.taxInformation) {
+      const updatedTaxInformation2 = [{
+        country: country2,
+        number: value,
+        type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
+      }];
+      return handleChangeFor("taxInformation", "blur")(updatedTaxInformation2);
     }
-  }, [registrationNumber2]);
-  if (!formUtils.isRequiredField("taxId")) {
-    return null;
-  }
-  const exemptionIsPossible = ((_b = mergedProps.requiredFields) == null ? void 0 : _b.includes("exemptedFromTax")) ?? false;
-  const showTaxIdExemptedOption = exemptionIsPossible && (((_c = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _c.length) ?? 0) > 1;
+    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, {
+      country: country2,
+      number: value,
+      type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
+    }];
+    const updatedTaxInformation = taxInformation.map((taxInfo) => {
+      if (taxInfo.country !== country2) return taxInfo;
+      return {
+        country: country2,
+        number: value,
+        type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
+      };
+    });
+    return handleChangeFor("taxInformation", "blur")(updatedTaxInformation);
+  };
   const handleTaxIdNumberTypeChange = (taxIdType) => {
     if (taxIdType === "exempted") {
-      if (!exemptionIsPossible) {
+      if (!canExempt) {
         throw Error(`${country2} does not allow tax exemptions`);
       }
       handleChangeFor("exemptedFromTax")(true);
+      removeCurrentCountryTaxInformation();
       setTaxIdNumberType(void 0);
       return;
     }
-    if (exemptionIsPossible && data.exemptedFromTax === true) {
+    if (isUen) {
+      if (taxIdType === "UEN") {
+        handleChangeFor("isUen")(true);
+        setUenAsTaxId(registrationNumber2);
+      } else {
+        handleChangeFor("isUen")(false);
+        removeCurrentCountryTaxInformation();
+      }
+    }
+    if (canExempt && data.exemptedFromTax === true) {
       handleChangeFor("exemptedFromTax")(false);
     }
     setTaxIdNumberType(taxIdType);
   };
+  const handleExemptedFromTaxChange = (exempted) => {
+    handleChangeFor("exemptedFromTax")(exempted);
+    removeCurrentCountryTaxInformation();
+  };
   return jsxs("div", {
-    className: "adyen-kyc-field--tax-id",
-    children: [jsx(StateContextSetter, {
-      stateRef
-    }), jsx(TaxIdNumberTypeSelector, {
+    className: "adyen-kyc-field__tax-information",
+    children: [jsx(TaxIdNumberTypeSelector, {
       country: country2,
       companyType: companyType2,
       setSelected: handleTaxIdNumberTypeChange,
       selected: data.exemptedFromTax ? "exempted" : taxIdNumberType,
-      exemptedOption: showTaxIdExemptedOption ? formUtils.getLabel("exemptedFromTax", "iDontHaveATaxId") : false
+      exemptedOption: showTaxIdExemptedOptions ? labels2.exemptedFromTax : false
     }), !data.isUen && jsx(MaskedInputText, {
-      name: "taxId",
-      label: formUtils.getLabel("taxId"),
-      formatGuidance: formUtils.getGuidanceText("taxId"),
-      ...formUtils.getMask("taxId"),
+      "aria-required": true,
+      "aria-label": labels2.taxInformation,
+      "aria-invalid": !valid.taxInformation,
+      name: "taxInformation",
       classNameModifiers: {
-        field: ["tax-id"],
-        input: ["tax-id"]
+        field: ["taxInformation"],
+        input: ["taxInformationInput"]
       },
-      errorMessage: formUtils.getErrorMessage("taxId", errors, fieldProblems),
-      shouldValidate: props.shouldValidate,
-      isValid: valid.taxId,
-      value: data.taxId ?? "",
-      readonly: formUtils.isReadOnly("taxId"),
-      onInput: handleChangeFor("taxId", "input"),
-      onBlur: handleChangeFor("taxId", "blur"),
-      disabled: data.exemptedFromTax || data.isUen
-    }), formUtils.isRequiredField("isUen") && jsx(Checkbox, {
-      name: "isUen",
-      label: formUtils.getLabel("iDoNotHaveGst"),
-      classNameModifiers: ["exempted-from-tax"],
-      checked: Boolean(data.isUen),
-      onChange: handleUenOrGstChange,
-      "aria-required": false,
-      "aria-label": formUtils.getLabel("iDoNotHaveGst"),
-      "aria-invalid": false
-    }), formUtils.isRequiredField("exemptedFromTax") && !showTaxIdExemptedOption && jsx(Checkbox, {
+      label: labels2.taxInformation ?? "",
+      formatGuidance: (guidanceText == null ? void 0 : guidanceText.taxInformation) ?? "",
+      value: (currentCountryTaxInformation == null ? void 0 : currentCountryTaxInformation.number) ?? "",
+      errorMessage: errors.taxInformation,
+      placeholder: placeholders == null ? void 0 : placeholders.taxInformation,
+      isValid: Boolean(valid.taxInformation) && !!currentCountryTaxInformation,
+      onInput: handleTaxInformationInput,
+      onBlur: handleTaxInformationBlur,
+      disabled: data.exemptedFromTax || data.isUen,
+      readonly,
+      shouldValidate,
+      ...mask
+    }), canExempt && !showTaxIdExemptedOptions && jsx(Field, {
       name: "exemptedFromTax",
-      label: formUtils.getLabel("exemptedFromTax", "iDontHaveATaxId"),
-      value: "exemptedFromTax",
-      readonly: formUtils.isReadOnly("exemptedFromTax"),
-      classNameModifiers: ["exempted-from-tax"],
-      checked: Boolean(data.exemptedFromTax),
-      onChange: handleChangeFor("exemptedFromTax"),
-      "aria-required": false,
-      "aria-label": formUtils.getLabel("exemptedFromTax"),
-      "aria-invalid": false
+      classNameModifiers: ["exemptedFromTax"],
+      children: (childProps) => jsx(Checkbox, {
+        ...childProps,
+        "aria-required": false,
+        "aria-label": labels2.exemptedFromTax,
+        "aria-invalid": false,
+        name: "exemptedFromTax",
+        label: labels2.exemptedFromTax,
+        value: "exemptedFromTax",
+        checked: Boolean(data.exemptedFromTax),
+        onChange: handleExemptedFromTaxChange
+      })
+    })]
+  });
+}
+const defaultFieldMetadata$6 = defaultFieldMetadata$8;
+const defaultFieldConfig$6 = entriesOf(defaultFieldConfig$8).reduce((fieldConfig, [country2, countryEntry]) => ({
+  ...fieldConfig,
+  [country2]: ({
+    taxIdNumberType,
+    companyType: companyType2
+  }) => {
+    const fieldMetadata = resolveFieldMetadata(countryEntry, {
+      taxIdNumberType,
+      companyType: companyType2
+    }, defaultFieldMetadata$8);
+    const taxIdValidators = fieldMetadata.validators ? Array.isArray(fieldMetadata.validators) ? fieldMetadata.validators : [fieldMetadata.validators] : [];
+    const mappedValidators = taxIdValidators.map((validator) => ({
+      ...validator,
+      validate: (taxInformation) => {
+        var _a;
+        const taxIdNumber2 = (_a = taxInformation == null ? void 0 : taxInformation.find((taxId2) => country2 === taxId2.country)) == null ? void 0 : _a.number;
+        return taxIdNumber2 ? validator.validate(taxIdNumber2) : false;
+      }
+    }));
+    return {
+      ...fieldMetadata,
+      validators: mappedValidators
+    };
+  }
+}), {});
+const TRADING_NAME_FIELD = ["tradingName", "sameNameAsLegalName"];
+function TradingNameField({
+  data,
+  valid,
+  errors,
+  labels: labels2,
+  readonly,
+  handleChangeFor,
+  legalCompanyName: legalCompanyName2
+}) {
+  const handleSameAsLegalName = useCallback((isChecked) => {
+    handleChangeFor("sameNameAsLegalName", "input")(isChecked);
+    if (isChecked) {
+      handleChangeFor("tradingName")(legalCompanyName2);
+    }
+  }, [handleChangeFor, legalCompanyName2]);
+  useEffect(() => {
+    if (data.sameNameAsLegalName && data.tradingName !== legalCompanyName2) {
+      handleChangeFor("tradingName")(legalCompanyName2);
+    }
+  }, [legalCompanyName2, data.sameNameAsLegalName, data.tradingName]);
+  return jsxs("div", {
+    className: "adyen-kyc-field__tradingName",
+    children: [jsx(Field, {
+      name: "tradingName",
+      label: labels2.tradingName,
+      classNameModifiers: ["tradingName"],
+      errorMessage: errors.tradingName,
+      isValid: valid.tradingName,
+      disabled: readonly || data.sameNameAsLegalName,
+      children: (childProps) => jsx(InputText, {
+        ...childProps,
+        "aria-required": true,
+        "aria-label": labels2.tradingName,
+        "aria-invalid": !valid.tradingName,
+        name: "tradingName",
+        value: data.tradingName,
+        readonly: readonly || data.sameNameAsLegalName,
+        onInput: handleChangeFor("tradingName", "input"),
+        onBlur: handleChangeFor("tradingName", "blur")
+      })
+    }), jsx(Field, {
+      name: "sameNameAsLegalName",
+      classNameModifiers: ["sameNameAsLegalName"],
+      errorMessage: errors.sameNameAsLegalName,
+      isValid: valid.sameNameAsLegalName,
+      children: (childProps) => jsx(Checkbox, {
+        ...childProps,
+        "aria-required": false,
+        "aria-label": labels2.sameNameAsLegalName,
+        "aria-invalid": false,
+        name: "sameNameAsLegalName",
+        label: labels2.sameNameAsLegalName,
+        checked: Boolean(data.sameNameAsLegalName),
+        onChange: handleSameAsLegalName
+      })
     })]
   });
 }
+const tradingNameFieldMetadata = {
+  label: "tradingName",
+  validators: [validateNotEmptyOnBlur]
+};
 var ExperimentNames = /* @__PURE__ */ ((ExperimentNames2) => {
   ExperimentNames2["EnableCompanySearchFlow"] = "EnableCompanySearchFlow";
   ExperimentNames2["EnableNewBusinessDetailsFlow"] = "EnableNewBusinessDetailsFlow";
@@ -11609,7 +11784,7 @@ function VatNumberField({
     id: VatAbsenceReason.CountryWithoutVatOrGstSystem,
     name: VatAbsenceReason.CountryWithoutVatOrGstSystem
   }]);
-  const showVatExemptedOption = canExempt && ((_a = taxIdNumberOptions[country2]) == null ? void 0 : _a.length) > 1;
+  const showVatExemptedOptions = canExempt && ((_a = taxIdNumberOptions[country2]) == null ? void 0 : _a.length) > 1;
   const handleVatNumberTypeChange = (vatType) => {
     if (vatType === "exempted") {
       if (!canExempt) {
@@ -11630,13 +11805,13 @@ function VatNumberField({
       country: country2,
       setSelected: handleVatNumberTypeChange,
       selected: data.exemptedFromVat ? "exempted" : vatNumberType,
-      exemptedOption: showVatExemptedOption ? labels2.exemptedFromVat : false
+      exemptedOption: showVatExemptedOptions ? labels2.exemptedFromVat : false
     }), jsx(MaskedInputText, {
       "aria-required": true,
       "aria-label": labels2.vatNumber,
       "aria-invalid": !valid.vatNumber,
       classNameModifiers: {
-        field: ["tax-id"],
+        field: ["vatNumber"],
         input: ["vatNumber"]
       },
       name: "vatNumber",
@@ -11652,19 +11827,23 @@ function VatNumberField({
       readonly,
       shouldValidate,
       ...mask
-    }), canExempt && !showVatExemptedOption && jsx(Checkbox, {
-      "aria-required": false,
-      "aria-label": labels2 == null ? void 0 : labels2.exemptedFromVat,
-      "aria-invalid": false,
+    }), canExempt && !showVatExemptedOptions && jsx(Field, {
       name: "exemptedFromVat",
-      label: labels2 == null ? void 0 : labels2.exemptedFromVat,
-      value: "exemptedFromVat",
-      classNameModifiers: ["exempted-from-tax"],
-      checked: data.exemptedFromVat ?? false,
-      onChange: handleChangeFor("exemptedFromVat")
+      classNameModifiers: ["exemptedFromVat"],
+      children: (childProps) => jsx(Checkbox, {
+        ...childProps,
+        "aria-required": false,
+        "aria-label": labels2 == null ? void 0 : labels2.exemptedFromVat,
+        "aria-invalid": false,
+        name: "exemptedFromVat",
+        label: labels2 == null ? void 0 : labels2.exemptedFromVat,
+        value: "exemptedFromVat",
+        checked: data.exemptedFromVat ?? false,
+        onChange: handleChangeFor("exemptedFromVat")
+      })
     }), data.exemptedFromVat && jsx(Field, {
       name: "vatAbsenceReason",
-      classNameModifiers: ["tax-id-absence-reason"],
+      classNameModifiers: ["vatAbsenceReason"],
       label: labels2 == null ? void 0 : labels2.vatAbsenceReason,
       errorMessage: errors.vatAbsenceReason,
       isValid: valid.vatAbsenceReason,
@@ -11681,22 +11860,6 @@ function VatNumberField({
     })]
   });
 }
-const companyRegistrationDetailsValidationRules = {
-  tradingName: {
-    modes: ["blur"],
-    validate: (tradingName2) => !isEmpty(tradingName2),
-    errorMessage: "fieldIsRequired"
-  },
-  dateOfIncorporation: [{
-    modes: ["blur"],
-    validate: (dateOfIncorporation2) => !!dateOfIncorporation2,
-    errorMessage: "fieldIsRequired"
-  }, {
-    modes: ["blur"],
-    validate: (dateOfIncorporation2) => !isEmpty(dateOfIncorporation2) && new Date(dateOfIncorporation2) < /* @__PURE__ */ new Date(),
-    errorMessage: "invalidDateOfIncorporation"
-  }]
-};
 const FLOWS_THAT_HIDE_REGISTRATION_NUMBER = [{
   companyType: [CompanyTypesValue.SOLE_PROPRIETORSHIP],
   country: CountryCodes.Gibraltar
@@ -11716,256 +11879,269 @@ const FLOWS_THAT_HIDE_REGISTRATION_NUMBER = [{
   companyType: [CompanyTypesValue.SOLE_PROPRIETORSHIP],
   country: CountryCodes.PuertoRico
 }];
-const companyRegistrationDetailsFields = ["tradingName", "sameNameAsLegalName", ...businessRegistrationNumberFields, "stockExchangeMIC", "stockISIN", "stockTickerSymbol", ...VAT_NUMBER_FIELD, ...taxIdFields, "dateOfIncorporation"];
+const companyRegistrationDetailsFields = [...TRADING_NAME_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...STOCK_TICKER_SYMBOL_FIELD, ...VAT_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...DATE_OF_INCORPORATION_FIELD];
 function CompanyRegistrationDetailsComponent(props) {
-  var _a, _b, _c;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+  let mergedProps = props;
+  const COMPANY_REGISTRATION_DETAILS = mergedProps.id ?? "companyRegistrationDetails";
   const {
     i18n
   } = useI18nContext();
   const {
     companyNameAndCountry
   } = useGlobalData();
-  let mergedProps = props;
-  const defaultVatNumberType = ((_a = mergedProps.data) == null ? void 0 : _a.vatNumber) ? inferTaxIdNumberType((_b = mergedProps.data) == null ? void 0 : _b.vatNumber, mergedProps.country) : (_c = taxIdNumberOptions[mergedProps.country]) == null ? void 0 : _c[0].id;
+  const {
+    updateStateSlice
+  } = useGlobalDataSlice(COMPANY_REGISTRATION_DETAILS);
+  const country2 = (companyNameAndCountry == null ? void 0 : companyNameAndCountry.country) ?? mergedProps.country;
+  const hideOptionalRegistrationNumberField = FLOWS_THAT_HIDE_REGISTRATION_NUMBER.some((f) => f.country === country2 && mergedProps.companyType && f.companyType.includes(mergedProps.companyType));
+  const requiredFields = mergedProps.requiredFields || companyRegistrationDetailsFields;
+  const legalCompanyName2 = companyNameAndCountry == null ? void 0 : companyNameAndCountry.legalCompanyName;
+  const defaultVatNumberType = ((_a = mergedProps.data) == null ? void 0 : _a.vatNumber) ? inferTaxIdNumberType((_b = mergedProps.data) == null ? void 0 : _b.vatNumber, country2) : (_c = taxIdNumberOptions[country2]) == null ? void 0 : _c[0].id;
   const [vatNumberType, setVatNumberType] = useState(defaultVatNumberType);
+  const registrationNumberOptions = useMemo(() => getCompanyRegistrationNumberOptions(country2, mergedProps.companyType), [country2, mergedProps.companyType]);
+  const defaultRegistrationNumberType = ((_d = mergedProps.data) == null ? void 0 : _d.registrationNumber) ? inferCompanyRegistrationNumberType((_e = mergedProps.data) == null ? void 0 : _e.registrationNumber, country2, mergedProps.companyType) : registrationNumberOptions == null ? void 0 : registrationNumberOptions[0].id;
+  const [registrationNumberType, setRegistrationNumberType] = useState(defaultRegistrationNumberType);
+  const existingTaxId = (_h = (_g = (_f = mergedProps.data) == null ? void 0 : _f.taxInformation) == null ? void 0 : _g.find((taxId2) => taxId2.country === country2)) == null ? void 0 : _h.number;
+  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2) : (_i = getTaxIdNumberOptions(country2, mergedProps.companyType)) == null ? void 0 : _i[0].id;
+  const [taxIdNumberType, setTaxIdNumberType] = useState(defaultTaxIdNumberType);
+  mergedProps = mergeFieldMetadataIntoProps("tradingName", tradingNameFieldMetadata, mergedProps);
   mergedProps = mergeFieldMetadataIntoProps("stockExchangeMIC", stockExchangeMICFieldMetadata, mergedProps);
   mergedProps = mergeFieldMetadataIntoProps("stockISIN", stockISINFieldMetadata, mergedProps);
   mergedProps = mergeFieldMetadataIntoProps("stockTickerSymbol", stockTickerSymbolFieldMetadata, mergedProps);
-  mergedProps = mergeFieldMetadataIntoProps("vatNumber", resolveFieldMetadata(defaultFieldConfig$7[mergedProps.country], {
+  mergedProps = mergeFieldMetadataIntoProps("vatNumber", resolveFieldMetadata(defaultFieldConfig$7[country2], {
     vatNumberType
   }, defaultFieldMetadata$7), mergedProps);
   mergedProps = mergeFieldMetadataIntoProps("vatAbsenceReason", vatAbsenceReasonMetadata, mergedProps);
-  const hideOptionalRegistrationNumberField = FLOWS_THAT_HIDE_REGISTRATION_NUMBER.some((f) => f.country === mergedProps.country && f.companyType.includes(mergedProps.companyType));
-  const stateRef = useRef({
-    setState: null
-  });
-  const COMPANY_REGISTRATION_DETAILS = mergedProps.id ?? "companyRegistrationDetails";
-  const requiredFields = mergedProps.requiredFields || companyRegistrationDetailsFields;
-  const directChildFields = requiredFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "stockTickerSymbol", "dateOfIncorporation", "vatNumber"].includes(field));
-  const legalCompanyName2 = companyNameAndCountry == null ? void 0 : companyNameAndCountry.legalCompanyName;
-  const isSameNameAsLegalName = !mergedProps.data.tradingName ? true : mergedProps.data.tradingName === legalCompanyName2;
+  mergedProps = mergeFieldMetadataIntoProps("registrationNumber", resolveFieldMetadata(defaultFieldConfig$9[country2], {
+    companyType: mergedProps.companyType,
+    registrationNumberType
+  }, defaultFieldMetadata$9), mergedProps);
+  mergedProps = mergeFieldMetadataIntoProps("taxInformation", resolveFieldMetadata(defaultFieldConfig$6[country2], {
+    taxIdNumberType
+  }, defaultFieldMetadata$6), mergedProps);
+  mergedProps = mergeFieldMetadataIntoProps("dateOfIncorporation", dateOfIncorporationFieldMetadata, mergedProps);
+  const getFormSchema2 = useCallback((currentData) => {
+    const fieldsToRemove = [];
+    if (currentData.sameNameAsLegalName) {
+      fieldsToRemove.push("tradingName");
+    }
+    if (currentData.exemptedFromVat) {
+      fieldsToRemove.push("vatNumber");
+    } else {
+      fieldsToRemove.push("exemptedFromVat", "vatAbsenceReason");
+    }
+    if (currentData.exemptedFromTax) {
+      fieldsToRemove.push("taxInformation");
+    } else {
+      fieldsToRemove.push("exemptedFromTax");
+    }
+    if (currentData.isUen) {
+      fieldsToRemove.push("taxInformation", "exemptedFromTax");
+    }
+    if (currentData.exemptedFromRegistrationNumber) {
+      fieldsToRemove.push("registrationNumber");
+    } else {
+      fieldsToRemove.push("exemptedFromRegistrationNumber");
+    }
+    return requiredFields.filter((field) => !fieldsToRemove.includes(field));
+  }, [requiredFields]);
   const {
-    handleChangeFor,
+    schema,
     data,
     valid,
-    fieldProblems,
     errors,
-    isValid,
-    triggerValidation,
-    setData
+    fieldProblems,
+    handleChangeFor
   } = useForm({
     ...mergedProps,
-    schema: (currentData) => !currentData.exemptedFromVat ? (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatAbsenceReason")) ?? directChildFields : (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatNumber")) ?? directChildFields,
-    defaultData: {
-      ...mergedProps.data,
-      sameNameAsLegalName: isSameNameAsLegalName,
-      tradingName: isSameNameAsLegalName ? legalCompanyName2 : mergedProps.data.tradingName
-    },
-    rules: {
-      ...mergedProps.validators,
-      ...companyRegistrationDetailsValidationRules
-    },
-    fieldProblems: mergedProps == null ? void 0 : mergedProps.fieldValidationErrors
+    schema: getFormSchema2,
+    defaultData: mergedProps.data,
+    rules: mergedProps.validators,
+    fieldProblems: mergedProps.fieldValidationErrors
   });
   useEffect(() => {
-    if (mergedProps.data.tradingName !== data.tradingName && mergedProps.data.tradingName) {
-      setData("tradingName", mergedProps.data.tradingName);
-      triggerValidation(["tradingName"]);
-    }
-  }, [mergedProps.data.tradingName]);
-  const formUtils = formUtilities(mergedProps, i18n);
-  useEffect(() => {
-    stateRef.current.setState({
-      type: "addToState",
-      value: {
-        data,
-        valid,
-        errors,
-        caller: COMPANY_REGISTRATION_DETAILS,
-        dataStoreId: COMPANY_REGISTRATION_DETAILS,
-        schema: requiredFields
-      }
+    updateStateSlice({
+      schema,
+      data,
+      errors,
+      valid,
+      fieldProblems
     });
-  }, [data, valid, errors, isValid]);
-  useEffect(() => {
-    setData("sameNameAsLegalName", isSameNameAsLegalName);
-    if (isSameNameAsLegalName) {
-      setData("tradingName", legalCompanyName2);
-    }
-  }, [legalCompanyName2]);
-  const handleSameLegalNameChange = (tradingNameIsSameAsLegalName) => {
-    handleChangeFor("sameNameAsLegalName", "input")(tradingNameIsSameAsLegalName);
-    setData("tradingName", tradingNameIsSameAsLegalName ? legalCompanyName2 : "");
-  };
-  const registrationNumberProps = getFieldProps(mergedProps, businessRegistrationNumberFields);
-  const taxIdProps = getFieldProps(mergedProps, taxIdFields);
-  const handleChange = ({
-    currentState,
-    changeInitiatedBy
-  }) => {
-    if (changeInitiatedBy === COMPANY_REGISTRATION_DETAILS) {
-      const currentData = currentState.data[COMPANY_REGISTRATION_DETAILS];
-      let schema = requiredFields;
-      let hasSchemaChanged = false;
-      if (formUtils.isRequiredField("vatNumber")) {
-        schema = currentData.exemptedFromVat ? schema.filter((child) => child !== "vatNumber") : schema.filter((child) => child !== "vatAbsenceReason" && child !== "exemptedFromVat");
-        hasSchemaChanged = true;
-      }
-      if (formUtils.isRequiredField("taxId") && currentData.exemptedFromTax) {
-        schema = schema.filter((child) => child !== "taxId");
-        hasSchemaChanged = true;
-      }
-      if (formUtils.isRequiredField("registrationNumber") && currentData.exemptedFromRegistrationNumber) {
-        schema = schema.filter((child) => child !== "registrationNumber");
-        hasSchemaChanged = true;
-      }
-      if (hasSchemaChanged) {
-        stateRef.current.setState({
-          type: "addToState",
-          value: {
-            data,
-            valid,
-            errors,
-            fieldProblems,
-            caller: mergedProps.id,
-            dataStoreId: mergedProps.id,
-            schema
-          }
-        });
-      }
-    }
-  };
-  return jsxs(Fragment, {
-    children: [jsx(StateContextSetter, {
-      owner: COMPANY_REGISTRATION_DETAILS,
-      stateRef
-    }), jsx(StateContextWatcher, {
-      onChange: handleChange
-    }), jsxs("form", {
-      className: "adyen-kyc-company__company-registration-details",
-      children: [jsx(FormHeader, {
-        heading: mergedProps.heading
-      }), jsx(ErrorPanel, {
-        verificationErrors: mergedProps == null ? void 0 : mergedProps.formVerificationErrors,
-        validationErrors: mergedProps == null ? void 0 : mergedProps.fieldValidationErrors,
-        formUtils,
-        id: "ariaErrorField"
-      }), jsx(ContextGuidance, {
-        page: "Company registration details",
-        title: i18n.get("whyDoINeedToFillInThisInformation"),
-        content: i18n.get("reasonForFillingCompanyRegistrationDetails"),
-        titleId: "whyDoINeedToFillInThisInformation",
-        contentId: "reasonForFillingCompanyRegistrationDetails"
-      }), formUtils.isRequiredField("tradingName") && jsxs(Fragment, {
-        children: [jsx(Field, {
-          name: "tradingName",
-          label: formUtils.getLabel("tradingName"),
-          classNameModifiers: ["tradingName"],
-          errorMessage: formUtils.getErrorMessage("tradingName", errors, fieldProblems),
-          isValid: valid.tradingName,
-          children: (childProps) => jsx(InputText, {
-            ...childProps,
-            name: "tradingName",
-            value: data.tradingName,
-            readonly: formUtils.isReadOnly("tradingName") || data.sameNameAsLegalName,
-            classNameModifiers: ["tradingName"],
-            onInput: handleChangeFor("tradingName", "input"),
-            onBlur: handleChangeFor("tradingName", "blur"),
-            "aria-required": true,
-            "aria-label": formUtils.getLabel("tradingName"),
-            "aria-invalid": !valid.tradingName
-          })
-        }), jsx("div", {
-          className: "adyen-kyc-field--same-name-as-legal-name",
-          children: jsx(Checkbox, {
-            name: "sameNameAsLegalName",
-            label: formUtils.getLabel("sameNameAsLegalName"),
-            checked: data.sameNameAsLegalName,
-            onChange: handleSameLegalNameChange,
-            "aria-required": false,
-            "aria-label": formUtils.getLabel("sameNameAsLegalName"),
-            "aria-invalid": false
-          })
-        })]
-      }), formUtils.isRequiredField("stockExchangeMIC") && jsx(StockExchangeMICField, {
-        data: formUtils.getFieldData(data, STOCK_EXCHANGE_MIC_FIELD),
-        valid: formUtils.getFieldValid(valid, STOCK_EXCHANGE_MIC_FIELD),
-        errors: formUtils.getFieldErrors(errors, fieldProblems, STOCK_EXCHANGE_MIC_FIELD),
-        labels: formUtils.getFieldLabels(STOCK_EXCHANGE_MIC_FIELD),
-        placeholders: formUtils.getFieldPlaceholders(STOCK_EXCHANGE_MIC_FIELD),
-        mask: formUtils.getMask("stockExchangeMIC"),
-        guidanceText: formUtils.getFieldGuidanceText(STOCK_EXCHANGE_MIC_FIELD),
-        readonly: formUtils.isReadOnly("stockExchangeMIC"),
-        handleChangeFor
-      }), formUtils.isRequiredField("stockISIN") && jsx(StockISINField, {
-        data: formUtils.getFieldData(data, STOCK_ISIN_FIELD),
-        valid: formUtils.getFieldValid(valid, STOCK_ISIN_FIELD),
-        errors: formUtils.getFieldErrors(errors, fieldProblems, STOCK_ISIN_FIELD),
-        labels: formUtils.getFieldLabels(STOCK_ISIN_FIELD),
-        placeholders: formUtils.getFieldPlaceholders(STOCK_ISIN_FIELD),
-        mask: formUtils.getMask("stockISIN"),
-        guidanceText: formUtils.getFieldGuidanceText(STOCK_ISIN_FIELD),
-        readonly: formUtils.isReadOnly("stockISIN"),
-        handleChangeFor
-      }), formUtils.isRequiredField("stockTickerSymbol") && jsx(StockTickerSymbolField, {
-        data: formUtils.getFieldData(data, STOCK_TICKER_SYMBOL_FIELD),
-        valid: formUtils.getFieldValid(valid, STOCK_TICKER_SYMBOL_FIELD),
-        errors: formUtils.getFieldErrors(errors, fieldProblems, STOCK_TICKER_SYMBOL_FIELD),
-        labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
-        placeholders: formUtils.getFieldPlaceholders(STOCK_TICKER_SYMBOL_FIELD),
-        mask: formUtils.getMask("stockTickerSymbol"),
-        guidanceText: formUtils.getFieldGuidanceText(STOCK_TICKER_SYMBOL_FIELD),
-        readonly: formUtils.isReadOnly("stockTickerSymbol"),
-        handleChangeFor
-      }), formUtils.isRequiredField("registrationNumber", !hideOptionalRegistrationNumberField) && jsx(BusinessRegistrationNumber, {
-        ...registrationNumberProps,
-        companyType: mergedProps.companyType,
-        country: mergedProps.country,
-        dataStoreId: COMPANY_REGISTRATION_DETAILS
-      }), formUtils.isRequiredField("vatNumber") && jsx(VatNumberField, {
-        data: formUtils.getFieldData(data, VAT_NUMBER_FIELD),
-        valid: formUtils.getFieldValid(valid, VAT_NUMBER_FIELD),
-        errors: formUtils.getFieldErrors(errors, fieldProblems, VAT_NUMBER_FIELD),
-        labels: formUtils.getFieldLabels(VAT_NUMBER_FIELD, {
-          exemptedFromVat: "iDontHaveAVatNumber"
-        }),
-        mask: formUtils.getMask("vatNumber"),
-        guidanceText: formUtils.getFieldGuidanceText(VAT_NUMBER_FIELD),
-        placeholders: formUtils.getFieldPlaceholders(VAT_NUMBER_FIELD),
-        readonly: formUtils.isReadOnly("vatNumber"),
-        handleChangeFor,
-        country: mergedProps.country,
-        canExempt: formUtils.isRequiredField("exemptedFromVat"),
-        vatNumberType,
-        setVatNumberType
-      }), formUtils.isRequiredField("taxId") && jsx(TaxId, {
-        ...taxIdProps,
-        dataStoreId: COMPANY_REGISTRATION_DETAILS,
-        country: mergedProps.country,
-        companyType: mergedProps.companyType
-      }), formUtils.isRequiredField("dateOfIncorporation") && jsx(Field, {
-        name: "dateOfIncorporation",
-        label: formUtils.getLabel("dateOfIncorporation"),
-        classNameModifiers: ["dateOfIncorporation"],
-        errorMessage: formUtils.getErrorMessage("dateOfIncorporation", errors, fieldProblems),
-        isValid: valid.dateOfIncorporation,
-        children: (childProps) => jsx(InputDate, {
-          ...childProps,
-          name: "dateOfIncorporation",
-          value: data.dateOfIncorporation,
-          placeholder: i18n.get("datePlaceholder"),
+  }, [updateStateSlice, schema, data, errors, valid, fieldProblems]);
+  const formUtils = formUtilities(mergedProps, i18n);
+  return jsxs("form", {
+    id: COMPANY_REGISTRATION_DETAILS,
+    className: "adyen-kyc-company-registration-details",
+    children: [jsx(FormHeader, {
+      heading: mergedProps.heading
+    }), jsx(ErrorPanel, {
+      verificationErrors: mergedProps == null ? void 0 : mergedProps.formVerificationErrors,
+      validationErrors: mergedProps == null ? void 0 : mergedProps.fieldValidationErrors,
+      formUtils,
+      id: "ariaErrorField"
+    }), jsx(ContextGuidance, {
+      page: "Company registration details",
+      title: i18n.get("whyDoINeedToFillInThisInformation"),
+      content: i18n.get("reasonForFillingCompanyRegistrationDetails"),
+      titleId: "whyDoINeedToFillInThisInformation",
+      contentId: "reasonForFillingCompanyRegistrationDetails"
+    }), jsxs("fieldset", {
+      form: COMPANY_REGISTRATION_DETAILS,
+      children: [formUtils.isRequiredField("tradingName") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(TradingNameField, {
+          data: formUtils.getFieldData(data, TRADING_NAME_FIELD),
+          valid: formUtils.getFieldValid(valid, TRADING_NAME_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, TRADING_NAME_FIELD),
+          labels: formUtils.getFieldLabels(TRADING_NAME_FIELD),
+          readonly: formUtils.isReadOnly("tradingName"),
+          handleChangeFor,
+          legalCompanyName: legalCompanyName2
+        })
+      }), formUtils.isRequiredField("stockExchangeMIC") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(StockExchangeMICField, {
+          data: formUtils.getFieldData(data, STOCK_EXCHANGE_MIC_FIELD),
+          valid: formUtils.getFieldValid(valid, STOCK_EXCHANGE_MIC_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, STOCK_EXCHANGE_MIC_FIELD),
+          labels: formUtils.getFieldLabels(STOCK_EXCHANGE_MIC_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(STOCK_EXCHANGE_MIC_FIELD),
+          mask: formUtils.getMask("stockExchangeMIC"),
+          guidanceText: formUtils.getFieldGuidanceText(STOCK_EXCHANGE_MIC_FIELD),
+          readonly: formUtils.isReadOnly("stockExchangeMIC"),
+          handleChangeFor
+        })
+      }), formUtils.isRequiredField("stockISIN") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(StockISINField, {
+          data: formUtils.getFieldData(data, STOCK_ISIN_FIELD),
+          valid: formUtils.getFieldValid(valid, STOCK_ISIN_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, STOCK_ISIN_FIELD),
+          labels: formUtils.getFieldLabels(STOCK_ISIN_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(STOCK_ISIN_FIELD),
+          mask: formUtils.getMask("stockISIN"),
+          guidanceText: formUtils.getFieldGuidanceText(STOCK_ISIN_FIELD),
+          readonly: formUtils.isReadOnly("stockISIN"),
+          handleChangeFor
+        })
+      }), formUtils.isRequiredField("stockTickerSymbol") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(StockTickerSymbolField, {
+          data: formUtils.getFieldData(data, STOCK_TICKER_SYMBOL_FIELD),
+          valid: formUtils.getFieldValid(valid, STOCK_TICKER_SYMBOL_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, STOCK_TICKER_SYMBOL_FIELD),
+          labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(STOCK_TICKER_SYMBOL_FIELD),
+          mask: formUtils.getMask("stockTickerSymbol"),
+          guidanceText: formUtils.getFieldGuidanceText(STOCK_TICKER_SYMBOL_FIELD),
+          readonly: formUtils.isReadOnly("stockTickerSymbol"),
+          handleChangeFor
+        })
+      }), formUtils.isRequiredField("registrationNumber", !hideOptionalRegistrationNumberField) && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(BusinessRegistrationNumberField, {
+          data: formUtils.getFieldData(data, BUSINESS_REGISTRATION_NUMBER_FIELD),
+          valid: formUtils.getFieldValid(valid, BUSINESS_REGISTRATION_NUMBER_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, BUSINESS_REGISTRATION_NUMBER_FIELD),
+          labels: formUtils.getFieldLabels(BUSINESS_REGISTRATION_NUMBER_FIELD, {
+            exemptedFromRegistrationNumber: "iDontHaveARegistrationNumber"
+          }),
+          mask: formUtils.getMask("registrationNumber"),
+          guidanceText: formUtils.getFieldGuidanceText(BUSINESS_REGISTRATION_NUMBER_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(BUSINESS_REGISTRATION_NUMBER_FIELD),
+          helperText: formUtils.getFieldHelperText(BUSINESS_REGISTRATION_NUMBER_FIELD),
+          readonly: formUtils.isReadOnly("registrationNumber"),
+          optional: formUtils.isOptionalField("registrationNumber"),
+          shouldValidate: mergedProps.shouldValidate,
+          handleChangeFor,
+          country: country2,
+          canExempt: formUtils.isRequiredField("exemptedFromRegistrationNumber"),
+          companyType: mergedProps.companyType,
+          registrationNumberOptions,
+          registrationNumberType,
+          setRegistrationNumberType
+        })
+      }), formUtils.isRequiredField("vatNumber") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(VatNumberField, {
+          data: formUtils.getFieldData(data, VAT_NUMBER_FIELD),
+          valid: formUtils.getFieldValid(valid, VAT_NUMBER_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, VAT_NUMBER_FIELD),
+          labels: formUtils.getFieldLabels(VAT_NUMBER_FIELD, {
+            exemptedFromVat: "iDontHaveAVatNumber"
+          }),
+          mask: formUtils.getMask("vatNumber"),
+          guidanceText: formUtils.getFieldGuidanceText(VAT_NUMBER_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(VAT_NUMBER_FIELD),
+          readonly: formUtils.isReadOnly("vatNumber"),
+          handleChangeFor,
+          country: country2,
+          canExempt: formUtils.isRequiredField("exemptedFromVat"),
+          vatNumberType,
+          setVatNumberType
+        })
+      }), formUtils.isRequiredField("taxInformation") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(TaxInformationField, {
+          data: formUtils.getFieldData(data, TAX_INFORMATION_FIELD),
+          valid: formUtils.getFieldValid(valid, TAX_INFORMATION_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, TAX_INFORMATION_FIELD),
+          labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD, {
+            exemptedFromTax: "iDontHaveATaxId"
+          }),
+          mask: formUtils.getMask("taxInformation"),
+          helperText: formUtils.getFieldHelperText(TAX_INFORMATION_FIELD),
+          guidanceText: formUtils.getFieldGuidanceText(TAX_INFORMATION_FIELD),
+          readonly: formUtils.isReadOnly("taxInformation"),
+          shouldValidate: mergedProps.shouldValidate,
+          handleChangeFor,
+          canExempt: formUtils.isRequiredField("exemptedFromTax"),
+          isUen: formUtils.isRequiredField("isUen"),
+          country: country2,
+          companyType: mergedProps.companyType,
+          taxIdNumberType,
+          setTaxIdNumberType,
+          defaultData: (_j = mergedProps.data) == null ? void 0 : _j.taxInformation
+        })
+      }), formUtils.isRequiredField("dateOfIncorporation") && jsx("div", {
+        className: "adyen-kyc-field-wrapper",
+        children: jsx(DateOfIncorporationField, {
+          data: formUtils.getFieldData(data, DATE_OF_INCORPORATION_FIELD),
+          valid: formUtils.getFieldValid(valid, DATE_OF_INCORPORATION_FIELD),
+          errors: formUtils.getFieldErrors(errors, fieldProblems, DATE_OF_INCORPORATION_FIELD),
+          labels: formUtils.getFieldLabels(DATE_OF_INCORPORATION_FIELD),
+          placeholders: formUtils.getFieldPlaceholders(DATE_OF_INCORPORATION_FIELD, {
+            dateOfIncorporation: "datePlaceholder"
+          }),
           readonly: formUtils.isReadOnly("dateOfIncorporation"),
-          onInput: handleChangeFor("dateOfIncorporation", "input"),
-          onBlur: handleChangeFor("dateOfIncorporation", "blur"),
-          "aria-required": true,
-          "aria-label": formUtils.getLabel("dateOfIncorporation"),
-          "aria-invalid": !valid.dateOfIncorporation,
-          max: formatDateObj(/* @__PURE__ */ new Date())
+          handleChangeFor
         })
       })]
     })]
   });
 }
+function StateContextSetter({
+  stateRef
+}) {
+  if (stateRef.current.setState) {
+    return null;
+  }
+  return jsx(StateContext.Consumer, {
+    children: (stateContextValue) => {
+      if (!stateContextValue) {
+        throw new Error("<StateContextSetter> needs to be mounted inside a <StateProvider>");
+      }
+      const {
+        dispatch,
+        setActiveForms
+      } = stateContextValue;
+      stateRef.current.setState = dispatch;
+      stateRef.current.setActiveForms = setActiveForms;
+      return null;
+    }
+  });
+}
 const companyBase = {
   accountHolder: {
     rule: "accountHolderIfCustomer"
@@ -12110,26 +12286,6 @@ const businessDetailsBase = {
     rule: "countryRequiresRegistrationNumberForCompanies"
   }
 };
-const taxIdBase$1 = {
-  exemptedFromTax: {
-    rule: "countryHasTaxExemptionsForSomeCompanies"
-  },
-  taxId: {
-    rule: "countryUsesTaxId"
-  },
-  exemptedFromVat: {
-    rule: "countryUsesVat"
-  },
-  vatAbsenceReason: {
-    rule: "countryUsesVat"
-  },
-  vatNumber: {
-    rule: "countryUsesVat"
-  },
-  isUen: {
-    rule: "countryUsesUenOrGst"
-  }
-};
 const taxInformationBase = {
   vatNumber: {
     rule: "countryUsesVat"
@@ -12192,7 +12348,7 @@ const fieldsPerScenario$3 = {
   },
   L: {
     ...companyBase,
-    ...taxIdBase$1
+    ...taxInformationBase
   },
   L_PROOFOFADDRESS: {
     proofOfAddressDocument: {
@@ -15374,6 +15530,7 @@ function CompanyComponent(props) {
   } = useI18nContext();
   const [currentCompanyType, setCurrentCompanyType] = useState(void 0);
   const [currentCountry, setCurrentCountry] = useState(props.country);
+  const [currentLegalName, setCurrentLegalName] = useState();
   const companyNameAndCountryFormProps = getFormProps(props, CompanyNameAndCountryFormID);
   const companyTypeFormProps = getFormProps(props, CompanyTypeFormID);
   const companyRegistrationDetailsFormProps = getFormProps(props, CompanyRegistrationDetailsFormID);
@@ -15384,13 +15541,15 @@ function CompanyComponent(props) {
     currentState,
     prevState
   }) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    const companyType2 = (_b = (_a = currentState.data) == null ? void 0 : _a[CompanyTypeFormID]) == null ? void 0 : _b.entityType;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+    const legalCompanyName2 = (_b = (_a = currentState.data) == null ? void 0 : _a[CompanyNameAndCountryFormID]) == null ? void 0 : _b.legalCompanyName;
+    setCurrentLegalName(legalCompanyName2);
+    const companyType2 = (_d = (_c = currentState.data) == null ? void 0 : _c[CompanyTypeFormID]) == null ? void 0 : _d.entityType;
     setCurrentCompanyType(companyType2);
-    const companyCountryPrev = (_d = (_c = prevState.data) == null ? void 0 : _c[CompanyNameAndCountryFormID]) == null ? void 0 : _d.country;
-    const companyCountry = (_f = (_e = currentState.data) == null ? void 0 : _e[CompanyNameAndCountryFormID]) == null ? void 0 : _f.country;
+    const companyCountryPrev = (_f = (_e = prevState.data) == null ? void 0 : _e[CompanyNameAndCountryFormID]) == null ? void 0 : _f.country;
+    const companyCountry = (_h = (_g = currentState.data) == null ? void 0 : _g[CompanyNameAndCountryFormID]) == null ? void 0 : _h.country;
     setCurrentCountry(companyCountry);
-    const accountHolder2 = (_h = (_g = currentState.data) == null ? void 0 : _g[CompanyTypeFormID]) == null ? void 0 : _h.accountHolder;
+    const accountHolder2 = (_j = (_i = currentState.data) == null ? void 0 : _i[CompanyTypeFormID]) == null ? void 0 : _j.accountHolder;
     if (companyCountry != null && companyCountry !== companyCountryPrev) {
       props.onCountryChange(companyCountry);
     }
@@ -15426,8 +15585,9 @@ function CompanyComponent(props) {
         ...companyRegistrationDetailsFormProps,
         heading: i18n.get("registrationDetails"),
         id: CompanyRegistrationDetailsFormID,
-        country: props.country,
-        companyType: currentCompanyType
+        country: currentCountry,
+        companyType: currentCompanyType,
+        legalName: currentLegalName
       })
     }), jsx("div", {
       className: props.activeForm.formId !== CompanyRegistrationAddressFormID ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
@@ -15786,80 +15946,6 @@ const getObscuredAccountNumber = ({
   accountIdentifier,
   realLastFour
 }) => realLastFour ? `*******${realLastFour}` : accountIdentifier;
-const countryToTaxInfoTypeMap = {
-  US: "EIN",
-  AU: "ABN",
-  NZ: "IRD",
-  HK: "BRN",
-  SG: "GST"
-};
-const updateTaxInformation = ({
-  taxId: taxId2,
-  country: country2,
-  exemptedFromTax: exemptedFromTax2 = false,
-  isUen,
-  entity
-}) => {
-  var _a;
-  const updatedEntity = cloneObject(entity);
-  const taxInformation = ((_a = entity.taxInformation) == null ? void 0 : _a.reduce((acc, info) => {
-    acc[info.country] = info;
-    return acc;
-  }, {})) ?? {};
-  if (exemptedFromTax2) {
-    delete taxInformation[country2];
-  } else if (isUen !== void 0) {
-    taxInformation[country2] = {
-      country: country2,
-      type: isUen ? "UEN" : "GST",
-      number: taxId2
-    };
-  } else {
-    taxInformation[country2] = {
-      country: country2,
-      type: countryToTaxInfoTypeMap[country2],
-      number: taxId2
-    };
-  }
-  updatedEntity.taxInformation = Object.values(taxInformation);
-  if (country2 === "US") {
-    delete updatedEntity.vatNumber;
-    delete updatedEntity.registrationNumber;
-  }
-  return updatedEntity;
-};
-const getUpdatedCountryOfGoverningLaw = (nameAndCountry) => {
-  if (!nameAndCountry) {
-    return nameAndCountry;
-  }
-  const updatedNameAndCountry = cloneObject(nameAndCountry);
-  if (updatedNameAndCountry.country === "GB" && !updatedNameAndCountry.differentCountryOfGoverningLaw) {
-    updatedNameAndCountry.countryOfGoverningLaw = "GB";
-  } else if (updatedNameAndCountry.country !== "GB") {
-    delete updatedNameAndCountry.countryOfGoverningLaw;
-  }
-  return updatedNameAndCountry;
-};
-const transformCountryOfGoverningLawToLegalEntity = (nameAndCountry, organization) => {
-  const updatedOrganization = cloneObject(organization);
-  if (nameAndCountry.country === "GB") {
-    if (!nameAndCountry.differentCountryOfGoverningLaw) {
-      updatedOrganization.countryOfGoverningLaw = CountryCodes.UnitedKingdom;
-    } else {
-      updatedOrganization.countryOfGoverningLaw = nameAndCountry.countryOfGoverningLaw;
-    }
-  } else {
-    delete updatedOrganization.countryOfGoverningLaw;
-  }
-  return updatedOrganization;
-};
-const transformCountryOfGoverningLawToSchema = (nameAndCountry, organization) => {
-  const updatedNameAndCountry = cloneObject(nameAndCountry);
-  if (organization.registeredAddress.country === CountryCodes.UnitedKingdom && organization.countryOfGoverningLaw !== CountryCodes.UnitedKingdom) {
-    updatedNameAndCountry.differentCountryOfGoverningLaw = true;
-  }
-  return updatedNameAndCountry;
-};
 const mandatoryApiFields = {
   INDIVIDUAL: ["personalDetails.firstName", "personalDetails.lastName", "personalDetails.residencyCountry"],
   DECISIONMAKER: ["personalDetails.firstName", "personalDetails.lastName", "personalDetails.residencyCountry", "personalDetails.role", "personalDetails.jobTitle"],
@@ -15952,6 +16038,7 @@ const companyBaseMapping = {
   "companyType.entityType": "organization.type",
   "companyRegistrationDetails.tradingName": "organization.doingBusinessAs",
   "companyRegistrationDetails.registrationNumber": "organization.registrationNumber",
+  "companyRegistrationDetails.taxInformation": "organization.taxInformation",
   "companyRegistrationDetails.vatNumber": "organization.vatNumber",
   "companyRegistrationDetails.vatAbsenceReason": "organization.vatAbsenceReason",
   "companyRegistrationDetails.dateOfIncorporation": "organization.dateOfIncorporation",
@@ -16027,6 +16114,7 @@ const solePropBaseMapping = {
   "solePropRegistrationDetails.vatAbsenceReason": "soleProprietorship.vatAbsenceReason",
   "solePropRegistrationDetails.exemptedFromTax": "soleProprietorship.taxAbsent",
   "solePropRegistrationDetails.registrationNumber": "soleProprietorship.registrationNumber",
+  "solePropRegistrationDetails.taxInformation": "soleProprietorship.taxInformation",
   "solePropRegistrationDetails.dateOfIncorporation": "soleProprietorship.dateOfIncorporation",
   "solePropRegistrationAddress.registrationAddress.city": "soleProprietorship.registeredAddress.city",
   "solePropRegistrationAddress.registrationAddress.country": "soleProprietorship.registeredAddress.country",
@@ -16303,7 +16391,7 @@ const mapIndividualToLegalEntity = (data) => {
   return requestObj;
 };
 const mapLegalEntityToCompany = (legalEntity, isChangingType, accountHolder2) => {
-  var _a, _b, _c, _d;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   let companyCompData;
   if (legalEntity == null ? void 0 : legalEntity.organization) {
     companyCompData = formatObject(legalEntity, companyComponentsKeyMapping);
@@ -16316,20 +16404,17 @@ const mapLegalEntityToCompany = (legalEntity, isChangingType, accountHolder2) =>
       companyCompData.companyRegistrationAddress.operationalAddressIsSame = operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME;
     }
     companyCompData.companyNameAndCountry = transformCountryOfGoverningLawToSchema(companyCompData.companyNameAndCountry, legalEntity.organization);
+    const sameNameAsLegalName2 = !(((_b = companyCompData.companyNameAndCountry) == null ? void 0 : _b.legalCompanyName) && ((_c = companyCompData.companyRegistrationDetails) == null ? void 0 : _c.tradingName) && companyCompData.companyNameAndCountry.legalCompanyName !== companyCompData.companyRegistrationDetails.tradingName);
     companyCompData.companyRegistrationDetails = {
       ...companyCompData.companyRegistrationDetails,
-      sameNameAsLegalName: !(((_b = companyCompData.companyNameAndCountry) == null ? void 0 : _b.legalCompanyName) && ((_c = companyCompData.companyRegistrationDetails) == null ? void 0 : _c.tradingName) && companyCompData.companyNameAndCountry.legalCompanyName !== companyCompData.companyRegistrationDetails.tradingName)
+      tradingName: ((_d = companyCompData.companyRegistrationDetails) == null ? void 0 : _d.tradingName) ? (_e = companyCompData.companyRegistrationDetails) == null ? void 0 : _e.tradingName : (_f = companyCompData.companyNameAndCountry) == null ? void 0 : _f.legalCompanyName,
+      sameNameAsLegalName: companyCompData.companyNameAndCountry.legalCompanyName ? sameNameAsLegalName2 : true
     };
-    const {
-      taxInformation = []
-    } = legalEntity.organization;
-    if (taxInformation.length) {
+    if ((_h = (_g = legalEntity.organization) == null ? void 0 : _g.taxInformation) == null ? void 0 : _h.length) {
       const {
         country: country2
       } = legalEntity.organization.registeredAddress;
-      const countryTaxInformation = taxInformation.find((info) => info.country === country2);
-      companyCompData.companyRegistrationDetails.taxId = countryTaxInformation == null ? void 0 : countryTaxInformation.number;
-      companyCompData.companyRegistrationDetails.exemptedFromTax = false;
+      const countryTaxInformation = legalEntity.organization.taxInformation.find((info) => info.country === country2);
       if ((countryTaxInformation == null ? void 0 : countryTaxInformation.type) === "UEN") {
         companyCompData.companyRegistrationDetails.isUen = true;
       }
@@ -16337,7 +16422,7 @@ const mapLegalEntityToCompany = (legalEntity, isChangingType, accountHolder2) =>
         companyCompData.companyRegistrationDetails.isUen = false;
       }
     }
-    if ((_d = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _d.length) {
+    if ((_i = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _i.length) {
       companyCompData = {
         ...companyCompData,
         ...mapApiDocumentToCompanyDocuments(legalEntity == null ? void 0 : legalEntity.id)
@@ -16354,21 +16439,27 @@ const mapLegalEntityToCompany = (legalEntity, isChangingType, accountHolder2) =>
   return companyCompData;
 };
 const mapCompanyToLegalEntity = (data) => {
+  var _a, _b, _c, _d, _e, _f;
   const requestObj = {
     ...formatObject(data, companyApiKeyMapping)
   };
   if (requestObj.organization.vatAbsenceReason) {
     requestObj.organization.vatNumber = "";
   }
-  requestObj.organization = transformCountryOfGoverningLawToLegalEntity(data.companyNameAndCountry, requestObj.organization);
-  if (data.companyRegistrationDetails.taxId) {
+  const taxId2 = (_a = data.companyRegistrationDetails.taxInformation) == null ? void 0 : _a.find((tax) => {
+    var _a2;
+    return tax.country === ((_a2 = data.companyNameAndCountry) == null ? void 0 : _a2.country);
+  }).number;
+  if (taxId2 || ((_b = data.companyRegistrationDetails) == null ? void 0 : _b.isUen)) {
     requestObj.organization = updateTaxInformation({
-      taxId: data.companyRegistrationDetails.taxId,
-      country: data.companyNameAndCountry.country,
-      isUen: data.companyRegistrationDetails.isUen,
+      taxId: ((_c = data.companyRegistrationDetails) == null ? void 0 : _c.isUen) ? data.companyRegistrationDetails.registrationNumber : taxId2,
+      country: (_d = data.companyNameAndCountry) == null ? void 0 : _d.country,
+      exemptedFromTax: (_e = data.companyRegistrationDetails) == null ? void 0 : _e.exemptedFromTax,
+      isUen: (_f = data.companyRegistrationDetails) == null ? void 0 : _f.isUen,
       entity: requestObj.organization
     });
   }
+  requestObj.organization = transformCountryOfGoverningLawToLegalEntity(data.companyNameAndCountry, requestObj.organization);
   requestObj.type = LegalEntityType.ORGANIZATION;
   return requestObj;
 };
@@ -16431,7 +16522,7 @@ const mapHighExposureToLegalEntity = (data) => ({
   ...formatObject(data, highExposureApiKeyMapping)
 });
 const mapLegalEntityToSoleProp = (legalEntity) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   let solePropCompData;
   if (legalEntity == null ? void 0 : legalEntity.soleProprietorship) {
     solePropCompData = formatObject(legalEntity, solePropComponentsKeyMapping);
@@ -16452,19 +16543,10 @@ const mapLegalEntityToSoleProp = (legalEntity) => {
     solePropCompData.solePropNameAndCountry = transformCountryOfGoverningLawToSchema(solePropCompData.solePropNameAndCountry, legalEntity.soleProprietorship);
     solePropCompData.solePropRegistrationDetails = {
       ...solePropCompData.solePropRegistrationDetails,
-      sameNameAsLegalName: !(((_e = solePropCompData.solePropNameAndCountry) == null ? void 0 : _e.legalCompanyName) && ((_f = solePropCompData.solePropRegistrationDetails) == null ? void 0 : _f.tradingName) && solePropCompData.solePropNameAndCountry.legalCompanyName !== solePropCompData.solePropRegistrationDetails.tradingName)
+      tradingName: ((_e = solePropCompData.solePropRegistrationDetails) == null ? void 0 : _e.tradingName) ? (_f = solePropCompData.solePropRegistrationDetails) == null ? void 0 : _f.tradingName : (_g = solePropCompData.solePropNameAndCountry) == null ? void 0 : _g.legalCompanyName,
+      sameNameAsLegalName: !(((_h = solePropCompData.solePropNameAndCountry) == null ? void 0 : _h.legalCompanyName) && ((_i = solePropCompData.solePropRegistrationDetails) == null ? void 0 : _i.tradingName) && solePropCompData.solePropNameAndCountry.legalCompanyName !== solePropCompData.solePropRegistrationDetails.tradingName)
     };
-    const {
-      taxInformation = []
-    } = legalEntity.soleProprietorship;
-    if (taxInformation.length) {
-      const {
-        country: country2
-      } = legalEntity.soleProprietorship.registeredAddress;
-      solePropCompData.solePropRegistrationDetails.taxId = (_g = taxInformation.find((info) => info.country === country2)) == null ? void 0 : _g.number;
-      solePropCompData.solePropRegistrationDetails.exemptedFromTax = false;
-    }
-    if ((_h = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _h.length) {
+    if ((_j = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _j.length) {
       solePropCompData = {
         ...solePropCompData,
         ...mapApiDocumentToSolePropDocuments(legalEntity == null ? void 0 : legalEntity.id)
@@ -16482,20 +16564,16 @@ const mapSolePropToLegalEntity = (data) => {
     requestObj.soleProprietorship.vatNumber = "";
   }
   requestObj.soleProprietorship = transformCountryOfGoverningLawToLegalEntity(data.solePropNameAndCountry, requestObj.soleProprietorship);
-  if (data.solePropRegistrationDetails.taxId || requestObj.soleProprietorship.taxAbsent) {
-    requestObj.soleProprietorship = updateTaxInformation({
-      taxId: data.solePropRegistrationDetails.taxId,
-      exemptedFromTax: data.solePropRegistrationDetails.exemptedFromTax,
-      country: data.solePropNameAndCountry.country,
-      entity: requestObj.soleProprietorship
-    });
-  }
   if (data.solePropRegistrationDetails.exemptedFromRegistrationNumber) {
     requestObj.soleProprietorship.registrationNumber = "";
   }
   if (!((_a = requestObj.soleProprietorship) == null ? void 0 : _a.countryOfGoverningLaw) && ((_b = data.solePropNameAndCountry) == null ? void 0 : _b.country)) {
     requestObj.soleProprietorship.countryOfGoverningLaw = data.solePropNameAndCountry.country;
   }
+  if (data.solePropNameAndCountry.country === "US") {
+    delete requestObj.soleProprietorship.vatNumber;
+    delete requestObj.soleProprietorship.registrationNumber;
+  }
   requestObj.type = LegalEntityType.SOLE_PROPRIETORSHIP;
   return requestObj;
 };
@@ -17887,10 +17965,10 @@ const ContactDetailsComp = memo(ContactDetailsComponent, (prevProps, nextProps)
 ContactDetailsComponent.defaultProps = {
   data: {}
 };
-const defaultFieldMetadata$6 = {
+const defaultFieldMetadata$5 = {
   label: "idNumber"
 };
-const defaultFieldConfig$6 = {
+const defaultFieldConfig$5 = {
   [CountryCodes.Brazil]: {
     label: "cadastroDePessoasFisicas",
     mask: {
@@ -18351,10 +18429,10 @@ function IdentityNumberComponent(props) {
     idNumberExempt: !!(propData == null ? void 0 : propData.idNumberExempt)
   });
   const schema = requiredFields ?? idNumberFields;
-  const fieldConfig = propFieldConfig ?? defaultFieldConfig$6;
+  const fieldConfig = propFieldConfig ?? defaultFieldConfig$5;
   const metadata = resolveFieldMetadata(fieldConfig[country2], {
     idNumberType
-  }, defaultFieldMetadata$6);
+  }, defaultFieldMetadata$5);
   const idNumberExemptMetadata = resolveFieldMetadata(idNumberExemptDefaultConfig[country2], {}, idNumberExemptDefaultMetadata);
   const mergedProps = mergeFieldMetadataIntoProps("idNumberExempt", idNumberExemptMetadata, mergeFieldMetadataIntoProps("idNumber", metadata, {
     requiredFields: schema,
@@ -19016,9 +19094,9 @@ function IdentityAuComponent({
     requiredFields
   };
   const mergedProps = useMemo(() => {
-    const idNumberMetadata = resolveFieldMetadata(defaultFieldConfig$6[CountryCodes.Australia], {
+    const idNumberMetadata = resolveFieldMetadata(defaultFieldConfig$5[CountryCodes.Australia], {
       idNumberType: identityType
-    }, defaultFieldMetadata$6);
+    }, defaultFieldMetadata$5);
     return mergeFieldMetadataIntoProps("idNumber", idNumberMetadata, mergeFieldMetadataIntoProps("licenseCardNumber", licenseCardNumberMetaData$1, initialFormUtilProps));
   }, [identityType]);
   const {
@@ -19141,9 +19219,9 @@ function IdentityHKComponent({
     requiredFields
   };
   const mergedProps = useMemo(() => {
-    const idNumberMetadata = resolveFieldMetadata(defaultFieldConfig$6[CountryCodes.HongKong], {
+    const idNumberMetadata = resolveFieldMetadata(defaultFieldConfig$5[CountryCodes.HongKong], {
       idNumberType: identityType
-    }, defaultFieldMetadata$6);
+    }, defaultFieldMetadata$5);
     return mergeFieldMetadataIntoProps("idNumber", idNumberMetadata, initialFormUtilProps);
   }, [identityType]);
   const {
@@ -19323,9 +19401,9 @@ function IdentityNZComponent({
     requiredFields
   };
   const mergedProps = useMemo(() => {
-    const idNumberMetadata = resolveFieldMetadata(defaultFieldConfig$6[CountryCodes.NewZealand], {
+    const idNumberMetadata = resolveFieldMetadata(defaultFieldConfig$5[CountryCodes.NewZealand], {
       idNumberType: identityType
-    }, defaultFieldMetadata$6);
+    }, defaultFieldMetadata$5);
     return mergeFieldMetadataIntoProps("idNumber", idNumberMetadata, mergeFieldMetadataIntoProps("licenseCardNumber", licenseCardNumberMetaData, initialFormUtilProps));
   }, [identityType]);
   const {
@@ -21741,11 +21819,11 @@ const simpleBankAccountNumberMetadata = (example, length, maxLength) => {
     }
   };
 };
-const defaultFieldMetadata$5 = {
+const defaultFieldMetadata$4 = {
   label: "bankAccountNumber",
   validators: isNotEmptyValidator
 };
-const defaultFieldConfig$5 = {
+const defaultFieldConfig$4 = {
   [CountryCodes.Denmark]: simpleBankAccountNumberMetadata("2621955959", 10),
   [CountryCodes.Norway]: simpleBankAccountNumberMetadata("1117947", 7),
   [CountryCodes.UnitedKingdom]: simpleBankAccountNumberMetadata("10000003", 8),
@@ -21793,9 +21871,9 @@ function BankAccountNumber(props) {
   } = useI18nContext();
   const {
     country: country2,
-    fieldConfig = defaultFieldConfig$5
+    fieldConfig = defaultFieldConfig$4
   } = props;
-  const metadata = resolveFieldMetadata(fieldConfig[country2], {}, defaultFieldMetadata$5);
+  const metadata = resolveFieldMetadata(fieldConfig[country2], {}, defaultFieldMetadata$4);
   const mergedProps = mergeFieldMetadataIntoProps("bankAccountNumber", metadata, props);
   const {
     handleChangeFor,
@@ -21896,7 +21974,7 @@ function BankCity(props) {
     })
   });
 }
-const defaultFieldMetadata$4 = {
+const defaultFieldMetadata$3 = {
   label: "bankCode",
   validators: isNotEmptyValidator
 };
@@ -21914,7 +21992,7 @@ const simpleBankCodeMetadata = (length, example, label) => ({
     }
   }
 });
-const defaultFieldConfig$4 = {
+const defaultFieldConfig$3 = {
   [CountryCodes.Brazil]: simpleBankCodeMetadata(3, "123"),
   [CountryCodes.Canada]: simpleBankCodeMetadata(3, "100", "institutionNumber"),
   [CountryCodes.Denmark]: simpleBankCodeMetadata(4, "5051"),
@@ -21932,9 +22010,9 @@ function BankCode(props) {
   } = useI18nContext();
   const {
     country: country2,
-    fieldConfig = defaultFieldConfig$4
+    fieldConfig = defaultFieldConfig$3
   } = props;
-  const metadata = resolveFieldMetadata(fieldConfig[country2], {}, defaultFieldMetadata$4);
+  const metadata = resolveFieldMetadata(fieldConfig[country2], {}, defaultFieldMetadata$3);
   const mergedProps = mergeFieldMetadataIntoProps("bankCode", metadata, props);
   const {
     handleChangeFor,
@@ -22033,11 +22111,11 @@ function BankName(props) {
     })
   });
 }
-const defaultFieldMetadata$3 = {
+const defaultFieldMetadata$2 = {
   label: "branchCode",
   validators: isNotEmptyValidator
 };
-const defaultFieldConfig$3 = {
+const defaultFieldConfig$2 = {
   [CountryCodes.UnitedKingdom]: {
     label: "sortCode",
     validators: validatePatternOnBlur(/^\d{6}$/),
@@ -22152,9 +22230,9 @@ function BranchCode(props) {
   } = useI18nContext();
   const {
     country: country2,
-    fieldConfig = defaultFieldConfig$3
+    fieldConfig = defaultFieldConfig$2
   } = props;
-  const metadata = resolveFieldMetadata(fieldConfig[country2], {}, defaultFieldMetadata$3);
+  const metadata = resolveFieldMetadata(fieldConfig[country2], {}, defaultFieldMetadata$2);
   const mergedProps = mergeFieldMetadataIntoProps("branchCode", metadata, props);
   const {
     handleChangeFor,
@@ -22364,11 +22442,11 @@ const ibanMetadata = (country2, inputLength, example, allowLettersInBban) => ({
   guidanceText: ibanGuidance(allowLettersInBban ? "characters" : "digits", inputLength, example)
 });
 const gbIbanMetadata = ibanMetadata(CountryCodes.UnitedKingdom, 20, "GB09 BARC 2003 9554 8297 59", true);
-const defaultFieldMetadata$2 = {
+const defaultFieldMetadata$1 = {
   label: "iban",
   validators: isNotEmptyValidator
 };
-const defaultFieldConfig$2 = {
+const defaultFieldConfig$1 = {
   [CountryCodes.Austria]: ibanMetadata(CountryCodes.Austria, 18, "AT88 5400 0746 7265 9747"),
   [CountryCodes.Belgium]: ibanMetadata(CountryCodes.Belgium, 14, "BE59 9788 6743 2226"),
   [CountryCodes.Croatia]: ibanMetadata(CountryCodes.Croatia, 19, "HR51 2484 0083 5929 6973 8"),
@@ -22415,9 +22493,9 @@ function Iban(props) {
   } = useI18nContext();
   const {
     country: country2,
-    fieldConfig = defaultFieldConfig$2
+    fieldConfig = defaultFieldConfig$1
   } = props;
-  const metadata = resolveFieldMetadata(fieldConfig[country2], {}, defaultFieldMetadata$2);
+  const metadata = resolveFieldMetadata(fieldConfig[country2], {}, defaultFieldMetadata$1);
   const mergedProps = mergeFieldMetadataIntoProps("iban", metadata, props);
   const {
     handleChangeFor,
@@ -23309,17 +23387,25 @@ function SolePropComponent(props) {
   const {
     isExperimentEnabled
   } = useExperimentsContext();
-  const [tradingName2, setTradingName] = useState();
+  const [currentCountry, setCurrentCountry] = useState(props.country);
+  const [currentLegalName, setCurrentLegalName] = useState();
   const solePropNameAndCountryFormProps = getFormProps(props, solePropNameAndCountryFormId);
   const solePropsRegistrationDetailsFormProps = getFormProps(props, solePropRegistrationDetailsFormId);
   const solePropRegistrationAddressFormProps = getNestedOuterFormPropsFromOuterFormProps(props, solePropRegistrationAddressFormId);
   const solePropDocumentsFormProps = getFormProps(props, solePropDocumentFormId);
   const handleStateChange = ({
-    currentState
+    currentState,
+    prevState
   }) => {
-    var _a, _b, _c;
-    const legalCompanyName2 = (_b = (_a = currentState.data) == null ? void 0 : _a.solePropNameAndCountry) == null ? void 0 : _b.legalCompanyName;
-    setTradingName(((_c = solePropsRegistrationDetailsFormProps == null ? void 0 : solePropsRegistrationDetailsFormProps.data) == null ? void 0 : _c.tradingName) || legalCompanyName2);
+    var _a, _b, _c, _d, _e, _f, _g;
+    const companyCountryPrev = (_b = (_a = prevState.data) == null ? void 0 : _a[solePropNameAndCountryFormId]) == null ? void 0 : _b.country;
+    const companyCountry = (_d = (_c = currentState.data) == null ? void 0 : _c[solePropNameAndCountryFormId]) == null ? void 0 : _d.country;
+    setCurrentCountry(companyCountry);
+    const legalCompanyName2 = (_f = (_e = currentState.data) == null ? void 0 : _e[solePropNameAndCountryFormId]) == null ? void 0 : _f.legalCompanyName;
+    setCurrentLegalName(legalCompanyName2);
+    if (companyCountry != null && companyCountry !== companyCountryPrev) {
+      (_g = props.onCountryChange) == null ? void 0 : _g.call(props, companyCountry);
+    }
   };
   const renderActiveForm = (activeForm) => {
     var _a;
@@ -23349,14 +23435,11 @@ function SolePropComponent(props) {
         className: activeForm.formId !== solePropRegistrationDetailsFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
         children: jsx(CompanyRegistrationDetailsComponent, {
           ...solePropsRegistrationDetailsFormProps,
-          data: {
-            ...solePropsRegistrationDetailsFormProps == null ? void 0 : solePropsRegistrationDetailsFormProps.data,
-            tradingName: tradingName2
-          },
           heading: i18n.get("registrationDetails"),
           id: solePropRegistrationDetailsFormId,
           companyType: CompanyTypesValue.SOLE_PROPRIETORSHIP,
-          country: props.country
+          country: currentCountry,
+          legalName: currentLegalName
         })
       }), jsx("div", {
         className: activeForm.formId !== solePropRegistrationAddressFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
@@ -23694,6 +23777,278 @@ const getCountrySpecificTrustTypeOptions = (country2) => {
     return countrySpecificTrustTypeOption;
   });
 };
+const businessRegistrationNumberFields = ["registrationNumber", "exemptedFromRegistrationNumber"];
+function BusinessRegistrationNumber(props) {
+  var _a, _b, _c, _d;
+  const fieldConfig = props.fieldConfig ?? defaultFieldConfig$9;
+  const {
+    i18n
+  } = useI18nContext();
+  const stateRef = useRef({
+    setState: null
+  });
+  const schema = props.requiredFields || ["registrationNumber"];
+  const {
+    companyType: companyType2,
+    country: country2
+  } = props;
+  const registrationNumberOptions = useMemo(() => getCompanyRegistrationNumberOptions(country2, companyType2), [country2, companyType2]);
+  const defaultRegistrationNumberType = ((_a = props.data) == null ? void 0 : _a.registrationNumber) ? inferCompanyRegistrationNumberType((_b = props.data) == null ? void 0 : _b.registrationNumber, country2, companyType2) : registrationNumberOptions == null ? void 0 : registrationNumberOptions[0].id;
+  const [registrationNumberType, setRegistrationNumberType] = useState(defaultRegistrationNumberType);
+  const metadata = resolveFieldMetadata(fieldConfig[country2], {
+    companyType: companyType2,
+    registrationNumberType
+  }, defaultFieldMetadata$9);
+  const mergedProps = mergeFieldMetadataIntoProps("registrationNumber", metadata, {
+    requiredFields: schema,
+    readOnlyFields: props.readOnlyFields
+  });
+  const {
+    handleChangeFor,
+    data,
+    valid,
+    errors,
+    isValid,
+    fieldProblems
+  } = useForm({
+    ...mergedProps,
+    schema: (data2) => data2.exemptedFromRegistrationNumber ? ["exemptedFromRegistrationNumber"] : ["registrationNumber", "exemptedFromRegistrationNumber"],
+    rules: mergedProps.validators,
+    defaultData: {
+      ...props.data,
+      exemptedFromRegistrationNumber: !!((_c = props.data) == null ? void 0 : _c.exemptedFromRegistrationNumber)
+    },
+    // exemptedFromRegistrationNumber should be a boolean
+    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
+  });
+  useEffect(() => {
+    var _a2, _b2;
+    (_b2 = (_a2 = stateRef == null ? void 0 : stateRef.current) == null ? void 0 : _a2.setState) == null ? void 0 : _b2.call(_a2, {
+      type: "addToState",
+      value: {
+        data,
+        valid,
+        errors,
+        caller: "businessRegistration",
+        dataStoreId: props.dataStoreId
+      }
+    });
+  }, [data, valid, errors, isValid]);
+  useEffect(() => {
+    if (data.registrationNumber || registrationNumberType) {
+      handleChangeFor("registrationNumber", "blur")(data.registrationNumber);
+    }
+  }, [props.country, registrationNumberType]);
+  const formUtils = formUtilities(mergedProps, i18n);
+  const exemptionIsPossible = ((_d = mergedProps.requiredFields) == null ? void 0 : _d.includes("exemptedFromRegistrationNumber")) ?? false;
+  const showExemptedOption = exemptionIsPossible && !!registrationNumberOptions && registrationNumberOptions.length > 1;
+  const handleCompanyRegistrationNumberTypeChange = (regNumberType) => {
+    if (regNumberType === "exempted") {
+      if (!exemptionIsPossible) {
+        throw Error(`${country2} does not allow tax exemptions`);
+      }
+      handleChangeFor("exemptedFromRegistrationNumber")(true);
+      setRegistrationNumberType(void 0);
+      return;
+    }
+    if (exemptionIsPossible && data.exemptedFromRegistrationNumber === true) {
+      handleChangeFor("exemptedFromRegistrationNumber")(false);
+    }
+    setRegistrationNumberType(regNumberType);
+  };
+  return jsxs("div", {
+    className: "adyen-kyc-field__business-registration adyen-kyc-u-margin-bottom-16",
+    children: [jsx(StateContextSetter, {
+      stateRef
+    }), jsx(CompanyRegistrationNumberTypeSelector, {
+      companyType: companyType2,
+      country: country2,
+      setSelected: handleCompanyRegistrationNumberTypeChange,
+      selected: data.exemptedFromRegistrationNumber ? "exempted" : registrationNumberType,
+      exemptedOption: showExemptedOption ? formUtils.getLabel("exemptedFromRegistrationNumber", "iDontHaveARegistrationNumber") : false
+    }), jsx(MaskedInputText, {
+      name: "registrationNumber",
+      label: formUtils.getLabel("registrationNumber", "companyRegistrationNumber"),
+      formatGuidance: formUtils.getGuidanceText("registrationNumber"),
+      classNameModifiers: {
+        field: ["registrationNumber"],
+        input: ["registrationNumber"]
+      },
+      errorMessage: formUtils.getErrorMessage("registrationNumber", errors, fieldProblems),
+      shouldValidate: props.shouldValidate,
+      isValid: valid.registrationNumber,
+      "aria-required": formUtils.isRequiredField("registrationNumber"),
+      "aria-label": formUtils.getLabel("registrationNumber"),
+      "aria-invalid": !valid.registrationNumber,
+      disabled: data.exemptedFromRegistrationNumber,
+      onBlur: handleChangeFor("registrationNumber", "blur"),
+      readonly: formUtils.isReadOnly("registrationNumber"),
+      value: data.registrationNumber ?? "",
+      onInput: handleChangeFor("registrationNumber", "input"),
+      ...formUtils.getMask("registrationNumber")
+    }), formUtils.isRequiredField("exemptedFromRegistrationNumber") && !showExemptedOption && jsx(Checkbox, {
+      name: "exemptedFromRegistrationNumber",
+      label: formUtils.getLabel("iDontHaveARegistrationNumber"),
+      value: "exemptedFromRegistrationNumber",
+      readonly: formUtils.isReadOnly("exemptedFromRegistrationNumber"),
+      classNameModifiers: ["exempted-from-registration"],
+      checked: data.exemptedFromRegistrationNumber ?? false,
+      onChange: handleChangeFor("exemptedFromRegistrationNumber"),
+      "aria-required": formUtils.isRequiredField("exemptedFromRegistrationNumber"),
+      "aria-label": formUtils.getLabel("exemptedFromRegistrationNumber"),
+      "aria-invalid": false
+    })]
+  });
+}
+const taxIdFields = ["taxId", "exemptedFromTax", "isUen"];
+function TaxId(props) {
+  var _a, _b, _c;
+  const {
+    data: propData,
+    country: country2,
+    companyType: companyType2,
+    fieldValidationErrors,
+    dataStoreId,
+    fieldConfig = defaultFieldConfig$8
+  } = props;
+  const existingTaxId = propData == null ? void 0 : propData.taxId;
+  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2, companyType2) : (_a = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _a[0].id;
+  const [taxIdNumberType, setTaxIdNumberType] = useState(defaultTaxIdNumberType);
+  const metadata = resolveFieldMetadata(fieldConfig[country2], {
+    taxIdNumberType,
+    companyType: companyType2
+  }, defaultFieldMetadata$8);
+  const mergedProps = mergeFieldMetadataIntoProps("taxId", metadata, props);
+  const {
+    i18n
+  } = useI18nContext();
+  const formUtils = formUtilities(mergedProps, i18n);
+  const stateRef = useRef({
+    setState: null
+  });
+  const {
+    handleChangeFor,
+    data,
+    valid,
+    errors,
+    isValid,
+    fieldProblems
+  } = useForm({
+    ...mergedProps,
+    schema: (data2) => formUtils.isRequiredField("isUen") ? ["taxId", "isUen"] : data2.exemptedFromTax ? ["exemptedFromTax"] : ["taxId", "exemptedFromTax"],
+    rules: mergedProps.validators,
+    defaultData: {
+      ...propData,
+      exemptedFromTax: Boolean(propData == null ? void 0 : propData.exemptedFromTax),
+      // exemptedFromTax should be a boolean
+      isUen: formUtils.isRequiredField("isUen") ? Boolean(propData == null ? void 0 : propData.isUen) : void 0
+    },
+    fieldProblems: fieldValidationErrors
+  });
+  useEffect(() => {
+    if (data.taxId || taxIdNumberType) {
+      handleChangeFor("taxId", "blur")(data.taxId);
+    }
+  }, [taxIdNumberType, country2]);
+  useEffect(() => {
+    var _a2, _b2;
+    (_b2 = (_a2 = stateRef.current) == null ? void 0 : _a2.setState) == null ? void 0 : _b2.call(_a2, {
+      type: "addToState",
+      value: {
+        data,
+        valid,
+        errors,
+        caller: "taxId",
+        dataStoreId
+      }
+    });
+  }, [data, valid, errors, isValid, dataStoreId]);
+  const {
+    sliceData: companyRegistrationDetails
+  } = useGlobalDataSlice("companyRegistrationDetails");
+  const registrationNumber2 = companyRegistrationDetails == null ? void 0 : companyRegistrationDetails.registrationNumber;
+  const handleUenOrGstChange = (isUen) => {
+    handleChangeFor("isUen", "input")(isUen);
+    if (isUen) {
+      handleChangeFor("taxId", "blur")(registrationNumber2);
+      return;
+    }
+    handleChangeFor("taxId", "blur")("");
+  };
+  useEffect(() => {
+    if (data.isUen) {
+      handleChangeFor("taxId", "blur")(registrationNumber2);
+    }
+  }, [registrationNumber2]);
+  if (!formUtils.isRequiredField("taxId")) {
+    return null;
+  }
+  const exemptionIsPossible = ((_b = mergedProps.requiredFields) == null ? void 0 : _b.includes("exemptedFromTax")) ?? false;
+  const showTaxIdExemptedOption = exemptionIsPossible && (((_c = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _c.length) ?? 0) > 1;
+  const handleTaxIdNumberTypeChange = (taxIdType) => {
+    if (taxIdType === "exempted") {
+      if (!exemptionIsPossible) {
+        throw Error(`${country2} does not allow tax exemptions`);
+      }
+      handleChangeFor("exemptedFromTax")(true);
+      setTaxIdNumberType(void 0);
+      return;
+    }
+    if (exemptionIsPossible && data.exemptedFromTax === true) {
+      handleChangeFor("exemptedFromTax")(false);
+    }
+    setTaxIdNumberType(taxIdType);
+  };
+  return jsxs("div", {
+    className: "adyen-kyc-field--tax-id",
+    children: [jsx(StateContextSetter, {
+      stateRef
+    }), jsx(TaxIdNumberTypeSelector, {
+      country: country2,
+      companyType: companyType2,
+      setSelected: handleTaxIdNumberTypeChange,
+      selected: data.exemptedFromTax ? "exempted" : taxIdNumberType,
+      exemptedOption: showTaxIdExemptedOption ? formUtils.getLabel("exemptedFromTax", "iDontHaveATaxId") : false
+    }), !data.isUen && jsx(MaskedInputText, {
+      name: "taxId",
+      label: formUtils.getLabel("taxId"),
+      formatGuidance: formUtils.getGuidanceText("taxId"),
+      ...formUtils.getMask("taxId"),
+      classNameModifiers: {
+        field: ["tax-id"],
+        input: ["tax-id"]
+      },
+      errorMessage: formUtils.getErrorMessage("taxId", errors, fieldProblems),
+      shouldValidate: props.shouldValidate,
+      isValid: valid.taxId,
+      value: data.taxId ?? "",
+      readonly: formUtils.isReadOnly("taxId"),
+      onInput: handleChangeFor("taxId", "input"),
+      onBlur: handleChangeFor("taxId", "blur"),
+      disabled: data.exemptedFromTax || data.isUen
+    }), formUtils.isRequiredField("isUen") && jsx(Checkbox, {
+      name: "isUen",
+      label: formUtils.getLabel("iDoNotHaveGst"),
+      classNameModifiers: ["exempted-from-tax"],
+      checked: Boolean(data.isUen),
+      onChange: handleUenOrGstChange,
+      "aria-required": false,
+      "aria-label": formUtils.getLabel("iDoNotHaveGst"),
+      "aria-invalid": false
+    }), formUtils.isRequiredField("exemptedFromTax") && !showTaxIdExemptedOption && jsx(Checkbox, {
+      name: "exemptedFromTax",
+      label: formUtils.getLabel("exemptedFromTax", "iDontHaveATaxId"),
+      value: "exemptedFromTax",
+      readonly: formUtils.isReadOnly("exemptedFromTax"),
+      classNameModifiers: ["exempted-from-tax"],
+      checked: Boolean(data.exemptedFromTax),
+      onChange: handleChangeFor("exemptedFromTax"),
+      "aria-required": false,
+      "aria-label": formUtils.getLabel("exemptedFromTax"),
+      "aria-invalid": false
+    })]
+  });
+}
 const trustRegistrationDetailsValidations = {
   trustType: {
     modes: ["blur"],
@@ -25660,127 +26015,6 @@ const getFieldsWithExistingData = (legalEntity, isExperimentEnabled) => {
   }
   return nonDocumentFields;
 };
-const BUSINESS_REGISTRATION_NUMBER_FIELD = ["registrationNumber", "exemptedFromRegistrationNumber"];
-function BusinessRegistrationNumberField({
-  data,
-  valid,
-  errors,
-  labels: labels2,
-  mask,
-  guidanceText,
-  placeholders,
-  readonly,
-  shouldValidate,
-  optional: optional2,
-  handleChangeFor,
-  country: country2,
-  canExempt,
-  companyType: companyType2,
-  registrationNumberOptions,
-  registrationNumberType,
-  setRegistrationNumberType
-}) {
-  const showExemptedOption = canExempt && !!registrationNumberOptions && registrationNumberOptions.length > 1;
-  const handleCompanyRegistrationNumberTypeChange = (regNumberType) => {
-    if (regNumberType === "exempted") {
-      if (!canExempt) {
-        throw Error(`${country2} does not allow tax exemptions`);
-      }
-      handleChangeFor("exemptedFromRegistrationNumber")(true);
-      setRegistrationNumberType(void 0);
-      return;
-    }
-    if (canExempt && data.exemptedFromRegistrationNumber === true) {
-      handleChangeFor("exemptedFromRegistrationNumber")(false);
-    }
-    setRegistrationNumberType(regNumberType);
-  };
-  return jsxs("div", {
-    className: "adyen-kyc-field__business-registration",
-    children: [jsx(CompanyRegistrationNumberTypeSelector, {
-      companyType: companyType2,
-      country: country2,
-      setSelected: handleCompanyRegistrationNumberTypeChange,
-      selected: data.exemptedFromRegistrationNumber ? "exempted" : registrationNumberType,
-      exemptedOption: showExemptedOption ? labels2.exemptedFromRegistrationNumber : false
-    }), jsx(MaskedInputText, {
-      "aria-required": true,
-      "aria-label": labels2.registrationNumber,
-      "aria-invalid": !valid.registrationNumber,
-      classNameModifiers: {
-        field: ["registrationNumber"],
-        input: ["registrationNumber"]
-      },
-      name: "registrationNumber",
-      value: (data == null ? void 0 : data.registrationNumber) ?? "",
-      label: labels2.registrationNumber ?? "",
-      formatGuidance: (guidanceText == null ? void 0 : guidanceText.registrationNumber) ?? "",
-      placeholder: placeholders == null ? void 0 : placeholders.registrationNumber,
-      errorMessage: errors.registrationNumber,
-      isValid: Boolean(valid.registrationNumber),
-      onInput: handleChangeFor("registrationNumber", "input"),
-      onBlur: handleChangeFor("registrationNumber", "blur"),
-      disabled: data.exemptedFromRegistrationNumber,
-      optional: optional2,
-      readonly,
-      shouldValidate: !optional2 && shouldValidate,
-      ...mask
-    }), canExempt && jsx(Checkbox, {
-      "aria-required": false,
-      "aria-label": labels2 == null ? void 0 : labels2.exemptedFromRegistrationNumber,
-      "aria-invalid": false,
-      name: "exemptedFromRegistrationNumber",
-      value: "exemptedFromRegistrationNumber",
-      checked: Boolean(data.exemptedFromRegistrationNumber),
-      label: labels2 == null ? void 0 : labels2.exemptedFromRegistrationNumber,
-      readonly,
-      classNameModifiers: ["exempted-from-registration"],
-      onChange: handleChangeFor("exemptedFromRegistrationNumber")
-    })]
-  });
-}
-const DATE_OF_INCORPORATION_FIELD = ["dateOfIncorporation"];
-function DateOfIncorporationField({
-  data,
-  valid,
-  errors,
-  labels: labels2,
-  placeholders,
-  readonly,
-  handleChangeFor
-}) {
-  return jsx(Field, {
-    name: "dateOfIncorporation",
-    label: labels2.dateOfIncorporation,
-    classNameModifiers: ["dateOfIncorporation"],
-    errorMessage: errors.dateOfIncorporation,
-    isValid: valid.dateOfIncorporation,
-    children: (childProps) => jsx(InputDate, {
-      ...childProps,
-      "aria-required": true,
-      "aria-label": labels2.dateOfIncorporation,
-      "aria-invalid": !valid.dateOfIncorporation,
-      name: "dateOfIncorporation",
-      value: data.dateOfIncorporation,
-      placeholder: placeholders == null ? void 0 : placeholders.dateOfIncorporation,
-      readonly,
-      onInput: handleChangeFor("dateOfIncorporation", "input"),
-      onBlur: handleChangeFor("dateOfIncorporation", "blur"),
-      max: formatDateObj(/* @__PURE__ */ new Date())
-    })
-  });
-}
-const DateOfIncorporationFieldValidation = () => ({
-  dateOfIncorporation: [{
-    modes: ["blur"],
-    validate: (dateOfIncorporation2) => !isEmpty(dateOfIncorporation2),
-    errorMessage: "fieldIsRequired"
-  }, {
-    modes: ["blur"],
-    validate: (dateOfIncorporation2) => dateOfIncorporation2 ? new Date(dateOfIncorporation2) < /* @__PURE__ */ new Date() : false,
-    errorMessage: "invalidDateOfIncorporation"
-  }]
-});
 const DBA_NAME_FIELD = ["hasDba", "dbaName"];
 function DBANameField({
   data,
@@ -25849,207 +26083,6 @@ const dbaNameFieldMetadata = {
   label: "dbaName",
   validators: [validateNotEmptyOnBlur]
 };
-const TAX_INFORMATION_FIELD = ["taxInformation", "exemptedFromTax", "isUen"];
-function TaxInformationField({
-  data,
-  valid,
-  errors,
-  labels: labels2,
-  mask,
-  guidanceText,
-  placeholders,
-  readonly,
-  shouldValidate,
-  handleChangeFor,
-  country: country2,
-  canExempt,
-  registrationNumber: registrationNumber2,
-  isUen,
-  companyType: companyType2,
-  taxIdNumberType,
-  setTaxIdNumberType,
-  defaultData
-}) {
-  var _a;
-  useEffect(() => {
-    handleChangeFor("taxInformation", "input")(defaultData);
-  }, [country2]);
-  const currentCountryTaxInformation = useMemo(() => {
-    var _a2;
-    return (_a2 = data == null ? void 0 : data.taxInformation) == null ? void 0 : _a2.find((taxInfo) => taxInfo.country === country2);
-  }, [data, country2]);
-  const showTaxIdExemptedOption = canExempt && (((_a = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _a.length) ?? 0) > 1;
-  const removeCurrentCountryTaxInformation = () => {
-    var _a2;
-    const filterdTaxInformation = (_a2 = data.taxInformation) == null ? void 0 : _a2.filter((taxId2) => taxId2.country !== country2);
-    handleChangeFor("taxInformation", "input")(filterdTaxInformation);
-  };
-  const setUenAsTaxId = (uen2) => {
-    if (!data.taxInformation) {
-      return handleChangeFor("taxInformation", "blur")([{
-        country: country2,
-        number: uen2 ?? "",
-        type: "UEN"
-      }]);
-    }
-    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, {
-      country: country2,
-      number: uen2 ?? "",
-      type: "UEN"
-    }];
-    const updatedTaxInformation = taxInformation.map((taxInfo) => {
-      if (taxInfo.country !== country2) return taxInfo;
-      return {
-        country: country2,
-        number: uen2 ?? "",
-        type: "UEN"
-      };
-    });
-    return handleChangeFor("taxInformation", "blur")(updatedTaxInformation);
-  };
-  const handleTaxInformationInput = (value) => {
-    if (!data.taxInformation) {
-      const updatedTaxInformation2 = [{
-        country: country2,
-        number: value,
-        type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
-      }];
-      return handleChangeFor("taxInformation", "input")(updatedTaxInformation2);
-    }
-    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, {
-      country: country2,
-      number: value,
-      type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
-    }];
-    const updatedTaxInformation = taxInformation.map((taxInfo) => {
-      if (taxInfo.country !== country2) return taxInfo;
-      return {
-        country: country2,
-        number: value,
-        type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
-      };
-    });
-    return handleChangeFor("taxInformation", "input")(updatedTaxInformation);
-  };
-  const handleTaxInformationBlur = (e) => {
-    const {
-      value
-    } = e.target;
-    if (!data.taxInformation) {
-      const updatedTaxInformation2 = [{
-        country: country2,
-        number: value,
-        type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
-      }];
-      return handleChangeFor("taxInformation", "blur")(updatedTaxInformation2);
-    }
-    const taxInformation = currentCountryTaxInformation ? data.taxInformation : [...data.taxInformation, {
-      country: country2,
-      number: value,
-      type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
-    }];
-    const updatedTaxInformation = taxInformation.map((taxInfo) => {
-      if (taxInfo.country !== country2) return taxInfo;
-      return {
-        country: country2,
-        number: value,
-        type: data.isUen ? "UEN" : countryToTaxInfoTypeMap[country2]
-      };
-    });
-    return handleChangeFor("taxInformation", "blur")(updatedTaxInformation);
-  };
-  const handleTaxIdNumberTypeChange = (taxIdType) => {
-    if (taxIdType === "exempted") {
-      if (!canExempt) {
-        throw Error(`${country2} does not allow tax exemptions`);
-      }
-      handleChangeFor("exemptedFromTax")(true);
-      removeCurrentCountryTaxInformation();
-      setTaxIdNumberType(void 0);
-      return;
-    }
-    if (isUen) {
-      if (taxIdType === "UEN") {
-        handleChangeFor("isUen")(true);
-        setUenAsTaxId(registrationNumber2);
-      } else {
-        handleChangeFor("isUen")(false);
-        removeCurrentCountryTaxInformation();
-      }
-    }
-    if (canExempt && data.exemptedFromTax === true) {
-      handleChangeFor("exemptedFromTax")(false);
-    }
-    setTaxIdNumberType(taxIdType);
-  };
-  const handleExemptedFromTaxChange = (exempted) => {
-    handleChangeFor("exemptedFromTax")(exempted);
-    removeCurrentCountryTaxInformation();
-  };
-  return jsxs("div", {
-    className: "adyen-kyc-field__tax-information",
-    children: [jsx(TaxIdNumberTypeSelector, {
-      country: country2,
-      companyType: companyType2,
-      setSelected: handleTaxIdNumberTypeChange,
-      selected: data.exemptedFromTax ? "exempted" : taxIdNumberType,
-      exemptedOption: showTaxIdExemptedOption ? labels2.exemptedFromTax : false
-    }), !data.isUen && jsx(MaskedInputText, {
-      "aria-required": true,
-      "aria-label": labels2.taxInformation,
-      "aria-invalid": !valid.taxInformation,
-      name: "taxInformationNumber",
-      label: labels2.taxInformation ?? "",
-      formatGuidance: (guidanceText == null ? void 0 : guidanceText.taxInformation) ?? "",
-      value: (currentCountryTaxInformation == null ? void 0 : currentCountryTaxInformation.number) ?? "",
-      errorMessage: errors.taxInformation,
-      placeholder: placeholders == null ? void 0 : placeholders.taxInformation,
-      isValid: Boolean(valid.taxInformation) && !!currentCountryTaxInformation,
-      onInput: handleTaxInformationInput,
-      onBlur: handleTaxInformationBlur,
-      disabled: data.exemptedFromTax || data.isUen,
-      readonly,
-      shouldValidate,
-      ...mask
-    }), canExempt && !showTaxIdExemptedOption && jsx(Checkbox, {
-      "aria-required": false,
-      "aria-label": labels2.exemptedFromTax,
-      "aria-invalid": false,
-      name: "exemptedFromTax",
-      label: labels2.exemptedFromTax,
-      value: "exemptedFromTax",
-      classNameModifiers: ["exempted-from-tax"],
-      checked: Boolean(data.exemptedFromTax),
-      onChange: handleExemptedFromTaxChange
-    })]
-  });
-}
-const defaultFieldMetadata$1 = defaultFieldMetadata$8;
-const defaultFieldConfig$1 = entriesOf(defaultFieldConfig$8).reduce((fieldConfig, [country2, countryEntry]) => ({
-  ...fieldConfig,
-  [country2]: ({
-    taxIdNumberType,
-    companyType: companyType2
-  }) => {
-    const fieldMetadata = resolveFieldMetadata(countryEntry, {
-      taxIdNumberType,
-      companyType: companyType2
-    }, defaultFieldMetadata$8);
-    const taxIdValidators = fieldMetadata.validators ? Array.isArray(fieldMetadata.validators) ? fieldMetadata.validators : [fieldMetadata.validators] : [];
-    const mappedValidators = taxIdValidators.map((validator) => ({
-      ...validator,
-      validate: (taxInformation) => {
-        var _a;
-        const taxIdNumber2 = (_a = taxInformation == null ? void 0 : taxInformation.find((taxId2) => country2 === taxId2.country)) == null ? void 0 : _a.number;
-        return taxIdNumber2 ? validator.validate(taxIdNumber2) : false;
-      }
-    }));
-    return {
-      ...fieldMetadata,
-      validators: mappedValidators
-    };
-  }
-}), {});
 function VerifiedBusinessCard({
   verifiedBusiness
 }) {
@@ -26179,7 +26212,20 @@ function AdditionalInformationComponent({
     if (currentData.exemptedFromVat) {
       fieldsToRemove.push("vatNumber");
     } else {
-      fieldsToRemove.push("vatAbsenceReason");
+      fieldsToRemove.push("exemptedFromVat", "vatAbsenceReason");
+    }
+    if (currentData.exemptedFromTax) {
+      fieldsToRemove.push("taxInformation");
+    } else {
+      fieldsToRemove.push("exemptedFromTax");
+    }
+    if (currentData.isUen) {
+      fieldsToRemove.push("taxInformation", "exemptedFromTax");
+    }
+    if (currentData.exemptedFromRegistrationNumber) {
+      fieldsToRemove.push("registrationNumber");
+    } else {
+      fieldsToRemove.push("exemptedFromRegistrationNumber");
     }
     if (!currentData.hasDba) {
       fieldsToRemove.push("dbaName");
@@ -26204,9 +26250,9 @@ function AdditionalInformationComponent({
             registrationNumberType
           }, defaultFieldMetadata$9), acc);
         case "taxInformation":
-          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$1[country2], {
+          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$6[country2], {
             taxIdNumberType
-          }, defaultFieldMetadata$1), acc);
+          }, defaultFieldMetadata$6), acc);
         case "vatNumber":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$7[country2], {
             vatNumberType
@@ -26214,13 +26260,7 @@ function AdditionalInformationComponent({
         case "vatAbsenceReason":
           return mergeFieldMetadataIntoProps("vatAbsenceReason", vatAbsenceReasonMetadata, acc);
         case "dateOfIncorporation":
-          return {
-            ...acc,
-            validators: {
-              ...acc.validators,
-              ...DateOfIncorporationFieldValidation()
-            }
-          };
+          return mergeFieldMetadataIntoProps("dateOfIncorporation", dateOfIncorporationFieldMetadata, acc);
         case "stockExchangeMIC":
           return mergeFieldMetadataIntoProps("stockExchangeMIC", stockExchangeMICFieldMetadata, acc);
         case "stockISIN":
@@ -26606,9 +26646,9 @@ function BasicInformationComponent({
             state: sliceData == null ? void 0 : sliceData.stateOrProvince
           }, defaultFieldMetadata$9), acc);
         case "taxInformation":
-          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$1[country2], {
+          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$6[country2], {
             taxIdNumberType
-          }, defaultFieldMetadata$1), acc);
+          }, defaultFieldMetadata$6), acc);
         default:
           return acc;
       }
@@ -28764,11 +28804,11 @@ const formatBasicInformation = (data, labels2, datasetUtils, companyType2) => {
     companyType: companyType2,
     registrationNumberType: data.registrationNumber ? inferCompanyRegistrationNumberType(data == null ? void 0 : data.registrationNumber, country2, companyType2) : (_a = getCompanyRegistrationNumberOptions(country2, companyType2)) == null ? void 0 : _a[0].id
   }, defaultFieldMetadata$9).label;
-  const taxIdLabel = resolveFieldMetadata(defaultFieldConfig$1[country2], {
+  const taxIdLabel = resolveFieldMetadata(defaultFieldConfig$6[country2], {
     taxIdNumberType: countryToTaxInfoTypeMap[country2] ?? void 0,
     // TODO use type selector
     companyType: void 0
-  }, defaultFieldMetadata$1).label;
+  }, defaultFieldMetadata$6).label;
   return {
     [((_b = labels2 == null ? void 0 : labels2.basicInformation) == null ? void 0 : _b.country) ?? "country"]: datasetUtils.getCountryName(data.country),
     [getKeyForField("stateOrProvince", data.country)]: datasetUtils.getStateName(data.stateOrProvince, data.country),
@@ -28782,11 +28822,11 @@ const formatAdditionalInformation = (data, labels2, country2, companyType2) => {
     companyType: companyType2,
     registrationNumberType: data.registrationNumber ? inferCompanyRegistrationNumberType(data == null ? void 0 : data.registrationNumber, country2, companyType2) : (_a = getCompanyRegistrationNumberOptions(country2, companyType2)) == null ? void 0 : _a[0].id
   }, defaultFieldMetadata$9).label;
-  const taxIdLabel = resolveFieldMetadata(defaultFieldConfig$1[country2], {
+  const taxIdLabel = resolveFieldMetadata(defaultFieldConfig$6[country2], {
     taxIdNumberType: countryToTaxInfoTypeMap[country2] ?? void 0,
     // TODO use type selector
     companyType: void 0
-  }, defaultFieldMetadata$1).label;
+  }, defaultFieldMetadata$6).label;
   return {
     [((_b = labels2 == null ? void 0 : labels2.additionalInformation) == null ? void 0 : _b.legalCompanyName) ?? "legalCompanyName"]: data.legalCompanyName,
     [((_c = labels2 == null ? void 0 : labels2.additionalInformation) == null ? void 0 : _c.dbaName) ?? "dbaName"]: data.dbaName,
@@ -29612,7 +29652,7 @@ function CompanyDropinComponent({
   }, []);
   const datasetUtils = datasetUtilities(i18n.locale);
   const formatDataForSummary2 = (data2, forms22) => {
-    var _a2, _b2, _c, _d, _e, _f;
+    var _a2, _b2, _c, _d, _e, _f, _g;
     let summaryData = cloneObject(data2);
     if (summaryData.companyNameAndCountry) {
       if (isCountryOfGoverningLawEnabled) {
@@ -29643,6 +29683,16 @@ function CompanyDropinComponent({
         summaryData.companyRegistrationDetails.vatAbsenceReason = i18n.get(vatAbsenceReason2);
       }
     }
+    if ((_g = summaryData.companyRegistrationDetails) == null ? void 0 : _g.taxInformation) {
+      const taxInformation = summaryData.companyRegistrationDetails.taxInformation.find((taxId2) => {
+        var _a3;
+        return taxId2.country === ((_a3 = data2.companyNameAndCountry) == null ? void 0 : _a3.country);
+      });
+      if (taxInformation) {
+        summaryData.companyRegistrationDetails[taxInformation.type] = taxInformation.number;
+      }
+      delete summaryData.companyRegistrationDetails.taxInformation;
+    }
     if (isDocumentsRequired$2(forms22)) {
       companyDocumentForms.forEach((formId) => delete summaryData[formId]);
       summaryData = {
@@ -30153,10 +30203,10 @@ function CompanyBasics({
             isBusiness: false
           }, defaultFieldMetadata), acc);
         case "taxInformation":
-          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$1[country2], {
+          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$6[country2], {
             taxIdNumberType,
             companyType: companyType2
-          }, defaultFieldMetadata$1), acc);
+          }, defaultFieldMetadata$6), acc);
         default:
           return acc;
       }
@@ -30284,64 +30334,6 @@ function CompanyBasics({
   });
 }
 const CompanyBasicsComponent = memo(CompanyBasics, (prevProps, nextProps) => objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.placeholders, nextProps.placeholders) && objectsDeepEqual(prevProps.helperText, nextProps.helperText) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && prevProps.heading === nextProps.heading && prevProps.description === nextProps.description && prevProps.readOnly === nextProps.readOnly && prevProps.requiredFields === nextProps.requiredFields && prevProps.obscuredFields === nextProps.obscuredFields && prevProps.optionalFields === nextProps.optionalFields && prevProps.readOnlyFields === nextProps.readOnlyFields && prevProps.shouldValidate === nextProps.shouldValidate && prevProps.companyType === nextProps.companyType && objectsDeepEqual(prevProps.kompanyVerifiedData, nextProps.kompanyVerifiedData));
-const TRADING_NAME_FIELD = ["tradingName", "sameNameAsLegalName"];
-function TradingNameField({
-  data,
-  valid,
-  errors,
-  labels: labels2,
-  readonly,
-  handleChangeFor,
-  legalCompanyName: legalCompanyName2
-}) {
-  const handleSameAsLegalName = useCallback((isChecked) => {
-    handleChangeFor("sameNameAsLegalName", "input")(isChecked);
-    if (isChecked) {
-      handleChangeFor("tradingName")(legalCompanyName2);
-    }
-  }, [handleChangeFor, legalCompanyName2]);
-  useEffect(() => {
-    if (data.sameNameAsLegalName && data.tradingName && legalCompanyName2 && data.tradingName !== legalCompanyName2) {
-      return handleChangeFor("tradingName")(legalCompanyName2);
-    }
-  }, [legalCompanyName2, data.sameNameAsLegalName, data.tradingName, handleChangeFor]);
-  return jsxs(Fragment, {
-    children: [jsx(Field, {
-      name: "tradingNameField",
-      label: labels2.tradingName,
-      classNameModifiers: ["tradingName"],
-      errorMessage: errors.tradingName,
-      isValid: valid.tradingName,
-      children: (childProps) => jsx(InputText, {
-        ...childProps,
-        "aria-required": true,
-        "aria-label": labels2.tradingName,
-        "aria-invalid": !valid.tradingName,
-        name: "tradingName",
-        value: data.tradingName,
-        readonly: readonly || data.sameNameAsLegalName,
-        classNameModifiers: ["tradingName"],
-        onInput: handleChangeFor("tradingName", "input"),
-        onBlur: handleChangeFor("tradingName", "blur")
-      })
-    }), jsx(Checkbox, {
-      "aria-required": false,
-      "aria-label": labels2.sameNameAsLegalName,
-      "aria-invalid": false,
-      name: "sameNameAsLegalName",
-      label: labels2.sameNameAsLegalName,
-      checked: Boolean(data.sameNameAsLegalName),
-      onChange: handleSameAsLegalName
-    })]
-  });
-}
-const TradingNameFieldValidation = () => ({
-  tradingName: [{
-    modes: ["blur"],
-    validate: (tradingName2) => !isEmpty(tradingName2),
-    errorMessage: "fieldIsRequired"
-  }]
-});
 const COMPANY_OTHER_DETAILS_FORM_ID = "companyOtherDetails";
 const companyOtherDetailsFields = [...TRADING_NAME_FIELD, ...STOCK_EXCHANGE_MIC_FIELD, ...STOCK_ISIN_FIELD, ...STOCK_TICKER_SYMBOL_FIELD, ...DATE_OF_INCORPORATION_FIELD, ...BUSINESS_REGISTRATION_NUMBER_FIELD, ...TAX_INFORMATION_FIELD, ...VAT_NUMBER_FIELD];
 function CompanyOtherDetails({
@@ -30379,7 +30371,6 @@ function CompanyOtherDetails({
   const existingTaxId = (_c = (_b = data == null ? void 0 : data.taxInformation) == null ? void 0 : _b.find((taxId2) => taxId2.country === country2)) == null ? void 0 : _c.number;
   const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2, companyType2) : (_d = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _d[0].id;
   const [taxIdNumberType, setTaxIdNumberType] = useState$1(defaultTaxIdNumberType);
-  const directChildFields = companyOtherDetailsFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "stockTickerSymbol", "dateOfIncorporation"].includes(field));
   const initialFormUtilsProps = useMemo$1(() => ({
     allFields,
     labels: labels2,
@@ -30397,21 +30388,9 @@ function CompanyOtherDetails({
     return (_a2 = initialFormUtilsProps.allFields) == null ? void 0 : _a2.reduce((acc, field) => {
       switch (field) {
         case "tradingName":
-          return {
-            ...acc,
-            validators: {
-              ...acc.validators,
-              ...TradingNameFieldValidation()
-            }
-          };
+          return mergeFieldMetadataIntoProps("tradingName", tradingNameFieldMetadata, acc);
         case "dateOfIncorporation":
-          return {
-            ...acc,
-            validators: {
-              ...acc.validators,
-              ...DateOfIncorporationFieldValidation()
-            }
-          };
+          return mergeFieldMetadataIntoProps("dateOfIncorporation", dateOfIncorporationFieldMetadata, acc);
         case "stockExchangeMIC":
           return mergeFieldMetadataIntoProps("stockExchangeMIC", stockExchangeMICFieldMetadata, acc);
         case "stockISIN":
@@ -30424,10 +30403,10 @@ function CompanyOtherDetails({
             registrationNumberType
           }, defaultFieldMetadata$9), acc);
         case "taxInformation":
-          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$1[country2], {
+          return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$6[country2], {
             taxIdNumberType,
             companyType: companyType2
-          }, defaultFieldMetadata$1), acc);
+          }, defaultFieldMetadata$6), acc);
         case "vatNumber":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$7[country2], {
             vatNumberType
@@ -30439,6 +30418,32 @@ function CompanyOtherDetails({
       }
     }, initialFormUtilsProps);
   }, [companyType2, country2, initialFormUtilsProps, registrationNumberType, taxIdNumberType, vatNumberType]);
+  const getFormSchema2 = useCallback$1((currentData) => {
+    var _a2;
+    const fieldsToRemove = [];
+    if (currentData.sameNameAsLegalName) {
+      fieldsToRemove.push("tradingName");
+    }
+    if (currentData.exemptedFromVat) {
+      fieldsToRemove.push("vatNumber");
+    } else {
+      fieldsToRemove.push("exemptedFromVat", "vatAbsenceReason");
+    }
+    if (currentData.exemptedFromTax) {
+      fieldsToRemove.push("taxInformation");
+    } else {
+      fieldsToRemove.push("exemptedFromTax");
+    }
+    if (currentData.isUen) {
+      fieldsToRemove.push("taxInformation", "exemptedFromTax");
+    }
+    if (currentData.exemptedFromRegistrationNumber) {
+      fieldsToRemove.push("registrationNumber");
+    } else {
+      fieldsToRemove.push("exemptedFromRegistrationNumber");
+    }
+    return ((_a2 = initialFormUtilsProps.requiredFields) == null ? void 0 : _a2.filter((field) => !fieldsToRemove.includes(field))) ?? TRADING_NAME_FIELD;
+  }, [initialFormUtilsProps.requiredFields]);
   const {
     schema: formSchema,
     data: formData,
@@ -30447,7 +30452,7 @@ function CompanyOtherDetails({
     fieldProblems: formFieldProblems,
     handleChangeFor
   } = useForm({
-    schema: (currentData) => !currentData.exemptedFromVat ? (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatAbsenceReason")) ?? directChildFields : (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatNumber")) ?? directChildFields,
+    schema: getFormSchema2,
     defaultData: data,
     rules: mergedFieldProps == null ? void 0 : mergedFieldProps.validators,
     optionalFields: mergedFieldProps == null ? void 0 : mergedFieldProps.optionalFields,
@@ -30681,10 +30686,10 @@ const formatDataForSummary = (data, forms2, labels2, i18n) => {
   var _a;
   const datasetUtils = datasetUtilities(i18n.locale);
   const country2 = (_a = data.companyBasics) == null ? void 0 : _a.country;
-  const taxIdLabel = resolveFieldMetadata(defaultFieldConfig$1[country2], {
+  const taxIdLabel = resolveFieldMetadata(defaultFieldConfig$6[country2], {
     taxIdNumberType: countryToTaxInfoTypeMap[country2],
     companyType: void 0
-  }, defaultFieldMetadata$1).label;
+  }, defaultFieldMetadata$6).label;
   return entriesOf(data).reduce((summaryData, [form, formData]) => {
     var _a2, _b, _c, _d, _e, _f, _g, _h, _i, _j;
     if (!form) return summaryData;
@@ -36843,7 +36848,7 @@ function SolePropDropinComponent({
   };
   const isCountryOfGoverningLawEnabled = isExperimentEnabled("EnableCountryOfGoverningLawForUKCompanies");
   const formatDataForSummary2 = (data2, forms22) => {
-    var _a2, _b2, _c, _d, _e;
+    var _a2, _b2, _c, _d, _e, _f;
     let summaryData = cloneObject(data2);
     if (isCountryOfGoverningLawEnabled) {
       summaryData.solePropNameAndCountry = getUpdatedCountryOfGoverningLaw(summaryData.solePropNameAndCountry);
@@ -36854,11 +36859,21 @@ function SolePropDropinComponent({
       countryRegionOfEstablishment: solePropCountry,
       countryOfGoverningLaw: ((_c = summaryData.solePropNameAndCountry) == null ? void 0 : _c.countryOfGoverningLaw) && datasetUtils.getCountryName(summaryData.solePropNameAndCountry.countryOfGoverningLaw)
     };
-    if ((_d = summaryData.solePropRegistrationAddress) == null ? void 0 : _d.registrationAddress) {
+    if ((_d = summaryData.companyRegistrationDetails) == null ? void 0 : _d.taxInformation) {
+      const taxInformation = summaryData.companyRegistrationDetails.taxInformation.find((taxId2) => {
+        var _a3;
+        return taxId2.country === ((_a3 = data2.solePropNameAndCountry) == null ? void 0 : _a3.country);
+      });
+      if (taxInformation) {
+        summaryData.companyRegistrationDetails[taxInformation.type] = taxInformation.number;
+      }
+      delete summaryData.companyRegistrationDetails.taxInformation;
+    }
+    if ((_e = summaryData.solePropRegistrationAddress) == null ? void 0 : _e.registrationAddress) {
       summaryData.solePropRegistrationAddress.hasInnerForms = true;
       summaryData.solePropRegistrationAddress.registrationAddress = mapAddressLabels(summaryData.solePropRegistrationAddress.registrationAddress, datasetUtils);
     }
-    if ((_e = summaryData.solePropRegistrationAddress) == null ? void 0 : _e.operationalAddress) {
+    if ((_f = summaryData.solePropRegistrationAddress) == null ? void 0 : _f.operationalAddress) {
       summaryData.solePropRegistrationAddress.operationalAddress = mapAddressLabels(summaryData.solePropRegistrationAddress.operationalAddress, datasetUtils);
     }
     if (isDocumentsRequired(forms22)) {
@@ -41096,7 +41111,7 @@ const ConfigurationApiProvider = ({
     isEmbeddedDropin,
     loadingContext
   } = authContext;
-  const sdkVersion = "2.49.0";
+  const sdkVersion = "2.49.1";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,