From 6720e02766441036d872203216a1d9a45025f5a9 Mon Sep 17 00:00:00 2001 From: it-fixcomart Date: Sat, 28 Jun 2025 10:35:02 +0700 Subject: fix cities address --- src/lib/address/components/CreateAddress.jsx | 15 +++++++-------- src/lib/address/components/EditAddress.jsx | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/lib/address/components/CreateAddress.jsx b/src/lib/address/components/CreateAddress.jsx index 35c966c7..963a19aa 100644 --- a/src/lib/address/components/CreateAddress.jsx +++ b/src/lib/address/components/CreateAddress.jsx @@ -94,14 +94,13 @@ const CreateAddress = () => { useEffect(() => { if (detailAddress && Object.keys(detailAddress).length > 0) { const selectedCities = cities.find( - (city) => - detailAddress?.district - .toLowerCase() - .includes(city.label.toLowerCase()) || - city.label - .toLowerCase() - .includes(detailAddress?.district.toLowerCase()) - ); + (city) => + city.label.toLowerCase() === detailAddress?.district.toLowerCase() + ) || cities.find( + (city) => + detailAddress?.district.toLowerCase().includes(city.label.toLowerCase()) || + city.label.toLowerCase().includes(detailAddress?.district.toLowerCase()) + ); setValue('city', selectedCities?.value); } }, [cities, detailAddress, setValue]); diff --git a/src/lib/address/components/EditAddress.jsx b/src/lib/address/components/EditAddress.jsx index 217be867..deaa8a3e 100644 --- a/src/lib/address/components/EditAddress.jsx +++ b/src/lib/address/components/EditAddress.jsx @@ -126,14 +126,13 @@ const EditAddress = ({ id, defaultValues }) => { useEffect(() => { if (Object.keys(detailAddress).length > 0) { const selectedCities = cities.find( - (city) => - detailAddress?.district - .toLowerCase() - .includes(city.label.toLowerCase()) || - city.label - .toLowerCase() - .includes(detailAddress?.district.toLowerCase()) - ); + (city) => + city.label.toLowerCase() === detailAddress?.district.toLowerCase() + ) || cities.find( + (city) => + detailAddress?.district.toLowerCase().includes(city.label.toLowerCase()) || + city.label.toLowerCase().includes(detailAddress?.district.toLowerCase()) + ); setValue('city', selectedCities?.value); } }, [cities, detailAddress, setValue]); -- cgit v1.2.3