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

[Fix] Localize currency symbol #8299

Merged
merged 32 commits into from
Jun 6, 2022
Merged

[Fix] Localize currency symbol #8299

merged 32 commits into from
Jun 6, 2022

Conversation

mdneyazahmad
Copy link
Contributor

@mdneyazahmad mdneyazahmad commented Mar 24, 2022

Details

This pr localizes the currency symbol in different locale in IOUCurrencySelection and IOUAmountPage.
Example: $ 999 (English) will be 999 US$ (Espanol)

Fixed Issues

$ #7915

Tests

  1. Change language preference to Espanol.
  2. Navigate FAB -> Request Money.
  3. Enter amount 999.
  4. Verify that currency symbol is localized. It should display $ 999 (English) and 999 US$ (Espanol).
  5. Verify that IOUCurrencySelection page has all currency list with SO4217 Code and localized symbol.
  • 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

  1. Change language preference to Espanol.
  2. Navigate FAB -> Request Money.
  3. Enter amount 999.
  4. Verify that currency symbol is localized. It should display $ 999 (English) and 999 US$ (Espanol).
  5. Verify that IOUCurrencySelection page has all currency list with SO4217 Code and localized symbol.
  • Verify that no errors appear in the JS console

Screenshots

Web

web.mp4

Mobile Web

mweb.mp4

Desktop

desktop.mp4

iOS

ios.mp4

Android

android.mp4

@mdneyazahmad mdneyazahmad requested a review from a team as a code owner March 24, 2022 18:41
@melvin-bot melvin-bot bot requested review from parasharrajat and tgolen and removed request for a team March 24, 2022 18:41
Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

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

image

Missing...

@mdneyazahmad
Copy link
Contributor Author

getlocalizedCurrencySymbol is duplicated in two files. Should I move this to withLocalize?

@mdneyazahmad
Copy link
Contributor Author

Updated

Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

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

We can do better to dry this code. Please do not request the review until the code is sufficiently dried.

src/pages/iou/steps/IOUAmountPage.js Outdated Show resolved Hide resolved
src/components/withLocalize.js Outdated Show resolved Hide resolved
src/components/withLocalize.js Outdated Show resolved Hide resolved
src/components/withLocalize.js Outdated Show resolved Hide resolved
src/pages/iou/steps/IOUAmountPage.js Outdated Show resolved Hide resolved
@mdneyazahmad
Copy link
Contributor Author

Updated

src/libs/CurrencySymbolUtils.js Outdated Show resolved Hide resolved
src/libs/CurrencySymbolUtils.js Outdated Show resolved Hide resolved
src/libs/CurrencySymbolUtils.js Outdated Show resolved Hide resolved
src/libs/CurrencySymbolUtils.js Outdated Show resolved Hide resolved
src/libs/CurrencySymbolUtils.js Outdated Show resolved Hide resolved
src/pages/iou/steps/IOUAmountPage.js Outdated Show resolved Hide resolved
tests/unit/CurrencySymbolUtilsTest.js Outdated Show resolved Hide resolved
tests/unit/CurrencySymbolUtilsTest.js Outdated Show resolved Hide resolved
tests/unit/CurrencySymbolUtilsTest.js Outdated Show resolved Hide resolved
tests/unit/CurrencySymbolUtilsTest.js Outdated Show resolved Hide resolved
Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

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

These are two videos for LTR and RTL. I don't like the RTL one due to the delay. It is severely visible on Android. When the user removes the char continuously, it takes a bit of time for the space to shrink. @tgolen What do you think?

screen-2022-04-04_23.13.32.mp4
screen-2022-04-04_23.14.05.mp4

@mdneyazahmad
Copy link
Contributor Author

#8299 (review) may be related to this issue #7790

@parasharrajat
Copy link
Member

@mdneyazahmad Do you mind raising the same doubt on the Slack channel? The question is that should we really change the layout for the symbol. Also, Is this UI looking fine #8299 (review)? I am pointing towards the shrinking of the space between 0 and the symbol.

@parasharrajat
Copy link
Member

@mdneyazahmad @tgolen Bump.

@mdneyazahmad
Copy link
Contributor Author

@parasharrajat Sorry for delay. Should I wait for @tgolen reviews, before asking on slack channel?

@parasharrajat
Copy link
Member

No, please feel free to ask.

@mountiny mountiny self-requested a review June 1, 2022 16:47
@parasharrajat
Copy link
Member

Thanks for the review @mountiny. Let's take this to the finish line.

mdneyazahmad and others added 2 commits June 2, 2022 22:48
Co-authored-by: Vit Horacek <36083550+mountiny@users.noreply.github.com>
@mountiny
Copy link
Contributor

mountiny commented Jun 2, 2022

Thanks @mdneyazahmad. Let's get this over the finish line @parasharrajat :)

@parasharrajat
Copy link
Member

@mdneyazahmad You got some conflicts.

@mdneyazahmad
Copy link
Contributor Author

I see this PR #9064 was merged an hour ago and created merge conflict. Updating it soon.

parasharrajat
parasharrajat previously approved these changes Jun 3, 2022
Copy link
Member

@parasharrajat parasharrajat left a comment

Choose a reason for hiding this comment

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

LGTM. @mdneyazahmad Please merge main.

cc: @mountiny

🎀 👀 🎀 C+ reviewed

@mountiny
Copy link
Contributor

mountiny commented Jun 3, 2022

@mdneyazahmad Gonna wait for you to merge main/resolve conflicts.

Thanks @parasharrajat!

Copy link
Contributor

@mountiny mountiny left a comment

Choose a reason for hiding this comment

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

I think this LGTM, I will go ahead and merge and Tim will most likely focus on the Offline refactoring right now.

Thank you @mdneyazahmad and @parasharrajat

@mountiny mountiny merged commit 52c7907 into Expensify:main Jun 6, 2022
@OSBotify
Copy link
Contributor

OSBotify commented Jun 6, 2022

✋ 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
Copy link
Contributor

OSBotify commented Jun 6, 2022

🚀 Deployed to staging by @mountiny in version: 1.1.72-0 🚀

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

placeholder={this.props.numberFormat(0)}
keyboardType={CONST.KEYBOARD_TYPE.NUMBER_PAD}
blurOnSubmit={false}
Copy link
Member

@rushatgabhane rushatgabhane Jun 7, 2022

Choose a reason for hiding this comment

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

Hello 👋

While refactoring this code, blurOnSubmit must have been removed by mistake. This effectively reverted #9064 which fixed #8362

@mdneyazahmad can you please follow up with a PR to fix this regression, thank you!
cc: @parasharrajat @mountiny

Copy link
Member

Choose a reason for hiding this comment

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

Oh yeah it seems like this got missed while merging main. Good catch.

Copy link
Contributor

Choose a reason for hiding this comment

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

Great catch, the PR is up here #9351

Would any one of you @rushatgabhane or @parasharrajat be able to give this a quick test based on the PR Rushat linked to make sure the behaviour works fine and approve the PR, I will merge. Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

Merged, thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I missed it while fixing the merge conflict. Thanks @rushatgabhane for catching it early and @mountiny for creating the PR.

Copy link
Contributor

Choose a reason for hiding this comment

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

No worries, this is easy to miss.

@OSBotify
Copy link
Contributor

OSBotify commented Jun 8, 2022

🚀 Deployed to production by @yuwenmemon in version: 1.1.73-2 🚀

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

@dangrous
Copy link
Contributor

This is not exactly a bug but coming off of #12555 - we should make sure in the future we have ways for the user to get more information about "hidden" features - even just a tooltip like we've now implemented will help to point people in the right direction.

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.

None yet

7 participants