Skip to content

fix: Update city selection logic to handle administrative area level … #317

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d-beezee merged 2 commits into from
Jun 16, 2025
Merged

fix: Update city selection logic to handle administrative area level … #317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c875ad5
fix: Update city selection logic to handle administrative area level …
d-beezee Jun 16, 2025
3950075
Merge branch 'develop' into restrict-profile-city
d-beezee Jun 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/features/CitySelect.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ const CitySelect = ({
autocompletionRequest: {
types:
countryRestrictions === "IT"
? ["administrative_level_area_3"]
? ["administrative_area_level_3"]
: ["(cities)"],
componentRestrictions: { country: countryRestrictions || "" },
},
Expand Down
16 changes: 11 additions & 5 deletions src/pages/PreviewSelectionForm/SelectionForm/SelectionFormFields/AddressFields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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,
Expand Down
10 changes: 8 additions & 2 deletions src/pages/Profile/TabBase/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Loading