@adyen/kyc-components 4.16.0 → 4.17.0-beta.0

package/dist/adyen-onboarding.js

@@ -1,50 +1,50 @@
 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] = "c3962387-9bf6-475d-aec5-95a5d7e3e1b4", e._sentryDebugIdIdentifier = "sentry-dbid-c3962387-9bf6-475d-aec5-95a5d7e3e1b4");
+	n && (e._sentryDebugIds = e._sentryDebugIds || {}, e._sentryDebugIds[n] = "b2d9e1f7-8cad-4e66-94d7-758780869c63", e._sentryDebugIdIdentifier = "sentry-dbid-b2d9e1f7-8cad-4e66-94d7-758780869c63");
 } catch (e) {}
-import { a as Icon, i as Typography, n as addResourceBundles, o as createLogger, r as useTranslation } from "./translation-BYvhW5zA.js";
-import { A as _rolldown_dynamic_import_helper_default, F as useToggles, N as FeatureNames, O as useSetting, _ as isPartOfTrustFromLegalEntity, a as doesLegalEntityRequiresLegalRepresentative, b as isInstantVerifiedAccount, d as hasRejectedCapabilities, ft as useAccountHolder, g as getOwnTrustProblems, i as useGlobalStore, j as useToggleContext, m as isPartOfUnincorporatedPartnership, mt as stylesheets, n as EmbedShell, p as getOwnUnincorporatedPartnershipProblems, pt as useLocalStorage, r as useGetTaskStatus, t as resolveEnvironment, u as hasAllCapabilitiesResolved, x as Alert, y as getObscuredAccountNumber } from "./resolveEnvironment-DNmu53Rr.js";
-import { n as IconButton, r as Loader, t as Button } from "./Button-i8I2dHP8.js";
-import { n as httpGet, r as httpPost, s as useApiContext } from "./http-8qgzqVqk.js";
-import { r as useLegalEntity, t as ROOT_LE } from "./useLegalEntity-CtlUQv_J.js";
+import { a as Icon, i as Typography, n as addResourceBundles, o as createLogger, r as useTranslation } from "./translation-BR3rLb4m.js";
+import { A as _rolldown_dynamic_import_helper_default, F as useToggles, O as useSetting, _ as isPartOfTrustFromLegalEntity, a as doesLegalEntityRequiresLegalRepresentative, b as isInstantVerifiedAccount, d as hasRejectedCapabilities, ft as useAccountHolder, g as getOwnTrustProblems, i as useGlobalStore, j as useToggleContext, m as isPartOfUnincorporatedPartnership, mt as stylesheets, n as EmbedShell, p as getOwnUnincorporatedPartnershipProblems, pt as useLocalStorage, r as useGetTaskStatus, t as resolveEnvironment, u as hasAllCapabilitiesResolved, x as Alert, y as getObscuredAccountNumber } from "./resolveEnvironment-CDmvZMy-.js";
+import { n as IconButton, r as Loader, t as Button } from "./Button-3qGOI53m.js";
+import { n as httpGet, r as httpPost, s as useApiContext } from "./http-DeQp0G69.js";
+import { r as useLegalEntity, t as ROOT_LE } from "./useLegalEntity-BXk2tzGe.js";
 import { t as LegalEntityTypes } from "./legal-entity-type-0MfCGzUf.js";
 import { t as getLegalEntityCountry } from "./getLegalEntityCountry-BHh7Ux8v.js";
 import { t as useSettingsContext } from "./useSettingsContext-Bpf4UqRT.js";
-import { a as noop, o as objectsDeepEqual } from "./AnalyticsContext-BFrJmsp0.js";
+import { a as noop, o as objectsDeepEqual } from "./AnalyticsContext-BnRQ9H1u.js";
 import { t as StackLayout } from "./StackLayout-IUdNMDgW.js";
 import { i as TaskStatuses, n as TASK_STATUS_POLLING_INTERVAL_MS, t as TASK_STATUS_COMPLETED_POLLING_INTERVAL_MS } from "./taskStatus-BtekPA8E.js";
 import { t as CountryCodes } from "./country-code-CJk2hdPu.js";
-import { n as Skeleton } from "./Accordion-IXKjwyLD.js";
+import { n as Skeleton } from "./Accordion-DmH02rWQ.js";
 import { t as TaskTypes } from "./taskTypes-NawDTp5n.js";
 import { a as getLegalRepresentative, c as getOwnSolePropProblems, f as hasSolePropInLegalEntity } from "./entityAssociationUtil-C-wflW8q.js";
 import { a as getOwnSignatories, i as getOwnDecisionMakersLegalEntityIds } from "./decisionMakerRoles-DIG8zo1C.js";
-import { n as canShowAdaptivePoc, t as TaskListItem } from "./TaskListItem-DYISbC7G.js";
-import { t as useBusinessLines } from "./useBusinessLines-BFsRoAAj.js";
-import { n as usePciQuestionnaireList, t as getPciQuestionnaireList } from "./usePciQuestionnaireList-CbkNC_Ye.js";
-import { n as usePciStatus, t as useSalesChannels } from "./useSalesChannels-DW5ilTS0.js";
-import { n as useTermsOfServiceAcceptanceInfos, t as useTermsOfServiceStatus } from "./useTermsOfServiceStatus-D1_ECrkO.js";
-import { t as Card } from "./Card-BCGLpdw7.js";
-import { i as useAnalyticsContext } from "./Modal-BLP2aF-u.js";
+import { n as canShowAdaptivePoc, t as TaskListItem } from "./TaskListItem-CerYvccy.js";
+import { i as useAnalyticsContext } from "./Modal-DParMHcv.js";
+import { t as HandlerContext } from "./HandlerContext-DeMa68z0.js";
 import { t as SettingNames } from "./types-Cwq1JAWT.js";
-import { n as useToastContext } from "./invalidateRootLegalEntity-DLpPeD5p.js";
-import { t as useCanSeeIntroduction } from "./useCanSeeIntroduction-DeC5D9Io.js";
+import { t as TrustedFieldsProviders } from "./trusted-fields-provider-DLz8KKVf.js";
+import { r as getTrustedFieldsProvider } from "./getTrustedFields-BJ88GlM-.js";
+import { t as useAssociatedLegalEntity } from "./useAssociatedLegalEntity-QRvyeNwU.js";
+import { t as useBusinessLines } from "./useBusinessLines-B2iCcDej.js";
+import { n as usePciQuestionnaireList, t as getPciQuestionnaireList } from "./usePciQuestionnaireList-BEPt97lw.js";
+import { n as usePciStatus, t as useSalesChannels } from "./useSalesChannels-D3vQBhRT.js";
+import { n as useTermsOfServiceAcceptanceInfos, t as useTermsOfServiceStatus } from "./useTermsOfServiceStatus-B1OpYOua.js";
+import { t as Card } from "./Card-BCGLpdw7.js";
+import { n as useToastContext } from "./invalidateRootLegalEntity-CLfParL1.js";
+import { t as useCanSeeIntroduction } from "./useCanSeeIntroduction-CnXU-rRK.js";
 import { a as idNowPostSubmit, c as CompanyTypesValues, n as isBafinSignatoryFlow, s as showIdNowModal } from "./bafinUtils-BKq-s1Ka.js";
-import { n as getDefaultAccountHolderType } from "./accountHolderUtils-BqC40MeW.js";
-import { t as useDataMissingRemediations } from "./useDataMissingRemediations-QYShC4SG.js";
-import { t as EndStateLayout } from "./EndStateLayout-CBRHUXyY.js";
-import { n as useCapabilityProblems } from "./getProblemsForEntity-D6XC4DZ2.js";
+import { n as getDefaultAccountHolderType } from "./accountHolderUtils-DN7xxNk6.js";
+import { t as useDataMissingRemediations } from "./useDataMissingRemediations-BZwtMi3U.js";
+import { t as EndStateLayout } from "./EndStateLayout-ic1EOve9.js";
+import { n as useCapabilityProblems } from "./getProblemsForEntity-CjAq8_4L.js";
 import { t as downloadFile } from "./file-1IenVoh8.js";
 import { t as filterProblemsByTaskForms } from "./filterProblemsByTaskForms-CQby20PN.js";
-import { n as useDeleteTransferInstrument } from "./VerificationErrorAlert-B_RKlfIG.js";
-import { n as translateTranslatable } from "./utils-C1buyvRw.js";
-import { t as HandlerContext } from "./HandlerContext-DeMa68z0.js";
-import { t as TrustedFieldsProviders } from "./trusted-fields-provider-DLz8KKVf.js";
-import { r as getTrustedFieldsProvider } from "./getTrustedFields-BJ88GlM-.js";
-import { t as useAssociatedLegalEntity } from "./useAssociatedLegalEntity-CkuvFV-D.js";
-import { n as Image, t as UnincorporatedPartnershipMemberTypes } from "./unincorporated-partnership-nnTW3FnG.js";
+import { n as useDeleteTransferInstrument } from "./VerificationErrorAlert-DoI4EWvH.js";
+import { n as translateTranslatable } from "./utils-BtyrxTzp.js";
 import { t as isNewEntity } from "./isNewEntity-vML86iIM.js";
-import { t as useTrustMembers } from "./useTrustMembers-BIdqkIX1.js";
-import { A as UnincorporatedPartnershipMembersOverview$1, C as TrustMemberCompanyPage$1, D as UnincorporatedPartnershipIndividualPage$1, E as TrustMembersOverview$1, M as getDefaultTask$1, O as UnincorporatedPartnershipMemberCompanyPage$1, S as TrustDetailsPage$1, T as TrustMemberRoleAndTypePage$1, _ as SignPCIComponent$1, a as BusinessTypeSelectionPage$1, b as SourceOfFundsPage$1, c as DecisionMakers$1, d as PayoutDetailsPage$1, f as ROUTE_PATHS, g as RootIndividualDetailsPage$1, h as RootBusinessLinesPage$1, i as BusinessFinancingPage$1, j as detectBasePath, k as UnincorporatedPartnershipMemberRoleAndTypePage$1, l as Introduction$1, m as RootBusinessDetailsPage$1, n as AcceptTermsOfService$1, o as CustomerSupport$1, p as Review$1, r as AccountSetupRejected$1, s as DecisionMakerDetailsPage$1, t as useNavigate, u as LegalRepresentativeDetailsPage$1, v as SingpassSelection$1, w as TrustMemberIndividualPage$1, x as TaxReportingDropin$1, y as SoleProprietorshipPage$1 } from "./useNavigate-i7J4ofUG.js";
+import { A as UnincorporatedPartnershipMembersOverview, C as TrustMemberCompanyPage, D as UnincorporatedPartnershipIndividualPage, E as TrustMembersOverview, O as UnincorporatedPartnershipMemberCompanyPage, S as TrustDetailsPage, T as TrustMemberRoleAndTypePage, _ as SignPCIComponent, a as BusinessTypeSelectionPage, b as SourceOfFundsPage, c as DecisionMakers, d as PayoutDetailsPage, f as ROUTE_PATHS, g as RootIndividualDetailsPage, h as RootBusinessLinesPage, i as BusinessFinancingPage, j as getDefaultTask, k as UnincorporatedPartnershipMemberRoleAndTypePage, l as Introduction, m as RootBusinessDetailsPage, n as AcceptTermsOfService, o as CustomerSupport, p as Review, r as AccountSetupRejected, s as DecisionMakerDetailsPage, t as useNavigate, u as LegalRepresentativeDetailsPage, v as SingpassSelection, w as TrustMemberIndividualPage, x as TaxReportingDropin, y as SoleProprietorshipPage } from "./useNavigate-CjmVqQDd.js";
+import { n as Image, t as UnincorporatedPartnershipMemberTypes } from "./unincorporated-partnership-BstfjTh2.js";
+import { t as useTrustMembers } from "./useTrustMembers-DVjAe7_S.js";
 import register from "preact-custom-element";
 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";
@@ -76,6 +76,163 @@ var useTaskTypes = (options) => {
 	});
 };
 //#endregion
+//#region src/context/handlerContext/HandlerProvider.tsx
+function HandlerProvider({ children, onNavigateToTask }) {
+	return /* @__PURE__ */ jsx(HandlerContext.Provider, {
+		value: { onNavigateToTask },
+		children
+	});
+}
+//#endregion
+//#region src/hooks/introduction/useHasSeenIntroduction.ts
+var getHasSeenIntroductionStorageKey = (legalEntityId) => `COMPLETED_INTRO-${legalEntityId}`;
+var useHasSeenIntroduction = ({ legalEntityId }) => {
+	const [hasSeenIntroduction, setHasSeenIntroduction] = useLocalStorage(getHasSeenIntroductionStorageKey(legalEntityId), false);
+	return {
+		hasSeenIntroduction,
+		setHasSeenIntroduction
+	};
+};
+//#endregion
+//#region src/hooks/singpass/useHasSeenSingpassSelection.ts
+var getHasSeenSingpassSelectionStorageKey = (legalEntityId) => `COMPLETED_SINGPASS_SELECTION-${legalEntityId}`;
+var useHasSeenSingpassSelection = ({ legalEntityId }) => {
+	const [hasSeenSingpassSelection, setHasSeenSingpassSelection] = useLocalStorage(getHasSeenSingpassSelectionStorageKey(legalEntityId), false);
+	return {
+		hasSeenSingpassSelection,
+		setHasSeenSingpassSelection
+	};
+};
+//#endregion
+//#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 [state, dispatch] = useReducer(singpassReducer, {
+		isLoading: false,
+		isSuccess: getTrustedFieldsProvider(legalEntity) === TrustedFieldsProviders.SINGPASS
+	});
+	const { refetch: fetchOpenIdAuthorizationLink } = useOpenIdAuthorizationLink({ enabled: false });
+	const isEligibleForSingpass = useMemo$1(() => {
+		if (!legalEntity) return false;
+		if (getLegalEntityCountry(legalEntity) !== CountryCodes.Singapore) return false;
+		if (accountHolder) return accountHolder === "theCompanyIWorkFor" || accountHolder === "myName";
+		const legalEntityType = legalEntity.type;
+		const isPartOfTrust = isPartOfTrustFromLegalEntity(legalEntity);
+		const isVanillaOrganization = legalEntityType === LegalEntityTypes.ORGANIZATION && !isPartOfTrust;
+		const hasSoleProprietor = hasSolePropInLegalEntity(legalEntity);
+		const isVanillaIndividual = legalEntityType === LegalEntityTypes.INDIVIDUAL && !hasSoleProprietor;
+		return isVanillaOrganization || isVanillaIndividual;
+	}, [legalEntity, accountHolder]);
+	const handleInitiateSingpassMyInfoLogin = async () => {
+		dispatch({
+			...state,
+			type: SingpassMyInfoLoginActionTypes.LOADING
+		});
+		const { data } = await fetchOpenIdAuthorizationLink();
+		return data?.item.authUrl;
+	};
+	const handleSingpassMyInfoLoginSuccess = () => {
+		dispatch({
+			...state,
+			type: SingpassMyInfoLoginActionTypes.SUCCESS
+		});
+	};
+	const handleSingpassMyInfoLoginFailure = (errorMessage) => {
+		dispatch({
+			...state,
+			errorMessage,
+			type: SingpassMyInfoLoginActionTypes.FAILURE
+		});
+	};
+	const handleSingpassMyInfoLoginReset = () => {
+		dispatch({
+			...state,
+			type: SingpassMyInfoLoginActionTypes.RESET
+		});
+	};
+	return {
+		isEligibleForSingpass,
+		state,
+		handleInitiateSingpassMyInfoLogin,
+		handleSingpassMyInfoLoginSuccess,
+		handleSingpassMyInfoLoginFailure,
+		handleSingpassMyInfoLoginReset
+	};
+};
+//#endregion
+//#region src/hooks/useAssociatedLegalRepresentative.ts
+var useAssociatedLegalRepresentative = (legalEntity) => {
+	const matchingAssociation = useMemo$1(() => {
+		return getLegalRepresentative(legalEntity);
+	}, [legalEntity]);
+	const { data } = useLegalEntity(doesLegalEntityRequiresLegalRepresentative(legalEntity) && matchingAssociation?.legalEntityId ? matchingAssociation.legalEntityId : skipToken);
+	return data;
+};
+//#endregion
+//#region src/hooks/useCanSeeEntitySelection.ts
+var getCanSeeEntitySelectionStorageKey = (legalEntityId) => `ENTITY_SELECTION_SEEN-${legalEntityId}`;
+var useCanSeeEntitySelection = (legalEntityId) => {
+	const [canSeeEntitySelectionFromLocalStorage, setCanSeeEntitySelectionIntoLocalStorage] = useLocalStorage(getCanSeeEntitySelectionStorageKey(legalEntityId), true);
+	return {
+		canSeeEntitySelection: canSeeEntitySelectionFromLocalStorage,
+		setCanSeeEntitySelection: setCanSeeEntitySelectionIntoLocalStorage
+	};
+};
+//#endregion
+//#region src/router/MemoryRouterContext.tsx
+var MemoryRouterContext = createContext$1(null);
+var useMemoryRouter = () => useContext$1(MemoryRouterContext);
+//#endregion
 //#region src/api/pci/usePciQuestionnaire.ts
 /**
 * Returns the details of a questionnaire, notably the content that
@@ -184,11 +341,11 @@ var individualFormIds = [
 ];
 //#endregion
 //#region src/components/Apps/tasks/TaskList/utils.ts
-var logger$2 = createLogger();
+var logger$1 = createLogger();
 var getAccountTaskStatus = (accountId, payinPayoutTaskStatus) => {
 	const taskStatusEntry = (payinPayoutTaskStatus?.taskStatusEntries)?.find((entry) => entry.id.includes(accountId));
 	if (!taskStatusEntry) {
-		logger$2.warn(`No task status for this account: ${accountId}`);
+		logger$1.warn(`No task status for this account: ${accountId}`);
 		if (!payinPayoutTaskStatus?.status) return TaskStatuses.PROCESSING;
 		return TaskStatuses[payinPayoutTaskStatus.status];
 	}
@@ -631,407 +788,78 @@ function TaskListInner({ onNavigateToTask, legalEntityResponse, capabilityProble
 	});
 }
 //#endregion
-//#region src/context/handlerContext/HandlerProvider.tsx
-function HandlerProvider({ children, onNavigateToTask }) {
-	return /* @__PURE__ */ jsx(HandlerContext.Provider, {
-		value: { onNavigateToTask },
-		children
+//#region src/hooks/introduction/useShouldShowIntroduction.ts
+var useShouldShowIntroduction = ({ legalEntity }) => {
+	const canSeeIntroduction = useCanSeeIntroduction({ legalEntity });
+	const { hasSeenIntroduction } = useHasSeenIntroduction({ legalEntityId: legalEntity.id });
+	return canSeeIntroduction && !hasSeenIntroduction;
+};
+//#endregion
+//#region src/router/DefaultRouteRedirect.tsx
+function DefaultRouteRedirect({ legalEntity, children }) {
+	const navigate = useNavigate();
+	const { isSettingEnabled } = useSettingsContext();
+	const { accountHolder } = useAccountHolder();
+	const { canSeeEntitySelection } = useCanSeeEntitySelection(legalEntity.id);
+	const { hasSeenSingpassSelection } = useHasSeenSingpassSelection({ legalEntityId: legalEntity.id });
+	const { isEligibleForSingpass } = useSingpassMyInfoLogin({
+		legalEntity,
+		accountHolder
 	});
+	const showIntroduction = useShouldShowIntroduction({ legalEntity });
+	const showServiceAgreementsFirst = isSettingEnabled(SettingNames.ShowServiceAgreementsFirst);
+	const showBusinessFinancingFirst = isSettingEnabled(SettingNames.ShowBusinessFinancingFirst);
+	const canChangeEntityType = isSettingEnabled(SettingNames.AllowLegalEntityTypeChange);
+	const shouldShowSingpassSelection = isEligibleForSingpass && !hasSeenSingpassSelection;
+	const defaultTask = useMemo$1(() => getDefaultTask({
+		legalEntity,
+		canSeeEntitySelection,
+		canChangeEntityType,
+		showIntroduction,
+		shouldShowSingpassSelection,
+		showServiceAgreementsFirst,
+		showBusinessFinancingFirst
+	}), [
+		legalEntity,
+		canSeeEntitySelection,
+		canChangeEntityType,
+		showIntroduction,
+		shouldShowSingpassSelection,
+		showServiceAgreementsFirst,
+		showBusinessFinancingFirst
+	]);
+	const shouldRenderInline = defaultTask === TaskTypes.TASKS_OVERVIEW && !!children;
+	useEffect$1(() => {
+		if (shouldRenderInline) return;
+		navigate.replace(defaultTask);
+	}, [
+		defaultTask,
+		navigate,
+		shouldRenderInline
+	]);
+	if (shouldRenderInline) return /* @__PURE__ */ jsx(Fragment$1, { children });
+	return /* @__PURE__ */ jsx(Loader, {});
 }
 //#endregion
-//#region src/hooks/introduction/useHasSeenIntroduction.ts
-var getHasSeenIntroductionStorageKey = (legalEntityId) => `COMPLETED_INTRO-${legalEntityId}`;
-var useHasSeenIntroduction = ({ legalEntityId }) => {
-	const [hasSeenIntroduction, setHasSeenIntroduction] = useLocalStorage(getHasSeenIntroductionStorageKey(legalEntityId), false);
-	return {
-		hasSeenIntroduction,
-		setHasSeenIntroduction
-	};
-};
+//#region src/router/SuspenseRoute.tsx
+function SuspenseRoute({ path, children }) {
+	return /* @__PURE__ */ jsx(Route, {
+		path,
+		children: /* @__PURE__ */ jsx(Suspense, {
+			fallback: /* @__PURE__ */ jsx(Loader, {}),
+			children
+		})
+	});
+}
 //#endregion
-//#region src/hooks/singpass/useHasSeenSingpassSelection.ts
-var getHasSeenSingpassSelectionStorageKey = (legalEntityId) => `COMPLETED_SINGPASS_SELECTION-${legalEntityId}`;
-var useHasSeenSingpassSelection = ({ legalEntityId }) => {
-	const [hasSeenSingpassSelection, setHasSeenSingpassSelection] = useLocalStorage(getHasSeenSingpassSelectionStorageKey(legalEntityId), false);
-	return {
-		hasSeenSingpassSelection,
-		setHasSeenSingpassSelection
-	};
-};
-//#endregion
-//#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 [state, dispatch] = useReducer(singpassReducer, {
-		isLoading: false,
-		isSuccess: getTrustedFieldsProvider(legalEntity) === TrustedFieldsProviders.SINGPASS
-	});
-	const { refetch: fetchOpenIdAuthorizationLink } = useOpenIdAuthorizationLink({ enabled: false });
-	const isEligibleForSingpass = useMemo$1(() => {
-		if (!legalEntity) return false;
-		if (getLegalEntityCountry(legalEntity) !== CountryCodes.Singapore) return false;
-		if (accountHolder) return accountHolder === "theCompanyIWorkFor" || accountHolder === "myName";
-		const legalEntityType = legalEntity.type;
-		const isPartOfTrust = isPartOfTrustFromLegalEntity(legalEntity);
-		const isVanillaOrganization = legalEntityType === LegalEntityTypes.ORGANIZATION && !isPartOfTrust;
-		const hasSoleProprietor = hasSolePropInLegalEntity(legalEntity);
-		const isVanillaIndividual = legalEntityType === LegalEntityTypes.INDIVIDUAL && !hasSoleProprietor;
-		return isVanillaOrganization || isVanillaIndividual;
-	}, [legalEntity, accountHolder]);
-	const handleInitiateSingpassMyInfoLogin = async () => {
-		dispatch({
-			...state,
-			type: SingpassMyInfoLoginActionTypes.LOADING
-		});
-		const { data } = await fetchOpenIdAuthorizationLink();
-		return data?.item.authUrl;
-	};
-	const handleSingpassMyInfoLoginSuccess = () => {
-		dispatch({
-			...state,
-			type: SingpassMyInfoLoginActionTypes.SUCCESS
-		});
-	};
-	const handleSingpassMyInfoLoginFailure = (errorMessage) => {
-		dispatch({
-			...state,
-			errorMessage,
-			type: SingpassMyInfoLoginActionTypes.FAILURE
-		});
-	};
-	const handleSingpassMyInfoLoginReset = () => {
-		dispatch({
-			...state,
-			type: SingpassMyInfoLoginActionTypes.RESET
-		});
-	};
-	return {
-		isEligibleForSingpass,
-		state,
-		handleInitiateSingpassMyInfoLogin,
-		handleSingpassMyInfoLoginSuccess,
-		handleSingpassMyInfoLoginFailure,
-		handleSingpassMyInfoLoginReset
-	};
-};
-//#endregion
-//#region src/hooks/useAssociatedLegalRepresentative.ts
-var useAssociatedLegalRepresentative = (legalEntity) => {
-	const matchingAssociation = useMemo$1(() => {
-		return getLegalRepresentative(legalEntity);
-	}, [legalEntity]);
-	const { data } = useLegalEntity(doesLegalEntityRequiresLegalRepresentative(legalEntity) && matchingAssociation?.legalEntityId ? matchingAssociation.legalEntityId : skipToken);
-	return data;
-};
-//#endregion
-//#region src/hooks/useCanSeeEntitySelection.ts
-var getCanSeeEntitySelectionStorageKey = (legalEntityId) => `ENTITY_SELECTION_SEEN-${legalEntityId}`;
-var useCanSeeEntitySelection = (legalEntityId) => {
-	const [canSeeEntitySelectionFromLocalStorage, setCanSeeEntitySelectionIntoLocalStorage] = useLocalStorage(getCanSeeEntitySelectionStorageKey(legalEntityId), true);
-	return {
-		canSeeEntitySelection: canSeeEntitySelectionFromLocalStorage,
-		setCanSeeEntitySelection: setCanSeeEntitySelectionIntoLocalStorage
-	};
-};
-var SingpassBanner_module_default = {
-	"provider-button": "_provider-button_126ab_1",
-	providerButton: "_provider-button_126ab_1"
-};
-//#endregion
-//#region src/components/Shared/SingpassBanner/SingpassBanner.tsx
-var singpassLogo = lazy(() => import("./singpass-logo-small-Dj6yeaQx.js"));
-var legalEntityTypeToSubtitleTranslationKey = {
-	[LegalEntityTypes.INDIVIDUAL]: "myInfoYouCanGetVerifiedDetails",
-	[LegalEntityTypes.ORGANIZATION]: "myInfoBusinessYouCanGetVerifiedDetails"
-};
-var legalEntityTypeToButtonLabelKey = {
-	[LegalEntityTypes.INDIVIDUAL]: "retrieveMyinfo",
-	[LegalEntityTypes.ORGANIZATION]: "retrieveMyinfoBusiness"
-};
-var successAlertTitleText = {
-	[LegalEntityTypes.INDIVIDUAL]: "myinfoDetailsRetrieved",
-	[LegalEntityTypes.ORGANIZATION]: "myinfoBusinessDetailsRetrieved"
-};
-var successAlertContentText = {
-	[LegalEntityTypes.INDIVIDUAL]: "yourDetailsArePreFilledInTheRelevantSections",
-	[LegalEntityTypes.ORGANIZATION]: "yourBusinesssDetailsArePreFilledInTheRelevantSections"
-};
-var SingpassBanner = ({ isLoading, isSuccess, errorMessage, onClick, onAlertClose, onMessage, legalEntityType }) => {
-	const { t, i18n } = useTranslation("singpassBanner");
-	const { t: tUi } = useTranslation("ui");
-	const { t: commonT } = useTranslation("common");
-	addResourceBundles(i18n, [{
-		ns: "singpassBanner",
-		importFn: (lang) => _rolldown_dynamic_import_helper_default(/* @__PURE__ */ Object.assign({ "./language/en-US.json": () => import("./en-US-CKZZNUWW.js") }), `./language/${lang}.json`, 3)
-	}]);
-	const { baseUrl, rootLegalEntityId } = useApiContext();
-	const singpassEventListener = useCallback$1((event) => {
-		if (event.origin !== new URL(baseUrl.value).origin) return;
-		if (event.data.legalEntityReference !== rootLegalEntityId.value) return;
-		onMessage({ data: { isSuccessful: event.data.isSuccessful } });
-	}, [
-		baseUrl.value,
-		rootLegalEntityId.value,
-		onMessage
-	]);
-	useEffect$1(() => {
-		window.addEventListener("message", singpassEventListener);
-		return () => window.removeEventListener("message", singpassEventListener);
-	}, [singpassEventListener]);
-	if (isLoading) return /* @__PURE__ */ jsx(Skeleton, {});
-	if (isSuccess) {
-		const successTitleText = successAlertTitleText[legalEntityType];
-		const successContentText = successAlertContentText[legalEntityType];
-		return /* @__PURE__ */ jsx(Alert, {
-			variant: "success",
-			title: successTitleText && t(($) => $[successTitleText]),
-			onClose: onAlertClose,
-			children: successContentText && t(($) => $[successContentText])
-		});
-	}
-	const buttonLabelKey = legalEntityTypeToButtonLabelKey[legalEntityType];
-	const singpassButton = buttonLabelKey && /* @__PURE__ */ jsx(Button, {
-		onClick,
-		fullWidth: true,
-		variant: "secondary",
-		children: /* @__PURE__ */ jsxs("div", {
-			className: SingpassBanner_module_default.providerButton,
-			children: [tUi(($) => $[buttonLabelKey]), /* @__PURE__ */ jsx(Image, { lazyLoadedImage: singpassLogo })]
-		})
-	});
-	if (errorMessage) return /* @__PURE__ */ jsx(Alert, {
-		variant: "warning",
-		title: translateTranslatable(commonT, errorMessage),
-		onClose: onAlertClose,
-		children: /* @__PURE__ */ jsxs(Typography, {
-			variant: "body",
-			children: [t(($) => $["tryAgainOrContinueEnteringTheDetailsYourself"]), singpassButton]
-		})
-	});
-	const subtitleTranslationKey = legalEntityTypeToSubtitleTranslationKey[legalEntityType];
-	return /* @__PURE__ */ jsxs(Alert, {
-		className: cx("adyen-task-list-singpass-banner"),
-		icon: false,
-		title: t(($) => $["getSetUpInstantly"]),
-		children: [subtitleTranslationKey && /* @__PURE__ */ jsx("div", {
-			className: cx("adyen-task-list-singpass-banner__subtitle"),
-			children: t(($) => $[subtitleTranslationKey])
-		}), singpassButton]
-	});
-};
-//#endregion
-//#region src/components/Trust/hooks/useTrustMemberNavigation.hook.ts
-var useTrustMemberNavigation = ({ navigateTo, trust }) => {
-	const { t } = useTranslation("trust");
-	const { showToast } = useToastContext();
-	const [trustMember, setTrustMember] = useState$1();
-	const { setTrustMembers } = useGlobalStore();
-	const trustMembers = useTrustMembers();
-	const memberId = trustMember?.trustMemberType === "undefinedBeneficiary" ? trustMember.reference : trustMember?.legalEntityId;
-	useEffect$1(() => setTrustMembers(trustMembers), [trustMembers]);
-	const onNavigateToTrustMemberEditDetails = async (tm) => {
-		try {
-			if (tm.legalEntityId === isNewEntity) setTrustMember(tm);
-			const id = tm.legalEntityId === isNewEntity ? void 0 : tm.legalEntityId;
-			navigateTo(tm.trustMemberType === "company" ? TaskTypes.TRUST_MEMBER_COMPANY : TaskTypes.TRUST_MEMBER_INDIVIDUAL, id ? { memberId: id } : void 0);
-		} catch {
-			showToast({
-				label: t(($) => $["failedToFetchTrustMemberDetails"]),
-				variant: "error"
-			});
-		}
-	};
-	const onNavigateToTrustMemberRoleAndType = (tm) => {
-		setTrustMember(tm === "new" ? void 0 : tm);
-		let id;
-		if (tm !== "new") {
-			if (tm.trustMemberType === "undefinedBeneficiary") id = tm.reference !== isNewEntity ? tm.reference : void 0;
-			else if (tm.legalEntityId !== isNewEntity) id = tm.legalEntityId;
-		}
-		navigateTo(TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE, id ? { memberId: id } : void 0);
-	};
-	const onNavigateToTrust = async (task = TaskTypes.TRUST) => {
-		try {
-			if (trust) navigateTo(task);
-			else navigateTo(TaskTypes.TRUST);
-		} catch {
-			showToast({
-				label: t(($) => $["failedToFetchTrustDetails"]),
-				variant: "error"
-			});
-		}
-	};
-	return {
-		trustMember,
-		trustMemberId: memberId === isNewEntity ? void 0 : memberId,
-		trustMembers,
-		onNavigateToTrust,
-		onNavigateToTrustMemberRoleAndType,
-		onNavigateToTrustMemberEditDetails
-	};
-};
-//#endregion
-//#region src/components/UnincorporatedPartnership/hooks/useUnincorporatedPartnershipNavigation.ts
-var createDefaultMember = (selectedMember, selectedEntityType, selectedRoles) => {
-	const firstRole = selectedRoles?.[0];
-	return {
-		memberType: selectedMember?.memberType || firstRole,
-		roles: selectedRoles || selectedMember?.roles || [UnincorporatedPartnershipMemberTypes.SECONDARY_PARTNER],
-		legalEntityType: selectedEntityType,
-		legalEntityId: selectedMember?.legalEntityId || "",
-		name: selectedMember?.name || ""
-	};
-};
-var useUnincorporatedPartnershipNavigation = ({ navigateTo }) => {
-	const [activeMember, setActiveMember] = useState$1();
-	const { rootLegalEntityId } = useApiContext();
-	const onNavigateToMember = async ({ selectedMember, selectedRoles, selectedEntityType, roleAndType }) => {
-		const createdMember = createDefaultMember(selectedMember, selectedEntityType, selectedRoles);
-		setActiveMember(createdMember);
-		if (rootLegalEntityId.value === createdMember?.legalEntityId) {
-			navigateTo(createdMember.legalEntityType === LegalEntityTypes.INDIVIDUAL ? TaskTypes.INDIVIDUAL : TaskTypes.BUSINESS_DETAILS);
-			return;
-		}
-		const memberParams = createdMember.legalEntityId ? { memberId: createdMember.legalEntityId } : void 0;
-		if (roleAndType) {
-			navigateTo(TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_ROLE_AND_TYPE, memberParams);
-			return;
-		}
-		navigateTo(createdMember?.legalEntityType === LegalEntityTypes.ORGANIZATION ? TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY : TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_INDIVIDUAL, memberParams);
-	};
-	return {
-		onNavigateToMember,
-		activeMember,
-		setActiveMember
-	};
-};
-//#endregion
-//#region src/router/MemoryRouterContext.tsx
-var MemoryRouterContext = createContext$1(null);
-var useMemoryRouter = () => useContext$1(MemoryRouterContext);
-//#endregion
-//#region src/hooks/introduction/useShouldShowIntroduction.ts
-var useShouldShowIntroduction = ({ legalEntity }) => {
-	const canSeeIntroduction = useCanSeeIntroduction({ legalEntity });
-	const { hasSeenIntroduction } = useHasSeenIntroduction({ legalEntityId: legalEntity.id });
-	return canSeeIntroduction && !hasSeenIntroduction;
-};
-//#endregion
-//#region src/router/DefaultRouteRedirect.tsx
-function DefaultRouteRedirect({ legalEntity, children }) {
-	const navigate = useNavigate();
-	const { isSettingEnabled } = useSettingsContext();
-	const { accountHolder } = useAccountHolder();
-	const { canSeeEntitySelection } = useCanSeeEntitySelection(legalEntity.id);
-	const { hasSeenSingpassSelection } = useHasSeenSingpassSelection({ legalEntityId: legalEntity.id });
-	const { isEligibleForSingpass } = useSingpassMyInfoLogin({
-		legalEntity,
-		accountHolder
-	});
-	const showIntroduction = useShouldShowIntroduction({ legalEntity });
-	const showServiceAgreementsFirst = isSettingEnabled(SettingNames.ShowServiceAgreementsFirst);
-	const showBusinessFinancingFirst = isSettingEnabled(SettingNames.ShowBusinessFinancingFirst);
-	const canChangeEntityType = isSettingEnabled(SettingNames.AllowLegalEntityTypeChange);
-	const shouldShowSingpassSelection = isEligibleForSingpass && !hasSeenSingpassSelection;
-	const defaultTask = useMemo$1(() => getDefaultTask$1({
-		legalEntity,
-		canSeeEntitySelection,
-		canChangeEntityType,
-		showIntroduction,
-		shouldShowSingpassSelection,
-		showServiceAgreementsFirst,
-		showBusinessFinancingFirst
-	}), [
-		legalEntity,
-		canSeeEntitySelection,
-		canChangeEntityType,
-		showIntroduction,
-		shouldShowSingpassSelection,
-		showServiceAgreementsFirst,
-		showBusinessFinancingFirst
-	]);
-	const shouldRenderInline = defaultTask === TaskTypes.TASKS_OVERVIEW && !!children;
-	useEffect$1(() => {
-		if (shouldRenderInline) return;
-		navigate.replace(defaultTask);
-	}, [
-		defaultTask,
-		navigate,
-		shouldRenderInline
-	]);
-	if (shouldRenderInline) return /* @__PURE__ */ jsx(Fragment$1, { children });
-	return /* @__PURE__ */ jsx(Loader, {});
-}
-//#endregion
-//#region src/router/SuspenseRoute.tsx
-function SuspenseRoute({ path, children }) {
-	return /* @__PURE__ */ jsx(Route, {
-		path,
-		children: /* @__PURE__ */ jsx(Suspense, {
-			fallback: /* @__PURE__ */ jsx(Loader, {}),
-			children
-		})
-	});
-}
-//#endregion
-//#region src/router/OnboardingRouter.tsx
-function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorporatedPartnership, soleProp, associatedLegalRepresentative, refetchLegalEntity, refetchTrust, refetchUnincorporatedPartnership, onExternalSubmit, accountHolder, setAccountHolder, setCanSeeEntitySelection, setHasSeenIntroduction, taskTypes, targetLegalEntityType, setTargetLegalEntityType, trustMember, onNavigateToTrust, onNavigateToTrustMemberRoleAndType, onNavigateToTrustMemberEditDetails, unincorporatedPartnershipMember, setActiveMember, onNavigateToMember, singpassBanner, handleSingpassSelectionNextClick, openBankingPartnerConfigId }) {
-	const navigate = useNavigate();
-	const userEvents = useAnalyticsContext();
-	const handleOnSubmit = async (data, backStepCount) => {
-		onExternalSubmit?.(data);
-		await refetchLegalEntity();
-		navigate.back(backStepCount);
+//#region src/router/OnboardingRouter.tsx
+function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorporatedPartnership, soleProp, associatedLegalRepresentative, refetchLegalEntity, refetchTrust, refetchUnincorporatedPartnership, onExternalSubmit, accountHolder, setAccountHolder, setCanSeeEntitySelection, setHasSeenIntroduction, taskTypes, targetLegalEntityType, setTargetLegalEntityType, trustMember, onNavigateToTrust, onNavigateToTrustMemberRoleAndType, onNavigateToTrustMemberEditDetails, unincorporatedPartnershipMember, setActiveMember, onNavigateToMember, singpassBanner, handleSingpassSelectionNextClick, openBankingPartnerConfigId }) {
+	const navigate = useNavigate();
+	const userEvents = useAnalyticsContext();
+	const handleOnSubmit = async (data, backStepCount) => {
+		onExternalSubmit?.(data);
+		await refetchLegalEntity();
+		navigate.back(backStepCount);
 	};
 	const onNavigateToDecisionMakerIndividual = (task, decisionMakerId, parentId) => {
 		navigate.to(task, {
@@ -1063,7 +891,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.INTRODUCTION],
-			children: /* @__PURE__ */ jsx(Introduction$1, {
+			children: /* @__PURE__ */ jsx(Introduction, {
 				onExitIntroduction: () => {
 					setHasSeenIntroduction(true);
 					navigate.to("default");
@@ -1075,7 +903,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 			path: ROUTE_PATHS[TaskTypes.BUSINESS_TYPE_SELECTION],
 			children: /* @__PURE__ */ jsx("div", {
 				className: "u-display-flex u-justify-content-center",
-				children: /* @__PURE__ */ jsx(BusinessTypeSelectionPage$1, {
+				children: /* @__PURE__ */ jsx(BusinessTypeSelectionPage, {
 					onComplete: async (newAccountHolder) => {
 						setAccountHolder(newAccountHolder);
 						setCanSeeEntitySelection(false);
@@ -1088,7 +916,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.SINGPASS_SELECTION],
-			children: /* @__PURE__ */ jsx(SingpassSelection$1, {
+			children: /* @__PURE__ */ jsx(SingpassSelection, {
 				handleNextClick: handleSingpassSelectionNextClick,
 				accountHolder,
 				legalEntityType: legalEntity.type
@@ -1096,11 +924,11 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.CAPABILITY_REJECTED],
-			children: /* @__PURE__ */ jsx(AccountSetupRejected$1, {})
+			children: /* @__PURE__ */ jsx(AccountSetupRejected, {})
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.INDIVIDUAL],
-			children: /* @__PURE__ */ jsx(RootIndividualDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(RootIndividualDetailsPage, {
 				onSubmit: async (data) => {
 					onExternalSubmit?.(data);
 					await refetchLegalEntity();
@@ -1113,7 +941,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.BUSINESS_DETAILS],
-			children: /* @__PURE__ */ jsx(RootBusinessDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(RootBusinessDetailsPage, {
 				onSubmit: async (data) => {
 					onExternalSubmit?.(data);
 					await refetchLegalEntity();
@@ -1126,25 +954,25 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.DECISION_MAKER_OVERVIEW],
-			children: /* @__PURE__ */ jsx(DecisionMakers$1, {
+			children: /* @__PURE__ */ jsx(DecisionMakers, {
 				onNavigateToIndividual: (legalEntityId) => onNavigateToDecisionMakerIndividual(TaskTypes.DECISION_MAKER, legalEntityId),
 				navigateBackToTaskList: () => navigate.to(TaskTypes.TASKS_OVERVIEW)
 			})
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.CUSTOMER_SUPPORT],
-			children: /* @__PURE__ */ jsx(CustomerSupport$1, {
+			children: /* @__PURE__ */ jsx(CustomerSupport, {
 				country: rootLegalEntityCountry,
 				onSubmit: () => navigate.to(TaskTypes.TASKS_OVERVIEW)
 			})
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.REVIEW],
-			children: /* @__PURE__ */ jsx(Review$1, { handleHomeClick: () => navigate.to(TaskTypes.TASKS_OVERVIEW) })
+			children: /* @__PURE__ */ jsx(Review, { handleHomeClick: () => navigate.to(TaskTypes.TASKS_OVERVIEW) })
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.DECISION_MAKER],
-			children: /* @__PURE__ */ jsx(DecisionMakerDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(DecisionMakerDetailsPage, {
 				onSubmit: async (data, scenario) => {
 					onExternalSubmit?.(data);
 					await refetchLegalEntity();
@@ -1162,7 +990,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.PAYOUT],
-			children: /* @__PURE__ */ jsx(PayoutDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(PayoutDetailsPage, {
 				taskType: TaskTypes.PAYOUT,
 				handleHomeClick: () => navigate.to(TaskTypes.TASKS_OVERVIEW),
 				openBankingPartnerConfigId,
@@ -1175,7 +1003,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.PAYIN],
-			children: /* @__PURE__ */ jsx(PayoutDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(PayoutDetailsPage, {
 				taskType: TaskTypes.PAYIN,
 				handleHomeClick: () => navigate.to(TaskTypes.TASKS_OVERVIEW),
 				openBankingPartnerConfigId,
@@ -1188,7 +1016,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.TRUST_MEMBER_OVERVIEW],
-			children: /* @__PURE__ */ jsx(TrustMembersOverview$1, {
+			children: /* @__PURE__ */ jsx(TrustMembersOverview, {
 				navigateBackToTaskList: () => navigate.to(TaskTypes.TASKS_OVERVIEW),
 				navigateToEditTrustMember: onNavigateToTrustMemberRoleAndType,
 				navigateToEditTrustMemberOwner: (trustMemberOwnerId, trustMemberId) => onNavigateToDecisionMakerIndividual(TaskTypes.TRUST_MEMBER_COMPANY_OWNER, trustMemberOwnerId, trustMemberId)
@@ -1196,7 +1024,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE],
-			children: /* @__PURE__ */ jsx(TrustMemberRoleAndTypePage$1, {
+			children: /* @__PURE__ */ jsx(TrustMemberRoleAndTypePage, {
 				trustId: trust?.id,
 				navigateToFullDropinFor: onNavigateToTrustMemberEditDetails,
 				navigateBack: async () => {
@@ -1207,7 +1035,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.TRUST_MEMBER_COMPANY_OWNER],
-			children: /* @__PURE__ */ jsx(DecisionMakerDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(DecisionMakerDetailsPage, {
 				taskType: TaskTypes.TRUST_MEMBER_COMPANY_OWNER,
 				onSubmit: async (data) => {
 					await handleOnSubmit(data);
@@ -1218,7 +1046,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.TRUST_MEMBER_INDIVIDUAL],
-			children: /* @__PURE__ */ jsx(TrustMemberIndividualPage$1, {
+			children: /* @__PURE__ */ jsx(TrustMemberIndividualPage, {
 				trustId: trust?.id,
 				newMember: trustMember?.legalEntityId === isNewEntity ? trustMember : void 0,
 				onSubmit: async (data) => {
@@ -1234,7 +1062,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.TRUST_MEMBER_COMPANY],
-			children: /* @__PURE__ */ jsx(TrustMemberCompanyPage$1, {
+			children: /* @__PURE__ */ jsx(TrustMemberCompanyPage, {
 				trustId: trust?.id,
 				newMember: trustMember?.legalEntityId === isNewEntity ? trustMember : void 0,
 				onSubmit: async (data) => {
@@ -1249,7 +1077,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.TRUST],
-			children: /* @__PURE__ */ jsx(TrustDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(TrustDetailsPage, {
 				taskType: TaskTypes.TRUST,
 				trustId: trust?.id,
 				onSubmit: (data) => handleOnSubmit(data, 1),
@@ -1258,7 +1086,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_OVERVIEW],
-			children: /* @__PURE__ */ jsx(UnincorporatedPartnershipMembersOverview$1, {
+			children: /* @__PURE__ */ jsx(UnincorporatedPartnershipMembersOverview, {
 				navigateBackToTaskList: () => navigate.to(TaskTypes.TASKS_OVERVIEW),
 				navigateToEditMember: (member) => onNavigateToMember({
 					selectedMember: member,
@@ -1274,7 +1102,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_ROLE_AND_TYPE],
-			children: /* @__PURE__ */ jsx(UnincorporatedPartnershipMemberRoleAndTypePage$1, {
+			children: /* @__PURE__ */ jsx(UnincorporatedPartnershipMemberRoleAndTypePage, {
 				onNavigateToMember,
 				navigateBack: async () => {
 					await refetchUnincorporatedPartnership();
@@ -1284,7 +1112,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER],
-			children: /* @__PURE__ */ jsx(DecisionMakerDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(DecisionMakerDetailsPage, {
 				taskType: TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER,
 				onSubmit: async (data) => {
 					await handleOnSubmit(data);
@@ -1295,7 +1123,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_INDIVIDUAL],
-			children: /* @__PURE__ */ jsx(UnincorporatedPartnershipIndividualPage$1, {
+			children: /* @__PURE__ */ jsx(UnincorporatedPartnershipIndividualPage, {
 				partnershipId: unincorporatedPartnership?.id,
 				member: unincorporatedPartnershipMember,
 				onSubmit: async (data) => {
@@ -1311,7 +1139,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY],
-			children: /* @__PURE__ */ jsx(UnincorporatedPartnershipMemberCompanyPage$1, {
+			children: /* @__PURE__ */ jsx(UnincorporatedPartnershipMemberCompanyPage, {
 				partnershipId: unincorporatedPartnership?.id,
 				newMember: unincorporatedPartnershipMember?.legalEntityId === "" ? unincorporatedPartnershipMember : void 0,
 				onSubmit: async (data) => {
@@ -1326,7 +1154,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.UNINCORPORATED_PARTNERSHIP],
-			children: /* @__PURE__ */ jsx(TrustDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(TrustDetailsPage, {
 				taskType: TaskTypes.UNINCORPORATED_PARTNERSHIP,
 				trustId: unincorporatedPartnership?.id,
 				onSubmit: (data) => handleOnSubmit(data, 1),
@@ -1335,11 +1163,11 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.PCI_DSS],
-			children: /* @__PURE__ */ jsx(SignPCIComponent$1, { onClose: () => navigate.back() })
+			children: /* @__PURE__ */ jsx(SignPCIComponent, { onClose: () => navigate.back() })
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.SOLE_PROPRIETOR_COMPANY],
-			children: /* @__PURE__ */ jsx(SoleProprietorshipPage$1, {
+			children: /* @__PURE__ */ jsx(SoleProprietorshipPage, {
 				solePropId: soleProp?.id,
 				onSubmit: (data) => handleOnSubmit(data, 1),
 				handleHomeClick: () => navigate.back()
@@ -1347,7 +1175,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.SERVICE_AGREEMENT],
-			children: /* @__PURE__ */ jsx(AcceptTermsOfService$1, {
+			children: /* @__PURE__ */ jsx(AcceptTermsOfService, {
 				legalEntityId: legalEntity.id,
 				onClose: () => {
 					userEvents.addPageEvent("Clicked button", {
@@ -1356,7 +1184,6 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 					});
 					navigate.back();
 				},
-				asEmbedded: false,
 				handleAddSigner: () => {
 					onNavigateToDecisionMakerIndividual(TaskTypes.DECISION_MAKER);
 				}
@@ -1364,7 +1191,7 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.LEGAL_REPRESENTATIVE_DETAILS],
-			children: /* @__PURE__ */ jsx(LegalRepresentativeDetailsPage$1, {
+			children: /* @__PURE__ */ jsx(LegalRepresentativeDetailsPage, {
 				legalRepresentativeId: associatedLegalRepresentative?.id,
 				onSubmit: handleOnSubmit,
 				handleHomeClick: () => navigate.back()
@@ -1372,14 +1199,14 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.SOURCE_OF_FUNDS],
-			children: /* @__PURE__ */ jsx(SourceOfFundsPage$1, {
+			children: /* @__PURE__ */ jsx(SourceOfFundsPage, {
 				onSubmit: handleOnSubmit,
 				handleHomeClick: () => navigate.to(TaskTypes.TASKS_OVERVIEW)
 			})
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.BUSINESS_FINANCING],
-			children: /* @__PURE__ */ jsx(BusinessFinancingPage$1, {
+			children: /* @__PURE__ */ jsx(BusinessFinancingPage, {
 				onSubmit: async (data) => {
 					onExternalSubmit?.(data);
 					await refetchLegalEntity();
@@ -1390,11 +1217,11 @@ function OnboardingRouter({ legalEntity, rootLegalEntityCountry, trust, unincorp
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.TAX_REPORTING],
-			children: /* @__PURE__ */ jsx(TaxReportingDropin$1, { handleHomeClick: () => navigate.to(TaskTypes.TASKS_OVERVIEW) })
+			children: /* @__PURE__ */ jsx(TaxReportingDropin, { handleHomeClick: () => navigate.to(TaskTypes.TASKS_OVERVIEW) })
 		}),
 		/* @__PURE__ */ jsx(SuspenseRoute, {
 			path: ROUTE_PATHS[TaskTypes.ACQUIRING_BUSINESS_LINE],
-			children: /* @__PURE__ */ jsx(RootBusinessLinesPage$1, { handleHomeClick: () => navigate.to(TaskTypes.TASKS_OVERVIEW) })
+			children: /* @__PURE__ */ jsx(RootBusinessLinesPage, { handleHomeClick: () => navigate.to(TaskTypes.TASKS_OVERVIEW) })
 		}),
 		/* @__PURE__ */ jsx(Route, {
 			path: "/",
@@ -1422,383 +1249,253 @@ var useCurrentTask = () => {
 		if (match) return taskType;
 	}
 };
+var SingpassBanner_module_default = {
+	"provider-button": "_provider-button_126ab_1",
+	providerButton: "_provider-button_126ab_1"
+};
 //#endregion
-//#region src/components/EmbeddedDropins/OnboardingDropinComponent/DropinComposer/RouterDropinComposer.tsx
-function isIn$1(values, x) {
-	return values.includes(x);
-}
-var PAGES_WITH_POLLING$1 = [TaskTypes.DECISION_MAKER_OVERVIEW, TaskTypes.TASKS_OVERVIEW];
-var logger$1 = createLogger();
-function URLRouterDropinComposer(props) {
-	const { parser } = useRouter();
-	return /* @__PURE__ */ jsx(Router, {
-		base: useMemo$1(() => detectBasePath(parser), [parser]),
-		children: /* @__PURE__ */ jsx(WouterDropinComposerInner, { ...props })
-	});
-}
-var MEMORY_ROUTER_SESSION_KEY = "ho-memory-router-path";
-var MEMORY_ROUTER_LE_KEY = "ho-memory-router-le";
-function MemoryRouterDropinComposer({ legalEntityResponse, ...rest }) {
-	const leId = legalEntityResponse.id;
-	const memoryRouter = useMemo$1(() => {
-		if (sessionStorage.getItem(MEMORY_ROUTER_LE_KEY) !== leId) {
-			sessionStorage.removeItem(MEMORY_ROUTER_SESSION_KEY);
-			sessionStorage.setItem(MEMORY_ROUTER_LE_KEY, leId);
-		}
-		return memoryLocation({
-			path: sessionStorage.getItem("ho-memory-router-path") ?? "/",
-			record: true
+//#region src/components/Shared/SingpassBanner/SingpassBanner.tsx
+var singpassLogo = lazy(() => import("./singpass-logo-small-Dj6yeaQx.js"));
+var legalEntityTypeToSubtitleTranslationKey = {
+	[LegalEntityTypes.INDIVIDUAL]: "myInfoYouCanGetVerifiedDetails",
+	[LegalEntityTypes.ORGANIZATION]: "myInfoBusinessYouCanGetVerifiedDetails"
+};
+var legalEntityTypeToButtonLabelKey = {
+	[LegalEntityTypes.INDIVIDUAL]: "retrieveMyinfo",
+	[LegalEntityTypes.ORGANIZATION]: "retrieveMyinfoBusiness"
+};
+var successAlertTitleText = {
+	[LegalEntityTypes.INDIVIDUAL]: "myinfoDetailsRetrieved",
+	[LegalEntityTypes.ORGANIZATION]: "myinfoBusinessDetailsRetrieved"
+};
+var successAlertContentText = {
+	[LegalEntityTypes.INDIVIDUAL]: "yourDetailsArePreFilledInTheRelevantSections",
+	[LegalEntityTypes.ORGANIZATION]: "yourBusinesssDetailsArePreFilledInTheRelevantSections"
+};
+var SingpassBanner = ({ isLoading, isSuccess, errorMessage, onClick, onAlertClose, onMessage, legalEntityType }) => {
+	const { t, i18n } = useTranslation("singpassBanner");
+	const { t: tUi } = useTranslation("ui");
+	const { t: commonT } = useTranslation("common");
+	addResourceBundles(i18n, [{
+		ns: "singpassBanner",
+		importFn: (lang) => _rolldown_dynamic_import_helper_default(/* @__PURE__ */ Object.assign({ "./language/en-US.json": () => import("./en-US-CKZZNUWW.js") }), `./language/${lang}.json`, 3)
+	}]);
+	const { baseUrl, rootLegalEntityId } = useApiContext();
+	const singpassEventListener = useCallback$1((event) => {
+		if (event.origin !== new URL(baseUrl.value).origin) return;
+		if (event.data.legalEntityReference !== rootLegalEntityId.value) return;
+		onMessage({ data: { isSuccessful: event.data.isSuccessful } });
+	}, [
+		baseUrl.value,
+		rootLegalEntityId.value,
+		onMessage
+	]);
+	useEffect$1(() => {
+		window.addEventListener("message", singpassEventListener);
+		return () => window.removeEventListener("message", singpassEventListener);
+	}, [singpassEventListener]);
+	if (isLoading) return /* @__PURE__ */ jsx(Skeleton, {});
+	if (isSuccess) {
+		const successTitleText = successAlertTitleText[legalEntityType];
+		const successContentText = successAlertContentText[legalEntityType];
+		return /* @__PURE__ */ jsx(Alert, {
+			variant: "success",
+			title: successTitleText && t(($) => $[successTitleText]),
+			onClose: onAlertClose,
+			children: successContentText && t(($) => $[successContentText])
 		});
-	}, [leId]);
-	const handle = useMemo$1(() => ({
-		navigate: memoryRouter.navigate,
-		history: memoryRouter.history
-	}), [memoryRouter]);
-	return /* @__PURE__ */ jsx(Router, {
-		hook: memoryRouter.hook,
-		children: /* @__PURE__ */ jsxs(MemoryRouterContext.Provider, {
-			value: handle,
-			children: [/* @__PURE__ */ jsx(MemoryRouterPathSync, {}), /* @__PURE__ */ jsx(WouterDropinComposerInner, {
-				legalEntityResponse,
-				...rest
-			})]
+	}
+	const buttonLabelKey = legalEntityTypeToButtonLabelKey[legalEntityType];
+	const singpassButton = buttonLabelKey && /* @__PURE__ */ jsx(Button, {
+		onClick,
+		fullWidth: true,
+		variant: "secondary",
+		children: /* @__PURE__ */ jsxs("div", {
+			className: SingpassBanner_module_default.providerButton,
+			children: [tUi(($) => $[buttonLabelKey]), /* @__PURE__ */ jsx(Image, { lazyLoadedImage: singpassLogo })]
 		})
 	});
-}
-var HISTORY_STATE_KEY = "kycMemoryPath";
-function MemoryRouterPathSync() {
-	const [location] = useLocation();
-	const memoryRouter = useMemoryRouter();
-	const isPopstateNav = useRef$1(false);
-	useEffect$1(() => {
-		sessionStorage.setItem(MEMORY_ROUTER_SESSION_KEY, location);
-		if (isPopstateNav.current) {
-			isPopstateNav.current = false;
-			return;
-		}
-		if (window.history.state?.[HISTORY_STATE_KEY] === location) return;
-		window.history.pushState({ [HISTORY_STATE_KEY]: location }, "");
-	}, [location]);
-	useEffect$1(() => {
-		if (!memoryRouter) return;
-		const onPopState = (event) => {
-			const path = event.state?.[HISTORY_STATE_KEY];
-			if (path != null) {
-				isPopstateNav.current = true;
-				memoryRouter.navigate(path, { replace: true });
-			}
-		};
-		window.addEventListener("popstate", onPopState);
-		return () => window.removeEventListener("popstate", onPopState);
-	}, [memoryRouter]);
-	useEffect$1(() => {
-		if (!window.history.state?.[HISTORY_STATE_KEY]) window.history.replaceState({ [HISTORY_STATE_KEY]: location }, "");
-	}, []);
-	return null;
-}
-function WouterDropinComposerInner({ legalEntityResponse, onSubmit, onNavigate = noop, openBankingPartnerConfigId }) {
-	const { accountHolder, setAccountHolder } = useAccountHolder();
-	const { setCanSeeEntitySelection } = useCanSeeEntitySelection(legalEntityResponse.id);
-	const userEvents = useAnalyticsContext();
-	const { features } = useToggleContext();
-	const navigate = useNavigate();
-	const currentTask = useCurrentTask();
-	const { setHasSeenSingpassSelection } = useHasSeenSingpassSelection({ legalEntityId: legalEntityResponse.id });
-	const { setHasSeenIntroduction } = useHasSeenIntroduction({ legalEntityId: legalEntityResponse.id });
-	const { rootLegalEntity: rootLegalEntitySignal, rootLegalEntityCountry: rootLegalEntityCountrySignal, taskTypes: taskTypesSignal, setRootLegalEntity, setTaskTypes, setAccountHolder: setAccountHolderInGlobalStore } = useGlobalStore();
-	const rootLegalEntity = rootLegalEntitySignal.value;
-	const rootLegalEntityCountry = rootLegalEntityCountrySignal.value;
-	const taskTypes = taskTypesSignal.value;
-	const { data: rawTaskTypes, isLoading: isLoadingConfiguration } = useTaskTypes();
-	const { isSettingEnabled } = useSettingsContext();
-	useEffect$1(() => {
-		if (!rawTaskTypes) return;
-		let filteredTasks = rawTaskTypes;
-		if (!isSettingEnabled(SettingNames.AllowBusinessLines)) filteredTasks = rawTaskTypes?.filter((task) => task !== TaskTypes.ACQUIRING_BUSINESS_LINE);
-		setTaskTypes(filteredTasks);
-	}, [rawTaskTypes, setTaskTypes]);
-	const { data: legalEntityData, refetch: refetchLegalEntity } = useLegalEntity(legalEntityResponse.id, { refetchInterval: (query) => {
-		const legalEntityData = query.state.data;
-		if (legalEntityData) return !currentTask || !isIn$1(PAGES_WITH_POLLING$1, currentTask) || hasAllCapabilitiesResolved(legalEntityData) || hasRejectedCapabilities(legalEntityData) ? false : 3e3;
-		return 3e3;
-	} });
-	useEffect$1(() => {
-		if (legalEntityData && !objectsDeepEqual(legalEntityData, rootLegalEntity)) setRootLegalEntity(legalEntityData);
-	}, [legalEntityData]);
-	const { isEligibleForSingpass, state: singpassLoginState, handleInitiateSingpassMyInfoLogin, handleSingpassMyInfoLoginSuccess, handleSingpassMyInfoLoginFailure, handleSingpassMyInfoLoginReset } = useSingpassMyInfoLogin({
-		legalEntity: rootLegalEntity,
-		accountHolder
+	if (errorMessage) return /* @__PURE__ */ jsx(Alert, {
+		variant: "warning",
+		title: translateTranslatable(commonT, errorMessage),
+		onClose: onAlertClose,
+		children: /* @__PURE__ */ jsxs(Typography, {
+			variant: "body",
+			children: [t(($) => $["tryAgainOrContinueEnteringTheDetailsYourself"]), singpassButton]
+		})
 	});
-	const singpassTabRef = useRef$1(null);
-	const { data: trust, refetch: refetchTrust } = useAssociatedLegalEntity(rootLegalEntity, LegalEntityTypes.TRUST);
-	const { data: unincorporatedPartnership, refetch: refetchUnincorporatedPartnership } = useAssociatedLegalEntity(rootLegalEntity, LegalEntityTypes.UNINCORPORATED_PARTNERSHIP);
-	const { data: soleProp } = useAssociatedLegalEntity(rootLegalEntity, LegalEntityTypes.SOLE_PROPRIETORSHIP);
-	const associatedLegalRepresentative = useAssociatedLegalRepresentative(rootLegalEntity);
-	const [targetLegalEntityType, setTargetLegalEntityType] = useState$1();
-	const { trustMember, onNavigateToTrust, onNavigateToTrustMemberRoleAndType, onNavigateToTrustMemberEditDetails } = useTrustMemberNavigation({
-		trust,
-		navigateTo: navigate.to
+	const subtitleTranslationKey = legalEntityTypeToSubtitleTranslationKey[legalEntityType];
+	return /* @__PURE__ */ jsxs(Alert, {
+		className: cx("adyen-task-list-singpass-banner"),
+		icon: false,
+		title: t(($) => $["getSetUpInstantly"]),
+		children: [subtitleTranslationKey && /* @__PURE__ */ jsx("div", {
+			className: cx("adyen-task-list-singpass-banner__subtitle"),
+			children: t(($) => $[subtitleTranslationKey])
+		}), singpassButton]
 	});
-	const { onNavigateToMember, activeMember: unincorporatedPartnershipMember, setActiveMember } = useUnincorporatedPartnershipNavigation({ navigateTo: navigate.to });
-	const handleSingpassSelectionNextClick = async (method) => {
-		if (method === "singpass") try {
-			const authUrl = await handleInitiateSingpassMyInfoLogin();
-			if (!authUrl) throw new Error("OpenId authentication url not");
-			setHasSeenSingpassSelection(true);
-			singpassTabRef.current = window.open(authUrl, "_blank");
-			singpassTabRef.current?.focus();
-		} catch (e) {
-			logger$1.error(e);
-			if (typeof e === "string") handleSingpassMyInfoLoginFailure(e);
+};
+//#endregion
+//#region src/components/Trust/hooks/useTrustMemberNavigation.hook.ts
+var useTrustMemberNavigation = ({ navigateTo, trust }) => {
+	const { t } = useTranslation("trust");
+	const { showToast } = useToastContext();
+	const [trustMember, setTrustMember] = useState$1();
+	const { setTrustMembers } = useGlobalStore();
+	const trustMembers = useTrustMembers();
+	const memberId = trustMember?.trustMemberType === "undefinedBeneficiary" ? trustMember.reference : trustMember?.legalEntityId;
+	useEffect$1(() => setTrustMembers(trustMembers), [trustMembers]);
+	const onNavigateToTrustMemberEditDetails = async (tm) => {
+		try {
+			if (tm.legalEntityId === isNewEntity) setTrustMember(tm);
+			const id = tm.legalEntityId === isNewEntity ? void 0 : tm.legalEntityId;
+			navigateTo(tm.trustMemberType === "company" ? TaskTypes.TRUST_MEMBER_COMPANY : TaskTypes.TRUST_MEMBER_INDIVIDUAL, id ? { memberId: id } : void 0);
+		} catch {
+			showToast({
+				label: t(($) => $["failedToFetchTrustMemberDetails"]),
+				variant: "error"
+			});
 		}
-		if (method === "manual") setHasSeenSingpassSelection(true);
-		navigate.to(TaskTypes.TASKS_OVERVIEW);
 	};
-	const isJourneyInitializedRef = useRef$1(false);
-	if (!isJourneyInitializedRef.current) {
-		userEvents.addJourneyEvent("Landed on page", { actionType: "start" });
-		isJourneyInitializedRef.current = true;
-	}
-	useEffect$1(() => {
-		if (currentTask) onNavigate(currentTask);
-	}, [currentTask]);
-	useEffect$1(() => {
-		if (hasRejectedCapabilities(rootLegalEntity)) navigate.replace(TaskTypes.CAPABILITY_REJECTED);
-	}, [rootLegalEntity]);
-	useEffect$1(() => {
-		const newAccountHolder = getDefaultAccountHolderType(rootLegalEntity, false, accountHolder);
-		if (newAccountHolder !== accountHolder) setAccountHolder(newAccountHolder);
-	}, [accountHolder, rootLegalEntity]);
-	useEffect$1(() => setAccountHolderInGlobalStore(accountHolder), [accountHolder]);
-	const { rootLegalEntityId } = useApiContext();
-	const { data: toggleData } = useToggles();
-	rootLegalEntityId.value = rootLegalEntity.id;
-	useEffect$1(() => {
-		Object.keys(toggleData?.experiments || {}).forEach((experiment) => {
-			const [name, variant] = experiment.split("_");
-			userEvents.trackExperiment({
-				name,
-				variant
+	const onNavigateToTrustMemberRoleAndType = (tm) => {
+		setTrustMember(tm === "new" ? void 0 : tm);
+		let id;
+		if (tm !== "new") {
+			if (tm.trustMemberType === "undefinedBeneficiary") id = tm.reference !== isNewEntity ? tm.reference : void 0;
+			else if (tm.legalEntityId !== isNewEntity) id = tm.legalEntityId;
+		}
+		navigateTo(TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE, id ? { memberId: id } : void 0);
+	};
+	const onNavigateToTrust = async (task = TaskTypes.TRUST) => {
+		try {
+			if (trust) navigateTo(task);
+			else navigateTo(TaskTypes.TRUST);
+		} catch {
+			showToast({
+				label: t(($) => $["failedToFetchTrustDetails"]),
+				variant: "error"
 			});
-		});
-	}, [
-		features,
-		toggleData?.experiments,
-		userEvents
-	]);
-	const singpassBanner = isEligibleForSingpass ? /* @__PURE__ */ jsx(SingpassBanner, {
-		...singpassLoginState,
-		onAlertClose: () => {
-			handleSingpassMyInfoLoginReset();
-		},
-		onClick: async () => {
-			try {
-				const authUrl = await handleInitiateSingpassMyInfoLogin();
-				singpassTabRef.current = window.open(authUrl);
-				singpassTabRef.current?.focus();
-			} catch (e) {
-				logger$1.error(e);
-				if (typeof e === "string") handleSingpassMyInfoLoginFailure(e);
-			}
-		},
-		onMessage: async ({ data: { isSuccessful } }) => {
-			if (isSuccessful) {
-				handleSingpassMyInfoLoginSuccess();
-				await refetchLegalEntity();
-				singpassTabRef.current?.close();
-			} else handleSingpassMyInfoLoginFailure(legalEntityResponse.type === LegalEntityTypes.INDIVIDUAL ? "weCouldntConnectToMyinfo" : "weCouldntConnectToMyinfoBusiness");
-		},
-		legalEntityType: legalEntityResponse?.type
-	}) : void 0;
-	if (isLoadingConfiguration) return /* @__PURE__ */ jsx(Skeleton, {});
-	return /* @__PURE__ */ jsx(HandlerProvider, {
-		onNavigateToTask: (taskType) => navigate.to(taskType),
-		children: /* @__PURE__ */ jsx(OnboardingRouter, {
-			legalEntity: rootLegalEntity,
-			rootLegalEntityCountry,
-			trust,
-			unincorporatedPartnership,
-			soleProp,
-			associatedLegalRepresentative,
-			refetchLegalEntity,
-			refetchTrust,
-			refetchUnincorporatedPartnership,
-			onExternalSubmit: onSubmit,
-			accountHolder,
-			setAccountHolder,
-			setCanSeeEntitySelection,
-			setHasSeenIntroduction,
-			taskTypes,
-			targetLegalEntityType,
-			setTargetLegalEntityType,
-			trustMember,
-			onNavigateToTrust,
-			onNavigateToTrustMemberRoleAndType,
-			onNavigateToTrustMemberEditDetails,
-			unincorporatedPartnershipMember,
-			setActiveMember,
-			onNavigateToMember,
-			singpassBanner,
-			handleSingpassSelectionNextClick,
-			openBankingPartnerConfigId
-		})
-	});
-}
-//#endregion
-//#region src/components/EmbeddedDropins/OnboardingDropinComponent/DropinComposer/useNavigation.ts
-var useNavigation = ({ legalEntity, onNavigate }) => {
-	const { isSettingEnabled } = useSettingsContext();
-	const userEvents = useAnalyticsContext();
-	const showServiceAgreementsFirst = isSettingEnabled(SettingNames.ShowServiceAgreementsFirst);
-	const showBusinessFinancingFirst = isSettingEnabled(SettingNames.ShowBusinessFinancingFirst);
-	const canChangeEntityType = isSettingEnabled(SettingNames.AllowLegalEntityTypeChange);
-	const showIntroduction = useShouldShowIntroduction({ legalEntity });
-	const { hasSeenSingpassSelection } = useHasSeenSingpassSelection({ legalEntityId: legalEntity.id });
-	const { accountHolder } = useAccountHolder();
-	const { canSeeEntitySelection } = useCanSeeEntitySelection(legalEntity.id);
-	const { isEligibleForSingpass } = useSingpassMyInfoLogin({
-		legalEntity,
-		accountHolder
-	});
-	const shouldShowSingpassSelection = isEligibleForSingpass && !hasSeenSingpassSelection;
-	const [taskHistory, setTaskHistory] = useState$1(["default"]);
-	const actualTasks = taskHistory.filter((task) => task !== "default");
-	const handleNavigation = useCallback$1((task) => {
-		userEvents.updateBaseTrackingPayload({ task });
-		onNavigate?.(task);
-	}, [onNavigate]);
-	const navigateTo = useCallback$1((task, deletePreviousHistory = false) => {
-		const pushNewTask = () => setTaskHistory((taskHistory) => deletePreviousHistory ? [task] : [...taskHistory, task]);
-		if (task === "default") setTimeout(pushNewTask);
-		else {
-			pushNewTask();
-			handleNavigation(task);
 		}
-	}, [handleNavigation]);
-	const navigateBack = useCallback$1((stepCount = 1) => {
-		if (taskHistory.length <= 1) return;
-		const prevTask = taskHistory[taskHistory.length - (stepCount + 1)];
-		if (prevTask === "default") throw Error("Cannot navigate back to 'default' task");
-		if (prevTask === TaskTypes.TASKS_OVERVIEW) {
-			setTaskHistory([TaskTypes.TASKS_OVERVIEW]);
-			handleNavigation?.(TaskTypes.TASKS_OVERVIEW);
+	};
+	return {
+		trustMember,
+		trustMemberId: memberId === isNewEntity ? void 0 : memberId,
+		trustMembers,
+		onNavigateToTrust,
+		onNavigateToTrustMemberRoleAndType,
+		onNavigateToTrustMemberEditDetails
+	};
+};
+//#endregion
+//#region src/components/UnincorporatedPartnership/hooks/useUnincorporatedPartnershipNavigation.ts
+var createDefaultMember = (selectedMember, selectedEntityType, selectedRoles) => {
+	const firstRole = selectedRoles?.[0];
+	return {
+		memberType: selectedMember?.memberType || firstRole,
+		roles: selectedRoles || selectedMember?.roles || [UnincorporatedPartnershipMemberTypes.SECONDARY_PARTNER],
+		legalEntityType: selectedEntityType,
+		legalEntityId: selectedMember?.legalEntityId || "",
+		name: selectedMember?.name || ""
+	};
+};
+var useUnincorporatedPartnershipNavigation = ({ navigateTo }) => {
+	const [activeMember, setActiveMember] = useState$1();
+	const { rootLegalEntityId } = useApiContext();
+	const onNavigateToMember = async ({ selectedMember, selectedRoles, selectedEntityType, roleAndType }) => {
+		const createdMember = createDefaultMember(selectedMember, selectedEntityType, selectedRoles);
+		setActiveMember(createdMember);
+		if (rootLegalEntityId.value === createdMember?.legalEntityId) {
+			navigateTo(createdMember.legalEntityType === LegalEntityTypes.INDIVIDUAL ? TaskTypes.INDIVIDUAL : TaskTypes.BUSINESS_DETAILS);
 			return;
 		}
-		setTaskHistory(taskHistory.slice(0, -1 * stepCount));
-		handleNavigation?.(prevTask);
-		userEvents.updateBaseTrackingPayload({ task: prevTask });
-	}, [taskHistory, handleNavigation]);
-	useEffect$1(() => {
-		if (!window.history.state) window.history.pushState({}, "");
-		const handleBrowserBackButton = () => {
-			if (window.history.state === null) window.history.pushState({}, "");
-			navigateTo(TaskTypes.TASKS_OVERVIEW);
-		};
-		window.addEventListener("popstate", handleBrowserBackButton);
-		return () => {
-			window.removeEventListener("popstate", handleBrowserBackButton);
-		};
-	}, [navigateTo]);
-	useEffect$1(() => {
-		if (taskHistory[taskHistory.length - 1] === "default") {
-			const defaultTask = getDefaultTask({
-				legalEntity,
-				canSeeEntitySelection,
-				showIntroduction,
-				canChangeEntityType,
-				shouldShowSingpassSelection,
-				showServiceAgreementsFirst,
-				showBusinessFinancingFirst
-			});
-			setTaskHistory([...taskHistory.slice(0, taskHistory.length - 1), defaultTask]);
+		const memberParams = createdMember.legalEntityId ? { memberId: createdMember.legalEntityId } : void 0;
+		if (roleAndType) {
+			navigateTo(TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_ROLE_AND_TYPE, memberParams);
+			return;
 		}
-	}, [
-		legalEntity,
-		accountHolder,
-		showIntroduction,
-		canChangeEntityType,
-		shouldShowSingpassSelection,
-		showServiceAgreementsFirst,
-		taskHistory,
-		showBusinessFinancingFirst
-	]);
+		navigateTo(createdMember?.legalEntityType === LegalEntityTypes.ORGANIZATION ? TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY : TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_INDIVIDUAL, memberParams);
+	};
 	return {
-		currentTask: actualTasks[actualTasks.length - 1],
-		previousTask: actualTasks[actualTasks.length - 2],
-		navigateBack,
-		navigateTo
+		onNavigateToMember,
+		activeMember,
+		setActiveMember
 	};
 };
-var getDefaultTask = ({ legalEntity, canSeeEntitySelection, canChangeEntityType, showIntroduction, shouldShowSingpassSelection, showServiceAgreementsFirst, showBusinessFinancingFirst }) => {
-	const hasLegalEntityProgressedBeyondEntitySelection = hasProgressedBeyondEntitySelection(legalEntity);
-	if (showServiceAgreementsFirst) return TaskTypes.SERVICE_AGREEMENT;
-	if (showBusinessFinancingFirst) return TaskTypes.BUSINESS_FINANCING;
-	if (canChangeEntityType && canSeeEntitySelection && !hasLegalEntityProgressedBeyondEntitySelection) return TaskTypes.BUSINESS_TYPE_SELECTION;
-	if (showIntroduction) return TaskTypes.INTRODUCTION;
-	if (shouldShowSingpassSelection) return TaskTypes.SINGPASS_SELECTION;
-	return TaskTypes.TASKS_OVERVIEW;
-};
-/**
-* We are trying to determine if the LE has data beyond what we consider has basic
-*/
-var hasProgressedBeyondEntitySelection = (legalEntity) => {
-	const hasOwnEntityAssocation = legalEntity.entityAssociations?.some((ea) => ea.associatorId === legalEntity.id);
-	const hasOrganizationType = legalEntity.organization?.type;
-	return hasOwnEntityAssocation || !!hasOrganizationType;
-};
 //#endregion
-//#region src/components/EmbeddedDropins/OnboardingDropinComponent/DropinComposer/DropinComposer.tsx
-var Introduction = lazy(async () => (await import("./Introduction-BW34fE2j.js")).Introduction);
-var BusinessTypeSelectionPage = lazy(async () => (await import("./BusinessTypeSelectionPage-iyr7_IJ3.js")).BusinessTypeSelectionPage);
-var SingpassSelection = lazy(async () => (await import("./SingpassSelection-C2zkEgl-.js")).SingpassSelection);
-var AccountSetupRejected = lazy(async () => (await import("./AccountSetupRejected-B9nn5XCa.js")).AccountSetupRejected);
-var DecisionMakers = lazy(async () => (await import("./DecisionMakers-KRLt3D9t.js")).DecisionMakers);
-var CustomerSupport = lazy(async () => (await import("./CustomerSupport-C8-aUKX8.js")).CustomerSupport);
-var Review = lazy(async () => (await import("./Review-Bb6Pa_w8.js")).Review);
-var SignPCIComponent = lazy(async () => (await import("./SignPCIComponent-Cq7ByxRB.js").then((n) => n.n)).SignPCIComponent);
-var AcceptTermsOfService = lazy(async () => (await import("./AcceptTermsOfServiceComponent-BAP8iSCH.js").then((n) => n.n)).AcceptTermsOfServiceComponent);
-var TaxReportingDropin = lazy(async () => (await import("./TaxReportingDropin-CJmwUlt2.js").then((n) => n.n)).TaxReportingDropin);
-var PayoutDetailsPage = lazy(async () => (await import("./PayoutDetailsPage-FV5HTHgS.js")).PayoutDetailsPage);
-var RootBusinessDetailsPage = lazy(async () => (await import("./RootBusinessDetailsPage-Ctu2xjXc.js")).RootBusinessDetailsPage);
-var RootBusinessLinesPage = lazy(async () => (await import("./RootBusinessLinesPage-DO6mFoJi.js")).RootBusinessLinesPage);
-var SoleProprietorshipPage = lazy(async () => (await import("./SoleProprietorshipPage-BUSKNpcO.js")).SoleProprietorshipPage);
-var TrustMemberCompanyPage = lazy(async () => (await import("./TrustMemberCompanyPage-B67lZGKc.js")).TrustMemberCompanyPage);
-var TrustMemberIndividualPage = lazy(async () => (await import("./TrustMemberIndividualPage-CJyS5Y5F.js")).TrustMemberIndividualPage);
-var TrustMemberRoleAndTypePage = lazy(async () => (await import("./TrustMemberRoleAndTypePage-7n_0TauB.js")).TrustMemberRoleAndTypePage);
-var TrustMembersOverview = lazy(async () => (await import("./TrustMembersOverview-DFbfGFTO.js")).TrustMembersOverview);
-var UnincorporatedPartnershipMemberCompanyPage = lazy(async () => (await import("./UnincorporatedPartnershipMemberCompanyPage-B68CSHOX.js")).UnincorporatedPartnershipMemberCompanyPage);
-var UnincorporatedPartnershipIndividualPage = lazy(async () => (await import("./UnincorporatedPartnershipIndividualPage-mfeo4ncp.js")).UnincorporatedPartnershipIndividualPage);
-var UnincorporatedPartnershipMemberRoleAndTypePage = lazy(async () => (await import("./UnincorporatedPartnershipMemberRoleAndTypePage-BNzMC3Tr.js")).UnincorporatedPartnershipMemberRoleAndTypePage);
-var UnincorporatedPartnershipMembersOverview = lazy(async () => (await import("./UnincorporatedPartnershipMembersOverview--pHx2qaV.js")).UnincorporatedPartnershipMembersOverview);
-var BusinessFinancingPage = lazy(async () => (await import("./BusinessFinancingPage-EM8pTloq.js")).BusinessFinancingPage);
-var TrustDetailsPage = lazy(async () => (await import("./TrustDetailsPage-C7dLjUT2.js")).TrustDetailsPage);
-var SourceOfFundsPage = lazy(async () => (await import("./SourceOfFundsPage-DbQ6IQy3.js").then((n) => n.n)).SourceOfFundsPage);
-var RootIndividualDetailsPage = lazy(async () => (await import("./RootIndividualDetailsPage-BWJxPMIO.js")).RootIndividualDetailsPage);
-var LegalRepresentativeDetailsPage = lazy(async () => (await import("./LegalRepresentativeDetailsPage-URoPwp5T.js")).LegalRepresentativeDetailsPage);
-var DecisionMakerDetailsPage = lazy(async () => (await import("./DecisionMakerDetailsPage-BmjeUNpo.js")).DecisionMakerDetailsPage);
+//#region src/components/EmbeddedDropins/OnboardingDropinComponent/DropinComposer/RouterDropinComposer.tsx
 function isIn(values, x) {
 	return values.includes(x);
 }
 var PAGES_WITH_POLLING = [TaskTypes.DECISION_MAKER_OVERVIEW, TaskTypes.TASKS_OVERVIEW];
 var logger = createLogger();
-function DropinComposer(props) {
-	const { isFeatureEnabled } = useToggleContext();
-	const useURLRouter = isFeatureEnabled(FeatureNames.EnableURLRouterForHostedOnboarding);
-	if (isFeatureEnabled(FeatureNames.EnableMemoryRouterForHostedOnboarding)) return /* @__PURE__ */ jsx(MemoryRouterDropinComposer, { ...props });
-	if (useURLRouter) return /* @__PURE__ */ jsx(URLRouterDropinComposer, { ...props });
-	return /* @__PURE__ */ jsx(LegacyDropinComposer, { ...props });
+var MEMORY_ROUTER_SESSION_KEY = "ho-memory-router-path";
+var MEMORY_ROUTER_LE_KEY = "ho-memory-router-le";
+function MemoryRouterDropinComposer({ legalEntityResponse, ...rest }) {
+	const leId = legalEntityResponse.id;
+	const memoryRouter = useMemo$1(() => {
+		if (sessionStorage.getItem(MEMORY_ROUTER_LE_KEY) !== leId) {
+			sessionStorage.removeItem(MEMORY_ROUTER_SESSION_KEY);
+			sessionStorage.setItem(MEMORY_ROUTER_LE_KEY, leId);
+		}
+		return memoryLocation({
+			path: sessionStorage.getItem("ho-memory-router-path") ?? "/",
+			record: true
+		});
+	}, [leId]);
+	const handle = useMemo$1(() => ({
+		navigate: memoryRouter.navigate,
+		history: memoryRouter.history
+	}), [memoryRouter]);
+	return /* @__PURE__ */ jsx(Router, {
+		hook: memoryRouter.hook,
+		children: /* @__PURE__ */ jsxs(MemoryRouterContext.Provider, {
+			value: handle,
+			children: [/* @__PURE__ */ jsx(MemoryRouterPathSync, {}), /* @__PURE__ */ jsx(WouterDropinComposerInner, {
+				legalEntityResponse,
+				...rest
+			})]
+		})
+	});
+}
+var HISTORY_STATE_KEY = "kycMemoryPath";
+function MemoryRouterPathSync() {
+	const [location] = useLocation();
+	const memoryRouter = useMemoryRouter();
+	const isPopstateNav = useRef$1(false);
+	useEffect$1(() => {
+		sessionStorage.setItem(MEMORY_ROUTER_SESSION_KEY, location);
+		if (isPopstateNav.current) {
+			isPopstateNav.current = false;
+			return;
+		}
+		if (window.history.state?.[HISTORY_STATE_KEY] === location) return;
+		window.history.pushState({ [HISTORY_STATE_KEY]: location }, "");
+	}, [location]);
+	useEffect$1(() => {
+		if (!memoryRouter) return;
+		const onPopState = (event) => {
+			const path = event.state?.[HISTORY_STATE_KEY];
+			if (path != null) {
+				isPopstateNav.current = true;
+				memoryRouter.navigate(path, { replace: true });
+			}
+		};
+		window.addEventListener("popstate", onPopState);
+		return () => window.removeEventListener("popstate", onPopState);
+	}, [memoryRouter]);
+	useEffect$1(() => {
+		if (!window.history.state?.[HISTORY_STATE_KEY]) window.history.replaceState({ [HISTORY_STATE_KEY]: location }, "");
+	}, []);
+	return null;
 }
-function LegacyDropinComposer({ legalEntityResponse, onSubmit, onNavigate = noop, openBankingPartnerConfigId }) {
+function WouterDropinComposerInner({ legalEntityResponse, onSubmit, onNavigate = noop, openBankingPartnerConfigId }) {
 	const { accountHolder, setAccountHolder } = useAccountHolder();
 	const { setCanSeeEntitySelection } = useCanSeeEntitySelection(legalEntityResponse.id);
 	const userEvents = useAnalyticsContext();
-	const { features } = useToggleContext();
+	const navigate = useNavigate();
+	const currentTask = useCurrentTask();
 	const { setHasSeenSingpassSelection } = useHasSeenSingpassSelection({ legalEntityId: legalEntityResponse.id });
 	const { setHasSeenIntroduction } = useHasSeenIntroduction({ legalEntityId: legalEntityResponse.id });
-	const { currentTask, previousTask, navigateTo, navigateBack } = useNavigation({
-		legalEntity: legalEntityResponse,
-		onNavigate
-	});
 	const { rootLegalEntity: rootLegalEntitySignal, rootLegalEntityCountry: rootLegalEntityCountrySignal, taskTypes: taskTypesSignal, setRootLegalEntity, setTaskTypes, setAccountHolder: setAccountHolderInGlobalStore } = useGlobalStore();
 	const rootLegalEntity = rootLegalEntitySignal.value;
 	const rootLegalEntityCountry = rootLegalEntityCountrySignal.value;
@@ -1819,7 +1516,6 @@ function LegacyDropinComposer({ legalEntityResponse, onSubmit, onNavigate = noop
 	useEffect$1(() => {
 		if (legalEntityData && !objectsDeepEqual(legalEntityData, rootLegalEntity)) setRootLegalEntity(legalEntityData);
 	}, [legalEntityData]);
-	const [currentTransferInstrumentId, setCurrentTransferInstrumentId] = useState$1();
 	const { isEligibleForSingpass, state: singpassLoginState, handleInitiateSingpassMyInfoLogin, handleSingpassMyInfoLoginSuccess, handleSingpassMyInfoLoginFailure, handleSingpassMyInfoLoginReset } = useSingpassMyInfoLogin({
 		legalEntity: rootLegalEntity,
 		accountHolder
@@ -1828,17 +1524,13 @@ function LegacyDropinComposer({ legalEntityResponse, onSubmit, onNavigate = noop
 	const { data: trust, refetch: refetchTrust } = useAssociatedLegalEntity(rootLegalEntity, LegalEntityTypes.TRUST);
 	const { data: unincorporatedPartnership, refetch: refetchUnincorporatedPartnership } = useAssociatedLegalEntity(rootLegalEntity, LegalEntityTypes.UNINCORPORATED_PARTNERSHIP);
 	const { data: soleProp } = useAssociatedLegalEntity(rootLegalEntity, LegalEntityTypes.SOLE_PROPRIETORSHIP);
-	const [parentId, setParentId] = useState$1();
-	const [currentDecisionMakerId, setCurrentDecisionMakerId] = useState$1();
-	const { data: currentDecisionMaker } = useLegalEntity(currentDecisionMakerId ?? skipToken);
 	const associatedLegalRepresentative = useAssociatedLegalRepresentative(rootLegalEntity);
 	const [targetLegalEntityType, setTargetLegalEntityType] = useState$1();
-	const legacyNavigateTo = (task, _params) => navigateTo(task);
-	const { trustMember, trustMemberId, onNavigateToTrust, onNavigateToTrustMemberRoleAndType, onNavigateToTrustMemberEditDetails } = useTrustMemberNavigation({
+	const { trustMember, onNavigateToTrust, onNavigateToTrustMemberRoleAndType, onNavigateToTrustMemberEditDetails } = useTrustMemberNavigation({
 		trust,
-		navigateTo: legacyNavigateTo
+		navigateTo: navigate.to
 	});
-	const { onNavigateToMember, activeMember: unincorporatedPartnershipMember, setActiveMember } = useUnincorporatedPartnershipNavigation({ navigateTo: legacyNavigateTo });
+	const { onNavigateToMember, activeMember: unincorporatedPartnershipMember, setActiveMember } = useUnincorporatedPartnershipNavigation({ navigateTo: navigate.to });
 	const handleSingpassSelectionNextClick = async (method) => {
 		if (method === "singpass") try {
 			const authUrl = await handleInitiateSingpassMyInfoLogin();
@@ -1851,48 +1543,7 @@ function LegacyDropinComposer({ legalEntityResponse, onSubmit, onNavigate = noop
 			if (typeof e === "string") handleSingpassMyInfoLoginFailure(e);
 		}
 		if (method === "manual") setHasSeenSingpassSelection(true);
-		navigateTo(TaskTypes.TASKS_OVERVIEW);
-	};
-	const onNavigateToDecisionMakerIndividual = async (task, id, parentId) => {
-		setParentId(parentId ?? rootLegalEntity.id);
-		setCurrentDecisionMakerId(id);
-		navigateTo(task);
-	};
-	const onNavigateToPayinOrPayout = async (id, task = TaskTypes.PAYOUT) => {
-		if (id) try {
-			setCurrentTransferInstrumentId(id);
-		} finally {
-			navigateTo(task);
-		}
-		else {
-			setCurrentTransferInstrumentId(void 0);
-			navigateTo(task);
-		}
-	};
-	const onNavigateToTask = async (task, id) => {
-		switch (task) {
-			case TaskTypes.PAYOUT:
-				await onNavigateToPayinOrPayout(id, TaskTypes.PAYOUT);
-				break;
-			case TaskTypes.PAYIN:
-				await onNavigateToPayinOrPayout(id, TaskTypes.PAYIN);
-				break;
-			case TaskTypes.TRUST:
-				await onNavigateToTrust();
-				break;
-			case TaskTypes.TRUST_MEMBER_OVERVIEW:
-				await onNavigateToTrust(TaskTypes.TRUST_MEMBER_OVERVIEW);
-				break;
-			case TaskTypes.SOLE_PROPRIETOR_COMPANY:
-				await navigateTo(TaskTypes.SOLE_PROPRIETOR_COMPANY);
-				break;
-			default: navigateTo(task);
-		}
-	};
-	const handleOnSubmit = async (data, backStepCount) => {
-		onSubmit?.(data);
-		await refetchLegalEntity();
-		navigateBack(backStepCount);
+		navigate.to(TaskTypes.TASKS_OVERVIEW);
 	};
 	const isJourneyInitializedRef = useRef$1(false);
 	if (!isJourneyInitializedRef.current) {
@@ -1900,7 +1551,10 @@ function LegacyDropinComposer({ legalEntityResponse, onSubmit, onNavigate = noop
 		isJourneyInitializedRef.current = true;
 	}
 	useEffect$1(() => {
-		if (hasRejectedCapabilities(rootLegalEntity)) navigateTo(TaskTypes.CAPABILITY_REJECTED, true);
+		if (currentTask) onNavigate(currentTask);
+	}, [currentTask]);
+	useEffect$1(() => {
+		if (hasRejectedCapabilities(rootLegalEntity)) navigate.replace(TaskTypes.CAPABILITY_REJECTED);
 	}, [rootLegalEntity]);
 	useEffect$1(() => {
 		const newAccountHolder = getDefaultAccountHolderType(rootLegalEntity, false, accountHolder);
@@ -1918,11 +1572,7 @@ function LegacyDropinComposer({ legalEntityResponse, onSubmit, onNavigate = noop
 				variant
 			});
 		});
-	}, [
-		features,
-		toggleData?.experiments,
-		userEvents
-	]);
+	}, [toggleData?.experiments, userEvents]);
 	const singpassBanner = isEligibleForSingpass ? /* @__PURE__ */ jsx(SingpassBanner, {
 		...singpassLoginState,
 		onAlertClose: () => {
@@ -1948,341 +1598,42 @@ function LegacyDropinComposer({ legalEntityResponse, onSubmit, onNavigate = noop
 		legalEntityType: legalEntityResponse?.type
 	}) : void 0;
 	if (isLoadingConfiguration) return /* @__PURE__ */ jsx(Skeleton, {});
-	const renderTask = () => {
-		switch (currentTask) {
-			case TaskTypes.BUSINESS_TYPE_SELECTION: return /* @__PURE__ */ jsx("div", {
-				className: "u-display-flex u-justify-content-center",
-				children: /* @__PURE__ */ jsx(Suspense, {
-					fallback: /* @__PURE__ */ jsx(Loader, {}),
-					children: /* @__PURE__ */ jsx(BusinessTypeSelectionPage, {
-						onComplete: async (newAccountHolder) => {
-							setAccountHolder(newAccountHolder);
-							setCanSeeEntitySelection(false);
-							await refetchLegalEntity();
-							navigateTo("default");
-						},
-						onBack: previousTask ? navigateBack : void 0
-					})
-				})
-			});
-			case TaskTypes.SINGPASS_SELECTION: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(SingpassSelection, {
-					handleNextClick: handleSingpassSelectionNextClick,
-					accountHolder,
-					legalEntityType: rootLegalEntity.type
-				})
-			});
-			case TaskTypes.INTRODUCTION: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(Introduction, {
-					onExitIntroduction: () => {
-						setHasSeenIntroduction(true);
-						navigateTo("default");
-					},
-					tasks: taskTypes
-				})
-			});
-			case TaskTypes.CAPABILITY_REJECTED: return /* @__PURE__ */ jsxs(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: [/* @__PURE__ */ jsx(AccountSetupRejected, {}), ";"]
-			});
-			case TaskTypes.TASKS_OVERVIEW: return /* @__PURE__ */ jsx(TaskList, {
-				onNavigateToTask,
-				singpassComponent: singpassBanner
-			});
-			case TaskTypes.DECISION_MAKER_OVERVIEW: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(DecisionMakers, {
-					onNavigateToIndividual: (legalEntityId) => onNavigateToDecisionMakerIndividual(TaskTypes.DECISION_MAKER, legalEntityId),
-					navigateBackToTaskList: navigateBack
-				})
-			});
-			case TaskTypes.INDIVIDUAL: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(RootIndividualDetailsPage, {
-					onSubmit: async (data) => {
-						onSubmit?.(data);
-						await refetchLegalEntity();
-						navigateTo(TaskTypes.TASKS_OVERVIEW);
-						setTargetLegalEntityType(void 0);
-					},
-					handleHomeClick: () => navigateTo(TaskTypes.TASKS_OVERVIEW),
-					isTargetLegalEntityType: targetLegalEntityType === LegalEntityTypes.INDIVIDUAL
-				})
-			});
-			case TaskTypes.CUSTOMER_SUPPORT: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(CustomerSupport, {
-					country: rootLegalEntityCountry,
-					onSubmit: () => navigateTo(TaskTypes.TASKS_OVERVIEW)
-				})
-			});
-			case TaskTypes.REVIEW: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(Review, { handleHomeClick: () => navigateTo(TaskTypes.TASKS_OVERVIEW) })
-			});
-			case TaskTypes.DECISION_MAKER: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(DecisionMakerDetailsPage, {
-					decisionMakerId: currentDecisionMaker?.id,
-					parentCompanyId: parentId,
-					onSubmit: async (data, scenario) => {
-						onSubmit?.(data);
-						await refetchLegalEntity();
-						if (isBafinSignatoryFlow({
-							taskType: TaskTypes.DECISION_MAKER,
-							data,
-							scenarios: scenario
-						})) {
-							showIdNowModal.value = true;
-							idNowPostSubmit.value = true;
-						} else navigateBack();
-					},
-					handleHomeClick: navigateBack
-				})
-			});
-			case TaskTypes.TRUST_MEMBER_COMPANY_OWNER: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(DecisionMakerDetailsPage, {
-					taskType: TaskTypes.TRUST_MEMBER_COMPANY_OWNER,
-					parentCompanyId: parentId,
-					decisionMakerId: currentDecisionMakerId,
-					onSubmit: async (data) => {
-						await handleOnSubmit(data);
-						await refetchTrust();
-					},
-					handleHomeClick: navigateBack
-				})
-			});
-			case TaskTypes.TRUST_MEMBER_INDIVIDUAL: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(TrustMemberIndividualPage, {
-					memberId: trustMemberId,
-					trustId: trust.id,
-					newMember: trustMember?.legalEntityId === isNewEntity ? trustMember : void 0,
-					onSubmit: async (data) => {
-						await handleOnSubmit(data, 2);
-						await refetchTrust();
-					},
-					handleBackClick: navigateBack,
-					handleHomeClick: () => navigateTo(TaskTypes.TRUST_MEMBER_OVERVIEW)
-				})
-			});
-			case TaskTypes.TRUST_MEMBER_COMPANY: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(TrustMemberCompanyPage, {
-					trustId: trust.id,
-					trustMemberCompanyId: trustMemberId,
-					newMember: trustMember?.legalEntityId === isNewEntity ? trustMember : void 0,
-					onSubmit: async (data) => {
-						await handleOnSubmit(data, 2);
-						await refetchTrust();
-					},
-					handleHomeClick: navigateBack
-				})
-			});
-			case TaskTypes.BUSINESS_DETAILS: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(RootBusinessDetailsPage, {
-					onSubmit: async (data) => {
-						onSubmit?.(data);
-						await refetchLegalEntity();
-						navigateTo(TaskTypes.TASKS_OVERVIEW);
-						setTargetLegalEntityType(void 0);
-					},
-					handleHomeClick: navigateBack,
-					isTargetLegalEntityType: targetLegalEntityType === LegalEntityTypes.ORGANIZATION
-				})
-			});
-			case TaskTypes.PAYOUT:
-			case TaskTypes.PAYIN: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(PayoutDetailsPage, {
-					taskType: currentTask,
-					transferInstrumentId: currentTransferInstrumentId,
-					setTransferInstrumentId: setCurrentTransferInstrumentId,
-					handleHomeClick: navigateBack,
-					openBankingPartnerConfigId,
-					onSubmit: handleOnSubmit
-				})
-			});
-			case TaskTypes.TRUST: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(TrustDetailsPage, {
-					taskType: TaskTypes.TRUST,
-					trustId: trust?.id,
-					onSubmit: (data) => handleOnSubmit(data, 1),
-					handleHomeClick: navigateBack
-				})
-			});
-			case TaskTypes.TRUST_MEMBER_OVERVIEW: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(TrustMembersOverview, {
-					navigateBackToTaskList: navigateBack,
-					navigateToEditTrustMember: onNavigateToTrustMemberRoleAndType,
-					navigateToEditTrustMemberOwner: (trustMemberOwnerId, trustMemberId) => onNavigateToDecisionMakerIndividual(TaskTypes.TRUST_MEMBER_COMPANY_OWNER, trustMemberOwnerId, trustMemberId)
-				})
-			});
-			case TaskTypes.TRUST_MEMBER_ROLE_AND_TYPE: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(TrustMemberRoleAndTypePage, {
-					trustId: trust.id,
-					memberId: trustMemberId,
-					navigateToFullDropinFor: onNavigateToTrustMemberEditDetails,
-					navigateBack: async () => {
-						await refetchTrust();
-						navigateBack();
-					}
-				})
-			});
-			case TaskTypes.UNINCORPORATED_PARTNERSHIP: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(TrustDetailsPage, {
-					taskType: TaskTypes.UNINCORPORATED_PARTNERSHIP,
-					trustId: unincorporatedPartnership?.id,
-					onSubmit: (data) => handleOnSubmit(data, 1),
-					handleHomeClick: navigateBack
-				})
-			});
-			case TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_OVERVIEW: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(UnincorporatedPartnershipMembersOverview, {
-					navigateBackToTaskList: navigateBack,
-					navigateToEditMember: (member) => onNavigateToMember({
-						selectedMember: member,
-						selectedEntityType: member?.legalEntityType,
-						selectedRoles: member?.roles,
-						roleAndType: true
-					}),
-					navigateToEditMemberOwner: (memberOwnerId, memberId) => {
-						setActiveMember({ legalEntityId: memberId });
-						onNavigateToDecisionMakerIndividual(TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER, memberOwnerId, memberId);
-					}
-				})
-			});
-			case TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(UnincorporatedPartnershipMemberCompanyPage, {
-					partnershipId: unincorporatedPartnership.id,
-					partnershipMemberCompanyId: unincorporatedPartnershipMember?.legalEntityId,
-					newMember: unincorporatedPartnershipMember?.legalEntityId === "" ? unincorporatedPartnershipMember : void 0,
-					onSubmit: (data) => handleOnSubmit(data, 2),
-					handleHomeClick: navigateBack
-				})
-			});
-			case TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(DecisionMakerDetailsPage, {
-					taskType: TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_COMPANY_OWNER,
-					parentCompanyId: unincorporatedPartnershipMember?.legalEntityId,
-					decisionMakerId: currentDecisionMakerId,
-					onSubmit: async (data) => {
-						await handleOnSubmit(data);
-						await refetchUnincorporatedPartnership();
-					},
-					handleHomeClick: navigateBack
-				})
-			});
-			case TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_INDIVIDUAL: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(UnincorporatedPartnershipIndividualPage, {
-					memberId: unincorporatedPartnershipMember?.legalEntityId,
-					partnershipId: unincorporatedPartnership.id,
-					member: unincorporatedPartnershipMember,
-					onSubmit: (data) => {
-						handleOnSubmit(data, 2);
-						refetchUnincorporatedPartnership();
-					},
-					handleBackClick: navigateBack,
-					handleHomeClick: () => navigateTo(TaskTypes.TRUST_MEMBER_OVERVIEW)
-				})
-			});
-			case TaskTypes.UNINCORPORATED_PARTNERSHIP_MEMBER_ROLE_AND_TYPE: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(UnincorporatedPartnershipMemberRoleAndTypePage, {
-					memberId: unincorporatedPartnershipMember?.legalEntityId,
-					onNavigateToMember,
-					navigateBack: async () => {
-						await refetchUnincorporatedPartnership();
-						navigateBack();
-					}
-				})
-			});
-			case TaskTypes.PCI_DSS: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(SignPCIComponent, { onClose: navigateBack })
-			});
-			case TaskTypes.SOLE_PROPRIETOR_COMPANY: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(SoleProprietorshipPage, {
-					solePropId: soleProp?.id,
-					onSubmit: (data) => handleOnSubmit(data, 1),
-					handleHomeClick: navigateBack
-				})
-			});
-			case TaskTypes.SERVICE_AGREEMENT: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(AcceptTermsOfService, {
-					legalEntityId: rootLegalEntity.id,
-					onClose: () => {
-						userEvents.addPageEvent("Clicked button", {
-							actionType: "back",
-							label: "back"
-						});
-						navigateBack();
-					},
-					asEmbedded: false,
-					handleAddSigner: () => {
-						onNavigateToDecisionMakerIndividual(TaskTypes.DECISION_MAKER);
-					}
-				})
-			});
-			case TaskTypes.LEGAL_REPRESENTATIVE_DETAILS: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(LegalRepresentativeDetailsPage, {
-					legalRepresentativeId: associatedLegalRepresentative?.id,
-					onSubmit: handleOnSubmit,
-					handleHomeClick: navigateBack
-				})
-			});
-			case TaskTypes.SOURCE_OF_FUNDS: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(SourceOfFundsPage, {
-					onSubmit: handleOnSubmit,
-					handleHomeClick: () => navigateTo(TaskTypes.TASKS_OVERVIEW)
-				})
-			});
-			case TaskTypes.BUSINESS_FINANCING: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(BusinessFinancingPage, {
-					onSubmit: async (data) => {
-						onSubmit?.(data);
-						await refetchLegalEntity();
-						navigateTo(TaskTypes.TASKS_OVERVIEW);
-					},
-					handleHomeClick: () => navigateTo(TaskTypes.TASKS_OVERVIEW)
-				})
-			});
-			case TaskTypes.TAX_REPORTING: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(TaxReportingDropin, { handleHomeClick: () => navigateTo(TaskTypes.TASKS_OVERVIEW) })
-			});
-			case TaskTypes.ACQUIRING_BUSINESS_LINE: return /* @__PURE__ */ jsx(Suspense, {
-				fallback: /* @__PURE__ */ jsx(Loader, {}),
-				children: /* @__PURE__ */ jsx(RootBusinessLinesPage, { handleHomeClick: () => navigateTo(TaskTypes.TASKS_OVERVIEW) })
-			});
-			default: return null;
-		}
-	};
 	return /* @__PURE__ */ jsx(HandlerProvider, {
-		onNavigateToTask,
-		children: renderTask()
+		onNavigateToTask: (taskType) => navigate.to(taskType),
+		children: /* @__PURE__ */ jsx(OnboardingRouter, {
+			legalEntity: rootLegalEntity,
+			rootLegalEntityCountry,
+			trust,
+			unincorporatedPartnership,
+			soleProp,
+			associatedLegalRepresentative,
+			refetchLegalEntity,
+			refetchTrust,
+			refetchUnincorporatedPartnership,
+			onExternalSubmit: onSubmit,
+			accountHolder,
+			setAccountHolder,
+			setCanSeeEntitySelection,
+			setHasSeenIntroduction,
+			taskTypes,
+			targetLegalEntityType,
+			setTargetLegalEntityType,
+			trustMember,
+			onNavigateToTrust,
+			onNavigateToTrustMemberRoleAndType,
+			onNavigateToTrustMemberEditDetails,
+			unincorporatedPartnershipMember,
+			setActiveMember,
+			onNavigateToMember,
+			singpassBanner,
+			handleSingpassSelectionNextClick,
+			openBankingPartnerConfigId
+		})
 	});
 }
 //#endregion
 //#region src/components/EmbeddedDropins/OnboardingDropinComponent/OnboardingDropinComponent.tsx
-var AdaptiveWorkflowComponent = lazy(async () => (await import("./AdaptiveWorkflowComponent-BrdXMApx.js")).AdaptiveWorkflowComponent);
+var AdaptiveWorkflowComponent = lazy(async () => (await import("./AdaptiveWorkflowComponent-BTdp5UKa.js")).AdaptiveWorkflowComponent);
 function OnboardingDropinComponent({ legalEntityId, openBankingPartnerConfigId }) {
 	const { isFeatureEnabled } = useToggleContext();
 	if (!legalEntityId) throw new Error("Must provide at-least legalEntityId");
@@ -2290,33 +1641,33 @@ function OnboardingDropinComponent({ legalEntityId, openBankingPartnerConfigId }
 	addResourceBundles(i18n, [{
 		ns: "common",
 		importFn: (lang) => _rolldown_dynamic_import_helper_default(/* @__PURE__ */ Object.assign({
-			"../../../language/locales/bg-BG.json": () => import("./bg-BG-BcmC41vE.js"),
-			"../../../language/locales/cs-CZ.json": () => import("./cs-CZ-ghdW0Tc6.js"),
-			"../../../language/locales/da-DK.json": () => import("./da-DK-CBOVFYaa.js"),
-			"../../../language/locales/de-DE.json": () => import("./de-DE-CA81fzkA.js"),
-			"../../../language/locales/el-GR.json": () => import("./el-GR-BjOmQ_B_.js"),
+			"../../../language/locales/bg-BG.json": () => import("./bg-BG-BHL5r3bk.js"),
+			"../../../language/locales/cs-CZ.json": () => import("./cs-CZ-DfuZr4cv.js"),
+			"../../../language/locales/da-DK.json": () => import("./da-DK-CLx0Hv_L.js"),
+			"../../../language/locales/de-DE.json": () => import("./de-DE-CcOP7Z3J.js"),
+			"../../../language/locales/el-GR.json": () => import("./el-GR-CO9ixkqP.js"),
 			"../../../language/locales/en-US.instructions.json": () => import("./en-US.instructions-FOYUYA3c.js"),
-			"../../../language/locales/en-US.json": () => import("./en-US-Dab7moVA.js"),
-			"../../../language/locales/es-ES.json": () => import("./es-ES-BEYl7Z8S.js"),
-			"../../../language/locales/es-LA.json": () => import("./es-LA-D741KUNg.js"),
-			"../../../language/locales/et-EE.json": () => import("./et-EE-CfgyGext.js"),
-			"../../../language/locales/fi-FI.json": () => import("./fi-FI-DFO20YZY.js"),
-			"../../../language/locales/fr-FR.json": () => import("./fr-FR-wvWrk_PU.js"),
-			"../../../language/locales/hr-HR.json": () => import("./hr-HR-D0zfmZK6.js"),
-			"../../../language/locales/hu-HU.json": () => import("./hu-HU-CL021irk.js"),
-			"../../../language/locales/it-IT.json": () => import("./it-IT-6VoxKX97.js"),
-			"../../../language/locales/ja-JP.json": () => import("./ja-JP-Cja4dur8.js"),
-			"../../../language/locales/lt-LT.json": () => import("./lt-LT-CNFgOeH4.js"),
-			"../../../language/locales/lv-LV.json": () => import("./lv-LV-BdSdhjTP.js"),
-			"../../../language/locales/nl-NL.json": () => import("./nl-NL-CclRrN3_.js"),
-			"../../../language/locales/no-NO.json": () => import("./no-NO-CO5xyGPh.js"),
-			"../../../language/locales/pl-PL.json": () => import("./pl-PL-DUH23AYC.js"),
-			"../../../language/locales/pt-BR.json": () => import("./pt-BR-MAQR_CUu2.js"),
-			"../../../language/locales/pt-PT.json": () => import("./pt-PT-CoKsjpyN.js"),
-			"../../../language/locales/ro-RO.json": () => import("./ro-RO-Cpv5pKod.js"),
-			"../../../language/locales/sk-SK.json": () => import("./sk-SK-p_p2X_aA.js"),
-			"../../../language/locales/sl-SI.json": () => import("./sl-SI-BpZp1MAq.js"),
-			"../../../language/locales/sv-SE.json": () => import("./sv-SE-BoXCPhGb.js")
+			"../../../language/locales/en-US.json": () => import("./en-US-CJsQJw90.js"),
+			"../../../language/locales/es-ES.json": () => import("./es-ES-CwLsmJeQ.js"),
+			"../../../language/locales/es-LA.json": () => import("./es-LA-b7TFh_XZ.js"),
+			"../../../language/locales/et-EE.json": () => import("./et-EE-o65QgBKk.js"),
+			"../../../language/locales/fi-FI.json": () => import("./fi-FI-CKffkrhp.js"),
+			"../../../language/locales/fr-FR.json": () => import("./fr-FR-CQbo6d_Q.js"),
+			"../../../language/locales/hr-HR.json": () => import("./hr-HR-BH4GZRVw.js"),
+			"../../../language/locales/hu-HU.json": () => import("./hu-HU-D0LsAFcV.js"),
+			"../../../language/locales/it-IT.json": () => import("./it-IT-NOsTkUWg.js"),
+			"../../../language/locales/ja-JP.json": () => import("./ja-JP-C98F-BgJ.js"),
+			"../../../language/locales/lt-LT.json": () => import("./lt-LT-erbGBPqF.js"),
+			"../../../language/locales/lv-LV.json": () => import("./lv-LV-xbEcOY__.js"),
+			"../../../language/locales/nl-NL.json": () => import("./nl-NL-Cpuz-HtA.js"),
+			"../../../language/locales/no-NO.json": () => import("./no-NO-Bd3KNpMs.js"),
+			"../../../language/locales/pl-PL.json": () => import("./pl-PL-Bg2G4ioZ.js"),
+			"../../../language/locales/pt-BR.json": () => import("./pt-BR-DT63AAqA2.js"),
+			"../../../language/locales/pt-PT.json": () => import("./pt-PT-BFTfpBI4.js"),
+			"../../../language/locales/ro-RO.json": () => import("./ro-RO-DJeBU2j9.js"),
+			"../../../language/locales/sk-SK.json": () => import("./sk-SK-rMCHSdm4.js"),
+			"../../../language/locales/sl-SI.json": () => import("./sl-SI-Dg4bivT7.js"),
+			"../../../language/locales/sv-SE.json": () => import("./sv-SE-DaklU1jx.js")
 		}), `../../../language/locales/${lang}.json`, 6)
 	}, {
 		ns: "ui",
@@ -2355,7 +1706,7 @@ function OnboardingDropinComponent({ legalEntityId, openBankingPartnerConfigId }
 		fallback: /* @__PURE__ */ jsx(Loader, {}),
 		children: /* @__PURE__ */ jsx(AdaptiveWorkflowComponent, {})
 	});
-	else return /* @__PURE__ */ jsx(DropinComposer, {
+	else return /* @__PURE__ */ jsx(MemoryRouterDropinComposer, {
 		legalEntityResponse: legalEntityData,
 		openBankingPartnerConfigId
 	});