@adyen/kyc-components 4.0.0-beta.0 → 4.0.0-beta.3

package/dist/{IndividualOnfidoDropin-D6uwo7VI.js → IndividualOnfidoDropin-DHhyO2ai.js}

@@ -2,58 +2,24 @@
 {
   try {
     let e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "4b8b06b2-0644-4e9e-a906-e14e5e300a8a", e._sentryDebugIdIdentifier = "sentry-dbid-4b8b06b2-0644-4e9e-a906-e14e5e300a8a");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "c2c20178-52ca-46e1-9e49-d0ae59916244", e._sentryDebugIdIdentifier = "sentry-dbid-c2c20178-52ca-46e1-9e49-d0ae59916244");
   } catch (e) {
   }
 }
 ;
-import { am as CountryCodes, X as TaskTypes, q as useApiContext, b5 as useMutation, b7 as httpPost, bX as matchesRegex, bY as trimValWithOneSpace, bZ as NO_ALPHABET_REGEX, b_ as EMOJI_REGEX, b$ as hasRepeatedCharacters, c0 as isInvalidName, c1 as INDIVIDUAL_VALID_CHAR_REGEX, c2 as getFormattingRegEx, c3 as SPECIAL_CHARS, ap as resolveFieldMetadata, c4 as getSSNType, an as isEmpty, c5 as defaultFieldMetadata, c6 as defaultFieldConfig, br as defaultFieldMetadata$1, bs as fieldConfig, c7 as defaultFieldMetadata$2, z as LegalEntityType, c8 as defaultFieldConfig$1, c9 as getAgeToday, ca as euCountries, cb as getLocalizedIdDocumentTypeOptions, cc as individualApiKeyMapping, b8 as individualComponentsKeyMapping, bJ as reverseMapping, cd as getNomineeFromAssociation, aJ as createLogger, U as useAccountHolder, b as useI18nContext, $ as useAnalyticsContext, a5 as useExperimentsContext, K as useSettingsContext, ce as useProviderStatus, g as getLegalEntityCountry, bW as getAssociatedLeAnalyticsPayload, cf as addressValidators, cg as getAsyncIdNumberValidationRule, bt as getAsyncPhoneValidationRules, ch as addressFormatters, ci as setHasMotionCaptureScenario, cj as individualForms, ck as showIndividualMotionCapture, bp as getAllowedDecisionMakerRoles, a_ as datasetUtilities, cl as Individual, cm as filterOutUnwantedAssociationsIfRootLE, b1 as cloneObject, cn as mapAddressLabels, co as individualDocumentForms, cp as individualDocumentMapping, cq as individualObscuredFields, cr as drop, ak as getOwnEntityAssociations, cs as hasNomineesChanged, ct as attachNomineeToRole, cu as idVerificationProviderId, cv as doArraysMatch, bq as DecisionMakerType, bC as createFormRules, bo as getAvailableDecisionMakerRoleTypes, cw as allowedCountriesForNominee, bS as getAddressSchemaForCountry, bT as COUNTRIES_WITH_STATES_DATASET, cx as Scenarios, ax as Field, bw as Select, cy as isTruthyValidator, cz as licenseCardNumberDefaultMetadata, cA as licenseCardNumberDefaultConfig, ao as mergeFieldMetadataIntoProps, aw as createFormUtils, bx as useFormContext, at as getFieldProps, cB as idNumberFields, cC as IdentityNumber, cD as additionallIdNumberOptions, cE as MaskedInput, bM as InputDate, cF as formatDateObj, cG as DriversLicense, cH as addressFields, u as useAllowedCountries, cI as getDefaultTaxIdNumberType, F as FormHeader, av as ErrorPanel, G as Typography, aD as CountryField, bU as Address, bV as getAddressSchemaLabelsByCountry, bK as Link, cJ as IndividualIdNumberTypeSelector, cK as TaxInformationField, cL as PatriotActDisclosure, au as nameFields, cM as decisionMakerRoleFields, cN as nomineeFields, cO as contactDetailFields, C as Alert, aS as ContextGuidance, aZ as TrustedFieldsProvider, cP as DecisionMakerRole, cQ as NomineeDecisionMakerRole, aC as Name, bg as InputText, bu as ContactDetails, bB as keysOf, aY as objectsDeepEqual, bz as isEmpty$1, cR as RadioWithLabel, bi as listToRecord, Z as Button, ba as Svg, cS as pick, cT as IdVerification, _ as IconButton, c as useDataset, d as datasetIdentifier, L as Loader, cU as IdDocumentManualUpload, cV as idDocumentUploadFields, cW as useFormRouterContext, by as getFormProps, bA as useCapabilities, cX as setShowIndividualMotionCapture, cY as shouldShowMotionCapture, cZ as hasMotionCaptureScenario, c_ as MemoizedProofOfRelationship, c$ as MemoizedDocumentUpload, d0 as MemoizedProofOfResidencyUpload, bb as useQueryClient } from "./StoreProvider-COHi02bX.js";
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
 import { useMemo, useState, useEffect, useCallback } from "preact/hooks";
-import { e as useScenarios, u as useScenarioConfiguration, i as isValidationError, p as processValidationErrors, d as isMaintenanceModeError } from "./processValidationErrors-RYlNmxB9.js";
-import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-By6uwPUg.js";
-import { c as contactDetailsValidationRules, u as useValidatePhoneNumberImperatively } from "./validate-Dyb8B4Hi.js";
-import { F as FormContextProvider, a as FormFlow } from "./FormFlow-CZgc09E3.js";
-import { u as useToastContext } from "./useToastContext-CF2xonft.js";
-import { g as getPropsFromConfigurations, c as composePerScenarioFormConfigurations } from "./process-field-configurations-DugpEY9k.js";
-import { a as useSingpassMyInfoLogin, P as ProviderButton } from "./ProviderButton-vD5DUJaN.js";
-import { g as getRequiredForms, a as addValidityToForms, u as useFormComposer, t as trackNavigation } from "./dropinUtils-Bk0T79SK.js";
-import { u as useMultiForm } from "./useMultiForm-Lh2i5tRJ.js";
-import { b as getIdDocument, g as getDocument, c as createDocumentRequest, d as documentApiUtils, m as mergeAttachments, a as getFileExtention } from "./documentUtils-51iMbUyU.js";
-import { g as getFieldsWithExistingData } from "./getFieldsWithExistingData-UNUNInq5.js";
-import { l as localizeDateString } from "./localizeDateString-KlstHAcM.js";
-import { o as omitObscuredFieldsIfUnchanged } from "./omitObscuredFieldsIfUnchanged-DhCrqm4T.js";
-import { r as rules, D as DECISION_MAKER_TYPES_WITH_JOBTITLE$1 } from "./rules-a4kJDPzY.js";
-import { f as formatObject } from "./utils-B1H_8b1P.js";
-import { f as fieldsPerScenario, a as isLowRiskCountry } from "./individualFormConfig-BrFLPTfr.js";
-import { C as Confirm } from "./Confirm-okTxq40p.js";
-import { M as Modal } from "./Modal-CRNejb1x.js";
-import { S as Spacer } from "./Spacer-BK3jDget.js";
-import { T as TileGroup } from "./TileGroup-B1IymoWv.js";
-import { m as mapExistingFile, g as getPageName, a as getPage } from "./mapExistingFile-BE74t9jV.js";
-const KEY_MARKETS = [
-  CountryCodes.UnitedStates,
-  CountryCodes.UnitedKingdom,
-  CountryCodes.Germany,
-  CountryCodes.France,
-  CountryCodes.Canada,
-  CountryCodes.Australia
-];
-function isOnfidoAutofillFlowEnabled(country, taskType, isExperimentEnabled) {
-  const market = KEY_MARKETS.includes(country) ? "KeyMarkets" : "AdditionalMarkets";
-  let type;
-  switch (taskType) {
-    case TaskTypes.INDIVIDUAL:
-      type = "PureIndividuals";
-      break;
-    case TaskTypes.DECISION_MAKER:
-      type = "DecisionMakers";
-      break;
-    default:
-      return false;
-  }
-  return isExperimentEnabled(`EnableAutofillFlowFor${type}In${market}`);
-}
+import { p as useApiContext, bi as useMutation, bk as httpPost, bX as matchesRegex, bY as trimValWithOneSpace, bZ as NO_ALPHABET_REGEX, b_ as EMOJI_REGEX, b$ as hasRepeatedCharacters, c0 as isInvalidName, c1 as INDIVIDUAL_VALID_CHAR_REGEX, c2 as getFormattingRegEx, c3 as SPECIAL_CHARS, c4 as standardKatakanaValidator, c5 as standardKanjiValidator, at as resolveFieldMetadata, aq as CountryCodes, c6 as getSSNType, ar as isEmpty, c7 as defaultFieldMetadata, c8 as defaultFieldConfig, c9 as defaultFieldMetadata$1, ca as fieldConfig, X as TaskTypes, cb as taxInformationDefaultFieldMetadata, y as LegalEntityType, cc as taxInformationDefaultFieldConfig, cd as getAgeToday, ce as euCountries, cf as getIdDocument, cg as getDocument, ch as mapExistingFile, ci as getPageName, cj as getLocalizedIdDocumentTypeOptions, ck as getPage, cl as createDocumentRequest, bA as formatObject, cm as individualApiKeyMapping, bn as individualComponentsKeyMapping, bz as reverseMapping, cn as getNomineeFromAssociation, co as drop, Y as createLogger, U as useAccountHolder, ap as useI18nContext, a0 as useAnalyticsContext, a6 as useToastContext, a7 as useExperimentsContext, K as useSettingsContext, cp as documentApiUtils, cq as useProviderStatus, g as getLegalEntityCountry, bP as getAssociatedLeAnalyticsPayload, cr as addressValidators, cs as getAsyncIdNumberValidationRule, ct as getAsyncPhoneValidationRules, cu as addressFormatters, cv as useScenarios, cw as setHasMotionCaptureScenario, cx as useScenarioConfiguration, cy as getPropsFromConfigurations, cz as individualForms, cA as showIndividualMotionCapture, bQ as getRequiredForms, bR as addValidityToForms, cB as getAllowedDecisionMakerRoles, b3 as datasetUtilities, bS as useFormComposer, bT as trackNavigation, cC as Individual, cD as composePerScenarioFormConfigurations, cE as omitObscuredFieldsIfUnchanged, cF as filterOutUnwantedAssociationsIfRootLE, bU as isValidationError, bV as processValidationErrors, bW as isMaintenanceModeError, bd as cloneObject, cG as mapAddressLabels, cH as individualDocumentForms, cI as individualDocumentMapping, cJ as individualObscuredFields, cK as mergeAttachments, cL as getFileExtention, al as getOwnEntityAssociations, cM as hasNomineesChanged, cN as attachNomineeToRole, cO as idVerificationProviderId, cP as doArraysMatch, G as Typography, _ as Button, aB as Field, cQ as DecisionMakerType, cR as createFormRules, cS as getAvailableDecisionMakerRoleTypes, cT as allowedCountriesForNominee, bL as getAddressSchemaForCountry, bM as COUNTRIES_WITH_STATES_DATASET, cU as Scenarios, cV as isLowRiskCountry, bu as Select, cW as isTruthyValidator, cX as licenseCardNumberDefaultMetadata, cY as licenseCardNumberDefaultConfig, as as mergeFieldMetadataIntoProps, aA as createFormUtils, bK as useFormContext, ax as getFieldProps, cZ as idNumberFields, c_ as IdentityNumber, c$ as additionallIdNumberOptions, d0 as MaskedInput, bG as InputDate, d1 as formatDateObj, d2 as DriversLicense, d3 as addressFields, u as useAllowedCountries, M as SettingNames, d4 as getDefaultTaxIdNumberType, F as FormHeader, az as ErrorPanel, aH as CountryField, bN as Address, bO as getAddressSchemaLabelsByCountry, bD as Link, bb as Confirm, d5 as getAgeRangeForLegalRepresentative, d6 as IndividualIdNumberTypeSelector, d7 as TaxInformationField, d8 as PatriotActDisclosure, d9 as isLegalRepresentativeNeeded, ay as nameFields, da as decisionMakerRoleFields, db as nomineeFields, dc as contactDetailFields, B as Alert, aX as ContextGuidance, b2 as TrustedFieldsProvider, dd as DecisionMakerRole, de as NomineeDecisionMakerRole, df as LocalizedNameFields, bE as InputText, dg as ContactDetails, dh as keysOf, b1 as objectsDeepEqual, di as isEmpty$1, dj as RadioWithLabel, dk as listToRecord, b5 as Modal, bp as Svg, dl as pick, dm as IdVerification, ba as Spacer, $ as IconButton, c as useDataset, d as datasetIdentifier, L as Loader, dn as isPersonUnderAge, dp as IdDocumentManualUpload, C as translateStringOrObject, a as useTranslation, aV as Trans, dq as idDocumentUploadFields, dr as useFormRouterContext, ds as getFormProps, dt as useCapabilities, du as hasMotionCaptureScenario, dv as setShowIndividualMotionCapture, dw as shouldShowMotionCapture, dx as MemoizedProofOfRelationship, dy as MemoizedDocumentUpload, dz as MemoizedProofOfResidencyUpload, dA as individualOnfidoApiKeyMapping, dB as individualOnfidoBaseMapping, bq as useQueryClient, dC as individualOnfidoDocumentMapping, dD as individualOnfidoObscuredFields } from "./StoreProvider-ClKLaHzy.js";
+import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-D8dw9Oc3.js";
+import { c as contactDetailsValidationRules, u as useValidatePhoneNumberImperatively } from "./validate-CeF0YKvL.js";
+import { F as FormContextProvider, a as FormFlow } from "./FormFlow-DjvdNEiV.js";
+import { u as useSingpassMyInfoLogin, P as ProviderButton } from "./ProviderButton-B58n0cRC.js";
+import { u as useMultiForm } from "./useMultiForm-KQwxav4F.js";
+import { g as getFieldsWithExistingData } from "./getFieldsWithExistingData-BY--eXBQ.js";
+import { l as localizeDateString } from "./localizeDateString-CKCBXzSn.js";
+import { r as rules, D as DECISION_MAKER_TYPES_WITH_JOBTITLE$1 } from "./rules-CCnLDGvk.js";
+import { signal, computed } from "@preact/signals";
+import { T as TileGroup } from "./TileGroup-BtE472I1.js";
 const verifyIdNumber = async (legalEntityId, baseUrl, data) => {
   return await httpPost(
     {
@@ -139,6 +105,38 @@ const onfidoDocumentTypeMapping = [
   { id: "identityCard", name: "identityCard", hasBackPage: true },
   { id: "passport", name: "passport", hasBackPage: false }
 ];
+const jaHaniNameValidationRules = {
+  jaHaniFirstName: [
+    {
+      modes: ["blur"],
+      validate: (input) => standardKanjiValidator(input),
+      errorMessage: "nameMustContainLetters"
+    }
+  ],
+  jaHaniLastName: [
+    {
+      modes: ["blur"],
+      validate: (input) => standardKanjiValidator(input),
+      errorMessage: "nameMustContainLetters"
+    }
+  ]
+};
+const jaKanaNameValidationRules = {
+  jaKanaFirstName: [
+    {
+      modes: ["blur"],
+      validate: (input) => standardKatakanaValidator(input),
+      errorMessage: "nameMustContainLetters"
+    }
+  ],
+  jaKanaLastName: [
+    {
+      modes: ["blur"],
+      validate: (input) => standardKatakanaValidator(input),
+      errorMessage: "nameMustContainLetters"
+    }
+  ]
+};
 const isNotOutOfRangeBirthDateValidatorRule$1 = {
   modes: ["blur"],
   validate: (birthDate) => !isEmpty(birthDate) && new Date(birthDate) < /* @__PURE__ */ new Date(),
@@ -181,53 +179,51 @@ const personalDetailsValidators = ({
   existingIdNumber,
   formVerificationErrors,
   taxIdNumberType
-}) => {
-  var _a, _b;
-  return {
-    taxInformation: (_a = resolveFieldMetadata(
-      defaultFieldConfig$1[country],
-      {
-        taxIdNumberType,
-        companyType: LegalEntityType.INDIVIDUAL
-      },
-      defaultFieldMetadata$2
-    )) == null ? void 0 : _a.validators,
-    birthDate: (() => {
-      const baseValidators = [isNotOutOfRangeBirthDateValidatorRule$1];
-      if (isSettingEnabled("enforceLegalAge")) {
+}) => ({
+  taxInformation: resolveFieldMetadata(
+    taxInformationDefaultFieldConfig[country],
+    {
+      taxIdNumberType,
+      companyType: LegalEntityType.INDIVIDUAL
+    },
+    taxInformationDefaultFieldMetadata
+  )?.validators,
+  birthDate: (() => {
+    const baseValidators = [isNotOutOfRangeBirthDateValidatorRule$1];
+    if (isSettingEnabled("enforceLegalAge")) {
+      return [...baseValidators, buildMinimumAgeValidationRule$1(18)];
+    }
+    if (isExperimentEnabled("EnableAgeVerification")) {
+      if (taskType === TaskTypes.LEGAL_REPRESENTATIVE_DETAILS) {
         return [...baseValidators, buildMinimumAgeValidationRule$1(18)];
       }
-      if (isExperimentEnabled("EnableAgeVerification")) {
-        if (taskType === TaskTypes.LEGAL_REPRESENTATIVE_DETAILS) {
-          return [...baseValidators, buildMinimumAgeValidationRule$1(18)];
-        }
-        return [...baseValidators, getCountrySpecificMinimumAgeValidationRule$1(country)];
-      }
-      return baseValidators;
-    })(),
-    ...isExperimentEnabled("StrictNameAndAddressValidationV4") ? nameValidationRulesV4 : void 0,
-    ...contactDetailsValidationRules,
-    phoneNumber: (_b = resolveFieldMetadata(
-      fieldConfig[phonePrefix ?? country],
-      {},
-      defaultFieldMetadata$1
-    )) == null ? void 0 : _b.validators,
-    idNumber: (() => {
-      var _a2;
-      const derivedIdNumberType = country === CountryCodes.UnitedStates ? getSSNType(formVerificationErrors, existingIdNumber) : idNumberType;
-      return idNumberExempt ? {
-        validate: () => {
-          return idNumberExempt || !isEmpty(idNumber);
-        },
-        modes: ["blur"]
-      } : (_a2 = resolveFieldMetadata(
-        defaultFieldConfig[country],
-        { idNumberType: derivedIdNumberType },
-        defaultFieldMetadata
-      )) == null ? void 0 : _a2.validators;
-    })()
-  };
-};
+      return [...baseValidators, getCountrySpecificMinimumAgeValidationRule$1(country)];
+    }
+    return baseValidators;
+  })(),
+  ...isExperimentEnabled("StrictNameAndAddressValidationV4") ? nameValidationRulesV4 : void 0,
+  ...contactDetailsValidationRules,
+  phoneNumber: resolveFieldMetadata(
+    fieldConfig[phonePrefix ?? country],
+    {},
+    defaultFieldMetadata$1
+  )?.validators,
+  idNumber: (() => {
+    const derivedIdNumberType = country === CountryCodes.UnitedStates ? getSSNType(formVerificationErrors, existingIdNumber) : idNumberType;
+    return idNumberExempt ? {
+      validate: () => {
+        return idNumberExempt || !isEmpty(idNumber);
+      },
+      modes: ["blur"]
+    } : resolveFieldMetadata(
+      defaultFieldConfig[country],
+      { idNumberType: derivedIdNumberType },
+      defaultFieldMetadata
+    )?.validators;
+  })(),
+  ...jaHaniNameValidationRules,
+  ...jaKanaNameValidationRules
+});
 const mandateIdVerificationForMotionCapture = (showMotionCapture, derivedProps) => {
   if (!derivedProps) {
     return void 0;
@@ -244,27 +240,27 @@ const mandateIdVerificationForMotionCapture = (showMotionCapture, derivedProps)
   return copiedDerivedProps;
 };
 const mapApiDocumentToIndividualDocuments = (entityId) => {
-  const idDocument = getIdDocument(entityId);
+  const idDocument2 = getIdDocument(entityId);
   const proofOfResidency = getDocument(entityId, "proofOfResidency");
   const proofOfNationalId = getDocument(entityId, "proofOfNationalIdNumber");
   const proofOfRelationship = getDocument(entityId, "proofOfRelationship");
   return {
-    idDocument: idDocument ? mapApiIdDocumentToSchema(idDocument) : void 0,
+    idDocument: idDocument2 ? mapApiIdDocumentToSchema(idDocument2) : void 0,
     proofOfResidency: proofOfResidency ? { proofOfResidency: [mapExistingFile(getPageName(proofOfResidency))] } : void 0,
     proofOfNationalId: proofOfNationalId ? { proofOfNationalId: [mapExistingFile(getPageName(proofOfNationalId))] } : void 0,
     proofOfRelationship: proofOfRelationship ? { proofOfRelationship: [mapExistingFile(getPageName(proofOfRelationship))] } : void 0
   };
 };
-const mapApiIdDocumentToSchema = (idDocument) => {
-  const { type, attachments, modificationDate } = idDocument;
+const mapApiIdDocumentToSchema = (idDocument2) => {
+  const { type, attachments, modificationDate } = idDocument2;
   const { hasBackPage } = getLocalizedIdDocumentTypeOptions().find(({ id }) => id === type);
   let frontPage;
   let backPage;
-  if ((attachments == null ? void 0 : attachments.length) === 1) {
-    frontPage = getPage(idDocument);
+  if (attachments?.length === 1) {
+    frontPage = getPage(idDocument2);
   } else {
-    frontPage = hasBackPage ? getPage(idDocument, "front") : getPage(idDocument);
-    backPage = hasBackPage ? getPage(idDocument, "back") : void 0;
+    frontPage = hasBackPage ? getPage(idDocument2, "front") : getPage(idDocument2);
+    backPage = hasBackPage ? getPage(idDocument2, "back") : void 0;
   }
   return {
     ...frontPage ? { idFrontPage: [mapExistingFile(frontPage.pageName ?? "")] } : {},
@@ -274,32 +270,31 @@ const mapApiIdDocumentToSchema = (idDocument) => {
   };
 };
 const mapIndividualDocumentToApiDocument = async (data, entityId) => {
-  var _a, _b;
   if (!data) return void 0;
   const { proofOfNationalId, proofOfResidency, proofOfRelationship } = data;
-  const idDocument = "idDocument" in data ? data.idDocument : data.manualIdUpload;
+  const idDocument2 = "idDocument" in data ? data.idDocument : data.manualIdUpload;
   const entityType = "legalEntity";
   const documents = await Promise.all([
-    (idDocument == null ? void 0 : idDocument.idFrontPage) ? createDocumentRequest({
+    idDocument2?.idFrontPage ? createDocumentRequest({
       entityId,
       entityType,
-      documentType: idDocument.idDocumentType,
-      page1: (_a = idDocument.idFrontPage) == null ? void 0 : _a[0],
-      page2: (_b = idDocument.idBackPage) == null ? void 0 : _b[0]
+      documentType: idDocument2.idDocumentType,
+      page1: idDocument2.idFrontPage?.[0],
+      page2: idDocument2.idBackPage?.[0]
     }) : void 0,
-    (proofOfNationalId == null ? void 0 : proofOfNationalId.proofOfNationalId) ? createDocumentRequest({
+    proofOfNationalId?.proofOfNationalId ? createDocumentRequest({
       entityId,
       entityType,
       documentType: "proofOfNationalIdNumber",
       page1: proofOfNationalId.proofOfNationalId[0]
     }) : void 0,
-    (proofOfResidency == null ? void 0 : proofOfResidency.proofOfResidency) ? createDocumentRequest({
+    proofOfResidency?.proofOfResidency ? createDocumentRequest({
       entityId,
       entityType,
       documentType: "proofOfResidency",
       page1: proofOfResidency.proofOfResidency[0]
     }) : void 0,
-    (proofOfRelationship == null ? void 0 : proofOfRelationship.proofOfRelationship) ? createDocumentRequest({
+    proofOfRelationship?.proofOfRelationship ? createDocumentRequest({
       entityId,
       entityType,
       documentType: "proofOfRelationship",
@@ -349,12 +344,33 @@ const adjustIdentificationData = (data, apiData) => {
         ...identificationData,
         expiryDate: "",
         cardNumber: "",
-        nationalIdExempt: (apiData == null ? void 0 : apiData.nationalIdExempt) ?? !idNumber
+        nationalIdExempt: apiData?.nationalIdExempt ?? !idNumber
       };
   }
 };
+const mapNameLocalization = (data) => {
+  const localization = [];
+  if (data.jaHaniFirstName || data.jaHaniLastName) {
+    localization.push({
+      script: "ja-Hani",
+      fields: {
+        firstName: data.jaHaniFirstName,
+        lastName: data.jaHaniLastName
+      }
+    });
+  }
+  if (data.jaKanaFirstName || data.jaKanaLastName) {
+    localization.push({
+      script: "ja-Kana",
+      fields: {
+        firstName: data.jaKanaFirstName,
+        lastName: data.jaKanaLastName
+      }
+    });
+  }
+  return localization;
+};
 const mapIndividualToLegalEntity = (data) => {
-  var _a;
   const requestObj = {
     ...formatObject(data, individualApiKeyMapping)
   };
@@ -365,7 +381,11 @@ const mapIndividualToLegalEntity = (data) => {
     personalDetails,
     requestObj.individual.identificationData
   );
-  if ((_a = personalDetails.phoneNumber) == null ? void 0 : _a.number) {
+  const localization = mapNameLocalization(personalDetails);
+  if (localization.length) {
+    requestObj.individual.name.localization = localization;
+  }
+  if (personalDetails.phoneNumber?.number) {
     requestObj.individual.phone = {
       number: personalDetails.phoneNumber.number,
       type: "mobile"
@@ -376,7 +396,6 @@ const mapIndividualToLegalEntity = (data) => {
   return requestObj;
 };
 const mapLegalEntityToIndividual = (legalEntity, isChangingType, isRoleFieldNeeded, parentLegalEntity, isLegalRepresentative) => {
-  var _a, _b, _c, _d, _e, _f, _g;
   let individualData = formatObject(
     legalEntity,
     individualComponentsKeyMapping
@@ -384,49 +403,248 @@ const mapLegalEntityToIndividual = (legalEntity, isChangingType, isRoleFieldNeed
   individualData = {
     ...individualData,
     personalDetails: {
-      ...individualData == null ? void 0 : individualData.personalDetails,
+      ...individualData?.personalDetails,
       ...isChangingType && {
         firstName: "",
         lastName: ""
       }
     }
   };
-  if (!((_a = individualData.personalDetails) == null ? void 0 : _a.idNumberExempt)) {
+  if (!individualData.personalDetails?.idNumberExempt) {
     individualData.personalDetails.idNumberExempt = false;
   }
   const apiIdentityTypeToIdentityTypeMap = reverseMapping(
     getIdentityTypeToApiIdentityTypeMap(individualData.personalDetails)
   );
-  if ((_c = (_b = legalEntity == null ? void 0 : legalEntity.individual) == null ? void 0 : _b.identificationData) == null ? void 0 : _c.type) {
+  if (legalEntity?.individual?.identificationData?.type) {
     individualData.personalDetails.typeOfIdentity = apiIdentityTypeToIdentityTypeMap[legalEntity.individual.identificationData.type];
   }
-  if ((_d = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _d.length) {
+  if (legalEntity?.documentDetails?.length) {
     individualData = {
       ...individualData,
-      ...mapApiDocumentToIndividualDocuments(legalEntity == null ? void 0 : legalEntity.id)
+      ...mapApiDocumentToIndividualDocuments(legalEntity?.id)
     };
   }
-  if (!(parentLegalEntity == null ? void 0 : parentLegalEntity.entityAssociations)) {
+  if (legalEntity?.individual?.residentialAddress.country === "JP" && legalEntity.individual?.name?.localization) {
+    const configs = [
+      {
+        script: "ja-Hani",
+        mappingFunction: (l) => ({
+          jaHaniFirstName: l.fields?.firstName,
+          jaHaniLastName: l.fields?.lastName
+        })
+      },
+      {
+        script: "ja-Kana",
+        mappingFunction: (l) => ({
+          jaKanaFirstName: l.fields?.firstName,
+          jaKanaLastName: l.fields?.lastName
+        })
+      }
+    ];
+    configs.forEach((config) => {
+      const localizationToMap = legalEntity.individual?.name.localization?.find(
+        (l) => l.script === config.script
+      );
+      if (localizationToMap) {
+        individualData.personalDetails = {
+          ...individualData.personalDetails,
+          ...config.mappingFunction(localizationToMap)
+        };
+      }
+    });
+  }
+  if (!parentLegalEntity?.entityAssociations) {
     return individualData;
   }
-  const associations = ((_e = parentLegalEntity == null ? void 0 : parentLegalEntity.entityAssociations) == null ? void 0 : _e.filter((ea) => ea.legalEntityId === (legalEntity == null ? void 0 : legalEntity.id))) ?? [];
+  const associations = parentLegalEntity?.entityAssociations?.filter((ea) => ea.legalEntityId === legalEntity?.id) ?? [];
   if (isRoleFieldNeeded) {
     individualData.personalDetails.role = associations.map((ea) => ea.type);
-    individualData.personalDetails.jobTitle = (_f = associations.find(
+    individualData.personalDetails.jobTitle = associations.find(
       ({ jobTitle }) => Boolean(jobTitle)
-    )) == null ? void 0 : _f.jobTitle;
+    )?.jobTitle;
   }
   individualData.personalDetails = getNomineeFromAssociation(
     associations,
     individualData.personalDetails
   );
   if (isLegalRepresentative) {
-    individualData.personalDetails.relationship = (_g = associations.find(
+    individualData.personalDetails.relationship = associations.find(
       ({ relationship }) => Boolean(relationship)
-    )) == null ? void 0 : _g.relationship;
+    )?.relationship;
   }
   return individualData;
 };
+const identityBase = {
+  role: {
+    rule: "requiredIfDecisionMakerTask"
+  },
+  firstName: {
+    rule: "REQUIRED"
+  },
+  lastName: {
+    rule: "REQUIRED"
+  },
+  birthDate: {
+    rule: "REQUIRED"
+  },
+  phoneNumber: {
+    rules: ["requiredIfPhoneScenarioDisabled", "contactsIfRequiredForRole"]
+  },
+  email: {
+    rule: "contactsIfRequiredForRole"
+  },
+  jobTitle: {
+    rule: "jobTitleIfRequiredForRole"
+  },
+  nationality: {
+    rule: "nationalityIfRequiredForRole"
+  },
+  address: {
+    rule: "addressIfRequiredForCountry"
+  },
+  otherAddressInformation: {
+    rule: "otherAddressInfoIfRequiredForCountry"
+  },
+  country: {
+    rule: "REQUIRED"
+  },
+  postalCode: {
+    rule: "postalCodeIfRequiredForCountry"
+  },
+  city: {
+    rule: "cityIfRequiredForCountry"
+  },
+  stateOrProvince: {
+    rule: "stateOrProvinceIfRequiredForCountry"
+  },
+  residencyCountry: {
+    rule: "REQUIRED"
+  },
+  proofOfResidency: {
+    rule: "isProofOfResidencyRequired"
+  },
+  proofOfNationalId: {
+    rule: "isProofOfNationalIdRequired"
+  },
+  relationship: {
+    rule: "legalRepresentativeRelationshipRequired"
+  },
+  proofOfRelationship: {
+    rule: "isProofOfRelationshipRequired"
+  },
+  nomineeDirector: {
+    rule: "nomineeDirectorRequiredForCountry"
+  },
+  nomineeShareholder: {
+    rule: "nomineeShareHolderRequiredForCountry"
+  },
+  jaHaniFirstName: {
+    rule: "japaneseFirstAndLastNames"
+  },
+  jaHaniLastName: {
+    rule: "japaneseFirstAndLastNames"
+  },
+  jaKanaFirstName: {
+    rule: "japaneseFirstAndLastNames"
+  },
+  jaKanaLastName: {
+    rule: "japaneseFirstAndLastNames"
+  },
+  idDocumentType: {
+    // If the user has a missing ID error and chooses manual flow
+    rule: "isManualIdFlowAndHasMissingData"
+  }
+};
+const identityNumber$1 = {
+  idNumber: {
+    rule: "idNumberRules",
+    obscured: true
+  },
+  idNumberExempt: {
+    rules: ["idNumberExemptIfApplicableCountry", "isDirectorIdNumberRequiredForCountry"]
+  },
+  idDocumentType: {
+    rule: "manualIdDocumentRequired"
+  },
+  idFrontPage: {
+    rule: "idFrontPageIfManualUpload"
+  },
+  idBackPage: {
+    rule: "backPageIfRequiredForDocumentType"
+  },
+  idVerificationMethod: {
+    rule: "idVerificationRequired"
+  },
+  instantIdVerificationData: {
+    rule: "instantVerificationDataRule"
+  }
+};
+const additionalIdentityInfo$1 = {
+  typeOfIdentity: {
+    rules: ["requiredIfCountryUsesMultipleTypesOfIdentity", "isDirectorIdNumberRequiredForCountry"]
+  },
+  issuerState: {
+    rule: "issuerStateRequired"
+  },
+  licenseCardNumber: {
+    rule: "licenseCardNumberRules"
+  },
+  expiryDate: {
+    rule: "expiryDateRequired"
+  }
+};
+const idDocument = {
+  idVerificationMethod: {
+    rule: "REQUIRED"
+  },
+  idDocumentType: {
+    rule: "REQUIRED"
+  },
+  idFrontPage: {
+    rule: "idFrontPageIfManualUpload"
+  },
+  idBackPage: {
+    rule: "backPageIfRequiredForDocumentType"
+  }
+};
+const nationality$1 = {
+  nationality: {
+    rule: "REQUIRED"
+  }
+};
+const phoneNumberBase$1 = {
+  phoneNumber: {
+    rule: "contactsIfRequiredForRole"
+  }
+};
+const taxInformationBase$1 = {
+  taxInformation: { rule: "countryUsesTaxId" }
+};
+const fieldsPerScenario = {
+  L0: drop("address", "birthDate").from(identityBase),
+  L1: identityBase,
+  L_TAXINFO: { ...identityBase, ...taxInformationBase$1 },
+  L1_ID: {
+    ...identityBase,
+    ...identityNumber$1,
+    ...additionalIdentityInfo$1
+  },
+  L1_IDO: {
+    // TODO: change idNumber rule to optional once optional fields are implemented
+    ...identityBase,
+    ...identityNumber$1,
+    ...additionalIdentityInfo$1
+  },
+  L1_NAT: {
+    ...identityBase,
+    ...identityNumber$1,
+    ...additionalIdentityInfo$1,
+    ...nationality$1
+  },
+  L1_IDDOC: idDocument,
+  L_PH: phoneNumberBase$1
+};
 const parseIndividualScenarios = (scenarios) => composePerScenarioFormConfigurations(scenarios, fieldsPerScenario);
 const parseConfiguration$1 = ({ scenarios }) => parseIndividualScenarios(scenarios);
 const logger$4 = createLogger();
@@ -446,7 +664,6 @@ function IndividualDropin({
   trustedFieldsProvider,
   trustedRoles
 }) {
-  var _a, _b, _c, _d, _e, _f;
   const { baseUrl, rootLegalEntityId } = useApiContext();
   const { accountHolder, setAccountHolder } = useAccountHolder();
   const { i18n } = useI18nContext();
@@ -494,7 +711,7 @@ function IndividualDropin({
   const [documents, setDocuments] = useState();
   const [existingAttachments, setExistingAttachments] = useState();
   const [country, setCountry] = useState(
-    ((_a = dataFromResponse == null ? void 0 : dataFromResponse.personalDetails) == null ? void 0 : _a.residencyCountry) ?? parentCountry
+    dataFromResponse?.personalDetails?.residencyCountry ?? parentCountry
   );
   const [hideFooter, setHideFooter] = useState(false);
   const [derivedProps, setDerivedProps] = useState();
@@ -525,29 +742,26 @@ function IndividualDropin({
     });
   }, []);
   const individualFieldValidations = useCallback(
-    (data2) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h, _i, _j, _k, _l, _m;
-      return {
-        personalDetails: personalDetailsValidators({
-          country: ((_a2 = data2 == null ? void 0 : data2.personalDetails) == null ? void 0 : _a2.residencyCountry) ?? country,
-          isExperimentEnabled,
-          isSettingEnabled,
-          taskType,
-          idNumberType: (_b2 = data2 == null ? void 0 : data2.personalDetails) == null ? void 0 : _b2.typeOfIdentity,
-          phonePrefix: (_d2 = (_c2 = data2 == null ? void 0 : data2.personalDetails) == null ? void 0 : _c2.phoneNumber) == null ? void 0 : _d2.phoneCountryCode,
-          idNumberExempt: (_e2 = data2 == null ? void 0 : data2.personalDetails) == null ? void 0 : _e2.idNumberExempt,
-          idNumber: (_f2 = data2 == null ? void 0 : data2.personalDetails) == null ? void 0 : _f2.idNumber,
-          existingIdNumber: (_g = dataFromResponse.personalDetails) == null ? void 0 : _g.idNumber,
-          formVerificationErrors: (_h = propProblems == null ? void 0 : propProblems.verificationErrors) == null ? void 0 : _h.personalDetails,
-          taxIdNumberType: ((_j = (_i = data2 == null ? void 0 : data2.personalDetails) == null ? void 0 : _i.taxInformation) == null ? void 0 : _j.length) ? (_l = (_k = data2 == null ? void 0 : data2.personalDetails) == null ? void 0 : _k.taxInformation[0]) == null ? void 0 : _l.type : void 0
-        }),
-        address: addressValidators({
-          isExperimentEnabled,
-          country: ((_m = data2 == null ? void 0 : data2.personalDetails) == null ? void 0 : _m.residencyCountry) ?? country,
-          i18n
-        })
-      };
-    },
+    (data2) => ({
+      personalDetails: personalDetailsValidators({
+        country: data2?.personalDetails?.residencyCountry ?? country,
+        isExperimentEnabled,
+        isSettingEnabled,
+        taskType,
+        idNumberType: data2?.personalDetails?.typeOfIdentity,
+        phonePrefix: data2?.personalDetails?.phoneNumber?.phoneCountryCode,
+        idNumberExempt: data2?.personalDetails?.idNumberExempt,
+        idNumber: data2?.personalDetails?.idNumber,
+        existingIdNumber: dataFromResponse.personalDetails?.idNumber,
+        formVerificationErrors: propProblems?.verificationErrors?.personalDetails,
+        taxIdNumberType: data2?.personalDetails?.taxInformation?.length ? data2?.personalDetails?.taxInformation[0]?.type : void 0
+      }),
+      address: addressValidators({
+        isExperimentEnabled,
+        country: data2?.personalDetails?.residencyCountry ?? country,
+        i18n
+      })
+    }),
     [isExperimentEnabled, isSettingEnabled, taskType]
   );
   const validatePhoneNumber = useValidatePhoneNumberImperatively();
@@ -556,7 +770,7 @@ function IndividualDropin({
     (data2) => ({
       personalDetails: {
         phoneNumber: getAsyncPhoneValidationRules(validatePhoneNumber).phoneNumber,
-        idNumber: getAsyncIdNumberValidationRule(verifyIdNumber2, data2 == null ? void 0 : data2.personalDetails).idNumber
+        idNumber: getAsyncIdNumberValidationRule(verifyIdNumber2, data2?.personalDetails).idNumber
       }
     }),
     [getAsyncPhoneValidationRules, getAsyncIdNumberValidationRule]
@@ -581,18 +795,17 @@ function IndividualDropin({
     []
   );
   const form = useMultiForm({
-    requiredFields: derivedProps == null ? void 0 : derivedProps.requiredFields,
+    requiredFields: derivedProps?.requiredFields,
     defaultData,
     rules: individualFieldValidations,
     asyncRules: individualFieldAsyncValidations,
-    optionalFields: derivedProps == null ? void 0 : derivedProps.optionalFields,
+    optionalFields: derivedProps?.optionalFields,
     formatters
   });
   const { data = dataFromResponse } = form;
   useEffect(() => {
-    var _a2;
-    setCountry(((_a2 = data == null ? void 0 : data.personalDetails) == null ? void 0 : _a2.residencyCountry) ?? parentCountry);
-  }, [(_b = data == null ? void 0 : data.personalDetails) == null ? void 0 : _b.residencyCountry, parentCountry]);
+    setCountry(data?.personalDetails?.residencyCountry ?? parentCountry);
+  }, [data?.personalDetails?.residencyCountry, parentCountry]);
   const { data: scenarios } = useScenarios(country, LegalEntityType.INDIVIDUAL);
   useEffect(() => {
     if (!scenarios) return;
@@ -606,26 +819,23 @@ function IndividualDropin({
     country
   });
   const fieldsFromCustomRules = useMemo(
-    () => {
-      var _a2;
-      return rules({
-        matchingScenario,
-        data,
-        country: ((_a2 = data == null ? void 0 : data.personalDetails) == null ? void 0 : _a2.residencyCountry) ?? country,
-        taskType,
-        isExperimentEnabled,
-        rootLegalEntity: parentLegalEntity
-      });
-    },
-    [country, matchingScenario, data, taskType]
+    () => rules({
+      matchingScenario,
+      data,
+      country: data?.personalDetails?.residencyCountry ?? country,
+      taskType,
+      isExperimentEnabled,
+      rootLegalEntity: parentLegalEntity,
+      problems
+    }),
+    [country, matchingScenario, data, taskType, problems]
   );
   useEffect(() => {
-    var _a2;
     const derivedProps2 = getPropsFromConfigurations(
       fieldConfigurations,
       individualForms,
-      (problems == null ? void 0 : problems.remediationActions) ? Object.values(problems == null ? void 0 : problems.remediationActions) : [],
-      (problems == null ? void 0 : problems.missingData) ?? [],
+      problems?.remediationActions ? Object.values(problems?.remediationActions) : [],
+      problems?.missingData ?? [],
       legalEntityResponse ? getFieldsWithExistingData(
         legalEntityResponse,
         individualApiKeyMapping,
@@ -641,12 +851,12 @@ function IndividualDropin({
       fieldsFromCustomRules,
       {},
       {},
-      legalEntityResponse == null ? void 0 : legalEntityResponse.type,
+      legalEntityResponse?.type,
       [],
       true
     );
     const updatedDerivedProps = mandateIdVerificationForMotionCapture(
-      (_a2 = showIndividualMotionCapture) == null ? void 0 : _a2.value,
+      showIndividualMotionCapture?.value,
       derivedProps2
     );
     setDerivedProps(updatedDerivedProps);
@@ -654,46 +864,41 @@ function IndividualDropin({
     fieldConfigurations,
     legalEntityResponse,
     fieldsFromCustomRules,
-    problems == null ? void 0 : problems.remediationActions,
-    problems == null ? void 0 : problems.missingData
+    problems?.remediationActions,
+    problems?.missingData
   ]);
   const forms = useMemo(() => {
-    var _a2;
     const formsWithUpdatedName = {
       ...individualForms,
       idDocument: {
         ...individualForms.idDocument,
-        formName: ((_a2 = data.idVerificationMethod) == null ? void 0 : _a2.idVerificationMethod) === "instantVerification" ? "instantVerification" : "idDocument"
+        formName: data.idVerificationMethod?.idVerificationMethod === "instantVerification" ? "instantVerification" : "idDocument"
       }
     };
     const requiredForms = getRequiredForms(
       formsWithUpdatedName,
-      derivedProps == null ? void 0 : derivedProps.requiredFields,
-      derivedProps == null ? void 0 : derivedProps.optionalFields
+      derivedProps?.requiredFields,
+      derivedProps?.optionalFields
     ).filter(
       // Prevent showing the ID verification method step when onfido is not enabled
-      (form2) => {
-        var _a3, _b2;
-        return form2.formId !== "idVerificationMethod" || ((_b2 = (_a3 = providerStatus == null ? void 0 : providerStatus.statuses) == null ? void 0 : _a3.idDocument) == null ? void 0 : _b2.enabled);
-      }
+      (form2) => form2.formId !== "idVerificationMethod" || providerStatus?.statuses?.idDocument?.enabled
     );
     return addValidityToForms(requiredForms, form.isValid, problems);
   }, [
     derivedProps,
     form.isValid,
     problems,
-    (_d = (_c = providerStatus == null ? void 0 : providerStatus.statuses) == null ? void 0 : _c.idDocument) == null ? void 0 : _d.enabled,
-    (_e = data.idVerificationMethod) == null ? void 0 : _e.idVerificationMethod
+    providerStatus?.statuses?.idDocument?.enabled,
+    data.idVerificationMethod?.idVerificationMethod
   ]);
   if (isRoleFieldNeeded && parentLegalEntity) {
     roleTypes = getAllowedDecisionMakerRoles(parentLegalEntity, taskType);
   }
   useEffect(() => {
-    var _a2;
-    if (!((_a2 = legalEntityResponse == null ? void 0 : legalEntityResponse.documentDetails) == null ? void 0 : _a2.length)) return;
-    documentUtils.fetchDocuments(legalEntityResponse.documentDetails, legalEntityResponse == null ? void 0 : legalEntityResponse.id).then((res) => {
+    if (!legalEntityResponse?.documentDetails?.length) return;
+    documentUtils.fetchDocuments(legalEntityResponse.documentDetails, legalEntityResponse?.id).then((res) => {
       setExistingAttachments(res[0].attachments);
-      setDocuments(mapApiDocumentToIndividualDocuments(legalEntityResponse == null ? void 0 : legalEntityResponse.id));
+      setDocuments(mapApiDocumentToIndividualDocuments(legalEntityResponse?.id));
     }).catch(() => {
       showToast({ label: i18n.get("failedToFetchRelevantDocuments"), variant: "error" });
     });
@@ -706,9 +911,8 @@ function IndividualDropin({
     legalEntity,
     idDocumentType
   }) => {
-    var _a2, _b2, _c2;
     let updatedLegalEntity;
-    const leId = (legalEntityResponse == null ? void 0 : legalEntityResponse.id) || (newDecisionMaker == null ? void 0 : newDecisionMaker.id);
+    const leId = legalEntityResponse?.id || newDecisionMaker?.id;
     if (!leId) {
       updatedLegalEntity = await createLegalEntity(legalEntity);
       userEvents.addTaskEvent("Success", {
@@ -716,8 +920,8 @@ function IndividualDropin({
         actionType: "submit",
         legalEntityId: updatedLegalEntity.id,
         entityType: updatedLegalEntity.type,
-        countryOfRegistration: ((_a2 = dataSubmitted.personalDetails) == null ? void 0 : _a2.residencyCountry) || null,
-        roles: ((_b2 = dataSubmitted.personalDetails) == null ? void 0 : _b2.role) || null
+        countryOfRegistration: dataSubmitted.personalDetails?.residencyCountry || null,
+        roles: dataSubmitted.personalDetails?.role || null
       });
     } else {
       const patchLegalEntity = { ...drop("type").from(legalEntity), id: leId };
@@ -727,7 +931,7 @@ function IndividualDropin({
         actionType: "submit",
         legalEntityId: updatedLegalEntity.id,
         entityType: updatedLegalEntity.type,
-        countryOfRegistration: ((_c2 = dataSubmitted.personalDetails) == null ? void 0 : _c2.residencyCountry) || null,
+        countryOfRegistration: dataSubmitted.personalDetails?.residencyCountry || null,
         documentType: idDocumentType || null
       });
     }
@@ -749,10 +953,9 @@ function IndividualDropin({
     legalEntity,
     dataSubmitted
   }) => {
-    var _a2, _b2, _c2, _d2;
     if (!isDocumentsRequired(forms2)) return;
-    if ((_a2 = dataSubmitted.idDocument) == null ? void 0 : _a2.instantIdVerificationData) {
-      if (((_c2 = (_b2 = providerStatus == null ? void 0 : providerStatus.statuses) == null ? void 0 : _b2.idDocument) == null ? void 0 : _c2.enabled) === false) {
+    if (dataSubmitted.idDocument?.instantIdVerificationData) {
+      if (providerStatus?.statuses?.idDocument?.enabled === false) {
         throw new Error("Provider unexpectedly disabled instant verification flow");
       }
       await handleInstantIdVerificationStartCheck(
@@ -765,7 +968,7 @@ function IndividualDropin({
         legalEntity.id
       );
       if (!formattedDocuments || formattedDocuments.length === 0) {
-        if (existingAttachments == null ? void 0 : existingAttachments.length)
+        if (existingAttachments?.length)
           logger$4.log(
             "User has already uploaded documents and is not changing them, nothing needs to be done"
           );
@@ -777,26 +980,24 @@ function IndividualDropin({
       }
       formattedDocuments[0].attachments = mergeAttachments(
         existingAttachments ?? [],
-        ((_d2 = formattedDocuments[0]) == null ? void 0 : _d2.attachments) ?? []
+        formattedDocuments[0]?.attachments ?? []
       ).filter((attachment) => attachment.content);
       const uploadedDocuments = await documentUtils.uploadDocuments(
         formattedDocuments,
         legalEntity.id
       );
-      uploadedDocuments == null ? void 0 : uploadedDocuments.forEach((doc) => {
-        var _a3;
+      uploadedDocuments?.forEach((doc) => {
         userEvents.addTaskEvent("Success", {
           ...associatedLeTrackingParams,
           actionType: "upload",
           documentType: doc.type,
-          fileExtention: ((_a3 = doc == null ? void 0 : doc.attachments) == null ? void 0 : _a3.map((item) => getFileExtention(item.pageName ?? ""))) ?? null
+          fileExtention: doc?.attachments?.map((item) => getFileExtention(item.pageName ?? "")).filter((item) => item !== void 0) ?? null
         });
       });
     }
   };
   const hasRolesChanged = (legalEntity, existingEntityAssociations, newRoles) => {
-    var _a2;
-    const existingRoles = (_a2 = existingEntityAssociations == null ? void 0 : existingEntityAssociations.filter((ea) => ea.legalEntityId === legalEntity.id)) == null ? void 0 : _a2.map(({ type }) => type);
+    const existingRoles = existingEntityAssociations?.filter((ea) => ea.legalEntityId === legalEntity.id)?.map(({ type }) => type);
     return !doArraysMatch(existingRoles, newRoles);
   };
   const attachAssociationToParentLegalEntity = async ({
@@ -804,22 +1005,18 @@ function IndividualDropin({
     parentLE,
     dataSubmitted
   }) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2;
-    const newRoles = taskType === TaskTypes.DECISION_MAKER || taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER || taskType === TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER ? (_a2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _a2.role : taskType === TaskTypes.TRUST_MEMBER_INDIVIDUAL || taskType === TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_INDIVIDUAL ? trustMember == null ? void 0 : trustMember.roles : null;
+    const newRoles = taskType === TaskTypes.DECISION_MAKER || taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER || taskType === TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER ? dataSubmitted?.personalDetails?.role : taskType === TaskTypes.TRUST_MEMBER_INDIVIDUAL || taskType === TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_INDIVIDUAL ? trustMember?.roles : null;
     const existingEntityAssociations = getOwnEntityAssociations(parentLE);
-    if (newRoles && (hasRolesChanged(legalEntity, existingEntityAssociations, newRoles) || ((_b2 = dataFromResponse.personalDetails) == null ? void 0 : _b2.jobTitle) !== ((_c2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _c2.jobTitle) || hasNomineesChanged(dataFromResponse.personalDetails, dataSubmitted.personalDetails))) {
+    if (newRoles && (hasRolesChanged(legalEntity, existingEntityAssociations, newRoles) || dataFromResponse.personalDetails?.jobTitle !== dataSubmitted?.personalDetails?.jobTitle || hasNomineesChanged(dataFromResponse.personalDetails, dataSubmitted.personalDetails))) {
       const updatedParentLegalEntity = {
         entityAssociations: [
-          ...newRoles.map((role) => {
-            var _a3;
-            return {
-              type: role,
-              legalEntityId: legalEntity.id,
-              ...DECISION_MAKER_TYPES_WITH_JOBTITLE$1.some((type) => type === role) && {
-                jobTitle: (_a3 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _a3.jobTitle
-              }
-            };
-          }) || [],
+          ...newRoles.map((role) => ({
+            type: role,
+            legalEntityId: legalEntity.id,
+            ...DECISION_MAKER_TYPES_WITH_JOBTITLE$1.some((type) => type === role) && {
+              jobTitle: dataSubmitted?.personalDetails?.jobTitle
+            }
+          })) || [],
           ...existingEntityAssociations.filter((ea) => ea.legalEntityId !== legalEntity.id) || []
         ]
       };
@@ -830,11 +1027,11 @@ function IndividualDropin({
       }
       await updateLegalEntity({ ...updatedParentLegalEntity, id: parentLE.id });
     }
-    if (taskType === TaskTypes.LEGAL_REPRESENTATIVE_DETAILS && (existingEntityAssociations.every((ea) => ea.legalEntityId !== legalEntity.id) || ((_d2 = dataFromResponse == null ? void 0 : dataFromResponse.personalDetails) == null ? void 0 : _d2.relationship) !== ((_e2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _e2.relationship))) {
+    if (taskType === TaskTypes.LEGAL_REPRESENTATIVE_DETAILS && (existingEntityAssociations.every((ea) => ea.legalEntityId !== legalEntity.id) || dataFromResponse?.personalDetails?.relationship !== dataSubmitted?.personalDetails?.relationship)) {
       const newEntityAssociation = {
         type: "legalRepresentative",
         legalEntityId: legalEntity.id,
-        relationship: (_f2 = dataSubmitted == null ? void 0 : dataSubmitted.personalDetails) == null ? void 0 : _f2.relationship
+        relationship: dataSubmitted?.personalDetails?.relationship
       };
       const updatedParentLegalEntity = {
         entityAssociations: [newEntityAssociation, ...existingEntityAssociations]
@@ -843,7 +1040,6 @@ function IndividualDropin({
     }
   };
   const onSubmit = async () => {
-    var _a2;
     setLoadingStatus("loading");
     const dataSubmitted = omitObscuredFieldsIfUnchanged(
       individualObscuredFields,
@@ -855,12 +1051,9 @@ function IndividualDropin({
     }
     try {
       const legalEntity = mapIndividualToLegalEntity(dataSubmitted);
-      const idDocumentType = (_a2 = idDocumentTypeOptions.find(
-        ({ id }) => {
-          var _a3;
-          return ((_a3 = dataSubmitted == null ? void 0 : dataSubmitted.idDocument) == null ? void 0 : _a3.idDocumentType) === id;
-        }
-      )) == null ? void 0 : _a2.id;
+      const idDocumentType = idDocumentTypeOptions.find(
+        ({ id }) => dataSubmitted?.idDocument?.idDocumentType === id
+      )?.id;
       legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(
         taskType,
         legalEntityResponse,
@@ -882,7 +1075,7 @@ function IndividualDropin({
       }
       setLoadingStatus("success");
       clearToasts();
-      externalOnSubmit == null ? void 0 : externalOnSubmit(dataSubmitted);
+      externalOnSubmit?.(dataSubmitted);
     } catch (e) {
       logger$4.error("Failed to update individual", e);
       if (isValidationError(e)) {
@@ -907,18 +1100,14 @@ function IndividualDropin({
   };
   const isDocumentsRequired = (forms2) => forms2.some((form2) => individualDocumentForms.includes(form2.formId));
   const datasetUtils = datasetUtilities(i18n.locale);
-  const formatIdDocument = (idDocument) => {
-    var _a2, _b2;
-    if (!idDocument) return void 0;
-    const documentType = (idDocument == null ? void 0 : idDocument.instantIdVerificationData) ? onfidoDocumentTypeMapping.find(
-      (document) => {
-        var _a3;
-        return ((_a3 = idDocument.instantIdVerificationData) == null ? void 0 : _a3.document_front.type) === document.id;
-      }
-    ) : idDocumentTypeOptions.find(({ id }) => idDocument.idDocumentType === id);
+  const formatIdDocument = (idDocument2) => {
+    if (!idDocument2) return void 0;
+    const documentType = idDocument2?.instantIdVerificationData ? onfidoDocumentTypeMapping.find(
+      (document) => idDocument2.instantIdVerificationData?.document_front.type === document.id
+    ) : idDocumentTypeOptions.find(({ id }) => idDocument2.idDocumentType === id);
     if (!documentType) return void 0;
-    const frontPage = (_a2 = idDocument.idFrontPage) == null ? void 0 : _a2[0];
-    const backPage = (_b2 = idDocument.idBackPage) == null ? void 0 : _b2[0];
+    const frontPage = idDocument2.idFrontPage?.[0];
+    const backPage = idDocument2.idBackPage?.[0];
     if (!frontPage) return void 0;
     return {
       documentType: i18n.get(documentType.name),
@@ -931,18 +1120,17 @@ function IndividualDropin({
     };
   };
   const formatFileSummaryData = ({
-    idDocument,
+    idDocument: idDocument2,
     proofOfNationalId,
     proofOfResidency,
     proofOfRelationship
   }) => {
-    var _a2, _b2, _c2;
-    const proofOfNationalIdFile = (_a2 = proofOfNationalId == null ? void 0 : proofOfNationalId.proofOfNationalId) == null ? void 0 : _a2[0];
-    const proofOfResidencyFile = (_b2 = proofOfResidency == null ? void 0 : proofOfResidency.proofOfResidency) == null ? void 0 : _b2[0];
-    const proofOfRelationshipFile = (_c2 = proofOfRelationship == null ? void 0 : proofOfRelationship.proofOfRelationship) == null ? void 0 : _c2[0];
+    const proofOfNationalIdFile = proofOfNationalId?.proofOfNationalId?.[0];
+    const proofOfResidencyFile = proofOfResidency?.proofOfResidency?.[0];
+    const proofOfRelationshipFile = proofOfRelationship?.proofOfRelationship?.[0];
     return {
-      ...((idDocument == null ? void 0 : idDocument.idDocumentType) || (idDocument == null ? void 0 : idDocument.instantIdVerificationData)) && {
-        idDocument: formatIdDocument(idDocument)
+      ...(idDocument2?.idDocumentType || idDocument2?.instantIdVerificationData) && {
+        idDocument: formatIdDocument(idDocument2)
       },
       ...proofOfNationalIdFile && {
         proofOfNationalId: {
@@ -962,14 +1150,13 @@ function IndividualDropin({
     };
   };
   const formatDataForSummary = () => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g, _h;
     let summaryData = cloneObject(data);
-    if ((_a2 = summaryData.personalDetails) == null ? void 0 : _a2.residencyCountry) {
+    if (summaryData.personalDetails?.residencyCountry) {
       summaryData.personalDetails.residencyCountry = datasetUtils.getCountryName(
         summaryData.personalDetails.residencyCountry
       );
     }
-    if ((_b2 = summaryData.personalDetails) == null ? void 0 : _b2.nationality) {
+    if (summaryData.personalDetails?.nationality) {
       summaryData.personalDetails.nationality = datasetUtils.getCountryName(
         summaryData.personalDetails.nationality
       );
@@ -981,27 +1168,24 @@ function IndividualDropin({
       individualDocumentForms.forEach((formId) => delete summaryData[formId]);
       summaryData = { ...summaryData, ...formatFileSummaryData(data) };
     }
-    if ((_c2 = summaryData.personalDetails) == null ? void 0 : _c2.accountHolder) {
+    if (summaryData.personalDetails?.accountHolder) {
       summaryData.personalDetails.accountHolder = i18n.get(
         summaryData.personalDetails.accountHolder
       );
     }
-    if ((_d2 = summaryData.personalDetails) == null ? void 0 : _d2.birthDate) {
+    if (summaryData.personalDetails?.birthDate) {
       summaryData.personalDetails.birthDate = localizeDateString(
         summaryData.personalDetails.birthDate,
         i18n.locale
       );
     }
-    if ((_e2 = summaryData.personalDetails) == null ? void 0 : _e2.phoneNumber) {
+    if (summaryData.personalDetails?.phoneNumber) {
       delete summaryData.personalDetails.phoneNumber;
-      summaryData.personalDetails.phoneNumber = (_g = (_f2 = data.personalDetails) == null ? void 0 : _f2.phoneNumber) == null ? void 0 : _g.number;
+      summaryData.personalDetails.phoneNumber = data.personalDetails?.phoneNumber?.number;
     }
-    if ((_h = summaryData.personalDetails) == null ? void 0 : _h.taxInformation) {
+    if (summaryData.personalDetails?.taxInformation) {
       const taxInformation = summaryData.personalDetails.taxInformation.find(
-        (taxId) => {
-          var _a3;
-          return taxId.country === ((_a3 = data.personalDetails) == null ? void 0 : _a3.nationality);
-        }
+        (taxId) => taxId.country === data.personalDetails?.nationality
       );
       if (taxInformation) {
         delete summaryData.personalDetails.taxInformation;
@@ -1012,7 +1196,7 @@ function IndividualDropin({
   };
   const summaryOmittedKeys = [
     ...taskType === TaskTypes.DECISION_MAKER ? ["role"] : [],
-    ...((_f = data == null ? void 0 : data.personalDetails) == null ? void 0 : _f.idNumberExempt) ? ["idNumber"] : []
+    ...data?.personalDetails?.idNumberExempt ? ["idNumber"] : []
   ];
   const {
     handleNextClick,
@@ -1073,7 +1257,7 @@ function IndividualDropin({
           onNext: handleNextClick,
           onBack: handleBackClick,
           setHideFooter,
-          legalEntityId: legalEntityResponse == null ? void 0 : legalEntityResponse.id,
+          legalEntityId: legalEntityResponse?.id,
           allowedRoles: roleTypes,
           shouldValidate,
           accountHolder,
@@ -1128,59 +1312,120 @@ const additionalPersonalDetailsValidators = ({
   formVerificationErrors,
   i18n,
   taxIdNumberType
-}) => {
-  var _a;
-  return {
-    taxInformation: (_a = resolveFieldMetadata(
-      defaultFieldConfig$1[country],
-      {
-        taxIdNumberType,
-        companyType: LegalEntityType.INDIVIDUAL
-      },
-      defaultFieldMetadata$2
-    )) == null ? void 0 : _a.validators,
-    birthDate: (() => {
-      const baseValidators = [isNotOutOfRangeBirthDateValidatorRule];
-      if (isSettingEnabled("enforceLegalAge")) {
+}) => ({
+  taxInformation: resolveFieldMetadata(
+    taxInformationDefaultFieldConfig[country],
+    {
+      taxIdNumberType,
+      companyType: LegalEntityType.INDIVIDUAL
+    },
+    taxInformationDefaultFieldMetadata
+  )?.validators,
+  birthDate: (() => {
+    const baseValidators = [isNotOutOfRangeBirthDateValidatorRule];
+    if (isSettingEnabled("enforceLegalAge")) {
+      return [...baseValidators, buildMinimumAgeValidationRule(18)];
+    }
+    if (isExperimentEnabled("EnableAgeVerification")) {
+      if (taskType === TaskTypes.LEGAL_REPRESENTATIVE_DETAILS) {
         return [...baseValidators, buildMinimumAgeValidationRule(18)];
       }
-      if (isExperimentEnabled("EnableAgeVerification")) {
-        if (taskType === TaskTypes.LEGAL_REPRESENTATIVE_DETAILS) {
-          return [...baseValidators, buildMinimumAgeValidationRule(18)];
-        }
-        return [...baseValidators, getCountrySpecificMinimumAgeValidationRule(country)];
-      }
-      return baseValidators;
-    })(),
-    ...isExperimentEnabled("StrictNameAndAddressValidationV4") ? nameValidationRulesV4 : void 0,
-    ...contactDetailsValidationRules,
-    idNumber: (() => {
-      var _a2;
-      const derivedIdNumberType = country === CountryCodes.UnitedStates ? getSSNType(formVerificationErrors, existingIdNumber) : idNumberType;
-      return idNumberExempt ? {
-        validate: () => {
-          return idNumberExempt || !isEmpty(idNumber);
-        },
-        modes: ["blur"]
-      } : (_a2 = resolveFieldMetadata(
-        defaultFieldConfig[country],
-        { idNumberType: derivedIdNumberType },
-        defaultFieldMetadata
-      )) == null ? void 0 : _a2.validators;
-    })(),
-    ...addressValidators({
-      isExperimentEnabled,
-      country,
-      i18n
-    })
-  };
-};
+      return [...baseValidators, getCountrySpecificMinimumAgeValidationRule(country)];
+    }
+    return baseValidators;
+  })(),
+  ...isExperimentEnabled("StrictNameAndAddressValidationV4") ? nameValidationRulesV4 : void 0,
+  ...contactDetailsValidationRules,
+  idNumber: (() => {
+    const derivedIdNumberType = country === CountryCodes.UnitedStates ? getSSNType(formVerificationErrors, existingIdNumber) : idNumberType;
+    return idNumberExempt ? {
+      validate: () => {
+        return idNumberExempt || !isEmpty(idNumber);
+      },
+      modes: ["blur"]
+    } : resolveFieldMetadata(
+      defaultFieldConfig[country],
+      { idNumberType: derivedIdNumberType },
+      defaultFieldMetadata
+    )?.validators;
+  })(),
+  ...addressValidators({
+    isExperimentEnabled,
+    country,
+    i18n
+  })
+});
 const basicDetailsValidators = ({
   isExperimentEnabled = () => false
 }) => ({
   ...contactDetailsValidationRules,
   ...isExperimentEnabled("StrictNameAndAddressValidationV4") ? nameValidationRulesV4 : void 0
 });
+const guidanceQuestion = "adyen-kyc-guidance-question";
+const options = "adyen-kyc-options";
+const styles$6 = {
+  guidanceQuestion,
+  options
+};
+var GuidanceQuestionValues = /* @__PURE__ */ ((GuidanceQuestionValues2) => {
+  GuidanceQuestionValues2["YES"] = "Yes";
+  GuidanceQuestionValues2["NO"] = "No";
+  return GuidanceQuestionValues2;
+})(GuidanceQuestionValues || {});
+const GuidanceQuestion = (props) => {
+  const {
+    descriptionLinkText,
+    errorMessage,
+    name,
+    noLabel,
+    onChange,
+    onDescriptionLinkClick,
+    question,
+    value,
+    yesLabel
+  } = props;
+  const { i18n } = useI18nContext();
+  const userEvents = useAnalyticsContext();
+  const handleChange = (selectedValue) => {
+    userEvents.addFieldEvent("Interacted with form field", {
+      actionType: "select",
+      field: name,
+      returnValue: selectedValue
+    });
+    const newValue = selectedValue || null;
+    onChange(newValue);
+  };
+  const yesTileLabel = yesLabel ?? i18n.get("yes");
+  const noTileLabel = noLabel ?? i18n.get("no");
+  return /* @__PURE__ */ jsxs("div", { className: styles$6.guidanceQuestion, children: [
+    /* @__PURE__ */ jsx(Typography, { variant: "body", el: "p", children: question }),
+    descriptionLinkText && onDescriptionLinkClick && /* @__PURE__ */ jsx(Button, { variant: "link", onClick: onDescriptionLinkClick, children: descriptionLinkText }),
+    /* @__PURE__ */ jsx(Field, { name, className: styles$6.options, children: () => /* @__PURE__ */ jsx(
+      TileGroup,
+      {
+        allowMultiple: false,
+        errorMessage,
+        isHorizontal: true,
+        maxSelected: 1,
+        name,
+        onChange: handleChange,
+        selected: value || "",
+        tiles: [
+          {
+            label: yesTileLabel,
+            value: "Yes"
+            /* YES */
+          },
+          {
+            label: noTileLabel,
+            value: "No"
+            /* NO */
+          }
+        ]
+      }
+    ) })
+  ] });
+};
 const areArraysDifferent = (a = [], b = []) => {
   if (a.length !== b.length) {
     return true;
@@ -1190,22 +1435,21 @@ const areArraysDifferent = (a = [], b = []) => {
   return sortedA.some((item, index) => item !== sortedB[index]);
 };
 const calculateRoles = (data) => {
-  var _a, _b, _c, _d;
   const roleMappings = [
     {
-      isApplicable: ((_a = data == null ? void 0 : data.signatoryQuestionnaire) == null ? void 0 : _a.isSignatory) === "yes",
+      isApplicable: data?.signatoryQuestionnaire?.isSignatory === GuidanceQuestionValues.YES,
       role: DecisionMakerType.SIGNATORY
     },
     {
-      isApplicable: ((_b = data == null ? void 0 : data.uboQuestionnaire) == null ? void 0 : _b.isOwner) === "yes",
+      isApplicable: data?.uboQuestionnaire?.isOwner === GuidanceQuestionValues.YES,
       role: DecisionMakerType.OWNER
     },
     {
-      isApplicable: ((_c = data == null ? void 0 : data.uboQuestionnaire) == null ? void 0 : _c.isControllingPerson) === "yes",
+      isApplicable: data?.uboQuestionnaire?.isControllingPerson === GuidanceQuestionValues.YES,
       role: DecisionMakerType.CONTROLLING_PERSON
     },
     {
-      isApplicable: ((_d = data == null ? void 0 : data.uboQuestionnaire) == null ? void 0 : _d.isDirector) === "yes",
+      isApplicable: data?.uboQuestionnaire?.isDirector === GuidanceQuestionValues.YES,
       role: DecisionMakerType.DIRECTOR
     }
   ];
@@ -1249,13 +1493,15 @@ const DECISION_MAKER_TYPES_WITH_JOBTITLE = [
   DecisionMakerType.SIGNATORY,
   DecisionMakerType.CONTROLLING_PERSON
 ];
+const ID_MISSING_DATA_ERROR_CODE = "2_8071";
 const individualOnfidoRules = ({
   matchingScenario,
   data,
   country,
   taskType,
   isExperimentEnabled = () => false,
-  rootLegalEntity
+  rootLegalEntity,
+  problems
 }) => createFormRules({
   countryUsesTaxId: () => {
     if (isExperimentEnabled("EnableTaxIdRequiredForBusinessAccountsScenarios") && TAX_ID_REQUIRED_COUNTRIES.includes(country)) {
@@ -1264,29 +1510,30 @@ const individualOnfidoRules = ({
     return void 0;
   },
   isDirectorIdNumberRequiredForCountry: () => {
-    var _a, _b, _c, _d, _e;
-    if (!((_a = data.basicDetails) == null ? void 0 : _a.role)) {
+    if (!data.basicDetails?.role) {
       return REQUIRED;
     }
-    if ((_c = (_b = data.basicDetails) == null ? void 0 : _b.role) == null ? void 0 : _c.some((role) => role !== DecisionMakerType.DIRECTOR)) {
+    if (data.basicDetails?.role?.some((role) => role !== DecisionMakerType.DIRECTOR)) {
       return REQUIRED;
     }
-    if (ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES.includes(country) && ((_e = (_d = data.basicDetails) == null ? void 0 : _d.role) == null ? void 0 : _e.some((role) => role === DecisionMakerType.DIRECTOR))) {
+    if (ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES.includes(country) && data.basicDetails?.role?.some((role) => role === DecisionMakerType.DIRECTOR)) {
       return REQUIRED;
     }
   },
   idNumberRules: () => {
-    var _a, _b, _c, _d, _e, _f;
-    if ((_a = data.additionalPersonalDetails) == null ? void 0 : _a.idNumberExempt) {
+    if (data.additionalPersonalDetails?.idNumberExempt) {
       return OPTIONAL;
     }
-    if (!((_b = data.basicDetails) == null ? void 0 : _b.role)) {
+    if (!data.basicDetails?.role) {
       return REQUIRED;
     }
-    if ((_d = (_c = data.basicDetails) == null ? void 0 : _c.role) == null ? void 0 : _d.some((role) => role !== DecisionMakerType.DIRECTOR)) {
+    if (country === CountryCodes.UnitedStates && data.basicDetails?.role?.every((role) => role === DecisionMakerType.SIGNATORY)) {
+      return void 0;
+    }
+    if (data.basicDetails?.role?.some((role) => role !== DecisionMakerType.DIRECTOR)) {
       return REQUIRED;
     }
-    if (ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES.includes(country) && ((_f = (_e = data.basicDetails) == null ? void 0 : _e.role) == null ? void 0 : _f.some((role) => role === DecisionMakerType.DIRECTOR))) {
+    if (ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES.includes(country) && data.basicDetails?.role?.some((role) => role === DecisionMakerType.DIRECTOR)) {
       return REQUIRED;
     }
   },
@@ -1296,7 +1543,10 @@ const individualOnfidoRules = ({
     }
   },
   idNumberExemptIfApplicableCountry: () => {
-    if (isExperimentEnabled("EnableTaxIdRequiredForBusinessAccountsScenarios") && (matchingScenario == null ? void 0 : matchingScenario.includes(Scenarios.L_TAXINFO))) {
+    if (isExperimentEnabled("EnableTaxIdRequiredForBusinessAccountsScenarios") && matchingScenario?.includes(Scenarios.L_TAXINFO)) {
+      return void 0;
+    }
+    if (country === CountryCodes.UnitedStates && data.basicDetails?.role?.every((role) => role === DecisionMakerType.SIGNATORY)) {
       return void 0;
     }
     if (ID_NUMBER_EXEMPT_COUNTRIES.includes(country)) {
@@ -1304,30 +1554,25 @@ const individualOnfidoRules = ({
     }
   },
   hasChosenIdType: () => {
-    var _a;
-    return ((_a = data == null ? void 0 : data.manualIdUpload) == null ? void 0 : _a.idDocumentType) ? REQUIRED : void 0;
+    return data?.manualIdUpload?.idDocumentType ? REQUIRED : void 0;
   },
   backPageIfRequiredForIdType: () => {
     const idDocumentTypeOptions = getLocalizedIdDocumentTypeOptions(country);
     const idDocumentOption = idDocumentTypeOptions.find(
-      ({ id }) => {
-        var _a;
-        return id === ((_a = data.manualIdUpload) == null ? void 0 : _a.idDocumentType);
-      }
+      ({ id }) => id === data.manualIdUpload?.idDocumentType
     );
-    return (idDocumentOption == null ? void 0 : idDocumentOption.hasBackPage) ? REQUIRED : void 0;
+    return idDocumentOption?.hasBackPage ? REQUIRED : void 0;
   },
   isProofOfResidencyRequired: () => {
-    var _a, _b, _c, _d, _e, _f;
-    if ((_b = (_a = data.proofOfResidency) == null ? void 0 : _a.proofOfResidency) == null ? void 0 : _b.length) {
+    if (data.proofOfResidency?.proofOfResidency?.length) {
       return REQUIRED;
     }
-    const isInstantFlow = ((_c = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _c.idVerificationMethod) === "instantVerification";
+    const isInstantFlow = data?.idVerificationMethod?.idVerificationMethod === "instantVerification";
     if (!isInstantFlow) {
       return void 0;
     }
-    const documentCountry = (_e = (_d = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _d.idDocument) == null ? void 0 : _e.documentCountry;
-    const residenceCountry = ((_f = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _f.country) ?? country;
+    const documentCountry = data?.idVerificationMethod?.idDocument?.documentCountry;
+    const residenceCountry = data?.additionalPersonalDetails?.country ?? country;
     if (!documentCountry || !residenceCountry) {
       return void 0;
     }
@@ -1338,15 +1583,13 @@ const individualOnfidoRules = ({
     }
   },
   isProofOfNationalIdRequired: () => {
-    var _a, _b;
-    if ((_b = (_a = data.proofOfNationalId) == null ? void 0 : _a.proofOfNationalId) == null ? void 0 : _b.length) {
+    if (data.proofOfNationalId?.proofOfNationalId?.length) {
       return REQUIRED;
     }
   },
   contactsIfRequiredForRole: () => {
-    var _a, _b;
     if (taskType === TaskTypes.DECISION_MAKER) {
-      if ((_b = (_a = data.basicDetails) == null ? void 0 : _a.role) == null ? void 0 : _b.includes(DecisionMakerType.SIGNATORY)) {
+      if (data.basicDetails?.role?.includes(DecisionMakerType.SIGNATORY)) {
         return REQUIRED;
       }
       return;
@@ -1355,22 +1598,20 @@ const individualOnfidoRules = ({
   },
   requiredIfPhoneScenarioDisabled: () => !isExperimentEnabled("EnablePhoneFieldScenario") ? REQUIRED : void 0,
   jobTitleIfRequiredForRole: () => {
-    var _a, _b;
     if (taskType !== TaskTypes.DECISION_MAKER) return;
-    if (((_b = (_a = data.basicDetails) == null ? void 0 : _a.role) == null ? void 0 : _b.some(
+    if (data.basicDetails?.role?.some(
       (role) => DECISION_MAKER_TYPES_WITH_JOBTITLE.includes(role)
-    )) || JOB_TITLE_REQUIRED_FOR_COUNTRIES.includes(country)) {
+    ) || JOB_TITLE_REQUIRED_FOR_COUNTRIES.includes(country)) {
       return REQUIRED;
     }
   },
   nationalityIfRequiredForRole: () => {
-    var _a;
     const enableNationalitySGHK = isExperimentEnabled("EnableNationalitySGHK");
-    const rootLegalEntityCountry = (_a = rootLegalEntity == null ? void 0 : rootLegalEntity.organization) == null ? void 0 : _a.registeredAddress.country;
+    const rootLegalEntityCountry = rootLegalEntity?.organization?.registeredAddress.country;
     if (enableNationalitySGHK && rootLegalEntityCountry && NATIONALITY_REQUIRED_FOR_COUNTRIES.includes(rootLegalEntityCountry)) {
       return REQUIRED;
     }
-    if (NATIONALITY_REQUIRED_FOR_COUNTRIES.includes(country)) {
+    if (NATIONALITY_REQUIRED_FOR_COUNTRIES.includes(country) || data?.additionalPersonalDetails?.nationality) {
       return REQUIRED;
     }
   },
@@ -1380,20 +1621,17 @@ const individualOnfidoRules = ({
     }
   },
   licenseCardNumberRules: () => {
-    var _a;
-    if (((_a = data.additionalPersonalDetails) == null ? void 0 : _a.typeOfIdentity) === "driversLicense" && LICENSE_CARD_NUMBER_REQUIRED_FOR_COUNTRIES.includes(country)) {
+    if (data.additionalPersonalDetails?.typeOfIdentity === "driversLicense" && LICENSE_CARD_NUMBER_REQUIRED_FOR_COUNTRIES.includes(country)) {
       return REQUIRED;
     }
   },
   issuerStateRequired: () => {
-    var _a;
-    if (((_a = data.additionalPersonalDetails) == null ? void 0 : _a.typeOfIdentity) === "driversLicense" && ISSUER_REQUIRED_FOR_COUNTRIES.includes(country)) {
+    if (data.additionalPersonalDetails?.typeOfIdentity === "driversLicense" && ISSUER_REQUIRED_FOR_COUNTRIES.includes(country)) {
       return REQUIRED;
     }
   },
   expiryDateRequired: () => {
-    var _a;
-    if (((_a = data.additionalPersonalDetails) == null ? void 0 : _a.typeOfIdentity) === "passport" && EXPIRY_DATE_REQUIRED_FOR_COUNTRIES.includes(country)) {
+    if (data.additionalPersonalDetails?.typeOfIdentity === "passport" && EXPIRY_DATE_REQUIRED_FOR_COUNTRIES.includes(country)) {
       return REQUIRED;
     }
   },
@@ -1401,64 +1639,69 @@ const individualOnfidoRules = ({
   isProofOfRelationshipRequired: () => void 0,
   // not required until more clarity from product
   addressIfRequiredForCountry: () => {
-    var _a;
-    const addressSchema = getAddressSchemaForCountry((_a = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a.country);
+    const addressSchema = getAddressSchemaForCountry(data?.additionalPersonalDetails?.country);
     return addressSchema.includes("address") ? "REQUIRED" : void 0;
   },
   otherAddressInfoIfRequiredForCountry: () => {
-    var _a;
-    const addressSchema = getAddressSchemaForCountry((_a = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a.country);
+    const addressSchema = getAddressSchemaForCountry(data?.additionalPersonalDetails?.country);
     return addressSchema.includes("otherAddressInformation") ? "OPTIONAL" : void 0;
   },
   postalCodeIfRequiredForCountry: () => {
-    var _a;
-    const addressSchema = getAddressSchemaForCountry((_a = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a.country);
+    const addressSchema = getAddressSchemaForCountry(data?.additionalPersonalDetails?.country);
     return addressSchema.includes("postalCode") ? "REQUIRED" : void 0;
   },
   cityIfRequiredForCountry: () => {
-    var _a;
-    const addressSchema = getAddressSchemaForCountry((_a = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a.country);
+    const addressSchema = getAddressSchemaForCountry(data?.additionalPersonalDetails?.country);
     return addressSchema.includes("city") ? "REQUIRED" : void 0;
   },
   stateOrProvinceIfRequiredForCountry: () => {
-    var _a, _b;
-    const addressSchema = getAddressSchemaForCountry((_a = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a.country);
-    return addressSchema.includes("stateOrProvince") && COUNTRIES_WITH_STATES_DATASET.includes(((_b = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _b.country) ?? country) ? "REQUIRED" : void 0;
+    const addressSchema = getAddressSchemaForCountry(data?.additionalPersonalDetails?.country);
+    return addressSchema.includes("stateOrProvince") && COUNTRIES_WITH_STATES_DATASET.includes(data?.additionalPersonalDetails?.country ?? country) ? "REQUIRED" : void 0;
   },
   nomineeDirectorRequiredForCountry: () => {
-    var _a, _b, _c;
-    if (allowedCountriesForNominee.includes(((_a = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a.country) ?? country) && ((_c = (_b = data == null ? void 0 : data.basicDetails) == null ? void 0 : _b.role) == null ? void 0 : _c.includes(DecisionMakerType.DIRECTOR))) {
+    if (allowedCountriesForNominee.includes(data?.additionalPersonalDetails?.country ?? country) && data?.basicDetails?.role?.includes(DecisionMakerType.DIRECTOR)) {
       return "REQUIRED";
     }
   },
   nomineeShareHolderRequiredForCountry: () => {
-    var _a, _b, _c;
-    if (allowedCountriesForNominee.includes(((_a = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a.country) ?? country) && ((_c = (_b = data == null ? void 0 : data.basicDetails) == null ? void 0 : _b.role) == null ? void 0 : _c.includes(DecisionMakerType.OWNER))) {
+    if (allowedCountriesForNominee.includes(data?.additionalPersonalDetails?.country ?? country) && data?.basicDetails?.role?.includes(DecisionMakerType.OWNER)) {
       return "REQUIRED";
     }
   },
   isUsingInstantVerificationOrHasExistingDocument: () => {
-    var _a, _b;
-    const isUsingInstantVerification = ((_a = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _a.idVerificationMethod) === "instantVerification";
-    const existingDocument = (_b = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _b.idDocument;
+    const isUsingInstantVerification = data?.idVerificationMethod?.idVerificationMethod === "instantVerification";
+    const existingDocument = data?.idVerificationMethod?.idDocument;
     return isUsingInstantVerification || existingDocument ? REQUIRED : void 0;
   },
   isManualIdFlow: () => {
-    var _a;
-    const isManualFlow = ((_a = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _a.idVerificationMethod) === "manualVerification";
+    const isManualFlow = data?.idVerificationMethod?.idVerificationMethod === "manualVerification";
     return isManualFlow ? "REQUIRED" : void 0;
   },
   isManualIdFlowAndNotProvidingIdNumber: () => {
-    var _a, _b;
-    const isManualFlow = ((_a = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _a.idVerificationMethod) === "manualVerification";
-    const idNumberExempt = (_b = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _b.idNumberExempt;
-    return isManualFlow && idNumberExempt ? "REQUIRED" : void 0;
+    const hasMissingId = problems?.missingData?.some(
+      (error) => error.code === ID_MISSING_DATA_ERROR_CODE
+    );
+    const isManualFlow = data?.idVerificationMethod?.idVerificationMethod === "manualVerification";
+    const idNumberExempt = data?.additionalPersonalDetails?.idNumberExempt;
+    return isManualFlow && (idNumberExempt || hasMissingId) ? "REQUIRED" : void 0;
+  },
+  isManualIdFlowAndHasMissingData: () => {
+    const hasMissingId = problems?.missingData?.some(
+      (error) => error.code === ID_MISSING_DATA_ERROR_CODE
+    );
+    const isManualFlow = data?.idVerificationMethod?.idVerificationMethod === "manualVerification";
+    return isManualFlow && hasMissingId ? "REQUIRED" : void 0;
   },
   idVerificationRequired: () => {
     return REQUIRED;
   },
   isGuidedDecisionMakersFlowEnabled: () => {
-    if (isExperimentEnabled("EnableGuidedDecisionMakersFlow") || isExperimentEnabled("DecisionMakersFlowOptimization_GuidedDecisionMakersFlow")) {
+    if (!isExperimentEnabled("DisableGuidedDecisionMakersFlow") && (isExperimentEnabled("EnableGuidedDecisionMakersFlow") || isExperimentEnabled("DecisionMakersFlowOptimization_GuidedDecisionMakersFlow"))) {
+      return "REQUIRED";
+    }
+  },
+  isGuidedDecisionMakersFlowDisabled: () => {
+    if (isExperimentEnabled("DisableGuidedDecisionMakersFlow") || !isExperimentEnabled("EnableGuidedDecisionMakersFlow") && !isExperimentEnabled("DecisionMakersFlowOptimization_GuidedDecisionMakersFlow")) {
       return "REQUIRED";
     }
   },
@@ -1470,6 +1713,11 @@ const individualOnfidoRules = ({
     if (isDirectorRequired) {
       return "REQUIRED";
     }
+  },
+  japaneseFirstAndLastNames: () => {
+    if (country === CountryCodes.Japan) {
+      return "REQUIRED";
+    }
   }
 });
 const TypeOfIdentity = ({
@@ -1524,7 +1772,6 @@ const identityValidationRules = (country) => {
   }
 };
 function Identity(props) {
-  var _a, _b, _c;
   const { additionalPersonalDetails, country, idNumberType, handleFieldChange } = props;
   const {
     data,
@@ -1576,7 +1823,7 @@ function Identity(props) {
   const mergedProps = useMemo(() => {
     const idNumberMetadata = resolveFieldMetadata(
       defaultFieldConfig[country],
-      { idNumberType: data == null ? void 0 : data.typeOfIdentity },
+      { idNumberType: data?.typeOfIdentity },
       defaultFieldMetadata
     );
     return mergeFieldMetadataIntoProps(
@@ -1588,21 +1835,21 @@ function Identity(props) {
         initialFormUtilProps
       )
     );
-  }, [country, data == null ? void 0 : data.typeOfIdentity, initialFormUtilProps, licenseCardNumberMetaData]);
+  }, [country, data?.typeOfIdentity, initialFormUtilProps, licenseCardNumberMetaData]);
   const { i18n } = useI18nContext();
   const formUtils = useMemo(() => createFormUtils(mergedProps, i18n), [mergedProps, i18n]);
   const { form } = useFormContext();
-  const defaultIdNumber = (_b = (_a = form == null ? void 0 : form.defaultData) == null ? void 0 : _a.additionalPersonalDetails) == null ? void 0 : _b.idNumber;
+  const defaultIdNumber = form?.defaultData?.additionalPersonalDetails?.idNumber;
   const ssnType = getSSNType(formVerificationErrors, defaultIdNumber);
   const today = /* @__PURE__ */ new Date();
   const maxExpiryDateSelection = new Date((/* @__PURE__ */ new Date()).setFullYear(today.getFullYear() + 10));
   const isCountryAustralia = country === CountryCodes.Australia;
   const isCountryNewZealand = country === CountryCodes.NewZealand;
   useEffect(() => {
-    if ((data == null ? void 0 : data.typeOfIdentity) === "nationalIdNumber") {
+    if (data?.typeOfIdentity === "nationalIdNumber") {
       handleFieldChange("typeOfIdentity")(void 0);
     }
-  }, [data == null ? void 0 : data.typeOfIdentity, handleFieldChange]);
+  }, [data?.typeOfIdentity, handleFieldChange]);
   if (!handleFieldChange) {
     return;
   }
@@ -1625,62 +1872,60 @@ function Identity(props) {
     /* @__PURE__ */ jsx(
       TypeOfIdentity,
       {
-        availableIdentityTypesOptions: (_c = additionallIdNumberOptions) == null ? void 0 : _c[country],
-        selectedIdentityType: data == null ? void 0 : data.typeOfIdentity,
+        availableIdentityTypesOptions: additionallIdNumberOptions?.[country],
+        selectedIdentityType: data?.typeOfIdentity,
         setSelectedIdentityType: handleFieldChange("typeOfIdentity"),
         label: formUtils.getLabel("typeOfIdentity"),
-        isValid: Boolean(valid == null ? void 0 : valid.typeOfIdentity),
+        isValid: Boolean(valid?.typeOfIdentity),
         errorMessage: formUtils.getErrorMessage("typeOfIdentity", errors, fieldValidationErrors)
       }
     ),
-    (isCountryAustralia || isCountryNewZealand) && (data == null ? void 0 : data.typeOfIdentity) === "passport" && /* @__PURE__ */ jsx(
+    (isCountryAustralia || isCountryNewZealand) && data?.typeOfIdentity === "passport" && /* @__PURE__ */ jsx(
       MaskedInput,
       {
         name: "idNumber",
         type: "text",
         label: formUtils.getLabel("idNumber", "idNumber"),
         formatGuidance: formUtils.getGuidanceText("idNumber"),
-        classNameModifiers: { field: ["idNumber"], input: ["idNumber"] },
         errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldValidationErrors),
         shouldValidate,
-        isValid: Boolean(valid == null ? void 0 : valid.idNumber),
+        isValid: Boolean(valid?.idNumber),
         "aria-required": formUtils.isRequiredField("idNumber"),
-        "aria-invalid": !(valid == null ? void 0 : valid.idNumber),
+        "aria-invalid": !valid?.idNumber,
         onBlur: handleFieldChange("idNumber", "blur"),
         readonly: formUtils.isReadOnly("idNumber"),
-        value: (data == null ? void 0 : data.idNumber) ?? "",
+        value: data?.idNumber ?? "",
         onInput: handleFieldChange("idNumber", "input"),
-        acceptObscuredValue: formUtils == null ? void 0 : formUtils.isObscured("idNumber"),
+        acceptObscuredValue: formUtils?.isObscured("idNumber"),
         ...formUtils.getMask("idNumber")
       }
     ),
-    isCountryNewZealand && (data == null ? void 0 : data.typeOfIdentity) === "passport" && /* @__PURE__ */ jsx(
+    isCountryNewZealand && data?.typeOfIdentity === "passport" && /* @__PURE__ */ jsx(
       Field,
       {
         name: "expiryDate",
         label: formUtils.getLabel("passportExpiryDate"),
-        classNameModifiers: ["expiryDate"],
         errorMessage: formUtils.getErrorMessage("expiryDate", errors, fieldValidationErrors),
-        isValid: valid == null ? void 0 : valid.expiryDate,
+        isValid: valid?.expiryDate,
         children: (childProps) => /* @__PURE__ */ jsx(
           InputDate,
           {
             ...childProps,
             name: "expiryDate",
-            value: data == null ? void 0 : data.expiryDate,
+            value: data?.expiryDate,
             placeholder: i18n.get("datePlaceholder"),
             readonly: formUtils.isReadOnly("expiryDate"),
             onInput: handleFieldChange("expiryDate", "input"),
             onBlur: handleFieldChange("expiryDate", "blur"),
             "aria-required": true,
-            "aria-invalid": !(valid == null ? void 0 : valid.expiryDate),
+            "aria-invalid": !valid?.expiryDate,
             min: formatDateObj(today),
             max: formatDateObj(maxExpiryDateSelection)
           }
         )
       }
     ),
-    (isCountryAustralia || isCountryNewZealand) && (data == null ? void 0 : data.typeOfIdentity) === "driversLicense" && /* @__PURE__ */ jsx(
+    (isCountryAustralia || isCountryNewZealand) && data?.typeOfIdentity === "driversLicense" && /* @__PURE__ */ jsx(
       DriversLicense,
       {
         country,
@@ -1692,9 +1937,9 @@ function Identity(props) {
         onCardNumberBlur: handleFieldChange("licenseCardNumber", "blur"),
         formUtils,
         isValid: {
-          idNumber: Boolean(valid == null ? void 0 : valid.idNumber),
-          licenseCardNumber: Boolean(valid == null ? void 0 : valid.licenseCardNumber),
-          issuerState: Boolean(valid == null ? void 0 : valid.issuerState)
+          idNumber: Boolean(valid?.idNumber),
+          licenseCardNumber: Boolean(valid?.licenseCardNumber),
+          issuerState: Boolean(valid?.issuerState)
         },
         errorMessages: {
           idNumber: formUtils.getErrorMessage("idNumber", errors, fieldValidationErrors),
@@ -1715,17 +1960,16 @@ function Identity(props) {
         type: "text",
         label: formUtils.getLabel("idNumber", "idNumber"),
         formatGuidance: formUtils.getGuidanceText("idNumber"),
-        classNameModifiers: { field: ["idNumber"], input: ["idNumber"] },
         errorMessage: formUtils.getErrorMessage("idNumber", errors, fieldValidationErrors),
         shouldValidate,
-        isValid: Boolean(valid == null ? void 0 : valid.idNumber),
+        isValid: Boolean(valid?.idNumber),
         "aria-required": formUtils.isRequiredField("idNumber"),
-        "aria-invalid": Boolean(!(valid == null ? void 0 : valid.idNumber)),
+        "aria-invalid": Boolean(!valid?.idNumber),
         onBlur: handleFieldChange("idNumber", "blur"),
         readonly: formUtils.isReadOnly("idNumber"),
-        value: (data == null ? void 0 : data.idNumber) ?? "",
+        value: data?.idNumber ?? "",
         onInput: handleFieldChange("idNumber", "input"),
-        acceptObscuredValue: formUtils == null ? void 0 : formUtils.isObscured("idNumber"),
+        acceptObscuredValue: formUtils?.isObscured("idNumber"),
         ...formUtils.getMask("idNumber")
       }
     )
@@ -1756,13 +2000,14 @@ const additionalPersonalDetailsFields = [
   ...addressFields,
   "taxInformation"
 ];
-const countriesRequiringNationality = [
-  CountryCodes.HongKong,
-  CountryCodes.Singapore
-];
 function AdditionalPersonalDetails(props) {
   const { i18n } = useI18nContext();
   const allowedCountries = useAllowedCountries();
+  const [showLegalRepresentativePrompt, setShowLegalRepresentativePrompt] = useState(false);
+  const { isSettingEnabled } = useSettingsContext();
+  const { isExperimentEnabled } = useExperimentsContext();
+  const isExperimentAgeVerificationEnabled = isExperimentEnabled("EnableAgeVerification");
+  const isSettingsEnforceLegalAgeEnabled = isSettingEnabled(SettingNames.EnforceLegalAge);
   const {
     country: defaultCountry,
     data,
@@ -1775,21 +2020,21 @@ function AdditionalPersonalDetails(props) {
     taskType,
     handleFieldChange
   } = props;
-  const country = (data == null ? void 0 : data.country) ?? defaultCountry;
+  const country = data?.country ?? defaultCountry;
   const isIndividual = taskType === TaskTypes.INDIVIDUAL;
   const showField = (fieldKeys) => fieldKeys.some((field) => formUtils.isRequiredField(field) || formUtils.isOptionalField(field));
   const [taxIdNumberType, setTaxIdNumberType] = useState(
-    getDefaultTaxIdNumberType(data == null ? void 0 : data.taxInformation, country, LegalEntityType.INDIVIDUAL)
+    getDefaultTaxIdNumberType(data?.taxInformation, country, LegalEntityType.INDIVIDUAL)
   );
   const mergedProps = mergeFieldMetadataIntoProps(
     "taxInformation",
     resolveFieldMetadata(
-      defaultFieldConfig$1[country],
+      taxInformationDefaultFieldConfig[country],
       {
         taxIdNumberType,
         companyType: LegalEntityType.INDIVIDUAL
       },
-      defaultFieldMetadata$2
+      taxInformationDefaultFieldMetadata
     ),
     props
   );
@@ -1803,6 +2048,13 @@ function AdditionalPersonalDetails(props) {
   if (!handleFieldChange) {
     return;
   }
+  const handleBirthDateChange = (event) => {
+    handleFieldChange("birthDate", "blur")(event);
+    if (isExperimentAgeVerificationEnabled && !isSettingsEnforceLegalAgeEnabled && isLegalRepresentativeNeeded(event.currentTarget.value, country, taskType)) {
+      setShowLegalRepresentativePrompt(true);
+    }
+  };
+  const isRootIndividual = taskType === TaskTypes.INDIVIDUAL;
   return /* @__PURE__ */ jsxs("form", { className: "adyen-kyc-individual__personal-details", "aria-describedby": "ariaErrorField", children: [
     /* @__PURE__ */ jsx(FormHeader, { heading }),
     /* @__PURE__ */ jsx(
@@ -1822,14 +2074,13 @@ function AdditionalPersonalDetails(props) {
       CountryField,
       {
         data: { country },
-        valid: { country: valid == null ? void 0 : valid.country },
+        valid: { country: valid?.country },
         errors: {
           country: formUtils.getErrorMessage("country", errors, fieldValidationErrors)
         },
         labels: { country: formUtils.getLabel("country") },
         readonly: formUtils.isReadOnly("country"),
-        allowedCountries,
-        classNameModifiers: ["country"],
+        allowedCountries: isRootIndividual ? allowedCountries : void 0,
         handleChangeFor: handleFieldChange
       }
     ),
@@ -1861,32 +2112,48 @@ function AdditionalPersonalDetails(props) {
       {
         name: "birthDate",
         label: formUtils.getLabel("birthDate"),
-        classNameModifiers: ["birthDate"],
         errorMessage: birthDateErrorMessage,
-        isValid: valid == null ? void 0 : valid.birthDate,
+        isValid: valid?.birthDate,
         children: (childProps) => /* @__PURE__ */ jsx(
           InputDate,
           {
             ...childProps,
             name: "birthDate",
-            value: data == null ? void 0 : data.birthDate,
+            value: data?.birthDate,
             placeholder: i18n.get("datePlaceholder"),
             readonly: formUtils.isReadOnly("birthDate"),
             onInput: handleFieldChange("birthDate", "input"),
-            onBlur: handleFieldChange("birthDate", "blur"),
+            onBlur: handleBirthDateChange,
             "aria-required": true,
-            "aria-invalid": !(valid == null ? void 0 : valid.birthDate),
+            "aria-invalid": !valid?.birthDate,
             max: formatDateObj(/* @__PURE__ */ new Date())
           }
         )
       }
     ),
+    showLegalRepresentativePrompt && /* @__PURE__ */ jsx(
+      Confirm,
+      {
+        title: i18n.get("legalRepresentativeForMinorIsRequired"),
+        description: i18n.get("becauseThisPersonIsUnderXYearsOld", {
+          values: { age: getAgeRangeForLegalRepresentative(country)?.max?.toString() ?? "" }
+        }),
+        onCancel: () => {
+          setShowLegalRepresentativePrompt(false);
+        },
+        confirmText: i18n.get("ok"),
+        cancelText: i18n.get("editDetails"),
+        onConfirm: () => {
+          setShowLegalRepresentativePrompt(false);
+        }
+      }
+    ),
     /* @__PURE__ */ jsx(
       IndividualIdNumberTypeSelector,
       {
         country,
         handleFieldChange: handleFieldChange("typeOfIdentity", "input"),
-        selected: data == null ? void 0 : data.typeOfIdentity
+        selected: data?.typeOfIdentity
       }
     ),
     /* @__PURE__ */ jsx(
@@ -1895,15 +2162,15 @@ function AdditionalPersonalDetails(props) {
         additionalPersonalDetails: props,
         country,
         errors,
-        idNumberType: data == null ? void 0 : data.typeOfIdentity,
+        idNumberType: data?.typeOfIdentity,
         handleFieldChange
       }
     ),
     showField(["taxInformation"]) && /* @__PURE__ */ jsx(
       TaxInformationField,
       {
-        data: { taxInformation: data == null ? void 0 : data.taxInformation },
-        valid: { taxInformation: valid == null ? void 0 : valid.taxInformation },
+        data: { taxInformation: data?.taxInformation },
+        valid: { taxInformation: valid?.taxInformation },
         errors: {
           taxInformation: formUtils.getErrorMessage(
             "taxInformation",
@@ -1913,7 +2180,6 @@ function AdditionalPersonalDetails(props) {
         },
         labels: formUtils.getFieldLabels(["taxInformation"]),
         mask: formUtils.getMask("taxInformation"),
-        helperText: formUtils.getFieldHelperText(["taxInformation"]),
         guidanceText: formUtils.getFieldGuidanceText(["taxInformation"]),
         readonly: formUtils.isReadOnly("taxInformation"),
         shouldValidate,
@@ -1923,21 +2189,21 @@ function AdditionalPersonalDetails(props) {
         companyType: LegalEntityType.INDIVIDUAL,
         taxIdNumberType,
         setTaxIdNumberType,
-        defaultData: data == null ? void 0 : data.taxInformation
+        defaultData: data?.taxInformation
       }
     ),
-    countriesRequiringNationality.includes(country) && formUtils.isRequiredField("nationality") && /* @__PURE__ */ jsx(
+    formUtils.isRequiredField("nationality") && /* @__PURE__ */ jsx(
       CountryField,
       {
-        data: { country: data == null ? void 0 : data.nationality },
-        valid: { country: valid == null ? void 0 : valid.nationality },
+        data: { country: data?.nationality },
+        valid: { country: valid?.nationality },
+        name: "nationality",
         errors: {
           country: formUtils.getErrorMessage("nationality", errors, fieldValidationErrors)
         },
         labels: { country: formUtils.getLabel("nationality") },
         readonly: formUtils.isReadOnly("nationality"),
-        classNameModifiers: ["nationality"],
-        handleChangeFor: handleFieldChange
+        handleChangeFor: () => handleFieldChange("nationality", "input")
       }
     ),
     country === "US" && isIndividual ? /* @__PURE__ */ jsx(PatriotActDisclosure, {}) : void 0
@@ -1949,16 +2215,20 @@ const basicDetailsFields = [
   ...decisionMakerRoleFields,
   ...nomineeFields,
   ...contactDetailFields,
-  "relationship"
+  "relationship",
+  "jaHaniFirstName",
+  "jaHaniLastName",
+  "jaKanaFirstName",
+  "jaKanaLastName"
 ];
 function BasicDetails(props) {
-  var _a, _b, _c, _d;
   const { i18n } = useI18nContext();
   const {
     form: { triggerValidation }
   } = useFormContext();
   const { isExperimentEnabled } = useExperimentsContext();
   const isGuidedDecisionMakersFlowEnabled = isExperimentEnabled("EnableGuidedDecisionMakersFlow") || isExperimentEnabled("DecisionMakersFlowOptimization_GuidedDecisionMakersFlow");
+  const isGuidedDecisionMakersFlowDisabled = isExperimentEnabled("DisableGuidedDecisionMakersFlow");
   const {
     country,
     data,
@@ -1980,10 +2250,13 @@ function BasicDetails(props) {
   const formUtils = createFormUtils(props, i18n);
   const decisionMakerRoleProps = getFieldProps(props, decisionMakerRoleFields);
   const nomineeProps = getFieldProps(props, nomineeFields);
-  const nameProps = getFieldProps(
-    props,
-    nameFields
-  );
+  const localizedNameProps = getFieldProps(props, [
+    "jaHaniFirstName",
+    "jaHaniLastName",
+    "jaKanaFirstName",
+    "jaKanaLastName",
+    ...nameFields
+  ]);
   const contactDetailsFormProps = getFieldProps(props, contactDetailFields);
   if (!handleFieldChange) {
     return;
@@ -2006,8 +2279,8 @@ function BasicDetails(props) {
         title: i18n.get({
           key: "legalRepresentativeFor",
           values: {
-            firstName: ((_a = parentLegalEntity == null ? void 0 : parentLegalEntity.individual) == null ? void 0 : _a.name.firstName) || "",
-            lastName: ((_b = parentLegalEntity == null ? void 0 : parentLegalEntity.individual) == null ? void 0 : _b.name.lastName) || ""
+            firstName: parentLegalEntity?.individual?.name.firstName || "",
+            lastName: parentLegalEntity?.individual?.name.lastName || ""
           }
         })
       }
@@ -2024,33 +2297,34 @@ function BasicDetails(props) {
     isDecisionMakerTask && trustedFieldsProvider === TrustedFieldsProvider.SINGPASS && readOnlyFields && /* @__PURE__ */ jsx(Typography, { color: "secondary", variant: "caption", children: i18n.get(
       "weSelectedSomeRolesBasedOnMyinfoBusinessDataAboutYourCompanysAppointmentHoldersAndShareholders"
     ) }),
-    isDecisionMakerTask && !isGuidedDecisionMakersFlowEnabled && /* @__PURE__ */ jsx(
-      DecisionMakerRole,
-      {
-        ...decisionMakerRoleProps,
-        taskType,
-        dataStoreId: basicDetailsId,
-        allowedRoles,
-        trustedRoles,
-        country,
-        handleFieldChange
-      }
-    ),
-    isDecisionMakerTask && /* @__PURE__ */ jsx(
-      NomineeDecisionMakerRole,
-      {
-        ...nomineeProps,
-        roles: data == null ? void 0 : data.role,
-        country,
-        handleFieldChange
-      }
-    ),
-    !!((_c = nameProps == null ? void 0 : nameProps.requiredFields) == null ? void 0 : _c.length) && /* @__PURE__ */ jsx(
-      Name,
-      {
-        ...nameProps,
-        dataStoreId: basicDetailsId,
-        errors,
+    isDecisionMakerTask && (isGuidedDecisionMakersFlowDisabled || !isGuidedDecisionMakersFlowEnabled) && /* @__PURE__ */ jsxs(Fragment, { children: [
+      /* @__PURE__ */ jsx(
+        DecisionMakerRole,
+        {
+          ...decisionMakerRoleProps,
+          taskType,
+          dataStoreId: basicDetailsId,
+          allowedRoles,
+          trustedRoles,
+          country,
+          handleFieldChange
+        }
+      ),
+      /* @__PURE__ */ jsx(
+        NomineeDecisionMakerRole,
+        {
+          ...nomineeProps,
+          roles: data?.role,
+          country,
+          handleFieldChange
+        }
+      )
+    ] }),
+    /* @__PURE__ */ jsx(
+      LocalizedNameFields,
+      {
+        ...localizedNameProps,
+        country,
         handleFieldChange
       }
     ),
@@ -2059,14 +2333,13 @@ function BasicDetails(props) {
       {
         name: "jobTitle",
         label: formUtils.getLabel("jobTitle"),
-        classNameModifiers: ["jobTitle"],
         errorMessage: formUtils.getErrorMessage("jobTitle", errors, fieldValidationErrors),
         children: (childProps) => /* @__PURE__ */ jsx(
           InputText,
           {
             ...childProps,
             name: "jobTitle",
-            value: data == null ? void 0 : data.jobTitle,
+            value: data?.jobTitle,
             placeholder: formUtils.getPlaceholder("jobTitle"),
             readonly: formUtils.isReadOnly("jobTitle"),
             onInput: handleFieldChange("jobTitle", "input"),
@@ -2076,7 +2349,7 @@ function BasicDetails(props) {
         )
       }
     ),
-    !!((_d = contactDetailsFormProps == null ? void 0 : contactDetailsFormProps.requiredFields) == null ? void 0 : _d.length) && /* @__PURE__ */ jsx(
+    !!contactDetailsFormProps?.requiredFields?.length && /* @__PURE__ */ jsx(
       ContactDetails,
       {
         ...contactDetailsFormProps,
@@ -2159,9 +2432,6 @@ const createAddressConflictRule = (datasetUtils) => (provided, detected) => {
   const detectedString = addressToString(mapApiAddressToSchema(detected), datasetUtils);
   return { hasConflict: providedString !== detectedString };
 };
-const createIdConflictRule = () => () => {
-  return { hasConflict: false };
-};
 const useDataConflicts = (providedData, detectedData, rules2 = {}, onAutoResolve) => {
   const { conflictingProperties, wasAutoResolved, resolvedData, hasConflicts } = useMemo(() => {
     if (!providedData || !detectedData) {
@@ -2188,16 +2458,17 @@ const useDataConflicts = (providedData, detectedData, rules2 = {}, onAutoResolve
     const wasAutoResolved2 = autoResolvedPatches.size > 0;
     const resolvedData2 = wasAutoResolved2 ? { ...providedData ?? {}, ...Object.fromEntries(autoResolvedPatches) } : void 0;
     if (wasAutoResolved2 && !hasConflicts2 && resolvedData2) {
-      onAutoResolve == null ? void 0 : onAutoResolve(resolvedData2);
+      onAutoResolve?.(resolvedData2);
     }
     return { hasConflicts: hasConflicts2, conflictingProperties: conflictingProperties2, wasAutoResolved: wasAutoResolved2, resolvedData: resolvedData2 };
   }, [providedData, detectedData, rules2, onAutoResolve]);
   return { hasConflicts, conflictingProperties, wasAutoResolved, resolvedData };
 };
+const isNextStepDisabled = signal(false);
 const conflictRowTable = "adyen-kyc-conflict-row-table";
 const conflictRowList = "adyen-kyc-conflict-row-list";
 const conflictRowListOptionLabel = "adyen-kyc-conflict-row-list-option-label";
-const styles$6 = {
+const styles$5 = {
   conflictRowTable,
   conflictRowList,
   conflictRowListOptionLabel
@@ -2223,7 +2494,7 @@ const ConflictRow = ({
     }
   }, [hasOnlyProvided, hasOnlyDetected, onSelect, selected]);
   if (hasOnlyProvided || hasOnlyDetected) return;
-  return showAs === "listItem" ? /* @__PURE__ */ jsxs("div", { className: styles$6.conflictRowList, children: [
+  return showAs === "listItem" ? /* @__PURE__ */ jsxs("div", { className: styles$5.conflictRowList, children: [
     /* @__PURE__ */ jsx("dt", { children: /* @__PURE__ */ jsx(Typography, { variant: "caption", children: i18n.get(label) }) }),
     /* @__PURE__ */ jsxs("dd", { children: [
       /* @__PURE__ */ jsxs("div", { children: [
@@ -2232,7 +2503,7 @@ const ConflictRow = ({
           {
             variant: "caption",
             color: "tertiary",
-            className: styles$6.conflictRowListOptionLabel,
+            className: styles$5.conflictRowListOptionLabel,
             children: i18n.get("youEntered")
           }
         ),
@@ -2252,7 +2523,7 @@ const ConflictRow = ({
           {
             variant: "caption",
             color: "tertiary",
-            className: styles$6.conflictRowListOptionLabel,
+            className: styles$5.conflictRowListOptionLabel,
             children: i18n.get("weDetected")
           }
         ),
@@ -2267,7 +2538,7 @@ const ConflictRow = ({
         )
       ] })
     ] })
-  ] }) : /* @__PURE__ */ jsxs("tr", { className: styles$6.conflictRowTable, children: [
+  ] }) : /* @__PURE__ */ jsxs("tr", { className: styles$5.conflictRowTable, children: [
     /* @__PURE__ */ jsx("td", { children: /* @__PURE__ */ jsx(Typography, { variant: "caption", children: i18n.get(label) }) }),
     /* @__PURE__ */ jsx("td", { children: /* @__PURE__ */ jsx(
       RadioWithLabel,
@@ -2293,7 +2564,7 @@ const dataConflictsWrapper = "adyen-kyc-data-conflicts-wrapper";
 const dataConflictsHeader = "adyen-kyc-data-conflicts-header";
 const dataConflictsTable = "adyen-kyc-data-conflicts-table";
 const dataConflictsList = "adyen-kyc-data-conflicts-list";
-const styles$5 = {
+const styles$4 = {
   dataConflictsWrapper,
   dataConflictsHeader,
   dataConflictsTable,
@@ -2334,13 +2605,13 @@ const DataConflictsModal = ({
     // No dependencies, as setShowError and setResolutions are stable.
   );
   return /* @__PURE__ */ jsxs(Modal, { ariaLabel: i18n.get(title), onClose: () => setShowCancelModal(true), inset: true, children: [
-    /* @__PURE__ */ jsxs("div", { className: styles$5.dataConflictsWrapper, children: [
-      /* @__PURE__ */ jsxs("div", { className: styles$5.dataConflictsHeader, children: [
+    /* @__PURE__ */ jsxs("div", { className: styles$4.dataConflictsWrapper, children: [
+      /* @__PURE__ */ jsxs("div", { className: styles$4.dataConflictsHeader, children: [
         /* @__PURE__ */ jsx(Typography, { variant: "title-l", el: "h1", children: i18n.get(title) }),
         /* @__PURE__ */ jsx(Typography, { variant: "body", children: i18n.get(explanation) })
       ] }),
       showError ? /* @__PURE__ */ jsx(Alert, { variant: "error", title: i18n.get("chooseTheCorrectDetailsBeforeProceeding") }) : void 0,
-      /* @__PURE__ */ jsx("dl", { className: styles$5.dataConflictsList, children: keysOf(conflictItems).map((property) => /* @__PURE__ */ jsx(
+      /* @__PURE__ */ jsx("dl", { className: styles$4.dataConflictsList, children: keysOf(conflictItems).map((property) => /* @__PURE__ */ jsx(
         ConflictRow,
         {
           showAs: "listItem",
@@ -2353,7 +2624,7 @@ const DataConflictsModal = ({
         },
         property
       )) }),
-      /* @__PURE__ */ jsxs("table", { className: styles$5.dataConflictsTable, children: [
+      /* @__PURE__ */ jsxs("table", { className: styles$4.dataConflictsTable, children: [
         /* @__PURE__ */ jsx("thead", { children: /* @__PURE__ */ jsxs("tr", { children: [
           /* @__PURE__ */ jsx("th", {}),
           /* @__PURE__ */ jsx("th", { children: /* @__PURE__ */ jsx(Typography, { variant: "caption", color: "tertiary", children: i18n.get("youEntered") }) }),
@@ -2410,30 +2681,13 @@ const DataConflictsModal = ({
     )
   ] });
 };
-const formatId = (id, i18n) => {
-  switch (id.typeOfIdentity) {
-    case "passport":
-      return `${i18n.get("passport")} (${id.idNumber})`;
-    case "driversLicense":
-      return `${i18n.get("driversLicense")} (${id.licenseCardNumber})`;
-    case "proofOfIdentityCard":
-      return `${i18n.get("proofOfIdentityCard")} (${id.idNumber})`;
-    case "nationalIdNumber":
-      return `${i18n.get("nationalIdNumber")} (${id.idNumber})`;
-    default:
-      if (id.idNumber) {
-        return `${id.typeOfIdentity || i18n.get("idNumber")} (${id.idNumber})`;
-      }
-      return `${id.typeOfIdentity}`;
-  }
-};
 const verificationDisclaimer = "adyen-kyc-verification-disclaimer";
-const styles$4 = {
+const styles$3 = {
   verificationDisclaimer
 };
 const IdVerificationDisclaimer = () => {
   const { i18n } = useI18nContext();
-  return /* @__PURE__ */ jsxs(Typography, { variant: "caption", color: "tertiary", className: styles$4.verificationDisclaimer, children: [
+  return /* @__PURE__ */ jsxs(Typography, { variant: "caption", color: "tertiary", className: styles$3.verificationDisclaimer, children: [
     i18n.get("ifYouChooseToUseOnfido"),
     " ",
     /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/privacy/", external: true, inline: true, children: i18n.get("onfidoPrivacyPolicy") }),
@@ -2446,25 +2700,25 @@ const IdVerificationDisclaimer = () => {
 const verificationHeader = "adyen-kyc-verification-header";
 const verificationHeaderImage = "adyen-kyc-verification-header-image";
 const verificationHeaderContent = "adyen-kyc-verification-header-content";
-const styles$3 = {
+const styles$2 = {
   verificationHeader,
   verificationHeaderImage,
   verificationHeaderContent
 };
 const IdVerificationHeader = () => {
   const { i18n } = useI18nContext();
-  return /* @__PURE__ */ jsxs("div", { className: styles$3.verificationHeader, children: [
+  return /* @__PURE__ */ jsxs("div", { className: styles$2.verificationHeader, children: [
     /* @__PURE__ */ jsx(
       Svg,
       {
-        className: styles$3.verificationHeaderImage,
+        className: styles$2.verificationHeaderImage,
         type: "image",
         name: "passport-front-green",
         title: i18n.get("instantIDVerificationDescription")
       }
     ),
     /* @__PURE__ */ jsx(Typography, { variant: "title-l", children: i18n.get("capturePersonalDetails") }),
-    /* @__PURE__ */ jsxs(Typography, { variant: "body", color: "primary", className: styles$3.verificationHeaderContent, children: [
+    /* @__PURE__ */ jsxs(Typography, { variant: "body", color: "primary", className: styles$2.verificationHeaderContent, children: [
       i18n.get("takeOrUploadAPhoto"),
       " ",
       /* @__PURE__ */ jsx(Link, { href: "https://onfido.com", external: true, inline: true, children: i18n.get("onfido") })
@@ -2472,46 +2726,52 @@ const IdVerificationHeader = () => {
   ] });
 };
 const verifyOnfidoContainer = "adyen-kyc-verify-onfido-container";
+const verifyOnfidoError = "adyen-kyc-verify-onfido-error";
 const verifyOnfidoContent = "adyen-kyc-verify-onfido-content";
-const styles$2 = {
+const styles$1 = {
   verifyOnfidoContainer,
+  verifyOnfidoError,
   verifyOnfidoContent
 };
 const toIndividualOnfidoConflictSchema = ({
   basicDetails,
   additionalPersonalDetails
-}) => ({
-  firstName: basicDetails == null ? void 0 : basicDetails.firstName,
-  lastName: basicDetails == null ? void 0 : basicDetails.lastName,
-  email: basicDetails == null ? void 0 : basicDetails.email,
-  phoneNumber: basicDetails == null ? void 0 : basicDetails.phoneNumber,
-  id: {
-    idNumber: additionalPersonalDetails == null ? void 0 : additionalPersonalDetails.idNumber,
-    typeOfIdentity: additionalPersonalDetails == null ? void 0 : additionalPersonalDetails.typeOfIdentity,
-    issuerState: additionalPersonalDetails == null ? void 0 : additionalPersonalDetails.issuerState,
-    licenseCardNumber: additionalPersonalDetails == null ? void 0 : additionalPersonalDetails.licenseCardNumber,
-    expiryDate: additionalPersonalDetails == null ? void 0 : additionalPersonalDetails.expiryDate
-  },
-  birthDate: additionalPersonalDetails == null ? void 0 : additionalPersonalDetails.birthDate,
-  nationality: additionalPersonalDetails == null ? void 0 : additionalPersonalDetails.nationality,
-  address: pick(
-    "address",
-    "otherAddressInformation",
-    "postalCode",
-    "city",
-    "stateOrProvince",
-    "country"
-  ).from(additionalPersonalDetails)
-});
+}) => {
+  return {
+    // from basicDetails
+    firstName: basicDetails?.firstName,
+    lastName: basicDetails?.lastName,
+    email: basicDetails?.email,
+    phoneNumber: basicDetails?.phoneNumber,
+    // from additionalPersonalDetails
+    birthDate: additionalPersonalDetails?.birthDate,
+    nationality: additionalPersonalDetails?.nationality,
+    address: pick(
+      "address",
+      "otherAddressInformation",
+      "postalCode",
+      "city",
+      "stateOrProvince",
+      "country"
+    ).from(additionalPersonalDetails),
+    // from additionalPersonalDetails (flattened so that `id` fields can be compared at granular level)
+    idNumber: additionalPersonalDetails?.idNumber,
+    typeOfIdentity: additionalPersonalDetails?.typeOfIdentity,
+    issuerState: additionalPersonalDetails?.issuerState,
+    licenseCardNumber: additionalPersonalDetails?.licenseCardNumber,
+    expiryDate: additionalPersonalDetails?.expiryDate
+  };
+};
 const fromIndividualOnfidoConflictSchema = ({
   firstName,
   lastName,
   email,
   phoneNumber,
-  id,
   birthDate,
   nationality: nationality2,
-  address
+  address,
+  ...idFields
+  // The rest of the properties are the flattened ID Fields
 }) => ({
   basicDetails: {
     firstName,
@@ -2522,11 +2782,8 @@ const fromIndividualOnfidoConflictSchema = ({
   additionalPersonalDetails: {
     birthDate,
     nationality: nationality2,
-    idNumber: id == null ? void 0 : id.idNumber,
-    typeOfIdentity: id == null ? void 0 : id.typeOfIdentity,
-    issuerState: id == null ? void 0 : id.issuerState,
-    licenseCardNumber: id == null ? void 0 : id.licenseCardNumber,
-    expiryDate: id == null ? void 0 : id.expiryDate,
+    // Reconstruct the `id` object from the flattened top-level properties
+    ...idFields,
     ...address
   }
 });
@@ -2617,12 +2874,12 @@ const OnfidoVerificationModal = ({
   ) });
 };
 const uploadedDocument = "adyen-kyc-uploaded-document";
-const styles$1 = {
+const styles = {
   uploadedDocument
 };
 const UploadedDocument = ({ document, onDelete, onUpdate }) => {
   const { i18n } = useI18nContext();
-  return /* @__PURE__ */ jsxs("article", { className: styles$1.uploadedDocument, children: [
+  return /* @__PURE__ */ jsxs("article", { className: styles.uploadedDocument, children: [
     /* @__PURE__ */ jsxs("div", { children: [
       /* @__PURE__ */ jsx(Typography, { el: "h4", variant: "title", children: i18n.get(document.idDocumentType) }),
       /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: i18n.get("uploadedOn", {
@@ -2652,8 +2909,13 @@ const idVerificationMethodFields = [
   "idDocument"
 ];
 function IdVerificationMethod(props) {
-  var _a, _b, _c, _d, _e;
-  const { legalEntityId, handlers, formVerificationErrors, fieldValidationErrors } = props;
+  const {
+    legalEntityId,
+    handlers,
+    formVerificationErrors,
+    fieldValidationErrors,
+    hasLiveSelfieErrorCode
+  } = props;
   const { i18n } = useI18nContext();
   const userEvents = useAnalyticsContext();
   const extractDocumentInformation2 = useExtractDocumentInformation();
@@ -2661,7 +2923,7 @@ function IdVerificationMethod(props) {
     form: { data, handleChangeFor, setFormData }
   } = useFormContext();
   const datasetUtils = datasetUtilities(i18n.locale);
-  const existingDocument = (_a = data.idVerificationMethod) == null ? void 0 : _a.idDocument;
+  const existingDocument = data.idVerificationMethod?.idDocument;
   const hasExistingDocument = !isEmpty$1(existingDocument);
   const handleFieldChange = useCallback(
     (fieldName, mode = "input") => handleChangeFor(fieldName, "idVerificationMethod", mode),
@@ -2686,9 +2948,7 @@ function IdVerificationMethod(props) {
   );
   const conflictRules = useMemo(
     () => ({
-      address: createAddressConflictRule(datasetUtils),
-      id: createIdConflictRule()
-      // ignore id related conflicts
+      address: createAddressConflictRule(datasetUtils)
     }),
     [datasetUtils]
   );
@@ -2699,6 +2959,24 @@ function IdVerificationMethod(props) {
     setOcrExtractedData(void 0);
     handlers.handleContinueToAdditionalDetails();
   };
+  const validateExtractionResult = (extractionResult) => {
+    const { isExpired, isValidDocumentType, dateOfBirth, issuingCountry } = extractionResult;
+    if (isExpired) {
+      return { key: "theDocumentYouUploadedIsExpired" };
+    }
+    if (isValidDocumentType === false) {
+      return { key: "theDocumentTypeYouUploadedIsNotSupported" };
+    }
+    if (isPersonUnderAge(dateOfBirth, issuingCountry)) {
+      return {
+        key: "weDontAcceptDocumentsOrInformationAboutAnyoneYoungerThan_",
+        options: {
+          values: { minimumOnboardingAge: extractionResult.minimumOnboardingAge?.toString() ?? "" }
+        }
+      };
+    }
+    return null;
+  };
   const { hasConflicts, conflictingProperties, resolvedData } = useDataConflicts(
     comparableExistingData,
     comparableExtractedData,
@@ -2706,9 +2984,9 @@ function IdVerificationMethod(props) {
     onAutoResolve
   );
   const minimumApplicantDetails = {
-    firstName: (_b = data.basicDetails) == null ? void 0 : _b.firstName,
-    lastName: (_c = data.basicDetails) == null ? void 0 : _c.lastName,
-    residencyCountry: (_d = data.additionalPersonalDetails) == null ? void 0 : _d.country
+    firstName: data.basicDetails?.firstName,
+    lastName: data.basicDetails?.lastName,
+    residencyCountry: data.additionalPersonalDetails?.country
   };
   const launchOnfido = () => {
     clearError();
@@ -2724,13 +3002,18 @@ function IdVerificationMethod(props) {
     clearError();
     setShowLoadingSpinner(true);
     setStatus("extractionLoading");
-    const { document_front, document_back } = onfidoResult;
-    const documentIds = [document_front.id];
-    if (document_back) documentIds.push(document_back.id);
+    const documentIds = [onfidoResult.document_front.id];
+    if (onfidoResult.document_back) documentIds.push(onfidoResult.document_back.id);
     try {
       const extractionResult = await extractDocumentInformation2.mutateAsync({
         documents: documentIds.map((documentId) => ({ documentId }))
       });
+      const validationError = validateExtractionResult(extractionResult);
+      if (validationError) {
+        setError(validationError);
+        setStatus("ready");
+        return;
+      }
       setOcrExtractedData(extractionResult);
       handleFieldChange("idDocument")({
         instantIdVerificationData: onfidoResult,
@@ -2740,14 +3023,28 @@ function IdVerificationMethod(props) {
       });
       setStatus("ready");
     } catch (err) {
-      handleOnfidoError(err);
+      handleOnfidoExtractionError(err);
+      handleFieldChange("idDocument")({
+        instantIdVerificationData: onfidoResult,
+        idDocumentType: onfidoResult.document_front.type,
+        modificationDate: (/* @__PURE__ */ new Date()).toISOString()
+      });
     } finally {
       setShowLoadingSpinner(false);
     }
   };
+  const handleOnfidoExtractionError = (error2) => {
+    logger$2.error("Onfido extraction error", error2);
+    userEvents.addPageEvent("Encountered error", {
+      actionType: "submit",
+      returnType: "onfido",
+      returnValue: "weCouldNotExtractDocumentInformation"
+    });
+    setStatus("ready");
+  };
   const handleOnfidoError = (error2) => {
     logger$2.error("Onfido error", error2);
-    setError("weCouldNotReachOnfido");
+    setError({ key: "weCouldNotReachOnfido" });
     userEvents.addPageEvent("Encountered error", {
       actionType: "submit",
       returnType: "onfido",
@@ -2787,6 +3084,9 @@ function IdVerificationMethod(props) {
       handleFieldChange("idDocument")(void 0);
     }
   };
+  if (hasLiveSelfieErrorCode && data.idVerificationMethod?.idVerificationMethod === "existingDocument") {
+    handleDeleteDocument();
+  }
   const handleCancelDeleteDocument = () => {
     setStatus("ready");
     userEvents.addPageEvent("Clicked button", {
@@ -2811,7 +3111,8 @@ function IdVerificationMethod(props) {
   };
   const modalProvidedData = resolvedData || comparableExistingData;
   const formUtils = createFormUtils(props, i18n);
-  return /* @__PURE__ */ jsxs("div", { className: styles$2.verifyOnfidoContainer, children: [
+  isNextStepDisabled.value = showLoadingSpinner;
+  return /* @__PURE__ */ jsxs("div", { className: styles$1.verifyOnfidoContainer, children: [
     /* @__PURE__ */ jsx(
       ErrorPanel,
       {
@@ -2822,8 +3123,15 @@ function IdVerificationMethod(props) {
       }
     ),
     /* @__PURE__ */ jsx(IdVerificationHeader, {}),
-    error ? /* @__PURE__ */ jsx(Alert, { variant: "error", title: i18n.get(error) }) : void 0,
-    /* @__PURE__ */ jsx("div", { className: styles$2.verifyOnfidoContent, children: showLoadingSpinner ? /* @__PURE__ */ jsx(Loader, { size: "large" }) : /* @__PURE__ */ jsx(Fragment, { children: hasExistingDocument ? /* @__PURE__ */ jsx(
+    error ? /* @__PURE__ */ jsx(
+      Alert,
+      {
+        variant: "error",
+        title: i18n.get(error.key, error.options),
+        className: styles$1.verifyOnfidoError
+      }
+    ) : void 0,
+    /* @__PURE__ */ jsx("div", { className: styles$1.verifyOnfidoContent, children: showLoadingSpinner ? /* @__PURE__ */ jsx(Loader, { size: "large" }) : /* @__PURE__ */ jsx(Fragment, { children: hasExistingDocument ? /* @__PURE__ */ jsx(
       UploadedDocument,
       {
         document: existingDocument,
@@ -2841,7 +3149,7 @@ function IdVerificationMethod(props) {
           onClick: launchOnfido
         }
       ),
-      !((_e = showIndividualMotionCapture) == null ? void 0 : _e.value) && /* @__PURE__ */ jsx(
+      !showIndividualMotionCapture?.value && /* @__PURE__ */ jsx(
         Button,
         {
           onClick: () => setStatus("confirmManualFlowModal"),
@@ -2890,8 +3198,7 @@ function IdVerificationMethod(props) {
         detectedData: comparableExtractedData,
         conflictingProperties,
         formatters: {
-          address: (val) => addressToString(val, datasetUtils),
-          id: (val) => formatId(val, i18n)
+          address: (val) => addressToString(val, datasetUtils)
         },
         title: "confirmPersonalDetails",
         explanation: "theDetailsYouEnteredDontMatch",
@@ -2906,13 +3213,12 @@ function IdVerificationMethod(props) {
   ] });
 }
 const ManualIdUpload = () => {
-  var _a, _b;
   const { form } = useFormContext();
   const { handleChangeFor } = form;
   const data = form.data.manualIdUpload;
   const valid = form.valid.manualIdUpload;
   const errors = form.errors.manualIdUpload;
-  const name = `${(_a = form.data.basicDetails) == null ? void 0 : _a.firstName} ${(_b = form.data.basicDetails) == null ? void 0 : _b.lastName}`;
+  const name = `${form.data.basicDetails?.firstName} ${form.data.basicDetails?.lastName}`;
   const handleFieldChange = (fieldName, mode) => handleChangeFor(fieldName, "manualIdUpload", mode);
   return /* @__PURE__ */ jsx(
     IdDocumentManualUpload,
@@ -2925,70 +3231,50 @@ const ManualIdUpload = () => {
     }
   );
 };
-const getDisplayErrorMessage = (errorMessage, i18n) => {
-  return typeof errorMessage !== "boolean" ? i18n.get(errorMessage) : errorMessage;
+const getDisplayErrorMessage = (errorMessage, t) => {
+  return typeof errorMessage !== "boolean" ? translateStringOrObject(t, errorMessage) : errorMessage;
 };
-const guidanceQuestion = "adyen-kyc-guidance-question";
-const options = "adyen-kyc-options";
-const styles = {
-  guidanceQuestion,
-  options
-};
-const GuidanceQuestion = (props) => {
-  const {
-    descriptionLinkText,
-    errorMessage,
-    name,
-    noLabel,
-    onChange,
-    onDescriptionLinkClick,
-    question,
-    value,
-    yesLabel
-  } = props;
+const SignatoryQuestionnaireModalContent = () => {
   const { i18n } = useI18nContext();
-  const handleChange = (selectedValue) => {
-    const newValue = selectedValue || null;
-    onChange(newValue);
-  };
-  const yesTileLabel = yesLabel ?? i18n.get("yes");
-  const noTileLabel = noLabel ?? i18n.get("no");
-  return /* @__PURE__ */ jsxs("div", { className: styles.guidanceQuestion, children: [
-    /* @__PURE__ */ jsx(Typography, { variant: "body", el: "p", children: question }),
-    descriptionLinkText && onDescriptionLinkClick && /* @__PURE__ */ jsx(Button, { variant: "link", onClick: onDescriptionLinkClick, children: descriptionLinkText }),
-    /* @__PURE__ */ jsx(Field, { name, className: styles.options, children: () => /* @__PURE__ */ jsx(
-      TileGroup,
-      {
-        allowMultiple: false,
-        errorMessage,
-        isHorizontal: true,
-        maxSelected: 1,
-        name,
-        onChange: handleChange,
-        selected: value || "",
-        tiles: [
-          { label: yesTileLabel, value: "yes" },
-          { label: noTileLabel, value: "no" }
-        ]
-      }
-    ) })
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx(Typography, { variant: "title-l", el: "h3", className: "adyen-kyc-u-margin-bottom-40", children: i18n.get("moreAboutAuthorizedSignatories") }),
+    /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("signatoryDescriptionQ1") }),
+    /* @__PURE__ */ jsx(Typography, { el: "p", className: "adyen-kyc-u-margin-bottom-32", children: i18n.get("signatoryDescriptionA1") }),
+    /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("signatoryDescriptionQ2") }),
+    /* @__PURE__ */ jsx(Typography, { el: "p", children: i18n.get("signatoryDescriptionA2") })
   ] });
 };
 function SignatoryQuestionnaire(props) {
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
+  const userEvents = useAnalyticsContext();
+  const [isModalOpen, setIsModalOpen] = useState(false);
   const {
     data,
     errors,
     formVerificationErrors,
     heading,
     fieldValidationErrors,
-    handleDescriptionLinkClick,
     handleFieldChange
   } = props;
   const formUtils = createFormUtils(props, i18n);
   if (!handleFieldChange) {
     return;
   }
+  const openModal = () => {
+    userEvents.addPageEvent("Opened modal", {
+      actionType: "open",
+      label: "isSignatoryModal"
+    });
+    setIsModalOpen(true);
+  };
+  const closeModal = () => {
+    userEvents.addPageEvent("Closed modal", {
+      actionType: "close",
+      label: "isSignatoryModal"
+    });
+    setIsModalOpen(false);
+  };
   const errorMessage = formUtils.getErrorMessage("isSignatory", errors, fieldValidationErrors);
   return /* @__PURE__ */ jsxs("form", { className: "adyen-kyc-individual__personal-details", "aria-describedby": "ariaErrorField", children: [
     /* @__PURE__ */ jsx(FormHeader, { heading }),
@@ -3005,23 +3291,92 @@ function SignatoryQuestionnaire(props) {
       GuidanceQuestion,
       {
         name: "isSignatory",
-        value: data == null ? void 0 : data.isSignatory,
+        value: data?.isSignatory,
         onChange: handleFieldChange("isSignatory"),
-        onDescriptionLinkClick: handleDescriptionLinkClick,
+        onDescriptionLinkClick: openModal,
         question: i18n.get("signatoryQuestion"),
         descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(errorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(errorMessage, t)
       }
-    )
+    ),
+    isModalOpen && /* @__PURE__ */ jsx(Modal, { onClose: closeModal, ariaLabel: i18n.get("moreAboutAuthorizedSignatories"), inset: true, children: /* @__PURE__ */ jsx(SignatoryQuestionnaireModalContent, {}) })
   ] });
 }
+const UboQuestionnaireModalContent = ({ modalType }) => {
+  const { t } = useTranslation();
+  const { i18n } = useI18nContext();
+  switch (modalType) {
+    case "isOwner":
+      return /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(Typography, { variant: "title-l", el: "h3", className: "adyen-kyc-u-margin-bottom-40", children: i18n.get("moreAboutOwners") }),
+        /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("ownersDescriptionQ1") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", children: i18n.get("ownersDescriptionA1P1") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", className: "adyen-kyc-u-margin-bottom-32", children: i18n.get("ownersDescriptionA1P2") }),
+        /* @__PURE__ */ jsx(
+          Alert,
+          {
+            title: i18n.get("ownersDescriptionAlertTitle"),
+            icon: false,
+            className: "adyen-kyc-u-margin-bottom-32",
+            children: i18n.get("ownersDescriptionAlertContent")
+          }
+        ),
+        /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("ownersDescriptionQ2") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", children: i18n.get("ownersDescriptionA2P1") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", className: "adyen-kyc-u-margin-bottom-32", children: i18n.get("ownersDescriptionA2P2") }),
+        /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("ownersDescriptionQ3") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", className: "adyen-kyc-u-margin-bottom-32", children: i18n.get("ownersDescriptionA3") }),
+        /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("ownersDescriptionQ4") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", className: "adyen-kyc-u-margin-bottom-32", children: i18n.get("ownersDescriptionA4") })
+      ] });
+    case "isControllingPerson":
+      return /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(Typography, { variant: "title-l", el: "h3", className: "adyen-kyc-u-margin-bottom-40", children: i18n.get("moreAboutOwnershipThroughControl") }),
+        /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("controllingPersonDescriptionQ1") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", className: "adyen-kyc-u-margin-bottom-32", children: i18n.get("controllingPersonDescriptionA1P1") }),
+        /* @__PURE__ */ jsxs("ul", { children: [
+          /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(Trans, { t, i18nKey: ($) => $["controllingPersonDescriptionA1L1"] }) }),
+          /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(Trans, { t, i18nKey: ($) => $["controllingPersonDescriptionA1L2"] }) }),
+          /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(Trans, { t, i18nKey: ($) => $["controllingPersonDescriptionA1L3"] }) }),
+          /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(Trans, { t, i18nKey: ($) => $["controllingPersonDescriptionA1L4"] }) })
+        ] }),
+        /* @__PURE__ */ jsx(
+          Alert,
+          {
+            title: i18n.get("ownersDescriptionAlertTitle"),
+            icon: false,
+            className: "adyen-kyc-u-margin-bottom-32",
+            children: i18n.get("controllingPersonDescriptionAlertContent")
+          }
+        ),
+        /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("ownersDescriptionQ4") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", children: i18n.get("ownersDescriptionA4") }),
+        /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("controllingPersonDescriptionQ2") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", className: "adyen-kyc-u-margin-bottom-32", children: i18n.get("controllingPersonDescriptionA2") })
+      ] });
+    case "isDirector":
+      return /* @__PURE__ */ jsxs(Fragment, { children: [
+        /* @__PURE__ */ jsx(Typography, { variant: "title-l", el: "h3", className: "adyen-kyc-u-margin-bottom-40", children: i18n.get("moreAboutDirectors") }),
+        /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("directorDescriptionQ1") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", className: "adyen-kyc-u-margin-bottom-32", children: i18n.get("directorDescriptionA1") }),
+        /* @__PURE__ */ jsx(Typography, { variant: "body-strongest", el: "h4", className: "adyen-kyc-u-margin-bottom-12", children: i18n.get("directorDescriptionQ2") }),
+        /* @__PURE__ */ jsx(Typography, { el: "p", children: i18n.get("directorDescriptionA2") })
+      ] });
+    default:
+      return null;
+  }
+};
 const uboQuestionnaireFields = [
   "isOwner",
   "isControllingPerson",
-  "isDirector"
+  "isDirector",
+  "isNomineeDirector",
+  "isNomineeShareholder"
 ];
 function UboQuestionnaire(props) {
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
+  const userEvents = useAnalyticsContext();
   const {
     data,
     description,
@@ -3029,19 +3384,50 @@ function UboQuestionnaire(props) {
     formVerificationErrors,
     heading,
     fieldValidationErrors,
-    handleDescriptionLinkClick,
     handleFieldChange
   } = props;
   const formUtils = createFormUtils(props, i18n);
+  const [activeModal, setActiveModal] = useState(null);
   if (!handleFieldChange) {
     return;
   }
+  const openModal = (modalType) => () => {
+    userEvents.addPageEvent("Opened modal", {
+      actionType: "open",
+      label: `${modalType}Modal`
+    });
+    setActiveModal(modalType);
+  };
+  const closeModal = () => {
+    if (activeModal) {
+      userEvents.addPageEvent("Closed modal", {
+        actionType: "close",
+        label: `${activeModal}Modal`
+      });
+    }
+    setActiveModal(null);
+  };
+  const modalAriaLabelMap = {
+    isOwner: i18n.get("moreAboutOwners"),
+    isControllingPerson: i18n.get("moreAboutOwnershipThroughControl"),
+    isDirector: i18n.get("moreAboutDirectors")
+  };
   const isDirectorErrorMessage = formUtils.getErrorMessage(
     "isDirector",
     errors,
     fieldValidationErrors
   );
+  const isNomineeDirectorErrorMessage = formUtils.getErrorMessage(
+    "isNomineeDirector",
+    errors,
+    fieldValidationErrors
+  );
   const isOwnerErrorMessage = formUtils.getErrorMessage("isOwner", errors, fieldValidationErrors);
+  const isNomineeShareholderErrorMessage = formUtils.getErrorMessage(
+    "isNomineeShareholder",
+    errors,
+    fieldValidationErrors
+  );
   const isControllingPersonErrorMessage = formUtils.getErrorMessage(
     "isControllingPerson",
     errors,
@@ -3062,38 +3448,59 @@ function UboQuestionnaire(props) {
       GuidanceQuestion,
       {
         name: "isDirector",
-        value: data == null ? void 0 : data.isDirector,
+        value: data?.isDirector,
         onChange: handleFieldChange("isDirector"),
-        onDescriptionLinkClick: handleDescriptionLinkClick,
+        onDescriptionLinkClick: openModal("isDirector"),
         question: i18n.get("directorQuestion"),
         descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(isDirectorErrorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(isDirectorErrorMessage, t)
+      }
+    ),
+    formUtils.isRequiredField("isNomineeDirector") && data?.isDirector === GuidanceQuestionValues.YES && /* @__PURE__ */ jsx(
+      GuidanceQuestion,
+      {
+        name: "isNomineeDirector",
+        value: data?.isNomineeDirector,
+        onChange: handleFieldChange("isNomineeDirector"),
+        question: i18n.get("nomineeDirectorQuestion"),
+        errorMessage: getDisplayErrorMessage(isNomineeDirectorErrorMessage, t)
       }
     ),
     formUtils.isRequiredField("isOwner") && /* @__PURE__ */ jsx(
       GuidanceQuestion,
       {
         name: "isOwner",
-        value: data == null ? void 0 : data.isOwner,
+        value: data?.isOwner,
         onChange: handleFieldChange("isOwner"),
-        onDescriptionLinkClick: handleDescriptionLinkClick,
+        onDescriptionLinkClick: openModal("isOwner"),
         question: i18n.get("ownerQuestion"),
         descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(isOwnerErrorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(isOwnerErrorMessage, t)
+      }
+    ),
+    formUtils.isRequiredField("isNomineeShareholder") && data?.isOwner === GuidanceQuestionValues.YES && /* @__PURE__ */ jsx(
+      GuidanceQuestion,
+      {
+        name: "isNomineeShareholder",
+        value: data?.isNomineeShareholder,
+        onChange: handleFieldChange("isNomineeShareholder"),
+        question: i18n.get("nomineeShareHolderQuestion"),
+        errorMessage: getDisplayErrorMessage(isNomineeShareholderErrorMessage, t)
       }
     ),
     formUtils.isRequiredField("isControllingPerson") && /* @__PURE__ */ jsx(
       GuidanceQuestion,
       {
         name: "isControllingPerson",
-        value: data == null ? void 0 : data.isControllingPerson,
+        value: data?.isControllingPerson,
         onChange: handleFieldChange("isControllingPerson"),
-        onDescriptionLinkClick: handleDescriptionLinkClick,
+        onDescriptionLinkClick: openModal("isControllingPerson"),
         question: i18n.get("controllingPersonQuestion"),
         descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(isControllingPersonErrorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(isControllingPersonErrorMessage, t)
       }
-    )
+    ),
+    activeModal && /* @__PURE__ */ jsx(Modal, { onClose: closeModal, ariaLabel: modalAriaLabelMap[activeModal], inset: true, children: /* @__PURE__ */ jsx(UboQuestionnaireModalContent, { modalType: activeModal }) })
   ] });
 }
 const logger$1 = createLogger();
@@ -3153,15 +3560,17 @@ const manualIdUploadFormID = individualOnfidoForms.manualIdUpload.formId;
 const proofOfResidencyFormID = individualOnfidoForms.proofOfResidency.formId;
 const proofOfNationalIdFormID = individualOnfidoForms.proofOfNationalId.formId;
 const proofOfRelationshipFormID = individualOnfidoForms.proofOfRelationship.formId;
+const LIVE_SELFIE_ERROR_CODE = "2_8210";
 function IndividualOnfido(props) {
-  var _a, _b, _c, _d, _e;
   const { i18n } = useI18nContext();
+  const userEvents = useAnalyticsContext();
   const {
     form: { errors, valid, fieldProblems: fieldValidationErrors, handleChangeFor, setFormData }
   } = useFormContext();
   const { setFormIndex } = useFormRouterContext();
   const { isExperimentEnabled } = useExperimentsContext();
   const isGuidedDecisionMakersFlowEnabled = isExperimentEnabled("EnableGuidedDecisionMakersFlow") || isExperimentEnabled("DecisionMakersFlowOptimization_GuidedDecisionMakersFlow");
+  const isGuidedDecisionMakersFlowDisabled = isExperimentEnabled("DisableGuidedDecisionMakersFlow");
   const [isDecisionMakerNotRequiredModalOpen, setIsDecisionMakerNotRequiredModalOpen] = useState(false);
   const {
     activeForm: propActiveForm,
@@ -3186,31 +3595,42 @@ function IndividualOnfido(props) {
   const proofOfResidencyFormProps = getFormProps(props, proofOfResidencyFormID);
   const proofOfNationalIdFormProps = getFormProps(props, proofOfNationalIdFormID);
   const proofOfRelationshipFormProps = getFormProps(props, proofOfRelationshipFormID);
-  const countryOfResidence = ((_a = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a.country) ?? defaultCountry;
+  const countryOfResidence = data?.additionalPersonalDetails?.country ?? defaultCountry;
   const handleNextForPersonNotRequired = () => {
-    var _a2;
-    if (!(data == null ? void 0 : data.signatoryQuestionnaire) && !(data == null ? void 0 : data.uboQuestionnaire)) return;
+    if (!data?.signatoryQuestionnaire && !data?.uboQuestionnaire) return;
     const { signatoryQuestionnaire, uboQuestionnaire } = data;
-    const isDirectorApplicable = (_a2 = uboQuestionnaireFormProps == null ? void 0 : uboQuestionnaireFormProps.requiredFields) == null ? void 0 : _a2.includes("isDirector");
-    const isNotRequired = signatoryQuestionnaire && uboQuestionnaire && (signatoryQuestionnaire == null ? void 0 : signatoryQuestionnaire.isSignatory) === "no" && (uboQuestionnaire == null ? void 0 : uboQuestionnaire.isOwner) === "no" && (uboQuestionnaire == null ? void 0 : uboQuestionnaire.isControllingPerson) === "no" && (!isDirectorApplicable || (uboQuestionnaire == null ? void 0 : uboQuestionnaire.isDirector) === "no");
+    const isDirectorApplicable = uboQuestionnaireFormProps?.requiredFields?.includes("isDirector");
+    const isNotRequired = signatoryQuestionnaire && uboQuestionnaire && signatoryQuestionnaire?.isSignatory === GuidanceQuestionValues.NO && uboQuestionnaire?.isOwner === GuidanceQuestionValues.NO && uboQuestionnaire?.isControllingPerson === GuidanceQuestionValues.NO && (!isDirectorApplicable || uboQuestionnaire?.isDirector === GuidanceQuestionValues.NO);
     if (isNotRequired) {
+      userEvents.addPageEvent("Opened modal", {
+        actionType: "open",
+        label: "personalInfoNotNeeded"
+      });
       setIsDecisionMakerNotRequiredModalOpen(true);
     } else {
-      onNext == null ? void 0 : onNext();
+      onNext?.();
     }
   };
   useEffect(() => {
     if (propActiveForm.formId === uboQuestionnaireFormID) {
-      setNextHandler == null ? void 0 : setNextHandler(() => handleNextForPersonNotRequired);
+      setNextHandler?.(() => handleNextForPersonNotRequired);
     } else {
-      setNextHandler == null ? void 0 : setNextHandler(void 0);
+      setNextHandler?.(void 0);
     }
   }, [propActiveForm, setNextHandler, data]);
   const handleCloseModalAndGoBack = () => {
+    userEvents.addPageEvent("Closed modal", {
+      actionType: "close",
+      label: "personalInfoNotNeeded"
+    });
     setIsDecisionMakerNotRequiredModalOpen(false);
-    handleHomeClick == null ? void 0 : handleHomeClick();
+    handleHomeClick?.();
   };
   const handleCloseModalAndChangeAnswers = () => {
+    userEvents.addPageEvent("Clicked button", {
+      actionType: "cancel",
+      label: `personalInfoNotNeeded`
+    });
     setIsDecisionMakerNotRequiredModalOpen(false);
   };
   const gotoFormByFormId = (formId) => {
@@ -3230,32 +3650,37 @@ function IndividualOnfido(props) {
   const capabilities = useCapabilities();
   const newRoles = useMemo(() => calculateRoles(data), [data]);
   useEffect(() => {
-    var _a2;
-    if (isGuidedDecisionMakersFlowEnabled) {
-      const currentRoles = ((_a2 = data == null ? void 0 : data.basicDetails) == null ? void 0 : _a2.role) ?? [];
+    if (!isGuidedDecisionMakersFlowDisabled && isGuidedDecisionMakersFlowEnabled) {
+      const currentRoles = data?.basicDetails?.role ?? [];
       if (areArraysDifferent(newRoles, currentRoles)) {
-        const basicDetailsData = (data == null ? void 0 : data.basicDetails) ?? {};
+        const basicDetailsData = data?.basicDetails ?? {};
         setFormData("basicDetails", { ...basicDetailsData, role: newRoles });
       }
     }
-  }, [newRoles, data == null ? void 0 : data.basicDetails, setFormData, isGuidedDecisionMakersFlowEnabled]);
+  }, [
+    newRoles,
+    data?.basicDetails,
+    setFormData,
+    isGuidedDecisionMakersFlowDisabled,
+    isGuidedDecisionMakersFlowEnabled
+  ]);
+  const hasMotionCaptureScenarioValue = hasMotionCaptureScenario?.value;
   useEffect(() => {
-    var _a2, _b2;
     setShowIndividualMotionCapture(
       shouldShowMotionCapture({
         capabilities,
-        userRoles: (_a2 = data == null ? void 0 : data.basicDetails) == null ? void 0 : _a2.role,
+        userRoles: data?.basicDetails?.role,
         taskType,
-        hasMotionScenario: (_b2 = hasMotionCaptureScenario) == null ? void 0 : _b2.value
+        hasMotionScenario: hasMotionCaptureScenarioValue
       })
     );
-  }, [(_b = data == null ? void 0 : data.basicDetails) == null ? void 0 : _b.role, taskType, capabilities, (_c = hasMotionCaptureScenario) == null ? void 0 : _c.value]);
-  const fullName = `${(_d = data == null ? void 0 : data.basicDetails) == null ? void 0 : _d.firstName} ${(_e = data == null ? void 0 : data.basicDetails) == null ? void 0 : _e.lastName}`;
+  }, [data?.basicDetails?.role, taskType, capabilities, hasMotionCaptureScenarioValue]);
+  const fullName = `${data?.basicDetails?.firstName} ${data?.basicDetails?.lastName}`;
   const handleFieldChange = (formName) => (fieldName, mode) => handleChangeFor(fieldName, formName, mode);
-  const handleDescriptionLinkClick = () => {
-  };
+  const hasLiveSelfieErrorCode = problems?.missingData?.some(
+    (problem) => problem.code === LIVE_SELFIE_ERROR_CODE && problem.type === "dataMissing"
+  );
   const renderActiveForm = (activeForm) => {
-    var _a2, _b2;
     switch (activeForm.formId) {
       case signatoryQuestionnaireFormID:
         return /* @__PURE__ */ jsx(
@@ -3265,9 +3690,8 @@ function IndividualOnfido(props) {
             heading: i18n.get("signatoryQuestionnaireHeader"),
             id: signatoryQuestionnaireFormID,
             handleFieldChange: handleFieldChange("signatoryQuestionnaire"),
-            handleDescriptionLinkClick,
-            errors: errors == null ? void 0 : errors.signatoryQuestionnaire,
-            fieldValidationErrors: fieldValidationErrors == null ? void 0 : fieldValidationErrors.signatoryQuestionnaire
+            errors: errors?.signatoryQuestionnaire,
+            fieldValidationErrors: fieldValidationErrors?.signatoryQuestionnaire
           }
         );
       case uboQuestionnaireFormID:
@@ -3279,9 +3703,8 @@ function IndividualOnfido(props) {
             description: i18n.get("uboQuestionnaireDescription"),
             id: uboQuestionnaireFormID,
             handleFieldChange: handleFieldChange("uboQuestionnaire"),
-            handleDescriptionLinkClick,
-            errors: errors == null ? void 0 : errors.uboQuestionnaire,
-            fieldValidationErrors: fieldValidationErrors == null ? void 0 : fieldValidationErrors.uboQuestionnaire
+            errors: errors?.uboQuestionnaire,
+            fieldValidationErrors: fieldValidationErrors?.uboQuestionnaire
           }
         );
       case basicDetailsFormID:
@@ -3289,7 +3712,7 @@ function IndividualOnfido(props) {
           BasicDetails,
           {
             ...basicDetailsFormProps,
-            data: (data == null ? void 0 : data.basicDetails) ?? {},
+            data: data?.basicDetails ?? {},
             heading: i18n.get("basicInformationFormName"),
             taskType,
             id: basicDetailsFormID,
@@ -3298,9 +3721,9 @@ function IndividualOnfido(props) {
             parentLegalEntity,
             trustedFieldsProvider,
             trustedRoles,
-            errors: errors == null ? void 0 : errors.basicDetails,
-            fieldValidationErrors: fieldValidationErrors == null ? void 0 : fieldValidationErrors.basicDetails,
-            valid: valid == null ? void 0 : valid.basicDetails,
+            errors: errors?.basicDetails,
+            fieldValidationErrors: fieldValidationErrors?.basicDetails,
+            valid: valid?.basicDetails,
             handleFieldChange: handleFieldChange("basicDetails")
           }
         );
@@ -3314,8 +3737,9 @@ function IndividualOnfido(props) {
               handleDeleteDocument,
               handleUpdateDocument
             },
-            formVerificationErrors: (_a2 = problems == null ? void 0 : problems.verificationErrors) == null ? void 0 : _a2.idVerificationMethod,
-            fieldValidationErrors: (_b2 = problems == null ? void 0 : problems.validationErrors) == null ? void 0 : _b2.idVerificationMethod
+            formVerificationErrors: problems?.verificationErrors?.idVerificationMethod,
+            fieldValidationErrors: problems?.validationErrors?.idVerificationMethod,
+            hasLiveSelfieErrorCode
           }
         );
       case additionalPersonalDetailsFormID:
@@ -3324,12 +3748,12 @@ function IndividualOnfido(props) {
           {
             ...additionalPersonalDetailsFormProps,
             country: countryOfResidence,
-            data: (data == null ? void 0 : data.additionalPersonalDetails) ?? {},
+            data: data?.additionalPersonalDetails ?? {},
             heading: i18n.get("additionalPersonalDetails"),
             id: additionalPersonalDetailsFormID,
-            errors: errors == null ? void 0 : errors.additionalPersonalDetails,
-            fieldValidationErrors: fieldValidationErrors == null ? void 0 : fieldValidationErrors.additionalPersonalDetails,
-            valid: valid == null ? void 0 : valid.additionalPersonalDetails,
+            errors: errors?.additionalPersonalDetails,
+            fieldValidationErrors: fieldValidationErrors?.additionalPersonalDetails,
+            valid: valid?.additionalPersonalDetails,
             taskType,
             handleFieldChange: handleFieldChange("additionalPersonalDetails")
           }
@@ -3341,7 +3765,7 @@ function IndividualOnfido(props) {
           MemoizedProofOfResidencyUpload,
           {
             ...proofOfResidencyFormProps,
-            data: data == null ? void 0 : data.proofOfResidency,
+            data: data?.proofOfResidency,
             id: proofOfResidencyFormID,
             name: fullName,
             errors: errors.proofOfResidency,
@@ -3355,7 +3779,7 @@ function IndividualOnfido(props) {
           MemoizedDocumentUpload,
           {
             ...proofOfNationalIdFormProps,
-            data: data == null ? void 0 : data.proofOfNationalId,
+            data: data?.proofOfNationalId,
             documentField: "proofOfNationalId",
             documentType: "registrationDocument",
             heading: i18n.get("proofOfNationalId"),
@@ -3371,7 +3795,7 @@ function IndividualOnfido(props) {
           MemoizedProofOfRelationship,
           {
             ...proofOfRelationshipFormProps,
-            data: data == null ? void 0 : data.proofOfRelationship,
+            data: data?.proofOfRelationship,
             id: proofOfRelationshipFormID,
             name: fullName,
             errors: errors.proofOfRelationship,
@@ -3399,56 +3823,76 @@ function IndividualOnfido(props) {
     )
   ] });
 }
-const individualOnfidoObscuredFields = [
-  "additionalPersonalDetails.idNumber",
-  "additionalPersonalDetails.idNumberExempt"
-];
-const individualOnfidoBaseMapping = {
-  "basicDetails.firstName": "individual.name.firstName",
-  "basicDetails.lastName": "individual.name.lastName",
-  "basicDetails.phoneNumber.number": "individual.phone.number",
-  "basicDetails.phoneNumber.phoneCountryCode": "individual.phone.phoneCountryCode",
-  "basicDetails.phoneNumber.type": "individual.phone.type",
-  "basicDetails.email": "individual.email",
-  "additionalPersonalDetails.birthDate": "individual.birthData.dateOfBirth",
-  "additionalPersonalDetails.idNumber": "individual.identificationData.number",
-  "additionalPersonalDetails.idNumberExempt": "individual.identificationData.nationalIdExempt",
-  "additionalPersonalDetails.typeOfIdentity": "individual.identificationData.type",
-  "additionalPersonalDetails.issuerState": "individual.identificationData.issuerState",
-  "additionalPersonalDetails.licenseCardNumber": "individual.identificationData.cardNumber",
-  "additionalPersonalDetails.expiryDate": "individual.identificationData.expiryDate",
-  "additionalPersonalDetails.nationality": "individual.nationality",
-  "additionalPersonalDetails.taxInformation": "individual.taxInformation",
-  // Address fields
-  "additionalPersonalDetails.city": "individual.residentialAddress.city",
-  "additionalPersonalDetails.country": "individual.residentialAddress.country",
-  "additionalPersonalDetails.postalCode": "individual.residentialAddress.postalCode",
-  "additionalPersonalDetails.stateOrProvince": "individual.residentialAddress.stateOrProvince",
-  "additionalPersonalDetails.address": "individual.residentialAddress.street",
-  "additionalPersonalDetails.otherAddressInformation": "individual.residentialAddress.street2"
-};
-const individualOnfidoApiKeyMapping = {
-  ...reverseMapping(individualOnfidoBaseMapping)
+const getOnfidoIdentityTypeToApiIdentityTypeMap = (data) => {
+  const { country } = data;
+  switch (country) {
+    case CountryCodes.HongKong:
+      return {
+        passport: "passport",
+        driversLicense: "driversLicense",
+        proofOfIdentityCard: "nationalIdNumber"
+      };
+    default:
+      return {
+        nationalIdNumber: "nationalIdNumber",
+        passport: "passport",
+        driversLicense: "driversLicense",
+        proofOfIdentityCard: "identityCard"
+      };
+  }
 };
-const individualOnfidoDocumentMapping = {
-  ["passport"]: "idVerificationMethod.idDocument",
-  ["proofOfResidency"]: "proofOfResidency.proofOfResidency",
-  ["proofOfNationalIdNumber"]: "proofOfNationalId.proofOfNationalId",
-  ["proofOfRelationship"]: "proofOfRelationship.proofOfRelationship"
+const adjustOnfidoIdentificationData = (data, apiData) => {
+  const { typeOfIdentity, idNumber, idNumberExempt } = data;
+  const identificationData = {
+    ...apiData,
+    number: idNumber,
+    type: getOnfidoIdentityTypeToApiIdentityTypeMap(data)[typeOfIdentity] ?? "nationalIdNumber"
+  };
+  switch (typeOfIdentity) {
+    case "passport":
+      return {
+        ...identificationData,
+        cardNumber: ""
+      };
+    case "driversLicense":
+      return {
+        ...identificationData,
+        expiryDate: ""
+      };
+    default:
+      return idNumber === void 0 && idNumberExempt === void 0 ? void 0 : {
+        ...identificationData,
+        expiryDate: "",
+        cardNumber: "",
+        nationalIdExempt: apiData?.nationalIdExempt ?? !idNumber
+      };
+  }
 };
-const mapIndividualOnfidoSchemaToLegalEntity = (individualOnfido) => {
-  var _a, _b;
+const mapIndividualOnfidoSchemaToLegalEntity = (individualOnfido, isExperimentEnabled, matchingScenario) => {
   const legalEntity = {
     ...formatObject(individualOnfido, individualOnfidoApiKeyMapping),
     type: LegalEntityType.INDIVIDUAL
   };
   if (individualOnfido.additionalPersonalDetails) {
-    legalEntity.individual.identificationData = adjustIdentificationData(
+    if (isExperimentEnabled("EnableTaxIdRequiredForBusinessAccountsScenarios") && matchingScenario?.includes(Scenarios.L_TAXINFO) && individualOnfido.additionalPersonalDetails?.idNumber && individualOnfido.additionalPersonalDetails?.typeOfIdentity && individualOnfido.additionalPersonalDetails?.country === CountryCodes.Spain) {
+      legalEntity.individual.taxInformation = [
+        {
+          country: individualOnfido.additionalPersonalDetails.country,
+          number: individualOnfido.additionalPersonalDetails.idNumber,
+          type: individualOnfido.additionalPersonalDetails.typeOfIdentity.toUpperCase()
+        }
+      ];
+    }
+    legalEntity.individual.identificationData = adjustOnfidoIdentificationData(
       individualOnfido.additionalPersonalDetails,
       legalEntity.individual.identificationData
     );
   }
-  if ((_a = individualOnfido.basicDetails) == null ? void 0 : _a.phoneNumber) {
+  const localization = mapNameLocalization(individualOnfido.basicDetails ?? {});
+  if (localization.length) {
+    legalEntity.individual.name.localization = localization;
+  }
+  if (individualOnfido.basicDetails?.phoneNumber) {
     const phone = {
       number: individualOnfido.basicDetails.phoneNumber.number,
       type: "mobile"
@@ -3456,7 +3900,7 @@ const mapIndividualOnfidoSchemaToLegalEntity = (individualOnfido) => {
     if (phone.number && legalEntity.individual) {
       legalEntity.individual.phone = phone;
     } else {
-      (_b = legalEntity == null ? void 0 : legalEntity.individual) == null ? true : delete _b.phone;
+      delete legalEntity?.individual?.phone;
     }
   }
   return legalEntity;
@@ -3465,29 +3909,37 @@ const getIndividualSchemaFromAPI = {
   ...individualOnfidoBaseMapping
 };
 const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isRoleFieldNeeded, parentLegalEntity) => {
-  var _a, _b, _c, _d, _e, _f, _g;
   let individualOnfido = {
     ...formatObject(legalEntity, getIndividualSchemaFromAPI)
   };
   individualOnfido = {
     ...individualOnfido,
     basicDetails: {
-      ...individualOnfido == null ? void 0 : individualOnfido.basicDetails,
+      ...individualOnfido?.basicDetails,
       ...isChangingType && {
         firstName: "",
-        lastName: ""
+        lastName: "",
+        localization: {}
       }
     },
     signatoryQuestionnaire: {
-      isSignatory: isChangingType ? null : ((_a = individualOnfido.signatoryQuestionnaire) == null ? void 0 : _a.isSignatory) ?? null
+      isSignatory: isChangingType ? null : individualOnfido.signatoryQuestionnaire?.isSignatory ?? null
     },
-    uboQuestionnaire: {
-      isOwner: isChangingType ? null : ((_b = individualOnfido.uboQuestionnaire) == null ? void 0 : _b.isOwner) ?? null,
-      isControllingPerson: isChangingType ? null : ((_c = individualOnfido.uboQuestionnaire) == null ? void 0 : _c.isControllingPerson) ?? null,
-      isDirector: isChangingType ? null : ((_d = individualOnfido.uboQuestionnaire) == null ? void 0 : _d.isDirector) ?? null
+    uboQuestionnaire: isChangingType ? {
+      isOwner: null,
+      isControllingPerson: null,
+      isDirector: null,
+      isNomineeShareholder: null,
+      isNomineeDirector: null
+    } : {
+      isOwner: individualOnfido.uboQuestionnaire?.isOwner ?? null,
+      isControllingPerson: individualOnfido.uboQuestionnaire?.isControllingPerson ?? null,
+      isDirector: individualOnfido.uboQuestionnaire?.isDirector ?? null,
+      isNomineeDirector: individualOnfido.uboQuestionnaire?.isNomineeDirector ?? null,
+      isNomineeShareholder: individualOnfido.uboQuestionnaire?.isNomineeShareholder ?? null
     }
   };
-  if ((_e = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _e.length) {
+  if (legalEntity?.documentDetails?.length) {
     individualOnfido = {
       ...individualOnfido,
       idVerificationMethod: {
@@ -3497,19 +3949,54 @@ const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isR
       }
     };
   }
-  if (!(parentLegalEntity == null ? void 0 : parentLegalEntity.entityAssociations)) {
+  if (legalEntity.individual?.identificationData?.type && individualOnfido.additionalPersonalDetails) {
+    const apiIdentityTypeToIdentityTypeMap = reverseMapping(
+      getOnfidoIdentityTypeToApiIdentityTypeMap(individualOnfido.additionalPersonalDetails)
+    );
+    individualOnfido.additionalPersonalDetails.typeOfIdentity = apiIdentityTypeToIdentityTypeMap[legalEntity.individual.identificationData.type];
+  }
+  if (legalEntity.individual?.name?.localization) {
+    const configs = [
+      {
+        script: "ja-Hani",
+        mappingFunction: (l) => ({
+          jaHaniFirstName: l.fields?.firstName,
+          jaHaniLastName: l.fields?.lastName
+        })
+      },
+      {
+        script: "ja-Kana",
+        mappingFunction: (l) => ({
+          jaKanaFirstName: l.fields?.firstName,
+          jaKanaLastName: l.fields?.lastName
+        })
+      }
+    ];
+    configs.forEach((config) => {
+      const localizationToMap = legalEntity.individual?.name.localization?.find(
+        (l) => l.script === config.script
+      );
+      if (localizationToMap) {
+        individualOnfido.basicDetails = {
+          ...individualOnfido.basicDetails,
+          ...config.mappingFunction(localizationToMap)
+        };
+      }
+    });
+  }
+  if (!parentLegalEntity?.entityAssociations) {
     return individualOnfido;
   }
-  const associations = ((_f = parentLegalEntity == null ? void 0 : parentLegalEntity.entityAssociations) == null ? void 0 : _f.filter((ea) => ea.legalEntityId === (legalEntity == null ? void 0 : legalEntity.id))) ?? [];
+  const associations = parentLegalEntity?.entityAssociations?.filter((ea) => ea.legalEntityId === legalEntity?.id) ?? [];
   if (isRoleFieldNeeded && individualOnfido.basicDetails) {
     individualOnfido.basicDetails.role = associations.map((ea) => ea.type);
-    individualOnfido.basicDetails.jobTitle = (_g = associations.find(
+    individualOnfido.basicDetails.jobTitle = associations.find(
       ({ jobTitle }) => Boolean(jobTitle)
-    )) == null ? void 0 : _g.jobTitle;
+    )?.jobTitle;
   }
   if (isRoleFieldNeeded && individualOnfido.signatoryQuestionnaire && individualOnfido.uboQuestionnaire) {
     const associationTypes = new Set(associations.map((ea) => ea.type));
-    const hasAssociation = (type) => associationTypes.has(type) ? "yes" : "no";
+    const hasAssociation = (type) => associationTypes.has(type) ? GuidanceQuestionValues.YES : GuidanceQuestionValues.NO;
     individualOnfido.signatoryQuestionnaire.isSignatory = hasAssociation(
       DecisionMakerType.SIGNATORY
     );
@@ -3518,6 +4005,13 @@ const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isR
       DecisionMakerType.CONTROLLING_PERSON
     );
     individualOnfido.uboQuestionnaire.isDirector = hasAssociation(DecisionMakerType.DIRECTOR);
+    const hasNomineeAssociation = (type) => associations.some((ea) => ea.type === type && ea.nominee) ? GuidanceQuestionValues.YES : GuidanceQuestionValues.NO;
+    individualOnfido.uboQuestionnaire.isNomineeDirector = hasNomineeAssociation(
+      DecisionMakerType.DIRECTOR
+    );
+    individualOnfido.uboQuestionnaire.isNomineeShareholder = hasNomineeAssociation(
+      DecisionMakerType.OWNER
+    );
   }
   individualOnfido.basicDetails = getNomineeFromAssociation(
     associations,
@@ -3526,8 +4020,7 @@ const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isR
   return individualOnfido;
 };
 const mapDocumentDetailToIdDocument = (documents) => {
-  var _a;
-  const activeDocument = (_a = documents.filter((document) => document.active)) == null ? void 0 : _a[0];
+  const activeDocument = documents.find((document) => document.active);
   return activeDocument ? {
     idDocumentType: activeDocument.type,
     modificationDate: activeDocument.modificationDate
@@ -3589,10 +4082,10 @@ const identityOnfidoBase = {
     rule: "isProofOfRelationshipRequired"
   },
   nomineeDirector: {
-    rule: "nomineeDirectorRequiredForCountry"
+    rules: ["isGuidedDecisionMakersFlowDisabled", "nomineeDirectorRequiredForCountry"]
   },
   nomineeShareholder: {
-    rule: "nomineeShareHolderRequiredForCountry"
+    rules: ["isGuidedDecisionMakersFlowDisabled", "nomineeShareHolderRequiredForCountry"]
   },
   // Regardless of scenario, we want the user to go through the "verification method" step
   // and hopefully get Onfido-verified. Otherwise, they must go through the manual flow.
@@ -3603,6 +4096,10 @@ const identityOnfidoBase = {
     // (either from Onfido or previously-uploaded document)
     rule: "isUsingInstantVerificationOrHasExistingDocument"
   },
+  idDocumentType: {
+    // If the user has a missing ID error and chooses manual flow
+    rule: "isManualIdFlowAndHasMissingData"
+  },
   /**
    * Below fields only relevant if manual ID is needed
    * @see identityNumber
@@ -3630,6 +4127,32 @@ const identityOnfidoBase = {
       "requiredIfDecisionMakerTask",
       "isDirectorRequiredForCountry"
     ]
+  },
+  isNomineeDirector: {
+    rules: [
+      "isGuidedDecisionMakersFlowEnabled",
+      "requiredIfDecisionMakerTask",
+      "nomineeDirectorRequiredForCountry"
+    ]
+  },
+  isNomineeShareholder: {
+    rules: [
+      "isGuidedDecisionMakersFlowEnabled",
+      "requiredIfDecisionMakerTask",
+      "nomineeShareHolderRequiredForCountry"
+    ]
+  },
+  jaHaniFirstName: {
+    rule: "japaneseFirstAndLastNames"
+  },
+  jaHaniLastName: {
+    rule: "japaneseFirstAndLastNames"
+  },
+  jaKanaFirstName: {
+    rule: "japaneseFirstAndLastNames"
+  },
+  jaKanaLastName: {
+    rule: "japaneseFirstAndLastNames"
   }
 };
 const identityNumber = {
@@ -3721,7 +4244,6 @@ function IndividualOnfidoDropin({
   trustedFieldsProvider,
   trustedRoles
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   const { baseUrl, rootLegalEntityId } = useApiContext();
   const { accountHolder, setAccountHolder } = useAccountHolder();
   const { i18n } = useI18nContext();
@@ -3730,12 +4252,14 @@ function IndividualOnfidoDropin({
   const { isExperimentEnabled } = useExperimentsContext();
   const { isSettingEnabled } = useSettingsContext();
   const queryClient = useQueryClient();
+  const isGuidedDecisionMakersFlowEnabled = isExperimentEnabled("EnableGuidedDecisionMakersFlow") || isExperimentEnabled("DecisionMakersFlowOptimization_GuidedDecisionMakersFlow");
+  const isGuidedDecisionMakersFlowDisabled = isExperimentEnabled("DisableGuidedDecisionMakersFlow");
   const defaultCountry = "NL";
   const { data: providerStatus } = useProviderStatus({
     providers: ["idDocument"],
     country: legalEntityResponse ? getLegalEntityCountry(legalEntityResponse) : defaultCountry
   });
-  const isInstantVerificationEnabled = ((_b = (_a = providerStatus == null ? void 0 : providerStatus.statuses) == null ? void 0 : _a.idDocument) == null ? void 0 : _b.enabled) ?? true;
+  const isInstantVerificationEnabled = providerStatus?.statuses?.idDocument?.enabled ?? true;
   const { mutateAsync: updateLegalEntity } = useUpdateLegalEntity();
   const isRoleFieldNeeded = taskType === TaskTypes.DECISION_MAKER || taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER || taskType === TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER;
   const dataFromResponse = useMemo(() => {
@@ -3766,7 +4290,7 @@ function IndividualOnfidoDropin({
   const [existingAttachments, setExistingAttachments] = useState();
   const [documents, setDocuments] = useState();
   const [country, setCountry] = useState(
-    ((_c = dataFromResponse == null ? void 0 : dataFromResponse.additionalPersonalDetails) == null ? void 0 : _c.country) ?? parentCountry
+    dataFromResponse?.additionalPersonalDetails?.country ?? parentCountry
   );
   const [derivedProps, setDerivedProps] = useState();
   const [nextHandler, setNextHandler] = useState();
@@ -3791,34 +4315,31 @@ function IndividualOnfidoDropin({
     });
   }, []);
   const individualFieldValidations = useCallback(
-    (data2) => {
-      var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j2;
-      return {
-        basicDetails: basicDetailsValidators({
-          isExperimentEnabled
-        }),
-        additionalPersonalDetails: additionalPersonalDetailsValidators({
-          country: ((_a2 = data2 == null ? void 0 : data2.additionalPersonalDetails) == null ? void 0 : _a2.country) ?? country,
-          isExperimentEnabled,
-          isSettingEnabled,
-          taskType,
-          idNumberType: (_b2 = data2 == null ? void 0 : data2.additionalPersonalDetails) == null ? void 0 : _b2.typeOfIdentity,
-          idNumberExempt: (_c2 = data2 == null ? void 0 : data2.additionalPersonalDetails) == null ? void 0 : _c2.idNumberExempt,
-          idNumber: (_d2 = data2 == null ? void 0 : data2.additionalPersonalDetails) == null ? void 0 : _d2.idNumber,
-          existingIdNumber: (_e2 = dataFromResponse.additionalPersonalDetails) == null ? void 0 : _e2.idNumber,
-          formVerificationErrors: (_f2 = problems == null ? void 0 : problems.verificationErrors) == null ? void 0 : _f2.additionalPersonalDetails,
-          i18n,
-          taxIdNumberType: ((_h2 = (_g2 = data2 == null ? void 0 : data2.additionalPersonalDetails) == null ? void 0 : _g2.taxInformation) == null ? void 0 : _h2.length) ? (_j2 = (_i2 = data2 == null ? void 0 : data2.additionalPersonalDetails) == null ? void 0 : _i2.taxInformation[0]) == null ? void 0 : _j2.type : void 0
-        })
-      };
-    },
+    (data2) => ({
+      basicDetails: basicDetailsValidators({
+        isExperimentEnabled
+      }),
+      additionalPersonalDetails: additionalPersonalDetailsValidators({
+        country: data2?.additionalPersonalDetails?.country ?? country,
+        isExperimentEnabled,
+        isSettingEnabled,
+        taskType,
+        idNumberType: data2?.additionalPersonalDetails?.typeOfIdentity,
+        idNumberExempt: data2?.additionalPersonalDetails?.idNumberExempt,
+        idNumber: data2?.additionalPersonalDetails?.idNumber,
+        existingIdNumber: dataFromResponse.additionalPersonalDetails?.idNumber,
+        formVerificationErrors: problems?.verificationErrors?.additionalPersonalDetails,
+        i18n,
+        taxIdNumberType: data2?.additionalPersonalDetails?.taxInformation?.length ? data2?.additionalPersonalDetails?.taxInformation[0]?.type : void 0
+      })
+    }),
     [
       country,
-      (_d = dataFromResponse.additionalPersonalDetails) == null ? void 0 : _d.idNumber,
+      dataFromResponse.additionalPersonalDetails?.idNumber,
       i18n,
       isExperimentEnabled,
       isSettingEnabled,
-      (_e = problems == null ? void 0 : problems.verificationErrors) == null ? void 0 : _e.additionalPersonalDetails,
+      problems?.verificationErrors?.additionalPersonalDetails,
       taskType
     ]
   );
@@ -3830,7 +4351,7 @@ function IndividualOnfidoDropin({
         phoneNumber: getAsyncPhoneValidationRules(validatePhoneNumber).phoneNumber
       },
       additionalPersonalDetails: {
-        idNumber: getAsyncIdNumberValidationRule(verifyIdNumber2, data2 == null ? void 0 : data2.additionalPersonalDetails).idNumber
+        idNumber: getAsyncIdNumberValidationRule(verifyIdNumber2, data2?.additionalPersonalDetails).idNumber
       }
     }),
     [verifyIdNumber2, validatePhoneNumber]
@@ -3847,11 +4368,11 @@ function IndividualOnfidoDropin({
     };
   }, [documents, dataFromResponse]);
   const form = useMultiForm({
-    requiredFields: derivedProps == null ? void 0 : derivedProps.requiredFields,
+    requiredFields: derivedProps?.requiredFields,
     defaultData,
     rules: individualFieldValidations,
     asyncRules: individualFieldAsyncValidations,
-    optionalFields: derivedProps == null ? void 0 : derivedProps.optionalFields
+    optionalFields: derivedProps?.optionalFields
   });
   const documentUtils = documentApiUtils({
     baseUrl: baseUrl.value,
@@ -3859,9 +4380,8 @@ function IndividualOnfidoDropin({
   });
   const { data, requiredFields } = form;
   useEffect(() => {
-    var _a2;
-    setCountry(((_a2 = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a2.country) ?? parentCountry);
-  }, [(_f = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _f.country, parentCountry]);
+    setCountry(data?.additionalPersonalDetails?.country ?? parentCountry);
+  }, [data?.additionalPersonalDetails?.country, parentCountry]);
   const { data: scenarios } = useScenarios(country, LegalEntityType.INDIVIDUAL);
   useEffect(() => {
     if (!scenarios) return;
@@ -3875,26 +4395,23 @@ function IndividualOnfidoDropin({
     country
   });
   const fieldsFromCustomRules = useMemo(
-    () => {
-      var _a2;
-      return individualOnfidoRules({
-        matchingScenario,
-        data,
-        country: ((_a2 = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _a2.country) ?? country,
-        taskType,
-        isExperimentEnabled,
-        rootLegalEntity: parentLegalEntity
-      });
-    },
-    [country, matchingScenario, data, isExperimentEnabled, parentLegalEntity, taskType]
+    () => individualOnfidoRules({
+      matchingScenario,
+      data,
+      country: data?.additionalPersonalDetails?.country ?? country,
+      taskType,
+      isExperimentEnabled,
+      rootLegalEntity: parentLegalEntity,
+      problems
+    }),
+    [country, matchingScenario, data, isExperimentEnabled, parentLegalEntity, taskType, problems]
   );
   useEffect(() => {
-    var _a2;
     const derivedProps2 = getPropsFromConfigurations(
       fieldConfigurations,
       individualOnfidoForms,
-      (problems == null ? void 0 : problems.remediationActions) ? Object.values(problems == null ? void 0 : problems.remediationActions) : [],
-      (problems == null ? void 0 : problems.missingData) ?? [],
+      problems?.remediationActions ? Object.values(problems?.remediationActions) : [],
+      problems?.missingData ?? [],
       legalEntityResponse ? getFieldsWithExistingData(
         legalEntityResponse,
         individualOnfidoApiKeyMapping,
@@ -3909,12 +4426,12 @@ function IndividualOnfidoDropin({
       fieldsFromCustomRules,
       {},
       {},
-      legalEntityResponse == null ? void 0 : legalEntityResponse.type,
+      legalEntityResponse?.type,
       [],
       true
     );
     const updatedDerivedProps = mandateIdVerificationForMotionCapture(
-      (_a2 = showIndividualMotionCapture) == null ? void 0 : _a2.value,
+      showIndividualMotionCapture?.value,
       derivedProps2
     );
     if (updatedDerivedProps) {
@@ -3924,15 +4441,14 @@ function IndividualOnfidoDropin({
     fieldConfigurations,
     legalEntityResponse,
     fieldsFromCustomRules,
-    problems == null ? void 0 : problems.remediationActions,
-    problems == null ? void 0 : problems.missingData
+    problems?.remediationActions,
+    problems?.missingData
   ]);
   useEffect(() => {
-    var _a2;
-    if (!((_a2 = legalEntityResponse == null ? void 0 : legalEntityResponse.documentDetails) == null ? void 0 : _a2.length)) return;
-    documentUtils.fetchDocuments(legalEntityResponse.documentDetails, legalEntityResponse == null ? void 0 : legalEntityResponse.id).then((res) => {
+    if (!legalEntityResponse?.documentDetails?.length) return;
+    documentUtils.fetchDocuments(legalEntityResponse.documentDetails, legalEntityResponse?.id).then((res) => {
       setExistingAttachments(res[0].attachments);
-      setDocuments(mapApiDocumentToIndividualDocuments(legalEntityResponse == null ? void 0 : legalEntityResponse.id));
+      setDocuments(mapApiDocumentToIndividualDocuments(legalEntityResponse?.id));
     }).catch(() => {
       showToast({ label: i18n.get("failedToFetchRelevantDocuments"), variant: "error" });
     });
@@ -3940,8 +4456,8 @@ function IndividualOnfidoDropin({
   const forms = useMemo(() => {
     const requiredForms = getRequiredForms(
       individualOnfidoForms,
-      derivedProps == null ? void 0 : derivedProps.requiredFields,
-      derivedProps == null ? void 0 : derivedProps.optionalFields
+      derivedProps?.requiredFields,
+      derivedProps?.optionalFields
     );
     const filteredForms = !isInstantVerificationEnabled ? requiredForms.filter((f) => f.formId !== "idVerificationMethod") : requiredForms;
     return addValidityToForms(filteredForms, form.isValid, problems);
@@ -3965,9 +4481,8 @@ function IndividualOnfidoDropin({
     legalEntity,
     idDocumentType
   }) => {
-    var _a2, _b2, _c2;
     let updatedLegalEntity;
-    const leId = (legalEntityResponse == null ? void 0 : legalEntityResponse.id) || (newDecisionMaker == null ? void 0 : newDecisionMaker.id);
+    const leId = legalEntityResponse?.id || newDecisionMaker?.id;
     if (!leId) {
       updatedLegalEntity = await createLegalEntity(legalEntity);
       userEvents.addTaskEvent("Success", {
@@ -3975,8 +4490,8 @@ function IndividualOnfidoDropin({
         actionType: "submit",
         legalEntityId: updatedLegalEntity.id,
         entityType: updatedLegalEntity.type,
-        countryOfRegistration: ((_a2 = dataSubmitted.additionalPersonalDetails) == null ? void 0 : _a2.country) || null,
-        roles: ((_b2 = dataSubmitted.basicDetails) == null ? void 0 : _b2.role) || null
+        countryOfRegistration: dataSubmitted.additionalPersonalDetails?.country || null,
+        roles: dataSubmitted.basicDetails?.role || null
       });
     } else {
       updatedLegalEntity = await updateLegalEntity({ ...drop("type").from(legalEntity), id: leId });
@@ -3985,7 +4500,7 @@ function IndividualOnfidoDropin({
         actionType: "submit",
         legalEntityId: updatedLegalEntity.id,
         entityType: updatedLegalEntity.type,
-        countryOfRegistration: ((_c2 = dataSubmitted.additionalPersonalDetails) == null ? void 0 : _c2.country) || null,
+        countryOfRegistration: dataSubmitted.additionalPersonalDetails?.country || null,
         documentType: idDocumentType || null
       });
     }
@@ -3995,14 +4510,13 @@ function IndividualOnfidoDropin({
     legalEntity,
     dataSubmitted
   }) => {
-    var _a2, _b2, _c2, _d2;
-    const idDocument = (_a2 = dataSubmitted.idVerificationMethod) == null ? void 0 : _a2.idDocument;
-    if (idDocument == null ? void 0 : idDocument.instantIdVerificationData) {
-      if (((_c2 = (_b2 = providerStatus == null ? void 0 : providerStatus.statuses) == null ? void 0 : _b2.idDocument) == null ? void 0 : _c2.enabled) === false) {
+    const idDocument2 = dataSubmitted.idVerificationMethod?.idDocument;
+    if (idDocument2?.instantIdVerificationData) {
+      if (providerStatus?.statuses?.idDocument?.enabled === false) {
         throw new Error("Provider unexpectedly disabled instant verification flow");
       }
       await handleInstantIdVerificationStartCheck(
-        idDocument.instantIdVerificationData,
+        idDocument2.instantIdVerificationData,
         legalEntity.id
       );
     } else {
@@ -4011,7 +4525,7 @@ function IndividualOnfidoDropin({
         legalEntity.id
       );
       if (!formattedDocuments || formattedDocuments.length === 0) {
-        if (existingAttachments == null ? void 0 : existingAttachments.length)
+        if (existingAttachments?.length)
           logger.log(
             "User has already uploaded documents and is not changing them, nothing needs to be done"
           );
@@ -4023,25 +4537,24 @@ function IndividualOnfidoDropin({
       }
       formattedDocuments[0].attachments = mergeAttachments(
         existingAttachments ?? [],
-        ((_d2 = formattedDocuments[0]) == null ? void 0 : _d2.attachments) ?? []
+        formattedDocuments[0]?.attachments ?? []
       ).filter((attachment) => attachment.content);
       const uploadedDocuments = await documentUtils.uploadDocuments(
         formattedDocuments,
         legalEntity.id
       );
-      uploadedDocuments == null ? void 0 : uploadedDocuments.forEach((doc) => {
-        var _a3;
+      uploadedDocuments?.forEach((doc) => {
         userEvents.addTaskEvent("Success", {
           ...associatedLeTrackingParams,
           actionType: "upload",
           documentType: doc.type,
-          fileExtention: ((_a3 = doc == null ? void 0 : doc.attachments) == null ? void 0 : _a3.map((item) => getFileExtention(item.pageName ?? ""))) ?? null
+          fileExtention: doc?.attachments?.map((item) => getFileExtention(item.pageName ?? "")).filter((item) => item !== void 0) ?? null
         });
       });
     }
   };
   const hasRolesChanged = (legalEntityId, existingEntityAssociations, newRoles) => {
-    const existingRoles = existingEntityAssociations == null ? void 0 : existingEntityAssociations.filter((association) => association.legalEntityId === legalEntityId).map(({ type }) => type);
+    const existingRoles = existingEntityAssociations?.filter((association) => association.legalEntityId === legalEntityId).map(({ type }) => type);
     return !doArraysMatch(existingRoles, newRoles);
   };
   const attachAssociationToParentLegalEntity = async ({
@@ -4049,35 +4562,31 @@ function IndividualOnfidoDropin({
     parentLE,
     dataSubmitted
   }) => {
-    var _a2, _b2, _c2;
-    const newRoles = taskType === TaskTypes.DECISION_MAKER || taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER || taskType === TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER ? (_a2 = dataSubmitted == null ? void 0 : dataSubmitted.basicDetails) == null ? void 0 : _a2.role : null;
+    const newRoles = taskType === TaskTypes.DECISION_MAKER || taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER || taskType === TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER ? dataSubmitted?.basicDetails?.role : null;
     const existingEntityAssociations = getOwnEntityAssociations(parentLE);
-    if (newRoles && (hasRolesChanged(legalEntity == null ? void 0 : legalEntity.id, existingEntityAssociations, newRoles) || ((_b2 = dataFromResponse.basicDetails) == null ? void 0 : _b2.jobTitle) !== ((_c2 = dataSubmitted == null ? void 0 : dataSubmitted.basicDetails) == null ? void 0 : _c2.jobTitle) || hasNomineesChanged(dataFromResponse.basicDetails, dataSubmitted.basicDetails))) {
+    if (newRoles && (hasRolesChanged(legalEntity?.id, existingEntityAssociations, newRoles) || dataFromResponse.basicDetails?.jobTitle !== dataSubmitted?.basicDetails?.jobTitle || hasNomineesChanged(dataFromResponse.basicDetails, dataSubmitted.basicDetails))) {
       const updatedParentLegalEntity = {
         entityAssociations: [
-          ...newRoles.map((role) => {
-            var _a3;
-            return {
-              type: role,
-              legalEntityId: legalEntity.id,
-              ...DECISION_MAKER_TYPES_WITH_JOBTITLE.some((type) => type === role) && {
-                jobTitle: (_a3 = dataSubmitted == null ? void 0 : dataSubmitted.basicDetails) == null ? void 0 : _a3.jobTitle
-              }
-            };
-          }) || [],
+          ...newRoles.map((role) => ({
+            type: role,
+            legalEntityId: legalEntity.id,
+            ...DECISION_MAKER_TYPES_WITH_JOBTITLE.some((type) => type === role) && {
+              jobTitle: dataSubmitted?.basicDetails?.jobTitle
+            }
+          })) || [],
           ...existingEntityAssociations.filter((ea) => ea.legalEntityId !== legalEntity.id) || []
         ]
       };
-      if (updatedParentLegalEntity.entityAssociations) {
+      const nomineeDataSource = !isGuidedDecisionMakersFlowDisabled && isGuidedDecisionMakersFlowEnabled ? dataSubmitted?.uboQuestionnaire : dataSubmitted.basicDetails;
+      if (nomineeDataSource && updatedParentLegalEntity.entityAssociations) {
         updatedParentLegalEntity.entityAssociations = updatedParentLegalEntity.entityAssociations.map(
-          (ea) => attachNomineeToRole(ea, country, dataSubmitted.basicDetails)
+          (ea) => attachNomineeToRole(ea, country, nomineeDataSource)
         );
       }
       await updateLegalEntity({ ...updatedParentLegalEntity, id: parentLE.id });
     }
   };
   const onSubmit = async () => {
-    var _a2, _b2;
     setLoadingStatus("loading");
     const dataSubmitted = omitObscuredFieldsIfUnchanged(
       individualOnfidoObscuredFields,
@@ -4088,13 +4597,14 @@ function IndividualOnfidoDropin({
       return;
     }
     try {
-      const legalEntity = mapIndividualOnfidoSchemaToLegalEntity(dataSubmitted);
-      const idDocumentType = (_a2 = idDocumentTypeOptions.find(
-        ({ id }) => {
-          var _a3, _b3;
-          return ((_b3 = (_a3 = dataSubmitted == null ? void 0 : dataSubmitted.idVerificationMethod) == null ? void 0 : _a3.idDocument) == null ? void 0 : _b3.idDocumentType) === id;
-        }
-      )) == null ? void 0 : _a2.id;
+      const legalEntity = mapIndividualOnfidoSchemaToLegalEntity(
+        dataSubmitted,
+        isExperimentEnabled,
+        matchingScenario
+      );
+      const idDocumentType = idDocumentTypeOptions.find(
+        ({ id }) => dataSubmitted?.idVerificationMethod?.idDocument?.idDocumentType === id
+      )?.id;
       legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(
         taskType,
         legalEntityResponse,
@@ -4106,7 +4616,7 @@ function IndividualOnfidoDropin({
         idDocumentType
       });
       setAccountHolder(accountHolder);
-      if (((_b2 = dataSubmitted.idVerificationMethod) == null ? void 0 : _b2.idVerificationMethod) !== "existingDocument") {
+      if (dataSubmitted.idVerificationMethod?.idVerificationMethod !== "existingDocument") {
         await submitDocuments({ legalEntity: createdLegalEntity, dataSubmitted });
       }
       if (parentLegalEntity) {
@@ -4122,7 +4632,7 @@ function IndividualOnfidoDropin({
       }
       setLoadingStatus("success");
       clearToasts();
-      externalOnSubmit == null ? void 0 : externalOnSubmit(dataSubmitted);
+      externalOnSubmit?.(dataSubmitted);
     } catch (e) {
       logger.error("Failed to update individual", e);
       if (isValidationError(e)) {
@@ -4145,18 +4655,14 @@ function IndividualOnfidoDropin({
     }
   };
   const datasetUtils = datasetUtilities(i18n.locale);
-  const formatIdDocument = (idDocument) => {
-    var _a2, _b2;
-    if (!idDocument) return void 0;
-    const documentType = (idDocument == null ? void 0 : idDocument.instantIdVerificationData) ? onfidoDocumentTypeMapping.find(
-      (document) => {
-        var _a3;
-        return ((_a3 = idDocument.instantIdVerificationData) == null ? void 0 : _a3.document_front.type) === document.id;
-      }
-    ) : idDocumentTypeOptions.find(({ id }) => idDocument.idDocumentType === id);
+  const formatIdDocument = (idDocument2) => {
+    if (!idDocument2) return void 0;
+    const documentType = idDocument2?.instantIdVerificationData ? onfidoDocumentTypeMapping.find(
+      (document) => idDocument2.instantIdVerificationData?.document_front.type === document.id
+    ) : idDocumentTypeOptions.find(({ id }) => idDocument2.idDocumentType === id);
     if (!documentType) return void 0;
-    const frontPage = (_a2 = idDocument.idFrontPage) == null ? void 0 : _a2[0];
-    const backPage = (_b2 = idDocument.idBackPage) == null ? void 0 : _b2[0];
+    const frontPage = idDocument2.idFrontPage?.[0];
+    const backPage = idDocument2.idBackPage?.[0];
     if (!frontPage) return void 0;
     return {
       documentType: i18n.get(documentType.name),
@@ -4175,14 +4681,13 @@ function IndividualOnfidoDropin({
     proofOfResidency,
     proofOfRelationship
   }) => {
-    var _a2, _b2, _c2;
-    const proofOfNationalIdFile = (_a2 = proofOfNationalId == null ? void 0 : proofOfNationalId.proofOfNationalId) == null ? void 0 : _a2[0];
-    const proofOfResidencyFile = (_b2 = proofOfResidency == null ? void 0 : proofOfResidency.proofOfResidency) == null ? void 0 : _b2[0];
-    const proofOfRelationshipFile = (_c2 = proofOfRelationship == null ? void 0 : proofOfRelationship.proofOfRelationship) == null ? void 0 : _c2[0];
-    const idDocument = (idVerificationMethod == null ? void 0 : idVerificationMethod.idVerificationMethod) === "manualVerification" ? manualIdUpload : idVerificationMethod == null ? void 0 : idVerificationMethod.idDocument;
+    const proofOfNationalIdFile = proofOfNationalId?.proofOfNationalId?.[0];
+    const proofOfResidencyFile = proofOfResidency?.proofOfResidency?.[0];
+    const proofOfRelationshipFile = proofOfRelationship?.proofOfRelationship?.[0];
+    const idDocument2 = idVerificationMethod?.idVerificationMethod === "manualVerification" ? manualIdUpload : idVerificationMethod?.idDocument;
     return {
-      ...((idDocument == null ? void 0 : idDocument.idDocumentType) || (idDocument == null ? void 0 : idDocument.instantIdVerificationData)) && {
-        idDocument: formatIdDocument(idDocument)
+      ...(idDocument2?.idDocumentType || idDocument2?.instantIdVerificationData) && {
+        idDocument: formatIdDocument(idDocument2)
       },
       ...proofOfNationalIdFile && {
         proofOfNationalId: {
@@ -4203,17 +4708,16 @@ function IndividualOnfidoDropin({
   };
   const isManualVerificationOrExistingDoc = (idVerificationMethod) => idVerificationMethod === "manualVerification" || idVerificationMethod === "existingDocument";
   const formatDataForSummary = () => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2;
     let summaryData = cloneObject(data);
-    if ((_a2 = summaryData == null ? void 0 : summaryData.basicDetails) == null ? void 0 : _a2.phoneNumber) {
+    if (summaryData?.basicDetails?.phoneNumber) {
       summaryData.basicDetails.phoneNumber = summaryData.basicDetails.phoneNumber.number;
     }
-    if ((_b2 = summaryData.additionalPersonalDetails) == null ? void 0 : _b2.country) {
+    if (summaryData.additionalPersonalDetails?.country) {
       summaryData.additionalPersonalDetails.country = datasetUtils.getCountryName(
         summaryData.additionalPersonalDetails.country
       );
     }
-    if ((_c2 = summaryData.additionalPersonalDetails) == null ? void 0 : _c2.nationality) {
+    if (summaryData.additionalPersonalDetails?.nationality) {
       summaryData.additionalPersonalDetails.nationality = datasetUtils.getCountryName(
         summaryData.additionalPersonalDetails.nationality
       );
@@ -4221,62 +4725,56 @@ function IndividualOnfidoDropin({
     if (summaryData.additionalPersonalDetails) {
       summaryData.address = mapAddressLabels(summaryData.additionalPersonalDetails, datasetUtils);
     }
-    if ((_d2 = summaryData.basicDetails) == null ? void 0 : _d2.accountHolder) {
+    if (summaryData.basicDetails?.accountHolder) {
       summaryData.basicDetails.accountHolder = i18n.get(summaryData.basicDetails.accountHolder);
     }
-    if ((_e2 = summaryData.additionalPersonalDetails) == null ? void 0 : _e2.birthDate) {
+    if (summaryData.additionalPersonalDetails?.birthDate) {
       summaryData.additionalPersonalDetails.birthDate = localizeDateString(
         summaryData.additionalPersonalDetails.birthDate,
         i18n.locale
       );
     }
-    if (isManualVerificationOrExistingDoc((_f2 = summaryData.idVerificationMethod) == null ? void 0 : _f2.idVerificationMethod) || summaryData.proofOfResidency) {
+    if (isManualVerificationOrExistingDoc(summaryData.idVerificationMethod?.idVerificationMethod) || summaryData.proofOfResidency) {
       const fileSummaryData = formatFileSummaryData(data);
       summaryData = { ...summaryData, ...fileSummaryData };
       summaryData.manualIdUpload = { ...summaryData.idDocument };
       summaryData.idVerificationMethod.idDocument = { ...summaryData.idDocument };
     }
-    if ((_g2 = summaryData.additionalPersonalDetails) == null ? void 0 : _g2.taxInformation) {
+    if (summaryData.additionalPersonalDetails?.taxInformation) {
       const taxInformation = summaryData.additionalPersonalDetails.taxInformation.find(
-        (taxId) => {
-          var _a3;
-          return taxId.country === ((_a3 = data.additionalPersonalDetails) == null ? void 0 : _a3.nationality);
-        }
+        (taxId) => taxId.country === data.additionalPersonalDetails?.nationality
       );
       if (taxInformation) {
         delete summaryData.additionalPersonalDetails.taxInformation;
         summaryData.additionalPersonalDetails[taxInformation.type] = taxInformation.number;
       }
     }
-    if (summaryData == null ? void 0 : summaryData.signatoryQuestionnaire) {
-      summaryData.signatoryQuestionnaire = ((_h2 = data == null ? void 0 : data.signatoryQuestionnaire) == null ? void 0 : _h2.isSignatory) === "yes" ? [i18n.get("signatorySummaryLabel")] : [];
+    if (summaryData?.signatoryQuestionnaire) {
+      summaryData.signatoryQuestionnaire = data?.signatoryQuestionnaire?.isSignatory === GuidanceQuestionValues.YES ? [i18n.get("signatorySummaryLabel")] : [];
     }
-    if (summaryData == null ? void 0 : summaryData.uboQuestionnaire) {
+    if (summaryData?.uboQuestionnaire) {
       const roleFieldToLabelMap = {
         isOwner: "ownerSummaryLabel",
         isControllingPerson: "controllingPersonSummaryLabel",
         isDirector: "directorSummaryLabel"
       };
       summaryData.uboQuestionnaire = Object.keys(roleFieldToLabelMap).flatMap(
-        (field) => {
-          var _a3;
-          return ((_a3 = data == null ? void 0 : data.uboQuestionnaire) == null ? void 0 : _a3[field]) === "yes" ? [i18n.get(roleFieldToLabelMap[field])] : [];
-        }
+        (field) => data?.uboQuestionnaire?.[field] === GuidanceQuestionValues.YES ? [i18n.get(roleFieldToLabelMap[field])] : []
       );
     }
     return summaryData;
   };
   const omittedKeysForSummary = [
     ...taskType === TaskTypes.DECISION_MAKER ? ["role"] : [],
-    ...((_g = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _g.idNumberExempt) ? ["idNumber"] : [],
-    ...isManualVerificationOrExistingDoc((_h = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _h.idVerificationMethod) ? ["idVerificationMethod", "modificationDate"] : []
+    ...data?.additionalPersonalDetails?.idNumberExempt ? ["idNumber"] : [],
+    ...isManualVerificationOrExistingDoc(data?.idVerificationMethod?.idVerificationMethod) ? ["idVerificationMethod", "modificationDate"] : []
   ];
   const omittedFormsForSummary = [
-    ...((_i = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _i.idVerificationMethod) === "instantVerification" ? ["idDocument"] : [],
-    ...((_j = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _j.idVerificationMethod) === "manualVerification" ? ["idVerificationMethod"] : []
+    ...data?.idVerificationMethod?.idVerificationMethod === "instantVerification" ? ["idDocument"] : [],
+    ...data?.idVerificationMethod?.idVerificationMethod === "manualVerification" ? ["idVerificationMethod"] : []
   ];
   const customLabelsForSummary = {
-    idVerificationMethod: ((_k = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _k.idVerificationMethod) === "instantVerification" ? "idVerificationMethod" : "idDocument"
+    idVerificationMethod: data?.idVerificationMethod?.idVerificationMethod === "instantVerification" ? "idVerificationMethod" : "idDocument"
   };
   const {
     handleNextClick,
@@ -4293,10 +4791,10 @@ function IndividualOnfidoDropin({
     triggerValidation: form.triggerValidation
     // TODO: figure out type of nested keys
   });
-  const disableNextButton = useMemo(() => {
-    const isVerificationMethod = (activeForm == null ? void 0 : activeForm.formId) === "idVerificationMethod";
-    return isVerificationMethod && !(activeForm == null ? void 0 : activeForm.isValid);
-  }, [activeForm]);
+  const disableNextButton = computed(() => {
+    const isVerificationMethod = activeForm?.formId === "idVerificationMethod";
+    return isVerificationMethod && !activeForm?.isValid || isNextStepDisabled.value;
+  });
   const handleTrackNavigation = useCallback(
     (props) => {
       trackNavigation({
@@ -4321,7 +4819,7 @@ function IndividualOnfidoDropin({
       },
       asModal,
       currentStep: steps.current,
-      disableNextButton,
+      disableNextButton: disableNextButton.value,
       forms,
       gotoFormByFormIndex,
       handleBackClick,
@@ -4342,7 +4840,7 @@ function IndividualOnfidoDropin({
           problems,
           onNext: handleNextClick,
           onBack: handleBackClick,
-          legalEntityId: legalEntityResponse == null ? void 0 : legalEntityResponse.id,
+          legalEntityId: legalEntityResponse?.id,
           allowedRoles: roleTypes,
           shouldValidate,
           accountHolder,
@@ -4359,6 +4857,5 @@ function IndividualOnfidoDropin({
 }
 export {
   IndividualOnfidoDropin as I,
-  IndividualDropin as a,
-  isOnfidoAutofillFlowEnabled as i
+  IndividualDropin as a
 };