@adyen/kyc-components 4.27.0-beta.2 → 4.28.0-beta.0

package/dist/{GlobalEntryModal-C52Qt9xX.js → GlobalEntryModal-Fszy2PMv.js}

@@ -1,14 +1,14 @@
 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] = "9cd4a731-32bf-4407-9bc3-10af39f1116b", e._sentryDebugIdIdentifier = "sentry-dbid-9cd4a731-32bf-4407-9bc3-10af39f1116b");
+	n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "1dc2003b-cc1c-4f5a-9bc4-9d4dd64cbb79", e._sentryDebugIdIdentifier = "sentry-dbid-1dc2003b-cc1c-4f5a-9bc4-9d4dd64cbb79");
 } catch (e) {}
 import { n as addResourceBundles, r as useTranslation } from "./translation-CpH8D2NK.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-DMoIAkRb.js";
+import { A as useAllowedCountries, N as Header, P as _rolldown_dynamic_import_helper_default, T as Alert, _ as isPartOfTrustFromLegalEntity, ct as isEmpty, vt as useAccountHolder } from "./registerEmbed-CZDAZwKX.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-BYafPrZH.js";
-import { s as useApiContext } from "./http-C8rt2BZk.js";
+import { t as Button } from "./Button-EhGM-oCO.js";
+import { r as httpPost, 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";
@@ -17,30 +17,172 @@ import { t as CountryCodes } from "./country-code-CJk2hdPu.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-BOqyVTd6.js";
-import { i as useAnalyticsContext } from "./Modal-B97EslpV.js";
-import { t as InputText } from "./InputText-Cis19tKa.js";
-import { t as ListItem } from "./ListItem-n927geYb.js";
+import { i as useToggleContext, r as useDebouncedCallback } from "./Checkbox-Ec4wyyJQ.js";
+import { a as useAnalyticsContext } from "./useId-AzWxLa17.js";
+import { r as InputText } from "./RadioGroup-SDQSOsEf.js";
+import { i as getTrustedFieldsProvider, t as ListItem } from "./ListItem-aX6AyCay.js";
 import { t as getFormSlice } from "./getFormSlice-CxtXJ0-P.js";
 import { t as Card } from "./Card-BCGLpdw7.js";
-import { r as useToastContext } from "./useId-BABqOnYH.js";
-import { a as resolveFieldMetadata, c as getPropsFromConfigurations, r as createFormRules } from "./unincorporatedPartnership-BlCV-3wE.js";
-import { o as Field, p as LoaderWrapper } from "./Select-BdcPU6Uf.js";
-import { o as StructuredList, r as formatObject, s as Confirm } from "./utils-CZSmyjZ8.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-BZZPRWu-.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-zy0ihxPy.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-DnDIfrpG.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-CS6lTiW2.js";
-import { a as getValidCompanyTypesForRegistrationNumberType, l as registrationNumberDefaultFieldConfig, r as inferCompanyRegistrationNumberType, u as registrationNumberDefaultFieldMetadata } from "./getDefaultRegistrationNumberType-CZerowIu.js";
+import { n as useToastContext } from "./invalidateRootLegalEntity-CnH38v8h.js";
+import { a as resolveFieldMetadata, c as getPropsFromConfigurations, r as createFormRules } from "./unincorporatedPartnership-B5pKn0gl.js";
+import { o as Field, p as LoaderWrapper } from "./Select-DtO-GvLp.js";
+import { o as StructuredList, r as formatObject, s as Confirm } from "./utils-BfA0Rrku.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-DSR31SH8.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-DxKg7Ea-.js";
+import { H as FormContextProvider, I as useMultiForm, V as summaryStep, c as CountryField, d as isBusinessSelectionLegalArrangementError, g as createFormUtils, o as List, s as COUNTRY_FIELD, t as addValidityToForms, v as useFormContext, y as FormFlow, z as useFormComposer } from "./dropinUtils-CZuO0w1x.js";
+import { A as REGISTRATION_NUMBER_EXEMPTION_RULES, B as getValidCompanyTypesForTaxIdNumberType, C as COUNTRIES_THAT_USE_TAX_ID_INSTEAD_OF_VAT, D as COUNTRIES_WITH_POSSIBLE_TAX_EXEMPTION_FOR_COMPANIES, F as mapJapaneseLegalNamesToLocalization, H as TileGroup, I as mapLocalizationToJapaneseLegalNames, M as isRegistrationExemptionAllowed, N as isRegistrationNumberAbsentStateV4Scenario, T as COUNTRIES_WITH_OPTIONAL_REGISTRATION_NUMBER, _ as taxInformationDefaultFieldMetadata, b as COUNTRIES_THAT_DONT_REQUIRE_COMPANY_REGISTRATION, c as DataConflictsModal, g as taxInformationDefaultFieldConfig, h as getTaxInformationPlaceholderText, j as TAX_ID_REQUIRED_COUNTRIES_ORGANIZATION, k as COUNTRIES_WITH_POSSIBLE_TRUSTEE_TAXID_ABSENT_V4, l as TAX_INFORMATION_FIELD, u as TaxInformationField, w as COUNTRIES_USING_COMPANY_SEARCH } from "./bafinUtils-TT8a0y7q.js";
+import { a as getValidCompanyTypesForRegistrationNumberType, l as registrationNumberDefaultFieldConfig, r as inferCompanyRegistrationNumberType, u as registrationNumberDefaultFieldMetadata } from "./getDefaultRegistrationNumberType-t926T5FG.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-O58Eimhw.js";
-import { n as BusinessRegistrationNumberField, t as BUSINESS_REGISTRATION_NUMBER_FIELD } from "./BusinessRegistrationNumberField-BIWFuhfO.js";
-import { useCallback, useContext, useEffect, useMemo, useRef, useState } from "preact/hooks";
-import { Fragment, jsx, jsxs } from "preact/jsx-runtime";
+import { a as defaultFieldMetadata, i as defaultFieldConfigV4, o as defaultFieldMetadataV4, r as defaultFieldConfig, t as LEGAL_COMPANY_NAME_FIELD } from "./LegalCompanyNameField-Ch1VrlJs.js";
+import { n as BusinessRegistrationNumberField, t as BUSINESS_REGISTRATION_NUMBER_FIELD } from "./BusinessRegistrationNumberField-ByWbtuPm.js";
+import { Suspense, lazy } from "preact/compat";
+import { useCallback as useCallback$1, useContext as useContext$1, useEffect as useEffect$1, useMemo as useMemo$1, useReducer, useRef as useRef$1, useState as useState$1 } from "preact/hooks";
+import { Fragment as Fragment$1, jsx, jsxs } from "preact/jsx-runtime";
 import { createModel, signal, useModel, useSignal } from "@preact/signals";
-import { useQueryClient } from "@tanstack/preact-query";
-import { createContext } from "preact";
+import { useQuery, useQueryClient } from "@tanstack/preact-query";
+import { createContext as createContext$1 } from "preact";
 import { Show } from "@preact/signals/utils";
+//#region src/api/openId/useOpenIdAuthorizationLink.ts
+async function convertToSingpassLinkResponse(openIdInitiateResponse) {
+	return { item: {
+		authUrl: (await Promise.resolve(openIdInitiateResponse)).authUrl,
+		success: true
+	} };
+}
+var useOpenIdAuthorizationLink = (options) => {
+	const { rootLegalEntityId, baseUrl } = useApiContext();
+	return useQuery({
+		queryKey: ["openIdAuthorizationLink"],
+		queryFn: () => getOpenIdAuthorizationLink(rootLegalEntityId.value, baseUrl.value),
+		...options
+	});
+};
+var getOpenIdAuthorizationLink = async (legalEntityId, baseUrl) => {
+	return convertToSingpassLinkResponse(httpPost({
+		baseUrl,
+		path: `/legalEntities/${legalEntityId}/openid/initiate`
+	}));
+};
+//#endregion
+//#region src/hooks/singpass/useSingpassMyInfoLogin.ts
+var SingpassMyInfoLoginActionTypes = {
+	LOADING: "LOADING",
+	SUCCESS: "SUCCESS",
+	FAILURE: "FAILURE",
+	RESET: "RESET"
+};
+var defaultSingpassState = {
+	isLoading: false,
+	isSuccess: false
+};
+var singpassReducer = (state, action) => {
+	switch (action.type) {
+		case SingpassMyInfoLoginActionTypes.LOADING: return {
+			...state,
+			isLoading: true
+		};
+		case SingpassMyInfoLoginActionTypes.SUCCESS: return {
+			isLoading: false,
+			isSuccess: true
+		};
+		case SingpassMyInfoLoginActionTypes.FAILURE: return {
+			isLoading: false,
+			isSuccess: false,
+			errorMessage: action.errorMessage
+		};
+		case SingpassMyInfoLoginActionTypes.RESET: return defaultSingpassState;
+		default: return state;
+	}
+};
+var useSingpassMyInfoLogin = ({ legalEntity, accountHolder }) => {
+	const { isFeatureEnabled } = useToggleContext();
+	const isSingpassMyInfoEnabled = isFeatureEnabled("SingpassMyInfoEnabled");
+	const defaultState = {
+		isLoading: false,
+		isSuccess: getTrustedFieldsProvider(legalEntity) === "singpass"
+	};
+	const userEvents = useAnalyticsContext();
+	const [state, dispatch] = useReducer(singpassReducer, defaultState);
+	const { refetch: fetchOpenIdAuthorizationLink } = useOpenIdAuthorizationLink({ enabled: false });
+	const singpassTabRef = useRef$1(null);
+	const isEligibleForSingpass = useMemo$1(() => {
+		if (!legalEntity) return false;
+		if (getLegalEntityCountry(legalEntity) !== CountryCodes.Singapore) return false;
+		if (accountHolder) {
+			if (accountHolder === "myName") return isSingpassMyInfoEnabled;
+			return accountHolder === "theCompanyIWorkFor";
+		}
+		const legalEntityType = legalEntity.type;
+		const isPartOfTrust = isPartOfTrustFromLegalEntity(legalEntity);
+		const isVanillaOrganization = legalEntityType === "organization" && !isPartOfTrust;
+		const hasSoleProprietor = hasSolePropInLegalEntity(legalEntity);
+		return isVanillaOrganization || legalEntityType === "individual" && !hasSoleProprietor && isSingpassMyInfoEnabled;
+	}, [
+		legalEntity,
+		accountHolder,
+		isSingpassMyInfoEnabled
+	]);
+	const handleInitiateSingpassMyInfoLogin = async () => {
+		const singpassWindow = window.open("", "_blank");
+		if (!singpassWindow) throw new Error("Failed to open Singpass window");
+		singpassTabRef.current = singpassWindow;
+		dispatch({
+			...state,
+			type: SingpassMyInfoLoginActionTypes.LOADING
+		});
+		try {
+			const { data } = await fetchOpenIdAuthorizationLink();
+			const authUrl = data?.item.authUrl;
+			if (!authUrl) throw new Error("OpenId authentication URL was not returned");
+			singpassWindow.location.href = authUrl;
+			singpassWindow.focus();
+			userEvents.addPageEvent("Success", {
+				actionType: "navigate",
+				label: "singpassVerification"
+			});
+		} catch (error) {
+			singpassWindow.close();
+			singpassTabRef.current = null;
+			throw error;
+		}
+	};
+	const handleSingpassMyInfoLoginSuccess = () => {
+		userEvents.addPageEvent("Success", {
+			actionType: "verify",
+			label: "singpassVerification"
+		});
+		dispatch({
+			...state,
+			type: SingpassMyInfoLoginActionTypes.SUCCESS
+		});
+	};
+	const handleSingpassMyInfoLoginFailure = (errorMessage) => {
+		userEvents.addPageEvent("Encountered error", {
+			actionType: "navigate",
+			label: "singpassVerification"
+		});
+		dispatch({
+			...state,
+			errorMessage,
+			type: SingpassMyInfoLoginActionTypes.FAILURE
+		});
+	};
+	const handleSingpassMyInfoLoginReset = () => {
+		dispatch({
+			...state,
+			type: SingpassMyInfoLoginActionTypes.RESET
+		});
+	};
+	return {
+		isEligibleForSingpass,
+		state,
+		handleInitiateSingpassMyInfoLogin,
+		handleSingpassMyInfoLoginSuccess,
+		handleSingpassMyInfoLoginFailure,
+		handleSingpassMyInfoLoginReset
+	};
+};
+//#endregion
 //#region src/components/GlobalEntry/globalEntryStore.ts
 var showGlobalEntryModal = signal(false);
 //#endregion
@@ -149,7 +291,7 @@ function confirmBusinessAnalytics(userEvents, idx) {
 //#region src/components/GlobalEntry/forms/BusinessSelection/BusinessInformationCard/BusinessInformationCard.tsx
 function BusinessInformation({ fetching, selectedBusiness }) {
 	const { t } = useTranslation(["common", "business"]);
-	const cardDetails = useMemo(() => {
+	const cardDetails = useMemo$1(() => {
 		if (!selectedBusiness) return [];
 		const address = selectedBusiness.registeredAddress ?? selectedBusiness.principalPlaceOfBusinessAddress;
 		const addressDetails = address && typeof address !== "string" && "fullAddress" in address ? address.fullAddress : void 0;
@@ -228,7 +370,7 @@ function BusinessSelection({ id, country }) {
 	const queryClient = useQueryClient();
 	const userEvents = useAnalyticsContext();
 	const logger = createLogger();
-	const companySearchStateModel = useContext(CompanySearchStateContext);
+	const companySearchStateModel = useContext$1(CompanySearchStateContext);
 	const { data, valid, errors, requiredFields, optionalFields, trustedFields, fieldProblems, handleChange: handleChangeFor } = getFormSlice(form, "businessSelection");
 	const { data: companySearchResponse, isLoading: searching } = useCompanySearch({
 		name: companySearchStateModel.companySearchName.value ?? "",
@@ -254,7 +396,7 @@ function BusinessSelection({ id, country }) {
 	* could perhaps auto-select the result, without caching, we'd have another spinner & wait time for
 	* the user. Better to force a manual re-selection to work around our rough implementation details.
 	*/
-	const isInitializedRef = useRef(false);
+	const isInitializedRef = useRef$1(false);
 	if (!isInitializedRef.current) {
 		if (data?.selectedBusinessId) {
 			handleChangeFor("selectedBusinessId", "blur")("");
@@ -431,7 +573,10 @@ var determineAccountHolder = (data) => {
 	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 === "justMe") {
+		if (data.registrationInformation?.hasDoingBusinessAs === "yes") return "mySoleProprietorName";
+		return filedPaperwork === "yes" ? "mySoleProprietorName" : "myName";
+	}
 	if (entitySetup === "partOfABusiness") {
 		if (isUnincorporatedPartnership(data)) return "anUnincorporatedPartnership";
 		if (isTrust(data)) return "aTrust";
@@ -443,6 +588,18 @@ var determineEntityAssociations = (data, accountHolder, legalEntity) => {
 	if (!ownAssociations || ownAssociations.length === 0) return;
 	return accountHolder !== determineAccountHolder(data) ? [] : void 0;
 };
+var completeWithSingpass = async ({ rootLegalEntity, updateLegalEntity, onComplete, handleInitiateSingpassMyInfoLogin }) => {
+	if (rootLegalEntity.type !== "organization") await updateLegalEntity({
+		id: rootLegalEntity.id,
+		type: "organization"
+	});
+	if (rootLegalEntity.organization?.registeredAddress?.country !== CountryCodes.Singapore) await updateLegalEntity({
+		id: rootLegalEntity.id,
+		organization: { registeredAddress: { country: CountryCodes.Singapore } }
+	});
+	onComplete("theCompanyIWorkFor");
+	await handleInitiateSingpassMyInfoLogin();
+};
 //#endregion
 //#region src/components/GlobalEntry/forms/CompanyStructure/CompanyStructure.tsx
 var COMPANY_STRUCTURE_FIELDS = ["organizationType"];
@@ -598,7 +755,7 @@ var PrimaryPartnerTypeField_module_default = {
 //#endregion
 //#region src/components/GlobalEntry/fields/PrimaryPartnerTypeField/PrimaryPartnerTypeField.tsx
 var PRIMARY_PARTNER_TYPE_FIELD = ["primaryPartnerType"];
-var PrimaryPartnerTypeField = ({ data, valid, errors, handleChangeFor }) => {
+var PrimaryPartnerTypeField = ({ data, valid, errors, isTrust, handleChangeFor }) => {
 	const { t: globalEntryT } = useTranslation("globalEntry");
 	const partnerTypeOptions = [{
 		value: "individual",
@@ -609,13 +766,23 @@ var PrimaryPartnerTypeField = ({ data, valid, errors, handleChangeFor }) => {
 		label: globalEntryT(($) => $["aBusinessEntity"]),
 		iconName: "company"
 	}];
+	const { label, formatGuidance } = {
+		trust: {
+			label: globalEntryT(($) => $["whatTypeOfEntityIsTheFirstPrimaryTrustee"]),
+			formatGuidance: globalEntryT(($) => $["wellStartByCollectingInformationAboutOneTrustee"])
+		},
+		unincorporatedPartnership: {
+			label: globalEntryT(($) => $["whatTypeOfEntityIsTheFirstPrimaryPartner"]),
+			formatGuidance: globalEntryT(($) => $["wellStartByCollectingInformationAboutOnePartner"])
+		}
+	}[isTrust ? "trust" : "unincorporatedPartnership"];
 	return /* @__PURE__ */ jsx(Field, {
 		el: "fieldset",
 		name: "primaryPartnerType",
 		errorMessage: errors.primaryPartnerType,
 		isValid: valid?.primaryPartnerType,
-		label: globalEntryT(($) => $["whatTypeOfEntityIsTheFirstPrimaryPartner"]),
-		formatGuidance: globalEntryT(($) => $["wellStartByCollectingInformationAboutOnePartner"]),
+		label,
+		formatGuidance,
 		children: () => /* @__PURE__ */ jsx(List, {
 			dividers: false,
 			padding: "large",
@@ -658,7 +825,8 @@ var PrimaryPartner = ({ id }) => {
 			data: { primaryPartnerType: data?.primaryPartnerType },
 			valid: { primaryPartnerType: valid?.primaryPartnerType },
 			errors: { primaryPartnerType: formUtils.getErrorMessage("primaryPartnerType", errors, fieldProblems) },
-			handleChangeFor
+			handleChangeFor,
+			isTrust: form.data.registrationInformation?.isTrust === "yes"
 		})]
 	});
 };
@@ -688,19 +856,19 @@ function Questionnaire({ name, label, helper, selected, tiles, isValid, errorMes
 }
 //#endregion
 //#region src/components/GlobalEntry/fields/DbaQuestionnaire/DbaQuestionnaire.tsx
-var DBA_QUESTIONNAIRE_FIELD = ["doingBusinessAs"];
+var DBA_QUESTIONNAIRE_FIELD = ["hasDoingBusinessAs"];
 function DbaQuestionnaire({ data, valid, errors, handleChangeFor }) {
 	const { t: commonT } = useTranslation("common");
 	const { t: globalEntryT } = useTranslation("globalEntry");
 	return /* @__PURE__ */ jsx(Questionnaire, {
-		name: "doingBusinessAs",
+		name: "hasDoingBusinessAs",
 		label: globalEntryT(($) => $["doYouUseABusinessNameThatsDifferentFromYourLegalName"]),
-		helper: globalEntryT(($) => $["thisIsAlsoCalledATradingNameOperatingNameOrDoingBusinessAs"]),
-		selected: data.doingBusinessAs,
-		isValid: valid.doingBusinessAs,
-		errorMessage: errors.doingBusinessAs,
+		helper: globalEntryT(($) => $["thisIsAlsoCalledATradingNameOperatingNameOrDoingBusinessAsName"]),
+		selected: data.hasDoingBusinessAs,
+		isValid: valid.hasDoingBusinessAs,
+		errorMessage: errors.hasDoingBusinessAs,
 		isHorizontal: true,
-		onChange: handleChangeFor("doingBusinessAs"),
+		onChange: handleChangeFor("hasDoingBusinessAs"),
 		tiles: [{
 			label: commonT(($) => $["yes"]),
 			value: "yes"
@@ -856,7 +1024,7 @@ var UnincorporatedOrganizationTypeField = ({ data, valid, errors, handleChangeFo
 		value: "unincorporatedAssociation",
 		icon: "trust"
 	}];
-	return /* @__PURE__ */ jsxs(Fragment, { children: [/* @__PURE__ */ jsx(Questionnaire, {
+	return /* @__PURE__ */ jsxs(Fragment$1, { children: [/* @__PURE__ */ jsx(Questionnaire, {
 		name: "unincorporatedOrganizationType",
 		label: t(($) => $["whichBestDescribesYourOrganization"]),
 		errorMessage: errors.unincorporatedOrganizationType,
@@ -876,6 +1044,7 @@ var UnincorporatedOrganizationTypeField = ({ data, valid, errors, handleChangeFo
 };
 //#endregion
 //#region src/components/GlobalEntry/forms/RegistrationInformation/RegistrationInformation.tsx
+var LazySingpassSelectionCTA = lazy(async () => (await import("./SingpassSelectionCTA-sVs1ou1t.js")).SingpassSelectionCTA);
 var REGISTRATION_INFORMATION_FIELDS = [
 	...PAPERWORK_QUESTIONNAIRE_FIELD,
 	...DBA_QUESTIONNAIRE_FIELD,
@@ -890,7 +1059,7 @@ var REGISTRATION_INFORMATION_FIELDS = [
 	...BUSINESS_REGISTRATION_NUMBER_FIELD,
 	...TAX_INFORMATION_FIELD
 ];
-var RegistrationInformation = ({ id, shouldValidate, legalEntity, country }) => {
+var RegistrationInformation = ({ id, shouldValidate, legalEntity, country, onSingpassClick }) => {
 	const { form } = useFormContext();
 	const { t: commonT } = useTranslation("common");
 	const { t: globalEntryT } = useTranslation("globalEntry");
@@ -914,6 +1083,7 @@ var RegistrationInformation = ({ id, shouldValidate, legalEntity, country }) =>
 		t: businessT
 	});
 	const showField = (fieldKeys) => fieldKeys.some((field) => formUtils.isRequiredField(field) || formUtils.isOptionalField(field));
+	const showSingpassCta = country === CountryCodes.Singapore && form.data.entityInformation.entitySetup === "partOfABusiness" && data?.filedPaperwork === "yes";
 	/**
 	* State is asked for in business search but may not be updated if user does not
 	* find results or opts for manual flow.
@@ -941,9 +1111,9 @@ var RegistrationInformation = ({ id, shouldValidate, legalEntity, country }) =>
 				handleChangeFor
 			}),
 			showField(DBA_QUESTIONNAIRE_FIELD) && /* @__PURE__ */ jsx(DbaQuestionnaire, {
-				data: { doingBusinessAs: data.doingBusinessAs },
-				valid: { doingBusinessAs: valid.doingBusinessAs },
-				errors: { doingBusinessAs: formUtils.getErrorMessage("doingBusinessAs", errors, fieldProblems) },
+				data: { hasDoingBusinessAs: data.hasDoingBusinessAs },
+				valid: { hasDoingBusinessAs: valid.hasDoingBusinessAs },
+				errors: { hasDoingBusinessAs: formUtils.getErrorMessage("hasDoingBusinessAs", errors, fieldProblems) },
 				handleChangeFor
 			}),
 			showField(TRUST_QUESTIONNAIRE_FIELD) && /* @__PURE__ */ jsx(TrustQuestionnaire, {
@@ -952,6 +1122,10 @@ var RegistrationInformation = ({ id, shouldValidate, legalEntity, country }) =>
 				errors: { isTrust: formUtils.getErrorMessage("isTrust", errors, fieldProblems) },
 				handleChangeFor
 			}),
+			showSingpassCta && /* @__PURE__ */ jsx(Suspense, {
+				fallback: null,
+				children: /* @__PURE__ */ jsx(LazySingpassSelectionCTA, { onClick: onSingpassClick })
+			}),
 			showField(LLC_QUESTIONNAIRE_FIELD) && /* @__PURE__ */ jsx(LlcQuestionnaire, {
 				data: { isLimitedLiabilityCorporation: data.isLimitedLiabilityCorporation },
 				valid: { isLimitedLiabilityCorporation: valid.isLimitedLiabilityCorporation },
@@ -1239,7 +1413,7 @@ function usePrefetchCompanySearch({ country, multiForm, activeFormId, isUsingCom
 	* generic, but to avoid putting the cart before the horse, it'll intentionally
 	* remain as-is.
 	*/
-	const prefetchCompanySearchResults = useCallback(async () => {
+	const prefetchCompanySearchResults = useCallback$1(async () => {
 		const root = getRootElement(), activeElementName = (root.activeElement && root.activeElement.getAttribute("name")) ?? "";
 		const fieldNames = getRelatedFields(country);
 		let allRelatedFieldsAreValid = true, noRelatedFieldsAreFocused = true;
@@ -1273,7 +1447,7 @@ function usePrefetchCompanySearch({ country, multiForm, activeFormId, isUsingCom
 	* Re-fires prefetch when fields lose focus, with extra filtering within
 	* the handler to determine whether the search should continue after being debounced.
 	*/
-	useEffect(() => {
+	useEffect$1(() => {
 		const prefetch = () => {
 			if (activeFormId !== "registrationInformation" || !isUsingCompanySearch) return;
 			debouncedCompanySearchPrefetch();
@@ -1381,7 +1555,7 @@ function RegistrationNumberMismatchModal({ companySearchStateModel, country, reg
 //#region src/components/GlobalEntry/modals/TinMismatchModal.tsx
 function TinMismatchModal({ onCancel, onConfirm }) {
 	const { t } = useTranslation(["common", "business"]);
-	const modalDescriptionKey = typeof useContext(CompanySearchStateContext).selectedCompany.value === "undefined" ? "theEinDidntMatchLegalBusinessName" : "itLooksLikeThisBusinessUsesADifferentEIN";
+	const modalDescriptionKey = typeof useContext$1(CompanySearchStateContext).selectedCompany.value === "undefined" ? "theEinDidntMatchLegalBusinessName" : "itLooksLikeThisBusinessUsesADifferentEIN";
 	return /* @__PURE__ */ jsx(Confirm, {
 		title: t(($) => $["employerIdentificationNumberDoesntMatch"], { ns: "business" }),
 		description: t(($) => $[modalDescriptionKey], { ns: "business" }),
@@ -1403,8 +1577,8 @@ var globalEntryFieldRuleConfigurations = {
 	countryOfGoverningLaw: { rule: "countryOfGoverningLawRequired" },
 	selectedBusinessId: { rule: "businessSelectionRequired" },
 	filedPaperwork: { rule: "filedPaperworkRequired" },
-	doingBusinessAs: { rule: "doingBusinessAsRequired" },
 	isTrust: { rule: "isTrustRequired" },
+	hasDoingBusinessAs: { rule: "hasDoingBusinessAsRequired" },
 	isLimitedLiabilityCorporation: { rule: "isLimitedLiabilityCorporationRequired" },
 	unincorporatedOrganizationType: { rule: "unincorporatedOrganizationTypeRequired" },
 	legalCompanyName: { rule: "legalCompanyNameRequired" },
@@ -1443,7 +1617,7 @@ var globalEntryCustomRules = ({ accountHolder, data, isFeatureEnabled = () => fa
 			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,
+		hasDoingBusinessAsRequired: () => 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";
@@ -1703,7 +1877,7 @@ var globalEntryValidationRules = ({ data, legalEntity, isFeatureEnabled = () =>
 			modes: ["blur", "input"]
 		} },
 		registrationInformation: {
-			doingBusinessAs: {
+			hasDoingBusinessAs: {
 				validate: (value) => !!value,
 				modes: ["blur", "input"]
 			},
@@ -1732,14 +1906,15 @@ var globalEntryValidationRules = ({ data, legalEntity, isFeatureEnabled = () =>
 };
 //#endregion
 //#region src/components/GlobalEntry/tasks/GlobalEntry.tsx
-var GlobalEntry = ({ activeForm, legalEntity, shouldValidate, country }) => {
+var GlobalEntry = ({ activeForm, legalEntity, shouldValidate, country, onSingpassClick }) => {
 	switch (activeForm.formId) {
 		case globalEntryForms.entityInformation.formId: return /* @__PURE__ */ jsx(EntityInformation, { id: activeForm.formId });
 		case globalEntryForms.registrationInformation.formId: return /* @__PURE__ */ jsx(RegistrationInformation, {
 			id: activeForm.formId,
 			legalEntity,
 			shouldValidate,
-			country
+			country,
+			onSingpassClick
 		});
 		case globalEntryForms.businessSelection.formId: return /* @__PURE__ */ jsx(BusinessSelection, {
 			id: activeForm.formId,
@@ -1756,7 +1931,7 @@ var GlobalEntry = ({ activeForm, legalEntity, shouldValidate, country }) => {
 };
 //#endregion
 //#region src/components/GlobalEntry/tasks/GlobalEntryModal.tsx
-var CompanySearchStateContext = createContext({});
+var CompanySearchStateContext = createContext$1({});
 var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	const { i18n, t } = useTranslation(["common", "globalEntry"]);
 	const { isFeatureEnabled } = useToggleContext();
@@ -1766,14 +1941,20 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	const { accountHolder: accountHolderMaybe } = useAccountHolder();
 	const userEvents = useAnalyticsContext();
 	const { mutateAsync: clearCompanyData } = useClearCompanyData();
-	const [derivedProps, setDerivedProps] = useState();
+	const [derivedProps, setDerivedProps] = useState$1();
 	const accountHolder = accountHolderMaybe ?? (rootLegalEntity.type === "individual" ? "myName" : "theCompanyIWorkFor");
 	const companySearchStateModel = useModel(() => new CompanySearchStateModel(userEvents));
+	const { handleInitiateSingpassMyInfoLogin, handleSingpassMyInfoLoginFailure } = useSingpassMyInfoLogin({
+		legalEntity: rootLegalEntity,
+		accountHolder: "theCompanyIWorkFor"
+	});
 	const tinMismatchModalOpen = useSignal(false);
 	const legalArrangementModalOpen = useSignal(false);
 	const registrationNumberMismatchModalOpen = useSignal(false);
 	const skipBusinessSelection = useSignal(true);
-	const [searchStatus, setSearchStatus] = useState("success");
+	const [searchStatus, setSearchStatus] = useState$1("success");
+	const initialRootLegalEntity = useRef$1(rootLegalEntity).current;
+	const initialAccountHolder = useRef$1(accountHolder).current;
 	/**
 	* Distinct from the model's `verificationMatched`, which updates the moment the API answers. This
 	* only records the outcome once the user navigates forward, and it is deliberately inert: unlike
@@ -1784,32 +1965,32 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	addResourceBundles(i18n, [{
 		ns: "globalEntry",
 		importFn: (lang) => _rolldown_dynamic_import_helper_default(/* #__PURE__ */ Object.assign({
-			"../language/bg-BG.json": () => import("./bg-BG-ClMsmcda.js"),
-			"../language/cs-CZ.json": () => import("./cs-CZ-DyLd-erd.js"),
-			"../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-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"),
-			"../language/fi-FI.json": () => import("./fi-FI-B1RyWVH2.js"),
-			"../language/fr-FR.json": () => import("./fr-FR-C3Zi7-JE.js"),
-			"../language/hr-HR.json": () => import("./hr-HR-CH9yGEPn.js"),
-			"../language/hu-HU.json": () => import("./hu-HU-DpUG3GwC.js"),
-			"../language/it-IT.json": () => import("./it-IT-BEEsgu4Z.js"),
-			"../language/ja-JP.json": () => import("./ja-JP-CcXk7Gcc.js"),
-			"../language/lt-LT.json": () => import("./lt-LT-CGgbFwbx.js"),
-			"../language/lv-LV.json": () => import("./lv-LV-Ck_aQ4ML.js"),
-			"../language/nl-NL.json": () => import("./nl-NL-_hbzuQ0h.js"),
-			"../language/no-NO.json": () => import("./no-NO-B_ijkAtf.js"),
-			"../language/pl-PL.json": () => import("./pl-PL-u6DrL8IY.js"),
-			"../language/pt-BR.json": () => import("./pt-BR-CPS77pGy.js"),
-			"../language/pt-PT.json": () => import("./pt-PT-DIKqQR6V.js"),
-			"../language/ro-RO.json": () => import("./ro-RO-Cg1nG9ns.js"),
-			"../language/sk-SK.json": () => import("./sk-SK-CRfiVN3e.js"),
-			"../language/sl-SI.json": () => import("./sl-SI-Dpr3StsS.js"),
-			"../language/sv-SE.json": () => import("./sv-SE-CH4wMrUZ.js")
+			"../language/bg-BG.json": () => import("./bg-BG-s01xQ0IE.js"),
+			"../language/cs-CZ.json": () => import("./cs-CZ-DfKxKCsI.js"),
+			"../language/da-DK.json": () => import("./da-DK-BrKeONXP.js"),
+			"../language/de-DE.json": () => import("./de-DE-CaVZKsmT.js"),
+			"../language/el-GR.json": () => import("./el-GR-DHA0rkvc.js"),
+			"../language/en-US.json": () => import("./en-US-B7V_rOZV.js"),
+			"../language/es-ES.json": () => import("./es-ES-DsWec_oM.js"),
+			"../language/es-LA.json": () => import("./es-LA-D0FhHrwN.js"),
+			"../language/et-EE.json": () => import("./et-EE-Bp9-vCYs.js"),
+			"../language/fi-FI.json": () => import("./fi-FI-DcwOxjVV.js"),
+			"../language/fr-FR.json": () => import("./fr-FR-_ytHUJlx.js"),
+			"../language/hr-HR.json": () => import("./hr-HR-Cb9wbqiH.js"),
+			"../language/hu-HU.json": () => import("./hu-HU-d15vxL_S.js"),
+			"../language/it-IT.json": () => import("./it-IT-DBatLxXf.js"),
+			"../language/ja-JP.json": () => import("./ja-JP-BRdSqCDF.js"),
+			"../language/lt-LT.json": () => import("./lt-LT-DbzhtTak.js"),
+			"../language/lv-LV.json": () => import("./lv-LV-B17wL3y6.js"),
+			"../language/nl-NL.json": () => import("./nl-NL-CfQsmGB5.js"),
+			"../language/no-NO.json": () => import("./no-NO-B1dqTSiS.js"),
+			"../language/pl-PL.json": () => import("./pl-PL-DSwjmRZS.js"),
+			"../language/pt-BR.json": () => import("./pt-BR-_3W6lRmq.js"),
+			"../language/pt-PT.json": () => import("./pt-PT-BUEnW3xZ.js"),
+			"../language/ro-RO.json": () => import("./ro-RO-B4LyC5yt.js"),
+			"../language/sk-SK.json": () => import("./sk-SK-CLhssOsk.js"),
+			"../language/sl-SI.json": () => import("./sl-SI-QgSjXf-1.js"),
+			"../language/sv-SE.json": () => import("./sv-SE-BJgBNvRa.js")
 		}), `../language/${lang}.json`, 3)
 	}]);
 	addResourceBundles(i18n, [{
@@ -1820,7 +2001,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 			"../../Business/language/da-DK.json": () => import("./da-DK-BzBfkSME.js"),
 			"../../Business/language/de-DE.json": () => import("./de-DE-C9cUCFOi.js"),
 			"../../Business/language/el-GR.json": () => import("./el-GR-aelq5Q0a.js"),
-			"../../Business/language/en-US.json": () => import("./en-US-DPr5RN3e.js"),
+			"../../Business/language/en-US.json": () => import("./en-US-BLUu-I1a.js"),
 			"../../Business/language/es-ES.json": () => import("./es-ES-DhkTbihW.js"),
 			"../../Business/language/es-LA.json": () => import("./es-LA-JRuDva0n.js"),
 			"../../Business/language/et-EE.json": () => import("./et-EE-D8TSvkoE.js"),
@@ -1846,20 +2027,20 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	const handleClose = () => {
 		showGlobalEntryModal.value = false;
 	};
-	const buildFieldValidations = useCallback((data) => globalEntryValidationRules({
+	const buildFieldValidations = useCallback$1((data) => globalEntryValidationRules({
 		data,
 		legalEntity: rootLegalEntity,
 		isFeatureEnabled
 	}), [isFeatureEnabled, rootLegalEntity]);
 	const { storedStateOrProvince } = useStoredStateOrProvince({ legalEntityId: rootLegalEntity.id });
-	const initialStoredStateOrProvince = useRef(storedStateOrProvince).current;
-	const defaultData = useMemo(() => {
-		const mappedData = mapLegalEntityToGlobalEntrySchema(rootLegalEntity, accountHolder);
+	const initialStoredStateOrProvince = useRef$1(storedStateOrProvince).current;
+	const defaultData = useMemo$1(() => {
+		const mappedData = mapLegalEntityToGlobalEntrySchema(initialRootLegalEntity, initialAccountHolder);
 		mappedData.registrationInformation.stateOrProvince = mappedData.registrationInformation.stateOrProvince ?? initialStoredStateOrProvince;
 		return mappedData;
 	}, [
-		rootLegalEntity,
-		accountHolder,
+		initialRootLegalEntity,
+		initialAccountHolder,
 		initialStoredStateOrProvince
 	]);
 	const multiForm = useMultiForm({
@@ -1871,7 +2052,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	});
 	const { isValid: formValidity, data, triggerValidation } = multiForm;
 	const country = data.entityInformation?.country ?? getLegalEntityCountry(rootLegalEntity);
-	const rules = useMemo(() => globalEntryCustomRules({
+	const rules = useMemo$1(() => globalEntryCustomRules({
 		data,
 		isFeatureEnabled,
 		isSettingEnabled,
@@ -1887,7 +2068,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		data,
 		rootLegalEntity
 	]);
-	useEffect(() => {
+	useEffect$1(() => {
 		const props = getPropsFromConfigurations({
 			scenarioConfiguration: globalEntryFieldRuleConfigurations,
 			forms: globalEntryForms,
@@ -1904,7 +2085,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	* The company structures that are still valid given the registration number type and tax ID
 	* number type currently in the form.
 	*/
-	const availableCompanyStructures = useMemo(() => getAvailableCompanyStructures({
+	const availableCompanyStructures = useMemo$1(() => getAvailableCompanyStructures({
 		country,
 		registrationNumberType: data.registrationInformation?.registrationNumberType,
 		registrationNumberExempt: data.registrationInformation?.exemptedFromRegistrationNumber,
@@ -1924,10 +2105,10 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	* This is used to automatically select the company structure when the user has already provided
 	* the necessary information to uniquely identify the company structure
 	*/
-	const inferredCompanyStructure = useMemo(() => {
+	const inferredCompanyStructure = useMemo$1(() => {
 		return availableCompanyStructures.length === 1 ? availableCompanyStructures[0] : void 0;
 	}, [availableCompanyStructures]);
-	const getRequiredForms = useCallback((options) => buildRequiredForms({
+	const getRequiredForms = useCallback$1((options) => buildRequiredForms({
 		config: {
 			forms: globalEntryForms,
 			requiredFields: derivedProps?.requiredFields,
@@ -1947,7 +2128,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		inferredCompanyStructure,
 		rootLegalEntity
 	]);
-	const forms = useMemo(() => getRequiredForms({
+	const forms = useMemo$1(() => getRequiredForms({
 		skipBusinessSelection: skipBusinessSelection.value,
 		skipCompanyStructure: !!companySearchStateModel.verifiedBusiness.value?.legalForm || !!inferredCompanyStructure
 	}), [
@@ -1957,13 +2138,12 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		inferredCompanyStructure
 	]);
 	const { mutateAsync: updateLegalEntity, isPending: isUpdatingLegalEntity } = useUpdateLegalEntity();
-	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
 	* on navigation so the re-render hasn't happened yet.
 	*/
-	const pendingSubmitData = useRef();
+	const pendingSubmitData = useRef$1();
 	const confirmSelection = (options) => {
 		pendingSubmitData.current = companySearchStateModel.confirmCompany(multiForm, country, options);
 	};
@@ -2013,7 +2193,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 		registrationNumberMismatchModalOpen,
 		confirmSelection
 	});
-	const [companyStructure, setCompanyStructure] = useState(data.companyStructure?.organizationType);
+	const [companyStructure, setCompanyStructure] = useState$1(data.companyStructure?.organizationType);
 	if (inferredCompanyStructure && companyStructure !== inferredCompanyStructure && !companySearchStateModel.verifiedBusiness.value?.legalForm && activeForm?.formId === globalEntryForms.registrationInformation.formId) {
 		setCompanyStructure(inferredCompanyStructure);
 		multiForm.handleChangeFor("companyStructure", "organizationType")(inferredCompanyStructure);
@@ -2021,17 +2201,48 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	/**
 	* Current country value must be kept in sync with what is selected in entityInformation form
 	*/
-	const [prevCountry, setPrevCountry] = useState(data.entityInformation?.country);
+	const [prevCountry, setPrevCountry] = useState$1(data.entityInformation?.country);
 	if (data.entityInformation?.country && prevCountry !== data.entityInformation.country) {
 		setPrevCountry(data.entityInformation.country);
 		companySearchStateModel.resetCompanySearchData();
 		multiForm.handleChangeFor("companyStructure", "organizationType")(void 0);
 	}
+	const handleCompleteWithSingpass = async () => {
+		try {
+			await completeWithSingpass({
+				rootLegalEntity,
+				updateLegalEntity,
+				onComplete,
+				handleInitiateSingpassMyInfoLogin
+			});
+			showGlobalEntryModal.value = false;
+		} catch (err) {
+			logger.error(err);
+			handleSingpassMyInfoLoginFailure("weCouldntConnectToMyinfoBusiness");
+			showToast({
+				label: t(($) => $["weCouldntConnectToMyinfoBusiness"], { ns: "common" }),
+				variant: "error"
+			});
+		}
+	};
 	const overrideNextClick = async () => {
 		if (!activeForm.isValid) return handleNextClick();
 		if (!isUsingCompanySearch(data)) return handleNextClick();
 		switch (activeForm.formId) {
 			case globalEntryForms.registrationInformation.formId: {
+				if (rootLegalEntity.type === "individual") try {
+					await updateLegalEntity({
+						id: rootLegalEntity.id,
+						type: "organization"
+					});
+				} catch (err) {
+					logger.error(err);
+					showToast({
+						label: t(($) => $["failedToUpdateDetails"], { ns: "common" }),
+						variant: "error"
+					});
+					return;
+				}
 				const currentForms = await attemptBusinessSearch();
 				if (currentForms === null) return;
 				return handleNextClick(currentForms);
@@ -2120,7 +2331,7 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 			forms,
 			gotoFormByFormIndex,
 			gotoFormByFormId,
-			loadingStatus: isLoading ? "loading" : searchStatus,
+			loadingStatus: isUpdatingLegalEntity ? "loading" : searchStatus,
 			currentStep: steps.current,
 			totalSteps: steps.total,
 			isGlobalEntry: true,
@@ -2132,7 +2343,8 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 						activeForm,
 						shouldValidate,
 						legalEntity: rootLegalEntity,
-						country
+						country,
+						onSingpassClick: handleCompleteWithSingpass
 					}),
 					/* @__PURE__ */ jsx(Show, {
 						when: tinMismatchModalOpen,
@@ -2163,4 +2375,4 @@ var GlobalEntryModal = ({ rootLegalEntity, onComplete }) => {
 	});
 };
 //#endregion
-export { showGlobalEntryModal as n, GlobalEntryModal as t };
+export { showGlobalEntryModal as n, useSingpassMyInfoLogin as r, GlobalEntryModal as t };