@adyen/kyc-components 3.6.1 → 3.7.0

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

@@ -2,7 +2,7 @@ import { useContext, useState, useCallback, useEffect, useMemo, useReducer, useR
 import { createContext, createElement, render } from "preact";
 import { sanitize } from "isomorphic-dompurify";
 import cx from "classnames";
-import { lazy, Suspense, useId, forwardRef, memo, useMemo as useMemo$1, useEffect as useEffect$1, useState as useState$1, useCallback as useCallback$1 } from "preact/compat";
+import { lazy, Suspense, useId, forwardRef, memo, useMemo as useMemo$1, useEffect as useEffect$1, useState as useState$1 } from "preact/compat";
 import { jsx, jsxs, Fragment } from "preact/jsx-runtime";
 import { debounce, noop as noop$1, isEmpty as isEmpty$1, range } from "lodash";
 import OpenBankingSDK from "@adyen/openbankingsdk";
@@ -183,6 +183,7 @@ const chamberOfCommerceRegistrationNumber = "Chamber of Commerce registration nu
 const taxId = "Tax ID";
 const exemptedFromTax = "Exempted from tax";
 const doNotHaveTaxIdNumber = "I do not have a Tax Identification Number";
+const doNotHaveEIN = "I do not have an EIN";
 const doNotHaveFirmenbuchnummer = "I do not have a Firmenbuchnummer";
 const doNotHaveOrganisationsnummer = "I do not have an Organisationsnummer";
 const doNotHaveYTunnus = "I do not have a Y-TUNNUS";
@@ -202,6 +203,7 @@ const validationPleaseEnterAValidVatNumber = "Please enter a valid Tax id number
 const validationPleaseEnterAValidIdNumberWithFormat = "Please enter a valid %{idType} number. Expected format: %{format}";
 const validationPleaseEnterAValidVatNumberWithFormat = "Please enter a valid VAT number. Expected format: %{format}";
 const validationPleaseEnterAValidTaxIdNumberWithFormat = "Please enter a valid Tax id number. Expected format: %{format}";
+const validationPleaseEnterAValidEINWithFormat = "Please enter a valid EIN. Expected format: %{format}";
 const validationPleaseEnterAValidTaxIdNumber = "Please enter a valid Tax id number.";
 const validationPleaseEnterAValidIRDNumber = "Please enter a valid IRD number. Expected format: 8 - 9 digits";
 const aValidAbnShouldBe11Digits = "A valid ABN should be 11 digits.";
@@ -619,7 +621,7 @@ const noGlare = "No glare";
 const selectDocumentType = "Select document type";
 const registrationDocumentSubTitle = "Upload your company’s business registration document. We need to see this document so we can verify your company.";
 const documentIssuedByGovernmentAuthority = "The document has to be issued by a government authority. It’s usually given when a business is created at the local commercial register";
-const uploadTaxationDocument = "Upload a a tax return or taxation registration document. We need to see this document so we can verify that your tax ID number belongs to your company.";
+const uploadTaxationDocument = "Upload a tax return or taxation registration document. We need to see this document so we can verify that your tax ID number belongs to your company.";
 const containsNameOfCompany = "Contains the name of your company or organization";
 const documentShowsTaxIdOfCompany = "The document shows the tax ID number of the company";
 const issuedByTheTaxAuthority = "Issued by the tax authority or government of the country where the company is registered";
@@ -869,14 +871,14 @@ const marketIdentifierCodeMIC = "Market Identifier Code (MIC)";
 const isin = "ISIN";
 const companyLookupResultsHeader = "Let's find your company";
 const companyLookupResultsHeader__searching = "Searching for companies...";
-const companyLookupResultsHeader__verifying = "Verifying tax information...";
+const companyLookupResultsHeader__verifying = "Verifying company selection...";
 const companyLookupResultsHeader__noResults = "We couldn't find your company";
 const companyLookupResultsHeader__results = "Select your company";
 const companyLookupResultsHeader__searchFailure = "Sorry, something went wrong";
 const companyLookupResultsHeaderDescription__noResults = "No problem, let's enter your company details in the next steps.";
-const companyLookupResultsHeaderDescription__results = "This helps you to get verified quicker. If you can't find your company, you can always continue by pressing Next.";
+const companyLookupResultsHeaderDescription__results = "We'll find your official company details to help you get verified faster. If your company isn't in this list, you can always continue by pressing Next.";
 const companyLookupResultsHeaderDescription__searchFailure = "If that doesn't work, press Next to continue.";
-const companyLookupResultsListAlert__title__verified = "Your tax information has been verified";
+const companyLookupResultsListAlert__title__verified = "Your company details will be pre-filled in the relevant sections.";
 const companyLookupResultsListAlert__title__warning = "This company's TIN doesn't match yours";
 const companyLookupResultsListAlert__title__error = "Sorry, something went wrong. Try again or continue by pressing Next";
 const companyLookupResultsListAlert__description__warning = "Check the TIN you've entered, or select a different company.";
@@ -887,9 +889,9 @@ const companyStructureFormName = "Company structure";
 const companyStructureFormDescription = "What type of company do you have?";
 const companyOtherDetailsFormName = "Other details";
 const companyRegistrationDocumentFormName = "Registration document";
-const companyRegistrationDocumentFormDescription = "Please upload you companies registration document so we can verify your information.";
+const companyRegistrationDocumentFormDescription = "Please upload your companies registration document so we can verify your information.";
 const companyTaxDocumentFormName = "Tax document";
-const companyTaxDocumentFormDescription = "Please upload you companies tax documents so we can verify your information.";
+const companyTaxDocumentFormDescription = "Please upload your companies tax documents so we can verify your information.";
 const errorMessage_1_10 = "Information couldn’t be verified";
 const errorMessage_1_11 = "Document didn’t meet requirements";
 const errorMessage_1_12 = "Legal entity declined";
@@ -1112,6 +1114,7 @@ const errorMessage_2_8064 = "UBO through ownership was missing.";
 const errorMessage_2_8067 = "Signatory was missing.";
 const errorMessage_2_8141 = "Registration document was missing.";
 const errorMessage_2_8162 = "proofOfOrganizationTaxInfo was missing.";
+const errorMessage_2_8183 = "'webAddress' was missing.";
 const errorMessage_2_8189 = "UBO through control was missing.";
 const errorMessage_2_8193 = "Director was missing.";
 const errorMessage_3_10 = "Review of data is required";
@@ -1157,6 +1160,7 @@ const remediationMessage_1_705 = "Upload an official bank statement";
 const remediationMessage_2_123 = "You haven't added an owner";
 const remediationMessage_2_124 = "You haven't added a signatory";
 const remediationMessage_2_151 = "You haven't added a controlling person";
+const remediationMessage_2_178 = "Add 'webAddress' to business line.";
 const remediationMessage_2_185 = "You haven't added your directors";
 const remediationMessage_3_100 = "Check the above information, then click here to confirm.";
 const sameNameAsLegalName = "Same as legal name of the company";
@@ -1424,6 +1428,7 @@ const defaultTrans = {
   taxId,
   exemptedFromTax,
   doNotHaveTaxIdNumber,
+  doNotHaveEIN,
   doNotHaveFirmenbuchnummer,
   doNotHaveOrganisationsnummer,
   doNotHaveYTunnus,
@@ -1443,6 +1448,7 @@ const defaultTrans = {
   validationPleaseEnterAValidIdNumberWithFormat,
   validationPleaseEnterAValidVatNumberWithFormat,
   validationPleaseEnterAValidTaxIdNumberWithFormat,
+  validationPleaseEnterAValidEINWithFormat,
   validationPleaseEnterAValidTaxIdNumber,
   validationPleaseEnterAValidIRDNumber,
   aValidAbnShouldBe11Digits,
@@ -2361,6 +2367,7 @@ const defaultTrans = {
   errorMessage_2_8067,
   errorMessage_2_8141,
   errorMessage_2_8162,
+  errorMessage_2_8183,
   errorMessage_2_8189,
   errorMessage_2_8193,
   errorMessage_3_10,
@@ -2406,6 +2413,7 @@ const defaultTrans = {
   remediationMessage_2_123,
   remediationMessage_2_124,
   remediationMessage_2_151,
+  remediationMessage_2_178,
   remediationMessage_2_185,
   remediationMessage_3_100,
   sameNameAsLegalName,
@@ -2729,6 +2737,7 @@ var SettingNames = /* @__PURE__ */ ((SettingNames2) => {
   SettingNames2["AllowIntraRegionCrossBorderPayout"] = "allowIntraRegionCrossBorderPayout";
   SettingNames2["AllowLegalEntityTypeChange"] = "changeLegalEntityType";
   SettingNames2["AllowPrefilledCountryEdit"] = "editPrefilledCountry";
+  SettingNames2["LimitToOneTransferInstrument"] = "limitToOneTransferInstrument";
   SettingNames2["RequirePciSignEcommerce"] = "requirePciSignEcommerce";
   SettingNames2["RequirePciSignPos"] = "requirePciSignPos";
   SettingNames2["RequirePciSignEcomMoto"] = "requirePciSignEcomMoto";
@@ -6680,18 +6689,6 @@ const taxIdNumberOptions = {
   }, {
     id: "uen",
     name: "uen"
-  }],
-  [CountryCodes.UnitedStates]: [{
-    id: "ein",
-    name: "employerIdentificationNumber"
-  }, {
-    id: "ssn",
-    name: "socialSecurityNumber",
-    applicableOnlyFor: [CompanyTypesValue.SOLE_PROPRIETORSHIP]
-  }, {
-    id: "ssnLastFour",
-    name: "last4DigitsOfSocialSecurityNumber",
-    applicableOnlyFor: [CompanyTypesValue.SOLE_PROPRIETORSHIP]
   }]
 };
 const getTaxIdNumberOptions = (country2, companyType2) => {
@@ -8088,7 +8085,7 @@ function BusinessRegistrationNumber(props) {
       ...formUtils.getMask("registrationNumber")
     }), formUtils.isRequiredField("exemptedFromRegistrationNumber") && !showExemptedOption && jsx(Checkbox, {
       name: "exemptedFromRegistrationNumber",
-      label: formUtils.getLabel("exemptedFromRegistrationNumber"),
+      label: formUtils.getLabel("iDontHaveARegistrationNumber"),
       value: "exemptedFromRegistrationNumber",
       readonly: formUtils.isReadOnly("exemptedFromRegistrationNumber"),
       classNameModifiers: ["exempted-from-registration"],
@@ -8581,41 +8578,17 @@ const defaultFieldConfig$7 = {
       }
     }
   },
-  [CountryCodes.UnitedStates]: ({
-    taxIdNumberType
-  }) => {
-    switch (taxIdNumberType) {
-      case "ssn":
-        return {
-          label: "socialSecurityNumber",
-          validators: validatePatternOnBlur(/^\d{9}$/),
-          mask: {
-            mask: makeMask(...numericInputs(9))
-          }
-        };
-      case "ssnLastFour":
-        return {
-          label: "last4DigitsOfSocialSecurityNumber",
-          validators: validatePatternOnBlur(/^\d{4}$/),
-          mask: {
-            mask: makeMask(...nonInputs("*** — ** — "), ...numericInputs(4))
-          }
-        };
-      case "ein":
-      default:
-        return {
-          label: "employerIdentificationNumber",
-          validators: validatePatternOnBlur(/^\d{9}$/),
-          mask: {
-            mask: makeMask(...numericInputs(2), ...nonInputs(" - "), ...numericInputs(7))
-          },
-          guidanceText: {
-            key: "validationPleaseEnterAValidTaxIdNumberWithFormat",
-            values: {
-              format: "XX-XXXXXXX"
-            }
-          }
-        };
+  [CountryCodes.UnitedStates]: {
+    label: "employerIdentificationNumber",
+    validators: validatePatternOnBlur(/^\d{9}$/),
+    mask: {
+      mask: makeMask(...numericInputs(2), ...nonInputs(" - "), ...numericInputs(7))
+    },
+    guidanceText: {
+      key: "validationPleaseEnterAValidEINWithFormat",
+      values: {
+        format: "XX-XXXXXXX"
+      }
     }
   },
   /**
@@ -10290,10 +10263,7 @@ const countryConfig$3 = {
       label: "doingBusinessAs"
     },
     exemptedFromTax: {
-      label: "doNotHaveTaxIdNumber"
-    },
-    taxId: {
-      label: "employerIdentificationNumber"
+      label: "doNotHaveEIN"
     }
   }
 };
@@ -13071,6 +13041,9 @@ const rules$2 = ({
     if (country2 === "DE" && (companyType2 === CompanyTypesValue.GOVERNMENTAL_ORGANIZATION || companyType2 === CompanyTypesValue.NON_PROFIT_OR_CHARITABLE)) {
       return "REQUIRED";
     }
+    if (country2 === "DK" && companyType2 === CompanyTypesValue.NON_PROFIT_OR_CHARITABLE) {
+      return "REQUIRED";
+    }
   },
   countryRequiresRegistrationNumberForSoleProps: () => {
     if (!COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION.includes(country2)) {
@@ -22045,7 +22018,7 @@ var EntityType = /* @__PURE__ */ ((EntityType2) => {
   EntityType2["LEGAL_ENTITY"] = "LegalEntity";
   return EntityType2;
 })(EntityType || {});
-const UNRELATED_DATA_MISSING_ERROR_CODES = ["2_8036", "2_8064", "2_8067", "2_8189"];
+const UNRELATED_DATA_MISSING_ERROR_CODES = ["2_8036", "2_8064", "2_8067", "2_8183", "2_8189"];
 const UNRELATED_INVALID_INPUT_ERROR_CODES = ["1_14", "2_901", "2_902"];
 const getComponentMappingFromLEFieldPath = (context, entityType2, isExperimentEnabled) => {
   if (!(context == null ? void 0 : context.key)) {
@@ -24848,11 +24821,15 @@ function TaxInformationField({
   readonly,
   handleChangeFor,
   country: country2,
-  canExempt
+  canExempt,
+  companyType: companyType2,
+  taxIdNumberType,
+  setTaxIdNumberType
 }) {
+  var _a;
   const currentCountryTaxInformation = useMemo(() => {
-    var _a;
-    return (_a = data == null ? void 0 : data.taxInformation) == null ? void 0 : _a.find((taxInfo) => taxInfo.country === country2);
+    var _a2;
+    return (_a2 = data == null ? void 0 : data.taxInformation) == null ? void 0 : _a2.find((taxInfo) => taxInfo.country === country2);
   }, [data, country2]);
   const handleTaxInformationInput = (value) => {
     if (!data.taxInformation) {
@@ -24907,8 +24884,33 @@ function TaxInformationField({
     });
     return handleChangeFor("taxInformation", "blur")(updatedTaxInformation);
   };
-  return jsxs(Fragment, {
-    children: [jsx(MaskedInputText, {
+  const showTaxIdExemptedOption = canExempt && (((_a = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _a.length) ?? 0) > 1;
+  const handleTaxIdNumberTypeChange = (taxIdType) => {
+    if (taxIdType === "exempted") {
+      if (!canExempt) {
+        throw Error(`${country2} does not allow tax exemptions`);
+      }
+      handleChangeFor("exemptedFromTax")(true);
+      setTaxIdNumberType(void 0);
+      return;
+    }
+    if (canExempt && data.exemptedFromTax === true) {
+      handleChangeFor("exemptedFromTax")(false);
+    }
+    setTaxIdNumberType(taxIdType);
+  };
+  return jsxs("div", {
+    className: "adyen-kyc-field__tax-information",
+    children: [jsx(TaxIdNumberTypeSelector, {
+      country: country2,
+      companyType: companyType2,
+      setSelected: handleTaxIdNumberTypeChange,
+      selected: data.exemptedFromTax ? "exempted" : taxIdNumberType,
+      exemptedOption: showTaxIdExemptedOption ? labels2.exemptedFromTax : false
+    }), jsx(MaskedInputText, {
+      "aria-required": true,
+      "aria-label": labels2.taxInformation,
+      "aria-invalid": !valid.taxInformation,
       name: "taxInformationNumber",
       label: labels2.taxInformation ?? "",
       formatGuidance: (guidanceText == null ? void 0 : guidanceText.taxInformation) ?? "",
@@ -24916,15 +24918,12 @@ function TaxInformationField({
       errorMessage: errors.taxInformation,
       placeholder: placeholders == null ? void 0 : placeholders.taxInformation,
       isValid: Boolean(valid.taxInformation),
-      "aria-required": true,
-      "aria-label": labels2.taxInformation,
-      "aria-invalid": !valid.taxInformation,
       onInput: handleTaxInformationInput,
       onBlur: handleTaxInformationBlur,
       disabled: data.exemptedFromTax,
       readonly,
       ...mask
-    }), canExempt && jsx(Checkbox, {
+    }), canExempt && !showTaxIdExemptedOption && jsx(Checkbox, {
       "aria-required": false,
       "aria-label": labels2.exemptedFromTax,
       "aria-invalid": false,
@@ -24991,13 +24990,14 @@ function CompanyBasics({
   handleRefreshCompanyDataset,
   handleVerifyTin,
   country: country2,
+  companyType: companyType2 = CompanyTypesValue.PRIVATE_COMPANY,
   isTopLevelEntity,
   baseTrackingPayload,
   kompanyVerifiedData,
   setKompanyAddress,
   setKompanyVerifiedData
 }) {
-  var _a, _b;
+  var _a, _b, _c, _d, _e;
   const {
     i18n
   } = useI18nContext();
@@ -25009,6 +25009,9 @@ function CompanyBasics({
   } = useGlobalDataSlice(COMPANY_BASICS_FORM_ID);
   const [loading2, setLoading] = useState$1(false);
   const allowedCountries = useAllowedCountries();
+  const existingTaxId = (_b = (_a = data == null ? void 0 : data.taxInformation) == null ? void 0 : _a.find((taxId2) => taxId2.country === country2)) == null ? void 0 : _b.number;
+  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2) : (_c = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _c[0].id;
+  const [taxIdNumberType, setTaxIdNumberType] = useState$1(defaultTaxIdNumberType);
   const initialFormUtilsProps = useMemo$1(() => ({
     labels: labels2,
     placeholders,
@@ -25050,13 +25053,13 @@ function CompanyBasics({
           };
         case "taxInformation":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig[country2], {
-            taxIdNumberType: countryToTaxInfoTypeMap[country2]
+            taxIdNumberType
           }, defaultFieldMetadata), acc);
         default:
           return acc;
       }
     }, initialFormUtilsProps);
-  }, [country2, initialFormUtilsProps]);
+  }, [country2, initialFormUtilsProps, taxIdNumberType]);
   const schema = (requiredFields == null ? void 0 : requiredFields.length) ? requiredFields : ["legalCompanyName", "country"];
   const {
     schema: formSchema,
@@ -25078,7 +25081,7 @@ function CompanyBasics({
   const isAllowedEditPrefilledCountry = isSettingEnabled(SettingNames.AllowPrefilledCountryEdit);
   const formUtils = formUtilities(mergedFieldProps ?? initialFormUtilsProps, i18n);
   const hasCompanySearchProvider = formData.country && COUNTRIES_WITH_IN_APP_SEARCH_COMPANY_VERIFICATION.includes(formData.country);
-  const currentCountryTaxIdNumber = (_b = (_a = formData.taxInformation) == null ? void 0 : _a.find((taxInfo) => taxInfo.country === formData.country)) == null ? void 0 : _b.number;
+  const currentCountryTaxIdNumber = (_e = (_d = formData.taxInformation) == null ? void 0 : _d.find((taxInfo) => taxInfo.country === formData.country)) == null ? void 0 : _e.number;
   const disabled = (field) => formUtils.isReadOnly(field) || Boolean(kompanyVerifiedData) || loading2;
   useEffect$1(() => {
     updateStateSlice({
@@ -25141,7 +25144,9 @@ function CompanyBasics({
           data: formUtils.getFieldData(formData, TAX_INFORMATION_FIELD),
           valid: formUtils.getFieldValid(formValid, TAX_INFORMATION_FIELD),
           errors: formUtils.getFieldErrors(formErrors, formFieldProblems, TAX_INFORMATION_FIELD),
-          labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD),
+          labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD, {
+            exemptedFromTax: "iDontHaveATaxId"
+          }),
           mask: formUtils.getMask("taxInformation"),
           helperText: formUtils.getFieldHelperText(TAX_INFORMATION_FIELD),
           guidanceText: formUtils.getFieldGuidanceText(TAX_INFORMATION_FIELD),
@@ -25149,7 +25154,10 @@ function CompanyBasics({
           handleChangeFor,
           canExempt: formUtils.isRequiredField("exemptedFromTax"),
           isUen: formUtils.isRequiredField("isUen"),
-          country: formData.country
+          country: formData.country,
+          companyType: companyType2 ?? CompanyTypesValue.PRIVATE_COMPANY,
+          taxIdNumberType,
+          setTaxIdNumberType
         })
       }), hasCompanySearchProvider && jsx(CompanyLookupComponent, {
         defaultData: data,
@@ -25172,7 +25180,7 @@ function CompanyBasics({
     })]
   });
 }
-const CompanyBasicsComponent = memo(CompanyBasics, (prevProps, nextProps) => objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.placeholders, nextProps.placeholders) && objectsDeepEqual(prevProps.helperText, nextProps.helperText) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && prevProps.heading === nextProps.heading && prevProps.description === nextProps.description && prevProps.readOnly === nextProps.readOnly && prevProps.requiredFields === nextProps.requiredFields && prevProps.obscuredFields === nextProps.obscuredFields && prevProps.optionalFields === nextProps.optionalFields && prevProps.readOnlyFields === nextProps.readOnlyFields && prevProps.shouldValidate === nextProps.shouldValidate && objectsDeepEqual(prevProps.kompanyVerifiedData, nextProps.kompanyVerifiedData));
+const CompanyBasicsComponent = memo(CompanyBasics, (prevProps, nextProps) => objectsDeepEqual(prevProps.data, nextProps.data) && objectsDeepEqual(prevProps.labels, nextProps.labels) && objectsDeepEqual(prevProps.placeholders, nextProps.placeholders) && objectsDeepEqual(prevProps.helperText, nextProps.helperText) && objectsDeepEqual(prevProps.formVerificationErrors, nextProps.formVerificationErrors) && objectsDeepEqual(prevProps.fieldValidationErrors, nextProps.fieldValidationErrors) && prevProps.heading === nextProps.heading && prevProps.description === nextProps.description && prevProps.readOnly === nextProps.readOnly && prevProps.requiredFields === nextProps.requiredFields && prevProps.obscuredFields === nextProps.obscuredFields && prevProps.optionalFields === nextProps.optionalFields && prevProps.readOnlyFields === nextProps.readOnlyFields && prevProps.shouldValidate === nextProps.shouldValidate && prevProps.companyType === nextProps.companyType && objectsDeepEqual(prevProps.kompanyVerifiedData, nextProps.kompanyVerifiedData));
 const BUSINESS_REGISTRATION_NUMBER_FIELD = ["registrationNumber", "exemptedFromRegistrationNumber"];
 function BusinessRegistrationNumberField({
   data,
@@ -25183,11 +25191,38 @@ function BusinessRegistrationNumberField({
   guidanceText,
   placeholders,
   readonly,
+  handleChangeFor,
+  country: country2,
   canExempt,
-  handleChangeFor
+  companyType: companyType2,
+  registrationNumberOptions,
+  registrationNumberType,
+  setRegistrationNumberType
 }) {
-  return jsxs(Fragment, {
-    children: [jsx(MaskedInputText, {
+  const showExemptedOption = canExempt && !!registrationNumberOptions && registrationNumberOptions.length > 1;
+  const handleCompanyRegistrationNumberTypeChange = (regNumberType) => {
+    if (regNumberType === "exempted") {
+      if (!canExempt) {
+        throw Error(`${country2} does not allow tax exemptions`);
+      }
+      handleChangeFor("exemptedFromRegistrationNumber")(true);
+      setRegistrationNumberType(void 0);
+      return;
+    }
+    if (canExempt && data.exemptedFromRegistrationNumber === true) {
+      handleChangeFor("exemptedFromRegistrationNumber")(false);
+    }
+    setRegistrationNumberType(regNumberType);
+  };
+  return jsxs("div", {
+    className: "adyen-kyc-field__business-registration",
+    children: [jsx(CompanyRegistrationNumberTypeSelector, {
+      companyType: companyType2,
+      country: country2,
+      setSelected: handleCompanyRegistrationNumberTypeChange,
+      selected: data.exemptedFromRegistrationNumber ? "exempted" : registrationNumberType,
+      exemptedOption: showExemptedOption ? labels2.exemptedFromRegistrationNumber : false
+    }), jsx(MaskedInputText, {
       "aria-required": true,
       "aria-label": labels2.registrationNumber,
       "aria-invalid": !valid.registrationNumber,
@@ -25332,13 +25367,38 @@ function VatNumberField({
   placeholders,
   readonly,
   handleChangeFor,
-  canExempt
+  canExempt,
+  country: country2,
+  vatNumberType,
+  setVatNumberType
 }) {
+  var _a;
   const {
     i18n
   } = useI18nContext();
-  return jsxs(Fragment, {
-    children: [jsx(MaskedInputText, {
+  const showVatExemptedOption = canExempt && ((_a = taxIdNumberOptions[country2]) == null ? void 0 : _a.length) > 1;
+  const handleVatNumberTypeChange = (vatType) => {
+    if (vatType === "exempted") {
+      if (!canExempt) {
+        throw Error(`${country2} does not allow VAT exemptions`);
+      }
+      handleChangeFor("exemptedFromVat")(true);
+      setVatNumberType(void 0);
+      return;
+    }
+    if (canExempt && data.exemptedFromVat === true) {
+      handleChangeFor("exemptedFromVat")(false);
+    }
+    setVatNumberType(vatType);
+  };
+  return jsxs("div", {
+    className: "adyen-kyc-field__vat-number",
+    children: [jsx(TaxIdNumberTypeSelector, {
+      country: country2,
+      setSelected: handleVatNumberTypeChange,
+      selected: data.exemptedFromVat ? "exempted" : vatNumberType,
+      exemptedOption: showVatExemptedOption ? labels2.exemptedFromVat : false
+    }), jsx(MaskedInputText, {
       "aria-required": true,
       "aria-label": labels2.vatNumber,
       "aria-invalid": !valid.vatNumber,
@@ -25358,7 +25418,7 @@ function VatNumberField({
       disabled: data.exemptedFromVat,
       readonly,
       ...mask
-    }), canExempt && jsx(Checkbox, {
+    }), canExempt && !showVatExemptedOption && jsx(Checkbox, {
       "aria-required": false,
       "aria-label": labels2 == null ? void 0 : labels2.exemptedFromVat,
       "aria-invalid": false,
@@ -25415,14 +25475,17 @@ function CompanyOtherDetails({
     i18n
   } = useI18nContext();
   const {
-    sliceData,
     updateStateSlice
   } = useGlobalDataSlice(COMPANY_OTHER_DETAILS_FORM_ID);
-  const [registrationNumberType, setRegistrationNumberType] = useState$1((data == null ? void 0 : data.registrationNumber) ? inferCompanyRegistrationNumberType(data == null ? void 0 : data.registrationNumber, country2, companyType2) : (_a = companyRegistrationNumberOptions[country2]) == null ? void 0 : _a[0].id);
-  const existingTaxIdentificationNumber = (data == null ? void 0 : data.vatNumber) ?? ((_c = (_b = data == null ? void 0 : data.taxInformation) == null ? void 0 : _b.find((taxId2) => taxId2.country === country2)) == null ? void 0 : _c.number);
-  const [taxIdentificationNumberType, setTaxIdentificationNumberType] = useState$1(existingTaxIdentificationNumber ? inferTaxIdNumberType(existingTaxIdentificationNumber, country2) : (_d = taxIdNumberOptions[country2]) == null ? void 0 : _d[0].id);
+  const registrationNumberOptions = useMemo$1(() => getCompanyRegistrationNumberOptions(country2, companyType2), [country2, companyType2]);
+  const defaultRegistrationNumberType = (data == null ? void 0 : data.registrationNumber) ? inferCompanyRegistrationNumberType(data == null ? void 0 : data.registrationNumber, country2, companyType2) : registrationNumberOptions == null ? void 0 : registrationNumberOptions[0].id;
+  const [registrationNumberType, setRegistrationNumberType] = useState$1(defaultRegistrationNumberType);
+  const defaultVatNumberType = (data == null ? void 0 : data.vatNumber) ? inferTaxIdNumberType(data == null ? void 0 : data.vatNumber, country2) : (_a = taxIdNumberOptions[country2]) == null ? void 0 : _a[0].id;
+  const [vatNumberType, setVatNumberType] = useState$1(defaultVatNumberType);
+  const existingTaxId = (_c = (_b = data == null ? void 0 : data.taxInformation) == null ? void 0 : _b.find((taxId2) => taxId2.country === country2)) == null ? void 0 : _c.number;
+  const defaultTaxIdNumberType = existingTaxId ? inferTaxIdNumberType(existingTaxId, country2) : (_d = getTaxIdNumberOptions(country2, companyType2)) == null ? void 0 : _d[0].id;
+  const [taxIdNumberType, setTaxIdNumberType] = useState$1(defaultTaxIdNumberType);
   const directChildFields = companyOtherDetailsFields.filter((field) => ["tradingName", "sameNameAsLegalName", "stockExchangeMIC", "stockISIN", "dateOfIncorporation"].includes(field));
-  const schema = useMemo$1(() => !(sliceData == null ? void 0 : sliceData.exemptedFromVat) ? (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatAbsenceReason")) ?? directChildFields : (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatNumber")) ?? directChildFields, [requiredFields, directChildFields, sliceData]);
   const initialFormUtilsProps = useMemo$1(() => ({
     labels: labels2,
     placeholders,
@@ -25465,27 +25528,26 @@ function CompanyOtherDetails({
           }, defaultFieldMetadata$8), acc);
         case "taxInformation":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig[country2], {
-            taxIdNumberType: taxIdentificationNumberType
+            taxIdNumberType
           }, defaultFieldMetadata), acc);
         case "vatNumber":
           return mergeFieldMetadataIntoProps(field, resolveFieldMetadata(defaultFieldConfig$6[country2], {
-            vatNumberType: taxIdentificationNumberType
+            vatNumberType
           }, defaultFieldMetadata$6), acc);
         default:
           return acc;
       }
     }, initialFormUtilsProps);
-  }, [companyType2, country2, initialFormUtilsProps, registrationNumberType, taxIdentificationNumberType]);
+  }, [companyType2, country2, initialFormUtilsProps, registrationNumberType, taxIdNumberType, vatNumberType]);
   const {
     schema: formSchema,
     data: formData,
     errors: formErrors,
     valid: formValid,
     fieldProblems: formFieldProblems,
-    handleChangeFor,
-    triggerValidation
+    handleChangeFor
   } = useForm({
-    schema,
+    schema: (currentData) => !currentData.exemptedFromVat ? (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatAbsenceReason")) ?? directChildFields : (requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "vatNumber")) ?? directChildFields,
     defaultData: data,
     rules: mergedFieldProps == null ? void 0 : mergedFieldProps.validators,
     optionalFields: mergedFieldProps == null ? void 0 : mergedFieldProps.optionalFields,
@@ -25494,14 +25556,6 @@ function CompanyOtherDetails({
     shouldValidate
   });
   const formUtils = formUtilities(mergedFieldProps ?? initialFormUtilsProps, i18n);
-  const handleBusinessRegistrationNumberTypeChange = useCallback$1((type) => {
-    setRegistrationNumberType(type);
-    triggerValidation(["registrationNumber"]);
-  }, [triggerValidation]);
-  const handleTaxIdentificationNumberTypeChange = useCallback$1((type) => {
-    setTaxIdentificationNumberType(type);
-    triggerValidation(["vatNumber", "taxInformation"]);
-  }, [triggerValidation]);
   useEffect$1(() => {
   }, [kompanyVerifiedData]);
   useEffect$1(() => {
@@ -25541,44 +25595,46 @@ function CompanyOtherDetails({
           handleChangeFor,
           legalCompanyName: legalCompanyName2
         })
-      }), formUtils.isRequiredField("registrationNumber") && jsx(CompanyRegistrationNumberTypeSelector, {
-        companyType: companyType2,
-        country: country2,
-        setSelected: handleBusinessRegistrationNumberTypeChange,
-        selected: registrationNumberType
       }), formUtils.isRequiredField("registrationNumber") && jsx("div", {
         className: "adyen-kyc-field-wrapper",
         children: jsx(BusinessRegistrationNumberField, {
           data: formUtils.getFieldData(formData, BUSINESS_REGISTRATION_NUMBER_FIELD),
           valid: formUtils.getFieldValid(formValid, BUSINESS_REGISTRATION_NUMBER_FIELD),
           errors: formUtils.getFieldErrors(formErrors, formFieldProblems, BUSINESS_REGISTRATION_NUMBER_FIELD),
-          labels: formUtils.getFieldLabels(BUSINESS_REGISTRATION_NUMBER_FIELD),
+          labels: formUtils.getFieldLabels(BUSINESS_REGISTRATION_NUMBER_FIELD, {
+            exemptedFromRegistrationNumber: "iDontHaveARegistrationNumber"
+          }),
           mask: formUtils.getMask("registrationNumber"),
           guidanceText: formUtils.getFieldGuidanceText(BUSINESS_REGISTRATION_NUMBER_FIELD),
           placeholders: formUtils.getFieldPlaceholders(BUSINESS_REGISTRATION_NUMBER_FIELD),
           helperText: formUtils.getFieldHelperText(BUSINESS_REGISTRATION_NUMBER_FIELD),
           readonly: formUtils.isReadOnly("registrationNumber"),
           handleChangeFor,
-          canExempt: formUtils.isRequiredField("exemptedFromRegistrationNumber")
+          country: country2,
+          canExempt: formUtils.isRequiredField("exemptedFromRegistrationNumber"),
+          companyType: companyType2,
+          registrationNumberOptions,
+          registrationNumberType,
+          setRegistrationNumberType
         })
-      }), formUtils.isRequiredField("vatNumber") && jsx(TaxIdNumberTypeSelector, {
-        country: country2,
-        setSelected: handleTaxIdentificationNumberTypeChange,
-        selected: taxIdentificationNumberType
       }), formUtils.isRequiredField("vatNumber") && jsx("div", {
         className: "adyen-kyc-field-wrapper",
         children: jsx(VatNumberField, {
           data: formUtils.getFieldData(formData, VAT_NUMBER_FIELD),
           valid: formUtils.getFieldValid(formValid, VAT_NUMBER_FIELD),
           errors: formUtils.getFieldErrors(formErrors, formFieldProblems, VAT_NUMBER_FIELD),
-          labels: formUtils.getFieldLabels(VAT_NUMBER_FIELD),
+          labels: formUtils.getFieldLabels(VAT_NUMBER_FIELD, {
+            exemptedFromVat: "iDontHaveAVatNumber"
+          }),
           mask: formUtils.getMask("vatNumber"),
           guidanceText: formUtils.getFieldGuidanceText(VAT_NUMBER_FIELD),
           placeholders: formUtils.getFieldPlaceholders(VAT_NUMBER_FIELD),
           readonly: formUtils.isReadOnly("vatNumber"),
           handleChangeFor,
           country: country2,
-          canExempt: formUtils.isRequiredField("exemptedFromVat")
+          canExempt: formUtils.isRequiredField("exemptedFromVat"),
+          vatNumberType,
+          setVatNumberType
         })
       }), formUtils.isRequiredField("taxInformation") && jsx("div", {
         className: "adyen-kyc-field-wrapper",
@@ -25586,7 +25642,9 @@ function CompanyOtherDetails({
           data: formUtils.getFieldData(formData, TAX_INFORMATION_FIELD),
           valid: formUtils.getFieldValid(formValid, TAX_INFORMATION_FIELD),
           errors: formUtils.getFieldErrors(formErrors, formFieldProblems, TAX_INFORMATION_FIELD),
-          labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD),
+          labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD, {
+            exemptedFromTax: "iDontHaveATaxId"
+          }),
           mask: formUtils.getMask("taxInformation"),
           helperText: formUtils.getFieldHelperText(TAX_INFORMATION_FIELD),
           guidanceText: formUtils.getFieldGuidanceText(TAX_INFORMATION_FIELD),
@@ -25594,7 +25652,10 @@ function CompanyOtherDetails({
           handleChangeFor,
           country: country2,
           canExempt: formUtils.isRequiredField("exemptedFromTax"),
-          isUen: formUtils.isRequiredField("isUen")
+          isUen: formUtils.isRequiredField("isUen"),
+          companyType: companyType2,
+          taxIdNumberType,
+          setTaxIdNumberType
         })
       }), formUtils.isRequiredField("dateOfIncorporation") && jsx("div", {
         className: "adyen-kyc-field-wrapper",
@@ -25685,11 +25746,16 @@ function CompanyStructure({
     requiredFields
   }, i18n);
   const disabled = Boolean((_a = kompanyVerifiedData == null ? void 0 : kompanyVerifiedData.companyStructure) == null ? void 0 : _a.entityType) || formUtils.isReadOnly("entityType");
+  const prevVerifiedDataRef = useRef(kompanyVerifiedData);
   useEffect(() => {
-    var _a2, _b;
+    var _a2, _b, _c, _d, _e;
     if ((_a2 = kompanyVerifiedData == null ? void 0 : kompanyVerifiedData.companyStructure) == null ? void 0 : _a2.entityType) {
       handleChangeFor("entityType")((_b = kompanyVerifiedData == null ? void 0 : kompanyVerifiedData.companyStructure) == null ? void 0 : _b.entityType);
     }
+    if (((_d = (_c = prevVerifiedDataRef.current) == null ? void 0 : _c.companyStructure) == null ? void 0 : _d.entityType) && !((_e = kompanyVerifiedData == null ? void 0 : kompanyVerifiedData.companyStructure) == null ? void 0 : _e.entityType)) {
+      handleChangeFor("entityType")(void 0);
+    }
+    prevVerifiedDataRef.current = kompanyVerifiedData;
   }, [kompanyVerifiedData]);
   useEffect(() => {
     updateStateSlice({
@@ -26202,7 +26268,7 @@ function useCompanySearchTaskSubmit({
   };
 }
 function CompanySearchComponent(props) {
-  var _a, _b;
+  var _a, _b, _c;
   const {
     i18n
   } = useI18nContext();
@@ -26233,6 +26299,7 @@ function CompanySearchComponent(props) {
         id: forms.companyBasics.formId,
         heading: i18n.get(forms.companyBasics.formName),
         country: country2,
+        companyType: (_a = globalData == null ? void 0 : globalData.companyStructure) == null ? void 0 : _a.entityType,
         isTopLevelEntity,
         baseTrackingPayload,
         handleCompanyIndexSearch,
@@ -26275,8 +26342,8 @@ function CompanySearchComponent(props) {
         id: forms.companyOtherDetails.formId,
         heading: i18n.get(forms.companyOtherDetails.formName),
         country: country2,
-        legalCompanyName: (_a = globalData == null ? void 0 : globalData.companyBasics) == null ? void 0 : _a.legalCompanyName,
-        companyType: (_b = globalData == null ? void 0 : globalData.companyStructure) == null ? void 0 : _b.entityType,
+        legalCompanyName: (_b = globalData == null ? void 0 : globalData.companyBasics) == null ? void 0 : _b.legalCompanyName,
+        companyType: (_c = globalData == null ? void 0 : globalData.companyStructure) == null ? void 0 : _c.entityType,
         kompanyVerifiedData
       })
     }), jsx("div", {
@@ -26634,12 +26701,6 @@ function useAssociatedLegalArrangement({
     associatedLegalArrangement
   };
 }
-const useShouldShowBusinessTypeSelection = (accountHolder2) => {
-  const {
-    isExperimentEnabled
-  } = useExperimentsContext();
-  return isExperimentEnabled("EnableNewEntryFlow") && !accountHolder2;
-};
 const logger$c = createLogger("useExemptSettlor");
 const useExemptSettlor = ({
   trust: trust2,
@@ -26658,6 +26719,11 @@ const useExemptSettlor = ({
   }, [trust2, updateExemptSettlor]);
   return exemptSettlor;
 };
+const leIdStorageKey = "LE_ID";
+const useLeId = () => {
+  const [leIdFromLocalStorage, setLeIdIntoLocalStorage] = useLocalStorage(leIdStorageKey, null);
+  return [leIdFromLocalStorage, setLeIdIntoLocalStorage];
+};
 function useSalesChannelsSettings() {
   const {
     isSettingEnabled
@@ -27125,8 +27191,6 @@ const BusinessTypeSelection = ({
   const defaultBusinessType = getBusinessType(businessTypeOptions, accountHolder2, legalEntityResponse == null ? void 0 : legalEntityResponse.type, (_b = legalEntityResponse == null ? void 0 : legalEntityResponse.organization) == null ? void 0 : _b.type);
   const getDefaultLegalArrangementSelection = () => legalArrangementOptions.find((item) => item.id === getDefaultLegalArrangementOrSuborganizationType(legalEntityResponse, accountHolder2));
   const defaultLegalArrangementType = getDefaultLegalArrangementSelection();
-  console.log("defaultBusinessType", defaultBusinessType);
-  console.log("defaultLegalArrangementType", defaultLegalArrangementType);
   const defaultTrusteeType = legalEntityResponse.type === LegalEntityType.INDIVIDUAL ? trusteeTypeItems[0] : trusteeTypeItems[1];
   const {
     handleChangeFor,
@@ -28163,6 +28227,22 @@ const introductionScreensByLegalEntityType = {
   [LegalEntityType.SOLE_PROPRIETORSHIP]: [IntroductionScreens.PROLOGUE, IntroductionScreens.INDIVIDUAL, IntroductionScreens.SOLE_PROPRIETOR_COMPANY, IntroductionScreens.ACCOUNT, IntroductionScreens.EPILOGUE],
   [LegalEntityType.TRUST]: [IntroductionScreens.PROLOGUE, IntroductionScreens.COMPANY, IntroductionScreens.INDIVIDUAL, IntroductionScreens.DECISION_MAKER, IntroductionScreens.TRUST, IntroductionScreens.TRUST_MEMBER_OVERVIEW, IntroductionScreens.ACCOUNT, IntroductionScreens.EPILOGUE]
 };
+var IntroductionScreenEvent = /* @__PURE__ */ ((IntroductionScreenEvent2) => {
+  IntroductionScreenEvent2["EMPTY"] = "Introduction_Empty";
+  IntroductionScreenEvent2["START_FLOW"] = "Introduction_StartFlow";
+  IntroductionScreenEvent2["START_SCREEN"] = "Introduction_StartScreen";
+  IntroductionScreenEvent2["STOP_SCREEN"] = "Introduction_StopScreen";
+  IntroductionScreenEvent2["STOP_FLOW"] = "Introduction_StopFlow";
+  IntroductionScreenEvent2["NEXT"] = "Introduction_Next";
+  IntroductionScreenEvent2["BACK"] = "Introduction_Back";
+  IntroductionScreenEvent2["SKIP"] = "Introduction_Skip";
+  return IntroductionScreenEvent2;
+})(IntroductionScreenEvent || {});
+var IntroductionScreenTiming = /* @__PURE__ */ ((IntroductionScreenTiming2) => {
+  IntroductionScreenTiming2["VIEW_FLOW"] = "Introduction_ViewFlow";
+  IntroductionScreenTiming2["VIEW_SCREEN"] = "Introduction_ViewScreen";
+  return IntroductionScreenTiming2;
+})(IntroductionScreenTiming || {});
 const useIntroductionScreens = ({
   legalEntity,
   tasks
@@ -28284,10 +28364,30 @@ const Introduction = ({
     tasks
   });
   const [activeIndex, setActiveIndex] = useState(0);
+  const eventSegmentationDefaults = getBaseTrackingPayload({
+    trackingConfig: {
+      topLevelLegalEntity: legalEntity
+    },
+    legalEntity,
+    task: TaskTypes.INTRODUCTION
+  });
+  const eventDetails = {
+    segmentation: {
+      ...eventSegmentationDefaults,
+      page: (introductionScreens == null ? void 0 : introductionScreens.length) ? introductionScreens[activeIndex] : null
+    }
+  };
   useEffect(() => {
-    if (!(introductionScreens == null ? void 0 : introductionScreens.length))
+    if (!(introductionScreens == null ? void 0 : introductionScreens.length)) {
+      userEvents.addEvent(IntroductionScreenEvent.EMPTY, {
+        segmentation: eventSegmentationDefaults
+      });
       onExitIntroduction();
-  }, [onExitIntroduction, introductionScreens]);
+    } else {
+      userEvents.startEvent(IntroductionScreenTiming.VIEW_FLOW);
+      userEvents.addEvent(IntroductionScreenEvent.START_FLOW, eventDetails);
+    }
+  }, [introductionScreens]);
   return (introductionScreens == null ? void 0 : introductionScreens.length) ? jsxs("div", {
     className: "adyen-kyc-introduction",
     children: [jsx(StepProgressIndicator, {
@@ -28297,7 +28397,10 @@ const Introduction = ({
       className: "adyen-kyc-introduction__skip",
       children: jsx(Button, {
         label: i18n.get("goToOverviewFromIntroduction"),
-        onClick: () => onExitIntroduction(),
+        onClick: () => {
+          userEvents.addEvent(IntroductionScreenEvent.SKIP, eventDetails);
+          onExitIntroduction();
+        },
         showAsLink: true,
         type: "button"
       })
@@ -28311,16 +28414,36 @@ const Introduction = ({
       children: [jsx(Button, {
         disabled: activeIndex === 0,
         label: "Back",
-        onClick: () => setActiveIndex((currentValue) => currentValue - 1),
+        onClick: () => {
+          userEvents.addEvent(IntroductionScreenEvent.BACK, eventDetails);
+          userEvents.addEvent(IntroductionScreenEvent.STOP_SCREEN, eventDetails);
+          userEvents.endEvent(IntroductionScreenTiming.VIEW_SCREEN, eventDetails);
+          setActiveIndex((currentValue) => currentValue - 1);
+          userEvents.startEvent(IntroductionScreenTiming.VIEW_SCREEN);
+          userEvents.addEvent(IntroductionScreenEvent.START_SCREEN, eventDetails);
+        },
         secondary: true,
         type: "button"
       }), activeIndex + 1 === introductionScreens.length ? jsx(Button, {
         label: "Start",
-        onClick: () => onExitIntroduction(),
+        onClick: () => {
+          userEvents.addEvent(IntroductionScreenEvent.STOP_SCREEN, eventDetails);
+          userEvents.addEvent(IntroductionScreenEvent.STOP_FLOW, eventDetails);
+          userEvents.endEvent(IntroductionScreenTiming.VIEW_SCREEN, eventDetails);
+          userEvents.endEvent(IntroductionScreenTiming.VIEW_FLOW, eventDetails);
+          onExitIntroduction();
+        },
         type: "button"
       }) : jsx(Button, {
         label: "Next",
-        onClick: () => setActiveIndex((currentValue) => currentValue + 1),
+        onClick: () => {
+          userEvents.addEvent(IntroductionScreenEvent.NEXT, eventDetails);
+          userEvents.addEvent(IntroductionScreenEvent.STOP_SCREEN, eventDetails);
+          userEvents.endEvent(IntroductionScreenTiming.VIEW_SCREEN, eventDetails);
+          setActiveIndex((currentValue) => currentValue + 1);
+          userEvents.startEvent(IntroductionScreenTiming.VIEW_SCREEN);
+          userEvents.addEvent(IntroductionScreenEvent.START_SCREEN, eventDetails);
+        },
         type: "button"
       })]
     })]
@@ -28682,6 +28805,7 @@ function TaskListComponent({
   const {
     isExperimentEnabled
   } = useExperimentsContext();
+  const limitToOneTransferInstrument = useSetting("limitToOneTransferInstrument");
   const isEnableNewEntryFlowEnabled = useEnableNewEntryFlow();
   const canSeeIntroduction = useCanSeeIntroduction({
     legalEntity: legalEntityResponse
@@ -28829,7 +28953,7 @@ function TaskListComponent({
             capabilityProblems,
             onNavigateToTask: () => handleOnNavigateToTaskPayout(transferInstrument.id),
             onTransferInstrumentDelete: () => onTransferInstrumentDelete(transferInstrument.id)
-          }, transferInstrument.id)), jsxs(Card, {
+          }, transferInstrument.id)), !limitToOneTransferInstrument || transferInstruments.length < 1 ? jsxs(Card, {
             stateful: true,
             onClick: () => handleOnNavigateToTaskPayout(),
             className: "adyen-task adl-add-payout",
@@ -28840,7 +28964,7 @@ function TaskListComponent({
             }), jsx("span", {
               children: isEnableNewEntryFlowEnabled ? i18n.get("addExtraBankAccount") : i18n.get(hasPayinTaskNotPayout ? "addExtraPayinAccount" : "addExtraPayoutAccount")
             })]
-          })]
+          }) : null]
         }) : jsx(TaskListItem, {
           onNavigateToTask: () => handleOnNavigateToTaskPayout(),
           icon: "payout",
@@ -32024,7 +32148,8 @@ function DropinComposerComponent({
     showToast
   } = useToastContext();
   const [isLoadingConfiguration, setIsLoadingConfiguration] = useState(false);
-  const showBusinessTypeSelection = useShouldShowBusinessTypeSelection(accountHolder2);
+  const isNewEntryFlowEnabled = isExperimentEnabled("EnableNewEntryFlow");
+  const [leId, setLeId] = useLeId();
   const showIntroduction = useShouldShowIntroduction({
     legalEntity: legalEntityResponse
   });
@@ -32035,12 +32160,13 @@ function DropinComposerComponent({
   });
   const [tasks, setTasks] = useState([]);
   const initialTask = useMemo(() => {
-    if (showBusinessTypeSelection)
+    if (isNewEntryFlowEnabled && (!accountHolder2 || legalEntityResponse.id !== leId)) {
       return TaskTypes.BUSINESS_TYPE_SELECTION;
+    }
     if (showIntroduction)
       return TaskTypes.INTRODUCTION;
     return TaskTypes.TASKS_OVERVIEW;
-  }, [showBusinessTypeSelection, showIntroduction]);
+  }, [showIntroduction, isNewEntryFlowEnabled, accountHolder2, legalEntityResponse, leId]);
   const [taskHistory, setTaskHistory] = useState([initialTask]);
   const [rootLegalEntity, setRootLegalEntity] = useState(legalEntityResponse);
   const [associatedLegalEntity, setAssociatedLegalEntity] = useState(null);
@@ -32564,6 +32690,12 @@ function DropinComposerComponent({
       clearInterval(timeoutId);
     };
   }, [refreshLegalEntity, rootLegalEntity, taskHistory]);
+  useEffect(() => {
+    if (!isNewEntryFlowEnabled || leId !== legalEntityResponse.id) {
+      setLeId(null);
+      setAccountHolder(null);
+    }
+  }, [isNewEntryFlowEnabled, setLeId]);
   if (isLoadingConfiguration) {
     return jsx(Shimmer, {});
   }
@@ -32577,6 +32709,7 @@ function DropinComposerComponent({
           legalEntityResponse: rootLegalEntity,
           accountHolder: accountHolder2,
           onAccountHolderSelect: async (newAccountHolder) => {
+            setLeId(legalEntityResponse.id);
             setAccountHolder(newAccountHolder);
             await refreshLegalEntity();
             onNavigateTo(showIntroduction ? TaskTypes.INTRODUCTION : TaskTypes.TASKS_OVERVIEW);
@@ -34571,7 +34704,8 @@ const settingsDefaults = {
   hideOnboardingIntroductionOrganization: true,
   hideOnboardingIntroductionTrust: true,
   hideOnboardingIntroductionSoleProprietor: true,
-  viewOnboardingGuidance: false
+  viewOnboardingGuidance: false,
+  limitToOneTransferInstrument: false
 };
 function SettingsProvider({
   children,