@adyen/kyc-components 4.0.0-beta.1 → 4.0.0-beta.4

package/dist/{IndividualOnfidoDropin-DGMCOm9M.js → IndividualOnfidoDropin-DV2fJG5W.js}

@@ -2,23 +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] = "52d3345a-d07d-4d8c-b6d3-766fa62cc152", e._sentryDebugIdIdentifier = "sentry-dbid-52d3345a-d07d-4d8c-b6d3-766fa62cc152");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "cfe534b6-6e6d-48d8-b10f-96ac912068e6", e._sentryDebugIdIdentifier = "sentry-dbid-cfe534b6-6e6d-48d8-b10f-96ac912068e6");
   } catch (e) {
   }
 }
 ;
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
 import { useMemo, useState, useEffect, useCallback } from "preact/hooks";
-import { p as useApiContext, bf as useMutation, bh as httpPost, c7 as matchesRegex, c8 as trimValWithOneSpace, c9 as NO_ALPHABET_REGEX, ca as EMOJI_REGEX, cb as hasRepeatedCharacters, cc as isInvalidName, cd as INDIVIDUAL_VALID_CHAR_REGEX, ce as getFormattingRegEx, cf as SPECIAL_CHARS, cg as standardKatakanaValidator, ch as standardKanjiValidator, ar as resolveFieldMetadata, ao as CountryCodes, ci as getSSNType, ap as isEmpty, cj as defaultFieldMetadata, ck as defaultFieldConfig, bE as defaultFieldMetadata$1, bF as fieldConfig, W as TaskTypes, cl as defaultFieldMetadata$2, y as LegalEntityType, cm as defaultFieldConfig$1, cn as getAgeToday, co as euCountries, cp as getIdDocument, cq as getDocument, cr as mapExistingFile, cs as getPageName, ct as getLocalizedIdDocumentTypeOptions, cu as getPage, cv as createDocumentRequest, bS as formatObject, cw as individualApiKeyMapping, bk as individualComponentsKeyMapping, bR as reverseMapping, cx as getNomineeFromAssociation, cy as drop, X as createLogger, P as useAccountHolder, b as useI18nContext, $ as useAnalyticsContext, a5 as useToastContext, a6 as useExperimentsContext, J as useSettingsContext, cz as documentApiUtils, cA as useProviderStatus, g as getLegalEntityCountry, c2 as getAssociatedLeAnalyticsPayload, cB as addressValidators, cC as getAsyncIdNumberValidationRule, bG as getAsyncPhoneValidationRules, cD as addressFormatters, cE as useScenarios, cF as setHasMotionCaptureScenario, cG as useScenarioConfiguration, cH as getPropsFromConfigurations, cI as individualForms, cJ as showIndividualMotionCapture, bO as getRequiredForms, bP as addValidityToForms, bC as getAllowedDecisionMakerRoles, b0 as datasetUtilities, bQ as useFormComposer, c3 as trackNavigation, cK as Individual, cL as composePerScenarioFormConfigurations, cM as omitObscuredFieldsIfUnchanged, cN as filterOutUnwantedAssociationsIfRootLE, c4 as isValidationError, c5 as processValidationErrors, c6 as isMaintenanceModeError, ba as cloneObject, cO as mapAddressLabels, cP as individualDocumentForms, cQ as individualDocumentMapping, cR as individualObscuredFields, cS as mergeAttachments, cT as getFileExtention, ak as getOwnEntityAssociations, cU as hasNomineesChanged, cV as attachNomineeToRole, cW as idVerificationProviderId, cX as doArraysMatch, bD as DecisionMakerType, cY as createFormRules, bB as getAvailableDecisionMakerRoleTypes, cZ as allowedCountriesForNominee, b_ as getAddressSchemaForCountry, b$ as COUNTRIES_WITH_STATES_DATASET, c_ as Scenarios, c$ as isLowRiskCountry, az as Field, bK as Select, d0 as isTruthyValidator, d1 as licenseCardNumberDefaultMetadata, d2 as licenseCardNumberDefaultConfig, aq as mergeFieldMetadataIntoProps, ay as createFormUtils, bL as useFormContext, av as getFieldProps, d3 as idNumberFields, d4 as IdentityNumber, d5 as additionallIdNumberOptions, d6 as MaskedInput, bW as InputDate, d7 as formatDateObj, d8 as DriversLicense, d9 as addressFields, u as useAllowedCountries, K as SettingNames, da as getDefaultTaxIdNumberType, F as FormHeader, ax as ErrorPanel, C as Typography, aF as CountryField, c0 as Address, c1 as getAddressSchemaLabelsByCountry, bU as Link, b8 as Confirm, db as getAgeRangeForLegalRepresentative, dc as IndividualIdNumberTypeSelector, dd as TaxInformationField, de as PatriotActDisclosure, df as isLegalRepresentativeNeeded, aw as nameFields, dg as decisionMakerRoleFields, dh as nomineeFields, di as contactDetailFields, B as Alert, aU as ContextGuidance, a$ as TrustedFieldsProvider, dj as DecisionMakerRole, dk as NomineeDecisionMakerRole, dl as LocalizedNameFields, bq as InputText, bH as ContactDetails, dm as keysOf, a_ as objectsDeepEqual, bN as isEmpty$1, dn as RadioWithLabel, bs as listToRecord, b2 as Modal, Z as Button, bm as Svg, dp as pick, dq as IdVerification, b7 as Spacer, _ as IconButton, c as useDataset, d as datasetIdentifier, L as Loader, dr as isPersonUnderAge, ds as IdDocumentManualUpload, dt as idDocumentUploadFields, du as useFormRouterContext, bM as getFormProps, dv as useCapabilities, dw as hasMotionCaptureScenario, dx as setShowIndividualMotionCapture, dy as shouldShowMotionCapture, dz as MemoizedProofOfRelationship, dA as MemoizedDocumentUpload, dB as MemoizedProofOfResidencyUpload, dC as individualOnfidoApiKeyMapping, dD as individualOnfidoBaseMapping, bn as useQueryClient, dE as individualOnfidoDocumentMapping, dF as individualOnfidoObscuredFields } from "./StoreProvider-BmzY19Td.js";
-import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-xQlAqIqy.js";
-import { c as contactDetailsValidationRules, u as useValidatePhoneNumberImperatively } from "./validate-BN5p-GhK.js";
-import { F as FormContextProvider, a as FormFlow } from "./FormFlow-Bt-mu4Wm.js";
-import { u as useSingpassMyInfoLogin, P as ProviderButton } from "./ProviderButton-DAsW5EVa.js";
-import { u as useMultiForm } from "./useMultiForm-Bwx2nVhh.js";
-import { g as getFieldsWithExistingData } from "./getFieldsWithExistingData-BW8_TEQl.js";
-import { l as localizeDateString } from "./localizeDateString-QtCjf8Fg.js";
-import { r as rules, D as DECISION_MAKER_TYPES_WITH_JOBTITLE$1 } from "./rules-CUANHpja.js";
-import { T as TileGroup } from "./TileGroup-i5Jc08ns.js";
+import { a as useApiContext, bp as useMutation, t 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, av as resolveFieldMetadata, as as CountryCodes, c6 as getSSNType, at as isEmpty, c7 as defaultFieldMetadata, c8 as defaultFieldConfig, c9 as defaultFieldMetadata$1, ca as fieldConfig, $ as TaskTypes, cb as taxInformationDefaultFieldMetadata, O as LegalEntityTypes, 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, b7 as individualComponentsKeyMapping, bz as reverseMapping, cn as getNomineeFromAssociation, co as drop, a0 as createLogger, X as useAccountHolder, u as useI18nContext, a3 as useAnalyticsContext, a9 as useToastContext, aa as useExperimentsContext, v 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, ba 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, bk as cloneObject, cG as mapAddressLabels, cH as individualDocumentForms, cI as individualDocumentMapping, cJ as individualObscuredFields, cK as mergeAttachments, cL as getFileExtention, ao as getOwnEntityAssociations, cM as hasNomineesChanged, cN as attachNomineeToRole, cO as idVerificationProviderId, cP as doArraysMatch, N as Typography, G as Button, aD as Field, cQ as DecisionMakerTypes, 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, au as mergeFieldMetadataIntoProps, c as useTranslation, aC as createFormUtils, bK as useFormContext, az as getFieldProps, cZ as idNumberFields, c_ as IdentityNumber, c$ as additionallIdNumberOptions, d0 as MaskedInput, bJ as InputDate, d1 as formatDateObj, d2 as DriversLicense, d3 as addressFields, b as useAllowedCountries, w as SettingNames, F as FormHeader, aB as ErrorPanel, aJ as CountryField, bN as Address, bO as getAddressSchemaLabelsByCountry, bD as Link, bi as Confirm, d4 as getAgeRangeForLegalRepresentative, d5 as IndividualIdNumberTypeSelector, d6 as TaxInformationField, bE as InputText, d7 as PatriotActDisclosure, d8 as isLegalRepresentativeNeeded, aA as nameFields, d9 as decisionMakerRoleFields, da as nomineeFields, db as contactDetailFields, K as Alert, aZ as ContextGuidance, b4 as TrustedFieldsProviders, dc as DecisionMakerRole, dd as NomineeDecisionMakerRole, de as LocalizedNameFields, df as ContactDetails, dg as keysOf, b3 as objectsDeepEqual, dh as isEmpty$1, di as RadioWithLabel, dj as listToRecord, bc as Modal, dk as pick, dl as IdVerification, bh as Spacer, a2 as IconButton, e as useDataset, f as datasetIdentifier, L as Loader, H as Svg, dm as IdDocumentManualUpload, M as translateStringOrObject, aX as Trans, dn as idDocumentUploadFields, dp as useFormRouterContext, dq as getFormProps, dr as useCapabilities, ds as hasMotionCaptureScenario, dt as setShowIndividualMotionCapture, du as shouldShowMotionCapture, dv as MemoizedProofOfRelationship, dw as MemoizedDocumentUpload, dx as MemoizedProofOfResidencyUpload, dy as individualOnfidoApiKeyMapping, dz as individualOnfidoBaseMapping, br as useQueryClient, dA as individualOnfidoDocumentMapping, dB as individualOnfidoObscuredFields } from "./StoreProvider-O9jwxfG8.js";
+import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-BfnvHQJj.js";
+import { c as contactDetailsValidationRules, u as useValidatePhoneNumberImperatively } from "./validate-Cy6vBhF2.js";
+import { F as FormContextProvider, a as FormFlow } from "./FormFlow-CNXkXUwa.js";
+import { u as useSingpassMyInfoLogin, L as LandingLayout } from "./LandingLayout-BC3pp_IY.js";
+import { u as useMultiForm } from "./useMultiForm-BQmE_nfY.js";
+import { g as getFieldsWithExistingData } from "./getFieldsWithExistingData-7pZnHro-.js";
+import { l as localizeDateString } from "./localizeDateString-BlZ_CtJI.js";
+import { r as rules, D as DECISION_MAKER_TYPES_WITH_JOBTITLE$1 } from "./rules-Meybz2dk.js";
+import { signal, computed } from "@preact/signals";
+import { T as TileGroup } from "./TileGroup-tu04B8GK.js";
 const verifyIdNumber = async (legalEntityId, baseUrl, data) => {
   return await httpPost(
     {
@@ -178,55 +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: LegalEntityTypes.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;
-    })(),
-    ...jaHaniNameValidationRules,
-    ...jaKanaNameValidationRules
-  };
-};
+      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;
@@ -259,7 +256,7 @@ const mapApiIdDocumentToSchema = (idDocument2) => {
   const { hasBackPage } = getLocalizedIdDocumentTypeOptions().find(({ id }) => id === type);
   let frontPage;
   let backPage;
-  if ((attachments == null ? void 0 : attachments.length) === 1) {
+  if (attachments?.length === 1) {
     frontPage = getPage(idDocument2);
   } else {
     frontPage = hasBackPage ? getPage(idDocument2, "front") : getPage(idDocument2);
@@ -273,32 +270,31 @@ const mapApiIdDocumentToSchema = (idDocument2) => {
   };
 };
 const mapIndividualDocumentToApiDocument = async (data, entityId) => {
-  var _a, _b;
   if (!data) return void 0;
   const { proofOfNationalId, proofOfResidency, proofOfRelationship } = data;
   const idDocument2 = "idDocument" in data ? data.idDocument : data.manualIdUpload;
   const entityType = "legalEntity";
   const documents = await Promise.all([
-    (idDocument2 == null ? void 0 : idDocument2.idFrontPage) ? createDocumentRequest({
+    idDocument2?.idFrontPage ? createDocumentRequest({
       entityId,
       entityType,
       documentType: idDocument2.idDocumentType,
-      page1: (_a = idDocument2.idFrontPage) == null ? void 0 : _a[0],
-      page2: (_b = idDocument2.idBackPage) == null ? void 0 : _b[0]
+      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",
@@ -348,7 +344,7 @@ const adjustIdentificationData = (data, apiData) => {
         ...identificationData,
         expiryDate: "",
         cardNumber: "",
-        nationalIdExempt: (apiData == null ? void 0 : apiData.nationalIdExempt) ?? !idNumber
+        nationalIdExempt: apiData?.nationalIdExempt ?? !idNumber
       };
   }
 };
@@ -375,11 +371,10 @@ const mapNameLocalization = (data) => {
   return localization;
 };
 const mapIndividualToLegalEntity = (data) => {
-  var _a;
   const requestObj = {
     ...formatObject(data, individualApiKeyMapping)
   };
-  requestObj.type = LegalEntityType.INDIVIDUAL;
+  requestObj.type = LegalEntityTypes.INDIVIDUAL;
   const { personalDetails } = data;
   if (!personalDetails) return requestObj;
   requestObj.individual.identificationData = adjustIdentificationData(
@@ -390,7 +385,7 @@ const mapIndividualToLegalEntity = (data) => {
   if (localization.length) {
     requestObj.individual.name.localization = localization;
   }
-  if ((_a = personalDetails.phoneNumber) == null ? void 0 : _a.number) {
+  if (personalDetails.phoneNumber?.number) {
     requestObj.individual.phone = {
       number: personalDetails.phoneNumber.number,
       type: "mobile"
@@ -401,7 +396,6 @@ const mapIndividualToLegalEntity = (data) => {
   return requestObj;
 };
 const mapLegalEntityToIndividual = (legalEntity, isChangingType, isRoleFieldNeeded, parentLegalEntity, isLegalRepresentative) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
   let individualData = formatObject(
     legalEntity,
     individualComponentsKeyMapping
@@ -409,54 +403,47 @@ 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 (((_e = legalEntity == null ? void 0 : legalEntity.individual) == null ? void 0 : _e.residentialAddress.country) === "JP" && ((_g = (_f = legalEntity.individual) == null ? void 0 : _f.name) == null ? void 0 : _g.localization)) {
+  if (legalEntity?.individual?.residentialAddress.country === "JP" && legalEntity.individual?.name?.localization) {
     const configs = [
       {
         script: "ja-Hani",
-        mappingFunction: (l) => {
-          var _a2, _b2;
-          return {
-            jaHaniFirstName: (_a2 = l.fields) == null ? void 0 : _a2.firstName,
-            jaHaniLastName: (_b2 = l.fields) == null ? void 0 : _b2.lastName
-          };
-        }
+        mappingFunction: (l) => ({
+          jaHaniFirstName: l.fields?.firstName,
+          jaHaniLastName: l.fields?.lastName
+        })
       },
       {
         script: "ja-Kana",
-        mappingFunction: (l) => {
-          var _a2, _b2;
-          return {
-            jaKanaFirstName: (_a2 = l.fields) == null ? void 0 : _a2.firstName,
-            jaKanaLastName: (_b2 = l.fields) == null ? void 0 : _b2.lastName
-          };
-        }
+        mappingFunction: (l) => ({
+          jaKanaFirstName: l.fields?.firstName,
+          jaKanaLastName: l.fields?.lastName
+        })
       }
     ];
     configs.forEach((config) => {
-      var _a2, _b2;
-      const localizationToMap = (_b2 = (_a2 = legalEntity.individual) == null ? void 0 : _a2.name.localization) == null ? void 0 : _b2.find(
+      const localizationToMap = legalEntity.individual?.name.localization?.find(
         (l) => l.script === config.script
       );
       if (localizationToMap) {
@@ -467,24 +454,24 @@ const mapLegalEntityToIndividual = (legalEntity, isChangingType, isRoleFieldNeed
       }
     });
   }
-  if (!(parentLegalEntity == null ? void 0 : parentLegalEntity.entityAssociations)) {
+  if (!parentLegalEntity?.entityAssociations) {
     return individualData;
   }
-  const associations = ((_h = parentLegalEntity == null ? void 0 : parentLegalEntity.entityAssociations) == null ? void 0 : _h.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 = (_i = associations.find(
+    individualData.personalDetails.jobTitle = associations.find(
       ({ jobTitle }) => Boolean(jobTitle)
-    )) == null ? void 0 : _i.jobTitle;
+    )?.jobTitle;
   }
   individualData.personalDetails = getNomineeFromAssociation(
     associations,
     individualData.personalDetails
   );
   if (isLegalRepresentative) {
-    individualData.personalDetails.relationship = (_j = associations.find(
+    individualData.personalDetails.relationship = associations.find(
       ({ relationship }) => Boolean(relationship)
-    )) == null ? void 0 : _j.relationship;
+    )?.relationship;
   }
   return individualData;
 };
@@ -677,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();
@@ -725,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();
@@ -756,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();
@@ -787,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]
@@ -812,19 +795,18 @@ 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]);
-  const { data: scenarios } = useScenarios(country, LegalEntityType.INDIVIDUAL);
+    setCountry(data?.personalDetails?.residencyCountry ?? parentCountry);
+  }, [data?.personalDetails?.residencyCountry, parentCountry]);
+  const { data: scenarios } = useScenarios(country, LegalEntityTypes.INDIVIDUAL);
   useEffect(() => {
     if (!scenarios) return;
     setHasMotionCaptureScenario(scenarios);
@@ -832,32 +814,28 @@ function IndividualDropin({
   }, [scenarios]);
   const { fieldConfigurations } = useScenarioConfiguration({
     parseConfiguration: parseConfiguration$1,
-    legalEntityType: LegalEntityType.INDIVIDUAL,
+    legalEntityType: LegalEntityTypes.INDIVIDUAL,
     setLoadingStatus,
     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,
-        problems
-      });
-    },
+    () => 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,
@@ -873,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);
@@ -886,50 +864,45 @@ 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" });
     });
-  }, []);
+  }, [legalEntityResponse]);
   const { mutateAsync: createLegalEntity } = useCreateLegalEntity();
   const { mutateAsync: updateLegalEntity } = useUpdateLegalEntity();
   const idDocumentTypeOptions = getLocalizedIdDocumentTypeOptions(country);
@@ -938,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", {
@@ -948,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 };
@@ -959,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
       });
     }
@@ -981,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(
@@ -997,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"
           );
@@ -1009,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 ?? "")).filter((item) => item !== void 0)) ?? 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 ({
@@ -1036,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) || []
         ]
       };
@@ -1062,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]
@@ -1075,7 +1040,6 @@ function IndividualDropin({
     }
   };
   const onSubmit = async () => {
-    var _a2;
     setLoadingStatus("loading");
     const dataSubmitted = omitObscuredFieldsIfUnchanged(
       individualObscuredFields,
@@ -1087,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,
@@ -1114,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)) {
@@ -1140,17 +1101,13 @@ function IndividualDropin({
   const isDocumentsRequired = (forms2) => forms2.some((form2) => individualDocumentForms.includes(form2.formId));
   const datasetUtils = datasetUtilities(i18n.locale);
   const formatIdDocument = (idDocument2) => {
-    var _a2, _b2;
     if (!idDocument2) return void 0;
-    const documentType = (idDocument2 == null ? void 0 : idDocument2.instantIdVerificationData) ? onfidoDocumentTypeMapping.find(
-      (document) => {
-        var _a3;
-        return ((_a3 = idDocument2.instantIdVerificationData) == null ? void 0 : _a3.document_front.type) === document.id;
-      }
+    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 = idDocument2.idFrontPage) == null ? void 0 : _a2[0];
-    const backPage = (_b2 = idDocument2.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),
@@ -1168,12 +1125,11 @@ function IndividualDropin({
     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 {
-      ...((idDocument2 == null ? void 0 : idDocument2.idDocumentType) || (idDocument2 == null ? void 0 : idDocument2.instantIdVerificationData)) && {
+      ...(idDocument2?.idDocumentType || idDocument2?.instantIdVerificationData) && {
         idDocument: formatIdDocument(idDocument2)
       },
       ...proofOfNationalIdFile && {
@@ -1194,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
       );
@@ -1213,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;
@@ -1244,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,
@@ -1305,7 +1257,7 @@ function IndividualDropin({
           onNext: handleNextClick,
           onBack: handleBackClick,
           setHideFooter,
-          legalEntityId: legalEntityResponse == null ? void 0 : legalEntityResponse.id,
+          legalEntityId: legalEntityResponse?.id,
           allowedRoles: roleTypes,
           shouldValidate,
           accountHolder,
@@ -1360,59 +1312,111 @@ 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: LegalEntityTypes.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$4 = {
+  guidanceQuestion,
+  options
+};
+const GuidanceQuestionValues = {
+  YES: "Yes",
+  NO: "No"
+};
+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$4.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$4.options, children: () => /* @__PURE__ */ jsx(
+      TileGroup,
+      {
+        allowMultiple: false,
+        errorMessage,
+        isHorizontal: true,
+        maxSelected: 1,
+        name,
+        onChange: handleChange,
+        selected: value || "",
+        tiles: [
+          { label: yesTileLabel, value: GuidanceQuestionValues.YES },
+          { label: noTileLabel, value: GuidanceQuestionValues.NO }
+        ]
+      }
+    ) })
+  ] });
+};
 const areArraysDifferent = (a = [], b = []) => {
   if (a.length !== b.length) {
     return true;
@@ -1422,23 +1426,22 @@ 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",
-      role: DecisionMakerType.SIGNATORY
+      isApplicable: data?.signatoryQuestionnaire?.isSignatory === GuidanceQuestionValues.YES,
+      role: DecisionMakerTypes.SIGNATORY
     },
     {
-      isApplicable: ((_b = data == null ? void 0 : data.uboQuestionnaire) == null ? void 0 : _b.isOwner) === "yes",
-      role: DecisionMakerType.OWNER
+      isApplicable: data?.uboQuestionnaire?.isOwner === GuidanceQuestionValues.YES,
+      role: DecisionMakerTypes.OWNER
     },
     {
-      isApplicable: ((_c = data == null ? void 0 : data.uboQuestionnaire) == null ? void 0 : _c.isControllingPerson) === "yes",
-      role: DecisionMakerType.CONTROLLING_PERSON
+      isApplicable: data?.uboQuestionnaire?.isControllingPerson === GuidanceQuestionValues.YES,
+      role: DecisionMakerTypes.CONTROLLING_PERSON
     },
     {
-      isApplicable: ((_d = data == null ? void 0 : data.uboQuestionnaire) == null ? void 0 : _d.isDirector) === "yes",
-      role: DecisionMakerType.DIRECTOR
+      isApplicable: data?.uboQuestionnaire?.isDirector === GuidanceQuestionValues.YES,
+      role: DecisionMakerTypes.DIRECTOR
     }
   ];
   return roleMappings.filter(({ isApplicable }) => isApplicable).map(({ role }) => role);
@@ -1478,8 +1481,8 @@ const TAX_ID_REQUIRED_COUNTRIES = [
   CountryCodes.France
 ];
 const DECISION_MAKER_TYPES_WITH_JOBTITLE = [
-  DecisionMakerType.SIGNATORY,
-  DecisionMakerType.CONTROLLING_PERSON
+  DecisionMakerTypes.SIGNATORY,
+  DecisionMakerTypes.CONTROLLING_PERSON
 ];
 const ID_MISSING_DATA_ERROR_CODE = "2_8071";
 const individualOnfidoRules = ({
@@ -1498,32 +1501,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 !== DecisionMakerTypes.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 === DecisionMakerTypes.DIRECTOR)) {
       return REQUIRED;
     }
   },
   idNumberRules: () => {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    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 (country === CountryCodes.UnitedStates && ((_d = (_c = data.basicDetails) == null ? void 0 : _c.role) == null ? void 0 : _d.every((role) => role === DecisionMakerType.SIGNATORY))) {
+    if (country === CountryCodes.UnitedStates && data.basicDetails?.role?.every((role) => role === DecisionMakerTypes.SIGNATORY)) {
       return void 0;
     }
-    if ((_f = (_e = data.basicDetails) == null ? void 0 : _e.role) == null ? void 0 : _f.some((role) => role !== DecisionMakerType.DIRECTOR)) {
+    if (data.basicDetails?.role?.some((role) => role !== DecisionMakerTypes.DIRECTOR)) {
       return REQUIRED;
     }
-    if (ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES.includes(country) && ((_h = (_g = data.basicDetails) == null ? void 0 : _g.role) == null ? void 0 : _h.some((role) => role === DecisionMakerType.DIRECTOR))) {
+    if (ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES.includes(country) && data.basicDetails?.role?.some((role) => role === DecisionMakerTypes.DIRECTOR)) {
       return REQUIRED;
     }
   },
@@ -1533,11 +1534,10 @@ const individualOnfidoRules = ({
     }
   },
   idNumberExemptIfApplicableCountry: () => {
-    var _a, _b;
-    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 && ((_b = (_a = data.basicDetails) == null ? void 0 : _a.role) == null ? void 0 : _b.every((role) => role === DecisionMakerType.SIGNATORY))) {
+    if (country === CountryCodes.UnitedStates && data.basicDetails?.role?.every((role) => role === DecisionMakerTypes.SIGNATORY)) {
       return void 0;
     }
     if (ID_NUMBER_EXEMPT_COUNTRIES.includes(country)) {
@@ -1545,30 +1545,28 @@ 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";
+    if (taskType === TaskTypes.DECISION_MAKER && data.basicDetails?.role?.includes(DecisionMakerTypes.SIGNATORY) && matchingScenario?.includes(Scenarios.L_BAFIN)) {
+      return void 0;
+    }
+    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;
     }
@@ -1579,15 +1577,19 @@ 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;
     }
   },
+  isIdVerificationMethodRequired: () => {
+    if (taskType === TaskTypes.DECISION_MAKER && data.basicDetails?.role?.includes(DecisionMakerTypes.SIGNATORY) && matchingScenario?.includes(Scenarios.L_BAFIN)) {
+      return void 0;
+    }
+    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(DecisionMakerTypes.SIGNATORY)) {
         return REQUIRED;
       }
       return;
@@ -1596,22 +1598,28 @@ 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;
+    }
+  },
+  isPlaceOfBirthRequired: () => {
+    if (taskType === TaskTypes.DECISION_MAKER && data.basicDetails?.role?.includes(DecisionMakerTypes.SIGNATORY) && matchingScenario?.includes(Scenarios.L_BAFIN)) {
       return REQUIRED;
     }
   },
   nationalityIfRequiredForRole: () => {
-    var _a, _b;
+    if (taskType === TaskTypes.DECISION_MAKER && data.basicDetails?.role?.includes(DecisionMakerTypes.SIGNATORY) && matchingScenario?.includes(Scenarios.L_BAFIN)) {
+      return REQUIRED;
+    }
     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) || ((_b = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _b.nationality)) {
+    if (NATIONALITY_REQUIRED_FOR_COUNTRIES.includes(country) || data?.additionalPersonalDetails?.nationality) {
       return REQUIRED;
     }
   },
@@ -1621,20 +1629,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;
     }
   },
@@ -1642,87 +1647,76 @@ 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(DecisionMakerTypes.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(DecisionMakerTypes.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, _c;
-    const hasMissingId = (_a = problems == null ? void 0 : problems.missingData) == null ? void 0 : _a.some(
+    const hasMissingId = problems?.missingData?.some(
       (error) => error.code === ID_MISSING_DATA_ERROR_CODE
     );
-    const isManualFlow = ((_b = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _b.idVerificationMethod) === "manualVerification";
-    const idNumberExempt = (_c = data == null ? void 0 : data.additionalPersonalDetails) == null ? void 0 : _c.idNumberExempt;
+    const isManualFlow = data?.idVerificationMethod?.idVerificationMethod === "manualVerification";
+    const idNumberExempt = data?.additionalPersonalDetails?.idNumberExempt;
     return isManualFlow && (idNumberExempt || hasMissingId) ? "REQUIRED" : void 0;
   },
   isManualIdFlowAndHasMissingData: () => {
-    var _a, _b;
-    const hasMissingId = (_a = problems == null ? void 0 : problems.missingData) == null ? void 0 : _a.some(
+    const hasMissingId = problems?.missingData?.some(
       (error) => error.code === ID_MISSING_DATA_ERROR_CODE
     );
-    const isManualFlow = ((_b = data == null ? void 0 : data.idVerificationMethod) == null ? void 0 : _b.idVerificationMethod) === "manualVerification";
+    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("EnableGuidedDecisionMakersFlow") && !isExperimentEnabled("DecisionMakersFlowOptimization_GuidedDecisionMakersFlow")) {
+    if (isExperimentEnabled("DisableGuidedDecisionMakersFlow") || !isExperimentEnabled("EnableGuidedDecisionMakersFlow") && !isExperimentEnabled("DecisionMakersFlowOptimization_GuidedDecisionMakersFlow")) {
       return "REQUIRED";
     }
   },
   isDirectorRequiredForCountry: () => {
-    const availableDecisionMakers = getAvailableDecisionMakerRoleTypes(country);
+    const availableDecisionMakers = getAvailableDecisionMakerRoleTypes(country, matchingScenario);
     const isDirectorRequired = availableDecisionMakers.some(
-      (maker) => maker.roleType === DecisionMakerType.DIRECTOR
+      (maker) => maker.roleType === DecisionMakerTypes.DIRECTOR
     );
     if (isDirectorRequired) {
       return "REQUIRED";
@@ -1786,7 +1780,6 @@ const identityValidationRules = (country) => {
   }
 };
 function Identity(props) {
-  var _a, _b, _c;
   const { additionalPersonalDetails, country, idNumberType, handleFieldChange } = props;
   const {
     data,
@@ -1838,7 +1831,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(
@@ -1850,21 +1843,21 @@ function Identity(props) {
         initialFormUtilProps
       )
     );
-  }, [country, data == null ? void 0 : data.typeOfIdentity, initialFormUtilProps, licenseCardNumberMetaData]);
-  const { i18n } = useI18nContext();
-  const formUtils = useMemo(() => createFormUtils(mergedProps, i18n), [mergedProps, i18n]);
+  }, [country, data?.typeOfIdentity, initialFormUtilProps, licenseCardNumberMetaData]);
+  const { t } = useTranslation();
+  const formUtils = useMemo(() => createFormUtils(mergedProps, t), [mergedProps, t]);
   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;
   }
@@ -1887,15 +1880,15 @@ 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",
@@ -1904,43 +1897,43 @@ function Identity(props) {
         formatGuidance: formUtils.getGuidanceText("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"),
         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,
-            placeholder: i18n.get("datePlaceholder"),
+            value: data?.expiryDate,
+            placeholder: t(($) => $["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,
@@ -1952,9 +1945,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),
@@ -1977,14 +1970,14 @@ function Identity(props) {
         formatGuidance: formUtils.getGuidanceText("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")
       }
     )
@@ -2012,16 +2005,17 @@ const additionalPersonalDetailsFields = [
   ...additionalIdentityInfoFields,
   "country",
   "nationality",
+  "placeOfBirth",
   ...addressFields,
   "taxInformation"
 ];
 function AdditionalPersonalDetails(props) {
-  var _a, _b;
-  const { i18n } = useI18nContext();
+  const { t } = useTranslation(["common", "individual"]);
   const allowedCountries = useAllowedCountries();
   const [showLegalRepresentativePrompt, setShowLegalRepresentativePrompt] = useState(false);
   const { isSettingEnabled } = useSettingsContext();
   const { isExperimentEnabled } = useExperimentsContext();
+  const { form } = useFormContext();
   const isExperimentAgeVerificationEnabled = isExperimentEnabled("EnableAgeVerification");
   const isSettingsEnforceLegalAgeEnabled = isSettingEnabled(SettingNames.EnforceLegalAge);
   const {
@@ -2036,25 +2030,24 @@ 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)
-  );
   const mergedProps = mergeFieldMetadataIntoProps(
     "taxInformation",
     resolveFieldMetadata(
-      defaultFieldConfig$1[country],
+      taxInformationDefaultFieldConfig[country],
       {
-        taxIdNumberType,
-        companyType: LegalEntityType.INDIVIDUAL
+        taxIdNumberType: form.data?.additionalPersonalDetails?.taxInformation?.find(
+          (taxId) => taxId.country === country
+        )?.type,
+        companyType: LegalEntityTypes.INDIVIDUAL
       },
-      defaultFieldMetadata$2
+      taxInformationDefaultFieldMetadata
     ),
     props
   );
-  const formUtils = createFormUtils(mergedProps, i18n);
+  const formUtils = createFormUtils(mergedProps, t);
   const birthDateErrorMessage = formUtils.getErrorMessage(
     "birthDate",
     errors,
@@ -2083,14 +2076,14 @@ function AdditionalPersonalDetails(props) {
       }
     ),
     /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-additional-information__section-heading", children: [
-      /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: i18n.get("residentialAddress") }),
-      /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: i18n.get("residentialAddressDescription") })
+      /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["residentialAddress"]) }),
+      /* @__PURE__ */ jsx(Typography, { el: "p", variant: "body", children: t(($) => $["thisPersonsPrimaryAddress"], { ns: "individual" }) })
     ] }),
     formUtils.isRequiredField("country") && /* @__PURE__ */ jsx(
       CountryField,
       {
         data: { country },
-        valid: { country: valid == null ? void 0 : valid.country },
+        valid: { country: valid?.country },
         errors: {
           country: formUtils.getErrorMessage("country", errors, fieldValidationErrors)
         },
@@ -2116,11 +2109,11 @@ function AdditionalPersonalDetails(props) {
       }
     ),
     /* @__PURE__ */ jsxs("div", { className: "adyen-kyc-additional-information__section-heading", children: [
-      /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: i18n.get("personalIdentityDetails") }),
+      /* @__PURE__ */ jsx(Typography, { el: "h3", variant: "title", children: t(($) => $["personalIdentityDetails"], { ns: "individual" }) }),
       /* @__PURE__ */ jsxs(Typography, { el: "p", variant: "body", children: [
-        i18n.get("personalIdentityDetailsDescription"),
+        t(($) => $["weOnlyUseTheseDetailsForIdentityVerification"], { ns: "individual" }),
         " ",
-        /* @__PURE__ */ jsx(Link, { href: "https://www.adyen.com/privacy-policy", external: true, children: i18n.get("personalIdentityDetailsDescriptionLink") })
+        /* @__PURE__ */ jsx(Link, { href: "https://www.adyen.com/privacy-policy", external: true, children: t(($) => $["privacyStatement"]) })
       ] })
     ] }),
     formUtils.isRequiredField("birthDate") && /* @__PURE__ */ jsx(
@@ -2129,19 +2122,19 @@ function AdditionalPersonalDetails(props) {
         name: "birthDate",
         label: formUtils.getLabel("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,
-            placeholder: i18n.get("datePlaceholder"),
+            value: data?.birthDate,
+            placeholder: t(($) => $["datePlaceholder"]),
             readonly: formUtils.isReadOnly("birthDate"),
             onInput: handleFieldChange("birthDate", "input"),
             onBlur: handleBirthDateChange,
             "aria-required": true,
-            "aria-invalid": !(valid == null ? void 0 : valid.birthDate),
+            "aria-invalid": !valid?.birthDate,
             max: formatDateObj(/* @__PURE__ */ new Date())
           }
         )
@@ -2150,15 +2143,16 @@ function AdditionalPersonalDetails(props) {
     showLegalRepresentativePrompt && /* @__PURE__ */ jsx(
       Confirm,
       {
-        title: i18n.get("legalRepresentativeForMinorIsRequired"),
-        description: i18n.get("becauseThisPersonIsUnderXYearsOld", {
-          values: { age: ((_b = (_a = getAgeRangeForLegalRepresentative(country)) == null ? void 0 : _a.max) == null ? void 0 : _b.toString()) ?? "" }
+        title: t(($) => $["legalRepresentativeForMinorIsRequired"], { ns: "individual" }),
+        description: t(($) => $["becauseThisPersonIsUnderXYearsOld"], {
+          ns: "individual",
+          age: getAgeRangeForLegalRepresentative(country)?.max?.toString() ?? ""
         }),
         onCancel: () => {
           setShowLegalRepresentativePrompt(false);
         },
-        confirmText: i18n.get("ok"),
-        cancelText: i18n.get("editDetails"),
+        confirmText: t(($) => $["ok"]),
+        cancelText: t(($) => $["editDetails"]),
         onConfirm: () => {
           setShowLegalRepresentativePrompt(false);
         }
@@ -2169,7 +2163,7 @@ function AdditionalPersonalDetails(props) {
       {
         country,
         handleFieldChange: handleFieldChange("typeOfIdentity", "input"),
-        selected: data == null ? void 0 : data.typeOfIdentity
+        selected: data?.typeOfIdentity
       }
     ),
     /* @__PURE__ */ jsx(
@@ -2178,15 +2172,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",
@@ -2196,24 +2190,21 @@ function AdditionalPersonalDetails(props) {
         },
         labels: formUtils.getFieldLabels(["taxInformation"]),
         mask: formUtils.getMask("taxInformation"),
-        helperText: formUtils.getFieldHelperText(["taxInformation"]),
         guidanceText: formUtils.getFieldGuidanceText(["taxInformation"]),
         readonly: formUtils.isReadOnly("taxInformation"),
         shouldValidate,
         handleChangeFor: handleFieldChange,
         canExempt: false,
         country,
-        companyType: LegalEntityType.INDIVIDUAL,
-        taxIdNumberType,
-        setTaxIdNumberType,
-        defaultData: data == null ? void 0 : data.taxInformation
+        entityType: LegalEntityTypes.INDIVIDUAL,
+        defaultData: data?.taxInformation
       }
     ),
     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)
@@ -2223,6 +2214,28 @@ function AdditionalPersonalDetails(props) {
         handleChangeFor: () => handleFieldChange("nationality", "input")
       }
     ),
+    formUtils.isRequiredField("placeOfBirth") && /* @__PURE__ */ jsx(
+      Field,
+      {
+        name: "placeOfBirth",
+        label: formUtils.getLabel("placeOfBirth"),
+        errorMessage: formUtils.getErrorMessage("placeOfBirth", errors, fieldValidationErrors),
+        isValid: valid?.placeOfBirth,
+        children: (childProps) => /* @__PURE__ */ jsx(
+          InputText,
+          {
+            ...childProps,
+            name: "placeOfBirth",
+            value: data?.placeOfBirth,
+            readonly: formUtils.isReadOnly("placeOfBirth"),
+            onInput: handleFieldChange("placeOfBirth", "input"),
+            onBlur: handleFieldChange("placeOfBirth", "blur"),
+            "aria-required": true,
+            "aria-invalid": !valid?.placeOfBirth
+          }
+        )
+      }
+    ),
     country === "US" && isIndividual ? /* @__PURE__ */ jsx(PatriotActDisclosure, {}) : void 0
   ] });
 }
@@ -2239,13 +2252,14 @@ const basicDetailsFields = [
   "jaKanaLastName"
 ];
 function BasicDetails(props) {
-  var _a, _b, _c;
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
   const {
     form: { triggerValidation }
   } = useFormContext();
   const { isExperimentEnabled } = useExperimentsContext();
   const isGuidedDecisionMakersFlowEnabled = isExperimentEnabled("EnableGuidedDecisionMakersFlow") || isExperimentEnabled("DecisionMakersFlowOptimization_GuidedDecisionMakersFlow");
+  const isGuidedDecisionMakersFlowDisabled = isExperimentEnabled("DisableGuidedDecisionMakersFlow");
   const {
     country,
     data,
@@ -2264,7 +2278,7 @@ function BasicDetails(props) {
   } = props;
   const isDecisionMakerTask = taskType === TaskTypes.DECISION_MAKER || taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER || taskType === TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER;
   const isLegalRepresentativeDetailsTask = taskType === TaskTypes.LEGAL_REPRESENTATIVE_DETAILS;
-  const formUtils = createFormUtils(props, i18n);
+  const formUtils = createFormUtils(props, t);
   const decisionMakerRoleProps = getFieldProps(props, decisionMakerRoleFields);
   const nomineeProps = getFieldProps(props, nomineeFields);
   const localizedNameProps = getFieldProps(props, [
@@ -2296,8 +2310,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 || ""
           }
         })
       }
@@ -2311,10 +2325,10 @@ function BasicDetails(props) {
         contentId: "reasonForFillingIndividualPersonalDetails"
       }
     ),
-    isDecisionMakerTask && trustedFieldsProvider === TrustedFieldsProvider.SINGPASS && readOnlyFields && /* @__PURE__ */ jsx(Typography, { color: "secondary", variant: "caption", children: i18n.get(
+    isDecisionMakerTask && trustedFieldsProvider === TrustedFieldsProviders.SINGPASS && readOnlyFields && /* @__PURE__ */ jsx(Typography, { color: "secondary", variant: "caption", children: i18n.get(
       "weSelectedSomeRolesBasedOnMyinfoBusinessDataAboutYourCompanysAppointmentHoldersAndShareholders"
     ) }),
-    isDecisionMakerTask && !isGuidedDecisionMakersFlowEnabled && /* @__PURE__ */ jsxs(Fragment, { children: [
+    isDecisionMakerTask && (isGuidedDecisionMakersFlowDisabled || !isGuidedDecisionMakersFlowEnabled) && /* @__PURE__ */ jsxs(Fragment, { children: [
       /* @__PURE__ */ jsx(
         DecisionMakerRole,
         {
@@ -2331,7 +2345,7 @@ function BasicDetails(props) {
         NomineeDecisionMakerRole,
         {
           ...nomineeProps,
-          roles: data == null ? void 0 : data.role,
+          roles: data?.role,
           country,
           handleFieldChange
         }
@@ -2356,7 +2370,7 @@ function BasicDetails(props) {
           {
             ...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"),
@@ -2366,7 +2380,7 @@ function BasicDetails(props) {
         )
       }
     ),
-    !!((_c = contactDetailsFormProps == null ? void 0 : contactDetailsFormProps.requiredFields) == null ? void 0 : _c.length) && /* @__PURE__ */ jsx(
+    !!contactDetailsFormProps?.requiredFields?.length && /* @__PURE__ */ jsx(
       ContactDetails,
       {
         ...contactDetailsFormProps,
@@ -2475,16 +2489,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$3 = {
   conflictRowTable,
   conflictRowList,
   conflictRowListOptionLabel
@@ -2510,7 +2525,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$3.conflictRowList, children: [
     /* @__PURE__ */ jsx("dt", { children: /* @__PURE__ */ jsx(Typography, { variant: "caption", children: i18n.get(label) }) }),
     /* @__PURE__ */ jsxs("dd", { children: [
       /* @__PURE__ */ jsxs("div", { children: [
@@ -2519,7 +2534,7 @@ const ConflictRow = ({
           {
             variant: "caption",
             color: "tertiary",
-            className: styles$6.conflictRowListOptionLabel,
+            className: styles$3.conflictRowListOptionLabel,
             children: i18n.get("youEntered")
           }
         ),
@@ -2539,7 +2554,7 @@ const ConflictRow = ({
           {
             variant: "caption",
             color: "tertiary",
-            className: styles$6.conflictRowListOptionLabel,
+            className: styles$3.conflictRowListOptionLabel,
             children: i18n.get("weDetected")
           }
         ),
@@ -2554,7 +2569,7 @@ const ConflictRow = ({
         )
       ] })
     ] })
-  ] }) : /* @__PURE__ */ jsxs("tr", { className: styles$6.conflictRowTable, children: [
+  ] }) : /* @__PURE__ */ jsxs("tr", { className: styles$3.conflictRowTable, children: [
     /* @__PURE__ */ jsx("td", { children: /* @__PURE__ */ jsx(Typography, { variant: "caption", children: i18n.get(label) }) }),
     /* @__PURE__ */ jsx("td", { children: /* @__PURE__ */ jsx(
       RadioWithLabel,
@@ -2580,7 +2595,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$2 = {
   dataConflictsWrapper,
   dataConflictsHeader,
   dataConflictsTable,
@@ -2621,13 +2636,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$2.dataConflictsWrapper, children: [
+      /* @__PURE__ */ jsxs("div", { className: styles$2.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$2.dataConflictsList, children: keysOf(conflictItems).map((property) => /* @__PURE__ */ jsx(
         ConflictRow,
         {
           showAs: "listItem",
@@ -2640,7 +2655,7 @@ const DataConflictsModal = ({
         },
         property
       )) }),
-      /* @__PURE__ */ jsxs("table", { className: styles$5.dataConflictsTable, children: [
+      /* @__PURE__ */ jsxs("table", { className: styles$2.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") }) }),
@@ -2697,57 +2712,11 @@ const DataConflictsModal = ({
     )
   ] });
 };
-const verificationDisclaimer = "adyen-kyc-verification-disclaimer";
-const styles$4 = {
-  verificationDisclaimer
-};
-const IdVerificationDisclaimer = () => {
-  const { i18n } = useI18nContext();
-  return /* @__PURE__ */ jsxs(Typography, { variant: "caption", color: "tertiary", className: styles$4.verificationDisclaimer, children: [
-    i18n.get("ifYouChooseToUseOnfido"),
-    " ",
-    /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/privacy/", external: true, inline: true, children: i18n.get("onfidoPrivacyPolicy") }),
-    " ",
-    i18n.get("and"),
-    " ",
-    /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/terms-of-service/", external: true, inline: true, children: i18n.get("onfidoTermsOfService") })
-  ] });
-};
-const verificationHeader = "adyen-kyc-verification-header";
 const verificationHeaderImage = "adyen-kyc-verification-header-image";
-const verificationHeaderContent = "adyen-kyc-verification-header-content";
-const styles$3 = {
-  verificationHeader,
-  verificationHeaderImage,
-  verificationHeaderContent
-};
-const IdVerificationHeader = () => {
-  const { i18n } = useI18nContext();
-  return /* @__PURE__ */ jsxs("div", { className: styles$3.verificationHeader, children: [
-    /* @__PURE__ */ jsx(
-      Svg,
-      {
-        className: styles$3.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: [
-      i18n.get("takeOrUploadAPhoto"),
-      " ",
-      /* @__PURE__ */ jsx(Link, { href: "https://onfido.com", external: true, inline: true, children: i18n.get("onfido") })
-    ] })
-  ] });
-};
-const verifyOnfidoContainer = "adyen-kyc-verify-onfido-container";
 const verifyOnfidoError = "adyen-kyc-verify-onfido-error";
-const verifyOnfidoContent = "adyen-kyc-verify-onfido-content";
-const styles$2 = {
-  verifyOnfidoContainer,
-  verifyOnfidoError,
-  verifyOnfidoContent
+const styles$1 = {
+  verificationHeaderImage,
+  verifyOnfidoError
 };
 const toIndividualOnfidoConflictSchema = ({
   basicDetails,
@@ -2755,13 +2724,13 @@ const toIndividualOnfidoConflictSchema = ({
 }) => {
   return {
     // from basicDetails
-    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,
+    firstName: basicDetails?.firstName,
+    lastName: basicDetails?.lastName,
+    email: basicDetails?.email,
+    phoneNumber: basicDetails?.phoneNumber,
     // from additionalPersonalDetails
-    birthDate: additionalPersonalDetails == null ? void 0 : additionalPersonalDetails.birthDate,
-    nationality: additionalPersonalDetails == null ? void 0 : additionalPersonalDetails.nationality,
+    birthDate: additionalPersonalDetails?.birthDate,
+    nationality: additionalPersonalDetails?.nationality,
     address: pick(
       "address",
       "otherAddressInformation",
@@ -2771,11 +2740,11 @@ const toIndividualOnfidoConflictSchema = ({
       "country"
     ).from(additionalPersonalDetails),
     // from additionalPersonalDetails (flattened so that `id` fields can be compared at granular level)
-    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
+    idNumber: additionalPersonalDetails?.idNumber,
+    typeOfIdentity: additionalPersonalDetails?.typeOfIdentity,
+    issuerState: additionalPersonalDetails?.issuerState,
+    licenseCardNumber: additionalPersonalDetails?.licenseCardNumber,
+    expiryDate: additionalPersonalDetails?.expiryDate
   };
 };
 const fromIndividualOnfidoConflictSchema = ({
@@ -2890,12 +2859,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", {
@@ -2925,7 +2894,6 @@ const idVerificationMethodFields = [
   "idDocument"
 ];
 function IdVerificationMethod(props) {
-  var _a, _b, _c, _d, _e, _f;
   const {
     legalEntityId,
     handlers,
@@ -2933,14 +2901,14 @@ function IdVerificationMethod(props) {
     fieldValidationErrors,
     hasLiveSelfieErrorCode
   } = props;
-  const { i18n } = useI18nContext();
+  const { t, i18n } = useTranslation(["individual", "common"]);
   const userEvents = useAnalyticsContext();
   const extractDocumentInformation2 = useExtractDocumentInformation();
   const {
     form: { data, handleChangeFor, setFormData }
   } = useFormContext();
-  const datasetUtils = datasetUtilities(i18n.locale);
-  const existingDocument = (_a = data.idVerificationMethod) == null ? void 0 : _a.idDocument;
+  const datasetUtils = datasetUtilities(i18n.language);
+  const existingDocument = data.idVerificationMethod?.idDocument;
   const hasExistingDocument = !isEmpty$1(existingDocument);
   const handleFieldChange = useCallback(
     (fieldName, mode = "input") => handleChangeFor(fieldName, "idVerificationMethod", mode),
@@ -2977,19 +2945,18 @@ function IdVerificationMethod(props) {
     handlers.handleContinueToAdditionalDetails();
   };
   const validateExtractionResult = (extractionResult) => {
-    var _a2;
-    const { isExpired, isValidDocumentType, dateOfBirth, issuingCountry } = extractionResult;
+    const { isExpired, isValidDocumentType, isUnderage, minimumOnboardingAge } = extractionResult;
     if (isExpired) {
       return { key: "theDocumentYouUploadedIsExpired" };
     }
-    if (isValidDocumentType === false) {
+    if (!isValidDocumentType) {
       return { key: "theDocumentTypeYouUploadedIsNotSupported" };
     }
-    if (isPersonUnderAge(dateOfBirth, issuingCountry)) {
+    if (isUnderage) {
       return {
         key: "weDontAcceptDocumentsOrInformationAboutAnyoneYoungerThan_",
         options: {
-          values: { minimumOnboardingAge: ((_a2 = extractionResult.minimumOnboardingAge) == null ? void 0 : _a2.toString()) ?? "" }
+          values: { minimumOnboardingAge: minimumOnboardingAge?.toString() ?? "" }
         }
       };
     }
@@ -3002,9 +2969,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();
@@ -3041,11 +3008,25 @@ 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({ key: "weCouldNotReachOnfido" });
@@ -3088,7 +3069,7 @@ function IdVerificationMethod(props) {
       handleFieldChange("idDocument")(void 0);
     }
   };
-  if (hasLiveSelfieErrorCode && ((_e = data.idVerificationMethod) == null ? void 0 : _e.idVerificationMethod) === "existingDocument") {
+  if (hasLiveSelfieErrorCode && data.idVerificationMethod?.idVerificationMethod === "existingDocument") {
     handleDeleteDocument();
   }
   const handleCancelDeleteDocument = () => {
@@ -3114,8 +3095,9 @@ function IdVerificationMethod(props) {
     handlers.handleUpdateDocument();
   };
   const modalProvidedData = resolvedData || comparableExistingData;
-  const formUtils = createFormUtils(props, i18n);
-  return /* @__PURE__ */ jsxs("div", { className: styles$2.verifyOnfidoContainer, children: [
+  const formUtils = createFormUtils(props, i18n.t);
+  isNextStepDisabled.value = showLoadingSpinner;
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(
       ErrorPanel,
       {
@@ -3125,44 +3107,78 @@ function IdVerificationMethod(props) {
         id: "ariaErrorField"
       }
     ),
-    /* @__PURE__ */ jsx(IdVerificationHeader, {}),
-    error ? /* @__PURE__ */ jsx(
-      Alert,
-      {
-        variant: "error",
-        title: i18n.get(error.key, error.options),
-        className: styles$2.verifyOnfidoError
-      }
-    ) : void 0,
-    /* @__PURE__ */ jsx("div", { className: styles$2.verifyOnfidoContent, children: showLoadingSpinner ? /* @__PURE__ */ jsx(Loader, { size: "large" }) : /* @__PURE__ */ jsx(Fragment, { children: hasExistingDocument ? /* @__PURE__ */ jsx(
-      UploadedDocument,
+    /* @__PURE__ */ jsx(
+      LandingLayout,
       {
-        document: existingDocument,
-        onDelete: () => setStatus("confirmDeleteDocumentModal"),
-        onUpdate: handleUpdateExistingDocument
+        media: /* @__PURE__ */ jsx(
+          Svg,
+          {
+            type: "image",
+            className: styles$1.verificationHeaderImage,
+            name: "passport-front-green",
+            title: t(($) => $["instantIDVerificationDescription"], { ns: "common" })
+          }
+        ),
+        title: t(($) => $["identityVerification"], { ns: "common" }),
+        description: showIndividualMotionCapture?.value ? t(($) => $["toHelpProtectAgainstFraudAndKeepOurServices"]) : /* @__PURE__ */ jsxs(Fragment, { children: [
+          t(($) => $["takeOrUploadAPhoto"], { ns: "common" }),
+          " ",
+          /* @__PURE__ */ jsx(Link, { href: "https://onfido.com", external: true, inline: true, children: t(($) => $["onfido"], { ns: "common" }) })
+        ] }),
+        helpAction: error ? /* @__PURE__ */ jsx(
+          Alert,
+          {
+            variant: "error",
+            title: t(($) => $[error.key], { ...error.options?.values, ns: "common" }),
+            className: styles$1.verifyOnfidoError
+          }
+        ) : void 0,
+        actions: /* @__PURE__ */ jsx(Fragment, { children: showLoadingSpinner ? /* @__PURE__ */ jsx(Loader, { size: "large" }) : !hasExistingDocument && /* @__PURE__ */ jsxs(Fragment, { children: [
+          /* @__PURE__ */ jsx(
+            Button,
+            {
+              fullWidth: true,
+              onClick: launchOnfido,
+              disabled: status === "extractionLoading",
+              loading: status === "extractionLoading",
+              children: t(($) => $["startVerification"], { ns: "common" })
+            }
+          ),
+          !showIndividualMotionCapture?.value && /* @__PURE__ */ jsx(
+            Button,
+            {
+              onClick: () => setStatus("confirmManualFlowModal"),
+              variant: "secondary",
+              fullWidth: true,
+              children: t(($) => $["addDetailsManually"], { ns: "common" })
+            }
+          )
+        ] }) }),
+        content: !showLoadingSpinner && hasExistingDocument && /* @__PURE__ */ jsx(
+          UploadedDocument,
+          {
+            document: existingDocument,
+            onDelete: () => setStatus("confirmDeleteDocumentModal"),
+            onUpdate: handleUpdateExistingDocument
+          }
+        ),
+        disclaimer: (
+          // TODO - replace with Trans component
+          !hasExistingDocument && /* @__PURE__ */ jsxs(Fragment, { children: [
+            t(($) => $["byContinuingToUseThisService"]),
+            " ",
+            /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/facial-scan-policy-and-release/", external: true, inline: true, children: t(($) => $["onfidoFacialScanPolicy"]) }),
+            " ",
+            /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/privacy/", external: true, inline: true, children: t(($) => $["privacyPolicy"], { ns: "common" }) }),
+            " ",
+            t(($) => $["and"], { ns: "common" }),
+            " ",
+            /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/terms-of-service/", external: true, inline: true, children: t(($) => $["termsOfService"], { ns: "common" }) }),
+            "."
+          ] })
+        )
       }
-    ) : /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx(
-        ProviderButton,
-        {
-          provider: "onfido",
-          fullWidth: true,
-          disabled: status === "extractionLoading",
-          loading: status === "extractionLoading",
-          onClick: launchOnfido
-        }
-      ),
-      !((_f = showIndividualMotionCapture) == null ? void 0 : _f.value) && /* @__PURE__ */ jsx(
-        Button,
-        {
-          onClick: () => setStatus("confirmManualFlowModal"),
-          variant: "secondary",
-          fullWidth: true,
-          children: i18n.get("addDetailsManually")
-        }
-      ),
-      /* @__PURE__ */ jsx(IdVerificationDisclaimer, {})
-    ] }) }) }),
+    ),
     status === "onfidoModal" && /* @__PURE__ */ jsx(
       OnfidoVerificationModal,
       {
@@ -3176,19 +3192,19 @@ function IdVerificationMethod(props) {
     status === "confirmManualFlowModal" && /* @__PURE__ */ jsx(
       Confirm,
       {
-        title: i18n.get("addDetailsManuallyQuestion"),
-        description: i18n.get("itCanTakeUpTo"),
+        title: t(($) => $["addDetailsManuallyQuestion"]),
+        description: t(($) => $["itCanTakeUpTo"]),
         onCancel: handleCancelAddDetailsManually,
-        confirmText: i18n.get("yesAddManually"),
+        confirmText: t(($) => $["yesAddManually"]),
         onConfirm: handleContinueViaManualEntryFlow
       }
     ),
     status === "confirmDeleteDocumentModal" && /* @__PURE__ */ jsx(
       Confirm,
       {
-        title: i18n.get("deleteIdDocument"),
-        description: i18n.get("youMayBeAskedToReUpload"),
-        confirmText: i18n.get("deleteDocument"),
+        title: t(($) => $["deleteIdDocument"]),
+        description: t(($) => $["youMayBeAskedToReUpload"]),
+        confirmText: t(($) => $["deleteDocument"], { ns: "common" }),
         onCancel: handleCancelDeleteDocument,
         onConfirm: handleDeleteDocument,
         critical: true
@@ -3216,13 +3232,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,
@@ -3235,54 +3250,8 @@ const ManualIdUpload = () => {
     }
   );
 };
-const getDisplayErrorMessage = (errorMessage, i18n) => {
-  return typeof errorMessage !== "boolean" ? i18n.get(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 { 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" }
-        ]
-      }
-    ) })
-  ] });
+const getDisplayErrorMessage = (errorMessage, t) => {
+  return typeof errorMessage !== "boolean" ? translateStringOrObject(t, errorMessage) : errorMessage;
 };
 const SignatoryQuestionnaireModalContent = () => {
   const { i18n } = useI18nContext();
@@ -3295,7 +3264,8 @@ const SignatoryQuestionnaireModalContent = () => {
   ] });
 };
 function SignatoryQuestionnaire(props) {
-  const { i18n } = useI18nContext();
+  const { t } = useTranslation(["common", "individual"]);
+  const userEvents = useAnalyticsContext();
   const [isModalOpen, setIsModalOpen] = useState(false);
   const {
     data,
@@ -3305,12 +3275,23 @@ function SignatoryQuestionnaire(props) {
     fieldValidationErrors,
     handleFieldChange
   } = props;
-  const formUtils = createFormUtils(props, i18n);
+  const formUtils = createFormUtils(props, t);
   if (!handleFieldChange) {
     return;
   }
-  const toggleModal = () => {
-    setIsModalOpen(!isModalOpen);
+  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: [
@@ -3328,25 +3309,19 @@ function SignatoryQuestionnaire(props) {
       GuidanceQuestion,
       {
         name: "isSignatory",
-        value: data == null ? void 0 : data.isSignatory,
+        value: data?.isSignatory,
         onChange: handleFieldChange("isSignatory"),
-        onDescriptionLinkClick: toggleModal,
-        question: i18n.get("signatoryQuestion"),
-        descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(errorMessage, i18n)
+        onDescriptionLinkClick: openModal,
+        question: t(($) => $["doesThisPersonHaveTheAuthority"], { ns: "individual" }),
+        descriptionLinkText: t(($) => $["whatDoesThisMean"]),
+        errorMessage: getDisplayErrorMessage(errorMessage, t)
       }
     ),
-    isModalOpen && /* @__PURE__ */ jsx(Modal, { onClose: toggleModal, ariaLabel: i18n.get("moreAboutAuthorizedSignatories"), inset: true, children: /* @__PURE__ */ jsx(SignatoryQuestionnaireModalContent, {}) })
+    isModalOpen && /* @__PURE__ */ jsx(Modal, { onClose: closeModal, ariaLabel: t(($) => $["moreAboutAuthorizedSignatories"]), inset: true, children: /* @__PURE__ */ jsx(SignatoryQuestionnaireModalContent, {}) })
   ] });
 }
-const RichText = ({ content }) => {
-  if (!content) {
-    return null;
-  }
-  const parts = content.split(/<strong>|<\/strong>/);
-  return /* @__PURE__ */ jsx(Fragment, { children: parts.map((part, index) => index % 2 === 1 ? /* @__PURE__ */ jsx("strong", { children: part }, index) : part) });
-};
 const UboQuestionnaireModalContent = ({ modalType }) => {
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
   switch (modalType) {
     case "isOwner":
@@ -3378,10 +3353,10 @@ const UboQuestionnaireModalContent = ({ modalType }) => {
         /* @__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(RichText, { content: i18n.get("controllingPersonDescriptionA1L1") }) }),
-          /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(RichText, { content: i18n.get("controllingPersonDescriptionA1L2") }) }),
-          /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(RichText, { content: i18n.get("controllingPersonDescriptionA1L3") }) }),
-          /* @__PURE__ */ jsx("li", { children: /* @__PURE__ */ jsx(RichText, { content: i18n.get("controllingPersonDescriptionA1L4") }) })
+          /* @__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,
@@ -3417,7 +3392,8 @@ const uboQuestionnaireFields = [
   "isNomineeShareholder"
 ];
 function UboQuestionnaire(props) {
-  const { i18n } = useI18nContext();
+  const { t } = useTranslation(["common", "individual"]);
+  const userEvents = useAnalyticsContext();
   const {
     data,
     description,
@@ -3427,21 +3403,31 @@ function UboQuestionnaire(props) {
     fieldValidationErrors,
     handleFieldChange
   } = props;
-  const formUtils = createFormUtils(props, i18n);
+  const formUtils = createFormUtils(props, t);
   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")
+    isOwner: t(($) => $["moreAboutOwners"]),
+    isControllingPerson: t(($) => $["moreAboutOwnershipThroughControl"]),
+    isDirector: t(($) => $["moreAboutDirectors"])
   };
   const isDirectorErrorMessage = formUtils.getErrorMessage(
     "isDirector",
@@ -3479,56 +3465,60 @@ function UboQuestionnaire(props) {
       GuidanceQuestion,
       {
         name: "isDirector",
-        value: data == null ? void 0 : data.isDirector,
+        value: data?.isDirector,
         onChange: handleFieldChange("isDirector"),
         onDescriptionLinkClick: openModal("isDirector"),
-        question: i18n.get("directorQuestion"),
-        descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(isDirectorErrorMessage, i18n)
+        question: t(($) => $["isThisPersonListedAsADirector"], { ns: "individual" }),
+        descriptionLinkText: t(($) => $["whatDoesThisMean"]),
+        errorMessage: getDisplayErrorMessage(isDirectorErrorMessage, t)
       }
     ),
-    formUtils.isRequiredField("isNomineeDirector") && (data == null ? void 0 : data.isDirector) === "yes" && /* @__PURE__ */ jsx(
+    formUtils.isRequiredField("isNomineeDirector") && data?.isDirector === GuidanceQuestionValues.YES && /* @__PURE__ */ jsx(
       GuidanceQuestion,
       {
         name: "isNomineeDirector",
-        value: data == null ? void 0 : data.isNomineeDirector,
+        value: data?.isNomineeDirector,
         onChange: handleFieldChange("isNomineeDirector"),
-        question: i18n.get("nomineeDirectorQuestion"),
-        errorMessage: getDisplayErrorMessage(isNomineeDirectorErrorMessage, i18n)
+        question: t(($) => $["isThisPersonANomineeDirectorAppointed"], { ns: "individual" }),
+        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: openModal("isOwner"),
-        question: i18n.get("ownerQuestion"),
-        descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(isOwnerErrorMessage, i18n)
+        question: t(($) => $["doesThisPersonOwn25PercentOrMoreOfBusiness"], { ns: "individual" }),
+        descriptionLinkText: t(($) => $["whatDoesThisMean"]),
+        errorMessage: getDisplayErrorMessage(isOwnerErrorMessage, t)
       }
     ),
-    formUtils.isRequiredField("isNomineeShareholder") && (data == null ? void 0 : data.isOwner) === "yes" && /* @__PURE__ */ jsx(
+    formUtils.isRequiredField("isNomineeShareholder") && data?.isOwner === GuidanceQuestionValues.YES && /* @__PURE__ */ jsx(
       GuidanceQuestion,
       {
         name: "isNomineeShareholder",
-        value: data == null ? void 0 : data.isNomineeShareholder,
+        value: data?.isNomineeShareholder,
         onChange: handleFieldChange("isNomineeShareholder"),
-        question: i18n.get("nomineeShareHolderQuestion"),
-        errorMessage: getDisplayErrorMessage(isNomineeShareholderErrorMessage, i18n)
+        question: t(($) => $["isThisPersonANomineeShareholderAppointedToHold"], {
+          ns: "individual"
+        }),
+        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: openModal("isControllingPerson"),
-        question: i18n.get("controllingPersonQuestion"),
-        descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(isControllingPersonErrorMessage, i18n)
+        question: t(($) => $["doesThisPersonHaveSignificantResponsibility"], {
+          ns: "individual"
+        }),
+        descriptionLinkText: t(($) => $["whatDoesThisMean"]),
+        errorMessage: getDisplayErrorMessage(isControllingPersonErrorMessage, t)
       }
     ),
     activeModal && /* @__PURE__ */ jsx(Modal, { onClose: closeModal, ariaLabel: modalAriaLabelMap[activeModal], inset: true, children: /* @__PURE__ */ jsx(UboQuestionnaireModalContent, { modalType: activeModal }) })
@@ -3593,14 +3583,15 @@ 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, _f;
   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,
@@ -3625,31 +3616,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) => {
@@ -3669,34 +3671,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]);
-  const hasMotionCaptureScenarioValue = (_b = hasMotionCaptureScenario) == null ? void 0 : _b.value;
+  }, [
+    newRoles,
+    data?.basicDetails,
+    setFormData,
+    isGuidedDecisionMakersFlowDisabled,
+    isGuidedDecisionMakersFlowEnabled
+  ]);
+  const hasMotionCaptureScenarioValue = hasMotionCaptureScenario?.value;
   useEffect(() => {
-    var _a2;
     setShowIndividualMotionCapture(
       shouldShowMotionCapture({
         capabilities,
-        userRoles: (_a2 = data == null ? void 0 : data.basicDetails) == null ? void 0 : _a2.role,
+        userRoles: data?.basicDetails?.role,
         taskType,
         hasMotionScenario: hasMotionCaptureScenarioValue
       })
     );
-  }, [(_c = data == null ? void 0 : data.basicDetails) == null ? void 0 : _c.role, taskType, capabilities, hasMotionCaptureScenarioValue]);
-  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 hasLiveSelfieErrorCode = (_f = problems == null ? void 0 : problems.missingData) == null ? void 0 : _f.some(
+  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(
@@ -3706,8 +3711,8 @@ function IndividualOnfido(props) {
             heading: i18n.get("signatoryQuestionnaireHeader"),
             id: signatoryQuestionnaireFormID,
             handleFieldChange: handleFieldChange("signatoryQuestionnaire"),
-            errors: errors == null ? void 0 : errors.signatoryQuestionnaire,
-            fieldValidationErrors: fieldValidationErrors == null ? void 0 : fieldValidationErrors.signatoryQuestionnaire
+            errors: errors?.signatoryQuestionnaire,
+            fieldValidationErrors: fieldValidationErrors?.signatoryQuestionnaire
           }
         );
       case uboQuestionnaireFormID:
@@ -3719,8 +3724,8 @@ function IndividualOnfido(props) {
             description: i18n.get("uboQuestionnaireDescription"),
             id: uboQuestionnaireFormID,
             handleFieldChange: handleFieldChange("uboQuestionnaire"),
-            errors: errors == null ? void 0 : errors.uboQuestionnaire,
-            fieldValidationErrors: fieldValidationErrors == null ? void 0 : fieldValidationErrors.uboQuestionnaire
+            errors: errors?.uboQuestionnaire,
+            fieldValidationErrors: fieldValidationErrors?.uboQuestionnaire
           }
         );
       case basicDetailsFormID:
@@ -3728,7 +3733,7 @@ function IndividualOnfido(props) {
           BasicDetails,
           {
             ...basicDetailsFormProps,
-            data: (data == null ? void 0 : data.basicDetails) ?? {},
+            data: data?.basicDetails ?? {},
             heading: i18n.get("basicInformationFormName"),
             taskType,
             id: basicDetailsFormID,
@@ -3737,9 +3742,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")
           }
         );
@@ -3753,8 +3758,8 @@ 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
           }
         );
@@ -3764,12 +3769,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")
           }
@@ -3781,7 +3786,7 @@ function IndividualOnfido(props) {
           MemoizedProofOfResidencyUpload,
           {
             ...proofOfResidencyFormProps,
-            data: data == null ? void 0 : data.proofOfResidency,
+            data: data?.proofOfResidency,
             id: proofOfResidencyFormID,
             name: fullName,
             errors: errors.proofOfResidency,
@@ -3795,7 +3800,7 @@ function IndividualOnfido(props) {
           MemoizedDocumentUpload,
           {
             ...proofOfNationalIdFormProps,
-            data: data == null ? void 0 : data.proofOfNationalId,
+            data: data?.proofOfNationalId,
             documentField: "proofOfNationalId",
             documentType: "registrationDocument",
             heading: i18n.get("proofOfNationalId"),
@@ -3811,7 +3816,7 @@ function IndividualOnfido(props) {
           MemoizedProofOfRelationship,
           {
             ...proofOfRelationshipFormProps,
-            data: data == null ? void 0 : data.proofOfRelationship,
+            data: data?.proofOfRelationship,
             id: proofOfRelationshipFormID,
             name: fullName,
             errors: errors.proofOfRelationship,
@@ -3839,23 +3844,67 @@ function IndividualOnfido(props) {
     )
   ] });
 }
+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 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, isExperimentEnabled, matchingScenario) => {
-  var _a, _b, _c, _d, _e;
   const legalEntity = {
     ...formatObject(individualOnfido, individualOnfidoApiKeyMapping),
-    type: LegalEntityType.INDIVIDUAL
+    type: LegalEntityTypes.INDIVIDUAL
   };
   if (individualOnfido.additionalPersonalDetails) {
-    if (isExperimentEnabled("EnableTaxIdRequiredForBusinessAccountsScenarios") && (matchingScenario == null ? void 0 : matchingScenario.includes(Scenarios.L_TAXINFO)) && ((_a = individualOnfido.additionalPersonalDetails) == null ? void 0 : _a.idNumber) && ((_b = individualOnfido.additionalPersonalDetails) == null ? void 0 : _b.typeOfIdentity) && ((_c = individualOnfido.additionalPersonalDetails) == null ? void 0 : _c.country) === CountryCodes.Spain) {
+    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
+          type: individualOnfido.additionalPersonalDetails.typeOfIdentity.toUpperCase()
         }
       ];
     }
-    legalEntity.individual.identificationData = adjustIdentificationData(
+    legalEntity.individual.identificationData = adjustOnfidoIdentificationData(
       individualOnfido.additionalPersonalDetails,
       legalEntity.individual.identificationData
     );
@@ -3864,7 +3913,7 @@ const mapIndividualOnfidoSchemaToLegalEntity = (individualOnfido, isExperimentEn
   if (localization.length) {
     legalEntity.individual.name.localization = localization;
   }
-  if ((_d = individualOnfido.basicDetails) == null ? void 0 : _d.phoneNumber) {
+  if (individualOnfido.basicDetails?.phoneNumber) {
     const phone = {
       number: individualOnfido.basicDetails.phoneNumber.number,
       type: "mobile"
@@ -3872,7 +3921,7 @@ const mapIndividualOnfidoSchemaToLegalEntity = (individualOnfido, isExperimentEn
     if (phone.number && legalEntity.individual) {
       legalEntity.individual.phone = phone;
     } else {
-      (_e = legalEntity == null ? void 0 : legalEntity.individual) == null ? true : delete _e.phone;
+      delete legalEntity?.individual?.phone;
     }
   }
   return legalEntity;
@@ -3881,14 +3930,13 @@ const getIndividualSchemaFromAPI = {
   ...individualOnfidoBaseMapping
 };
 const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isRoleFieldNeeded, parentLegalEntity) => {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
   let individualOnfido = {
     ...formatObject(legalEntity, getIndividualSchemaFromAPI)
   };
   individualOnfido = {
     ...individualOnfido,
     basicDetails: {
-      ...individualOnfido == null ? void 0 : individualOnfido.basicDetails,
+      ...individualOnfido?.basicDetails,
       ...isChangingType && {
         firstName: "",
         lastName: "",
@@ -3896,7 +3944,7 @@ const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isR
       }
     },
     signatoryQuestionnaire: {
-      isSignatory: isChangingType ? null : ((_a = individualOnfido.signatoryQuestionnaire) == null ? void 0 : _a.isSignatory) ?? null
+      isSignatory: isChangingType ? null : individualOnfido.signatoryQuestionnaire?.isSignatory ?? null
     },
     uboQuestionnaire: isChangingType ? {
       isOwner: null,
@@ -3905,14 +3953,14 @@ const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isR
       isNomineeShareholder: null,
       isNomineeDirector: null
     } : {
-      isOwner: ((_b = individualOnfido.uboQuestionnaire) == null ? void 0 : _b.isOwner) ?? null,
-      isControllingPerson: ((_c = individualOnfido.uboQuestionnaire) == null ? void 0 : _c.isControllingPerson) ?? null,
-      isDirector: ((_d = individualOnfido.uboQuestionnaire) == null ? void 0 : _d.isDirector) ?? null,
-      isNomineeDirector: ((_e = individualOnfido.uboQuestionnaire) == null ? void 0 : _e.isNomineeDirector) ?? null,
-      isNomineeShareholder: ((_f = individualOnfido.uboQuestionnaire) == null ? void 0 : _f.isNomineeShareholder) ?? 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 ((_g = legalEntity == null ? void 0 : legalEntity.documentDetails) == null ? void 0 : _g.length) {
+  if (legalEntity?.documentDetails?.length) {
     individualOnfido = {
       ...individualOnfido,
       idVerificationMethod: {
@@ -3922,32 +3970,31 @@ const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isR
       }
     };
   }
-  if ((_i = (_h = legalEntity.individual) == null ? void 0 : _h.name) == null ? void 0 : _i.localization) {
+  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) => {
-          var _a2, _b2;
-          return {
-            jaHaniFirstName: (_a2 = l.fields) == null ? void 0 : _a2.firstName,
-            jaHaniLastName: (_b2 = l.fields) == null ? void 0 : _b2.lastName
-          };
-        }
+        mappingFunction: (l) => ({
+          jaHaniFirstName: l.fields?.firstName,
+          jaHaniLastName: l.fields?.lastName
+        })
       },
       {
         script: "ja-Kana",
-        mappingFunction: (l) => {
-          var _a2, _b2;
-          return {
-            jaKanaFirstName: (_a2 = l.fields) == null ? void 0 : _a2.firstName,
-            jaKanaLastName: (_b2 = l.fields) == null ? void 0 : _b2.lastName
-          };
-        }
+        mappingFunction: (l) => ({
+          jaKanaFirstName: l.fields?.firstName,
+          jaKanaLastName: l.fields?.lastName
+        })
       }
     ];
     configs.forEach((config) => {
-      var _a2, _b2;
-      const localizationToMap = (_b2 = (_a2 = legalEntity.individual) == null ? void 0 : _a2.name.localization) == null ? void 0 : _b2.find(
+      const localizationToMap = legalEntity.individual?.name.localization?.find(
         (l) => l.script === config.script
       );
       if (localizationToMap) {
@@ -3958,33 +4005,33 @@ const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isR
       }
     });
   }
-  if (!(parentLegalEntity == null ? void 0 : parentLegalEntity.entityAssociations)) {
+  if (!parentLegalEntity?.entityAssociations) {
     return individualOnfido;
   }
-  const associations = ((_j = parentLegalEntity == null ? void 0 : parentLegalEntity.entityAssociations) == null ? void 0 : _j.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 = (_k = associations.find(
+    individualOnfido.basicDetails.jobTitle = associations.find(
       ({ jobTitle }) => Boolean(jobTitle)
-    )) == null ? void 0 : _k.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
+      DecisionMakerTypes.SIGNATORY
     );
-    individualOnfido.uboQuestionnaire.isOwner = hasAssociation(DecisionMakerType.OWNER);
+    individualOnfido.uboQuestionnaire.isOwner = hasAssociation(DecisionMakerTypes.OWNER);
     individualOnfido.uboQuestionnaire.isControllingPerson = hasAssociation(
-      DecisionMakerType.CONTROLLING_PERSON
+      DecisionMakerTypes.CONTROLLING_PERSON
     );
-    individualOnfido.uboQuestionnaire.isDirector = hasAssociation(DecisionMakerType.DIRECTOR);
-    const hasNomineeAssociation = (type) => associations.some((ea) => ea.type === type && ea.nominee) ? "yes" : "no";
+    individualOnfido.uboQuestionnaire.isDirector = hasAssociation(DecisionMakerTypes.DIRECTOR);
+    const hasNomineeAssociation = (type) => associations.some((ea) => ea.type === type && ea.nominee) ? GuidanceQuestionValues.YES : GuidanceQuestionValues.NO;
     individualOnfido.uboQuestionnaire.isNomineeDirector = hasNomineeAssociation(
-      DecisionMakerType.DIRECTOR
+      DecisionMakerTypes.DIRECTOR
     );
     individualOnfido.uboQuestionnaire.isNomineeShareholder = hasNomineeAssociation(
-      DecisionMakerType.OWNER
+      DecisionMakerTypes.OWNER
     );
   }
   individualOnfido.basicDetails = getNomineeFromAssociation(
@@ -3994,8 +4041,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
@@ -4023,6 +4069,9 @@ const identityOnfidoBase = {
   jobTitle: {
     rule: "jobTitleIfRequiredForRole"
   },
+  placeOfBirth: {
+    rule: "isPlaceOfBirthRequired"
+  },
   nationality: {
     rule: "nationalityIfRequiredForRole"
   },
@@ -4062,10 +4111,8 @@ const identityOnfidoBase = {
   nomineeShareholder: {
     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.
   idVerificationMethod: {
-    rule: "REQUIRED"
+    rule: "isIdVerificationMethodRequired"
   },
   idDocument: {
     // (either from Onfido or previously-uploaded document)
@@ -4219,7 +4266,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();
@@ -4229,12 +4275,13 @@ function IndividualOnfidoDropin({
   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(() => {
@@ -4265,7 +4312,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();
@@ -4276,6 +4323,7 @@ function IndividualOnfidoDropin({
     }),
     [propProblems, validationErrors]
   );
+  const hasVerificationErrors = propProblems?.verificationErrors && Object.keys(propProblems.verificationErrors).length > 0;
   const associatedLeTrackingParams = useMemo(() => {
     return taskType === TaskTypes.INDIVIDUAL ? {} : getAssociatedLeAnalyticsPayload({
       associatedLegalEntity: legalEntityResponse,
@@ -4290,34 +4338,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
     ]
   );
@@ -4329,7 +4374,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]
@@ -4346,11 +4391,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,
@@ -4358,10 +4403,9 @@ 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]);
-  const { data: scenarios } = useScenarios(country, LegalEntityType.INDIVIDUAL);
+    setCountry(data?.additionalPersonalDetails?.country ?? parentCountry);
+  }, [data?.additionalPersonalDetails?.country, parentCountry]);
+  const { data: scenarios } = useScenarios(country, LegalEntityTypes.INDIVIDUAL);
   useEffect(() => {
     if (!scenarios) return;
     setHasMotionCaptureScenario(scenarios);
@@ -4369,32 +4413,28 @@ function IndividualOnfidoDropin({
   }, [scenarios]);
   const { fieldConfigurations } = useScenarioConfiguration({
     parseConfiguration,
-    legalEntityType: LegalEntityType.INDIVIDUAL,
+    legalEntityType: LegalEntityTypes.INDIVIDUAL,
     setLoadingStatus,
     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,
-        problems
-      });
-    },
+    () => 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,
@@ -4409,12 +4449,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) {
@@ -4424,15 +4464,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" });
     });
@@ -4440,8 +4479,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);
@@ -4457,7 +4496,7 @@ function IndividualOnfidoDropin({
     };
     await getIdVerificationStartCheck(data2);
   };
-  const roleTypes = isRoleFieldNeeded && parentLegalEntity ? getAllowedDecisionMakerRoles(parentLegalEntity, taskType) : [];
+  const roleTypes = isRoleFieldNeeded && parentLegalEntity ? getAllowedDecisionMakerRoles(parentLegalEntity, taskType, matchingScenario) : [];
   const { mutateAsync: createLegalEntity } = useCreateLegalEntity();
   const idDocumentTypeOptions = getLocalizedIdDocumentTypeOptions(country);
   const submitLegalEntity = async ({
@@ -4465,9 +4504,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", {
@@ -4475,8 +4513,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 });
@@ -4485,7 +4523,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
       });
     }
@@ -4495,10 +4533,9 @@ function IndividualOnfidoDropin({
     legalEntity,
     dataSubmitted
   }) => {
-    var _a2, _b2, _c2, _d2;
-    const idDocument2 = (_a2 = dataSubmitted.idVerificationMethod) == null ? void 0 : _a2.idDocument;
-    if (idDocument2 == null ? void 0 : idDocument2.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(
@@ -4511,7 +4548,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"
           );
@@ -4523,25 +4560,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 ?? "")).filter((item) => item !== void 0)) ?? 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 ({
@@ -4549,26 +4585,22 @@ 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) || []
         ]
       };
-      const nomineeDataSource = isGuidedDecisionMakersFlowEnabled ? dataSubmitted == null ? void 0 : dataSubmitted.uboQuestionnaire : dataSubmitted.basicDetails;
+      const nomineeDataSource = !isGuidedDecisionMakersFlowDisabled && isGuidedDecisionMakersFlowEnabled ? dataSubmitted?.uboQuestionnaire : dataSubmitted.basicDetails;
       if (nomineeDataSource && updatedParentLegalEntity.entityAssociations) {
         updatedParentLegalEntity.entityAssociations = updatedParentLegalEntity.entityAssociations.map(
           (ea) => attachNomineeToRole(ea, country, nomineeDataSource)
@@ -4578,7 +4610,6 @@ function IndividualOnfidoDropin({
     }
   };
   const onSubmit = async () => {
-    var _a2, _b2;
     setLoadingStatus("loading");
     const dataSubmitted = omitObscuredFieldsIfUnchanged(
       individualOnfidoObscuredFields,
@@ -4594,12 +4625,9 @@ function IndividualOnfidoDropin({
         isExperimentEnabled,
         matchingScenario
       );
-      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 idDocumentType = idDocumentTypeOptions.find(
+        ({ id }) => dataSubmitted?.idVerificationMethod?.idDocument?.idDocumentType === id
+      )?.id;
       legalEntity.entityAssociations = filterOutUnwantedAssociationsIfRootLE(
         taskType,
         legalEntityResponse,
@@ -4611,7 +4639,7 @@ function IndividualOnfidoDropin({
         idDocumentType
       });
       setAccountHolder(accountHolder);
-      if (((_b2 = dataSubmitted.idVerificationMethod) == null ? void 0 : _b2.idVerificationMethod) !== "existingDocument") {
+      if (dataSubmitted.idVerificationMethod && dataSubmitted.idVerificationMethod?.idVerificationMethod !== "existingDocument" || hasVerificationErrors) {
         await submitDocuments({ legalEntity: createdLegalEntity, dataSubmitted });
       }
       if (parentLegalEntity) {
@@ -4627,11 +4655,18 @@ function IndividualOnfidoDropin({
       }
       setLoadingStatus("success");
       clearToasts();
-      externalOnSubmit == null ? void 0 : externalOnSubmit(dataSubmitted);
+      externalOnSubmit?.(dataSubmitted);
     } catch (e) {
+      const eventsAdditionalData = {};
       logger.error("Failed to update individual", e);
       if (isValidationError(e)) {
-        setValidationErrors(processValidationErrors(e, TaskTypes.INDIVIDUAL));
+        const getErrors = processValidationErrors(e, TaskTypes.INDIVIDUAL);
+        if (getErrors && !Object.keys(getErrors).length) {
+          showToast({ label: i18n.get("failedToUpdateDetails"), variant: "error" });
+          eventsAdditionalData.unmappedErrorNames = e.invalidFields?.map((field) => field.name).filter(Boolean);
+        } else {
+          setValidationErrors(getErrors);
+        }
       } else if (isMaintenanceModeError(e)) {
         showToast({
           label: i18n.get("maintenanceModeMessage"),
@@ -4644,24 +4679,21 @@ function IndividualOnfidoDropin({
       setLoadingStatus("success");
       userEvents.addTaskEvent("Encountered error", {
         actionType: "submit",
-        returnType: e.errorCode,
-        returnValue: e.title
+        additionalData: eventsAdditionalData,
+        returnType: e?.errorCode,
+        returnValue: e?.title || "backend"
       });
     }
   };
   const datasetUtils = datasetUtilities(i18n.locale);
   const formatIdDocument = (idDocument2) => {
-    var _a2, _b2;
     if (!idDocument2) return void 0;
-    const documentType = (idDocument2 == null ? void 0 : idDocument2.instantIdVerificationData) ? onfidoDocumentTypeMapping.find(
-      (document) => {
-        var _a3;
-        return ((_a3 = idDocument2.instantIdVerificationData) == null ? void 0 : _a3.document_front.type) === document.id;
-      }
+    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 = idDocument2.idFrontPage) == null ? void 0 : _a2[0];
-    const backPage = (_b2 = idDocument2.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),
@@ -4680,13 +4712,12 @@ 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 idDocument2 = (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 {
-      ...((idDocument2 == null ? void 0 : idDocument2.idDocumentType) || (idDocument2 == null ? void 0 : idDocument2.instantIdVerificationData)) && {
+      ...(idDocument2?.idDocumentType || idDocument2?.instantIdVerificationData) && {
         idDocument: formatIdDocument(idDocument2)
       },
       ...proofOfNationalIdFile && {
@@ -4708,17 +4739,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
       );
@@ -4726,62 +4756,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,
@@ -4798,10 +4822,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({
@@ -4826,7 +4850,7 @@ function IndividualOnfidoDropin({
       },
       asModal,
       currentStep: steps.current,
-      disableNextButton,
+      disableNextButton: disableNextButton.value,
       forms,
       gotoFormByFormIndex,
       handleBackClick,
@@ -4847,7 +4871,7 @@ function IndividualOnfidoDropin({
           problems,
           onNext: handleNextClick,
           onBack: handleBackClick,
-          legalEntityId: legalEntityResponse == null ? void 0 : legalEntityResponse.id,
+          legalEntityId: legalEntityResponse?.id,
           allowedRoles: roleTypes,
           shouldValidate,
           accountHolder,