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.

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

[Refactor] PreferredLocale_Update #9650

Merged
merged 1 commit into from
Jul 7, 2022

Conversation

danieldoglas
Copy link
Contributor

@danieldoglas danieldoglas commented Jun 30, 2022

Linked with https://github.com/Expensify/Web-Expensify/pull/34182

Details

Refactoring method PreferredLocale_Update to new standards.

Fixed Issues

$ https://github.com/Expensify/Expensify/issues/211819

Tests

  • Checked language is changing from Login
  • Checked language is changing from Settings.
  • Verify that no errors appear in the JS console

PR Review Checklist

Contributor (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 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 included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 tagging the marketing team 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
  • 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 */
    • Any functional components have the displayName property
    • 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
  • 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.

PR Reviewer Checklist

  • 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 tagging the marketing team 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 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 */
    • Any functional components have the displayName property
    • 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.

QA Steps

[DEV ONLY]
From login page:

  • Click on the drop down for languages

  • Change it to Spanish/English

  • It should change without issues
    [PRODUCTION]

  • Sign in

  • Go to Settings > Preferences

  • Change language

  • Check that the request for api?command=UpdatePreferredLocale was successful
    image

  • Your preferred language should change without any issues.

  • Verify that no errors appear in the JS console

Screenshots

Web

video_correto.mov

Mobile Web

mobile-web-ios.mov

Desktop

desktop.mov

iOS

ios.mov

Android

@danieldoglas danieldoglas requested a review from a team as a code owner June 30, 2022 20:11
@danieldoglas danieldoglas self-assigned this Jun 30, 2022
@melvin-bot melvin-bot bot requested review from chiragsalian and removed request for a team June 30, 2022 20:11
@danieldoglas danieldoglas changed the title [Refactor] PreferredLocale_Update [HOLD WEB#34182][Refactor] PreferredLocale_Update Jun 30, 2022
@danieldoglas
Copy link
Contributor Author

I was not able to test it in android because of this error. As soon as that is solved I'll add the video here too

@danieldoglas danieldoglas changed the title [HOLD WEB#34182][Refactor] PreferredLocale_Update [Refactor] PreferredLocale_Update Jul 1, 2022
@danieldoglas
Copy link
Contributor Author

HOLD removed, but still can't run Android to upload the videos.

Copy link
Contributor

@marcaaron marcaaron left a comment

Choose a reason for hiding this comment

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

This PR should be on HOLD until the Web-E PR here is deployed to production.

@danieldoglas danieldoglas changed the title [Refactor] PreferredLocale_Update [HOLD Web#34182][Refactor] PreferredLocale_Update Jul 1, 2022
@danieldoglas danieldoglas changed the title [HOLD Web#34182][Refactor] PreferredLocale_Update [Refactor] PreferredLocale_Update Jul 7, 2022
@danieldoglas
Copy link
Contributor Author

Now it's off HOLD!

Copy link
Contributor

@chiragsalian chiragsalian left a comment

Choose a reason for hiding this comment

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

LGTM and works well

];

API.write('UpdatePreferredLocale', {
value: locale,
Copy link
Contributor

Choose a reason for hiding this comment

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

NAB, kind of odd that there is an API parameter called value ? 😄 Curious whether it should be more specific but definitely would not block on this comment.

@marcaaron marcaaron merged commit bf96f4a into main Jul 7, 2022
@marcaaron marcaaron deleted the dsilva_refactorPreferredLocaleUpdate branch July 7, 2022 22:59
@melvin-bot
Copy link

melvin-bot bot commented Jul 7, 2022

@marcaaron looks like this was merged without passing tests. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

@melvin-bot melvin-bot bot added the Emergency label Jul 7, 2022
@marcaaron
Copy link
Contributor

Tests passed afaict.

@luacmartins
Copy link
Contributor

I think the issue is that this PR wasn't up-to-date with main. So we double imported API in App.js. Rory put up a fix here. We are making a lot of changes to the same files, so should make sure we are pulling main before merging.

@marcaaron
Copy link
Contributor

Ok, got it, thanks! Maybe we can make it so that no PR can be merged if it's behind main? That seems like a good idea. cc @roryabraham if you know how to do that with your GH action 🥷 skills.

@roryabraham
Copy link
Contributor

There is a GitHub setting we could turn on that forces a PR to be up-to-date with main in order to merge it, but we historically haven't turned that on because it could cause sometimes-unnecessary delays, particularly with our global team. So instead we have a GitHub Action that runs lint and tests on main whenever a PR is merged. If they fail, as happened in this case, then:

However, GitHub has a new feature called merge queues that might be able to solve this in a better way, where instead of merging a PR, you would add it to a queue to be merged. The queue processes pull requests by merging into a temporary copy of main, running whatever tests + lint we want, and then the PR is only merged to main for real if everything passes. And then it does the same for the next PR in the merge queue. Would need to test it a bit but it seems cool.

@OSBotify
Copy link
Contributor

OSBotify commented Jul 8, 2022

🚀 Deployed to staging by @marcaaron in version: 1.1.81-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @roryabraham in version: 1.1.82-5 🚀

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants