@adyen/kyc-components 4.26.0 → 4.27.0-beta.0

package/dist/{GlobalEntryModal-DE543xEp.js → GlobalEntryModal-ZuajLl8B.js}

@@ -1,41 +1,40 @@
 try {
 	let e = "undefined" != typeof window ? window : "undefined" != typeof global ? global : "undefined" != typeof globalThis ? globalThis : "undefined" != typeof self ? self : {}, n = new e.Error().stack;
-	n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "fb6f691d-8436-4363-86f6-6577834bab99", e._sentryDebugIdIdentifier = "sentry-dbid-fb6f691d-8436-4363-86f6-6577834bab99");
+	n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "9cd4a731-32bf-4407-9bc3-10af39f1116b", e._sentryDebugIdIdentifier = "sentry-dbid-9cd4a731-32bf-4407-9bc3-10af39f1116b");
 } catch (e) {}
 import { n as addResourceBundles, r as useTranslation } from "./translation-CpH8D2NK.js";
-import { A as _rolldown_dynamic_import_helper_default, E as useAllowedCountries, it as isEmpty, k as Header, mt as useAccountHolder, x as Alert } from "./resolveEnvironment-NlZWcle4.js";
+import { C as Alert, M as _rolldown_dynamic_import_helper_default, O as useAllowedCountries, gt as useAccountHolder, j as Header, ot as isEmpty } from "./resolveEnvironment-CrNBwIpQ.js";
 import { t as createLogger } from "./logger-Z8AeTE4x.js";
 import { t as Typography } from "./Typography-CAc_f5Iq.js";
 import { t as Loader } from "./Loader-BDaKGf77.js";
-import { t as Button } from "./Button-Dwr6jvJZ.js";
+import { t as Button } from "./Button-BYafPrZH.js";
 import { s as useApiContext } from "./http-C8rt2BZk.js";
 import { t as getLegalEntityCountry } from "./getLegalEntityCountry-BK-HHa65.js";
 import { t as useSettingsContext } from "./useSettingsContext-Bpf4UqRT.js";
 import { s as keysOf } from "./genUtils-nphCwt1A.js";
 import { t as StackLayout } from "./StackLayout-J1ynSX-P.js";
 import { t as CountryCodes } from "./country-code-CJk2hdPu.js";
-import { y as reverseMapping } from "./processCapabilities-FL4-KAbd.js";
+import { y as reverseMapping } from "./processCapabilities-B75YIdXZ.js";
 import { t as TaskTypes } from "./taskTypes-3vSkMBDm.js";
 import { f as hasSolePropInLegalEntity, s as getOwnEntityAssociations } from "./entityAssociationUtil-BlfcBl3i.js";
-import { i as useToggleContext, r as useDebouncedCallback } from "./Checkbox-BQIr-4_9.js";
-import { i as useAnalyticsContext } from "./Modal-DyKW1wuk.js";
-import { t as InputText } from "./InputText-CimBq-8I.js";
-import { t as ListItem } from "./ListItem-DY-qq1lS.js";
-import { n as useAssociatedLegalEntity, t as getFormSlice } from "./getFormSlice-CxtXJ0-P.js";
+import { i as useToggleContext, r as useDebouncedCallback } from "./Checkbox-qFA2J_1r.js";
+import { i as useAnalyticsContext } from "./Modal-ChWNV9yG.js";
+import { t as InputText } from "./InputText-CGngUMdf.js";
+import { t as ListItem } from "./ListItem-n927geYb.js";
+import { t as getFormSlice } from "./getFormSlice-CxtXJ0-P.js";
 import { t as Card } from "./Card-BCGLpdw7.js";
-import { r as useToastContext } from "./useId-DHoBdW3X.js";
-import { o as getPropsFromConfigurations, r as resolveFieldMetadata, t as createFormRules } from "./form-rules-CRMDL7v8.js";
-import { p as LoaderWrapper, r as Field } from "./Select-b8cQ38Yi.js";
-import { o as StructuredList, r as formatObject, s as Confirm } from "./utils-CHeUbOCF.js";
-import { a as CountryOfGoverningLawField, c as useCompanyTypeExamples, d as companySearchQueryOptions, f as useCompanySearch, i as COUNTRY_OF_GOVERNING_LAW_FIELD, l as useCompanySelection, m as useClearCompanyData, n as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, o as useLegalCompanyNameField, p as trackPerformance, r as isNormalizedStringMatch, t as CountryOfGoverningLawFieldValidation, u as verifyTinQueryOptions } from "./validate-BbY2FS3b.js";
-import { d as COUNTRIES_WITH_STATES_DATASET, m as useCreateLegalEntity, n as StateField, p as useUpdateLegalEntity, r as stateFieldMetadata, t as STATE_FIELD } from "./StateField-fSYeyb3x.js";
-import { I as useFormComposer, K as createFormUtils, N as useMultiForm, R as summaryStep, Y as FormContextProvider, _ as FormFlow, c as COUNTRY_FIELD, f as isBusinessSelectionLegalArrangementError, g as useFormContext, l as CountryField, t as addValidityToForms } from "./dropinUtils-COH_5oC3.js";
-import { t as List } from "./List-qvNxW9lm.js";
-import { A as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, B as isUsingCompanySearch, C as getValidCompanyTypesForTaxIdNumberType, D as COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION, F as COUNTRIES_WITH_POSSIBLE_TRUSTEE_TAXID_ABSENT_V4, H as mapLocalizationToJapaneseLegalNames, I as REGISTRATION_NUMBER_EXEMPTION_RULES, L as TAX_ID_REQUIRED_COUNTRIES_ORGANIZATION, M as COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER_SOLE_PROPS, N as COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_COMPANIES, O as COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION, P as COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_SOLE_PROPS, R as isRegistrationExemptionAllowed, T as TileGroup, V as mapJapaneseLegalNamesToLocalization, _ as getTaxInformationPlaceholderText, c as DataConflictsModal, j as COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER, k as COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP, l as TAX_INFORMATION_FIELD, u as TaxInformationField, v as taxInformationDefaultFieldConfig, x as isJapanLocalizationEnabled, y as taxInformationDefaultFieldMetadata, z as isRegistrationNumberAbsentStateV4Scenario } from "./bafinUtils-DvMDkIIg.js";
-import { a as getValidCompanyTypesForRegistrationNumberType, l as registrationNumberDefaultFieldConfig, r as inferCompanyRegistrationNumberType, u as registrationNumberDefaultFieldMetadata } from "./getDefaultRegistrationNumberType-V2vtKe2c.js";
-import { a as defaultFieldMetadata, i as defaultFieldConfigV4, o as defaultFieldMetadataV4, r as defaultFieldConfig, t as LEGAL_COMPANY_NAME_FIELD } from "./LegalCompanyNameField-C6W0bxo-.js";
-import { n as BusinessRegistrationNumberField, t as BUSINESS_REGISTRATION_NUMBER_FIELD } from "./BusinessRegistrationNumberField-C53lsFml.js";
-import { r as SOLE_PROP_COUNTRIES, t as ALLOWED_UNINCORPORATED_PARTNERSHIP_COUNTRIES } from "./legalArrangementUtils-Crgt_L7h.js";
+import { r as useToastContext } from "./useId-e2xn6OME.js";
+import { a as resolveFieldMetadata, c as getPropsFromConfigurations, r as createFormRules } from "./unincorporatedPartnership-Dr3lPgDv.js";
+import { o as Field, p as LoaderWrapper } from "./Select-BMGxcmZy.js";
+import { o as StructuredList, r as formatObject, s as Confirm } from "./utils-C3-aLHsN.js";
+import { a as CountryOfGoverningLawField, c as useCompanyTypeExamples, d as companySearchQueryOptions, f as useCompanySearch, h as useClearCompanyData, i as COUNTRY_OF_GOVERNING_LAW_FIELD, l as useCompanySelection, m as useStoredStateOrProvince, n as COUNTRY_OF_GOVERNING_LAW_POSSIBLE, o as useLegalCompanyNameField, p as trackPerformance, r as isNormalizedStringMatch, t as CountryOfGoverningLawFieldValidation, u as verifyTinQueryOptions } from "./validate-bah41KLb.js";
+import { d as COUNTRIES_WITH_STATES_DATASET, h as useUpdateLegalEntity, n as StateField, p as isJapanLocalizationEnabled, r as stateFieldMetadata, t as STATE_FIELD } from "./StateField-TYw5No81.js";
+import { R as useMultiForm, U as summaryStep, V as useFormComposer, W as FormContextProvider, b as useFormContext, c as List, l as COUNTRY_FIELD, p as isBusinessSelectionLegalArrangementError, t as addValidityToForms, u as CountryField, v as createFormUtils, x as FormFlow } from "./dropinUtils-D7sD4BX1.js";
+import { D as COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER, E as COUNTRIES_USING_COMPANY_SEARCH, F as isRegistrationNumberAbsentStateV4Scenario, H as getValidCompanyTypesForTaxIdNumberType, L as mapJapaneseLegalNamesToLocalization, M as REGISTRATION_NUMBER_EXEMPTION_RULES, N as TAX_ID_REQUIRED_COUNTRIES_ORGANIZATION, P as isRegistrationExemptionAllowed, R as mapLocalizationToJapaneseLegalNames, S as COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION, T as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, W as TileGroup, _ as getTaxInformationPlaceholderText, c as DataConflictsModal, j as COUNTRIES_WITH_POSSIBLE_TRUSTEE_TAXID_ABSENT_V4, k as COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_COMPANIES, l as TAX_INFORMATION_FIELD, u as TaxInformationField, v as taxInformationDefaultFieldConfig, y as taxInformationDefaultFieldMetadata } from "./bafinUtils-4C7AJpnd.js";
+import { a as getValidCompanyTypesForRegistrationNumberType, l as registrationNumberDefaultFieldConfig, r as inferCompanyRegistrationNumberType, u as registrationNumberDefaultFieldMetadata } from "./getDefaultRegistrationNumberType-BWN86JDR.js";
+import { a as TRUST_COUNTRIES, i as SOLE_PROP_COUNTRIES, n as INDIVIDUALS_WHO_TRADE_COUNTRIES, t as ALLOWED_UNINCORPORATED_PARTNERSHIP_COUNTRIES } from "./legalArrangementUtils-CHlmmcB8.js";
+import { a as defaultFieldMetadata, i as defaultFieldConfigV4, o as defaultFieldMetadataV4, r as defaultFieldConfig, t as LEGAL_COMPANY_NAME_FIELD } from "./LegalCompanyNameField-BsY3tJfX.js";
+import { n as BusinessRegistrationNumberField, t as BUSINESS_REGISTRATION_NUMBER_FIELD } from "./BusinessRegistrationNumberField-B2n9ugLK.js";
 import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
 import { Fragment, jsx, jsxs } from "preact/jsx-runtime";
 import { createModel, signal, useModel, useSignal } from "@preact/signals";
@@ -234,7 +233,7 @@ function BusinessSelection({ id, country }) {
 	const { data: companySearchResponse, isLoading: searching } = useCompanySearch({
 		name: companySearchStateModel.companySearchName.value ?? "",
 		country,
-		state: form.data.entityInformation?.stateOrProvince,
+		state: form.data.registrationInformation?.stateOrProvince,
 		registrationNumber: form.data.registrationInformation?.registrationNumber
 	});
 	const { data: selectData, error: selectError, mutateAsync: selectCompany, reset: resetSelectMutationState } = useCompanySelection();
@@ -381,7 +380,8 @@ var companyTypeMetadata = {
 var companyTypeOptions = Object.keys(companyTypeMetadata);
 //#endregion
 //#region src/components/GlobalEntry/utils/getAvailableCompanyStructures.ts
-function getAvailableCompanyStructures({ country, registrationNumberType, registrationNumberExempt, taxIdNumberType, legalEntity }) {
+function getAvailableCompanyStructures({ country, registrationNumberType, registrationNumberExempt, taxIdNumberType, legalEntity, isSingleMemberLlc }) {
+	if (isSingleMemberLlc) return ["privateCompany"];
 	const companyTypeRadioOptions = !!legalEntity.capabilities?.issueBankAccount?.requested ? companyTypeOptions.filter((companyType) => companyType !== "governmentalOrganization") : companyTypeOptions;
 	const validCompanyTypesByRegistrationNumber = registrationNumberExempt && isRegistrationExemptionAllowed({ country }) ? REGISTRATION_NUMBER_EXEMPTION_RULES[country] ?? [] : getValidCompanyTypesForRegistrationNumberType(country, registrationNumberType);
 	const validCompanyTypesForRegistrationNumber = new Set(validCompanyTypesByRegistrationNumber);
@@ -390,6 +390,60 @@ function getAvailableCompanyStructures({ country, registrationNumberType, regist
 	return constrainedCompanyTypeRadioOptions.length > 0 ? constrainedCompanyTypeRadioOptions : companyTypeRadioOptions;
 }
 //#endregion
+//#region src/components/GlobalEntry/utils/utils.ts
+var getGlobalEntryCompanyType = (legalEntity, data) => {
+	if (data.entityInformation.entitySetup === "partOfABusiness" || isSingleMemberLLC(data)) return data.companyStructure?.organizationType ?? legalEntity?.organization?.type;
+	if (data.entityInformation.entitySetup === "justMe") {
+		const hasSoleProprietorshipAssociation = legalEntity && hasSolePropInLegalEntity(legalEntity);
+		return data.registrationInformation?.filedPaperwork === "yes" || hasSoleProprietorshipAssociation ? "soleProprietorship" : void 0;
+	}
+};
+var isPaperworkQuestionAsked = (data) => {
+	const { country, entitySetup } = data.entityInformation ?? {};
+	if (!country) return false;
+	if (entitySetup === "partOfABusiness") return ALLOWED_UNINCORPORATED_PARTNERSHIP_COUNTRIES.includes(country);
+	return entitySetup === "justMe" && SOLE_PROP_COUNTRIES.includes(country);
+};
+var getFiledPaperwork = (data) => {
+	if (isPaperworkQuestionAsked(data)) return data.registrationInformation?.filedPaperwork ?? null;
+	return data.entityInformation?.entitySetup === "partOfABusiness" ? "yes" : "no";
+};
+var isTrustQuestionAsked = (data) => data.entityInformation.entitySetup === "partOfABusiness" && getFiledPaperwork(data) === "yes" && !!data.entityInformation.country && TRUST_COUNTRIES.includes(data.entityInformation.country);
+var isSingleMemberLLC = (data) => data.entityInformation?.entitySetup === "justMe" && data.entityInformation.country === CountryCodes.UnitedStates && data.registrationInformation?.isLimitedLiabilityCorporation === "yes";
+var isUsingCompanySearch = (data) => {
+	const country = data.entityInformation.country;
+	return !!country && COUNTRIES_USING_COMPANY_SEARCH.includes(country) && (data.entityInformation.entitySetup === "partOfABusiness" && getFiledPaperwork(data) === "yes" || isSingleMemberLLC(data));
+};
+var isUnincorporatedPartnership = (data) => data.entityInformation?.entitySetup === "partOfABusiness" && getFiledPaperwork(data) === "no" && data.registrationInformation?.unincorporatedOrganizationType === "unincorporatedPartnership";
+var isTrust = (data) => data.entityInformation?.entitySetup === "partOfABusiness" && getFiledPaperwork(data) === "yes" && data.registrationInformation?.isTrust === "yes";
+/**
+* `justMe` is a natural person unless they represent a single-member LLC. Being part of a business
+* only makes the entity an `organization` when the primary partner is not an individual, because an
+* individual partner in an unincorporated partnership stays an individual legal entity.
+*/
+var determineLegalEntityType = (data) => isSingleMemberLLC(data) || data.entityInformation?.entitySetup === "partOfABusiness" && data.primaryPartner?.primaryPartnerType !== "individual" ? "organization" : "individual";
+/**
+* The account holder is derived from the form data, not sent to the API and is kept client-side.
+*/
+var determineAccountHolder = (data) => {
+	const entitySetup = data.entityInformation?.entitySetup;
+	/** Derived, because the question is not put to the user in every country */
+	const filedPaperwork = getFiledPaperwork(data);
+	if (isSingleMemberLLC(data)) return "theCompanyIWorkFor";
+	if (isTrustQuestionAsked(data) && data.registrationInformation.isTrust === "yes") return "aTrust";
+	if (entitySetup === "justMe") return filedPaperwork === "yes" ? "mySoleProprietorName" : "myName";
+	if (entitySetup === "partOfABusiness") {
+		if (isUnincorporatedPartnership(data)) return "anUnincorporatedPartnership";
+		if (isTrust(data)) return "aTrust";
+		if (filedPaperwork === "yes") return "theCompanyIWorkFor";
+	}
+};
+var determineEntityAssociations = (data, accountHolder, legalEntity) => {
+	const ownAssociations = getOwnEntityAssociations(legalEntity);
+	if (!ownAssociations || ownAssociations.length === 0) return;
+	return accountHolder !== determineAccountHolder(data) ? [] : void 0;
+};
+//#endregion
 //#region src/components/GlobalEntry/forms/CompanyStructure/CompanyStructure.tsx
 var COMPANY_STRUCTURE_FIELDS = ["organizationType"];
 function CompanyStructure({ id, country, legalEntity }) {
@@ -407,7 +461,8 @@ function CompanyStructure({ id, country, legalEntity }) {
 		registrationNumberType: registrationInformation?.registrationNumberType,
 		registrationNumberExempt: registrationInformation?.exemptedFromRegistrationNumber,
 		taxIdNumberType: registrationInformation?.taxInformation?.find((taxInformation) => taxInformation.country === country)?.type,
-		legalEntity
+		legalEntity,
+		isSingleMemberLlc: isSingleMemberLLC(form.data)
 	});
 	const companyTypeExamples = useCompanyTypeExamples(country);
 	const tiles = options.filter((option) => !!companyTypeMetadata[option]).map((option) => {
@@ -499,12 +554,8 @@ var EntitySetupField = ({ data, valid, errors, handleChangeFor }) => {
 };
 //#endregion
 //#region src/components/GlobalEntry/forms/EntityInformation/EntityInformation.tsx
-var ENTITY_INFORMATION_FIELDS = [
-	...COUNTRY_FIELD,
-	...STATE_FIELD,
-	...ENTITY_SETUP_FIELD
-];
-var EntityInformation = ({ id, country }) => {
+var ENTITY_INFORMATION_FIELDS = [...COUNTRY_FIELD, ...ENTITY_SETUP_FIELD];
+var EntityInformation = ({ id }) => {
 	const { form } = useFormContext();
 	const { t: commonT } = useTranslation("common");
 	const { t: globalEntryT } = useTranslation("globalEntry");
@@ -515,7 +566,6 @@ var EntityInformation = ({ id, country }) => {
 		optionalFields,
 		trustedFields
 	}, commonT);
-	const showField = (fieldKeys) => fieldKeys.some((field) => formUtils.isRequiredField(field) || formUtils.isOptionalField(field));
 	return /* @__PURE__ */ jsxs("form", {
 		id,
 		children: [
@@ -532,15 +582,6 @@ var EntityInformation = ({ id, country }) => {
 				allowedCountries,
 				handleChangeFor
 			}),
-			showField(STATE_FIELD) && /* @__PURE__ */ jsx(StateField, {
-				data: { stateOrProvince: data?.stateOrProvince },
-				valid: { stateOrProvince: valid?.stateOrProvince },
-				errors: { stateOrProvince: formUtils.getErrorMessage("stateOrProvince", errors, fieldProblems) },
-				selectedCountry: country,
-				readonly: false,
-				handleChangeFor,
-				labelOverride: commonT(($) => $["whereIsYourBusinessRegistered"])
-			}),
 			/* @__PURE__ */ jsx(EntitySetupField, {
 				data: { entitySetup: data?.entitySetup },
 				valid: { entitySetup: valid?.entitySetup },
@@ -622,41 +663,186 @@ var PrimaryPartner = ({ id }) => {
 	});
 };
 //#endregion
-//#region src/components/GlobalEntry/fields/PaperworkQuestionnaire/PaperworkQuestionnaire.tsx
-var PAPERWORK_QUESTIONNAIRE_FIELD = ["filedPaperwork"];
-/**
-* The paperwork answer dictates whether the entity is:
-* A) a pure individual or a sole prop, or
-* B) a registered business or an unincorporated partnership.
-*/
-function PaperworkQuestionnaire({ data, valid, handleChangeFor, errors, label }) {
-	const { t } = useTranslation(["globalEntry", "common"]);
+//#region src/components/GlobalEntry/fields/Questionnaire/Questionnaire.tsx
+function Questionnaire({ name, label, helper, selected, tiles, isValid, errorMessage, isHorizontal, onChange, onHelpClick }) {
+	const { t } = useTranslation("common");
 	return /* @__PURE__ */ jsx(Field, {
 		el: "fieldset",
-		name: "PaperworkQuestionnaire",
+		name,
 		label,
-		isValid: valid.filedPaperwork,
-		errorMessage: errors.filedPaperwork,
+		helper,
+		isValid,
+		errorMessage,
 		children: () => /* @__PURE__ */ jsxs(StackLayout, { children: [/* @__PURE__ */ jsx(Button, {
 			variant: "link",
-			onClick: () => {},
-			children: /* @__PURE__ */ jsx(Typography, { children: t(($) => $["whatDoesThisMean"], { ns: "common" }) })
+			onClick: () => onHelpClick?.(),
+			children: /* @__PURE__ */ jsx(Typography, { children: t(($) => $["whatDoesThisMean"]) })
 		}), /* @__PURE__ */ jsx(TileGroup, {
-			name: "filedPaperwork",
-			selected: data.filedPaperwork ?? "",
-			isHorizontal: true,
-			onChange: (value) => handleChangeFor("filedPaperwork")(value),
-			tiles: [{
-				label: t(($) => $["yes"], { ns: "common" }),
-				value: "yes"
-			}, {
-				label: t(($) => $["no"], { ns: "common" }),
-				value: "no"
-			}]
+			name,
+			selected: selected ?? "",
+			isHorizontal,
+			onChange,
+			tiles
 		})] })
 	});
 }
 //#endregion
+//#region src/components/GlobalEntry/fields/DbaQuestionnaire/DbaQuestionnaire.tsx
+var DBA_QUESTIONNAIRE_FIELD = ["doingBusinessAs"];
+function DbaQuestionnaire({ data, valid, errors, handleChangeFor }) {
+	const { t: commonT } = useTranslation("common");
+	const { t: globalEntryT } = useTranslation("globalEntry");
+	return /* @__PURE__ */ jsx(Questionnaire, {
+		name: "doingBusinessAs",
+		label: globalEntryT(($) => $["doYouUseABusinessNameThatsDifferentFromYourLegalName"]),
+		helper: globalEntryT(($) => $["thisIsAlsoCalledATradingNameOperatingNameOrDoingBusinessAs"]),
+		selected: data.doingBusinessAs,
+		isValid: valid.doingBusinessAs,
+		errorMessage: errors.doingBusinessAs,
+		isHorizontal: true,
+		onChange: handleChangeFor("doingBusinessAs"),
+		tiles: [{
+			label: commonT(($) => $["yes"]),
+			value: "yes"
+		}, {
+			label: commonT(($) => $["no"]),
+			value: "no"
+		}]
+	});
+}
+//#endregion
+//#region src/components/GlobalEntry/fields/LlcQuestionnaire/LlcQuestionnaire.tsx
+var LLC_QUESTIONNAIRE_FIELD = ["isLimitedLiabilityCorporation"];
+function LlcQuestionnaire({ data, valid, errors, handleChangeFor }) {
+	const { t: commonT } = useTranslation("common");
+	const { t: globalEntryT } = useTranslation("globalEntry");
+	return /* @__PURE__ */ jsx(Questionnaire, {
+		name: "isLimitedLiabilityCorporation",
+		label: globalEntryT(($) => $["isYourBusinessRegisteredAsALimitedLiabilityCorporation"]),
+		selected: data.isLimitedLiabilityCorporation,
+		isValid: valid.isLimitedLiabilityCorporation,
+		errorMessage: errors.isLimitedLiabilityCorporation,
+		isHorizontal: true,
+		onChange: handleChangeFor("isLimitedLiabilityCorporation"),
+		tiles: [{
+			label: commonT(($) => $["yes"]),
+			value: "yes"
+		}, {
+			label: commonT(($) => $["no"]),
+			value: "no"
+		}]
+	});
+}
+//#endregion
+//#region src/components/GlobalEntry/fields/PaperworkQuestionnaire/fieldConfig.ts
+var paperworkQuestionnaireDefaultFieldConfig = ({ entitySetup }) => {
+	switch (entitySetup) {
+		case "partOfABusiness": return { label: "hasYourOrganizationFiledRegistrationPaperworkWithAGovernmentAuthority" };
+		default: return { label: "areYourBusinessActivitiesRegisteredWithAGovernmentAuthority" };
+	}
+};
+var paperworkQuestionnaireFieldConfig = {
+	[CountryCodes.Australia]: ({ entitySetup }) => {
+		switch (entitySetup) {
+			case "partOfABusiness": return { label: "hasYourOrganizationFiledRegistrationPaperworkWithAGovernmentAuthority" };
+			default: return { label: "haveYouRegisteredYourIndividualBusiness" };
+		}
+	},
+	[CountryCodes.Canada]: ({ entitySetup }) => {
+		switch (entitySetup) {
+			case "partOfABusiness": return { label: "hasYourOrganizationFiledRegistrationPaperworkWithAGovernmentAuthority" };
+			default: return { label: "haveYouRegisteredYourIndividualBusiness" };
+		}
+	},
+	[CountryCodes.France]: ({ entitySetup }) => {
+		switch (entitySetup) {
+			case "partOfABusiness": return { label: "hasYourOrganizationFiledRegistrationPaperworkWithTheINPI" };
+			default: return { label: "areYouRegisteredAsAnAutoOrMicroEntrepreneur" };
+		}
+	},
+	[CountryCodes.Germany]: ({ entitySetup }) => {
+		switch (entitySetup) {
+			case "partOfABusiness": return { label: "hasYourOrganizationFiledRegistrationPaperworkWithTheHandelregister" };
+			default: return { label: "areYouRegisteredAsAFreiberufler" };
+		}
+	},
+	[CountryCodes.Mexico]: () => {
+		return { label: "areYouRegisteredAsAPersonaFisica" };
+	},
+	[CountryCodes.Netherlands]: ({ entitySetup }) => {
+		switch (entitySetup) {
+			case "partOfABusiness": return { label: "hasYourOrganizationFiledRegistrationPaperworkWithAGovernmentAuthority" };
+			default: return { label: "haveYouRegisteredYourIndividualBusiness" };
+		}
+	},
+	[CountryCodes.Singapore]: ({ entitySetup }) => {
+		switch (entitySetup) {
+			case "partOfABusiness": return { label: "hasYourOrganizationFiledRegistrationPaperworkWithAGovernmentAuthority" };
+			default: return { label: "haveYouRegisteredYourIndividualBusiness" };
+		}
+	},
+	[CountryCodes.UnitedKingdom]: ({ entitySetup }) => {
+		switch (entitySetup) {
+			case "partOfABusiness": return { label: "hasYourOrganizationFiledRegistrationPaperworkWithCompaniesHouse" };
+			default: return { label: "areYouRegisteredAsASoleTrader" };
+		}
+	},
+	[CountryCodes.UnitedStates]: ({ entitySetup }) => {
+		switch (entitySetup) {
+			case "partOfABusiness": return { label: "hasYourOrganizationFiledRegistrationPaperworkWithAStateAgency" };
+			default: return { label: "doYouHaveAnEin" };
+		}
+	}
+};
+//#endregion
+//#region src/components/GlobalEntry/fields/PaperworkQuestionnaire/PaperworkQuestionnaire.tsx
+var PAPERWORK_QUESTIONNAIRE_FIELD = ["filedPaperwork"];
+function PaperworkQuestionnaire({ data, valid, handleChangeFor, errors, country, entitySetup }) {
+	const { t: commonT } = useTranslation("common");
+	const { t: globalEntryT } = useTranslation("globalEntry");
+	const { label } = resolveFieldMetadata(paperworkQuestionnaireFieldConfig[country], { entitySetup }, paperworkQuestionnaireDefaultFieldConfig({ entitySetup }));
+	return /* @__PURE__ */ jsx(Questionnaire, {
+		name: "filedPaperwork",
+		label: label ? globalEntryT(($) => $[label]) : void 0,
+		selected: data.filedPaperwork,
+		isValid: valid.filedPaperwork,
+		errorMessage: errors.filedPaperwork,
+		isHorizontal: true,
+		onChange: handleChangeFor("filedPaperwork"),
+		onHelpClick: () => {},
+		tiles: [{
+			label: commonT(($) => $["yes"]),
+			value: "yes"
+		}, {
+			label: commonT(($) => $["no"]),
+			value: "no"
+		}]
+	});
+}
+//#endregion
+//#region src/components/GlobalEntry/fields/TrustQuestionnaire/TrustQuestionnaire.tsx
+var TRUST_QUESTIONNAIRE_FIELD = ["isTrust"];
+function TrustQuestionnaire({ data, valid, errors, handleChangeFor }) {
+	const { t: commonT } = useTranslation("common");
+	const { t: globalEntryT } = useTranslation("globalEntry");
+	return /* @__PURE__ */ jsx(Questionnaire, {
+		name: "isTrust",
+		label: globalEntryT(($) => $["isYourOrganizationATrust"]),
+		selected: data.isTrust,
+		isValid: valid.isTrust,
+		errorMessage: errors.isTrust,
+		isHorizontal: true,
+		onChange: handleChangeFor("isTrust"),
+		tiles: [{
+			label: commonT(($) => $["yes"]),
+			value: "yes"
+		}, {
+			label: commonT(($) => $["no"]),
+			value: "no"
+		}]
+	});
+}
+//#endregion
 //#region src/components/GlobalEntry/fields/UnincorporatedOrganizationTypeField/UnincorporatedOrganizationTypeField.tsx
 var UNINCORPORATED_ORGANIZATION_TYPE_FIELD = ["unincorporatedOrganizationType"];
 var UnincorporatedOrganizationTypeField = ({ data, valid, errors, handleChangeFor }) => {
@@ -670,23 +856,15 @@ var UnincorporatedOrganizationTypeField = ({ data, valid, errors, handleChangeFo
 		value: "unincorporatedAssociation",
 		icon: "trust"
 	}];
-	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Field, {
-		el: "fieldset",
+	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Questionnaire, {
 		name: "unincorporatedOrganizationType",
 		label: t(($) => $["whichBestDescribesYourOrganization"]),
 		errorMessage: errors.unincorporatedOrganizationType,
 		isValid: valid?.unincorporatedOrganizationType,
-		children: () => /* @__PURE__ */ jsxs(StackLayout, { children: [/* @__PURE__ */ jsx(Button, {
-			variant: "link",
-			onClick: () => {},
-			children: /* @__PURE__ */ jsx(Typography, { children: t(($) => $["whatDoesThisMean"], { ns: "common" }) })
-		}), /* @__PURE__ */ jsx(TileGroup, {
-			name: "unincorporatedOrganizationType",
-			selected: data?.unincorporatedOrganizationType ?? "",
-			onChange: (value) => handleChangeFor("unincorporatedOrganizationType")(value),
-			tiles,
-			isHorizontal: true
-		})] })
+		selected: data?.unincorporatedOrganizationType,
+		onChange: handleChangeFor("unincorporatedOrganizationType"),
+		tiles,
+		isHorizontal: true
 	}), data?.unincorporatedOrganizationType === "unincorporatedAssociation" && /* @__PURE__ */ jsx(Alert, {
 		variant: "error",
 		title: t(($) => $["unincorporatedAssociationsArentSupported"]),
@@ -697,63 +875,17 @@ var UnincorporatedOrganizationTypeField = ({ data, valid, errors, handleChangeFo
 	})] });
 };
 //#endregion
-//#region src/components/GlobalEntry/utils/utils.ts
-var getGlobalEntryCompanyType = (legalEntity, data) => {
-	if (data.entityInformation.entitySetup === "partOfABusiness") return data.companyStructure?.organizationType ?? legalEntity?.organization?.type;
-	if (data.entityInformation.entitySetup === "justMe") {
-		const hasSoleProprietorshipAssociation = legalEntity && hasSolePropInLegalEntity(legalEntity);
-		return data.registrationInformation?.filedPaperwork === "yes" || hasSoleProprietorshipAssociation ? "soleProprietorship" : void 0;
-	}
-};
-var isPaperworkQuestionAsked = (data) => {
-	const { country, entitySetup } = data.entityInformation ?? {};
-	if (!country) return false;
-	if (entitySetup === "partOfABusiness") return ALLOWED_UNINCORPORATED_PARTNERSHIP_COUNTRIES.includes(country);
-	return entitySetup === "justMe" && SOLE_PROP_COUNTRIES.includes(country);
-};
-var getFiledPaperwork = (data) => {
-	if (isPaperworkQuestionAsked(data)) return data.registrationInformation?.filedPaperwork ?? null;
-	return data.entityInformation?.entitySetup === "partOfABusiness" ? "yes" : "no";
-};
-var isSoleProprietorship = (data) => data.entityInformation?.entitySetup === "justMe" && getFiledPaperwork(data) === "yes";
-var isUnincorporatedPartnership = (data) => data.entityInformation?.entitySetup === "partOfABusiness" && getFiledPaperwork(data) === "no" && data.registrationInformation?.unincorporatedOrganizationType === "unincorporatedPartnership";
-/**
-* `justMe` is always a natural person. Being part of a business only makes the entity an
-* `organization` when the primary partner is not an individual, because an individual partner in an
-* unincorporated partnership stays an individual legal entity.
-*/
-var determineLegalEntityType = (data) => data.entityInformation?.entitySetup === "partOfABusiness" && data.primaryPartner?.primaryPartnerType !== "individual" ? "organization" : "individual";
-/**
-* The account holder is derived from the form data, not sent to the API and is kept client-side.
-*/
-var determineAccountHolder = (data) => {
-	const entitySetup = data.entityInformation?.entitySetup;
-	/** Derived, because the question is not put to the user in every country */
-	const filedPaperwork = getFiledPaperwork(data);
-	if (entitySetup === "justMe") return filedPaperwork === "yes" ? "mySoleProprietorName" : "myName";
-	if (entitySetup === "partOfABusiness") {
-		if (isUnincorporatedPartnership(data)) return "anUnincorporatedPartnership";
-		if (filedPaperwork === "yes") return "theCompanyIWorkFor";
-	}
-};
-var determineEntityAssociations = (data, accountHolder, legalEntity, newSoleProp) => {
-	/** Sole props are the only association we create and associate in Global Entry */
-	if (newSoleProp) return [{
-		type: "soleProprietorship",
-		legalEntityId: newSoleProp.id
-	}];
-	const ownAssociations = getOwnEntityAssociations(legalEntity);
-	if (!ownAssociations || ownAssociations.length === 0) return;
-	return accountHolder !== determineAccountHolder(data) ? [] : void 0;
-};
-//#endregion
 //#region src/components/GlobalEntry/forms/RegistrationInformation/RegistrationInformation.tsx
 var REGISTRATION_INFORMATION_FIELDS = [
 	...PAPERWORK_QUESTIONNAIRE_FIELD,
+	...DBA_QUESTIONNAIRE_FIELD,
+	...TRUST_QUESTIONNAIRE_FIELD,
+	...LLC_QUESTIONNAIRE_FIELD,
 	...UNINCORPORATED_ORGANIZATION_TYPE_FIELD,
 	...LEGAL_COMPANY_NAME_FIELD,
 	"jaHaniLegalCompanyName",
 	"jaKanaLegalCompanyName",
+	...STATE_FIELD,
 	...COUNTRY_OF_GOVERNING_LAW_FIELD,
 	...BUSINESS_REGISTRATION_NUMBER_FIELD,
 	...TAX_INFORMATION_FIELD
@@ -782,6 +914,17 @@ var RegistrationInformation = ({ id, shouldValidate, legalEntity, country }) =>
 		t: businessT
 	});
 	const showField = (fieldKeys) => fieldKeys.some((field) => formUtils.isRequiredField(field) || formUtils.isOptionalField(field));
+	/**
+	* State is asked for in business search but may not be updated if user does not
+	* find results or opts for manual flow.
+	* It is stored client side for use when users encounter the State field in other forms
+	* and it was not saved on the legal entity.
+	*/
+	const { setStoredStateOrProvince } = useStoredStateOrProvince({ legalEntityId: legalEntity.id });
+	const handleStateChange = (key, mode) => (event) => {
+		handleChangeFor(key, mode)(event);
+		setStoredStateOrProvince(event.target.value);
+	};
 	return /* @__PURE__ */ jsxs("form", {
 		id,
 		children: [
@@ -793,7 +936,26 @@ var RegistrationInformation = ({ id, shouldValidate, legalEntity, country }) =>
 				data: { filedPaperwork: data.filedPaperwork },
 				valid: { filedPaperwork: valid.filedPaperwork },
 				errors: { filedPaperwork: formUtils.getErrorMessage("filedPaperwork", errors, fieldProblems) },
-				label: form.data.entityInformation.entitySetup === "partOfABusiness" ? globalEntryT(($) => $["hasPaperworkBeenFiled"]) : globalEntryT(($) => $["areYourBusinessActivitiesRegisteredWithAGovernmentAuthority"]),
+				country,
+				entitySetup: form.data.entityInformation.entitySetup,
+				handleChangeFor
+			}),
+			showField(DBA_QUESTIONNAIRE_FIELD) && /* @__PURE__ */ jsx(DbaQuestionnaire, {
+				data: { doingBusinessAs: data.doingBusinessAs },
+				valid: { doingBusinessAs: valid.doingBusinessAs },
+				errors: { doingBusinessAs: formUtils.getErrorMessage("doingBusinessAs", errors, fieldProblems) },
+				handleChangeFor
+			}),
+			showField(TRUST_QUESTIONNAIRE_FIELD) && /* @__PURE__ */ jsx(TrustQuestionnaire, {
+				data: { isTrust: data.isTrust },
+				valid: { isTrust: valid.isTrust },
+				errors: { isTrust: formUtils.getErrorMessage("isTrust", errors, fieldProblems) },
+				handleChangeFor
+			}),
+			showField(LLC_QUESTIONNAIRE_FIELD) && /* @__PURE__ */ jsx(LlcQuestionnaire, {
+				data: { isLimitedLiabilityCorporation: data.isLimitedLiabilityCorporation },
+				valid: { isLimitedLiabilityCorporation: valid.isLimitedLiabilityCorporation },
+				errors: { isLimitedLiabilityCorporation: formUtils.getErrorMessage("isLimitedLiabilityCorporation", errors, fieldProblems) },
 				handleChangeFor
 			}),
 			showField(COUNTRY_OF_GOVERNING_LAW_FIELD) && /* @__PURE__ */ jsx(CountryOfGoverningLawField, {
@@ -829,6 +991,15 @@ var RegistrationInformation = ({ id, shouldValidate, legalEntity, country }) =>
 					onKeyDown: field?.onKeyDown
 				})
 			}, field?.name)),
+			showField(STATE_FIELD) && /* @__PURE__ */ jsx(StateField, {
+				data: { stateOrProvince: data.stateOrProvince },
+				valid: { stateOrProvince: valid.stateOrProvince },
+				errors: { stateOrProvince: formUtils.getErrorMessage("stateOrProvince", errors, fieldProblems) },
+				selectedCountry: country,
+				readonly: false,
+				handleChangeFor: handleStateChange,
+				labelOverride: commonT(($) => $["whereIsYourBusinessRegistered"])
+			}),
 			showField(TAX_INFORMATION_FIELD) && /* @__PURE__ */ jsx(TaxInformationField, {
 				data: {
 					taxInformation: data.taxInformation,
@@ -872,7 +1043,7 @@ var RegistrationInformation = ({ id, shouldValidate, legalEntity, country }) =>
 				optional: formUtils.isOptionalField("registrationNumber"),
 				handleChangeFor,
 				country,
-				state: form.data.entityInformation.stateOrProvince,
+				state: data.stateOrProvince,
 				canExempt: showField(["exemptedFromRegistrationNumber"]),
 				companyType
 			})
@@ -941,7 +1112,7 @@ function useCompanySearchNextClickOverrides({ country, multiForm, companySearchS
 			const companySearchInput = {
 				name: legalCompanyName,
 				country,
-				state: multiForm.data.entityInformation?.stateOrProvince,
+				state: multiForm.data.registrationInformation?.stateOrProvince,
 				registrationNumber: multiForm.data.registrationInformation?.registrationNumber
 			};
 			searchResponse = await trackPerformance("companySearch", () => queryClient.fetchQuery(companySearchQueryOptions(rootLegalEntityId.peek(), baseUrl.peek(), companySearchInput, userEvents)), userEvents);
@@ -1047,7 +1218,7 @@ var getRootElement = () => {
 	const onboardingWC = document.querySelector("adyen-onboarding");
 	return (onboardingWC && onboardingWC?.shadowRoot) ?? document;
 };
-var isEntityInformationField = (fieldName) => fieldName === "country" || fieldName === "stateOrProvince";
+var isEntityInformationField = (fieldName) => fieldName === "country";
 var getRelatedFields = (country) => {
 	const baseFields = [
 		"legalCompanyName",
@@ -1080,7 +1251,7 @@ function usePrefetchCompanySearch({ country, multiForm, activeFormId, isUsingCom
 		const companySearchInput = {
 			name: multiForm.data.registrationInformation?.legalCompanyName ?? "",
 			country: multiForm.data.entityInformation?.country,
-			state: multiForm.data.entityInformation?.stateOrProvince,
+			state: multiForm.data.registrationInformation?.stateOrProvince,
 			registrationNumber: multiForm.data.registrationInformation?.registrationNumber
 		};
 		await queryClient.prefetchQuery(companySearchQueryOptions(rootLegalEntityId.peek(), baseUrl.peek(), companySearchInput, userEvents));
@@ -1088,7 +1259,7 @@ function usePrefetchCompanySearch({ country, multiForm, activeFormId, isUsingCom
 		baseUrl,
 		country,
 		multiForm.data.entityInformation?.country,
-		multiForm.data.entityInformation?.stateOrProvince,
+		multiForm.data.registrationInformation?.stateOrProvince,
 		multiForm.data.registrationInformation?.legalCompanyName,
 		multiForm.data.registrationInformation?.registrationNumber,
 		multiForm.valid.entityInformation,
@@ -1123,43 +1294,32 @@ var determineEntitySetup = (legalEntity, accountHolder) => {
 	if (legalEntity.type === "individual") return "justMe";
 	return "partOfABusiness";
 };
-/**
-* @param legalEntity the root entity
-* @param associatedSoleProp the proprietorship associated to the root, when there is one. It holds
-* the registration details the root does not, so editing an existing proprietorship prefills.
-*/
-var mapLegalEntityToGlobalEntrySchema = (legalEntity, accountHolder, associatedSoleProp) => {
-	const soleProprietorship = associatedSoleProp?.soleProprietorship ?? (legalEntity.type === "soleProprietorship" ? legalEntity.soleProprietorship : void 0);
-	const isSoleProprietorship = !!soleProprietorship;
-	const taxInformation = isSoleProprietorship ? soleProprietorship.taxInformation : legalEntity.organization?.taxInformation;
-	const registrationNumber = isSoleProprietorship ? soleProprietorship.registrationNumber : legalEntity.organization?.registrationNumber;
+var mapLegalEntityToGlobalEntrySchema = (legalEntity, accountHolder) => {
+	const taxInformation = legalEntity.organization?.taxInformation;
+	const registrationNumber = legalEntity.organization?.registrationNumber;
 	const currentCountryTaxInformation = taxInformation?.find((taxInformationItem) => taxInformationItem.country === getLegalEntityCountry(legalEntity));
 	const isUen = currentCountryTaxInformation?.type === "UEN";
 	const country = getLegalEntityCountry(legalEntity);
-	const companyType = legalEntity.organization?.type ? legalEntity.organization?.type : "soleProprietorship";
+	const companyType = legalEntity.organization?.type;
 	const registrationNumberExemption = !registrationNumber && !!companyType && isRegistrationExemptionAllowed({
 		country,
 		companyType
 	}) ? true : legalEntity.organization?.registrationNumberAbsent;
-	const stateOrProvince = [
-		legalEntity.organization?.registeredAddress,
-		legalEntity.individual?.residentialAddress,
-		soleProprietorship?.registeredAddress
-	].find((address) => address?.street && address?.stateOrProvince)?.stateOrProvince;
+	const stateOrProvince = [legalEntity.organization?.registeredAddress, legalEntity.individual?.residentialAddress].find((address) => address?.street && address?.stateOrProvince)?.stateOrProvince;
 	return {
 		entityInformation: {
 			entitySetup: determineEntitySetup(legalEntity, accountHolder),
-			country: getLegalEntityCountry(legalEntity),
-			stateOrProvince
+			country: getLegalEntityCountry(legalEntity)
 		},
 		registrationInformation: {
 			...mapLocalizationToJapaneseLegalNames(legalEntity.organization?.localization),
+			stateOrProvince,
 			filedPaperwork: accountHolder === "anUnincorporatedPartnership" ? "no" : taxInformation && taxInformation.length > 0 || registrationNumber ? "yes" : void 0,
 			unincorporatedOrganizationType: accountHolder === "anUnincorporatedPartnership" ? "unincorporatedPartnership" : void 0,
-			legalCompanyName: isSoleProprietorship ? soleProprietorship.name : legalEntity.organization?.legalName,
+			legalCompanyName: legalEntity.organization?.legalName,
 			registrationNumber: isUen ? currentCountryTaxInformation?.number : registrationNumber,
-			exemptedFromRegistrationNumber: isSoleProprietorship ? soleProprietorship.taxAbsent : registrationNumberExemption,
-			countryOfGoverningLaw: isSoleProprietorship ? soleProprietorship.countryOfGoverningLaw : legalEntity.organization?.countryOfGoverningLaw,
+			exemptedFromRegistrationNumber: registrationNumberExemption,
+			countryOfGoverningLaw: legalEntity.organization?.countryOfGoverningLaw,
 			taxInformation,
 			isUen
 		},
@@ -1202,7 +1362,7 @@ function RegistrationNumberMismatchModal({ companySearchStateModel, country, reg
 	const registrationNumberType = data?.exemptedFromRegistrationNumber ? "exempted" : data?.registrationNumberType;
 	const { label: registrationNumberLabel } = resolveFieldMetadata(registrationNumberDefaultFieldConfig[country], {
 		registrationNumberType: registrationNumberType === "exempted" ? void 0 : registrationNumberType,
-		state: form.data.entityInformation?.stateOrProvince || void 0
+		state: form.data.registrationInformation?.stateOrProvince || void 0
 	}, registrationNumberDefaultFieldMetadata);
 	return /* @__PURE__ */ jsx(DataConflictsModal, {
 		providedData,
@@ -1243,6 +1403,9 @@ var globalEntryFieldRuleConfigurations = {
 	countryOfGoverningLaw: { rule: "countryOfGoverningLawRequired" },
 	selectedBusinessId: { rule: "businessSelectionRequired" },
 	filedPaperwork: { rule: "filedPaperworkRequired" },
+	doingBusinessAs: { rule: "doingBusinessAsRequired" },
+	isTrust: { rule: "isTrustRequired" },
+	isLimitedLiabilityCorporation: { rule: "isLimitedLiabilityCorporationRequired" },
 	unincorporatedOrganizationType: { rule: "unincorporatedOrganizationTypeRequired" },
 	legalCompanyName: { rule: "legalCompanyNameRequired" },
 	jaHaniLegalCompanyName: { rule: "jaHaniLegalCompanyName" },
@@ -1255,115 +1418,97 @@ var globalEntryFieldRuleConfigurations = {
 };
 var globalEntryCustomRules = ({ accountHolder, data, isFeatureEnabled = () => false, isSettingEnabled = () => false, country, rootLegalEntity }) => {
 	const filedPaperwork = getFiledPaperwork(data);
-	const hasFiledPaperwork = filedPaperwork === "yes";
+	const isUsIndividual = data.entityInformation?.entitySetup === "justMe" && country === CountryCodes.UnitedStates;
+	const llcAnswer = data.registrationInformation?.isLimitedLiabilityCorporation;
+	const isLlcQuestionRequired = isUsIndividual && filedPaperwork === "yes";
+	const hasDeterminedBusinessType = !isLlcQuestionRequired || !!llcAnswer;
+	const isSingleMemberLlc = isSingleMemberLLC(data);
+	const isTrustQuestionRequired = isTrustQuestionAsked(data);
+	const isTrust = isTrustQuestionRequired && data.registrationInformation.isTrust === "yes";
+	const canCollectOrganizationDetails = !isTrustQuestionRequired || data.registrationInformation.isTrust === "no";
+	const hasFiledPaperwork = filedPaperwork === "yes" && hasDeterminedBusinessType;
 	const hasAnsweredPaperworkQuestion = !!filedPaperwork;
 	const isPartOfABusiness = data.entityInformation?.entitySetup === "partOfABusiness";
-	const isSoleProp = isSoleProprietorship(data);
+	const isOrganization = isPartOfABusiness || isSingleMemberLlc;
 	const isExemptFromRegistrationNumber = Boolean(data.registrationInformation?.exemptedFromRegistrationNumber);
 	const existingRegistrationNumber = rootLegalEntity?.type === "soleProprietorship" ? rootLegalEntity.soleProprietorship?.registrationNumber : rootLegalEntity?.organization?.registrationNumber;
 	const isUnincorporatedOrganization = isPartOfABusiness && filedPaperwork === "no";
-	const isRegisteredOrganization = isPartOfABusiness && hasFiledPaperwork;
+	const isRegisteredOrganization = isOrganization && hasFiledPaperwork && canCollectOrganizationDetails;
 	return createFormRules({
 		entitySetupRequired: () => "REQUIRED",
 		countryRequired: () => "REQUIRED",
-		requireStateOrProvinceForCompanySearch: () => {
-			if (isPartOfABusiness && isUsingCompanySearch(country, TaskTypes.GLOBAL_ENTRY) && COUNTRIES_WITH_STATES_DATASET.includes(country)) return "REQUIRED";
-		},
-		businessSelectionRequired: () => isUsingCompanySearch(country, TaskTypes.GLOBAL_ENTRY) && isRegisteredOrganization ? "REQUIRED" : void 0,
+		businessSelectionRequired: () => isUsingCompanySearch(data) ? "REQUIRED" : void 0,
 		organizationTypeRequired: () => isRegisteredOrganization ? "REQUIRED" : void 0,
 		countryOfGoverningLawRequired: () => {
-			if (isFeatureEnabled("EnableCountryOfGoverningLawForUKCompanies") && COUNTRY_OF_GOVERNING_LAW_POSSIBLE.includes(country) && (isPartOfABusiness || isSoleProp) && hasAnsweredPaperworkQuestion) return "REQUIRED";
+			if (isFeatureEnabled("EnableCountryOfGoverningLawForUKCompanies") && COUNTRY_OF_GOVERNING_LAW_POSSIBLE.includes(country) && isOrganization && hasAnsweredPaperworkQuestion && canCollectOrganizationDetails) return "REQUIRED";
 		},
 		filedPaperworkRequired: () => isPaperworkQuestionAsked(data) ? "REQUIRED" : void 0,
+		doingBusinessAsRequired: () => data.entityInformation.entitySetup === "justMe" && filedPaperwork === "no" && INDIVIDUALS_WHO_TRADE_COUNTRIES.includes(country) ? "REQUIRED" : void 0,
+		isTrustRequired: () => isTrustQuestionRequired ? "REQUIRED" : void 0,
+		requireStateOrProvinceForCompanySearch: () => {
+			if (isUsingCompanySearch(data) && COUNTRIES_WITH_STATES_DATASET.includes(country)) return "REQUIRED";
+		},
+		isLimitedLiabilityCorporationRequired: () => isLlcQuestionRequired ? "REQUIRED" : void 0,
 		unincorporatedOrganizationTypeRequired: () => isUnincorporatedOrganization ? "REQUIRED" : void 0,
-		legalCompanyNameRequired: () => hasFiledPaperwork ? "REQUIRED" : void 0,
+		legalCompanyNameRequired: () => isRegisteredOrganization ? "REQUIRED" : void 0,
 		jaHaniLegalCompanyName: () => {
-			if (hasFiledPaperwork && isJapanLocalizationEnabled(isSettingEnabled, country)) return "REQUIRED";
+			if (isRegisteredOrganization && isJapanLocalizationEnabled(isSettingEnabled, country)) return "REQUIRED";
 		},
 		jaKanaLegalCompanyName: () => {
-			if (hasFiledPaperwork && isJapanLocalizationEnabled(isSettingEnabled, country)) return "REQUIRED";
+			if (isRegisteredOrganization && isJapanLocalizationEnabled(isSettingEnabled, country)) return "REQUIRED";
 		},
 		countryRequiresRegistrationNumber: () => {
-			if (!hasFiledPaperwork) return;
-			if (isSoleProp) {
-				if (COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION.includes(country)) return;
-				if (COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER_SOLE_PROPS.includes(country)) return "OPTIONAL";
+			if (!isRegisteredOrganization) return;
+			if (COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER.includes(country)) return "OPTIONAL";
+			if (country === CountryCodes.HongKong) {
+				if (!existingRegistrationNumber) return;
 				return isExemptFromRegistrationNumber ? "OPTIONAL" : "REQUIRED";
 			}
-			if (isPartOfABusiness) {
-				if (COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER.includes(country)) return "OPTIONAL";
-				if (country === CountryCodes.HongKong) {
-					if (!existingRegistrationNumber) return;
-					return isExemptFromRegistrationNumber ? "OPTIONAL" : "REQUIRED";
-				}
-				if (!COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION.includes(country)) return isExemptFromRegistrationNumber ? void 0 : "REQUIRED";
-			}
+			if (!COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION.includes(country)) return isExemptFromRegistrationNumber ? void 0 : "REQUIRED";
 		},
 		registrationNumberType: () => {
-			if (!hasFiledPaperwork) return;
-			if (isSoleProp) return COUNTRIES_THAT_DONT_REQUIRE_SOLE_PROP_REGISTRATION.includes(country) ? void 0 : "OPTIONAL";
-			if (isPartOfABusiness) {
-				if (COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER.includes(country)) return "OPTIONAL";
-				if (COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION.includes(country)) return;
-				return "OPTIONAL";
-			}
+			if (!isRegisteredOrganization) return;
+			if (COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER.includes(country)) return "OPTIONAL";
+			if (COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION.includes(country)) return;
+			return "OPTIONAL";
 		},
 		companyRegistrationNumberExemptionAllowed: () => {
-			if (!hasFiledPaperwork) return;
-			if (isSoleProp) {
-				if (!isRegistrationExemptionAllowed({
-					country,
-					companyType: "soleProprietorship"
-				})) return;
-				return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
-			}
-			if (isPartOfABusiness) {
-				if (!isRegistrationExemptionAllowed({ country })) return;
-				/**
-				* Country-specific guard checks before applying the shared exemption rule result.
-				*
-				* - HK first enforces the legacy registration-number presence guard for existing entities.
-				* - AU/NZ then enforce the absent-state V4 feature flag gate.
-				*/
-				switch (country) {
-					case CountryCodes.HongKong:
-						if (!existingRegistrationNumber) return;
-						return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
-					case CountryCodes.Australia:
-					case CountryCodes.NewZealand:
-						if (!isFeatureEnabled("EnableRegistrationAndTaxAbsentStatesV4")) return;
-						return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
-					default: return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
-				}
+			if (!isRegisteredOrganization) return;
+			if (!isRegistrationExemptionAllowed({ country })) return;
+			/**
+			* Country-specific guard checks before applying the shared exemption rule result.
+			*
+			* - HK first enforces the legacy registration-number presence guard for existing entities.
+			* - AU/NZ then enforce the absent-state V4 feature flag gate.
+			*/
+			switch (country) {
+				case CountryCodes.HongKong:
+					if (!existingRegistrationNumber) return;
+					return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
+				case CountryCodes.Australia:
+				case CountryCodes.NewZealand:
+					if (!isFeatureEnabled("EnableRegistrationAndTaxAbsentStatesV4")) return;
+					return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
+				default: return isExemptFromRegistrationNumber ? "REQUIRED" : "OPTIONAL";
 			}
 		},
 		taxInformationRequired: () => {
 			const requiredUnlessExempt = Boolean(data.registrationInformation?.exemptedFromTax) ? "OPTIONAL" : "REQUIRED";
 			const usesTaxIdInsteadOfVat = COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT.includes(country);
-			if (!hasFiledPaperwork) return;
-			if (isPartOfABusiness) {
-				if (rootLegalEntity?.type === "organization" && keysOf(rootLegalEntity.capabilities ?? {}).includes("issueBankAccount")) {
-					if (TAX_ID_REQUIRED_COUNTRIES_ORGANIZATION.includes(country)) return requiredUnlessExempt;
-					if (country === CountryCodes.Italy && data.registrationInformation?.registrationNumberType === "CCIAA") return requiredUnlessExempt;
-				}
-				if (usesTaxIdInsteadOfVat) return requiredUnlessExempt;
-			}
-			if (isSoleProp) {
-				if (COUNTRIES_THAT_DO_NOT_USE_TAX_ID_FOR_SOLE_PROP.includes(country)) return;
-				if (usesTaxIdInsteadOfVat) return requiredUnlessExempt;
+			if (!isRegisteredOrganization) return;
+			if (rootLegalEntity?.type === "organization" && keysOf(rootLegalEntity.capabilities ?? {}).includes("issueBankAccount")) {
+				if (TAX_ID_REQUIRED_COUNTRIES_ORGANIZATION.includes(country)) return requiredUnlessExempt;
+				if (country === CountryCodes.Italy && data.registrationInformation?.registrationNumberType === "CCIAA") return requiredUnlessExempt;
 			}
+			if (usesTaxIdInsteadOfVat) return requiredUnlessExempt;
 		},
 		countryHasTaxExemptions: () => {
-			if (!hasFiledPaperwork) return;
+			if (!isRegisteredOrganization) return;
 			const isExemptFromTax = Boolean(data.registrationInformation?.exemptedFromTax);
-			if (isSoleProp) {
-				if (!COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_SOLE_PROPS.includes(country)) return;
-				return isExemptFromTax ? "REQUIRED" : "OPTIONAL";
-			}
 			if (isFeatureEnabled("EnableRegistrationAndTaxAbsentStatesV4") && COUNTRIES_WITH_POSSIBLE_TRUSTEE_TAXID_ABSENT_V4.includes(country) && accountHolder === "aTrust") return isExemptFromTax ? "REQUIRED" : "OPTIONAL";
 			if (COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_COMPANIES.includes(country)) return isExemptFromTax ? "REQUIRED" : "OPTIONAL";
 		},
-		primaryPartnerTypeRequired: () => isUnincorporatedOrganization && data.registrationInformation.unincorporatedOrganizationType === "unincorporatedPartnership" ? "REQUIRED" : void 0
+		primaryPartnerTypeRequired: () => isTrust || isUnincorporatedOrganization && data.registrationInformation.unincorporatedOrganizationType === "unincorporatedPartnership" ? "REQUIRED" : void 0
 	});
 };
 //#endregion
@@ -1396,6 +1541,7 @@ function buildRequiredForms({ config: { forms, requiredFields, optionalFields, i
 */
 var globalEntryKeyMappingForOrgs = {
 	"entityInformation.country": "organization.registeredAddress.country",
+	"registrationInformation.stateOrProvince": "organization.registeredAddress.stateOrProvince",
 	"registrationInformation.legalCompanyName": "organization.legalName",
 	"registrationInformation.registrationNumber": "organization.registrationNumber",
 	"registrationInformation.exemptedFromRegistrationNumber": "organization.registrationNumberAbsent",
@@ -1404,40 +1550,16 @@ var globalEntryKeyMappingForOrgs = {
 	"companyStructure.organizationType": "organization.type"
 };
 var globalEntryKeyMappingForIndividuals = { "entityInformation.country": "individual.residentialAddress.country" };
-var globalEntryKeyMappingForSoleProps = {
-	"entityInformation.country": "soleProprietorship.registeredAddress.country",
-	"registrationInformation.legalCompanyName": "soleProprietorship.name",
-	"registrationInformation.registrationNumber": "soleProprietorship.registrationNumber",
-	"registrationInformation.taxInformation": "soleProprietorship.taxInformation",
-	"registrationInformation.exemptedFromTax": "soleProprietorship.taxAbsent",
-	"registrationInformation.countryOfGoverningLaw": "soleProprietorship.countryOfGoverningLaw"
-};
 /** Api-keyed mapping, for building the legal entity request from the form schema */
 var globalEntryApiKeyMappingForOrgs = reverseMapping(globalEntryKeyMappingForOrgs);
-/** Api-keyed mapping, for building the sole proprietorship request from the form schema */
-var globalEntryApiKeyMappingForSoleProps = reverseMapping(globalEntryKeyMappingForSoleProps);
 /** Api-keyed mapping, for building the legal entity request from the form schema */
 var globalEntryApiKeyMappingForIndividuals = reverseMapping(globalEntryKeyMappingForIndividuals);
 //#endregion
 //#region src/components/GlobalEntry/mapping/mapGlobalEntrySchemaToLegalEntity.ts
-var mapGlobalEntrySchemaToSoleProp = (data) => {
-	const { soleProprietorship } = formatObject(data, globalEntryApiKeyMappingForSoleProps);
-	return {
-		type: "soleProprietorship",
-		soleProprietorship: {
-			...soleProprietorship,
-			/**
-			* A proprietorship always has a governing law, but the field is only put to the user in the
-			* countries that can differ from where they registered, so the rest fall back to that.
-			*/
-			countryOfGoverningLaw: data.registrationInformation?.countryOfGoverningLaw ?? data.entityInformation?.country
-		}
-	};
-};
-var mapGlobalEntrySchemaToLegalEntity = (data, legalEntity, accountHolder, isFeatureEnabled, newSoleProp) => {
+var mapGlobalEntrySchemaToLegalEntity = (data, legalEntity, accountHolder, isFeatureEnabled) => {
 	const isOrg = determineLegalEntityType(data) === "organization";
 	const mapping = isOrg ? globalEntryApiKeyMappingForOrgs : globalEntryApiKeyMappingForIndividuals;
-	const entityAssociations = determineEntityAssociations(data, accountHolder, legalEntity, newSoleProp);
+	const entityAssociations = determineEntityAssociations(data, accountHolder, legalEntity);
 	const entity = {
 		...formatObject(data, mapping),
 		id: legalEntity.id,
@@ -1513,29 +1635,26 @@ var mergeVerifiedCompanyData = ({ entity, legalEntity, verifiedCompanyData }) =>
 		organization
 	};
 };
-var submitGlobalEntry = async ({ legalEntity, associatedSoleProp, data, updateLegalEntity, createLegalEntity, accountHolder, isFeatureEnabled, verifiedCompanyData }) => {
-	let newSoleProp;
-	if (isSoleProprietorship(data)) {
-		const mappedSolePropData = mapGlobalEntrySchemaToSoleProp(data);
-		if (associatedSoleProp?.id) {
-			const { type: _type, ...soleProprietorshipDetails } = mappedSolePropData;
-			await updateLegalEntity({
-				...soleProprietorshipDetails,
-				id: associatedSoleProp.id
-			});
-		} else
- /**
-		* Created first so the entity can be associated to it below, which keeps this to a single
-		* write against the entity itself.
-		*/
-		newSoleProp = await createLegalEntity(mappedSolePropData);
-	}
-	const { type: targetType, ...legalEntityData } = mergeVerifiedCompanyData({
-		entity: mapGlobalEntrySchemaToLegalEntity(data, legalEntity, accountHolder, isFeatureEnabled, newSoleProp ? newSoleProp : void 0),
+var getAddressPayload = (address) => {
+	const country = address.country;
+	const requiresStateOrProvince = COUNTRIES_WITH_STATES_DATASET.includes(country) && COUNTRIES_USING_COMPANY_SEARCH.includes(country);
+	if (Boolean(address.street && address.city && address.postalCode && (requiresStateOrProvince ? !!address.stateOrProvince : true))) return address;
+	return { country: address.country };
+};
+var submitGlobalEntry = async ({ legalEntity, data, updateLegalEntity, accountHolder, isFeatureEnabled, verifiedCompanyData }) => {
+	const mappedData = mergeVerifiedCompanyData({
+		entity: mapGlobalEntrySchemaToLegalEntity(data, legalEntity, accountHolder, isFeatureEnabled),
 		legalEntity,
 		verifiedCompanyData
 	});
 	/**
+	* If the request does not have a complete address, send only its country
+	* to avoid validation errors.
+	*/
+	if (mappedData.organization?.registeredAddress) mappedData.organization.registeredAddress = getAddressPayload(mappedData.organization.registeredAddress);
+	if (mappedData.organization?.principalPlaceOfBusiness) mappedData.organization.principalPlaceOfBusiness = getAddressPayload(mappedData.organization.principalPlaceOfBusiness);
+	const { type: targetType, ...legalEntityData } = mappedData;
+	/**
 	* LEM rejects a change of type in the same request as the data
 	*/
 	if (targetType !== legalEntity.type) await updateLegalEntity({
@@ -1559,10 +1678,6 @@ var globalEntryValidationRules = ({ data, legalEntity, isFeatureEnabled = () =>
 		taxIdNumberType,
 		companyType
 	}, taxInformationDefaultFieldMetadata).validators;
-	const registrationNumberValidators = resolveFieldMetadata(registrationNumberDefaultFieldConfig[country], {
-		registrationNumberType: data?.registrationInformation?.registrationNumberType,
-		state: data?.entityInformation?.stateOrProvince
-	}, registrationNumberDefaultFieldMetadata).validators;
 	return {
 		businessSelection: { selectedBusinessId: {
 			validate: (value) => !isEmpty(value),
@@ -1573,15 +1688,40 @@ var globalEntryValidationRules = ({ data, legalEntity, isFeatureEnabled = () =>
 			validate: (value) => !!value,
 			modes: ["blur", "input"]
 		} },
-		entityInformation: { stateOrProvince: stateValidators },
+		entityInformation: {
+			country: {
+				validate: (value) => !!value,
+				modes: ["blur", "input"]
+			},
+			entitySetup: {
+				validate: (value) => !!value,
+				modes: ["blur", "input"]
+			}
+		},
 		primaryPartner: { primaryPartnerType: {
 			validate: (value) => !!value,
 			modes: ["blur", "input"]
 		} },
 		registrationInformation: {
+			doingBusinessAs: {
+				validate: (value) => !!value,
+				modes: ["blur", "input"]
+			},
+			isTrust: {
+				validate: (value) => !!value,
+				modes: ["blur", "input"]
+			},
+			isLimitedLiabilityCorporation: {
+				validate: (value) => !!value,
+				modes: ["blur", "input"]
+			},
 			countryOfGoverningLaw: countryOfGoverningLawValidators,
 			legalCompanyName: legalCompanyNameValidators,
-			registrationNumber: registrationNumberValidators,
+			stateOrProvince: stateValidators,
+			registrationNumber: resolveFieldMetadata(registrationNumberDefaultFieldConfig[country], {
+				registrationNumberType: data?.registrationInformation?.registrationNumberType,
+				state: data?.registrationInformation?.stateOrProvince
+			}, registrationNumberDefaultFieldMetadata).validators,
 			taxInformation: taxInformationValidators,
 			unincorporatedOrganizationType: {
 				validate: (value) => !!value && value !== "unincorporatedAssociation",
@@ -1594,10 +1734,7 @@ var globalEntryValidationRules = ({ data, legalEntity, isFeatureEnabled = () =>
 //#region src/components/GlobalEntry/tasks/GlobalEntry.tsx
 var GlobalEntry = ({ activeForm, legalEntity, shouldValidate, country }) => {
 	switch (activeForm.formId) {
-		case globalEntryForms.entityInformation.formId: return /* @__PURE__ */ jsx(EntityInformation, {
-			id: activeForm.formId,
-			country
-		});
+		case globalEntryForms.entityInformation.formId: return /* @__PURE__ */ jsx(EntityInformation, { id: activeForm.formId });
 		case globalEntryForms.registrationInformation.formId: return /* @__PURE__ */ jsx(RegistrationInformation, {
 			id: activeForm.formId,
 			legalEntity,
@@ -1652,7 +1789,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 			"../language/da-DK.json": () => import("./da-DK-Dhr4p-qj.js"),
 			"../language/de-DE.json": () => import("./de-DE-QDT6VVq9.js"),
 			"../language/el-GR.json": () => import("./el-GR-V2cZ5gjl.js"),
-			"../language/en-US.json": () => import("./en-US-Cz4JoU20.js"),
+			"../language/en-US.json": () => import("./en-US-BMMx67Za.js"),
 			"../language/es-ES.json": () => import("./es-ES-SsReQJzQ.js"),
 			"../language/es-LA.json": () => import("./es-LA-DTXCg1tj.js"),
 			"../language/et-EE.json": () => import("./et-EE-Bg3WOS9m.js"),
@@ -1714,12 +1851,16 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		legalEntity: rootLegalEntity,
 		isFeatureEnabled
 	}), [isFeatureEnabled, rootLegalEntity]);
-	/** Holds the registration details when the user already trades as a sole proprietor */
-	const { data: associatedSoleProp, isLoading: isLoadingAssociatedSoleProp } = useAssociatedLegalEntity(rootLegalEntity, "soleProprietorship");
-	const defaultData = useMemo(() => mapLegalEntityToGlobalEntrySchema(rootLegalEntity, accountHolder, associatedSoleProp), [
+	const { storedStateOrProvince } = useStoredStateOrProvince({ legalEntityId: rootLegalEntity.id });
+	const initialStoredStateOrProvince = useRef(storedStateOrProvince).current;
+	const defaultData = useMemo(() => {
+		const mappedData = mapLegalEntityToGlobalEntrySchema(rootLegalEntity, accountHolder);
+		mappedData.registrationInformation.stateOrProvince = mappedData.registrationInformation.stateOrProvince ?? initialStoredStateOrProvince;
+		return mappedData;
+	}, [
 		rootLegalEntity,
-		associatedSoleProp,
-		accountHolder
+		accountHolder,
+		initialStoredStateOrProvince
 	]);
 	const multiForm = useMultiForm({
 		defaultData,
@@ -1758,6 +1899,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		});
 		setDerivedProps(props);
 	}, [rootLegalEntity?.type, rules]);
+	const isSingleMemberLlc = isSingleMemberLLC(data);
 	/**
 	* The company structures that are still valid given the registration number type and tax ID
 	* number type currently in the form.
@@ -1767,12 +1909,14 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		registrationNumberType: data.registrationInformation?.registrationNumberType,
 		registrationNumberExempt: data.registrationInformation?.exemptedFromRegistrationNumber,
 		taxIdNumberType: data.registrationInformation?.taxInformation?.find((taxInformation) => taxInformation.country === country)?.type,
-		legalEntity: rootLegalEntity
+		legalEntity: rootLegalEntity,
+		isSingleMemberLlc
 	}), [
 		country,
 		data.registrationInformation?.exemptedFromRegistrationNumber,
 		data.registrationInformation?.registrationNumberType,
 		data.registrationInformation?.taxInformation,
+		isSingleMemberLlc,
 		rootLegalEntity
 	]);
 	/**
@@ -1813,8 +1957,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		inferredCompanyStructure
 	]);
 	const { mutateAsync: updateLegalEntity, isPending: isUpdatingLegalEntity } = useUpdateLegalEntity();
-	const { mutateAsync: createLegalEntity, isPending: isCreatingLegalEntity } = useCreateLegalEntity();
-	const isLoading = isUpdatingLegalEntity || isCreatingLegalEntity || isLoadingAssociatedSoleProp;
+	const isLoading = isUpdatingLegalEntity;
 	/**
 	* Form writes only reach the state on the next render so this prevents
 	* outdated data from being submitted. In Global Entry, we submit the form
@@ -1830,10 +1973,8 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		try {
 			const newAccountHolder = await submitGlobalEntry({
 				legalEntity: rootLegalEntity,
-				associatedSoleProp,
 				data: submittedData,
 				updateLegalEntity,
-				createLegalEntity,
 				accountHolder,
 				isFeatureEnabled,
 				verifiedCompanyData: companySearchStateModel.verifiedBusiness.peek()
@@ -1857,7 +1998,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		country,
 		multiForm,
 		activeFormId: activeForm.formId,
-		isUsingCompanySearch: isUsingCompanySearch(country, TaskTypes.GLOBAL_ENTRY)
+		isUsingCompanySearch: isUsingCompanySearch(data)
 	});
 	const { attemptBusinessSearch, confirmBusinessSelection } = useCompanySearchNextClickOverrides({
 		country,
@@ -1888,7 +2029,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	}
 	const overrideNextClick = async () => {
 		if (!activeForm.isValid) return handleNextClick();
-		if (!(isUsingCompanySearch(country, TaskTypes.GLOBAL_ENTRY) && data.registrationInformation?.filedPaperwork === "yes")) return handleNextClick();
+		if (!isUsingCompanySearch(data)) return handleNextClick();
 		switch (activeForm.formId) {
 			case globalEntryForms.registrationInformation.formId: {
 				const currentForms = await attemptBusinessSearch();