Merge pull request #16567 from jjcoffee/16392

Add better support for non-US cities in address autocomplete by pulling in postal_town
Expensify · Mar 28, 2023 · 3a9ce6f · 3a9ce6f
2 parents 752ac61 + a4c943a
commit 3a9ce6f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/components/AddressSearch.js b/src/components/AddressSearch.js
@@ -105,8 +105,9 @@ const AddressSearch = (props) => {
         const {
             street_number: streetNumber,
             route: streetName,
-            locality: city,
-            sublocality: cityFallback, // Some locations only return sublocality instead of locality
+            locality,
+            sublocality,
+            postal_town: postalTown,
             postal_code: zipCode,
             administrative_area_level_1: state,
             country,
@@ -115,6 +116,7 @@ const AddressSearch = (props) => {
             route: 'long_name',
             locality: 'long_name',
             sublocality: 'long_name',
+            postal_town: 'long_name',
             postal_code: 'long_name',
             administrative_area_level_1: 'short_name',
             country: 'short_name',
@@ -132,7 +134,12 @@ const AddressSearch = (props) => {
         // Refer to https://github.com/Expensify/App/issues/15633 for more information.
         const values = {
             street: props.value ? props.value.trim() : '',
-            city: city || cityFallback,
+
+            // When locality is not returned, many countries return the city as postalTown (e.g. 5 New Street
+            // Square, London), otherwise as sublocality (e.g. 384 Court Street Brooklyn). If postalTown is
+            // returned, the sublocality will be a city subdivision so shouldn't take precedence (e.g.
+            // Salagatan, Upssala, Sweden).
+            city: locality || postalTown || sublocality,
             zipCode,
             country: '',
             state,