Corrected Currency Display: Enforce Two Decimal Places in Amounts #35797

abzokhattab · 2024-02-05T08:39:32Z

Details

Fixed Issues

$ #34894
$ #34894 (comment)

Tests

Verify that no errors appear in the JS console

Navigate to FAB (Floating Action Button)
Select Request Money
Select manual
Enter an amount that has a last decimal digit as 0 (e.g. 23.20)
click on Next > go back using the header back button
Ensure the amount shown to the user is the same as in step 4

Offline tests

Navigate to FAB (Floating Action Button)
Select Request Money
Select manual
Enter an amount that has a last decimal digit as 0 (e.g. 23.20)
click on Next > go back using the header back button
Ensure the amount shown to the user is the same as in step 4

QA Steps

Verify that no errors appear in the JS console

Navigate to FAB (Floating Action Button)
Select Request Money
Select manual
Enter an amount that has a last decimal digit as 0 (e.g. 23.20)
click on Next > go back using the header back button
Ensure the amount shown to the user is the same as in step 4

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-02-02.at.2.15.48.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-02-05.at.10.21.39.AM.mov

iOS: Native

Screen.Recording.2024-02-02.at.2.15.48.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-02-05.at.10.21.39.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-05.at.10.20.36.AM.mov

MacOS: Desktop

Screen.Recording.2024-02-05.at.10.20.59.AM.mov

melvin-bot · 2024-02-05T08:39:38Z

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

eVoloshchak · 2024-02-06T14:08:12Z

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 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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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-03-19-17-19-43.mp4

Android: mWeb Chrome

Screen.Recording.2024-03-19.at.17.36.21.mov

iOS: Native

Screen.Recording.2024-03-19.at.17.24.48.mov

iOS: mWeb Safari

Screen.Recording.2024-03-19.at.17.28.12.mov

MacOS: Chrome / Safari

Screen.Recording.2024-03-19.at.17.39.29.mov

MacOS: Desktop

Screen.Recording.2024-03-19.at.17.22.21.mov

eVoloshchak

Bug:

Open any 1:1 chat
Press '+' button -> Request Money
Enter an amount without the decimal point (i.e. "5")
Click "Next"
Click "Back"
Notice the amount is now "5.00"

Screen.Recording.2024-02-06.at.15.22.18.mov

This is kind of an edge case, this comment explains it well

you're not wrong #34894 (comment), it's not quite consistent, but I think if the user has JUST entered a value, we'd want to maintain it as is, making it easier for the user to fix if needed. This is also how Square Cash and Venmo do it, as a reference.

abzokhattab · 2024-02-06T20:50:21Z

done .. please review the latest change

eVoloshchak · 2024-02-07T13:50:58Z

This is still present
It should work this way for any number, not just for numbers without the decimal point
https://github.com/Expensify/App/assets/9059945/9e1df7c0-d730-4ed8-877f-4d975db2cc06

abzokhattab · 2024-02-09T16:36:55Z

This is still present
It should work this way for any number, not just for numbers without the decimal point
https://github.com/Expensify/App/assets/9059945/9e1df7c0-d730-4ed8-877f-4d975db2cc06

@eVoloshchak why do you consider the case mentioned in the video attached as a bug, i think it makes sense to be converted to 8.90.

the thing is, the amount of the transaction is saved as a number in the server and either you enter 8.90 or 8.9 it will be converted to 8.9 when saving it as a number so what you are requesting requires changing the type of this var to string so that the value is shown as it was entered. this change will need lots of change as well in the frontend since the transaction amount is used in many locations

eVoloshchak · 2024-02-12T17:25:47Z

why do you consider the case mentioned in the video attached as a bug, i think it makes sense to be converted to 8.90

@abzokhattab, this isn't a bug per se, but I agree with this comment

but I think if the user has JUST entered a value, we'd want to maintain it as is, making it easier for the user to fix if needed. This is also how Square Cash and Venmo do it, as a reference.

The key here is we shouldn't change the amount if user JUST entered it. Say, you enter 8.8, click 'Next' and immediatelly come back wanting to change it. If it's immediately converted to 8.80, you have one additional keypress to do (and it's much worse for 8.00)

abzokhattab · 2024-02-12T21:48:18Z

Do you mean that we should only add a new var (amountString) in the transaction optimistic values, which represents the precise amount entered by the user, however, this value will not be saved in the db is that right?

eVoloshchak · 2024-02-14T13:38:03Z

Video below demonstrates the desired behavior
https://github.com/Expensify/App/assets/9059945/460be79a-3b96-4eb5-8b25-dc7f8696e889

Essentially, if you enter an amount, press next and then immediately press 'Back', amount should stay the same.
But if you enter an amount, press next and then press on amount to edit it, it should be displayed with two decimal places

…ctions-amounts-the-same-as-the-user-entered

abzokhattab · 2024-02-18T21:35:08Z

Okay, i removed the logic that updates the amount on clicking on next below:

https://github.com/Expensify/App/blob/39b575c6af3c1442e9452aadbb79b403b40964e6/src/pages/iou/steps/MoneyRequestAmountForm.js#L240-#L243

but this will cause this issue again as a regression, so if we are fine with that we can move forward.

here the result:

Screen.Recording.2024-02-18.at.11.31.13.PM.mov

eVoloshchak · 2024-02-21T19:07:23Z

@abzokhattab, this doesn't seem to work correctly, I can still see the same bug

Screen.Recording.2024-02-21.at.20.06.12.mov

…ctions-amounts-the-same-as-the-user-entered

abzokhattab · 2024-02-22T12:05:48Z

@eVoloshchak okay done

please be aware that this change will cause those issues, if we are fine with this new approach then we can discard them
#33125 #33123 #30505

eVoloshchak · 2024-02-28T21:24:52Z

@abzokhattab, took a look at #33125 #33123 #30505, we're definitely don't want those issues to come back
Let's look for another approach

…ctions-amounts-the-same-as-the-user-entered

abzokhattab · 2024-02-29T14:35:57Z

do you have any idea in mind, I agree that we shouldn't bring them back,

the problem is with this useEffect which updates the amount whenever the value changes

App/src/pages/iou/steps/MoneyRequestAmountForm.tsx

Lines 129 to 136 in 104565b

    
           useEffect(() => { 
        
               if (!currency || typeof amount !== 'number') { 
        
                   return; 
        
               } 
        
               initializeAmount(amount); 
        
               // we want to re-initialize the state only when the selected tab or amount changes 
        
               // eslint-disable-next-line react-hooks/exhaustive-deps 
        
           }, [selectedTab, amount]);

however, i think we shouldn't remove it , let me know if you have any approach in mind or what should we do in this case.

Thanks @eVoloshchak

abzokhattab · 2024-03-03T15:19:08Z

kindly reminder @eVoloshchak

abzokhattab · 2024-03-28T15:52:47Z

@dangrous okay i added some tests for the edge cases ... please let me now if you have any other comments.

dangrous

One minor change just to make typescript happy!

tests/unit/CurrencyUtilsTest.ts

dangrous

cool, this looks good to me!

dangrous · 2024-04-01T18:07:38Z

aw shoot, I was slow - can you update the merge conflicts @abzokhattab? Then we should be good to go

…ctions-amounts-the-same-as-the-user-entered

abzokhattab · 2024-04-01T21:06:28Z

There we go @dangrous

dangrous · 2024-04-02T15:38:29Z

arggghhh sorry. One more time? I'll keep this tab open so it hopefully doesn't happen again

…ctions-amounts-the-same-as-the-user-entered

abzokhattab · 2024-04-02T22:24:05Z

arggghhh sorry. One more time? I'll keep this tab open so it hopefully doesn't happen again

😂😂😂😂 hopefully this is the last time.

dangrous

Let's do it!

OSBotify · 2024-04-03T17:02:09Z

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

iwiznia · 2024-04-04T15:09:48Z

Reverting due to #39599

OSBotify · 2024-04-08T10:53:53Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.60-13 🚀

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

Corrected Currency Display: Enforce Two Decimal Places in Amounts

2169530

abzokhattab requested a review from a team as a code owner February 5, 2024 08:39

melvin-bot bot requested review from eVoloshchak and removed request for a team February 5, 2024 08:39

eVoloshchak reviewed Feb 6, 2024

View reviewed changes

fix the case where there is no decimal value passed

72d282f

abzokhattab requested a review from eVoloshchak February 6, 2024 20:50

abzokhattab added 2 commits February 6, 2024 22:50

cleaning

8e80ffb

fixing tests

8315492

Merge remote-tracking branch 'origin/main' into preserving-the-transa…

bf046e2

…ctions-amounts-the-same-as-the-user-entered

abzokhattab added 2 commits February 18, 2024 23:35

keeping the user input when clicking next

65f90db

Fixing tests

3fa6bb9

abzokhattab added 2 commits February 22, 2024 13:58

Merge remote-tracking branch 'origin/main' into preserving-the-transa…

45013c3

…ctions-amounts-the-same-as-the-user-entered

Removing the amount from the useEffect dependencies

6c40f80

minor change

c9614cc

Merge remote-tracking branch 'origin/main' into preserving-the-transa…

bd68682

…ctions-amounts-the-same-as-the-user-entered

abzokhattab requested a review from dangrous March 28, 2024 15:53

dangrous requested changes Mar 28, 2024

View reviewed changes

tests/unit/CurrencyUtilsTest.ts Outdated Show resolved Hide resolved

minor edit

89d4d77

abzokhattab requested a review from dangrous March 29, 2024 17:57

dangrous reviewed Apr 1, 2024

View reviewed changes

dangrous previously approved these changes Apr 1, 2024

View reviewed changes

abzokhattab dismissed dangrous’s stale review via 4d26474 April 1, 2024 20:56

abzokhattab force-pushed the preserving-the-transactions-amounts-the-same-as-the-user-entered branch from 4d26474 to 89d4d77 Compare April 1, 2024 20:59

Merge remote-tracking branch 'origin/main' into preserving-the-transa…

ad1507b

…ctions-amounts-the-same-as-the-user-entered

abzokhattab requested a review from dangrous April 1, 2024 21:06

Merge remote-tracking branch 'origin/main' into preserving-the-transa…

d4b3764

…ctions-amounts-the-same-as-the-user-entered

dangrous approved these changes Apr 3, 2024

View reviewed changes

dangrous merged commit 4fcd8a1 into Expensify:main Apr 3, 2024
15 checks passed

Nodebrute mentioned this pull request Apr 3, 2024

[HOLD for payment 2024-04-15] DEV: In the Request money modal amount is prefilled with 0.00 #39537

Closed

6 tasks

github-actions bot mentioned this pull request Apr 4, 2024

[INCORRECT] (used to be a checklist but was incorrectly triggered) #39573

Closed

44 tasks

mountiny mentioned this pull request Apr 4, 2024

Deploy Checklist: New Expensify 2024-04-04 #39588

Closed

48 tasks

eVoloshchak mentioned this pull request Apr 4, 2024

Revert "35797-preserving-the-transactions-amounts-the-same-as-entered" #39610

Merged

48 tasks

nkdengineer mentioned this pull request Apr 5, 2024

[HOLD for payment 2024-04-15] [$250] Taxes - Transaction thread shows skeleton loading when saving 0.00 tax amount for second time #39701

Closed

6 tasks

abzokhattab mentioned this pull request Apr 24, 2024

Preserve transactions amount in create IOU #40062

Merged

58 tasks

abzokhattab mentioned this pull request Jun 15, 2024

[$250] Expense - Leading zeros are not removed when returning to amount input page #43243

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Corrected Currency Display: Enforce Two Decimal Places in Amounts #35797

Corrected Currency Display: Enforce Two Decimal Places in Amounts #35797

abzokhattab commented Feb 5, 2024

melvin-bot bot commented Feb 5, 2024

eVoloshchak commented Feb 6, 2024 •

edited

Loading

eVoloshchak left a comment

abzokhattab commented Feb 6, 2024

eVoloshchak commented Feb 7, 2024

abzokhattab commented Feb 9, 2024 •

edited

Loading

eVoloshchak commented Feb 12, 2024

abzokhattab commented Feb 12, 2024

eVoloshchak commented Feb 14, 2024

abzokhattab commented Feb 18, 2024 •

edited

Loading

eVoloshchak commented Feb 21, 2024

abzokhattab commented Feb 22, 2024 •

edited

Loading

eVoloshchak commented Feb 28, 2024

abzokhattab commented Feb 29, 2024

abzokhattab commented Mar 3, 2024

abzokhattab commented Mar 28, 2024

dangrous left a comment

dangrous left a comment

dangrous commented Apr 1, 2024

abzokhattab commented Apr 1, 2024

dangrous commented Apr 2, 2024

abzokhattab commented Apr 2, 2024

dangrous left a comment

OSBotify commented Apr 3, 2024

iwiznia commented Apr 4, 2024

OSBotify commented Apr 8, 2024

Corrected Currency Display: Enforce Two Decimal Places in Amounts #35797

Corrected Currency Display: Enforce Two Decimal Places in Amounts #35797

Conversation

abzokhattab commented Feb 5, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 5, 2024

eVoloshchak commented Feb 6, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eVoloshchak left a comment

Choose a reason for hiding this comment

abzokhattab commented Feb 6, 2024

eVoloshchak commented Feb 7, 2024

abzokhattab commented Feb 9, 2024 • edited Loading

eVoloshchak commented Feb 12, 2024

abzokhattab commented Feb 12, 2024

eVoloshchak commented Feb 14, 2024

abzokhattab commented Feb 18, 2024 • edited Loading

eVoloshchak commented Feb 21, 2024

abzokhattab commented Feb 22, 2024 • edited Loading

eVoloshchak commented Feb 28, 2024

abzokhattab commented Feb 29, 2024

abzokhattab commented Mar 3, 2024

abzokhattab commented Mar 28, 2024

dangrous left a comment

Choose a reason for hiding this comment

dangrous left a comment

Choose a reason for hiding this comment

dangrous commented Apr 1, 2024

abzokhattab commented Apr 1, 2024

dangrous commented Apr 2, 2024

abzokhattab commented Apr 2, 2024

dangrous left a comment

Choose a reason for hiding this comment

OSBotify commented Apr 3, 2024

iwiznia commented Apr 4, 2024

OSBotify commented Apr 8, 2024

eVoloshchak commented Feb 6, 2024 •

edited

Loading

abzokhattab commented Feb 9, 2024 •

edited

Loading

abzokhattab commented Feb 18, 2024 •

edited

Loading

abzokhattab commented Feb 22, 2024 •

edited

Loading