Fix: resetting the country/state picker when it is reopened #24023

joh42 · 2023-08-01T22:25:33Z

Details

The values of the country/state pickers would remain cleared after reopening the picker

Please note: the state picker is broken in Storybook due to an issue with HeaderWithBackButton that I have reported here. This issue exists on staging. As suggested by Jack Nam I still marked the Storybook checkbox as completed, since that issue is not caused by this PR.

Fixed Issues

$ #23768
PROPOSAL: #23768 (comment)

Tests

Testing the country selector

Go to settings > profile > personal details > home address
Click on country to open the country selector
Pick any country
Reopen the country selector
Clear the input field and close the selector
Reopen the country selector
Verify that the country you selected is selected by default

Testing the state selector

Go to settings > profile > personal details > home address
Click on state to open the state selector
Select any state
Reopen the state selector
Clear the input field and close the selector
Reopen the state selector
Verify that the state you selected is selected by default

Verify that no errors appear in the JS console

Offline tests

Same as regular steps

QA Steps

Same as regular steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screen.Recording.2023-08-02.at.14.31.49.mov

Screen.Recording.2023-08-02.at.14.34.10.mov

Mobile Web - Chrome

Screen.Recording.2023-08-02.at.01.12.32.mov

Mobile Web - Safari

Screen.Recording.2023-08-02.at.00.45.06.mov

Desktop

Screen.Recording.2023-08-02.at.00.33.48.mov

Screen.Recording.2023-08-02.at.00.34.11.mov

iOS

Screen.Recording.2023-08-02.at.00.38.07.mov

Android

Screen.Recording.2023-08-02.at.01.18.23.mov

melvin-bot · 2023-08-01T22:25:37Z

Hey! I see that you made changes to our Form component. Make sure to update the docs in FORMS.md accordingly. Cheers!

joh42 · 2023-08-01T22:27:31Z

Looking through FORMS.md, I don't think there's anything that we need to update due to this PR

melvin-bot · 2023-08-01T23:24:09Z

@s77rt 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]

s77rt · 2023-08-02T11:35:56Z

src/components/CountryPicker/index.js

+    const updateSearchValue = useCallback((countries, currentValue) => {
+        setSearchValue(lodashGet(countries, currentValue, ''));
+    }, []);
+
    useEffect(() => {
-        setSearchValue(lodashGet(allCountries, value, ''));
-    }, [value, allCountries]);
+        updateSearchValue(allCountries, value);
+    }, [value, allCountries, updateSearchValue]);


Why we are adding updateSearchValue as a new function? We should just call setSearchValue

Thought it would be DRYer. Will change it.

s77rt · 2023-08-02T11:42:22Z

@joh42 Please adjust the title of the PR to reflect the change. Also please remove the first video showing the bug it may be confusing.

joh42 · 2023-08-02T12:40:55Z

Updated, ready for another review @s77rt

s77rt · 2023-08-02T17:23:38Z

Please use the tests described below: (do same thing with state test)
It's better to avoid the "repeat step X" pattern as it's a little harder to read and reproduce

Go to settings > profile > personal details > home address
Click on country to open the country selector
Pick the United States
Reopen the country selector
Clear the input field and close the selector
Reopen the country selector
Verify that the United States is selected by default

joh42 · 2023-08-02T17:30:10Z

👍 updated testing steps @s77rt

s77rt · 2023-08-02T17:32:43Z

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.

Screenshots/Videos

Web

web.mp4

Mobile Web - Chrome

mweb-chrome.mp4

Mobile Web - Safari

mweb-safari.mp4

Desktop

desktop.mp4

iOS

ios.mp4

Android

android.mp4

s77rt · 2023-08-02T17:33:33Z

Please double check the state selector test steps

joh42 · 2023-08-02T17:36:06Z

Oh right, you actually don't need to select a country to use the state selector. Removing those 2 steps

joh42 · 2023-08-02T17:37:10Z

Updated again @s77rt

s77rt · 2023-08-02T17:58:38Z

@joh42 Thank you!

s77rt

LGTM! 🚀

s77rt · 2023-08-02T18:02:59Z

@MariaHCD ⚡

OSBotify · 2023-08-02T18:05:05Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

OSBotify · 2023-08-03T17:41:49Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 1.3.50-0 🚀

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

OSBotify · 2023-08-07T18:30:09Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.3.50-3 🚀

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

OSBotify · 2023-08-07T18:57:22Z

🚀 Deployed to staging by https://github.com/MariaHCD in version: 1.3.51-0 🚀

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

OSBotify · 2023-08-09T08:46:30Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.3.51-2 🚀

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

joh42 added 2 commits August 1, 2023 23:52

implemented searchValue resetting when showing the country picker

1be9f4e

implemented searchValue resetting when showing the state picker

0dc553c

made linter happy

5b9556b

joh42 marked this pull request as ready for review August 1, 2023 23:24

joh42 requested a review from a team as a code owner August 1, 2023 23:24

melvin-bot bot removed the request for review from a team August 1, 2023 23:24

melvin-bot bot requested a review from s77rt August 1, 2023 23:24

joh42 mentioned this pull request Aug 1, 2023

[$1000] selected country does not show on opening Country selection page #23768

Closed

6 tasks

s77rt suggested changes Aug 2, 2023

View reviewed changes

joh42 changed the title ~~Fix/23768~~ Fix: resetting the country/state picker when it is reopened Aug 2, 2023

joh42 added 3 commits August 2, 2023 14:22

removed updateSearchValue function from the state picker

f49c336

removed updateSearchValue function from the country picker

bd56704

corrected variable names

d50af95

joh42 requested a review from s77rt August 2, 2023 12:41

s77rt approved these changes Aug 2, 2023

View reviewed changes

melvin-bot bot requested a review from MariaHCD August 2, 2023 17:59

MariaHCD approved these changes Aug 2, 2023

View reviewed changes

MariaHCD merged commit 564d705 into Expensify:main Aug 2, 2023

OSBotify mentioned this pull request Aug 3, 2023

Deploy Checklist: New Expensify 2023-08-03 #24121

Closed

86 tasks

OSBotify mentioned this pull request Aug 7, 2023

Deploy Checklist: New Expensify 2023-08-07 #24230

Closed

98 tasks

Fix: resetting the country/state picker when it is reopened #24023

Fix: resetting the country/state picker when it is reopened #24023

Uh oh!

Conversation

joh42 commented Aug 1, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Testing the country selector

Testing the state selector

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Aug 1, 2023

Uh oh!

joh42 commented Aug 1, 2023

Uh oh!

melvin-bot bot commented Aug 1, 2023

Uh oh!

s77rt Aug 2, 2023

Choose a reason for hiding this comment

Uh oh!

joh42 Aug 2, 2023

Choose a reason for hiding this comment

Uh oh!

s77rt commented Aug 2, 2023

Uh oh!

joh42 commented Aug 2, 2023

Uh oh!

s77rt commented Aug 2, 2023

Uh oh!

joh42 commented Aug 2, 2023

Uh oh!

s77rt commented Aug 2, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

s77rt commented Aug 2, 2023

Uh oh!

joh42 commented Aug 2, 2023

Uh oh!

joh42 commented Aug 2, 2023

Uh oh!

s77rt commented Aug 2, 2023

Uh oh!

s77rt left a comment

Choose a reason for hiding this comment

Uh oh!

s77rt commented Aug 2, 2023

Uh oh!

OSBotify commented Aug 2, 2023

Uh oh!

OSBotify commented Aug 3, 2023

Uh oh!

OSBotify commented Aug 7, 2023

Uh oh!

OSBotify commented Aug 7, 2023

Uh oh!

OSBotify commented Aug 9, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

joh42 commented Aug 1, 2023 •

edited

Loading

s77rt commented Aug 2, 2023 •

edited

Loading