@adyen/kyc-components 2.35.0 → 2.36.1

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

@@ -1235,19 +1235,14 @@ const introductionScreenEpilogueTitle = "Why do we need this information?";
 const introductionScreenEpilogueDescriptionP1 = "We check all this information against official records to verify your identity and comply with financial regulations.";
 const introductionScreenEpilogueDescriptionP2 = "Your information will be used only for these purposes.";
 const oib = "OIB";
-const onboardingRedirectInitialHeader = "Reach more customers and accept orders online";
-const onboardingRedirectInitialDescriptionP1 = "Register today and get access to all the features like receiving payments or issuing cards.";
-const onboardingRedirectInitialCtaButton = "Get started";
-const onboardingRedirectInProgressHeader = "We are currently reviewing your information";
-const onboardingRedirectInProgressDescriptionP1 = "We will notify you when your details are verified correctly so you can start doing payments.";
-const onboardingRedirectInProgressCtaButton = "View information";
-const onboardingRedirectErrorsHeader = "Some of your information needs to be corrected";
-const onboardingRedirectErrorsDescriptionP1 = "We reviewed the information you submitted, but we were not able to verify everything.";
-const onboardingRedirectErrorsDescriptionP2 = "You need to correct some information before we can activate your account.";
-const onboardingRedirectErrorsCtaButton = "Correct information";
-const onboardingRedirectFinishedHeader = "You’re all set";
-const onboardingRedirectFinishedDescriptionP1 = "We reviewed the information you submitted and successfully verified your account.";
-const onboardingRedirectFinishedCtaButton = "View data";
+const onboardingRedirectAwaitingDescriptionP1 = "Verify your business details to start receiving payments.";
+const onboardingRedirectAwaitingCtaButton = "Continue";
+const onboardingRedirectInReviewDescriptionP1 = "We’re reviewing your details. It might take up to 2 business days.";
+const onboardingRedirectInReviewCtaButton = "Go to details";
+const onboardingRedirectUnsuccessfulDescriptionP1 = "We couldn’t verify some details. Check if they’re correct and make any updates needed.";
+const onboardingRedirectUnsuccessfulCtaButton = "Update details";
+const onboardingRedirectRejectedDescriptionP1 = "Your account can’t be set up.";
+const onboardingRedirectVerifiedDescriptionP1 = "Your details are verified.";
 const onboardingRedirectLinkError = "Onboarding link not available at the moment, please try again later.";
 const onboardingRedirectOpenError = "Pop-up blocker prevented redirecting, please allow pop-ups for this site.";
 const defaultTrans = {
@@ -2470,19 +2465,14 @@ const defaultTrans = {
   introductionScreenEpilogueDescriptionP1,
   introductionScreenEpilogueDescriptionP2,
   oib,
-  onboardingRedirectInitialHeader,
-  onboardingRedirectInitialDescriptionP1,
-  onboardingRedirectInitialCtaButton,
-  onboardingRedirectInProgressHeader,
-  onboardingRedirectInProgressDescriptionP1,
-  onboardingRedirectInProgressCtaButton,
-  onboardingRedirectErrorsHeader,
-  onboardingRedirectErrorsDescriptionP1,
-  onboardingRedirectErrorsDescriptionP2,
-  onboardingRedirectErrorsCtaButton,
-  onboardingRedirectFinishedHeader,
-  onboardingRedirectFinishedDescriptionP1,
-  onboardingRedirectFinishedCtaButton,
+  onboardingRedirectAwaitingDescriptionP1,
+  onboardingRedirectAwaitingCtaButton,
+  onboardingRedirectInReviewDescriptionP1,
+  onboardingRedirectInReviewCtaButton,
+  onboardingRedirectUnsuccessfulDescriptionP1,
+  onboardingRedirectUnsuccessfulCtaButton,
+  onboardingRedirectRejectedDescriptionP1,
+  onboardingRedirectVerifiedDescriptionP1,
   onboardingRedirectLinkError,
   onboardingRedirectOpenError
 };
@@ -2968,7 +2958,7 @@ const icons = {
   warning: lazy(() => import("./warning-99uFf1WU.js")),
   wrong: lazy(() => import("./wrong-1wvh7nZe.js"))
 };
-const logger$w = createLogger("Icon");
+const logger$v = createLogger("Icon");
 const Icon = ({
   className,
   name,
@@ -2976,7 +2966,7 @@ const Icon = ({
 }) => {
   const LazyLoadedIcon = icons[name];
   if (!LazyLoadedIcon) {
-    logger$w.error(`No such icon: "${name}"`);
+    logger$v.error(`No such icon: "${name}"`);
     return null;
   }
   return jsx("span", {
@@ -3180,7 +3170,7 @@ function useFormRouterContext() {
   }
   return context;
 }
-const logger$v = createLogger("Link");
+const logger$u = createLogger("Link");
 const getIconClass = (icon, external) => {
   if (external) {
     return "adl-link__icon adyen-kyc-icon-external-link";
@@ -3192,7 +3182,7 @@ const getIconClass = (icon, external) => {
 };
 const isValidLink = (href) => {
   if (href === "#") {
-    logger$v.error('Links must include a valid href. If your href is "#", consider using a Button instead');
+    logger$u.error('Links must include a valid href. If your href is "#", consider using a Button instead');
     return false;
   }
   return true;
@@ -3480,7 +3470,7 @@ const useSetting = (settingName) => {
   } = context;
   return getSetting(settingName);
 };
-const logger$u = createLogger("useAllowedCountries");
+const logger$t = createLogger("useAllowedCountries");
 const useAllowedCountries = () => {
   const acceptedCountries = useSetting("acceptedCountries");
   const {
@@ -3490,7 +3480,7 @@ const useAllowedCountries = () => {
   useEffect(() => {
     if (acceptedCountries !== void 0)
       return;
-    getAllowedCountries2().then((response) => setAllowedCountries(response.countries)).catch(logger$u.error);
+    getAllowedCountries2().then((response) => setAllowedCountries(response.countries)).catch(logger$t.error);
   }, [acceptedCountries]);
   return allowedCountries;
 };
@@ -3829,7 +3819,7 @@ class ValidationResult {
     return this.validationResults.filter((result) => result.hasError);
   }
 }
-const logger$t = createLogger("useAsyncValidator");
+const logger$s = createLogger("useAsyncValidator");
 const useAsyncValidator = (asyncRules) => {
   const [asyncValidationResults, setAsyncValidationResults] = useState({});
   const clearAsyncValidationResults = useCallback(() => setAsyncValidationResults({}), []);
@@ -3852,7 +3842,7 @@ const useAsyncValidator = (asyncRules) => {
           hasError: !isValid
         }])
       });
-    }).catch(logger$t.error);
+    }).catch(logger$s.error);
   }, [asyncRules, clearAsyncValidationResults]);
   return {
     asyncValidationResults,
@@ -5283,7 +5273,7 @@ function useIsElementVisible(ref, fallback = true) {
   }, [ref]);
   return isOnScreen;
 }
-const logger$s = createLogger("Flag");
+const logger$r = createLogger("Flag");
 const flagImports = /* @__PURE__ */ Object.assign({
   "../../../../assets/flags/ad.svg": () => import("./ad-DT4vRaBJ.js"),
   "../../../../assets/flags/ae.svg": () => import("./ae-BOcuAHGY.js"),
@@ -5540,7 +5530,7 @@ const flagImports = /* @__PURE__ */ Object.assign({
 const getLazyLoadedSvgComponent = (country2) => {
   const importForCountry = flagImports[`../../../../assets/flags/${country2.toLowerCase()}.svg`];
   if (!importForCountry) {
-    logger$s.error(`No flag available for ${country2}`);
+    logger$r.error(`No flag available for ${country2}`);
     return void 0;
   }
   return lazy(importForCountry);
@@ -6189,6 +6179,102 @@ const isValueObscured = (value) => {
   var _a;
   return typeof value === "string" && !!((_a = value.match(/[*]{1,}/)) == null ? void 0 : _a.length);
 };
+const shiftRight = (possibleShifts, matchedTokens, remainingTokens) => {
+  let shiftsToTry = [...possibleShifts];
+  let current = {
+    matchedTokens,
+    remainingTokens
+  };
+  while (current.remainingTokens.length > 0 && shiftsToTry.length > 0) {
+    const possibleShift = shiftsToTry[0];
+    const shifted = tryShift(current.matchedTokens, current.remainingTokens, possibleShift.fromIndex, possibleShift.shiftDistance);
+    if (shifted === "notPossible") {
+      shiftsToTry = shiftsToTry.slice(1);
+    } else {
+      current = shifted;
+      shiftsToTry = [...possibleShifts];
+    }
+  }
+  return current;
+};
+const findPossibleShifts = (mask) => {
+  const inputOnlyMask = mask.filter((t) => t.type === "input");
+  const optionals = inputOnlyMask.filter((t) => t.optional);
+  const possibleShifts = [];
+  for (const optional of optionals) {
+    const index = inputOnlyMask.indexOf(optional);
+    for (let i = index + 1; i < inputOnlyMask.length; i += 1) {
+      const laterToken = inputOnlyMask[i];
+      if (laterToken.type === "input") {
+        possibleShifts.push({
+          fromIndex: index,
+          shiftDistance: i - index
+        });
+      }
+    }
+  }
+  return possibleShifts.sort((s1, s2) => {
+    if (s1.fromIndex === s2.fromIndex) {
+      return s2.shiftDistance - s1.shiftDistance;
+    }
+    return s1.fromIndex - s2.fromIndex;
+  });
+};
+const tryShift = (matchedTokens, remainingTokens, fromIndex, shiftDistance) => {
+  const normalizedTokens = [...matchedTokens.map((token, i) => ({
+    ...token,
+    currentValue: token.char,
+    originalIndex: i
+  })), ...remainingTokens.map((token, i) => ({
+    ...token,
+    currentValue: null,
+    originalIndex: i + matchedTokens.length
+  }))];
+  const normalizedInputTokens = normalizedTokens.filter((token) => token.type === "input");
+  if (normalizedTokens[fromIndex].currentValue === null) {
+    return "notPossible";
+  }
+  const emptyInputsAfter = normalizedInputTokens.slice(fromIndex + 1).filter((t) => !t.currentValue);
+  if (shiftDistance > emptyInputsAfter.length) {
+    return "notPossible";
+  }
+  for (let i = 0; i < normalizedInputTokens.length; i += 1) {
+    const token = normalizedInputTokens[i];
+    if (i < fromIndex) {
+      token.potentialValue = token.currentValue;
+    } else if (i < fromIndex + shiftDistance) {
+      token.potentialValue = null;
+    } else {
+      token.potentialValue = normalizedInputTokens[i - shiftDistance].currentValue;
+    }
+  }
+  const allValid = normalizedInputTokens.every((token) => {
+    var _a;
+    if (!token.potentialValue) {
+      return token.optional;
+    }
+    return ((_a = token.allow) == null ? void 0 : _a.test(token.potentialValue)) ?? true;
+  });
+  if (!allValid)
+    return "notPossible";
+  let matchedUpTo = 0;
+  for (let i = 0; i < normalizedTokens.length; i += 1) {
+    const token = normalizedInputTokens.find((t) => t.originalIndex === i) ?? normalizedTokens[i];
+    if (token.type === "input" && !token.potentialValue && !token.optional) {
+      break;
+    }
+    matchedUpTo = i + 1;
+  }
+  const newMatchedTokens = normalizedTokens.slice(0, matchedUpTo).map((token) => ({
+    ...token,
+    char: token.type === "nonInput" ? token.char : token.potentialValue
+  }));
+  const newRemainingTokens = normalizedTokens.slice(matchedUpTo);
+  return {
+    matchedTokens: newMatchedTokens,
+    remainingTokens: newRemainingTokens
+  };
+};
 const getAvailableInputTokens = (tokens) => {
   const availableTokens = [];
   for (const token of tokens) {
@@ -6231,7 +6317,7 @@ const matchAgainstMask = (pureValue, mask, acceptObscuredValue = false) => {
   let tokensToProcess = [...mask.tokens];
   let charsToProcess = pureValue;
   let charIndex = 0;
-  let displayValue = "";
+  let matchedTokens = [];
   if (acceptObscuredValue && isValueObscured(pureValue)) {
     return {
       outcome: "obscureCorrect",
@@ -6245,27 +6331,32 @@ const matchAgainstMask = (pureValue, mask, acceptObscuredValue = false) => {
   const shiftTokens = (increment) => {
     tokensToProcess = tokensToProcess.slice(increment);
   };
+  const displayValue = () => matchedTokens.map((token) => token.char).join("");
   while (true) {
     const char = charsToProcess[0];
     const token = tokensToProcess[0];
     if (!char && !tokensToProcess.some((t) => t.type === "input" && !t.optional))
       return {
         outcome: "correct",
-        displayValue: displayValue + getEagerSuffix(tokensToProcess),
+        displayValue: displayValue() + getEagerSuffix(tokensToProcess),
         potentialForMoreOptionalInput: getPotentialForMoreOptionalInput(tokensToProcess)
       };
-    if (!char)
+    if (!char) {
+      const output = shiftRight(mask.possibleShifts, matchedTokens, tokensToProcess);
+      matchedTokens = output.matchedTokens;
+      tokensToProcess = output.remainingTokens;
       return {
         outcome: "partialCorrect",
-        displayValue: displayValue + getEagerSuffix(tokensToProcess)
+        displayValue: displayValue() + getEagerSuffix(tokensToProcess)
       };
+    }
     if (!token)
       return {
         outcome: "mismatch",
         badChar: char,
         mismatchAtChar: charIndex,
         mismatchedToken: "inputTooLong",
-        partialDisplayValue: displayValue
+        partialDisplayValue: displayValue()
       };
     if (token.type === "nonInput") {
       if (token.includeInValue) {
@@ -6275,11 +6366,11 @@ const matchAgainstMask = (pureValue, mask, acceptObscuredValue = false) => {
             badChar: char,
             mismatchAtChar: charIndex,
             mismatchedToken: token,
-            partialDisplayValue: displayValue
+            partialDisplayValue: displayValue()
           };
         shiftChars(1);
       }
-      displayValue += token.char;
+      matchedTokens.push(token);
       shiftTokens(1);
     }
     if (token.type === "input") {
@@ -6291,9 +6382,12 @@ const matchAgainstMask = (pureValue, mask, acceptObscuredValue = false) => {
           badChar: char,
           mismatchAtChar: charIndex,
           mismatchedToken: token,
-          partialDisplayValue: displayValue
+          partialDisplayValue: displayValue()
         };
-      displayValue += char;
+      matchedTokens.push({
+        ...matchingToken,
+        char
+      });
       shiftTokens(matchingToken.offset + 1);
       shiftChars(1);
     }
@@ -6329,7 +6423,7 @@ const deriveInputState = (isValid, isFocused, hasBlurred, isDisabled, errorMessa
   };
 };
 const MISMATCH_ANIMATION_NAME = "mismatchShake";
-const logger$r = createLogger("MaskedInputText");
+const logger$q = createLogger("MaskedInputText");
 const MaskedInputText = ({
   value,
   onInput,
@@ -6371,7 +6465,7 @@ const MaskedInputText = ({
   };
   useEffect(() => {
     if (!mask) {
-      logger$r.warn("`mask` is undefined. No masking of input will take place.");
+      logger$q.warn("`mask` is undefined. No masking of input will take place.");
     }
   }, [mask]);
   const getMaskResult = useCallback((pureValue) => {
@@ -6398,7 +6492,7 @@ const MaskedInputText = ({
         return;
       }
       const fallback = displayValueToPure(maskResult.partialDisplayValue);
-      logger$r.warn(`Value received "${value}" does not match mask`, maskResult, `
+      logger$q.warn(`Value received "${value}" does not match mask`, maskResult, `
 Falling back to partially valid value "${fallback}"`);
       onInput(fallback);
     }
@@ -6748,7 +6842,8 @@ const customInputs = (length, regex, optional = false) => makeArrayOfRepeatedObj
   optional
 });
 const makeMask = (...tokens) => ({
-  tokens
+  tokens,
+  possibleShifts: findPossibleShifts(tokens)
 });
 const uppercase = (str) => (str == null ? void 0 : str.toUpperCase()) ?? str;
 const businessRegistrationNumberMasks = {
@@ -10502,7 +10597,7 @@ const accountHolderValidationRules = {
   }
 };
 const accountHolderFields = ["accountHolder"];
-const logger$q = createLogger("AccountHolder");
+const logger$p = createLogger("AccountHolder");
 function getAvailableAccountHolderOptions(legalEntityType, isChangeOfLegalEntityTypeAllowed, isTrustFlowEnabled, isSoleProprietorshipAllowed, isChangeToMyNameAllowed) {
   switch (legalEntityType) {
     case LegalEntityType.ORGANIZATION: {
@@ -10512,7 +10607,7 @@ function getAvailableAccountHolderOptions(legalEntityType, isChangeOfLegalEntity
       return [...isChangeToMyNameAllowed ? ["myName"] : [], ...isChangeOfLegalEntityTypeAllowed ? ["theCompanyIWorkFor"] : [], ...isTrustFlowEnabled ? ["aTrust"] : [], ...isSoleProprietorshipAllowed ? ["mySoleProprietorName"] : []];
     }
     default:
-      logger$q.error(`No available account holder options for legal entity type '${legalEntityType}'`);
+      logger$p.error(`No available account holder options for legal entity type '${legalEntityType}'`);
       return [];
   }
 }
@@ -11259,7 +11354,7 @@ function Dropzone(props) {
     })]
   });
 }
-const logger$p = createLogger("TextArea");
+const logger$o = createLogger("TextArea");
 function TextArea(props) {
   const {
     classNameModifiers,
@@ -11280,7 +11375,7 @@ function TextArea(props) {
   } = useI18nContext();
   const [value, setValue] = useState("");
   if (Object.prototype.hasOwnProperty.call(props, "onChange")) {
-    logger$p.error("Error: Form fields that rely on InputBase may not have an onChange property");
+    logger$o.error("Error: Form fields that rely on InputBase may not have an onChange property");
   }
   const handleInput = (e) => {
     var _a;
@@ -11693,7 +11788,7 @@ function FieldContainer(props) {
   }
   return renderField(fieldName);
 }
-const logger$o = createLogger("SearchAddress");
+const logger$n = createLogger("SearchAddress");
 const SearchAddress = ({
   data,
   legalEntityId,
@@ -11736,7 +11831,7 @@ const SearchAddress = ({
       const response = await handleFindAddress(selectedAddressId);
       autocompleteAddressForm(response);
     } catch (e) {
-      logger$o.error(e);
+      logger$n.error(e);
     }
   };
   const onDrilldown = async (selectedAddress) => {
@@ -11748,7 +11843,7 @@ const SearchAddress = ({
       }, legalEntityId);
       setItems((response == null ? void 0 : response.results) || []);
     } catch (e) {
-      logger$o.error(e);
+      logger$n.error(e);
     }
   };
   const onChange = (e) => {
@@ -11803,7 +11898,7 @@ const SearchAddress = ({
           setItems([]);
         }
       } catch (e) {
-        logger$o.error(e);
+        logger$n.error(e);
       }
       setLoading(false);
     }
@@ -14748,7 +14843,7 @@ const initOnfido = async ({
     language: getOnfidoLocaleConfig(i18n)
   });
 };
-const logger$n = createLogger("IdVerificationComponent");
+const logger$m = createLogger("IdVerificationComponent");
 function IdVerificationComponent({
   userDetails,
   legalEntityId,
@@ -14781,7 +14876,7 @@ function IdVerificationComponent({
         onIdVerificationError,
         onIdVerificationComplete
       });
-    })().catch(logger$n.error);
+    })().catch(logger$m.error);
     return () => {
       if (onfidoSdk.current)
         onfidoSdk.current.tearDown();
@@ -14833,7 +14928,7 @@ function IdDocumentAlreadyUpload(props) {
     })]
   });
 }
-const logger$m = createLogger("IdDocumentInstantVerificationComponent");
+const logger$l = createLogger("IdDocumentInstantVerificationComponent");
 const idVerificationSchema = ["instantIdVerificationData", "idDocumentType"];
 const documentTypeValidationRules = {
   instantIdVerificationData: {
@@ -14915,7 +15010,7 @@ function IdDocumentInstantVerificationComponent(props) {
         userDetails: props.userDetails,
         legalEntityId: props.legalEntityId,
         onIdVerificationComplete: handleIdVerificationComplete,
-        onIdVerificationError: logger$m.error
+        onIdVerificationError: logger$l.error
       }), jsxs("div", {
         className: "adyen-kyc-document-upload__manual-upload",
         children: [i18n.get("canNotCompleteInstantVerification"), " ", jsx("button", {
@@ -18359,7 +18454,7 @@ class AdyenKycSdkError extends Error {
 }
 let sdkToken;
 let fetchSdkToken;
-const logger$l = createLogger("Session");
+const logger$k = createLogger("Session");
 const setSdkToken = (token) => {
   sdkToken = token;
 };
@@ -18382,7 +18477,7 @@ const refreshSession = async () => {
     setSdkToken(token);
     isSessionRefreshed = true;
   } catch (e) {
-    logger$l.error("Failed to fetch sdk token", e);
+    logger$k.error("Failed to fetch sdk token", e);
   }
   return isSessionRefreshed;
 };
@@ -18392,7 +18487,7 @@ const addAnimationStartListener = (element, listener) => {
 const removeAnimationStartListener = (element, listener) => {
   element.removeEventListener("animationstart", listener, false);
 };
-const logger$k = createLogger("Fetch");
+const logger$j = createLogger("Fetch");
 const getRequestObject = (options, data) => {
   const {
     headers = [],
@@ -18439,10 +18534,10 @@ const logFetchError = (message, level) => {
     case "info":
     case "warn":
     case "error":
-      logger$k[level](message);
+      logger$j[level](message);
       break;
     default:
-      logger$k.error(message);
+      logger$j.error(message);
   }
 };
 const handleFetchResponse = async (response, responseType) => {
@@ -18535,7 +18630,7 @@ const RELEVANT_MESSAGE_TYPES = ["account_verification_report_id", "error"];
 const TERMINAL_DATA_PROPS = ["accounts", "error", "reference"];
 const MOUNT_TIMEOUT = 10 * 1e3;
 const TINK_VENDOR = "Tink";
-const logger$j = createLogger("iframeWidget");
+const logger$i = createLogger("iframeWidget");
 const isObjectData = (data) => typeof data === "object" && !Array.isArray(data) && data !== null;
 const isTerminalMessageData = (data) => isObjectData(data) && Object.entries(data).some(([prop]) => TERMINAL_DATA_PROPS.includes(prop));
 const parseMessageJson = (message) => {
@@ -18554,7 +18649,7 @@ const callbackErrorHandler = async (response) => {
   try {
     await response;
   } catch (ex) {
-    logger$j.error(ex);
+    logger$i.error(ex);
   }
   return {
     error: "UNKNOWN_ERROR",
@@ -18663,7 +18758,7 @@ class IFrameWidget {
             message = responseData.errorMessage;
           }
         } catch (ex) {
-          logger$j.error(ex);
+          logger$i.error(ex);
         }
         throw new AdyenKycSdkError(reason, jsonData.error);
       }
@@ -18851,7 +18946,7 @@ function BankVerificationWidget({
     ref: widgetContainerRef
   });
 }
-const logger$i = createLogger("BankVerification");
+const logger$h = createLogger("BankVerification");
 const accountVerificationFields = ["verifiedAccountHolder", "verifiedBankCountry", "verifiedBankName", "verifiedCurrencyCode", "verifiedBankAccountNumber"];
 const InstantVerificationErrorContext = createContext(null);
 const useInstantVerificationErrorNotification = (notificationVisibilityDuration) => {
@@ -18885,7 +18980,7 @@ const usePreferredVendorForCountry = (country2, getBankVerificationVendors) => {
       const vendor = vendors[0];
       setPreferredVendor(vendor.name ? vendor : void 0);
     };
-    getPreferredVendor().catch(logger$i.error);
+    getPreferredVendor().catch(logger$h.error);
   }, [country2, getBankVerificationVendors]);
   return preferredVendor;
 };
@@ -19797,9 +19892,7 @@ const ibanMask = (country2, inputLength, allowLettersInBban) => {
     tokens.push(spacer, ...inputToken(remainder));
   }
   return {
-    mask: {
-      tokens
-    },
+    mask: makeMask(...tokens),
     transformOnType: allowLettersInBban ? uppercase : void 0
   };
 };
@@ -20148,7 +20241,7 @@ const makePayoutVerificationMethodsMetadata = (svgPath, instantVerificationProvi
   }
 });
 const payoutVerificationMethods = ["instantVerification", "manualVerification"];
-const logger$h = createLogger("useLocalStorage");
+const logger$g = createLogger("useLocalStorage");
 const useLocalStorage = (key, defaultValue, options) => {
   const {
     serializer,
@@ -20169,7 +20262,7 @@ const useLocalStorage = (key, defaultValue, options) => {
       const res = rawValueRef.current ? parser(rawValueRef.current) : defaultValue;
       return res;
     } catch (err) {
-      logger$h.error(err);
+      logger$g.error(err);
       return defaultValue;
     }
   });
@@ -20201,7 +20294,7 @@ const useLocalStorage = (key, defaultValue, options) => {
     try {
       updateLocalStorage();
     } catch (err) {
-      logger$h.error(err);
+      logger$g.error(err);
     }
   }, [value]);
   useEffect(() => {
@@ -20216,7 +20309,7 @@ const useLocalStorage = (key, defaultValue, options) => {
           setValue(event.newValue ? parser(event.newValue) : void 0);
         }
       } catch (err) {
-        logger$h.error(err);
+        logger$g.error(err);
       }
     };
     if (typeof window === "undefined")
@@ -22491,7 +22584,7 @@ const defaultPayoutAccountFormat = {
   [CountryCodes.Sweden]: "local",
   [CountryCodes.UnitedKingdom]: "local"
 };
-const logger$g = createLogger("useScenarioConfiguration");
+const logger$f = createLogger("useScenarioConfiguration");
 const useScenarioConfiguration = ({
   getConfigurationData,
   getPayoutAccountFormatData,
@@ -22514,12 +22607,12 @@ const useScenarioConfiguration = ({
         const response = await getConfigurationData();
         setConfigurationResponse(response);
       } catch (err) {
-        logger$g.warn("WARNING: Configuration request failed - error:", err);
+        logger$f.warn("WARNING: Configuration request failed - error:", err);
       } finally {
         setLoadingStatus("success");
       }
     };
-    makeConfigCallAndSave().catch(logger$g.error);
+    makeConfigCallAndSave().catch(logger$f.error);
   }, [getConfigurationData, setLoadingStatus]);
   useEffect(() => {
     setLoadingStatus("loading");
@@ -22538,12 +22631,12 @@ const useScenarioConfiguration = ({
         const defaultAccountFormat = defaultPayoutAccountFormat[country2] ?? allowedBankAccountFormats[0];
         setAccountFormat(existingBankAccountFormat ?? defaultAccountFormat);
       } catch (err) {
-        logger$g.warn("WARNING: Payout format request failed - error:", err);
+        logger$f.warn("WARNING: Payout format request failed - error:", err);
       } finally {
         setLoadingStatus("success");
       }
     };
-    makePayoutFormatCallAndSave().catch(logger$g.error);
+    makePayoutFormatCallAndSave().catch(logger$f.error);
   }, [country2, setAccountFormat, getPayoutAccountFormatData, setLoadingStatus, existingBankAccountFormat]);
   const {
     fieldConfigurations,
@@ -23279,7 +23372,7 @@ var ToastType = /* @__PURE__ */ ((ToastType2) => {
   ToastType2["ERROR"] = "error";
   return ToastType2;
 })(ToastType || {});
-const logger$f = createLogger("FormRouterContextProvider");
+const logger$e = createLogger("FormRouterContextProvider");
 function FormRouterContextProvider({
   children,
   forms: forms2,
@@ -23299,7 +23392,7 @@ function FormRouterContextProvider({
       if (formIndex > -1) {
         setFormIndex(formIndex);
       } else {
-        logger$f.error("No form was found to have that field so form navigation failed.");
+        logger$e.error("No form was found to have that field so form navigation failed.");
       }
     }
   }), [forms2, handleGetIdVerificationToken, setFormIndex]);
@@ -23912,7 +24005,7 @@ var CompanySearchEvents = /* @__PURE__ */ ((CompanySearchEvents2) => {
   CompanySearchEvents2["SELECTION_ERROR"] = "CompanySearch_CompanySelectionError";
   return CompanySearchEvents2;
 })(CompanySearchEvents || {});
-const logger$e = createLogger("useCompanySearch");
+const logger$d = createLogger("useCompanySearch");
 const LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW = 1577664e5;
 function useCompanySearch({
   defaultData,
@@ -24040,7 +24133,7 @@ function useCompanySearch({
         state: companyData.state ?? stateOrProvince2
       });
     } catch (e) {
-      logger$e.error(e);
+      logger$d.error(e);
       setError(e);
       setStatus("error");
     } finally {
@@ -24073,7 +24166,7 @@ function useCompanySearch({
         indexSearch: handleCompanyIndexSearch,
         deepSearch: handleCompanyDeepSearch,
         resultsLimit: limit
-      })) == null ? void 0 : _a.catch((e) => logger$e.error(e));
+      })) == null ? void 0 : _a.catch((e) => logger$d.error(e));
     }
   }, [legalCompanyName2, country2, stateOrProvince2, taxIdentificationNumber2, verifiedCompany, searchCompanies, handleCompanyIndexSearch, handleCompanyDeepSearch, limit, canVerify, baseTrackingPayload]);
   useEffect(() => {
@@ -25851,7 +25944,7 @@ const mapLegalEntityToCompanySearchSchema = (legalEntity) => {
     }
   }, {});
 };
-const logger$d = createLogger("useFormTaskSubmit");
+const logger$c = createLogger("useFormTaskSubmit");
 function useCompanySearchTaskSubmit({
   task,
   forms: forms2,
@@ -25897,7 +25990,7 @@ function useCompanySearchTaskSubmit({
         });
       }
     } catch (e) {
-      logger$d.error(e);
+      logger$c.error(e);
       userEvents.addEvent(CompanySearchEvents.DOCUMENTS_ERROR, {
         segmentation: {
           ...baseTrackingPayload,
@@ -25949,7 +26042,7 @@ function useCompanySearchTaskSubmit({
           ...trackingPayload
         }
       });
-      logger$d.log(submittedLegalEntity);
+      logger$c.log(submittedLegalEntity);
       setAccountHolder(entityTypeToCorrespondingAccountHolderOption[legalEntityResponse.type]);
       clearToasts();
       onExternalSubmit == null ? void 0 : onExternalSubmit(data);
@@ -25974,7 +26067,7 @@ function useCompanySearchTaskSubmit({
           type: ToastType.ERROR
         });
       }
-      logger$d.error(e);
+      logger$c.error(e);
       userEvents.addEvent(CompanySearchEvents.TASK_ERROR, {
         segmentation: {
           ...baseTrackingPayload,
@@ -26407,25 +26500,32 @@ const useShouldShowIntroduction = ({
   });
   return canSeeIntroduction && !hasSeenIntroduction;
 };
-const logger$c = createLogger("useAssociatedLegalArrangement");
+const logger$b = createLogger("useAssociatedLegalArrangement");
 function useAssociatedLegalArrangement({
   rootLegalEntity,
   getLegalEntity: getLegalEntity2
 }) {
   const [associatedLegalArrangement, setAssociatedLegalArrangement] = useState();
   const getAssociatedEntity = useCallback(async (entityId) => getLegalEntity2 == null ? void 0 : getLegalEntity2(entityId), [getLegalEntity2]);
-  useEffect(() => {
+  const refreshAssociatedLegalArrangement = useCallback(() => {
     var _a;
     const foundEntity = (_a = rootLegalEntity == null ? void 0 : rootLegalEntity.entityAssociations) == null ? void 0 : _a.find((entity) => entity.type === LegalEntityType.SOLE_PROPRIETORSHIP || entity.type === LegalEntityType.TRUST);
     if (foundEntity == null ? void 0 : foundEntity.legalEntityId) {
-      getAssociatedEntity(foundEntity == null ? void 0 : foundEntity.legalEntityId).then((res) => setAssociatedLegalArrangement(res)).catch(logger$c.error);
+      getAssociatedEntity(foundEntity == null ? void 0 : foundEntity.legalEntityId).then((res) => setAssociatedLegalArrangement(res)).catch(logger$b.error);
+    }
+  }, [getAssociatedEntity, rootLegalEntity == null ? void 0 : rootLegalEntity.entityAssociations]);
+  useEffect(() => {
+    if (!associatedLegalArrangement) {
+      refreshAssociatedLegalArrangement();
     }
   }, [getAssociatedEntity, rootLegalEntity == null ? void 0 : rootLegalEntity.entityAssociations]);
   return {
-    associatedLegalArrangement
+    associatedLegalArrangement,
+    setAssociatedLegalArrangement,
+    refreshAssociatedLegalArrangement
   };
 }
-const logger$b = createLogger("useExemptSettlor");
+const logger$a = createLogger("useExemptSettlor");
 const useExemptSettlor = ({
   trust: trust2,
   handleGetLegalEntity
@@ -26437,9 +26537,9 @@ const useExemptSettlor = ({
     setExemptSettlor(exemptSettlorLE);
   }, [handleGetLegalEntity]);
   useEffect(() => {
-    if (!trust2)
+    if (!(trust2 == null ? void 0 : trust2.trust))
       return;
-    updateExemptSettlor(trust2).catch(logger$b.error);
+    updateExemptSettlor(trust2).catch(logger$a.error);
   }, [trust2, updateExemptSettlor]);
   return exemptSettlor;
 };
@@ -26469,26 +26569,6 @@ function useSalesChannelsSettings() {
     return settings;
   }, [isSettingEnabled]);
 }
-const logger$a = createLogger("useTrust");
-const useTrust = ({
-  rootLegalEntity,
-  handleGetLegalEntity
-}) => {
-  const [trust2, setTrust] = useState();
-  const refreshTrust = useCallback(async () => {
-    var _a, _b;
-    const trustId = (_b = (_a = rootLegalEntity == null ? void 0 : rootLegalEntity.entityAssociations) == null ? void 0 : _a.find((association2) => association2.type === LegalEntityType.TRUST)) == null ? void 0 : _b.legalEntityId;
-    const trustLE = trustId ? await handleGetLegalEntity(trustId) : void 0;
-    setTrust(trustLE);
-    return trustLE;
-  }, [handleGetLegalEntity]);
-  useEffect(() => {
-    if (hasOwnEntityAssociationOfType(LegalEntityType.TRUST, rootLegalEntity.entityAssociations, rootLegalEntity.id)) {
-      refreshTrust().catch(logger$a.error);
-    }
-  }, [refreshTrust]);
-  return [trust2, refreshTrust];
-};
 const downloadFile = async (base64, filename) => {
   saveBlobAsFile(base64ToBlob(base64), filename);
 };
@@ -31889,7 +31969,7 @@ function DropinComposerComponent({
   onNavigate = noop,
   ...args
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const {
     contextCountry,
     accountHolder: accountHolder2,
@@ -31932,20 +32012,17 @@ function DropinComposerComponent({
   const [rootLegalEntity, setRootLegalEntity] = useState(legalEntityResponse);
   const [associatedLegalEntity, setAssociatedLegalEntity] = useState(null);
   const {
-    associatedLegalArrangement
+    associatedLegalArrangement,
+    setAssociatedLegalArrangement,
+    refreshAssociatedLegalArrangement
   } = useAssociatedLegalArrangement({
     rootLegalEntity,
     getLegalEntity: args == null ? void 0 : args.handleGetLegalEntity
   });
   const [associatedLegalEntityParent, setAssociatedLegalEntityParent] = useState(null);
   const [legalEntityType, setLegalEntityType] = useState(null);
-  const [solePropietor, setSolePropietor] = useState(null);
-  const [trust2, refreshTrust] = useTrust({
-    rootLegalEntity,
-    handleGetLegalEntity: args.handleGetLegalEntity
-  });
   const exemptSettlor = useExemptSettlor({
-    trust: trust2,
+    trust: associatedLegalArrangement,
     handleGetLegalEntity: args.handleGetLegalEntity
   });
   const [trustMember, setTrustMember] = useState(null);
@@ -31960,9 +32037,9 @@ function DropinComposerComponent({
   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();
-  const isOrganizationSettlorWithExemptionEnabled = isOrganizationSettlorWithExemptionReasonEnabled(isExperimentEnabled("AllowOrganizationSettlorWithExemptionReason"), trust2 == null ? void 0 : trust2.trust.countryOfGoverningLaw);
+  const isOrganizationSettlorWithExemptionEnabled = isOrganizationSettlorWithExemptionReasonEnabled(isExperimentEnabled("AllowOrganizationSettlorWithExemptionReason"), (_c = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.trust) == null ? void 0 : _c.countryOfGoverningLaw);
   const allowMoreRolesForMainRootTrustee = isExperimentEnabled("AllowMoreRolesForMainRootTrustee");
-  const trustMembers2 = trust2 ? allowMoreRolesForMainRootTrustee ? getRootTrusteeTrustMembers(trust2, rootLegalEntity, exemptSettlor) : getTrustMembers(trust2, rootLegalEntity, exemptSettlor) : [];
+  const trustMembers2 = (associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.trust) ? allowMoreRolesForMainRootTrustee ? getRootTrusteeTrustMembers(associatedLegalArrangement, rootLegalEntity, exemptSettlor) : getTrustMembers(associatedLegalArrangement, rootLegalEntity, exemptSettlor) : [];
   const getLegalEntityProblems = (le) => {
     var _a2;
     if (le == null ? void 0 : le.id) {
@@ -32037,7 +32114,7 @@ function DropinComposerComponent({
     if (id2) {
       try {
         const response = await (args == null ? void 0 : args.handleGetLegalEntity(id2));
-        setSolePropietor(response);
+        setAssociatedLegalArrangement(response);
       } catch (e) {
         showToast({
           label: i18n.get("failedToFetchSoleProp"),
@@ -32097,21 +32174,21 @@ function DropinComposerComponent({
         case "company":
           await deleteAssociatedTrustMember({
             associatedTrustMember: trustMember2,
-            trust: trust2,
+            trust: associatedLegalArrangement,
             handleUpdateLegalEntity: args.handleUpdateLegalEntity
           });
           break;
         case "undefinedBeneficiary":
           await deleteUndefinedBeneficiary({
             undefinedBeneficiary: trustMember2,
-            trust: trust2,
+            trust: associatedLegalArrangement,
             handleUpdateLegalEntity: args.handleUpdateLegalEntity
           });
           break;
         case "rootTrustee":
           throw new Error("Cannot delete root trustee");
       }
-      await refreshTrust();
+      await refreshAssociatedLegalArrangement();
       showToast({
         type: ToastType.SUCCESS,
         label: i18n.get("successFullyRemovedTrustMember")
@@ -32126,7 +32203,7 @@ function DropinComposerComponent({
   };
   const addOrUpdateTrustMember = async (updated, existing) => {
     if ((existing == null ? void 0 : existing.trustMemberType) === "undefinedBeneficiary" && updated.trustMemberType === "undefinedBeneficiary" && existing.description === updated.description) {
-      await refreshTrustAndRunOnSubmit(trust2, 1);
+      await refreshLegalArrangementAndRunOnSubmit(associatedLegalArrangement, 1);
       return;
     }
     try {
@@ -32134,7 +32211,7 @@ function DropinComposerComponent({
         case "undefinedBeneficiary":
           await addOrUpdateUndefinedBeneficiary({
             newOrUpdated: updated,
-            trust: trust2,
+            trust: associatedLegalArrangement,
             handleUpdateLegalEntity: args.handleUpdateLegalEntity
           });
           break;
@@ -32145,7 +32222,7 @@ function DropinComposerComponent({
               handleCreateLegalEntity: args.handleCreateLegalEntity
             }) : await createExemptSettlor({
               exemptSettlor: updated,
-              trust: trust2,
+              trust: associatedLegalArrangement,
               handleCreateLegalEntity: args.handleCreateLegalEntity
             });
             updated.legalEntityId = newSettlorLE.id;
@@ -32164,7 +32241,7 @@ function DropinComposerComponent({
           }
           await addOrUpdateAssociatedTrustMember({
             newOrUpdated: updated,
-            trust: trust2,
+            trust: associatedLegalArrangement,
             handleUpdateLegalEntity: args.handleUpdateLegalEntity
           });
           break;
@@ -32172,7 +32249,7 @@ function DropinComposerComponent({
         case "company":
           await addOrUpdateAssociatedTrustMember({
             newOrUpdated: updated,
-            trust: trust2,
+            trust: associatedLegalArrangement,
             handleUpdateLegalEntity: args.handleUpdateLegalEntity
           });
           break;
@@ -32181,7 +32258,7 @@ function DropinComposerComponent({
             existing.roles = updated.roles;
             await updateRootTrusteeTrustMember({
               trustMember: existing,
-              trust: trust2,
+              trust: associatedLegalArrangement,
               handleUpdateLegalEntity: args.handleUpdateLegalEntity
             });
           }
@@ -32193,7 +32270,7 @@ function DropinComposerComponent({
         label: i18n.get("successfullyUpdatedDetails"),
         type: ToastType.SUCCESS
       });
-      await refreshTrustAndRunOnSubmit(trust2, 1);
+      await refreshLegalArrangementAndRunOnSubmit(associatedLegalArrangement, 1);
     } catch (err) {
       logger$8.error(err);
       showToast({
@@ -32233,7 +32310,7 @@ function DropinComposerComponent({
     if (id2) {
       try {
         await getTransferInstrument2(id2);
-        if (hasSolePropInLegalEntity(rootLegalEntity) && !solePropietor) {
+        if (hasSolePropInLegalEntity(rootLegalEntity) && !associatedLegalArrangement) {
           await getSolePropietor();
         }
       } finally {
@@ -32264,8 +32341,7 @@ function DropinComposerComponent({
   };
   const onNavigateToTrust = async (task = TaskTypes.TRUST) => {
     try {
-      const trust22 = await refreshTrust();
-      if (trust22) {
+      if (associatedLegalArrangement) {
         onNavigateTo(task);
       } else {
         onNavigateTo(TaskTypes.TRUST);
@@ -32360,8 +32436,8 @@ function DropinComposerComponent({
     await refreshLegalEntity();
     navigateBack(backStepCount);
   };
-  const refreshTrustAndRunOnSubmit = async (data, backSteps) => {
-    await refreshTrust();
+  const refreshLegalArrangementAndRunOnSubmit = async (data, backSteps) => {
+    await refreshAssociatedLegalArrangement();
     await componentOnSubmit(data, backSteps);
   };
   const onPciDownload = async () => {
@@ -32593,7 +32669,7 @@ function DropinComposerComponent({
         onChange: componentOnChange,
         eventEmitter,
         onSubmit: async (data) => {
-          await refreshTrust();
+          await refreshAssociatedLegalArrangement();
           await componentOnSubmit(data);
         },
         handleHomeClick: navigateBack,
@@ -32613,14 +32689,14 @@ function DropinComposerComponent({
           topLevelLegalEntity: legalEntityResponse
         },
         taskType: TaskTypes.TRUST_MEMBER_INDIVIDUAL,
-        parentLegalEntity: trust2,
+        parentLegalEntity: associatedLegalArrangement,
         legalEntityResponse: associatedLegalEntity,
         country: rootLegalEntityCountry,
         problems: getLegalEntityProblems(associatedLegalEntity),
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
         onChange: componentOnChange,
         eventEmitter,
-        onSubmit: (data) => refreshTrustAndRunOnSubmit(data, 2),
+        onSubmit: (data) => refreshLegalArrangementAndRunOnSubmit(data, 2),
         handleBackClick: navigateBack,
         handleHomeClick: () => onNavigateTo(TaskTypes.TRUST_MEMBER_OVERVIEW),
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
@@ -32701,13 +32777,13 @@ function DropinComposerComponent({
           topLevelLegalEntity: legalEntityResponse
         },
         taskType: TaskTypes.TRUST_MEMBER_COMPANY,
-        parentLegalEntity: trust2,
+        parentLegalEntity: associatedLegalArrangement,
         legalEntityResponse: associatedLegalEntity,
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
-        problems: (_c = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _c[rootLegalEntity.id],
+        problems: (_d = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _d[rootLegalEntity.id],
         onChange: componentOnChange,
         eventEmitter,
-        onSubmit: (data) => refreshTrustAndRunOnSubmit(data, 2),
+        onSubmit: (data) => refreshLegalArrangementAndRunOnSubmit(data, 2),
         handleBackClick: navigateBack,
         handleHomeClick: navigateBack,
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
@@ -32723,7 +32799,7 @@ function DropinComposerComponent({
         },
         taskType: currentTask,
         taskName: currentTask === TaskTypes.PAYIN ? "payinDetails" : "payoutDetails",
-        problems: (_d = capabilityProblems == null ? void 0 : capabilityProblems.BankAccount) == null ? void 0 : _d[transferInstrument == null ? void 0 : transferInstrument.id],
+        problems: (_e = capabilityProblems == null ? void 0 : capabilityProblems.BankAccount) == null ? void 0 : _e[transferInstrument == null ? void 0 : transferInstrument.id],
         transferInstrument,
         setTransferInstrument,
         legalEntityResponse: rootLegalEntity,
@@ -32752,16 +32828,16 @@ function DropinComposerComponent({
           topLevelLegalEntity: legalEntityResponse
         },
         taskType: TaskTypes.TRUST,
-        problems: (_e = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _e[trust2 == null ? void 0 : trust2.id],
+        problems: (_f = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _f[associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.id],
         parentLegalEntity: rootLegalEntity,
-        legalEntityResponse: trust2,
+        legalEntityResponse: associatedLegalArrangement,
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
         onChange: componentOnChange,
         eventEmitter,
-        onSubmit: componentOnSubmit,
+        onSubmit: (data) => refreshLegalArrangementAndRunOnSubmit(data, 1),
         handleHomeClick: navigateBack,
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
-        country: (((_f = trust2 == null ? void 0 : trust2.trust) == null ? void 0 : _f.countryOfGoverningLaw) || ((_g = trust2 == null ? void 0 : trust2.trust) == null ? void 0 : _g.registeredAddress.country)) ?? rootLegalEntityCountry,
+        country: (((_g = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.trust) == null ? void 0 : _g.countryOfGoverningLaw) || ((_h = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.trust) == null ? void 0 : _h.registeredAddress.country)) ?? rootLegalEntityCountry,
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
         handleFindAddress: args == null ? void 0 : args.handleFindAddress
       });
@@ -32778,7 +32854,7 @@ function DropinComposerComponent({
       return jsx(RoleAndTypeDropinComponent, {
         navigateToFullDropinFor: onNavigateToTrustMember,
         navigateBack: async () => {
-          await refreshTrust();
+          await refreshAssociatedLegalArrangement();
           navigateBack();
         },
         existingTrustMember: trustMember,
@@ -32806,15 +32882,15 @@ function DropinComposerComponent({
         ...args,
         taskType: TaskTypes.SOLE_PROPRIETOR_COMPANY,
         parentLegalEntity: rootLegalEntity,
-        legalEntityResponse: solePropietor,
+        legalEntityResponse: associatedLegalArrangement,
         capabilities: Object.keys((legalEntityResponse == null ? void 0 : legalEntityResponse.capabilities) ?? {}),
-        problems: (_h = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _h[solePropietor == null ? void 0 : solePropietor.id],
+        problems: (_i = capabilityProblems == null ? void 0 : capabilityProblems.LegalEntity) == null ? void 0 : _i[associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.id],
         onChange: componentOnChange,
         eventEmitter,
-        onSubmit: componentOnSubmit,
+        onSubmit: (data) => refreshLegalArrangementAndRunOnSubmit(data, 1),
         handleHomeClick: navigateBack,
         homeButtonLabel: i18n.get("saveAndGoToOverview"),
-        country: (((_i = solePropietor == null ? void 0 : solePropietor.soleProprietorship) == null ? void 0 : _i.countryOfGoverningLaw) || ((_k = (_j = solePropietor == null ? void 0 : solePropietor.soleProprietorship) == null ? void 0 : _j.registeredAddress) == null ? void 0 : _k.country)) ?? rootLegalEntityCountry,
+        country: (((_j = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.soleProprietorship) == null ? void 0 : _j.countryOfGoverningLaw) || ((_l = (_k = associatedLegalArrangement == null ? void 0 : associatedLegalArrangement.soleProprietorship) == null ? void 0 : _k.registeredAddress) == null ? void 0 : _l.country)) ?? rootLegalEntityCountry,
         handleAddressSearch: args == null ? void 0 : args.handleAddressSearch,
         handleFindAddress: args == null ? void 0 : args.handleFindAddress
       });
@@ -33129,16 +33205,6 @@ const getAddress = async (context, addressId) => {
     }
   });
 };
-const getAnalyticsSession = async (loadingContext, data) => httpPost({
-  loadingContext,
-  errorLevel: "warn",
-  errorMessage: `Failed to get analytics sessionId`,
-  path: `analytics/ui`,
-  authentication: "jwt",
-  headers: {
-    "Content-Type": "application/json"
-  }
-}, data);
 const getIdverificationToken = async (context, request) => {
   const {
     loadingContext,
@@ -33209,16 +33275,6 @@ const idVerificationStartcheck = async (context, request) => {
     }
   }, request);
 };
-const pushEvents = async (loadingContext, sessionId, event) => httpPost({
-  loadingContext,
-  errorLevel: "warn",
-  errorMessage: `Failed to push events`,
-  path: `analytics/ui/${sessionId}`,
-  authentication: "jwt",
-  headers: {
-    "Content-Type": "application/json"
-  }
-}, event);
 const searchAddress = async (context, address2) => {
   const {
     loadingContext,
@@ -33278,9 +33334,7 @@ const useComponentApi = (rootLegalEntityId) => {
       getIdVerificationToken: async (legalEntityId, data) => getIdverificationToken(baseRequestContext, data),
       idVerificationStartCheck: async (legalEntityId, data) => idVerificationStartcheck(baseRequestContext, data),
       getOnboardingStatus: async () => getOnboardingStatus(baseRequestContext),
-      generateOnboardingLink: async (config) => generateOnboardingLink(baseRequestContext, config),
-      getAnalyticsSession: async (data) => getAnalyticsSession(loadingContext, data),
-      pushEvents: async (sessionId, event) => pushEvents(loadingContext, sessionId, event)
+      generateOnboardingLink: async (config) => generateOnboardingLink(baseRequestContext, config)
     };
   }, [base, rootLegalEntityId]);
 };
@@ -33434,46 +33488,46 @@ function CreateTransferInstrumentComponent({
     taskType: TaskTypes.PAYOUT
   }) : null;
 }
+var OnboardingUrlTarget = /* @__PURE__ */ ((OnboardingUrlTarget2) => {
+  OnboardingUrlTarget2["BLANK"] = "_blank";
+  OnboardingUrlTarget2["SELF"] = "_self";
+  return OnboardingUrlTarget2;
+})(OnboardingUrlTarget || {});
 var OnboardingStatus = /* @__PURE__ */ ((OnboardingStatus2) => {
-  OnboardingStatus2["INCOMPLETE"] = "INCOMPLETE";
-  OnboardingStatus2["PROCESSING"] = "PROCESSING";
-  OnboardingStatus2["ERROR"] = "ERROR";
-  OnboardingStatus2["FINISHED"] = "FINISHED";
+  OnboardingStatus2["AWAITING_DATA"] = "AWAITING_DATA";
+  OnboardingStatus2["IN_REVIEW"] = "IN_REVIEW";
+  OnboardingStatus2["UNSUCCESSFUL"] = "UNSUCCESSFUL";
+  OnboardingStatus2["REJECTED"] = "REJECTED";
+  OnboardingStatus2["VERIFIED"] = "VERIFIED";
   return OnboardingStatus2;
 })(OnboardingStatus || {});
 const contentMap = {
-  [OnboardingStatus.INCOMPLETE]: {
-    header: "onboardingRedirectInitialHeader",
-    description: ["onboardingRedirectInitialDescriptionP1"],
-    ctaButton: "onboardingRedirectInitialCtaButton"
+  [OnboardingStatus.AWAITING_DATA]: {
+    description: ["onboardingRedirectAwaitingDescriptionP1"],
+    ctaButton: "onboardingRedirectAwaitingCtaButton"
+  },
+  [OnboardingStatus.IN_REVIEW]: {
+    description: ["onboardingRedirectInReviewDescriptionP1"],
+    ctaButton: "onboardingRedirectInReviewCtaButton"
   },
-  [OnboardingStatus.PROCESSING]: {
-    header: "onboardingRedirectInProgressHeader",
-    description: ["onboardingRedirectInProgressDescriptionP1"],
-    ctaButton: "onboardingRedirectInProgressCtaButton"
+  [OnboardingStatus.UNSUCCESSFUL]: {
+    description: ["onboardingRedirectUnsuccessfulDescriptionP1"],
+    ctaButton: "onboardingRedirectUnsuccessfulCtaButton"
   },
-  [OnboardingStatus.ERROR]: {
-    header: "onboardingRedirectErrorsHeader",
-    description: ["onboardingRedirectErrorsDescriptionP1", "onboardingRedirectErrorsDescriptionP2"],
-    ctaButton: "onboardingRedirectErrorsCtaButton"
+  [OnboardingStatus.REJECTED]: {
+    description: ["onboardingRedirectRejectedDescriptionP1"]
   },
-  [OnboardingStatus.FINISHED]: {
-    header: "onboardingRedirectFinishedHeader",
-    description: ["onboardingRedirectFinishedDescriptionP1"],
-    ctaButton: "onboardingRedirectFinishedCtaButton"
+  [OnboardingStatus.VERIFIED]: {
+    description: ["onboardingRedirectVerifiedDescriptionP1"]
   }
 };
 function getContentByStatus(status) {
   return contentMap[status];
 }
-var OnboardingUrlTarget = /* @__PURE__ */ ((OnboardingUrlTarget2) => {
-  OnboardingUrlTarget2["BLANK"] = "_blank";
-  OnboardingUrlTarget2["SELF"] = "_self";
-  return OnboardingUrlTarget2;
-})(OnboardingUrlTarget || {});
-const logger$5 = createLogger("OnboardingRedirectComponent");
-function OnboardingRedirectComponent({
+const logger$5 = createLogger("ViewVerificationStatusComponent");
+function ViewVerificationStatusComponent({
   legalEntityId,
+  hideExplanation = false,
   returnUrl,
   redirectTarget,
   onStatusChange,
@@ -33557,6 +33611,12 @@ function OnboardingRedirectComponent({
       const {
         redirectUrl
       } = await generateOnboardingLink2(config);
+      if (!redirectUrl) {
+        handleError({
+          trKey: "onboardingRedirectLinkError"
+        });
+        return;
+      }
       openUrl(redirectUrl, config);
     } catch (error) {
       handleError({
@@ -33584,6 +33644,20 @@ function OnboardingRedirectComponent({
       });
     }
   };
+  const renderFooter = () => {
+    const statusesWithoutActions = [OnboardingStatus.REJECTED, OnboardingStatus.VERIFIED];
+    if (statusesWithoutActions.includes(onboardingStatus) || !(content == null ? void 0 : content.ctaButton)) {
+      return;
+    }
+    return jsx(Button, {
+      label: i18n.get(content.ctaButton),
+      onClick: redirectToAdyen,
+      type: "button",
+      className: "adyen-view-verification-status__button",
+      role: "link",
+      status: loadingLinkStatus === "loading" ? "loading" : "default"
+    });
+  };
   const renderBody = () => {
     if (alertContent) {
       return jsx(Alert, {
@@ -33594,24 +33668,12 @@ function OnboardingRedirectComponent({
     }
     if (content) {
       return jsxs(Fragment, {
-        children: [jsx("h1", {
-          className: "adyen-onboarding-redirect__header",
-          children: i18n.get(content.header)
-        }), content.description.map((key) => jsx("p", {
-          className: "adyen-onboarding-redirect__description",
+        children: [hideExplanation ? null : content.description.map((key) => jsx("p", {
+          className: "adyen-view-verification-status__description",
           children: i18n.get(key)
         }, key)), jsx("div", {
-          className: "adyen-onboarding-redirect__footer",
-          children: jsx(Button, {
-            label: i18n.get(content.ctaButton),
-            onClick: redirectToAdyen,
-            type: "button",
-            className: "adyen-onboarding-redirect__button",
-            role: "link",
-            negative: onboardingStatus !== OnboardingStatus.FINISHED,
-            tertiary: onboardingStatus === OnboardingStatus.FINISHED,
-            status: loadingLinkStatus === "loading" ? "loading" : "default"
-          })
+          className: "adyen-view-verification-status__footer",
+          children: renderFooter()
         })]
       });
     }
@@ -33620,7 +33682,7 @@ function OnboardingRedirectComponent({
     });
   };
   return jsx("section", {
-    className: "adyen-onboarding-redirect",
+    className: "adyen-view-verification-status",
     children: renderBody()
   });
 }
@@ -33635,7 +33697,7 @@ const componentsMap = {
   pci: PciDropinComponent,
   createTransferInstrumentComponent: CreateTransferInstrumentComponent,
   createIndividualComponent: CreateIndividualComponent,
-  onboardingRedirectComponent: OnboardingRedirectComponent
+  viewVerificationStatusComponent: ViewVerificationStatusComponent
 };
 const AuthProvider = ({
   children,
@@ -33665,6 +33727,26 @@ const AuthProvider = ({
     children
   });
 };
+const getAnalyticsSession = async (loadingContext, data) => httpPost({
+  loadingContext,
+  errorLevel: "warn",
+  errorMessage: `Failed to get analytics sessionId`,
+  path: `analytics/ui`,
+  authentication: "jwt",
+  headers: {
+    "Content-Type": "application/json"
+  }
+}, data);
+const pushEvents = async (loadingContext, sessionId, event) => httpPost({
+  loadingContext,
+  errorLevel: "warn",
+  errorMessage: `Failed to push events`,
+  path: `analytics/ui/${sessionId}`,
+  authentication: "jwt",
+  headers: {
+    "Content-Type": "application/json"
+  }
+}, event);
 const convertToEmbeddedEvent = (eventQueueItem) => {
   const [eventType, event] = eventQueueItem;
   const hasEventData = typeof event === "object";
@@ -33679,28 +33761,33 @@ const convertToEmbeddedEvent = (eventQueueItem) => {
 };
 const useAnalytics = async ({
   onUserEvent,
-  isEmbeddedDropin,
   legalEntityId,
   sdkVersion,
   componentName
 }) => {
   const {
-    getAnalyticsSession: getAnalyticsSession2,
-    pushEvents: pushEvents2
-  } = useComponentApi(legalEntityId);
+    isEmbeddedDropin,
+    loadingContext: base
+  } = useAuthContext();
+  const loadingContext = `${base}api/${COMPONENTS_API_VERSION}/`;
   if (isEmbeddedDropin) {
-    const {
-      id: sessionId
-    } = await getAnalyticsSession2({
-      sdkVersion,
-      componentName,
-      userAgent: navigator.userAgent,
-      legalEntityId
-    });
-    userEvents.subscribe((data) => {
-      const eventItem = convertToEmbeddedEvent(data);
-      pushEvents2(sessionId, eventItem);
-    });
+    try {
+      const sessionResponse = await getAnalyticsSession(loadingContext, {
+        sdkVersion,
+        componentName,
+        userAgent: navigator.userAgent,
+        legalEntityId
+      });
+      if (!(sessionResponse == null ? void 0 : sessionResponse.id)) {
+        throw Error("Analytics session Id not received");
+      }
+      userEvents.subscribe((data) => {
+        const eventItem = convertToEmbeddedEvent(data);
+        pushEvents(loadingContext, sessionResponse.id, eventItem);
+      });
+    } catch (e) {
+      console.error("Failed to initiate analytics for component", e);
+    }
   } else if (onUserEvent) {
     userEvents.subscribe(onUserEvent);
   }
@@ -34004,10 +34091,9 @@ const ConfigurationApiProvider = ({
     isEmbeddedDropin,
     loadingContext
   } = authContext;
-  const sdkVersion = "2.35.0";
+  const sdkVersion = "2.36.1";
   useAnalytics({
     onUserEvent,
-    isEmbeddedDropin,
     legalEntityId: rootLegalEntityId,
     sdkVersion,
     componentName
@@ -35166,11 +35252,14 @@ const createIndividualComponentSchema = {
     type: "function"
   }
 };
-const onboardingRedirectComponentSchema = {
+const viewVerificationStatusComponentSchema = {
   legalEntityId: {
     type: "string",
     required: true
   },
+  hideExplanation: {
+    type: "boolean"
+  },
   redirectTarget: {
     type: "string"
   },
@@ -35198,7 +35287,7 @@ const componentsSchemaMap = {
   taskList: taskListSchema,
   createIndividualComponent: createIndividualComponentSchema,
   createTransferInstrumentComponent: createTransferInstrumentComponentSchema,
-  onboardingRedirectComponent: onboardingRedirectComponentSchema
+  viewVerificationStatusComponent: viewVerificationStatusComponentSchema
 };
 const validateComponentName = (componentName) => {
   if (!componentName) {