Update picker items by luacmartins · Pull Request #13375 · Expensify/App

luacmartins · 2022-12-06T20:07:48Z

Details

We changed the render items in Picker from this.props.items to this.items and updated them in the constructor only, which caused the items to not be translated when a different language is selected. This PR fixes that issue.

I'm also moving the new color to the themeColors file instead of variables.

Fixed Issues

$ #13341

Tests

Navigate to Settings > Preferences
Change the language
Verify that the value in Priority mode is translated

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as test steps

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Windows
https://user-images.githubusercontent.com/22219519/206017878-8f4ead41-c62d-4088-9920-9963d9f742bb.mov

Mac
https://user-images.githubusercontent.com/22219519/206017899-e7a66ab4-8f30-48ff-b51f-3113273c20b7.mov

Mobile Web - Chrome

chrome.mov

Mobile Web - Safari

safari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

melvin-bot · 2022-12-06T20:07:53Z

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

melvin-bot · 2022-12-06T20:40:21Z

@eVoloshchak @marcaaron One of you needs to 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]

pecanoro · 2022-12-06T21:03:45Z

Oh wow, thank you for fixing this, what an edge case, I didn't think that items would change after being rendered, didn't realize that changing languages when it's mounted already would cause it 😄

luacmartins · 2022-12-08T18:43:27Z

@eVoloshchak @marcaaron friendly bump for reviews!

marcaaron · 2022-12-06T22:48:17Z

src/components/Picker/index.js

        this.placeholder = _.isEmpty(this.props.placeholder) ? {} : {
            ...this.props.placeholder,
-            color: variables.pickerOptionsTextColor,
+            color: themeColors.pickerOptionsTextColor,


cc @shawnborton do we follow a particular naming convention for the these theme colors? I wasn't sure so wanted to ask if you're cool with the theme colors referring to specific things in the UI vs. more general stuff.

I think that's okay? I don't feel strongly. Maybe @grgia has an opinion since she worked a lot on refactoring colors.

marcaaron · 2022-12-08T19:01:07Z

src/components/Picker/index.js

-                        items={this.items}
+
+                        // We add a text color to prevent white text on white background dropdown items on Windows
+                        items={_.map(this.props.items, item => ({...item, color: themeColors.pickerOptionsTextColor}))}


NAB, but guessing there is no way to pass the color to the picker component instead of with each option? Seems a bit weird to have to decorate the items with the color property if they are all going to be the same color.

I agree, but unfortunately I don't think there's a way around it or I couldn't find another solution. Here's the link to the lib docs.

No worries that's what I figured. I can't think of any reason why we might want to avoid this other than performance (though definitely not for the case this PR is fixing). But if performance is a concern we can find a more optimal way to recalculate things. Not concerned really.

src/styles/colors.js

eVoloshchak · 2022-12-08T19:23:01Z

@eVoloshchak @marcaaron friendly bump for reviews!

Can't do it till tomorrow, could you unassign me please?

luacmartins · 2022-12-08T19:23:23Z

Comment removed, waiting for Shawn's input here

marcaaron · 2022-12-08T20:14:05Z

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:
- iOS / native
- Android / native
- iOS / Safari
- Android / Chrome
- MacOS / Chrome
- 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 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 was added in all src/languages/* files
- I verified any copy / text that was added to the app is correct English and 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 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 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.
I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

2022-12-08_10-13-24.mp4

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

OSBotify · 2022-12-08T20:36:41Z

✋ 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 · 2022-12-13T22:38:05Z

🚀 Deployed to production by @chiragsalian in version: 1.2.38-6 🚀

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

luacmartins added 2 commits December 6, 2022 12:09

move colors to colors file

a4e8edd

update items on render

733e833

luacmartins self-assigned this Dec 6, 2022

luacmartins marked this pull request as ready for review December 6, 2022 20:39

luacmartins requested a review from a team as a code owner December 6, 2022 20:39

luacmartins mentioned this pull request Dec 6, 2022

Clean up the code when adding colors for the Picker #13299

Merged

98 tasks

melvin-bot bot requested review from eVoloshchak and marcaaron and removed request for a team December 6, 2022 20:40

marcaaron requested changes Dec 8, 2022

View reviewed changes

rm comment

5634f96

luacmartins removed the request for review from eVoloshchak December 8, 2022 19:39

marcaaron self-requested a review December 8, 2022 20:31

marcaaron approved these changes Dec 8, 2022

View reviewed changes

marcaaron merged commit cb256f9 into main Dec 8, 2022

marcaaron deleted the cmartins-fixPickerUpdate branch December 8, 2022 20:32

francoisl mentioned this pull request Dec 10, 2022

Deploy Checklist: New Expensify 2022-12-09 #13498

Closed

32 tasks

melvin-bot bot mentioned this pull request Dec 13, 2022

[Hold for payment 2022-12-20] Priority Mode options is not changing to selected language #13341

Closed

Conversation

luacmartins commented Dec 6, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Dec 6, 2022

Uh oh!

melvin-bot bot commented Dec 6, 2022

Uh oh!

pecanoro commented Dec 6, 2022

Uh oh!

luacmartins commented Dec 8, 2022

Uh oh!

marcaaron Dec 6, 2022

Choose a reason for hiding this comment

Uh oh!

shawnborton Dec 8, 2022

Choose a reason for hiding this comment

Uh oh!

marcaaron Dec 8, 2022

Choose a reason for hiding this comment

Uh oh!

luacmartins Dec 8, 2022

Choose a reason for hiding this comment

Uh oh!

marcaaron Dec 8, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

eVoloshchak commented Dec 8, 2022

Uh oh!

luacmartins commented Dec 8, 2022

Uh oh!

marcaaron commented Dec 8, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

OSBotify commented Dec 8, 2022

Uh oh!

OSBotify commented Dec 13, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

luacmartins commented Dec 6, 2022 •

edited

Loading

marcaaron commented Dec 8, 2022 •

edited

Loading