@adyen/kyc-components 3.0.0-beta.13 → 3.0.0-beta.15

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

@@ -62,6 +62,7 @@ const uploadDocument = "Upload Document";
 const individualDetails = "Individual details";
 const socialSecurityNumber = "Last 4 digits of Social Security Number (SSN)";
 const socialSecurityNumber9Digits = "Social Security Number (SSN)";
+const socialInsuranceNumber = "Social Insurance Number (SIN)";
 const codiceFiscale = "Codice fiscale";
 const personnummer = "Personnummer";
 const dni = "DNI";
@@ -121,6 +122,8 @@ const nationality$1 = "Nationality";
 const dateOfIncorporation = "Date of incorporation";
 const passportExpiryDate = "Passport expiry date";
 const proofOfNationality = "Proof of nationality";
+const identityNumberExempt__US = "I don't have an SSN";
+const identityNumberExempt__CA = "I don't have an SIN";
 const uploadDocumentForSsn = "Upload an ID document instead of SSN";
 const uploadDocumentForNric = "Upload an ID document instead of NRIC";
 const operationalAddressHeader = "Additional address";
@@ -224,13 +227,6 @@ const pleaseNote = "Please note:";
 const byClickingSubmitReview = "By clicking 'Submit review', you confirm that all of your information has been reviewed, and that all newly provided or already existing data is accurate and up-to-date.";
 const nameAndCountry = "Name and country";
 const companyCountry = "Where is your business located?";
-const legalCompanyName = "Legal name of the company";
-const legalCompanyNameHelper = "Enter the name exactly as it is on your company's official registration documents.";
-const legalCompanyNameHelper__AU = "Enter the name exactly as it is on your Australian Securities and Investment Commission's (ASIC)";
-const legalCompanyNameHelper__NL = "Enter the name exactly as it is on your Chamber of Commerce registration.";
-const legalCompanyNameHelper__US = "Enter the name exactly as it is on on your Secretary of State registration.";
-const legalCompanyNameHelper__SG = "Enter the name exactly as it is on your Accounting and Corporate Regulatory Authority (ACRA) BizFile";
-const legalCompanyNameHelper__HK = "Enter the name exactly as it is on your Hong Kong Companies Registry's Certificate of Incorporation";
 const accountDetailsDescription = "Provide a few details about you to start accepting live payments.";
 const provideDetails = "Provide details";
 const payoutAccountsDescription = "To set up your account, let us know where to send your payouts.";
@@ -303,6 +299,10 @@ const bankCityTown = "Bank city/town";
 const clearingCode = "Clearing code";
 const bankCode = "Bank code";
 const bankName = "Bank name";
+const accountNumber = "Account number";
+const bsbCode = "Bank State Branch (BSB) code";
+const branchNumber = "Branch Number";
+const clearingNumber = "Clearing Number";
 const achRoutingNumber = "ACH routing number";
 const decisionMaker = "Decision-makers";
 const decisionMakerDescription = "Provide the information of the owners, controlling persons, and signatories in your company. Keep in mind that one person may hold multiple roles. The requirements are as follows:";
@@ -457,7 +457,7 @@ const ICO = "IČO (Identifikační číslo)";
 const handelsregisternummer = "Handelsregisternummer";
 const NumeroDeTVA = "Numéro de TVA";
 const organisasjonsnummer = "Organisasjonsnummer";
-const skattenummer = "Skattenummer";
+const mvanummer = "MVA nummer";
 const verificationErrorMessage = "Some information couldn’t be verified. Click to see what needs to be adjusted.";
 const remediationFormErrorMessage = "Some information couldn’t be verified. Information in this form may need to be adjusted.";
 const youHaveUnsavedChanges = "You have unsaved changes";
@@ -591,6 +591,8 @@ const solePropDetails = "Sole proprietor details";
 const soleProprietorDetails = "Sole proprietor details";
 const selectAccountHolder = "Select account holder";
 const nameOfBankAccountHolder = "We need to know about the bank account where you want to receive your payouts. What is the name of the account holder of that bank account?";
+const enterValidAccountDetails = "Please enter valid account details";
+const enterValid_ = "Please enter valid: %{fieldNames}";
 const myName = "My name";
 const myNameDescription = "It’s a personal bank account held in my own name";
 const mySoleProprietorName = "My sole proprietor name";
@@ -676,12 +678,12 @@ const documentIssuedWithinLastYear = "Note! The document needs to be issued with
 const learnMore = "Learn more";
 const doingBusinessAsNameFiling = "Doing business as-name filling";
 const taxFiling = "Tax-filling";
-const continueAsCompany = "Continue as a company?";
-const continueAsIndividual = "Continue as an individual?";
-const indicatedPayoutToCompany = "You indicated that you want to be paid out to a bank account that is owned by a company, such as a private company, public company, partnership, or non-profit organization. This means that we need to collect some information about your company too.";
-const continueSigningUpAsCompany = "Do you want to continue signing up with your company information?";
-const indicatedPayoutToPersonalAccount = "You indicated that you want to be paid out to a bank account that is owned by you personally. This means you will continue as an individual, not a company. However, if you operate as a private company, public company, partnership, or non-profit organization, then you cannot continue as an individual.";
-const continueSigningUpAsIndividual = "Do you want to continue signing up as an individual?";
+const areYouACompany = "Are you a company?";
+const singingUpAsIndividualButLooksLikeYouAreACompany = "You’re now signing up as an individual. But it looks like you’re a company that uses a company bank account to receive payouts.";
+const wouldYouLikeToSignUpAsCompanyInstead = "Would you like to sign up as a company instead? (You’ll have to re-enter some information from before.)";
+const areYouAnIndividual = "Are you an individual?";
+const singingUpAsCompanyButLooksLikeYouAreAnIndividual = "You’re now signing up as an company. But it looks like you’re an individual who uses your personal bank account to receive payouts.";
+const wouldYouLikeToSignUpAsIndividualInstead = "Would you like to sign up as an individual instead? (You’ll have to re-enter some information from before.)";
 const noGoBack = "No, go back";
 const continueCompany = "Continue as company";
 const continueIndividual = "Continue as individual";
@@ -692,7 +694,6 @@ const addresses = "Addresses";
 const loading = "Loading";
 const businessIncorporationNumber = "Business incorporation number";
 const doNotHaveBusinessIncorporationNumber = "I do not have a Business incorporation number";
-const socialInsuranceNumber = "Social insurance number";
 const verificationMethod = "Verification method";
 const verifyViaMobileBankAppOrBankWebsite = "Verify the account via mobile bank app or bank website";
 const provideAccountDetailsAndUploadBankStatement = "Provide account details and upload a scan of a bank statement";
@@ -761,6 +762,13 @@ const passportPhotoPage = "Passport photo page";
 const residencePermitBack = "Residence permit (back)";
 const residencePermitFront = "Residence permit (front)";
 const manualUpload = "Manual upload";
+const legalCompanyName = "Legal name of the company";
+const legalCompanyName__helperText = "Enter the name exactly as it is on your company's official registration documents.";
+const legalCompanyName__helperText__AU = "Enter the name exactly as it is on your Australian Securities and Investment Commission's (ASIC).";
+const legalCompanyName__helperText__NL = "Enter the name exactly as it is on your Chamber of Commerce registration.";
+const legalCompanyName__helperText__US = "Enter the name exactly as it appears on your Secretary of State Registration.";
+const legalCompanyName__helperText__SG = "Enter the name exactly as it is on your Accounting and Corporate Regulatory Authority (ACRA) BizFile.";
+const legalCompanyName__helperText__HK = "Enter the name exactly as it is on your Hong Kong Companies Registry's Certificate of Incorporation.";
 const errorMessage_1_10 = "Information couldn’t be verified";
 const errorMessage_1_11 = "Document didn’t meet requirements";
 const errorMessage_1_12 = "Legal entity declined";
@@ -1133,6 +1141,7 @@ const defaultTrans = {
   individualDetails,
   socialSecurityNumber,
   socialSecurityNumber9Digits,
+  socialInsuranceNumber,
   codiceFiscale,
   personnummer,
   dni,
@@ -1192,6 +1201,8 @@ const defaultTrans = {
   dateOfIncorporation,
   passportExpiryDate,
   proofOfNationality,
+  identityNumberExempt__US,
+  identityNumberExempt__CA,
   uploadDocumentForSsn,
   uploadDocumentForNric,
   operationalAddressHeader,
@@ -1295,13 +1306,6 @@ const defaultTrans = {
   byClickingSubmitReview,
   nameAndCountry,
   companyCountry,
-  legalCompanyName,
-  legalCompanyNameHelper,
-  legalCompanyNameHelper__AU,
-  legalCompanyNameHelper__NL,
-  legalCompanyNameHelper__US,
-  legalCompanyNameHelper__SG,
-  legalCompanyNameHelper__HK,
   accountDetailsDescription,
   provideDetails,
   payoutAccountsDescription,
@@ -1374,6 +1378,10 @@ const defaultTrans = {
   clearingCode,
   bankCode,
   bankName,
+  accountNumber,
+  bsbCode,
+  branchNumber,
+  clearingNumber,
   achRoutingNumber,
   decisionMaker,
   decisionMakerDescription,
@@ -1531,7 +1539,7 @@ const defaultTrans = {
   handelsregisternummer,
   NumeroDeTVA,
   organisasjonsnummer,
-  skattenummer,
+  mvanummer,
   verificationErrorMessage,
   remediationFormErrorMessage,
   youHaveUnsavedChanges,
@@ -1667,6 +1675,8 @@ const defaultTrans = {
   soleProprietorDetails,
   selectAccountHolder,
   nameOfBankAccountHolder,
+  enterValidAccountDetails,
+  enterValid_,
   myName,
   myNameDescription,
   mySoleProprietorName,
@@ -1761,12 +1771,12 @@ const defaultTrans = {
   learnMore,
   doingBusinessAsNameFiling,
   taxFiling,
-  continueAsCompany,
-  continueAsIndividual,
-  indicatedPayoutToCompany,
-  continueSigningUpAsCompany,
-  indicatedPayoutToPersonalAccount,
-  continueSigningUpAsIndividual,
+  areYouACompany,
+  singingUpAsIndividualButLooksLikeYouAreACompany,
+  wouldYouLikeToSignUpAsCompanyInstead,
+  areYouAnIndividual,
+  singingUpAsCompanyButLooksLikeYouAreAnIndividual,
+  wouldYouLikeToSignUpAsIndividualInstead,
   "continue": "Continue",
   noGoBack,
   continueCompany,
@@ -1778,7 +1788,6 @@ const defaultTrans = {
   loading,
   businessIncorporationNumber,
   doNotHaveBusinessIncorporationNumber,
-  socialInsuranceNumber,
   verificationMethod,
   verifyViaMobileBankAppOrBankWebsite,
   provideAccountDetailsAndUploadBankStatement,
@@ -1849,6 +1858,13 @@ const defaultTrans = {
   residencePermitBack,
   residencePermitFront,
   manualUpload,
+  legalCompanyName,
+  legalCompanyName__helperText,
+  legalCompanyName__helperText__AU,
+  legalCompanyName__helperText__NL,
+  legalCompanyName__helperText__US,
+  legalCompanyName__helperText__SG,
+  legalCompanyName__helperText__HK,
   errorMessage_1_10,
   errorMessage_1_11,
   errorMessage_1_12,
@@ -2391,12 +2407,26 @@ const useCoreContext = () => {
   return context;
 };
 const Summary$1 = "";
+const omitKeys = (obj, omit) => Object.keys(obj).filter((k) => !omit.includes(k)).reduce((a, c) => {
+  a[c] = obj[c];
+  return a;
+}, {});
+const addKeys = (obj, add2, initialValue, defaultData, pendingData) => add2.reduce((a, c) => ({
+  ...a,
+  [c]: a[c] ?? (pendingData == null ? void 0 : pendingData[c]) ?? (defaultData == null ? void 0 : defaultData[c]) ?? initialValue
+}), obj);
+function getDataByFields(formData, fieldKeys) {
+  return entriesOf(formData).reduce((acc, [key, val]) => {
+    if (fieldKeys.includes(key)) {
+      return {
+        ...acc,
+        [key]: val
+      };
+    }
+    return acc;
+  }, {});
+}
 const formUtilities = (props, i18n) => ({
-  getPlaceholder: (field, fallbackPlaceholderKey) => {
-    var _a, _b;
-    const translationKey = fallbackPlaceholderKey ? ((_a = props.placeholders) == null ? void 0 : _a[field]) ?? fallbackPlaceholderKey : (_b = props.placeholders) == null ? void 0 : _b[field];
-    return translationKey ? i18n.get(translationKey) : "";
-  },
   getLabel: (field, fallbackLabelKey) => {
     var _a, _b;
     let translationKey = ((_a = props.labels) == null ? void 0 : _a[field]) ?? fallbackLabelKey ?? field;
@@ -2412,6 +2442,11 @@ const formUtilities = (props, i18n) => ({
     }
     return i18n.get(translationKey);
   },
+  getPlaceholder: (field, fallbackPlaceholderKey) => {
+    var _a, _b;
+    const translationKey = fallbackPlaceholderKey ? ((_a = props.placeholders) == null ? void 0 : _a[field]) ?? fallbackPlaceholderKey : (_b = props.placeholders) == null ? void 0 : _b[field];
+    return translationKey ? i18n.get(translationKey) : "";
+  },
   getHelperText: (field, fallbackHelperTextKey) => {
     var _a, _b;
     const translationKey = fallbackHelperTextKey ? ((_a = props.helperText) == null ? void 0 : _a[field]) ?? fallbackHelperTextKey : (_b = props.helperText) == null ? void 0 : _b[field];
@@ -2451,7 +2486,70 @@ const formUtilities = (props, i18n) => ({
       return i18n.get(translationKey, translationObject);
     }
     return errorMessage ? i18n.get(errorMessage) : Boolean(fieldProblems == null ? void 0 : fieldProblems[field]);
-  }
+  },
+  getFieldData: (formData, fieldKeys) => getDataByFields(formData, fieldKeys),
+  getFieldValid: (formValid, fieldKeys) => entriesOf(formValid).reduce((acc, [key, val]) => fieldKeys.includes(key) ? {
+    ...acc,
+    [key]: val
+  } : acc, {}),
+  getFieldErrors: (formErrors, fieldProblems, fieldKeys) => Object.keys(formErrors).reduce((acc, key) => {
+    var _a;
+    if (fieldKeys.includes(key)) {
+      const error = (_a = formErrors == null ? void 0 : formErrors[key]) == null ? void 0 : _a.errorMessage;
+      if (typeof error === "object") {
+        const {
+          translationKey,
+          translationObject
+        } = error;
+        return {
+          ...acc,
+          [key]: i18n.get(translationKey, translationObject)
+        };
+      }
+      return error ? {
+        ...acc,
+        [key]: i18n.get(error)
+      } : {
+        ...acc,
+        [key]: Boolean(fieldProblems == null ? void 0 : fieldProblems[key])
+      };
+    }
+    return acc;
+  }, {}),
+  getFieldLabels: (fieldKeys, fallbackLabelKeys) => fieldKeys.reduce((acc, field) => {
+    var _a, _b;
+    let translationKey = ((_a = props.labels) == null ? void 0 : _a[field]) ?? (fallbackLabelKeys == null ? void 0 : fallbackLabelKeys[field]) ?? field;
+    if (props.labels && !((_b = props.labels) == null ? void 0 : _b[field]) && Object.keys(props.labels).length) {
+      const parentKey = Object.keys(props.labels).find((fieldKey) => {
+        var _a2;
+        return typeof ((_a2 = props.labels) == null ? void 0 : _a2[fieldKey]) === "object";
+      });
+      if (parentKey) {
+        const nestedLabel = props.labels[parentKey][field];
+        translationKey = nestedLabel ?? translationKey;
+      }
+    }
+    return {
+      ...acc,
+      [field]: i18n.get(translationKey)
+    };
+  }, {}),
+  getFieldPlaceholders: (fieldKeys, fallbackPlaceholderKeys) => fieldKeys.reduce((acc, field) => {
+    var _a, _b;
+    const translationKey = (fallbackPlaceholderKeys == null ? void 0 : fallbackPlaceholderKeys[field]) ? ((_a = props.placeholders) == null ? void 0 : _a[field]) ?? (fallbackPlaceholderKeys == null ? void 0 : fallbackPlaceholderKeys[field]) : (_b = props.placeholders) == null ? void 0 : _b[field];
+    return translationKey ? {
+      ...acc,
+      [field]: i18n.get(translationKey)
+    } : acc;
+  }, {}),
+  getFieldHelperText: (fieldKeys, fallbackHelperTextKeys) => fieldKeys.reduce((acc, field) => {
+    var _a, _b;
+    const translationKey = (fallbackHelperTextKeys == null ? void 0 : fallbackHelperTextKeys[field]) ? ((_a = props.helperText) == null ? void 0 : _a[field]) ?? (fallbackHelperTextKeys == null ? void 0 : fallbackHelperTextKeys[field]) : (_b = props.helperText) == null ? void 0 : _b[field];
+    return translationKey ? {
+      ...acc,
+      [field]: i18n.get(translationKey)
+    } : acc;
+  }, {})
 });
 const MAX_LENGTH = 30;
 const getMaxLengthByFormatRuleset = (formattingRules, field) => {
@@ -2524,6 +2622,14 @@ function mergeCountryBasedRulesets(defaultRuleset, countryBasedRuleset, country2
 }
 const isUndefinedOrNull = (input) => !!(input === void 0 || input === null);
 const isEmpty = (input) => !!(isUndefinedOrNull(input) || typeof input === "object" && Object.keys(input).length === 0 || typeof input === "string" && /^[\s]*$/.test(input));
+const hasEmptyFields = (input) => input && (Object.keys(input).length === 0 || Object.values(input).some((value) => value === void 0 || value === null || value === ""));
+const extractFieldName = (inputString) => {
+  const fieldNames = inputString == null ? void 0 : inputString.split(".");
+  const fieldName = (fieldNames == null ? void 0 : fieldNames.length) > 0 ? fieldNames[fieldNames.length - 1] : "";
+  return fieldName;
+};
+const mapKeyToFieldName = (i18n, key) => i18n == null ? void 0 : i18n.get(key);
+const concatenateFieldNames = (fieldNames) => fieldNames == null ? void 0 : fieldNames.join(", ");
 const isString = (input) => typeof input === "string" || input instanceof String;
 const hasText = (input) => isString(input) && !isEmpty(input);
 const SPECIAL_CHARS = "?\\-\\+_=!@#$%^&*(){}~<>\\[\\]\\/\\\\";
@@ -3069,14 +3175,6 @@ function useResetGlobalData(caller) {
     }
   }), [dispatch, caller]);
 }
-const omitKeys = (obj, omit) => Object.keys(obj).filter((k) => !omit.includes(k)).reduce((a, c) => {
-  a[c] = obj[c];
-  return a;
-}, {});
-const addKeys = (obj, add2, initialValue, defaultData, pendingData) => add2.reduce((a, c) => ({
-  ...a,
-  [c]: a[c] ?? (pendingData == null ? void 0 : pendingData[c]) ?? (defaultData == null ? void 0 : defaultData[c]) ?? initialValue
-}), obj);
 const processField = ({
   key,
   value = null,
@@ -3491,6 +3589,7 @@ function useForm({
   asyncRules,
   fieldProblems,
   maskedFields,
+  optionalFields,
   formatters,
   shouldValidate = false
 }) {
@@ -3502,20 +3601,26 @@ function useForm({
     asyncValidationResults
   } = useAsyncValidator(asyncRules);
   const getRequiredFields = useMemo(() => typeof schema === "function" ? schema : () => schema, [schema]);
+  const getSchema = useMemo(() => {
+    if (optionalFields) {
+      return defaultData ? [...getRequiredFields(defaultData), ...optionalFields] : [];
+    }
+    return defaultData ? getRequiredFields(defaultData) : [];
+  }, [optionalFields, defaultData, getRequiredFields]);
   const getReducer = useCallback(() => reducer({
     staticValidate: triggerStaticValidation,
     asyncValidate: triggerAsyncValidation,
     formatters
   }), [triggerStaticValidation, triggerAsyncValidation, formatters]);
   const getInitialData = useCallback(() => ({
-    schema: defaultData ? getRequiredFields(defaultData) : [],
+    schema: getSchema,
     defaultData,
     fieldProblems,
     maskedFields,
     formatters,
     staticValidate: triggerStaticValidation,
     asyncValidate: triggerAsyncValidation
-  }), [defaultData, fieldProblems, maskedFields, formatters, getRequiredFields, triggerStaticValidation, triggerAsyncValidation]);
+  }), [getSchema, defaultData, fieldProblems, maskedFields, formatters, triggerStaticValidation, triggerAsyncValidation]);
   const [state2, dispatch] = useReducer(getReducer(), getInitialData(), init);
   const isValid = useMemo(() => {
     var _a;
@@ -4850,12 +4955,12 @@ const Select = ({
   });
 };
 const logger$m = createLogger("CountryField");
-const COUNTRY_FIELD = "country";
+const COUNTRY_FIELD = ["country"];
 function CountryField({
   data,
   valid,
-  error,
-  label,
+  errors,
+  labels: labels2,
   readonly,
   handleChangeFor,
   helperText,
@@ -4878,27 +4983,21 @@ 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_FIELD,
-    label: label || i18n.get(COUNTRY_FIELD),
-    errorMessage: error,
+    name: "country",
+    label: (labels2 == null ? void 0 : labels2.country) || i18n.get("country"),
+    errorMessage: errors.country,
     classNameModifiers,
-    isValid: valid,
-    helper: helperText,
+    isValid: valid.country,
+    helper: helperText == null ? void 0 : helperText.country,
     children: (childProps) => jsx(Select, {
       ...childProps,
-      name: COUNTRY_FIELD,
+      name: "country",
       placeholder: i18n.get("selectCountry"),
-      selected: data,
+      selected: data.country,
       items: countries,
       readonly: (countries.length === 1 || readonly) && !!data,
-      onChange: handleCompanyChangeFor
+      onChange: handleChangeFor("country")
     })
   });
 }
@@ -5030,46 +5129,34 @@ const InputText = forwardRef(({
   );
 });
 InputText.displayName = "InputText";
-const LEGAL_COMPANY_NAME_FIELD = "legalCompanyName";
+const LEGAL_COMPANY_NAME_FIELD = ["legalCompanyName"];
 function LegalCompanyNameField({
   data,
   valid,
-  error,
-  label,
+  errors,
+  labels: labels2,
   helperText,
   readonly,
   handleChangeFor
 }) {
-  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: helperText,
-    classNameModifiers: [LEGAL_COMPANY_NAME_FIELD],
-    errorMessage: error,
-    isValid: valid,
+    name: "legalCompanyName",
+    label: labels2.legalCompanyName,
+    helper: helperText == null ? void 0 : helperText.legalCompanyName,
+    errorMessage: errors.legalCompanyName,
+    isValid: valid.legalCompanyName,
+    classNameModifiers: ["legalCompanyName"],
     children: (childProps) => jsx(InputText, {
       ...childProps,
       "aria-required": true,
-      "aria-label": label,
-      "aria-invalid": !valid,
-      name: LEGAL_COMPANY_NAME_FIELD,
-      value: data,
+      "aria-label": labels2.legalCompanyName,
+      "aria-invalid": !valid.legalCompanyName,
+      name: "legalCompanyName",
+      value: data.legalCompanyName,
       readonly,
-      classNameModifiers: [LEGAL_COMPANY_NAME_FIELD],
-      onInput: handleLegalCompanyNameInput,
-      onBlur: handleLegalCompanyNameBlur
+      classNameModifiers: ["legalCompanyName"],
+      onInput: handleChangeFor("legalCompanyName", "input"),
+      onBlur: handleChangeFor("legalCompanyName", "blur")
     })
   });
 }
@@ -5112,7 +5199,7 @@ const companyCountryValidationRules = {
     errorMessage: "fieldIsRequired"
   }
 };
-const companyNameAndCountryFields = [LEGAL_COMPANY_NAME_FIELD, COUNTRY_FIELD];
+const companyNameAndCountryFields = [...LEGAL_COMPANY_NAME_FIELD, ...COUNTRY_FIELD];
 function CompanyNameAndCountry(props) {
   const {
     i18n
@@ -5161,22 +5248,24 @@ function CompanyNameAndCountry(props) {
       validationErrors: props == null ? void 0 : props.fieldValidationErrors,
       formUtils,
       id: "ariaErrorField"
-    }), 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),
+    }), formData.country === "US" ? jsx(PatriotActDisclosure, {}) : void 0, formUtils.isRequiredField("country") && jsx(CountryField, {
+      data: formUtils.getFieldData(formData, COUNTRY_FIELD),
+      valid: formUtils.getFieldValid(formValid, COUNTRY_FIELD),
+      errors: formUtils.getFieldErrors(formErrors, formFieldProblems, COUNTRY_FIELD),
+      labels: formUtils.getFieldLabels(COUNTRY_FIELD),
       readonly: !isAllowedEditPrefilledCountry || Boolean(props == null ? void 0 : props.disableCountry),
-      classNameModifiers: [COUNTRY_FIELD],
+      classNameModifiers: ["country"],
       allowedCountries: [],
       handleChangeFor
-    }), formUtils.isRequiredField(LEGAL_COMPANY_NAME_FIELD) && jsx(LegalCompanyNameField, {
-      data: formData.legalCompanyName,
-      valid: formValid.legalCompanyName,
-      error: formUtils.getErrorMessage(LEGAL_COMPANY_NAME_FIELD, formErrors, formFieldProblems),
-      label: formUtils.getLabel(LEGAL_COMPANY_NAME_FIELD),
-      helperText: formUtils.getHelperText(LEGAL_COMPANY_NAME_FIELD, "legalCompanyNameHelper"),
-      readonly: formUtils.isReadOnly(LEGAL_COMPANY_NAME_FIELD),
+    }), formUtils.isRequiredField("legalCompanyName") && jsx(LegalCompanyNameField, {
+      data: formUtils.getFieldData(formData, LEGAL_COMPANY_NAME_FIELD),
+      valid: formUtils.getFieldValid(formValid, LEGAL_COMPANY_NAME_FIELD),
+      errors: formUtils.getFieldErrors(formErrors, formFieldProblems, LEGAL_COMPANY_NAME_FIELD),
+      labels: formUtils.getFieldLabels(LEGAL_COMPANY_NAME_FIELD),
+      helperText: formUtils.getFieldHelperText(LEGAL_COMPANY_NAME_FIELD, {
+        legalCompanyName: "legalCompanyName__helperText"
+      }),
+      readonly: formUtils.isReadOnly("legalCompanyName"),
       handleChangeFor
     })]
   });
@@ -7896,7 +7985,7 @@ const fieldsPerScenario$3 = {
 const countryConfig$4 = {
   [CountryCodes.Australia]: {
     legalCompanyName: {
-      helperText: "legalCompanyNameHelper__AU"
+      helperText: "legalCompanyName__helperText__AU"
     },
     legalEntityType: {
       label: "companyType"
@@ -8092,7 +8181,7 @@ const countryConfig$4 = {
   },
   [CountryCodes.HongKong]: {
     legalCompanyName: {
-      helperText: "legalCompanyNameHelper__HK"
+      helperText: "legalCompanyName__helperText__HK"
     },
     legalEntityType: {
       label: "typeOfCompany"
@@ -8251,7 +8340,7 @@ const countryConfig$4 = {
       label: "chamberOfCommerceRegistrationNumber"
     },
     legalCompanyName: {
-      helperText: "legalCompanyNameHelper__NL"
+      helperText: "legalCompanyName__helperText__NL"
     },
     exemptedFromVat: {
       label: "vatNumberExempted"
@@ -8291,7 +8380,7 @@ const countryConfig$4 = {
       label: "vatNumberAbsenceReason"
     },
     vatNumber: {
-      label: "skattenummer"
+      label: "mvanummer"
     }
   },
   [CountryCodes.Poland]: {
@@ -8382,7 +8471,7 @@ const countryConfig$4 = {
       label: "uen"
     },
     legalCompanyName: {
-      helperText: "legalCompanyNameHelper__SG"
+      helperText: "legalCompanyName__helperText__SG"
     },
     legalEntityType: {
       label: "companyType"
@@ -8438,7 +8527,7 @@ const countryConfig$4 = {
   },
   [CountryCodes.UnitedStates]: {
     legalCompanyName: {
-      helperText: "legalCompanyNameHelper__US"
+      helperText: "legalCompanyName__helperText__US"
     },
     tradingName: {
       label: "doingBusinessAs"
@@ -8655,14 +8744,14 @@ const rules$3 = ({
     }
   },
   isProofOfResidenceRequired: () => {
-    var _a;
-    if ((_a = data.proofOfResidence) == null ? void 0 : _a.proofOfResidence) {
+    var _a, _b;
+    if ((_b = (_a = data.proofOfResidence) == null ? void 0 : _a.proofOfResidence) == null ? void 0 : _b.length) {
       return REQUIRED;
     }
   },
   isProofOfNationalIdRequired: () => {
-    var _a;
-    if ((_a = data.proofOfNationalId) == null ? void 0 : _a.proofOfNationalId) {
+    var _a, _b;
+    if ((_b = (_a = data.proofOfNationalId) == null ? void 0 : _a.proofOfNationalId) == null ? void 0 : _b.length) {
       return REQUIRED;
     }
   },
@@ -9163,6 +9252,8 @@ function bytesToSize(bytes) {
   return `${(bytes / 1024 ** i).toFixed()} ${sizes[i]}`;
 }
 const DropzoneFile$1 = "";
+const isExistingFile = (file) => "existing" in file && file.existing;
+const isNewlyUploadedFile = (file) => !isExistingFile(file);
 function DropzoneFile(props) {
   const {
     file,
@@ -9212,7 +9303,7 @@ function DropzoneFile(props) {
         className: "adyen-kyc-dropzone-file__size",
         children: [jsxs("span", {
           children: [i18n.get("complete"), " "]
-        }), formatSize(file.size)]
+        }), isNewlyUploadedFile(file) ? formatSize(file.size) : void 0]
       })]
     }), jsx("button", {
       type: "button",
@@ -9232,6 +9323,7 @@ const defaultFileValidationOptions = {
   // 4MB by default
   isOptional: false
 };
+const filterOnlyNewlyUploadedFiles = (files) => files.filter(isNewlyUploadedFile);
 const fileValidationRules = ({
   allowedFileTypes,
   maxNumberOfFiles,
@@ -9265,7 +9357,7 @@ const fileValidationRules = ({
   validate: (files) => {
     if (!files)
       return true;
-    return files.every((file) => allowedFileTypes.some((filetype) => file.name.toLowerCase().endsWith(filetype.toLowerCase())));
+    return filterOnlyNewlyUploadedFiles(files).every((file) => allowedFileTypes.some((filetype) => file.name.toLowerCase().endsWith(filetype.toLowerCase())));
   },
   errorMessage: "unsupportedFiletype",
   modes: ["blur", "input"]
@@ -9273,7 +9365,7 @@ const fileValidationRules = ({
   validate: (files) => {
     if (!files)
       return true;
-    return files.every((file) => !file.size || file.size < maxSize);
+    return filterOnlyNewlyUploadedFiles(files).every((file) => !file.size || file.size < maxSize);
   },
   errorMessage: "maximumFileSizeExceeded",
   modes: ["blur", "input"]
@@ -9770,12 +9862,11 @@ const mapAddressLabels = (data, datasetUtils) => {
   }
   return data;
 };
-const STATE_FIELD = "stateOrProvince";
 function StateField({
   data,
   valid,
-  error,
-  label,
+  errors,
+  labels: labels2,
   readonly,
   handleChangeFor,
   selectedCountry,
@@ -9788,30 +9879,24 @@ function StateField({
     dataset: states,
     loaded
   } = useDataset(datasetIdentifier.state(selectedCountry), !selectedCountry || !COUNTRIES_WITH_STATES_DATASET.includes(selectedCountry));
-  const handleStateChangeFor = useCallback((e) => {
-    const {
-      value
-    } = e.target;
-    handleChangeFor(STATE_FIELD)(value);
-  }, [handleChangeFor]);
-  const labelKey = getKeyForField(STATE_FIELD, selectedCountry);
+  const labelKey = getKeyForField("stateOrProvince", selectedCountry);
   const placeholderKey = getKeyForField("stateOrProvincePlaceholder", selectedCountry);
   if (!loaded || !states.length)
     return null;
   return jsx(Field, {
-    name: STATE_FIELD,
-    label: label || i18n.get(labelKey),
+    name: "stateOrProvince",
+    label: (labels2 == null ? void 0 : labels2.stateOrProvince) || i18n.get(labelKey),
     classNameModifiers,
-    errorMessage: error,
-    isValid: valid,
+    errorMessage: errors.stateOrProvince,
+    isValid: valid.stateOrProvince,
     children: (childProps) => jsx(Select, {
       ...childProps,
-      name: STATE_FIELD,
-      selected: data,
+      name: "stateOrProvince",
+      selected: data.stateOrProvince,
       placeholder: i18n.get(placeholderKey),
       items: states,
-      readonly: readonly && !!data,
-      onChange: handleStateChangeFor
+      readonly: readonly && !!data.stateOrProvince,
+      onChange: handleChangeFor("stateOrProvince")
     })
   });
 }
@@ -9840,10 +9925,18 @@ 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),
+          data: {
+            country: value
+          },
+          valid: {
+            country: valid == null ? void 0 : valid.country
+          },
+          errors: {
+            country: errorMessage
+          },
+          labels: {
+            country: formUtils.getLabel(field)
+          },
           readonly: formUtils.isReadOnly(field),
           classNameModifiers,
           allowedCountries,
@@ -9852,10 +9945,18 @@ function FieldContainer(props) {
         });
       case "stateOrProvince":
         return jsx(StateField, {
-          data: value,
-          valid: valid == null ? void 0 : valid.stateOrProvince,
-          error: errorMessage,
-          label: formUtils.getLabel(field),
+          data: {
+            stateOrProvince: value
+          },
+          valid: {
+            stateOrProvince: valid == null ? void 0 : valid.stateOrProvince
+          },
+          errors: {
+            stateOrProvince: errorMessage
+          },
+          labels: {
+            stateOrProvince: formUtils.getLabel(field)
+          },
           readonly: formUtils.isReadOnly(field),
           classNameModifiers,
           selectedCountry: data.country,
@@ -10725,7 +10826,8 @@ function RegistrationAddressComponent(props) {
     heading,
     description: description2,
     handleAddressSearch,
-    handleFindAddress
+    handleFindAddress,
+    optionalFields
   } = props;
   const {
     data: formData,
@@ -10738,7 +10840,8 @@ function RegistrationAddressComponent(props) {
     schema: ["operationalAddressIsSame"],
     defaultData: data,
     rules: validators || registrationAddressValidationRules,
-    maskedFields: []
+    maskedFields: [],
+    optionalFields
   });
   const formUtils = formUtilities(props, i18n);
   const stateRef = useRef({
@@ -11115,9 +11218,10 @@ const createDocumentRequest = async ({
   description: description2,
   existingDocument
 }) => {
-  const promises = [fileToBase64(page1), fileToBase64(page2)].filter(Boolean);
-  const [encodedFront, encodedBack] = await Promise.all(promises);
-  if (!encodedFront) {
+  const pagesToUpload = [page1, page2].filter((page) => page !== void 0 && isNewlyUploadedFile(page));
+  const [page1ToUpload, page2ToUpload] = pagesToUpload;
+  const [encodedPage1, encodedPage2] = await Promise.all(pagesToUpload.map(fileToBase64));
+  if (!encodedPage1) {
     if (existingDocument && existingDocument.description !== description2) {
       return {
         owner: {
@@ -11137,7 +11241,7 @@ const createDocumentRequest = async ({
     },
     type: documentType2,
     description: description2 || `Document type: ${documentType2}`,
-    attachments: [...page1 && page2 && encodedFront && encodedBack ? [createAttachment(encodedFront, page1.name, "front"), createAttachment(encodedBack, page2.name, "back")] : [createAttachment(encodedFront, page1.name)]]
+    attachments: [...page1ToUpload && page2ToUpload && encodedPage1 && encodedPage2 ? [createAttachment(encodedPage1, page1ToUpload.name, "front"), createAttachment(encodedPage2, page2ToUpload.name, "back")] : [createAttachment(encodedPage1, page1ToUpload.name)]]
   };
 };
 const createAttachment = (content, pageName, pageType) => ({
@@ -11158,15 +11262,10 @@ const hasDocumentChanged = (newDocument, entityId) => {
   return true;
 };
 const fileToBase64 = (file) => new Promise((resolve, reject) => {
-  if (!file || !(file instanceof Blob)) {
-    resolve();
-    return;
-  }
   const reader = new FileReader();
   reader.readAsDataURL(file);
   reader.onload = () => {
-    var _a;
-    const base64String = (_a = reader.result) == null ? void 0 : _a.toString().split(";base64,")[1];
+    const base64String = reader.result.toString().split(";base64,")[1];
     resolve(base64String);
   };
   reader.onerror = (error) => reject(error);
@@ -11645,10 +11744,17 @@ const isPartOfTrustFromLegalEntity = (legalEntity) => {
   var _a;
   return (_a = legalEntity == null ? void 0 : legalEntity.entityAssociations) == null ? void 0 : _a.some((ea) => ea.entityType === LegalEntityType.TRUST && ea.associatorId === legalEntity.id);
 };
+const getRootTrusteeLegalEntityId = (trustEntity) => {
+  var _a;
+  if (!trustEntity.entityAssociations)
+    return "";
+  return (_a = trustEntity.entityAssociations.filter((entityAssociation) => entityAssociation.type === LegalEntityType.TRUST)[0]) == null ? void 0 : _a.legalEntityId;
+};
 const getOwnTrustMembers = (trustEntity) => {
   if (!trustEntity.entityAssociations)
     return [];
-  return trustEntity.entityAssociations.filter((entityAssociation) => Object.values(TrustMemberTypes).includes(entityAssociation.type) && entityAssociation.associatorId === trustEntity.id);
+  const rootTrusteeLegalEntityId = getRootTrusteeLegalEntityId(trustEntity);
+  return trustEntity.entityAssociations.filter((entityAssociation) => Object.values(TrustMemberTypes).includes(entityAssociation.type) && rootTrusteeLegalEntityId === (entityAssociation == null ? void 0 : entityAssociation.associatorId));
 };
 const getOwnTrustMembersLegalEntityIds = (legalEntity) => getOwnTrustMembers(legalEntity).map((ea) => ea.legalEntityId).filter((id2) => id2 !== void 0);
 const getOwnTrustLegalEntityId = (legalEntity) => {
@@ -12502,6 +12608,10 @@ const mapIndividualDocumentToApiDocument = async (data, entityId) => {
     return documents2.filter(Boolean);
   }
 };
+const mapExistingFile = (name) => ({
+  name,
+  existing: true
+});
 const mapApiIdDocumentToSchema = (idDocument2) => {
   const {
     hasBackPage
@@ -12512,14 +12622,10 @@ const mapApiIdDocumentToSchema = (idDocument2) => {
   const backPage2 = hasBackPage ? getPage(idDocument2, "back") : void 0;
   return {
     ...frontPage2 ? {
-      idFrontPage: [{
-        name: frontPage2.pageName
-      }]
+      idFrontPage: [mapExistingFile(frontPage2.pageName)]
     } : {},
     ...backPage2 ? {
-      idBackPage: [{
-        name: backPage2.pageName
-      }]
+      idBackPage: [mapExistingFile(backPage2.pageName)]
     } : {},
     idDocumentType: idDocument2.type
   };
@@ -12530,12 +12636,12 @@ const mapApiDocumentToIndividualDocuments = (entityId) => {
   const proofOfNationalId2 = getDocument$1(entityId, DocumentType.PROOF_OF_NATIONAL_ID_NUMBER) || null;
   return {
     idDocument: idDocument2 ? mapApiIdDocumentToSchema(idDocument2) : null,
-    proofOfResidence: proofOfResidence2 ? [{
-      name: getPageName(proofOfResidence2)
-    }] : null,
-    proofOfNationalId: proofOfNationalId2 ? [{
-      name: getPageName(proofOfNationalId2)
-    }] : null
+    proofOfResidence: proofOfResidence2 ? {
+      proofOfResidence: [mapExistingFile(getPageName(proofOfResidence2))]
+    } : null,
+    proofOfNationalId: proofOfNationalId2 ? {
+      proofOfNationalId: [mapExistingFile(getPageName(proofOfNationalId2))]
+    } : null
   };
 };
 const mapCompanyDocumentToApiDocument = async (data, entityId) => {
@@ -12572,14 +12678,10 @@ const mapApiDocumentToCompanyDocuments = (entityId) => {
   const taxDocument2 = getDocument$1(entityId, DocumentType.VAT_DOCUMENT) ?? getDocument$1(entityId, DocumentType.PROOF_OF_ORGANIZATION_TAX_INFO) ?? null;
   return {
     companyRegistrationDocument: registrationDocument2 ? {
-      registrationDocument: [{
-        name: getPageName(registrationDocument2)
-      }]
+      registrationDocument: [mapExistingFile(getPageName(registrationDocument2))]
     } : null,
     companyTaxDocument: taxDocument2 ? {
-      taxDocument: [{
-        name: getPageName(taxDocument2)
-      }]
+      taxDocument: [mapExistingFile(getPageName(taxDocument2))]
     } : null
   };
 };
@@ -12599,9 +12701,7 @@ const mapApiDocumentToTrustDocument = (entityId) => {
   const constitutionalDocument2 = getDocument$1(entityId, DocumentType.CONSTITUTIONAL_DOCUMENT) || null;
   return {
     trustConstitutionalDocument: constitutionalDocument2 ? {
-      constitutionalDocument: [{
-        name: getPageName(constitutionalDocument2)
-      }]
+      constitutionalDocument: [mapExistingFile(getPageName(constitutionalDocument2))]
     } : null
   };
 };
@@ -12621,9 +12721,7 @@ const mapApiDocumentToSolePropDocuments = (entityId) => {
   const constitutionalDocument2 = getDocument$1(entityId, DocumentType.CONSTITUTIONAL_DOCUMENT) || null;
   return {
     solePropConstitutionalDocument: constitutionalDocument2 ? {
-      constitutionalDocument: [{
-        name: getPageName(constitutionalDocument2)
-      }]
+      constitutionalDocument: [mapExistingFile(getPageName(constitutionalDocument2))]
     } : null
   };
 };
@@ -12650,9 +12748,7 @@ const mapPayoutDocumentsToApiDocuments = async (data, entityId) => {
 const mapApiDocumentToPayoutDocuments = (entityId) => {
   const bankStatement2 = getDocument$1(entityId, DocumentType.BANK_STATEMENT) || null;
   return {
-    bankStatementDocument: bankStatement2 ? [{
-      name: getPageName(bankStatement2)
-    }] : null,
+    bankStatementDocument: bankStatement2 ? [mapExistingFile(getPageName(bankStatement2))] : null,
     description: bankStatement2.description
   };
 };
@@ -12755,27 +12851,21 @@ function IdDocumentManualUploadComponent(props) {
       const document2 = idDocumentType ? getDocument$1(props.legalEntityId, idDocumentType) : void 0;
       if (!document2) {
         setIdFrontPage({
-          idFrontPage: null
+          idFrontPage: void 0
         });
         setIdBackPage({
-          idBackPage: null
+          idBackPage: void 0
         });
       } else if (hasBackPage(idDocumentType)) {
         setIdFrontPage({
-          idFrontPage: [{
-            name: getPageName(document2, "front")
-          }]
+          idFrontPage: [mapExistingFile(getPageName(document2, "front"))]
         });
         setIdBackPage({
-          idBackPage: [{
-            name: getPageName(document2, "back")
-          }]
+          idBackPage: [mapExistingFile(getPageName(document2, "back"))]
         });
       } else {
         setIdFrontPage({
-          idFrontPage: [{
-            name: getPageName(document2)
-          }]
+          idFrontPage: [mapExistingFile(getPageName(document2))]
         });
       }
     }
@@ -12877,7 +12967,7 @@ const useIdVerificationToken = ({
     lastName: lastName2,
     residencyCountry: residencyCountry2
   } = userDetails;
-  const [sdkToken, setSdkToken] = useState();
+  const [sdkToken2, setSdkToken2] = useState();
   const [loadingStatus, setLoadingStatus] = useState();
   const hasAllUserDetails = userDetails && Object.values(userDetails).every(Boolean);
   useEffect(() => {
@@ -12903,9 +12993,9 @@ const useIdVerificationToken = ({
           // Do not include legalEntityId if we don't know yet. Eg.: decision-makers flow the associated legalEntityId.
         };
         const {
-          sdkToken: sdkToken2
+          sdkToken: sdkToken22
         } = await handleGetIdVerificationToken("", data);
-        setSdkToken(sdkToken2);
+        setSdkToken2(sdkToken22);
       } catch (e) {
         onIdVerificationError == null ? void 0 : onIdVerificationError(e);
       } finally {
@@ -12914,7 +13004,7 @@ const useIdVerificationToken = ({
     })().catch(console.error);
   }, [firstName2, lastName2, residencyCountry2, hasAllUserDetails]);
   return {
-    sdkToken,
+    sdkToken: sdkToken2,
     loadingStatus
   };
 };
@@ -13458,7 +13548,7 @@ function IdVerificationComponent({
     i18n
   } = useI18nContext();
   const {
-    sdkToken,
+    sdkToken: sdkToken2,
     loadingStatus
   } = useIdVerificationToken({
     userDetails,
@@ -13469,10 +13559,10 @@ function IdVerificationComponent({
   const onfidoSdk = useRef();
   useEffect(() => {
     (async () => {
-      if (!sdkToken)
+      if (!sdkToken2)
         return;
       onfidoSdk.current = await initOnfido({
-        token: sdkToken,
+        token: sdkToken2,
         i18n,
         onIdVerificationClose,
         onIdVerificationError,
@@ -13483,7 +13573,7 @@ function IdVerificationComponent({
       if (onfidoSdk.current)
         onfidoSdk.current.tearDown();
     };
-  }, [sdkToken]);
+  }, [sdkToken2]);
   useEffect(() => {
     if (!onfidoSdk.current)
       return;
@@ -15774,10 +15864,18 @@ 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"),
+        data: {
+          country: data.residencyCountry
+        },
+        valid: {
+          country: valid.residencyCountry
+        },
+        errors: {
+          country: formUtils.getErrorMessage("residencyCountry", errors, fieldProblems)
+        },
+        labels: {
+          country: formUtils.getLabel("residencyCountry")
+        },
         readonly: !isAllowedEditPrefilledCountry && !isDecisionMakerTask,
         allowedCountries: [],
         classNameModifiers: ["country"],
@@ -15787,10 +15885,18 @@ function PersonalDetailsComponent(props) {
         country: data.residencyCountry,
         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"),
+        data: {
+          country: data.nationality
+        },
+        valid: {
+          country: valid.nationality
+        },
+        errors: {
+          country: formUtils.getErrorMessage("nationality", errors, fieldProblems)
+        },
+        labels: {
+          country: formUtils.getLabel("nationality")
+        },
         readonly: formUtils.isReadOnly("nationality"),
         classNameModifiers: ["nationality"],
         handleChangeFor: () => handleChangeFor("nationality", "input")
@@ -16123,6 +16229,29 @@ function IndividualComponent(props) {
   });
 }
 const PayoutDetails = "";
+const useAsyncAccountDetailsValidationRules = (payload, hasEmptyFields2) => {
+  const {
+    accountIdentification: accountIdentification2
+  } = useConfigurationApi();
+  const [accountValidationData, setAccountValidationData] = useState({
+    invalidFields: [],
+    valid: false
+  });
+  useEffect(() => {
+    const fetchAccountDetails = async () => {
+      try {
+        const accountIdentificationResponse = await accountIdentification2(payload);
+        setAccountValidationData(accountIdentificationResponse);
+      } catch (error) {
+        console.error("Error fetching account details:", error);
+      }
+    };
+    if (payload && !hasEmptyFields2) {
+      fetchAccountDetails();
+    }
+  }, [accountIdentification2, hasEmptyFields2, payload]);
+  return accountValidationData;
+};
 const BankVerification$2 = "";
 const _actionBar_component = "";
 const ActionBar = ({
@@ -16284,6 +16413,29 @@ class AdyenKycSdkError extends Error {
     this.stack = stack.join("\n");
   }
 }
+let sdkToken;
+let fetchSdkToken;
+const logger$g = createLogger("Session");
+const setSdkToken = (token) => {
+  sdkToken = token;
+};
+const setSdkTokenHandler = (handler) => {
+  fetchSdkToken = handler;
+};
+const getSdkToken = () => sdkToken;
+const refreshSession = async () => {
+  if (!fetchSdkToken) {
+    throw Error("Not able to extend session, fetch handler not provided ");
+  }
+  try {
+    const {
+      token
+    } = await fetchSdkToken();
+    setSdkToken(token);
+  } catch (e) {
+    logger$g.error("Failed to fetch sdk token", e);
+  }
+};
 const OpenBankingSDKStyles = "";
 const WIDGET_IFRAME_CLASS$1 = "adyen-open-banking-sdk-widget";
 const WIDGET_CONTAINER_CLASS$1 = `${WIDGET_IFRAME_CLASS$1}-container`;
@@ -16349,17 +16501,18 @@ const removeAnimationStartListener = (element, listener) => {
   element.removeEventListener("MSAnimationStart", listener, false);
   element.removeEventListener("webkitAnimationStart", listener, false);
 };
-const logger$g = createLogger("Fetch");
+const logger$f = createLogger("Fetch");
 const getRequestObject = (options, data) => {
   const {
     headers = [],
     method = "GET",
-    sdkToken
+    authentication
   } = options;
   let authHeaders;
-  if (options.sdkToken) {
+  if (authentication === "jwt") {
+    const sdkToken2 = getSdkToken();
     authHeaders = {
-      Authorization: `Bearer ${sdkToken}`,
+      Authorization: `Bearer ${sdkToken2}`,
       Origin: window.location.origin
     };
   }
@@ -16395,10 +16548,10 @@ const logFetchError = (message, level) => {
     case "info":
     case "warn":
     case "error":
-      logger$g[level](message);
+      logger$f[level](message);
       break;
     default:
-      logger$g.error(message);
+      logger$f.error(message);
   }
 };
 const handleFetchResponse = async (response, responseType) => {
@@ -16417,11 +16570,17 @@ const handleFetchResponse = async (response, responseType) => {
   }
 };
 const isValidationErrorResponse = (response) => (response == null ? void 0 : response.status) === 422;
+const isSessionExpiredResponse = (response) => (response == null ? void 0 : response.status) === 401;
+const processValidationErrors$1 = async (response) => {
+  const responseData = await response.json();
+  throw new ValidationError(responseData.errorCode, responseData);
+};
 class ValidationError extends Error {
   constructor(message, validationDetails) {
     super(message);
     this.invalidFields = validationDetails == null ? void 0 : validationDetails.invalidFields;
     this.errorCode = validationDetails == null ? void 0 : validationDetails.errorCode;
+    this.sourceError = validationDetails;
   }
 }
 const http = async (options, data, responseType = "json") => {
@@ -16433,6 +16592,7 @@ const http = async (options, data, responseType = "json") => {
   } = options;
   const request = getRequestObject(options, data);
   const url = getRequestUrl(loadingContext, path, clientKey);
+  const needsAuthGuard = options.authentication === "jwt";
   let response;
   try {
     response = await fetch(url, request);
@@ -16453,8 +16613,11 @@ const http = async (options, data, responseType = "json") => {
     return options.errorHandler(handleFetchResponse(response, responseType));
   }
   if (isValidationErrorResponse(response)) {
-    const responseData = await response.json();
-    throw new ValidationError(responseData.errorCode, responseData);
+    return processValidationErrors$1(response);
+  }
+  if (needsAuthGuard && isSessionExpiredResponse(response)) {
+    await refreshSession();
+    return http(options, data, responseType);
   }
   logFetchError(errorMessage, errorLevel);
   throw new Error(errorMessage);
@@ -16484,7 +16647,7 @@ const RELEVANT_MESSAGE_TYPES = ["account_verification_report_id", "error"];
 const TERMINAL_DATA_PROPS = ["accounts", "error", "reference"];
 const MOUNT_TIMEOUT = 10 * 1e3;
 const TINK_VENDOR = "Tink";
-const logger$f = createLogger("iframeWidget");
+const logger$e = createLogger("iframeWidget");
 const isObjectData = (data) => typeof data === "object" && !Array.isArray(data) && data !== null;
 const isTerminalMessageData = (data) => Object.entries(data).some(([prop]) => TERMINAL_DATA_PROPS.includes(prop));
 const parseMessageJson = (message) => {
@@ -16503,7 +16666,7 @@ const callbackErrorHandler = async (response) => {
   try {
     await response;
   } catch (ex) {
-    logger$f.error(ex);
+    logger$e.error(ex);
   }
   return {
     error: "UNKNOWN_ERROR",
@@ -16512,7 +16675,7 @@ const callbackErrorHandler = async (response) => {
 };
 let activeWidget;
 class IFrameWidget {
-  constructor(iframeElement, url, vendor, sdkToken) {
+  constructor(iframeElement, url, vendor, sdkToken2) {
     this.mountInProgress = false;
     this.waitForResponse = async () => new Promise((resolve, reject) => {
       this.listener = async (message) => {
@@ -16535,7 +16698,7 @@ class IFrameWidget {
     this.iframeElement = iframeElement;
     this.iframeWindow = iframeElement.contentWindow;
     this.vendor = vendor;
-    this.sdkToken = sdkToken;
+    this.sdkToken = sdkToken2;
   }
   removeMessageEventListener() {
     if (!this.listener)
@@ -16609,7 +16772,7 @@ class IFrameWidget {
             message = responseData.errorMessage;
           }
         } catch (ex) {
-          logger$f.error(ex);
+          logger$e.error(ex);
         }
         throw new AdyenKycSdkError(reason, jsonData.error);
       }
@@ -16695,7 +16858,7 @@ function BankVerificationWidget({
   const {
     isEmbeddedDropin
   } = context;
-  const sdkToken = isEmbeddedDropin ? context.sdkToken : void 0;
+  const sdkToken2 = isEmbeddedDropin ? getSdkToken() : void 0;
   useEffect(
     () => {
       const container = widgetContainerRef.current;
@@ -16738,7 +16901,7 @@ function BankVerificationWidget({
               requestAnimationFrame(async () => {
                 var _a, _b;
                 try {
-                  iFrameWidget = new IFrameWidget(iFrame, url, vendor, sdkToken);
+                  iFrameWidget = new IFrameWidget(iFrame, url, vendor, sdkToken2);
                   const result = await iFrameWidget.mountAndWaitForResponse();
                   widgetCallback({
                     action: "verification_success",
@@ -16795,7 +16958,7 @@ function BankVerificationWidget({
     ref: widgetContainerRef
   });
 }
-const logger$e = createLogger("BankVerification");
+const logger$d = createLogger("BankVerification");
 const accountVerificationFields = ["verifiedAccountHolder", "verifiedBankCountry", "verifiedBankName", "verifiedCurrencyCode", "verifiedBankAccountNumber"];
 const InstantVerificationErrorContext = createContext(null);
 const useInstantVerificationErrorNotification = (notificationVisibilityDuration) => {
@@ -16829,7 +16992,7 @@ const usePreferredVendorForCountry = (country2, getBankVerificationVendors) => {
       const preferredVendor2 = vendors[0];
       setPreferredVendor(preferredVendor2.name ? preferredVendor2 : null);
     };
-    getPreferredVendor().catch(logger$e.error);
+    getPreferredVendor().catch(logger$d.error);
   }, [country2, getBankVerificationVendors]);
   return preferredVendor;
 };
@@ -17130,6 +17293,7 @@ function BankAccountFormat(props) {
 var ExperimentNames = /* @__PURE__ */ ((ExperimentNames2) => {
   ExperimentNames2["EnableTrustFlow"] = "EnableTrustFlow";
   ExperimentNames2["OnlyAllowAlphanumericBankAccountNumbers"] = "OnlyAllowAlphanumericBankAccountNumbers";
+  ExperimentNames2["OrganizationSettlorWithExemptionReason"] = "OrganizationSettlorWithExemptionReason";
   return ExperimentNames2;
 })(ExperimentNames || {});
 const stripNonAlphanumeric = (value) => value.replaceAll(/[^0-9a-zA-Z]/g, "");
@@ -17736,7 +17900,9 @@ function PayoutAccountComponent(props) {
     country: country2,
     id: id2,
     legalEntityResponse,
-    requiredFields
+    requiredFields,
+    arePayoutAccountDetailsInvalid,
+    invalidFieldNames
   } = props;
   const stateRef = useRef({
     setState: null
@@ -17850,10 +18016,19 @@ function PayoutAccountComponent(props) {
       hasCloseButton: false,
       type: AlertTypes.BASIC,
       title: getSupportedCurrencyGuidance(i18n, country2, requiredFields)
+    }), arePayoutAccountDetailsInvalid && jsx(Alert, {
+      hasCloseButton: false,
+      className: "adl-u-margin-top-16",
+      type: AlertTypes.ERROR,
+      title: invalidFieldNames ? i18n.get("enterValid_", {
+        values: {
+          fieldNames: invalidFieldNames
+        }
+      }) : i18n.get("enterValidAccountDetails")
     })]
   });
 }
-const PayoutAccount = memo(PayoutAccountComponent, (prevProps, nextProps) => 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) && prevProps.country === nextProps.country && prevProps.shouldValidate === nextProps.shouldValidate);
+const PayoutAccount = memo(PayoutAccountComponent, (prevProps, nextProps) => 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) && prevProps.country === nextProps.country && prevProps.shouldValidate === nextProps.shouldValidate && prevProps.arePayoutAccountDetailsInvalid === nextProps.arePayoutAccountDetailsInvalid && prevProps.invalidFieldNames === nextProps.invalidFieldNames);
 const PayoutBankStatement$1 = "";
 function FilePicker({
   files,
@@ -18431,15 +18606,25 @@ 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"),
+      data: {
+        country: data.bankCountry
+      },
+      valid: {
+        country: valid == null ? void 0 : valid.bankCountry
+      },
+      errors: {
+        country: formUtils.getErrorMessage("bankCountry", errors, fieldProblems)
+      },
+      labels: {
+        country: formUtils.getLabel("bankCountry", "bankAccountCountry")
+      },
       readonly: !intraRegionCrossBorderPayoutsAllowed || allowedBankCountries.length === 1,
       allowedCountries: allowedBankCountries,
       classNameModifiers: ["country"],
       handleChangeFor: () => handleChangeFor("bankCountry", "input"),
-      helperText: intraRegionCrossBorderPayoutsAllowed ? void 0 : i18n.get(props.legalEntityType === LegalEntityType.INDIVIDUAL ? "youCanOnlyUseABankAccountInTheCountryWhereYouLive" : "youCanOnlyUseABankAccountInTheCountryWhereYourCompanyIsRegistered")
+      helperText: {
+        country: intraRegionCrossBorderPayoutsAllowed ? void 0 : i18n.get(props.legalEntityType === LegalEntityType.INDIVIDUAL ? "youCanOnlyUseABankAccountInTheCountryWhereYouLive" : "youCanOnlyUseABankAccountInTheCountryWhereYourCompanyIsRegistered")
+      }
     }), jsx(Field, {
       name: "verificationMethods",
       label: formUtils.getLabel("payoutVerificationMethod", "verificationMethod"),
@@ -18573,7 +18758,8 @@ function PayoutDetailsComponent(props) {
     setHideBackButton,
     setSubmitButtonLabel,
     createTrustedTransferInstrument: createTrustedTransferInstrument2,
-    handleBankVerificationError: handleBankVerificationError2
+    handleBankVerificationError: handleBankVerificationError2,
+    accountDetailsFromInput
   } = props;
   const [instantVerificationError, setInstantVerificationError] = useInstantVerificationErrorNotification(1e4);
   const verificationMethodFormProps = getFormProps(props, payoutSteps.payoutVerificationMethod.formId);
@@ -18597,6 +18783,26 @@ function PayoutDetailsComponent(props) {
     }
   }, [activeForm]);
   const [bankInfoValidated, setBankInfoValidated] = useState(false);
+  const [arePayoutAccountDetailsInvalid, setArePayoutAccountDetailsInvalid] = useState(false);
+  const [invalidFieldNames, setInvalidFieldNames] = useState("");
+  const debouncedGetAccountIdentificationFromPayoutAccountSchema = useCallback(debounce(getAccountIdentificationFromPayoutAccountSchema, 500), [getAccountIdentificationFromPayoutAccountSchema]);
+  const payload = useMemo(() => bankCountry2 ? debouncedGetAccountIdentificationFromPayoutAccountSchema(accountDetailsFromInput, bankCountry2) : {}, [accountDetailsFromInput, bankCountry2, debouncedGetAccountIdentificationFromPayoutAccountSchema]);
+  const validateAccountDetails = useAsyncAccountDetailsValidationRules(payload, hasEmptyFields(payload));
+  const resetInvalidFieldState = () => {
+    setInvalidFieldNames("");
+    setArePayoutAccountDetailsInvalid(false);
+  };
+  useEffect(() => {
+    var _a2;
+    if (validateAccountDetails && ((_a2 = validateAccountDetails.invalidFields) == null ? void 0 : _a2.length) > 0) {
+      const fieldNames = validateAccountDetails.invalidFields.map((field) => extractFieldName(field == null ? void 0 : field.name)).map((key) => mapKeyToFieldName(i18n, key));
+      const invalidFieldsString = concatenateFieldNames(fieldNames);
+      setInvalidFieldNames(invalidFieldsString);
+      setArePayoutAccountDetailsInvalid(true);
+    } else {
+      resetInvalidFieldState();
+    }
+  }, [i18n, validateAccountDetails]);
   return jsxs("div", {
     className: "adyen-kyc-payout",
     children: [jsx("div", {
@@ -18641,7 +18847,9 @@ function PayoutDetailsComponent(props) {
         heading: taskHeading,
         id: payoutSteps.payoutAccountDetails(taskType).formId,
         country: bankCountry2,
-        legalEntityResponse
+        legalEntityResponse,
+        arePayoutAccountDetailsInvalid,
+        invalidFieldNames
       })
     }), !verifyInstantly && jsx("div", {
       className: activeForm.formId !== payoutSteps.payoutAccountDocuments.formId ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
@@ -18936,14 +19144,16 @@ function TrustRegistrationDetailsComponent(props) {
         id: "ariaErrorField"
       }), jsx(ContextHelper, {
         content: i18n.get("makeSureToHaveYourTrustDeed")
-      }), formUtils.isRequiredField(COUNTRY_FIELD) && jsx(CountryField, {
-        data: country2,
-        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),
+      }), formUtils.isRequiredField("country") && jsx(CountryField, {
+        data: formUtils.getFieldData(data, COUNTRY_FIELD),
+        valid: formUtils.getFieldValid(valid, COUNTRY_FIELD),
+        errors: formUtils.getFieldErrors(errors, fieldProblems, COUNTRY_FIELD),
+        labels: formUtils.getFieldLabels(COUNTRY_FIELD, {
+          country: "countryOfEstablishment"
+        }),
+        readonly: formUtils.isReadOnly("country"),
         allowedCountries: ALLOWED_TRUST_COUNTRIES,
-        classNameModifiers: [COUNTRY_FIELD],
+        classNameModifiers: ["country"],
         handleChangeFor: () => (e) => {
           handleChangeFor("country", "input")(e);
           if (onCountryChange)
@@ -20093,7 +20303,7 @@ const defaultPayoutAccountFormat = {
   [CountryCodes.Sweden]: "local",
   [CountryCodes.UnitedKingdom]: "local"
 };
-const logger$d = createLogger("useScenarioConfiguration");
+const logger$c = createLogger("useScenarioConfiguration");
 const useScenarioConfiguration = ({
   getConfigurationData,
   getPayoutAccountFormatData,
@@ -20115,12 +20325,12 @@ const useScenarioConfiguration = ({
         const response = await getConfigurationData();
         setConfigurationResponse(response);
       } catch (err) {
-        logger$d.warn("WARNING: Configuration request failed - error:", err);
+        logger$c.warn("WARNING: Configuration request failed - error:", err);
       } finally {
         setLoadingStatus("success");
       }
     };
-    makeConfigCallAndSave().catch(logger$d.error);
+    makeConfigCallAndSave().catch(logger$c.error);
   }, [getConfigurationData, setLoadingStatus]);
   useEffect(() => {
     setLoadingStatus("loading");
@@ -20136,12 +20346,12 @@ const useScenarioConfiguration = ({
         const defaultAccountFormat = defaultPayoutAccountFormat[country2] ?? allowedBankAccountFormats[0];
         setAccountFormat(defaultAccountFormat);
       } catch (err) {
-        logger$d.warn("WARNING: Payout format request failed - error:", err);
+        logger$c.warn("WARNING: Payout format request failed - error:", err);
       } finally {
         setLoadingStatus("success");
       }
     };
-    makePayoutFormatCallAndSave().catch(logger$d.error);
+    makePayoutFormatCallAndSave().catch(logger$c.error);
   }, [country2, setAccountFormat, getPayoutAccountFormatData, setLoadingStatus]);
   const {
     fieldConfigurations,
@@ -20308,7 +20518,7 @@ const countryConfig$1 = {
       placeholder: "SSNFormatUS"
     },
     idNumberExempt: {
-      label: "uploadDocumentForSsn"
+      label: "identityNumberExempt__US"
     }
   },
   CA: {
@@ -20317,7 +20527,7 @@ const countryConfig$1 = {
       placeholder: "SINFormatCA"
     },
     idNumberExempt: {
-      label: "uploadDocumentForSsn"
+      label: "identityNumberExempt__CA"
     }
   },
   IT: {
@@ -20797,7 +21007,7 @@ var ToastType = /* @__PURE__ */ ((ToastType2) => {
   return ToastType2;
 })(ToastType || {});
 const FormComposer = "";
-const logger$c = createLogger("FormRouterContextProvider");
+const logger$b = createLogger("FormRouterContextProvider");
 function FormRouterContextProvider({
   children,
   forms,
@@ -20817,7 +21027,7 @@ function FormRouterContextProvider({
       if (formIndex > -1) {
         setFormIndex(formIndex);
       } else {
-        logger$c.error("No form was found to have that field so form navigation failed.");
+        logger$b.error("No form was found to have that field so form navigation failed.");
       }
     }
   }), [forms, handleGetIdVerificationToken, setFormIndex]);
@@ -21061,16 +21271,18 @@ const canSubmit = (data) => mandatoryApiFields.ORGANIZATION.every((detail) => {
 });
 const isDocumentsRequired = (forms) => forms.some((form) => [companyForms.companyRegistrationDocument.formId, companyForms.companyTaxDocument.formId].includes(form.formId));
 const formatFileSummaryData = (companyRegistrationDocument2, companyTaxDocument) => {
-  var _a, _b, _c, _d;
+  var _a, _b;
+  const registrationDocument2 = (_a = companyRegistrationDocument2 == null ? void 0 : companyRegistrationDocument2.registrationDocument) == null ? void 0 : _a[0];
+  const taxDocument2 = (_b = companyTaxDocument == null ? void 0 : companyTaxDocument.taxDocument) == null ? void 0 : _b[0];
   return {
-    ...(companyRegistrationDocument2 == null ? void 0 : companyRegistrationDocument2.registrationDocument) && {
+    ...registrationDocument2 && {
       companyRegistrationDocument: {
-        fileName: (_b = (_a = companyRegistrationDocument2.registrationDocument) == null ? void 0 : _a[0]) == null ? void 0 : _b.name
+        fileName: registrationDocument2.name
       }
     },
-    ...(companyTaxDocument == null ? void 0 : companyTaxDocument.taxDocument) && {
+    ...taxDocument2 && {
       companyTaxDocument: {
-        fileName: (_d = (_c = companyTaxDocument.taxDocument) == null ? void 0 : _c[0]) == null ? void 0 : _d.name
+        fileName: taxDocument2.name
       }
     }
   };
@@ -21414,7 +21626,7 @@ function CompanyDropinComponent({
     })
   });
 }
-const logger$b = createLogger("useLocalStorage");
+const logger$a = createLogger("useLocalStorage");
 function useLocalStorage(key, defaultValue, options) {
   const {
     serializer,
@@ -21435,7 +21647,7 @@ function useLocalStorage(key, defaultValue, options) {
       const res = rawValueRef.current ? parser(rawValueRef.current) : defaultValue;
       return res;
     } catch (err) {
-      logger$b.error(err);
+      logger$a.error(err);
       return defaultValue;
     }
   });
@@ -21467,7 +21679,7 @@ function useLocalStorage(key, defaultValue, options) {
     try {
       updateLocalStorage();
     } catch (err) {
-      logger$b.error(err);
+      logger$a.error(err);
     }
   }, [value]);
   useEffect(() => {
@@ -21482,7 +21694,7 @@ function useLocalStorage(key, defaultValue, options) {
           setValue(event.newValue ? parser(event.newValue) : void 0);
         }
       } catch (err) {
-        logger$b.error(err);
+        logger$a.error(err);
       }
     };
     if (typeof window === "undefined")
@@ -21518,7 +21730,7 @@ const useShouldShowIntro = (legalEntity) => {
   } = useHasSeenIntro(legalEntity.id);
   return canSeeIntro && !hasSeenIntro;
 };
-const logger$a = createLogger("useExemptSettlor");
+const logger$9 = createLogger("useExemptSettlor");
 const useExemptSettlor = ({
   trust,
   handleGetLegalEntity
@@ -21530,7 +21742,7 @@ const useExemptSettlor = ({
     setExemptSettlor(exemptSettlorLE);
   }, [handleGetLegalEntity]);
   useEffect(() => {
-    updateExemptSettlor(trust).catch(logger$a.error);
+    updateExemptSettlor(trust).catch(logger$9.error);
   }, [trust, updateExemptSettlor]);
   return exemptSettlor;
 };
@@ -21637,15 +21849,17 @@ const getFallbackName = (exemptSettlorAssociation) => {
 };
 const convertEntityAssociationIntoTrustMember = (association, associations, exemptSettlorLE) => {
   var _a;
-  if (association.settlorExemptionReason)
+  if (association.settlorExemptionReason) {
     return {
       trustMemberType: "exemptSettlor",
       roles: [TrustMemberTypes.SETTLOR],
-      legalEntityType: LegalEntityType.INDIVIDUAL,
+      legalEntityType: association.entityType,
       legalEntityId: association.legalEntityId,
       settlorExemptionReason: association.settlorExemptionReason,
-      exemptSettlorName: ((_a = exemptSettlorLE == null ? void 0 : exemptSettlorLE.individual) == null ? void 0 : _a.name) ?? getFallbackName(association)
+      exemptSettlorName: association.entityType === LegalEntityType.INDIVIDUAL ? ((_a = exemptSettlorLE == null ? void 0 : exemptSettlorLE.individual) == null ? void 0 : _a.name) ?? getFallbackName(association) : void 0,
+      name: association.name
     };
+  }
   if (association.entityType === LegalEntityType.ORGANIZATION)
     return {
       trustMemberType: "company",
@@ -21701,6 +21915,7 @@ const getTrustMembers = (trustLE, rootLegalEntity, exemptSettlorLE) => {
   return [mapRootLegalEntityToTrustMember(rootLegalEntity), ...mapEntityAssociationsToTrustMembers(trustLE.id, trustLE.entityAssociations ?? [], exemptSettlorLE), ...mapUndefinedBeneficiaryInfoToTrustMembers(((_a = trustLE.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [])];
 };
 const mapTrustMemberToEntityAssociations = (trustMember) => {
+  var _a, _b;
   if (trustMember.legalEntityId === isNewEntity) {
     throw Error("Cannot map a new trust member, you must create it first");
   }
@@ -21710,7 +21925,7 @@ const mapTrustMemberToEntityAssociations = (trustMember) => {
       entityType: trustMember.legalEntityType,
       type: TrustMemberTypes.SETTLOR,
       settlorExemptionReason: trustMember.settlorExemptionReason,
-      name: `${trustMember.exemptSettlorName.firstName} ${trustMember.exemptSettlorName.lastName}`
+      name: trustMember.legalEntityType === LegalEntityType.INDIVIDUAL ? `${(_a = trustMember.exemptSettlorName) == null ? void 0 : _a.firstName} ${(_b = trustMember.exemptSettlorName) == null ? void 0 : _b.lastName}` : trustMember.name ?? ""
     }];
   return trustMember.roles.map((role2) => ({
     legalEntityId: trustMember.legalEntityId,
@@ -21753,12 +21968,13 @@ const createExemptSettlor = async ({
   trust,
   handleCreateLegalEntity
 }) => {
+  var _a, _b;
   const exemptSettlorLE = {
     type: LegalEntityType.INDIVIDUAL,
     individual: {
       name: {
-        firstName: exemptSettlor.exemptSettlorName.firstName,
-        lastName: exemptSettlor.exemptSettlorName.lastName
+        firstName: ((_a = exemptSettlor.exemptSettlorName) == null ? void 0 : _a.firstName) ?? "",
+        lastName: ((_b = exemptSettlor.exemptSettlorName) == null ? void 0 : _b.lastName) ?? ""
       },
       residentialAddress: {
         country: trust.trust.registeredAddress.country
@@ -21767,6 +21983,21 @@ const createExemptSettlor = async ({
   };
   return handleCreateLegalEntity(exemptSettlorLE);
 };
+const createOrganizationExemptSettlor = async ({
+  exemptSettlor,
+  handleCreateLegalEntity
+}) => {
+  const exemptSettlorLE = {
+    type: LegalEntityType.ORGANIZATION,
+    organization: {
+      legalName: exemptSettlor.name ?? "",
+      registeredAddress: {
+        country: exemptSettlor.country
+      }
+    }
+  };
+  return handleCreateLegalEntity(exemptSettlorLE);
+};
 const deleteAssociatedTrustMember = async ({
   associatedTrustMember,
   trust,
@@ -21797,11 +22028,26 @@ const updateExemptSettlorName = async ({
   exemptSettlor,
   handleUpdateLegalEntity
 }) => {
+  var _a, _b;
   const exemptSettlorPatch = {
     individual: {
       name: {
-        firstName: exemptSettlor.exemptSettlorName.firstName,
-        lastName: exemptSettlor.exemptSettlorName.lastName
+        firstName: (_a = exemptSettlor.exemptSettlorName) == null ? void 0 : _a.firstName,
+        lastName: (_b = exemptSettlor.exemptSettlorName) == null ? void 0 : _b.lastName
+      }
+    }
+  };
+  return handleUpdateLegalEntity(exemptSettlorPatch, exemptSettlor.legalEntityId);
+};
+const updateOrganizationExemptSettlorName = async ({
+  exemptSettlor,
+  handleUpdateLegalEntity
+}) => {
+  const exemptSettlorPatch = {
+    organization: {
+      legalName: exemptSettlor.name,
+      registeredAddress: {
+        country: exemptSettlor.country
       }
     }
   };
@@ -22221,10 +22467,12 @@ const Remove = ({
   };
   useEffect(() => {
     if (undoTimer === 0 && isRemoving) {
-      onRemove();
-      setIsRemoving(false);
-      onRemoveStatusChange == null ? void 0 : onRemoveStatusChange(false);
-      handleIsRemoveDisabled == null ? void 0 : handleIsRemoveDisabled(false);
+      (async () => {
+        setIsRemoving(false);
+        await onRemove();
+        onRemoveStatusChange == null ? void 0 : onRemoveStatusChange(false);
+        handleIsRemoveDisabled == null ? void 0 : handleIsRemoveDisabled(false);
+      })();
     }
   }, [undoTimer, isRemoving, onRemoveStatusChange, handleIsRemoveDisabled, onRemove]);
   return isRemoving ? jsx(Button, {
@@ -22638,11 +22886,11 @@ function LegalEntityTypeSwitcher({
           children: [jsx("h2", {
             className: "adyen-kyc-form-header__heading",
             "data-testid": LegalEntityType.ORGANIZATION,
-            children: i18n.get("continueAsCompany")
+            children: i18n.get("areYouACompany")
           }), jsx("span", {
-            children: i18n.get("indicatedPayoutToCompany")
+            children: i18n.get("singingUpAsIndividualButLooksLikeYouAreACompany")
           }), jsx("p", {
-            children: i18n.get("continueSigningUpAsCompany")
+            children: i18n.get("wouldYouLikeToSignUpAsCompanyInstead")
           })]
         });
       case LegalEntityType.INDIVIDUAL:
@@ -22650,11 +22898,11 @@ function LegalEntityTypeSwitcher({
           children: [jsx("h2", {
             className: "adyen-kyc-form-header__heading",
             "data-testid": LegalEntityType.INDIVIDUAL,
-            children: i18n.get("continueAsIndividual")
+            children: i18n.get("areYouAnIndividual")
           }), jsx("span", {
-            children: i18n.get("indicatedPayoutToPersonalAccount")
+            children: i18n.get("singingUpAsCompanyButLooksLikeYouAreAnIndividual")
           }), jsx("p", {
-            children: i18n.get("continueSigningUpAsIndividual")
+            children: i18n.get("wouldYouLikeToSignUpAsIndividualInstead")
           })]
         });
       default:
@@ -23272,10 +23520,11 @@ const ExemptSettlorTaskItem = ({
   onEdit,
   onDelete
 }) => {
+  var _a, _b;
   const {
     i18n
   } = useI18nContext();
-  const settlorName = `${exemptSettlor.exemptSettlorName.firstName} ${exemptSettlor.exemptSettlorName.lastName}`;
+  const settlorName = exemptSettlor.legalEntityType === LegalEntityType.INDIVIDUAL ? `${(_a = exemptSettlor.exemptSettlorName) == null ? void 0 : _a.firstName} ${(_b = exemptSettlor.exemptSettlorName) == null ? void 0 : _b.lastName}` : exemptSettlor.name ?? "";
   const actions = [{
     icon: "edit",
     onSelect: onEdit,
@@ -23899,42 +24148,50 @@ function IndividualDropinComponent({
   };
   const datasetUtils = datasetUtilities(i18n.locale);
   const formatIdDocument = (idDocument2) => {
-    var _a2, _b2, _c2, _d2, _e, _f;
-    if (idDocument2) {
-      const documentType2 = hasInstantIdVerification({
-        idDocument: idDocument2
-      }) ? onfidoDocumentTypeMapping.find((document2) => idDocument2.instantIdVerificationData.document_front.type === document2.id) : idDocumentTypeOptions.find(({
-        id: id2
-      }) => (idDocument2 == null ? void 0 : idDocument2.idDocumentType) === id2);
-      return {
-        documentType: i18n.get(documentType2 == null ? void 0 : documentType2.name),
-        ...(documentType2 == null ? void 0 : documentType2.hasBackPage) ? {
-          frontPage: (_b2 = (_a2 = idDocument2 == null ? void 0 : idDocument2.idFrontPage) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.name,
-          backPage: (_d2 = (_c2 = idDocument2 == null ? void 0 : idDocument2.idBackPage) == null ? void 0 : _c2[0]) == null ? void 0 : _d2.name
-        } : {
-          fileName: (_f = (_e = idDocument2 == null ? void 0 : idDocument2.idFrontPage) == null ? void 0 : _e[0]) == null ? void 0 : _f.name
-        }
-      };
-    }
+    var _a2, _b2;
+    if (!idDocument2)
+      return void 0;
+    const documentType2 = hasInstantIdVerification({
+      idDocument: idDocument2
+    }) ? onfidoDocumentTypeMapping.find((document2) => idDocument2.instantIdVerificationData.document_front.type === document2.id) : idDocumentTypeOptions.find(({
+      id: id2
+    }) => idDocument2.idDocumentType === id2);
+    if (!documentType2)
+      return void 0;
+    const frontPage2 = (_a2 = idDocument2.idFrontPage) == null ? void 0 : _a2[0];
+    const backPage2 = (_b2 = idDocument2.idBackPage) == null ? void 0 : _b2[0];
+    if (!frontPage2)
+      return void 0;
+    return {
+      documentType: i18n.get(documentType2.name),
+      ...backPage2 && documentType2.hasBackPage ? {
+        frontPage: frontPage2.name,
+        backPage: backPage2.name
+      } : {
+        fileName: frontPage2.name
+      }
+    };
   };
   const formatFileSummaryData2 = ({
     idDocument: idDocument2,
     proofOfNationalId: proofOfNationalId2,
     proofOfResidence: proofOfResidence2
   }) => {
-    var _a2, _b2, _c2, _d2;
+    var _a2, _b2;
+    const proofOfNationalIdFile = (_a2 = proofOfNationalId2 == null ? void 0 : proofOfNationalId2.proofOfNationalId) == null ? void 0 : _a2[0];
+    const proofOfResidenceFile = (_b2 = proofOfResidence2 == null ? void 0 : proofOfResidence2.proofOfResidence) == null ? void 0 : _b2[0];
     return {
       ...((idDocument2 == null ? void 0 : idDocument2.idDocumentType) || (idDocument2 == null ? void 0 : idDocument2.instantIdVerificationData)) && {
         idDocument: formatIdDocument(idDocument2)
       },
-      ...(proofOfNationalId2 == null ? void 0 : proofOfNationalId2.proofOfNationalId) && {
+      ...proofOfNationalIdFile && {
         proofOfNationalId: {
-          fileName: (_b2 = (_a2 = proofOfNationalId2.proofOfNationalId) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.name
+          fileName: proofOfNationalIdFile.name
         }
       },
-      ...(proofOfResidence2 == null ? void 0 : proofOfResidence2.proofOfResidence) && {
+      ...proofOfResidenceFile && {
         proofOfResidence: {
-          fileName: (_d2 = (_c2 = proofOfResidence2.proofOfResidence) == null ? void 0 : _c2[0]) == null ? void 0 : _d2.name
+          fileName: proofOfResidenceFile.name
         }
       }
     };
@@ -24218,6 +24475,7 @@ function PayoutDetailsDropinComponent({
   const [loadingStatus, setLoadingStatus] = useState("success");
   const [data, setData] = useState(prefilledData);
   const [problems, setProblems] = useState(propProblems || ((_c = (_b = getCapabilityProblems(legalEntityResponse)) == null ? void 0 : _b.BankAccount) == null ? void 0 : _c[transferInstrument == null ? void 0 : transferInstrument.id]));
+  const [accountDetailsFromInput, setAccountDetailsFromInput] = useState(prefilledData.payoutAccountDetails);
   const baseTrackingPayload = getBaseTrackingPayload({
     trackingConfig,
     task: taskType
@@ -24342,6 +24600,11 @@ function PayoutDetailsDropinComponent({
       }
     }
   };
+  useEffect(() => {
+    var _a2;
+    const payoutAccountData = (_a2 = cloneObject(data)) == null ? void 0 : _a2.payoutAccountDetails;
+    setAccountDetailsFromInput(payoutAccountData);
+  }, [data]);
   const onSubmit = async () => {
     setLoadingStatus("loading");
     const dataSubmitted = cloneObject(data);
@@ -24417,11 +24680,12 @@ function PayoutDetailsDropinComponent({
   };
   const isDocumentsRequired2 = (forms2) => forms2.some((form) => form.formId === payoutDetailsSteps.payoutAccountDocuments.formId);
   const formatFileSummaryData2 = (documents22) => {
-    var _a2, _b2;
+    var _a2;
+    const bankStatementDocument2 = (_a2 = documents22 == null ? void 0 : documents22.bankStatementDocument) == null ? void 0 : _a2[0];
     return {
-      ...(documents22 == null ? void 0 : documents22.bankStatementDocument) && {
+      ...bankStatementDocument2 && {
         bankStatementDocument: {
-          fileName: (_b2 = (_a2 = documents22.bankStatementDocument) == null ? void 0 : _a2[0]) == null ? void 0 : _b2.name
+          fileName: bankStatementDocument2.name
         }
       }
     };
@@ -24518,7 +24782,8 @@ function PayoutDetailsDropinComponent({
       shouldValidate,
       bankVerificationVendors,
       createTrustedTransferInstrument: createTrustedTransferInstrument2,
-      handleBankVerificationError: handleBankVerificationError2
+      handleBankVerificationError: handleBankVerificationError2,
+      accountDetailsFromInput
     })
   });
 }
@@ -25014,6 +25279,7 @@ const convertExistingSettlorExemptionReasons = (existingReasons) => {
   return existingReasons;
 };
 const convertExistingTrustMember = (trustMember) => {
+  var _a, _b;
   switch (trustMember.trustMemberType) {
     case "undefinedBeneficiary":
       return {
@@ -25023,6 +25289,13 @@ const convertExistingTrustMember = (trustMember) => {
       };
     case "regular":
     case "company":
+      return {
+        entityType: trustMember.legalEntityType,
+        role: trustMember.roles,
+        settlorExemptionReason: ["noneOfTheAbove"],
+        country: trustMember.trustMemberType === "company" ? trustMember.country : void 0,
+        legalCompanyName: trustMember.trustMemberType === "company" ? trustMember.name : void 0
+      };
     case "rootTrustee":
       return {
         entityType: trustMember.legalEntityType,
@@ -25031,11 +25304,13 @@ const convertExistingTrustMember = (trustMember) => {
       };
     case "exemptSettlor":
       return {
-        entityType: LegalEntityType.INDIVIDUAL,
+        entityType: trustMember.legalEntityType,
         role: ["settlor"],
         settlorExemptionReason: convertExistingSettlorExemptionReasons(trustMember.settlorExemptionReason),
-        firstName: trustMember.exemptSettlorName.firstName,
-        lastName: trustMember.exemptSettlorName.lastName
+        firstName: (_a = trustMember.exemptSettlorName) == null ? void 0 : _a.firstName,
+        lastName: (_b = trustMember.exemptSettlorName) == null ? void 0 : _b.lastName,
+        legalCompanyName: trustMember.name,
+        country: trustMember.country
       };
   }
 };
@@ -25059,6 +25334,10 @@ const isExemptSettlor = (data) => {
   var _a;
   return ((_a = data.settlorExemptionReason) == null ? void 0 : _a.some((reason) => reason !== "noneOfTheAbove")) ?? false;
 };
+const isOrganizationAndSettlor = (data) => {
+  var _a;
+  return data.entityType === LegalEntityType.ORGANIZATION && ((_a = data.role) == null ? void 0 : _a.length) === 1 && data.role[0] === "settlor";
+};
 const roleAndTypeValidationRules = {
   entityType: {
     modes: ["blur"],
@@ -25079,6 +25358,16 @@ const roleAndTypeValidationRules = {
     modes: ["blur"],
     validate: (reasons) => Boolean(reasons == null ? void 0 : reasons.length),
     errorMessage: "fieldIsRequired"
+  },
+  country: {
+    modes: ["blur"],
+    validate: (country2) => !!country2,
+    errorMessage: "fieldIsRequired"
+  },
+  legalCompanyName: {
+    modes: ["blur"],
+    validate: (name) => !!name,
+    errorMessage: "fieldIsRequired"
   }
 };
 const CHARACTERS_LIMIT = 256;
@@ -25094,29 +25383,34 @@ const leTypeCardDetails = {
     description: "businessEntityDescription"
   }
 };
-const decideFields = (data) => {
-  var _a, _b;
-  if ((_a = data.role) == null ? void 0 : _a.includes("undefinedBeneficiary")) {
-    return ["role", "descriptionUndefinedBeneficiary"];
-  }
-  if ((_b = data.role) == null ? void 0 : _b.length) {
-    if (couldBeExemptSettlor(data)) {
-      return isExemptSettlor(data) ? ["role", "entityType", "settlorExemptionReason", "firstName", "lastName"] : ["role", "entityType", "settlorExemptionReason"];
-    }
-    return ["role", "entityType"];
-  }
-  return ["role"];
-};
 const TrustRoleAndEntityType = (props) => {
   const {
     existingTrustMember,
-    id: id2
+    id: id2,
+    getLegalEntityHandler,
+    isOrganizationSettlorWithExemptionEnabled
   } = props;
   const {
     i18n
   } = useI18nContext();
   const defaultData = existingTrustMember ? convertExistingTrustMember(existingTrustMember) : {};
   const formUtils = formUtilities(props, i18n);
+  const decideFields = (data2) => {
+    var _a, _b;
+    if ((_a = data2.role) == null ? void 0 : _a.includes("undefinedBeneficiary")) {
+      return ["role", "descriptionUndefinedBeneficiary"];
+    }
+    if ((_b = data2.role) == null ? void 0 : _b.length) {
+      if (isOrganizationSettlorWithExemptionEnabled && isOrganizationAndSettlor(data2)) {
+        return ["role", "entityType", "settlorExemptionReason", "country", "legalCompanyName"];
+      }
+      if (couldBeExemptSettlor(data2)) {
+        return isExemptSettlor(data2) ? ["role", "entityType", "settlorExemptionReason", "firstName", "lastName"] : ["role", "entityType", "settlorExemptionReason"];
+      }
+      return ["role", "entityType"];
+    }
+    return ["role"];
+  };
   const {
     data,
     valid,
@@ -25136,6 +25430,18 @@ const TrustRoleAndEntityType = (props) => {
     fieldProblems: props == null ? void 0 : props.fieldValidationErrors
   });
   const availableRoles = getAvailableRoles(data.role);
+  useEffect(() => {
+    (async () => {
+      var _a;
+      if (isOrganizationSettlorWithExemptionEnabled && existingTrustMember && existingTrustMember.trustMemberType === "exemptSettlor" && existingTrustMember.legalEntityId !== "isNewEntry" && existingTrustMember.roles !== void 0 && existingTrustMember.roles.length === 1 && existingTrustMember.roles[0] === "settlor" && getLegalEntityHandler) {
+        const response = await getLegalEntityHandler(existingTrustMember.legalEntityId);
+        const country2 = (_a = response == null ? void 0 : response.organization) == null ? void 0 : _a.registeredAddress.country;
+        if (response && response.organization) {
+          handleChangeFor("country")(country2);
+        }
+      }
+    })();
+  }, []);
   useEffect(() => {
     var _a;
     (_a = props.onChange) == null ? void 0 : _a.call(props, {
@@ -25183,6 +25489,13 @@ const TrustRoleAndEntityType = (props) => {
     setValid("lastName", valid2.lastName);
     setErrors("lastName", errors2.lastName);
   };
+  const onEntityTypeChange = (value) => {
+    var _a;
+    if (isOrganizationSettlorWithExemptionEnabled && value === LegalEntityType.ORGANIZATION && ((_a = data.role) == null ? void 0 : _a.length) === 1 && data.role[0] === "settlor") {
+      changeSettlorExemptionReasons(["professionalServiceProvider"]);
+    }
+    handleChangeFor("entityType")(value);
+  };
   return jsxs("form", {
     className: "adyen-kyc-trust__role-and-entity-type adl-u-width-full",
     children: [jsx(FormHeader, {
@@ -25220,7 +25533,7 @@ const TrustRoleAndEntityType = (props) => {
       children: (childProps) => jsx(RadioCardSelect, {
         ...childProps,
         options: trustMemberLegalEntityTypes,
-        onSelect: handleChangeFor("entityType"),
+        onSelect: onEntityTypeChange,
         selected: data.entityType,
         optionId: (option) => leTypeCardDetails[option].id,
         optionName: (option) => leTypeCardDetails[option].name,
@@ -25246,7 +25559,7 @@ const TrustRoleAndEntityType = (props) => {
         "aria-label": formUtils.getLabel("descriptionUndefinedBeneficiary"),
         "aria-invalid": !valid.descriptionUndefinedBeneficiary
       })
-    }), (schema == null ? void 0 : schema.includes("settlorExemptionReason")) && jsx(Field, {
+    }), (schema == null ? void 0 : schema.includes("settlorExemptionReason")) && !isOrganizationAndSettlor(data) && jsx(Field, {
       name: "settlorExemptionReason",
       label: formUtils.getLabel("settlorExemptionReason", "whichOfTheseApplyToTheSettlor"),
       isValid: valid.settlorExemptionReason,
@@ -25277,6 +25590,27 @@ const TrustRoleAndEntityType = (props) => {
       },
       onChange: onNameChange,
       dataStoreId: id2
+    }) : void 0, isOrganizationSettlorWithExemptionEnabled && (schema == null ? void 0 : schema.includes("country")) && (schema == null ? void 0 : schema.includes("legalCompanyName")) ? jsxs(Fragment, {
+      children: [jsx(CountryField, {
+        data: formUtils.getFieldData(data, COUNTRY_FIELD),
+        valid: formUtils.getFieldValid(valid, COUNTRY_FIELD),
+        errors: formUtils.getFieldErrors(errors, fieldProblems, COUNTRY_FIELD),
+        labels: formUtils.getFieldLabels(COUNTRY_FIELD),
+        readonly: false,
+        classNameModifiers: COUNTRY_FIELD,
+        allowedCountries: [],
+        handleChangeFor
+      }), jsx(LegalCompanyNameField, {
+        data: formUtils.getFieldData(data, LEGAL_COMPANY_NAME_FIELD),
+        valid: formUtils.getFieldValid(valid, LEGAL_COMPANY_NAME_FIELD),
+        errors: formUtils.getFieldErrors(errors, fieldProblems, LEGAL_COMPANY_NAME_FIELD),
+        labels: formUtils.getFieldLabels(LEGAL_COMPANY_NAME_FIELD),
+        helperText: formUtils.getFieldHelperText(LEGAL_COMPANY_NAME_FIELD, {
+          legalCompanyName: "legalCompanyName__helperText"
+        }),
+        readonly: false,
+        handleChangeFor
+      })]
     }) : void 0]
   });
 };
@@ -25326,11 +25660,22 @@ const decideForms = (trustMember) => {
       return regularForms;
   }
 };
-const convertDataToTrustMember = (data, existingTrustMember) => {
+const convertDataToTrustMember = (data, existingTrustMember, isOrganizationSettlorWithExemptionReasonEnabled2 = false) => {
   var _a;
   const existingId = existingTrustMember ? existingTrustMember.trustMemberType === "undefinedBeneficiary" ? existingTrustMember.reference : existingTrustMember.legalEntityId : void 0;
   if ((_a = data.role) == null ? void 0 : _a.length) {
-    if (isExemptSettlor(data))
+    if (isExemptSettlor(data)) {
+      if (isOrganizationSettlorWithExemptionReasonEnabled2 && data.entityType === LegalEntityType.ORGANIZATION) {
+        return {
+          trustMemberType: "exemptSettlor",
+          roles: [TrustMemberTypes.SETTLOR],
+          legalEntityType: LegalEntityType.ORGANIZATION,
+          legalEntityId: existingId ?? isNewEntity,
+          name: data.legalCompanyName ?? "",
+          settlorExemptionReason: ["professionalServiceProvider"],
+          country: data.country
+        };
+      }
       return {
         trustMemberType: "exemptSettlor",
         roles: [TrustMemberTypes.SETTLOR],
@@ -25342,6 +25687,7 @@ const convertDataToTrustMember = (data, existingTrustMember) => {
         },
         legalEntityId: existingId ?? isNewEntity
       };
+    }
     if (data.role.includes("undefinedBeneficiary"))
       return {
         trustMemberType: "undefinedBeneficiary",
@@ -25349,14 +25695,16 @@ const convertDataToTrustMember = (data, existingTrustMember) => {
         description: data.descriptionUndefinedBeneficiary ?? "",
         reference: existingId ?? isNewEntity
       };
-    if (data.entityType === LegalEntityType.ORGANIZATION)
+    if (data.entityType === LegalEntityType.ORGANIZATION) {
       return {
         trustMemberType: "company",
         roles: data.role,
         legalEntityType: LegalEntityType.ORGANIZATION,
         legalEntityId: existingId ?? isNewEntity,
-        name: ""
+        name: data.legalCompanyName ?? "",
+        country: data.country
       };
+    }
     if (data.entityType === LegalEntityType.INDIVIDUAL)
       return {
         trustMemberType: "regular",
@@ -25372,8 +25720,11 @@ function RoleAndTypeDropinComponent({
   existingTrustMember,
   navigateToFullDropinFor,
   navigateBack,
-  addOrUpdateTrustMember
+  addOrUpdateTrustMember,
+  getLegalEntityHandler,
+  isOrganizationSettlorWithExemptionEnabled
 }) {
+  var _a, _b;
   const {
     i18n
   } = useI18nContext();
@@ -25394,8 +25745,10 @@ function RoleAndTypeDropinComponent({
       entityType: trustMember.trustMemberType !== "undefinedBeneficiary" ? i18n.get(trustMember.legalEntityType) : void 0,
       descriptionUndefinedBeneficiary: trustMember.trustMemberType === "undefinedBeneficiary" ? trustMember.description : void 0,
       otherInformation: trustMember.trustMemberType === "exemptSettlor" ? formatSettlorExemptionReasonsForSummary(trustMember.settlorExemptionReason ?? []) : void 0,
-      firstName: trustMember.trustMemberType === "exemptSettlor" ? trustMember.exemptSettlorName.firstName : void 0,
-      lastName: trustMember.trustMemberType === "exemptSettlor" ? trustMember.exemptSettlorName.lastName : void 0
+      firstName: trustMember.trustMemberType === "exemptSettlor" ? (_a = trustMember.exemptSettlorName) == null ? void 0 : _a.firstName : void 0,
+      lastName: trustMember.trustMemberType === "exemptSettlor" ? (_b = trustMember.exemptSettlorName) == null ? void 0 : _b.lastName : void 0,
+      country: isOrganizationSettlorWithExemptionEnabled && trustMember.trustMemberType === "exemptSettlor" ? trustMember.country : void 0,
+      legalCompanyName: isOrganizationSettlorWithExemptionEnabled && trustMember.trustMemberType === "exemptSettlor" ? trustMember.name : void 0
     }
   };
   const onNavigateToNextStep = () => {
@@ -25416,7 +25769,7 @@ function RoleAndTypeDropinComponent({
         [dataStoreId]: isValid
       });
     }
-    setTrustMember(convertDataToTrustMember(data, existingTrustMember));
+    setTrustMember(convertDataToTrustMember(data, existingTrustMember, isOrganizationSettlorWithExemptionEnabled));
   };
   const saveRolesAndNavigate = async () => {
     if (trustMember === "incomplete")
@@ -25462,7 +25815,9 @@ function RoleAndTypeDropinComponent({
           id: "roleAndEntityType",
           existingTrustMember,
           onChange: onTrustMemberChange,
-          shouldValidate
+          shouldValidate,
+          getLegalEntityHandler,
+          isOrganizationSettlorWithExemptionEnabled
         })
       }), isSummaryStep && jsx("div", {
         className: "adyen-kyc-form-wrapper",
@@ -25495,7 +25850,7 @@ const serviceAgreementValidationRules = {
     errorMessage: "fieldIsRequired"
   }
 };
-const logger$9 = createLogger("useServiceAgreement");
+const logger$8 = createLogger("useServiceAgreement");
 const FALLBACK_LANGUAGE_CODE = "en";
 const useServiceAgreement = ({
   handleGetServiceAgreement,
@@ -25524,7 +25879,7 @@ const useServiceAgreement = ({
           language: agreementLanguage
         });
         if (!document2) {
-          logger$9.log('"document" field was missing in response');
+          logger$8.log('"document" field was missing in response');
           return;
         }
         const contract = JSON.parse(decodeURIComponent(escape(window.atob(document2))));
@@ -25542,7 +25897,7 @@ const useServiceAgreement = ({
         throw err;
       }
     };
-    requestServiceAgreement().catch(logger$9.error);
+    requestServiceAgreement().catch(logger$8.error);
   }, [handleGetServiceAgreement, handleServiceAgreementIsNotAvailableInThatLanguage, agreementLanguage, legalEntityId, serviceAgreementType]);
   return {
     loading: loading2,
@@ -26624,11 +26979,12 @@ function SolePropDropinComponent({
     return summaryData;
   };
   const formatFileSummaryData2 = (solePropConstitutionalDocument) => {
-    var _a2, _b;
+    var _a2;
+    const constitutionalDocument2 = (_a2 = solePropConstitutionalDocument == null ? void 0 : solePropConstitutionalDocument.constitutionalDocument) == null ? void 0 : _a2[0];
     return {
-      ...(solePropConstitutionalDocument == null ? void 0 : solePropConstitutionalDocument.constitutionalDocument) && {
+      ...constitutionalDocument2 && {
         solePropConstitutionalDocument: {
-          fileName: (_b = (_a2 = solePropConstitutionalDocument.constitutionalDocument) == null ? void 0 : _a2[0]) == null ? void 0 : _b.name
+          fileName: constitutionalDocument2.name
         }
       }
     };
@@ -26838,11 +27194,12 @@ function TrustDropinComponent(props) {
     return summaryData;
   };
   const formatFileSummaryData2 = (trustConstitutionalDocument) => {
-    var _a, _b;
+    var _a;
+    const constitutionalDocument2 = (_a = trustConstitutionalDocument == null ? void 0 : trustConstitutionalDocument.constitutionalDocument) == null ? void 0 : _a[0];
     return {
-      ...(trustConstitutionalDocument == null ? void 0 : trustConstitutionalDocument.constitutionalDocument) && {
+      ...constitutionalDocument2 && {
         trustConstitutionalDocument: {
-          fileName: (_b = (_a = trustConstitutionalDocument.constitutionalDocument) == null ? void 0 : _a[0]) == null ? void 0 : _b.name
+          fileName: constitutionalDocument2.name
         }
       }
     };
@@ -26878,7 +27235,8 @@ function TrustDropinComponent(props) {
 }
 const PAGES_WITH_STATUS = [TaskTypes.DECISION_MAKER_OVERVIEW, TaskTypes.TASKS_OVERVIEW];
 const POLLING_INTERVAL = 3e3;
-const logger$8 = createLogger("DropinComposerComponent");
+const logger$7 = createLogger("DropinComposerComponent");
+const isOrganizationSettlorWithExemptionReasonEnabled = (enabled, country2) => country2 === CountryCodes.Australia && enabled;
 function DropinComposerComponent({
   capabilities,
   legalEntityResponse,
@@ -26937,6 +27295,7 @@ function DropinComposerComponent({
   const hasTrust = isExperimentEnabled("EnableTrustFlow") && (accountHolder2 === "aTrust" || isPartOfTrustFromLegalEntity(legalEntityResponse));
   const reviewRequired = (legalEntity == null ? void 0 : legalEntity.id) && ((_d = (_c = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _c[legalEntity.id]) == null ? void 0 : _d.isReviewRequired);
   const additionalSalesChannels = useSalesChannelsSettings();
+  const isOrganizationSettlorWithExemptionEnabled = isOrganizationSettlorWithExemptionReasonEnabled(isExperimentEnabled("OrganizationSettlorWithExemptionReason"), trust == null ? void 0 : trust.trust.countryOfGoverningLaw);
   const getLegalEntityProblems = (le) => {
     var _a2;
     if (le == null ? void 0 : le.id) {
@@ -26955,7 +27314,7 @@ function DropinComposerComponent({
         setPciStatus(response);
         return response;
       } catch (e) {
-        logger$8.warn(i18n.get("failedToGetPciStatus"));
+        logger$7.warn(i18n.get("failedToGetPciStatus"));
       }
     }
     return void 0;
@@ -26984,7 +27343,7 @@ function DropinComposerComponent({
   useEffect(() => {
     if (!tasks.includes(TaskTypes.PCI_DSS))
       return;
-    getPciTemplate().catch(logger$8.error);
+    getPciTemplate().catch(logger$7.error);
   }, [getPciTemplate, tasks]);
   const getServiceAgreementAcceptanceInfos = async () => {
     if (legalEntity.id && (args == null ? void 0 : args.handleGetServiceAgreementAcceptanceInfos)) {
@@ -26992,7 +27351,7 @@ function DropinComposerComponent({
         const response = await args.handleGetServiceAgreementAcceptanceInfos(legalEntity.id);
         setServiceAgreementAcceptanceInfos(response.data);
       } catch (e) {
-        logger$8.warn(i18n.get("failedToGetServiceAgreementStatus"));
+        logger$7.warn(i18n.get("failedToGetServiceAgreementStatus"));
       }
     }
   };
@@ -27002,7 +27361,7 @@ function DropinComposerComponent({
         const response = await args.handleGetServiceAgreementStatus(legalEntity.id);
         setServiceAgreementTypes(response.termsOfServiceTypes);
       } catch (e) {
-        logger$8.warn(i18n.get("failedToGetServiceAgreementStatus"));
+        logger$7.warn(i18n.get("failedToGetServiceAgreementStatus"));
       }
     }
   };
@@ -27041,7 +27400,7 @@ function DropinComposerComponent({
         setCapabilityProblems(getCapabilityProblems(response));
         return response;
       } catch (e) {
-        logger$8.warn(i18n.get("failedToFetchLegalEntityDetails"));
+        logger$7.warn(i18n.get("failedToFetchLegalEntityDetails"));
       }
     }
     return void 0;
@@ -27053,7 +27412,7 @@ function DropinComposerComponent({
         setTrust(response);
         return response;
       } catch (e) {
-        logger$8.warn(i18n.get("failedToFetchTrustDetails"));
+        logger$7.warn(i18n.get("failedToFetchTrustDetails"));
       }
     }
     return void 0;
@@ -27103,7 +27462,7 @@ function DropinComposerComponent({
         label: i18n.get("successFullyRemovedTrustMember")
       });
     } catch (err) {
-      logger$8.error(`Failed to delete trust member`, err);
+      logger$7.error(`Failed to delete trust member`, err);
       showToast({
         type: ToastType.ERROR,
         label: i18n.get("failedToRemoveTrustMember")
@@ -27126,7 +27485,10 @@ function DropinComposerComponent({
           break;
         case "exemptSettlor":
           if (!existing) {
-            const newSettlorLE = await createExemptSettlor({
+            const newSettlorLE = isOrganizationSettlorWithExemptionEnabled && updated.legalEntityType === "organization" ? await createOrganizationExemptSettlor({
+              exemptSettlor: updated,
+              handleCreateLegalEntity: args.handleCreateLegalEntity
+            }) : await createExemptSettlor({
               exemptSettlor: updated,
               trust,
               handleCreateLegalEntity: args.handleCreateLegalEntity
@@ -27139,6 +27501,12 @@ function DropinComposerComponent({
               handleUpdateLegalEntity: args.handleUpdateLegalEntity
             });
           }
+          if (existing && isOrganizationSettlorWithExemptionEnabled && updated.legalEntityType === "organization") {
+            await updateOrganizationExemptSettlorName({
+              exemptSettlor: updated,
+              handleUpdateLegalEntity: args.handleUpdateLegalEntity
+            });
+          }
           await addOrUpdateAssociatedTrustMember({
             newOrUpdated: updated,
             trust,
@@ -27155,7 +27523,7 @@ function DropinComposerComponent({
           break;
         case "rootTrustee":
         default:
-          logger$8.warn(`Updating trust member type "${trustMember.trustMemberType}" is not implemented.`);
+          logger$7.warn(`Updating trust member type "${trustMember.trustMemberType}" is not implemented.`);
       }
       showToast({
         label: i18n.get("successfullyUpdatedDetails"),
@@ -27163,7 +27531,7 @@ function DropinComposerComponent({
       });
       await refreshTrustAndRunOnSubmit(trust, 1);
     } catch (err) {
-      logger$8.error(err);
+      logger$7.error(err);
       showToast({
         label: i18n.get("failedToUpdateDetails"),
         type: ToastType.ERROR
@@ -27386,7 +27754,7 @@ function DropinComposerComponent({
       }
     };
     setIsLoadingConfiguration(true);
-    fetchConfiguration().catch(logger$8.error).finally(() => {
+    fetchConfiguration().catch(logger$7.error).finally(() => {
       setIsLoadingConfiguration(false);
       onLoad();
     });
@@ -27671,7 +28039,9 @@ function DropinComposerComponent({
           navigateBack();
         },
         existingTrustMember: trustMember,
-        addOrUpdateTrustMember: (newOrUpdated) => addOrUpdateTrustMember(newOrUpdated, trustMember)
+        addOrUpdateTrustMember: (newOrUpdated) => addOrUpdateTrustMember(newOrUpdated, trustMember),
+        getLegalEntityHandler: args == null ? void 0 : args.handleGetLegalEntity,
+        isOrganizationSettlorWithExemptionEnabled
       });
     case TaskTypes.PCI_DSS:
       return jsx(PciDropinComponent, {
@@ -27743,7 +28113,6 @@ const ManageTransferInstrumentComponent$1 = "";
 const createDocument = async (context, document2, ownerId) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpPost({
@@ -27751,7 +28120,7 @@ const createDocument = async (context, document2, ownerId) => {
     errorLevel: "warn",
     errorMessage: `Failed to create document`,
     path: `${legalEntityId}/documents/${ownerId}`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27760,7 +28129,6 @@ const createDocument = async (context, document2, ownerId) => {
 const createTransferInstrument = async (context, transferInstrument) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpPost({
@@ -27768,7 +28136,7 @@ const createTransferInstrument = async (context, transferInstrument) => {
     errorLevel: "warn",
     errorMessage: `Failed to create transferInstrument`,
     path: `${legalEntityId}/transferInstruments`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27777,7 +28145,6 @@ const createTransferInstrument = async (context, transferInstrument) => {
 const getBankVerificationVendor = async (context, country2) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpGet({
@@ -27785,7 +28152,7 @@ const getBankVerificationVendor = async (context, country2) => {
     errorLevel: "warn",
     errorMessage: `Bank verification vendor not available`,
     path: `${legalEntityId}/transferInstruments/trusted/providers?country=${country2}`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27793,8 +28160,7 @@ const getBankVerificationVendor = async (context, country2) => {
 };
 const getDataset$1 = async (context, name, locale) => {
   const {
-    loadingContext,
-    sdkToken
+    loadingContext
   } = context;
   const datasetUtils = datasetUtilities(locale);
   const dataset = datasetUtils.getDataset(name);
@@ -27809,7 +28175,7 @@ const getDataset$1 = async (context, name, locale) => {
     errorLevel: "warn",
     errorMessage: `Dataset ${name} is not available`,
     path,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27821,7 +28187,6 @@ const getDataset$1 = async (context, name, locale) => {
 const getDocument = async (context, documentId) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpGet({
@@ -27829,7 +28194,7 @@ const getDocument = async (context, documentId) => {
     errorLevel: "warn",
     errorMessage: `Failed to fetch document`,
     path: `${legalEntityId}/documents/${documentId}`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27838,7 +28203,6 @@ const getDocument = async (context, documentId) => {
 const getLegalEntity = async (context) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpGet({
@@ -27846,7 +28210,7 @@ const getLegalEntity = async (context) => {
     errorLevel: "warn",
     errorMessage: `LegalEntity not available`,
     path: `${legalEntityId}`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27855,7 +28219,6 @@ const getLegalEntity = async (context) => {
 const getScenarios = async (context) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpGet({
@@ -27863,7 +28226,7 @@ const getScenarios = async (context) => {
     errorLevel: "warn",
     errorMessage: `Scenarios not available`,
     path: `${legalEntityId}/configurations/scenarios`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27872,7 +28235,6 @@ const getScenarios = async (context) => {
 const getTasks = async (context) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpGet({
@@ -27880,7 +28242,7 @@ const getTasks = async (context) => {
     errorLevel: "warn",
     errorMessage: `Tasks not available`,
     path: `${legalEntityId}/configurations/tasks`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27889,7 +28251,6 @@ const getTasks = async (context) => {
 const getTransferInstrument = async (context, transferInstrumentId) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpGet({
@@ -27897,7 +28258,7 @@ const getTransferInstrument = async (context, transferInstrumentId) => {
     errorLevel: "warn",
     errorMessage: `TransferInstrument not available`,
     path: `${legalEntityId}/transferInstruments/${transferInstrumentId}`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27906,7 +28267,6 @@ const getTransferInstrument = async (context, transferInstrumentId) => {
 const getTransferInstruments = async (context) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpGet({
@@ -27914,7 +28274,7 @@ const getTransferInstruments = async (context) => {
     errorLevel: "warn",
     errorMessage: `TransferInstrument not available`,
     path: `${legalEntityId}/transferInstruments`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27923,7 +28283,6 @@ const getTransferInstruments = async (context) => {
 const updateDocument = async (context, document2, documentId, ownerId) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpPost({
@@ -27931,7 +28290,7 @@ const updateDocument = async (context, document2, documentId, ownerId) => {
     errorLevel: "warn",
     errorMessage: `Failed to update document`,
     path: `${legalEntityId}/documents/${documentId}/${ownerId}`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27940,7 +28299,6 @@ const updateDocument = async (context, document2, documentId, ownerId) => {
 const updateTransferInstrument = async (context, transferInstrument, transferInstrumentId) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpPost({
@@ -27948,7 +28306,7 @@ const updateTransferInstrument = async (context, transferInstrument, transferIns
     errorLevel: "warn",
     errorMessage: `Failed to update transferInstrument`,
     path: `${legalEntityId}/transferInstruments/${transferInstrumentId}`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27957,7 +28315,6 @@ const updateTransferInstrument = async (context, transferInstrument, transferIns
 const createTrustedTransferInstrument = async (context, code2, state2) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   const path = `${legalEntityId}/transferInstruments/trusted`;
@@ -27966,7 +28323,7 @@ const createTrustedTransferInstrument = async (context, code2, state2) => {
     errorLevel: "warn",
     errorMessage: `Failed to create trusted transferInstrument`,
     path,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27978,7 +28335,6 @@ const createTrustedTransferInstrument = async (context, code2, state2) => {
 const deleteTransferInstrument = async (context, transferInstrumentId) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpDelete({
@@ -27986,7 +28342,7 @@ const deleteTransferInstrument = async (context, transferInstrumentId) => {
     errorLevel: "warn",
     errorMessage: `Failed to create transferInstrument`,
     path: `${legalEntityId}/transferInstruments/${transferInstrumentId}`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -27995,7 +28351,6 @@ const deleteTransferInstrument = async (context, transferInstrumentId) => {
 const handleBankVerificationError = async (context, errorCode, errorMessage, state2, metadata) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   const path = `${legalEntityId}/transferInstruments/trusted/error`;
@@ -28004,7 +28359,7 @@ const handleBankVerificationError = async (context, errorCode, errorMessage, sta
     errorLevel: "warn",
     errorMessage: `Failed to create trusted transferInstrument`,
     path,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -28022,7 +28377,6 @@ const useComponentApi = (rootLegalEntityId) => {
     throw new Error("Cannot use component API outside an embedded dropin");
   }
   const {
-    sdkToken,
     loadingContext: base
   } = authContext;
   return useMemo(() => {
@@ -28030,8 +28384,7 @@ const useComponentApi = (rootLegalEntityId) => {
     const loadingContextWithRootLEAuth = `${loadingContext}legalEntities/`;
     const baseRequestContext = {
       loadingContext: loadingContextWithRootLEAuth,
-      legalEntityId: rootLegalEntityId,
-      sdkToken
+      legalEntityId: rootLegalEntityId
     };
     return {
       getLegalEntity: async (legalEntityId) => getLegalEntity({
@@ -28050,7 +28403,7 @@ const useComponentApi = (rootLegalEntityId) => {
       handleBankVerificationError: async (errorCode, errorMessage, state2, metadata) => handleBankVerificationError(baseRequestContext, errorCode, errorMessage, state2, metadata),
       getTransferInstruments: async () => getTransferInstruments(baseRequestContext)
     };
-  }, [base, rootLegalEntityId, sdkToken]);
+  }, [base, rootLegalEntityId]);
 };
 const DEFAULT_POLLING_INTERVAL = 3e3;
 const DEFAULT_POLLING_INTERVAL_RETRY_COUNT = 3;
@@ -28177,6 +28530,7 @@ function ManageTransferInstrumentOverviewItem({
   } = useI18nContext();
   const description2 = statusDescription[transferInstrumentReference.status];
   const needMoreDetails = transferInstrumentReference.status === "DETAILS_REQUIRED";
+  const [isRemoving, setIsRemoving] = useState(false);
   const status = !needMoreDetails ? jsx(TaskItemStatus, {
     status: TaskStatus[transferInstrumentReference.status],
     size: "large",
@@ -28218,12 +28572,13 @@ function ManageTransferInstrumentOverviewItem({
       accountHolderName,
       onEdit: () => onEdit(transferInstrument.id)
     }), jsx(Remove, {
-      label: "removeThisBankAccount",
-      onRemove: () => onRemove(transferInstrumentReference.transferInstrument.id)
+      label: isRemoving ? "removing" : "removeThisBankAccount",
+      onRemove: async () => onRemove(transferInstrumentReference.transferInstrument.id),
+      onRemoveStatusChange: setIsRemoving
     })]
   }, transferInstrumentReference.transferInstrument.id);
 }
-const logger$7 = createLogger("ManageTransferInstrumentOverview");
+const logger$6 = createLogger("ManageTransferInstrumentOverview");
 function ManageTransferInstrumentOverview({
   transferInstrumentReferences,
   onAdd,
@@ -28248,7 +28603,7 @@ function ManageTransferInstrumentOverview({
         ...transferInstrumentsMap
       });
     } catch (e) {
-      logger$7.error(e);
+      logger$6.error(e);
     }
   };
   const onRemoveTransferinstrument = async (transferInstrumentId) => {
@@ -28256,7 +28611,7 @@ function ManageTransferInstrumentOverview({
       await deleteTransferInstrument2(transferInstrumentId);
       onRemove(transferInstrumentId);
     } catch (e) {
-      logger$7.error(e);
+      logger$6.error(e);
     }
   };
   const transferInstrumentListEle = transferInstrumentReferences.map((transferInstrumentRef, PAYOUT) => jsx(ManageTransferInstrumentOverviewItem, {
@@ -28282,7 +28637,7 @@ function ManageTransferInstrumentOverview({
     })]
   });
 }
-const logger$6 = createLogger("ManageTransferInstrumentComponent");
+const logger$5 = createLogger("ManageTransferInstrumentComponent");
 function ManageTransferInstrumentComponent({
   legalEntityId,
   onAdd,
@@ -28310,20 +28665,20 @@ function ManageTransferInstrumentComponent({
     status
   }) => status !== "FINISHED");
   useInterval(refreshTransferInstruments, hasUnverifiedTransferInstruments);
-  const init2 = async () => {
+  const init2 = useCallback(async () => {
     const [transferInstrumentRefs, legalEntity] = await Promise.all([getTransferInstruments2(), getLegalEntity2(legalEntityId)]);
-    const accountHolderName2 = getPayoutAccountHolderName(legalEntity, i18n);
-    setAccountHolderName(accountHolderName2);
+    const accountHolder2 = getPayoutAccountHolderName(legalEntity, i18n);
+    setAccountHolderName(accountHolder2);
     setTransferInstruments(transferInstrumentRefs);
-  };
+  }, [getTransferInstruments2, getLegalEntity2, i18n, legalEntityId]);
   useEffect(() => {
     eventEmitter == null ? void 0 : eventEmitter.on("updateLocale", (locale) => setLocale(locale));
-    init2().catch(logger$6.error).finally(() => {
+    init2().catch(logger$5.error).finally(() => {
       setLoadingStatus("success");
     });
-  }, []);
-  const onRemove = async (transferInsrumentId) => {
-    await refreshTransferInstruments();
+  }, [init2, setLocale, eventEmitter]);
+  const onRemove = (transferInsrumentId) => {
+    refreshTransferInstruments().catch(logger$5.error);
     onRemoveSuccess == null ? void 0 : onRemoveSuccess(transferInsrumentId, legalEntityId);
   };
   const render2 = () => {
@@ -28370,7 +28725,7 @@ class EventEmitter {
     };
   }
 }
-const logger$5 = createLogger("TransferInstrumentComponent");
+const logger$4 = createLogger("TransferInstrumentComponent");
 function TransferInstrumentComponent({
   legalEntityId,
   transferInstrumentId,
@@ -28405,8 +28760,8 @@ function TransferInstrumentComponent({
         const ti = await getTransferInstrument2(transferInstrumentId);
         setTransferInstrument(ti);
       }
-    })().catch(logger$5.error);
-  }, [transferInstrumentId]);
+    })().catch(logger$4.error);
+  }, [transferInstrumentId, fetchLegalEntity]);
   return legalEntity ? jsx(PayoutDetailsDropinComponent, {
     eventEmitter: eventEmitter ?? new EventEmitter(),
     transferInstrument,
@@ -28440,85 +28795,17 @@ const componentsMap = {
   transferInstrumentComponent: TransferInstrumentComponent,
   manageTransferInstrumentComponent: ManageTransferInstrumentComponent
 };
-const refreshSdkToken = async (context, refreshToken) => {
-  const {
-    loadingContext,
-    sdkToken
-  } = context;
-  return httpPost({
-    loadingContext,
-    errorLevel: "warn",
-    errorMessage: `Failed to refresh token`,
-    path: `sessions/refresh`,
-    sdkToken,
-    headers: {
-      "Content-Type": "application/json"
-    }
-  }, {
-    refreshToken
-  });
-};
-const SDK_TOKEN_TTL = 6e4;
-const REFRESH_INTERVAL = SDK_TOKEN_TTL - 5e3;
-const RETRY_LIMIT = 2;
-const logger$4 = createLogger("useSdkToken");
-const useSdkToken = ({
-  initialSdkToken,
-  refreshToken,
-  autheBase
-}) => {
-  const [sdkToken, setSdkToken] = useState(initialSdkToken);
-  const doRefresh = async (sdkToken2, refreshToken2, retries) => {
-    try {
-      const {
-        token: newSdkToken
-      } = await refreshSdkToken({
-        loadingContext: autheBase,
-        sdkToken: sdkToken2
-      }, refreshToken2);
-      setSdkToken(newSdkToken);
-    } catch (e) {
-      if (!retries) {
-        throw new Error("Unable to refresh token after retries", e);
-      }
-      logger$4.warn("Failed to refresh token. Retrying..", e);
-      await doRefresh(sdkToken2, refreshToken2, retries - 1);
-    }
-  };
-  useEffect(() => {
-    if (!sdkToken || !refreshToken) {
-      return;
-    }
-    const refreshHandler = setInterval(() => {
-      doRefresh(sdkToken, refreshToken, RETRY_LIMIT).catch(() => {
-        clearInterval(refreshHandler);
-      });
-    }, REFRESH_INTERVAL);
-    return () => {
-      clearInterval(refreshHandler);
-    };
-  }, [sdkToken]);
-  return sdkToken;
-};
-const AUTHE_API_VERSION = "v1";
 const AuthProvider = ({
   children,
-  sdkToken: initialSdkToken,
-  refreshToken,
+  sdkToken: sdkToken2,
+  getSdkToken: getSdkToken2,
   clientKey,
   loadingContext
 }) => {
-  const autheBase = `${loadingContext}authe/api/${AUTHE_API_VERSION}/`;
-  const sdkToken = useSdkToken({
-    initialSdkToken,
-    refreshToken,
-    autheBase
-  });
   const contextValue = useMemo(() => {
-    if (sdkToken && refreshToken) {
+    if (sdkToken2 && getSdkToken2) {
       return {
         isEmbeddedDropin: true,
-        sdkToken,
         loadingContext: `${loadingContext}onboardingcomponents/`
       };
     }
@@ -28529,8 +28816,8 @@ const AuthProvider = ({
         loadingContext
       };
     }
-    throw new Error("Must provide either `sdkToken` and `refreshToken` or `clientKey`");
-  }, [sdkToken, clientKey]);
+    throw new Error("Must provide either `sdkToken` and `getSdkToken` or `clientKey`");
+  }, [sdkToken2, clientKey]);
   return jsx(AuthContext.Provider, {
     value: contextValue,
     children
@@ -28548,7 +28835,6 @@ const getPayoutAccountFormat = async (country2) => getAccountFormatsForCountry(c
 const getAllowedLocales$1 = async (context) => {
   const {
     loadingContext,
-    sdkToken,
     legalEntityId
   } = context;
   return httpGet({
@@ -28556,7 +28842,7 @@ const getAllowedLocales$1 = async (context) => {
     errorLevel: "warn",
     errorMessage: `Supported locales not available`,
     path: `${legalEntityId}/configurations/supportedLocales`,
-    sdkToken,
+    authentication: "jwt",
     headers: {
       "Content-Type": "application/json"
     }
@@ -28564,17 +28850,18 @@ const getAllowedLocales$1 = async (context) => {
 };
 const getEmbeddedApi = ({
   base,
-  sdkToken,
   rootLegalEntityId
 }) => {
   const loadingContext = `${base}api/${COMPONENTS_API_VERSION}/`;
   const loadingContextWithRootLEAuth = `${loadingContext}legalEntities/`;
   const baseRequestContext = {
     loadingContext: loadingContextWithRootLEAuth,
-    legalEntityId: rootLegalEntityId,
-    sdkToken
+    legalEntityId: rootLegalEntityId
   };
   return {
+    accountIdentification: () => {
+      throw new Error("accountIdentification: Not implemented in onboarding component api");
+    },
     getConfiguration: async ({
       legalEntityType
     }) => {
@@ -28621,6 +28908,23 @@ const getEmbeddedApi = ({
     }
   };
 };
+const accountIdentification = async (context, payoutAccountDetails) => {
+  const {
+    loadingContext,
+    clientKey
+  } = context;
+  return httpPost({
+    loadingContext,
+    clientKey,
+    errorLevel: "warn",
+    errorMessage: "Account Identification is not available",
+    path: "v1/validations/accountidentification"
+  }, {
+    accountIdentification: {
+      ...payoutAccountDetails
+    }
+  });
+};
 const companyDeepSearch = async (context, data) => {
   const {
     loadingContext,
@@ -28631,6 +28935,10 @@ const companyDeepSearch = async (context, data) => {
     clientKey,
     errorLevel: "warn",
     errorMessage: "Failed to use companyDeepSearch",
+    errorHandler: async (response) => {
+      const error = await response;
+      throw new AdyenKycSdkError(error.message, error);
+    },
     path: "v1/companyIndex/deepSearch",
     headers: {
       "Content-Type": "application/json"
@@ -28647,6 +28955,10 @@ const companyIndexSearch = async (context, data) => {
     clientKey,
     errorLevel: "warn",
     errorMessage: "Failed to use companyIndexSearch",
+    errorHandler: async (response) => {
+      const error = await response;
+      throw new AdyenKycSdkError(error.message, error);
+    },
     path: "v1/companyIndex/indexSearch",
     headers: {
       "Content-Type": "application/json"
@@ -28689,6 +29001,10 @@ const getCompanyData = async (context, data) => {
     clientKey,
     errorLevel: "warn",
     errorMessage: "Failed to use getCompanyData",
+    errorHandler: async (response) => {
+      const error = await response;
+      throw new AdyenKycSdkError(error.message, error);
+    },
     path: "v1/companyData/fullDataset",
     headers: {
       "Content-Type": "application/json"
@@ -28742,6 +29058,10 @@ const refreshCompanyData = async (context, data) => {
     clientKey,
     errorLevel: "warn",
     errorMessage: "Failed to use refreshCompanyData",
+    errorHandler: async (response) => {
+      const error = await response;
+      throw new AdyenKycSdkError(error.message, error);
+    },
     path: "v1/companyData/refreshDataset",
     headers: {
       "Content-Type": "application/json"
@@ -28809,6 +29129,10 @@ const verifyTin = async (context, data) => {
     clientKey,
     errorLevel: "warn",
     errorMessage: "Failed to use verifyTin",
+    errorHandler: async (response) => {
+      const error = await response;
+      throw new AdyenKycSdkError(error.message, error);
+    },
     path: "v1/tinVerification/verifyTin",
     headers: {
       "Content-Type": "application/json"
@@ -28819,6 +29143,10 @@ const getKycExternalApi = ({
   loadingContext,
   clientKey
 }) => ({
+  accountIdentification: async (accountIdentificationDetails) => accountIdentification({
+    loadingContext,
+    clientKey
+  }, accountIdentificationDetails),
   getConfiguration: async (request) => getConfiguration({
     loadingContext,
     clientKey
@@ -28875,7 +29203,6 @@ const ConfigurationApiProvider = ({
   const authContext = useAuthContext();
   const contextValue = useMemo(() => authContext.isEmbeddedDropin ? getEmbeddedApi({
     base: authContext.loadingContext,
-    sdkToken: authContext.sdkToken,
     rootLegalEntityId
   }) : getKycExternalApi({
     loadingContext: authContext.loadingContext,
@@ -29159,7 +29486,7 @@ class UIElement extends BaseElement {
       const Component = this.props.component;
       return jsx(AuthProvider, {
         sdkToken: this.props.sdkToken,
-        refreshToken: this.props.refreshToken,
+        getSdkToken: this.props.getSdkToken,
         clientKey: this.props.clientKey,
         loadingContext: this.props.loadingContext,
         children: jsx(ConfigurationApiProvider, {
@@ -29733,10 +30060,10 @@ const validateComponentName = (componentName) => {
 const validateCoreOptions = (coreOptions) => {
   const requiredOptions = ["locale", "environment", "country"];
   const missing = requiredOptions.filter((option) => !coreOptions[option]);
-  if (!(coreOptions.sdkToken && coreOptions.refreshToken) && !coreOptions.clientKey) {
+  if (!(coreOptions.sdkToken && coreOptions.getSdkToken) && !coreOptions.clientKey) {
     throw new Error(`
 
-Please specify either sdkToken and a refreshToken or a clientKey for the SDK to initialize!
+Please specify either sdkToken and getSdkToken handler or a clientKey for the SDK to initialize!
       
 
 - For more information please check: https://github.com/Adyen/adyen-kyc-components#configuration.`);
@@ -29873,7 +30200,14 @@ class Core {
         newOptions.locale = FALLBACK_LOCALE;
       return newOptions;
     };
+    this.initializeSession = () => {
+      if (this.options.sdkToken && this.options.getSdkToken) {
+        setSdkToken(this.options.sdkToken);
+        setSdkTokenHandler(this.options.getSdkToken);
+      }
+    };
     this.options = this.getUpdatedOptions(coreOptions);
+    this.initializeSession();
   }
 }
 export {