summaryrefslogtreecommitdiff
path: root/src/lib/address/components
diff options
context:
space:
mode:
authorIT Fixcomart <it@fixcomart.co.id>2025-06-28 04:26:45 +0000
committerIT Fixcomart <it@fixcomart.co.id>2025-06-28 04:26:45 +0000
commit0ef2f68fbb26afc3279abd6944edcaa0a0a531d0 (patch)
treeb9c6ba40e02bf18b71b022dcb5e6353e8931dda8 /src/lib/address/components
parent943755079722a515532ddb64cf5b43747096ea2e (diff)
parent6720e02766441036d872203216a1d9a45025f5a9 (diff)
Merged in fix_city_address (pull request #427)
<hafid> fix cities address
Diffstat (limited to 'src/lib/address/components')
-rw-r--r--src/lib/address/components/CreateAddress.jsx15
-rw-r--r--src/lib/address/components/EditAddress.jsx15
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]);