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

rerender country and state if visited via deep link #28404

Merged
merged 16 commits into from
Oct 2, 2023
Merged

rerender country and state if visited via deep link #28404

Changes from 11 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5c23584
rerender country and state if visited via deep link
saranshbalyan-1234 Sep 28, 2023
1c64c43
Update src/pages/settings/Profile/PersonalDetails/AddressPage.js
saranshbalyan-1234 Sep 28, 2023
230bc39
Update src/pages/settings/Profile/PersonalDetails/AddressPage.js
saranshbalyan-1234 Sep 28, 2023
7cc4535
resolved comments
saranshbalyan-1234 Sep 28, 2023
5729e74
resolved comments
saranshbalyan-1234 Sep 28, 2023
6f1b1c0
resolved comments
saranshbalyan-1234 Sep 29, 2023
fe4ca57
removed spaces
saranshbalyan-1234 Sep 29, 2023
f1f96bc
Update AddressPage.js
saranshbalyan-1234 Sep 29, 2023
48c1939
Update src/pages/settings/Profile/PersonalDetails/AddressPage.js
saranshbalyan-1234 Sep 29, 2023
7c03147
Update AddressPage.js
saranshbalyan-1234 Sep 29, 2023
811deb9
Update AddressPage.js
saranshbalyan-1234 Sep 29, 2023
c318647
Update AddressPage.js
saranshbalyan-1234 Sep 29, 2023
237a589
Update AddressPage.js
saranshbalyan-1234 Sep 29, 2023
1caf195
Update AddressPage.js
saranshbalyan-1234 Sep 29, 2023
a9b6ed1
Update AddressPage.js
saranshbalyan-1234 Sep 29, 2023
a70225e
pretteir
saranshbalyan-1234 Oct 2, 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
16 changes: 10 additions & 6 deletions src/pages/settings/Profile/PersonalDetails/AddressPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import lodashGet from 'lodash/get';
import _ from 'underscore';
import React, {useState, useCallback, useEffect} from 'react';
import React, {useState, useCallback, useEffect, useMemo} from 'react';
import PropTypes from 'prop-types';
import {View} from 'react-native';
import {CONST as COMMON_CONST} from 'expensify-common/lib/CONST';
Expand Down Expand Up @@ -70,14 +70,13 @@ function updateAddress(values) {

function AddressPage({privatePersonalDetails, route}) {
usePrivatePersonalDetails();
const {translate} = useLocalize();
const { translate } = useLocalize();
const address = useMemo(() => lodashGet(privatePersonalDetails, 'address') || {}, [privatePersonalDetails]);
const countryFromUrl = lodashGet(route, 'params.country');
const [currentCountry, setCurrentCountry] = useState(countryFromUrl || PersonalDetails.getCountryISO(lodashGet(privatePersonalDetails, 'address.country')));
const isUSAForm = currentCountry === CONST.COUNTRY.US;
const [currentCountry, setCurrentCountry] = useState(address.country);
const zipSampleFormat = lodashGet(CONST.COUNTRY_ZIP_REGEX_DATA, [currentCountry, 'samples'], '');
const zipFormat = translate('common.zipCodeExampleFormat', {zipSampleFormat});

const address = lodashGet(privatePersonalDetails, 'address') || {};
const isUSAForm = currentCountry === CONST.COUNTRY.US;
const isLoadingPersonalDetails = lodashGet(privatePersonalDetails, 'isLoading', true);
const [street1, street2] = (address.street || '').split('\n');
const [state, setState] = useState(address.state);
Expand All @@ -87,6 +86,11 @@ function AddressPage({privatePersonalDetails, route}) {
* @param {Object} values - form input values
* @returns {Object} - An object containing the errors for each inputID
*/
useEffect(() => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are some linter errors still
image

You can check those by running npm run lint (ignore the errors in /vendor/bundle/ruby)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the wrong place to put useEffect, it's currently between validate function and JSdoc for the said function

It should be placed after const [state, setState] = useState(address.state); (make sure there's an empty line above and below useEffect)

Copy link
Contributor

@eVoloshchak eVoloshchak Sep 29, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image

if(!address) return;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still a linter error

image
Suggested change
if(!address) return;
if(!address) {
return
}

setState(address.state);
setCurrentCountry(address.country);
}, [address]);
saranshbalyan-1234 marked this conversation as resolved.
Show resolved Hide resolved
const validate = useCallback((values) => {
const errors = {};
const requiredFields = ['addressLine1', 'city', 'country', 'state'];
Expand Down