merge conflict

This commit is contained in:
Marshal
2026-08-12 11:24:22 +00:00
27 changed files with 1076 additions and 560 deletions

View File

@@ -169,7 +169,8 @@ export default function OnboardingWizardDialog({
setCooperative(checked);
if (checked) {
setRoles((prev) => prev.filter((r) => r !== "freight_forwarder"));
setNationality((prev) => (prev === "foreign" ? "ethiopian" : prev));
// Ethiopian is then the only answer left, so it is made rather than asked.
setNationality("ethiopian");
}
}, []);
const [documentFiles, setDocumentFiles] = useState<

View File

@@ -50,7 +50,7 @@ function buildLicenseSetting(
isMultiple: true,
maxFiles: 10,
allowedExtensions: ["pdf", "png", "jpg", "jpeg"],
maxSizeMb: 10,
maxSizeMb: 25,
order: 1,
},
],

View File

@@ -29,7 +29,11 @@ export default function NationalitySelect({
<SimpleGrid cols={{ base: 1, sm: excludeForeign ? 1 : 2 }} spacing="md">
<RoleCard
label="Ethiopian Company"
description="Registered in Ethiopia. You'll provide a TIN certificate, commercial registration and national ID."
description={
excludeForeign
? "Registered in Ethiopia. You'll provide a TIN certificate, your co-operative registration certificate and national ID."
: "Registered in Ethiopia. You'll provide a TIN certificate, commercial registration and national ID."
}
icon={<MapPin size={22} />}
selected={value === "ethiopian"}
onClick={() => onChange("ethiopian")}