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/ Zeros are added to currency that does not support decimal #43816

Conversation

abzokhattab
Copy link
Contributor

Details

Fixed Issues

$ #43215
PROPOSAL:

Tests

  • Verify that no errors appear in the JS console
  1. Go to chat.
  2. Go to + > Submit expense > Manual.
  3. Select a currency that does not support decimal places (MRO).
  4. Enter amount > Next.
  5. On confirmation page, click Amount.
  6. Ensure that there are no decimal digits or commas present in the amount.
  7. Also, ensure that you can modify the amount without any problems.

Offline tests

Same as Tests

QA Steps

Same as Tests

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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • 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 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • 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.

Screenshots/Videos

Android: Native
Screen.Recording.2024-06-16.at.1.38.42.PM.mov
Android: mWeb Chrome
Screen.Recording.2024-06-16.at.2.06.03.PM.mov
iOS: Native
Screen.Recording.2024-06-16.at.1.38.42.PM.mov
iOS: mWeb Safari
Screen.Recording.2024-06-16.at.2.05.27.PM.mov
MacOS: Chrome / Safari
Screen.Recording.2024-06-16.at.1.29.16.PM.mov
MacOS: Desktop
Screen.Recording.2024-06-16.at.2.54.58.PM.mov

@abzokhattab abzokhattab requested a review from a team as a code owner June 16, 2024 20:33
@melvin-bot melvin-bot bot removed the request for review from a team June 16, 2024 20:33
Copy link

melvin-bot bot commented Jun 16, 2024

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

@abzokhattab
Copy link
Contributor Author

@eVoloshchak @dangrous Please let me know what you think about these changes and if we need to change anything else

src/libs/CurrencyUtils.ts Outdated Show resolved Hide resolved
Co-authored-by: Eugene Voloshchak <copyreading@gmail.com>
@eVoloshchak
Copy link
Contributor

eVoloshchak commented Jun 26, 2024

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: mWeb Chrome
    • iOS: Native
    • iOS: mWeb 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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
    • 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(theme.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 the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • 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

Android: Native
24-07-08-01-16-40.mp4
Android: mWeb Chrome
Screen.Recording.2024-07-08.at.01.19.55.mov
iOS: Native
Screen.Recording.2024-07-08.at.01.15.18.mov
iOS: mWeb Safari
Screen.Recording.2024-07-08.at.01.13.20.mov
MacOS: Chrome / Safari
Screen.Recording.2024-07-08.at.01.12.35.mov
MacOS: Desktop
Screen.Recording.2024-07-08.at.01.16.04.mov

@eVoloshchak
Copy link
Contributor

Bug: on mWeb Safari the amount is still displayed with two zeros. This is interesting, every other platform works correctly except for mWeb Safari

Simulator Screenshot - iPhone 15 Pro - 2024-06-26 at 22 04 25

@dangrous
Copy link
Contributor

dangrous commented Jul 1, 2024

How are we looking on this @abzokhattab - do you have any ideas on that iOS Safari issue? I'd like to get this closed out this week.

@dangrous
Copy link
Contributor

dangrous commented Jul 3, 2024

Bump @abzokhattab - it's been a week - can we get an ETA on this please? We should be able to merge on Friday or earlier. Thanks.

@abzokhattab
Copy link
Contributor Author

Sorry for the late response ... i am checking this bug now

@abzokhattab
Copy link
Contributor Author

This issue exists in the main branch so the current changes didn't introduce this bug .. this is another bug:

Screen.Recording.2024-07-03.at.4.22.40.PM.mov

from my testing, i see that Intl.NumberFormat is not always consistent .. sometimes it adds the decimal zeros and others not.

@dangrous
Copy link
Contributor

dangrous commented Jul 4, 2024

@shubham1206agra can you confirm that that particular bug already exists on main? If so we can move forward with this and report that separately (if it's the only remaining issue)

@shubham1206agra
Copy link
Contributor

This is actually being handled by @eVoloshchak, not me.

@dangrous
Copy link
Contributor

dangrous commented Jul 4, 2024

oops sorry! @eVoloshchak same question - can you confirm that that particular bug already exists on main? If so we can move forward with this and report that separately (if it's the only remaining issue)

@dangrous dangrous removed the request for review from shubham1206agra July 5, 2024 09:40
@eVoloshchak
Copy link
Contributor

Can confirm the issue is present on staging, moving forward with the checklist

Copy link
Contributor

@eVoloshchak eVoloshchak left a comment

Choose a reason for hiding this comment

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

LGTM!

Copy link

melvin-bot bot commented Jul 7, 2024

We did not find an internal engineer to review this PR, trying to assign a random engineer to #43215 as well as to this PR... Please reach out for help on Slack if no one gets assigned!

@dangrous dangrous self-requested a review July 8, 2024 08:50
Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

Seems pretty simplified (great!) as long as it tests well. One note about params but then I think we should be good!

@@ -96,11 +96,11 @@ function convertToFrontendAmountAsInteger(amountAsInt: number): number {
*
* @note we do not support any currencies with more than two decimal places.
*/
function convertToFrontendAmountAsString(amountAsInt: number | null | undefined): string {
function convertToFrontendAmountAsString(amountAsInt: number | null | undefined, currency?: string): string {
Copy link
Contributor

@dangrous dangrous Jul 8, 2024

Choose a reason for hiding this comment

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

currency shouldn't be optional, right? Else L103 will break...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah we can make it as required.

Done

@dangrous
Copy link
Contributor

dangrous commented Jul 8, 2024

great, thanks! @eVoloshchak do you want to give this one final look and test? And make sure we updated any usages as necessary to include currency. Thanks!

@eVoloshchak
Copy link
Contributor

I'm late, apologies. @abzokhattab, could you resolve the conflicts please?

@dangrous
Copy link
Contributor

bump @abzokhattab - can you please handle the conflicts (and @eVoloshchak the final test) so we can get this out today?

@abzokhattab
Copy link
Contributor Author

Seems like most of the current changes were already done in this PR

i resolved the conflicts

Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

Okay sorry - now that the rest of the code is updated, and has the default value for currency, we no longer need this to be required. So it looks like the only actual change we need is adding shouldKeepUserInput to IOURequestStepAmount.

I'm curious - why is that other PR so similar to this one? Did they use your work?

src/components/MoneyRequestAmountInput.tsx Outdated Show resolved Hide resolved
src/components/MoneyRequestAmountInput.tsx Outdated Show resolved Hide resolved
abzokhattab and others added 2 commits July 16, 2024 17:41
Co-authored-by: Daniel Gale-Rosen <5487802+dangrous@users.noreply.github.com>
Co-authored-by: Daniel Gale-Rosen <5487802+dangrous@users.noreply.github.com>
@abzokhattab
Copy link
Contributor Author

So it looks like the only actual change we need is adding shouldKeepUserInput to IOURequestStepAmount.

yeah, i enabled it to make the Pay flow the same as submit, split and others ...

I'm curious - why is that other PR so similar to this one? Did they use your work?

I don't really know 😂 ... maybe a coincidence

Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

looks fine!

@dangrous
Copy link
Contributor

@eVoloshchak if you want to give it last looks we should be all set!

Copy link
Contributor

@eVoloshchak eVoloshchak left a comment

Choose a reason for hiding this comment

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

Tests well!

@melvin-bot melvin-bot bot requested a review from dangrous July 17, 2024 13:03
Copy link
Contributor

@dangrous dangrous left a comment

Choose a reason for hiding this comment

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

woohoo!

@dangrous dangrous merged commit a129673 into Expensify:main Jul 17, 2024
16 checks passed
@OSBotify
Copy link
Contributor

✋ 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

🚀 Deployed to staging by https://github.com/dangrous in version: 9.0.9-1 🚀

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

@OSBotify
Copy link
Contributor

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.9-2 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.9-5 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.10-7 🚀

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.

5 participants