@adyen/kyc-components 2.8.1 → 2.9.0

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

@@ -1,5 +1,5 @@
 import { useContext, useState, useCallback, useEffect, useMemo, useReducer, useLayoutEffect, useRef as useRef$1, useId as useId$1 } from "preact/hooks";
-import { createContext, createElement, toChildArray, render } from "preact";
+import { createContext, createElement, render } from "preact";
 import sanitizeHtml from "sanitize-html";
 import cx from "classnames";
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
@@ -28,6 +28,7 @@ const postalCode = "Postal code";
 const city = "City";
 const cityTown = "City / Town";
 const state = "State";
+const region = "Region";
 const provinceOrTerritory = "Province or territory";
 const selectProvinceOrTerritory = "Select a province or territory";
 const zipCode = "ZIP code";
@@ -72,8 +73,11 @@ const codNumericPersonal = "Cod Numeric Personal (CNP)";
 const cadastroDePessoasFisicas = "Cadastro de Pessoas Físicas (CFP)";
 const invalidFormatExpects = "Invalid format. Expected format: %{format}";
 const invalidFormatForAuPassportNumber = "This isn't a valid Australian passport number. Expected format: 1-2 letters followed by 7 numbers.";
+const invalidFormatForNZPassportNumber = "Expected format should be 8-9 alphanumeric characters. For example: PA094043.";
 const invalidFormatForAuDriversLicenseNumber = "This isn't a valid Australian driver's license number. Expected format: 6-11 alphanumeric characters.";
+const invalidFormatForNZDriversLicenseNumber = "Expected format should be: 2 characters, followed by 6 digits";
 const invalidFormatForAuDriversLicenseCardNumber = "This isn't a valid Australian driver's license card number. Expected format: 6-10 alphanumeric characters.";
+const invalidFormatForNZDriversLicenseCardNumber = "Expected format should be: 3 digits";
 const invalidFormatForAuProofOfIdentityCardNumber = "This isn't a valid Australian proof of identity card number. Expected format: 6-10 alphanumeric characters.";
 const invalidFormatForHKPassportNumber = "Not valid for HK. Format should be: 9-character alphanumeric. For example: K12345599";
 const invalidFormatForHKDriversLicenseNumber = "Not valid for HK. Format should be: 8-character alphanumeric. For example: A1234567";
@@ -108,6 +112,7 @@ const issuerState = "Issuing state";
 const licenseNumber = "Driver license number";
 const driverLicense = "Driver License";
 const licenseCardNumber = "Card number";
+const licenceVersionNumber = "Licence version number";
 const documents = "Documents";
 const idDocument$1 = "ID Document";
 const documentType = "Document type";
@@ -427,7 +432,7 @@ const irdDocument = "IRD document";
 const irdNumber = "IRD number";
 const australianBusinessNumberAbn = "Australian business number (ABN)";
 const australianBusinessNumberAcn = "Australian company number (ACN)";
-const companyNumber__NZ = "New Zealand Business Number (NZBN) / Company Number (NCN)";
+const NZBN = "New Zealand Business Number (NZBN)";
 const enterpriseNumber = "Enterprise Number";
 const NIP = "NIP (Numer identyfikacji podatkowej)";
 const NIPC = "NIPC (Número de Identificação de Pessoa Colectiva)";
@@ -476,12 +481,16 @@ const updateTheInformation = "Update the information";
 const andResubmit = "and submit again.";
 const someFieldsHaveUnsupportedFormatedUpdateInfoAndResubmit = "Some fields have unsupported formats. Update the information and submit again.";
 const trustType = "Type of trust agreement";
+const businessTrust = "Business trust";
 const cashManagementTrust = "Cash management trust";
+const charitableTrust = "Charitable trust";
 const corporateUnitTrust = "Corporate unit trust";
 const deceasedEstate = "Deceased estate";
 const discretionaryInvestmentTrust = "Discretionary investment trust";
 const discretionaryServicesManagementTrust = "Discretionary services management trust";
 const discretionaryTradingTrust = "Discretionary trading trust";
+const discretionaryTrust = "Discretionary trust";
+const familyTrust = "Family trust";
 const firstHomeSaverAccountsTrust = "First home saver accounts trust";
 const fixedTrust = "Fixed trust";
 const fixedUnitTrust = "Fixed unit trust";
@@ -1003,6 +1012,7 @@ const remediationMessage_3_100 = "Check the above information, then click here t
 const sameNameAsLegalName = "Same as legal name of the company";
 const whereCanIFindTheseNumbersOnMyDriversLicense = "Where can I find these numbers on my driver's license?";
 const whereToFindNumbersOnDriversLicense = "Depending on the issuing state the position of these numbers might differ, but the license number is always on the front side of the card and the card number is in most cases located on the back of the license.";
+const whereToFindNumbersOnDriversLicense__NZ = "The license number and version number are always on the front side of the card.";
 const iStillCantFindIt = "I still can't find it.";
 const patriotActDisclosureTitle = "Important Information You Need to Know About Opening An Account";
 const patriotActDisclosureTextParagraph1 = "To help the government fight the funding of terrorism and money laundering activities, Federal law requires financial institutions to obtain, verify, and record information that identifies each person (individual or entity) who opens an account and certain individuals who are associated with an account.";
@@ -1072,6 +1082,7 @@ const defaultTrans = {
   city,
   cityTown,
   state,
+  region,
   provinceOrTerritory,
   selectProvinceOrTerritory,
   zipCode,
@@ -1116,8 +1127,11 @@ const defaultTrans = {
   cadastroDePessoasFisicas,
   invalidFormatExpects,
   invalidFormatForAuPassportNumber,
+  invalidFormatForNZPassportNumber,
   invalidFormatForAuDriversLicenseNumber,
+  invalidFormatForNZDriversLicenseNumber,
   invalidFormatForAuDriversLicenseCardNumber,
+  invalidFormatForNZDriversLicenseCardNumber,
   invalidFormatForAuProofOfIdentityCardNumber,
   invalidFormatForHKPassportNumber,
   invalidFormatForHKDriversLicenseNumber,
@@ -1152,6 +1166,7 @@ const defaultTrans = {
   licenseNumber,
   driverLicense,
   licenseCardNumber,
+  licenceVersionNumber,
   documents,
   idDocument: idDocument$1,
   documentType,
@@ -1471,7 +1486,8 @@ const defaultTrans = {
   irdNumber,
   australianBusinessNumberAbn,
   australianBusinessNumberAcn,
-  companyNumber__NZ,
+  "NZBN/NCN": "New Zealand Business Number (NZBN) / Company Number (NCN)",
+  NZBN,
   enterpriseNumber,
   NIP,
   NIPC,
@@ -1524,12 +1540,16 @@ const defaultTrans = {
   andResubmit,
   someFieldsHaveUnsupportedFormatedUpdateInfoAndResubmit,
   trustType,
+  businessTrust,
   cashManagementTrust,
+  charitableTrust,
   corporateUnitTrust,
   deceasedEstate,
   discretionaryInvestmentTrust,
   discretionaryServicesManagementTrust,
   discretionaryTradingTrust,
+  discretionaryTrust,
+  familyTrust,
   firstHomeSaverAccountsTrust,
   fixedTrust,
   fixedUnitTrust,
@@ -2063,6 +2083,7 @@ const defaultTrans = {
   sameNameAsLegalName,
   whereCanIFindTheseNumbersOnMyDriversLicense,
   whereToFindNumbersOnDriversLicense,
+  whereToFindNumbersOnDriversLicense__NZ,
   iStillCantFindIt,
   patriotActDisclosureTitle,
   patriotActDisclosureTextParagraph1,
@@ -4431,6 +4452,13 @@ const businessRegistrationNumberPatterns = {
         x: 9,
         y: 13
       }
+    },
+    [CompanyTypesValue.SOLE_PROPRIETORSHIP]: {
+      regex: /^\d{13}$/,
+      format: "Xdigits",
+      values: {
+        digits: 13
+      }
     }
   },
   [CountryCodes.Norway]: {
@@ -4565,6 +4593,22 @@ const CountryIdNumberPatterns = {
   [CountryCodes.UnitedStates]: /^\d{4}$/,
   US9: /^\d{9}$/
 };
+const DriversLicenseCardNumberPatterns = {
+  [CountryCodes.NewZealand]: /^[\d]{3}$/
+};
+const DriversLicenseNumberPatterns = {
+  [CountryCodes.Australia]: /^[A-Za-z\d]{6,11}$/,
+  [CountryCodes.HongKong]: /^[A-Z]{1}[A-Z0-9]{7}$/,
+  [CountryCodes.NewZealand]: /^[A-Za-z]{2}[\d]{6}$/
+};
+const PassportNumberPatterns = {
+  [CountryCodes.Australia]: /^[A-Z]{1,2}\d{7}$/,
+  [CountryCodes.HongKong]: /^(?=.{9}$)[A-Z]{1,2}\d{6}[A-Z0-9]{1,2}$/
+};
+const ProofOfIdentityCardPatterns = {
+  [CountryCodes.Australia]: /^[A-Za-z\d]{6,10}$/,
+  [CountryCodes.HongKong]: /^[A-Z]{1,2}[0-9]{6}[0-9A]$/
+};
 const vatSpecsPerCountry = {
   /* EUROPE: EU */
   [CountryCodes.Austria]: {
@@ -7399,6 +7443,44 @@ var SettingNames = /* @__PURE__ */ ((SettingNames2) => {
   SettingNames2["RequirePciSignPosMoto"] = "requirePciSignPosMoto";
   return SettingNames2;
 })(SettingNames || {});
+function useGlobalData() {
+  const {
+    getData
+  } = useStateContext();
+  return getData();
+}
+function useGlobalDataSlice(sliceId, caller) {
+  const {
+    dispatch,
+    getData
+  } = useStateContext();
+  const sliceData = getData()[sliceId];
+  const updateState = useCallback((updatedSlice) => dispatch({
+    type: "addToState",
+    value: {
+      ...updatedSlice,
+      dataStoreId: sliceId,
+      caller
+    }
+    // TODO merge SFValue and StateSlice types
+  }), [sliceId, caller]);
+  const updateStateSlice = useMemo(() => debounce(updateState, ON_CHANGE_DEBOUNCE_DURATION), [updateState]);
+  return {
+    sliceData,
+    updateStateSlice
+  };
+}
+function useResetGlobalData(caller) {
+  const {
+    dispatch
+  } = useStateContext();
+  return useCallback(() => dispatch({
+    type: "resetState",
+    value: {
+      caller
+    }
+  }), [dispatch, caller]);
+}
 function useDataset(datasetIdentifier2, skip) {
   const {
     i18n
@@ -7477,15 +7559,17 @@ function datasetUtilities(locale) {
   };
 }
 const logger$j = createLogger("CountryField");
+const COUNTRY_FIELD = "country";
 function CountryField({
-  allowedCountries = [],
-  classNameModifiers = [],
-  errorMessage,
-  onDropdownChange,
-  value,
-  readOnly,
+  data,
+  valid,
+  error,
   label,
-  helperText
+  readonly,
+  handleChangeFor,
+  helperText,
+  allowedCountries = [],
+  classNameModifiers = []
 }) {
   const {
     i18n
@@ -7503,100 +7587,76 @@ function CountryField({
     ...item,
     sprite: `#adl-flag-${item.id.toLowerCase()}`
   }));
+  const handleCompanyChangeFor = useCallback((e) => {
+    const {
+      value
+    } = e.target;
+    handleChangeFor(COUNTRY_FIELD)(value);
+  }, [handleChangeFor]);
   return jsx(Field, {
-    name: "country",
-    label: label || i18n.get("country"),
-    errorMessage,
+    name: COUNTRY_FIELD,
+    label: label || i18n.get(COUNTRY_FIELD),
+    errorMessage: error,
     classNameModifiers,
-    isValid: !!value,
+    isValid: valid,
     helper: helperText,
     children: (childProps) => jsx(Select, {
       ...childProps,
-      onChange: onDropdownChange,
-      name: "country",
+      name: COUNTRY_FIELD,
       placeholder: i18n.get("selectCountry"),
-      selected: value,
+      selected: data,
       items: countries,
-      readonly: (countries.length === 1 || readOnly) && !!value
+      readonly: (countries.length === 1 || readonly) && !!data,
+      onChange: handleCompanyChangeFor
     })
   });
 }
-const companyNameValidatorRules = {
-  legalCompanyName: {
-    modes: ["blur"],
-    validate: (legalCompanyName2) => !isEmpty(legalCompanyName2),
-    errorMessage: "fieldIsRequired"
-  }
-};
-const legalCompanyNameFields = ["legalCompanyName"];
-function LegalCompanyName(props) {
+const LEGAL_COMPANY_NAME_FIELD = "legalCompanyName";
+function LegalCompanyNameField({
+  country: country2,
+  data,
+  valid,
+  error,
+  label,
+  readonly,
+  handleChangeFor
+}) {
   const {
     i18n
   } = useI18nContext();
-  const {
-    dataStoreId,
-    requiredFields,
-    country: country2
-  } = props;
-  const schema = requiredFields || ["legalCompanyName"];
-  const stateRef = useRef$1({
-    setState: null
-  });
-  const {
-    handleChangeFor,
-    data,
-    valid,
-    errors,
-    isValid,
-    fieldProblems
-  } = useForm({
-    ...props,
-    schema,
-    rules: props.validators || companyNameValidatorRules,
-    defaultData: props.data,
-    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
-  });
-  useEffect(() => {
-    var _a, _b;
-    (_b = (_a = stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
-      type: "addToState",
-      value: {
-        data,
-        valid,
-        errors,
-        fieldProblems,
-        caller: "legalCompanyName",
-        dataStoreId
-      }
-    });
-  }, [data, valid, errors, isValid]);
-  const formUtils = formUtilities(props, i18n);
-  return !formUtils.isRequiredField("legalCompanyName") ? null : jsxs("div", {
-    className: "adyen-kyc-field__legal-company-name",
-    children: [jsx(StateContextSetter, {
-      stateRef
-    }), jsx(Field, {
-      name: "legalCompanyName",
-      label: formUtils.getLabel("legalCompanyName"),
-      helper: i18n.get("legalCompanyNameHelper", {
-        localizeFor: country2
-      }),
-      classNameModifiers: ["legalCompanyName"],
-      errorMessage: formUtils.getErrorMessage("legalCompanyName", errors, fieldProblems),
-      isValid: valid.legalCompanyName,
-      children: (childProps) => jsx(InputText, {
-        ...childProps,
-        name: "legalCompanyName",
-        value: data.legalCompanyName,
-        readonly: formUtils.isReadOnly("legalCompanyName"),
-        classNameModifiers: ["legalCompanyName"],
-        onInput: handleChangeFor("legalCompanyName", "input"),
-        onBlur: handleChangeFor("legalCompanyName", "blur"),
-        "aria-required": true,
-        "aria-label": formUtils.getLabel("legalCompanyName"),
-        "aria-invalid": !valid.legalCompanyName
-      })
-    })]
+  const handleLegalCompanyNameInput = useCallback((e) => {
+    const {
+      value
+    } = e.target;
+    handleChangeFor(LEGAL_COMPANY_NAME_FIELD, "input")(value);
+  }, [handleChangeFor]);
+  const handleLegalCompanyNameBlur = useCallback((e) => {
+    const {
+      value
+    } = e.target;
+    handleChangeFor(LEGAL_COMPANY_NAME_FIELD, "blur")(value);
+  }, [handleChangeFor]);
+  return jsx(Field, {
+    name: LEGAL_COMPANY_NAME_FIELD,
+    label,
+    helper: i18n.get("legalCompanyNameHelper", {
+      localizeFor: country2
+    }),
+    classNameModifiers: [LEGAL_COMPANY_NAME_FIELD],
+    errorMessage: error,
+    isValid: valid,
+    children: (childProps) => jsx(InputText, {
+      ...childProps,
+      "aria-required": true,
+      "aria-label": label,
+      "aria-invalid": !valid,
+      name: LEGAL_COMPANY_NAME_FIELD,
+      value: data,
+      readonly,
+      classNameModifiers: [LEGAL_COMPANY_NAME_FIELD],
+      onInput: handleLegalCompanyNameInput,
+      onBlur: handleLegalCompanyNameBlur
+    })
   });
 }
 const Disclaimer$1 = "";
@@ -7627,90 +7687,96 @@ const PatriotActDisclosure = () => {
   });
 };
 const companyCountryValidationRules = {
-  companyCountry: {
+  country: {
     modes: ["blur"],
     validate: (companyCountry2) => !isEmpty(companyCountry2),
     errorMessage: "fieldIsRequired"
+  },
+  legalCompanyName: {
+    modes: ["blur"],
+    validate: (legalCompanyName2) => !isEmpty(legalCompanyName2),
+    errorMessage: "fieldIsRequired"
   }
 };
-const companyNameAndCountryFields = ["companyCountry", "legalCompanyName"];
-function CompanyNameAndCountryComponent(props) {
+const companyNameAndCountryFields = [LEGAL_COMPANY_NAME_FIELD, COUNTRY_FIELD];
+function CompanyNameAndCountry(props) {
   const {
     i18n
   } = useI18nContext();
   const {
     isSettingEnabled
   } = useSettingsContext();
-  const COMPANY_NAME_AND_COUNTRY = props.id;
-  const schema = ["companyCountry"];
-  const stateRef = useRef$1({
-    setState: null
-  });
-  const isAllowedEditPrefilledCountry = isSettingEnabled(SettingNames.AllowPrefilledCountryEdit);
-  const requiredFieldsByFlow = companyNameAndCountryFields;
   const {
-    handleChangeFor,
-    data,
-    valid,
-    errors,
-    isValid,
-    fieldProblems
+    id: id2
+  } = props;
+  const {
+    sliceData,
+    updateStateSlice
+  } = useGlobalDataSlice(id2);
+  const {
+    data: formData,
+    valid: formValid,
+    errors: formErrors,
+    fieldProblems: formFieldProblems,
+    handleChangeFor
   } = useForm({
     ...props,
-    schema,
-    defaultData: props.data,
-    rules: props.validators || companyCountryValidationRules,
+    schema: companyNameAndCountryFields,
+    defaultData: props == null ? void 0 : props.data,
+    rules: (props == null ? void 0 : props.validators) || companyCountryValidationRules,
     fieldProblems: props == null ? void 0 : props.fieldValidationErrors
   });
   const formUtils = formUtilities(props, i18n);
+  const isAllowedEditPrefilledCountry = isSettingEnabled(SettingNames.AllowPrefilledCountryEdit);
   useEffect(() => {
-    var _a, _b;
-    (_b = (_a = stateRef.current).setState) == null ? void 0 : _b.call(_a, {
-      type: "addToState",
-      value: {
-        data,
-        valid,
-        errors,
-        fieldProblems,
-        caller: COMPANY_NAME_AND_COUNTRY,
-        dataStoreId: COMPANY_NAME_AND_COUNTRY,
-        schema: requiredFieldsByFlow
-      }
+    updateStateSlice == null ? void 0 : updateStateSlice({
+      data: {
+        ...sliceData,
+        ...formData
+      },
+      errors: formErrors,
+      valid: formValid,
+      fieldProblems: formFieldProblems
     });
-  }, [data, valid, errors, isValid]);
-  const legalCompanyNameProps = getFieldProps(props, legalCompanyNameFields);
-  return jsxs("div", {
-    children: [jsx(StateContextSetter, {
-      owner: COMPANY_NAME_AND_COUNTRY,
-      stateRef
-    }), jsx(FormHeader, {
-      heading: props.heading
+  }, [formData, formErrors, formFieldProblems, formValid, updateStateSlice]);
+  return jsxs("form", {
+    children: [jsx(FormHeader, {
+      heading: props == null ? void 0 : props.heading
     }), jsx(ErrorPanel, {
       verificationErrors: props == null ? void 0 : props.formVerificationErrors,
       validationErrors: props == null ? void 0 : props.fieldValidationErrors,
       formUtils,
       id: "ariaErrorField"
-    }), data.companyCountry === "US" ? jsx(PatriotActDisclosure, {}) : void 0, formUtils.isRequiredField("companyCountry") && jsx(CountryField, {
-      label: formUtils.getLabel("companyCountry"),
+    }), formData.country === "US" ? jsx(PatriotActDisclosure, {}) : void 0, formUtils.isRequiredField(COUNTRY_FIELD) && jsx(CountryField, {
+      data: formData.country,
+      valid: formValid.country,
+      error: formUtils.getErrorMessage(COUNTRY_FIELD, formErrors, formFieldProblems),
+      label: formUtils.getLabel(COUNTRY_FIELD),
+      readonly: !isAllowedEditPrefilledCountry || Boolean(props == null ? void 0 : props.disableCountry),
+      classNameModifiers: [COUNTRY_FIELD],
       allowedCountries: [],
-      classNameModifiers: ["country"],
-      errorMessage: formUtils.getErrorMessage("companyCountry", errors, fieldProblems),
-      onDropdownChange: handleChangeFor("companyCountry"),
-      value: data.companyCountry,
-      readOnly: !isAllowedEditPrefilledCountry || props.disableCountry
-    }), formUtils.isRequiredField("legalCompanyName") && jsx(LegalCompanyName, {
-      ...legalCompanyNameProps,
-      dataStoreId: COMPANY_NAME_AND_COUNTRY,
-      country: data.companyCountry
+      handleChangeFor
+    }), formUtils.isRequiredField(LEGAL_COMPANY_NAME_FIELD) && jsx(LegalCompanyNameField, {
+      data: formData.legalCompanyName,
+      country: formData.country,
+      valid: formValid.legalCompanyName,
+      error: formUtils.getErrorMessage(LEGAL_COMPANY_NAME_FIELD, formErrors, formFieldProblems),
+      label: formUtils.getLabel(LEGAL_COMPANY_NAME_FIELD),
+      readonly: formUtils.isReadOnly(LEGAL_COMPANY_NAME_FIELD),
+      handleChangeFor
     })]
   });
 }
+const CompanyNameAndCountryComponent = memo(CompanyNameAndCountry, (prevProps, nextProps) => {
+  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;
+});
 const CompanyTypeComponent$1 = "";
 const companyBase = {
   accountHolder: {
     rule: "accountHolderIfCustomer"
   },
-  companyCountry: {
+  country: {
     rule: "REQUIRED"
   },
   entityType: {
@@ -8205,16 +8271,13 @@ const countryConfig$4 = {
       label: "irdDocument"
     },
     registrationNumber: {
-      label: "companyNumber__NZ"
+      label: "NZBN"
     },
     taxId: {
       label: "IRD"
     },
     exemptedFromVat: {
       label: "vatNumberExempted"
-    },
-    vatNumber: {
-      label: "irdNumber"
     }
   },
   [CountryCodes.Norway]: {
@@ -8537,12 +8600,15 @@ var TaskStatus = /* @__PURE__ */ ((TaskStatus2) => {
   TaskStatus2[TaskStatus2["REMOVING"] = 9] = "REMOVING";
   return TaskStatus2;
 })(TaskStatus || {});
-const SOLE_PROP_COUNTRIES = [CountryCodes.Austria, CountryCodes.Australia, CountryCodes.Belgium, CountryCodes.Bulgaria, CountryCodes.Canada, CountryCodes.Croatia, CountryCodes.Cyprus, CountryCodes.CzechRepublic, CountryCodes.Denmark, CountryCodes.Estonia, CountryCodes.Finland, CountryCodes.France, CountryCodes.Germany, CountryCodes.Gibraltar, CountryCodes.Greece, CountryCodes.Guernsey, CountryCodes.HongKong, CountryCodes.Hungary, CountryCodes.Ireland, CountryCodes.IsleOfMan, CountryCodes.Italy, CountryCodes.Jersey, CountryCodes.Latvia, CountryCodes.Liechtenstein, CountryCodes.Lithuania, CountryCodes.Luxembourg, CountryCodes.Malta, CountryCodes.Monaco, CountryCodes.Netherlands, CountryCodes.Norway, CountryCodes.Poland, CountryCodes.Portugal, CountryCodes.PuertoRico, CountryCodes.Romania, CountryCodes.Singapore, CountryCodes.Slovakia, CountryCodes.Slovenia, CountryCodes.Spain, CountryCodes.Sweden, CountryCodes.Switzerland, CountryCodes.UnitedKingdom, CountryCodes.UnitedStates];
+const SOLE_PROP_COUNTRIES = [CountryCodes.Austria, CountryCodes.Australia, CountryCodes.Belgium, CountryCodes.Bulgaria, CountryCodes.Canada, CountryCodes.Croatia, CountryCodes.Cyprus, CountryCodes.CzechRepublic, CountryCodes.Denmark, CountryCodes.Estonia, CountryCodes.Finland, CountryCodes.France, CountryCodes.Germany, CountryCodes.Gibraltar, CountryCodes.Greece, CountryCodes.Guernsey, CountryCodes.HongKong, CountryCodes.Hungary, CountryCodes.Ireland, CountryCodes.IsleOfMan, CountryCodes.Italy, CountryCodes.Jersey, CountryCodes.Latvia, CountryCodes.Liechtenstein, CountryCodes.Lithuania, CountryCodes.Luxembourg, CountryCodes.Malta, CountryCodes.Monaco, CountryCodes.Netherlands, CountryCodes.NewZealand, CountryCodes.Norway, CountryCodes.Poland, CountryCodes.Portugal, CountryCodes.PuertoRico, CountryCodes.Romania, CountryCodes.Singapore, CountryCodes.Slovakia, CountryCodes.Slovenia, CountryCodes.Spain, CountryCodes.Sweden, CountryCodes.Switzerland, CountryCodes.UnitedKingdom, CountryCodes.UnitedStates];
 const ID_NUMBER_EXEMPT_COUNTRIES = [CountryCodes.Canada, CountryCodes.UnitedStates];
 const ID_NUMBER_VERIFICATION_COUNTRIES = [CountryCodes.UnitedStates];
 const COUNTRIES_WHICH_USE_MULTIPLE_IDENTITY_TYPES = [CountryCodes.HongKong, CountryCodes.Australia];
-const ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES = [CountryCodes.Singapore];
+const ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES = [CountryCodes.Singapore, CountryCodes.NewZealand];
 const NATIONALITY_REQUIRED_FOR_COUNTRIES = [CountryCodes.Singapore];
+const CONTACTS_REQUIRED_FOR_COUNTRIES = [CountryCodes.NewZealand];
+const JOB_TITLE_REQUIRED_FOR_COUNTRIES = [CountryCodes.NewZealand];
+const ISSUER_REQUIRED_FOR_COUNTRIES = [CountryCodes.Australia];
 const rules$2 = ({
   data,
   country: country2,
@@ -8584,19 +8650,25 @@ const rules$2 = ({
     }
   },
   contactsIfRequiredForRole: () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     if (!((_a = data.personalDetails) == null ? void 0 : _a.role)) {
       return "REQUIRED";
     }
     if ((_c = (_b = data.personalDetails) == null ? void 0 : _b.role) == null ? void 0 : _c.includes(DecisionMakerType.SIGNATORY)) {
       return "REQUIRED";
     }
+    if (CONTACTS_REQUIRED_FOR_COUNTRIES.includes((_d = data.personalDetails) == null ? void 0 : _d.residencyCountry)) {
+      return "REQUIRED";
+    }
   },
   jobTitleIfRequiredForRole: () => {
     var _a, _b;
     if ((_b = (_a = data.personalDetails) == null ? void 0 : _a.role) == null ? void 0 : _b.some((role2) => role2 === DecisionMakerType.SIGNATORY || role2 === DecisionMakerType.CONTROLLING_PERSON)) {
       return "REQUIRED";
     }
+    if (JOB_TITLE_REQUIRED_FOR_COUNTRIES.includes(country2)) {
+      return "REQUIRED";
+    }
   },
   nationalityIfRequiredForRole: () => {
     var _a;
@@ -8620,6 +8692,12 @@ const rules$2 = ({
       return "REQUIRED";
     }
   },
+  issuerStateRequired: () => {
+    var _a;
+    if (((_a = data.personalDetails) == null ? void 0 : _a.typeOfIdentity) === "driversLicense" && ISSUER_REQUIRED_FOR_COUNTRIES.includes(country2)) {
+      return "REQUIRED";
+    }
+  },
   isVerificationAllowedForCountry: () => ID_NUMBER_VERIFICATION_COUNTRIES.includes(country2)
 });
 const accountHolderValidationRules = {
@@ -9589,7 +9667,7 @@ function ListItem({
 const Address$1 = "";
 const ADDRESS_SCHEMA = ["street", "houseNumberOrName", "postalCode", "city", "stateOrProvince", "country"];
 const [STREET, HOUSE_NUMBER, POSTAL_CODE, CITY, STATE, COUNTRY] = ADDRESS_SCHEMA;
-const COUNTRIES_WITH_STATES_DATASET = [CountryCodes.Australia, CountryCodes.Brazil, CountryCodes.Canada, CountryCodes.UnitedStates];
+const COUNTRIES_WITH_STATES_DATASET = [CountryCodes.Australia, CountryCodes.Brazil, CountryCodes.Canada, CountryCodes.NewZealand, CountryCodes.UnitedStates];
 const COUNTRIES_WITH_OPTIONAL_HOUSE_NUMBER = [CountryCodes.Canada, CountryCodes.UnitedKingdom, CountryCodes.UnitedStates];
 const ADDRESS_SCHEMAS = {
   [CountryCodes.Australia]: [COUNTRY, STREET, HOUSE_NUMBER, CITY, STATE, POSTAL_CODE],
@@ -9622,6 +9700,7 @@ const LABELS = {
     [CountryCodes.Australia]: "state",
     [CountryCodes.Brazil]: "state",
     [CountryCodes.Canada]: "provinceOrTerritory",
+    [CountryCodes.NewZealand]: "region",
     [CountryCodes.UnitedStates]: "state"
   },
   stateOrProvincePlaceholder: {
@@ -9668,15 +9747,17 @@ const mapAddressLabels = (data, datasetUtils) => {
   }
   return data;
 };
-function StateField(props) {
-  const {
-    classNameModifiers,
-    selectedCountry,
-    onDropdownChange,
-    value,
-    readOnly,
-    errorMessage
-  } = props;
+const STATE_FIELD = "stateOrProvince";
+function StateField({
+  data,
+  valid,
+  error,
+  label,
+  readonly,
+  handleChangeFor,
+  selectedCountry,
+  classNameModifiers = []
+}) {
   const {
     i18n
   } = useI18nContext();
@@ -9684,24 +9765,30 @@ function StateField(props) {
     dataset: states,
     loaded
   } = useDataset(datasetIdentifier.state(selectedCountry), !selectedCountry || !COUNTRIES_WITH_STATES_DATASET.includes(selectedCountry));
-  const labelKey = getKeyForField("stateOrProvince", selectedCountry);
+  const handleStateChangeFor = useCallback((e) => {
+    const {
+      value
+    } = e.target;
+    handleChangeFor(STATE_FIELD)(value);
+  }, [handleChangeFor]);
+  const labelKey = getKeyForField(STATE_FIELD, selectedCountry);
   const placeholderKey = getKeyForField("stateOrProvincePlaceholder", selectedCountry);
   if (!loaded || !states.length)
     return null;
   return jsx(Field, {
-    name: "stateOrProvince",
-    label: i18n.get(labelKey),
+    name: STATE_FIELD,
+    label: label || i18n.get(labelKey),
     classNameModifiers,
-    errorMessage,
-    isValid: !!value,
+    errorMessage: error,
+    isValid: valid,
     children: (childProps) => jsx(Select, {
       ...childProps,
-      name: "stateOrProvince",
-      onChange: onDropdownChange,
-      selected: value,
+      name: STATE_FIELD,
+      selected: data,
       placeholder: i18n.get(placeholderKey),
       items: states,
-      readonly: readOnly && !!value
+      readonly: readonly && !!data,
+      onChange: handleStateChangeFor
     })
   });
 }
@@ -9716,13 +9803,11 @@ function FieldContainer(props) {
     errors,
     fieldProblems,
     fieldName,
-    onInput,
-    onBlur,
     trimOnBlur,
     allowedCountries,
-    onDropdownChange,
     hideField,
-    maxlength
+    maxlength,
+    handleChangeFor
   } = props;
   const formUtils = formUtilities(props, i18n);
   const errorMessage = formUtils.getErrorMessage(fieldName, errors, fieldProblems);
@@ -9732,20 +9817,26 @@ function FieldContainer(props) {
     switch (field) {
       case "country":
         return jsx(CountryField, {
+          data: value,
+          valid: valid == null ? void 0 : valid.country,
+          error: errorMessage,
+          label: formUtils.getLabel(field),
+          readonly: formUtils.isReadOnly(field),
           classNameModifiers,
           allowedCountries,
-          errorMessage,
-          onDropdownChange,
-          value,
-          className: hideField ? "adl-u-display-none" : ""
+          className: hideField ? "adl-u-display-none" : "",
+          handleChangeFor
         });
       case "stateOrProvince":
         return jsx(StateField, {
+          data: value,
+          valid: valid == null ? void 0 : valid.stateOrProvince,
+          error: errorMessage,
+          label: formUtils.getLabel(field),
+          readonly: formUtils.isReadOnly(field),
           classNameModifiers,
           selectedCountry: data.country,
-          errorMessage,
-          onDropdownChange,
-          value
+          handleChangeFor
         });
       default:
         return jsx(Field, {
@@ -9759,8 +9850,8 @@ function FieldContainer(props) {
             classNameModifiers,
             name: field,
             value: field === "postalCode" ? value == null ? void 0 : value.toUpperCase() : value,
-            onInput,
-            onBlur,
+            onInput: handleChangeFor(fieldName, "input"),
+            onBlur: handleChangeFor(fieldName, "blur"),
             maxLength: maxlength,
             "aria-required": true,
             "aria-label": props == null ? void 0 : props["aria-label"],
@@ -10442,9 +10533,7 @@ function Address(props) {
       errors,
       fieldProblems,
       fieldName,
-      onInput: handleChangeFor(fieldName, "input"),
-      onBlur: handleChangeFor(fieldName, "blur"),
-      onDropdownChange: handleChangeFor(fieldName, "blur"),
+      handleChangeFor,
       maxlength: getMaxLengthByFieldAndCountry(countrySpecificFormatters, fieldName, data.country, true),
       hideField,
       "aria-label": formUtils.getLabel(fieldName, fieldName),
@@ -10741,8 +10830,8 @@ function CompanyComponent(props) {
     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;
     setCurrentCompanyType(companyType2);
-    const companyCountryPrev = (_d = (_c = prevState.data) == null ? void 0 : _c[CompanyNameAndCountryFormID]) == null ? void 0 : _d.companyCountry;
-    const companyCountry2 = (_f = (_e = currentState.data) == null ? void 0 : _e[CompanyNameAndCountryFormID]) == null ? void 0 : _f.companyCountry;
+    const companyCountryPrev = (_d = (_c = prevState.data) == null ? void 0 : _c[CompanyNameAndCountryFormID]) == null ? void 0 : _d.country;
+    const companyCountry2 = (_f = (_e = currentState.data) == null ? void 0 : _e[CompanyNameAndCountryFormID]) == null ? void 0 : _f.country;
     const accountHolder2 = (_h = (_g = currentState.data) == null ? void 0 : _g[CompanyTypeFormID]) == null ? void 0 : _h.accountHolder;
     if (companyCountry2 != null && companyCountry2 !== companyCountryPrev) {
       props.onCountryChange(companyCountry2);
@@ -10761,8 +10850,8 @@ function CompanyComponent(props) {
         children: jsx(CompanyNameAndCountryComponent, {
           ...companyNameAndCountryFormProps,
           data: {
-            ...companyNameAndCountryFormProps == null ? void 0 : companyNameAndCountryFormProps.data,
-            companyCountry: props.country
+            ...companyNameAndCountryFormProps.data,
+            country: props.country
           },
           heading: i18n.get("nameAndCountry"),
           id: CompanyNameAndCountryFormID
@@ -10794,7 +10883,7 @@ function CompanyComponent(props) {
           }),
           id: CompanyRegistrationAddressFormID,
           country: props.country,
-          problems: props == null ? void 0 : props.problems,
+          problems: props.problems,
           handleAddressSearch: props.handleAddressSearch,
           handleFindAddress: props.handleFindAddress
         })
@@ -11046,6 +11135,7 @@ const COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION = [CountryCodes.Austral
 const COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION = [CountryCodes.Singapore, CountryCodes.UnitedStates];
 const COUNTRIES_WITH_POSSIBLE_REGISTRATION_EXEMPTIONS_FOR_SOLE_PROPS = [CountryCodes.Austria, CountryCodes.Canada, CountryCodes.Finland, CountryCodes.Germany, CountryCodes.Lithuania, CountryCodes.Luxembourg, CountryCodes.Poland, CountryCodes.Sweden, CountryCodes.Switzerland];
 const COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT = [CountryCodes.Australia, CountryCodes.Canada, CountryCodes.Gibraltar, CountryCodes.HongKong, CountryCodes.NewZealand, CountryCodes.PuertoRico, CountryCodes.Singapore, CountryCodes.UnitedStates];
+const COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP = [CountryCodes.NewZealand, CountryCodes.Singapore];
 const COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_COMPANIES = [
   // strictly a subset of countries which use tax ID
   // right now in all countries companies must provide a tax ID - but maybe there will be exemptions in future?
@@ -11080,7 +11170,7 @@ const rules$1 = ({
     }
   },
   countryUsesTaxId: () => {
-    if (COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(country2) && !("solePropNameAndCountry" in data && country2 === "SG")) {
+    if (COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(country2) && !("solePropNameAndCountry" in data && COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP.includes(country2))) {
       return "REQUIRED";
     }
   },
@@ -11657,8 +11747,8 @@ const mandatoryApiFields = {
   INDIVIDUAL: ["personalDetails.firstName", "personalDetails.lastName", "personalDetails.residencyCountry"],
   DECISIONMAKER: ["personalDetails.firstName", "personalDetails.lastName", "personalDetails.residencyCountry", "personalDetails.role", "personalDetails.jobTitle"],
   DECISION_MAKER_OWNER: ["personalDetails.firstName", "personalDetails.lastName", "personalDetails.residencyCountry", "personalDetails.role"],
-  ORGANIZATION: ["companyNameAndCountry.legalCompanyName", "companyNameAndCountry.companyCountry"],
-  SOLE_PROPRIETORSHIP: ["solePropNameAndCountry.legalCompanyName", "solePropNameAndCountry.companyCountry"],
+  ORGANIZATION: ["companyNameAndCountry.legalCompanyName", "companyNameAndCountry.country"],
+  SOLE_PROPRIETORSHIP: ["solePropNameAndCountry.legalCompanyName", "solePropNameAndCountry.country"],
   TRUST: ["trustRegistrationDetails.legalName", "trustRegistrationDetails.country"]
 };
 const individualMaskedFields = ["personalDetails.idNumber", "personalDetails.idNumberExempt"];
@@ -11674,6 +11764,7 @@ const individualBaseMapping = {
   "personalDetails.issuerState": "individual.identificationData.issuerState",
   "personalDetails.licenseCardNumber": "individual.identificationData.cardNumber",
   "personalDetails.nationality": "individual.nationality",
+  "personalDetails.jobTitle": "individual.jobTitle",
   "address.city": "individual.residentialAddress.city",
   "address.country": "individual.residentialAddress.country",
   "address.postalCode": "individual.residentialAddress.postalCode",
@@ -11704,6 +11795,7 @@ const payoutBaseMapping = {
   "payoutAccountDetails.iban": "bankAccount.iban"
 };
 const companyBaseMapping = {
+  "companyNameAndCountry.country": "organization.registeredAddress.country",
   "companyNameAndCountry.legalCompanyName": "organization.legalName",
   "companyType.entityType": "organization.type",
   "companyDetails.tradingName": "organization.doingBusinessAs",
@@ -11745,8 +11837,8 @@ const trustBaseMapping = {
   "trustRegistrationAddress.operationalAddress.houseNumberOrName": "trust.principalPlaceOfBusiness.street2"
 };
 const solePropBaseMapping = {
+  "solePropNameAndCountry.country": "soleProprietorship.countryOfGoverningLaw",
   "solePropNameAndCountry.legalCompanyName": "soleProprietorship.name",
-  "solePropNameAndCountry.companyCountry": "soleProprietorship.countryOfGoverningLaw",
   "solePropRegistrationDetails.tradingName": "soleProprietorship.doingBusinessAs",
   "solePropRegistrationDetails.vatNumber": "soleProprietorship.vatNumber",
   "solePropRegistrationDetails.vatAbsenceReason": "soleProprietorship.vatAbsenceReason",
@@ -11766,7 +11858,6 @@ const solePropBaseMapping = {
   "solePropRegistrationAddress.operationalAddress.houseNumberOrName": "soleProprietorship.principalPlaceOfBusiness.street2"
 };
 const companyComponentsKeyMapping = {
-  "companyNameAndCountry.companyCountry": "organization.registeredAddress.country",
   "companyDetails.exemptedFromVat": "organization.vatAbsenceReason",
   ...companyBaseMapping
 };
@@ -11819,49 +11910,85 @@ const remediationSolePropKeyMapping = {
   ...solePropApiKeyMapping,
   [DocumentType.CONSTITUTIONAL_DOCUMENT]: "solePropConstitutionalDocument.constitutionalDocument"
 };
-const mapIndividualToLegalEntity = (data) => {
-  var _a;
-  const requestObj = {
-    ...formatObject(data, individualApiKeyMapping)
-  };
-  requestObj.type = LegalEntityType.INDIVIDUAL;
-  requestObj.individual.identificationData = adjustIdentificationData(data.personalDetails, requestObj.individual.identificationData);
-  if ((_a = requestObj.individual.phone) == null ? void 0 : _a.number) {
-    requestObj.individual.phone.type = "mobile";
-  } else {
-    delete requestObj.individual.phone;
+const legalEntityDocumentToFieldMapping = {
+  [LegalEntityType.INDIVIDUAL]: {
+    [DocumentType.PASSPORT]: "idDocument.idDocument",
+    [DocumentType.PROOF_OF_RESIDENCY]: "proofOfResidence.proofOfResidence",
+    [DocumentType.PROOF_OF_NATIONAL_ID_NUMBER]: "proofOfNationalId.proofOfNationalId"
+  },
+  [LegalEntityType.ORGANIZATION]: {
+    [DocumentType.REGISTRATION_DOCUMENT]: "companyRegistrationDocument.registrationDocument",
+    [DocumentType.VAT_DOCUMENT]: "companyTaxDocument.taxDocument"
+  },
+  [LegalEntityType.SOLE_PROPRIETORSHIP]: {
+    [DocumentType.CONSTITUTIONAL_DOCUMENT]: "solePropConstitutionalDocument.constitutionalDocument"
+  },
+  [LegalEntityType.TRUST]: {
+    [DocumentType.CONSTITUTIONAL_DOCUMENT]: "trustConstitutionalDocument.constitutionalDocument"
   }
-  return requestObj;
-};
-const identityTypeToApiIdentityTypeMap = {
-  nationalIdNumber: "nationalIdNumber",
-  passport: "passport",
-  driversLicense: "driversLicense",
-  proofOfIdentityCard: "identityCard"
 };
-const apiIdentityTypeToIdentityTypeMap = reverseObject(identityTypeToApiIdentityTypeMap);
-const adjustIdentificationData = (data, apiData) => {
-  if (data.idNumber === void 0 && data.idNumberExempt === void 0)
-    return void 0;
-  return {
-    ...apiData,
-    number: stripCountryIdFormat(data.idNumber, data.residencyCountry),
-    nationalIdExempt: apiData.nationalIdExempt ?? !data.idNumber,
-    type: identityTypeToApiIdentityTypeMap[data.typeOfIdentity] ?? "nationalIdNumber"
-  };
-};
-const mapTransferInstrumentToPayoutAccount = (transferInstrument) => formatObject(transferInstrument, payoutComponentKeyMapping);
-const mapPayoutAccountToTransferInstrument = ({
-  data,
-  legalEntity
-}) => {
+function getProp(object, path) {
+  const splitPath = path.split(".");
+  const reducer2 = (xs, x) => xs && xs[x] !== void 0 ? xs[x] : void 0;
+  return splitPath.reduce(reducer2, object);
+}
+function assignToProp(path, obj, val) {
+  const splitPath = path.split(".");
+  const pathDepth = splitPath.length;
+  let currentObj = obj;
+  splitPath.forEach((key, index) => {
+    if (index === pathDepth - 1) {
+      currentObj[key] = val;
+    } else {
+      if (!currentObj[key]) {
+        currentObj[key] = {};
+      }
+      currentObj = currentObj[key];
+    }
+  });
+}
+const formatObject = (obj, mapping) => {
+  if (obj) {
+    const formattedObj = {};
+    Object.entries(mapping).forEach(([targetKey, sourceKey]) => {
+      const value = getProp(obj, sourceKey);
+      if (value !== void 0) {
+        assignToProp(targetKey, formattedObj, value);
+      }
+    });
+    return formattedObj;
+  }
+  return null;
+};
+const identityTypeToApiIdentityTypeMap = {
+  nationalIdNumber: "nationalIdNumber",
+  passport: "passport",
+  driversLicense: "driversLicense",
+  proofOfIdentityCard: "identityCard"
+};
+const apiIdentityTypeToIdentityTypeMap = reverseObject(identityTypeToApiIdentityTypeMap);
+const adjustIdentificationData = (data, apiData) => {
+  if (data.idNumber === void 0 && data.idNumberExempt === void 0)
+    return void 0;
+  return {
+    ...apiData,
+    number: stripCountryIdFormat(data.idNumber, data.residencyCountry),
+    nationalIdExempt: apiData.nationalIdExempt ?? !data.idNumber,
+    type: identityTypeToApiIdentityTypeMap[data.typeOfIdentity] ?? "nationalIdNumber"
+  };
+};
+const mapTransferInstrumentToPayoutAccount = (transferInstrument) => formatObject(transferInstrument, payoutComponentKeyMapping);
+const mapPayoutAccountToTransferInstrument = ({
+  data,
+  legalEntity
+}) => {
   const payoutAccountData = formatObject(data, payoutApiKeyMapping);
   payoutAccountData.legalEntityId = legalEntity.id;
   payoutAccountData.type = TransferInstrumentType.BANK_ACCOUNT;
   return payoutAccountData;
 };
 const mapLegalEntityToIndividual = (legalEntity, isChangingType) => {
-  var _a, _b;
+  var _a, _b, _c;
   let individualData = formatObject(legalEntity, individualComponentsKeyMapping);
   individualData = {
     ...individualData,
@@ -11877,10 +12004,30 @@ const mapLegalEntityToIndividual = (legalEntity, isChangingType) => {
   if ((_b = (_a = legalEntity == null ? void 0 : legalEntity.individual) == null ? void 0 : _a.identificationData) == null ? void 0 : _b.type) {
     individualData.personalDetails.typeOfIdentity = apiIdentityTypeToIdentityTypeMap[legalEntity.individual.identificationData.type];
   }
+  if ((_c = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _c.length) {
+    individualData = {
+      ...individualData,
+      ...mapApiDocumentToIndividualDocuments(legalEntity == null ? void 0 : legalEntity.id)
+    };
+  }
   return individualData;
 };
+const mapIndividualToLegalEntity = (data) => {
+  var _a;
+  const requestObj = {
+    ...formatObject(data, individualApiKeyMapping)
+  };
+  requestObj.type = LegalEntityType.INDIVIDUAL;
+  requestObj.individual.identificationData = adjustIdentificationData(data.personalDetails, requestObj.individual.identificationData);
+  if ((_a = requestObj.individual.phone) == null ? void 0 : _a.number) {
+    requestObj.individual.phone.type = "mobile";
+  } else {
+    delete requestObj.individual.phone;
+  }
+  return requestObj;
+};
 const mapLegalEntityToCompany = (legalEntity, isChangingType) => {
-  var _a, _b, _c;
+  var _a, _b, _c, _d;
   let companyCompData;
   if (legalEntity == null ? void 0 : legalEntity.organization) {
     companyCompData = formatObject(legalEntity, companyComponentsKeyMapping);
@@ -11908,6 +12055,12 @@ const mapLegalEntityToCompany = (legalEntity, isChangingType) => {
       companyCompData.companyDetails.exemptedFromTax = false;
       companyCompData.companyDetails.uenOrGst = countryTaxInformation == null ? void 0 : countryTaxInformation.type;
     }
+    if ((_d = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _d.length) {
+      companyCompData = {
+        ...companyCompData,
+        ...mapApiDocumentToCompanyDocuments(legalEntity == null ? void 0 : legalEntity.id)
+      };
+    }
   }
   companyCompData = {
     ...companyCompData,
@@ -11928,13 +12081,120 @@ const mapCompanyToLegalEntity = (data) => {
   if (data.companyDetails.taxId) {
     requestObj.organization = updateTaxInformation({
       taxId: data.companyDetails.taxId,
-      country: data.companyNameAndCountry.companyCountry,
+      country: data.companyNameAndCountry.country,
       entity: requestObj.organization
     });
   }
   requestObj.type = LegalEntityType.ORGANIZATION;
   return requestObj;
 };
+const mapLegalEntityToTrust = (legalEntity) => {
+  var _a, _b, _c;
+  let trustCompData;
+  if (legalEntity == null ? void 0 : legalEntity.trust) {
+    trustCompData = formatObject(legalEntity, trustComponentsKeyMapping);
+    if ((_a = legalEntity.trust) == null ? void 0 : _a.principalPlaceOfBusiness) {
+      trustCompData.trustRegistrationAddress.operationalAddressIsSame = operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME;
+    } else {
+      if (!trustCompData.trustRegistrationAddress) {
+        trustCompData.trustRegistrationAddress = {};
+      }
+      trustCompData.trustRegistrationAddress.operationalAddressIsSame = operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME;
+    }
+    const {
+      taxInformation = []
+    } = legalEntity.trust;
+    if (taxInformation.length) {
+      const {
+        country: country2
+      } = legalEntity.trust.registeredAddress;
+      trustCompData.trustRegistrationDetails.taxId = (_b = taxInformation.find((info) => info.country === country2)) == null ? void 0 : _b.number;
+      trustCompData.trustRegistrationDetails.exemptedFromTax = false;
+    }
+    if ((_c = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _c.length) {
+      trustCompData = {
+        ...trustCompData,
+        ...mapApiDocumentToTrustDocument(legalEntity == null ? void 0 : legalEntity.id)
+      };
+    }
+  }
+  return trustCompData;
+};
+const mapTrustToLegalEntity = (data) => {
+  const requestObj = {
+    ...formatObject(data, trustApiKeyMapping)
+  };
+  if (data.trustRegistrationDetails.taxId) {
+    requestObj.trust = updateTaxInformation({
+      taxId: data.trustRegistrationDetails.taxId,
+      country: data.trustRegistrationDetails.country,
+      entity: requestObj.trust
+    });
+  }
+  requestObj.type = LegalEntityType.TRUST;
+  return requestObj;
+};
+const mapLegalEntityToSoleProp = (legalEntity) => {
+  var _a, _b, _c, _d, _e;
+  let solePropCompData;
+  if (legalEntity == null ? void 0 : legalEntity.soleProprietorship) {
+    solePropCompData = formatObject(legalEntity, solePropComponentsKeyMapping);
+    if ((_a = legalEntity.soleProprietorship) == null ? void 0 : _a.principalPlaceOfBusiness) {
+      solePropCompData.solePropRegistrationAddress.operationalAddressIsSame = operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME;
+    } else {
+      if (!solePropCompData.solePropRegistrationAddress) {
+        solePropCompData.solePropRegistrationAddress = {};
+      }
+      solePropCompData.solePropRegistrationAddress.operationalAddressIsSame = operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME;
+    }
+    solePropCompData.solePropRegistrationDetails = {
+      ...solePropCompData.solePropRegistrationDetails,
+      sameNameAsLegalName: !(((_b = solePropCompData.solePropNameAndCountry) == null ? void 0 : _b.legalCompanyName) && ((_c = solePropCompData.solePropRegistrationDetails) == null ? void 0 : _c.tradingName) && solePropCompData.solePropNameAndCountry.legalCompanyName !== solePropCompData.solePropRegistrationDetails.tradingName)
+    };
+    const {
+      taxInformation = []
+    } = legalEntity.soleProprietorship;
+    if (taxInformation.length) {
+      const {
+        country: country2
+      } = legalEntity.soleProprietorship.registeredAddress;
+      solePropCompData.solePropRegistrationDetails.taxId = (_d = taxInformation.find((info) => info.country === country2)) == null ? void 0 : _d.number;
+      solePropCompData.solePropRegistrationDetails.exemptedFromTax = false;
+    }
+    if ((_e = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _e.length) {
+      solePropCompData = {
+        ...solePropCompData,
+        ...mapApiDocumentToSolePropDocuments(legalEntity == null ? void 0 : legalEntity.id)
+      };
+    }
+  }
+  return solePropCompData;
+};
+const mapSolePropToLegalEntity = (data) => {
+  const requestObj = {
+    ...formatObject(data, solePropApiKeyMapping)
+  };
+  if (requestObj.soleProprietorship.vatAbsenceReason) {
+    requestObj.soleProprietorship.vatNumber = "";
+  }
+  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 = "";
+  }
+  requestObj.type = LegalEntityType.SOLE_PROPRIETORSHIP;
+  return requestObj;
+};
+const getPageName = (document2, pageIndex = 0) => {
+  var _a;
+  return ((_a = document2 == null ? void 0 : document2.attachments) == null ? void 0 : _a[pageIndex].pageName) || null;
+};
 const mapIndividualDocumentToApiDocument = async (data, entityId) => {
   var _a, _b, _c, _d;
   if (data) {
@@ -12000,7 +12260,7 @@ const mapCompanyDocumentToApiDocument = async (data, entityId) => {
     }
   } = data;
   const entityType2 = "legalEntity";
-  const taxDocumentType = COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(data.companyNameAndCountry.companyCountry) ? DocumentType.PROOF_OF_ORGANIZATION_TAX_INFO : DocumentType.VAT_DOCUMENT;
+  const taxDocumentType = COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(data.companyNameAndCountry.country) ? DocumentType.PROOF_OF_ORGANIZATION_TAX_INFO : DocumentType.VAT_DOCUMENT;
   const documents2 = await Promise.all([
     createDocumentRequest({
       entityId,
@@ -12035,13 +12295,48 @@ const mapApiDocumentToCompanyDocuments = (entityId) => {
     } : null
   };
 };
-const mapApiDocumentToPayoutDocuments = (entityId) => {
-  const bankStatement2 = getDocument$1(entityId, DocumentType.BANK_STATEMENT) || null;
+const mapTrustDocumentToApiDocument = async (data, entityId) => {
+  var _a;
+  const constitutionalDocument2 = (_a = data == null ? void 0 : data.trustConstitutionalDocument) == null ? void 0 : _a.constitutionalDocument;
+  const entityType2 = "legalEntity";
+  const documents2 = await Promise.all([createDocumentRequest({
+    entityId,
+    entityType: entityType2,
+    documentType: DocumentType.CONSTITUTIONAL_DOCUMENT,
+    page1: constitutionalDocument2 == null ? void 0 : constitutionalDocument2[0]
+  })]);
+  return documents2.filter(Boolean);
+};
+const mapApiDocumentToTrustDocument = (entityId) => {
+  const constitutionalDocument2 = getDocument$1(entityId, DocumentType.CONSTITUTIONAL_DOCUMENT) || null;
   return {
-    bankStatementDocument: bankStatement2 ? [{
-      name: getPageName(bankStatement2)
-    }] : null,
-    description: bankStatement2.description
+    trustConstitutionalDocument: constitutionalDocument2 ? {
+      constitutionalDocument: [{
+        name: getPageName(constitutionalDocument2)
+      }]
+    } : null
+  };
+};
+const mapSolePropDocumentToApiDocument = async (data, entityId) => {
+  var _a;
+  const constitutionalDocument2 = (_a = data == null ? void 0 : data.solePropConstitutionalDocument) == null ? void 0 : _a.constitutionalDocument;
+  const entityType2 = "legalEntity";
+  const documents2 = await Promise.all([createDocumentRequest({
+    entityId,
+    entityType: entityType2,
+    documentType: DocumentType.CONSTITUTIONAL_DOCUMENT,
+    page1: constitutionalDocument2 == null ? void 0 : constitutionalDocument2[0]
+  })]);
+  return documents2.filter(Boolean);
+};
+const mapApiDocumentToSolePropDocuments = (entityId) => {
+  const constitutionalDocument2 = getDocument$1(entityId, DocumentType.CONSTITUTIONAL_DOCUMENT) || null;
+  return {
+    solePropConstitutionalDocument: constitutionalDocument2 ? {
+      constitutionalDocument: [{
+        name: getPageName(constitutionalDocument2)
+      }]
+    } : null
   };
 };
 const mapPayoutDocumentsToApiDocuments = async (data, entityId) => {
@@ -12064,174 +12359,21 @@ const mapPayoutDocumentsToApiDocuments = async (data, entityId) => {
   });
   return document2;
 };
-const formatObject = (obj, mapping) => {
-  if (obj) {
-    const formattedObj = {};
-    Object.entries(mapping).forEach(([targetKey, sourceKey]) => {
-      const value = getProp(obj, sourceKey);
-      if (value !== void 0) {
-        assignToProp(targetKey, formattedObj, value);
-      }
-    });
-    return formattedObj;
-  }
-  return null;
-};
-function assignToProp(path, obj, val) {
-  const splitPath = path.split(".");
-  const pathDepth = splitPath.length;
-  let currentObj = obj;
-  splitPath.forEach((key, index) => {
-    if (index === pathDepth - 1) {
-      currentObj[key] = val;
-    } else {
-      if (!currentObj[key]) {
-        currentObj[key] = {};
-      }
-      currentObj = currentObj[key];
-    }
-  });
-}
-const mapLegalEntityToTrust = (legalEntity) => {
-  var _a, _b;
-  let trustCompData;
-  if (legalEntity == null ? void 0 : legalEntity.trust) {
-    trustCompData = formatObject(legalEntity, trustComponentsKeyMapping);
-    if ((_a = legalEntity.trust) == null ? void 0 : _a.principalPlaceOfBusiness) {
-      trustCompData.trustRegistrationAddress.operationalAddressIsSame = operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME;
-    } else {
-      if (!trustCompData.trustRegistrationAddress) {
-        trustCompData.trustRegistrationAddress = {};
-      }
-      trustCompData.trustRegistrationAddress.operationalAddressIsSame = operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME;
-    }
-    const {
-      taxInformation = []
-    } = legalEntity.trust;
-    if (taxInformation.length) {
-      const {
-        country: country2
-      } = legalEntity.trust.registeredAddress;
-      trustCompData.trustRegistrationDetails.taxId = (_b = taxInformation.find((info) => info.country === country2)) == null ? void 0 : _b.number;
-      trustCompData.trustRegistrationDetails.exemptedFromTax = false;
-    }
-  }
-  return trustCompData;
-};
-const mapTrustToLegalEntity = (data) => {
-  const requestObj = {
-    ...formatObject(data, trustApiKeyMapping)
-  };
-  if (data.trustRegistrationDetails.taxId) {
-    requestObj.trust = updateTaxInformation({
-      taxId: data.trustRegistrationDetails.taxId,
-      country: data.trustRegistrationDetails.country,
-      entity: requestObj.trust
-    });
-  }
-  requestObj.type = LegalEntityType.TRUST;
-  return requestObj;
-};
-const mapTrustDocumentToApiDocument = async (data, entityId) => {
-  var _a;
-  const constitutionalDocument2 = (_a = data == null ? void 0 : data.trustConstitutionalDocument) == null ? void 0 : _a.constitutionalDocument;
-  const entityType2 = "legalEntity";
-  const documents2 = await Promise.all([createDocumentRequest({
-    entityId,
-    entityType: entityType2,
-    documentType: DocumentType.CONSTITUTIONAL_DOCUMENT,
-    page1: constitutionalDocument2 == null ? void 0 : constitutionalDocument2[0]
-  })]);
-  return documents2.filter(Boolean);
-};
-const mapLegalEntityToSoleProp = (legalEntity) => {
-  var _a, _b, _c, _d;
-  let solePropCompData;
-  if (legalEntity == null ? void 0 : legalEntity.soleProprietorship) {
-    solePropCompData = formatObject(legalEntity, solePropComponentsKeyMapping);
-    if ((_a = legalEntity.soleProprietorship) == null ? void 0 : _a.principalPlaceOfBusiness) {
-      solePropCompData.solePropRegistrationAddress.operationalAddressIsSame = operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME;
-    } else {
-      if (!solePropCompData.solePropRegistrationAddress) {
-        solePropCompData.solePropRegistrationAddress = {};
-      }
-      solePropCompData.solePropRegistrationAddress.operationalAddressIsSame = operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME;
-    }
-    solePropCompData.solePropRegistrationDetails = {
-      ...solePropCompData.solePropRegistrationDetails,
-      sameNameAsLegalName: !(((_b = solePropCompData.solePropNameAndCountry) == null ? void 0 : _b.legalCompanyName) && ((_c = solePropCompData.solePropRegistrationDetails) == null ? void 0 : _c.tradingName) && solePropCompData.solePropNameAndCountry.legalCompanyName !== solePropCompData.solePropRegistrationDetails.tradingName)
-    };
-    const {
-      taxInformation = []
-    } = legalEntity.soleProprietorship;
-    if (taxInformation.length) {
-      const {
-        country: country2
-      } = legalEntity.soleProprietorship.registeredAddress;
-      solePropCompData.solePropRegistrationDetails.taxId = (_d = taxInformation.find((info) => info.country === country2)) == null ? void 0 : _d.number;
-      solePropCompData.solePropRegistrationDetails.exemptedFromTax = false;
-    }
-  }
-  return solePropCompData;
-};
-const mapSolePropToLegalEntity = (data) => {
-  const requestObj = {
-    ...formatObject(data, solePropApiKeyMapping)
-  };
-  if (requestObj.soleProprietorship.vatAbsenceReason) {
-    requestObj.soleProprietorship.vatNumber = "";
-  }
-  if (data.solePropRegistrationDetails.taxId || requestObj.soleProprietorship.taxAbsent) {
-    requestObj.soleProprietorship = updateTaxInformation({
-      taxId: data.solePropRegistrationDetails.taxId,
-      exemptedFromTax: data.solePropRegistrationDetails.exemptedFromTax,
-      country: data.solePropNameAndCountry.companyCountry,
-      entity: requestObj.soleProprietorship
-    });
-  }
-  if (data.solePropRegistrationDetails.exemptedFromRegistrationNumber) {
-    requestObj.soleProprietorship.registrationNumber = "";
-  }
-  requestObj.type = LegalEntityType.SOLE_PROPRIETORSHIP;
-  return requestObj;
-};
-const mapSolePropDocumentToApiDocument = async (data, entityId) => {
-  var _a;
-  const constitutionalDocument2 = (_a = data == null ? void 0 : data.solePropConstitutionalDocument) == null ? void 0 : _a.constitutionalDocument;
-  const entityType2 = "legalEntity";
-  const documents2 = await Promise.all([createDocumentRequest({
-    entityId,
-    entityType: entityType2,
-    documentType: DocumentType.CONSTITUTIONAL_DOCUMENT,
-    page1: constitutionalDocument2 == null ? void 0 : constitutionalDocument2[0]
-  })]);
-  return documents2.filter(Boolean);
-};
-const mapApiDocumentToSolePropDocuments = (entityId) => {
-  const constitutionalDocument2 = getDocument$1(entityId, DocumentType.CONSTITUTIONAL_DOCUMENT) || null;
-  return {
-    solePropConstitutionalDocument: constitutionalDocument2 ? {
-      constitutionalDocument: [{
-        name: getPageName(constitutionalDocument2)
-      }]
-    } : null
-  };
-};
-const getPageName = (document2, pageIndex = 0) => {
-  var _a;
-  return ((_a = document2 == null ? void 0 : document2.attachments) == null ? void 0 : _a[pageIndex].pageName) || null;
-};
-function getProp(object, path) {
-  const splitPath = path.split(".");
-  const reducer2 = (xs, x) => xs && xs[x] !== void 0 ? xs[x] : void 0;
-  return splitPath.reduce(reducer2, object);
-}
-const idDocumentUploadFields = ["idDocumentType", "idFrontPage", "idBackPage", "idDocument"];
-const documentTypeValidationRules$1 = {
-  idDocumentType: {
-    validate: (idDocumentType) => !!idDocumentType,
-    errorMessage: "fieldIsRequired",
-    modes: ["blur", "input"]
+const mapApiDocumentToPayoutDocuments = (entityId) => {
+  const bankStatement2 = getDocument$1(entityId, DocumentType.BANK_STATEMENT) || null;
+  return {
+    bankStatementDocument: bankStatement2 ? [{
+      name: getPageName(bankStatement2)
+    }] : null,
+    description: bankStatement2.description
+  };
+};
+const idDocumentUploadFields = ["idDocumentType", "idFrontPage", "idBackPage", "idDocument"];
+const documentTypeValidationRules$1 = {
+  idDocumentType: {
+    validate: (idDocumentType) => !!idDocumentType,
+    errorMessage: "fieldIsRequired",
+    modes: ["blur", "input"]
   }
 };
 function IdDocumentManualUploadComponent(props) {
@@ -13745,89 +13887,709 @@ const ContactDetailsComp = memo(ContactDetailsComponent, (prevProps, nextProps)
 ContactDetailsComponent.defaultProps = {
   data: {}
 };
-const additionalIdentityInfoFields$1 = ["typeOfIdentity", "licenseCardNumber", "issuerState"];
-const identityTypes$1 = ["nationalIdNumber", "passport", "driversLicense", "proofOfIdentityCard"];
-function useGlobalData() {
-  const {
-    getData
-  } = useStateContext();
-  return getData();
-}
-function useGlobalDataSlice(sliceId, caller) {
-  const {
-    dispatch,
-    getData
-  } = useStateContext();
-  const sliceData = getData()[sliceId];
-  const updateState = useCallback((updatedSlice) => dispatch({
-    type: "addToState",
-    value: {
-      ...updatedSlice,
-      dataStoreId: sliceId,
-      caller
-    }
-    // TODO merge SFValue and StateSlice types
-  }), [sliceId, caller]);
-  const updateStateSlice = useMemo(() => debounce(updateState, ON_CHANGE_DEBOUNCE_DURATION), [updateState]);
-  return {
-    sliceData,
-    updateStateSlice
+const IdentityNumber$1 = "";
+function validCheckCharacter(input, calculationInput) {
+  if (!/^[A-Z]$/.test(input)) {
+    return false;
+  }
+  const CHECKCHARACTER_ODD_VALUE = {
+    0: 1,
+    9: 21,
+    I: 19,
+    R: 8,
+    1: 0,
+    A: 1,
+    J: 21,
+    S: 12,
+    2: 5,
+    B: 0,
+    K: 2,
+    T: 14,
+    3: 7,
+    C: 5,
+    L: 4,
+    U: 16,
+    4: 9,
+    D: 7,
+    M: 18,
+    V: 10,
+    5: 13,
+    E: 9,
+    N: 20,
+    W: 22,
+    6: 15,
+    F: 13,
+    O: 11,
+    X: 25,
+    7: 17,
+    G: 15,
+    P: 3,
+    Y: 24,
+    8: 19,
+    H: 17,
+    Q: 6,
+    Z: 23
   };
-}
-function useResetGlobalData(caller) {
-  const {
-    dispatch
-  } = useStateContext();
-  return useCallback(() => dispatch({
-    type: "resetState",
-    value: {
-      caller
-    }
-  }), [dispatch, caller]);
-}
-const isTruthyValidator$1 = {
-  validate: (value) => !!value,
-  modes: ["blur"],
-  errorMessage: "fieldIsRequired"
-};
-const PASSPORT_NUMBER_PATTERN$1 = /^[A-Z]{1,2}\d{7}$/;
-const DRIVERS_LICENSE_NUMBER_PATTERN$1 = /^[A-Za-z\d]{6,11}$/;
-const PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN$1 = /^[A-Za-z\d]{6,10}$/;
-const auIdentityValidationRules = {
-  typeOfIdentity: [isTruthyValidator$1],
-  idNumber: [{
-    validate: (value, context) => {
-      switch (context.state.data.typeOfIdentity) {
-        case "passport":
-          return PASSPORT_NUMBER_PATTERN$1.test(value);
-        case "driversLicense":
-          return DRIVERS_LICENSE_NUMBER_PATTERN$1.test(value);
-        case "proofOfIdentityCard":
-          return PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN$1.test(value);
-      }
-    },
-    errorMessage: (value, context) => {
-      switch (context.state.data.typeOfIdentity) {
-        case "passport":
-          return "invalidFormatForAuPassportNumber";
-        case "driversLicense":
-          return "invalidFormatForAuDriversLicenseNumber";
-        case "proofOfIdentityCard":
-          return "invalidFormatForAuProofOfIdentityCardNumber";
-      }
-    },
-    modes: ["blur"]
-  }],
-  licenseCardNumber: [{
-    validate: (value) => DRIVERS_LICENSE_NUMBER_PATTERN$1.test(value),
-    errorMessage: "invalidFormatForAuDriversLicenseCardNumber",
-    modes: ["blur"]
-  }],
-  issuerState: [isTruthyValidator$1]
-};
-const DriversLicense$1 = ({
-  driversLicense: driversLicense2,
-  onIssuerStateChange,
+  const CHECKCHARACTER_EVEN_VALUE = {
+    0: 0,
+    9: 9,
+    I: 8,
+    R: 17,
+    1: 1,
+    A: 0,
+    J: 9,
+    S: 18,
+    2: 2,
+    B: 1,
+    K: 10,
+    T: 19,
+    3: 3,
+    C: 2,
+    L: 11,
+    U: 20,
+    4: 4,
+    D: 3,
+    M: 12,
+    V: 21,
+    5: 5,
+    E: 4,
+    N: 13,
+    W: 22,
+    6: 6,
+    F: 5,
+    O: 14,
+    X: 23,
+    7: 7,
+    G: 6,
+    P: 15,
+    Y: 24,
+    8: 8,
+    H: 7,
+    Q: 16,
+    Z: 25
+  };
+  let total = 0;
+  for (let i = 0; i < 15; i += 1) {
+    const set = i % 2 === 1 ? CHECKCHARACTER_EVEN_VALUE : CHECKCHARACTER_ODD_VALUE;
+    const token = calculationInput.substring(i, i + 1);
+    const value = set[token];
+    if (value == null) {
+      return true;
+    }
+    total = (total + value) % 26;
+  }
+  if (total >= 0 && total <= 26 && "ABCDEFGHIJKLMNOPQRSTUVWXYZ".charAt(total) === input) {
+    return true;
+  }
+  return false;
+}
+const helper = {
+  validCheckCharacter
+};
+const countryIdNumberFormatters = {
+  [CountryCodes.Brazil]: {
+    idNumber: {
+      formatter: formatBrazilSSN,
+      maxlength: 18
+    }
+  },
+  [CountryCodes.Denmark]: {
+    idNumber: {
+      formatter: formatDenmarkCPR,
+      maxlength: 11
+    }
+  },
+  [CountryCodes.Sweden]: {
+    idNumber: {
+      formatter: formatSwedenPersonnummer,
+      maxlength: 13
+    }
+  },
+  [CountryCodes.UnitedStates]: {
+    idNumber: {
+      maxlength: 4
+    }
+  },
+  US9: {
+    idNumber: {
+      maxlength: 9
+    }
+  }
+};
+const IdNumberValidationRules = {
+  idNumber: [{
+    validate: (value) => !!value,
+    modes: ["blur"],
+    errorMessage: "fieldIsRequired"
+  }]
+};
+const countryIdNumberValidationRules = {
+  [CountryCodes.Brazil]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.BR.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberBR"
+    }]
+  },
+  [CountryCodes.Canada]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.CA.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberCA"
+    }]
+  },
+  [CountryCodes.Denmark]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.DK.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberDK"
+    }]
+  },
+  [CountryCodes.Italy]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.IT.test(idNumber2) && helper.validCheckCharacter(idNumber2.substring(15, 16), idNumber2.substring(0, 15)) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberIT"
+    }]
+  },
+  [CountryCodes.Poland]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.PL.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberPL"
+    }]
+  },
+  [CountryCodes.Romania]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.RO.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberRO"
+    }]
+  },
+  [CountryCodes.Singapore]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.SG.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberSG"
+    }]
+  },
+  [CountryCodes.Spain]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.ES.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberES"
+    }]
+  },
+  [CountryCodes.Sweden]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.SE.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberSE"
+    }]
+  },
+  [CountryCodes.UnitedStates]: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.US.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberUS"
+    }]
+  },
+  US9: {
+    idNumber: [{
+      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.US9.test(idNumber2) : false,
+      modes: ["blur"],
+      errorMessage: "invalidFormatIdentityNumberUS9"
+    }]
+  }
+};
+const idNumberFields = ["idNumber", "idNumberExempt"];
+function IdentityNumber(props) {
+  const {
+    i18n
+  } = useI18nContext();
+  const {
+    dataStoreId,
+    country: country2,
+    errors: propErrors,
+    data: propData,
+    requiredFields,
+    fieldValidationErrors,
+    maskedFields,
+    classNames,
+    dataPlaceholder
+  } = props;
+  const stateRef = useRef$1({
+    setState: null
+  });
+  const formUtils = formUtilities(props, i18n);
+  const [errors, setErrors] = useState(propErrors);
+  const [data, setData] = useState({
+    ...propData,
+    idNumberExempt: !!(propData == null ? void 0 : propData.idNumberExempt)
+  });
+  const formattingRules = useMemo(() => mergeCountryBasedRulesets({}, countryIdNumberFormatters, country2), [country2]);
+  const validationRules = useMemo(() => mergeCountryBasedValidators(IdNumberValidationRules, countryIdNumberValidationRules, country2), [country2]);
+  const maxLengthForField = getMaxLengthByFormatRuleset(formattingRules, "idNumber");
+  const {
+    handleChangeFor,
+    data: formData,
+    valid,
+    errors: formErrors,
+    fieldProblems,
+    setValid,
+    setErrors: setFormErrors,
+    triggerValidation
+  } = useForm({
+    ...props,
+    schema: requiredFields ?? idNumberFields,
+    formatters: formattingRules,
+    rules: validationRules,
+    defaultData: propData,
+    fieldProblems: fieldValidationErrors,
+    maskedFields
+  });
+  useEffect(() => {
+    if (propErrors && propErrors.idNumber) {
+      const idNumberFieldErrors = pick("idNumber").from(propErrors);
+      setErrors({
+        ...errors,
+        ...idNumberFieldErrors
+      });
+      setValid("idNumber", false);
+    }
+  }, [propErrors]);
+  useEffect(() => {
+    if (data.idNumber) {
+      triggerValidation(["idNumber"]);
+    }
+  }, [country2]);
+  useEffect(() => {
+    const dataHasChanged = !objectsDeepEqual(data, formData);
+    const persistExternalErrors = !!(!dataHasChanged && propErrors && Object.keys(propErrors).length);
+    const newErrors = {
+      ...formErrors,
+      ...persistExternalErrors && errors
+    };
+    if (!objectsDeepEqual(errors, newErrors)) {
+      setErrors(newErrors);
+    }
+    if (persistExternalErrors) {
+      setValid("idNumber", false);
+    }
+    setData({
+      ...data,
+      ...formData
+    });
+  }, [formErrors, formData]);
+  useEffect(() => {
+    var _a, _b;
+    const adjustedValid = {
+      ...valid
+    };
+    adjustedValid.idNumber = data.idNumberExempt ? true : valid.idNumber;
+    const adjustedData = {
+      ...data
+    };
+    adjustedData.idNumber = data.idNumberExempt ? void 0 : data.idNumber;
+    if (data.idNumberExempt && formErrors.idNumber !== null)
+      setFormErrors("idNumber", null);
+    (_b = (_a = stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
+      type: "addToState",
+      value: {
+        data: adjustedData,
+        valid: adjustedValid,
+        errors,
+        fieldProblems,
+        caller: "idNum",
+        dataStoreId
+      }
+    });
+  }, [data, valid, errors, fieldProblems, dataStoreId]);
+  const classModifiers = [formUtils.isRequiredField("idNumberExempt") ? "idNumberWithExempt" : "idNumber"];
+  if (classNames)
+    classModifiers.push(...classNames);
+  return jsx("div", {
+    className: "adyen-kyc-field__id-number",
+    children: formUtils.isRequiredField("idNumber") && jsxs(Fragment, {
+      children: [jsx(Field, {
+        name: "idNumber",
+        label: formUtils.getLabel("idNumber"),
+        classNameModifiers: classModifiers,
+        errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems),
+        disabled: data.idNumberExempt,
+        isValid: valid.idNumber,
+        dataPlaceholder: data.idNumber && dataPlaceholder,
+        children: (childProps) => jsx(InputText, {
+          ...childProps,
+          name: "idNumber",
+          value: data.idNumber,
+          placeholder: formUtils.getPlaceholder("idNumber"),
+          readonly: formUtils.isReadOnly("idNumber"),
+          onInput: handleChangeFor("idNumber", "input"),
+          onBlur: handleChangeFor("idNumber", "blur"),
+          "aria-required": true,
+          "aria-label": formUtils.getLabel("idNumber", "idNumber"),
+          "aria-invalid": !valid.idNumber,
+          inputMode: "numeric",
+          maxLength: maxLengthForField,
+          ...data.idNumberExempt && {
+            disabled: true
+          }
+        })
+      }), jsx(Field, {
+        classNameModifiers: ["idNumber__checkbox"],
+        name: "idNumberExempt",
+        children: (childProps) => formUtils.isRequiredField("idNumberExempt") && jsx(Checkbox, {
+          ...childProps,
+          label: formUtils.getLabel("idNumberExempt"),
+          checked: Boolean(data.idNumberExempt),
+          classNameModifiers: ["idNumberExempt"],
+          name: "idNumberExempt",
+          onChange: handleChangeFor("idNumberExempt")
+        })
+      }), jsx(StateContextSetter, {
+        owner: "IdNumberComp",
+        stateRef
+      })]
+    })
+  });
+}
+const IdentityNumberComponent = memo(IdentityNumber, (prevProps, nextProps) => prevProps.country === nextProps.country && prevProps.shouldValidate === nextProps.shouldValidate && objectsDeepEqual(prevProps.errors, nextProps.errors) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors));
+IdentityNumberComponent.defaultProps = {
+  data: {},
+  onChange: () => {
+  }
+};
+const handleKeys = (keys, callback, propagationMode = "stopIfMatches") => (event) => {
+  if (propagationMode === "stop")
+    event.stopPropagation();
+  if (keys.includes(event.key)) {
+    if (propagationMode === "stopIfMatches")
+      event.stopPropagation();
+    callback();
+  }
+};
+const styles = {
+  "adyen-kyc-multi-select-list": "adyen-kyc-multi-select-list",
+  "adyen-kyc-multi-select-list-item": "adyen-kyc-multi-select-list-item",
+  "adyen-kyc-multi-select-list-item--with-description": "adyen-kyc-multi-select-list-item--with-description",
+  "adyen-kyc-checkbox__label": "adyen-kyc-checkbox__label"
+};
+const MultiSelectList = ({
+  options,
+  selected,
+  onSelect,
+  mapToSelectItem
+}) => jsx("ul", {
+  className: styles["adyen-kyc-multi-select-list"],
+  children: options.map((option) => {
+    const item = mapToSelectItem(option);
+    const isSelected = selected.includes(option);
+    const handleSelect = () => {
+      const newSelection = isSelected ? selected.filter((selectedOption) => selectedOption !== option) : [...selected, option];
+      onSelect(newSelection);
+    };
+    return jsx(SelectListItem, {
+      item,
+      selected: isSelected,
+      onKeyDown: handleKeys(["Enter", " "], handleSelect),
+      onSelect: handleSelect,
+      isMulti: true,
+      className: cx([styles["adyen-kyc-multi-select-list-item"], {
+        [styles["adyen-kyc-multi-select-list-item--with-description"]]: !!item.description
+      }])
+    }, item.id);
+  })
+});
+const decisionMakerRoleValidationRules = {
+  role: {
+    modes: ["blur"],
+    validate: (role2) => !!(role2 == null ? void 0 : role2.length),
+    errorMessage: "fieldIsRequired"
+  }
+};
+const decisionMakerRoleFields = ["role"];
+const DecisionMakerRoleComponent = (props) => {
+  const {
+    data: dataProp,
+    dataStoreId,
+    validators,
+    fieldValidationErrors,
+    requiredFields,
+    allowedRoles
+  } = props;
+  const {
+    i18n
+  } = useI18nContext();
+  const {
+    data,
+    valid,
+    errors,
+    isValid,
+    fieldProblems,
+    handleChangeFor
+  } = useForm({
+    ...props,
+    schema: requiredFields || ["role"],
+    rules: validators || decisionMakerRoleValidationRules,
+    defaultData: dataProp,
+    fieldProblems: fieldValidationErrors
+  });
+  const [decisionMakerRoles2, setDecisionMakerRoles] = useState([]);
+  const stateRef = useRef$1({
+    setState: null
+  });
+  const formUtils = formUtilities(props, i18n);
+  const allowedRolesString = allowedRoles == null ? void 0 : allowedRoles.toString();
+  const makeSelectItemForDecisionMakerRole = (role2) => {
+    const validRole = decisionMakerRoles2.find((item) => item.id === role2);
+    return {
+      ...validRole,
+      disabled: !(allowedRoles == null ? void 0 : allowedRoles.includes(validRole == null ? void 0 : validRole.id))
+    };
+  };
+  const changeRoles = (roles) => {
+    handleChangeFor("role", "input")(roles);
+  };
+  useEffect(() => {
+    var _a, _b;
+    (_b = (_a = stateRef.current).setState) == null ? void 0 : _b.call(_a, {
+      type: "addToState",
+      value: {
+        data,
+        valid,
+        errors,
+        fieldProblems,
+        caller: "Role",
+        dataStoreId
+      }
+    });
+  }, [data, valid, errors, isValid, dataStoreId, fieldProblems]);
+  useEffect(() => {
+    setDecisionMakerRoles(getTranslatedDecisionMakerRoles(i18n, allowedRoles));
+  }, [allowedRoles, allowedRolesString, i18n, i18n.languageCode, i18n.locale]);
+  return jsxs("div", {
+    className: "adyen-kyc-field__role",
+    children: [jsx(StateContextSetter, {
+      stateRef
+    }), formUtils.isRequiredField("role", false) && jsx(Field, {
+      name: "role",
+      classNameModifiers: ["role"],
+      label: formUtils.getLabel("role", "selectAllTheRolesThatThisDecisionMakerHolds"),
+      errorMessage: formUtils.getErrorMessage("role", errors, fieldProblems),
+      isValid: valid.role,
+      showErrorIconBottom: true,
+      children: (childProps) => jsx(MultiSelectList, {
+        ...childProps,
+        options: allowedRoles ?? [],
+        selected: data.role ?? [],
+        onSelect: changeRoles,
+        mapToSelectItem: makeSelectItemForDecisionMakerRole
+      })
+    })]
+  });
+};
+const nameValidationRules = {
+  firstName: [{
+    validate: hasText,
+    errorMessage: "fieldIsRequired",
+    modes: ["blur"]
+  }],
+  lastName: [{
+    validate: hasText,
+    errorMessage: "fieldIsRequired",
+    modes: ["blur"]
+  }]
+};
+const specialCharsRegEx = getFormattingRegEx(SPECIAL_CHARS.replace("-", ""));
+const nameFormatters = {
+  firstName: {
+    // formatter: trimValWithOneSpace // just trim
+    // Example - removing disallowed chars as they are input: then they don't end up in state
+    formatter: (val) => val ? trimValWithOneSpace(val).replace(specialCharsRegEx, "") : void 0
+    // trim & replace
+  },
+  lastName: {
+    formatter: (val) => val ? trimValWithOneSpace(val).replace(specialCharsRegEx, "") : void 0
+  }
+};
+const nameFields = ["firstName", "lastName"];
+function NameComponent(props) {
+  const {
+    i18n
+  } = useI18nContext();
+  const schema = props.requiredFields || ["firstName", "lastName"];
+  const {
+    handleChangeFor,
+    data,
+    valid,
+    errors,
+    fieldProblems,
+    isValid
+  } = useForm({
+    ...props,
+    schema,
+    rules: nameValidationRules,
+    formatters: nameFormatters,
+    defaultData: props.data,
+    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
+  });
+  const {
+    dataStoreId
+  } = props;
+  const stateRef = useRef$1({
+    setState: null
+  });
+  useEffect(() => {
+    var _a, _b, _c;
+    (_b = (_a = stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
+      type: "addToState",
+      value: {
+        data,
+        valid,
+        errors,
+        fieldProblems,
+        caller: "name",
+        dataStoreId
+      }
+    });
+    (_c = props.onChange) == null ? void 0 : _c.call(props, {
+      schema,
+      data,
+      valid,
+      errors,
+      fieldProblems,
+      isValid
+    });
+  }, [data, valid, errors, isValid]);
+  const formUtils = formUtilities(props, i18n);
+  return jsxs("div", {
+    className: "adyen-kyc-field-wrapper",
+    children: [jsx(StateContextSetter, {
+      stateRef
+    }), formUtils.isRequiredField("firstName") && jsx(Field, {
+      name: "firstName",
+      label: formUtils.getLabel("firstName"),
+      classNameModifiers: ["firstName", "col-50"],
+      errorMessage: formUtils.getErrorMessage("firstName", errors, fieldProblems),
+      isValid: valid.firstName,
+      helper: formUtils.getLabel("enterNameExactlyAsAppearInID"),
+      children: (childProps) => jsx(InputText, {
+        ...childProps,
+        name: "firstName",
+        value: data.firstName,
+        classNameModifiers: ["name"],
+        readonly: formUtils.isReadOnly("firstName"),
+        onInput: handleChangeFor("firstName", "input"),
+        onBlur: handleChangeFor("firstName", "blur"),
+        trimOnBlur: true,
+        spellCheck: false,
+        "aria-required": true,
+        "aria-label": formUtils.getLabel("firstName"),
+        "aria-invalid": !valid.firstName
+      })
+    }), formUtils.isRequiredField("lastName") && jsx(Field, {
+      name: "lastName",
+      label: formUtils.getLabel("lastName"),
+      classNameModifiers: ["lastName", "col-50"],
+      errorMessage: formUtils.getErrorMessage("lastName", errors, fieldProblems),
+      isValid: valid.lastName,
+      helper: formUtils.getLabel("enterLastNameExactlyAsAppearInID"),
+      children: (childProps) => jsx(InputText, {
+        ...childProps,
+        name: "lastName",
+        value: data.lastName,
+        classNameModifiers: ["lastName"],
+        readonly: formUtils.isReadOnly("lastName"),
+        onInput: handleChangeFor("lastName", "input"),
+        onBlur: handleChangeFor("lastName", "blur"),
+        trimOnBlur: true,
+        spellCheck: false,
+        "aria-required": true,
+        "aria-label": formUtils.getLabel("lastName"),
+        "aria-invalid": !valid.lastName
+      })
+    })]
+  });
+}
+const Name = memo(NameComponent, (prevProps, nextProps) => prevProps.shouldValidate === nextProps.shouldValidate && objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors));
+NameComponent.defaultProps = {
+  data: {},
+  onChange: () => {
+  },
+  visibility: "editable",
+  validationRules: nameValidationRules
+};
+const personalDetailsValidationRules = {
+  birthDate: [{
+    modes: ["blur"],
+    validate: (birthDate2) => !!birthDate2,
+    errorMessage: "fieldIsRequired"
+  }, {
+    modes: ["blur"],
+    validate: (birthDate2) => birthDate2 && new Date(birthDate2) < /* @__PURE__ */ new Date(),
+    errorMessage: "invalidDateOfBirth"
+  }],
+  residencyCountry: {
+    modes: ["blur"],
+    validate: (residencyCountry2) => !!residencyCountry2,
+    errorMessage: "fieldIsRequired"
+  },
+  nationality: {
+    modes: ["blur"],
+    validate: (nationality2) => !!nationality2,
+    errorMessage: "fieldIsRequired"
+  },
+  jobTitle: {
+    modes: ["blur"],
+    validate: (jobTitle2) => !!jobTitle2,
+    errorMessage: "fieldIsRequired"
+  }
+};
+const additionalIdentityInfoFields$2 = ["typeOfIdentity", "licenseCardNumber", "issuerState"];
+const identityTypes$2 = ["nationalIdNumber", "passport", "driversLicense", "proofOfIdentityCard"];
+const isTruthyValidator = {
+  validate: (value) => !!value,
+  modes: ["blur"],
+  errorMessage: "fieldIsRequired"
+};
+const auIdentityValidationRules = {
+  typeOfIdentity: [isTruthyValidator],
+  idNumber: [{
+    validate: (value, context) => {
+      switch (context == null ? void 0 : context.state.data.typeOfIdentity) {
+        case "passport":
+          return PassportNumberPatterns.AU.test(value ?? "");
+        case "driversLicense":
+          return DriversLicenseNumberPatterns.AU.test(value ?? "");
+        case "proofOfIdentityCard":
+          return ProofOfIdentityCardPatterns.AU.test(value ?? "");
+        default:
+          return false;
+      }
+    },
+    errorMessage: (_, context) => {
+      switch (context == null ? void 0 : context.state.data.typeOfIdentity) {
+        case "passport":
+          return "invalidFormatForAuPassportNumber";
+        case "driversLicense":
+          return "invalidFormatForAuDriversLicenseNumber";
+        case "proofOfIdentityCard":
+          return "invalidFormatForAuProofOfIdentityCardNumber";
+      }
+    },
+    modes: ["blur"]
+  }],
+  licenseCardNumber: [{
+    validate: (value) => DriversLicenseNumberPatterns.AU.test(value ?? ""),
+    errorMessage: "invalidFormatForAuDriversLicenseCardNumber",
+    modes: ["blur"]
+  }],
+  issuerState: [isTruthyValidator]
+};
+const DriversLicense$2 = ({
+  driversLicense: driversLicense2,
+  onIssuerStateChange,
   onLicenseNumberInput,
   onLicenseNumberBlur,
   onCardNumberInput,
@@ -13903,7 +14665,7 @@ const DriversLicense$1 = ({
     })]
   });
 };
-const PassportNumber$1 = ({
+const PassportNumber$2 = ({
   passportNumber: passportNumber2,
   onInput,
   onBlur,
@@ -13949,11 +14711,11 @@ const ProofOfIdentityCard$1 = ({
     placeholder: ""
   })
 });
-const mapIdentityTypeToItem$1 = (type, label) => ({
+const mapIdentityTypeToItem$2 = (type, label) => ({
   id: type,
   name: label
 });
-const TypeOfIdentity$1 = ({
+const TypeOfIdentity$2 = ({
   availableIdentityTypes,
   selectedIdentityType,
   setSelectedIdentityType,
@@ -13975,7 +14737,7 @@ const TypeOfIdentity$1 = ({
     children: (childProps) => jsx(Select, {
       ...childProps,
       isInvalid: false,
-      items: availableIdentityTypes.map((type) => mapIdentityTypeToItem$1(type, i18n.get(type))),
+      items: availableIdentityTypes.map((type) => mapIdentityTypeToItem$2(type, i18n.get(type))),
       placeholder: i18n.get("id"),
       selected: selectedIdentityType,
       onChange: (event) => setSelectedIdentityType(event.target.value)
@@ -13996,7 +14758,7 @@ function IdentityAuComponent(props) {
     valid
   } = useForm({
     ...props,
-    schema: props.requiredFields,
+    schema: props.requiredFields ?? [],
     defaultData: props.data,
     fieldProblems: props.fieldValidationErrors,
     rules: auIdentityValidationRules,
@@ -14024,28 +14786,28 @@ function IdentityAuComponent(props) {
   } = useI18nContext();
   const formUtils = formUtilities(props, i18n);
   return jsxs(Fragment, {
-    children: [jsx(TypeOfIdentity$1, {
-      availableIdentityTypes: identityTypes$1.filter((type) => type !== "nationalIdNumber"),
+    children: [jsx(TypeOfIdentity$2, {
+      availableIdentityTypes: identityTypes$2.filter((type) => type !== "nationalIdNumber"),
       selectedIdentityType: data.typeOfIdentity,
       setSelectedIdentityType: handleChangeFor("typeOfIdentity"),
       formUtils,
       isValid: valid.typeOfIdentity,
       errorMessage: formUtils.getErrorMessage("typeOfIdentity", errors, fieldProblems)
-    }), data.typeOfIdentity === "passport" ? jsx(PassportNumber$1, {
-      passportNumber: data.idNumber,
+    }), data.typeOfIdentity === "passport" ? jsx(PassportNumber$2, {
+      passportNumber: data.idNumber ?? "",
       onInput: handleChangeFor("idNumber", "input"),
       onBlur: handleChangeFor("idNumber", "blur"),
       formUtils,
       isValid: valid.idNumber,
       errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems)
     }) : data.typeOfIdentity === "proofOfIdentityCard" ? jsx(ProofOfIdentityCard$1, {
-      cardNumber: data.idNumber,
+      cardNumber: data.idNumber ?? "",
       onInput: handleChangeFor("idNumber", "input"),
       onBlur: handleChangeFor("idNumber", "blur"),
       formUtils,
       isValid: valid.idNumber,
       errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems)
-    }) : data.typeOfIdentity === "driversLicense" ? jsx(DriversLicense$1, {
+    }) : data.typeOfIdentity === "driversLicense" ? jsx(DriversLicense$2, {
       driversLicense: data,
       onIssuerStateChange: handleChangeFor("issuerState"),
       onLicenseNumberInput: handleChangeFor("idNumber", "input"),
@@ -14066,18 +14828,10 @@ function IdentityAuComponent(props) {
     }) : void 0]
   });
 }
-const auIdentityFields = [...additionalIdentityInfoFields$1, "idNumber"];
-const additionalIdentityInfoFields = ["typeOfIdentity"];
-const identityTypes = ["nationalIdNumber", "passport", "driversLicense", "proofOfIdentityCard"];
-const PASSPORT_NUMBER_PATTERN = /^(?=.{9}$)[A-Z]{1,2}\d{6}[A-Z0-9]{1,2}$/;
-const DRIVERS_LICENSE_NUMBER_PATTERN = /^[A-Z]{1}[A-Z0-9]{7}$/;
-const PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN = /^[A-Z]{1,2}[0-9]{6}[0-9A]$/;
-const isValidatePassportNumber = (value) => PASSPORT_NUMBER_PATTERN.test(value);
-const isTruthyValidator = {
-  validate: (value) => !!value,
-  modes: ["blur"],
-  errorMessage: "fieldIsRequired"
-};
+const auIdentityFields = [...additionalIdentityInfoFields$2, "idNumber"];
+const additionalIdentityInfoFields$1 = ["typeOfIdentity"];
+const identityTypes$1 = ["nationalIdNumber", "passport", "driversLicense", "proofOfIdentityCard"];
+const isValidatePassportNumber = (value) => PassportNumberPatterns.HK.test(value);
 const identityValidationRules = {
   typeOfIdentity: [isTruthyValidator],
   idNumber: [{
@@ -14087,9 +14841,9 @@ const identityValidationRules = {
         case "passport":
           return isValidatePassportNumber(value);
         case "driversLicense":
-          return DRIVERS_LICENSE_NUMBER_PATTERN.test(value);
+          return DriversLicenseNumberPatterns.HK.test(value);
         case "proofOfIdentityCard":
-          return PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN.test(value);
+          return ProofOfIdentityCardPatterns.HK.test(value);
         default:
           return false;
       }
@@ -14105,15 +14859,9 @@ const identityValidationRules = {
       }
     },
     modes: ["blur"]
-  }],
-  licenseCardNumber: [{
-    validate: (value) => DRIVERS_LICENSE_NUMBER_PATTERN.test(value ?? ""),
-    errorMessage: "invalidFormatForHKDriversLicenseNumber",
-    modes: ["blur"]
-  }],
-  issuerState: [isTruthyValidator]
+  }]
 };
-const DriversLicense = ({
+const DriversLicense$1 = ({
   driversLicense: driversLicense2,
   onLicenseNumberInput,
   onLicenseNumberBlur,
@@ -14140,7 +14888,7 @@ const DriversLicense = ({
     })
   });
 };
-const PassportNumber = ({
+const PassportNumber$1 = ({
   passportNumber: passportNumber2,
   onInput,
   onBlur,
@@ -14182,11 +14930,11 @@ const ProofOfIdentityCard = ({
     placeholder: ""
   })
 });
-const mapIdentityTypeToItem = (type, label) => ({
+const mapIdentityTypeToItem$1 = (type, label) => ({
   id: type,
   name: label
 });
-const TypeOfIdentity = ({
+const TypeOfIdentity$1 = ({
   availableIdentityTypes,
   selectedIdentityType,
   setSelectedIdentityType,
@@ -14208,7 +14956,7 @@ const TypeOfIdentity = ({
     children: (childProps) => jsx(Select, {
       ...childProps,
       isInvalid: false,
-      items: availableIdentityTypes.map((type) => mapIdentityTypeToItem(type, i18n.get(type))),
+      items: availableIdentityTypes.map((type) => mapIdentityTypeToItem$1(type, i18n.get(type))),
       placeholder: i18n.get("id"),
       selected: selectedIdentityType,
       onChange: (event) => setSelectedIdentityType(event.target.value)
@@ -14260,14 +15008,14 @@ function IdentityHKComponent(props) {
   } = useI18nContext();
   const formUtils = formUtilities(props, i18n);
   return jsxs(Fragment, {
-    children: [jsx(TypeOfIdentity, {
-      availableIdentityTypes: identityTypes.filter((type) => type !== "nationalIdNumber"),
+    children: [jsx(TypeOfIdentity$1, {
+      availableIdentityTypes: identityTypes$1.filter((type) => type !== "nationalIdNumber"),
       selectedIdentityType: data.typeOfIdentity,
       setSelectedIdentityType: handleChangeFor("typeOfIdentity"),
       formUtils,
       isValid: valid.typeOfIdentity,
       errorMessage: formUtils.getErrorMessage("typeOfIdentity", errors, fieldProblems)
-    }), data.typeOfIdentity === "passport" ? jsx(PassportNumber, {
+    }), data.typeOfIdentity === "passport" ? jsx(PassportNumber$1, {
       passportNumber: data.idNumber ?? "",
       onInput: handleChangeFor("idNumber", "input"),
       onBlur: handleChangeFor("idNumber", "blur"),
@@ -14281,7 +15029,7 @@ function IdentityHKComponent(props) {
       isValid: valid.idNumber,
       label: formUtils.getLabel("idNumber", "hkid"),
       errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems)
-    }) : data.typeOfIdentity === "driversLicense" ? jsx(DriversLicense, {
+    }) : data.typeOfIdentity === "driversLicense" ? jsx(DriversLicense$1, {
       driversLicense: data,
       onLicenseNumberInput: handleChangeFor("idNumber", "input"),
       onLicenseNumberBlur: handleChangeFor("idNumber", "blur"),
@@ -14295,380 +15043,235 @@ function IdentityHKComponent(props) {
     }) : void 0]
   });
 }
-const hkIdentityFields = [...additionalIdentityInfoFields, "idNumber"];
-const IdentityNumber$1 = "";
-function validCheckCharacter(input, calculationInput) {
-  if (!/^[A-Z]$/.test(input)) {
-    return false;
-  }
-  const CHECKCHARACTER_ODD_VALUE = {
-    0: 1,
-    9: 21,
-    I: 19,
-    R: 8,
-    1: 0,
-    A: 1,
-    J: 21,
-    S: 12,
-    2: 5,
-    B: 0,
-    K: 2,
-    T: 14,
-    3: 7,
-    C: 5,
-    L: 4,
-    U: 16,
-    4: 9,
-    D: 7,
-    M: 18,
-    V: 10,
-    5: 13,
-    E: 9,
-    N: 20,
-    W: 22,
-    6: 15,
-    F: 13,
-    O: 11,
-    X: 25,
-    7: 17,
-    G: 15,
-    P: 3,
-    Y: 24,
-    8: 19,
-    H: 17,
-    Q: 6,
-    Z: 23
-  };
-  const CHECKCHARACTER_EVEN_VALUE = {
-    0: 0,
-    9: 9,
-    I: 8,
-    R: 17,
-    1: 1,
-    A: 0,
-    J: 9,
-    S: 18,
-    2: 2,
-    B: 1,
-    K: 10,
-    T: 19,
-    3: 3,
-    C: 2,
-    L: 11,
-    U: 20,
-    4: 4,
-    D: 3,
-    M: 12,
-    V: 21,
-    5: 5,
-    E: 4,
-    N: 13,
-    W: 22,
-    6: 6,
-    F: 5,
-    O: 14,
-    X: 23,
-    7: 7,
-    G: 6,
-    P: 15,
-    Y: 24,
-    8: 8,
-    H: 7,
-    Q: 16,
-    Z: 25
-  };
-  let total = 0;
-  for (let i = 0; i < 15; i += 1) {
-    const set = i % 2 === 1 ? CHECKCHARACTER_EVEN_VALUE : CHECKCHARACTER_ODD_VALUE;
-    const token = calculationInput.substring(i, i + 1);
-    const value = set[token];
-    if (value == null) {
-      return true;
-    }
-    total = (total + value) % 26;
-  }
-  if (total >= 0 && total <= 26 && "ABCDEFGHIJKLMNOPQRSTUVWXYZ".charAt(total) === input) {
-    return true;
-  }
-  return false;
-}
-const helper = {
-  validCheckCharacter
-};
-const countryIdNumberFormatters = {
-  [CountryCodes.Brazil]: {
-    idNumber: {
-      formatter: formatBrazilSSN,
-      maxlength: 18
-    }
-  },
-  [CountryCodes.Denmark]: {
-    idNumber: {
-      formatter: formatDenmarkCPR,
-      maxlength: 11
-    }
-  },
-  [CountryCodes.Sweden]: {
-    idNumber: {
-      formatter: formatSwedenPersonnummer,
-      maxlength: 13
-    }
-  },
-  [CountryCodes.UnitedStates]: {
-    idNumber: {
-      maxlength: 4
-    }
-  },
-  US9: {
-    idNumber: {
-      maxlength: 9
-    }
-  }
-};
-const IdNumberValidationRules = {
+const hkIdentityFields = [...additionalIdentityInfoFields$1, "idNumber"];
+const additionalIdentityInfoFields = ["typeOfIdentity", "licenseCardNumber"];
+const identityTypes = ["nationalIdNumber", "passport", "driversLicense", "proofOfIdentityCard"];
+const PASSPORT_NUMBER_PATTERN = /^[A-Z]{1,2}\d{7}$/;
+const nzIdentityValidationRules = {
+  typeOfIdentity: [isTruthyValidator],
   idNumber: [{
-    validate: (value) => !!value,
-    modes: ["blur"],
-    errorMessage: "fieldIsRequired"
-  }]
-};
-const countryIdNumberValidationRules = {
-  [CountryCodes.Brazil]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.BR.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberBR"
-    }]
-  },
-  [CountryCodes.Canada]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.CA.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberCA"
-    }]
-  },
-  [CountryCodes.Denmark]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.DK.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberDK"
-    }]
-  },
-  [CountryCodes.Italy]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.IT.test(idNumber2) && helper.validCheckCharacter(idNumber2.substring(15, 16), idNumber2.substring(0, 15)) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberIT"
-    }]
-  },
-  [CountryCodes.Poland]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.PL.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberPL"
-    }]
-  },
-  [CountryCodes.Romania]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.RO.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberRO"
-    }]
-  },
-  [CountryCodes.Singapore]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.SG.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberSG"
-    }]
-  },
-  [CountryCodes.Spain]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.ES.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberES"
-    }]
-  },
-  [CountryCodes.Sweden]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.SE.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberSE"
-    }]
-  },
-  [CountryCodes.UnitedStates]: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.US.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberUS"
-    }]
-  },
-  US9: {
-    idNumber: [{
-      validate: (idNumber2) => idNumber2 ? CountryIdNumberPatterns.US9.test(idNumber2) : false,
-      modes: ["blur"],
-      errorMessage: "invalidFormatIdentityNumberUS9"
-    }]
-  }
+    validate: (val, context) => {
+      var _a, _b;
+      const value = val ?? "";
+      switch ((_b = (_a = context == null ? void 0 : context.state) == null ? void 0 : _a.data) == null ? void 0 : _b.typeOfIdentity) {
+        case "passport":
+          return PASSPORT_NUMBER_PATTERN.test(value);
+        case "driversLicense":
+          return DriversLicenseNumberPatterns[CountryCodes.NewZealand].test(value);
+        default:
+          return false;
+      }
+    },
+    errorMessage: (_, context) => {
+      var _a, _b;
+      switch ((_b = (_a = context == null ? void 0 : context.state) == null ? void 0 : _a.data) == null ? void 0 : _b.typeOfIdentity) {
+        case "passport":
+          return "invalidFormatForNZPassportNumber";
+        case "driversLicense":
+          return "invalidFormatForNZDriversLicenseNumber";
+      }
+    },
+    modes: ["blur"]
+  }],
+  licenseCardNumber: [{
+    validate: (value) => DriversLicenseCardNumberPatterns[CountryCodes.NewZealand].test(value ?? ""),
+    errorMessage: "invalidFormatForNZDriversLicenseCardNumber",
+    modes: ["blur"]
+  }]
 };
-const idNumberFields = ["idNumber", "idNumberExempt"];
-function IdentityNumber(props) {
+const DriversLicense = ({
+  driversLicense: driversLicense2,
+  onLicenseNumberInput,
+  onLicenseNumberBlur,
+  onCardNumberInput,
+  onCardNumberBlur,
+  formUtils: {
+    getLabel
+  },
+  isValid,
+  errorMessages
+}) => {
   const {
     i18n
   } = useI18nContext();
-  const {
-    dataStoreId,
-    country: country2,
-    errors: propErrors,
-    data: propData,
-    requiredFields,
-    fieldValidationErrors,
-    maskedFields,
-    classNames,
-    dataPlaceholder
-  } = props;
-  const stateRef = useRef$1({
-    setState: null
+  return jsxs(Fragment, {
+    children: [jsxs("div", {
+      className: "adyen-kyc-field-wrapper",
+      children: [jsx(Field, {
+        name: "licenseNumber",
+        label: getLabel("idNumber", "licenseNumber"),
+        isValid: isValid.idNumber,
+        errorMessage: errorMessages.idNumber,
+        children: (childProps) => jsx(InputText, {
+          ...childProps,
+          name: "licenseNumber",
+          value: driversLicense2.idNumber,
+          onInput: onLicenseNumberInput,
+          onBlur: onLicenseNumberBlur,
+          placeholder: ""
+        })
+      }), jsx(Field, {
+        name: "licenseCardNumber",
+        label: getLabel("licenceVersionNumber"),
+        isValid: isValid.licenseCardNumber,
+        errorMessage: errorMessages.licenseCardNumber,
+        children: (childProps) => jsx(InputText, {
+          ...childProps,
+          name: "licenseCardNumber",
+          value: driversLicense2.licenseCardNumber,
+          onInput: onCardNumberInput,
+          onBlur: onCardNumberBlur,
+          placeholder: ""
+        })
+      })]
+    }), jsx(ContextGuidance, {
+      page: "Personal details",
+      title: i18n.get("whereCanIFindTheseNumbersOnMyDriversLicense"),
+      content: jsxs(Fragment, {
+        children: [i18n.get("whereToFindNumbersOnDriversLicense__NZ"), " ", jsx("a", {
+          href: "https://www.nzta.govt.nz/driver-licences/getting-a-licence/your-driver-licence-explained/",
+          target: "_blank",
+          rel: "noreferrer",
+          children: i18n.get("iStillCantFindIt")
+        })]
+      }),
+      titleId: "whereCanIFindTheseNumbersOnMyDriversLicense",
+      contentId: "whereToFindNumbersOnDriversLicense"
+    })]
   });
-  const formUtils = formUtilities(props, i18n);
-  const [errors, setErrors] = useState(propErrors);
-  const [data, setData] = useState({
-    ...propData,
-    idNumberExempt: !!(propData == null ? void 0 : propData.idNumberExempt)
+};
+const PassportNumber = ({
+  passportNumber: passportNumber2,
+  onInput,
+  onBlur,
+  formUtils: {
+    getLabel
+  },
+  errorMessage,
+  isValid
+}) => jsx(Field, {
+  name: "passportNumber",
+  label: getLabel("idNumber", "passportNumber"),
+  errorMessage,
+  isValid,
+  children: (childProps) => jsx(InputText, {
+    ...childProps,
+    name: "passportNumber",
+    value: passportNumber2,
+    onInput,
+    onBlur,
+    placeholder: ""
+  })
+});
+const mapIdentityTypeToItem = (type, label) => ({
+  id: type,
+  name: label
+});
+const TypeOfIdentity = ({
+  availableIdentityTypes,
+  selectedIdentityType,
+  setSelectedIdentityType,
+  formUtils: {
+    getLabel
+  },
+  errorMessage,
+  isValid
+}) => {
+  const {
+    i18n
+  } = useI18nContext();
+  return jsx(Field, {
+    name: "typeOfIdentity",
+    label: getLabel("typeOfIdentity"),
+    errorMessage,
+    isValid,
+    helper: i18n.get("typeOfIdentitySubtitle"),
+    children: (childProps) => jsx(Select, {
+      ...childProps,
+      isInvalid: false,
+      items: availableIdentityTypes.map((type) => mapIdentityTypeToItem(type, i18n.get(type))),
+      placeholder: i18n.get("id"),
+      selected: selectedIdentityType,
+      onChange: (event) => setSelectedIdentityType(event.target.value)
+    })
   });
-  const formattingRules = useMemo(() => mergeCountryBasedRulesets({}, countryIdNumberFormatters, country2), [country2]);
-  const validationRules = useMemo(() => mergeCountryBasedValidators(IdNumberValidationRules, countryIdNumberValidationRules, country2), [country2]);
-  const maxLengthForField = getMaxLengthByFormatRuleset(formattingRules, "idNumber");
+};
+function IdentityNZComponent(props) {
+  var _a;
+  if (((_a = props.data) == null ? void 0 : _a.typeOfIdentity) === "nationalIdNumber") {
+    props.data.typeOfIdentity = void 0;
+  }
   const {
     handleChangeFor,
-    data: formData,
-    valid,
-    errors: formErrors,
+    triggerValidation,
+    data,
+    errors,
     fieldProblems,
-    setValid,
-    setErrors: setFormErrors,
-    triggerValidation
+    valid
   } = useForm({
     ...props,
-    schema: requiredFields ?? idNumberFields,
-    formatters: formattingRules,
-    rules: validationRules,
-    defaultData: propData,
-    fieldProblems: fieldValidationErrors,
-    maskedFields
+    schema: props.requiredFields ?? [],
+    defaultData: props.data,
+    fieldProblems: props.fieldValidationErrors,
+    rules: nzIdentityValidationRules,
+    maskedFields: props.maskedFields
   });
   useEffect(() => {
-    if (propErrors && propErrors.idNumber) {
-      const idNumberFieldErrors = pick("idNumber").from(propErrors);
-      setErrors({
-        ...errors,
-        ...idNumberFieldErrors
-      });
-      setValid("idNumber", false);
-    }
-  }, [propErrors]);
-  useEffect(() => {
-    if (data.idNumber) {
+    if (data.typeOfIdentity)
       triggerValidation(["idNumber"]);
-    }
-  }, [country2]);
-  useEffect(() => {
-    const dataHasChanged = !objectsDeepEqual(data, formData);
-    const persistExternalErrors = !!(!dataHasChanged && propErrors && Object.keys(propErrors).length);
-    const newErrors = {
-      ...formErrors,
-      ...persistExternalErrors && errors
-    };
-    if (!objectsDeepEqual(errors, newErrors)) {
-      setErrors(newErrors);
-    }
-    if (persistExternalErrors) {
-      setValid("idNumber", false);
-    }
-    setData({
-      ...data,
-      ...formData
-    });
-  }, [formErrors, formData]);
-  useEffect(() => {
-    var _a, _b;
-    const adjustedValid = {
-      ...valid
-    };
-    adjustedValid.idNumber = data.idNumberExempt ? true : valid.idNumber;
-    const adjustedData = {
+  }, [data.typeOfIdentity]);
+  const {
+    sliceData,
+    updateStateSlice
+  } = useGlobalDataSlice("personalDetails");
+  useEffect(() => updateStateSlice({
+    data: {
+      ...sliceData,
       ...data
-    };
-    adjustedData.idNumber = data.idNumberExempt ? void 0 : data.idNumber;
-    if (data.idNumberExempt && formErrors.idNumber !== null)
-      setFormErrors("idNumber", null);
-    (_b = (_a = stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
-      type: "addToState",
-      value: {
-        data: adjustedData,
-        valid: adjustedValid,
-        errors,
-        fieldProblems,
-        caller: "idNum",
-        dataStoreId
+    },
+    errors,
+    valid,
+    fieldProblems
+  }), [data, errors, valid, fieldProblems]);
+  const {
+    i18n
+  } = useI18nContext();
+  const formUtils = formUtilities(props, i18n);
+  const availableIdentityTypes = ["passport", "driversLicense"];
+  return jsxs(Fragment, {
+    children: [jsx(TypeOfIdentity, {
+      availableIdentityTypes: identityTypes.filter((type) => availableIdentityTypes.includes(type)),
+      selectedIdentityType: data.typeOfIdentity,
+      setSelectedIdentityType: handleChangeFor("typeOfIdentity"),
+      formUtils,
+      isValid: valid.typeOfIdentity,
+      errorMessage: formUtils.getErrorMessage("typeOfIdentity", errors, fieldProblems)
+    }), data.typeOfIdentity === "passport" ? jsx(PassportNumber, {
+      passportNumber: data.idNumber ?? "",
+      onInput: handleChangeFor("idNumber", "input"),
+      onBlur: handleChangeFor("idNumber", "blur"),
+      formUtils,
+      isValid: valid.idNumber,
+      errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems)
+    }) : data.typeOfIdentity === "driversLicense" ? jsx(DriversLicense, {
+      driversLicense: data,
+      onLicenseNumberInput: handleChangeFor("idNumber", "input"),
+      onLicenseNumberBlur: handleChangeFor("idNumber", "blur"),
+      onCardNumberInput: handleChangeFor("licenseCardNumber", "input"),
+      onCardNumberBlur: handleChangeFor("licenseCardNumber", "blur"),
+      formUtils,
+      isValid: {
+        idNumber: valid.idNumber,
+        licenseCardNumber: valid.licenseCardNumber
+      },
+      errorMessages: {
+        idNumber: formUtils.getErrorMessage("idNumber", errors, fieldProblems),
+        licenseCardNumber: formUtils.getErrorMessage("licenseCardNumber", errors, fieldProblems)
       }
-    });
-  }, [data, valid, errors, fieldProblems, dataStoreId]);
-  const classModifiers = [formUtils.isRequiredField("idNumberExempt") ? "idNumberWithExempt" : "idNumber"];
-  if (classNames)
-    classModifiers.push(...classNames);
-  return jsx("div", {
-    className: "adyen-kyc-field__id-number",
-    children: formUtils.isRequiredField("idNumber") && jsxs(Fragment, {
-      children: [jsx(Field, {
-        name: "idNumber",
-        label: formUtils.getLabel("idNumber"),
-        classNameModifiers: classModifiers,
-        errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems),
-        disabled: data.idNumberExempt,
-        isValid: valid.idNumber,
-        dataPlaceholder: data.idNumber && dataPlaceholder,
-        children: (childProps) => jsx(InputText, {
-          ...childProps,
-          name: "idNumber",
-          value: data.idNumber,
-          placeholder: formUtils.getPlaceholder("idNumber"),
-          readonly: formUtils.isReadOnly("idNumber"),
-          onInput: handleChangeFor("idNumber", "input"),
-          onBlur: handleChangeFor("idNumber", "blur"),
-          "aria-required": true,
-          "aria-label": formUtils.getLabel("idNumber", "idNumber"),
-          "aria-invalid": !valid.idNumber,
-          inputMode: "numeric",
-          maxLength: maxLengthForField,
-          ...data.idNumberExempt && {
-            disabled: true
-          }
-        })
-      }), jsx(Field, {
-        classNameModifiers: ["idNumber__checkbox"],
-        name: "idNumberExempt",
-        children: (childProps) => formUtils.isRequiredField("idNumberExempt") && jsx(Checkbox, {
-          ...childProps,
-          label: formUtils.getLabel("idNumberExempt"),
-          checked: Boolean(data.idNumberExempt),
-          classNameModifiers: ["idNumberExempt"],
-          name: "idNumberExempt",
-          onChange: handleChangeFor("idNumberExempt")
-        })
-      }), jsx(StateContextSetter, {
-        owner: "IdNumberComp",
-        stateRef
-      })]
-    })
+    }) : void 0]
   });
 }
-const IdentityNumberComponent = memo(IdentityNumber, (prevProps, nextProps) => prevProps.country === nextProps.country && prevProps.shouldValidate === nextProps.shouldValidate && objectsDeepEqual(prevProps.errors, nextProps.errors) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors));
-IdentityNumberComponent.defaultProps = {
-  data: {},
-  onChange: () => {
-  }
-};
+const nzIdentityFields = [...additionalIdentityInfoFields, "idNumber"];
 const ERROR_CODES = {
   SSN_REMEDIATION: "1_316",
   SSN_4_DIGITS_VALIDATION: "1_3062",
@@ -14708,297 +15311,59 @@ const IdentityUSComponent = forwardRef((props, ref) => {
     USIdentityProps.dataPlaceholder = "*** — ** — ";
   }
   return jsx(IdentityNumberComponent, {
-    ...USIdentityProps,
-    ref
-  });
-});
-const handleKeys = (keys, callback, propagationMode = "stopIfMatches") => (event) => {
-  if (propagationMode === "stop")
-    event.stopPropagation();
-  if (keys.includes(event.key)) {
-    if (propagationMode === "stopIfMatches")
-      event.stopPropagation();
-    callback();
-  }
-};
-const styles = {
-  "adyen-kyc-multi-select-list": "adyen-kyc-multi-select-list",
-  "adyen-kyc-multi-select-list-item": "adyen-kyc-multi-select-list-item",
-  "adyen-kyc-multi-select-list-item--with-description": "adyen-kyc-multi-select-list-item--with-description",
-  "adyen-kyc-checkbox__label": "adyen-kyc-checkbox__label"
-};
-const MultiSelectList = ({
-  options,
-  selected,
-  onSelect,
-  mapToSelectItem
-}) => jsx("ul", {
-  className: styles["adyen-kyc-multi-select-list"],
-  children: options.map((option) => {
-    const item = mapToSelectItem(option);
-    const isSelected = selected.includes(option);
-    const handleSelect = () => {
-      const newSelection = isSelected ? selected.filter((selectedOption) => selectedOption !== option) : [...selected, option];
-      onSelect(newSelection);
-    };
-    return jsx(SelectListItem, {
-      item,
-      selected: isSelected,
-      onKeyDown: handleKeys(["Enter", " "], handleSelect),
-      onSelect: handleSelect,
-      isMulti: true,
-      className: cx([styles["adyen-kyc-multi-select-list-item"], {
-        [styles["adyen-kyc-multi-select-list-item--with-description"]]: !!item.description
-      }])
-    }, item.id);
-  })
-});
-const decisionMakerRoleValidationRules = {
-  role: {
-    modes: ["blur"],
-    validate: (role2) => !!(role2 == null ? void 0 : role2.length),
-    errorMessage: "fieldIsRequired"
-  }
-};
-const decisionMakerRoleFields = ["role"];
-const DecisionMakerRoleComponent = (props) => {
-  const {
-    data: dataProp,
-    dataStoreId,
-    validators,
-    fieldValidationErrors,
-    requiredFields,
-    allowedRoles
-  } = props;
-  const {
-    i18n
-  } = useI18nContext();
-  const {
-    data,
-    valid,
-    errors,
-    isValid,
-    fieldProblems,
-    handleChangeFor
-  } = useForm({
-    ...props,
-    schema: requiredFields || ["role"],
-    rules: validators || decisionMakerRoleValidationRules,
-    defaultData: dataProp,
-    fieldProblems: fieldValidationErrors
-  });
-  const [decisionMakerRoles2, setDecisionMakerRoles] = useState([]);
-  const stateRef = useRef$1({
-    setState: null
-  });
-  const formUtils = formUtilities(props, i18n);
-  const allowedRolesString = allowedRoles == null ? void 0 : allowedRoles.toString();
-  const makeSelectItemForDecisionMakerRole = (role2) => {
-    const validRole = decisionMakerRoles2.find((item) => item.id === role2);
-    return {
-      ...validRole,
-      disabled: !(allowedRoles == null ? void 0 : allowedRoles.includes(validRole == null ? void 0 : validRole.id))
-    };
-  };
-  const changeRoles = (roles) => {
-    handleChangeFor("role", "input")(roles);
-  };
-  useEffect(() => {
-    var _a, _b;
-    (_b = (_a = stateRef.current).setState) == null ? void 0 : _b.call(_a, {
-      type: "addToState",
-      value: {
-        data,
-        valid,
-        errors,
-        fieldProblems,
-        caller: "Role",
-        dataStoreId
-      }
-    });
-  }, [data, valid, errors, isValid, dataStoreId, fieldProblems]);
-  useEffect(() => {
-    setDecisionMakerRoles(getTranslatedDecisionMakerRoles(i18n, allowedRoles));
-  }, [allowedRoles, allowedRolesString, i18n, i18n.languageCode, i18n.locale]);
-  return jsxs("div", {
-    className: "adyen-kyc-field__role",
-    children: [jsx(StateContextSetter, {
-      stateRef
-    }), formUtils.isRequiredField("role", false) && jsx(Field, {
-      name: "role",
-      classNameModifiers: ["role"],
-      label: formUtils.getLabel("role", "selectAllTheRolesThatThisDecisionMakerHolds"),
-      errorMessage: formUtils.getErrorMessage("role", errors, fieldProblems),
-      isValid: valid.role,
-      showErrorIconBottom: true,
-      children: (childProps) => jsx(MultiSelectList, {
-        ...childProps,
-        options: allowedRoles ?? [],
-        selected: data.role ?? [],
-        onSelect: changeRoles,
-        mapToSelectItem: makeSelectItemForDecisionMakerRole
-      })
-    })]
-  });
-};
-const nameValidationRules = {
-  firstName: [{
-    validate: hasText,
-    errorMessage: "fieldIsRequired",
-    modes: ["blur"]
-  }],
-  lastName: [{
-    validate: hasText,
-    errorMessage: "fieldIsRequired",
-    modes: ["blur"]
-  }]
-};
-const specialCharsRegEx = getFormattingRegEx(SPECIAL_CHARS.replace("-", ""));
-const nameFormatters = {
-  firstName: {
-    // formatter: trimValWithOneSpace // just trim
-    // Example - removing disallowed chars as they are input: then they don't end up in state
-    formatter: (val) => val ? trimValWithOneSpace(val).replace(specialCharsRegEx, "") : void 0
-    // trim & replace
-  },
-  lastName: {
-    formatter: (val) => val ? trimValWithOneSpace(val).replace(specialCharsRegEx, "") : void 0
-  }
-};
-const nameFields = ["firstName", "lastName"];
-function NameComponent(props) {
-  const {
-    i18n
-  } = useI18nContext();
-  const schema = props.requiredFields || ["firstName", "lastName"];
-  const {
-    handleChangeFor,
-    data,
-    valid,
-    errors,
-    fieldProblems,
-    isValid
-  } = useForm({
-    ...props,
-    schema,
-    rules: nameValidationRules,
-    formatters: nameFormatters,
-    defaultData: props.data,
-    fieldProblems: props == null ? void 0 : props.fieldValidationErrors
-  });
-  const {
-    dataStoreId
-  } = props;
-  const stateRef = useRef$1({
-    setState: null
-  });
-  useEffect(() => {
-    var _a, _b, _c;
-    (_b = (_a = stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
-      type: "addToState",
-      value: {
-        data,
-        valid,
-        errors,
-        fieldProblems,
-        caller: "name",
-        dataStoreId
-      }
+    ...USIdentityProps,
+    ref
+  });
+});
+function IdentityComponent(props) {
+  var _a;
+  const {
+    personalDetails: personalDetails2,
+    country: country2,
+    errors
+  } = props;
+  const identityProps = getFieldProps(personalDetails2, idNumberFields);
+  if (!((_a = identityProps == null ? void 0 : identityProps.requiredFields) == null ? void 0 : _a.length)) {
+    return null;
+  }
+  if (country2 === "AU") {
+    const auIdentityProps = getFieldProps(personalDetails2, auIdentityFields);
+    return jsx(IdentityAuComponent, {
+      ...auIdentityProps,
+      dataStoreId: personalDetails2.id
     });
-    (_c = props.onChange) == null ? void 0 : _c.call(props, {
-      schema,
-      data,
-      valid,
+  }
+  if (country2 === "HK") {
+    const hkIdentityProps = getFieldProps(personalDetails2, hkIdentityFields);
+    return jsx(IdentityHKComponent, {
+      ...hkIdentityProps,
+      dataStoreId: personalDetails2.id
+    });
+  }
+  if (country2 === "US") {
+    return jsx(IdentityUSComponent, {
+      ...identityProps,
       errors,
-      fieldProblems,
-      isValid
+      dataStoreId: personalDetails2.id,
+      country: country2,
+      formVerificationErrors: personalDetails2.formVerificationErrors
     });
-  }, [data, valid, errors, isValid]);
-  const formUtils = formUtilities(props, i18n);
-  return jsxs("div", {
-    className: "adyen-kyc-field-wrapper",
-    children: [jsx(StateContextSetter, {
-      stateRef
-    }), formUtils.isRequiredField("firstName") && jsx(Field, {
-      name: "firstName",
-      label: formUtils.getLabel("firstName"),
-      classNameModifiers: ["firstName", "col-50"],
-      errorMessage: formUtils.getErrorMessage("firstName", errors, fieldProblems),
-      isValid: valid.firstName,
-      helper: formUtils.getLabel("enterNameExactlyAsAppearInID"),
-      children: (childProps) => jsx(InputText, {
-        ...childProps,
-        name: "firstName",
-        value: data.firstName,
-        classNameModifiers: ["name"],
-        readonly: formUtils.isReadOnly("firstName"),
-        onInput: handleChangeFor("firstName", "input"),
-        onBlur: handleChangeFor("firstName", "blur"),
-        trimOnBlur: true,
-        spellCheck: false,
-        "aria-required": true,
-        "aria-label": formUtils.getLabel("firstName"),
-        "aria-invalid": !valid.firstName
-      })
-    }), formUtils.isRequiredField("lastName") && jsx(Field, {
-      name: "lastName",
-      label: formUtils.getLabel("lastName"),
-      classNameModifiers: ["lastName", "col-50"],
-      errorMessage: formUtils.getErrorMessage("lastName", errors, fieldProblems),
-      isValid: valid.lastName,
-      helper: formUtils.getLabel("enterLastNameExactlyAsAppearInID"),
-      children: (childProps) => jsx(InputText, {
-        ...childProps,
-        name: "lastName",
-        value: data.lastName,
-        classNameModifiers: ["lastName"],
-        readonly: formUtils.isReadOnly("lastName"),
-        onInput: handleChangeFor("lastName", "input"),
-        onBlur: handleChangeFor("lastName", "blur"),
-        trimOnBlur: true,
-        spellCheck: false,
-        "aria-required": true,
-        "aria-label": formUtils.getLabel("lastName"),
-        "aria-invalid": !valid.lastName
-      })
-    })]
+  }
+  if (country2 === "NZ") {
+    const nzIdentityProps = getFieldProps(personalDetails2, nzIdentityFields);
+    return jsx(IdentityNZComponent, {
+      ...nzIdentityProps,
+      dataStoreId: personalDetails2.id
+    });
+  }
+  return jsx(IdentityNumberComponent, {
+    ...identityProps,
+    errors,
+    country: country2,
+    dataStoreId: personalDetails2.id
   });
 }
-const Name = memo(NameComponent, (prevProps, nextProps) => prevProps.shouldValidate === nextProps.shouldValidate && objectsDeepEqual(prevProps.requiredFields, nextProps.requiredFields) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors));
-NameComponent.defaultProps = {
-  data: {},
-  onChange: () => {
-  },
-  visibility: "editable",
-  validationRules: nameValidationRules
-};
-const personalDetailsValidationRules = {
-  birthDate: [{
-    modes: ["blur"],
-    validate: (birthDate2) => !!birthDate2,
-    errorMessage: "fieldIsRequired"
-  }, {
-    modes: ["blur"],
-    validate: (birthDate2) => birthDate2 && new Date(birthDate2) < /* @__PURE__ */ new Date(),
-    errorMessage: "invalidDateOfBirth"
-  }],
-  residencyCountry: {
-    modes: ["blur"],
-    validate: (residencyCountry2) => !!residencyCountry2,
-    errorMessage: "fieldIsRequired"
-  },
-  nationality: {
-    modes: ["blur"],
-    validate: (nationality2) => !!nationality2,
-    errorMessage: "fieldIsRequired"
-  },
-  jobTitle: {
-    modes: ["blur"],
-    validate: (jobTitle2) => !!jobTitle2,
-    errorMessage: "fieldIsRequired"
-  }
-};
-const personalDetailsFields = [...nameFields, "birthDate", ...idNumberFields, ...additionalIdentityInfoFields$1, "residencyCountry", "nationality", "jobTitle", ...decisionMakerRoleFields, ...contactDetailFields, ...accountHolderFields];
+const personalDetailsFields = [...nameFields, "birthDate", ...idNumberFields, ...additionalIdentityInfoFields$2, "residencyCountry", "nationality", "jobTitle", ...decisionMakerRoleFields, ...contactDetailFields, ...accountHolderFields];
 function PersonalDetailsComponent(props) {
   const {
     i18n
@@ -15037,9 +15402,6 @@ function PersonalDetailsComponent(props) {
   } = useVerification(props.verifyFields, data.residencyCountry);
   const decisionMakerRoleProps = getFieldProps(props, decisionMakerRoleFields);
   const nameProps = getFieldProps(props, nameFields);
-  const identityProps = getFieldProps(props, idNumberFields);
-  const identityAuProps = getFieldProps(props, auIdentityFields);
-  const identityHKProps = getFieldProps(props, hkIdentityFields);
   const contactDetailsFormProps = getFieldProps(props, contactDetailFields);
   const accountHolderProps = getFieldProps(props, accountHolderFields);
   this.verifyForm = () => {
@@ -15167,36 +15529,26 @@ function PersonalDetailsComponent(props) {
           max: formatDateObj(/* @__PURE__ */ new Date())
         })
       }), formUtils.isRequiredField("residencyCountry") && jsx(CountryField, {
+        data: data.residencyCountry,
+        valid: valid == null ? void 0 : valid.residencyCountry,
+        error: formUtils.getErrorMessage("residencyCountry", errors, fieldProblems),
         label: formUtils.getLabel("residencyCountry"),
+        readonly: !isAllowedEditPrefilledCountry && !isDecisionMakerTask,
         allowedCountries: [],
         classNameModifiers: ["country"],
-        errorMessage: formUtils.getErrorMessage("residencyCountry", errors, fieldProblems),
-        onDropdownChange: handleChangeFor("residencyCountry", "input"),
-        value: data.residencyCountry,
-        readOnly: !isAllowedEditPrefilledCountry && !isDecisionMakerTask
-      }), hasRequiredFields(identityProps) && (data.residencyCountry === "HK" ? jsx(IdentityHKComponent, {
-        ...identityHKProps,
-        dataStoreId: PERSONAL_DETAILS
-      }) : data.residencyCountry === "AU" ? jsx(IdentityAuComponent, {
-        ...identityAuProps,
-        dataStoreId: PERSONAL_DETAILS
-      }) : data.residencyCountry === "US" ? jsx(IdentityUSComponent, {
-        ...identityProps,
-        errors: externalErrors,
-        dataStoreId: PERSONAL_DETAILS,
+        handleChangeFor: () => handleChangeFor("residencyCountry", "input")
+      }), jsx(IdentityComponent, {
+        personalDetails: props,
         country: data.residencyCountry,
-        formVerificationErrors: props.formVerificationErrors
-      }) : jsx(IdentityNumberComponent, {
-        ...identityProps,
-        errors: externalErrors,
-        country: data.residencyCountry,
-        dataStoreId: PERSONAL_DETAILS
-      })), (data.residencyCountry === "SG" || data.residencyCountry === "HK") && formUtils.isRequiredField("nationality") && jsx(CountryField, {
+        errors: externalErrors
+      }), (data.residencyCountry === "SG" || data.residencyCountry === "HK") && formUtils.isRequiredField("nationality") && jsx(CountryField, {
+        data: data.nationality,
+        valid: valid == null ? void 0 : valid.nationality,
+        error: formUtils.getErrorMessage("nationality", errors, fieldProblems),
         label: formUtils.getLabel("nationality"),
+        readonly: formUtils.isReadOnly("nationality"),
         classNameModifiers: ["nationality"],
-        errorMessage: formUtils.getErrorMessage("nationality", errors, fieldProblems),
-        onDropdownChange: handleChangeFor("nationality", "input"),
-        value: data.nationality
+        handleChangeFor: () => handleChangeFor("nationality", "input")
       }), hasRequiredFields(contactDetailsFormProps) && jsx(ContactDetailsComp, {
         ...contactDetailsFormProps,
         dataStoreId: PERSONAL_DETAILS,
@@ -17751,13 +18103,14 @@ function PayoutVerificationMethod(props) {
         }
       })]
     }), jsx(CountryField, {
+      data: data.bankCountry,
+      valid: valid == null ? void 0 : valid.bankCountry,
+      error: formUtils.getErrorMessage("bankCountry", errors, fieldProblems),
       label: formUtils.getLabel("bankCountry", "bankAccountCountry"),
+      readonly: !intraRegionCrossBorderPayoutsAllowed || allowedBankCountries.length === 1,
       allowedCountries: allowedBankCountries,
       classNameModifiers: ["country"],
-      errorMessage: formUtils.getErrorMessage("bankCountry", errors, fieldProblems),
-      onDropdownChange: handleChangeFor("bankCountry", "input"),
-      value: data.bankCountry,
-      readOnly: !intraRegionCrossBorderPayoutsAllowed || allowedBankCountries.length === 1,
+      handleChangeFor: () => handleChangeFor("bankCountry", "input"),
       helperText: intraRegionCrossBorderPayoutsAllowed ? void 0 : i18n.get(props.legalEntityType === LegalEntityType.INDIVIDUAL ? "youCanOnlyUseABankAccountInTheCountryWhereYouLive" : "youCanOnlyUseABankAccountInTheCountryWhereYourCompanyIsRegistered")
     }), jsx(Field, {
       name: "verificationMethods",
@@ -18082,59 +18435,63 @@ function SolePropComponent(props) {
     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);
   };
-  const renderActiveForm = (activeForm) => jsxs(Fragment, {
-    children: [jsx(StateContextWatcher, {
-      owner: "SolePropComponent",
-      onChange: handleStateChange
-    }), jsx("div", {
-      className: activeForm.formId !== solePropNameAndCountryFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-      children: jsx(CompanyNameAndCountryComponent, {
-        ...solePropNameAndCountryFormProps,
-        data: {
-          ...solePropNameAndCountryFormProps == null ? void 0 : solePropNameAndCountryFormProps.data,
-          companyCountry: props.country
-        },
-        labels: {
-          companyCountry: "countryOfEstablishment",
-          legalCompanyName: "legalNameOfSoleProprietor"
-        },
-        heading: i18n.get("nameAndCountry"),
-        id: solePropNameAndCountryFormId,
-        disableCountry: true
-      })
-    }), jsx("div", {
-      className: activeForm.formId !== solePropRegistrationDetailsFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-      children: jsx(CompanyDetailsComponent, {
-        ...solePropsRegistrationDetailsFormProps,
-        data: {
-          ...solePropsRegistrationDetailsFormProps == null ? void 0 : solePropsRegistrationDetailsFormProps.data,
-          tradingName: tradingName2
-        },
-        heading: i18n.get("registrationDetails"),
-        id: solePropRegistrationDetailsFormId,
-        companyType: CompanyTypesValue.SOLE_PROPRIETORSHIP,
-        country: props.country
-      })
-    }), jsx("div", {
-      className: activeForm.formId !== solePropRegistrationAddressFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-      children: jsx(RegistrationAddressComponent, {
-        ...solePropRegistrationAddressFormProps,
-        heading: i18n.get("registeredAddress"),
-        id: solePropRegistrationAddressFormId,
-        country: props.country,
-        problems: props == null ? void 0 : props.problems,
-        handleAddressSearch: props.handleAddressSearch,
-        handleFindAddress: props.handleFindAddress
-      })
-    }), jsx("div", {
-      className: activeForm.formId !== solePropDocumentFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-      children: jsx(ConstitutionalDocumentUpload, {
-        ...solePropDocumentsFormProps,
-        id: solePropDocumentFormId,
-        legalEntityType: LegalEntityType.SOLE_PROPRIETORSHIP
-      })
-    })]
-  });
+  const renderActiveForm = (activeForm) => {
+    var _a;
+    return jsxs(Fragment, {
+      children: [jsx(StateContextWatcher, {
+        owner: "SolePropComponent",
+        onChange: handleStateChange
+      }), jsx("div", {
+        className: activeForm.formId !== solePropNameAndCountryFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
+        children: jsx(CompanyNameAndCountryComponent, {
+          ...solePropNameAndCountryFormProps,
+          data: {
+            ...solePropNameAndCountryFormProps == null ? void 0 : solePropNameAndCountryFormProps.data,
+            country: props == null ? void 0 : props.country,
+            legalCompanyName: (_a = solePropNameAndCountryFormProps == null ? void 0 : solePropNameAndCountryFormProps.data) == null ? void 0 : _a.legalCompanyName
+          },
+          labels: {
+            country: "countryOfEstablishment",
+            legalCompanyName: "legalNameOfSoleProprietor"
+          },
+          heading: i18n.get("nameAndCountry"),
+          id: solePropNameAndCountryFormId,
+          disableCountry: true
+        })
+      }), jsx("div", {
+        className: activeForm.formId !== solePropRegistrationDetailsFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
+        children: jsx(CompanyDetailsComponent, {
+          ...solePropsRegistrationDetailsFormProps,
+          data: {
+            ...solePropsRegistrationDetailsFormProps == null ? void 0 : solePropsRegistrationDetailsFormProps.data,
+            tradingName: tradingName2
+          },
+          heading: i18n.get("registrationDetails"),
+          id: solePropRegistrationDetailsFormId,
+          companyType: CompanyTypesValue.SOLE_PROPRIETORSHIP,
+          country: props.country
+        })
+      }), jsx("div", {
+        className: activeForm.formId !== solePropRegistrationAddressFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
+        children: jsx(RegistrationAddressComponent, {
+          ...solePropRegistrationAddressFormProps,
+          heading: i18n.get("registeredAddress"),
+          id: solePropRegistrationAddressFormId,
+          country: props.country,
+          problems: props == null ? void 0 : props.problems,
+          handleAddressSearch: props.handleAddressSearch,
+          handleFindAddress: props.handleFindAddress
+        })
+      }), jsx("div", {
+        className: activeForm.formId !== solePropDocumentFormId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
+        children: jsx(ConstitutionalDocumentUpload, {
+          ...solePropDocumentsFormProps,
+          id: solePropDocumentFormId,
+          legalEntityType: LegalEntityType.SOLE_PROPRIETORSHIP
+        })
+      })]
+    });
+  };
   return jsx("div", {
     className: "adyen-kyc-sol-prop",
     children: renderActiveForm(props.activeForm || solePropForms.solePropNameAndCountry)
@@ -18154,12 +18511,16 @@ const ContextHelper = ({
   })
 });
 var TrustTypes = /* @__PURE__ */ ((TrustTypes2) => {
+  TrustTypes2["BUSINESS_TRUST"] = "businessTrust";
   TrustTypes2["CASH_MANAGEMENT_TRUST"] = "cashManagementTrust";
+  TrustTypes2["CHARTIABLE_TRUST"] = "charitableTrust";
   TrustTypes2["CORPORATE_UNIT_TRUST"] = "corporateUnitTrust";
   TrustTypes2["DECEASED_ESTATE"] = "deceasedEstate";
   TrustTypes2["DISCRETIONARY_INVESTMENT_TRUST"] = "discretionaryInvestmentTrust";
   TrustTypes2["DISCRETIONARY_SERVICES_MANAGEMENT_TRUST"] = "discretionaryServicesManagementTrust";
   TrustTypes2["DISCRETIONARY_TRADING_TRUST"] = "discretionaryTradingTrust";
+  TrustTypes2["DISCRETIONARY_TRUST"] = "discretionaryTrust";
+  TrustTypes2["FAMILY_TRUST"] = "familyTrust";
   TrustTypes2["FIRST_HOME_SAVER_ACCOUNTS_TRUST"] = "firstHomeSaverAccountsTrust";
   TrustTypes2["FIXED_TRUST"] = "fixedTrust";
   TrustTypes2["FIXED_UNIT_TRUST"] = "fixedUnitTrust";
@@ -18172,8 +18533,14 @@ var TrustTypes = /* @__PURE__ */ ((TrustTypes2) => {
   return TrustTypes2;
 })(TrustTypes || {});
 const trustTypeOptions = [{
+  id: TrustTypes.BUSINESS_TRUST,
+  name: "businessTrust"
+}, {
   id: TrustTypes.CASH_MANAGEMENT_TRUST,
   name: "cashManagementTrust"
+}, {
+  id: TrustTypes.CHARTIABLE_TRUST,
+  name: "charitableTrust"
 }, {
   id: TrustTypes.CORPORATE_UNIT_TRUST,
   name: "corporateUnitTrust"
@@ -18189,6 +18556,12 @@ const trustTypeOptions = [{
 }, {
   id: TrustTypes.DISCRETIONARY_TRADING_TRUST,
   name: "discretionaryTradingTrust"
+}, {
+  id: TrustTypes.DISCRETIONARY_TRUST,
+  name: "discretionaryTrust"
+}, {
+  id: TrustTypes.FAMILY_TRUST,
+  name: "familyTrust"
 }, {
   id: TrustTypes.FIRST_HOME_SAVER_ACCOUNTS_TRUST,
   name: "firstHomeSaverAccountsTrust"
@@ -18300,14 +18673,15 @@ function TrustRegistrationDetailsComponent(props) {
         id: "ariaErrorField"
       }), jsx(ContextHelper, {
         content: i18n.get("makeSureToHaveYourTrustDeed")
-      }), formUtils.isRequiredField("country") && jsx(CountryField, {
-        label: formUtils.getLabel("country", "countryOfEstablishment"),
+      }), formUtils.isRequiredField(COUNTRY_FIELD) && jsx(CountryField, {
+        data: data.country,
+        valid: valid == null ? void 0 : valid.country,
+        error: formUtils.getErrorMessage(COUNTRY_FIELD, errors, fieldProblems),
+        label: formUtils.getLabel(COUNTRY_FIELD, "countryOfEstablishment"),
+        readonly: formUtils.isReadOnly(COUNTRY_FIELD),
         allowedCountries: ALLOWED_TRUST_COUNTRIES,
-        classNameModifiers: ["country"],
-        errorMessage: formUtils.getErrorMessage("country", errors, fieldProblems),
-        onDropdownChange: handleChangeFor("country"),
-        value: data.country,
-        readOnly: true
+        classNameModifiers: [COUNTRY_FIELD],
+        handleChangeFor
       }), formUtils.isRequiredField("legalName") && jsx(Field, {
         name: "legalName",
         label: formUtils.getLabel("legalName", "nameOfTrustAgreement"),
@@ -19541,7 +19915,7 @@ const additionalIdentityInfo = {
     rules: ["requiredIfCountryUsesMultipleTypesOfIdentity", "isDirectorIdNumberRequiredForCountry"]
   },
   issuerState: {
-    rule: "requiredIfIdentityTypeIsDriversLicense"
+    rule: "issuerStateRequired"
   },
   licenseCardNumber: {
     rule: "requiredIfIdentityTypeIsDriversLicense"
@@ -19717,7 +20091,15 @@ const fieldsPerScenario = {
     }
   }
 };
-const countryConfig = countryConfig$4;
+const countryConfig = {
+  ...countryConfig$4,
+  [CountryCodes.NewZealand]: {
+    ...countryConfig$4[CountryCodes.NewZealand],
+    registrationNumber: {
+      label: "NZBN"
+    }
+  }
+};
 function parseIndividualScenarios(scenario, country2) {
   let fieldConfigurations = scenario == null ? void 0 : scenario.reduce((scenarios, scenarioName) => ({
     ...scenarios,
@@ -20041,11 +20423,17 @@ const convertApiFieldNameToSchemaFieldName = (apiField, legalEntityType) => {
 };
 const knownProblematicFields = ["personalDetails.typeOfIdentity", "personalDetails.issuerState"];
 const getFieldsWithExistingData = (legalEntity) => {
+  var _a;
   const apiFieldsWithExistingData = getNestedPropertyKeys(legalEntity);
   const legalEntityType = legalEntity.type;
   if (!legalEntityType)
     return [];
-  return apiFieldsWithExistingData.map((field) => convertApiFieldNameToSchemaFieldName(field, legalEntityType)).filter((field) => field !== void 0).filter((field) => !knownProblematicFields.includes(field));
+  const nonDocumentFields = apiFieldsWithExistingData.map((field) => convertApiFieldNameToSchemaFieldName(field, legalEntityType)).filter((field) => field !== void 0).filter((field) => !knownProblematicFields.includes(field));
+  if ((_a = legalEntity.documentDetails) == null ? void 0 : _a.length) {
+    const documentFields = legalEntity.documentDetails.map((document2) => legalEntityDocumentToFieldMapping[legalEntityType][document2.type]).filter((field) => field !== void 0);
+    return [...nonDocumentFields, ...documentFields];
+  }
+  return nonDocumentFields;
 };
 var ToastType = /* @__PURE__ */ ((ToastType2) => {
   ToastType2["LOADING"] = "loading";
@@ -20379,7 +20767,7 @@ function CompanyDropinComponent({
   } = useConfigurationApi();
   const [data, setData] = useState(dataFromResponse);
   const [problems, setProblems] = useState(propProblems);
-  const [country2, setCountry] = useState(((_a = data == null ? void 0 : data.companyNameAndCountry) == null ? void 0 : _a.companyCountry) ?? parentCountry);
+  const [country2, setCountry] = useState(((_a = data == null ? void 0 : data.companyNameAndCountry) == null ? void 0 : _a.country) ?? parentCountry);
   const [loadingStatus, setLoadingStatus] = useState("success");
   const formRef = useRef$1(null);
   const baseTrackingPayload = getBaseTrackingPayload({
@@ -20483,7 +20871,7 @@ function CompanyDropinComponent({
     setLoadingStatus("loading");
     const companyTrackingPayload = {
       companyStructure: dataSubmitted.companyType.entityType,
-      countryOfRegistration: dataSubmitted.companyNameAndCountry.companyCountry,
+      countryOfRegistration: dataSubmitted.companyNameAndCountry.country,
       legalEntityName: dataSubmitted.companyNameAndCountry.legalCompanyName,
       usedAdditionalAddress: dataSubmitted.companyRegistrationAddress.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME
     };
@@ -20660,7 +21048,7 @@ function CompanyDropinComponent({
       activeForm,
       capabilities,
       data: dataFromResponse,
-      country: (_b = data == null ? void 0 : data.companyNameAndCountry) == null ? void 0 : _b.companyCountry,
+      country: (_b = data == null ? void 0 : data.companyNameAndCountry) == null ? void 0 : _b.country,
       problems,
       handleAddressSearch,
       handleFindAddress,
@@ -21390,58 +21778,66 @@ const ActionsMenu = ({
 };
 const Remove = ({
   onRemove,
-  onRemoveStatusChange
+  onRemoveStatusChange,
+  isRemoveDisabled,
+  handleIsRemoveDisabled
 }) => {
   const {
     i18n
   } = useI18nContext();
-  const [isUndoVisible, setIsUndoVisible] = useState(false);
   const [undoTimer, setUndoTimer] = useState(5);
+  const [isRemoving, setIsRemoving] = useState(false);
   useEffect(() => {
-    let undoTimeout;
     let undoInterval;
-    const deleteEntity = () => {
-      onRemove();
-    };
-    if (isUndoVisible) {
-      undoTimeout = setTimeout(() => {
-        setIsUndoVisible(false);
-        onRemoveStatusChange(false);
-        deleteEntity();
-      }, 5e3);
+    if (isRemoving && undoTimer > 0) {
       undoInterval = setInterval(() => {
         setUndoTimer((prevCount) => prevCount - 1);
       }, 1e3);
     }
     return () => {
-      clearTimeout(undoTimeout);
       clearInterval(undoInterval);
-      setUndoTimer(5);
     };
-  }, [isUndoVisible, setUndoTimer, setIsUndoVisible]);
+  }, [isRemoving, undoTimer]);
   const onClickHandler = (event) => {
     event.stopPropagation();
     event.preventDefault();
-    if (!isUndoVisible) {
-      setIsUndoVisible(true);
+    if (!isRemoving) {
+      setIsRemoving(true);
       onRemoveStatusChange(true);
+      handleIsRemoveDisabled(true);
     } else {
-      setIsUndoVisible(false);
+      setUndoTimer(5);
+      setIsRemoving(false);
       onRemoveStatusChange(false);
+      handleIsRemoveDisabled(false);
     }
   };
-  return jsx(Button, {
-    showAsLink: isUndoVisible,
+  useEffect(() => {
+    if (undoTimer === 0 && isRemoving) {
+      setIsRemoving(false);
+      onRemoveStatusChange(false);
+      handleIsRemoveDisabled(false);
+      onRemove();
+    }
+  }, [undoTimer, isRemoving, onRemoveStatusChange, handleIsRemoveDisabled, onRemove]);
+  return isRemoving ? jsx(Button, {
+    showAsLink: isRemoving,
     type: "button",
-    icon: !isUndoVisible ? "bin" : "",
     ghost: true,
     onClick: onClickHandler,
     onKeyDown: handleKeys(["Enter"], noop),
-    label: isUndoVisible ? i18n.get("undoWithTimer", {
+    label: i18n.get("undoWithTimer", {
       values: {
         secondsLeft: undoTimer
       }
-    }) : ""
+    })
+  }) : jsx(Button, {
+    type: "button",
+    icon: "bin",
+    ghost: true,
+    onClick: onClickHandler,
+    onKeyDown: handleKeys(["Enter"], noop),
+    disabled: isRemoveDisabled
   });
 };
 const EntityAssociation = ({
@@ -21452,7 +21848,9 @@ const EntityAssociation = ({
   problems,
   infoContent,
   onNavigateToEntity,
-  removeEntity
+  removeEntity,
+  isRemoveDisabled = false,
+  handleIsRemoveDisabled
 }) => {
   const {
     i18n
@@ -21497,11 +21895,13 @@ const EntityAssociation = ({
             open: showingActions,
             setOpen: setShowingActions
           })]
-        }), typeof removeEntity === "function" && jsx("div", {
+        }), typeof removeEntity === "function" && typeof handleIsRemoveDisabled === "function" && jsx("div", {
           className: "adl-entity-association__remove",
           children: jsx(Remove, {
             onRemove: removeEntity,
-            onRemoveStatusChange: setIsStatusRemoving
+            onRemoveStatusChange: setIsStatusRemoving,
+            isRemoveDisabled,
+            handleIsRemoveDisabled
           })
         })]
       })]
@@ -21626,6 +22026,7 @@ const DecisionMakersComponent = ({
   const {
     showToast
   } = useToastContext();
+  const [isRemoveDisabled, setIsRemoveDisabled] = useState(false);
   const decisionMakers2 = getOwnDecisionMakers(legalEntityResponse);
   const registeredCountry = (_b = (_a = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _a.registeredAddress) == null ? void 0 : _b.country;
   const availableDecisionMakers = getAvailableDecisionMakerRoleTypes(registeredCountry);
@@ -21743,7 +22144,9 @@ const DecisionMakersComponent = ({
           problems: decisionMaker2 == null ? void 0 : decisionMaker2.problems,
           removeEntity: () => {
             deleteDecisionMaker(decisionMaker2);
-          }
+          },
+          isRemoveDisabled,
+          handleIsRemoveDisabled: setIsRemoveDisabled
         }, decisionMaker2.reference))
       }) : null, jsx(Button, {
         secondary: true,
@@ -22087,7 +22490,9 @@ const TaskListItem = ({
   info,
   loading: loading2 = false,
   showErrorAlerts = "onErrorStatus",
-  removeEntity
+  removeEntity,
+  isRemoveDisabled = false,
+  handleIsRemoveDisabled
 }) => {
   const shouldShowErrorAlert = showErrorAlerts === "always" || showErrorAlerts === "onErrorStatus" && status === TaskStatus.ERROR;
   const [isStatusRemoving, setIsStatusRemoving] = useState(false);
@@ -22135,11 +22540,13 @@ const TaskListItem = ({
           children: [jsx(TaskItemStatus, {
             status: isStatusRemoving ? TaskStatus.REMOVING : status,
             downloadHandler
-          }), typeof removeEntity === "function" ? jsx("div", {
+          }), typeof removeEntity === "function" && typeof handleIsRemoveDisabled === "function" ? jsx("div", {
             className: "adyen-task-item__remove",
             children: jsx(Remove, {
               onRemove: removeEntity,
-              onRemoveStatusChange: setIsStatusRemoving
+              onRemoveStatusChange: setIsStatusRemoving,
+              isRemoveDisabled,
+              handleIsRemoveDisabled
             })
           }) : jsx(Icon, {
             className: "adl-u-color-grey-60",
@@ -22166,6 +22573,7 @@ const PayoutAccountTaskListItem = ({
   } = useI18nContext();
   const [isDeletingTransferInstrument, setIsDeletingTransferInstrument] = useState(false);
   const isInstantVerificationAccount = isInstantVerifiedAccount(account);
+  const [isRemoveDisabled, setIsRemoveDisabled] = useState(false);
   const maskedAccountNumber = getMaskedAccountNumber(account);
   const status = getTaskStatus(EntityType.BANK_ACCOUNT, capabilityProblems, legalEntityResponse, [account.id], isInstantVerificationAccount);
   return jsx(TaskListItem, {
@@ -22180,7 +22588,9 @@ const PayoutAccountTaskListItem = ({
     removeEntity: () => {
       setIsDeletingTransferInstrument(true);
       onTransferInstrumentDelete();
-    }
+    },
+    isRemoveDisabled,
+    handleIsRemoveDisabled: setIsRemoveDisabled
   });
 };
 const TaskListGroup$1 = "";
@@ -25154,50 +25564,34 @@ function StateProvider({
 const labels = (data, country2) => ({
   registrationNumber: () => {
     var _a;
-    if (country2 === CountryCodes.Monaco && ((_a = data == null ? void 0 : data.solePropNameAndCountry) == null ? void 0 : _a.companyCountry) === CountryCodes.Monaco) {
+    if (country2 === CountryCodes.Monaco && ((_a = data == null ? void 0 : data.solePropNameAndCountry) == null ? void 0 : _a.country) === CountryCodes.Monaco) {
       return "mcRegistrationNumberSoleProp";
     }
   }
 });
-const getFontFaceRule = (fontFamily, fontStyle, fontWeight, fontSrc, additionalFormats) => {
-  const ruleLines = [`font-family: '${fontFamily}'`, `font-style: ${fontStyle}`, `font-weight: ${fontWeight}`, `src: url(${fontSrc})`];
-  const additionalSources = [];
-  if (additionalFormats.eot) {
-    additionalSources.push(`url(${additionalFormats.eot}) format('embedded-opentype')`);
-  }
-  if (additionalFormats.woff) {
-    additionalSources.push(`url(${additionalFormats.woff}) format('woff')`);
-  }
-  if (additionalFormats.woff2) {
-    additionalSources.push(`url(${additionalFormats.woff2}) format('woff2')`);
-  }
-  if (additionalFormats.ttf) {
-    additionalSources.push(`url(${additionalFormats.ttf}) format('truetype')`);
-  }
-  if (additionalFormats.otf) {
-    additionalSources.push(`url(${additionalFormats.otf}) format('opentype')`);
-  }
-  if (additionalSources.length > 0) {
-    ruleLines.push(`src: ${additionalSources.join(",")};`);
-  }
+const fontFormats = ["eot", "woff", "woff2", "ttf", "otf"];
+const formatFullNames = {
+  eot: "embedded-opentype",
+  woff: "woff",
+  woff2: "woff2",
+  ttf: "truetype",
+  otf: "opentype"
+};
+const getFontFaceRule = (fontFamily, fontStyle, fontWeight, fontPath, formats) => {
+  const fontSources = formats.map((format) => `url(${fontPath}.${format}) format(${formatFullNames[format]})`);
+  const ruleLines = [`font-family: '${fontFamily}'`, `font-style: ${fontStyle}`, `font-weight: ${fontWeight}`, `src: ${fontSources.join(",")}`];
   return `@font-face {${ruleLines.join(";")}}`;
 };
-const addStyleTagForFont = (fontFamily, fontStyle, fontWeight, fontSrc, additionalFormats) => {
+const addStyleTagForFont = (fontFamily, fontStyle, fontWeight, fontPath, formats) => {
   const style = document.createElement("style");
   style.setAttribute("type", "text/css");
-  style.innerText = getFontFaceRule(fontFamily, fontStyle, fontWeight, fontSrc, additionalFormats);
-  document.body.insertBefore(style, document.body.firstChild);
+  style.innerText = getFontFaceRule(fontFamily, fontStyle, fontWeight, fontPath, formats);
+  document.head.insertBefore(style, document.head.firstChild);
 };
 const addStyleTagForADLIconFont = (loadingContext) => {
   const fontPath = `${loadingContext}static/fonts`;
   const iconFontPath = `${fontPath}/adyen-kyc-icons`;
-  addStyleTagForFont("adyen-kyc-icons", "normal", "normal", `${iconFontPath}.eot`, {
-    eot: `${iconFontPath}.eot`,
-    woff: `${iconFontPath}.woff`,
-    woff2: `${iconFontPath}.woff2`,
-    ttf: `${iconFontPath}.ttf`,
-    otf: `${iconFontPath}.otf`
-  });
+  addStyleTagForFont("adyen-kyc-icons", "normal", "normal", iconFontPath, fontFormats);
 };
 let isFlagsLoaded = false;
 let isDocumentGuidanceLoaded = false;
@@ -25800,8 +26194,8 @@ function SolePropDropinComponent({
     var _a2, _b, _c, _d;
     let summaryData = cloneObject(data2);
     let solePropCountry;
-    if ((_a2 = summaryData == null ? void 0 : summaryData.solePropNameAndCountry) == null ? void 0 : _a2.companyCountry) {
-      solePropCountry = datasetUtils.getCountryName(summaryData.solePropNameAndCountry.companyCountry);
+    if ((_a2 = summaryData == null ? void 0 : summaryData.solePropNameAndCountry) == null ? void 0 : _a2.country) {
+      solePropCountry = datasetUtils.getCountryName(summaryData.solePropNameAndCountry.country);
     }
     summaryData.solePropNameAndCountry = {
       legalNameOfSoleProprietor: (_b = data2.solePropNameAndCountry) == null ? void 0 : _b.legalCompanyName,
@@ -25842,7 +26236,7 @@ function SolePropDropinComponent({
     children: jsx(SolePropWithFormComposer, {
       capabilities,
       data,
-      country: ((_a = data == null ? void 0 : data.solePropNameAndCountry) == null ? void 0 : _a.companyCountry) || country2,
+      country: ((_a = data == null ? void 0 : data.solePropNameAndCountry) == null ? void 0 : _a.country) || country2,
       problems,
       eventEmitter,
       hideDropinLayout,
@@ -27028,23 +27422,6 @@ const getLegalEntity = async (context) => {
     }
   });
 };
-const getPayoutFormats = async (context, country2) => {
-  const {
-    loadingContext,
-    sdkToken,
-    legalEntityId
-  } = context;
-  return httpGet({
-    loadingContext,
-    errorLevel: "warn",
-    errorMessage: `Payout account format not available`,
-    path: `${legalEntityId}/configurations/payoutAccountFormats/${country2}`,
-    sdkToken,
-    headers: {
-      "Content-Type": "application/json"
-    }
-  });
-};
 const getScenarios = async (context) => {
   const {
     loadingContext,
@@ -27387,6 +27764,15 @@ const AuthProvider = ({
     children
   });
 };
+const accountFormatsImports = /* @__PURE__ */ Object.assign({ "./AD.json": () => import("./AD-43128b9f.mjs"), "./AE.json": () => import("./AE-81598d61.mjs"), "./AG.json": () => import("./AG-ed98ae0e.mjs"), "./AI.json": () => import("./AI-3e78c886.mjs"), "./AL.json": () => import("./AL-3ad2778a.mjs"), "./AM.json": () => import("./AM-6a5175fb.mjs"), "./AN.json": () => import("./AN-311f7139.mjs"), "./AO.json": () => import("./AO-99b5ef59.mjs"), "./AQ.json": () => import("./AQ-effe27c7.mjs"), "./AR.json": () => import("./AR-4013d95c.mjs"), "./AS.json": () => import("./AS-f15d56b2.mjs"), "./AT.json": () => import("./AT-d4d62b74.mjs"), "./AU.json": () => import("./AU-b9cba969.mjs"), "./AW.json": () => import("./AW-581f73fb.mjs"), "./AX.json": () => import("./AX-07af957a.mjs"), "./AZ.json": () => import("./AZ-be214142.mjs"), "./BA.json": () => import("./BA-af4be83f.mjs"), "./BB.json": () => import("./BB-df28f015.mjs"), "./BD.json": () => import("./BD-7aef0af6.mjs"), "./BE.json": () => import("./BE-fc7cf8d5.mjs"), "./BF.json": () => import("./BF-090b06e2.mjs"), "./BG.json": () => import("./BG-1f54cf4f.mjs"), "./BH.json": () => import("./BH-1e9cc2b9.mjs"), "./BJ.json": () => import("./BJ-d5dd5c6f.mjs"), "./BM.json": () => import("./BM-a808b13f.mjs"), "./BN.json": () => import("./BN-b13f6f6a.mjs"), "./BR.json": () => import("./BR-55d93100.mjs"), "./BS.json": () => import("./BS-db6a5bce.mjs"), "./BT.json": () => import("./BT-dfed2604.mjs"), "./BV.json": () => import("./BV-e123b0a8.mjs"), "./BW.json": () => import("./BW-08473bd7.mjs"), "./BY.json": () => import("./BY-2762d989.mjs"), "./BZ.json": () => import("./BZ-7f28b1ff.mjs"), "./CA.json": () => import("./CA-aa1f78ab.mjs"), "./CC.json": () => import("./CC-2cc6ac39.mjs"), "./CF.json": () => import("./CF-78ae0244.mjs"), "./CH.json": () => import("./CH-47f538c0.mjs"), "./CI.json": () => import("./CI-10feb889.mjs"), "./CK.json": () => import("./CK-e308c734.mjs"), "./CL.json": () => import("./CL-4a6c3e0b.mjs"), "./CM.json": () => import("./CM-fddc630d.mjs"), "./CN.json": () => import("./CN-46bb9203.mjs"), "./CO.json": () => import("./CO-1b150cda.mjs"), "./CR.json": () => import("./CR-2bf50f66.mjs"), "./CU.json": () => import("./CU-904aea8f.mjs"), "./CX.json": () => import("./CX-750ccd92.mjs"), "./CY.json": () => import("./CY-1508b23e.mjs"), "./CZ.json": () => import("./CZ-b6eaa1d5.mjs"), "./DE.json": () => import("./DE-e02051d4.mjs"), "./DJ.json": () => import("./DJ-0032728a.mjs"), "./DK.json": () => import("./DK-6116657e.mjs"), "./DM.json": () => import("./DM-a2c158c9.mjs"), "./DO.json": () => import("./DO-cedffa27.mjs"), "./DZ.json": () => import("./DZ-d44be6f8.mjs"), "./EC.json": () => import("./EC-c2e5813b.mjs"), "./EE.json": () => import("./EE-1a10f52d.mjs"), "./EG.json": () => import("./EG-8f29aebd.mjs"), "./EH.json": () => import("./EH-2dafda3e.mjs"), "./ES.json": () => import("./ES-42b3562e.mjs"), "./ET.json": () => import("./ET-ffa87ef0.mjs"), "./FI.json": () => import("./FI-8e3bb2bb.mjs"), "./FJ.json": () => import("./FJ-088ea689.mjs"), "./FK.json": () => import("./FK-16d84ff5.mjs"), "./FM.json": () => import("./FM-32616e6f.mjs"), "./FO.json": () => import("./FO-62c08e45.mjs"), "./FR.json": () => import("./FR-3db03e20.mjs"), "./GA.json": () => import("./GA-4de2f994.mjs"), "./GB.json": () => import("./GB-28ea0b5a.mjs"), "./GD.json": () => import("./GD-0ad67069.mjs"), "./GE.json": () => import("./GE-0f594b35.mjs"), "./GF.json": () => import("./GF-a062cea7.mjs"), "./GG.json": () => import("./GG-e00581ea.mjs"), "./GH.json": () => import("./GH-80209e7e.mjs"), "./GI.json": () => import("./GI-b0f7c8b3.mjs"), "./GL.json": () => import("./GL-8f5e8ba9.mjs"), "./GM.json": () => import("./GM-ff3ca013.mjs"), "./GN.json": () => import("./GN-fc7c0f8c.mjs"), "./GP.json": () => import("./GP-68f23382.mjs"), "./GQ.json": () => import("./GQ-f9867fbd.mjs"), "./GR.json": () => import("./GR-64a2d25c.mjs"), "./GS.json": () => import("./GS-49ce0f4c.mjs"), "./GT.json": () => import("./GT-fa779b14.mjs"), "./GU.json": () => import("./GU-f0dceb37.mjs"), "./GW.json": () => import("./GW-471336ea.mjs"), "./GY.json": () => import("./GY-2889ae39.mjs"), "./HK.json": () => import("./HK-0561cac3.mjs"), "./HM.json": () => import("./HM-924a724f.mjs"), "./HN.json": () => import("./HN-6dae206e.mjs"), "./HR.json": () => import("./HR-85763090.mjs"), "./HT.json": () => import("./HT-a659da85.mjs"), "./HU.json": () => import("./HU-f9ea5037.mjs"), "./ID.json": () => import("./ID-cb5cfce1.mjs"), "./IE.json": () => import("./IE-b341cbd2.mjs"), "./IL.json": () => import("./IL-657901df.mjs"), "./IM.json": () => import("./IM-5bd6279a.mjs"), "./IN.json": () => import("./IN-3c11df0e.mjs"), "./IO.json": () => import("./IO-24f6d2e7.mjs"), "./IQ.json": () => import("./IQ-241c0148.mjs"), "./IS.json": () => import("./IS-4a7e436f.mjs"), "./IT.json": () => import("./IT-f9755e76.mjs"), "./JE.json": () => import("./JE-46968fa2.mjs"), "./JM.json": () => import("./JM-a6657a34.mjs"), "./JO.json": () => import("./JO-bd1eabea.mjs"), "./JP.json": () => import("./JP-9b5a30fa.mjs"), "./KE.json": () => import("./KE-2a866579.mjs"), "./KG.json": () => import("./KG-7713761d.mjs"), "./KH.json": () => import("./KH-a5f0f831.mjs"), "./KI.json": () => import("./KI-8376e298.mjs"), "./KM.json": () => import("./KM-48c8c9c0.mjs"), "./KN.json": () => import("./KN-b34777c7.mjs"), "./KR.json": () => import("./KR-8bcf8499.mjs"), "./KW.json": () => import("./KW-4dd6ab01.mjs"), "./KY.json": () => import("./KY-4f921c93.mjs"), "./KZ.json": () => import("./KZ-68b655f3.mjs"), "./LA.json": () => import("./LA-582a34e2.mjs"), "./LB.json": () => import("./LB-7e5023a3.mjs"), "./LC.json": () => import("./LC-4e610f91.mjs"), "./LI.json": () => import("./LI-3979434e.mjs"), "./LK.json": () => import("./LK-23f5002d.mjs"), "./LT.json": () => import("./LT-2076ca77.mjs"), "./LU.json": () => import("./LU-b0538582.mjs"), "./LV.json": () => import("./LV-440617df.mjs"), "./MA.json": () => import("./MA-f2af9aa6.mjs"), "./MC.json": () => import("./MC-f619d821.mjs"), "./MD.json": () => import("./MD-ffe4e2f4.mjs"), "./ME.json": () => import("./ME-46686aa8.mjs"), "./MH.json": () => import("./MH-c535387d.mjs"), "./MK.json": () => import("./MK-11442cf1.mjs"), "./ML.json": () => import("./ML-b2c3720e.mjs"), "./MM.json": () => import("./MM-0ae1a124.mjs"), "./MN.json": () => import("./MN-baba0d9d.mjs"), "./MO.json": () => import("./MO-2c51f9f7.mjs"), "./MP.json": () => import("./MP-55044c4b.mjs"), "./MQ.json": () => import("./MQ-aaefd2b2.mjs"), "./MR.json": () => import("./MR-f122a6f0.mjs"), "./MS.json": () => import("./MS-7623ec5f.mjs"), "./MT.json": () => import("./MT-315c76bb.mjs"), "./MU.json": () => import("./MU-126673fe.mjs"), "./MV.json": () => import("./MV-d8748aca.mjs"), "./MW.json": () => import("./MW-26492427.mjs"), "./MX.json": () => import("./MX-ca79b44b.mjs"), "./MY.json": () => import("./MY-443e729e.mjs"), "./MZ.json": () => import("./MZ-192a5094.mjs"), "./NC.json": () => import("./NC-3849aac0.mjs"), "./NE.json": () => import("./NE-bf76bc84.mjs"), "./NF.json": () => import("./NF-46f5dffa.mjs"), "./NG.json": () => import("./NG-458396e5.mjs"), "./NI.json": () => import("./NI-efe8c864.mjs"), "./NL.json": () => import("./NL-3e38d0eb.mjs"), "./NO.json": () => import("./NO-088fac56.mjs"), "./NP.json": () => import("./NP-26b20587.mjs"), "./NR.json": () => import("./NR-ba1f7da1.mjs"), "./NU.json": () => import("./NU-6dc3ed45.mjs"), "./NZ.json": () => import("./NZ-12ed2cb9.mjs"), "./OM.json": () => import("./OM-4976855b.mjs"), "./PA.json": () => import("./PA-3b45122a.mjs"), "./PE.json": () => import("./PE-ad6e8281.mjs"), "./PF.json": () => import("./PF-2b1b6f30.mjs"), "./PG.json": () => import("./PG-b94ea47f.mjs"), "./PH.json": () => import("./PH-1b96a1eb.mjs"), "./PK.json": () => import("./PK-35cadd30.mjs"), "./PL.json": () => import("./PL-6a490cd1.mjs"), "./PM.json": () => import("./PM-d508f3c5.mjs"), "./PN.json": () => import("./PN-1f6ccf43.mjs"), "./PR.json": () => import("./PR-730f2830.mjs"), "./PS.json": () => import("./PS-f3ef78cd.mjs"), "./PT.json": () => import("./PT-66954cea.mjs"), "./PW.json": () => import("./PW-0d1c7797.mjs"), "./PY.json": () => import("./PY-c8e58794.mjs"), "./QA.json": () => import("./QA-35be8b1e.mjs"), "./RE.json": () => import("./RE-9f92ed9b.mjs"), "./RO.json": () => import("./RO-5c62edb1.mjs"), "./RS.json": () => import("./RS-bc256d90.mjs"), "./RU.json": () => import("./RU-bbee5e73.mjs"), "./RW.json": () => import("./RW-95b5d859.mjs"), "./SA.json": () => import("./SA-69b2f72a.mjs"), "./SB.json": () => import("./SB-567c239a.mjs"), "./SC.json": () => import("./SC-9e5a0d31.mjs"), "./SE.json": () => import("./SE-4ed53265.mjs"), "./SG.json": () => import("./SG-970463e3.mjs"), "./SH.json": () => import("./SH-d8ab21b7.mjs"), "./SI.json": () => import("./SI-3b6d3545.mjs"), "./SJ.json": () => import("./SJ-e3430cfd.mjs"), "./SK.json": () => import("./SK-2385e057.mjs"), "./SL.json": () => import("./SL-92bf45d9.mjs"), "./SM.json": () => import("./SM-bafbc267.mjs"), "./SN.json": () => import("./SN-5733e740.mjs"), "./SO.json": () => import("./SO-d5b69054.mjs"), "./SR.json": () => import("./SR-0a8c71c0.mjs"), "./ST.json": () => import("./ST-d40d86c1.mjs"), "./TC.json": () => import("./TC-ccbc7116.mjs"), "./TD.json": () => import("./TD-679d137c.mjs"), "./TF.json": () => import("./TF-6bfcf75d.mjs"), "./TG.json": () => import("./TG-a20ef9ed.mjs"), "./TH.json": () => import("./TH-e39a447c.mjs"), "./TK.json": () => import("./TK-89a81d38.mjs"), "./TL.json": () => import("./TL-8d6ca9b7.mjs"), "./TN.json": () => import("./TN-6e746476.mjs"), "./TO.json": () => import("./TO-a8c55d73.mjs"), "./TR.json": () => import("./TR-b1175ddc.mjs"), "./TT.json": () => import("./TT-5c4a3940.mjs"), "./TV.json": () => import("./TV-e1a267b9.mjs"), "./TW.json": () => import("./TW-9e0e34fa.mjs"), "./TZ.json": () => import("./TZ-c8a8159b.mjs"), "./UA.json": () => import("./UA-7014199a.mjs"), "./UG.json": () => import("./UG-1fe39fa7.mjs"), "./UM.json": () => import("./UM-3fcbf872.mjs"), "./US.json": () => import("./US-6fbdfc0c.mjs"), "./UY.json": () => import("./UY-e6d05d75.mjs"), "./UZ.json": () => import("./UZ-433656c8.mjs"), "./VA.json": () => import("./VA-e8e13d32.mjs"), "./VC.json": () => import("./VC-331669c0.mjs"), "./VE.json": () => import("./VE-5e7b0d3b.mjs"), "./VG.json": () => import("./VG-43e85e33.mjs"), "./VI.json": () => import("./VI-3d9d6d8b.mjs"), "./VN.json": () => import("./VN-9442a8c1.mjs"), "./VU.json": () => import("./VU-96fae02f.mjs"), "./WF.json": () => import("./WF-90a27056.mjs"), "./WS.json": () => import("./WS-ddcb2b71.mjs"), "./YE.json": () => import("./YE-02c4c81e.mjs"), "./YT.json": () => import("./YT-33751cc9.mjs"), "./ZA.json": () => import("./ZA-0084b083.mjs"), "./ZM.json": () => import("./ZM-c6a4d6cc.mjs") });
+const getAccountFormatsForCountry = async (country2) => {
+  const importForCountry = accountFormatsImports[`./${country2}.json`];
+  if (!importForCountry) {
+    throw Error(`No account formats available for ${country2}`);
+  }
+  return (await importForCountry()).default;
+};
+const getPayoutAccountFormat = async (country2) => getAccountFormatsForCountry(country2);
 const getEmbeddedApi = ({
   base,
   sdkToken,
@@ -27412,7 +27798,7 @@ const getEmbeddedApi = ({
         taskList: tasks
       };
     },
-    getPayoutAccountFormat: async (country2) => getPayoutFormats(baseRequestContext, country2),
+    getPayoutAccountFormat: async (country2) => getPayoutAccountFormat(country2),
     getDataset: async (datasetIdentifier2, locale) => getDataset$1({
       ...baseRequestContext,
       loadingContext
@@ -27481,19 +27867,6 @@ const companyIndexSearch = async (context, data) => {
     }
   }, data);
 };
-const getPayoutAccountFormat = async (context, country2) => {
-  const {
-    loadingContext,
-    clientKey
-  } = context;
-  return httpGet({
-    loadingContext,
-    errorLevel: "warn",
-    errorMessage: `Payout account format configuration is not available`,
-    path: `v1/configuration/accountFormats/${country2}`,
-    clientKey
-  });
-};
 const getAllowedCountries = async (context) => {
   const {
     loadingContext,
@@ -27664,10 +28037,7 @@ const getKycExternalApi = ({
     loadingContext,
     clientKey
   }, request),
-  getPayoutAccountFormat: async (country2) => getPayoutAccountFormat({
-    loadingContext,
-    clientKey
-  }, country2),
+  getPayoutAccountFormat: async (country2) => getPayoutAccountFormat(country2),
   getAllowedCountries: async () => getAllowedCountries({
     loadingContext,
     clientKey
@@ -27742,32 +28112,26 @@ const CoreProvider = ({
   const {
     getAllowedCountries: getAllowedCountries2
   } = useConfigurationApi();
-  const [loaded, setLoaded] = useState(false);
   const [contextCountry, setContextCountry] = useState(initialContextCountry);
   const [accountHolder2, setAccountHolder] = useState(null);
   const [accountFormat, setAccountFormat] = useState("local");
-  const init2 = async () => {
+  useEffect(() => {
     addStyleTagForADLIconFont(loadingContext);
-    try {
+  }, [loadingContext]);
+  useEffect(() => {
+    const checkIfCountryIsAllowed = async () => {
       const allowedCountries = (await getAllowedCountries2()).countries;
       if (!allowedCountries.includes(contextCountry)) {
-        throw new Error(`
+        logger$2.warn(`
 
 "${contextCountry}" isn't a supported country. Please use one of the following:
 - ${listify(allowedCountries)}.
                    `);
       }
-    } catch (e) {
-      logger$2.warn(e);
-    } finally {
-      setLoaded(true);
-    }
-  };
-  useEffect(() => {
-    init2().catch(logger$2.error);
-  });
+    };
+    checkIfCountryIsAllowed().catch(logger$2.warn);
+  }, [contextCountry, getAllowedCountries2]);
   const contextValue = useMemo(() => ({
-    loadingContext,
     isReview,
     setContextCountry,
     contextCountry,
@@ -27775,13 +28139,10 @@ const CoreProvider = ({
     accountHolder: accountHolder2,
     setAccountFormat,
     accountFormat
-  }), [contextCountry, loaded, accountHolder2, accountFormat]);
-  if (!loaded) {
-    return null;
-  }
+  }), [isReview, contextCountry, accountHolder2, accountFormat]);
   return jsx(CoreContext.Provider, {
     value: contextValue,
-    children: children && toChildArray(children)
+    children
   });
 };
 function ExperimentsContextProvider({