@adyen/kyc-components 2.55.0 → 2.56.0

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

@@ -107,6 +107,7 @@ const defaultTrans = {
   addPayinAccount: "Add a payin account",
   addPayoutAccount: "Add a payout account",
   addTrustMember: "Add trust member",
+  addYourselfAsSigner: "Add yourself as a signer",
   additionalInformation: "Additional information",
   additionalInformationFormHeading: "Additional business details",
   additionalInformationFormName: "Additional details",
@@ -478,6 +479,8 @@ const defaultTrans = {
   errorMessage_1_3051: "The proof of national ID number image was of too low quality.",
   errorMessage_1_3052: "An ID document is needed to verify the individual.",
   errorMessage_1_3062: "The name and 4 digit SSN couldn't be verified.",
+  errorMessage_1_3072: "We found the following issues:\n- The name and nationality couldn't be verified.\nReview the information below and correct any mistakes, or upload an id document then resubmit.",
+  errorMessage_1_3073: "We found the following issues:\n- The ID document didn't show the nationality.\nReview the information below and correct any mistakes, or upload an id document then resubmit.",
   errorMessage_1_31: "ID document is needed",
   errorMessage_1_32: "ID document couldn't be processed",
   errorMessage_1_33: "ID document didn't meet requirements",
@@ -851,6 +854,7 @@ const defaultTrans = {
   isParentOwnedByAnotherCompany: "Is your parent company owned by another company?",
   isThisAddressTheMainHeadquarters: "Is this address the main headquarters?",
   isTrustOperationAddressSame: "Is there a different address for your trust's operations?",
+  isYourNameMissingFromSigners: "Is your name missing from the list of signers?",
   issuedByTheTaxAuthority: "Issued by the tax authority or government of the country where the company is registered",
   issuedInTheLastXMonths: "Issued in the last %{number} months",
   issuerState: "Issuing state",
@@ -949,6 +953,7 @@ const defaultTrans = {
   nonProfitOrCharitableOrgDescription: "Your organization has official non-profit or tax-exempt status.",
   nonProfitOrCharitableOrgTitle: "Non-profit or charitable organization",
   noneOfTheAbove: "None of the above",
+  nothingNeedsToBeSigned: "Nothing needs to be signed right now.",
   notBlurry: "Not blurry",
   notCutOff: "Not cut off",
   notExpired: "Not expired",
@@ -1303,6 +1308,7 @@ const defaultTrans = {
   theIdCheckWillBeAutomaticallyValidated: "With the right capture, the ID check will be automatically validated",
   theSubmitWasSuccessful: "The submit was successful",
   thenResubmit: "then resubmit.",
+  thereAreNoSigners: "There are no signers, please add yourself to make sure you can accept the terms and get the funds.",
   thereWasAnErrorTryAgain: "There was an error, please try again",
   thisIsMyBusiness: "This is my business",
   thisMeansYouHaveAParentCompany: "If yes, this means you have a parent company, such as a global headquarters or a holding company.",
@@ -1828,7 +1834,7 @@ class UserEvents {
   }
 }
 const userEvents = new UserEvents();
-const logger$F = createLogger("useCompanySearch");
+const logger$G = createLogger("useCompanySearch");
 const LOW_RISK_COMPANY_DATA_COMPLIANCE_WINDOW = 1577664e5;
 function useCompanySearch({
   defaultData,
@@ -1952,7 +1958,7 @@ function useCompanySearch({
         state: companyData.state ?? stateOrProvince
       });
     } catch (e) {
-      logger$F.error(e);
+      logger$G.error(e);
       setError(e);
       setStatus("error");
     } finally {
@@ -1985,7 +1991,7 @@ function useCompanySearch({
         indexSearch: handleCompanyIndexSearch,
         deepSearch: handleCompanyDeepSearch,
         resultsLimit: limit
-      })) == null ? void 0 : _a.catch((e) => logger$F.error(e));
+      })) == null ? void 0 : _a.catch((e) => logger$G.error(e));
     }
   }, [legalCompanyName, country, stateOrProvince, taxIdentificationNumber, verifiedCompany, searchCompanies, handleCompanyIndexSearch, handleCompanyDeepSearch, limit, canVerify, baseTrackingPayload]);
   useEffect(() => {
@@ -2008,8 +2014,8 @@ function useCompanySearch({
     reset
   };
 }
-const logger$E = createLogger("useBusinessData");
-const KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS = [StateCodesUS.Arkansas, StateCodesUS.Connecticut, StateCodesUS.Georgia, StateCodesUS.Hawaii, StateCodesUS.Kentucky, StateCodesUS.Maryland, StateCodesUS.Minnesota, StateCodesUS.Missouri, StateCodesUS.Montana, StateCodesUS.NewHampshire, StateCodesUS.NewMexico, StateCodesUS.SouthCarolina, StateCodesUS.Utah, StateCodesUS.Vermont, StateCodesUS.Wisconsin, StateCodesUS.Wyoming];
+const logger$F = createLogger("useBusinessData");
+const KNOWN_BROKEN_PRIMARY_SOURCE_CONNECTIONS = [StateCodesUS.Arkansas, StateCodesUS.Connecticut, StateCodesUS.Georgia, StateCodesUS.Hawaii, StateCodesUS.Indiana, StateCodesUS.Kentucky, StateCodesUS.Maryland, StateCodesUS.Minnesota, StateCodesUS.Missouri, StateCodesUS.Montana, StateCodesUS.NewHampshire, StateCodesUS.NewMexico, StateCodesUS.SouthCarolina, StateCodesUS.Utah, StateCodesUS.Vermont, StateCodesUS.Wisconsin, StateCodesUS.Wyoming];
 function useBusinessData({
   handleCompanyIndexSearch,
   handleCompanyDeepSearch,
@@ -2044,7 +2050,7 @@ function useBusinessData({
   };
   const searchForBusiness = useCallback(async (data) => {
     if (!handleCompanyDeepSearch || !handleCompanyIndexSearch) {
-      logger$E.log("Missing handlers for searchForBusiness");
+      logger$F.log("Missing handlers for searchForBusiness");
       return;
     }
     if (searchResults && objectsDeepEqual(cachedSearch, data)) return;
@@ -2061,15 +2067,15 @@ function useBusinessData({
       return response == null ? void 0 : response.results;
     } catch (e) {
       setSearching("error");
-      logger$E.error(e);
+      logger$F.error(e);
     } finally {
       setCachedSearch(data);
       setSearching((prevState) => prevState !== "error" ? "loaded" : prevState);
     }
   }, [handleCompanyDeepSearch, handleCompanyIndexSearch, searchResults, cachedSearch]);
-  const fetchBusinessData = useCallback(async (company) => {
+  const fetchBusinessData = useCallback(async (company, state) => {
     if (!handleGetCompanyDataset || !handleRefreshCompanyDataset) {
-      logger$E.log("Missing handlers for fetchBusinessData");
+      logger$F.log("Missing handlers for fetchBusinessData");
       return;
     }
     if (cachedBusiness && objectsDeepEqual({
@@ -2088,23 +2094,25 @@ function useBusinessData({
       const businessData = isDataCompliant ? await handleGetCompanyDataset({
         companyId: company.id,
         country: "US"
+        // state: state as StateCodeUS,
       }) : await handleRefreshCompanyDataset({
         companyId: company.id,
         country: "US"
+        // state: state as StateCodeUS,
       });
       setCachedBusiness(businessData);
       return businessData;
     } catch (e) {
       setFetching("error");
       setCachedBusiness(void 0);
-      logger$E.error(e);
+      logger$F.error(e);
     } finally {
       setFetching((prevState) => prevState !== "error" ? "loaded" : prevState);
     }
   }, [cachedBusiness, handleGetCompanyDataset, handleRefreshCompanyDataset]);
   const verifyBusinessData = useCallback(async (data, tin) => {
     if (!handleVerifyTin) {
-      logger$E.log("Missing handlers for verifyBusinessData");
+      logger$F.log("Missing handlers for verifyBusinessData");
       return;
     }
     try {
@@ -2125,7 +2133,7 @@ function useBusinessData({
       return matched;
     } catch (e) {
       setVerifying("error");
-      logger$E.error(e);
+      logger$F.error(e);
     } finally {
       setVerifying((prevState) => prevState !== "error" ? "loaded" : prevState);
     }
@@ -2136,7 +2144,7 @@ function useBusinessData({
       await (handleClearCompanyData == null ? void 0 : handleClearCompanyData());
     } catch (e) {
       setResettingTrustedData("error");
-      logger$E.error(e);
+      logger$F.error(e);
     } finally {
       setResettingTrustedData((prevState) => prevState !== "error" ? "loaded" : prevState);
     }
@@ -2184,6 +2192,7 @@ var SettingNames = /* @__PURE__ */ ((SettingNames2) => {
   SettingNames2["HideOnboardingIntroductionSoleProprietor"] = "hideOnboardingIntroductionSoleProprietor";
   SettingNames2["TransferInstrumentLimit"] = "transferInstrumentLimit";
   SettingNames2["ViewOnboardingGuidance"] = "viewOnboardingGuidance";
+  SettingNames2["ShowServiceAgreementsFirst"] = "showServiceAgreementsFirst";
   return SettingNames2;
 })(SettingNames || {});
 const SettingsContext = createContext(void 0);
@@ -2471,7 +2480,7 @@ const svgs = {
   "trustly-logo": lazy(() => import("./trustly-logo-YJslAOYF.js"))
 };
 const unscalableIconNames = ["bin", "check", "checkmark", "checkmark-small", "chevron-right", "chevron-left", "company", "contract", "cross", "decision-maker", "document", "download", "edit", "info-circle", "image", "location", "payout", "pci", "plus", "remove", "save", "search", "trust", "user", "upload", "warning"];
-const logger$D = createLogger("Icon");
+const logger$E = createLogger("Icon");
 const Svg = ({
   className,
   name,
@@ -2482,7 +2491,7 @@ const Svg = ({
   const LazyLoadedSvg = svgs[name];
   const viewBox = unscalableIconNames.includes(name) ? "0 0 16 16" : void 0;
   if (!LazyLoadedSvg) {
-    logger$D.error(`No such svg: "${name}"`);
+    logger$E.error(`No such svg: "${name}"`);
     return null;
   }
   return jsx("span", {
@@ -2770,10 +2779,10 @@ function useFormRouterContext() {
   }
   return context;
 }
-const logger$C = createLogger("Link");
+const logger$D = createLogger("Link");
 const isValidLink = (href) => {
   if (href === "#") {
-    logger$C.error('Links must include a valid href. If your href is "#", consider using a Button instead');
+    logger$D.error('Links must include a valid href. If your href is "#", consider using a Button instead');
     return false;
   }
   return true;
@@ -3049,6 +3058,7 @@ function getFieldProps(props, innerFormFields) {
 var ExperimentNames = /* @__PURE__ */ ((ExperimentNames2) => {
   ExperimentNames2["EnableCompanySearchFlow"] = "EnableCompanySearchFlow";
   ExperimentNames2["EnableNewBusinessDetailsFlow"] = "EnableNewBusinessDetailsFlow";
+  ExperimentNames2["EnableNewAddressComponent"] = "EnableNewAddressComponent";
   ExperimentNames2["EnableNewEntryFlow"] = "EnableNewEntryFlow";
   ExperimentNames2["AllowOrganizationSettlorWithExemptionReason"] = "AllowOrganizationSettlorWithExemptionReason";
   ExperimentNames2["AllowMoreRolesForMainRootTrustee"] = "AllowMoreRolesForMainRootTrustee";
@@ -3062,6 +3072,8 @@ var ExperimentNames = /* @__PURE__ */ ((ExperimentNames2) => {
   ExperimentNames2["EnableAgeVerification"] = "EnableAgeVerification";
   ExperimentNames2["PreserveMismatchedInitialValues"] = "PreserveMismatchedInitialValues";
   ExperimentNames2["StrictNameAndAddressValidationV4"] = "StrictNameAndAddressValidationV4";
+  ExperimentNames2["EnableIdentificationNationalityCrossBorderAssociateCheck"] = "EnableIdentificationNationalityCrossBorderAssociateCheck";
+  ExperimentNames2["EnableAUGovernmentalOrganizationSkipRegistrationNumber"] = "EnableAUGovernmentalOrganizationSkipRegistrationNumber";
   return ExperimentNames2;
 })(ExperimentNames || {});
 const ON_CHANGE_DEBOUNCE_DURATION = 200;
@@ -3122,7 +3134,7 @@ const useSetting = (settingName) => {
   } = context;
   return getSetting(settingName);
 };
-const logger$B = createLogger("useAllowedCountries");
+const logger$C = createLogger("useAllowedCountries");
 const useAllowedCountries = () => {
   const acceptedCountries = useSetting("acceptedCountries");
   const {
@@ -3131,7 +3143,7 @@ const useAllowedCountries = () => {
   const [allowedCountries, setAllowedCountries] = useState(acceptedCountries);
   useEffect(() => {
     if (acceptedCountries !== void 0) return;
-    getAllowedCountries2().then((response) => setAllowedCountries(response.countries)).catch(logger$B.error);
+    getAllowedCountries2().then((response) => setAllowedCountries(response.countries)).catch(logger$C.error);
   }, [acceptedCountries]);
   return allowedCountries;
 };
@@ -3490,7 +3502,7 @@ function reducer({
     }
   };
 }
-const logger$A = createLogger("useAsyncValidator");
+const logger$B = createLogger("useAsyncValidator");
 const useAsyncValidator = (asyncRules) => {
   const [asyncValidationResults, setAsyncValidationResults] = useState({});
   const clearAsyncValidationResults = useCallback(() => setAsyncValidationResults({}), []);
@@ -3511,7 +3523,7 @@ const useAsyncValidator = (asyncRules) => {
           hasError: !isValid
         }])
       });
-    }).catch(logger$A.error);
+    }).catch(logger$B.error);
   }, [asyncRules, clearAsyncValidationResults]);
   return {
     asyncValidationResults,
@@ -3932,6 +3944,14 @@ const Field = ({
     })
   });
 };
+const useDebounce = (value, delay) => {
+  const [debouncedValue, setDebouncedValue] = useState(value);
+  useEffect(() => {
+    const handler = setTimeout(() => setDebouncedValue(value), delay);
+    return () => clearTimeout(handler);
+  }, [value, delay]);
+  return debouncedValue;
+};
 const getScrollParent = (node) => {
   if (!node) return null;
   const isElement = node instanceof HTMLElement;
@@ -3957,32 +3977,6 @@ const Tag = ({
     children
   });
 };
-const adyenKycDropdown = "adyen-kyc-dropdown";
-const adyenKycDropdownButton = "adyen-kyc-dropdown-button";
-const adyenKycDropdownButtonActive = "adyen-kyc-dropdown-button--active";
-const adyenKycFilterInput = "adyen-kyc-filter-input";
-const adyenKycDropdownList = "adyen-kyc-dropdown-list";
-const adyenKycDropdownListTransformer = "adyen-kyc-dropdown-list__transformer";
-const adyenKycDropdownListActive = "adyen-kyc-dropdown-list--active";
-const adyenKycDropdownElement = "adyen-kyc-dropdown-element";
-const styles$6 = {
-  "adyen-kyc-dropdown": "adyen-kyc-dropdown",
-  adyenKycDropdown,
-  "adyen-kyc-dropdown-button": "adyen-kyc-dropdown-button",
-  adyenKycDropdownButton,
-  "adyen-kyc-dropdown-button--active": "adyen-kyc-dropdown-button--active",
-  adyenKycDropdownButtonActive,
-  "adyen-kyc-filter-input": "adyen-kyc-filter-input",
-  adyenKycFilterInput,
-  "adyen-kyc-dropdown-list": "adyen-kyc-dropdown-list",
-  adyenKycDropdownList,
-  "adyen-kyc-dropdown-list__transformer": "adyen-kyc-dropdown-list__transformer",
-  adyenKycDropdownListTransformer,
-  "adyen-kyc-dropdown-list--active": "adyen-kyc-dropdown-list--active",
-  adyenKycDropdownListActive,
-  "adyen-kyc-dropdown-element": "adyen-kyc-dropdown-element",
-  adyenKycDropdownElement
-};
 function SelectButtonElement({
   filterable,
   isMulti,
@@ -4018,6 +4012,7 @@ function SelectButton({
   isMulti,
   id,
   isSearch,
+  hideSearchIcon = false,
   loading,
   textFilter
 }) {
@@ -4030,10 +4025,8 @@ function SelectButton({
     "aria-haspopup": "listbox",
     className: cx({
       "adyen-kyc-dropdown-button": true,
-      [styles$6["adyen-kyc-dropdown-button"]]: true,
       "adyen-kyc-dropdown-button--readonly": readonly,
       "adyen-kyc-dropdown-button--active": showList,
-      [styles$6["adyen-kyc-dropdown-button--active"]]: showList,
       "adyen-kyc-dropdown-button--invalid": isInvalid,
       "adyen-kyc-dropdown-field--valid": isValid,
       "adyen-kyc-dropdown-button-search": isSearch
@@ -4062,6 +4055,7 @@ function SelectButton({
       filterable,
       onInput,
       isSearch,
+      hideSearchIcon,
       loading,
       textFilter
     })
@@ -4076,6 +4070,7 @@ const SelectButtonContentSingle = ({
   filterable,
   onInput,
   isSearch,
+  hideSearchIcon = false,
   loading,
   textFilter
 }) => {
@@ -4084,17 +4079,17 @@ const SelectButtonContentSingle = ({
     children: [(activeSingle == null ? void 0 : activeSingle.icon) && jsx("span", {
       className: "adyen-kyc-dropdown-button__icon",
       children: activeSingle.icon
-    }), isSearch && jsx(Icon, {
+    }), isSearch && !hideSearchIcon && jsx(Icon, {
       name: "search",
       className: "adyen-kyc-dropdown-button-search__icon"
     }), jsx("span", {
       className: cx("adyen-kyc-dropdown-button__text", {
-        "adyen-kyc-dropdown-button__text--placeholder": !activeSingle
+        "adyen-kyc-dropdown-button__text--placeholder": !activeSingle && placeholder
       }),
       children: (activeSingle == null ? void 0 : activeSingle.selectedOptionName) || (activeSingle == null ? void 0 : activeSingle.name) || textFilter || placeholder
     })]
   }) : jsxs(Fragment, {
-    children: [isSearch && jsx(Icon, {
+    children: [isSearch && !hideSearchIcon && jsx(Icon, {
       name: "search",
       className: "adyen-kyc-dropdown-button-search__icon"
     }), jsx("input", {
@@ -4103,7 +4098,7 @@ const SelectButtonContentSingle = ({
       "aria-expanded": showList,
       "aria-owns": selectListId,
       autoComplete: "off",
-      className: cx("adyen-kyc-filter-input", [styles$6["adyen-kyc-filter-input"]]),
+      className: cx("adyen-kyc-filter-input"),
       onInput,
       placeholder,
       ref: filterInputRef,
@@ -4191,7 +4186,7 @@ const SelectListItem = ({
 }) => jsx("li", {
   "aria-disabled": !!item.disabled,
   "aria-selected": selected,
-  className: cx(["adyen-kyc-dropdown-element", styles$6["adyen-kyc-dropdown-element"], {
+  className: cx(["adyen-kyc-dropdown-element", {
     "adyen-kyc-dropdown-element--active": selected,
     "adyen-kyc-dropdown-element--disabled": !!item.disabled,
     "adyen-kyc-dropdown-multi-element": isMulti,
@@ -4322,9 +4317,7 @@ function SelectList({
       test: true,
       "adyen-kyc-dropdown-list--above": showAbove,
       "adyen-kyc-dropdown-list": true,
-      [styles$6["adyen-kyc-dropdown-list"]]: true,
-      "adyen-kyc-dropdown-list--active": showList,
-      [styles$6["adyen-kyc-dropdown-list--active"]]: showList
+      "adyen-kyc-dropdown-list--active": showList
     }),
     id: props.selectListId,
     role: "listbox",
@@ -4356,7 +4349,7 @@ const Select = ({
   name,
   isInvalid = false,
   isValid,
-  placeholder,
+  placeholder = "",
   isMulti,
   uniqueId,
   showSelectedItemsAsTags = false,
@@ -4366,21 +4359,21 @@ const Select = ({
   loading = false,
   getSearchItem,
   searchText,
+  onSearchTextChange,
   showSearchList
 }) => {
   const filterInputRef = useRef(null);
   const selectContainerRef = useRef(null);
   const toggleButtonRef = useRef(null);
   const selectListRef = useRef(null);
-  const [textFilter, setTextFilter] = useState(null);
+  const [textFilter, setTextFilter] = useState(searchText);
   const [isShowList, setIsShowList] = useState(false);
   const selectListId = useMemo(() => `select-${uuidv4()}`, []);
   const active = items.filter((i) => !isMulti ? i.id === selected : selected == null ? void 0 : selected.includes(i.id)) || [];
   const [isShowListAbove, setIsShowListAbove] = useState(false);
   const [scrollParent, setScrollParent] = useState(null);
-  const debouncedOnSearch = useCallback(debounce(onSearch, 500), [onSearch]);
   const closeList = () => {
-    setTextFilter(null);
+    if (!onSearchTextChange) setTextFilter(null);
     setIsShowList(false);
     if (toggleButtonRef.current) toggleButtonRef.current.focus();
   };
@@ -4491,11 +4484,19 @@ const Select = ({
     const {
       value
     } = e.target;
-    if (isSearch && value.length > 2) {
-      debouncedOnSearch(value);
+    if (onSearchTextChange) {
+      onSearchTextChange == null ? void 0 : onSearchTextChange(value);
+      setTextFilter(value);
+    } else {
+      setTextFilter(value.toLowerCase());
     }
-    setTextFilter(value.toLowerCase());
   };
+  const debouncedTextFilter = useDebounce(textFilter, 500);
+  useEffect(() => {
+    if (isSearch && (debouncedTextFilter == null ? void 0 : debouncedTextFilter.length) > 2) {
+      onSearch(debouncedTextFilter);
+    }
+  }, [debouncedTextFilter]);
   const toggleList = (e) => {
     e.preventDefault();
     if (isShowList) {
@@ -4505,9 +4506,9 @@ const Select = ({
     }
   };
   useEffect(() => {
-    if (resetSearch) {
-      setTextFilter("");
-    }
+    if (!onSearchTextChange) {
+      if (resetSearch) setTextFilter("");
+    } else if (resetSearch && !searchText) setTextFilter("");
   }, [resetSearch]);
   useEffect(() => {
     setTextFilter(searchText);
@@ -4527,7 +4528,7 @@ const Select = ({
     };
   }, []);
   return jsxs("div", {
-    className: cx(["adyen-kyc-dropdown", styles$6["adyen-kyc-dropdown"], className, ...classNameModifiers.map((m) => `adyen-kyc-dropdown--${m}`)]),
+    className: cx(["adyen-kyc-dropdown", className, ...classNameModifiers.map((m) => `adyen-kyc-dropdown--${m}`)]),
     ref: selectContainerRef,
     onClick: (e) => {
       e.stopPropagation();
@@ -4555,6 +4556,7 @@ const Select = ({
       isMulti,
       showSelectedItemsAsTags,
       isSearch,
+      hideSearchIcon: !!onSearchTextChange,
       loading,
       textFilter
     }), jsx(SelectList, {
@@ -7448,7 +7450,7 @@ const deriveInputState = (isValid, isFocused, isDisabled, isOptional, hasNullish
   };
 };
 const MISMATCH_ANIMATION_NAME = "mismatchShake";
-const logger$z = createLogger("MaskedInputText");
+const logger$A = createLogger("MaskedInputText");
 const MaskedInputText = ({
   value,
   onInput,
@@ -7495,7 +7497,7 @@ const MaskedInputText = ({
   };
   useEffect(() => {
     if (!mask) {
-      logger$z.warn("`mask` is undefined. No masking of input will take place.");
+      logger$A.warn("`mask` is undefined. No masking of input will take place.");
     }
   }, [mask]);
   const getMaskResult = useCallback((pureValue) => {
@@ -7520,13 +7522,13 @@ const MaskedInputText = ({
         return;
       }
       if (preserveMismatchingInitialValue) {
-        logger$z.warn(`Value received "${value}" does not match mask`, maskResult, `
+        logger$A.warn(`Value received "${value}" does not match mask`, maskResult, `
 Preserving mismatched initial value until user input.`);
         setPreservingMismatchedValue(true);
         return;
       }
       const fallback = displayValueToPure(maskResult.partialDisplayValue);
-      logger$z.warn(`Value received "${value}" does not match mask`, maskResult, `
+      logger$A.warn(`Value received "${value}" does not match mask`, maskResult, `
 Falling back to partially valid value "${fallback}"`);
       onInput(fallback);
     }
@@ -10967,7 +10969,7 @@ const ID_NUMBER_EXEMPT_COUNTRIES = [CountryCodes.Canada, CountryCodes.PuertoRico
 const ID_NUMBER_VERIFICATION_COUNTRIES = [CountryCodes.PuertoRico, CountryCodes.UnitedStates];
 const COUNTRIES_WHICH_USE_MULTIPLE_IDENTITY_TYPES = [CountryCodes.HongKong, CountryCodes.Australia, CountryCodes.NewZealand];
 const ID_NUMBER_REQUIRED_FOR_DIRECTOR_COUNTRIES = [CountryCodes.Singapore];
-const NATIONALITY_REQUIRED_FOR_COUNTRIES = [CountryCodes.Singapore];
+const NATIONALITY_REQUIRED_FOR_COUNTRIES = [CountryCodes.Singapore, CountryCodes.HongKong];
 const CONTACTS_REQUIRED_FOR_COUNTRIES = [CountryCodes.NewZealand];
 const JOB_TITLE_REQUIRED_FOR_COUNTRIES = [CountryCodes.NewZealand];
 const ISSUER_REQUIRED_FOR_COUNTRIES = [CountryCodes.Australia];
@@ -10978,7 +10980,8 @@ const rules$3 = ({
   country,
   taskType,
   isEmbeddedDropin,
-  isExperimentEnabled = () => false
+  isExperimentEnabled = () => false,
+  rootLegalEntity
 }) => ({
   isDirectorIdNumberRequiredForCountry: () => {
     var _a, _b, _c, _d, _e;
@@ -11043,8 +11046,13 @@ const rules$3 = ({
     }
   },
   nationalityIfRequiredForRole: () => {
-    var _a;
-    if (NATIONALITY_REQUIRED_FOR_COUNTRIES.includes(country) && ((_a = data.personalDetails) == null ? void 0 : _a.nationality)) {
+    var _a, _b;
+    const enableIdentificationNationalityCrossBorderAssociateCheck = isExperimentEnabled("EnableIdentificationNationalityCrossBorderAssociateCheck");
+    const rootLegalEntityCountry = (_a = rootLegalEntity == null ? void 0 : rootLegalEntity.organization) == null ? void 0 : _a.registeredAddress.country;
+    if (enableIdentificationNationalityCrossBorderAssociateCheck && rootLegalEntityCountry && NATIONALITY_REQUIRED_FOR_COUNTRIES.includes(rootLegalEntityCountry)) {
+      return REQUIRED;
+    }
+    if (NATIONALITY_REQUIRED_FOR_COUNTRIES.includes(country) || ((_b = data == null ? void 0 : data.personalDetails) == null ? void 0 : _b.nationality)) {
       return REQUIRED;
     }
   },
@@ -11084,7 +11092,7 @@ const accountHolderValidationRules = {
   }
 };
 const accountHolderFields = ["accountHolder"];
-const logger$y = createLogger("AccountHolder");
+const logger$z = createLogger("AccountHolder");
 function getAvailableAccountHolderOptions(legalEntityType, isChangeOfLegalEntityTypeAllowed, isTrustFlowEnabled, isSoleProprietorshipAllowed, isChangeToMyNameAllowed) {
   switch (legalEntityType) {
     case LegalEntityType.ORGANIZATION: {
@@ -11094,7 +11102,7 @@ function getAvailableAccountHolderOptions(legalEntityType, isChangeOfLegalEntity
       return [...isChangeToMyNameAllowed ? ["myName"] : [], ...isChangeOfLegalEntityTypeAllowed ? ["theCompanyIWorkFor"] : [], ...isTrustFlowEnabled ? ["aTrust"] : [], ...isSoleProprietorshipAllowed ? ["mySoleProprietorName"] : []];
     }
     default:
-      logger$y.error(`No available account holder options for legal entity type '${legalEntityType}'`);
+      logger$z.error(`No available account holder options for legal entity type '${legalEntityType}'`);
       return [];
   }
 }
@@ -11662,7 +11670,7 @@ function Dropzone(props) {
     })]
   });
 }
-const logger$x = createLogger("TextArea");
+const logger$y = createLogger("TextArea");
 function TextArea(props) {
   const {
     classNameModifiers,
@@ -11683,7 +11691,7 @@ function TextArea(props) {
   } = useI18nContext();
   const [value, setValue] = useState("");
   if (Object.prototype.hasOwnProperty.call(props, "onChange")) {
-    logger$x.error("Error: Form fields that rely on InputBase may not have an onChange property");
+    logger$y.error("Error: Form fields that rely on InputBase may not have an onChange property");
   }
   const handleInput = (e) => {
     var _a;
@@ -12134,7 +12142,7 @@ function useIsElementVisible(ref, fallback = true) {
   }, [ref]);
   return isOnScreen;
 }
-const logger$w = createLogger("SearchAddress");
+const logger$x = createLogger("SearchAddress");
 const SearchAddress = ({
   data,
   legalEntityId,
@@ -12178,7 +12186,7 @@ const SearchAddress = ({
       const response = await handleFindAddress(selectedAddressId);
       autocompleteAddressForm(response);
     } catch (e) {
-      logger$w.error(e);
+      logger$x.error(e);
     }
   };
   const onDrilldown = async (selectedAddress) => {
@@ -12190,7 +12198,7 @@ const SearchAddress = ({
       }, legalEntityId);
       setItems((response == null ? void 0 : response.results) || []);
     } catch (e) {
-      logger$w.error(e);
+      logger$x.error(e);
     }
   };
   const onChange = (e) => {
@@ -12210,7 +12218,7 @@ const SearchAddress = ({
     }
     setLoading(false);
   };
-  const formatAddressItem = (item) => {
+  const formatAddressItem2 = (item) => {
     if (item.description.includes("Addresses")) {
       const splittedDescription = item.description.split(" - ");
       if (splittedDescription.length === 1) {
@@ -12239,18 +12247,18 @@ const SearchAddress = ({
           country: data.country
         }, legalEntityId);
         if (response == null ? void 0 : response.results) {
-          const modifiedItems = response.results.map(formatAddressItem);
+          const modifiedItems = response.results.map(formatAddressItem2);
           setItems(modifiedItems);
         } else {
           setItems([]);
         }
       } catch (e) {
-        logger$w.error(e);
+        logger$x.error(e);
       }
       setLoading(false);
     }
   };
-  const getFormattedText = (highlightItems, text) => {
+  const getFormattedText2 = (highlightItems, text) => {
     const formattedText = [];
     let lastHighlightIndex = 0;
     if (highlightItems[0] === "") {
@@ -12276,7 +12284,7 @@ const SearchAddress = ({
     }
     return formattedText;
   };
-  const getHighlightedText = ({
+  const getHighlightedText2 = ({
     text,
     highlight,
     description
@@ -12290,11 +12298,11 @@ const SearchAddress = ({
       }
     } else {
       const highlightItems = highlight.split(";");
-      formattedText = getFormattedText(highlightItems[0].split(","), text);
+      formattedText = getFormattedText2(highlightItems[0].split(","), text);
       if (highlightItems.length > 1) {
         formattedText.push(`, `);
         formattedText.push(jsx(Fragment, {
-          children: getFormattedText(highlightItems[1].split(","), description)
+          children: getFormattedText2(highlightItems[1].split(","), description)
         }));
       } else if (description) {
         formattedText.push(`, ${description}`);
@@ -12302,10 +12310,10 @@ const SearchAddress = ({
     }
     return formattedText;
   };
-  const generateSearchListItem = (item) => jsxs(Fragment, {
+  const generateSearchListItem2 = (item) => jsxs(Fragment, {
     children: [jsx("span", {
       className: "adyen-kyc-dropdown-search-element__description",
-      children: getHighlightedText(item)
+      children: getHighlightedText2(item)
     }), item.addressAmount && jsxs("div", {
       className: "adyen-kyc-dropdown-search-element__addresses",
       children: [item.addressAmount, " ", jsxs("span", {
@@ -12336,7 +12344,7 @@ const SearchAddress = ({
       resetSearch,
       onSearch: getSearchItems,
       loading,
-      getSearchItem: generateSearchListItem,
+      getSearchItem: generateSearchListItem2,
       isInvalid: false,
       searchText,
       showSearchList
@@ -12623,7 +12631,7 @@ const countrySpecificFormatters = {
 };
 const addressValidationRules = (country) => {
   var _a, _b;
-  const postalCodeFormat = (_b = (_a = countrySpecificFormatters[country]) == null ? void 0 : _a.postalCode) == null ? void 0 : _b.format;
+  const postalCodeFormat = country ? (_b = (_a = countrySpecificFormatters[country]) == null ? void 0 : _a.postalCode) == null ? void 0 : _b.format : void 0;
   return {
     address: {
       modes: ["blur"],
@@ -12633,7 +12641,7 @@ const addressValidationRules = (country) => {
     postalCode: {
       modes: ["blur"],
       validate: (val) => {
-        const pattern = postalCodePatterns[country];
+        const pattern = country ? postalCodePatterns[country] : void 0;
         return pattern ? !!val && pattern.test(val) : !!val;
       },
       errorMessage: postalCodeFormat ? {
@@ -12662,7 +12670,7 @@ const addressValidationRules = (country) => {
 };
 const addressValidationRulesV4 = (country, i18n) => {
   var _a, _b;
-  const postalCodeFormat = (_b = (_a = countrySpecificFormatters[country]) == null ? void 0 : _a.postalCode) == null ? void 0 : _b.format;
+  const postalCodeFormat = country ? (_b = (_a = countrySpecificFormatters[country]) == null ? void 0 : _a.postalCode) == null ? void 0 : _b.format : void 0;
   const MIN_LENGTH_3 = 3;
   return {
     address: [{
@@ -12691,7 +12699,7 @@ const addressValidationRulesV4 = (country, i18n) => {
     postalCode: {
       modes: ["blur"],
       validate: (val) => {
-        const pattern = postalCodePatterns[country];
+        const pattern = country ? postalCodePatterns[country] : void 0;
         return pattern ? !!val && pattern.test(val) : !!val;
       },
       errorMessage: postalCodeFormat ? {
@@ -12786,8 +12794,8 @@ function Address(props) {
   });
   const datasetUtils = datasetUtilities(i18n.locale);
   const requiredFields = (requiredFieldsProp == null ? void 0 : requiredFieldsProp.includes("stateOrProvince")) || (dataProp == null ? void 0 : dataProp.country) && COUNTRIES_WITH_STATES_DATASET.includes(dataProp == null ? void 0 : dataProp.country) ? getAddressSchemaForCountry(dataProp == null ? void 0 : dataProp.country) : getAddressSchemaForCountry(dataProp == null ? void 0 : dataProp.country).filter((ad) => ad !== "stateOrProvince");
-  const rules2 = useMemo(() => (dataProp == null ? void 0 : dataProp.country) ? addressValidationRules(dataProp == null ? void 0 : dataProp.country) : {}, [dataProp == null ? void 0 : dataProp.country]);
-  const rulesV4 = useMemo(() => (dataProp == null ? void 0 : dataProp.country) ? addressValidationRulesV4(dataProp == null ? void 0 : dataProp.country, i18n) : {}, [dataProp == null ? void 0 : dataProp.country, i18n]);
+  const rules2 = useMemo(() => addressValidationRules(dataProp == null ? void 0 : dataProp.country), [dataProp == null ? void 0 : dataProp.country]);
+  const rulesV4 = useMemo(() => addressValidationRulesV4(dataProp == null ? void 0 : dataProp.country, i18n), [dataProp == null ? void 0 : dataProp.country, i18n]);
   const {
     data,
     errors,
@@ -13016,6 +13024,460 @@ Address.defaultProps = {
   requiredFields: ADDRESS_SCHEMA,
   countryCode: null
 };
+const logger$w = createLogger("AddressFieldContainer");
+const formatAddressItem = (item) => {
+  if (item.description.includes("Addresses")) {
+    const splittedDescription = item.description.split(" - ");
+    if (splittedDescription.length === 1) {
+      return {
+        ...item,
+        description: "",
+        addressAmount: splittedDescription[0].replace("Addresses", "")
+      };
+    }
+    return {
+      ...item,
+      description: splittedDescription[0],
+      addressAmount: splittedDescription[1].replace("Addresses", "")
+    };
+  }
+  return item;
+};
+const getFormattedText = (highlightItems, text) => {
+  const formattedText = [];
+  let lastHighlightIndex = 0;
+  if (highlightItems[0] === "") {
+    return [text];
+  }
+  highlightItems.forEach((highlightValue) => {
+    const highlightRange = highlightValue.split("-");
+    const highlightInit = parseInt(highlightRange[0]);
+    const highlightEnd = parseInt(highlightRange[1]);
+    if (lastHighlightIndex < highlightInit) {
+      const remain = text.substring(lastHighlightIndex, highlightInit);
+      formattedText.push(`${remain}`);
+    }
+    const boldText = text.substring(highlightInit, highlightEnd);
+    formattedText.push(jsx("span", {
+      className: "adyen-kyc-dropdown-search-element__description--highlight",
+      children: boldText
+    }));
+    lastHighlightIndex = highlightEnd;
+  });
+  if (lastHighlightIndex < text.length) {
+    formattedText.push(`${text.substring(lastHighlightIndex)}`);
+  }
+  return formattedText;
+};
+const getHighlightedText = ({
+  text = "",
+  highlight = "",
+  description = ""
+}) => {
+  let formattedText = [];
+  if (highlight === "") {
+    if (description) {
+      formattedText.push(`${text}, ${description}`);
+    } else {
+      formattedText.push(text);
+    }
+  } else {
+    const highlightItems = highlight.split(";");
+    formattedText = getFormattedText(highlightItems[0].split(","), text);
+    if (highlightItems.length > 1) {
+      formattedText.push(`, `);
+      formattedText.push(jsx(Fragment, {
+        children: getFormattedText(highlightItems[1].split(","), description)
+      }));
+    } else if (description) {
+      formattedText.push(`, ${description}`);
+    }
+  }
+  return formattedText;
+};
+const generateSearchListItem = (item, i18n) => jsxs(Fragment, {
+  children: [jsx("span", {
+    className: "adyen-kyc-dropdown-search-element__description",
+    children: getHighlightedText(item)
+  }), item.addressAmount && jsxs("div", {
+    className: "adyen-kyc-dropdown-search-element__addresses",
+    children: [item.addressAmount, " ", jsxs("span", {
+      className: "adyen-kyc-dropdown-search-element__addresses--text",
+      children: [" ", i18n.get("addresses")]
+    }), jsx(Icon, {
+      name: "arrow-right",
+      className: "adyen-kyc-dropdown-search-element__addresses--icon"
+    })]
+  })]
+});
+function FieldContainerComponent({
+  legalEntityId = "",
+  classNameModifiers = [],
+  schema,
+  data,
+  valid,
+  errors,
+  fieldProblems,
+  fieldName,
+  trimOnBlur,
+  hideField,
+  maxlength,
+  readOnly,
+  optional,
+  handleChangeFor,
+  handleAddressSearch,
+  handleFindAddress
+}) {
+  const {
+    i18n
+  } = useI18nContext();
+  useEffect(() => {
+    setItems([]);
+    setSearchText("");
+    setResetSearch(true);
+  }, [data.country]);
+  const formUtils = formUtilities({
+    data
+  }, i18n);
+  const errorMessage = formUtils.getErrorMessage(fieldName, errors ?? {}, fieldProblems);
+  const value = data[fieldName];
+  const labelKey = getKeyForField(fieldName, data.country);
+  const [items, setItems] = useState([]);
+  const [loading, setLoading] = useState(false);
+  const [resetSearch, setResetSearch] = useState(false);
+  const [showSearchList, setShowSearchList] = useState(false);
+  const [selectedAddressId, setSelectedAddressId] = useState();
+  const [searchText, setSearchText] = useState(data.address);
+  useEffect(() => {
+    setSearchText(data.address);
+  }, [data.address]);
+  const setAddressField = ({
+    houseNumberOrName,
+    street
+  }) => {
+    const hasHouseNumber = !!houseNumberOrName;
+    if (hasHouseNumber) {
+      const isHouseNumberFirst = data.country ? COUNTRIES_WITH_HOUSE_NUMBER_FIRST.includes(data.country) : false;
+      const needsComma = data.country ? COUNTRIES_WITH_COMMA_SEPARATED.includes(data.country) : false;
+      const formattedAddress = isHouseNumberFirst ? `${houseNumberOrName}${needsComma ? ", " : " "}${street}` : `${street}${needsComma ? ", " : " "}${houseNumberOrName}`;
+      return handleChangeFor("address", "input")(formattedAddress);
+    }
+    return handleChangeFor("address", "input")(street);
+  };
+  const getSearchItems = async (text) => {
+    if (!text || !data.country) return setItems([]);
+    try {
+      setLoading(true);
+      const response = await (handleAddressSearch == null ? void 0 : handleAddressSearch({
+        text,
+        country: data.country
+      }, legalEntityId));
+      if (response == null ? void 0 : response.results) {
+        setItems(response.results.map(formatAddressItem));
+      } else {
+        setItems([]);
+      }
+    } catch (e) {
+      logger$w.error(e);
+    }
+    setLoading(false);
+  };
+  const onFindAddress = async (addressId) => {
+    try {
+      const response = await (handleFindAddress == null ? void 0 : handleFindAddress(addressId));
+      if (response) {
+        schema == null ? void 0 : schema.forEach((field) => {
+          switch (field) {
+            case "country":
+              handleChangeFor("country", "input")(response.country ?? " ");
+              break;
+            case "address":
+              setAddressField(response);
+              break;
+            case "otherAddressInformation":
+              handleChangeFor("otherAddressInformation", "blur")(response.street2 ?? " ");
+              break;
+            case "city":
+              handleChangeFor("city", "input")(response.city ?? " ");
+              break;
+            case "postalCode":
+              handleChangeFor("postalCode", "input")(response.postalCode ?? " ");
+              break;
+            case "stateOrProvince":
+              handleChangeFor("stateOrProvince", "input")(response.stateOrProvince ?? " ");
+              break;
+            default:
+              break;
+          }
+        });
+      }
+    } catch (e) {
+      logger$w.error(e);
+    }
+  };
+  const onDrilldown = async (address) => {
+    if (!data.country) return;
+    try {
+      const response = await (handleAddressSearch == null ? void 0 : handleAddressSearch({
+        text: address.text,
+        country: data.country,
+        container: address.id
+      }, legalEntityId));
+      setItems((response == null ? void 0 : response.results) || []);
+    } catch (e) {
+      logger$w.error(e);
+    }
+  };
+  const handleOnChange = (e) => {
+    const addressId = e.target.value;
+    setSelectedAddressId(addressId);
+    setLoading(true);
+    const selectedAddress = items.filter((i) => i.id === addressId)[0];
+    if (selectedAddress.type === "Address") {
+      onFindAddress(selectedAddress.id);
+      setShowSearchList(false);
+    } else {
+      onDrilldown(selectedAddress);
+      setShowSearchList(true);
+    }
+    setLoading(false);
+  };
+  const renderField = (field) => {
+    switch (field) {
+      case "address":
+        return handleAddressSearch && handleFindAddress ? jsx(Field, {
+          name: field,
+          label: i18n.get(labelKey),
+          classNameModifiers,
+          errorMessage,
+          isValid: valid == null ? void 0 : valid[field],
+          optional,
+          children: (childProps) => jsx(Select, {
+            ...childProps,
+            isSearch: true,
+            name: field,
+            items: items.map((item) => ({
+              ...item,
+              name: ""
+            })),
+            selected: selectedAddressId,
+            loading,
+            onChange: handleOnChange,
+            onSearch: getSearchItems,
+            onSearchTextChange: (text) => handleChangeFor("address", "input")(text),
+            getSearchItem: (item) => generateSearchListItem(item, i18n),
+            showSearchList,
+            resetSearch,
+            searchText
+          })
+        }) : jsx(Field, {
+          name: field,
+          label: i18n.get(labelKey),
+          classNameModifiers,
+          errorMessage,
+          isValid: valid == null ? void 0 : valid[field],
+          optional,
+          children: (childProps) => jsx(InputText, {
+            ...childProps,
+            classNameModifiers,
+            name: field,
+            value,
+            onInput: handleChangeFor(fieldName, "input"),
+            onBlur: handleChangeFor(fieldName, "blur"),
+            maxLength: maxlength,
+            "aria-required": true,
+            "aria-label": i18n.get(labelKey),
+            "aria-invalid": !(valid == null ? void 0 : valid[field]),
+            trimOnBlur,
+            readonly: readOnly
+          })
+        });
+      case "country":
+        return jsx(CountryField, {
+          data: {
+            country: value
+          },
+          valid: {
+            country: valid == null ? void 0 : valid.country
+          },
+          errors: {
+            country: errorMessage
+          },
+          labels: {
+            country: formUtils.getLabel(field, labelKey)
+          },
+          readonly: Boolean(readOnly),
+          classNameModifiers,
+          className: hideField ? "adyen-kyc-search-fieldcontainer-hide" : "",
+          handleChangeFor
+        });
+      case "stateOrProvince":
+        return jsx(StateField, {
+          data: {
+            stateOrProvince: value
+          },
+          valid: {
+            stateOrProvince: valid == null ? void 0 : valid.stateOrProvince
+          },
+          errors: {
+            stateOrProvince: errorMessage
+          },
+          labels: {
+            stateOrProvince: formUtils.getLabel(field, labelKey)
+          },
+          readonly: Boolean(readOnly),
+          classNameModifiers,
+          selectedCountry: data.country,
+          handleChangeFor
+        });
+      default:
+        return jsx(Field, {
+          name: field,
+          label: i18n.get(labelKey),
+          classNameModifiers,
+          errorMessage,
+          isValid: valid == null ? void 0 : valid[field],
+          optional,
+          children: (childProps) => jsx(InputText, {
+            ...childProps,
+            classNameModifiers,
+            name: field,
+            value: field === "postalCode" ? value == null ? void 0 : value.toUpperCase() : value,
+            onInput: handleChangeFor(fieldName, "input"),
+            onBlur: handleChangeFor(fieldName, "blur"),
+            maxLength: maxlength,
+            "aria-required": true,
+            "aria-label": i18n.get(labelKey),
+            "aria-invalid": !(valid == null ? void 0 : valid[field]),
+            trimOnBlur,
+            readonly: readOnly
+          })
+        });
+    }
+  };
+  return hideField ? null : renderField(fieldName);
+}
+function AddressComponent({
+  data,
+  labels: labels2,
+  placeholders,
+  helperText,
+  readOnly,
+  hideCountry,
+  fieldValidationErrors,
+  allFields,
+  requiredFields,
+  optionalFields = ["otherAddressInformation"],
+  readOnlyFields,
+  trustedFields,
+  shouldValidate,
+  handleAddressSearch,
+  handleFindAddress,
+  onChange,
+  legalEntityId,
+  verifiedAddress
+}) {
+  const {
+    i18n
+  } = useI18nContext();
+  const {
+    isExperimentEnabled
+  } = useExperimentsContext();
+  const isStrictNameAndAddressValidationEnabled = isExperimentEnabled(ExperimentNames.StrictNameAndAddressValidationV4);
+  const schema = useMemo(() => {
+    if (requiredFields == null ? void 0 : requiredFields.length) {
+      return (requiredFields == null ? void 0 : requiredFields.includes("stateOrProvince")) || (data == null ? void 0 : data.country) && COUNTRIES_WITH_STATES_DATASET.includes(data == null ? void 0 : data.country) ? requiredFields : requiredFields == null ? void 0 : requiredFields.filter((field) => field !== "stateOrProvince");
+    }
+    return (data == null ? void 0 : data.country) && COUNTRIES_WITH_STATES_DATASET.includes(data == null ? void 0 : data.country) ? getAddressSchemaForCountry(data == null ? void 0 : data.country) : getAddressSchemaForCountry(data == null ? void 0 : data.country).filter((ad) => ad !== "stateOrProvince");
+  }, [data == null ? void 0 : data.country, requiredFields]);
+  const rules2 = useMemo(() => addressValidationRules(data == null ? void 0 : data.country), [data == null ? void 0 : data.country]);
+  const rulesV4 = useMemo(() => addressValidationRulesV4(data == null ? void 0 : data.country, i18n), [data == null ? void 0 : data.country, i18n]);
+  const {
+    schema: formSchema,
+    data: formData,
+    errors: formErrors,
+    valid: formValid,
+    fieldProblems: formFieldProblems,
+    handleChangeFor,
+    isValid
+  } = useForm({
+    schema,
+    defaultData: data,
+    formatters: addressFormatters,
+    rules: isStrictNameAndAddressValidationEnabled ? rulesV4 : rules2,
+    fieldProblems: fieldValidationErrors,
+    optionalFields,
+    obscuredFields: [],
+    trustedFields: [],
+    shouldValidate
+  });
+  useEffect(
+    () => verifiedAddress ? entriesOf(verifiedAddress).forEach(([key, value]) => {
+      if (formData[key] !== value) handleChangeFor(key, "input")(value);
+    }) : formSchema.forEach((field) => handleChangeFor(field, "input")((data == null ? void 0 : data[field]) ?? " ")),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [verifiedAddress]
+  );
+  const formUtils = formUtilities({
+    data,
+    labels: labels2,
+    placeholders,
+    helperText,
+    readOnly,
+    allFields,
+    requiredFields: schema,
+    optionalFields,
+    readOnlyFields,
+    trustedFields
+  }, i18n);
+  useEffect(() => {
+    onChange == null ? void 0 : onChange({
+      schema: formSchema,
+      data: formData,
+      valid: formValid,
+      errors: formErrors,
+      fieldProblems: formFieldProblems,
+      isValid
+    });
+  }, [formData, formErrors, formFieldProblems, formSchema, formValid, isValid]);
+  const createFieldComponent = (fieldName) => {
+    if (!formUtils.isRequiredField(fieldName) && !formUtils.isOptionalField(fieldName)) return null;
+    const hideField = fieldName === "country" && hideCountry;
+    return jsx(FieldContainerComponent, {
+      classNameModifiers: [fieldName],
+      schema: formSchema,
+      data: formData,
+      valid: formValid,
+      errors: formErrors,
+      fieldProblems: formFieldProblems,
+      fieldName,
+      maxlength: getMaxLengthByFieldAndCountry(countrySpecificFormatters, fieldName, formData.country),
+      hideField,
+      "aria-label": formUtils.getLabel(fieldName, fieldName),
+      readOnly: formUtils.isReadOnly(fieldName),
+      optional: formUtils.isOptionalField(fieldName),
+      trimOnBlur: true,
+      legalEntityId,
+      handleChangeFor,
+      handleAddressSearch,
+      handleFindAddress
+    }, fieldName);
+  };
+  return jsx("fieldset", {
+    className: "adyen-kyc__address",
+    children: formSchema.map((field) => createFieldComponent(field))
+  });
+}
+function AddressExperimentWrapper(props) {
+  const {
+    isExperimentEnabled
+  } = useExperimentsContext();
+  return isExperimentEnabled("EnableNewAddressComponent") ? jsx(AddressComponent, {
+    ...props
+  }) : jsx(Address, {
+    ...props
+  });
+}
 var operationalAddressIsSameIds = /* @__PURE__ */ ((operationalAddressIsSameIds2) => {
   operationalAddressIsSameIds2["OPERATIONAL_ADDRESS_IS_SAME"] = "OperationAddressAnswerYes";
   operationalAddressIsSameIds2["OPERATIONAL_ADDRESS_IS_NOT_SAME"] = "OperationAddressAnswerNo";
@@ -13080,7 +13542,8 @@ function RegistrationAddressComponent(props) {
     valid: formValid,
     errors: formErrors,
     fieldProblems: formFieldProblems,
-    handleChangeFor
+    handleChangeFor,
+    setValid
   } = useForm({
     ...props,
     schema: ["operationalAddressIsSame"],
@@ -13117,10 +13580,25 @@ function RegistrationAddressComponent(props) {
         schema: ["registrationAddress", "operationalAddressIsSame", ...isOperationAddressNotSame() ? ["operationalAddress"] : []]
       }
     });
-  }, [formData.operationalAddressIsSame]);
+  }, [formData, formValid, formErrors, formFieldProblems]);
   const isOperationAddressNotSame = () => formData.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME;
   const registrationAddressFormProps = getFormProps(props, registrationAddressFormID);
   const operationalAddressFormProps = getFormProps(props, operationalAddressFormID);
+  const handleRegistrationAddressChange = (state) => {
+    handleChangeFor("registrationAddress")(state.data);
+    setValid("registrationAddress", Boolean(state.isValid));
+  };
+  const handleOperationalAddressChange = (state) => {
+    handleChangeFor("operationalAddress")(state.data);
+    setValid("operationalAddress", Boolean(state.isValid));
+  };
+  const handleOperationalAddressIsSameChange = (e) => {
+    const {
+      value
+    } = e.target;
+    handleChangeFor("operationalAddressIsSame")(value);
+    if (value === "OperationAddressAnswerYes") setValid("operationalAddress", true);
+  };
   return jsxs(Fragment, {
     children: [jsx(StateContextSetter, {
       owner: id,
@@ -13139,7 +13617,7 @@ function RegistrationAddressComponent(props) {
       contentId: "reasonForFillingCompanyAddressDetails",
       title: i18n.get("whyDoINeedToFillInThisInformation"),
       content: i18n.get("reasonForFillingCompanyAddressDetails")
-    }), jsx(Address, {
+    }), jsx(AddressExperimentWrapper, {
       ...registrationAddressFormProps,
       data: {
         ...registrationAddressFormProps == null ? void 0 : registrationAddressFormProps.data,
@@ -13148,10 +13626,12 @@ function RegistrationAddressComponent(props) {
       hideCountry: true,
       id,
       addressType: "registrationAddress",
+      optionalFields: ["otherAddressInformation"],
       handleAddressSearch,
       handleFindAddress,
       verifiedBusiness,
-      kompanyAddress
+      kompanyAddress,
+      onChange: handleRegistrationAddressChange
     }), jsx(FormHeader, {
       classNames: "adyen-kyc-u-margin-top-32",
       heading: i18n.get("operationalAddressHeader")
@@ -13167,12 +13647,12 @@ function RegistrationAddressComponent(props) {
         items: operationalAddressIsSameItems,
         value: formData.operationalAddressIsSame,
         disabled: formUtils.isReadOnly("operationalAddressIsSame"),
-        onChange: handleChangeFor("operationalAddressIsSame"),
+        onChange: handleOperationalAddressIsSameChange,
         "aria-required": true,
         "aria-label": formUtils.getLabel("operationalAddressIsSame"),
         "aria-invalid": !formValid.operationalAddressIsSame
       })
-    }), isOperationAddressNotSame() && createElement(Address, {
+    }), isOperationAddressNotSame() && createElement(AddressExperimentWrapper, {
       ...operationalAddressFormProps,
       key: "operationalAddress",
       data: {
@@ -13181,9 +13661,11 @@ function RegistrationAddressComponent(props) {
       },
       hideCountry: true,
       id,
+      optionalFields: ["otherAddressInformation"],
       addressType: "operationalAddress",
       handleAddressSearch,
-      handleFindAddress
+      handleFindAddress,
+      onChange: handleOperationalAddressChange
     })]
   });
 }
@@ -13863,9 +14345,18 @@ const rules$2 = ({
     }
   },
   countryRequiresRegistrationNumberForCompanies: () => {
+    var _a, _b;
     if (COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER.includes(country)) {
       return "OPTIONAL";
     }
+    if (isExperimentEnabled("EnableAUGovernmentalOrganizationSkipRegistrationNumber") && country === CountryCodes.Australia) {
+      if ("companyType" in data && ((_a = data.companyType) == null ? void 0 : _a.entityType) === CompanyTypesValue.GOVERNMENTAL_ORGANIZATION) {
+        return;
+      }
+      if ("companyStructure" in data && ((_b = data.companyStructure) == null ? void 0 : _b.entityType) === CompanyTypesValue.GOVERNMENTAL_ORGANIZATION) {
+        return;
+      }
+    }
     if (!COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION.includes(country)) {
       return "REQUIRED";
     }
@@ -14985,49 +15476,13 @@ const useIdVerificationToken = ({
     loadingStatus
   };
 };
-const adyenKycLoadingInputForm = "adyen-kyc-loading-input__form";
-const adyenKycLoadingInputFormLoadingOpacity0 = "adyen-kyc-loading-input__form--loading-opacity0";
-const adyenKycLoadingInputFormLoadingOpacity01 = "adyen-kyc-loading-input__form--loading-opacity0-1";
-const adyenKycLoadingInputFormLoadingOpacity02 = "adyen-kyc-loading-input__form--loading-opacity0-2";
-const adyenKycLoadingInputFormLoadingOpacity03 = "adyen-kyc-loading-input__form--loading-opacity0-3";
-const adyenKycLoadingInputFormLoadingOpacity04 = "adyen-kyc-loading-input__form--loading-opacity0-4";
-const adyenKycLoadingInputFormLoadingOpacity05 = "adyen-kyc-loading-input__form--loading-opacity0-5";
-const adyenKycLoadingInputFormLoadingOpacity06 = "adyen-kyc-loading-input__form--loading-opacity0-6";
-const adyenKycLoadingInputFormLoadingOpacity07 = "adyen-kyc-loading-input__form--loading-opacity0-7";
-const adyenKycLoadingInputFormLoadingOpacity08 = "adyen-kyc-loading-input__form--loading-opacity0-8";
-const adyenKycLoadingInputFormLoadingOpacity09 = "adyen-kyc-loading-input__form--loading-opacity0-9";
-const adyenKycLoadingInputFormLoadingOpacity1 = "adyen-kyc-loading-input__form--loading-opacity1";
-const adyenKycLoadingInputLoader = "adyen-kyc-loading-input__loader";
-const adyenKycLoadingInputLoaderActive = "adyen-kyc-loading-input__loader--active";
-const styles$5 = {
-  "adyen-kyc-loading-input__form": "adyen-kyc-loading-input__form",
-  adyenKycLoadingInputForm,
-  "adyen-kyc-loading-input__form--loading-opacity0": "adyen-kyc-loading-input__form--loading-opacity0",
-  adyenKycLoadingInputFormLoadingOpacity0,
-  "adyen-kyc-loading-input__form--loading-opacity0-1": "adyen-kyc-loading-input__form--loading-opacity0-1",
-  adyenKycLoadingInputFormLoadingOpacity01,
-  "adyen-kyc-loading-input__form--loading-opacity0-2": "adyen-kyc-loading-input__form--loading-opacity0-2",
-  adyenKycLoadingInputFormLoadingOpacity02,
-  "adyen-kyc-loading-input__form--loading-opacity0-3": "adyen-kyc-loading-input__form--loading-opacity0-3",
-  adyenKycLoadingInputFormLoadingOpacity03,
-  "adyen-kyc-loading-input__form--loading-opacity0-4": "adyen-kyc-loading-input__form--loading-opacity0-4",
-  adyenKycLoadingInputFormLoadingOpacity04,
-  "adyen-kyc-loading-input__form--loading-opacity0-5": "adyen-kyc-loading-input__form--loading-opacity0-5",
-  adyenKycLoadingInputFormLoadingOpacity05,
-  "adyen-kyc-loading-input__form--loading-opacity0-6": "adyen-kyc-loading-input__form--loading-opacity0-6",
-  adyenKycLoadingInputFormLoadingOpacity06,
-  "adyen-kyc-loading-input__form--loading-opacity0-7": "adyen-kyc-loading-input__form--loading-opacity0-7",
-  adyenKycLoadingInputFormLoadingOpacity07,
-  "adyen-kyc-loading-input__form--loading-opacity0-8": "adyen-kyc-loading-input__form--loading-opacity0-8",
-  adyenKycLoadingInputFormLoadingOpacity08,
-  "adyen-kyc-loading-input__form--loading-opacity0-9": "adyen-kyc-loading-input__form--loading-opacity0-9",
-  adyenKycLoadingInputFormLoadingOpacity09,
-  "adyen-kyc-loading-input__form--loading-opacity1": "adyen-kyc-loading-input__form--loading-opacity1",
-  adyenKycLoadingInputFormLoadingOpacity1,
-  "adyen-kyc-loading-input__loader": "adyen-kyc-loading-input__loader",
-  adyenKycLoadingInputLoader,
-  "adyen-kyc-loading-input__loader--active": "adyen-kyc-loading-input__loader--active",
-  adyenKycLoadingInputLoaderActive
+const loaderWrapperLoader = "adyen-kyc-loader-wrapper-loader";
+const loaderWrapperLoaderActive = "adyen-kyc-loader-wrapper-loader-active";
+const styles$3 = {
+  "loader-wrapper-loader": "adyen-kyc-loader-wrapper-loader",
+  loaderWrapperLoader,
+  "loader-wrapper-loader-active": "adyen-kyc-loader-wrapper-loader-active",
+  loaderWrapperLoaderActive
 };
 const LoaderWrapper = ({
   children,
@@ -15037,18 +15492,15 @@ const LoaderWrapper = ({
   showSpinner = true,
   className
 }) => {
-  const formOpacityStrArr = `${formOpacityWhenLoading}`.split(".");
-  const digit = formOpacityStrArr[0];
-  const decimal = formOpacityStrArr[1];
-  const opacity = decimal ? `${digit}-${decimal}` : `${digit}`;
-  const wrapperClass = cx("adyen-kyc-loading-input__form", styles$5["adyen-kyc-loading-input__form"], {
-    [styles$5[`adyen-kyc-loading-input__form--loading-opacity${opacity}`]]: status === "loading"
-  });
-  const loaderWrapperClass = cx({
-    [styles$5["adyen-kyc-loading-input__loader"]]: true,
-    [styles$5["adyen-kyc-loading-input__loader--active"]]: status === "loading" && showSpinner
-  });
-  const overlayClass = cx("adyen-kyc-loading-input", className);
+  const opacitySyle = status === "loading" ? {
+    opacity: formOpacityWhenLoading
+  } : {
+    opacity: 1
+  };
+  const loaderWrapperClass = cx(styles$3.loaderWrapperLoader, {
+    [styles$3.loaderWrapperLoaderActive]: status === "loading" && showSpinner
+  });
+  const overlayClass = cx(styles$3.loaderWrapper, className);
   return jsxs("div", {
     className: overlayClass,
     style: {
@@ -15060,7 +15512,8 @@ const LoaderWrapper = ({
         size: loaderSize
       })
     }), jsx("div", {
-      className: wrapperClass,
+      className: styles$3.loaderWrapperForm,
+      style: opacitySyle,
       children
     })]
   });
@@ -16556,27 +17009,13 @@ const handleKeys = (keys, callback, propagationMode = "stopIfMatches") => (event
     callback();
   }
 };
-const adyenKycMultiSelectList = "adyen-kyc-multi-select-list";
-const adyenKycMultiSelectListItem = "adyen-kyc-multi-select-list-item";
-const adyenKycMultiSelectListItemWithDescription = "adyen-kyc-multi-select-list-item--with-description";
-const adyenKycCheckboxLabel = "adyen-kyc-checkbox__label";
-const styles$4 = {
-  "adyen-kyc-multi-select-list": "adyen-kyc-multi-select-list",
-  adyenKycMultiSelectList,
-  "adyen-kyc-multi-select-list-item": "adyen-kyc-multi-select-list-item",
-  adyenKycMultiSelectListItem,
-  "adyen-kyc-multi-select-list-item--with-description": "adyen-kyc-multi-select-list-item--with-description",
-  adyenKycMultiSelectListItemWithDescription,
-  "adyen-kyc-checkbox__label": "adyen-kyc-checkbox__label",
-  adyenKycCheckboxLabel
-};
 const MultiSelectList = ({
   options,
   selected,
   onSelect,
   mapToSelectItem
 }) => jsx("ul", {
-  className: styles$4["adyen-kyc-multi-select-list"],
+  className: "adyen-kyc-multi-select-list",
   children: options.map((option) => {
     const item = mapToSelectItem(option);
     const isSelected = selected.includes(option);
@@ -16590,8 +17029,8 @@ const MultiSelectList = ({
       onKeyDown: handleKeys(["Enter", " "], handleSelect),
       onSelect: handleSelect,
       isMulti: true,
-      className: cx([styles$4["adyen-kyc-multi-select-list-item"], {
-        [styles$4["adyen-kyc-multi-select-list-item--with-description"]]: !!item.description
+      className: cx(["adyen-kyc-multi-select-list-item", {
+        "adyen-kyc-multi-select-list-item--with-description": !!item.description
       }])
     }, item.id);
   })
@@ -17552,8 +17991,9 @@ const relationshipOptions = [{
   id: "guardian",
   name: "guardian"
 }];
+const countriesRequiringNationality = [CountryCodes.HongKong, CountryCodes.Singapore];
 function PersonalDetailsComponent(props) {
-  var _a;
+  var _a, _b, _c, _d;
   const {
     i18n
   } = useI18nContext();
@@ -17584,6 +18024,7 @@ function PersonalDetailsComponent(props) {
   const isDecisionMakerTask = props.taskType === TaskTypes.DECISION_MAKER || props.taskType === TaskTypes.TRUST_MEMBER_COMPANY_OWNER;
   const isTopLevelEntity = props.taskType === TaskTypes.INDIVIDUAL;
   const isLegalRepresentativeDetailsTask = props.taskType === TaskTypes.LEGAL_REPRESENTATIVE_DETAILS;
+  const countryRequiringNationality = ((_c = (_b = props.parentLegalEntity) == null ? void 0 : _b.organization) == null ? void 0 : _c.registeredAddress.country) || ((_d = props.data) == null ? void 0 : _d.residencyCountry);
   const requiredFieldsByTask = (props.requiredFields || personalDetailsFields).filter((field) => !isNewEntryFlowEnabled && (field !== "role" || field === "role" && isDecisionMakerTask) || isNewEntryFlowEnabled && (field !== "role" && field !== "accountHolder" || field === "role" && isDecisionMakerTask) || field === "relationship" && isLegalRepresentativeDetailsTask);
   const isAllowedEditPrefilledCountry = isSettingEnabled(SettingNames.AllowPrefilledCountryEdit);
   const getDirectChildFields = () => requiredFieldsByTask.filter((field) => ["birthDate", "residencyCountry", "jobTitle", "nationality", "relationship"].includes(field));
@@ -17675,9 +18116,9 @@ function PersonalDetailsComponent(props) {
     currentState,
     changeInitiatedBy
   }) => {
-    var _a2, _b;
+    var _a2, _b2;
     if (changeInitiatedBy === PERSONAL_DETAILS) {
-      if (!((_b = (_a2 = currentState.errors) == null ? void 0 : _a2[PERSONAL_DETAILS]) == null ? void 0 : _b.idNumber) && (externalErrors == null ? void 0 : externalErrors.idNumber)) {
+      if (!((_b2 = (_a2 = currentState.errors) == null ? void 0 : _a2[PERSONAL_DETAILS]) == null ? void 0 : _b2.idNumber) && (externalErrors == null ? void 0 : externalErrors.idNumber)) {
         delete externalErrors.idNumber;
       }
       this.isValid = currentState.validityByForm[PERSONAL_DETAILS];
@@ -17853,7 +18294,7 @@ function PersonalDetailsComponent(props) {
         country: data.residencyCountry,
         errors: externalErrors,
         idNumberType
-      }), (data.residencyCountry === "SG" || data.residencyCountry === "HK") && formUtils.isRequiredField("nationality") && jsx(CountryField, {
+      }), countriesRequiringNationality.includes(countryRequiringNationality) && formUtils.isRequiredField("nationality") && jsx(CountryField, {
         data: {
           country: data.nationality
         },
@@ -18111,7 +18552,7 @@ const proofOfNationalIdFormID = individualForms.proofOfNationalId.formId;
 const proofOfRelationshipFormID = individualForms.proofOfRelationship.formId;
 const individualDocumentForms = [idVerificationMethodFormID, idDocumentFormID, proofOfResidencyFormID, proofOfNationalIdFormID, proofOfRelationshipFormID];
 function IndividualComponent(props) {
-  var _a, _b, _c, _d, _e, _f, _g, _h;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i;
   const {
     i18n
   } = useI18nContext();
@@ -18154,7 +18595,7 @@ function IndividualComponent(props) {
     currentState,
     prevState
   }) => {
-    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i, _j;
+    var _a2, _b2, _c2, _d2, _e2, _f2, _g2, _h2, _i2, _j;
     const residencyCountryPrev = (_b2 = (_a2 = prevState.data) == null ? void 0 : _a2.personalDetails) == null ? void 0 : _b2.residencyCountry;
     const residencyCountry = (_d2 = (_c2 = currentState.data) == null ? void 0 : _c2.personalDetails) == null ? void 0 : _d2.residencyCountry;
     if (residencyCountry != null && residencyCountry !== residencyCountryPrev) {
@@ -18165,13 +18606,18 @@ function IndividualComponent(props) {
     if (idVerificationMethod != null && idVerificationMethod !== idVerificationMethodPrev) {
       setIdVerificationMethodSelected(idVerificationMethod);
     }
-    const accountHolder = (_j = (_i = currentState.data) == null ? void 0 : _i.personalDetails) == null ? void 0 : _j.accountHolder;
+    const accountHolder = (_j = (_i2 = currentState.data) == null ? void 0 : _i2.personalDetails) == null ? void 0 : _j.accountHolder;
     this.customNavigationHandler = accountHolder === "theCompanyIWorkFor" ? () => {
       var _a3;
       return (_a3 = props.onTypeSwitch) == null ? void 0 : _a3.call(props, LegalEntityType.ORGANIZATION);
     } : null;
     setData(currentState.data);
   };
+  const handleAddressChange = (addressData) => {
+    updateStateSlice({
+      ...addressData
+    });
+  };
   useEffect(() => {
     var _a2, _b2, _c2;
     const isIdDocumentFormActive = props.activeForm.formId === idDocumentFormID;
@@ -18179,8 +18625,18 @@ function IndividualComponent(props) {
     const isIdAlreadyUploaded = ((_a2 = data == null ? void 0 : data.idDocument) == null ? void 0 : _a2.instantIdVerificationData) || ((_c2 = (_b2 = props.data) == null ? void 0 : _b2.idDocument) == null ? void 0 : _c2.idDocumentType);
     props.setHideFooter(isIdDocumentFormActive && !isIdAlreadyUploaded && isInstantIdVerificationEnabled);
   }, [props.activeForm, idVerificationMethodSelected, props.handleGetIdVerificationToken, (_f = data == null ? void 0 : data.idDocument) == null ? void 0 : _f.instantIdVerificationData, (_h = (_g = props.data) == null ? void 0 : _g.idDocument) == null ? void 0 : _h.idDocumentType]);
-  const renderActiveForm = (activeForm) => {
+  const addressSchema = getAddressSchemaForCountry((_i = data == null ? void 0 : data.personalDetails) == null ? void 0 : _i.residencyCountry).filter((field) => {
     var _a2;
+    if (!COUNTRIES_WITH_STATES_DATASET.includes((_a2 = data == null ? void 0 : data.personalDetails) == null ? void 0 : _a2.residencyCountry)) {
+      return field !== "otherAddressInformation" && field !== "stateOrProvince";
+    }
+    return field !== "otherAddressInformation";
+  });
+  const {
+    updateStateSlice
+  } = useGlobalDataSlice("address");
+  const renderActiveForm = (activeForm) => {
+    var _a2, _b2;
     return jsxs(Fragment, {
       children: [jsx(StateContextWatcher, {
         owner: "IndividualComponent",
@@ -18217,17 +18673,20 @@ function IndividualComponent(props) {
             content: i18n.get("reasonForFillingIndividualAddressDetails"),
             titleId: "whyDoINeedToFillInThisInformation",
             contentId: "reasonForFillingIndividualAddressDetails"
-          }), jsx(Address, {
+          }), jsx(AddressExperimentWrapper, {
             ...addressFormProps,
+            id: addressFormID,
             data: {
-              ...addressFormProps.data,
-              country: props.country
+              ...data.address,
+              country: (_a2 = data == null ? void 0 : data.personalDetails) == null ? void 0 : _a2.residencyCountry
             },
-            hideCountry: true,
-            id: addressFormID,
+            requiredFields: addressSchema,
+            optionalFields: ["otherAddressInformation"],
             legalEntityId: props.legalEntityId,
             handleAddressSearch: props.handleAddressSearch,
-            handleFindAddress: props.handleFindAddress
+            handleFindAddress: props.handleFindAddress,
+            onChange: handleAddressChange,
+            hideCountry: true
           })]
         })
       }), !!props.handleGetIdVerificationToken && jsx("div", {
@@ -18236,7 +18695,7 @@ function IndividualComponent(props) {
           ...idVerificationMethodFormProps,
           name: fullName,
           id: idVerificationMethodFormID,
-          countryOfResidence: (_a2 = data == null ? void 0 : data.personalDetails) == null ? void 0 : _a2.residencyCountry
+          countryOfResidence: (_b2 = data == null ? void 0 : data.personalDetails) == null ? void 0 : _b2.residencyCountry
         })
       }), jsx("div", {
         className: activeForm.formId !== idDocumentFormID ? "adyen-kyc-form-wrapper adyen-kyc-form-wrapper--hidden" : "adyen-kyc-form-wrapper",
@@ -20608,46 +21067,26 @@ function SwiftCode(props) {
     "aria-invalid": !valid.swiftCode
   });
 }
-const adyenKycCheckGuidance = "adyen-kyc-check-guidance";
-const adyenKycCheckGuidanceImage = "adyen-kyc-check-guidance__image";
-const adyenKycCheckGuidanceImageAnnotated = "adyen-kyc-check-guidance__image--annotated";
-const adyenKycCheckGuidanceImageInactive = "adyen-kyc-check-guidance__image--inactive";
-const adyenKycUsCheckAccountNumber = "adyen-kyc-us-check-account-number";
-const adyenKycUsCheckRoutingNumber = "adyen-kyc-us-check-routing-number";
-const styles$3 = {
-  "adyen-kyc-check-guidance": "adyen-kyc-check-guidance",
-  adyenKycCheckGuidance,
-  "adyen-kyc-check-guidance__image": "adyen-kyc-check-guidance__image",
-  adyenKycCheckGuidanceImage,
-  "adyen-kyc-check-guidance__image--annotated": "adyen-kyc-check-guidance__image--annotated",
-  adyenKycCheckGuidanceImageAnnotated,
-  "adyen-kyc-check-guidance__image--inactive": "adyen-kyc-check-guidance__image--inactive",
-  adyenKycCheckGuidanceImageInactive,
-  "adyen-kyc-us-check-account-number": "adyen-kyc-us-check-account-number",
-  adyenKycUsCheckAccountNumber,
-  "adyen-kyc-us-check-routing-number": "adyen-kyc-us-check-routing-number",
-  adyenKycUsCheckRoutingNumber
-};
 const CheckGuidance = ({
   annotated
 }) => jsxs("div", {
-  className: styles$3["adyen-kyc-check-guidance"],
+  className: "adyen-kyc-check-guidance",
   children: [jsx(Svg, {
     type: "image",
     name: "us-check-account-number",
-    className: cx(styles$3["adyen-kyc-check-guidance__image"], styles$3["adyen-kyc-check-guidance__image--annotated"], {
-      [styles$3["adyen-kyc-check-guidance__image--inactive"]]: annotated !== "account"
+    className: cx("adyen-kyc-check-guidance__image", "adyen-kyc-check-guidance__image--annotated", {
+      "adyen-kyc-check-guidance__image--inactive": annotated !== "account"
     })
   }), jsx(Svg, {
     type: "image",
     name: "us-check-routing-number",
-    className: cx(styles$3["adyen-kyc-check-guidance__image"], styles$3["adyen-kyc-check-guidance__image--annotated"], {
-      [styles$3["adyen-kyc-check-guidance__image--inactive"]]: annotated !== "routing"
+    className: cx("adyen-kyc-check-guidance__image", "adyen-kyc-check-guidance__image--annotated", {
+      "adyen-kyc-check-guidance__image--inactive": annotated !== "routing"
     })
   }), jsx(Svg, {
     name: "us-check",
     type: "image",
-    className: styles$3["adyen-kyc-check-guidance__image"]
+    className: "adyen-kyc-check-guidance__image"
   })]
 });
 const payoutAccountFields = ["accountHolder", ...ibanFields, ...branchCodeFields, ...swiftCodeFields, ...currencyFields, ...bankAccountNumberFields, ...bankNameFields, ...bankCodeFields];
@@ -24138,22 +24577,42 @@ const dbaNameFieldMetadata = {
   label: "dbaName",
   validators: [validateNotEmptyOnBlur]
 };
-const adyenKycStructuredList = "adyen-kyc-structured-list";
-const adyenKycStructuredListListItem = "adyen-kyc-structured-list__list-item";
+const mapAddressData = (verifiedBusiness) => ({
+  address: verifiedBusiness.street ?? "",
+  otherAddressInformation: verifiedBusiness.street2 ?? "",
+  city: verifiedBusiness.city ?? "",
+  postalCode: verifiedBusiness.zipcode ?? "",
+  stateOrProvince: verifiedBusiness.state ?? ""
+});
+const applyVerifiedBusinessData = (verifiedBusiness, handleChangeFor) => {
+  if (!verifiedBusiness) return;
+  entriesOf(verifiedBusiness).forEach(([key, value]) => {
+    switch (key) {
+      case "name":
+        if (value) handleChangeFor("legalCompanyName", "input")(value);
+        break;
+      case "isPrincipalAddress":
+        if (value) handleChangeFor("operationalAddressIsSame", "input")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME);
+        break;
+    }
+  });
+};
+const structuredList = "adyen-kyc-structured-list";
+const structuredListListItem = "adyen-kyc-structured-list-list-item";
 const adyenLayoutMd = "adyen-layout-md";
-const adyenKycStructuredListLabel = "adyen-kyc-structured-list__label";
-const adyenKycStructuredListValue = "adyen-kyc-structured-list__value";
+const structuredListLabel = "adyen-kyc-structured-list-label";
+const structuredListValue = "adyen-kyc-structured-list-value";
 const styles$2 = {
-  "adyen-kyc-structured-list": "adyen-kyc-structured-list",
-  adyenKycStructuredList,
-  "adyen-kyc-structured-list__list-item": "adyen-kyc-structured-list__list-item",
-  adyenKycStructuredListListItem,
+  "structured-list": "adyen-kyc-structured-list",
+  structuredList,
+  "structured-list-list-item": "adyen-kyc-structured-list-list-item",
+  structuredListListItem,
   "adyen-layout-md": "adyen-layout-md",
   adyenLayoutMd,
-  "adyen-kyc-structured-list__label": "adyen-kyc-structured-list__label",
-  adyenKycStructuredListLabel,
-  "adyen-kyc-structured-list__value": "adyen-kyc-structured-list__value",
-  adyenKycStructuredListValue
+  "structured-list-label": "adyen-kyc-structured-list-label",
+  structuredListLabel,
+  "structured-list-value": "adyen-kyc-structured-list-value",
+  structuredListValue
 };
 const StructuredList = ({
   items
@@ -24162,28 +24621,29 @@ const StructuredList = ({
     i18n
   } = useI18nContext();
   return jsx("dl", {
-    className: styles$2["adyen-kyc-structured-list"],
+    className: styles$2.structuredList,
     children: items.map((item) => jsxs("div", {
-      className: styles$2["adyen-kyc-structured-list__list-item"],
+      className: styles$2.structuredListListItem,
       children: [jsx("dt", {
-        className: styles$2["adyen-kyc-structured-list__label"],
+        className: styles$2.structuredListLabel,
         children: i18n.get(item.labelKey)
       }), jsx("dd", {
-        className: styles$2["adyen-kyc-structured-list__value"],
+        className: styles$2.structuredListValue,
         children: item.value
       })]
     }, item.labelKey))
   });
 };
 function VerifiedBusinessCard({
-  verifiedBusiness
+  verifiedBusiness,
+  verifiedAddress
 }) {
   const {
     i18n
   } = useI18nContext();
   const [expanded, setExpanded] = useState(false);
-  const address = (verifiedBusiness == null ? void 0 : verifiedBusiness.street) && (verifiedBusiness == null ? void 0 : verifiedBusiness.city) && (verifiedBusiness == null ? void 0 : verifiedBusiness.state) && (verifiedBusiness == null ? void 0 : verifiedBusiness.zipcode) ? `${verifiedBusiness == null ? void 0 : verifiedBusiness.street} ${verifiedBusiness.city} ${verifiedBusiness.state} ${verifiedBusiness.zipcode}` : verifiedBusiness == null ? void 0 : verifiedBusiness.address;
-  const addressLink = (verifiedBusiness == null ? void 0 : verifiedBusiness.address) ? `https://www.google.com/maps/place/${verifiedBusiness == null ? void 0 : verifiedBusiness.address.replaceAll(" ", "+")}` : void 0;
+  const address = (verifiedAddress == null ? void 0 : verifiedAddress.address) && (verifiedAddress == null ? void 0 : verifiedAddress.city) && (verifiedAddress == null ? void 0 : verifiedAddress.stateOrProvince) && (verifiedAddress == null ? void 0 : verifiedAddress.postalCode) ? `${verifiedAddress == null ? void 0 : verifiedAddress.address} ${verifiedAddress.city} ${verifiedAddress.stateOrProvince} ${verifiedAddress.postalCode}` : verifiedBusiness == null ? void 0 : verifiedBusiness.address;
+  const addressLink = address ? `https://www.google.com/maps/place/${address.replaceAll(" ", "+")}` : void 0;
   const baseItems = useMemo(() => [{
     labelKey: "legalCompanyName__US",
     value: verifiedBusiness == null ? void 0 : verifiedBusiness.name
@@ -24196,7 +24656,7 @@ function VerifiedBusinessCard({
     value: verifiedBusiness == null ? void 0 : verifiedBusiness.legalForm
   }, {
     labelKey: "address",
-    value: jsxs("div", {
+    value: jsxs("span", {
       className: "adyen-kyc-verified-business-card__address",
       children: [address, addressLink && jsx(Link, {
         external: true,
@@ -24205,24 +24665,30 @@ function VerifiedBusinessCard({
       })]
     })
   }].filter((item) => !!item.value), [address, addressLink, i18n, verifiedBusiness == null ? void 0 : verifiedBusiness.legalForm]);
-  return jsx("section", {
-    children: jsxs("div", {
-      className: "adyen-kyc-verified-business-card",
+  const expandedContentClasses = cx("adyen-kyc-verified-business-card__content", {
+    "adyen-kyc-verified-business-card__content--collapsed": !expanded,
+    "adyen-kyc-verified-business-card__content--expanded": expanded
+  });
+  return jsxs("section", {
+    className: "adyen-kyc-verified-business-card",
+    children: [jsxs("div", {
+      className: "adyen-kyc-verified-business-card__content",
       children: [jsx(StructuredList, {
         items: baseItems
-      }), jsx(Divider, {}), expanded && jsxs(Fragment, {
-        children: [jsx(StructuredList, {
-          items: expandedItems
-        }), jsx(Divider, {})]
-      }), jsx("div", {
-        className: "adyen-kyc-verified-business-card__button",
-        children: jsx(Button, {
-          label: expanded ? i18n.get("hideDetails") : i18n.get("showDetails"),
-          showAsLink: true,
-          onClick: () => setExpanded(!expanded)
-        })
-      })]
-    })
+      }), jsx(Divider, {})]
+    }), jsxs("div", {
+      className: expandedContentClasses,
+      children: [jsx(StructuredList, {
+        items: expandedItems
+      }), jsx(Divider, {})]
+    }), jsx("div", {
+      className: "adyen-kyc-verified-business-card__expand-button",
+      children: jsx(Button, {
+        label: expanded ? i18n.get("hideDetails") : i18n.get("showDetails"),
+        showAsLink: true,
+        onClick: () => setExpanded(!expanded)
+      })
+    })]
   });
 }
 const ADDITIONAL_INFORMATION_FORM_ID = "additionalInformation";
@@ -24252,20 +24718,21 @@ function AdditionalInformationComponent({
   handleFindAddress
 }) {
   var _a, _b, _c, _d;
+  const {
+    basicInformation
+  } = useGlobalData();
   const {
     updateStateSlice
   } = useGlobalDataSlice(ADDITIONAL_INFORMATION_FORM_ID);
   const {
     i18n
   } = useI18nContext();
+  const {
+    isExperimentEnabled
+  } = useExperimentsContext();
   const showVerified = !!verifiedBusiness;
   const showStockData = companyType === CompanyTypesValue.PUBLIC_COMPANY;
-  const ADDRESS_SCHEMA2 = getAddressSchemaForCountry(country).filter((field) => {
-    if (!COUNTRIES_WITH_STATES_DATASET.includes(country)) {
-      return field !== "otherAddressInformation" && field !== "stateOrProvince";
-    }
-    return field !== "otherAddressInformation";
-  });
+  const addressSchema = getAddressSchemaForCountry(country).filter((field) => !COUNTRIES_WITH_STATES_DATASET.includes(country) ? field !== "stateOrProvince" : true);
   const initialFormUtilsProps = useMemo(() => ({
     data,
     labels: labels2,
@@ -24397,10 +24864,30 @@ function AdditionalInformationComponent({
       valid: formValid,
       fieldProblems: formFieldProblems
     });
-  }, [formSchema, formData, formErrors, formFieldProblems, formValid, updateStateSlice]);
-  useEffect(() => {
-    if (verifiedBusiness && verifiedBusiness.name !== formData.legalCompanyName) return handleChangeFor("legalCompanyName")(verifiedBusiness.name);
-  }, [formData.legalCompanyName, verifiedBusiness, showCompanyStructure]);
+  }, [formSchema, formData, formErrors, formValid, formFieldProblems]);
+  const verifiedAddress = useMemo(() => {
+    if (!verifiedBusiness) return void 0;
+    return verifiedBusiness.isPrincipalAddress || verifiedBusiness.state && (basicInformation == null ? void 0 : basicInformation.stateOrProvince) !== verifiedBusiness.state ? {
+      operationalAddress: {
+        ...mapAddressData(verifiedBusiness),
+        country
+      }
+    } : {
+      registrationAddress: {
+        ...mapAddressData(verifiedBusiness),
+        country
+      }
+    };
+  }, [verifiedBusiness, basicInformation == null ? void 0 : basicInformation.stateOrProvince, country]);
+  const hideRegistrationAddress = useMemo(() => addressSchema.filter((field) => field !== "otherAddressInformation").every((field) => {
+    var _a2;
+    return !!((_a2 = verifiedAddress == null ? void 0 : verifiedAddress.registrationAddress) == null ? void 0 : _a2[field]);
+  }) && Boolean(verifiedBusiness == null ? void 0 : verifiedBusiness.isTrustedAddress) && isExperimentEnabled("EnableNewAddressComponent"), [addressSchema, verifiedBusiness == null ? void 0 : verifiedBusiness.isTrustedAddress, isExperimentEnabled, verifiedAddress == null ? void 0 : verifiedAddress.registrationAddress]);
+  useEffect(
+    () => applyVerifiedBusinessData(verifiedBusiness, handleChangeFor),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    [verifiedBusiness]
+  );
   useEffect(() => {
     if (!verifiedBusiness && !showCompanyStructure) resetToDefaultData();
   }, [verifiedBusiness]);
@@ -24421,7 +24908,14 @@ function AdditionalInformationComponent({
     handleChangeFor("operationalAddress")(state.data);
     setValid("operationalAddress", Boolean(state.isValid));
   };
-  const handleOperationalAddressIsSameChange = (isChecked) => isChecked ? handleChangeFor("operationalAddressIsSame")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME) : handleChangeFor("operationalAddressIsSame")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME);
+  const handleOperationalAddressIsSameChange = (isChecked) => {
+    if (isChecked) {
+      handleChangeFor("operationalAddressIsSame")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME);
+      setValid("operationalAddress", true);
+    } else {
+      handleChangeFor("operationalAddressIsSame")(operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME);
+    }
+  };
   return jsxs("form", {
     id: ADDITIONAL_INFORMATION_FORM_ID,
     className: "adyen-kyc-additional-information",
@@ -24433,7 +24927,7 @@ function AdditionalInformationComponent({
       verificationErrors: formVerificationErrors,
       validationErrors: fieldValidationErrors,
       formUtils
-    }), showVerified && jsxs("div", {
+    }), showVerified && jsxs("section", {
       children: [jsx("div", {
         className: "adyen-kyc-additional-information__section-heading",
         children: jsx(Typography, {
@@ -24442,9 +24936,10 @@ function AdditionalInformationComponent({
           children: i18n.get("verifiedInformation")
         })
       }), jsx(VerifiedBusinessCard, {
-        verifiedBusiness
+        verifiedBusiness,
+        verifiedAddress: (verifiedAddress == null ? void 0 : verifiedAddress.registrationAddress) ?? (verifiedAddress == null ? void 0 : verifiedAddress.operationalAddress)
       })]
-    }), jsxs("fieldset", {
+    }), jsxs("section", {
       children: [showVerified && jsx("div", {
         className: "adyen-kyc-additional-information__section-heading",
         children: jsx(Typography, {
@@ -24452,114 +24947,116 @@ function AdditionalInformationComponent({
           variant: "title",
           children: i18n.get("otherBusinessInformation")
         })
-      }), showField(LEGAL_COMPANY_NAME_FIELD) && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(LegalCompanyNameField, {
-          data: formUtils.getFieldData(formData, LEGAL_COMPANY_NAME_FIELD),
-          valid: formUtils.getFieldValid(formValid, LEGAL_COMPANY_NAME_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, LEGAL_COMPANY_NAME_FIELD),
-          labels: formUtils.getFieldLabels(LEGAL_COMPANY_NAME_FIELD),
-          helperText: formUtils.getFieldHelperText(LEGAL_COMPANY_NAME_FIELD, {
-            legalCompanyName: "legalCompanyName__helperText"
-          }),
-          readonly: formUtils.isReadOnly("legalCompanyName"),
-          handleChangeFor
-        })
-      }), showField(DBA_NAME_FIELD) && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(DBANameField, {
-          data: formUtils.getFieldData(formData, DBA_NAME_FIELD),
-          valid: formUtils.getFieldValid(formValid, DBA_NAME_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, DBA_NAME_FIELD),
-          labels: formUtils.getFieldLabels(DBA_NAME_FIELD, {
-            hasDba: "hasDba"
-          }),
-          readonly: formUtils.isReadOnly("dbaName"),
-          handleChangeFor,
-          setErrors
-        })
-      }), showField(BUSINESS_REGISTRATION_NUMBER_FIELD) && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(BusinessRegistrationNumberField, {
-          data: formUtils.getFieldData(formData, BUSINESS_REGISTRATION_NUMBER_FIELD),
-          valid: formUtils.getFieldValid(formValid, BUSINESS_REGISTRATION_NUMBER_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, BUSINESS_REGISTRATION_NUMBER_FIELD),
-          labels: formUtils.getFieldLabels(BUSINESS_REGISTRATION_NUMBER_FIELD, {
-            exemptedFromRegistrationNumber: "iDontHaveARegistrationNumber"
-          }),
-          mask: formUtils.getMask("registrationNumber"),
-          guidanceText: formUtils.getFieldGuidanceText(BUSINESS_REGISTRATION_NUMBER_FIELD),
-          placeholders: formUtils.getFieldPlaceholders(BUSINESS_REGISTRATION_NUMBER_FIELD),
-          helperText: formUtils.getFieldHelperText(BUSINESS_REGISTRATION_NUMBER_FIELD),
-          readonly: formUtils.isReadOnly("registrationNumber"),
-          optional: formUtils.isOptionalField("registrationNumber"),
-          shouldValidate,
-          handleChangeFor,
-          country,
-          canExempt: formUtils.isRequiredField("exemptedFromRegistrationNumber"),
-          companyType,
-          registrationNumberOptions,
-          registrationNumberType,
-          setRegistrationNumberType
-        })
-      }), showField(TAX_INFORMATION_FIELD) && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(TaxInformationField, {
-          data: formUtils.getFieldData(formData, TAX_INFORMATION_FIELD),
-          valid: formUtils.getFieldValid(formValid, TAX_INFORMATION_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, TAX_INFORMATION_FIELD),
-          labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD, {
-            exemptedFromTax: "iDontHaveATaxId"
-          }),
-          mask: formUtils.getMask("taxInformation"),
-          helperText: formUtils.getFieldHelperText(TAX_INFORMATION_FIELD),
-          guidanceText: formUtils.getFieldGuidanceText(TAX_INFORMATION_FIELD),
-          readonly: formUtils.isReadOnly("taxInformation"),
-          shouldValidate,
-          handleChangeFor,
-          canExempt: formUtils.isRequiredField("exemptedFromTax"),
-          isUen: formUtils.isRequiredField("isUen"),
-          country,
-          companyType,
-          taxIdNumberType,
-          setTaxIdNumberType,
-          defaultData: data == null ? void 0 : data.taxInformation
-        })
-      }), showField(VAT_NUMBER_FIELD) && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(VatNumberField, {
-          data: formUtils.getFieldData(formData, VAT_NUMBER_FIELD),
-          valid: formUtils.getFieldValid(formValid, VAT_NUMBER_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, VAT_NUMBER_FIELD),
-          labels: formUtils.getFieldLabels(VAT_NUMBER_FIELD, {
-            exemptedFromVat: "iDontHaveAVatNumber"
-          }),
-          mask: formUtils.getMask("vatNumber"),
-          guidanceText: formUtils.getFieldGuidanceText(VAT_NUMBER_FIELD),
-          placeholders: formUtils.getFieldPlaceholders(VAT_NUMBER_FIELD),
-          readonly: formUtils.isReadOnly("vatNumber"),
-          handleChangeFor,
-          country,
-          canExempt: formUtils.isRequiredField("exemptedFromVat"),
-          vatNumberType,
-          setVatNumberType,
-          shouldValidate
-        })
-      }), showField(DATE_OF_INCORPORATION_FIELD) && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(DateOfIncorporationField, {
-          data: formUtils.getFieldData(formData, DATE_OF_INCORPORATION_FIELD),
-          valid: formUtils.getFieldValid(formValid, DATE_OF_INCORPORATION_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, DATE_OF_INCORPORATION_FIELD),
-          labels: formUtils.getFieldLabels(DATE_OF_INCORPORATION_FIELD),
-          placeholders: formUtils.getFieldPlaceholders(DATE_OF_INCORPORATION_FIELD, {
-            dateOfIncorporation: "datePlaceholder"
-          }),
-          readonly: formUtils.isReadOnly("dateOfIncorporation"),
-          handleChangeFor
-        })
+      }), jsxs("fieldset", {
+        children: [showField(LEGAL_COMPANY_NAME_FIELD) && jsx("div", {
+          className: "adyen-kyc-field-wrapper",
+          children: jsx(LegalCompanyNameField, {
+            data: formUtils.getFieldData(formData, LEGAL_COMPANY_NAME_FIELD),
+            valid: formUtils.getFieldValid(formValid, LEGAL_COMPANY_NAME_FIELD),
+            errors: formUtils.getFieldErrors(formErrors, formFieldProblems, LEGAL_COMPANY_NAME_FIELD),
+            labels: formUtils.getFieldLabels(LEGAL_COMPANY_NAME_FIELD),
+            helperText: formUtils.getFieldHelperText(LEGAL_COMPANY_NAME_FIELD, {
+              legalCompanyName: "legalCompanyName__helperText"
+            }),
+            readonly: formUtils.isReadOnly("legalCompanyName"),
+            handleChangeFor
+          })
+        }), showField(DBA_NAME_FIELD) && jsx("div", {
+          className: "adyen-kyc-field-wrapper",
+          children: jsx(DBANameField, {
+            data: formUtils.getFieldData(formData, DBA_NAME_FIELD),
+            valid: formUtils.getFieldValid(formValid, DBA_NAME_FIELD),
+            errors: formUtils.getFieldErrors(formErrors, formFieldProblems, DBA_NAME_FIELD),
+            labels: formUtils.getFieldLabels(DBA_NAME_FIELD, {
+              hasDba: "hasDba"
+            }),
+            readonly: formUtils.isReadOnly("dbaName"),
+            handleChangeFor,
+            setErrors
+          })
+        }), showField(BUSINESS_REGISTRATION_NUMBER_FIELD) && jsx("div", {
+          className: "adyen-kyc-field-wrapper",
+          children: jsx(BusinessRegistrationNumberField, {
+            data: formUtils.getFieldData(formData, BUSINESS_REGISTRATION_NUMBER_FIELD),
+            valid: formUtils.getFieldValid(formValid, BUSINESS_REGISTRATION_NUMBER_FIELD),
+            errors: formUtils.getFieldErrors(formErrors, formFieldProblems, BUSINESS_REGISTRATION_NUMBER_FIELD),
+            labels: formUtils.getFieldLabels(BUSINESS_REGISTRATION_NUMBER_FIELD, {
+              exemptedFromRegistrationNumber: "iDontHaveARegistrationNumber"
+            }),
+            mask: formUtils.getMask("registrationNumber"),
+            guidanceText: formUtils.getFieldGuidanceText(BUSINESS_REGISTRATION_NUMBER_FIELD),
+            placeholders: formUtils.getFieldPlaceholders(BUSINESS_REGISTRATION_NUMBER_FIELD),
+            helperText: formUtils.getFieldHelperText(BUSINESS_REGISTRATION_NUMBER_FIELD),
+            readonly: formUtils.isReadOnly("registrationNumber"),
+            optional: formUtils.isOptionalField("registrationNumber"),
+            shouldValidate,
+            handleChangeFor,
+            country,
+            canExempt: formUtils.isRequiredField("exemptedFromRegistrationNumber"),
+            companyType,
+            registrationNumberOptions,
+            registrationNumberType,
+            setRegistrationNumberType
+          })
+        }), showField(TAX_INFORMATION_FIELD) && jsx("div", {
+          className: "adyen-kyc-field-wrapper",
+          children: jsx(TaxInformationField, {
+            data: formUtils.getFieldData(formData, TAX_INFORMATION_FIELD),
+            valid: formUtils.getFieldValid(formValid, TAX_INFORMATION_FIELD),
+            errors: formUtils.getFieldErrors(formErrors, formFieldProblems, TAX_INFORMATION_FIELD),
+            labels: formUtils.getFieldLabels(TAX_INFORMATION_FIELD, {
+              exemptedFromTax: "iDontHaveATaxId"
+            }),
+            mask: formUtils.getMask("taxInformation"),
+            helperText: formUtils.getFieldHelperText(TAX_INFORMATION_FIELD),
+            guidanceText: formUtils.getFieldGuidanceText(TAX_INFORMATION_FIELD),
+            readonly: formUtils.isReadOnly("taxInformation"),
+            shouldValidate,
+            handleChangeFor,
+            canExempt: formUtils.isRequiredField("exemptedFromTax"),
+            isUen: formUtils.isRequiredField("isUen"),
+            country,
+            companyType,
+            taxIdNumberType,
+            setTaxIdNumberType,
+            defaultData: data == null ? void 0 : data.taxInformation
+          })
+        }), showField(VAT_NUMBER_FIELD) && jsx("div", {
+          className: "adyen-kyc-field-wrapper",
+          children: jsx(VatNumberField, {
+            data: formUtils.getFieldData(formData, VAT_NUMBER_FIELD),
+            valid: formUtils.getFieldValid(formValid, VAT_NUMBER_FIELD),
+            errors: formUtils.getFieldErrors(formErrors, formFieldProblems, VAT_NUMBER_FIELD),
+            labels: formUtils.getFieldLabels(VAT_NUMBER_FIELD, {
+              exemptedFromVat: "iDontHaveAVatNumber"
+            }),
+            mask: formUtils.getMask("vatNumber"),
+            guidanceText: formUtils.getFieldGuidanceText(VAT_NUMBER_FIELD),
+            placeholders: formUtils.getFieldPlaceholders(VAT_NUMBER_FIELD),
+            readonly: formUtils.isReadOnly("vatNumber"),
+            handleChangeFor,
+            country,
+            canExempt: formUtils.isRequiredField("exemptedFromVat"),
+            vatNumberType,
+            setVatNumberType,
+            shouldValidate
+          })
+        }), showField(DATE_OF_INCORPORATION_FIELD) && jsx("div", {
+          className: "adyen-kyc-field-wrapper",
+          children: jsx(DateOfIncorporationField, {
+            data: formUtils.getFieldData(formData, DATE_OF_INCORPORATION_FIELD),
+            valid: formUtils.getFieldValid(formValid, DATE_OF_INCORPORATION_FIELD),
+            errors: formUtils.getFieldErrors(formErrors, formFieldProblems, DATE_OF_INCORPORATION_FIELD),
+            labels: formUtils.getFieldLabels(DATE_OF_INCORPORATION_FIELD),
+            placeholders: formUtils.getFieldPlaceholders(DATE_OF_INCORPORATION_FIELD, {
+              dateOfIncorporation: "datePlaceholder"
+            }),
+            readonly: formUtils.isReadOnly("dateOfIncorporation"),
+            handleChangeFor
+          })
+        })]
       })]
-    }), showStockData && jsxs("fieldset", {
+    }), showStockData && jsxs("section", {
       children: [jsx("div", {
         className: "adyen-kyc-additional-information__section-heading",
         children: jsx(Typography, {
@@ -24567,50 +25064,55 @@ function AdditionalInformationComponent({
           variant: "title",
           children: i18n.get("stockExchangeInformation")
         })
-      }), showField(STOCK_EXCHANGE_MIC_FIELD) && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(StockExchangeMICField, {
-          data: formUtils.getFieldData(formData, STOCK_EXCHANGE_MIC_FIELD),
-          valid: formUtils.getFieldValid(formValid, STOCK_EXCHANGE_MIC_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STOCK_EXCHANGE_MIC_FIELD),
-          labels: formUtils.getFieldLabels(STOCK_EXCHANGE_MIC_FIELD),
-          placeholders: formUtils.getFieldPlaceholders(STOCK_EXCHANGE_MIC_FIELD),
-          mask: formUtils.getMask("stockExchangeMIC"),
-          guidanceText: formUtils.getFieldGuidanceText(STOCK_EXCHANGE_MIC_FIELD),
-          readonly: formUtils.isReadOnly("stockExchangeMIC"),
-          shouldValidate,
-          handleChangeFor
-        })
-      }), showField(STOCK_ISIN_FIELD) && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(StockISINField, {
-          data: formUtils.getFieldData(formData, STOCK_ISIN_FIELD),
-          valid: formUtils.getFieldValid(formValid, STOCK_ISIN_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STOCK_ISIN_FIELD),
-          labels: formUtils.getFieldLabels(STOCK_ISIN_FIELD),
-          placeholders: formUtils.getFieldPlaceholders(STOCK_ISIN_FIELD),
-          mask: formUtils.getMask("stockISIN"),
-          guidanceText: formUtils.getFieldGuidanceText(STOCK_ISIN_FIELD),
-          readonly: formUtils.isReadOnly("stockISIN"),
-          shouldValidate,
-          handleChangeFor
-        })
-      }), showField(STOCK_TICKER_SYMBOL_FIELD) && jsx("div", {
-        className: "adyen-kyc-field-wrapper",
-        children: jsx(StockTickerSymbolField, {
-          data: formUtils.getFieldData(formData, STOCK_TICKER_SYMBOL_FIELD),
-          valid: formUtils.getFieldValid(formValid, STOCK_TICKER_SYMBOL_FIELD),
-          errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STOCK_TICKER_SYMBOL_FIELD),
-          labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
-          placeholders: formUtils.getFieldPlaceholders(STOCK_TICKER_SYMBOL_FIELD),
-          mask: formUtils.getMask("stockTickerSymbol"),
-          guidanceText: formUtils.getFieldGuidanceText(STOCK_TICKER_SYMBOL_FIELD),
-          readonly: formUtils.isReadOnly("stockTickerSymbol"),
-          shouldValidate,
-          handleChangeFor
-        })
+      }), jsxs("fieldset", {
+        children: [showField(STOCK_EXCHANGE_MIC_FIELD) && jsx("div", {
+          className: "adyen-kyc-field-wrapper",
+          children: jsx(StockExchangeMICField, {
+            data: formUtils.getFieldData(formData, STOCK_EXCHANGE_MIC_FIELD),
+            valid: formUtils.getFieldValid(formValid, STOCK_EXCHANGE_MIC_FIELD),
+            errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STOCK_EXCHANGE_MIC_FIELD),
+            labels: formUtils.getFieldLabels(STOCK_EXCHANGE_MIC_FIELD),
+            placeholders: formUtils.getFieldPlaceholders(STOCK_EXCHANGE_MIC_FIELD),
+            mask: formUtils.getMask("stockExchangeMIC"),
+            guidanceText: formUtils.getFieldGuidanceText(STOCK_EXCHANGE_MIC_FIELD),
+            readonly: formUtils.isReadOnly("stockExchangeMIC"),
+            shouldValidate,
+            handleChangeFor
+          })
+        }), showField(STOCK_ISIN_FIELD) && jsx("div", {
+          className: "adyen-kyc-field-wrapper",
+          children: jsx(StockISINField, {
+            data: formUtils.getFieldData(formData, STOCK_ISIN_FIELD),
+            valid: formUtils.getFieldValid(formValid, STOCK_ISIN_FIELD),
+            errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STOCK_ISIN_FIELD),
+            labels: formUtils.getFieldLabels(STOCK_ISIN_FIELD),
+            placeholders: formUtils.getFieldPlaceholders(STOCK_ISIN_FIELD),
+            mask: formUtils.getMask("stockISIN"),
+            guidanceText: formUtils.getFieldGuidanceText(STOCK_ISIN_FIELD),
+            readonly: formUtils.isReadOnly("stockISIN"),
+            shouldValidate,
+            handleChangeFor
+          })
+        }), showField(STOCK_TICKER_SYMBOL_FIELD) && jsx("div", {
+          className: "adyen-kyc-field-wrapper",
+          children: jsx(StockTickerSymbolField, {
+            data: formUtils.getFieldData(formData, STOCK_TICKER_SYMBOL_FIELD),
+            valid: formUtils.getFieldValid(formValid, STOCK_TICKER_SYMBOL_FIELD),
+            errors: formUtils.getFieldErrors(formErrors, formFieldProblems, STOCK_TICKER_SYMBOL_FIELD),
+            labels: formUtils.getFieldLabels(STOCK_TICKER_SYMBOL_FIELD),
+            placeholders: formUtils.getFieldPlaceholders(STOCK_TICKER_SYMBOL_FIELD),
+            mask: formUtils.getMask("stockTickerSymbol"),
+            guidanceText: formUtils.getFieldGuidanceText(STOCK_TICKER_SYMBOL_FIELD),
+            readonly: formUtils.isReadOnly("stockTickerSymbol"),
+            shouldValidate,
+            handleChangeFor
+          })
+        })]
       })]
-    }), jsxs("fieldset", {
+    }), jsxs("section", {
+      style: {
+        display: hideRegistrationAddress ? "none" : "unset"
+      },
       children: [jsxs("div", {
         className: "adyen-kyc-additional-information__section-heading",
         children: [jsx(Typography, {
@@ -24622,7 +25124,7 @@ function AdditionalInformationComponent({
           variant: "body",
           children: i18n.get("registeredBusinessAddressDescription")
         })]
-      }), jsx(Address, {
+      }), jsx(AddressExperimentWrapper, {
         id: ADDITIONAL_INFORMATION_FORM_ID,
         addressType: "registrationAddress",
         data: {
@@ -24631,16 +25133,18 @@ function AdditionalInformationComponent({
         },
         labels: getAddressSchemaLabelsByCountry(country),
         countryCode: country,
-        requiredFields: ADDRESS_SCHEMA2,
+        requiredFields: addressSchema,
         shouldValidate,
         hideCountry: true,
         optionalFields: ["otherAddressInformation"],
+        readOnlyFields: verifiedBusiness ? ["stateOrProvince"] : [],
         onChange: handleRegistrationAddressChange,
         handleAddressSearch,
         handleFindAddress,
-        verifiedBusiness
+        verifiedBusiness,
+        verifiedAddress: verifiedAddress == null ? void 0 : verifiedAddress.registrationAddress
       })]
-    }), jsxs("fieldset", {
+    }), jsxs("section", {
       children: [jsxs("div", {
         className: "adyen-kyc-additional-information__section-heading",
         children: [jsx(Typography, {
@@ -24667,7 +25171,7 @@ function AdditionalInformationComponent({
           checked: formData.operationalAddressIsSame ? formData.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_SAME : true,
           onChange: handleOperationalAddressIsSameChange
         })
-      }), formData.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME && jsx(Address, {
+      }), formData.operationalAddressIsSame === operationalAddressIsSameIds.OPERATIONAL_ADDRESS_IS_NOT_SAME && jsx(AddressExperimentWrapper, {
         id: ADDITIONAL_INFORMATION_FORM_ID,
         addressType: "operationalAddress",
         data: {
@@ -24676,12 +25180,15 @@ function AdditionalInformationComponent({
         },
         labels: getAddressSchemaLabelsByCountry(country),
         countryCode: country,
-        requiredFields: ADDRESS_SCHEMA2,
+        requiredFields: addressSchema,
         shouldValidate,
+        hideCountry: true,
         optionalFields: ["otherAddressInformation"],
         onChange: handleOperationalAddressChange,
         handleAddressSearch,
-        handleFindAddress
+        handleFindAddress,
+        verifiedBusiness,
+        verifiedAddress: verifiedAddress == null ? void 0 : verifiedAddress.operationalAddress
       })]
     })]
   });
@@ -24936,10 +25443,10 @@ function BusinessSelectionComponent({
       if (fetching === "loading") return;
       if (!selectedBusinessId || selectedBusinessId !== result.id) {
         setSelectedBusinessId(result.id);
-        const businessData = await fetchBusinessData(result);
+        const businessData = await fetchBusinessData(result, basicInformation == null ? void 0 : basicInformation.stateOrProvince);
         setCurrentBusinessSelection(businessData);
       } else if (fetching === "error") {
-        const businessData = await fetchBusinessData(result);
+        const businessData = await fetchBusinessData(result, basicInformation == null ? void 0 : basicInformation.stateOrProvince);
         setCurrentBusinessSelection(businessData);
       }
     } catch (e) {
@@ -27147,7 +27654,7 @@ function BusinessDetailsDropinComponent({
   handleClearCompanyData,
   onTypeSwitch
 }) {
-  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m;
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
   const {
     state: {
       currentState
@@ -27314,17 +27821,17 @@ function BusinessDetailsDropinComponent({
     return tinMatch;
   }, [verifyBusinessData]);
   const findBusiness = useCallback(async (data) => {
-    var _a2, _b2, _c2;
+    var _a2, _b2, _c2, _d2;
     const tin = (_c2 = (_b2 = (_a2 = currentState.data.basicInformation) == null ? void 0 : _a2.taxInformation) == null ? void 0 : _b2.find((taxId) => currentCountry === taxId.country)) == null ? void 0 : _c2.number;
     const results = await searchForBusiness(data);
     if (results && results.length === 1) {
-      const businessData = await fetchBusinessData(results[0]);
+      const businessData = await fetchBusinessData(results[0], (_d2 = currentState.data.basicInformation) == null ? void 0 : _d2.stateOrProvince);
       if (businessData && tin) {
         const tinMatch = await handleVerifyBusinessData(businessData, tin);
         return tinMatch ? handleNextClick() : void 0;
       }
     }
-  }, [currentCountry, (_e = currentState.data.basicInformation) == null ? void 0 : _e.taxInformation, fetchBusinessData, handleNextClick, searchForBusiness, handleVerifyBusinessData]);
+  }, [currentCountry, (_e = currentState.data.basicInformation) == null ? void 0 : _e.taxInformation, (_f = currentState.data.basicInformation) == null ? void 0 : _f.stateOrProvince, fetchBusinessData, handleNextClick, searchForBusiness, handleVerifyBusinessData]);
   useEffect(() => {
     if (searchResults && !searchResults.length || searching === "error") {
       setShowCompanyStructure(true);
@@ -27336,7 +27843,7 @@ function BusinessDetailsDropinComponent({
       setShowCompanyStructure(false);
       resetBusinessData();
     }
-  }, [currentSearchName, (_f = currentState.data.basicInformation) == null ? void 0 : _f.businessName]);
+  }, [currentSearchName, (_g = currentState.data.basicInformation) == null ? void 0 : _g.businessName]);
   const [showBusinessSelection, setShowBusinessSelection] = useState(false);
   const isBusinessSelection = useMemo(() => showBusinessSelection && activeForm.formId === "basicInformation", [activeForm.formId, showBusinessSelection]);
   const hideBack = useMemo(() => {
@@ -27383,7 +27890,7 @@ function BusinessDetailsDropinComponent({
       default:
         return gotoFormByFormIndex(index);
     }
-  }, [canSubmitForm, currentCountry, (_g = currentState.data.basicInformation) == null ? void 0 : _g.businessName, (_h = currentState.data.basicInformation) == null ? void 0 : _h.country, (_i = currentState.data.basicInformation) == null ? void 0 : _i.stateOrProvince, findBusiness, forms2, gotoFormByFormIndex, isBusinessSelection, searchResults, verifiedBusiness, activeForm.formId]);
+  }, [canSubmitForm, currentCountry, (_h = currentState.data.basicInformation) == null ? void 0 : _h.businessName, (_i = currentState.data.basicInformation) == null ? void 0 : _i.country, (_j = currentState.data.basicInformation) == null ? void 0 : _j.stateOrProvince, findBusiness, forms2, gotoFormByFormIndex, isBusinessSelection, searchResults, verifiedBusiness, activeForm.formId]);
   const nextClick = useCallback(() => {
     var _a2, _b2, _c2, _d2, _e2, _f2, _g2;
     if (!COUNTRIES_USING_COMPANY_SEARCH.includes(currentCountry)) return handleNextClick();
@@ -27406,7 +27913,7 @@ function BusinessDetailsDropinComponent({
       default:
         return handleNextClick();
     }
-  }, [currentCountry, handleNextClick, activeForm.formId, verifiedBusiness, (_j = currentState.validityByForm) == null ? void 0 : _j.basicInformation, (_k = currentState.data.basicInformation) == null ? void 0 : _k.businessName, (_l = currentState.data.basicInformation) == null ? void 0 : _l.country, (_m = currentState.data.basicInformation) == null ? void 0 : _m.stateOrProvince, isBusinessSelection, findBusiness]);
+  }, [currentCountry, handleNextClick, activeForm.formId, verifiedBusiness, (_k = currentState.validityByForm) == null ? void 0 : _k.basicInformation, (_l = currentState.data.basicInformation) == null ? void 0 : _l.businessName, (_m = currentState.data.basicInformation) == null ? void 0 : _m.country, (_n = currentState.data.basicInformation) == null ? void 0 : _n.stateOrProvince, isBusinessSelection, findBusiness]);
   const backClick = useCallback(() => {
     if (!COUNTRIES_USING_COMPANY_SEARCH.includes(country)) return handleNextClick();
     switch (activeForm.formId) {
@@ -32702,7 +33209,8 @@ function IndividualDropinComponent({
     country,
     taskType,
     isEmbeddedDropin,
-    isExperimentEnabled
+    isExperimentEnabled,
+    rootLegalEntity: parentLegalEntity
   }), [country, data, taskType]);
   const customValidators = useMemo(() => isExperimentEnabled("EnableAgeVerification") ? validators({
     country,
@@ -34653,6 +35161,7 @@ function ServiceAgreementDropinComponent({
   handleDownloadAcceptedTermsOfServiceDocument,
   handleDownloadUnacceptedTermsOfServiceDocument,
   handleHomeClick,
+  handleAddSigner,
   handleSign,
   taskType,
   serviceAgreementTypes,
@@ -34693,8 +35202,8 @@ function ServiceAgreementDropinComponent({
   const forms2 = [...signedForms, ...formsToBeSigned];
   const [activeFormIndex, setActiveFormIndex] = useState(0);
   const [activeForm, setActiveForm] = useState(forms2[activeFormIndex]);
-  const canSign = (serviceAgreementTypes == null ? void 0 : serviceAgreementTypes.includes(activeForm.serviceAgreementType)) && !activeForm.acceptanceId;
-  const showSignerCard = !!activeForm.acceptanceId;
+  const canSign = (serviceAgreementTypes == null ? void 0 : serviceAgreementTypes.includes(activeForm == null ? void 0 : activeForm.serviceAgreementType)) && !(activeForm == null ? void 0 : activeForm.acceptanceId);
+  const showSignerCard = !!(activeForm == null ? void 0 : activeForm.acceptanceId);
   const handleServiceAgreementIsNotAvailableInThatLanguage = useCallback(() => {
     showToast({
       label: i18n.get("failedToGetServiceAgreementInSelectedLanguageFallbackToEn"),
@@ -34707,10 +35216,10 @@ function ServiceAgreementDropinComponent({
   } = useServiceAgreement({
     handleGetServiceAgreement,
     handleServiceAgreementIsNotAvailableInThatLanguage,
-    acceptanceId: activeForm.acceptanceId,
+    acceptanceId: activeForm == null ? void 0 : activeForm.acceptanceId,
     handleViewAcceptedTermsOfServiceDocument,
     legalEntityId: legalEntityResponse.id,
-    serviceAgreementType: activeForm.serviceAgreementType,
+    serviceAgreementType: activeForm == null ? void 0 : activeForm.serviceAgreementType,
     language: i18n.languageCode
   });
   const {
@@ -34865,12 +35374,24 @@ function ServiceAgreementDropinComponent({
       });
     }
   };
+  const addSignerAlert = jsx(Alert, {
+    variant: signers.length ? "info" : "warning",
+    className: "adyen-kyc-u-margin-top-16",
+    title: i18n.get(signers.length ? "isYourNameMissingFromSigners" : "thereAreNoSigners"),
+    children: jsx(Button, {
+      label: i18n.get("addYourselfAsSigner"),
+      onClick: handleAddSigner,
+      showAsLink: true,
+      underline: true,
+      type: "button"
+    })
+  });
   const sidebar = jsx(LoaderWrapper, {
     status: loadingStatus,
     formOpacityWhenLoading: 0.3,
     showSpinner: false,
     className: "adyen-kyc-dropin__sidebar-wrapper",
-    children: !!forms2.length && jsx(FormNavigation, {
+    children: jsx(FormNavigation, {
       forms: forms2,
       activeForm,
       gotoForm,
@@ -34883,11 +35404,11 @@ function ServiceAgreementDropinComponent({
     formOpacityWhenLoading: 0.3,
     showSpinner: false,
     className: "adyen-kyc-form-container",
-    children: [jsx(LoaderWrapper, {
+    children: [jsxs(LoaderWrapper, {
       status: contractLoadingStatus,
       formOpacityWhenLoading: 0.3,
       showSpinner: false,
-      children: serviceAgreement && jsxs(Fragment, {
+      children: [serviceAgreement && jsxs(Fragment, {
         children: [jsx(ContractViewer, {
           contract: serviceAgreement.contract,
           onExpandSection: handleExpandSection
@@ -34898,13 +35419,16 @@ function ServiceAgreementDropinComponent({
           label: i18n.get("downloadAsPdf"),
           icon: "download"
         })]
-      })
+      }), !forms2.length && jsx(Alert, {
+        variant: "info",
+        title: i18n.get("nothingNeedsToBeSigned")
+      })]
     }), canSign && jsxs(Fragment, {
-      children: [jsx(Field, {
+      children: [!!signers.length && jsx(Field, {
         name: "signer",
         label: i18n.get("signer"),
         classNameModifiers: ["col-50"],
-        className: "adyen-kyc-u-margin-y-32",
+        className: "adyen-kyc-u-margin-top-32",
         errorMessage: i18n.get((_a = errors.signer) == null ? void 0 : _a.errorMessage),
         isValid: valid.signer,
         children: (childProps) => jsx(Select, {
@@ -34915,8 +35439,9 @@ function ServiceAgreementDropinComponent({
           selected: data.signer,
           items: signers
         })
-      }), jsx(Field, {
+      }), addSignerAlert, jsx(Field, {
         name: "acceptServiceAgreement",
+        className: "adyen-kyc-u-margin-top-16",
         errorMessage: i18n.get((_b = errors.acceptServiceAgreement) == null ? void 0 : _b.errorMessage),
         isValid: valid.acceptServiceAgreement,
         children: (childProps) => jsx(Checkbox, {
@@ -34946,7 +35471,7 @@ function ServiceAgreementDropinComponent({
       homeButtonLabel: i18n.get("goToOverview"),
       onNext: canSign ? handleSignClick : () => gotoForm(activeFormIndex + 1),
       nextButtonLabel: i18n.get(canSign ? "sign" : "next"),
-      nextButtonDisabled: !canSign && activeFormIndex === forms2.length - 1,
+      nextButtonDisabled: forms2.length === 0 || !canSign && activeFormIndex === forms2.length - 1,
       onBack: () => gotoForm(activeFormIndex - 1),
       hideBackButton: activeFormIndex === 0,
       backButtonLabel: i18n.get("previous")
@@ -35604,6 +36129,10 @@ const useNavigation = ({
   onNavigate,
   handleOpenSingpassAuthorizationLink
 }) => {
+  const {
+    isSettingEnabled
+  } = useSettingsContext();
+  const showServiceAgreementsFirst = isSettingEnabled(SettingNames.ShowServiceAgreementsFirst);
   const isNewEntryFlowEnabled = useEnableNewEntryFlow();
   const showIntroduction = useShouldShowIntroduction({
     legalEntity
@@ -35671,11 +36200,12 @@ const useNavigation = ({
         canSeeEntitySelection,
         showIntroduction,
         isNewEntryFlowEnabled,
-        shouldShowSingpassSelection
+        shouldShowSingpassSelection,
+        showServiceAgreementsFirst
       });
       setTaskHistory([...taskHistory.slice(0, taskHistory.length - 1), defaultTask]);
     }
-  }, [legalEntity, accountHolder, showIntroduction, isNewEntryFlowEnabled, shouldShowSingpassSelection, taskHistory]);
+  }, [legalEntity, accountHolder, showIntroduction, isNewEntryFlowEnabled, shouldShowSingpassSelection, showServiceAgreementsFirst, taskHistory]);
   return {
     currentTask: actualTasks.at(-1),
     previousTask: actualTasks.at(-2),
@@ -35688,9 +36218,13 @@ const getDefaultTask = ({
   canSeeEntitySelection,
   isNewEntryFlowEnabled,
   showIntroduction,
-  shouldShowSingpassSelection
+  shouldShowSingpassSelection,
+  showServiceAgreementsFirst
 }) => {
   const hasLegalEntityProgressedBeyondEntitySelection = hasProgressedBeyondEntitySelection(legalEntity);
+  if (showServiceAgreementsFirst) {
+    return TaskTypes.SERVICE_AGREEMENT;
+  }
   if (isNewEntryFlowEnabled && canSeeEntitySelection && !hasLegalEntityProgressedBeyondEntitySelection) return TaskTypes.BUSINESS_TYPE_SELECTION;
   if (showIntroduction) return TaskTypes.INTRODUCTION;
   if (shouldShowSingpassSelection) return TaskTypes.SINGPASS_SELECTION;
@@ -36769,7 +37303,8 @@ function DropinComposerComponent({
         handleViewAcceptedTermsOfServiceDocument: args.handleViewAcceptedTermsOfServiceDocument,
         handleDownloadAcceptedTermsOfServiceDocument: args.handleDownloadAcceptedTermsOfServiceDocument,
         handleDownloadUnacceptedTermsOfServiceDocument: args.handleDownloadUnacceptedTermsOfServiceDocument,
-        handleHomeClick: navigateBack,
+        handleHomeClick: () => navigateTo(TaskTypes.TASKS_OVERVIEW),
+        handleAddSigner: () => navigateTo(TaskTypes.DECISION_MAKER),
         handleSign: async (...params) => {
           await args.handleSignServiceAgreement(...params);
           await getServiceAgreementStatus();
@@ -37206,7 +37741,8 @@ function CreateIndividualComponent({
   onSubmitSuccess,
   handleBackClick,
   modalView,
-  onClose
+  onClose,
+  onUnmount
 }) {
   var _a;
   const {
@@ -37234,6 +37770,12 @@ function CreateIndividualComponent({
   if (modalView) {
     setIsModalView(true);
   }
+  const handleOnClose = () => {
+    if (modalView) {
+      onUnmount == null ? void 0 : onUnmount();
+    }
+    onClose == null ? void 0 : onClose();
+  };
   const fetchLegalEntity = useCallback(async () => {
     try {
       const [parentEntity, entity] = await Promise.all([parentLegalEntityId ? getLegalEntity2(parentLegalEntityId) : Promise.resolve(void 0), legalEntityId ? getLegalEntity2(legalEntityId) : Promise.resolve(void 0)]);
@@ -37248,9 +37790,10 @@ function CreateIndividualComponent({
   }, [fetchLegalEntity]);
   const country = ((_a = legalEntity == null ? void 0 : legalEntity.individual) == null ? void 0 : _a.residentialAddress.country) ?? contextCountry;
   const onSubmit = (d) => {
-    if (onSubmitSuccess) {
-      onSubmitSuccess(d);
+    if (modalView) {
+      onUnmount == null ? void 0 : onUnmount();
     }
+    onSubmitSuccess == null ? void 0 : onSubmitSuccess(d);
   };
   return jsx(IndividualDropinComponent, {
     parentLegalEntity,
@@ -37269,7 +37812,7 @@ function CreateIndividualComponent({
     hideNavigation: true,
     asModal: isModalView,
     onSubmit,
-    handleCloseClick: onClose,
+    handleCloseClick: handleOnClose,
     taskType
   });
 }
@@ -37342,18 +37885,15 @@ var OnboardingStatus = /* @__PURE__ */ ((OnboardingStatus2) => {
   OnboardingStatus2["VERIFIED"] = "VERIFIED";
   return OnboardingStatus2;
 })(OnboardingStatus || {});
-const adyenKycSkeleton = "adyen-kyc-skeleton";
-const skeleton = "skeleton";
-const adyenKycSkeletonCircle = "adyen-kyc-skeleton__circle";
-const adyenKycSkeletonText = "adyen-kyc-skeleton__text";
+const skeleton = "adyen-kyc-skeleton";
+const skeletonCircle = "adyen-kyc-skeleton-circle";
+const skeletonText = "adyen-kyc-skeleton-text";
 const styles$1 = {
-  "adyen-kyc-skeleton": "adyen-kyc-skeleton",
-  adyenKycSkeleton,
   skeleton,
-  "adyen-kyc-skeleton__circle": "adyen-kyc-skeleton__circle",
-  adyenKycSkeletonCircle,
-  "adyen-kyc-skeleton__text": "adyen-kyc-skeleton__text",
-  adyenKycSkeletonText
+  "skeleton-circle": "adyen-kyc-skeleton-circle",
+  skeletonCircle,
+  "skeleton-text": "adyen-kyc-skeleton-text",
+  skeletonText
 };
 const Skeleton = ({
   circle = false,
@@ -37361,9 +37901,9 @@ const Skeleton = ({
   height = "1em",
   width
 }) => {
-  const classNames = cx("adyen-kyc-skeleton", {
-    [styles$1["adyen-kyc-skeleton__circle"]]: circle,
-    [styles$1["adyen-kyc-skeleton__text"]]: text
+  const classNames = cx(styles$1.skeleton, {
+    [styles$1.skeletonCircle]: circle,
+    [styles$1.skeletonText]: text
   });
   return jsx("div", {
     className: classNames,
@@ -37373,25 +37913,25 @@ const Skeleton = ({
     }
   });
 };
-const adyenKycEmbeddedStatus = "adyen-kyc-embedded-status";
-const adyenKycEmbeddedStatusLoading = "adyen-kyc-embedded-status--loading";
-const adyenKycEmbeddedStatusAvatar = "adyen-kyc-embedded-status__avatar";
-const adyenKycEmbeddedStatusLight = "adyen-kyc-embedded-status--light";
-const adyenKycEmbeddedStatusIcon = "adyen-kyc-embedded-status__icon";
-const adyenKycEmbeddedStatusInfo = "adyen-kyc-embedded-status__info";
+const embeddedStatus = "adyen-kyc-embedded-status";
+const embeddedStatusLoading = "adyen-kyc-embedded-status-loading";
+const embeddedStatusAvatar = "adyen-kyc-embedded-status-avatar";
+const embeddedStatusLight = "adyen-kyc-embedded-status-light";
+const embeddedStatusIcon = "adyen-kyc-embedded-status-icon";
+const embeddedStatusInfo = "adyen-kyc-embedded-status-info";
 const styles = {
-  "adyen-kyc-embedded-status": "adyen-kyc-embedded-status",
-  adyenKycEmbeddedStatus,
-  "adyen-kyc-embedded-status--loading": "adyen-kyc-embedded-status--loading",
-  adyenKycEmbeddedStatusLoading,
-  "adyen-kyc-embedded-status__avatar": "adyen-kyc-embedded-status__avatar",
-  adyenKycEmbeddedStatusAvatar,
-  "adyen-kyc-embedded-status--light": "adyen-kyc-embedded-status--light",
-  adyenKycEmbeddedStatusLight,
-  "adyen-kyc-embedded-status__icon": "adyen-kyc-embedded-status__icon",
-  adyenKycEmbeddedStatusIcon,
-  "adyen-kyc-embedded-status__info": "adyen-kyc-embedded-status__info",
-  adyenKycEmbeddedStatusInfo
+  "embedded-status": "adyen-kyc-embedded-status",
+  embeddedStatus,
+  "embedded-status-loading": "adyen-kyc-embedded-status-loading",
+  embeddedStatusLoading,
+  "embedded-status-avatar": "adyen-kyc-embedded-status-avatar",
+  embeddedStatusAvatar,
+  "embedded-status-light": "adyen-kyc-embedded-status-light",
+  embeddedStatusLight,
+  "embedded-status-icon": "adyen-kyc-embedded-status-icon",
+  embeddedStatusIcon,
+  "embedded-status-info": "adyen-kyc-embedded-status-info",
+  embeddedStatusInfo
 };
 const statusToTag = (status) => {
   switch (status) {
@@ -37456,23 +37996,23 @@ const EmbeddedStatus = ({
   };
   return jsxs("button", {
     type: "button",
-    className: cx(className, styles["adyen-kyc-embedded-status"], {
-      [styles["adyen-kyc-embedded-status--loading"]]: loading,
-      [styles["adyen-kyc-embedded-status--light"]]: light
+    className: cx(className, styles.embeddedStatus, {
+      [styles.embeddedStatusLoading]: loading,
+      [styles.embeddedStatusLight]: light
     }),
     onClick,
     children: [jsx("section", {
-      className: styles["adyen-kyc-embedded-status__avatar"],
+      className: styles.embeddedStatusAvatar,
       children: loading ? jsx(Skeleton, {
         height: "100%",
         width: "100%",
         circle: true
       }) : jsx(Icon, {
-        className: styles["adyen-kyc-embedded-status__icon"],
+        className: styles.embeddedStatusIcon,
         name: iconName
       })
     }), jsx("section", {
-      className: styles["adyen-kyc-embedded-status__info"],
+      className: styles.embeddedStatusInfo,
       children: loading ? jsxs(Fragment, {
         children: [jsx(Skeleton, {
           text: true,
@@ -37494,7 +38034,7 @@ const EmbeddedStatus = ({
         })]
       })
     }), actionButton ? jsx("section", {
-      className: styles["adyen-kyc-embedded-status__button"],
+      className: styles.embeddedStatusButton,
       children: loading ? jsx(Skeleton, {
         width: "5em",
         height: "2em"
@@ -37508,7 +38048,7 @@ const EmbeddedStatus = ({
         small: true
       })
     }) : statusTag.translationKey && jsx("section", {
-      className: styles["adyen-kyc-embedded-status__tag"],
+      className: styles.embeddedStatusTag,
       children: loading ? jsx(Skeleton, {
         width: "8ch",
         height: "1em"
@@ -39626,7 +40166,7 @@ const ConfigurationApiProvider = ({
     isEmbeddedDropin,
     loadingContext
   } = authContext;
-  const sdkVersion = "2.55.0";
+  const sdkVersion = "2.56.0";
   useAnalytics({
     onUserEvent,
     legalEntityId: rootLegalEntityId,
@@ -39814,7 +40354,8 @@ const settingsDefaults = {
   hideOnboardingIntroductionTrust: true,
   hideOnboardingIntroductionSoleProprietor: true,
   viewOnboardingGuidance: false,
-  transferInstrumentLimit: 0
+  transferInstrumentLimit: 0,
+  showServiceAgreementsFirst: false
 };
 function SettingsProvider({
   children,
@@ -40189,6 +40730,7 @@ class BaseElement {
       ...props
     };
     this._parentInstance = this.props._parentInstance;
+    this.remove = this.remove.bind(this);
   }
   /**
    * Mounts an element into the dom
@@ -40248,6 +40790,7 @@ class BaseElement {
     if (this._node) {
       render(null, this._node);
     }
+    this._node = void 0;
     return this;
   }
   /**
@@ -40304,7 +40847,7 @@ const DebugModal = ({
   };
   const copyToClipboard = async () => {
     const toCopy = {
-      sdkVersion: "2.55.0",
+      sdkVersion: "2.56.0",
       experiments: Object.fromEntries(allExperimentsWithValues),
       settings: Object.fromEntries(allSettingsWithValues)
     };
@@ -40343,7 +40886,7 @@ const DebugModal = ({
       children: [jsxs("div", {
         className: "adyen-kyc-debug-modal__meta",
         children: [jsxs("span", {
-          children: ["SDK version: ", "2.55.0"]
+          children: ["SDK version: ", "2.56.0"]
         }), jsxs("span", {
           children: ["rootLegalEntityId: ", rootLegalEntityId]
         })]
@@ -40491,14 +41034,14 @@ class UIElement extends BaseElement {
                       rootLegalEntityId,
                       handleGetLegalEntity: "handleGetLegalEntity" in this.props.componentProps ? this.props.componentProps.handleGetLegalEntity : void 0,
                       children: jsx("div", {
-                        className: "adyen-kyc-ui-element-container-wrapper",
                         children: jsx(AutoResizer, {
                           children: jsx("div", {
                             className: "adyen-kyc-ui-element-container",
                             children: jsx(ToastContextProvider, {
                               children: jsx(StateProvider, {
                                 children: jsx(Component, {
-                                  ...this.props.componentProps
+                                  ...this.props.componentProps,
+                                  onUnmount: this.remove
                                 })
                               })
                             })