diff --git a/src/features/CitySelect.tsx b/src/features/CitySelect.tsx index 165b2ccb..5d8a1b93 100644 --- a/src/features/CitySelect.tsx +++ b/src/features/CitySelect.tsx @@ -52,7 +52,7 @@ const CitySelect = ({ autocompletionRequest: { types: countryRestrictions === "IT" - ? ["administrative_level_area_3"] + ? ["administrative_area_level_3"] : ["(cities)"], componentRestrictions: { country: countryRestrictions || "" }, }, diff --git a/src/pages/PreviewSelectionForm/SelectionForm/SelectionFormFields/AddressFields.tsx b/src/pages/PreviewSelectionForm/SelectionForm/SelectionFormFields/AddressFields.tsx index 3690d157..3402fe61 100644 --- a/src/pages/PreviewSelectionForm/SelectionForm/SelectionFormFields/AddressFields.tsx +++ b/src/pages/PreviewSelectionForm/SelectionForm/SelectionFormFields/AddressFields.tsx @@ -4,10 +4,10 @@ import { SelectType, } from "@appquality/appquality-design-system"; import { FieldProps } from "formik"; -import CountrySelect from "src/features/CountrySelect"; -import CitySelect from "src/features/CitySelect"; -import { useTranslation } from "react-i18next"; import { useState } from "react"; +import { useTranslation } from "react-i18next"; +import CitySelect from "src/features/CitySelect"; +import CountrySelect from "src/features/CountrySelect"; interface AddressFieldsProps { label: string; @@ -70,9 +70,15 @@ export const AddressFields = ({ return; } const fields = place.address_components; - const city = fields.find( - (field) => field.types.indexOf("locality") >= 0 + let city = fields.find( + (field) => + field.types.indexOf("administrative_area_level_3") >= 0 ); + if (!city) { + city = fields.find( + (field) => field.types.indexOf("locality") >= 0 + ); + } if (!city) { form.setFieldError( cityField, diff --git a/src/pages/Profile/TabBase/index.tsx b/src/pages/Profile/TabBase/index.tsx index 62429ff5..cb0b90c6 100644 --- a/src/pages/Profile/TabBase/index.tsx +++ b/src/pages/Profile/TabBase/index.tsx @@ -338,9 +338,15 @@ const TabBase = () => { return; } const fields = place.address_components; - const city = fields.find( - (field) => field.types.indexOf("locality") >= 0 + let city = fields.find( + (field) => + field.types.indexOf("administrative_area_level_3") >= 0 ); + if (!city) { + city = fields.find( + (field) => field.types.indexOf("locality") >= 0 + ); + } if (!city) { formikProps.setFieldError( "city",