@adyen/kyc-components 2.4.0 → 2.4.2

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";
@@ -1266,6 +1276,9 @@ const defaultTrans = {
   invalidFormatForAuDriversLicenseNumber,
   invalidFormatForAuDriversLicenseCardNumber,
   invalidFormatForAuProofOfIdentityCardNumber,
+  invalidFormatForHKPassportNumber,
+  invalidFormatForHKDriversLicenseNumber,
+  invalidFormatForHKIdentityCardNumber,
   invalidFormatIdentityNumberBR,
   invalidFormatIdentityNumberDK,
   invalidFormatIdentityNumberCA,
@@ -1277,6 +1290,7 @@ const defaultTrans = {
   invalidFormatIdentityNumberUS,
   invalidFormatIdentityNumberUS9,
   invalidFormatIdentityNumberSG,
+  invalidFormatIdentityNumberHK,
   invalidFormatBankStatementDescription,
   residencyCountry,
   stateOrProvince,
@@ -1293,6 +1307,7 @@ const defaultTrans = {
   driversLicense,
   issuerState,
   licenseNumber,
+  driverLicense,
   licenseCardNumber,
   documents,
   idDocument: idDocument$1,
@@ -1369,6 +1384,7 @@ const defaultTrans = {
   validationPleaseEnterAValidTaxIdNumberWithFormat,
   aValidAbnShouldBe11Digits,
   aValidUenOrGstShouldBe9To10Characters,
+  aValidBrnShouldBe8Digits,
   validationPleaseEnterAValidUen,
   validationPleaseEnterAValidIban,
   yourIbanShouldBeginWith_,
@@ -1404,6 +1420,7 @@ const defaultTrans = {
   legalCompanyNameHelper__AU,
   legalCompanyNameHelper__US,
   legalCompanyNameHelper__SG,
+  legalCompanyNameHelper__HK,
   accountDetailsDescription,
   provideDetails,
   payoutAccountsDescription,
@@ -1613,6 +1630,7 @@ const defaultTrans = {
   NIF,
   uen,
   nric,
+  hkid,
   NIFdeIVA,
   partitaIVA,
   organisationsnummer,
@@ -1635,6 +1653,7 @@ const defaultTrans = {
   leave,
   taxIdNumber,
   companyRegistrationNumber,
+  companyRegistrationNumber__HK,
   euVatNumber,
   vatNumber,
   regonKrsNumber,
@@ -1897,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)",
@@ -3606,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,
@@ -3639,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))
@@ -3726,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,
@@ -4522,7 +4539,7 @@ const lengthValidationPatterns = {
     message: "validationEnter9Or12Digits"
   }
 };
-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 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 businessRegistrationNumberPatterns = {
   [CountryCodes.Australia]: {
     default: {
@@ -5734,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"];
@@ -7668,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"],
@@ -8451,10 +8475,10 @@ const countryConfig$4 = {
       label: "businessName"
     },
     registrationNumber: {
-      label: "companyNumber"
+      label: "companyRegistrationNumber__HK"
     },
     taxId: {
-      label: "businessRegistrationNumber"
+      label: "businessRegistrationNumber__HK"
     }
   },
   [CountryCodes.Hungary]: {
@@ -8948,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 = ({
@@ -10010,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 = {
@@ -10381,6 +10406,55 @@ const SearchAddress = ({
     })
   });
 };
+const createRegExpByDigits = (digits) => new RegExp(`^\\d{${digits}}$`);
+const postalCodePatterns = {
+  [CountryCodes.Australia]: createRegExpByDigits(4),
+  [CountryCodes.Austria]: createRegExpByDigits(4),
+  [CountryCodes.Belgium]: /^[1-9]\d{3}$/,
+  [CountryCodes.Brazil]: createRegExpByDigits(8),
+  [CountryCodes.Bulgaria]: createRegExpByDigits(4),
+  [CountryCodes.Canada]: /^[ABCEGHJKLMNPRSTVXY]\d[A-Z][ -]?(?:\d[A-Z]\d)?$/,
+  [CountryCodes.Croatia]: /^([1-5])\d{4}$/,
+  [CountryCodes.Cyprus]: createRegExpByDigits(4),
+  [CountryCodes.CzechRepublic]: /^\d{3} ?\d{2}$/,
+  [CountryCodes.Denmark]: /^(?:DK-)?\d{4}$/,
+  [CountryCodes.Estonia]: createRegExpByDigits(5),
+  [CountryCodes.Finland]: createRegExpByDigits(5),
+  [CountryCodes.France]: createRegExpByDigits(5),
+  [CountryCodes.Georgia]: createRegExpByDigits(4),
+  [CountryCodes.Germany]: createRegExpByDigits(5),
+  [CountryCodes.Gibraltar]: /^GX11[ -]?1AA$/,
+  [CountryCodes.Greece]: /^\d{3} ?\d{2}$/,
+  [CountryCodes.Hungary]: createRegExpByDigits(4),
+  [CountryCodes.Iceland]: createRegExpByDigits(3),
+  [CountryCodes.Ireland]: /^(?:[ACDEFHKNPRTVWXY]\d{2}|D6W)[ -]?[0-9ACDEFHKNPRTVWXY]{4}$/,
+  [CountryCodes.Italy]: createRegExpByDigits(5),
+  [CountryCodes.Japan]: /^\d{3}-\d{4}$/,
+  [CountryCodes.Latvia]: /^(?:LV-)?\d{4}$/,
+  [CountryCodes.Liechtenstein]: createRegExpByDigits(4),
+  [CountryCodes.Lithuania]: /^(?:LT-)?\d{4,5}$/,
+  [CountryCodes.Luxembourg]: createRegExpByDigits(4),
+  [CountryCodes.Malaysia]: createRegExpByDigits(5),
+  [CountryCodes.Malta]: /^[A-Za-z]{2,3} ?\d{2}(?:\d{2})?$/,
+  [CountryCodes.Monaco]: /^980\d{2}$/,
+  [CountryCodes.Netherlands]: /^(?:NL-)?[1-9]\d{3} ?(?:[ABCDEFGHIJKLMNOPQRTUVWXYZ][A-Z]|S[BCEFGHIJKLMNOPQRTUVWXYZ])$/,
+  [CountryCodes.NewZealand]: createRegExpByDigits(4),
+  [CountryCodes.Norway]: createRegExpByDigits(4),
+  [CountryCodes.Poland]: /^\d{2}-\d{3}$/,
+  [CountryCodes.Portugal]: /^[1-9]\d{3}([- ]?\d{3})?$/,
+  [CountryCodes.PuertoRico]: createRegExpByDigits(5),
+  [CountryCodes.Romania]: createRegExpByDigits(6),
+  [CountryCodes.Slovakia]: /^(SK-)?\d{5}$/,
+  [CountryCodes.Slovenia]: /^(SI-)?\d{4}$/,
+  [CountryCodes.Singapore]: createRegExpByDigits(6),
+  [CountryCodes.Spain]: /(?:0[1-9]|[1-4]\d|5[0-2])\d{3}/,
+  [CountryCodes.Sweden]: createRegExpByDigits(5),
+  [CountryCodes.Switzerland]: /^[1-9]\d{3}$/,
+  // https://en.wikipedia.org/wiki/Postcodes_in_the_United_Kingdom#Validation
+  // follows most of the bullet points but not all the restrictions
+  [CountryCodes.UnitedKingdom]: /^[ABCDEFGHIJKLMNOPRSTUWYZ](?:[ABCDEFGHKLMNOPQRSTUVWXY][0-9][ABEHMNPRVWXY0-9]?|[0-9][ABCDEFGHJKPSTUW0-9]?)(?: ?[0-9][ABDEFGHJLNPQRSTUWXYZ]{1,2})?$/,
+  [CountryCodes.UnitedStates]: /^\d{5}(?:[ -]?\d{4})?$/
+};
 const createFormatByDigits = (digits) => {
   const format = new Array(digits).fill("9").join("");
   return {
@@ -10615,156 +10689,56 @@ const countrySpecificFormatters = {
     postalCode: createFormatByDigits(5)
   }
 };
-const createPatternByDigits = (digits) => ({
-  pattern: new RegExp(`\\d{${digits}}`)
-});
-const postalCodePatterns = {
-  [CountryCodes.Australia]: createPatternByDigits(4),
-  [CountryCodes.Austria]: createPatternByDigits(4),
-  [CountryCodes.Belgium]: {
-    pattern: /(?:(?:[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.Cyprus]: createPatternByDigits(4),
-  [CountryCodes.CzechRepublic]: {
-    pattern: /\d{3}\s?\d{2}/
-  },
-  [CountryCodes.Denmark]: {
-    pattern: /^(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.Hungary]: createPatternByDigits(4),
-  [CountryCodes.Iceland]: createPatternByDigits(3),
-  [CountryCodes.Ireland]: {
-    pattern: /(?:^[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.Liechtenstein]: createPatternByDigits(4),
-  [CountryCodes.Lithuania]: {
-    pattern: /^(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.NewZealand]: createPatternByDigits(4),
-  [CountryCodes.Norway]: createPatternByDigits(4),
-  [CountryCodes.Poland]: {
-    pattern: /^\d{2}[-]\d{3}$/
-  },
-  [CountryCodes.Portugal]: {
-    pattern: /^([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.Singapore]: createPatternByDigits(6),
-  [CountryCodes.Spain]: {
-    pattern: /(?: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})? *)$/
-  }
-};
-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 {
@@ -10795,6 +10769,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,
@@ -10809,7 +10784,7 @@ function Address(props) {
     schema: requiredFields,
     defaultData: dataProp,
     formatters: addressFormatters,
-    rules: addressValidationRules,
+    rules: rules2,
     fieldProblems: fieldValidationErrorsProp,
     maskedFields: []
   });
@@ -10836,11 +10811,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)) {
@@ -11555,7 +11525,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,
@@ -14226,7 +14196,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
@@ -14265,25 +14235,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) => {
@@ -14299,13 +14269,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,
@@ -14383,7 +14353,7 @@ const DriversLicense = ({
     })]
   });
 };
-const PassportNumber = ({
+const PassportNumber$1 = ({
   passportNumber: passportNumber2,
   onInput,
   onBlur,
@@ -14406,7 +14376,7 @@ const PassportNumber = ({
     placeholder: ""
   })
 });
-const ProofOfIdentityCard = ({
+const ProofOfIdentityCard$1 = ({
   cardNumber,
   onInput,
   onBlur,
@@ -14429,11 +14399,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,
@@ -14455,7 +14425,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)
@@ -14483,7 +14453,6 @@ function IdentityAuComponent(props) {
     maskedFields: props.maskedFields
   });
   p(() => {
-    console.log("triggerValidation");
     if (data.typeOfIdentity)
       triggerValidation(["idNumber"]);
   }, [data.typeOfIdentity]);
@@ -14505,28 +14474,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"),
@@ -14548,6 +14517,250 @@ function IdentityAuComponent(props) {
   });
 }
 const auIdentityFields = [...additionalIdentityInfoFields, "idNumber"];
+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 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)) {
@@ -15425,7 +15638,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, {
@@ -15439,7 +15655,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),
@@ -20775,6 +20991,7 @@ const getPayoutAccountHolderName = (legalEntity, i18n) => {
   }
   return getLegalEntityNameBasedOnType(legalEntity);
 };
+const isNewEntity = Symbol("isNewEntity");
 const splitAtFirstOccurrence = (str, separator) => {
   const firstOccurrence = str.indexOf(separator);
   if (firstOccurrence === -1)
@@ -20858,6 +21075,9 @@ const getTrustMembers = (trustLE, rootLegalEntity, exemptSettlorLE) => {
   return [mapRootLegalEntityToTrustMember(rootLegalEntity), ...mapEntityAssociationsToTrustMembers(trustLE.id, trustLE.entityAssociations ?? [], exemptSettlorLE), ...mapUndefinedBeneficiaryInfoToTrustMembers(((_a = trustLE.trust) == null ? void 0 : _a.undefinedBeneficiaryInfo) ?? [])];
 };
 const mapTrustMemberToEntityAssociations = (trustMember) => {
+  if (trustMember.legalEntityId === isNewEntity) {
+    throw Error("Cannot map a new trust member, you must create it first");
+  }
   if (trustMember.trustMemberType === "exemptSettlor")
     return [{
       legalEntityId: trustMember.legalEntityId,
@@ -20892,7 +21112,9 @@ const addOrUpdateUndefinedBeneficiary = async ({
   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, {
+      undefinedBeneficiaryInfo: [...otherUndefinedBeneficiaries, newOrUpdated.reference === isNewEntity ? {
+        description: newOrUpdated.description
+      } : {
         reference: newOrUpdated.reference,
         description: newOrUpdated.description
       }]
@@ -24269,21 +24491,21 @@ const convertDataToTrustMember = (data, existingTrustMember) => {
           firstName: data.firstName ?? "",
           lastName: data.lastName ?? ""
         },
-        legalEntityId: existingId ?? ""
+        legalEntityId: existingId ?? isNewEntity
       };
     if (data.role.includes("undefinedBeneficiary"))
       return {
         trustMemberType: "undefinedBeneficiary",
         roles: [TrustMemberTypes.UNDEFINED_BENEFICIARY],
         description: data.descriptionUndefinedBeneficiary ?? "",
-        reference: existingId ?? ""
+        reference: existingId ?? isNewEntity
       };
     if (data.entityType === LegalEntityType.ORGANIZATION)
       return {
         trustMemberType: "company",
         roles: data.role,
         legalEntityType: LegalEntityType.ORGANIZATION,
-        legalEntityId: existingId ?? "",
+        legalEntityId: existingId ?? isNewEntity,
         name: ""
       };
     if (data.entityType === LegalEntityType.INDIVIDUAL)
@@ -24291,7 +24513,7 @@ const convertDataToTrustMember = (data, existingTrustMember) => {
         trustMemberType: "regular",
         roles: data.role,
         legalEntityType: LegalEntityType.INDIVIDUAL,
-        legalEntityId: existingId ?? "",
+        legalEntityId: existingId ?? isNewEntity,
         name: ""
       };
   }
@@ -25930,7 +26152,7 @@ function DropinComposerComponent({
   };
   const addOrUpdateTrustMember = async (updated, existing) => {
     if ((existing == null ? void 0 : existing.trustMemberType) === "undefinedBeneficiary" && updated.trustMemberType === "undefinedBeneficiary" && existing.description === updated.description) {
-      await refreshTrustAndRunOnSubmit(trust);
+      await refreshTrustAndRunOnSubmit(trust, 1);
       return;
     }
     try {
@@ -25979,7 +26201,7 @@ function DropinComposerComponent({
         label: i18n.get("successfullyUpdatedDetails"),
         type: ToastType.SUCCESS
       });
-      await refreshTrustAndRunOnSubmit(trust);
+      await refreshTrustAndRunOnSubmit(trust, 1);
     } catch (err) {
       logger$1.error(err);
       showToast({
@@ -26068,11 +26290,11 @@ function DropinComposerComponent({
   };
   const onNavigateToTrustMember = async (tm) => {
     try {
-      if (tm == null ? void 0 : tm.legalEntityId) {
+      if (tm.legalEntityId === isNewEntity) {
+        setAssociatedLegalEntity(null);
+      } else {
         const response = await (args == null ? void 0 : args.handleGetLegalEntity(tm.legalEntityId));
         setAssociatedLegalEntity(response);
-      } else {
-        setAssociatedLegalEntity(null);
       }
       setTrustMember(tm);
       onNavigateTo(tm.trustMemberType === "company" ? TaskTypes.TRUST_MEMBER_COMPANY : TaskTypes.TRUST_MEMBER_INDIVIDUAL);
@@ -26149,9 +26371,9 @@ function DropinComposerComponent({
     await refreshLegalEntity();
     navigateBack(backStepCount);
   };
-  const refreshTrustAndRunOnSubmit = async (data) => {
+  const refreshTrustAndRunOnSubmit = async (data, backSteps) => {
     await refreshTrust();
-    await componentOnSubmit(data, 2);
+    await componentOnSubmit(data, backSteps);
   };
   const onPciDownload = async () => {
     const baseTrackingPayload = getBaseTrackingPayload({
@@ -26351,7 +26573,7 @@ function DropinComposerComponent({
           capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
           onChange: componentOnChange,
           eventEmitter,
-          onSubmit: refreshTrustAndRunOnSubmit,
+          onSubmit: (data) => refreshTrustAndRunOnSubmit(data, 2),
           handleBackClick: navigateBack,
           handleHomeClick: () => onNavigateTo(TaskTypes.TRUST_MEMBER_OVERVIEW),
           homeButtonLabel: i18n.get("saveAndGoToOverview"),
@@ -26399,7 +26621,7 @@ function DropinComposerComponent({
           problems: (_a2 = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _a2[legalEntity.id],
           onChange: componentOnChange,
           eventEmitter,
-          onSubmit: refreshTrustAndRunOnSubmit,
+          onSubmit: (data) => refreshTrustAndRunOnSubmit(data, 2),
           handleBackClick: navigateBack,
           handleHomeClick: navigateBack,
           homeButtonLabel: i18n.get("saveAndGoToOverview"),