@adyen/kyc-components 2.3.3 → 2.4.1

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

@@ -307,6 +307,9 @@ const invalidFormatForAuPassportNumber = "This isn't a valid Australian passport
 const invalidFormatForAuDriversLicenseNumber = "This isn't a valid Australian driver's license number. Expected format: 6-11 alphanumeric characters.";
 const invalidFormatForAuDriversLicenseCardNumber = "This isn't a valid Australian driver's license card number. Expected format: 6-10 alphanumeric characters.";
 const invalidFormatForAuProofOfIdentityCardNumber = "This isn't a valid Australian proof of identity card number. Expected format: 6-10 alphanumeric characters.";
+const invalidFormatForHKPassportNumber = "Not valid for HK. Format should be: 9-character alphanumeric. For example: K12345599";
+const invalidFormatForHKDriversLicenseNumber = "Not valid for HK. Format should be: 8-character alphanumeric. For example: A1234567";
+const invalidFormatForHKIdentityCardNumber = "Not valid for HK. Format should be: 8 or 9-character alphanumeric. For example: C668668A";
 const invalidFormatIdentityNumberBR = "Please use the CFP format: XXX.XXX.XXX-XX";
 const invalidFormatIdentityNumberDK = "Please use the CPR format: XXXXXX-XXXX";
 const invalidFormatIdentityNumberCA = "Please use the SIN format: XXXXXXXXX";
@@ -318,6 +321,7 @@ const invalidFormatIdentityNumberSE = "Please use the Personnummer format: YYYYM
 const invalidFormatIdentityNumberUS = "Please provide last 4 digits";
 const invalidFormatIdentityNumberUS9 = "Please use the SSN format: XXXXXXXXX";
 const invalidFormatIdentityNumberSG = "Please use the NRIC format: S1234567A";
+const invalidFormatIdentityNumberHK = "Not valid for HK. Format should be: 8 or 9-character alphanumeric. For example: C668668E";
 const invalidFormatBankStatementDescription = "Please ensure your input contains solely letters, digits, currency codes, and the specified special characters: -._,:;'*!@#%()+?¿/「」";
 const residencyCountry = "Country of residence";
 const stateOrProvince = "State or province";
@@ -334,6 +338,7 @@ const id = "ID";
 const driversLicense = "Driver's license";
 const issuerState = "Issuing state";
 const licenseNumber = "Driver license number";
+const driverLicense = "Driver License";
 const licenseCardNumber = "Card number";
 const documents = "Documents";
 const idDocument$1 = "ID Document";
@@ -410,6 +415,7 @@ const validationPleaseEnterAValidVatNumberWithFormat = "Please enter a valid Tax
 const validationPleaseEnterAValidTaxIdNumberWithFormat = "Please enter a valid Tax id number. Expected format: %{format}";
 const aValidAbnShouldBe11Digits = "A valid ABN should be 11 digits.";
 const aValidUenOrGstShouldBe9To10Characters = "A valid UEN/GST should be 9 to 10 characters.";
+const aValidBrnShouldBe8Digits = "A valid BRN should be 8 digits.";
 const validationPleaseEnterAValidUen = "Please enter a valid UEN";
 const validationPleaseEnterAValidIban = "Please enter a valid IBAN";
 const yourIbanShouldBeginWith_ = "Your IBAN should begin with %{countryCode}.";
@@ -445,6 +451,7 @@ const legalCompanyNameHelper = "Enter the name exactly as it is on your Chamber
 const legalCompanyNameHelper__AU = "Enter the name exactly as it is on your Australian Securities and Investment Commission's (ASIC)";
 const legalCompanyNameHelper__US = "Enter the name exactly as it appears 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.";
@@ -654,6 +661,7 @@ const numerodeIVA = "Número de IVA";
 const NIF = "NIF (Número de Identificación Fiscal)";
 const uen = "Unique Entity Number (UEN)";
 const nric = "National Registration Identity Card (NRIC)";
+const hkid = "HKID Number";
 const NIFdeIVA = "Número de Identificación a efectos de IVA";
 const partitaIVA = "Partita IVA";
 const organisationsnummer = "Organisationsnummer";
@@ -673,6 +681,7 @@ const cancel = "Cancel";
 const leave = "Leave";
 const taxIdNumber = "Tax Identification Number";
 const companyRegistrationNumber = "Company registration number";
+const companyRegistrationNumber__HK = "Company Registration number (CRN)";
 const euVatNumber = "EU VAT number";
 const vatNumber = "VAT number";
 const regonKrsNumber = "REGON / KRS number";
@@ -924,6 +933,7 @@ const instantVerification = "Instant verification";
 const xCharactersLeft = "%{charactersLeft} characters left";
 const goBack = "Go back";
 const businessRegistrationNumber = "Business registration number";
+const businessRegistrationNumber__HK = "Business Registration number (BRN)";
 const doNotHaveBusinessNumber = "I do not have a Business number";
 const enterNameExactlyAsAppearInID = "Enter your first name(s) exactly as it appears on your identity document";
 const enterLastNameExactlyAsAppearInID = "Enter your last name(s) exactly as it appears on your identity document";
@@ -1199,6 +1209,10 @@ const deceased = "My settlor is deceased";
 const noneOfTheAbove = "None of the above";
 const settlorExemptionReason = "Settlor exemption reasons";
 const otherInformation = "Other information";
+const firstNameOfSettlor = "First name of settlor";
+const lastNameOfSettlor = "Last name of settlor";
+const enterSettlorsFirstNameExactlyAsItAppearsInID = "Enter the settlor's first name(s) exactly as it appears on their identity document";
+const enterSettlorsLastNameExactlyAsItAppearsInID = "Enter the settlor's last name(s) exactly as it appears on their identity document";
 const defaultTrans = {
   close,
   individual,
@@ -1262,6 +1276,9 @@ const defaultTrans = {
   invalidFormatForAuDriversLicenseNumber,
   invalidFormatForAuDriversLicenseCardNumber,
   invalidFormatForAuProofOfIdentityCardNumber,
+  invalidFormatForHKPassportNumber,
+  invalidFormatForHKDriversLicenseNumber,
+  invalidFormatForHKIdentityCardNumber,
   invalidFormatIdentityNumberBR,
   invalidFormatIdentityNumberDK,
   invalidFormatIdentityNumberCA,
@@ -1273,6 +1290,7 @@ const defaultTrans = {
   invalidFormatIdentityNumberUS,
   invalidFormatIdentityNumberUS9,
   invalidFormatIdentityNumberSG,
+  invalidFormatIdentityNumberHK,
   invalidFormatBankStatementDescription,
   residencyCountry,
   stateOrProvince,
@@ -1289,6 +1307,7 @@ const defaultTrans = {
   driversLicense,
   issuerState,
   licenseNumber,
+  driverLicense,
   licenseCardNumber,
   documents,
   idDocument: idDocument$1,
@@ -1365,6 +1384,7 @@ const defaultTrans = {
   validationPleaseEnterAValidTaxIdNumberWithFormat,
   aValidAbnShouldBe11Digits,
   aValidUenOrGstShouldBe9To10Characters,
+  aValidBrnShouldBe8Digits,
   validationPleaseEnterAValidUen,
   validationPleaseEnterAValidIban,
   yourIbanShouldBeginWith_,
@@ -1400,6 +1420,7 @@ const defaultTrans = {
   legalCompanyNameHelper__AU,
   legalCompanyNameHelper__US,
   legalCompanyNameHelper__SG,
+  legalCompanyNameHelper__HK,
   accountDetailsDescription,
   provideDetails,
   payoutAccountsDescription,
@@ -1609,6 +1630,7 @@ const defaultTrans = {
   NIF,
   uen,
   nric,
+  hkid,
   NIFdeIVA,
   partitaIVA,
   organisationsnummer,
@@ -1631,6 +1653,7 @@ const defaultTrans = {
   leave,
   taxIdNumber,
   companyRegistrationNumber,
+  companyRegistrationNumber__HK,
   euVatNumber,
   vatNumber,
   regonKrsNumber,
@@ -1893,6 +1916,7 @@ const defaultTrans = {
   xCharactersLeft,
   goBack,
   businessRegistrationNumber,
+  businessRegistrationNumber__HK,
   doNotHaveBusinessNumber,
   "UEN/GST": "Unique Entity Number (UEN)/Goods and Services Tax (GST)",
   "IRD/GST": "Inland Revenue Department Number (IRD No)/Goods and Services Tax (GST)",
@@ -2169,7 +2193,11 @@ const defaultTrans = {
   deceased,
   noneOfTheAbove,
   settlorExemptionReason,
-  otherInformation
+  otherInformation,
+  firstNameOfSettlor,
+  lastNameOfSettlor,
+  enterSettlorsFirstNameExactlyAsItAppearsInID,
+  enterSettlorsLastNameExactlyAsItAppearsInID
 };
 const FALLBACK_LOCALE = "en-US";
 const defaultTranslation = defaultTrans;
@@ -3059,10 +3087,11 @@ function StateContextWatcher({
     }
   }, [JSON.stringify(formState == null ? void 0 : formState.currentState)]);
   return o(StateContext.Consumer, {
-    children: ({
-      state: state2
-    }) => {
-      setFormState(state2);
+    children: (stateContextValue) => {
+      if (!stateContextValue) {
+        throw new Error("<StateContextWatcher> needs to be mounted inside a <StateProvider>");
+      }
+      setFormState(stateContextValue.state);
       return null;
     }
   });
@@ -3179,10 +3208,14 @@ function StateContextSetter({
     return null;
   }
   return o(StateContext.Consumer, {
-    children: ({
-      dispatch,
-      setActiveForms
-    }) => {
+    children: (stateContextValue) => {
+      if (!stateContextValue) {
+        throw new Error("<StateContextSetter> needs to be mounted inside a <StateProvider>");
+      }
+      const {
+        dispatch,
+        setActiveForms
+      } = stateContextValue;
       stateRef.current.setState = dispatch;
       stateRef.current.setActiveForms = setActiveForms;
       return null;
@@ -3593,6 +3626,17 @@ const useStaticValidator = (rules2) => {
     triggerStaticValidation
   };
 };
+const mergeStaticAndAsyncErrorsState = (staticValidationErrors, asyncValidationErrors, schema) => {
+  if (!schema.length)
+    return staticValidationErrors;
+  return schema.reduce((acc, field) => {
+    var _a;
+    return {
+      ...acc,
+      [field]: staticValidationErrors[field] ?? ((_a = asyncValidationErrors[field]) == null ? void 0 : _a.getError()) ?? null
+    };
+  }, {});
+};
 function useForm({
   schema,
   defaultData,
@@ -3626,21 +3670,9 @@ function useForm({
     asyncValidate: triggerAsyncValidation
   }), [defaultData, fieldProblems, maskedFields, formatters, getRequiredFields, triggerStaticValidation, triggerAsyncValidation]);
   const [state2, dispatch] = s(getReducer(), getInitialData(), init);
-  const [formErrors, setFormErrors] = h(state2.errors);
-  const mergeAsyncErrorsState = T$1((staticValidationErrors, asyncValidationErrors) => {
-    if (!state2.schema.length)
-      return staticValidationErrors;
-    return state2.schema.reduce((acc, field) => {
-      var _a;
-      return {
-        ...acc,
-        [field]: staticValidationErrors[field] ?? ((_a = asyncValidationErrors[field]) == null ? void 0 : _a.getError()) ?? null
-      };
-    }, {});
-  }, [state2.schema]);
   const isValid = F$1(() => {
     var _a;
-    return (_a = state2.schema) == null ? void 0 : _a.some((key) => !!state2.valid[key]);
+    return (_a = state2.schema) == null ? void 0 : _a.every((key) => state2.valid[key]);
   }, [state2.schema, state2.valid]);
   const getTargetValue = T$1((key, e2) => {
     if (!(e2 == null ? void 0 : e2.target))
@@ -3713,9 +3745,7 @@ function useForm({
       setFieldProblems(fieldProblems);
     }
   }, [JSON.stringify(fieldProblems), setFieldProblems]);
-  p(() => {
-    setFormErrors(mergeAsyncErrorsState(state2.errors, asyncValidationResults));
-  }, [mergeAsyncErrorsState, asyncValidationResults, state2.errors]);
+  const formErrors = F$1(() => mergeStaticAndAsyncErrorsState(state2.errors, asyncValidationResults, state2.schema), [asyncValidationResults, state2.errors]);
   return {
     mergeForm,
     setData,
@@ -4509,7 +4539,7 @@ const lengthValidationPatterns = {
     message: "validationEnter9Or12Digits"
   }
 };
-const bankStatementDescriptionPattern = /^[\s+$\xA2-\xA5\u058F\u060B\u09F2\u09F3\u09FB\u0AF1\u0BF9\u0E3F\u17DB\u20A0-\u20BD\uA838\uFDFC\uFE69\uFF04\uFFE0\uFFE1\uFFE5\uFFE6a-zA-Z0-9-."_,:;'*!@#%()+?¿/&「」]*$/;
+const bankStatementDescriptionPattern = /^[$\xA2-\xA5\u058F\u060B\u09F2\u09F3\u09FB\u0AF1\u0BF9\u0E3F\u17DB\u20A0-\u20BD\uA838\uFDFC\uFE69\uFF04\uFFE0\uFFE1\uFFE5\uFFE6a-zA-Z0-9-."_,:;'*!@#%()+?¿/&「」]*$/;
 const businessRegistrationNumberPatterns = {
   [CountryCodes.Australia]: {
     default: {
@@ -5721,6 +5751,13 @@ const countryBasedValidatorRules$1 = {
       validate: (taxId2) => validateTaxId(taxId2, "SG"),
       errorMessage: "aValidUenOrGstShouldBe9To10Characters"
     }]
+  },
+  HK: {
+    taxId: [{
+      modes: ["blur"],
+      validate: (taxId2) => validateTaxId(taxId2, "HK"),
+      errorMessage: "aValidBrnShouldBe8Digits"
+    }]
   }
 };
 const taxIdFields = ["taxId", "exemptedFromTax"];
@@ -7655,7 +7692,7 @@ function CompanyDetailsComponent(props) {
         ...taxIdProps,
         dataStoreId: COMPANY_DETAILS,
         country: props.country
-      }), props.country === "SG" && formUtils.isRequiredField("dateOfIncorporation") && o(Field, {
+      }), formUtils.isRequiredField("dateOfIncorporation") && o(Field, {
         name: "dateOfIncorporation",
         label: formUtils.getLabel("dateOfIncorporation"),
         classNameModifiers: ["dateOfIncorporation"],
@@ -8438,10 +8475,10 @@ const countryConfig$4 = {
       label: "businessName"
     },
     registrationNumber: {
-      label: "companyNumber"
+      label: "companyRegistrationNumber__HK"
     },
     taxId: {
-      label: "businessRegistrationNumber"
+      label: "businessRegistrationNumber__HK"
     }
   },
   [CountryCodes.Hungary]: {
@@ -8799,7 +8836,7 @@ var TrustMemberTypes = /* @__PURE__ */ ((TrustMemberTypes2) => {
   TrustMemberTypes2["DEFINED_BENEFICIARY"] = "definedBeneficiary";
   TrustMemberTypes2["UNDEFINED_BENEFICIARY"] = "undefinedBeneficiary";
   TrustMemberTypes2["PROTECTOR"] = "protector";
-  TrustMemberTypes2["TRUSTEE"] = "trustee";
+  TrustMemberTypes2["TRUSTEE"] = "secondaryTrustee";
   TrustMemberTypes2["SETTLOR"] = "settlor";
   return TrustMemberTypes2;
 })(TrustMemberTypes || {});
@@ -8935,7 +8972,7 @@ var TaskStatus = /* @__PURE__ */ ((TaskStatus2) => {
 const SOLE_PROP_COUNTRIES = [CountryCodes.Austria, CountryCodes.Australia, CountryCodes.Belgium, CountryCodes.Bulgaria, CountryCodes.Canada, CountryCodes.Croatia, CountryCodes.Cyprus, CountryCodes.CzechRepublic, CountryCodes.Denmark, CountryCodes.Estonia, CountryCodes.Finland, CountryCodes.France, CountryCodes.Germany, CountryCodes.Gibraltar, CountryCodes.Greece, CountryCodes.Guernsey, CountryCodes.Hungary, CountryCodes.Ireland, CountryCodes.IsleOfMan, CountryCodes.Italy, CountryCodes.Jersey, CountryCodes.Latvia, CountryCodes.Liechtenstein, CountryCodes.Lithuania, CountryCodes.Luxembourg, CountryCodes.Malta, CountryCodes.Monaco, CountryCodes.Netherlands, CountryCodes.Norway, CountryCodes.Poland, CountryCodes.Portugal, CountryCodes.PuertoRico, CountryCodes.Romania, CountryCodes.Singapore, CountryCodes.Slovakia, CountryCodes.Slovenia, CountryCodes.Spain, CountryCodes.Sweden, CountryCodes.Switzerland, CountryCodes.UnitedKingdom, CountryCodes.UnitedStates];
 const ID_NUMBER_EXEMPT_COUNTRIES = [CountryCodes.Canada, CountryCodes.UnitedStates];
 const ID_NUMBER_VERIFICATION_COUNTRIES = [CountryCodes.UnitedStates];
-const COUNTRIES_WHICH_USE_MULTIPLE_IDENTITY_TYPES = [CountryCodes.Australia];
+const COUNTRIES_WHICH_USE_MULTIPLE_IDENTITY_TYPES = [CountryCodes.HongKong, CountryCodes.Australia];
 const ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES = [CountryCodes.Singapore];
 const NATIONALITY_REQUIRED_FOR_COUNTRIES = [CountryCodes.Singapore];
 const rules$2 = ({
@@ -9997,6 +10034,7 @@ const ADDRESS_SCHEMAS = {
   [CountryCodes.Canada]: [COUNTRY, STREET, HOUSE_NUMBER, CITY, POSTAL_CODE, STATE],
   [CountryCodes.UnitedKingdom]: [COUNTRY, HOUSE_NUMBER, STREET, CITY, POSTAL_CODE, STATE],
   [CountryCodes.UnitedStates]: [COUNTRY, STREET, HOUSE_NUMBER, CITY, STATE, POSTAL_CODE],
+  [CountryCodes.HongKong]: [COUNTRY, STREET, HOUSE_NUMBER, CITY, STATE],
   default: [COUNTRY, STREET, HOUSE_NUMBER, POSTAL_CODE, CITY, STATE]
 };
 const LABELS = {
@@ -10602,156 +10640,103 @@ const countrySpecificFormatters = {
     postalCode: createFormatByDigits(5)
   }
 };
-const createPatternByDigits = (digits) => ({
-  pattern: new RegExp(`\\d{${digits}}`)
-});
+const createPatternByDigits = (digits) => new RegExp(`\\d{${digits}}`);
 const postalCodePatterns = {
   [CountryCodes.Australia]: createPatternByDigits(4),
   [CountryCodes.Austria]: createPatternByDigits(4),
-  [CountryCodes.Belgium]: {
-    pattern: /(?:(?:[1-9])(?:\d{3}))/
-  },
+  [CountryCodes.Belgium]: /[1-9]\d{3}/,
   [CountryCodes.Brazil]: createPatternByDigits(8),
   [CountryCodes.Bulgaria]: createPatternByDigits(4),
-  [CountryCodes.Canada]: {
-    pattern: /(?:[ABCEGHJ-NPRSTVXY]\d[A-Z][ -]?\d[A-Z]\d)/
-  },
-  [CountryCodes.Croatia]: {
-    pattern: /^([1-5])[0-9]{4}$/
-  },
+  [CountryCodes.Canada]: /[ABCEGHJ-NPRSTVXY]\d[A-Z][ -]?\d[A-Z]\d/,
+  [CountryCodes.Croatia]: /^([1-5])[0-9]{4}$/,
   [CountryCodes.Cyprus]: createPatternByDigits(4),
-  [CountryCodes.CzechRepublic]: {
-    pattern: /\d{3}\s?\d{2}/
-  },
-  [CountryCodes.Denmark]: {
-    pattern: /^(DK-)?[0-9]{4}$/
-  },
+  [CountryCodes.CzechRepublic]: /\d{3}\s?\d{2}/,
+  [CountryCodes.Denmark]: /^(DK-)?[0-9]{4}$/,
   [CountryCodes.Estonia]: createPatternByDigits(5),
   [CountryCodes.Finland]: createPatternByDigits(5),
   [CountryCodes.France]: createPatternByDigits(5),
   [CountryCodes.Georgia]: createPatternByDigits(4),
   [CountryCodes.Germany]: createPatternByDigits(5),
-  [CountryCodes.Gibraltar]: {
-    pattern: /^GX11[ -]?1AA$/
-  },
-  [CountryCodes.Greece]: {
-    pattern: /^\d{3}\s{0,1}\d{2}$/
-  },
+  [CountryCodes.Gibraltar]: /^GX11[ -]?1AA$/,
+  [CountryCodes.Greece]: /^\d{3}\s?\d{2}$/,
   [CountryCodes.Hungary]: createPatternByDigits(4),
   [CountryCodes.Iceland]: createPatternByDigits(3),
-  [CountryCodes.Ireland]: {
-    pattern: /(?:^[AC-FHKNPRTV-Y][0-9]{2}|D6W)[ -]?[0-9AC-FHKNPRTV-Y]{4}/
-  },
+  [CountryCodes.Ireland]: /(?:^[AC-FHKNPRTV-Y][0-9]{2}|D6W)[ -]?[0-9AC-FHKNPRTV-Y]{4}/,
   [CountryCodes.Italy]: createPatternByDigits(5),
-  [CountryCodes.Japan]: {
-    pattern: /^\d{3}[-]\d{4}$/
-  },
-  [CountryCodes.Latvia]: {
-    pattern: /^(LV-)?[0-9]{4}$/
-  },
+  [CountryCodes.Japan]: /^\d{3}-\d{4}$/,
+  [CountryCodes.Latvia]: /^(LV-)?[0-9]{4}$/,
   [CountryCodes.Liechtenstein]: createPatternByDigits(4),
-  [CountryCodes.Lithuania]: {
-    pattern: /^(LT-)?[0-9]{4,5}$/
-  },
+  [CountryCodes.Lithuania]: /^(LT-)?[0-9]{4,5}$/,
   [CountryCodes.Luxembourg]: createPatternByDigits(4),
   [CountryCodes.Malaysia]: createPatternByDigits(5),
-  [CountryCodes.Malta]: {
-    pattern: /^[A-Za-z]{2,3}[ ]?\d{2}(?:\d{2})?$/
-  },
-  [CountryCodes.Monaco]: {
-    pattern: /^980\d{2}$/
-  },
-  [CountryCodes.Netherlands]: {
-    pattern: /(?:NL-)?(?:[1-9]\d{3} ?(?:[A-EGHJ-NPRTVWXZ][A-EGHJ-NPRSTVWXZ]|S[BCEGHJ-NPRTVWXZ]))/
-  },
+  [CountryCodes.Malta]: /^[A-Za-z]{2,3} ?\d{2}(?:\d{2})?$/,
+  [CountryCodes.Monaco]: /^980\d{2}$/,
+  [CountryCodes.Netherlands]: /(?:NL-)?[1-9]\d{3} ?(?:[A-EGHJ-NPRTVWXZ][A-EGHJ-NPRSTVWXZ]|S[BCEGHJ-NPRTVWXZ])/,
   [CountryCodes.NewZealand]: createPatternByDigits(4),
   [CountryCodes.Norway]: createPatternByDigits(4),
-  [CountryCodes.Poland]: {
-    pattern: /^\d{2}[-]\d{3}$/
-  },
-  [CountryCodes.Portugal]: {
-    pattern: /^([1-9]\d{3})([- ]?(\d{3})? *)$/
-  },
+  [CountryCodes.Poland]: /^\d{2}-\d{3}$/,
+  [CountryCodes.Portugal]: /^([1-9]\d{3})([- ]?(\d{3})? *)$/,
   [CountryCodes.PuertoRico]: createPatternByDigits(5),
   [CountryCodes.Romania]: createPatternByDigits(6),
-  [CountryCodes.Slovakia]: {
-    pattern: /^(SK-)?[0-9]{5}$/
-  },
-  [CountryCodes.Slovenia]: {
-    pattern: /^(SI-)?[0-9]{4}$/
-  },
+  [CountryCodes.Slovakia]: /^(SK-)?[0-9]{5}$/,
+  [CountryCodes.Slovenia]: /^(SI-)?[0-9]{4}$/,
   [CountryCodes.Singapore]: createPatternByDigits(6),
-  [CountryCodes.Spain]: {
-    pattern: /(?:0[1-9]|[1-4]\d|5[0-2])\d{3}/
-  },
+  [CountryCodes.Spain]: /(?:0[1-9]|[1-4]\d|5[0-2])\d{3}/,
   [CountryCodes.Sweden]: createPatternByDigits(5),
-  [CountryCodes.Switzerland]: {
-    pattern: /[1-9]\d{3}/
-  },
-  [CountryCodes.UnitedKingdom]: {
-    pattern: /^([A-Za-z][A-Ha-hK-Yk-y]?[0-9][A-Za-z0-9]? ?[0-9][A-Za-z]{2}|[Gg][Ii][Rr] ?0[Aa]{2})$/
-  },
-  [CountryCodes.UnitedStates]: {
-    pattern: /^(\d{5})([-]?(\d{4})? *)$/
-  }
+  [CountryCodes.Switzerland]: /[1-9]\d{3}/,
+  [CountryCodes.UnitedKingdom]: /^([A-Za-z][A-Ha-hK-Yk-y]?[0-9][A-Za-z0-9]? ?[0-9][A-Za-z]{2}|[Gg][Ii][Rr] ?0[Aa]{2})$/,
+  [CountryCodes.UnitedStates]: /^(\d{5})(-?(\d{4})? *)$/
 };
-const addressValidationRules = {
-  street: {
-    modes: ["blur"],
-    validate: (val) => hasText(val),
-    errorMessage: "fieldIsRequired"
-  },
-  houseNumberOrName: {
-    modes: ["blur"],
-    validate: (val, context) => {
-      const {
-        country: country2
-      } = context.state.data;
-      if (country2 && COUNTRIES_WITH_OPTIONAL_HOUSE_NUMBER.includes(country2)) {
-        return true;
-      }
-      return hasText(val);
+const addressValidationRules = (country2) => {
+  var _a, _b;
+  const postalCodeFormat = (_b = (_a = countrySpecificFormatters[country2]) == null ? void 0 : _a.postalCode) == null ? void 0 : _b.format;
+  return {
+    street: {
+      modes: ["blur"],
+      validate: (val) => hasText(val),
+      errorMessage: "fieldIsRequired"
     },
-    errorMessage: "fieldIsRequired"
-  },
-  postalCode: {
-    modes: ["blur"],
-    validate: (val, context) => {
-      var _a, _b;
-      const {
-        country: country2
-      } = context.state.data;
-      if (country2) {
-        addressValidationRules.postalCode.errorMessage = {
-          translationKey: "invalidFormatExpects",
-          translationObject: {
-            values: {
-              format: ((_a = countrySpecificFormatters[country2]) == null ? void 0 : _a.postalCode.format) || null
-            }
+    houseNumberOrName: {
+      modes: ["blur"],
+      validate: (val) => {
+        if (country2 && COUNTRIES_WITH_OPTIONAL_HOUSE_NUMBER.includes(country2)) {
+          return true;
+        }
+        return hasText(val);
+      },
+      errorMessage: "fieldIsRequired"
+    },
+    postalCode: {
+      modes: ["blur"],
+      validate: (val) => {
+        const pattern = postalCodePatterns[country2];
+        return pattern ? !!val && pattern.test(val) : !!val;
+      },
+      errorMessage: postalCodeFormat ? {
+        translationKey: "invalidFormatExpects",
+        translationObject: {
+          values: {
+            format: postalCodeFormat
           }
-        };
-        const pattern = (_b = postalCodePatterns[country2]) == null ? void 0 : _b.pattern;
-        return pattern ? pattern.test(val) : !!val;
-      }
-      return !!val;
+        }
+      } : "invalidFormat"
     },
-    errorMessage: "fieldIsRequired"
-  },
-  city: {
-    modes: ["blur"],
-    validate: hasText,
-    errorMessage: "fieldIsRequired"
-  },
-  stateOrProvince: {
-    modes: ["blur"],
-    validate: (val) => !!val,
-    errorMessage: "fieldIsRequired"
-  },
-  country: {
-    modes: ["blur"],
-    validate: (val) => !!val,
-    errorMessage: "fieldIsRequired"
-  }
+    city: {
+      modes: ["blur"],
+      validate: hasText,
+      errorMessage: "fieldIsRequired"
+    },
+    stateOrProvince: {
+      modes: ["blur"],
+      validate: (val) => !!val,
+      errorMessage: "fieldIsRequired"
+    },
+    country: {
+      modes: ["blur"],
+      validate: (val) => !!val,
+      errorMessage: "fieldIsRequired"
+    }
+  };
 };
 function Address(props) {
   const {
@@ -10782,6 +10767,7 @@ function Address(props) {
   const addressFields = ADDRESS_SCHEMAS[dataProp == null ? void 0 : dataProp.country] ?? ADDRESS_SCHEMAS.default;
   const datasetUtils = datasetUtilities(i18n.locale);
   const requiredFields = (requiredFieldsProp == null ? void 0 : requiredFieldsProp.includes("stateOrProvince")) || dataProp.country && COUNTRIES_WITH_STATES_DATASET.includes(dataProp.country) ? addressFields : addressFields.filter((ad) => ad !== "stateOrProvince");
+  const rules2 = F$1(() => addressValidationRules(dataProp.country), [dataProp.country]);
   const {
     data,
     errors,
@@ -10796,7 +10782,7 @@ function Address(props) {
     schema: requiredFields,
     defaultData: dataProp,
     formatters: addressFormatters,
-    rules: addressValidationRules,
+    rules: rules2,
     fieldProblems: fieldValidationErrorsProp,
     maskedFields: []
   });
@@ -10823,11 +10809,6 @@ function Address(props) {
       setShowAddAddressButton(false);
     }
   }, []);
-  p(() => {
-    if (data.postalCode) {
-      handleChangeFor("postalCode", "blur")(data.postalCode);
-    }
-  }, [data.country]);
   p(() => {
     const processedData = ADDRESS_SCHEMA.reduce((acc, cur) => {
       if (!formUtils.isRequiredField(cur)) {
@@ -11542,7 +11523,7 @@ const COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_SOLE_PROPS = [
   CountryCodes.Canada,
   CountryCodes.UnitedStates
 ];
-const COUNTRIES_THAT_REQUIRE_DATE_OF_INCORPORATION = [CountryCodes.Singapore];
+const COUNTRIES_THAT_REQUIRE_DATE_OF_INCORPORATION = [CountryCodes.HongKong, CountryCodes.Singapore];
 const rules$1 = ({
   data,
   country: country2,
@@ -11834,21 +11815,6 @@ const getOwnTrustMembers = (trustEntity) => {
     return [];
   return trustEntity.entityAssociations.filter((entityAssociation) => Object.values(TrustMemberTypes).includes(entityAssociation.type) && entityAssociation.associatorId === trustEntity.id);
 };
-const getRootTrusteeInfo = (rootLegalEntity) => ({
-  id: rootLegalEntity.id,
-  type: TrustMemberTypes.TRUSTEE
-});
-const getUndefinedBeneficiaries = (legalEntity) => {
-  var _a;
-  return ((_a = legalEntity.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) || [];
-};
-const getAllTrustMembers = (rootLegalEntity, trustEntity) => [getRootTrusteeInfo(rootLegalEntity), ...getOwnTrustMembers(trustEntity).map((association) => ({
-  id: association.legalEntityId || "",
-  type: association.type
-})), ...getUndefinedBeneficiaries(trustEntity).map((undefinedBeneficiaryInfo) => ({
-  id: undefinedBeneficiaryInfo.reference,
-  type: TrustMemberTypes.UNDEFINED_BENEFICIARY
-}))];
 const getOwnTrustMembersLegalEntityIds = (legalEntity) => getOwnTrustMembers(legalEntity).map((ea) => ea.legalEntityId).filter((id2) => id2 !== void 0);
 const getOwnTrustLegalEntityId = (legalEntity) => {
   var _a, _b;
@@ -12136,7 +12102,7 @@ function formatSwedenPersonnummer(value) {
 }
 const formattedCountries = [CountryCodes.Denmark, CountryCodes.Sweden];
 const stripCountryIdFormat = (value, country2) => {
-  if (value && formattedCountries.includes(country2)) {
+  if (formattedCountries.includes(country2)) {
     return cleanNonNumbers(value);
   }
   return value;
@@ -14228,7 +14194,7 @@ ContactDetailsComponent.defaultProps = {
   data: {}
 };
 const additionalIdentityInfoFields = ["typeOfIdentity", "licenseCardNumber", "issuerState"];
-const identityTypes = ["nationalIdNumber", "passport", "driversLicense", "proofOfIdentityCard"];
+const identityTypes$1 = ["nationalIdNumber", "passport", "driversLicense", "proofOfIdentityCard"];
 function useGlobalData() {
   const {
     getData
@@ -14267,25 +14233,25 @@ function useResetGlobalData(caller) {
     }
   }), [dispatch, caller]);
 }
-const isTruthyValidator = {
+const isTruthyValidator$1 = {
   validate: (value) => !!value,
   modes: ["blur"],
   errorMessage: "fieldIsRequired"
 };
-const PASSPORT_NUMBER_PATTERN = /^[A-Z]{1,2}\d{7}$/;
-const DRIVERS_LICENSE_NUMBER_PATTERN = /^[A-Za-z\d]{6,11}$/;
-const PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN = /^[A-Za-z\d]{6,10}$/;
+const PASSPORT_NUMBER_PATTERN$1 = /^[A-Z]{1,2}\d{7}$/;
+const DRIVERS_LICENSE_NUMBER_PATTERN$1 = /^[A-Za-z\d]{6,11}$/;
+const PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN$1 = /^[A-Za-z\d]{6,10}$/;
 const auIdentityValidationRules = {
-  typeOfIdentity: [isTruthyValidator],
+  typeOfIdentity: [isTruthyValidator$1],
   idNumber: [{
     validate: (value, context) => {
       switch (context.state.data.typeOfIdentity) {
         case "passport":
-          return PASSPORT_NUMBER_PATTERN.test(value);
+          return PASSPORT_NUMBER_PATTERN$1.test(value);
         case "driversLicense":
-          return DRIVERS_LICENSE_NUMBER_PATTERN.test(value);
+          return DRIVERS_LICENSE_NUMBER_PATTERN$1.test(value);
         case "proofOfIdentityCard":
-          return PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN.test(value);
+          return PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN$1.test(value);
       }
     },
     errorMessage: (value, context) => {
@@ -14301,13 +14267,13 @@ const auIdentityValidationRules = {
     modes: ["blur"]
   }],
   licenseCardNumber: [{
-    validate: (value) => DRIVERS_LICENSE_NUMBER_PATTERN.test(value),
+    validate: (value) => DRIVERS_LICENSE_NUMBER_PATTERN$1.test(value),
     errorMessage: "invalidFormatForAuDriversLicenseCardNumber",
     modes: ["blur"]
   }],
-  issuerState: [isTruthyValidator]
+  issuerState: [isTruthyValidator$1]
 };
-const DriversLicense = ({
+const DriversLicense$1 = ({
   driversLicense: driversLicense2,
   onIssuerStateChange,
   onLicenseNumberInput,
@@ -14385,7 +14351,7 @@ const DriversLicense = ({
     })]
   });
 };
-const PassportNumber = ({
+const PassportNumber$1 = ({
   passportNumber: passportNumber2,
   onInput,
   onBlur,
@@ -14408,7 +14374,7 @@ const PassportNumber = ({
     placeholder: ""
   })
 });
-const ProofOfIdentityCard = ({
+const ProofOfIdentityCard$1 = ({
   cardNumber,
   onInput,
   onBlur,
@@ -14431,11 +14397,11 @@ const ProofOfIdentityCard = ({
     placeholder: ""
   })
 });
-const mapIdentityTypeToItem = (type, label) => ({
+const mapIdentityTypeToItem$1 = (type, label) => ({
   id: type,
   name: label
 });
-const TypeOfIdentity = ({
+const TypeOfIdentity$1 = ({
   availableIdentityTypes,
   selectedIdentityType,
   setSelectedIdentityType,
@@ -14457,7 +14423,7 @@ const TypeOfIdentity = ({
     children: (childProps) => o(Select, {
       ...childProps,
       isInvalid: false,
-      items: availableIdentityTypes.map((type) => mapIdentityTypeToItem(type, i18n.get(type))),
+      items: availableIdentityTypes.map((type) => mapIdentityTypeToItem$1(type, i18n.get(type))),
       placeholder: i18n.get("id"),
       selected: selectedIdentityType,
       onChange: (event) => setSelectedIdentityType(event.target.value)
@@ -14485,7 +14451,6 @@ function IdentityAuComponent(props) {
     maskedFields: props.maskedFields
   });
   p(() => {
-    console.log("triggerValidation");
     if (data.typeOfIdentity)
       triggerValidation(["idNumber"]);
   }, [data.typeOfIdentity]);
@@ -14507,28 +14472,28 @@ function IdentityAuComponent(props) {
   } = useCoreContext();
   const formUtils = formUtilities(props, i18n);
   return o(Fragment, {
-    children: [o(TypeOfIdentity, {
-      availableIdentityTypes: identityTypes.filter((type) => type !== "nationalIdNumber"),
+    children: [o(TypeOfIdentity$1, {
+      availableIdentityTypes: identityTypes$1.filter((type) => type !== "nationalIdNumber"),
       selectedIdentityType: data.typeOfIdentity,
       setSelectedIdentityType: handleChangeFor("typeOfIdentity"),
       formUtils,
       isValid: valid.typeOfIdentity,
       errorMessage: formUtils.getErrorMessage("typeOfIdentity", errors, fieldProblems)
-    }), data.typeOfIdentity === "passport" ? o(PassportNumber, {
+    }), data.typeOfIdentity === "passport" ? o(PassportNumber$1, {
       passportNumber: data.idNumber,
       onInput: handleChangeFor("idNumber", "input"),
       onBlur: handleChangeFor("idNumber", "blur"),
       formUtils,
       isValid: valid.idNumber,
       errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems)
-    }) : data.typeOfIdentity === "proofOfIdentityCard" ? o(ProofOfIdentityCard, {
+    }) : data.typeOfIdentity === "proofOfIdentityCard" ? o(ProofOfIdentityCard$1, {
       cardNumber: data.idNumber,
       onInput: handleChangeFor("idNumber", "input"),
       onBlur: handleChangeFor("idNumber", "blur"),
       formUtils,
       isValid: valid.idNumber,
       errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems)
-    }) : data.typeOfIdentity === "driversLicense" ? o(DriversLicense, {
+    }) : data.typeOfIdentity === "driversLicense" ? o(DriversLicense$1, {
       driversLicense: data,
       onIssuerStateChange: handleChangeFor("issuerState"),
       onLicenseNumberInput: handleChangeFor("idNumber", "input"),
@@ -14550,109 +14515,353 @@ function IdentityAuComponent(props) {
   });
 }
 const auIdentityFields = [...additionalIdentityInfoFields, "idNumber"];
-const IdentityNumber$1 = "";
-function validCheckCharacter(input, calculationInput) {
-  if (!/^[A-Z]$/.test(input)) {
-    return false;
-  }
-  const CHECKCHARACTER_ODD_VALUE = {
-    0: 1,
-    9: 21,
-    I: 19,
-    R: 8,
-    1: 0,
-    A: 1,
-    J: 21,
-    S: 12,
-    2: 5,
-    B: 0,
-    K: 2,
-    T: 14,
-    3: 7,
-    C: 5,
-    L: 4,
-    U: 16,
-    4: 9,
-    D: 7,
-    M: 18,
-    V: 10,
-    5: 13,
-    E: 9,
-    N: 20,
-    W: 22,
-    6: 15,
-    F: 13,
-    O: 11,
-    X: 25,
-    7: 17,
-    G: 15,
-    P: 3,
-    Y: 24,
-    8: 19,
-    H: 17,
-    Q: 6,
-    Z: 23
-  };
-  const CHECKCHARACTER_EVEN_VALUE = {
-    0: 0,
-    9: 9,
-    I: 8,
-    R: 17,
-    1: 1,
-    A: 0,
-    J: 9,
-    S: 18,
-    2: 2,
-    B: 1,
-    K: 10,
-    T: 19,
-    3: 3,
-    C: 2,
-    L: 11,
-    U: 20,
-    4: 4,
-    D: 3,
-    M: 12,
-    V: 21,
-    5: 5,
-    E: 4,
-    N: 13,
-    W: 22,
-    6: 6,
-    F: 5,
-    O: 14,
-    X: 23,
-    7: 7,
-    G: 6,
-    P: 15,
-    Y: 24,
-    8: 8,
-    H: 7,
-    Q: 16,
-    Z: 25
-  };
-  let total = 0;
-  for (let i2 = 0; i2 < 15; i2 += 1) {
-    const set = i2 % 2 === 1 ? CHECKCHARACTER_EVEN_VALUE : CHECKCHARACTER_ODD_VALUE;
-    const token = calculationInput.substring(i2, i2 + 1);
-    const value = set[token];
-    if (value == null) {
-      return true;
-    }
-    total = (total + value) % 26;
-  }
-  if (total >= 0 && total <= 26 && "ABCDEFGHIJKLMNOPQRSTUVWXYZ".charAt(total) === input) {
-    return true;
-  }
-  return false;
-}
-const helper = {
-  validCheckCharacter
+const identityTypes = ["nationalIdNumber", "passport", "driversLicense", "proofOfIdentityCard"];
+const PASSPORT_NUMBER_PATTERN = /^(?=.{9}$)[A-Z]{1,2}\d{6}[A-Z0-9]{1,2}$/;
+const DRIVERS_LICENSE_NUMBER_PATTERN = /^[A-Z]{1}[A-Z0-9]{7}$/;
+const PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN = /^[A-Z]{1,2}[0-9]{6}[0-9A]$/;
+const isValidatePassportNumber = (value) => PASSPORT_NUMBER_PATTERN.test(value);
+const isTruthyValidator = {
+  validate: (value) => !!value,
+  modes: ["blur"],
+  errorMessage: "fieldIsRequired"
 };
-const countryIdNumberFormatters = {
-  [CountryCodes.Brazil]: {
-    idNumber: {
-      formatter: formatBrazilSSN,
+const identityValidationRules = {
+  typeOfIdentity: [isTruthyValidator],
+  idNumber: [{
+    validate: (val, context) => {
+      const value = val ?? "";
+      switch (context == null ? void 0 : context.state.data.typeOfIdentity) {
+        case "passport":
+          return isValidatePassportNumber(value);
+        case "driversLicense":
+          return DRIVERS_LICENSE_NUMBER_PATTERN.test(value);
+        case "proofOfIdentityCard":
+          return PROOF_OF_IDENTITY_CARD_NUMBER_PATTERN.test(value);
+        default:
+          return false;
+      }
+    },
+    errorMessage: (_2, context) => {
+      switch (context == null ? void 0 : context.state.data.typeOfIdentity) {
+        case "passport":
+          return "invalidFormatForHKPassportNumber";
+        case "driversLicense":
+          return "invalidFormatForHKDriversLicenseNumber";
+        case "proofOfIdentityCard":
+          return "invalidFormatForHKIdentityCardNumber";
+      }
+    },
+    modes: ["blur"]
+  }],
+  licenseCardNumber: [{
+    validate: (value) => DRIVERS_LICENSE_NUMBER_PATTERN.test(value ?? ""),
+    errorMessage: "invalidFormatForHKDriversLicenseNumber",
+    modes: ["blur"]
+  }],
+  issuerState: [isTruthyValidator]
+};
+const DriversLicense = ({
+  driversLicense: driversLicense2,
+  onLicenseNumberInput,
+  onLicenseNumberBlur,
+  isValid,
+  errorMessages,
+  label
+}) => {
+  const {
+    i18n
+  } = useCoreContext();
+  return o(Fragment, {
+    children: [o("div", {
+      className: "adyen-kyc-field-wrapper",
+      children: o(Field, {
+        name: "licenseNumber",
+        label,
+        isValid: isValid.idNumber,
+        errorMessage: errorMessages.idNumber,
+        children: (childProps) => o(InputText, {
+          ...childProps,
+          name: "licenseNumber",
+          value: driversLicense2.idNumber,
+          onInput: onLicenseNumberInput,
+          onBlur: onLicenseNumberBlur,
+          placeholder: ""
+        })
+      })
+    }), o(ContextGuidance, {
+      page: "Personal details",
+      title: i18n.get("whereCanIFindTheseNumbersOnMyDriversLicense"),
+      content: o(Fragment, {
+        children: [i18n.get("whereToFindNumbersOnDriversLicense"), " ", o("a", {
+          href: "https://www.usi.gov.au/about/forms-id/drivers-licence",
+          target: "_blank",
+          rel: "noreferrer",
+          children: i18n.get("iStillCantFindIt")
+        })]
+      }),
+      titleId: "whereCanIFindTheseNumbersOnMyDriversLicense",
+      contentId: "whereToFindNumbersOnDriversLicense"
+    })]
+  });
+};
+const PassportNumber = ({
+  passportNumber: passportNumber2,
+  onInput,
+  onBlur,
+  errorMessage,
+  isValid,
+  label
+}) => o(Field, {
+  name: "passportNumber",
+  label,
+  errorMessage,
+  isValid,
+  children: (childProps) => o(InputText, {
+    ...childProps,
+    name: "passportNumber",
+    value: passportNumber2,
+    onInput,
+    onBlur,
+    placeholder: ""
+  })
+});
+const ProofOfIdentityCard = ({
+  cardNumber,
+  onInput,
+  onBlur,
+  label,
+  errorMessage,
+  isValid
+}) => o(Field, {
+  name: "cardNumber",
+  label,
+  errorMessage,
+  isValid,
+  children: (childProps) => o(InputText, {
+    ...childProps,
+    name: "cardNumber",
+    value: cardNumber,
+    onInput,
+    onBlur,
+    placeholder: ""
+  })
+});
+const mapIdentityTypeToItem = (type, label) => ({
+  id: type,
+  name: label
+});
+const TypeOfIdentity = ({
+  availableIdentityTypes,
+  selectedIdentityType,
+  setSelectedIdentityType,
+  formUtils: {
+    getLabel
+  },
+  errorMessage,
+  isValid
+}) => {
+  const {
+    i18n
+  } = useCoreContext();
+  return o(Field, {
+    name: "typeOfIdentity",
+    label: getLabel("typeOfIdentity"),
+    errorMessage,
+    isValid,
+    helper: i18n.get("typeOfIdentitySubtitle"),
+    children: (childProps) => o(Select, {
+      ...childProps,
+      isInvalid: false,
+      items: availableIdentityTypes.map((type) => mapIdentityTypeToItem(type, i18n.get(type))),
+      placeholder: i18n.get("id"),
+      selected: selectedIdentityType,
+      onChange: (event) => setSelectedIdentityType(event.target.value)
+    })
+  });
+};
+function IdentityHKComponent(props) {
+  var _a;
+  if (((_a = props.data) == null ? void 0 : _a.typeOfIdentity) === "nationalIdNumber") {
+    props.data.typeOfIdentity = void 0;
+  }
+  const {
+    handleChangeFor,
+    triggerValidation,
+    data,
+    errors,
+    fieldProblems,
+    valid
+  } = useForm({
+    ...props,
+    schema: props.requiredFields ?? [],
+    defaultData: props.data,
+    fieldProblems: props.fieldValidationErrors,
+    rules: identityValidationRules,
+    maskedFields: props.maskedFields
+  });
+  p(() => {
+    if (data.typeOfIdentity) {
+      triggerValidation(["idNumber"]);
+    }
+  }, [data.typeOfIdentity]);
+  const {
+    sliceData,
+    updateStateSlice
+  } = useGlobalDataSlice("personalDetails");
+  p(() => {
+    updateStateSlice({
+      data: {
+        ...sliceData,
+        ...data
+      },
+      errors,
+      valid,
+      fieldProblems
+    });
+  }, [data, errors, valid, fieldProblems]);
+  const {
+    i18n
+  } = useCoreContext();
+  const formUtils = formUtilities(props, i18n);
+  return o(Fragment, {
+    children: [o(TypeOfIdentity, {
+      availableIdentityTypes: identityTypes.filter((type) => type !== "nationalIdNumber"),
+      selectedIdentityType: data.typeOfIdentity,
+      setSelectedIdentityType: handleChangeFor("typeOfIdentity"),
+      formUtils,
+      isValid: valid.typeOfIdentity,
+      errorMessage: formUtils.getErrorMessage("typeOfIdentity", errors, fieldProblems)
+    }), data.typeOfIdentity === "passport" ? o(PassportNumber, {
+      passportNumber: data.idNumber ?? "",
+      onInput: handleChangeFor("idNumber", "input"),
+      onBlur: handleChangeFor("idNumber", "blur"),
+      isValid: valid.idNumber,
+      label: formUtils.getLabel("idNumber", "passportNumber"),
+      errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems)
+    }) : data.typeOfIdentity === "proofOfIdentityCard" ? o(ProofOfIdentityCard, {
+      cardNumber: data.idNumber ?? "",
+      onInput: handleChangeFor("idNumber", "input"),
+      onBlur: handleChangeFor("idNumber", "blur"),
+      isValid: valid.idNumber,
+      label: formUtils.getLabel("idNumber", "hkid"),
+      errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldProblems)
+    }) : data.typeOfIdentity === "driversLicense" ? o(DriversLicense, {
+      driversLicense: data,
+      onLicenseNumberInput: handleChangeFor("idNumber", "input"),
+      onLicenseNumberBlur: handleChangeFor("idNumber", "blur"),
+      label: formUtils.getLabel("idNumber", "driverLicense"),
+      isValid: {
+        idNumber: valid.idNumber
+      },
+      errorMessages: {
+        idNumber: formUtils.getErrorMessage("idNumber", errors, fieldProblems)
+      }
+    }) : void 0]
+  });
+}
+const IdentityNumber$1 = "";
+function validCheckCharacter(input, calculationInput) {
+  if (!/^[A-Z]$/.test(input)) {
+    return false;
+  }
+  const CHECKCHARACTER_ODD_VALUE = {
+    0: 1,
+    9: 21,
+    I: 19,
+    R: 8,
+    1: 0,
+    A: 1,
+    J: 21,
+    S: 12,
+    2: 5,
+    B: 0,
+    K: 2,
+    T: 14,
+    3: 7,
+    C: 5,
+    L: 4,
+    U: 16,
+    4: 9,
+    D: 7,
+    M: 18,
+    V: 10,
+    5: 13,
+    E: 9,
+    N: 20,
+    W: 22,
+    6: 15,
+    F: 13,
+    O: 11,
+    X: 25,
+    7: 17,
+    G: 15,
+    P: 3,
+    Y: 24,
+    8: 19,
+    H: 17,
+    Q: 6,
+    Z: 23
+  };
+  const CHECKCHARACTER_EVEN_VALUE = {
+    0: 0,
+    9: 9,
+    I: 8,
+    R: 17,
+    1: 1,
+    A: 0,
+    J: 9,
+    S: 18,
+    2: 2,
+    B: 1,
+    K: 10,
+    T: 19,
+    3: 3,
+    C: 2,
+    L: 11,
+    U: 20,
+    4: 4,
+    D: 3,
+    M: 12,
+    V: 21,
+    5: 5,
+    E: 4,
+    N: 13,
+    W: 22,
+    6: 6,
+    F: 5,
+    O: 14,
+    X: 23,
+    7: 7,
+    G: 6,
+    P: 15,
+    Y: 24,
+    8: 8,
+    H: 7,
+    Q: 16,
+    Z: 25
+  };
+  let total = 0;
+  for (let i2 = 0; i2 < 15; i2 += 1) {
+    const set = i2 % 2 === 1 ? CHECKCHARACTER_EVEN_VALUE : CHECKCHARACTER_ODD_VALUE;
+    const token = calculationInput.substring(i2, i2 + 1);
+    const value = set[token];
+    if (value == null) {
+      return true;
+    }
+    total = (total + value) % 26;
+  }
+  if (total >= 0 && total <= 26 && "ABCDEFGHIJKLMNOPQRSTUVWXYZ".charAt(total) === input) {
+    return true;
+  }
+  return false;
+}
+const helper = {
+  validCheckCharacter
+};
+const countryIdNumberFormatters = {
+  [CountryCodes.Brazil]: {
+    idNumber: {
+      formatter: formatBrazilSSN,
       maxlength: 18
     }
   },
@@ -15147,7 +15356,8 @@ function NameComponent(props) {
     setState: null
   });
   p(() => {
-    stateRef.current.setState({
+    var _a, _b, _c;
+    (_b = (_a = stateRef.current) == null ? void 0 : _a.setState) == null ? void 0 : _b.call(_a, {
       type: "addToState",
       value: {
         data,
@@ -15158,6 +15368,14 @@ function NameComponent(props) {
         dataStoreId
       }
     });
+    (_c = props.onChange) == null ? void 0 : _c.call(props, {
+      schema,
+      data,
+      valid,
+      errors,
+      fieldProblems,
+      isValid
+    });
   }, [data, valid, errors, isValid]);
   const formUtils = formUtilities(props, i18n);
   return o("div", {
@@ -15170,7 +15388,7 @@ function NameComponent(props) {
       classNameModifiers: ["firstName", "col-50"],
       errorMessage: formUtils.getErrorMessage("firstName", errors, fieldProblems),
       isValid: valid.firstName,
-      helper: i18n.get("enterNameExactlyAsAppearInID"),
+      helper: formUtils.getLabel("enterNameExactlyAsAppearInID"),
       children: (childProps) => o(InputText, {
         ...childProps,
         name: "firstName",
@@ -15191,7 +15409,7 @@ function NameComponent(props) {
       classNameModifiers: ["lastName", "col-50"],
       errorMessage: formUtils.getErrorMessage("lastName", errors, fieldProblems),
       isValid: valid.lastName,
-      helper: i18n.get("enterLastNameExactlyAsAppearInID"),
+      helper: formUtils.getLabel("enterLastNameExactlyAsAppearInID"),
       children: (childProps) => o(InputText, {
         ...childProps,
         name: "lastName",
@@ -15418,7 +15636,10 @@ function PersonalDetailsComponent(props) {
         onDropdownChange: handleChangeFor("residencyCountry", "input"),
         value: data.residencyCountry,
         readOnly: !isAllowedEditPrefilledCountry && !isDecisionMakerTask
-      }), hasRequiredFields(identityProps) && (data.residencyCountry === "AU" ? o(IdentityAuComponent, {
+      }), hasRequiredFields(identityProps) && (data.residencyCountry === "HK" ? o(IdentityHKComponent, {
+        ...identityAuProps,
+        dataStoreId: PERSONAL_DETAILS
+      }) : data.residencyCountry === "AU" ? o(IdentityAuComponent, {
         ...identityAuProps,
         dataStoreId: PERSONAL_DETAILS
       }) : data.residencyCountry === "US" ? o(IdentityUSComponent, {
@@ -15432,7 +15653,7 @@ function PersonalDetailsComponent(props) {
         errors: externalErrors,
         country: data.residencyCountry,
         dataStoreId: PERSONAL_DETAILS
-      })), data.residencyCountry === "SG" && formUtils.isRequiredField("nationality") && o(CountryField, {
+      })), (data.residencyCountry === "SG" || data.residencyCountry === "HK") && formUtils.isRequiredField("nationality") && o(CountryField, {
         label: formUtils.getLabel("nationality"),
         classNameModifiers: ["nationality"],
         errorMessage: formUtils.getErrorMessage("nationality", errors, fieldProblems),
@@ -17589,7 +17810,7 @@ function PayoutBankStatementComponent(props) {
     }) : null]
   });
 }
-const PayoutBankStatement = x(PayoutBankStatementComponent, (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 PayoutBankStatement = x(PayoutBankStatementComponent, (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.heading === nextProps.heading);
 const VerificationMethod = "";
 const hasLoaded = (loadedValue) => loadedValue !== "loading";
 const eeaCountries = [CountryCodes.Austria, CountryCodes.Belgium, CountryCodes.Bulgaria, CountryCodes.Croatia, CountryCodes.Cyprus, CountryCodes.CzechRepublic, CountryCodes.Denmark, CountryCodes.Estonia, CountryCodes.Finland, CountryCodes.France, CountryCodes.Germany, CountryCodes.Greece, CountryCodes.Hungary, CountryCodes.Ireland, CountryCodes.Italy, CountryCodes.Latvia, CountryCodes.Lithuania, CountryCodes.Luxembourg, CountryCodes.Netherlands, CountryCodes.Norway, CountryCodes.Poland, CountryCodes.Portugal, CountryCodes.Romania, CountryCodes.Slovakia, CountryCodes.Slovenia, CountryCodes.Spain, CountryCodes.Sweden];
@@ -19686,6 +19907,9 @@ const solePropBase = {
   tradingName: {
     rule: "REQUIRED"
   },
+  dateOfIncorporation: {
+    rule: "countryRequiresDateOfIncorporationForCompanies"
+  },
   exemptedFromRegistrationNumber: {
     rule: "countryHasRegistrationExemptionsForSomeSoleProps"
   },
@@ -20031,12 +20255,14 @@ const getRequiredForms = (forms, requiredFields, optionalFields) => {
 };
 const addValidityToForms = (forms, formValidity, problems) => forms.map(({
   formId,
-  formName
+  formName,
+  fields
 }) => {
   var _a;
   return {
     formId,
     formName,
+    fields,
     isValid: (formValidity == null ? void 0 : formValidity[formId]) ?? false,
     hasServerValidationErrors: Boolean((_a = problems == null ? void 0 : problems.validationErrors) == null ? void 0 : _a[formId])
   };
@@ -20130,6 +20356,7 @@ const FormNavigationItem = ({
   const {
     i18n
   } = useCoreContext();
+  const hasError = form.hasServerValidationErrors || hasVerificationErrors;
   return o("li", {
     className: cx("adyen-kyc-form-navigation__item", {
       "adyen-kyc-form-navigation__item--active": isActive,
@@ -20142,7 +20369,7 @@ const FormNavigationItem = ({
       children: o(AlertIcon, {
         type: AlertTypes.WARNING
       })
-    }), form.isValid && !form.hasServerValidationErrors && !hasVerificationErrors && o("span", {
+    }), form.isValid && !hasError && o("span", {
       className: "adyen-kyc-form-navigation__item-icon adyen-kyc-form-navigation__item-icon--success",
       children: o(Icon, {
         name: "checkmark-small"
@@ -20157,7 +20384,7 @@ function FormNavigation({
   validateForm,
   className,
   taskName,
-  hasVerificationErrors = false,
+  verificationErrors,
   trackNavigation: trackNavigation2 = noop
 }) {
   const {
@@ -20205,7 +20432,7 @@ function FormNavigation({
         form,
         isActive: form.formId === activeForm.formId,
         onClick: getNavigateHandler(form, activeForm),
-        hasVerificationErrors
+        hasVerificationErrors: Boolean((verificationErrors == null ? void 0 : verificationErrors[form.formId]) ?? false)
       }, form.formId))]
     })]
   });
@@ -20314,7 +20541,7 @@ const FormWrapper = ({
         baseTrackingPayload,
         i18n
       }),
-      hasVerificationErrors: Object.keys((problems == null ? void 0 : problems.verificationErrors) ?? {}).length > 0
+      verificationErrors: problems == null ? void 0 : problems.verificationErrors
     })
   });
   return o(DropinLayout, {
@@ -20475,7 +20702,7 @@ function CompanyDropinComponent({
       const existingRoles = (_a2 = existingEntityAssociations == null ? void 0 : existingEntityAssociations.filter((ea) => ea.legalEntityId === parentLegalEntity.id)) == null ? void 0 : _a2.map(({
         type
       }) => type);
-      const newRoles = associationDetail == null ? void 0 : associationDetail.types;
+      const newRoles = associationDetail == null ? void 0 : associationDetail.roles;
       if (newRoles && !doArraysMatch(existingRoles, newRoles)) {
         const updatedParentLegalEntity = {
           entityAssociations: [...newRoles.map((role2) => ({
@@ -20662,6 +20889,7 @@ function CompanyDropinComponent({
     validateForm: () => setShouldValidate(true),
     baseTrackingPayload,
     onSubmit,
+    problems,
     canSubmit: canSubmit(data) && hasDataChanged(dataFromResponse, data),
     summary: {
       data: formatDataForSummary(data, forms),
@@ -20683,6 +20911,22 @@ function CompanyDropinComponent({
     })
   });
 }
+const logger$3 = createLogger("useExemptSettlor");
+const useExemptSettlor = ({
+  trust,
+  handleGetLegalEntity
+}) => {
+  const [exemptSettlor, setExemptSettlor] = h();
+  const updateExemptSettlor = T$1(async (trustLE) => {
+    const exemptSettlorAssociation = getOwnEntityAssociations(trustLE).find((association) => association.type === TrustMemberTypes.SETTLOR && Boolean(association.settlorExemptionReason));
+    const exemptSettlorLE = (exemptSettlorAssociation == null ? void 0 : exemptSettlorAssociation.legalEntityId) ? await handleGetLegalEntity(exemptSettlorAssociation.legalEntityId) : void 0;
+    setExemptSettlor(exemptSettlorLE);
+  }, [handleGetLegalEntity]);
+  p(() => {
+    updateExemptSettlor(trust).catch(logger$3.error);
+  }, [trust, updateExemptSettlor]);
+  return exemptSettlor;
+};
 const downloadFile = async (base64, filename) => {
   saveBlobAsFile(base64ToBlob(base64), filename);
 };
@@ -20745,6 +20989,190 @@ const getPayoutAccountHolderName = (legalEntity, i18n) => {
   }
   return getLegalEntityNameBasedOnType(legalEntity);
 };
+const splitAtFirstOccurrence = (str, separator) => {
+  const firstOccurrence = str.indexOf(separator);
+  if (firstOccurrence === -1)
+    return [str];
+  return [str.slice(0, firstOccurrence), str.slice(firstOccurrence + 1)];
+};
+const getTrustMemberOwnerId = (trustMemberId, entityAssociations) => {
+  var _a;
+  return (_a = entityAssociations.find((association) => association.associatorId === trustMemberId && association.type === TrustMemberTypes.TRUSTEE)) == null ? void 0 : _a.legalEntityId;
+};
+const getFallbackName = (exemptSettlorAssociation) => {
+  const [firstName2, lastName2] = splitAtFirstOccurrence(exemptSettlorAssociation.name ?? "", " ");
+  return {
+    firstName: firstName2,
+    lastName: lastName2
+  };
+};
+const convertEntityAssociationIntoTrustMember = (association, associations, exemptSettlorLE) => {
+  var _a;
+  if (association.settlorExemptionReason)
+    return {
+      trustMemberType: "exemptSettlor",
+      roles: [TrustMemberTypes.SETTLOR],
+      legalEntityType: LegalEntityType.INDIVIDUAL,
+      legalEntityId: association.legalEntityId,
+      settlorExemptionReason: association.settlorExemptionReason,
+      exemptSettlorName: ((_a = exemptSettlorLE == null ? void 0 : exemptSettlorLE.individual) == null ? void 0 : _a.name) ?? getFallbackName(association)
+    };
+  if (association.entityType === LegalEntityType.ORGANIZATION)
+    return {
+      trustMemberType: "company",
+      roles: [],
+      legalEntityType: LegalEntityType.ORGANIZATION,
+      legalEntityId: association.legalEntityId,
+      name: association.name,
+      ownerId: getTrustMemberOwnerId(association.legalEntityId, associations)
+    };
+  if (association.entityType === LegalEntityType.INDIVIDUAL)
+    return {
+      trustMemberType: "regular",
+      roles: [],
+      legalEntityType: LegalEntityType.INDIVIDUAL,
+      legalEntityId: association.legalEntityId,
+      name: association.name
+    };
+  throw new Error(`Not a valid trust member: ${JSON.stringify(association)}`);
+};
+const mapEntityAssociationsToTrustMembers = (trustEntityId, entityAssociations, exemptSettlorLE) => {
+  const mappedTrustMembers = entityAssociations.reduce((acc, entityAssociation) => {
+    if (!Object.values(TrustMemberTypes).includes(entityAssociation.type) || entityAssociation.associatorId !== trustEntityId || !entityAssociation.legalEntityId) {
+      return acc;
+    }
+    const trustMember = acc[entityAssociation.legalEntityId] ?? convertEntityAssociationIntoTrustMember(entityAssociation, entityAssociations, exemptSettlorLE);
+    const trustMemberType = entityAssociation.type;
+    acc[entityAssociation.legalEntityId] = {
+      ...trustMember,
+      roles: [.../* @__PURE__ */ new Set([...trustMember.roles, trustMemberType])]
+    };
+    return acc;
+  }, {});
+  return Object.values(mappedTrustMembers);
+};
+const mapRootLegalEntityToTrustMember = (rootLegalEntity) => ({
+  trustMemberType: "rootTrustee",
+  roles: [TrustMemberTypes.TRUSTEE],
+  legalEntityType: rootLegalEntity.type,
+  legalEntityId: rootLegalEntity.id,
+  name: getLegalEntityNameBasedOnType(rootLegalEntity)
+});
+const mapUndefinedBeneficiaryInfoToTrustMembers = (undefinedBeneficiaryInfo) => undefinedBeneficiaryInfo.map(({
+  reference,
+  description: description2
+}) => ({
+  trustMemberType: "undefinedBeneficiary",
+  roles: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
+  reference,
+  description: description2
+}));
+const getTrustMembers = (trustLE, rootLegalEntity, exemptSettlorLE) => {
+  var _a;
+  return [mapRootLegalEntityToTrustMember(rootLegalEntity), ...mapEntityAssociationsToTrustMembers(trustLE.id, trustLE.entityAssociations ?? [], exemptSettlorLE), ...mapUndefinedBeneficiaryInfoToTrustMembers(((_a = trustLE.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [])];
+};
+const mapTrustMemberToEntityAssociations = (trustMember) => {
+  if (trustMember.trustMemberType === "exemptSettlor")
+    return [{
+      legalEntityId: trustMember.legalEntityId,
+      entityType: trustMember.legalEntityType,
+      type: TrustMemberTypes.SETTLOR,
+      settlorExemptionReason: trustMember.settlorExemptionReason,
+      name: `${trustMember.exemptSettlorName.firstName} ${trustMember.exemptSettlorName.lastName}`
+    }];
+  return trustMember.roles.map((role2) => ({
+    legalEntityId: trustMember.legalEntityId,
+    type: role2
+  }));
+};
+const addOrUpdateAssociatedTrustMember = async ({
+  newOrUpdated,
+  trust,
+  handleUpdateLegalEntity
+}) => {
+  const otherAssociations = getOwnEntityAssociations(trust).filter((existingAssociation) => existingAssociation.legalEntityId !== newOrUpdated.legalEntityId);
+  const updatedAssociations = mapTrustMemberToEntityAssociations(newOrUpdated);
+  const patchLE = {
+    entityAssociations: [...otherAssociations, ...updatedAssociations]
+  };
+  await handleUpdateLegalEntity(patchLE, trust.id);
+};
+const addOrUpdateUndefinedBeneficiary = async ({
+  newOrUpdated,
+  trust,
+  handleUpdateLegalEntity
+}) => {
+  var _a, _b;
+  const otherUndefinedBeneficiaries = ((_b = (_a = trust.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) == null ? void 0 : _b.filter((ub) => ub.reference !== newOrUpdated.reference)) ?? [];
+  const patchLE = {
+    trust: {
+      undefinedBeneficiaryInfo: [...otherUndefinedBeneficiaries, {
+        reference: newOrUpdated.reference,
+        description: newOrUpdated.description
+      }]
+    }
+  };
+  await handleUpdateLegalEntity(patchLE, trust.id);
+};
+const createExemptSettlor = async ({
+  exemptSettlor,
+  trust,
+  handleCreateLegalEntity
+}) => {
+  const exemptSettlorLE = {
+    type: LegalEntityType.INDIVIDUAL,
+    individual: {
+      name: {
+        firstName: exemptSettlor.exemptSettlorName.firstName,
+        lastName: exemptSettlor.exemptSettlorName.lastName
+      },
+      residentialAddress: {
+        country: trust.trust.registeredAddress.country
+      }
+    }
+  };
+  return handleCreateLegalEntity(exemptSettlorLE);
+};
+const deleteAssociatedTrustMember = async ({
+  associatedTrustMember,
+  trust,
+  handleUpdateLegalEntity
+}) => {
+  const ownEntityAssociations = getOwnEntityAssociations(trust);
+  const updatedTrustAssociations = {
+    entityAssociations: ownEntityAssociations.filter((entityAssociation) => entityAssociation.legalEntityId !== associatedTrustMember.legalEntityId)
+  };
+  await handleUpdateLegalEntity(updatedTrustAssociations, trust.id);
+};
+const deleteUndefinedBeneficiary = async ({
+  undefinedBeneficiary: undefinedBeneficiary2,
+  trust,
+  handleUpdateLegalEntity
+}) => {
+  var _a;
+  const existingUndefinedBeneficiaries = ((_a = trust.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [];
+  const updatedTrust = {
+    trust: {
+      undefinedBeneficiaryInfo: existingUndefinedBeneficiaries.filter((ub) => ub.reference !== undefinedBeneficiary2.reference)
+    }
+  };
+  await handleUpdateLegalEntity(updatedTrust, trust.id);
+};
+const exemptSettlorNamesTheSame = (existingSettlor, newSettlor) => JSON.stringify(existingSettlor.exemptSettlorName) === JSON.stringify(newSettlor.exemptSettlorName);
+const updateExemptSettlorName = async ({
+  exemptSettlor,
+  handleUpdateLegalEntity
+}) => {
+  const exemptSettlorPatch = {
+    individual: {
+      name: {
+        firstName: exemptSettlor.exemptSettlorName.firstName,
+        lastName: exemptSettlor.exemptSettlorName.lastName
+      }
+    }
+  };
+  return handleUpdateLegalEntity(exemptSettlorPatch, exemptSettlor.legalEntityId);
+};
 const DecisionMakers = "";
 const iconStatus = (current, min, max) => {
   const isEmpty2 = current === 0;
@@ -21364,7 +21792,6 @@ const DecisionMakersComponent = ({
       }), (uniqueDecisionMakers == null ? void 0 : uniqueDecisionMakers.length) > 0 ? o(CardGroup, {
         children: uniqueDecisionMakers.map((decisionMaker2) => o(EntityAssociation, {
           types: decisionMaker2.types,
-          reference: decisionMaker2.reference,
           name: decisionMaker2.name,
           status: decisionMaker2.status,
           actions: actions(decisionMaker2),
@@ -21863,221 +22290,210 @@ function TaskListComponent({
     })
   });
 }
-const TrustMembers = "";
-const getReference = (entityAssociation) => entityAssociation.legalEntityId ?? (entityAssociation.type === "settlor" ? "exemptSettlor" : "");
-const mapEntityAssociationsToUniqueTrustMembers = (entityAssociations, getTaskStatusForEntityAssociation) => {
-  const mappedTrustMembers = entityAssociations.reduce((acc, entityAssociation) => {
-    const reference = getReference(entityAssociation);
-    const mappedTrustMember = acc[reference];
-    const trustMemberType = entityAssociation.type;
-    acc[reference] = {
-      reference,
-      types: mappedTrustMember ? [...mappedTrustMember.types, trustMemberType] : [trustMemberType],
-      status: getTaskStatusForEntityAssociation(entityAssociation),
-      name: entityAssociation.name ?? "",
-      legalEntityType: entityAssociation.entityType,
-      settlorExemptionReason: entityAssociation.settlorExemptionReason
-    };
-    return acc;
-  }, {});
-  return Object.values(mappedTrustMembers);
-};
-const makeUndefinedBeneficiaryTrustMember = (undefinedBeneficiary2) => ({
-  types: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
-  reference: undefinedBeneficiary2.reference,
-  descriptionUndefinedBeneficiary: undefinedBeneficiary2.description,
-  status: TaskStatus.FINISHED,
-  name: ""
-});
-function UndefinedBeneficiaries({
-  undefinedBeneficiaries,
-  onDelete,
-  onEdit
-}) {
+const TrustMembersOverview$1 = "";
+const CompanyTrustMemberTaskItem = ({
+  companyTrustMember,
+  taskStatus,
+  onEditOwner,
+  onAddOwner,
+  onEdit,
+  onDelete
+}) => {
   const {
     i18n
   } = useCoreContext();
-  const actions = (undefinedBeneficiary2) => {
-    const trustMember = makeUndefinedBeneficiaryTrustMember(undefinedBeneficiary2);
-    return [{
-      icon: "edit",
-      onSelect: () => onEdit(trustMember),
-      label: i18n.get("editEntityDetails"),
-      title: i18n.get("editTrustMember", {
-        values: {
-          trustMember: i18n.get("undefinedBeneficiary")
-        }
-      })
-    }, {
-      icon: "bin",
-      onSelect: () => onDelete(trustMember.reference),
-      label: i18n.get("remove"),
-      title: i18n.get("removeTrustMember", {
-        values: {
-          trustMember: i18n.get("undefinedBeneficiary")
-        }
-      })
-    }];
-  };
-  return o(Fragment, {
-    children: undefinedBeneficiaries.map((undefinedBeneficiary2) => o(EntityAssociation, {
-      types: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
-      reference: undefinedBeneficiary2.reference,
-      status: TaskStatus.FINISHED,
-      name: undefinedBeneficiary2.description,
-      actions: actions(undefinedBeneficiary2),
-      onNavigateToEntity: () => onEdit(makeUndefinedBeneficiaryTrustMember(undefinedBeneficiary2))
-    }, undefinedBeneficiary2.reference))
-  });
-}
-const TrustMembersComponent = ({
-  parentLegalEntity,
-  trustResponse,
-  capabilityProblems,
-  navigateBackToTaskList,
-  navigateToEditTrustMember,
-  navigateToEditTrustMemberOwner,
-  handleUpdateLegalEntity,
-  onTrustMemberDelete
+  const actions = [{
+    icon: "edit",
+    onSelect: onEdit,
+    label: i18n.get("editEntityDetails"),
+    title: i18n.get("editTrustMember", {
+      values: {
+        trustMember: companyTrustMember.name
+      }
+    })
+  }, companyTrustMember.ownerId ? {
+    icon: "edit",
+    onSelect: onEditOwner,
+    label: i18n.get("editEntityOwner"),
+    title: i18n.get("editOwnerOfTrustMember", {
+      values: {
+        trustMember: companyTrustMember.name
+      }
+    })
+  } : {
+    icon: "plus",
+    onSelect: onAddOwner,
+    label: i18n.get("addEntityOwner"),
+    title: i18n.get("addOwnerToTrustMember", {
+      values: {
+        trustMember: companyTrustMember.name
+      }
+    })
+  }, {
+    icon: "bin",
+    onSelect: onDelete,
+    label: i18n.get("remove"),
+    title: i18n.get("removeTrustMember", {
+      values: {
+        trustMember: companyTrustMember.name
+      }
+    })
+  }];
+  const infoContent = companyTrustMember.ownerId ? void 0 : o(Alert, {
+    type: AlertTypes.BASIC,
+    hasCloseButton: false,
+    title: o(Fragment, {
+      children: [i18n.get("helpUsVerifyCompany"), " ", o(Link, {
+        onClick: (e2) => {
+          e2.preventDefault();
+          onAddOwner();
+        },
+        href: "to-company-owner",
+        children: i18n.get("providePersonalDetailsOfOwner")
+      })]
+    }),
+    className: "adl-u-margin-top-16"
+  });
+  return o(EntityAssociation, {
+    types: companyTrustMember.roles,
+    name: companyTrustMember.name,
+    status: taskStatus,
+    actions,
+    infoContent,
+    onNavigateToEntity: onEdit
+  }, companyTrustMember.legalEntityId);
+};
+const ExemptSettlorTaskItem = ({
+  exemptSettlor,
+  taskStatus,
+  onEdit,
+  onDelete
 }) => {
-  var _a;
   const {
     i18n
   } = useCoreContext();
-  const {
-    showToast
-  } = useToastContext();
-  const trustMemberRequirements = DEFAULT_TRUST_MEMBER_REQUIREMENTS;
-  const allTrustMembers = getAllTrustMembers(parentLegalEntity, trustResponse);
-  const allMappedTrustMembers = allTrustMembers.reduce((mappedTrustMembers, trustMember) => {
-    const existingMapping = mappedTrustMembers[trustMember.id];
-    mappedTrustMembers[trustMember.id] = {
-      id: trustMember.id,
-      types: [...(existingMapping == null ? void 0 : existingMapping.types) ?? [], trustMember.type]
-    };
-    return mappedTrustMembers;
-  }, {});
-  const allUniqueTrustMembers = allMappedTrustMembers ? Object.values(allMappedTrustMembers) : [];
-  const uniqueTrustMembersPerType = (roleTypes) => {
-    const filteredTrustMembers = allUniqueTrustMembers.filter(({
-      types
-    }) => {
-      const typeSet = new Set(types);
-      return roleTypes.some((label) => typeSet.has(label));
-    });
-    return filteredTrustMembers.length;
-  };
-  const trusteeName = getLegalEntityNameBasedOnType(parentLegalEntity);
-  const uniqueTrustMembers = mapEntityAssociationsToUniqueTrustMembers(getOwnTrustMembers(trustResponse), (entityAssociation) => getTaskStatus(EntityType.LEGAL_ENTITY, capabilityProblems, parentLegalEntity, entityAssociation.legalEntityId ? [entityAssociation.legalEntityId] : void 0));
-  const deleteTrustMember = async (legalEntityId) => {
-    try {
-      const ownEntityAssociations = getOwnEntityAssociations(trustResponse);
-      const updatedTrustAssociations = {
-        entityAssociations: ownEntityAssociations.filter((entityAssociation) => entityAssociation.legalEntityId !== legalEntityId)
-      };
-      await handleUpdateLegalEntity(updatedTrustAssociations, trustResponse.id);
-      onTrustMemberDelete();
-      showToast({
-        type: ToastType.SUCCESS,
-        label: i18n.get("successFullyRemovedTrustMember")
-      });
-    } catch (e2) {
-      showToast({
-        type: ToastType.ERROR,
-        label: i18n.get("failedToRemoveTrustMember")
-      });
-    }
-  };
-  const deleteUndefinedBeneficiary = async (undefinedBeneficiaryReference) => {
-    var _a2;
-    try {
-      const existingUndefinedBeneficiaries = ((_a2 = trustResponse.trust) == null ? void 0 : _a2.undefinedBeneficiaryInfo) ?? [];
-      const updatedTrust = {
-        trust: {
-          undefinedBeneficiaryInfo: existingUndefinedBeneficiaries.filter((undefinedBeneficiary2) => undefinedBeneficiary2.reference !== undefinedBeneficiaryReference)
-        }
-      };
-      await handleUpdateLegalEntity(updatedTrust, trustResponse.id);
-      onTrustMemberDelete();
-      showToast({
-        type: ToastType.SUCCESS,
-        label: i18n.get("successFullyRemovedTrustMember")
-      });
-    } catch (e2) {
-      showToast({
-        type: ToastType.ERROR,
-        label: i18n.get("failedToRemoveTrustMember")
-      });
-    }
-  };
-  const getTrustMemberOwnerId = (trustMemberId, trustResponse2) => {
-    var _a2;
-    const associations = trustResponse2.entityAssociations;
-    if (associations) {
-      return (_a2 = associations.find((association) => association.associatorId === trustMemberId && association.type === TrustMemberTypes.TRUSTEE)) == null ? void 0 : _a2.legalEntityId;
-    }
-  };
-  const infoContent = (trustMember) => {
-    const ownerId = getTrustMemberOwnerId(trustMember.reference, trustResponse);
-    if (trustMember.legalEntityType === LegalEntityType.ORGANIZATION && !ownerId) {
-      return o(Alert, {
-        type: AlertTypes.BASIC,
-        hasCloseButton: false,
-        title: o(Fragment, {
-          children: [i18n.get("helpUsVerifyCompany"), " ", o(Link, {
-            onClick: (e2) => {
-              e2.preventDefault();
-              navigateToEditTrustMemberOwner("", trustMember.reference);
-            },
-            href: "to-company-owner",
-            children: i18n.get("providePersonalDetailsOfOwner")
-          })]
-        }),
-        className: "adl-u-margin-top-16"
-      });
-    }
-  };
-  const actions = (trustMember) => {
-    const ownerId = getTrustMemberOwnerId(trustMember.reference, trustResponse);
-    const editCompanyTrusteeAction = trustMember.legalEntityType === LegalEntityType.ORGANIZATION ? ownerId ? {
-      icon: "edit",
-      onSelect: () => navigateToEditTrustMemberOwner(ownerId, trustMember.reference),
-      label: i18n.get("editEntityOwner"),
-      title: i18n.get("editOwnerOfTrustMember", {
-        values: {
-          trustMember: trustMember.name
-        }
-      })
-    } : {
-      icon: "plus",
-      onSelect: () => navigateToEditTrustMemberOwner("", trustMember.reference),
-      label: i18n.get("addEntityOwner"),
-      title: i18n.get("addOwnerToTrustMember", {
-        values: {
-          trustMember: trustMember.name
-        }
-      })
-    } : void 0;
-    return [{
-      icon: "edit",
-      onSelect: () => navigateToEditTrustMember(trustMember),
-      label: i18n.get("editEntityDetails"),
-      title: i18n.get("editTrustMember", {
-        values: {
-          trustMember: trustMember.name
-        }
-      })
-    }, editCompanyTrusteeAction, {
-      icon: "bin",
-      onSelect: () => deleteTrustMember(trustMember.reference),
-      label: i18n.get("remove"),
-      title: i18n.get("removeTrustMember", {
-        values: {
-          trustMember: trustMember.name
-        }
-      })
-    }].filter((action) => Boolean(action));
-  };
+  const settlorName = `${exemptSettlor.exemptSettlorName.firstName} ${exemptSettlor.exemptSettlorName.lastName}`;
+  const actions = [{
+    icon: "edit",
+    onSelect: onEdit,
+    label: i18n.get("editEntityDetails"),
+    title: i18n.get("editTrustMember", {
+      values: {
+        trustMember: settlorName
+      }
+    })
+  }, {
+    icon: "bin",
+    onSelect: onDelete,
+    label: i18n.get("remove"),
+    title: i18n.get("removeTrustMember", {
+      values: {
+        trustMember: settlorName
+      }
+    })
+  }];
+  return o(EntityAssociation, {
+    types: exemptSettlor.roles,
+    name: settlorName,
+    status: taskStatus,
+    actions,
+    onNavigateToEntity: onEdit
+  }, exemptSettlor.legalEntityId);
+};
+const RegularTrustMemberTaskItem = ({
+  trustMember,
+  taskStatus,
+  onEdit,
+  onDelete
+}) => {
+  const {
+    i18n
+  } = useCoreContext();
+  const actions = [{
+    icon: "edit",
+    onSelect: onEdit,
+    label: i18n.get("editEntityDetails"),
+    title: i18n.get("editTrustMember", {
+      values: {
+        trustMember: trustMember.name
+      }
+    })
+  }, {
+    icon: "bin",
+    onSelect: onDelete,
+    label: i18n.get("remove"),
+    title: i18n.get("removeTrustMember", {
+      values: {
+        trustMember: trustMember.name
+      }
+    })
+  }];
+  return o(EntityAssociation, {
+    types: trustMember.roles,
+    name: trustMember.name,
+    status: taskStatus,
+    actions,
+    onNavigateToEntity: onEdit
+  }, trustMember.legalEntityId);
+};
+const RootTrusteeTaskItem = ({
+  rootTrustee,
+  taskStatus
+}) => o(EntityAssociation, {
+  types: [TrustMemberTypes.TRUSTEE],
+  name: rootTrustee.name,
+  status: taskStatus
+}, rootTrustee.legalEntityId);
+const UndefinedBeneficiaryTaskItem = ({
+  undefinedBeneficiary: undefinedBeneficiary2,
+  onEdit,
+  onDelete
+}) => {
+  const {
+    i18n
+  } = useCoreContext();
+  const actions = [{
+    icon: "edit",
+    onSelect: onEdit,
+    label: i18n.get("editEntityDetails"),
+    title: i18n.get("editTrustMember", {
+      values: {
+        trustMember: i18n.get("undefinedBeneficiary")
+      }
+    })
+  }, {
+    icon: "bin",
+    onSelect: onDelete,
+    label: i18n.get("remove"),
+    title: i18n.get("removeTrustMember", {
+      values: {
+        trustMember: i18n.get("undefinedBeneficiary")
+      }
+    })
+  }];
+  return o(EntityAssociation, {
+    name: undefinedBeneficiary2.description,
+    types: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
+    status: TaskStatus.FINISHED,
+    actions,
+    onNavigateToEntity: onEdit
+  }, undefinedBeneficiary2.reference);
+};
+const TrustMembersOverview = ({
+  trustMembers: trustMembers2,
+  navigateBackToTaskList,
+  navigateToEditTrustMember,
+  navigateToEditTrustMemberOwner,
+  deleteTrustMember,
+  getTrustMemberTaskStatus
+}) => {
+  const {
+    i18n
+  } = useCoreContext();
+  const trustMemberRequirements = DEFAULT_TRUST_MEMBER_REQUIREMENTS;
+  const trustMembersWithOneOfGivenRoles = (roleTypes) => trustMembers2.filter(({
+    roles
+  }) => roleTypes.some((label) => roles.includes(label)));
   return o(DropinLayout, {
     content: o("div", {
       className: "adl-trust-members adl-u-width-full",
@@ -22092,10 +22508,10 @@ const TrustMembersComponent = ({
           max,
           label
         }) => o(EntityGuidanceStatus, {
-          country: "AU",
+          country: CountryCodes.Australia,
           currentTask: TaskTypes.TRUST_MEMBER_OVERVIEW,
           entityLabel: label,
-          status: iconStatus(uniqueTrustMembersPerType(roleTypes), min, max)
+          status: iconStatus(trustMembersWithOneOfGivenRoles(roleTypes).length, min, max)
         }, label))
       }), o(ReviewAlert, {}), o(ContextGuidance, {
         page: "Trust members",
@@ -22113,36 +22529,54 @@ const TrustMembersComponent = ({
         titleId: "whatIsTheDifferenceBetweenTheseRoles",
         contentId: "differenceBetweenTrustMemberRoles"
       }), o(CardGroup, {
-        children: [o(EntityAssociation, {
-          types: [TrustMemberTypes.TRUSTEE],
-          reference: parentLegalEntity.id,
-          status: getTaskStatus(EntityType.LEGAL_ENTITY, capabilityProblems, parentLegalEntity, [parentLegalEntity.id]),
-          name: trusteeName,
-          legalEntityType: parentLegalEntity.type
-        }, parentLegalEntity.id), uniqueTrustMembers.map((trustMember) => o(EntityAssociation, {
-          types: trustMember.types,
-          reference: trustMember.reference,
-          status: trustMember.status,
-          name: trustMember.name,
-          legalEntityType: trustMember.legalEntityType,
-          actions: actions(trustMember),
-          infoContent: infoContent(trustMember),
-          onNavigateToEntity: () => navigateToEditTrustMember(trustMember)
-        }, trustMember.reference)), o(UndefinedBeneficiaries, {
-          undefinedBeneficiaries: ((_a = trustResponse.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [],
-          onDelete: deleteUndefinedBeneficiary,
-          onEdit: navigateToEditTrustMember
-        })]
+        children: trustMembers2.map((trustMember) => {
+          switch (trustMember.trustMemberType) {
+            case "rootTrustee":
+              return o(RootTrusteeTaskItem, {
+                rootTrustee: trustMember,
+                taskStatus: getTrustMemberTaskStatus(trustMember)
+              });
+            case "regular":
+              return o(RegularTrustMemberTaskItem, {
+                trustMember,
+                taskStatus: getTrustMemberTaskStatus(trustMember),
+                onEdit: () => navigateToEditTrustMember(trustMember),
+                onDelete: () => deleteTrustMember(trustMember)
+              });
+            case "company":
+              return o(CompanyTrustMemberTaskItem, {
+                companyTrustMember: trustMember,
+                taskStatus: getTrustMemberTaskStatus(trustMember),
+                onEdit: () => navigateToEditTrustMember(trustMember),
+                onDelete: () => deleteTrustMember(trustMember),
+                onEditOwner: () => navigateToEditTrustMemberOwner(trustMember.ownerId, trustMember.legalEntityId),
+                onAddOwner: () => navigateToEditTrustMemberOwner("", trustMember.legalEntityId)
+              });
+            case "exemptSettlor":
+              return o(ExemptSettlorTaskItem, {
+                exemptSettlor: trustMember,
+                taskStatus: getTrustMemberTaskStatus(trustMember),
+                onEdit: () => navigateToEditTrustMember(trustMember),
+                onDelete: () => deleteTrustMember(trustMember)
+              });
+            case "undefinedBeneficiary":
+              return o(UndefinedBeneficiaryTaskItem, {
+                undefinedBeneficiary: trustMember,
+                onEdit: () => navigateToEditTrustMember(trustMember),
+                onDelete: () => deleteTrustMember(trustMember)
+              });
+          }
+        })
       }), o(Button, {
         secondary: true,
         className: cx("adl-trust-members__add", {
-          "adl-trust-members__add--more": uniqueTrustMembers.length > 0
+          "adl-trust-members__add--more": trustMembers2.length > 0
         }),
         icon: "plus",
         title: i18n.get("addTrustMember"),
         onClick: (e2) => {
           e2.stopPropagation();
-          navigateToEditTrustMember();
+          navigateToEditTrustMember("new");
         },
         label: i18n.get("addTrustMember")
       }), o(ActionBar, {
@@ -22257,7 +22691,7 @@ function IndividualDropinComponent({
   onChange,
   problems: propProblems,
   handleUpdateLegalEntity,
-  associationDetail,
+  trustMember,
   onSubmit: externalOnSubmit,
   onTypeSwitch
 }) {
@@ -22415,22 +22849,22 @@ function IndividualDropinComponent({
     legalEntity,
     dataSubmitted
   }) => {
-    if (!isDocumentsRequired2(forms2))
-      return;
-    if (hasInstantIdVerification(dataSubmitted)) {
-      await handleInstantIdVerificationStartCheck(dataSubmitted.idDocument.instantIdVerificationData, legalEntity.id);
-    } else {
-      const formattedDocuments = await mapIndividualDocumentToApiDocument(dataSubmitted, legalEntity.id);
-      const uploadedDocuments = await documentUtils.uploadDocuments(formattedDocuments, legalEntity.id);
-      uploadedDocuments == null ? void 0 : uploadedDocuments.forEach((doc) => {
-        userEvents.addEvent("Saved document", {
-          segmentation: {
-            ...baseTrackingPayload,
-            documentType: doc.type,
-            fileExtention: doc.attachments.map((item) => getFileExtention(item.pageName))
-          }
+    if (isDocumentsRequired2(forms2)) {
+      if (hasInstantIdVerification(dataSubmitted)) {
+        await handleInstantIdVerificationStartCheck(dataSubmitted.idDocument.instantIdVerificationData, legalEntity.id);
+      } else {
+        const formattedDocument = await mapIndividualDocumentToApiDocument(dataSubmitted, legalEntity.id);
+        await documentUtils.uploadDocuments(formattedDocument, legalEntity.id);
+        formattedDocument == null ? void 0 : formattedDocument.forEach((doc) => {
+          userEvents.addEvent("Saved document", {
+            segmentation: {
+              ...baseTrackingPayload,
+              documentType: doc.type,
+              fileExtention: doc.attachments.map((item) => getFileExtention(item.pageName))
+            }
+          });
         });
-      });
+      }
     }
   };
   const hasInstantIdVerification = (dataSubmitted) => {
@@ -22456,7 +22890,7 @@ function IndividualDropinComponent({
     dataSubmitted
   }) => {
     var _a2;
-    const newRoles = taskType === TaskTypes.DECISION_MAKER || taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER ? (_a2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _a2.role : taskType === TaskTypes.TRUST_MEMBER_INDIVIDUAL ? associationDetail == null ? void 0 : associationDetail.types : null;
+    const newRoles = taskType === TaskTypes.DECISION_MAKER || taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER ? (_a2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _a2.role : taskType === TaskTypes.TRUST_MEMBER_INDIVIDUAL ? trustMember == null ? void 0 : trustMember.roles : null;
     const existingEntityAssociations = getOwnEntityAssociations(parentLegalEntity);
     if (newRoles && hasRolesChanged(legalEntity, existingEntityAssociations, newRoles)) {
       const updatedParentLegalEntity = {
@@ -22597,11 +23031,14 @@ function IndividualDropinComponent({
     };
   };
   const formatDataForSummary = () => {
-    var _a2, _b2;
+    var _a2, _b2, _c2;
     let summaryData = cloneObject(data);
     if ((_a2 = summaryData.personalDetails) == null ? void 0 : _a2.residencyCountry) {
       summaryData.personalDetails.residencyCountry = datasetUtils.getCountryName(summaryData.personalDetails.residencyCountry);
     }
+    if ((_b2 = summaryData.personalDetails) == null ? void 0 : _b2.nationality) {
+      summaryData.personalDetails.nationality = datasetUtils.getCountryName(summaryData.personalDetails.nationality);
+    }
     if (summaryData.address) {
       summaryData.address = mapAddressLabels(summaryData.address, datasetUtils);
     }
@@ -22612,7 +23049,7 @@ function IndividualDropinComponent({
         ...formatFileSummaryData2(data)
       };
     }
-    if ((_b2 = summaryData == null ? void 0 : summaryData.personalDetails) == null ? void 0 : _b2.accountHolder) {
+    if ((_c2 = summaryData == null ? void 0 : summaryData.personalDetails) == null ? void 0 : _c2.accountHolder) {
       summaryData.personalDetails.accountHolder = i18n.get(summaryData.personalDetails.accountHolder);
     }
     return summaryData;
@@ -22780,7 +23217,8 @@ function PayoutDetailsDropinComponent({
 }) {
   var _a, _b, _c;
   const {
-    i18n
+    i18n,
+    setLocale
   } = useCoreContext();
   const {
     showToast,
@@ -22831,6 +23269,7 @@ function PayoutDetailsDropinComponent({
     task: taskType
   });
   p(() => {
+    eventEmitter.on("updateLocale", (locale) => setLocale(locale));
     userEvents.addPageView("Payout dropin");
     userEvents.addEvent("Started payout task", {
       segmentation: {
@@ -23712,11 +24151,42 @@ function PciDropinComponent({
     footer
   });
 }
+const convertExistingSettlorExemptionReasons = (existingReasons) => {
+  if (!existingReasons || !existingReasons.length)
+    return ["noneOfTheAbove"];
+  return existingReasons;
+};
+const convertExistingTrustMember = (trustMember) => {
+  switch (trustMember.trustMemberType) {
+    case "undefinedBeneficiary":
+      return {
+        entityType: LegalEntityType.INDIVIDUAL,
+        role: ["undefinedBeneficiary"],
+        descriptionUndefinedBeneficiary: trustMember.description
+      };
+    case "regular":
+    case "company":
+    case "rootTrustee":
+      return {
+        entityType: trustMember.legalEntityType,
+        role: trustMember.roles,
+        settlorExemptionReason: ["noneOfTheAbove"]
+      };
+    case "exemptSettlor":
+      return {
+        entityType: LegalEntityType.INDIVIDUAL,
+        role: ["settlor"],
+        settlorExemptionReason: convertExistingSettlorExemptionReasons(trustMember.settlorExemptionReason),
+        firstName: trustMember.exemptSettlorName.firstName,
+        lastName: trustMember.exemptSettlorName.lastName
+      };
+  }
+};
 const allowedCrossoverRolesMatrix = {
-  settlor: ["trustee", "protector"],
-  trustee: ["settlor", "protector", "definedBeneficiary"],
-  protector: ["settlor", "trustee", "definedBeneficiary"],
-  definedBeneficiary: ["trustee", "protector"],
+  settlor: ["secondaryTrustee", "protector"],
+  secondaryTrustee: ["settlor", "protector", "definedBeneficiary"],
+  protector: ["settlor", "secondaryTrustee", "definedBeneficiary"],
+  definedBeneficiary: ["secondaryTrustee", "protector"],
   undefinedBeneficiary: []
 };
 const getAvailableRoles = (currentRoles) => {
@@ -23773,31 +24243,22 @@ const decideFields = (data) => {
     return ["role", "descriptionUndefinedBeneficiary"];
   }
   if ((_b = data.role) == null ? void 0 : _b.length) {
-    return couldBeExemptSettlor(data) ? ["role", "entityType", "settlorExemptionReason"] : ["role", "entityType"];
+    if (couldBeExemptSettlor(data)) {
+      return isExemptSettlor(data) ? ["role", "entityType", "settlorExemptionReason", "firstName", "lastName"] : ["role", "entityType", "settlorExemptionReason"];
+    }
+    return ["role", "entityType"];
   }
   return ["role"];
 };
-const convertExistingSettlorExemptionReasons = (existingReasons) => {
-  if (!existingReasons || !existingReasons.length)
-    return ["noneOfTheAbove"];
-  return existingReasons;
-};
-function TrustRoleAndEntityTypeComponent(props) {
+const TrustRoleAndEntityType = (props) => {
   const {
-    trustMember,
+    existingTrustMember,
     id: id2
   } = props;
   const {
     i18n
   } = useCoreContext();
-  const defaultData = {
-    entityType: trustMember == null ? void 0 : trustMember.legalEntityType,
-    role: trustMember == null ? void 0 : trustMember.types,
-    descriptionUndefinedBeneficiary: trustMember == null ? void 0 : trustMember.descriptionUndefinedBeneficiary
-  };
-  if (couldBeExemptSettlor(defaultData)) {
-    defaultData.settlorExemptionReason = convertExistingSettlorExemptionReasons(trustMember == null ? void 0 : trustMember.settlorExemptionReason);
-  }
+  const defaultData = existingTrustMember ? convertExistingTrustMember(existingTrustMember) : {};
   const formUtils = formUtilities(props, i18n);
   const {
     data,
@@ -23806,7 +24267,10 @@ function TrustRoleAndEntityTypeComponent(props) {
     errors,
     fieldProblems,
     handleChangeFor,
-    isValid
+    isValid,
+    setData,
+    setValid,
+    setErrors
   } = useForm({
     ...props,
     schema: decideFields,
@@ -23849,6 +24313,19 @@ function TrustRoleAndEntityTypeComponent(props) {
     }
     handleChangeFor("settlorExemptionReason")(exemptionReasons);
   };
+  const nameProps = getFieldProps(props, nameFields);
+  const onNameChange = ({
+    data: data2,
+    valid: valid2,
+    errors: errors2
+  }) => {
+    setData("firstName", data2.firstName);
+    setValid("firstName", valid2.firstName);
+    setErrors("firstName", errors2.firstName);
+    setData("lastName", data2.lastName);
+    setValid("lastName", valid2.lastName);
+    setErrors("lastName", errors2.lastName);
+  };
   return o("form", {
     className: "adyen-kyc-trust__role-and-entity-type adl-u-width-full",
     children: [o(FormHeader, {
@@ -23882,7 +24359,7 @@ function TrustRoleAndEntityTypeComponent(props) {
       errorMessage: formUtils.getErrorMessage("entityType", errors, fieldProblems),
       label: formUtils.getLabel("entityType", "whatTypeOfYourMembersEntity"),
       classNameModifiers: ["entityType"],
-      disabled: !!(trustMember == null ? void 0 : trustMember.reference),
+      disabled: Boolean(existingTrustMember),
       children: (childProps) => o(RadioCardSelect, {
         ...childProps,
         options: trustMemberLegalEntityTypes,
@@ -23928,14 +24405,29 @@ function TrustRoleAndEntityTypeComponent(props) {
           name: i18n.get(reason)
         })
       })
-    })]
+    }), (schema == null ? void 0 : schema.includes("firstName")) || schema.includes("lastName") ? o(Name, {
+      ...nameProps,
+      data: {
+        firstName: defaultData.firstName,
+        lastName: defaultData.lastName
+      },
+      requiredFields: schema.filter((field) => nameFields.includes(field)),
+      labels: {
+        firstName: "firstNameOfSettlor",
+        lastName: "lastNameOfSettlor",
+        enterNameExactlyAsAppearInID: "enterSettlorsFirstNameExactlyAsItAppearsInID",
+        enterLastNameExactlyAsAppearInID: "enterSettlorsLastNameExactlyAsItAppearsInID"
+      },
+      onChange: onNameChange,
+      dataStoreId: id2
+    }) : void 0]
   });
-}
+};
 const summary = {
   formId: "summary",
   formName: "summary"
 };
-const roleAndTypeForms = {
+const regularForms = {
   roleAndEntityType: {
     formId: "roleAndEntityType",
     formName: "roleAndEntityType",
@@ -23963,124 +24455,98 @@ const exemptSettlorForms = {
   },
   summary
 };
-const logger$3 = createLogger("RoleAndTypeDropin");
-function RoleAndTypeDropinComponent(props) {
-  var _a, _b;
+const decideForms = (trustMember) => {
+  if (trustMember === "incomplete")
+    return regularForms;
+  switch (trustMember.trustMemberType) {
+    case "undefinedBeneficiary":
+      return undefinedBeneficiaryForms;
+    case "exemptSettlor":
+      return exemptSettlorForms;
+    case "rootTrustee":
+    case "regular":
+    case "company":
+      return regularForms;
+  }
+};
+const convertDataToTrustMember = (data, existingTrustMember) => {
+  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))
+      return {
+        trustMemberType: "exemptSettlor",
+        roles: [TrustMemberTypes.SETTLOR],
+        legalEntityType: LegalEntityType.INDIVIDUAL,
+        settlorExemptionReason: data.settlorExemptionReason.filter((reason) => reason !== "noneOfTheAbove"),
+        exemptSettlorName: {
+          firstName: data.firstName ?? "",
+          lastName: data.lastName ?? ""
+        },
+        legalEntityId: existingId ?? ""
+      };
+    if (data.role.includes("undefinedBeneficiary"))
+      return {
+        trustMemberType: "undefinedBeneficiary",
+        roles: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
+        description: data.descriptionUndefinedBeneficiary ?? "",
+        reference: existingId ?? ""
+      };
+    if (data.entityType === LegalEntityType.ORGANIZATION)
+      return {
+        trustMemberType: "company",
+        roles: data.role,
+        legalEntityType: LegalEntityType.ORGANIZATION,
+        legalEntityId: existingId ?? "",
+        name: ""
+      };
+    if (data.entityType === LegalEntityType.INDIVIDUAL)
+      return {
+        trustMemberType: "regular",
+        roles: data.role,
+        legalEntityType: LegalEntityType.INDIVIDUAL,
+        legalEntityId: existingId ?? "",
+        name: ""
+      };
+  }
+  return "incomplete";
+};
+function RoleAndTypeDropinComponent({
+  existingTrustMember,
+  navigateToFullDropinFor,
+  navigateBack,
+  addOrUpdateTrustMember
+}) {
   const {
     i18n
   } = useCoreContext();
-  const {
-    showToast
-  } = useToastContext();
-  const [trustMember, setTrustMember] = h(props.trustMember);
+  const [trustMember, setTrustMember] = h(existingTrustMember ?? "incomplete");
   const [shouldValidate, setShouldValidate] = h(false);
-  const roleAndEntityTypeFormID = "roleAndEntityType";
-  const [formList, setFormList] = h([...Object.values(roleAndTypeForms)]);
+  const formList = decideForms(trustMember);
+  const forms = Object.values(formList);
   const [formValidity, setFormValidity] = h({
-    [roleAndEntityTypeFormID]: false
+    roleAndEntityType: false
   });
-  const taskName = "trustMembers";
-  const [activeForm, setActiveForm] = h(formList[0]);
+  const [activeForm, setActiveForm] = h(regularForms.roleAndEntityType);
   const isSummaryStep = activeForm.formId === summaryStep.formId;
-  const trustMemberCase = ((_a = trustMember == null ? void 0 : trustMember.settlorExemptionReason) == null ? void 0 : _a.length) ? "exemptSettlor" : ((_b = trustMember == null ? void 0 : trustMember.types) == null ? void 0 : _b.includes(TrustMemberTypes.UNDEFINED_BENEFICIARY)) ? "undefinedBeneficiary" : "fullEntity";
-  const navigateToTrustMember = () => {
-    const trustMemberAssociation = {
-      ...props.trustMember,
-      legalEntityType: trustMember == null ? void 0 : trustMember.legalEntityType,
-      types: trustMember == null ? void 0 : trustMember.types
-    };
-    props.navigateNext(trustMemberAssociation);
-  };
-  const submitExemptSettlor = async (exemptSettlor, trustLE) => {
-    var _a2;
-    const existingTrustMembers = getOwnTrustMembers(trustLE);
-    const existingSettlor = existingTrustMembers.find((member) => member.type === "settlor");
-    const updatedAssociations = [...(trustLE.entityAssociations ?? []).filter((association) => association !== existingSettlor), exemptSettlor];
-    const updatedTrustLE = {
-      ...trustLE,
-      entityAssociations: updatedAssociations
-    };
-    try {
-      await ((_a2 = props.handleUpdateLegalEntity) == null ? void 0 : _a2.call(props, updatedTrustLE, trustLE.id));
-      showToast({
-        label: i18n.get("successfullyUpdatedDetails"),
-        type: ToastType.SUCCESS
-      });
-      props.onSubmit(updatedTrustLE);
-    } catch (e2) {
-      logger$3.error(e2);
-      showToast({
-        label: i18n.get("failedToUpdateDetails"),
-        type: ToastType.ERROR
-      });
-    }
-  };
-  const submitUndefinedBeneficiary = async () => {
-    var _a2, _b2, _c;
-    if (((_a2 = props.trustMember) == null ? void 0 : _a2.descriptionUndefinedBeneficiary) === (trustMember == null ? void 0 : trustMember.descriptionUndefinedBeneficiary)) {
-      props.onSubmit(props.trust);
-      return;
-    }
-    const existingUndefinedBeneficiaryInfo = (((_b2 = props.trust.trust) == null ? void 0 : _b2.undefinedBeneficiaryInfo) ?? []).filter((ub) => ub.reference !== (trustMember == null ? void 0 : trustMember.reference));
-    const updatedTrust = {
-      trust: {
-        undefinedBeneficiaryInfo: [{
-          ...(trustMember == null ? void 0 : trustMember.reference) && {
-            reference: trustMember == null ? void 0 : trustMember.reference
-          },
-          description: (trustMember == null ? void 0 : trustMember.descriptionUndefinedBeneficiary) || ""
-        }, ...existingUndefinedBeneficiaryInfo]
-      }
-    };
-    try {
-      await ((_c = props.handleUpdateLegalEntity) == null ? void 0 : _c.call(props, updatedTrust, props.trust.id));
-      showToast({
-        label: i18n.get("successfullyUpdatedDetails"),
-        type: ToastType.SUCCESS
-      });
-      props.onSubmit(updatedTrust);
-    } catch (e2) {
-      logger$3.error(e2);
-      showToast({
-        label: i18n.get("failedToUpdateDetails"),
-        type: ToastType.ERROR
-      });
-    }
-  };
   const formatRolesForSummary = (roles) => roles.map((role2) => i18n.get(getTrustMemberName(role2))).join(", ");
   const formatSettlorExemptionReasonsForSummary = (reasons) => reasons.map((reason) => i18n.get(reason)).join(", ");
-  const summaryData = {
+  const summaryData = trustMember === "incomplete" ? {} : {
     roleAndEntityType: {
-      role: formatRolesForSummary((trustMember == null ? void 0 : trustMember.types) ?? []),
-      entityType: (trustMember == null ? void 0 : trustMember.legalEntityType) ? i18n.get(trustMember == null ? void 0 : trustMember.legalEntityType) : void 0,
-      descriptionUndefinedBeneficiary: trustMember == null ? void 0 : trustMember.descriptionUndefinedBeneficiary,
-      otherInformation: formatSettlorExemptionReasonsForSummary((trustMember == null ? void 0 : trustMember.settlorExemptionReason) ?? [])
+      role: formatRolesForSummary(trustMember.roles),
+      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
     }
   };
   const onNavigateToNextStep = () => {
-    if (isSummaryStep) {
-      switch (trustMemberCase) {
-        case "exemptSettlor":
-          if (!trustMember)
-            return;
-          submitExemptSettlor(trustMember, props.trust).catch(logger$3.error);
-          break;
-        case "undefinedBeneficiary":
-          submitUndefinedBeneficiary().catch(logger$3.error);
-          break;
-        default:
-          return;
-      }
-    }
-    if (!formValidity[roleAndEntityTypeFormID]) {
-      setShouldValidate(true);
+    if (isSummaryStep && trustMember !== "incomplete") {
+      addOrUpdateTrustMember(trustMember);
       return;
     }
-    if (trustMemberCase === "fullEntity") {
-      navigateToTrustMember();
-    } else {
-      setActiveForm(summary);
-    }
+    gotoFormByFormIndex(forms.findIndex((form) => form.formId === activeForm.formId) + 1);
   };
   const onTrustMemberChange = ({
     data,
@@ -24093,69 +24559,51 @@ function RoleAndTypeDropinComponent(props) {
         [dataStoreId]: isValid
       });
     }
-    if ((data == null ? void 0 : data.role) && data.role.includes(TrustMemberTypes.UNDEFINED_BENEFICIARY)) {
-      setFormList([...Object.values(undefinedBeneficiaryForms)]);
-    } else if (isExemptSettlor(data)) {
-      setFormList([...Object.values(exemptSettlorForms)]);
-    } else {
-      setFormList([...Object.values(roleAndTypeForms)]);
-    }
-    setTrustMember({
-      ...props.trustMember,
-      ...data.role ? {
-        types: data.role
-      } : {},
-      legalEntityType: data.entityType,
-      ...data.descriptionUndefinedBeneficiary ? {
-        descriptionUndefinedBeneficiary: data.descriptionUndefinedBeneficiary
-      } : {},
-      ...isExemptSettlor(data) ? {
-        settlorExemptionReason: data.settlorExemptionReason.filter((reason) => reason !== "noneOfTheAbove")
-      } : {}
-    });
+    setTrustMember(convertDataToTrustMember(data, existingTrustMember));
   };
   const saveRolesAndNavigate = async () => {
-    var _a2, _b2, _c;
-    if (!trustMember) {
+    if (trustMember === "incomplete")
       return;
+    if (hasRolesChanged(trustMember.roles, existingTrustMember == null ? void 0 : existingTrustMember.roles)) {
+      addOrUpdateTrustMember(trustMember);
     }
-    const {
-      reference
-    } = trustMember;
-    if (reference && hasRolesChanged(trustMember.types, (_a2 = props.trustMember) == null ? void 0 : _a2.types) && props.trust.id) {
-      const existingTrustAssociations = getOwnEntityAssociations(props.trust);
-      const updatedTrustAssociations = {
-        entityAssociations: [...((_b2 = trustMember.types) == null ? void 0 : _b2.map((role2) => ({
-          type: role2,
-          reference
-        }))) || [], ...existingTrustAssociations.filter((ea) => ea.legalEntityId !== trustMember.reference) || []]
-      };
-      await ((_c = props.handleUpdateLegalEntity) == null ? void 0 : _c.call(props, updatedTrustAssociations, props.trust.id));
-    }
-    props.navigateBack();
+    navigateBack();
   };
   const hasRolesChanged = (newRoles = [], existingRoles = []) => newRoles.length !== existingRoles.length || !newRoles.every((newRole) => existingRoles.includes(newRole));
-  const formsWithValidity = Object.values(formList).map((form) => ({
+  const formsWithValidity = forms.map((form) => ({
     formId: form.formId,
     formName: form.formName,
     isValid: formValidity[form.formId]
   }));
   const gotoFormByFormIndex = (formIndex) => {
-    setActiveForm(formList[formIndex]);
+    const targetForm = forms[formIndex];
+    if (!formValidity.roleAndEntityType || trustMember === "incomplete") {
+      setShouldValidate(true);
+      return;
+    }
+    if (trustMember.trustMemberType === "regular" || trustMember.trustMemberType === "company") {
+      if (targetForm.formId === regularForms.memberDetails.formId) {
+        navigateToFullDropinFor(trustMember);
+        return;
+      }
+      if (targetForm.formId === summaryStep.formId)
+        return;
+    }
+    setActiveForm(targetForm);
   };
   const content = o(Fragment, {
     children: [o(FormNavigation, {
       forms: formsWithValidity,
       activeForm: formsWithValidity.find((form) => form.formId === activeForm.formId),
-      taskName,
-      gotoForm: noop
+      taskName: "trustMembers",
+      gotoForm: gotoFormByFormIndex
     }), o("div", {
       className: "adyen-kyc-form-container",
       children: [o("div", {
         className: activeForm.formId !== "roleAndEntityType" ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
-        children: o(TrustRoleAndEntityTypeComponent, {
-          id: roleAndEntityTypeFormID,
-          trustMember: props.trustMember,
+        children: o(TrustRoleAndEntityType, {
+          id: "roleAndEntityType",
+          existingTrustMember,
           onChange: onTrustMemberChange,
           shouldValidate
         })
@@ -24699,7 +25147,7 @@ function withFormComposer(WrappedComponent, {
   getConfigFor = "contextCountry"
 }) {
   const WithFormComposer = (props) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c;
     const {
       i18n,
       loadingContext,
@@ -25045,7 +25493,7 @@ function withFormComposer(WrappedComponent, {
         validateForm: validateCurrentForm,
         taskName,
         trackNavigation: trackNavigation2,
-        hasVerificationErrors: ((_c = props == null ? void 0 : props.problems) == null ? void 0 : _c.verificationErrors) && ((_e = Object.keys((_d = props == null ? void 0 : props.problems) == null ? void 0 : _d.verificationErrors)) == null ? void 0 : _e.length) > 0
+        verificationErrors: (_c = props == null ? void 0 : props.problems) == null ? void 0 : _c.verificationErrors
       })
     });
     const content = o(Fragment, {
@@ -25514,6 +25962,10 @@ function DropinComposerComponent({
   const [legalEntityType, setLegalEntityType] = h(null);
   const [solePropietor, setSolePropietor] = h(null);
   const [trust, setTrust] = h(null);
+  const exemptSettlor = useExemptSettlor({
+    trust,
+    handleGetLegalEntity: args.handleGetLegalEntity
+  });
   const [trustMember, setTrustMember] = h(null);
   const [pciTemplateResponse, setPciTemplateResponse] = h(null);
   const [pciStatus, setPciStatus] = h(null);
@@ -25655,6 +26107,101 @@ function DropinComposerComponent({
       }
     }
   };
+  const deleteTrustMember = async (trustMember2) => {
+    try {
+      switch (trustMember2.trustMemberType) {
+        case "regular":
+        case "exemptSettlor":
+        case "company":
+          await deleteAssociatedTrustMember({
+            associatedTrustMember: trustMember2,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "undefinedBeneficiary":
+          await deleteUndefinedBeneficiary({
+            undefinedBeneficiary: trustMember2,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "rootTrustee":
+          throw new Error("Cannot delete root trustee");
+      }
+      await refreshTrust();
+      showToast({
+        type: ToastType.SUCCESS,
+        label: i18n.get("successFullyRemovedTrustMember")
+      });
+    } catch (err) {
+      logger$1.error(`Failed to delete trust member`, err);
+      showToast({
+        type: ToastType.ERROR,
+        label: i18n.get("failedToRemoveTrustMember")
+      });
+    }
+  };
+  const addOrUpdateTrustMember = async (updated, existing) => {
+    if ((existing == null ? void 0 : existing.trustMemberType) === "undefinedBeneficiary" && updated.trustMemberType === "undefinedBeneficiary" && existing.description === updated.description) {
+      await refreshTrustAndRunOnSubmit(trust);
+      return;
+    }
+    try {
+      switch (updated.trustMemberType) {
+        case "undefinedBeneficiary":
+          await addOrUpdateUndefinedBeneficiary({
+            newOrUpdated: updated,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "exemptSettlor":
+          if (!existing) {
+            const newSettlorLE = await createExemptSettlor({
+              exemptSettlor: updated,
+              trust,
+              handleCreateLegalEntity: args.handleCreateLegalEntity
+            });
+            updated.legalEntityId = newSettlorLE.id;
+          }
+          if (existing && !exemptSettlorNamesTheSame(existing, updated)) {
+            await updateExemptSettlorName({
+              exemptSettlor: updated,
+              handleUpdateLegalEntity: args.handleUpdateLegalEntity
+            });
+          }
+          await addOrUpdateAssociatedTrustMember({
+            newOrUpdated: updated,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "regular":
+        case "company":
+          await addOrUpdateAssociatedTrustMember({
+            newOrUpdated: updated,
+            trust,
+            handleUpdateLegalEntity: args.handleUpdateLegalEntity
+          });
+          break;
+        case "rootTrustee":
+        default:
+          logger$1.warn(`Updating trust member type "${trustMember.trustMemberType}" is not implemented.`);
+      }
+      showToast({
+        label: i18n.get("successfullyUpdatedDetails"),
+        type: ToastType.SUCCESS
+      });
+      await refreshTrustAndRunOnSubmit(trust);
+    } catch (err) {
+      logger$1.error(err);
+      showToast({
+        label: i18n.get("failedToUpdateDetails"),
+        type: ToastType.ERROR
+      });
+    }
+  };
   const onNavigateTo = (task) => {
     setTaskHistory([...taskHistory, task]);
     onNavigate(task);
@@ -25735,14 +26282,14 @@ function DropinComposerComponent({
   };
   const onNavigateToTrustMember = async (tm) => {
     try {
-      if (tm == null ? void 0 : tm.reference) {
-        const response = await (args == null ? void 0 : args.handleGetLegalEntity(tm.reference));
+      if (tm == null ? void 0 : tm.legalEntityId) {
+        const response = await (args == null ? void 0 : args.handleGetLegalEntity(tm.legalEntityId));
         setAssociatedLegalEntity(response);
       } else {
         setAssociatedLegalEntity(null);
       }
       setTrustMember(tm);
-      onNavigateTo(tm.legalEntityType === LegalEntityType.ORGANIZATION ? TaskTypes.TRUST_MEMBER_COMPANY : TaskTypes.TRUST_MEMBER_INDIVIDUAL);
+      onNavigateTo(tm.trustMemberType === "company" ? TaskTypes.TRUST_MEMBER_COMPANY : TaskTypes.TRUST_MEMBER_INDIVIDUAL);
     } catch (e2) {
       showToast({
         label: i18n.get("failedToFetchTrustMemberDetails"),
@@ -25751,11 +26298,7 @@ function DropinComposerComponent({
     }
   };
   const onNavigateToTrustMemberRoleAndType = (tm) => {
-    if (tm) {
-      setTrustMember(tm);
-    } else {
-      setTrustMember(null);
-    }
+    setTrustMember(tm === "new" ? null : tm);
     onNavigateTo(TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE);
   };
   const navigateBack = (stepCount = 1) => {
@@ -26026,7 +26569,7 @@ function DropinComposerComponent({
           handleBackClick: navigateBack,
           handleHomeClick: () => onNavigateTo(TaskTypes.TRUST_MEMBER_OVERVIEW),
           homeButtonLabel: i18n.get("saveAndGoToOverview"),
-          associationDetail: trustMember,
+          trustMember,
           handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
           handleFindAddress: args == null ? void 0 : args.handleFindAddress,
           handleGetIdVerificationToken: args == null ? void 0 : args.handleGetIdVerificationToken
@@ -26123,27 +26666,23 @@ function DropinComposerComponent({
           handleFindAddress: args == null ? void 0 : args.handleFindAddress
         });
       case TaskTypes.TRUST_MEMBER_OVERVIEW:
-        return o(TrustMembersComponent, {
-          parentLegalEntity: legalEntity,
-          trustResponse: trust,
-          capabilityProblems,
+        return o(TrustMembersOverview, {
+          trustMembers: getTrustMembers(trust, legalEntity, exemptSettlor),
+          getTrustMemberTaskStatus: (member) => getTaskStatus(EntityType.LEGAL_ENTITY, capabilityProblems, legalEntity, member.trustMemberType === "undefinedBeneficiary" ? void 0 : [member.legalEntityId]),
+          navigateBackToTaskList: navigateBack,
           navigateToEditTrustMember: onNavigateToTrustMemberRoleAndType,
           navigateToEditTrustMemberOwner: (trustMemberOwnerId, trustMemberId) => onNavigateToDecisionMakerIndividual(TaskTypes.TRUST_MEMBER_COMPANY_OWNER, trustMemberOwnerId, trustMemberId),
-          navigateBackToTaskList: navigateBack,
-          handleUpdateLegalEntity: args == null ? void 0 : args.handleUpdateLegalEntity,
-          onTrustMemberDelete: refreshTrust
+          deleteTrustMember
         });
       case TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE:
         return o(RoleAndTypeDropinComponent, {
-          navigateNext: onNavigateToTrustMember,
+          navigateToFullDropinFor: onNavigateToTrustMember,
           navigateBack: async () => {
             await refreshTrust();
             navigateBack();
           },
-          trust,
-          trustMember,
-          handleUpdateLegalEntity: args == null ? void 0 : args.handleUpdateLegalEntity,
-          onSubmit: refreshTrustAndRunOnSubmit
+          existingTrustMember: trustMember,
+          addOrUpdateTrustMember: (newOrUpdated) => addOrUpdateTrustMember(newOrUpdated, trustMember)
         });
       case TaskTypes.PCI_DSS:
         return o(PciDropinComponent, {