@adyen/kyc-components 3.79.2 → 3.80.0

package/dist/{IndividualOnfidoDropin-D7HV4fhv.js → IndividualOnfidoDropin-VYVSjf_C.js}

@@ -2,24 +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] = "048f048c-317c-462d-bf16-076c77601e98", e._sentryDebugIdIdentifier = "sentry-dbid-048f048c-317c-462d-bf16-076c77601e98");
+    n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "4820f618-179c-42bf-ba8e-f62e77d52204", e._sentryDebugIdIdentifier = "sentry-dbid-4820f618-179c-42bf-ba8e-f62e77d52204");
   } catch (e) {
   }
 }
 ;
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
 import { useMemo, useState, useEffect, useCallback } from "preact/hooks";
-import { p as useApiContext, bh as useMutation, bj as httpPost, bW as matchesRegex, bX as trimValWithOneSpace, bY as NO_ALPHABET_REGEX, bZ as EMOJI_REGEX, b_ as hasRepeatedCharacters, b$ as isInvalidName, c0 as INDIVIDUAL_VALID_CHAR_REGEX, c1 as getFormattingRegEx, c2 as SPECIAL_CHARS, c3 as standardKatakanaValidator, c4 as standardKanjiValidator, as as resolveFieldMetadata, ap as CountryCodes, c5 as getSSNType, aq as isEmpty, c6 as defaultFieldMetadata, c7 as defaultFieldConfig, c8 as defaultFieldMetadata$1, c9 as fieldConfig, W as TaskTypes, ca as taxInformationDefaultFieldMetadata, y as LegalEntityType, cb as taxInformationDefaultFieldConfig, cc as getAgeToday, cd as euCountries, ce as getIdDocument, cf as getDocument, cg as mapExistingFile, ch as getPageName, ci as getLocalizedIdDocumentTypeOptions, cj as getPage, ck as createDocumentRequest, bz as formatObject, cl as individualApiKeyMapping, bm as individualComponentsKeyMapping, by as reverseMapping, cm as getNomineeFromAssociation, cn as drop, X as createLogger, P as useAccountHolder, b as useI18nContext, a0 as useAnalyticsContext, a6 as useToastContext, a7 as useExperimentsContext, J as useSettingsContext, co as documentApiUtils, cp as useProviderStatus, g as getLegalEntityCountry, bO as getAssociatedLeAnalyticsPayload, cq as addressValidators, cr as getAsyncIdNumberValidationRule, cs as getAsyncPhoneValidationRules, ct as addressFormatters, cu as useScenarios, cv as setHasMotionCaptureScenario, cw as useScenarioConfiguration, cx as getPropsFromConfigurations, cy as individualForms, cz as showIndividualMotionCapture, bP as getRequiredForms, bQ as addValidityToForms, cA as getAllowedDecisionMakerRoles, b2 as datasetUtilities, bR as useFormComposer, bS as trackNavigation, cB as Individual, cC as composePerScenarioFormConfigurations, cD as omitObscuredFieldsIfUnchanged, cE as filterOutUnwantedAssociationsIfRootLE, bT as isValidationError, bU as processValidationErrors, bV as isMaintenanceModeError, bc as cloneObject, cF as mapAddressLabels, cG as individualDocumentForms, cH as individualDocumentMapping, cI as individualObscuredFields, cJ as mergeAttachments, cK as getFileExtention, al as getOwnEntityAssociations, cL as hasNomineesChanged, cM as attachNomineeToRole, cN as idVerificationProviderId, cO as doArraysMatch, C as Typography, _ as Button, aA as Field, cP as DecisionMakerType, cQ as createFormRules, cR as getAvailableDecisionMakerRoleTypes, cS as allowedCountriesForNominee, bK as getAddressSchemaForCountry, bL as COUNTRIES_WITH_STATES_DATASET, cT as Scenarios, cU as isLowRiskCountry, bt as Select, cV as isTruthyValidator, cW as licenseCardNumberDefaultMetadata, cX as licenseCardNumberDefaultConfig, ar as mergeFieldMetadataIntoProps, az as createFormUtils, bJ as useFormContext, aw as getFieldProps, cY as idNumberFields, cZ as IdentityNumber, c_ as additionallIdNumberOptions, c$ as MaskedInput, bI as InputDate, d0 as formatDateObj, d1 as DriversLicense, d2 as addressFields, u as useAllowedCountries, K as SettingNames, d3 as getDefaultTaxIdNumberType, d4 as isDecisionMakerTask, F as FormHeader, ay as ErrorPanel, aG as CountryField, bM as Address, bN as getAddressSchemaLabelsByCountry, bC as Link, ba as Confirm, d5 as getAgeRangeForLegalRepresentative, d6 as IndividualIdNumberTypeSelector, d7 as TaxInformationField, d8 as PatriotActDisclosure, d9 as isLegalRepresentativeNeeded, ax as nameFields, da as decisionMakerRoleFields, db as nomineeFields, dc as contactDetailFields, B as Alert, aW as ContextGuidance, b1 as TrustedFieldsProvider, dd as DecisionMakerRole, de as NomineeDecisionMakerRole, df as LocalizedNameFields, bD as InputText, dg as ContactDetails, dh as keysOf, b0 as objectsDeepEqual, di as isEmpty$1, dj as RadioWithLabel, dk as listToRecord, b4 as Modal, bo as Svg, dl as pick, dm as IdVerification, b9 as Spacer, $ as IconButton, c as useDataset, d as datasetIdentifier, L as Loader, dn as isPersonUnderAge, dp as IdDocumentManualUpload, Z as useTranslation, aU as Trans, dq as idDocumentUploadFields, dr as useFormRouterContext, ds as getFormProps, dt as useCapabilities, du as hasMotionCaptureScenario, dv as setShowIndividualMotionCapture, dw as shouldShowMotionCapture, dx as MemoizedProofOfRelationship, dy as MemoizedDocumentUpload, dz as MemoizedProofOfResidencyUpload, dA as individualOnfidoApiKeyMapping, dB as individualOnfidoBaseMapping, bp as useQueryClient, dC as individualOnfidoDocumentMapping, dD as individualOnfidoObscuredFields } from "./StoreProvider-CFPaE2S6.js";
-import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-CQZpNVEx.js";
-import { c as contactDetailsValidationRules, u as useValidatePhoneNumberImperatively } from "./validate-Ddg2Xxm6.js";
-import { F as FormContextProvider, a as FormFlow } from "./FormFlow-dafBp16p.js";
-import { u as useSingpassMyInfoLogin, P as ProviderButton } from "./ProviderButton-BMTHmDlv.js";
-import { u as useMultiForm } from "./useMultiForm-BDkV8YGs.js";
-import { g as getFieldsWithExistingData } from "./getFieldsWithExistingData-BiBkVHe8.js";
-import { l as localizeDateString } from "./localizeDateString-BRbQo-M1.js";
-import { r as rules, D as DECISION_MAKER_TYPES_WITH_JOBTITLE$1 } from "./rules-CRNu4c7G.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, d4 as isDecisionMakerTask, F as FormHeader, aB as ErrorPanel, aJ as CountryField, bN as Address, bO as getAddressSchemaLabelsByCountry, bD as Link, bi as Confirm, d5 as getAgeRangeForLegalRepresentative, d6 as IndividualIdNumberTypeSelector, d7 as TaxInformationField, bE as InputText, d8 as PatriotActDisclosure, d9 as isLegalRepresentativeNeeded, aA as nameFields, da as decisionMakerRoleFields, db as nomineeFields, dc as contactDetailFields, K as Alert, aZ as ContextGuidance, b4 as TrustedFieldsProviders, dd as DecisionMakerRole, de as NomineeDecisionMakerRole, df as LocalizedNameFields, dg as ContactDetails, dh as keysOf, b3 as objectsDeepEqual, di as isEmpty$1, dj as RadioWithLabel, dk as listToRecord, bc as Modal, dl as pick, dm as IdVerification, bh as Spacer, a2 as IconButton, e as useDataset, f as datasetIdentifier, L as Loader, H as Svg, dn as isPersonUnderAge, dp as IdDocumentManualUpload, M as translateStringOrObject, aX as Trans, dq as idDocumentUploadFields, dr as useFormRouterContext, ds as getFormProps, dt as useCapabilities, du as hasMotionCaptureScenario, dv as setShowIndividualMotionCapture, dw as shouldShowMotionCapture, dx as MemoizedProofOfRelationship, dy as MemoizedDocumentUpload, dz as MemoizedProofOfResidencyUpload, dA as individualOnfidoApiKeyMapping, dB as individualOnfidoBaseMapping, br as useQueryClient, dC as individualOnfidoDocumentMapping, dD as individualOnfidoObscuredFields } from "./StoreProvider-nqVR_kWS.js";
+import { u as useCreateLegalEntity, a as useUpdateLegalEntity } from "./useUpdateLegalEntity-xfJlMkrb.js";
+import { c as contactDetailsValidationRules, u as useValidatePhoneNumberImperatively } from "./validate-C3WaahoD.js";
+import { F as FormContextProvider, a as FormFlow } from "./FormFlow-Urrg9vMm.js";
+import { u as useSingpassMyInfoLogin, L as LandingLayout } from "./LandingLayout-CddoBOJ4.js";
+import { u as useMultiForm } from "./useMultiForm-CD30RFXS.js";
+import { g as getFieldsWithExistingData } from "./getFieldsWithExistingData-D1vVVeaf.js";
+import { l as localizeDateString } from "./localizeDateString-DLWgJuND.js";
+import { r as rules, D as DECISION_MAKER_TYPES_WITH_JOBTITLE$1 } from "./rules-DF6nIpnn.js";
 import { signal, computed } from "@preact/signals";
-import { T as TileGroup } from "./TileGroup-Cqud8CNc.js";
+import { T as TileGroup } from "./TileGroup-BrD32_Y0.js";
 const verifyIdNumber = async (legalEntityId, baseUrl, data) => {
   return await httpPost(
     {
@@ -184,7 +184,7 @@ const personalDetailsValidators = ({
     taxInformationDefaultFieldConfig[country],
     {
       taxIdNumberType,
-      companyType: LegalEntityType.INDIVIDUAL
+      companyType: LegalEntityTypes.INDIVIDUAL
     },
     taxInformationDefaultFieldMetadata
   )?.validators,
@@ -374,7 +374,7 @@ const mapIndividualToLegalEntity = (data) => {
   const requestObj = {
     ...formatObject(data, individualApiKeyMapping)
   };
-  requestObj.type = LegalEntityType.INDIVIDUAL;
+  requestObj.type = LegalEntityTypes.INDIVIDUAL;
   const { personalDetails } = data;
   if (!personalDetails) return requestObj;
   requestObj.individual.identificationData = adjustIdentificationData(
@@ -806,7 +806,7 @@ function IndividualDropin({
   useEffect(() => {
     setCountry(data?.personalDetails?.residencyCountry ?? parentCountry);
   }, [data?.personalDetails?.residencyCountry, parentCountry]);
-  const { data: scenarios } = useScenarios(country, LegalEntityType.INDIVIDUAL);
+  const { data: scenarios } = useScenarios(country, LegalEntityTypes.INDIVIDUAL);
   useEffect(() => {
     if (!scenarios) return;
     setHasMotionCaptureScenario(scenarios);
@@ -814,7 +814,7 @@ function IndividualDropin({
   }, [scenarios]);
   const { fieldConfigurations } = useScenarioConfiguration({
     parseConfiguration: parseConfiguration$1,
-    legalEntityType: LegalEntityType.INDIVIDUAL,
+    legalEntityType: LegalEntityTypes.INDIVIDUAL,
     setLoadingStatus,
     country
   });
@@ -902,7 +902,7 @@ function IndividualDropin({
     }).catch(() => {
       showToast({ label: i18n.get("failedToFetchRelevantDocuments"), variant: "error" });
     });
-  }, []);
+  }, [legalEntityResponse]);
   const { mutateAsync: createLegalEntity } = useCreateLegalEntity();
   const { mutateAsync: updateLegalEntity } = useUpdateLegalEntity();
   const idDocumentTypeOptions = getLocalizedIdDocumentTypeOptions(country);
@@ -1317,7 +1317,7 @@ const additionalPersonalDetailsValidators = ({
     taxInformationDefaultFieldConfig[country],
     {
       taxIdNumberType,
-      companyType: LegalEntityType.INDIVIDUAL
+      companyType: LegalEntityTypes.INDIVIDUAL
     },
     taxInformationDefaultFieldMetadata
   )?.validators,
@@ -1363,15 +1363,14 @@ const basicDetailsValidators = ({
 });
 const guidanceQuestion = "adyen-kyc-guidance-question";
 const options = "adyen-kyc-options";
-const styles$6 = {
+const styles$4 = {
   guidanceQuestion,
   options
 };
-var GuidanceQuestionValues = /* @__PURE__ */ ((GuidanceQuestionValues2) => {
-  GuidanceQuestionValues2["YES"] = "Yes";
-  GuidanceQuestionValues2["NO"] = "No";
-  return GuidanceQuestionValues2;
-})(GuidanceQuestionValues || {});
+const GuidanceQuestionValues = {
+  YES: "Yes",
+  NO: "No"
+};
 const GuidanceQuestion = (props) => {
   const {
     descriptionLinkText,
@@ -1397,10 +1396,10 @@ const GuidanceQuestion = (props) => {
   };
   const yesTileLabel = yesLabel ?? i18n.get("yes");
   const noTileLabel = noLabel ?? i18n.get("no");
-  return /* @__PURE__ */ jsxs("div", { className: styles$6.guidanceQuestion, children: [
+  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$6.options, children: () => /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(Field, { name, className: styles$4.options, children: () => /* @__PURE__ */ jsx(
       TileGroup,
       {
         allowMultiple: false,
@@ -1411,16 +1410,8 @@ const GuidanceQuestion = (props) => {
         onChange: handleChange,
         selected: value || "",
         tiles: [
-          {
-            label: yesTileLabel,
-            value: "Yes"
-            /* YES */
-          },
-          {
-            label: noTileLabel,
-            value: "No"
-            /* NO */
-          }
+          { label: yesTileLabel, value: GuidanceQuestionValues.YES },
+          { label: noTileLabel, value: GuidanceQuestionValues.NO }
         ]
       }
     ) })
@@ -1438,19 +1429,19 @@ const calculateRoles = (data) => {
   const roleMappings = [
     {
       isApplicable: data?.signatoryQuestionnaire?.isSignatory === GuidanceQuestionValues.YES,
-      role: DecisionMakerType.SIGNATORY
+      role: DecisionMakerTypes.SIGNATORY
     },
     {
       isApplicable: data?.uboQuestionnaire?.isOwner === GuidanceQuestionValues.YES,
-      role: DecisionMakerType.OWNER
+      role: DecisionMakerTypes.OWNER
     },
     {
       isApplicable: data?.uboQuestionnaire?.isControllingPerson === GuidanceQuestionValues.YES,
-      role: DecisionMakerType.CONTROLLING_PERSON
+      role: DecisionMakerTypes.CONTROLLING_PERSON
     },
     {
       isApplicable: data?.uboQuestionnaire?.isDirector === GuidanceQuestionValues.YES,
-      role: DecisionMakerType.DIRECTOR
+      role: DecisionMakerTypes.DIRECTOR
     }
   ];
   return roleMappings.filter(({ isApplicable }) => isApplicable).map(({ role }) => role);
@@ -1490,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 = ({
@@ -1513,10 +1504,10 @@ const individualOnfidoRules = ({
     if (!data.basicDetails?.role) {
       return REQUIRED;
     }
-    if (data.basicDetails?.role?.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) && data.basicDetails?.role?.some((role) => role === DecisionMakerType.DIRECTOR)) {
+    if (ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES.includes(country) && data.basicDetails?.role?.some((role) => role === DecisionMakerTypes.DIRECTOR)) {
       return REQUIRED;
     }
   },
@@ -1527,13 +1518,13 @@ const individualOnfidoRules = ({
     if (!data.basicDetails?.role) {
       return REQUIRED;
     }
-    if (country === CountryCodes.UnitedStates && data.basicDetails?.role?.every((role) => role === DecisionMakerType.SIGNATORY)) {
+    if (country === CountryCodes.UnitedStates && data.basicDetails?.role?.every((role) => role === DecisionMakerTypes.SIGNATORY)) {
       return void 0;
     }
-    if (data.basicDetails?.role?.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) && data.basicDetails?.role?.some((role) => role === DecisionMakerType.DIRECTOR)) {
+    if (ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES.includes(country) && data.basicDetails?.role?.some((role) => role === DecisionMakerTypes.DIRECTOR)) {
       return REQUIRED;
     }
   },
@@ -1546,7 +1537,7 @@ const individualOnfidoRules = ({
     if (isExperimentEnabled("EnableTaxIdRequiredForBusinessAccountsScenarios") && matchingScenario?.includes(Scenarios.L_TAXINFO)) {
       return void 0;
     }
-    if (country === CountryCodes.UnitedStates && data.basicDetails?.role?.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)) {
@@ -1567,6 +1558,9 @@ const individualOnfidoRules = ({
     if (data.proofOfResidency?.proofOfResidency?.length) {
       return REQUIRED;
     }
+    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;
@@ -1587,9 +1581,15 @@ const individualOnfidoRules = ({
       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: () => {
     if (taskType === TaskTypes.DECISION_MAKER) {
-      if (data.basicDetails?.role?.includes(DecisionMakerType.SIGNATORY)) {
+      if (data.basicDetails?.role?.includes(DecisionMakerTypes.SIGNATORY)) {
         return REQUIRED;
       }
       return;
@@ -1605,7 +1605,15 @@ const individualOnfidoRules = ({
       return REQUIRED;
     }
   },
+  isPlaceOfBirthRequired: () => {
+    if (taskType === TaskTypes.DECISION_MAKER && data.basicDetails?.role?.includes(DecisionMakerTypes.SIGNATORY) && matchingScenario?.includes(Scenarios.L_BAFIN)) {
+      return REQUIRED;
+    }
+  },
   nationalityIfRequiredForRole: () => {
+    if (taskType === TaskTypes.DECISION_MAKER && data.basicDetails?.role?.includes(DecisionMakerTypes.SIGNATORY) && matchingScenario?.includes(Scenarios.L_BAFIN)) {
+      return REQUIRED;
+    }
     const enableNationalitySGHK = isExperimentEnabled("EnableNationalitySGHK");
     const rootLegalEntityCountry = rootLegalEntity?.organization?.registeredAddress.country;
     if (enableNationalitySGHK && rootLegalEntityCountry && NATIONALITY_REQUIRED_FOR_COUNTRIES.includes(rootLegalEntityCountry)) {
@@ -1659,12 +1667,12 @@ const individualOnfidoRules = ({
     return addressSchema.includes("stateOrProvince") && COUNTRIES_WITH_STATES_DATASET.includes(data?.additionalPersonalDetails?.country ?? country) ? "REQUIRED" : void 0;
   },
   nomineeDirectorRequiredForCountry: () => {
-    if (allowedCountriesForNominee.includes(data?.additionalPersonalDetails?.country ?? country) && data?.basicDetails?.role?.includes(DecisionMakerType.DIRECTOR)) {
+    if (allowedCountriesForNominee.includes(data?.additionalPersonalDetails?.country ?? country) && data?.basicDetails?.role?.includes(DecisionMakerTypes.DIRECTOR)) {
       return "REQUIRED";
     }
   },
   nomineeShareHolderRequiredForCountry: () => {
-    if (allowedCountriesForNominee.includes(data?.additionalPersonalDetails?.country ?? country) && data?.basicDetails?.role?.includes(DecisionMakerType.OWNER)) {
+    if (allowedCountriesForNominee.includes(data?.additionalPersonalDetails?.country ?? country) && data?.basicDetails?.role?.includes(DecisionMakerTypes.OWNER)) {
       return "REQUIRED";
     }
   },
@@ -1706,9 +1714,9 @@ const individualOnfidoRules = ({
     }
   },
   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";
@@ -1836,8 +1844,9 @@ function Identity(props) {
       )
     );
   }, [country, data?.typeOfIdentity, initialFormUtilProps, licenseCardNumberMetaData]);
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
-  const formUtils = useMemo(() => createFormUtils(mergedProps, i18n), [mergedProps, i18n]);
+  const formUtils = useMemo(() => createFormUtils(mergedProps, t), [mergedProps, t]);
   const { form } = useFormContext();
   const defaultIdNumber = form?.defaultData?.additionalPersonalDetails?.idNumber;
   const ssnType = getSSNType(formVerificationErrors, defaultIdNumber);
@@ -1997,15 +2006,18 @@ const additionalPersonalDetailsFields = [
   ...additionalIdentityInfoFields,
   "country",
   "nationality",
+  "placeOfBirth",
   ...addressFields,
   "taxInformation"
 ];
 function AdditionalPersonalDetails(props) {
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
   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 {
@@ -2023,22 +2035,21 @@ function AdditionalPersonalDetails(props) {
   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?.taxInformation, country, LegalEntityType.INDIVIDUAL)
-  );
   const mergedProps = mergeFieldMetadataIntoProps(
     "taxInformation",
     resolveFieldMetadata(
       taxInformationDefaultFieldConfig[country],
       {
-        taxIdNumberType,
-        companyType: LegalEntityType.INDIVIDUAL
+        taxIdNumberType: form.data?.additionalPersonalDetails?.taxInformation?.find(
+          (taxId) => taxId.country === country
+        )?.type,
+        companyType: LegalEntityTypes.INDIVIDUAL
       },
       taxInformationDefaultFieldMetadata
     ),
     props
   );
-  const formUtils = createFormUtils(mergedProps, i18n);
+  const formUtils = createFormUtils(mergedProps, t);
   const birthDateErrorMessage = formUtils.getErrorMessage(
     "birthDate",
     errors,
@@ -2181,16 +2192,13 @@ 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,
+        entityType: LegalEntityTypes.INDIVIDUAL,
         defaultData: data?.taxInformation
       }
     ),
@@ -2208,6 +2216,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
   ] });
 }
@@ -2224,6 +2254,7 @@ const basicDetailsFields = [
   "jaKanaLastName"
 ];
 function BasicDetails(props) {
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
   const {
     form: { triggerValidation }
@@ -2248,7 +2279,7 @@ function BasicDetails(props) {
     handleFieldChange
   } = props;
   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, [
@@ -2295,7 +2326,7 @@ function BasicDetails(props) {
         contentId: "reasonForFillingIndividualPersonalDetails"
       }
     ),
-    isDecisionMakerTask(taskType) && trustedFieldsProvider === TrustedFieldsProvider.SINGPASS && readOnlyFields && /* @__PURE__ */ jsx(Typography, { color: "secondary", variant: "caption", children: i18n.get(
+    isDecisionMakerTask(taskType) && trustedFieldsProvider === TrustedFieldsProviders.SINGPASS && readOnlyFields && /* @__PURE__ */ jsx(Typography, { color: "secondary", variant: "caption", children: i18n.get(
       "weSelectedSomeRolesBasedOnMyinfoBusinessDataAboutYourCompanysAppointmentHoldersAndShareholders"
     ) }),
     isDecisionMakerTask(taskType) && (isGuidedDecisionMakersFlowDisabled || !isGuidedDecisionMakersFlowEnabled) && /* @__PURE__ */ jsxs(Fragment, { children: [
@@ -2469,7 +2500,7 @@ 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$5 = {
+const styles$3 = {
   conflictRowTable,
   conflictRowList,
   conflictRowListOptionLabel
@@ -2495,7 +2526,7 @@ const ConflictRow = ({
     }
   }, [hasOnlyProvided, hasOnlyDetected, onSelect, selected]);
   if (hasOnlyProvided || hasOnlyDetected) return;
-  return showAs === "listItem" ? /* @__PURE__ */ jsxs("div", { className: styles$5.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: [
@@ -2504,7 +2535,7 @@ const ConflictRow = ({
           {
             variant: "caption",
             color: "tertiary",
-            className: styles$5.conflictRowListOptionLabel,
+            className: styles$3.conflictRowListOptionLabel,
             children: i18n.get("youEntered")
           }
         ),
@@ -2524,7 +2555,7 @@ const ConflictRow = ({
           {
             variant: "caption",
             color: "tertiary",
-            className: styles$5.conflictRowListOptionLabel,
+            className: styles$3.conflictRowListOptionLabel,
             children: i18n.get("weDetected")
           }
         ),
@@ -2539,7 +2570,7 @@ const ConflictRow = ({
         )
       ] })
     ] })
-  ] }) : /* @__PURE__ */ jsxs("tr", { className: styles$5.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,
@@ -2565,7 +2596,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$4 = {
+const styles$2 = {
   dataConflictsWrapper,
   dataConflictsHeader,
   dataConflictsTable,
@@ -2606,13 +2637,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$4.dataConflictsWrapper, children: [
-      /* @__PURE__ */ jsxs("div", { className: styles$4.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$4.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",
@@ -2625,7 +2656,7 @@ const DataConflictsModal = ({
         },
         property
       )) }),
-      /* @__PURE__ */ jsxs("table", { className: styles$4.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") }) }),
@@ -2682,57 +2713,11 @@ const DataConflictsModal = ({
     )
   ] });
 };
-const verificationDisclaimer = "adyen-kyc-verification-disclaimer";
-const styles$3 = {
-  verificationDisclaimer
-};
-const IdVerificationDisclaimer = () => {
-  const { i18n } = useI18nContext();
-  return /* @__PURE__ */ jsxs(Typography, { variant: "caption", color: "tertiary", className: styles$3.verificationDisclaimer, children: [
-    i18n.get("ifYouChooseToUseOnfido"),
-    " ",
-    /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/privacy/", external: true, inline: true, children: i18n.get("onfidoPrivacyPolicy") }),
-    " ",
-    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$2 = {
-  verificationHeader,
-  verificationHeaderImage,
-  verificationHeaderContent
-};
-const IdVerificationHeader = () => {
-  const { i18n } = useI18nContext();
-  return /* @__PURE__ */ jsxs("div", { className: styles$2.verificationHeader, children: [
-    /* @__PURE__ */ jsx(
-      Svg,
-      {
-        className: styles$2.verificationHeaderImage,
-        type: "image",
-        name: "passport-front-green",
-        title: i18n.get("instantIDVerificationDescription")
-      }
-    ),
-    /* @__PURE__ */ jsx(Typography, { variant: "title-l", children: i18n.get("capturePersonalDetails") }),
-    /* @__PURE__ */ jsxs(Typography, { variant: "body", color: "primary", className: styles$2.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$1 = {
-  verifyOnfidoContainer,
-  verifyOnfidoError,
-  verifyOnfidoContent
+  verificationHeaderImage,
+  verifyOnfidoError
 };
 const toIndividualOnfidoConflictSchema = ({
   basicDetails,
@@ -2926,6 +2911,7 @@ function IdVerificationMethod(props) {
     fieldValidationErrors,
     hasLiveSelfieErrorCode
   } = props;
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
   const userEvents = useAnalyticsContext();
   const extractDocumentInformation2 = useExtractDocumentInformation();
@@ -3132,9 +3118,9 @@ function IdVerificationMethod(props) {
     handlers.handleUpdateDocument();
   };
   const modalProvidedData = resolvedData || comparableExistingData;
-  const formUtils = createFormUtils(props, i18n);
+  const formUtils = createFormUtils(props, t);
   isNextStepDisabled.value = showLoadingSpinner;
-  return /* @__PURE__ */ jsxs("div", { className: styles$1.verifyOnfidoContainer, children: [
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
     /* @__PURE__ */ jsx(
       ErrorPanel,
       {
@@ -3144,44 +3130,75 @@ function IdVerificationMethod(props) {
         id: "ariaErrorField"
       }
     ),
-    /* @__PURE__ */ jsx(IdVerificationHeader, {}),
-    error ? /* @__PURE__ */ jsx(
-      Alert,
-      {
-        variant: "error",
-        title: i18n.get(error.key, error.options),
-        className: styles$1.verifyOnfidoError
-      }
-    ) : void 0,
-    /* @__PURE__ */ jsx("div", { className: styles$1.verifyOnfidoContent, children: showLoadingSpinner ? /* @__PURE__ */ jsx(Loader, { size: "large" }) : /* @__PURE__ */ jsx(Fragment, { children: hasExistingDocument ? /* @__PURE__ */ jsx(
-      UploadedDocument,
+    /* @__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: i18n.get("instantIDVerificationDescription")
+          }
+        ),
+        title: i18n.get("identityVerification"),
+        description: showIndividualMotionCapture?.value ? i18n.get("toHelpProtectAgainstFraudAndKeepOurServices") : /* @__PURE__ */ jsxs(Fragment, { children: [
+          i18n.get("takeOrUploadAPhoto"),
+          " ",
+          /* @__PURE__ */ jsx(Link, { href: "https://onfido.com", external: true, inline: true, children: i18n.get("onfido") })
+        ] }),
+        helpAction: error ? /* @__PURE__ */ jsx(
+          Alert,
+          {
+            variant: "error",
+            title: i18n.get(error.key, error.options),
+            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: i18n.get("startVerification")
+            }
+          ),
+          !showIndividualMotionCapture?.value && /* @__PURE__ */ jsx(
+            Button,
+            {
+              onClick: () => setStatus("confirmManualFlowModal"),
+              variant: "secondary",
+              fullWidth: true,
+              children: i18n.get("addDetailsManually")
+            }
+          )
+        ] }) }),
+        content: !showLoadingSpinner && hasExistingDocument && /* @__PURE__ */ jsx(
+          UploadedDocument,
+          {
+            document: existingDocument,
+            onDelete: () => setStatus("confirmDeleteDocumentModal"),
+            onUpdate: handleUpdateExistingDocument
+          }
+        ),
+        disclaimer: !hasExistingDocument && /* @__PURE__ */ jsxs(Fragment, { children: [
+          i18n.get("byContinuingToUseThisService"),
+          " ",
+          /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/facial-scan-policy-and-release/", external: true, inline: true, children: i18n.get("onfidoFacialScanPolicy") }),
+          " ",
+          /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/privacy/", external: true, inline: true, children: i18n.get("privacyPolicy") }),
+          " ",
+          i18n.get("and"),
+          " ",
+          /* @__PURE__ */ jsx(Link, { href: "https://onfido.com/terms-of-service/", external: true, inline: true, children: i18n.get("termsOfService") }),
+          "."
+        ] })
       }
-    ) : /* @__PURE__ */ jsxs(Fragment, { children: [
-      /* @__PURE__ */ jsx(
-        ProviderButton,
-        {
-          provider: "onfido",
-          fullWidth: true,
-          disabled: status === "extractionLoading",
-          loading: status === "extractionLoading",
-          onClick: launchOnfido
-        }
-      ),
-      !showIndividualMotionCapture?.value && /* @__PURE__ */ jsx(
-        Button,
-        {
-          onClick: () => setStatus("confirmManualFlowModal"),
-          variant: "secondary",
-          fullWidth: true,
-          children: i18n.get("addDetailsManually")
-        }
-      ),
-      /* @__PURE__ */ jsx(IdVerificationDisclaimer, {})
-    ] }) }) }),
+    ),
     status === "onfidoModal" && /* @__PURE__ */ jsx(
       OnfidoVerificationModal,
       {
@@ -3253,8 +3270,8 @@ const ManualIdUpload = () => {
     }
   );
 };
-const getDisplayErrorMessage = (errorMessage, i18n) => {
-  return typeof errorMessage !== "boolean" ? i18n.get(errorMessage) : errorMessage;
+const getDisplayErrorMessage = (errorMessage, t) => {
+  return typeof errorMessage !== "boolean" ? translateStringOrObject(t, errorMessage) : errorMessage;
 };
 const SignatoryQuestionnaireModalContent = () => {
   const { i18n } = useI18nContext();
@@ -3267,6 +3284,7 @@ const SignatoryQuestionnaireModalContent = () => {
   ] });
 };
 function SignatoryQuestionnaire(props) {
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
   const userEvents = useAnalyticsContext();
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -3278,7 +3296,7 @@ function SignatoryQuestionnaire(props) {
     fieldValidationErrors,
     handleFieldChange
   } = props;
-  const formUtils = createFormUtils(props, i18n);
+  const formUtils = createFormUtils(props, t);
   if (!handleFieldChange) {
     return;
   }
@@ -3317,7 +3335,7 @@ function SignatoryQuestionnaire(props) {
         onDescriptionLinkClick: openModal,
         question: i18n.get("signatoryQuestion"),
         descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(errorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(errorMessage, t)
       }
     ),
     isModalOpen && /* @__PURE__ */ jsx(Modal, { onClose: closeModal, ariaLabel: i18n.get("moreAboutAuthorizedSignatories"), inset: true, children: /* @__PURE__ */ jsx(SignatoryQuestionnaireModalContent, {}) })
@@ -3395,6 +3413,7 @@ const uboQuestionnaireFields = [
   "isNomineeShareholder"
 ];
 function UboQuestionnaire(props) {
+  const { t } = useTranslation();
   const { i18n } = useI18nContext();
   const userEvents = useAnalyticsContext();
   const {
@@ -3406,7 +3425,7 @@ function UboQuestionnaire(props) {
     fieldValidationErrors,
     handleFieldChange
   } = props;
-  const formUtils = createFormUtils(props, i18n);
+  const formUtils = createFormUtils(props, t);
   const [activeModal, setActiveModal] = useState(null);
   if (!handleFieldChange) {
     return;
@@ -3473,7 +3492,7 @@ function UboQuestionnaire(props) {
         onDescriptionLinkClick: openModal("isDirector"),
         question: i18n.get("directorQuestion"),
         descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(isDirectorErrorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(isDirectorErrorMessage, t)
       }
     ),
     formUtils.isRequiredField("isNomineeDirector") && data?.isDirector === GuidanceQuestionValues.YES && /* @__PURE__ */ jsx(
@@ -3483,7 +3502,7 @@ function UboQuestionnaire(props) {
         value: data?.isNomineeDirector,
         onChange: handleFieldChange("isNomineeDirector"),
         question: i18n.get("nomineeDirectorQuestion"),
-        errorMessage: getDisplayErrorMessage(isNomineeDirectorErrorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(isNomineeDirectorErrorMessage, t)
       }
     ),
     formUtils.isRequiredField("isOwner") && /* @__PURE__ */ jsx(
@@ -3495,7 +3514,7 @@ function UboQuestionnaire(props) {
         onDescriptionLinkClick: openModal("isOwner"),
         question: i18n.get("ownerQuestion"),
         descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(isOwnerErrorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(isOwnerErrorMessage, t)
       }
     ),
     formUtils.isRequiredField("isNomineeShareholder") && data?.isOwner === GuidanceQuestionValues.YES && /* @__PURE__ */ jsx(
@@ -3505,7 +3524,7 @@ function UboQuestionnaire(props) {
         value: data?.isNomineeShareholder,
         onChange: handleFieldChange("isNomineeShareholder"),
         question: i18n.get("nomineeShareHolderQuestion"),
-        errorMessage: getDisplayErrorMessage(isNomineeShareholderErrorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(isNomineeShareholderErrorMessage, t)
       }
     ),
     formUtils.isRequiredField("isControllingPerson") && /* @__PURE__ */ jsx(
@@ -3517,7 +3536,7 @@ function UboQuestionnaire(props) {
         onDescriptionLinkClick: openModal("isControllingPerson"),
         question: i18n.get("controllingPersonQuestion"),
         descriptionLinkText: i18n.get("whatDoesThisMean"),
-        errorMessage: getDisplayErrorMessage(isControllingPersonErrorMessage, i18n)
+        errorMessage: getDisplayErrorMessage(isControllingPersonErrorMessage, t)
       }
     ),
     activeModal && /* @__PURE__ */ jsx(Modal, { onClose: closeModal, ariaLabel: modalAriaLabelMap[activeModal], inset: true, children: /* @__PURE__ */ jsx(UboQuestionnaireModalContent, { modalType: activeModal }) })
@@ -3892,7 +3911,7 @@ const adjustOnfidoIdentificationData = (data, apiData) => {
 const mapIndividualOnfidoSchemaToLegalEntity = (individualOnfido, isExperimentEnabled, matchingScenario) => {
   const legalEntity = {
     ...formatObject(individualOnfido, individualOnfidoApiKeyMapping),
-    type: LegalEntityType.INDIVIDUAL
+    type: LegalEntityTypes.INDIVIDUAL
   };
   if (individualOnfido.additionalPersonalDetails) {
     if (isExperimentEnabled("EnableTaxIdRequiredForBusinessAccountsScenarios") && matchingScenario?.includes(Scenarios.L_TAXINFO) && individualOnfido.additionalPersonalDetails?.idNumber && individualOnfido.additionalPersonalDetails?.typeOfIdentity && individualOnfido.additionalPersonalDetails?.country === CountryCodes.Spain) {
@@ -4019,19 +4038,19 @@ const mapLegalEntityToIndividualOnfidoSchema = (legalEntity, isChangingType, isR
     const associationTypes = new Set(associations.map((ea) => ea.type));
     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);
+    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(
@@ -4069,6 +4088,9 @@ const identityOnfidoBase = {
   jobTitle: {
     rule: "jobTitleIfRequiredForRole"
   },
+  placeOfBirth: {
+    rule: "isPlaceOfBirthRequired"
+  },
   nationality: {
     rule: "nationalityIfRequiredForRole"
   },
@@ -4108,10 +4130,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)
@@ -4404,7 +4424,7 @@ function IndividualOnfidoDropin({
   useEffect(() => {
     setCountry(data?.additionalPersonalDetails?.country ?? parentCountry);
   }, [data?.additionalPersonalDetails?.country, parentCountry]);
-  const { data: scenarios } = useScenarios(country, LegalEntityType.INDIVIDUAL);
+  const { data: scenarios } = useScenarios(country, LegalEntityTypes.INDIVIDUAL);
   useEffect(() => {
     if (!scenarios) return;
     setHasMotionCaptureScenario(scenarios);
@@ -4412,7 +4432,7 @@ function IndividualOnfidoDropin({
   }, [scenarios]);
   const { fieldConfigurations } = useScenarioConfiguration({
     parseConfiguration,
-    legalEntityType: LegalEntityType.INDIVIDUAL,
+    legalEntityType: LegalEntityTypes.INDIVIDUAL,
     setLoadingStatus,
     country
   });
@@ -4495,7 +4515,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 ({