Merge pull request #847 from Tria-plc/freight_feature/usermanagement

chnages
This commit is contained in:
marshal
2026-07-20 20:52:57 +03:00
committed by GitHub
8 changed files with 161 additions and 9 deletions

View File

@@ -344,6 +344,11 @@ export function Step2ServiceType({
if (isIntercity && form.getValues("paymentCurrency") !== "ETB") {
form.setValue("paymentCurrency", "ETB", { shouldValidate: true });
}
// The customs clearing agent field is hidden for intercity — drop any value
// carried over from a draft or an operation-type switch.
if (isIntercity && form.getValues("customsClearingAgent")) {
form.setValue("customsClearingAgent", "", { shouldDirty: true });
}
}, [isIntercity, form]);
return (
@@ -538,7 +543,9 @@ export function Step2ServiceType({
)}
{includesCustoms ? (
{/* Intercity (domestic) moves never cross a border, so no customs
clearing agent is collected. */}
{isIntercity ? null : includesCustoms ? (
<Box
px={16}
py={14}