@incodetech/core 2.0.1 → 2.1.0-rc.1

package/dist/{ekybStateMachine-CyMx_kg-.esm.js → ekybStateMachine-klc-AImJ.esm.js}

@@ -1,8 +1,8 @@
 import { t as api } from "./api-CESGtpbH.esm.js";
-import { t as endpoints } from "./endpoints-CnN3SyDa.esm.js";
-import { a as fromPromise, r as assign, t as setup } from "./xstate.esm-B70JrNqo.esm.js";
-import { a as POSTAL_CODE_FORMAT_ERROR_KEYS, c as getPostalCodeMaxLength, i as FIXED_DIGIT_POSTAL_CODE_LENGTH, l as validatePostalCode, n as fillFromSuggestion, o as formatPostalCode, r as DYNAMIC_REQUIRED_KEY, s as getPostalCodeErrorKey, t as debounceSearchActor, u as usStateOptions } from "./addressSearch-BpTbTWCa.esm.js";
-import { t as getFlow } from "./flowServices-PiNsxLfK.esm.js";
+import { t as endpoints } from "./endpoints-BeTK0Mlt.esm.js";
+import { a as fromPromise, r as assign, t as setup } from "./xstate.esm-C9wncMQa.esm.js";
+import { a as getPostalCodeMaxLength, c as STREET_LEVEL_REQUIRED_ERROR, d as usStateOptions, i as getPostalCodeErrorKey, l as fillFromSuggestion, n as FIXED_DIGIT_POSTAL_CODE_LENGTH, o as validatePostalCode, r as formatPostalCode, s as DYNAMIC_REQUIRED_KEY, t as debounceSearchActor, u as getStreetLevelErrorForSuggestion } from "./addressSearch-DvmWXKZg.esm.js";
+import { t as getFlow } from "./flowServices-ChgTNggJ.esm.js";
 
 //#region src/modules/ekyb/ekybConstants.ts
 const UBO_INPUT_LIMIT = 8;
@@ -59,11 +59,6 @@ const FIELD_NAME_MAPPING = {
 	"taxId-user_input": "taxId"
 };
 const COUNTRIES_WITH_CNPJ_VALIDATION = ["BR"];
-const COUNTRIES_WITH_SPECIAL_TAX_ID_RULES = [
-	"NG",
-	"CM",
-	"KE"
-];
 const BUSINESS_NAME_OPTIONAL_COUNTRIES = [];
 const ADDRESS_FULLY_OPTIONAL_COUNTRIES = [
 	"BR",
@@ -79,9 +74,10 @@ const ADDRESS_FIELDS = [
 	"postalCode"
 ];
 const ALL_COUNTRIES_OPTIONAL_FIELDS = ["ubo"];
-
-//#endregion
-//#region src/modules/ekyb/ekybValidators.ts
+const UBO_FIELD_LABELS = {
+	name: "ekyb.uboName",
+	surname: "ekyb.uboSurname"
+};
 const CNPJ_FORMATTED_LENGTH = 18;
 const CNPJ_CLEAN_LENGTH = 14;
 const INVALID_CNPJ_PATTERNS = [
@@ -125,31 +121,6 @@ const CNPJ_SECOND_DIGIT_FACTORS = [
 	3,
 	2
 ];
-function cleanCnpjString(cnpj) {
-	return cnpj.replace(/\./g, "").replace(/\//g, "").replace(/-/g, "");
-}
-function calculateVerificationDigit(cnpjString, factors) {
-	let digit = 11 - factors.reduce((acc, factor, index) => acc + Number.parseInt(cnpjString.charAt(index), 10) * factor, 0) % 11;
-	if (digit >= 10) digit = 0;
-	return digit.toString();
-}
-/**
-* Validates a Brazilian CNPJ number (14-digit checksum).
-* Accepts formatted (00.000.000/0000-00) or unformatted input.
-*/
-function validateCNPJ(cnpjInput) {
-	if (!cnpjInput || typeof cnpjInput !== "string") return false;
-	let cnpj = cnpjInput.trim();
-	if (cnpj.length === CNPJ_FORMATTED_LENGTH) cnpj = cleanCnpjString(cnpj);
-	if (cnpj.length !== CNPJ_CLEAN_LENGTH) return false;
-	if (!/^\d+$/.test(cnpj)) return false;
-	if (INVALID_CNPJ_PATTERNS.includes(cnpj)) return false;
-	const first = calculateVerificationDigit(cnpj, CNPJ_FIRST_DIGIT_FACTORS);
-	if (cnpj.charAt(12) !== first) return false;
-	const second = calculateVerificationDigit(cnpj, CNPJ_SECOND_DIGIT_FACTORS);
-	if (cnpj.charAt(13) !== second) return false;
-	return true;
-}
 
 //#endregion
 //#region src/modules/ekyb/ekybUtils.ts
@@ -206,12 +177,187 @@ function requiresAddressValidation(countryCode) {
 }
 
 //#endregion
-//#region src/modules/ekyb/ekybActions.ts
-const REQUIRED_ERROR_KEYS = new Set(["ekyb.error.requiredField"]);
-const UBO_FIELD_LABELS = {
-	name: "ekyb.uboName",
-	surname: "ekyb.uboSurname"
+//#region src/modules/ekyb/ekybValidators.ts
+function cleanCnpjString(cnpj) {
+	return cnpj.replace(/\./g, "").replace(/\//g, "").replace(/-/g, "");
+}
+function calculateVerificationDigit(cnpjString, factors) {
+	let digit = 11 - factors.reduce((acc, factor, index) => acc + Number.parseInt(cnpjString.charAt(index), 10) * factor, 0) % 11;
+	if (digit >= 10) digit = 0;
+	return digit.toString();
+}
+/**
+* Validates a Brazilian CNPJ number (14-digit checksum).
+* Accepts formatted (00.000.000/0000-00) or unformatted input.
+*/
+function validateCNPJ(cnpjInput) {
+	if (!cnpjInput || typeof cnpjInput !== "string") return false;
+	let cnpj = cnpjInput.trim();
+	if (cnpj.length === CNPJ_FORMATTED_LENGTH) cnpj = cleanCnpjString(cnpj);
+	if (cnpj.length !== CNPJ_CLEAN_LENGTH) return false;
+	if (!/^\d+$/.test(cnpj)) return false;
+	if (INVALID_CNPJ_PATTERNS.includes(cnpj)) return false;
+	const first = calculateVerificationDigit(cnpj, CNPJ_FIRST_DIGIT_FACTORS);
+	if (cnpj.charAt(12) !== first) return false;
+	const second = calculateVerificationDigit(cnpj, CNPJ_SECOND_DIGIT_FACTORS);
+	if (cnpj.charAt(13) !== second) return false;
+	return true;
+}
+const buildPostalCodeParams = (country) => {
+	const fixedLen = FIXED_DIGIT_POSTAL_CODE_LENGTH[country];
+	if (fixedLen !== void 0) return { length: fixedLen };
+	let maxLen = getPostalCodeMaxLength(country);
+	if (country === "US" || country === "BR") maxLen = maxLen - 1;
+	return { maxLength: maxLen };
 };
+const createValidators = () => ({
+	required: (value, _rule, field) => {
+		if (value.trim().length > 0) return void 0;
+		const fieldName = field.displayLabel ?? field.label;
+		return fieldName ? {
+			key: DYNAMIC_REQUIRED_KEY,
+			params: { fieldName }
+		} : { key: DYNAMIC_REQUIRED_KEY };
+	},
+	streetLevelRequired: (value) => {
+		if (value.trim().length > 0) return void 0;
+		return STREET_LEVEL_REQUIRED_ERROR;
+	},
+	cnpj: (value) => {
+		if (value.trim().length === 0) return void 0;
+		return validateCNPJ(value) ? void 0 : { key: "ekyb.error.invalidTaxId" };
+	},
+	postalCodeFormat: (value, rule) => {
+		if (rule.type !== "postalCodeFormat") return void 0;
+		if (value.trim().length === 0) return void 0;
+		if (validatePostalCode(value, rule.country)) return void 0;
+		return {
+			key: getPostalCodeErrorKey(rule.country),
+			params: buildPostalCodeParams(rule.country)
+		};
+	}
+});
+const normalizeFieldValue = (value) => typeof value === "string" ? value : String(value ?? "");
+const evaluateRules = (value, rules, field, validators) => {
+	if (!rules) return void 0;
+	for (const rule of rules) {
+		const error = validators[rule.type](value, rule, field);
+		if (error) return error;
+	}
+};
+/**
+* Address group: when no address field is filled (for countries that require
+* address validation), marks required address fields with a required error.
+* Per-field errors take precedence — this is merged last in validateEkybForm.
+*/
+function validateAddressGroup(fields, values, country) {
+	if (!requiresAddressValidation(country)) return {};
+	const addressValues = {};
+	for (const f of ADDRESS_FIELDS) addressValues[f] = values[f];
+	if (hasAtLeastOneAddressField(addressValues)) return {};
+	const errors = {};
+	const requiredAddressFields = fields.filter((f) => ADDRESS_FIELDS.includes(f.name) && f.required);
+	for (const f of requiredAddressFields) if (!(values[f.name] ?? "").trim()) {
+		const fieldName = f.displayLabel ?? f.label;
+		errors[f.name] = {
+			key: DYNAMIC_REQUIRED_KEY,
+			params: { fieldName }
+		};
+	}
+	return errors;
+}
+/**
+* UBO group: marks required UBO name/surname fields when the UBO entry
+* has been interacted with (first UBO always validates; subsequent UBOs
+* only validate if either field has a value).
+*/
+function validateUboGroup(ubos, hasUbos) {
+	if (!hasUbos) return {};
+	const errors = {};
+	for (let i = 0; i < ubos.length; i++) {
+		const isDefault = i === 0;
+		const hasAnyValue = ubos[i].name.trim() !== "" || ubos[i].surname.trim() !== "";
+		if (isDefault || hasAnyValue) {
+			if (!ubos[i].name.trim()) errors[`ubo-${i}-name`] = {
+				key: DYNAMIC_REQUIRED_KEY,
+				params: { fieldName: UBO_FIELD_LABELS.name }
+			};
+			if (!ubos[i].surname.trim()) errors[`ubo-${i}-surname`] = {
+				key: DYNAMIC_REQUIRED_KEY,
+				params: { fieldName: UBO_FIELD_LABELS.surname }
+			};
+		}
+	}
+	return errors;
+}
+/**
+* Full-form validation: per-field pass, then address cross-field pass, then
+* UBO pass. Per-field errors take precedence over cross-field errors for
+* the same key.
+*/
+function validateEkybForm(values, fields, country, ubos, hasUbos) {
+	const validators = createValidators();
+	const perField = fields.reduce((acc, field) => {
+		const error = evaluateRules(normalizeFieldValue(values[field.name]), field.validation, field, validators);
+		if (error) acc[field.name] = error;
+		return acc;
+	}, {});
+	const addressGroup = validateAddressGroup(fields, values, country);
+	const uboGroup = validateUboGroup(ubos, hasUbos);
+	return {
+		...addressGroup,
+		...perField,
+		...uboGroup
+	};
+}
+/**
+* Single-field validation (per-field only, no cross-field passes).
+* Intended for blur-triggered validation of regular form fields.
+*/
+function validateEkybField(values, fieldName, fields) {
+	const field = fields.find((f) => f.name === fieldName);
+	if (!field) return void 0;
+	const validators = createValidators();
+	return evaluateRules(normalizeFieldValue(values[field.name]), field.validation, field, validators);
+}
+/**
+* Single UBO field validation (blur-triggered).
+* fieldKey format: `ubo-{index}-name` or `ubo-{index}-surname`.
+* Returns undefined for non-default UBOs whose peer field is also empty
+* (user hasn't started filling that UBO entry yet).
+*/
+function validateEkybUboField(ubos, fieldKey) {
+	const match = fieldKey.match(/^ubo-(\d+)-(name|surname)$/);
+	if (!match) return void 0;
+	const index = Number(match[1]);
+	const field = match[2];
+	if (index < 0 || index >= ubos.length) return void 0;
+	const ubo = ubos[index];
+	const isDefault = index === 0;
+	const hasAnyValue = ubo.name.trim() !== "" || ubo.surname.trim() !== "";
+	if (!isDefault && !hasAnyValue) return void 0;
+	if (!ubo[field].trim()) return {
+		key: DYNAMIC_REQUIRED_KEY,
+		params: { fieldName: UBO_FIELD_LABELS[field] }
+	};
+}
+/** Returns true when CNPJ validation applies for the given country. */
+function requiresCnpjValidation(country) {
+	return COUNTRIES_WITH_CNPJ_VALIDATION.includes(country);
+}
+
+//#endregion
+//#region src/modules/ekyb/ekybActions.ts
+function buildEkybValidationRules(fieldName, required, country) {
+	const rules = [];
+	if (required) rules.push({ type: "required" });
+	if (fieldName === "taxId" && requiresCnpjValidation(country)) rules.push({ type: "cnpj" });
+	if (fieldName === "postalCode") rules.push({
+		type: "postalCodeFormat",
+		country
+	});
+	return rules;
+}
 function buildEkybFields(verificationFields, country, _hasUbos) {
 	let modules = verificationFields.filter((f) => f !== "ubos-user_input" && !f.startsWith("socure"));
 	if (country === "GB") modules = modules.filter((m) => m !== "state-user_input");
@@ -241,6 +387,8 @@ function buildEkybFields(verificationFields, country, _hasUbos) {
 			def.options = usStateOptions;
 			def.placeholder = "verification.placeholder.state";
 		}
+		const validation = buildEkybValidationRules(fieldName, def.required, country);
+		if (validation.length > 0) def.validation = validation;
 		return def;
 	});
 }
@@ -253,83 +401,6 @@ function getDefaultVerificationFields(config) {
 	if (config.checkUniqueBeneficialOwner !== false) fields.push("ubos-user_input");
 	return fields;
 }
-function validateEkybField(name, value, required, country) {
-	const val = (value ?? "").trim();
-	if (required && !val) return "ekyb.error.requiredField";
-	if (name === "taxId") {
-		if (COUNTRIES_WITH_CNPJ_VALIDATION.includes(country)) {
-			if (val && !validateCNPJ(val)) return "ekyb.error.invalidTaxId";
-		}
-		if (COUNTRIES_WITH_SPECIAL_TAX_ID_RULES.includes(country) && !val) return;
-	}
-	if (name === "postalCode" && val) {
-		if (!validatePostalCode(val, country)) return getPostalCodeErrorKey(country);
-	}
-}
-function computeEkybValidation(fields, values, country, ubos, hasUbos) {
-	const errors = {};
-	for (const field of fields) {
-		const val = values[field.name];
-		const err = validateEkybField(field.name, val, field.required, country);
-		if (err) errors[field.name] = err;
-	}
-	if (requiresAddressValidation(country)) {
-		const addressValues = {};
-		for (const f of ADDRESS_FIELDS) addressValues[f] = values[f];
-		if (!hasAtLeastOneAddressField(addressValues)) {
-			const requiredAddressFields = fields.filter((f) => ADDRESS_FIELDS.includes(f.name) && f.required);
-			for (const f of requiredAddressFields) if (!errors[f.name] && !(values[f.name] ?? "").trim()) errors[f.name] = "ekyb.error.requiredField";
-		}
-	}
-	if (hasUbos) for (let i = 0; i < ubos.length; i++) {
-		const isDefault = i === 0;
-		const hasAnyValue = ubos[i].name.trim() !== "" || ubos[i].surname.trim() !== "";
-		if (isDefault || hasAnyValue) {
-			if (!ubos[i].name.trim()) errors[`ubo-${i}-name`] = "ekyb.error.requiredField";
-			if (!ubos[i].surname.trim()) errors[`ubo-${i}-surname`] = "ekyb.error.requiredField";
-		}
-	}
-	return {
-		errors,
-		isValid: Object.keys(errors).length === 0
-	};
-}
-function computeDisplayErrors(errors, touched, submitAttempted, country, fields) {
-	const display = {};
-	const errorParams = {};
-	const fieldLabelMap = new Map(fields?.map((f) => [f.name, f.displayLabel ?? f.label]));
-	for (const [field, err] of Object.entries(errors)) {
-		const isRequiredErr = REQUIRED_ERROR_KEYS.has(err);
-		if (isRequiredErr && (submitAttempted || touched[field])) {
-			display[field] = DYNAMIC_REQUIRED_KEY;
-			const label = fieldLabelMap.get(field);
-			if (label) errorParams[field] = { fieldName: label };
-			else {
-				const uboMatch = field.match(/^ubo-\d+-(name|surname)$/);
-				if (uboMatch) errorParams[field] = { fieldName: UBO_FIELD_LABELS[uboMatch[1]] ?? field };
-			}
-		} else if (!isRequiredErr && touched[field]) display[field] = err;
-		if (display[field] && field === "postalCode" && POSTAL_CODE_FORMAT_ERROR_KEYS.has(err)) {
-			const fixedLen = FIXED_DIGIT_POSTAL_CODE_LENGTH[country];
-			if (fixedLen !== void 0) errorParams[field] = {
-				...errorParams[field] ?? {},
-				length: fixedLen
-			};
-			else {
-				let maxLen = getPostalCodeMaxLength(country);
-				if (country === "US" || country === "BR") maxLen = maxLen - 1;
-				errorParams[field] = {
-					...errorParams[field] ?? {},
-					maxLength: maxLen
-				};
-			}
-		}
-	}
-	return {
-		displayErrors: display,
-		errorParams
-	};
-}
 function processEkybFieldValue(name, value, country) {
 	if (name === "postalCode") return formatPostalCode(value, country);
 	return value;
@@ -351,7 +422,7 @@ function buildEkybSubmitPayload(ctx) {
 //#endregion
 //#region src/modules/ekyb/ekybGuards.ts
 const hasFlowIdGuard = ({ context }) => !!context.config.flowId;
-const isValidGuard = ({ context }) => context.isValid;
+const hasNoValidationErrorsGuard = ({ context }) => Object.keys(context.validationErrors ?? {}).length === 0;
 const canAddUboGuard = ({ context }) => context.canAddUbo;
 const isValidUboIndexGuard = ({ context, event }) => {
 	const { index } = event;
@@ -384,6 +455,13 @@ const submitEkybActor = fromPromise(async ({ input, signal }) => submitEkyb(inpu
 
 //#endregion
 //#region src/modules/ekyb/ekybStateMachine.ts
+const ADDRESS_AUTOCOMPLETE_KEYS = [
+	"street",
+	"city",
+	"state",
+	"postalCode",
+	"houseNo"
+];
 const ekybMachine = setup({
 	types: {
 		context: {},
@@ -407,26 +485,20 @@ const ekybMachine = setup({
 			const country = "US";
 			const vFields = getDefaultVerificationFields(config);
 			const hasUbos = config.checkUniqueBeneficialOwner !== false && vFields.includes("ubos-user_input");
-			const fields = buildEkybFields(vFields, country, hasUbos);
-			const values = { country };
-			const ubos = hasUbos ? [{
-				id: "ubo-1",
-				name: "",
-				surname: ""
-			}] : [];
-			const { errors, isValid } = computeEkybValidation(fields, values, country, ubos, hasUbos);
 			return {
 				config,
 				country,
 				availableCountries: ALL_COUNTRIES,
-				fields,
-				values,
-				errors,
-				isValid,
-				ubos,
+				fields: buildEkybFields(vFields, country, hasUbos),
+				values: { country },
+				validationErrors: void 0,
+				ubos: hasUbos ? [{
+					id: "ubo-1",
+					name: "",
+					surname: ""
+				}] : [],
 				canAddUbo: hasUbos,
 				hasUbos,
-				submitAttempted: false,
 				addressSuggestions: [],
 				_nextUboId: 2,
 				_searchQuery: ""
@@ -449,18 +521,15 @@ const ekybMachine = setup({
 				nextId += 1;
 			}
 			else ubos = [];
-			const newValues = {
-				...context.values,
-				country,
-				state: ""
-			};
-			const { errors, isValid } = computeEkybValidation(fields, newValues, country, ubos, hasUbos);
 			return {
 				country,
 				fields,
-				values: newValues,
-				errors,
-				isValid,
+				values: {
+					...context.values,
+					country,
+					state: ""
+				},
+				validationErrors: void 0,
 				ubos,
 				canAddUbo: hasUbos && ubos.length < UBO_INPUT_LIMIT,
 				hasUbos,
@@ -468,18 +537,33 @@ const ekybMachine = setup({
 			};
 		}),
 		updateField: assign(({ context, event }) => {
-			const { name, value } = event;
-			const processed = processEkybFieldValue(name, value, context.country);
-			const newValues = {
+			if (event.type !== "DATA_CHANGED") return {};
+			const processed = processEkybFieldValue(event.name, event.value, context.country);
+			return { values: {
 				...context.values,
-				[name]: processed
-			};
-			const { errors, isValid } = computeEkybValidation(context.fields, newValues, context.country, context.ubos, context.hasUbos);
-			return {
-				values: newValues,
-				errors,
-				isValid
-			};
+				[event.name]: processed
+			} };
+		}),
+		clearFieldValidationError: assign(({ context, event }) => {
+			if (event.type !== "DATA_CHANGED") return {};
+			const errs = context.validationErrors;
+			if (!errs?.[event.name]) return {};
+			const next = { ...errs };
+			delete next[event.name];
+			return { validationErrors: Object.keys(next).length > 0 ? next : void 0 };
+		}),
+		validateFormField: assign(({ context, event }) => {
+			if (event.type !== "VALIDATE_FIELD") return {};
+			const { name } = event;
+			const message = /^ubo-\d+-(name|surname)$/.test(name) ? validateEkybUboField(context.ubos, name) : validateEkybField(context.values, name, context.fields);
+			const next = { ...context.validationErrors ?? {} };
+			if (message) next[name] = message;
+			else delete next[name];
+			return { validationErrors: Object.keys(next).length > 0 ? next : void 0 };
+		}),
+		computeValidationResult: assign(({ context }) => {
+			const errors = validateEkybForm(context.values, context.fields, context.country, context.ubos, context.hasUbos);
+			return { validationErrors: Object.keys(errors).length > 0 ? errors : void 0 };
 		}),
 		addUbo: assign(({ context }) => {
 			const newId = context._nextUboId;
@@ -488,13 +572,9 @@ const ekybMachine = setup({
 				name: "",
 				surname: ""
 			}];
-			const canAddUbo = ubos.length < UBO_INPUT_LIMIT;
-			const { errors, isValid } = computeEkybValidation(context.fields, context.values, context.country, ubos, context.hasUbos);
 			return {
 				ubos,
-				canAddUbo,
-				errors,
-				isValid,
+				canAddUbo: ubos.length < UBO_INPUT_LIMIT,
 				_nextUboId: newId + 1
 			};
 		}),
@@ -502,12 +582,27 @@ const ekybMachine = setup({
 			const { index } = event;
 			const ubos = context.ubos.filter((_, i) => i !== index);
 			const canAddUbo = ubos.length < UBO_INPUT_LIMIT;
-			const { errors, isValid } = computeEkybValidation(context.fields, context.values, context.country, ubos, context.hasUbos);
+			const errs = context.validationErrors;
+			let newErrors;
+			if (errs) {
+				const next = {};
+				for (const [key, val] of Object.entries(errs)) {
+					const match = key.match(/^ubo-(\d+)-(name|surname)$/);
+					if (!match) {
+						next[key] = val;
+						continue;
+					}
+					const uboIdx = Number(match[1]);
+					if (uboIdx === index) continue;
+					const newIdx = uboIdx > index ? uboIdx - 1 : uboIdx;
+					next[`ubo-${newIdx}-${match[2]}`] = val;
+				}
+				newErrors = Object.keys(next).length > 0 ? next : void 0;
+			}
 			return {
 				ubos,
 				canAddUbo,
-				errors,
-				isValid
+				validationErrors: newErrors
 			};
 		}),
 		setUboField: assign(({ context, event }) => {
@@ -516,33 +611,46 @@ const ekybMachine = setup({
 				...ubo,
 				[field]: value
 			} : ubo);
-			const { errors, isValid } = computeEkybValidation(context.fields, context.values, context.country, ubos, context.hasUbos);
+			const fieldKey = `ubo-${index}-${field}`;
+			const errs = context.validationErrors;
+			if (!errs?.[fieldKey]) return { ubos };
+			const next = { ...errs };
+			delete next[fieldKey];
 			return {
 				ubos,
-				errors,
-				isValid
+				validationErrors: Object.keys(next).length > 0 ? next : void 0
 			};
 		}),
 		setErrorMessage: assign(({ event }) => ({ errorMessage: String(event.error ?? "verification.error") })),
 		clearErrorMessage: assign({ errorMessage: () => "" }),
-		markSubmitAttempted: assign({ submitAttempted: () => true }),
 		fillAddressFields: assign(({ context, event }) => {
 			const { suggestion } = event;
 			const activeFields = new Set(context.fields.map((f) => f.name));
 			const { values: newValues } = fillFromSuggestion(context.values, {}, suggestion, activeFields);
-			const { errors, isValid } = computeEkybValidation(context.fields, newValues, context.country, context.ubos, context.hasUbos);
+			const errs = context.validationErrors;
+			let newErrors = errs;
+			if (errs) {
+				const next = { ...errs };
+				for (const key of ADDRESS_AUTOCOMPLETE_KEYS) delete next[key];
+				newErrors = Object.keys(next).length > 0 ? next : void 0;
+			}
+			const streetError = getStreetLevelErrorForSuggestion(suggestion, activeFields);
+			if (streetError !== void 0) newErrors = {
+				...newErrors,
+				street: streetError
+			};
 			return {
 				values: newValues,
 				addressSuggestions: [],
-				errors,
-				isValid
+				_searchQuery: "",
+				validationErrors: newErrors
 			};
 		}),
 		setAddressSuggestions: assign(({ event }) => ({ addressSuggestions: event.suggestions }))
 	},
 	guards: {
 		hasFlowId: hasFlowIdGuard,
-		isValid: isValidGuard,
+		hasNoValidationErrors: hasNoValidationErrorsGuard,
 		canAddUbo: canAddUboGuard,
 		isValidUboIndex: isValidUboIndexGuard,
 		isSupportedCountry: isSupportedCountryGuard
@@ -555,27 +663,21 @@ const ekybMachine = setup({
 		const country = "US";
 		const vFields = getDefaultVerificationFields(config);
 		const hasUbos = config.checkUniqueBeneficialOwner !== false && vFields.includes("ubos-user_input");
-		const fields = buildEkybFields(vFields, country, hasUbos);
-		const values = { country };
-		const ubos = hasUbos ? [{
-			id: "ubo-1",
-			name: "",
-			surname: ""
-		}] : [];
-		const { errors, isValid } = computeEkybValidation(fields, values, country, ubos, hasUbos);
 		return {
 			config,
 			country,
 			availableCountries: ALL_COUNTRIES,
-			fields,
-			values,
-			errors,
-			isValid,
-			ubos,
+			fields: buildEkybFields(vFields, country, hasUbos),
+			values: { country },
+			validationErrors: void 0,
+			ubos: hasUbos ? [{
+				id: "ubo-1",
+				name: "",
+				surname: ""
+			}] : [],
 			canAddUbo: hasUbos,
 			hasUbos,
 			errorMessage: "",
-			submitAttempted: false,
 			addressSuggestions: [],
 			_nextUboId: 2,
 			_searchQuery: ""
@@ -596,19 +698,34 @@ const ekybMachine = setup({
 			onError: "form"
 		} },
 		form: {
-			initial: "idle",
+			initial: "inputting",
 			states: {
-				idle: {},
+				inputting: { on: {
+					DATA_CHANGED: { actions: ["updateField", "clearFieldValidationError"] },
+					VALIDATE_FIELD: { actions: "validateFormField" },
+					SUBMIT: { target: "validatingSubmit" }
+				} },
 				searching: {
 					invoke: {
 						id: "debounceSearch",
 						src: "debounceSearch",
 						input: ({ context }) => ({ query: context._searchQuery })
 					},
-					on: { RESULTS: {
-						target: "idle",
-						actions: "setAddressSuggestions"
-					} }
+					on: {
+						DATA_CHANGED: { actions: ["updateField", "clearFieldValidationError"] },
+						VALIDATE_FIELD: { actions: "validateFormField" },
+						RESULTS: {
+							target: "inputting",
+							actions: "setAddressSuggestions"
+						}
+					}
+				},
+				validatingSubmit: {
+					entry: "computeValidationResult",
+					always: [{
+						guard: "hasNoValidationErrors",
+						target: "#ekyb.submitting"
+					}, { target: "inputting" }]
 				}
 			},
 			on: {
@@ -616,18 +733,6 @@ const ekybMachine = setup({
 					guard: "isSupportedCountry",
 					actions: "setCountry"
 				},
-				SET_FIELD: { actions: "updateField" },
-				SEARCH_ADDRESS: {
-					target: ".searching",
-					actions: assign(({ event }) => ({
-						_searchQuery: event.query,
-						addressSuggestions: []
-					}))
-				},
-				SELECT_ADDRESS: {
-					target: ".idle",
-					actions: "fillAddressFields"
-				},
 				ADD_UBO: {
 					guard: "canAddUbo",
 					actions: "addUbo"
@@ -640,10 +745,17 @@ const ekybMachine = setup({
 					guard: "isValidUboIndex",
 					actions: "setUboField"
 				},
-				SUBMIT: [{
-					target: "submitting",
-					guard: "isValid"
-				}, { actions: "markSubmitAttempted" }],
+				SEARCH_ADDRESS: {
+					target: ".searching",
+					actions: assign(({ event }) => ({
+						_searchQuery: event.query,
+						addressSuggestions: []
+					}))
+				},
+				SELECT_ADDRESS: {
+					target: ".inputting",
+					actions: "fillAddressFields"
+				},
 				CLOSE: { target: "closed" }
 			}
 		},
@@ -671,4 +783,4 @@ const ekybMachine = setup({
 });
 
 //#endregion
-export { DEV_ONLY_COUNTRIES as a, ALL_COUNTRIES as i, computeDisplayErrors as n, SUPPORTED_COUNTRIES as o, toEkybConfig as r, isSupportedCountry as s, ekybMachine as t };
+export { SUPPORTED_COUNTRIES as a, DEV_ONLY_COUNTRIES as i, toEkybConfig as n, isSupportedCountry as o, ALL_COUNTRIES as r, ekybMachine as t };