Skip to content
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

Fix: Web - Country field does not autofill for certain addresses. #21520 #21853

Merged
merged 6 commits into from
Jul 3, 2023
Merged

Fix: Web - Country field does not autofill for certain addresses. #21520 #21853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
24316ab
Use fallback for country
nishancx Jun 29, 2023
7e50eb6
Fix lint error
nishancx Jun 29, 2023
180edef
Check if country is valid
nishancx Jun 29, 2023
85c81b6
Cleanup
nishancx Jun 29, 2023
ba65be5
Add test for getPlaceAutocompleteTerms
nishancx Jun 30, 2023
3004da3
Use underscore
nishancx Jun 30, 2023
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
12 changes: 10 additions & 2 deletions src/components/AddressSearch/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ function AddressSearch(props) {
postal_code: zipCode,
administrative_area_level_1: state,
administrative_area_level_2: stateFallback,
country,
country: countryPrimary,
} = GooglePlacesUtils.getAddressComponents(addressComponents, {
street_number: 'long_name',
route: 'long_name',
Expand All @@ -142,7 +142,15 @@ function AddressSearch(props) {

// Make sure that the order of keys remains such that the country is always set above the state.
// Refer to https://github.com/Expensify/App/issues/15633 for more information.
const {state: stateAutoCompleteFallback = '', city: cityAutocompleteFallback = ''} = GooglePlacesUtils.getPlaceAutocompleteTerms(autocompleteData.terms);
const {
country: countryFallbackLongName = '',
state: stateAutoCompleteFallback = '',
city: cityAutocompleteFallback = '',
} = GooglePlacesUtils.getPlaceAutocompleteTerms(autocompleteData.terms);

const countryFallback = _.findKey(CONST.ALL_COUNTRIES, (country) => country === countryFallbackLongName);

const country = countryPrimary || countryFallback;

const values = {
street: `${streetNumber} ${streetName}`.trim(),
Expand Down
16 changes: 16 additions & 0 deletions tests/unit/GooglePlacesUtilsTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,12 @@ const addressComponents = [
types: ['postal_code'],
},
];

const autoCompleteTerms = [
{offset: 0, value: 'Bangladesh Border Road'},
{offset: 24, value: 'Bangladesh'},
];

describe('GooglePlacesUtilsTest', () => {
describe('getAddressComponents', () => {
it('should find address components by type', () => {
Expand Down Expand Up @@ -189,4 +195,14 @@ describe('GooglePlacesUtilsTest', () => {
expect(executionTime).toBeLessThan(5.0);
});
});
describe('getPlaceAutocompleteTerms', () => {
it('should find auto complete terms', () => {
expect(GooglePlacesUtils.getPlaceAutocompleteTerms(autoCompleteTerms)).toStrictEqual({
country: 'Bangladesh',
state: 'Bangladesh Border Road',
city: '',
street: '',
});
});
});
});