@adyen/kyc-components 3.14.0 → 3.15.0

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

@@ -5,10 +5,12 @@ import cx from "classnames";
 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 isISIN from "validator/es/lib/isISIN.js";
 import OpenBankingSDK from "@adyen/openbankingsdk";
 import { jsxs as jsxs$1, jsx as jsx$1 } from "preact/compat/jsx-runtime";
 import "@adyen/adyen-document-viewer/dist/adyen-document-viewer.min.css";
 import AdyenDocumentViewer from "@adyen/adyen-document-viewer";
+import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
 const ConfigurationApiContext = createContext(void 0);
 const useConfigurationApi = () => {
   const configurationApi = useContext(ConfigurationApiContext);
@@ -42,7 +44,7 @@ const payoutAccount = "Payout account";
 const payinAccount = "Payin account";
 const firstName = "First name";
 const lastName = "Last name";
-const country = "Country";
+const country = "Country/region";
 const street = "Street";
 const otherAddressInformation = "Other address information (optional)";
 const postalCode = "Postal code";
@@ -65,7 +67,7 @@ const invalidPhoneNumber = "Please enter a valid phone number.";
 const birthDate = "Date of birth";
 const idNumber = "Identity number";
 const selectState = "Select a state";
-const selectCountry = "Select a country";
+const selectCountryRegion = "Select a country/region";
 const search = "Search";
 const noOptionsFound = "No options found";
 const SSNFormatUS = "*** — ** — XXXX";
@@ -118,8 +120,9 @@ const invalidFormatIdentityNumberUS9 = "Please use the SSN format: XXXXXXXXX";
 const invalidFormatIdentityNumberSG = "Please use the NRIC format: S1234567A";
 const invalidFormatIdentityNumberHK = "Not valid for HK. Format should be: 8 or 9-character alphanumeric. For example: C668668E";
 const invalidFormatBankStatementDescription = "Please ensure your input contains solely letters, digits, currency codes, and the specified special characters: -._,:;'*!@#%()+?¿/「」";
-const residencyCountry = "Country of residence";
+const residencyCountry = "Country/region of residence";
 const stateOrProvince = "State or province";
+const basicInformation = "Basic information";
 const selectStateOrProvince = "Select a state or province";
 const dragYourFilesHereOr = "Drag your files here, or";
 const browse = "Browse";
@@ -242,7 +245,7 @@ const enterValidRegistrationNumber = "Please enter a valid registration number";
 const stockExchangeMICHelper = "Market Identifier Code, as defined in ISO 10383";
 const stockISINHelper = "International Securities Identification Number, as defined in ISO 10383";
 const validationPleaseEnterAValidMarketIdentifier = "Please enter a valid Market identifier code";
-const validationPleaseEnterAValidStockISIN = "Please enter a valid International Securities Identification Number";
+const validationPleaseEnterAValidStockISIN = "Please enter a valid ISIN. For example, %{example}";
 const shareholderDocument = "Shareholder document";
 const role = "Role";
 const selectAllTheRolesThatThisDecisionMakerHolds = "Select all the roles that this decision-maker holds.";
@@ -261,7 +264,6 @@ const cantSetUpAcccount = "You can’t set up an account";
 const accountCantBeSetUp = "Your account can’t be set up as your information couldn’t be verified. To find out more, reach out to customer support.";
 const pleaseNote = "Please note:";
 const byClickingSubmitReview = "By clicking 'Submit review', you confirm that all of your information has been reviewed, and that all newly provided or already existing data is accurate and up-to-date.";
-const nameAndCountry = "Name and country";
 const companyCountry = "Where is your business located?";
 const accountDetailsDescription = "Provide a few details about you to start accepting live payments.";
 const provideFewDetailsAboutYourself = "Provide a few details about yourself.";
@@ -322,8 +324,8 @@ const bankAccountToHaveSameNameAsTrust = " The bank account holder has to have t
 const bankAccountHasToBeInYourName = "The bank account has to be in your name";
 const orSoleProprietorshipName = "or sole proprietorship's name";
 const bankAccountHasToBeInYourCompanyName = "The bank account has to be in your company's name";
-const bankCountry = "Bank country";
-const bankAccountCountry = "Bank account country";
+const bankCountry = "Bank country/region";
+const bankAccountCountryRegion = "Bank account country/region";
 const currency = "Currency";
 const currencyCode = "Currency code";
 const currencyPlaceholder = "Select a currency code";
@@ -400,6 +402,7 @@ const documentCannotBeDamaged = "The document cannot be damaged";
 const verify = "Verify";
 const add = "Add";
 const idUploadDocumentSubtitle = "So that we can verify the identity of <strong>%{name}</strong>, we need to see their government issued ID.  Choose the method most convenient to you.";
+const verifyIndividualIdentity = "Verify %{name}'s Identity";
 const documentNotExpiredOrDamaged = "The document cannot be expired or damaged";
 const weAccept = "We accept:";
 const includeFrontAndBack = "Include both the front and back side, each in separate file";
@@ -417,6 +420,7 @@ const invalidDateOfBirth = "Please enter a valid date of birth";
 const invalidDateOfIncorporation = "Please enter a valid date of incorporation";
 const successfullyUpdatedDetails = "Successfully updated details";
 const failedToUpdateDetails = "Failed to update details";
+const documentUploadfailed = "Document upload failed. Please ensure the document is not a duplicate and its size is 4MBs or less.";
 const successfullyVerifiedIdNumber = "Successfully verified %{idNumber}";
 const failedFetchingDecisionMaker = "Failed to get decision maker details";
 const fileUpload = "File upload";
@@ -568,7 +572,7 @@ const otherTrust = "Other trust";
 const pooledSuperannuationTrust = "Pooled superannuation trust";
 const publicTradingTrust = "Public trading trust";
 const unlistedPublicUnitTrust = "Unlisted public unit trust";
-const countryOfEstablishment = "Country of establishment";
+const countryRegionOfEstablishment = "Country/region of establishment";
 const nameOfTrustAgreement = "Name of trust agreement";
 const typeOfTrustAgreement = "Type of trust agreement";
 const objectOfCharitableTrust = "Object of charitable trust";
@@ -770,13 +774,13 @@ const enterTheRemainingNDigitsThenXToYLettersForExample = "Enter the remaining %
 const provideAllOwners = "Add <strong>all owners</strong> holding 25% or more of your company.";
 const ifNoOwnersSpecifyControllingPersons = "If you don’t have any owners holding  25% or more, then specify <strong>all controlling persons</strong>.";
 const provideAtLeastOneSignatory = "Add at least <strong>1 signatory</strong>.";
-const provideOneControllingPerson = "Provide <strong>1 controlling person</strong>.";
+const provideOneControllingPerson = "Add <strong>1 controlling person</strong>.";
 const textToVerifyAccount = "For you to receive your payouts, we need a verified bank account.";
 const theBankAccountHolderMustHaveTheSameNameAsYourCompany_ = "The bank account holder must have the same name as your company <strong>%{companyName}</strong>.";
 const theBankAccountHolderMustBeInYourName_ = "The bank account holder must be in your name: <strong>%{name}</strong>";
 const weDoNotYetSupportInstantVerificationForBankAccountsIn_ = "We do not yet support instant verification for bank accounts in %{countryName}. Therefore, you must provide your account details manually.";
-const youCanOnlyUseABankAccountInTheCountryWhereYourCompanyIsRegistered = "You can only use a bank account in the country where your company is registered.";
-const youCanOnlyUseABankAccountInTheCountryWhereYouLive = "You can only use a bank account in the country where you live.";
+const youCanOnlyUseABankAccountInTheCountryRegionWhereYourCompanyIsRegistered = "You can only use a bank account in the country/region where your company is registered.";
+const youCanOnlyUseABankAccountInTheCountryRegionWhereYouLive = "You can only use a bank account in the country/region where you live.";
 const mobileApplication = "Mobile Application";
 const onOnlineBankingEnvironment = "Or web version of online banking environment";
 const dontHaveAccessOnlineBanking = "Don’t have access to online banking environment?";
@@ -879,8 +883,8 @@ const doNotHaveBusinessNumber = "I do not have a Business number";
 const enterNameExactlyAsAppearInID = "Enter your first name(s) exactly as it appears on your identity document";
 const enterLastNameExactlyAsAppearInID = "Enter your last name(s) exactly as it appears on your identity document";
 const takePhotoOriginalDocumentWithPhone = "Take a photo of the original ID document with your phone";
-const instantIDVerificationDescription = "With access to a physical ID document and a phone you can go through verification instantly!";
-const manualIDVerificationDescription = "Upload a good quality copy of your ID so we can verify it offline. Make sure it is clear with all corners and letters visible.";
+const instantIDVerificationDescription = "Take a photo of a passport, identity card, or driver’s license.";
+const manualIDVerificationDescription = "May take a few days. Upload a copy of a passport, identity, or driver’s license.";
 const uploadScanOriginalIDDocument = "Upload a scan of the original ID document";
 const takesLonger = "Takes longer";
 const howVerificationWithOnfidoWork = "How does verification with our partner Onfido work?";
@@ -920,7 +924,7 @@ const legalCompanyName__helperText__HK = "Enter the name exactly as it is on you
 const taxInformationNumber = "Tax Identification Number";
 const taxInformationNumber__HK = "Business Registration number (BRN)";
 const stockExchangeMIC = "Market Identifier Code (MIC)";
-const stockISIN = "ISIN";
+const stockISIN = "International Securities Identification Number (ISIN)";
 const companyLookupResultsHeader = "Let's find your company";
 const companyLookupResultsHeader__searching = "Searching for companies...";
 const companyLookupResultsHeader__verifying = "Verifying company selection...";
@@ -1345,7 +1349,7 @@ const defaultTrans = {
   birthDate,
   idNumber,
   selectState,
-  selectCountry,
+  selectCountryRegion,
   search,
   noOptionsFound,
   SSNFormatUS,
@@ -1400,6 +1404,7 @@ const defaultTrans = {
   invalidFormatBankStatementDescription,
   residencyCountry,
   stateOrProvince,
+  basicInformation,
   selectStateOrProvince,
   dragYourFilesHereOr,
   browse,
@@ -1541,7 +1546,6 @@ const defaultTrans = {
   accountCantBeSetUp,
   pleaseNote,
   byClickingSubmitReview,
-  nameAndCountry,
   companyCountry,
   accountDetailsDescription,
   provideFewDetailsAboutYourself,
@@ -1603,7 +1607,7 @@ const defaultTrans = {
   orSoleProprietorshipName,
   bankAccountHasToBeInYourCompanyName,
   bankCountry,
-  bankAccountCountry,
+  bankAccountCountryRegion,
   currency,
   currencyCode,
   currencyPlaceholder,
@@ -1680,6 +1684,7 @@ const defaultTrans = {
   verify,
   add,
   idUploadDocumentSubtitle,
+  verifyIndividualIdentity,
   documentNotExpiredOrDamaged,
   weAccept,
   includeFrontAndBack,
@@ -1697,6 +1702,7 @@ const defaultTrans = {
   invalidDateOfIncorporation,
   successfullyUpdatedDetails,
   failedToUpdateDetails,
+  documentUploadfailed,
   successfullyVerifiedIdNumber,
   failedFetchingDecisionMaker,
   fileUpload,
@@ -1853,7 +1859,7 @@ const defaultTrans = {
   pooledSuperannuationTrust,
   publicTradingTrust,
   unlistedPublicUnitTrust,
-  countryOfEstablishment,
+  countryRegionOfEstablishment,
   nameOfTrustAgreement,
   typeOfTrustAgreement,
   objectOfCharitableTrust,
@@ -2062,8 +2068,8 @@ const defaultTrans = {
   theBankAccountHolderMustHaveTheSameNameAsYourCompany_,
   theBankAccountHolderMustBeInYourName_,
   weDoNotYetSupportInstantVerificationForBankAccountsIn_,
-  youCanOnlyUseABankAccountInTheCountryWhereYourCompanyIsRegistered,
-  youCanOnlyUseABankAccountInTheCountryWhereYouLive,
+  youCanOnlyUseABankAccountInTheCountryRegionWhereYourCompanyIsRegistered,
+  youCanOnlyUseABankAccountInTheCountryRegionWhereYouLive,
   mobileApplication,
   onOnlineBankingEnvironment,
   dontHaveAccessOnlineBanking,
@@ -4991,7 +4997,7 @@ function CountryField({
     children: (childProps) => jsx(Select, {
       ...childProps,
       name: "country",
-      placeholder: i18n.get("selectCountry"),
+      placeholder: i18n.get("selectCountryRegion"),
       selected: data.country,
       items: countries,
       readonly: (countries.length === 1 || readonly) && !!data,
@@ -6760,6 +6766,11 @@ const PassportNumberPatterns = {
 const ProofOfIdentityCardPatterns = {
   [CountryCodes.HongKong]: /^[A-Z]{1,2}[0-9]{6}[0-9A]$/
 };
+const validateNotEmptyOnBlur = {
+  modes: ["blur"],
+  validate: (val) => !isEmpty(val),
+  errorMessage: "fieldIsRequired"
+};
 const validatePatternOnBlur = (pattern) => ({
   modes: ["blur"],
   validate: (val) => !!val && pattern.test(val)
@@ -7702,9 +7713,13 @@ function CollapsibleContainer({
     children
   });
 }
-function useAccordionContext() {
-  return useContext(AccordionContext);
-}
+const useAccordionContext = () => {
+  const accordionContext = useContext(AccordionContext);
+  if (!accordionContext) {
+    throw new Error("Cannot use useAccordionContext without AccordionContext");
+  }
+  return accordionContext;
+};
 function AccordionItem({
   children,
   className,
@@ -7915,7 +7930,7 @@ function StockExchangeMICField({
 }
 const stockExchangeMICFieldMetadata = {
   label: "stockExchangeMIC",
-  validators: validatePatternOnBlur(/^[a-zA-Z0-9]{4}$/),
+  validators: [validateNotEmptyOnBlur, validatePatternOnBlur(/^[a-zA-Z0-9]{4}$/)],
   mask: {
     mask: makeMask(...alphanumericInputs(4)),
     transformOnType: uppercase
@@ -7963,16 +7978,19 @@ function StockISINField({
 }
 const stockISINFieldMetadata = {
   label: "stockISIN",
-  validators: validatePatternOnBlur(/^[a-zA-Z0-9]{12}$/),
+  validators: [validateNotEmptyOnBlur, {
+    modes: ["blur"],
+    validate: (value) => !!value && isISIN(value)
+  }],
   mask: {
     mask: makeMask(...alphaInputs(2), ...alphanumericInputs(9), ...numericInputs(1)),
     transformOnType: uppercase
   },
+  helperText: "stockISINHelper",
   guidanceText: {
-    key: "enterNCharactersWithAMixForExample",
+    key: "validationPleaseEnterAValidStockISIN",
     values: {
-      numChars: "12",
-      example: "US00379P1010"
+      example: "NL0012969182"
     }
   }
 };
@@ -10458,7 +10476,9 @@ function AccountHolder(props) {
         dataStoreId
       }
     });
-    setAccountHolder((data == null ? void 0 : data.accountHolder) ?? null);
+    if (data == null ? void 0 : data.accountHolder) {
+      setAccountHolder(data.accountHolder);
+    }
   }, [data, errors, valid, dataStoreId]);
   const formUtils = formUtilities(props, i18n);
   const questionLabel = i18n.get("nameOfBankAccountHolder");
@@ -10707,7 +10727,7 @@ function DropzoneFile(props) {
     const i = parseInt(Math.floor(Math.log(bytes) / Math.log(1024)).toString());
     if (i === 0)
       return `${bytes} ${sizes[i]}`;
-    return `(${(bytes / 1024 ** i).toFixed(1)} ${sizes[i]})`;
+    return `${(bytes / 1024 ** i).toFixed(1)} ${sizes[i]}`;
   };
   return jsxs("div", {
     className: "adyen-kyc-dropzone-file",
@@ -10732,11 +10752,9 @@ function DropzoneFile(props) {
       }), errorMessage ? jsx("div", {
         className: "adyen-kyc-dropzone-file__error",
         children: i18n.get(errorMessage)
-      }) : jsxs("div", {
+      }) : jsx("div", {
         className: "adyen-kyc-dropzone-file__size",
-        children: [jsxs("span", {
-          children: [i18n.get("complete"), " "]
-        }), isNewlyUploadedFile(file) ? formatSize(file.size) : void 0]
+        children: isNewlyUploadedFile(file) ? formatSize(file.size) : void 0
       })]
     }), jsx("button", {
       type: "button",
@@ -12638,7 +12656,7 @@ function TaxDocumentComponent({
 const companyForms = {
   companyNameAndCountry: {
     formId: "companyNameAndCountry",
-    formName: "nameAndCountry",
+    formName: "basicInformation",
     fields: companyNameAndCountryFields
   },
   companyType: {
@@ -12718,7 +12736,7 @@ function CompanyComponent(props) {
           ...companyNameAndCountryFormProps.data,
           country: props.country
         },
-        heading: i18n.get("nameAndCountry"),
+        heading: i18n.get("basicInformation"),
         id: CompanyNameAndCountryFormID,
         isTopLevelEntity: props.isTopLevelEntity
       })
@@ -14681,31 +14699,16 @@ function IdVerificationMethodComponent(props) {
     }), jsxs("form", {
       className: "adyen-kyc-verification-method",
       children: [jsx(FormHeader, {
-        heading: i18n.get("verificationMethod")
+        heading: i18n.get("verifyIndividualIdentity", {
+          values: {
+            name
+          }
+        })
       }), jsx(ErrorPanel, {
         verificationErrors: formVerificationErrors,
         validationErrors: fieldValidationErrors,
         formUtils,
         id: "ariaErrorField"
-      }), jsx("div", {
-        dangerouslySetInnerHTML: {
-          __html: i18n.get("idUploadDocumentSubtitle", {
-            values: {
-              name
-            }
-          })
-        }
-      }), jsx("div", {
-        children: i18n.get("weAccept")
-      }), jsxs(List, {
-        className: "adl-u-margin-bottom-16",
-        children: [jsx(ListItem, {
-          children: i18n.get("passport")
-        }), jsx(ListItem, {
-          children: i18n.get("identityCard")
-        }), jsx(ListItem, {
-          children: i18n.get("driversLicense")
-        })]
       }), jsx(Field, {
         name: "verificationMethods",
         useLabelElement: false,
@@ -17231,6 +17234,7 @@ function IndividualComponent(props) {
   });
 }
 const useAsyncAccountDetailsValidationRules = (payload, hasEmptyFields2, isAccountNumberMasked2) => {
+  const [timeoutId, setTimeoutId] = useState(null);
   const {
     validateAccountIdentification: validateAccountIdentification2
   } = useConfigurationApi();
@@ -17248,7 +17252,13 @@ const useAsyncAccountDetailsValidationRules = (payload, hasEmptyFields2, isAccou
       }
     };
     if (payload && !hasEmptyFields2 && !isAccountNumberMasked2) {
-      fetchAccountDetails(payload);
+      if (timeoutId !== null) {
+        clearTimeout(timeoutId);
+      }
+      setTimeoutId(setTimeout(() => {
+        fetchAccountDetails(payload);
+        setTimeoutId(null);
+      }, 500));
     }
   }, [validateAccountIdentification2, hasEmptyFields2, payload]);
   return accountValidationData;
@@ -19740,90 +19750,6 @@ const makePayoutVerificationMethodsMetadata = (svgPath, instantVerificationProvi
   }
 });
 const payoutVerificationMethods = ["instantVerification", "manualVerification"];
-const logger$j = createLogger("useLocalStorage");
-const useLocalStorage = (key, defaultValue, options) => {
-  const {
-    serializer,
-    parser,
-    syncData
-  } = useMemo(() => ({
-    serializer: JSON.stringify,
-    parser: JSON.parse,
-    syncData: true,
-    ...options
-  }), [options]);
-  const rawValueRef = useRef(null);
-  const [value, setValue] = useState(() => {
-    if (typeof window === "undefined")
-      return defaultValue;
-    try {
-      rawValueRef.current = window.localStorage.getItem(key);
-      const res = rawValueRef.current ? parser(rawValueRef.current) : defaultValue;
-      return res;
-    } catch (err) {
-      logger$j.error(err);
-      return defaultValue;
-    }
-  });
-  useEffect(() => {
-    if (typeof window === "undefined")
-      return;
-    const updateLocalStorage = () => {
-      if (value !== void 0) {
-        const newValue = serializer(value);
-        const oldValue = rawValueRef.current;
-        rawValueRef.current = newValue;
-        window.localStorage.setItem(key, newValue);
-        window.dispatchEvent(new StorageEvent("storage", {
-          storageArea: window.localStorage,
-          url: window.location.href,
-          key,
-          newValue,
-          oldValue
-        }));
-      } else {
-        window.localStorage.removeItem(key);
-        window.dispatchEvent(new StorageEvent("storage", {
-          storageArea: window.localStorage,
-          url: window.location.href,
-          key
-        }));
-      }
-    };
-    try {
-      updateLocalStorage();
-    } catch (err) {
-      logger$j.error(err);
-    }
-  }, [value]);
-  useEffect(() => {
-    if (!syncData)
-      return;
-    const handleStorageChange = (event) => {
-      if (event.key !== key || event.storageArea !== window.localStorage)
-        return;
-      try {
-        if (event.newValue !== rawValueRef.current) {
-          rawValueRef.current = event.newValue;
-          setValue(event.newValue ? parser(event.newValue) : void 0);
-        }
-      } catch (err) {
-        logger$j.error(err);
-      }
-    };
-    if (typeof window === "undefined")
-      return;
-    window.addEventListener("storage", handleStorageChange);
-    return () => window.removeEventListener("storage", handleStorageChange);
-  }, [key, syncData]);
-  return [value, setValue];
-};
-const accountHolderStorageKey = "ACCOUNT_HOLDER";
-const useAccountHolder = (enableNewEntryFlow) => {
-  const [accountHolderFromLocalStorage, setAccountHolderIntoLocalStorage] = useLocalStorage(accountHolderStorageKey, null);
-  const [accountHolderFromState, setAccountHolderIntoState] = useState(null);
-  return enableNewEntryFlow ? [accountHolderFromLocalStorage, setAccountHolderIntoLocalStorage] : [accountHolderFromState, setAccountHolderIntoState];
-};
 const AccountHolderDescriptionFragment = ({
   legalEntityResponse
 }) => {
@@ -19832,7 +19758,9 @@ const AccountHolderDescriptionFragment = ({
     i18n
   } = useI18nContext();
   const hasSolePropEntityAssociations = hasOwnEntityAssociationOfType(LegalEntityType.SOLE_PROPRIETORSHIP, legalEntityResponse.entityAssociations, legalEntityResponse.id);
-  const [accountHolder2] = useAccountHolder(true);
+  const {
+    accountHolder: accountHolder2
+  } = useCoreContext();
   if (accountHolder2 === "mySoleProprietorName" || hasSolePropEntityAssociations) {
     const soleProp = (_a = legalEntityResponse.entityAssociations) == null ? void 0 : _a.find((ea) => ea.entityType === "soleProprietorship");
     const {
@@ -20079,14 +20007,14 @@ function PayoutVerificationMethod(props) {
         country: formUtils.getErrorMessage("bankCountry", errors, fieldProblems)
       },
       labels: {
-        country: formUtils.getLabel("bankCountry", "bankAccountCountry")
+        country: formUtils.getLabel("bankCountry", "bankAccountCountryRegion")
       },
       readonly: !intraRegionCrossBorderPayoutsAllowed || allowedBankCountries.length === 1,
       allowedCountries: allowedBankCountries,
       classNameModifiers: ["country"],
       handleChangeFor: () => handleChangeFor("bankCountry", "input"),
       helperText: {
-        country: intraRegionCrossBorderPayoutsAllowed ? void 0 : i18n.get(legalEntityType === LegalEntityType.INDIVIDUAL ? "youCanOnlyUseABankAccountInTheCountryWhereYouLive" : "youCanOnlyUseABankAccountInTheCountryWhereYourCompanyIsRegistered")
+        country: intraRegionCrossBorderPayoutsAllowed ? void 0 : i18n.get(legalEntityType === LegalEntityType.INDIVIDUAL ? "youCanOnlyUseABankAccountInTheCountryRegionWhereYouLive" : "youCanOnlyUseABankAccountInTheCountryRegionWhereYourCompanyIsRegistered")
       }
     }), jsx(Field, {
       name: "verificationMethods",
@@ -20259,8 +20187,7 @@ function PayoutDetailsComponent(props) {
   const [bankInfoValidated, setBankInfoValidated] = useState(false);
   const [arePayoutAccountDetailsInvalid, setArePayoutAccountDetailsInvalid] = useState(false);
   const [invalidFieldNames, setInvalidFieldNames] = useState("");
-  const debouncedGetAccountIdentificationFromPayoutAccountSchema = useCallback(debounce(getAccountIdentificationFromPayoutAccountSchema, 500), [getAccountIdentificationFromPayoutAccountSchema]);
-  const payload = useMemo(() => bankCountry2 && accountDetailsFromInput ? debouncedGetAccountIdentificationFromPayoutAccountSchema(accountDetailsFromInput, bankCountry2) : {}, [accountDetailsFromInput, bankCountry2, debouncedGetAccountIdentificationFromPayoutAccountSchema]);
+  const payload = useMemo(() => bankCountry2 && accountDetailsFromInput ? getAccountIdentificationFromPayoutAccountSchema(accountDetailsFromInput, bankCountry2) : {}, [accountDetailsFromInput, bankCountry2]);
   const validateAccountDetails = useAsyncAccountDetailsValidationRules(payload, hasEmptyFields(payload), isAccountNumberMasked(payload));
   const resetInvalidFieldState = () => {
     setInvalidFieldNames("");
@@ -20437,7 +20364,7 @@ const ConstitutionalDocumentComponent = memo(ConstitutionalDocumentUpload, (prev
 const solePropForms = {
   solePropNameAndCountry: {
     formId: "solePropNameAndCountry",
-    formName: "nameAndCountry",
+    formName: "basicInformation",
     fields: companyNameAndCountryFields
   },
   solePropRegistrationDetails: {
@@ -20495,10 +20422,10 @@ function SolePropComponent(props) {
             legalCompanyName: (_a = solePropNameAndCountryFormProps == null ? void 0 : solePropNameAndCountryFormProps.data) == null ? void 0 : _a.legalCompanyName
           },
           labels: {
-            country: "countryOfEstablishment",
+            country: "countryRegionOfEstablishment",
             legalCompanyName: isExperimentEnabled("EnableNewEntryFlow") ? "legalNameOfSoleProprietorship" : "legalNameOfSoleProprietor"
           },
-          heading: i18n.get("nameAndCountry"),
+          heading: i18n.get("basicInformation"),
           id: solePropNameAndCountryFormId,
           disableCountry: true,
           isTopLevelEntity: false
@@ -20962,7 +20889,7 @@ function TrustRegistrationDetailsComponent(props) {
         valid: formUtils.getFieldValid(valid, COUNTRY_FIELD),
         errors: formUtils.getFieldErrors(errors, fieldProblems, COUNTRY_FIELD),
         labels: formUtils.getFieldLabels(COUNTRY_FIELD, {
-          country: "countryOfEstablishment"
+          country: "countryRegionOfEstablishment"
         }),
         readonly: formUtils.isReadOnly("country"),
         allowedCountries: ALLOWED_TRUST_COUNTRIES,
@@ -22163,7 +22090,7 @@ const defaultPayoutAccountFormat = {
   [CountryCodes.Sweden]: "local",
   [CountryCodes.UnitedKingdom]: "local"
 };
-const logger$i = createLogger("useScenarioConfiguration");
+const logger$j = createLogger("useScenarioConfiguration");
 const useScenarioConfiguration = ({
   getConfigurationData,
   getPayoutAccountFormatData,
@@ -22186,12 +22113,12 @@ const useScenarioConfiguration = ({
         const response = await getConfigurationData();
         setConfigurationResponse(response);
       } catch (err) {
-        logger$i.warn("WARNING: Configuration request failed - error:", err);
+        logger$j.warn("WARNING: Configuration request failed - error:", err);
       } finally {
         setLoadingStatus("success");
       }
     };
-    makeConfigCallAndSave().catch(logger$i.error);
+    makeConfigCallAndSave().catch(logger$j.error);
   }, [getConfigurationData, setLoadingStatus]);
   useEffect(() => {
     setLoadingStatus("loading");
@@ -22210,12 +22137,12 @@ const useScenarioConfiguration = ({
         const defaultAccountFormat = defaultPayoutAccountFormat[country2] ?? allowedBankAccountFormats[0];
         setAccountFormat(existingBankAccountFormat ?? defaultAccountFormat);
       } catch (err) {
-        logger$i.warn("WARNING: Payout format request failed - error:", err);
+        logger$j.warn("WARNING: Payout format request failed - error:", err);
       } finally {
         setLoadingStatus("success");
       }
     };
-    makePayoutFormatCallAndSave().catch(logger$i.error);
+    makePayoutFormatCallAndSave().catch(logger$j.error);
   }, [country2, setAccountFormat, getPayoutAccountFormatData, setLoadingStatus, existingBankAccountFormat]);
   const {
     fieldConfigurations,
@@ -22254,7 +22181,9 @@ const useScenarioConfiguration = ({
 };
 const isMaintenanceModeError = (error) => error && "messageCode" in error && error.messageCode === "maintenanceMode";
 const API_VALIDATION_ERROR_CODE = "30_102";
+const DOCUMENT_UPLOAD_ERROR_CODE = ["30_105", "30_106"];
 const isValidationError = (error) => error && "errorCode" in error && error.errorCode === API_VALIDATION_ERROR_CODE;
+const isDocumentUploadError = (error) => error && "errorCode" in error && typeof error.errorCode === "string" && DOCUMENT_UPLOAD_ERROR_CODE.includes(error.errorCode);
 const linkedFieldsMap = {
   "companyRegistrationDetails.vatNumber": ["companyRegistrationDetails.vatAbsenceReason", "companyRegistrationDetails.exemptedFromVat"],
   "companyRegistrationDetails.vatAbsenceReason": ["companyRegistrationDetails.vatNumber", "companyRegistrationDetails.exemptedFromVat"],
@@ -22987,7 +22916,7 @@ var ToastType = /* @__PURE__ */ ((ToastType2) => {
   ToastType2["ERROR"] = "error";
   return ToastType2;
 })(ToastType || {});
-const logger$h = createLogger("FormRouterContextProvider");
+const logger$i = createLogger("FormRouterContextProvider");
 function FormRouterContextProvider({
   children,
   forms: forms2,
@@ -23007,7 +22936,7 @@ function FormRouterContextProvider({
       if (formIndex > -1) {
         setFormIndex(formIndex);
       } else {
-        logger$h.error("No form was found to have that field so form navigation failed.");
+        logger$i.error("No form was found to have that field so form navigation failed.");
       }
     }
   }), [forms2, handleGetIdVerificationToken, setFormIndex]);
@@ -23619,7 +23548,7 @@ var CompanySearchEvents = /* @__PURE__ */ ((CompanySearchEvents2) => {
   CompanySearchEvents2["SELECTION_ERROR"] = "CompanySearch_CompanySelectionError";
   return CompanySearchEvents2;
 })(CompanySearchEvents || {});
-const logger$g = createLogger("useCompanySearch");
+const logger$h = createLogger("useCompanySearch");
 const LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW = 1577664e5;
 function useCompanySearch({
   defaultData,
@@ -23746,7 +23675,7 @@ function useCompanySearch({
         state: companyData.state ?? stateOrProvince2
       });
     } catch (e) {
-      logger$g.error(e);
+      logger$h.error(e);
       setError(e);
       setStatus("error");
     } finally {
@@ -23779,7 +23708,7 @@ function useCompanySearch({
         indexSearch: handleCompanyIndexSearch,
         deepSearch: handleCompanyDeepSearch,
         resultsLimit: limit
-      })) == null ? void 0 : _a.catch((e) => logger$g.error(e));
+      })) == null ? void 0 : _a.catch((e) => logger$h.error(e));
     }
   }, [legalCompanyName2, country2, stateOrProvince2, taxIdentificationNumber2, verifiedCompany, searchCompanies, handleCompanyIndexSearch, handleCompanyDeepSearch, limit, canVerify, baseTrackingPayload]);
   useEffect(() => {
@@ -25582,7 +25511,7 @@ const mapLegalEntityToCompanySearchSchema = (legalEntity, isChangingType) => {
     }
   }, {});
 };
-const logger$f = createLogger("useFormTaskSubmit");
+const logger$g = createLogger("useFormTaskSubmit");
 function useCompanySearchTaskSubmit({
   task,
   forms: forms2,
@@ -25626,7 +25555,7 @@ function useCompanySearchTaskSubmit({
         });
       }
     } catch (e) {
-      logger$f.error(e);
+      logger$g.error(e);
       userEvents.addEvent(CompanySearchEvents.DOCUMENTS_ERROR, {
         segmentation: {
           ...baseTrackingPayload,
@@ -25678,7 +25607,7 @@ function useCompanySearchTaskSubmit({
           ...trackingPayload
         }
       });
-      logger$f.log(submittedLegalEntity);
+      logger$g.log(submittedLegalEntity);
       clearToasts();
       onExternalSubmit == null ? void 0 : onExternalSubmit(data);
     } catch (e) {
@@ -25702,7 +25631,7 @@ function useCompanySearchTaskSubmit({
           type: ToastType.ERROR
         });
       }
-      logger$f.error(e);
+      logger$g.error(e);
       userEvents.addEvent(CompanySearchEvents.TASK_ERROR, {
         segmentation: {
           ...baseTrackingPayload,
@@ -26057,6 +25986,84 @@ function CompanySearchDropinComponent({
     })
   });
 }
+const logger$f = createLogger("useLocalStorage");
+const useLocalStorage = (key, defaultValue, options) => {
+  const {
+    serializer,
+    parser,
+    syncData
+  } = useMemo(() => ({
+    serializer: JSON.stringify,
+    parser: JSON.parse,
+    syncData: true,
+    ...options
+  }), [options]);
+  const rawValueRef = useRef(null);
+  const [value, setValue] = useState(() => {
+    if (typeof window === "undefined")
+      return defaultValue;
+    try {
+      rawValueRef.current = window.localStorage.getItem(key);
+      const res = rawValueRef.current ? parser(rawValueRef.current) : defaultValue;
+      return res;
+    } catch (err) {
+      logger$f.error(err);
+      return defaultValue;
+    }
+  });
+  useEffect(() => {
+    if (typeof window === "undefined")
+      return;
+    const updateLocalStorage = () => {
+      if (value !== void 0) {
+        const newValue = serializer(value);
+        const oldValue = rawValueRef.current;
+        rawValueRef.current = newValue;
+        window.localStorage.setItem(key, newValue);
+        window.dispatchEvent(new StorageEvent("storage", {
+          storageArea: window.localStorage,
+          url: window.location.href,
+          key,
+          newValue,
+          oldValue
+        }));
+      } else {
+        window.localStorage.removeItem(key);
+        window.dispatchEvent(new StorageEvent("storage", {
+          storageArea: window.localStorage,
+          url: window.location.href,
+          key
+        }));
+      }
+    };
+    try {
+      updateLocalStorage();
+    } catch (err) {
+      logger$f.error(err);
+    }
+  }, [value]);
+  useEffect(() => {
+    if (!syncData)
+      return;
+    const handleStorageChange = (event) => {
+      if (event.key !== key || event.storageArea !== window.localStorage)
+        return;
+      try {
+        if (event.newValue !== rawValueRef.current) {
+          rawValueRef.current = event.newValue;
+          setValue(event.newValue ? parser(event.newValue) : void 0);
+        }
+      } catch (err) {
+        logger$f.error(err);
+      }
+    };
+    if (typeof window === "undefined")
+      return;
+    window.addEventListener("storage", handleStorageChange);
+    return () => window.removeEventListener("storage", handleStorageChange);
+  }, [key, syncData]);
+  return [value, setValue];
+};
 const getHasSeenIntroductionStorageKey = (legalEntityId) => `COMPLETED_INTRO-${legalEntityId}`;
 const useHasSeenIntroduction = ({
   legalEntityId
@@ -26067,61 +26074,6 @@ const useHasSeenIntroduction = ({
     setHasSeenIntroduction
   };
 };
-const useLegalEntityType = ({
-  legalEntity
-}) => {
-  const isTrust = isPartOfTrustFromLegalEntity(legalEntity);
-  const isSoleProprietor = hasSolePropInLegalEntity(legalEntity);
-  const hasLegalAssociation = isTrust || isSoleProprietor;
-  switch (legalEntity.type) {
-    case LegalEntityType.INDIVIDUAL:
-    case LegalEntityType.ORGANIZATION:
-      if (!hasLegalAssociation)
-        return legalEntity.type;
-      if (isSoleProprietor)
-        return LegalEntityType.SOLE_PROPRIETORSHIP;
-      if (isTrust)
-        return LegalEntityType.TRUST;
-      break;
-    default:
-      return void 0;
-  }
-};
-const useCanSeeIntroduction = ({
-  legalEntity
-}) => {
-  const legalEntityType = useLegalEntityType({
-    legalEntity
-  });
-  const {
-    isSettingEnabled
-  } = useSettingsContext();
-  switch (legalEntityType) {
-    case LegalEntityType.INDIVIDUAL:
-      return !isSettingEnabled(SettingNames.HideOnboardingIntroductionIndividual);
-    case LegalEntityType.ORGANIZATION:
-      return !isSettingEnabled(SettingNames.HideOnboardingIntroductionOrganization);
-    case LegalEntityType.SOLE_PROPRIETORSHIP:
-      return !isSettingEnabled(SettingNames.HideOnboardingIntroductionSoleProprietor);
-    case LegalEntityType.TRUST:
-      return !isSettingEnabled(SettingNames.HideOnboardingIntroductionTrust);
-    default:
-      return false;
-  }
-};
-const useShouldShowIntroduction = ({
-  legalEntity
-}) => {
-  const canSeeIntroduction = useCanSeeIntroduction({
-    legalEntity
-  });
-  const {
-    hasSeenIntroduction
-  } = useHasSeenIntroduction({
-    legalEntityId: legalEntity.id
-  });
-  return canSeeIntroduction && !hasSeenIntroduction;
-};
 const getHasSeenSingpassSelectionStorageKey = (legalEntityId) => `COMPLETED_SINGPASS_SELECTION-${legalEntityId}`;
 const useHasSeenSingpassSelection = ({
   legalEntityId
@@ -26132,27 +26084,23 @@ const useHasSeenSingpassSelection = ({
     setHasSeenSingpassSelection
   };
 };
-const useShouldShowSingpass = ({
-  isExperimentEnabled = false,
+const useIsEligibleForSingpass = ({
   legalEntity,
   accountHolder: accountHolder2,
   handleOpenSingpassAuthorizationLink
 }) => {
-  const shouldShowSingpassForAccountHolder = (newAccountHolder) => {
-    if (!isExperimentEnabled) {
-      return false;
-    }
-    const country2 = getLegalEntityCountry(legalEntity);
-    const isSingpassEnabled = Boolean(handleOpenSingpassAuthorizationLink && country2 === CountryCodes.Singapore);
-    if (newAccountHolder) {
-      return isSingpassEnabled && newAccountHolder === "theCompanyIWorkFor";
-    }
-    return isSingpassEnabled && (legalEntity == null ? void 0 : legalEntity.type) === LegalEntityType.ORGANIZATION;
-  };
-  return {
-    shouldShowSingpass: shouldShowSingpassForAccountHolder(accountHolder2),
-    shouldShowSingpassForAccountHolder
-  };
+  const {
+    isExperimentEnabled
+  } = useExperimentsContext();
+  if (!isExperimentEnabled("ShowSingPassButtonForCompanies"))
+    return false;
+  const isSingpassEnabled = Boolean(handleOpenSingpassAuthorizationLink) && getLegalEntityCountry(legalEntity) === CountryCodes.Singapore;
+  if (!isSingpassEnabled)
+    return false;
+  if (accountHolder2) {
+    return accountHolder2 === "theCompanyIWorkFor";
+  }
+  return legalEntity.type === LegalEntityType.ORGANIZATION;
 };
 const logger$e = createLogger("useAssociatedLegalArrangement");
 function useAssociatedLegalArrangement({
@@ -26197,11 +26145,6 @@ 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
@@ -26669,11 +26612,9 @@ const BusinessTypeIcon = (item) => jsx(Icon, {
 const BusinessTypeSelection = ({
   legalEntityResponse,
   accountHolder: accountHolder2,
-  onAccountHolderSelect,
+  onComplete,
+  onBack,
   handleUpdateLegalEntity,
-  taskHistory,
-  setTaskHistory,
-  onNavigateTo,
   baseTrackingPayload
 }) => {
   var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
@@ -26693,8 +26634,7 @@ const BusinessTypeSelection = ({
     1,
     2
     /* WE_CANNOT_SET_UP_ACCOUNT */
-  ].includes(currentStep);
-  const isPrevTaskTasksOverview = taskHistory[taskHistory.length - 2] === TaskTypes.TASKS_OVERVIEW;
+  ].includes(currentStep) || currentStep === 0 && Boolean(onBack);
   const {
     businessTypeOptions,
     legalArrangementOptions
@@ -26786,7 +26726,7 @@ const BusinessTypeSelection = ({
           segmentation: baseTrackingPayload
         });
       } else {
-        onAccountHolderSelect(newAccountHolder);
+        onComplete(newAccountHolder);
       }
       if (isLegalArrangementChanging) {
         await updateLegalEntityAndSelectAccountHolder();
@@ -26812,7 +26752,7 @@ const BusinessTypeSelection = ({
           }, legalEntityResponse == null ? void 0 : legalEntityResponse.id));
         }
       }
-      if (isLegalArrangementChanging) {
+      if (isLegalArrangementChanging && targetLegalArrangement) {
         await (handleUpdateLegalEntity == null ? void 0 : handleUpdateLegalEntity({
           organization: {
             type: mapLegalArrangementOptionToCompanyTypesValue(targetLegalArrangement)
@@ -26826,7 +26766,7 @@ const BusinessTypeSelection = ({
       });
     } finally {
       setLoadingStatus("success");
-      onAccountHolderSelect(newAccountHolder);
+      onComplete(newAccountHolder);
     }
   };
   const handleBackClick = () => {
@@ -26842,9 +26782,8 @@ const BusinessTypeSelection = ({
         /* BUSINESS_TYPE_SELECTION */
       );
     }
-    if (currentStep === 0 && isPrevTaskTasksOverview) {
-      setTaskHistory(taskHistory.slice(taskHistory.length - 2));
-      onNavigateTo(TaskTypes.TASKS_OVERVIEW);
+    if (currentStep === 0) {
+      onBack == null ? void 0 : onBack();
     }
   };
   const isWeCannotSetUpAccountStep = currentStep === 2;
@@ -26951,7 +26890,7 @@ const BusinessTypeSelection = ({
           disabled: currentStep === 1 && !data.legalArrangement,
           onClick: handleNextClick,
           type: "button"
-        }), (hasBackButton || isPrevTaskTasksOverview) && jsxs("button", {
+        }), hasBackButton && jsxs("button", {
           onClick: handleBackClick,
           type: "button",
           "aria-label": i18n.get("back"),
@@ -27762,6 +27701,48 @@ var IntroductionScreenTiming = /* @__PURE__ */ ((IntroductionScreenTiming2) => {
   IntroductionScreenTiming2["VIEW_SCREEN"] = "Introduction_ViewScreen";
   return IntroductionScreenTiming2;
 })(IntroductionScreenTiming || {});
+const useLegalEntityType = ({
+  legalEntity
+}) => {
+  const isTrust = isPartOfTrustFromLegalEntity(legalEntity);
+  const isSoleProprietor = hasSolePropInLegalEntity(legalEntity);
+  const hasLegalAssociation = isTrust || isSoleProprietor;
+  switch (legalEntity.type) {
+    case LegalEntityType.INDIVIDUAL:
+    case LegalEntityType.ORGANIZATION:
+      if (!hasLegalAssociation)
+        return legalEntity.type;
+      if (isSoleProprietor)
+        return LegalEntityType.SOLE_PROPRIETORSHIP;
+      if (isTrust)
+        return LegalEntityType.TRUST;
+      break;
+    default:
+      return void 0;
+  }
+};
+const useCanSeeIntroduction = ({
+  legalEntity
+}) => {
+  const legalEntityType = useLegalEntityType({
+    legalEntity
+  });
+  const {
+    isSettingEnabled
+  } = useSettingsContext();
+  switch (legalEntityType) {
+    case LegalEntityType.INDIVIDUAL:
+      return !isSettingEnabled(SettingNames.HideOnboardingIntroductionIndividual);
+    case LegalEntityType.ORGANIZATION:
+      return !isSettingEnabled(SettingNames.HideOnboardingIntroductionOrganization);
+    case LegalEntityType.SOLE_PROPRIETORSHIP:
+      return !isSettingEnabled(SettingNames.HideOnboardingIntroductionSoleProprietor);
+    case LegalEntityType.TRUST:
+      return !isSettingEnabled(SettingNames.HideOnboardingIntroductionTrust);
+    default:
+      return false;
+  }
+};
 const useIntroductionScreens = ({
   legalEntity,
   tasks
@@ -29513,7 +29494,7 @@ function IndividualDropinComponent({
 const useBankConfigurationHandlers = ({
   isEmbeddedDropin,
   handleGetBankVerificationVendors,
-  bankAccountCountry: bankAccountCountry2,
+  bankAccountCountry,
   getConfiguration: getConfiguration2,
   legalEntityType,
   capabilities
@@ -29522,16 +29503,16 @@ const useBankConfigurationHandlers = ({
   const callBankVerificationVendorsUpfront = isEmbeddedDropin && handleGetBankVerificationVendors;
   useEffect(() => {
     (async () => {
-      const bankVerificationVendorsResponse2 = callBankVerificationVendorsUpfront ? await handleGetBankVerificationVendors(bankAccountCountry2) : [];
+      const bankVerificationVendorsResponse2 = callBankVerificationVendorsUpfront ? await handleGetBankVerificationVendors(bankAccountCountry) : [];
       setBankVerificationVendorsResponse(bankVerificationVendorsResponse2);
     })();
-  }, [bankAccountCountry2]);
+  }, [bankAccountCountry]);
   const getConfigurationData = useCallback(async () => {
     var _a;
     const configuration = await getConfiguration2({
       legalEntityType,
       capabilities,
-      country: bankAccountCountry2
+      country: bankAccountCountry
     });
     if (!callBankVerificationVendorsUpfront || !((_a = bankVerificationVendorsResponse == null ? void 0 : bankVerificationVendorsResponse[0]) == null ? void 0 : _a.name)) {
       return configuration;
@@ -29539,10 +29520,10 @@ const useBankConfigurationHandlers = ({
     return {
       ...configuration,
       bankVerificationProviders: {
-        [bankAccountCountry2]: bankVerificationVendorsResponse[0].name
+        [bankAccountCountry]: bankVerificationVendorsResponse[0].name
       }
     };
-  }, [bankAccountCountry2, capabilities, bankVerificationVendorsResponse]);
+  }, [bankAccountCountry, capabilities, bankVerificationVendorsResponse]);
   const getBankVerificationVendorsHandler = useMemo(() => callBankVerificationVendorsUpfront && bankVerificationVendorsResponse ? (country2) => country2 && Promise.resolve(bankVerificationVendorsResponse) : handleGetBankVerificationVendors, [bankVerificationVendorsResponse, callBankVerificationVendorsUpfront]);
   return {
     getConfigurationData,
@@ -29701,7 +29682,7 @@ function PayoutDetailsDropinComponent({
     }
   } = useStateContext();
   const formValidity = currentState.validityByForm;
-  const bankAccountCountry2 = ((_c = (_b = currentState == null ? void 0 : currentState.data) == null ? void 0 : _b.payoutVerificationMethod) == null ? void 0 : _c.bankCountry) ?? defaultPayoutCountry;
+  const bankAccountCountry = ((_c = (_b = currentState == null ? void 0 : currentState.data) == null ? void 0 : _b.payoutVerificationMethod) == null ? void 0 : _c.bankCountry) ?? defaultPayoutCountry;
   const [hideDropinLayout, setHideDropinLayout] = useState(false);
   const [submitButtonLabel, setSubmitButtonLabel] = useState("submit");
   const [skipSubmit, setSkipSubmit] = useState(false);
@@ -29709,7 +29690,7 @@ function PayoutDetailsDropinComponent({
   const [hideBackButton, setHideBackButton] = useState(false);
   const [loadingStatus, setLoadingStatus] = useState("success");
   const [data, setData] = useState(prefilledData);
-  const [problems, setProblems] = useState(propProblems || ((transferInstrument == null ? void 0 : transferInstrument.id) ? (_e = (_d = getCapabilityProblems(legalEntityResponse, bankAccountCountry2)) == null ? void 0 : _d.BankAccount) == null ? void 0 : _e[transferInstrument.id] : void 0));
+  const [problems, setProblems] = useState(propProblems || ((transferInstrument == null ? void 0 : transferInstrument.id) ? (_e = (_d = getCapabilityProblems(legalEntityResponse, bankAccountCountry)) == null ? void 0 : _d.BankAccount) == null ? void 0 : _e[transferInstrument.id] : void 0));
   const [accountDetailsFromInput, setAccountDetailsFromInput] = useState(prefilledData.payoutAccountDetails);
   const existingBankAccountFormat = transferInstrument ? ((_f = existingPayoutDetails == null ? void 0 : existingPayoutDetails.payoutAccountDetails) == null ? void 0 : _f.iban) ? "iban" : "local" : void 0;
   const baseTrackingPayload = getBaseTrackingPayload({
@@ -29731,23 +29712,23 @@ function PayoutDetailsDropinComponent({
       ...currentState.data,
       payoutAccountDetails: {
         ...(_a2 = currentState.data) == null ? void 0 : _a2.payoutAccountDetails,
-        currency: (_b2 = currencyByCountry[bankAccountCountry2]) == null ? void 0 : _b2[0]
+        currency: (_b2 = currencyByCountry[bankAccountCountry]) == null ? void 0 : _b2[0]
       }
     });
     onChange == null ? void 0 : onChange(currentState);
-  }, [bankAccountCountry2, currentState, onChange]);
+  }, [bankAccountCountry, currentState, onChange]);
   const {
     getConfigurationData,
     getBankVerificationVendorsHandler
   } = useBankConfigurationHandlers({
     isEmbeddedDropin,
     handleGetBankVerificationVendors,
-    bankAccountCountry: bankAccountCountry2,
+    bankAccountCountry,
     getConfiguration: getConfiguration2,
     legalEntityType: legalEntityResponse.type,
     capabilities
   });
-  const getPayoutAccountFormatData = useCallback(async () => getAccountFormatsForCountry(bankAccountCountry2), [bankAccountCountry2]);
+  const getPayoutAccountFormatData = useCallback(async () => getAccountFormatsForCountry(bankAccountCountry), [bankAccountCountry]);
   const {
     fieldConfigurations,
     requiredFields,
@@ -29758,16 +29739,16 @@ function PayoutDetailsDropinComponent({
     getPayoutAccountFormatData,
     instantVerificationEnabled,
     setLoadingStatus,
-    country: bankAccountCountry2,
+    country: bankAccountCountry,
     existingBankAccountFormat
   });
   const fieldsFromCustomRules = useMemo(() => rules$1({
     data,
-    country: bankAccountCountry2,
+    country: bankAccountCountry,
     taskType,
     requiredFields
-  }), [bankAccountCountry2, data, taskType]);
-  const fieldsFormCustomLabels = useMemo(() => labels ? labels() : {}, [data, bankAccountCountry2]);
+  }), [bankAccountCountry, data, taskType]);
+  const fieldsFormCustomLabels = useMemo(() => labels ? labels() : {}, [data, bankAccountCountry]);
   const payoutDetailsSteps = useMemo(() => {
     var _a2;
     return getAppropriatePayoutDetailsSteps(taskType, Boolean((_a2 = prefilledData == null ? void 0 : prefilledData.payoutAccountDetails) == null ? void 0 : _a2.transferInstrumentId), !transferInstrument && isInstantVerificationAvailable({
@@ -29890,6 +29871,11 @@ function PayoutDetailsDropinComponent({
           ...problems,
           validationErrors
         });
+      } else if (isDocumentUploadError(e)) {
+        showToast({
+          label: i18n.get("documentUploadfailed"),
+          type: ToastType.ERROR
+        });
       } else if (isMaintenanceModeError(e)) {
         showToast({
           label: i18n.get("failedToUpdateDetails"),
@@ -31514,7 +31500,7 @@ function SolePropDropinComponent({
     const solePropCountry = ((_a2 = summaryData == null ? void 0 : summaryData.solePropNameAndCountry) == null ? void 0 : _a2.country) ? datasetUtils.getCountryName(summaryData.solePropNameAndCountry.country) : void 0;
     summaryData.solePropNameAndCountry = {
       legalNameOfSoleProprietor: (_b2 = data2.solePropNameAndCountry) == null ? void 0 : _b2.legalCompanyName,
-      countryOfEstablishment: solePropCountry
+      countryRegionOfEstablishment: solePropCountry
     };
     if ((_c = summaryData == null ? void 0 : summaryData.solePropRegistrationAddress) == null ? void 0 : _c.registrationAddress) {
       summaryData.solePropRegistrationAddress.hasInnerForms = true;
@@ -31799,7 +31785,7 @@ function TrustDropinComponent({
       })) == null ? void 0 : _c.name) : void 0;
       summaryData.trustRegistrationDetails = {
         nameOfTrustAgreement: (_d = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _d.legalName,
-        countryOfEstablishment: trustCountry,
+        countryRegionOfEstablishment: trustCountry,
         typeOfTrustAgreement: trustType2,
         objectOfTrust: (_e = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _e.objectOfTrust,
         taxId: (_f = summaryData == null ? void 0 : summaryData.trustRegistrationDetails) == null ? void 0 : _f.taxId
@@ -31892,6 +31878,107 @@ function TrustDropinComponent({
     })
   });
 }
+const useShouldShowIntroduction = ({
+  legalEntity
+}) => {
+  const canSeeIntroduction = useCanSeeIntroduction({
+    legalEntity
+  });
+  const {
+    hasSeenIntroduction
+  } = useHasSeenIntroduction({
+    legalEntityId: legalEntity.id
+  });
+  return canSeeIntroduction && !hasSeenIntroduction;
+};
+const useNavigation = ({
+  legalEntity,
+  onNavigate,
+  handleOpenSingpassAuthorizationLink
+}) => {
+  const isNewEntryFlowEnabled = useEnableNewEntryFlow();
+  const showIntroduction = useShouldShowIntroduction({
+    legalEntity
+  });
+  const {
+    hasSeenSingpassSelection
+  } = useHasSeenSingpassSelection({
+    legalEntityId: legalEntity.id
+  });
+  const {
+    accountHolder: accountHolder2
+  } = useCoreContext();
+  const eligibleForSingpass = useIsEligibleForSingpass({
+    legalEntity,
+    accountHolder: accountHolder2,
+    handleOpenSingpassAuthorizationLink
+  });
+  const shouldShowSingpassSelection = eligibleForSingpass && !hasSeenSingpassSelection;
+  const [taskHistory, setTaskHistory] = useState(["default"]);
+  const actualTasks = taskHistory.filter((task) => task !== "default");
+  const navigateTo = useCallback((task, deletePreviousHistory = false) => {
+    const pushNewTask = () => setTaskHistory((taskHistory2) => deletePreviousHistory ? [task] : [...taskHistory2, task]);
+    if (task === "default") {
+      setTimeout(pushNewTask);
+    } else {
+      pushNewTask();
+      onNavigate == null ? void 0 : onNavigate(task);
+    }
+  }, [onNavigate]);
+  const navigateBack = useCallback((stepCount = 1) => {
+    if (taskHistory.length <= 1)
+      return;
+    const prevTask = taskHistory[taskHistory.length - (stepCount + 1)];
+    if (prevTask === "default") {
+      throw Error("Cannot navigate back to 'default' task");
+    }
+    if (prevTask === TaskTypes.TASKS_OVERVIEW) {
+      setTaskHistory([TaskTypes.TASKS_OVERVIEW]);
+      onNavigate == null ? void 0 : onNavigate(TaskTypes.TASKS_OVERVIEW);
+      return;
+    }
+    setTaskHistory(taskHistory.slice(0, -1 * stepCount));
+    onNavigate == null ? void 0 : onNavigate(prevTask);
+  }, [taskHistory, onNavigate]);
+  useEffect(() => {
+    const pushedTask = taskHistory.at(-1);
+    if (pushedTask === "default") {
+      const defaultTask = getDefaultTask({
+        legalEntity,
+        accountHolder: accountHolder2,
+        showIntroduction,
+        isNewEntryFlowEnabled,
+        shouldShowSingpassSelection
+      });
+      setTaskHistory([...taskHistory.slice(0, taskHistory.length - 1), defaultTask]);
+    }
+  }, [legalEntity, accountHolder2, showIntroduction, isNewEntryFlowEnabled, shouldShowSingpassSelection, taskHistory]);
+  return {
+    currentTask: actualTasks.at(-1),
+    previousTask: actualTasks.at(-2),
+    navigateBack,
+    navigateTo
+  };
+};
+const getDefaultTask = ({
+  legalEntity,
+  accountHolder: accountHolder2,
+  isNewEntryFlowEnabled,
+  showIntroduction,
+  shouldShowSingpassSelection
+}) => {
+  var _a, _b;
+  const hasOwnEntityAssocation = (_a = legalEntity.entityAssociations) == null ? void 0 : _a.some((ea) => ea.associatorId === legalEntity.id);
+  const hasOrganizationType = (_b = legalEntity.organization) == null ? void 0 : _b.type;
+  const hasProgressedBeyondEntitySelection = hasOwnEntityAssocation || !!hasOrganizationType;
+  if (isNewEntryFlowEnabled && !accountHolder2 && !hasProgressedBeyondEntitySelection)
+    return TaskTypes.BUSINESS_TYPE_SELECTION;
+  if (showIntroduction)
+    return TaskTypes.INTRODUCTION;
+  if (shouldShowSingpassSelection)
+    return TaskTypes.SINGPASS_SELECTION;
+  return TaskTypes.TASKS_OVERVIEW;
+};
 const PAGES_WITH_POLLING = [TaskTypes.DECISION_MAKER_OVERVIEW, TaskTypes.TASKS_OVERVIEW];
 const POLLING_INTERVAL = 3e3;
 const logger$b = createLogger("DropinComposerComponent");
@@ -31926,50 +32013,27 @@ function DropinComposerComponent({
     showToast
   } = useToastContext();
   const [isLoadingConfiguration, setIsLoadingConfiguration] = useState(false);
-  const isNewEntryFlowEnabled = isExperimentEnabled("EnableNewEntryFlow");
-  const isSingpassExperimentEnabled = isExperimentEnabled("ShowSingPassButtonForCompanies");
   const {
-    hasSeenSingpassSelection,
+    handleOpenSingpassAuthorizationLink
+  } = args;
+  const {
     setHasSeenSingpassSelection
   } = useHasSeenSingpassSelection({
     legalEntityId: legalEntityResponse.id
   });
-  const [leId, setLeId] = useLeId();
-  const showIntroduction = useShouldShowIntroduction({
-    legalEntity: legalEntityResponse
-  });
   const {
     setHasSeenIntroduction
   } = useHasSeenIntroduction({
     legalEntityId: legalEntityResponse.id
   });
-  const [tasks, setTasks] = useState([]);
-  const [rootLegalEntity, setRootLegalEntity] = useState(legalEntityResponse);
-  const rootLegalEntityCountry = getLegalEntityCountry(rootLegalEntity);
-  const {
-    handleOpenSingpassAuthorizationLink
-  } = args;
-  const {
-    shouldShowSingpass,
-    shouldShowSingpassForAccountHolder
-  } = useShouldShowSingpass({
-    isExperimentEnabled: isSingpassExperimentEnabled,
+  const eligibleForSingpass = useIsEligibleForSingpass({
     legalEntity: legalEntityResponse,
     accountHolder: accountHolder2,
     handleOpenSingpassAuthorizationLink
   });
-  const shouldShowSingpassSelection = shouldShowSingpass && !hasSeenSingpassSelection;
-  const initialTask = useMemo(() => {
-    if (isNewEntryFlowEnabled && (!accountHolder2 || legalEntityResponse.id !== leId)) {
-      return TaskTypes.BUSINESS_TYPE_SELECTION;
-    }
-    if (showIntroduction)
-      return TaskTypes.INTRODUCTION;
-    if (shouldShowSingpassSelection)
-      return TaskTypes.SINGPASS_SELECTION;
-    return TaskTypes.TASKS_OVERVIEW;
-  }, [showIntroduction, isNewEntryFlowEnabled, accountHolder2, legalEntityResponse, leId]);
-  const [taskHistory, setTaskHistory] = useState([initialTask]);
+  const [tasks, setTasks] = useState([]);
+  const [rootLegalEntity, setRootLegalEntity] = useState(legalEntityResponse);
+  const rootLegalEntityCountry = getLegalEntityCountry(rootLegalEntity);
   const [associatedLegalEntity, setAssociatedLegalEntity] = useState(null);
   const {
     associatedLegalArrangement,
@@ -31993,6 +32057,16 @@ function DropinComposerComponent({
   const [transferInstrument, setTransferInstrument] = useState(null);
   const [capabilityProblems, setCapabilityProblems] = useState(getCapabilityProblems(legalEntityResponse, rootLegalEntityCountry, isExperimentEnabled));
   const [bankVerificationVendors, setBankVerificationVendors] = useState();
+  const {
+    currentTask,
+    previousTask,
+    navigateTo,
+    navigateBack
+  } = useNavigation({
+    legalEntity: legalEntityResponse,
+    onNavigate,
+    handleOpenSingpassAuthorizationLink
+  });
   const hasTrust = accountHolder2 === "aTrust" || isPartOfTrustFromLegalEntity(legalEntityResponse);
   const reviewRequired = (rootLegalEntity == null ? void 0 : rootLegalEntity.id) && ((_b = (_a = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _a[rootLegalEntity.id]) == null ? void 0 : _b.isReviewRequired);
   const additionalSalesChannels = useSalesChannelsSettings();
@@ -32255,7 +32329,7 @@ function DropinComposerComponent({
     }
   };
   const handleSingpassSelectionNextClick = async (method) => {
-    if (method === "singpass" && shouldShowSingpass) {
+    if (method === "singpass") {
       try {
         const {
           item: {
@@ -32264,8 +32338,8 @@ function DropinComposerComponent({
         } = await handleOpenSingpassAuthorizationLink();
         setHasSeenSingpassSelection(true);
         window.open(authUrl, "_blank").focus();
-        if (taskHistory[taskHistory.length - 1] !== TaskTypes.TASKS_OVERVIEW) {
-          onNavigateTo(TaskTypes.TASKS_OVERVIEW);
+        if (currentTask !== TaskTypes.TASKS_OVERVIEW) {
+          navigateTo(TaskTypes.TASKS_OVERVIEW);
         }
       } catch (e) {
         logger$b.error(e);
@@ -32277,13 +32351,9 @@ function DropinComposerComponent({
     }
     if (method === "manual") {
       setHasSeenSingpassSelection(true);
-      onNavigateTo(TaskTypes.TASKS_OVERVIEW);
+      navigateTo(TaskTypes.TASKS_OVERVIEW);
     }
   };
-  const onNavigateTo = (task) => {
-    setTaskHistory([...taskHistory, task]);
-    onNavigate(task);
-  };
   const onNavigateToDecisionMakerIndividual = async (task, id2, parentId) => {
     if (parentId && parentId !== rootLegalEntity.id) {
       const parentLegalEntity = await (args == null ? void 0 : args.handleGetLegalEntity(parentId));
@@ -32295,7 +32365,7 @@ function DropinComposerComponent({
       try {
         const currentAssociatedLegalEntity = await (args == null ? void 0 : args.handleGetLegalEntity(id2));
         setAssociatedLegalEntity(currentAssociatedLegalEntity);
-        onNavigateTo(task);
+        navigateTo(task);
       } catch (e) {
         showToast({
           label: i18n.get("failedFetchingDecisionMaker"),
@@ -32304,7 +32374,7 @@ function DropinComposerComponent({
       }
     } else {
       setAssociatedLegalEntity(null);
-      onNavigateTo(task);
+      navigateTo(task);
     }
   };
   const onNavigateToPayinOrPayout = async (id2, task = TaskTypes.PAYOUT) => {
@@ -32315,17 +32385,17 @@ function DropinComposerComponent({
           await getSolePropietor();
         }
       } finally {
-        onNavigateTo(task);
+        navigateTo(task);
       }
     } else {
       setTransferInstrument(null);
-      onNavigateTo(task);
+      navigateTo(task);
     }
   };
   const onNavigateToPci = async (task = TaskTypes.PCI_DSS) => {
     try {
       await getPciTemplate2();
-      onNavigateTo(task);
+      navigateTo(task);
     } catch (e) {
       showToast({
         label: i18n.get("failedToGetPciTemplate"),
@@ -32337,15 +32407,15 @@ function DropinComposerComponent({
     try {
       await getSolePropietor();
     } finally {
-      onNavigateTo(task);
+      navigateTo(task);
     }
   };
   const onNavigateToTrust = async (task = TaskTypes.TRUST) => {
     try {
       if (associatedLegalArrangement) {
-        onNavigateTo(task);
+        navigateTo(task);
       } else {
-        onNavigateTo(TaskTypes.TRUST);
+        navigateTo(TaskTypes.TRUST);
       }
     } catch (e) {
       showToast({
@@ -32363,7 +32433,7 @@ function DropinComposerComponent({
         setAssociatedLegalEntity(response);
       }
       setTrustMember(tm);
-      onNavigateTo(tm.trustMemberType === "company" ? TaskTypes.TRUST_MEMBER_COMPANY : TaskTypes.TRUST_MEMBER_INDIVIDUAL);
+      navigateTo(tm.trustMemberType === "company" ? TaskTypes.TRUST_MEMBER_COMPANY : TaskTypes.TRUST_MEMBER_INDIVIDUAL);
     } catch (e) {
       showToast({
         label: i18n.get("failedToFetchTrustMemberDetails"),
@@ -32373,35 +32443,23 @@ function DropinComposerComponent({
   };
   const onNavigateToTrustMemberRoleAndType = (tm) => {
     setTrustMember(tm === "new" ? null : tm);
-    onNavigateTo(TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE);
-  };
-  const navigateBack = (stepCount = 1) => {
-    if (taskHistory.length > 1) {
-      const prevTask = taskHistory[taskHistory.length - (stepCount + 1)];
-      if (prevTask === TaskTypes.TASKS_OVERVIEW) {
-        setTaskHistory([TaskTypes.TASKS_OVERVIEW]);
-        onNavigate(TaskTypes.TASKS_OVERVIEW);
-      } else {
-        setTaskHistory(taskHistory.slice(0, -1 * stepCount));
-        onNavigate(taskHistory[taskHistory.length - 1]);
-      }
-    }
+    navigateTo(TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE);
   };
   const navigateToTypeSwitcher = (leType) => {
     setLegalEntityType(leType);
-    onNavigateTo(TaskTypes.LEGAL_ENTITY_TYPE_SWITCHER);
+    navigateTo(TaskTypes.LEGAL_ENTITY_TYPE_SWITCHER);
   };
   const navigateToTargetEntityType = () => {
     switch (legalEntityType) {
       case LegalEntityType.INDIVIDUAL:
-        onNavigateTo(TaskTypes.INDIVIDUAL);
+        navigateTo(TaskTypes.INDIVIDUAL);
         break;
       case LegalEntityType.ORGANIZATION:
-        onNavigateTo(TaskTypes.COMPANY);
+        navigateTo(TaskTypes.COMPANY);
         break;
     }
   };
-  const navigateTo = async (task, id2) => {
+  const onNavigateToTask = async (task, id2) => {
     switch (task) {
       case TaskTypes.PAYOUT:
         await onNavigateToPayinOrPayout(id2, TaskTypes.PAYOUT);
@@ -32426,7 +32484,7 @@ function DropinComposerComponent({
         break;
       }
       default:
-        onNavigateTo(task);
+        navigateTo(task);
     }
   };
   const componentOnChange = (state2) => {
@@ -32499,15 +32557,14 @@ function DropinComposerComponent({
   }, [rootLegalEntity.type, contextCountry]);
   useEffect(() => {
     if (hasRejectedCapabilities(rootLegalEntity)) {
-      setTaskHistory([TaskTypes.CAPABILITY_REJECTED]);
+      navigateTo(TaskTypes.CAPABILITY_REJECTED, true);
     }
   }, [rootLegalEntity]);
   useEffect(() => {
-    if (!PAGES_WITH_POLLING.includes(taskHistory[taskHistory.length - 1]) || hasResolvedCapabilities(rootLegalEntity)) {
+    if (!PAGES_WITH_POLLING.includes(currentTask) || hasResolvedCapabilities(rootLegalEntity)) {
       return;
     }
     if (hasRejectedCapabilities(rootLegalEntity)) {
-      setTaskHistory([TaskTypes.CAPABILITY_REJECTED]);
       return;
     }
     const timeoutId = setTimeout(() => {
@@ -32516,17 +32573,10 @@ function DropinComposerComponent({
     return () => {
       clearInterval(timeoutId);
     };
-  }, [refreshLegalEntity, rootLegalEntity, taskHistory]);
-  useEffect(() => {
-    if (!isNewEntryFlowEnabled || leId !== legalEntityResponse.id) {
-      setLeId(null);
-      setAccountHolder(null);
-    }
-  }, [isNewEntryFlowEnabled, setLeId]);
+  }, [refreshLegalEntity, rootLegalEntity]);
   if (isLoadingConfiguration) {
     return jsx(Shimmer, {});
   }
-  const currentTask = taskHistory[taskHistory.length - 1];
   switch (currentTask) {
     case TaskTypes.BUSINESS_TYPE_SELECTION:
       return jsx("div", {
@@ -32535,23 +32585,12 @@ function DropinComposerComponent({
           ...args,
           legalEntityResponse: rootLegalEntity,
           accountHolder: accountHolder2,
-          onAccountHolderSelect: async (newAccountHolder) => {
-            setLeId(legalEntityResponse.id);
+          onComplete: async (newAccountHolder) => {
             setAccountHolder(newAccountHolder);
             await refreshLegalEntity();
-            if (showIntroduction) {
-              onNavigateTo(TaskTypes.INTRODUCTION);
-              return;
-            }
-            if (shouldShowSingpassForAccountHolder(newAccountHolder) && !hasSeenSingpassSelection) {
-              onNavigateTo(TaskTypes.SINGPASS_SELECTION);
-              return;
-            }
-            onNavigateTo(TaskTypes.TASKS_OVERVIEW);
+            navigateTo("default");
           },
-          taskHistory,
-          setTaskHistory,
-          onNavigateTo,
+          onBack: previousTask ? navigateBack : void 0,
           trackingConfig: {
             topLevelLegalEntity: legalEntityResponse
           },
@@ -32567,11 +32606,7 @@ function DropinComposerComponent({
         legalEntity: rootLegalEntity,
         onExitIntroduction: () => {
           setHasSeenIntroduction(true);
-          if (shouldShowSingpassSelection) {
-            onNavigateTo(TaskTypes.SINGPASS_SELECTION);
-            return;
-          }
-          onNavigateTo(TaskTypes.TASKS_OVERVIEW);
+          navigateTo("default");
         },
         tasks
       });
@@ -32582,7 +32617,7 @@ function DropinComposerComponent({
         trackingConfig: {
           topLevelLegalEntity: legalEntityResponse
         },
-        onNavigateToTask: navigateTo,
+        onNavigateToTask,
         tasks,
         legalEntityResponse: rootLegalEntity,
         capabilityProblems,
@@ -32593,7 +32628,7 @@ function DropinComposerComponent({
         isReview: reviewRequired,
         hasRequiredTrustMemberCount: hasRequiredTrustMemberCount(trustMembers2),
         onTransferInstrumentDelete: deleteTransferInstrument2,
-        onRetrieveMyinfoBusinessWithSingpass: shouldShowSingpass ? () => handleSingpassSelectionNextClick("singpass") : null
+        onRetrieveMyinfoBusinessWithSingpass: eligibleForSingpass ? () => handleSingpassSelectionNextClick("singpass") : null
       });
     case TaskTypes.DECISION_MAKER_OVERVIEW:
       return jsx(DecisionMakersComponent, {
@@ -32626,10 +32661,10 @@ function DropinComposerComponent({
         onSubmit: async (data) => {
           onSubmit == null ? void 0 : onSubmit(data);
           await refreshLegalEntity();
-          onNavigateTo(TaskTypes.TASKS_OVERVIEW);
+          navigateTo(TaskTypes.TASKS_OVERVIEW);
           setLegalEntityType(null);
         },
-        handleHomeClick: () => onNavigateTo(TaskTypes.TASKS_OVERVIEW),
+        handleHomeClick: () => navigateTo(TaskTypes.TASKS_OVERVIEW),
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
         handleCreateLegalEntity: args == null ? void 0 : args.handleCreateLegalEntity,
         handleUpdateLegalEntity: args == null ? void 0 : args.handleUpdateLegalEntity,
@@ -32646,7 +32681,7 @@ function DropinComposerComponent({
       return jsx(ReviewComponent, {
         legalEntityId: rootLegalEntity.id,
         handleReviewConfirm: args.handleReviewConfirm,
-        handleHomeClick: () => onNavigateTo(TaskTypes.TASKS_OVERVIEW)
+        handleHomeClick: () => navigateTo(TaskTypes.TASKS_OVERVIEW)
       });
     case TaskTypes.DECISION_MAKER:
       return jsx(IndividualDropinComponent, {
@@ -32716,7 +32751,7 @@ function DropinComposerComponent({
         eventEmitter,
         onSubmit: (data) => refreshLegalArrangementAndRunOnSubmit(data, 2),
         handleBackClick: navigateBack,
-        handleHomeClick: () => onNavigateTo(TaskTypes.TRUST_MEMBER_OVERVIEW),
+        handleHomeClick: () => navigateTo(TaskTypes.TRUST_MEMBER_OVERVIEW),
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
         trustMember,
         handleCreateLegalEntity: args == null ? void 0 : args.handleCreateLegalEntity,
@@ -32744,7 +32779,7 @@ function DropinComposerComponent({
         onSubmit: async (data) => {
           onSubmit == null ? void 0 : onSubmit(data);
           await refreshLegalEntity();
-          onNavigateTo(TaskTypes.TASKS_OVERVIEW);
+          navigateTo(TaskTypes.TASKS_OVERVIEW);
           setLegalEntityType(null);
         },
         handleHomeClick: navigateBack,
@@ -32772,7 +32807,7 @@ function DropinComposerComponent({
         onSubmit: async (data) => {
           onSubmit == null ? void 0 : onSubmit(data);
           await refreshLegalEntity();
-          onNavigateTo(TaskTypes.TASKS_OVERVIEW);
+          navigateTo(TaskTypes.TASKS_OVERVIEW);
           setLegalEntityType(null);
         },
         handleGetDocument: args.handleGetDocument,
@@ -34160,6 +34195,7 @@ function ViewVerificationStatusComponent({
   hideExplanation = false,
   returnUrl,
   redirectTarget,
+  themeId,
   onStatusChange,
   onError,
   onRedirect,
@@ -34235,7 +34271,8 @@ function ViewVerificationStatusComponent({
     setLinkLoadingStatus("loading");
     const config = {
       locale: i18n.locale,
-      returnUrl
+      returnUrl,
+      themeId
     };
     try {
       const {
@@ -34762,7 +34799,7 @@ const ConfigurationApiProvider = ({
     isEmbeddedDropin,
     loadingContext
   } = authContext;
-  const sdkVersion = "3.14.0";
+  const sdkVersion = "3.15.0";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,
@@ -34785,14 +34822,25 @@ const ConfigurationApiProvider = ({
     }), children]
   });
 };
+const getAccountHolderStorageKey = (legalEntityId) => `ACCOUNT_HOLDER-${legalEntityId}`;
+const useAccountHolder = (legalEntityId) => {
+  const [accountHolderFromLocalStorage, setAccountHolderIntoLocalStorage] = useLocalStorage(getAccountHolderStorageKey(legalEntityId), null);
+  return {
+    accountHolder: accountHolderFromLocalStorage,
+    setAccountHolder: setAccountHolderIntoLocalStorage
+  };
+};
 const logger$2 = createLogger("CoreProvider");
 const CoreProvider = ({
   contextCountry: initialContextCountry,
-  enableNewEntryFlowExperiment = false,
+  rootLegalEntityId,
   children
 }) => {
   const [contextCountry, setContextCountry] = useState(initialContextCountry);
-  const [accountHolder2, setAccountHolder] = useAccountHolder(enableNewEntryFlowExperiment);
+  const {
+    accountHolder: accountHolder2,
+    setAccountHolder
+  } = useAccountHolder(rootLegalEntityId);
   const [accountFormat, setAccountFormat] = useState("local");
   const allowedCountries = useAllowedCountries();
   const isCountryAllowed = (allowedCountries == null ? void 0 : allowedCountries.includes(contextCountry)) ?? true;
@@ -34910,6 +34958,15 @@ const I18nProvider = ({
     children
   });
 };
+const ReactQueryClient = new QueryClient();
+function ReactQueryProvider({
+  children
+}) {
+  return jsx(QueryClientProvider, {
+    client: ReactQueryClient,
+    children
+  });
+}
 const settingsDefaults = {
   acceptedCountries: void 0,
   allowBankAccountFormatSelection: false,
@@ -35238,8 +35295,8 @@ class UIElement extends BaseElement {
   constructor() {
     super(...arguments);
     this.render = () => {
-      var _a;
       const Component = this.props.component;
+      const rootLegalEntityId = getRootLegalEntityId(this.props.componentProps);
       return jsx(SettingsProvider, {
         settings: this.props.settings,
         children: jsx(AuthProvider, {
@@ -35248,12 +35305,12 @@ class UIElement extends BaseElement {
           clientKey: this.props.clientKey,
           loadingContext: this.props.loadingContext,
           children: jsx(ConfigurationApiProvider, {
-            rootLegalEntityId: getRootLegalEntityId(this.props.componentProps),
+            rootLegalEntityId,
             onUserEvent: this.props.onUserEvent,
             componentName: this.props.componentName,
             children: jsx(CoreProvider, {
               contextCountry: this.props.contextCountry,
-              enableNewEntryFlowExperiment: (_a = this.props.experiments) == null ? void 0 : _a.EnableNewEntryFlow,
+              rootLegalEntityId,
               children: jsx(I18nProvider, {
                 locale: this.props.locale,
                 customTranslations: this.props.customTranslations,
@@ -35264,9 +35321,11 @@ class UIElement extends BaseElement {
                     children: jsx(AutoResizer, {
                       children: jsx(ToastContextProvider, {
                         children: jsx(StateProvider, {
-                          children: jsx(Component, {
-                            ...this.props.componentProps,
-                            eventEmitter: this.eventEmitter
+                          children: jsx(ReactQueryProvider, {
+                            children: jsx(Component, {
+                              ...this.props.componentProps,
+                              eventEmitter: this.eventEmitter
+                            })
                           })
                         })
                       })
@@ -35940,6 +35999,9 @@ const viewVerificationStatusComponentSchema = {
   redirectTarget: {
     type: "string"
   },
+  themeId: {
+    type: "string"
+  },
   onStatusChange: {
     type: "function"
   },