Implement dedicated route for CountryPicker in AddressPage #26742

ygshbht · 2023-09-05T03:34:05Z

Details

Fixed Issues

$ #23725
PROPOSAL: #23725 (comment)

Tests

Go to Settings > Profile > Personal details > Home address > Country
Click back button of device
Notice it Properly navigates to Home address screen

Verify that no errors appear in the JS console

Offline tests

Same as tests

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
- I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
  - If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
I verified that if a function's arguments changed that all usages have also been updated correctly
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG))
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

desktop.browser.mp4

Mobile Web - Chrome

android.chrome.mp4

Mobile Web - Safari

safari.mp4

Desktop

desktop.mp4

iOS

ios.mp4

Android

android.mp4

melvin-bot · 2023-09-05T03:34:09Z

@parasharrajat Please copy/paste the Reviewer Checklist from here into a new comment on this PR and complete it. If you have the K2 extension, you can simply click: [this button]

parasharrajat · 2023-09-05T13:12:34Z

@ygshbht Please add QA steps, Offline tests, Tests. Checklist is also pending.

ygshbht · 2023-09-05T13:18:23Z

@parasharrajat Sure, just woke up. Doing it now #23725 (comment)

@parasharrajat I've created the PR if you'd like to review. I'll fill the checklist and the screenshots soon after waking up

ygshbht · 2023-09-05T13:42:45Z

@parasharrajat Updated

parasharrajat · 2023-09-05T23:17:25Z

src/pages/settings/Profile/PersonalDetails/AddressPage.js

@@ -236,3 +250,41 @@ export default withOnyx({
        key: ONYXKEYS.PRIVATE_PERSONAL_DETAILS,
    },
 })(AddressPage);
+
+const CountryPicker = React.memo(


Move this to its own page.

parasharrajat · 2023-09-05T23:18:01Z

src/pages/settings/Profile/PersonalDetails/AddressPage.js

+CountryPicker.propTypes = {
+    errorText: PropTypes.string,
+    value: PropTypes.string,
+};
+
+CountryPicker.defaultProps = {
+    errorText: '',
+    value: '',
+};


follow an existing pattern like other components. we define these on the top.

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

parasharrajat · 2023-09-05T23:19:05Z

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

+    ...withLocalizePropTypes,
+};
+
+const defaultProps = {};


Suggested change

const defaultProps = {};

parasharrajat · 2023-09-05T23:19:42Z

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

+function CountrySelection(props) {
+    const [searchValue, setSearchValue] = useState('');
+    const {translate} = useLocalize();
+    const currentCountry = lodashGet(props, 'route.params.country');


we can use prop destructuring for this component as well.

parasharrajat · 2023-09-05T23:21:25Z

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

+CountrySelection.defaultProps = defaultProps;
+
+export default compose(
+    withLocalize,


we already used useLocalize above.

parasharrajat · 2023-09-05T23:21:48Z

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

+export default compose(
+    withLocalize,
+
+    withNetwork(),


use useNetwork instead.

parasharrajat · 2023-09-05T23:23:29Z

src/pages/settings/Profile/PersonalDetails/AddressPage.js

@@ -177,8 +192,7 @@ function AddressPage({privatePersonalDetails}) {
                <View style={styles.mhn5}>
                    <CountryPicker


We should remove this old Picker.

Do you mean these files https://github.com/Expensify/App/tree/main/src/components/CountryPicker?

Co-authored-by: Rajat Parashar <[email protected]>

parasharrajat · 2023-09-06T19:21:09Z

src/components/CountryPickerMenuItem.js

+    errorText: PropTypes.string,
+    value: PropTypes.string,


missing comments.

src/components/CountryPickerMenuItem.js

parasharrajat · 2023-09-06T19:23:18Z

src/components/CountryPickerMenuItem.js

+}
+
+CountryPickerMenuItem.propTypes = propTypes;
+CountryPickerMenuItem.defaultProps = defaultProps;


Missing displayName.

parasharrajat · 2023-09-06T19:24:32Z

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

+            backTo: PropTypes.string,
+        }),
+    }).isRequired,
+    navigation: PropTypes.shape({


Missing Comments

parasharrajat · 2023-09-06T19:25:03Z

src/pages/settings/Profile/PersonalDetails/AddressPage.js

@@ -175,10 +189,9 @@ function AddressPage({privatePersonalDetails}) {
                />
                <View style={styles.formSpaceVertical} />
                <View style={styles.mhn5}>
-                    <CountryPicker


What happened to old CountryPicker component? Why are we keeping that if not used anymore?

Yes, that can be deleted

Co-authored-by: Rajat Parashar <[email protected]>

…github.com/ygshbht/App into fix/address-page-country-picker-navigation

ygshbht · 2023-09-06T19:40:33Z

@parasharrajat Done

parasharrajat · 2023-09-07T11:10:09Z

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

+        (option) => {
+            const backTo = lodashGet(route, 'params.backTo', '');
+
+            if (navigation.getState().routes.length === 1 && _.isEmpty(backTo)) {


Please add an explanation.

parasharrajat · 2023-09-07T11:10:56Z

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

+
+            if (navigation.getState().routes.length === 1 && _.isEmpty(backTo)) {
+                Navigation.goBack();
+            } else if (!_.isEmpty(backTo) && navigation.getState().routes.length === 1) {


parasharrajat · 2023-09-07T11:14:26Z

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

+    }).isRequired,
+    /** Navigation from react-navigation */
+    navigation: PropTypes.shape({
+        getState: PropTypes.func.isRequired,


We should also add comment here.

parasharrajat · 2023-09-07T11:14:38Z

src/pages/settings/Profile/PersonalDetails/CountrySelection.js

let's rename this CountrySelectionPage

parasharrajat · 2023-09-07T11:27:28Z

src/ROUTES.js

+    getPersonalDetailsAddressRoute: (country) => `${SETTINGS_PERSONAL_DETAILS}/address?country=${country}`,
+    SETTINGS_PERSONAL_DETAILS_ADDRESS_COUNTRY: `${SETTINGS_PERSONAL_DETAILS}/address/country`,
+    getCountryRoute: (country, backTo) => {


Why do we need two functions? when getCountryRoute can be used for both. Also, I see that getPersonalDetailsAddressRoute is not used anywhere

parasharrajat · 2023-09-07T11:27:50Z

src/components/CountryPickerMenuItem.js

+                descriptionTextStyle={countryTitleDescStyle}
+                description={translate('common.country')}
+                onPress={() => {
+                    const activeRoute = Navigation.getActiveRoute().replace(/\?.*/, '');


we should encode this querystring.

parasharrajat · 2023-09-07T12:06:08Z

src/components/CountryPickerMenuItem.js

+    value: '',
+};
+
+function CountryPickerMenuItem({errorText, value}, ref) {


Suggested change

function CountryPickerMenuItem({errorText, value}, ref) {

function CountryPickerMenuItem({errorText, countryCode}, ref) {

let's rename it.

parasharrajat · 2023-09-07T12:06:49Z

src/components/CountryPickerMenuItem.js

+
+function CountryPickerMenuItem({errorText, value}, ref) {
+    const {translate} = useLocalize();
+    const getCountryFromCountryCode = (code) => translate('allCountries')[code];


Suggested change

const getCountryFromCountryCode = (code) => translate('allCountries')[code];

const countries = translate('allCountries');

parasharrajat · 2023-09-07T12:08:39Z

src/components/CountryPickerMenuItem.js

+    const {translate} = useLocalize();
+    const getCountryFromCountryCode = (code) => translate('allCountries')[code];
+
+    const countryTitleDescStyle = value && value.length === 0 ? styles.textNormal : null;


Suggested change

const countryTitleDescStyle = value && value.length === 0 ? styles.textNormal : null;

const country = countries[countryCode] || '';

const countryTitleDescStyle = country.length === 0 ? styles.textNormal : null;

parasharrajat · 2023-09-07T12:08:54Z

src/components/CountryPickerMenuItem.js

+        <View>
+            <MenuItemWithTopDescription
+                shouldShowRightIcon
+                title={getCountryFromCountryCode(value)}


Suggested change

title={getCountryFromCountryCode(value)}

title={country}

parasharrajat · 2023-09-07T12:26:18Z

Functioning fine. Let me know when these changes are done so I can finish the checklist.

ygshbht · 2023-09-25T16:02:55Z

@parasharrajat Merged again

parasharrajat · 2023-09-25T16:53:39Z

src/ROUTES.ts

@@ -66,6 +66,13 @@ export default {
    SETTINGS_PERSONAL_DETAILS_LEGAL_NAME:       'settings/profile/personal-details/legal-name',
    SETTINGS_PERSONAL_DETAILS_DATE_OF_BIRTH:    'settings/profile/personal-details/date-of-birth',
    SETTINGS_PERSONAL_DETAILS_ADDRESS:          'settings/profile/personal-details/address',
+    SETTINGS_PERSONAL_DETAILS_ADDRESS_COUNTRY: {   route:`settings/profile/personal-details/address/country`, getRoute: (country: string, backTo?: string) => {


Very weird formatting but not a blocker.

parasharrajat

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

🎀 👀 🎀 C+ reviewed

parasharrajat

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

🎀 👀 🎀 C+ reviewed

parasharrajat

Reviewer Checklist

I have verified the author checklist is complete (all boxes are checked off).
I verified the correct issue is linked in the ### Fixed Issues section above
I verified testing steps are clear and they cover the changes made in this PR
- I verified the steps for local testing are in the Tests section
- I verified the steps for Staging and/or Production testing are in the QA steps section
- I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
- I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
I checked that screenshots or videos are included for tests on all platforms
I included screenshots or videos for tests on all platforms
I verified tests pass on all platforms & I tested again on:
- Android / native
- Android / Chrome
- iOS / native
- iOS / Safari
- MacOS / Chrome / Safari
- MacOS / Desktop
If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
I verified proper code patterns were followed (see Reviewing the code)
- I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
- I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
- I verified that comments were added to code that is not self explanatory
- I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
- I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
- I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
- I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
- I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
- I verified the JSDocs style guidelines (in STYLE.md) were followed
If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
I verified that this PR follows the guidelines as stated in the Review Guidelines
I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
If a new component is created I verified that:
- A similar component doesn't exist in the codebase
- All props are defined accurately and each prop has a /** comment above it */
- The file is named correctly
- The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
- The only data being stored in the state is data necessary for rendering and nothing else
- For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
- Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
- All JSX used for rendering exists in the render method
- The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
If any new file was added I verified that:
- The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
If a new CSS style is added I verified that:
- A similar style doesn't already exist
- The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

🎀 👀 🎀 C+ reviewed

mountiny · 2023-09-26T02:11:09Z

I am also asking Callstack people to have a look at this pr too as they have helped with the iou currency selection. More people the merrier

gedu · 2023-09-26T07:29:43Z

src/components/CountrySelector.js

+
+const defaultProps = {
+    errorText: '',
+    value: '',


Setting an empty string as default prevents the Form from passing the value. it has to be undefined

value: undefined

koko57 · 2023-09-26T09:50:35Z

conflicts, but overall LGTM

…picker-navigation

ygshbht · 2023-09-26T11:51:56Z

Merged!

mountiny

This is only for Country but did we not discuss before we would like to do this for state too at the same PR?

Also when you deeplink to the country picker, will you be rerouted to the start of the flow or closing the RHP?

ygshbht · 2023-09-27T08:44:59Z

This is only for Country but did we not discuss before we would like to do this for state too at the same PR?

I don't think this was mentioned before the job started #23725 (comment). I think it could still be done if it was a small task, however, i'd say its just as much work as CountryPicker and should require its own issue. I'd happily work on that. What do you say :)

Also when you deeplink to the country picker, will you be rerouted to the start of the flow or closing the RHP?

If there's a previous screen in the stack/ or backTo param in the URL, it will navigate back to that screen/ URL. Otherwise, it will close the RHP/ RHN

parasharrajat · 2023-09-27T08:50:37Z

Also when you deeplink to the country picker, will you be rerouted to the start of the flow or closing the RHP?

It will take you back to the URL passed via backTo otherwise the whole RHN is closed.

parasharrajat · 2023-09-27T08:51:06Z

I don't think this was mentioned before the job started #23725 (comment). I think it could still be done if it was a small task, however, i'd say it's just as much work as CountryPicker and should require its own issue. I'd happily work on that. What do you say :)

Maybe we can increase the price of the issue and do it here.
Increase the price of the issue and create a new follow-up PR.

mountiny · 2023-09-28T06:31:08Z

Happy to increase the price and do it in that issues

OSBotify · 2023-09-28T19:16:25Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.75-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-10-02T17:20:20Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.75-12 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

OSBotify · 2023-10-02T17:48:55Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.76-0 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅

OSBotify · 2023-10-03T15:49:52Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.76-6 🚀

platform	result
🤖 android 🤖	success ✅
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	failure ❌
🕸 web 🕸	success ✅

0xmiros · 2023-10-30T11:44:12Z

src/pages/settings/Profile/PersonalDetails/AddressPage.js

+            return;
+        }
+        handleAddressChange(countryFromUrl, 'country');
+    }, [countryFromUrl, handleAddressChange, currentCountry]);


Adding currentCountry dependency in this effect caused regression - #29382
More details about the root cause - #29382 (comment)

Implement dedicated route for CountryPicker in AddressPage

0479a7e

ygshbht requested a review from a team as a code owner September 5, 2023 03:34

melvin-bot bot requested review from parasharrajat and removed request for a team September 5, 2023 03:34

ygshbht mentioned this pull request Sep 5, 2023

[HOLD for payment 2024-04-15] [$750] mWeb - Click on back button from country picker page redirects to wrong page #23725

Closed

6 tasks

mountiny assigned ygshbht Sep 5, 2023

parasharrajat suggested changes Sep 5, 2023

View reviewed changes

parasharrajat reviewed Sep 5, 2023

View reviewed changes

ygshbht and others added 8 commits September 6, 2023 05:22

Comment correction

b5a0ebc

Co-authored-by: Rajat Parashar <[email protected]>

Remove unused dependencies in CountrySelection

3cbd8d2

CountrySelection refactoring

53286fd

CountrySelection remove defaultProps

d88cc41

Make CountryPickerMenuItem a new component on its own page

b8cacd7

CountrySelection Navigation bugfix after selecting country

f4ae5b2

Delete Old CountryPicker Modal

ae6ebcf

Add display name to CountryPickerMenuitem

9cfcc96

parasharrajat reviewed Sep 6, 2023

View reviewed changes

parasharrajat suggested changes Sep 6, 2023

View reviewed changes

ygshbht and others added 3 commits September 7, 2023 01:01

Remove memoing CountryPickerMenuItem

ff87483

Co-authored-by: Rajat Parashar <[email protected]>

Comment modifications to CountrySelection and related files

f161188

Merge branch 'fix/address-page-country-picker-navigation' of https://…

ce5463c

…github.com/ygshbht/App into fix/address-page-country-picker-navigation

parasharrajat suggested changes Sep 7, 2023

View reviewed changes

ygshbht added 2 commits September 7, 2023 20:49

CountySelectionPage & related files refactoring and comments

ba351d1

Rename CountrySelection to CountrySelectionPage

55253e7

parasharrajat reviewed Sep 25, 2023

View reviewed changes

parasharrajat approved these changes Sep 25, 2023

View reviewed changes

melvin-bot bot requested a review from mountiny September 25, 2023 16:53

parasharrajat approved these changes Sep 25, 2023

View reviewed changes

gedu reviewed Sep 26, 2023

View reviewed changes

set default prop value of 'value' of CountrySelector to undefined

945056d

Merge https://github.com/Expensify/App into fix/address-page-country-…

d2331d3

…picker-navigation

mountiny approved these changes Sep 27, 2023

View reviewed changes

parasharrajat mentioned this pull request Sep 27, 2023

[$500] Web - App takes user two steps back after clicking on browser back button from Year page #27665

Closed

6 tasks

mountiny merged commit 5cf1904 into Expensify:main Sep 28, 2023

OSBotify mentioned this pull request Sep 28, 2023

Deploy Checklist: New Expensify 2023-09-28 #28412

Closed

DylanDylann mentioned this pull request Sep 29, 2023

Fix/28007: City field is not clear when choosing new country #28362

Merged

59 tasks

OSBotify mentioned this pull request Oct 2, 2023

Deploy Checklist: New Expensify 2023-10-02 #28635

Closed

DylanDylann mentioned this pull request Oct 4, 2023

[HOLD for payment 2023-10-09] [$250] Personal Details - When random url param for country passed the app crashes on Dev and shows allCountries.randomParam #28743

Closed

6 tasks

0xmiros reviewed Oct 30, 2023

View reviewed changes

0xmiros mentioned this pull request Oct 30, 2023

[HOLD for payment 2023-10-30] Profile - 'Country' doesn't change if selected manually and then another suggested address is selected #29382

Closed

6 tasks

neonbhai mentioned this pull request Jan 12, 2024

[Payment due][$1000] Room - Side panel does not close when clicking outside of panel #34394

Closed

6 tasks

		@@ -177,8 +192,7 @@ function AddressPage({privatePersonalDetails}) {
		<View style={styles.mhn5}>
		<CountryPicker

	function CountryPickerMenuItem({errorText, value}, ref) {
	function CountryPickerMenuItem({errorText, countryCode}, ref) {

	const getCountryFromCountryCode = (code) => translate('allCountries')[code];
	const countries = translate('allCountries');

	const countryTitleDescStyle = value && value.length === 0 ? styles.textNormal : null;
	const country = countries[countryCode] \|\| '';
	const countryTitleDescStyle = country.length === 0 ? styles.textNormal : null;

Implement dedicated route for CountryPicker in AddressPage #26742

Implement dedicated route for CountryPicker in AddressPage #26742

Conversation

ygshbht commented Sep 5, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 5, 2023

parasharrajat commented Sep 5, 2023 • edited Loading

ygshbht commented Sep 5, 2023

ygshbht commented Sep 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ygshbht commented Sep 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

parasharrajat commented Sep 7, 2023

ygshbht commented Sep 25, 2023

Choose a reason for hiding this comment

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

parasharrajat left a comment

Choose a reason for hiding this comment

Reviewer Checklist

mountiny commented Sep 26, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

koko57 commented Sep 26, 2023 • edited Loading

ygshbht commented Sep 26, 2023

mountiny left a comment

Choose a reason for hiding this comment

ygshbht commented Sep 27, 2023

parasharrajat commented Sep 27, 2023

parasharrajat commented Sep 27, 2023 • edited Loading

mountiny commented Sep 28, 2023

OSBotify commented Sep 28, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

0xmiros Oct 30, 2023 • edited Loading

Choose a reason for hiding this comment

ygshbht commented Sep 5, 2023 •

edited

Loading

parasharrajat commented Sep 5, 2023 •

edited

Loading

koko57 commented Sep 26, 2023 •

edited

Loading

parasharrajat commented Sep 27, 2023 •

edited

Loading

0xmiros Oct 30, 2023 •

edited

Loading