Preserve transactions amount in create IOU #40062

abzokhattab · 2024-04-11T02:15:38Z

Details

Fixed Issues

Tests

Verify that no errors appear in the JS console

In the meantime - do you mind updating the tests one more time? Sorry. Since we wrote them, we changed the design of the app so there's no longer a "Request money" option, it's "Submit expense" or "track expense". And the FAB is no longer Floating, though maybe we still call it that?

Test 1:

Go to FAB >> Submit expense
Select Manual
Ensure that the input is not prefilled with 0.00

Test2:

Go to FAB >> Submit expense
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 3

Test3:

Create a random expense report
Open the report and edit the amount so that the last decimal digit is 0 (e.g. 23.20)
Open the report again
Verify the amount is displayed correctly, the last digit is 0

Offline tests

Same as in tests

QA Steps

Verify that no errors appear in the JS console

same as in tests

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-04-11T02:15:43Z

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

abzokhattab · 2024-04-11T02:19:36Z

@dangrous I kept the amount check here and it fixed the zero issue:

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

Line 100 in 894c310

    
           const selectedAmountAsString = amount ? CurrencyUtils.convertToFrontendAmountAsString(amount) : '';

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

Line 142 in 894c310

    
           const frontendAmount = newAmount ? CurrencyUtils.convertToFrontendAmountAsString(newAmount) : '';

Result:

Screen.Recording.2024-04-11.at.4.16.25.AM.mov

dangrous · 2024-04-12T20:26:05Z

@eVoloshchak can you give this a look? Looks like we've got some new merge conflicts too, @abzokhattab

…t-in-the-amount-formm

abzokhattab · 2024-04-15T18:31:29Z

Resolved the conflicts .. please let me know if you have any other comments

eVoloshchak · 2024-04-16T18:11:02Z

I'm too late again, apologies @abzokhattab, could you resolve the conflicts again?

abzokhattab · 2024-04-17T09:55:44Z

oh, okay resolved them :D @eVoloshchak

eVoloshchak · 2024-04-18T20:49:28Z

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

Screen.Recording.2024-04-19.at.00.04.02.mov

Android: mWeb Chrome

Screen.Recording.2024-04-19.at.00.00.34.mov

iOS: Native

Screen.Recording.2024-04-19.at.00.04.45.mov

iOS: mWeb Safari

Screen.Recording.2024-04-19.at.00.02.28.mov

MacOS: Chrome / Safari

Screen.Recording.2024-04-18.at.23.58.34.mov

MacOS: Desktop

Screen.Recording.2024-04-18.at.23.59.25.mov

eVoloshchak

Tests well!

dangrous

Just one question - and now some merge conflicts - then i think we're good.

To note, too - our preserving of user input means that if a user enters 123.2 initially and then goes to the next screen and back, it's still 123.2 which is a little wonky? But as we discussed, we DO want that for 123 (no decimal) so I think it's probably fine. Just wanted to bring it up in case we wanted to discuss.

dangrous · 2024-04-19T14:47:48Z

src/pages/iou/steps/MoneyRequestAmountForm.tsx

@@ -93,7 +97,7 @@ function MoneyRequestAmountForm(
    const isTaxAmountForm = Navigation.getActiveRoute().includes('taxAmount');

    const decimals = CurrencyUtils.getCurrencyDecimals(currency);
-    const selectedAmountAsString = amount ? CurrencyUtils.convertToFrontendAmount(amount).toString() : '';
+    const selectedAmountAsString = amount ? CurrencyUtils.convertToFrontendAmountAsString(amount) : '';


Won't this just return '' if we let the null amount go through?

yes but if the amount is zero the convertToFrontendAmountAsString will return 0.00 which is not wanted.. so i kept that check to return "" in this specific case

abzokhattab · 2024-04-23T04:59:55Z

But as we discussed, we DO want that for 123 (no decimal) so I think it's probably fine. Just wanted to bring it up in case we wanted to discuss it.

that would pass .. if the user enters 123 and goes back it will be the same. as per the requirement here

Screen.Recording.2024-04-23.at.6.58.19.AM.mov

cc @eVoloshchak

abzokhattab · 2024-04-23T05:00:27Z

now some merge conflicts - then i think we're good.

conflicts are now resolved

allgandalf · 2024-04-24T23:48:43Z

@abzokhattab @dangrous @eVoloshchak , I still think that my fix from the issue:

const initializeAmount = useCallback((newAmount) => {
   const frontendAmount = newAmount ? 
       (newAmount.includes('.') ? parseFloat(CurrencyUtils.convertToFrontendAmount(newAmount)).toFixed(2) : CurrencyUtils.convertToFrontendAmount(newAmount)) 
       : '';

Is a lot simpler fix for this issue, @abzokhattab can you test this one please, we need not be making such vast changes, this can possibly be dealt on the FE itself

dangrous · 2024-04-26T17:34:38Z

more merge conflicts unfortunately - @eVoloshchak let us know when you can take a look, and if we can potentially simplify re: @GandalfGwaihir 's thought above (I haven't investigated yet). Thank you!

eVoloshchak · 2024-05-03T16:18:29Z

@GandalfGwaihir, newAmount is Number, it doesn't support .includes() method for it (possibly component was migrated to ts recently?)

I cannot test this due to the above, but looking at the code it seems it doesn't implement the behavior described in #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.

Is that correct?

dangrous · 2024-05-07T14:29:31Z

Bump on this thanks!

src/components/MoneyRequestAmountInput.tsx

src/libs/CurrencyUtils.ts

eVoloshchak · 2024-05-10T15:14:05Z

src/pages/iou/MoneyRequestAmountForm.tsx

@@ -144,7 +148,7 @@ function MoneyRequestAmountForm(
    }, [isFocused, wasFocused]);

    const initializeAmount = useCallback((newAmount: number) => {
-        const frontendAmount = newAmount ? CurrencyUtils.convertToFrontendAmount(newAmount).toString() : '';
+        const frontendAmount = newAmount ? CurrencyUtils.convertToFrontendAmountAsString(newAmount).toString() : '';


Suggested change

const frontendAmount = newAmount ? CurrencyUtils.convertToFrontendAmountAsString(newAmount).toString() : '';

const frontendAmount = CurrencyUtils.convertToFrontendAmountAsString(newAmount);

this suggestion will cause this issue again

Isn't this already handled in convertToFrontendAmountAsString?

if (amountAsInt === null || amountAsInt === undefined) { return ''; }

Not the same:

newAmount ? the question mark here checks if the value is null, undefined and not 0 so in case the value is 0 it goes to the else condition which returns an empty string ""

dangrous · 2024-05-16T15:05:11Z

let us know if you have any questions on @eVoloshchak suggestions, @abzokhattab!

abzokhattab · 2024-05-19T17:13:40Z

let us know if you have any questions on @eVoloshchak suggestions, @abzokhattab!

sorry I missed the notification.

here is the lastest test:

Screen.Recording.2024-05-19.at.7.05.31.PM.mov

eVoloshchak

Re-tested, looking good

dangrous · 2024-05-23T15:18:21Z

This is looking good! One quick question - can we add testing steps to make sure we don't create #39599 and #39537 again? (And did we test for that here too?) Code looks ready to go I think - we're still on our merge "slush" though

eVoloshchak · 2024-05-27T14:22:47Z

@abzokhattab, could you take a look at #40062 (comment) please?
(not urgent since we're in the merge freeze, but will be helpful when we do the final batch of tests on this PR)

…amount-in-the-amount-formm

abzokhattab · 2024-05-28T09:52:49Z

I added another test to ensure that the input is not prefilled with 0.00

I think the PR is ready now

dangrous

Looks good! Holding on the merge for now, though.

In the meantime - do you mind updating the tests one more time? Sorry. Since we wrote them, we changed the design of the app so there's no longer a "Request money" option, it's "Submit expense" or "track expense". And the FAB is no longer Floating, though maybe we still call it that?

Anyways, thanks for your work - and patience - on this!

dangrous · 2024-05-29T14:15:35Z

Merge freeze is off so I think we're good to push this through once the tests are updated as noted above! (To be in line with new UI)

abzokhattab · 2024-05-29T15:58:02Z

done .. just update the test 🎉

dangrous · 2024-05-29T18:28:11Z

Great! But now conflicts 😂

…amount-in-the-amount-formm

abzokhattab · 2024-05-29T19:33:37Z

Lol, this loop never ends 😂

Done .. maybe the last time .. maybe

eVoloshchak · 2024-05-29T20:11:57Z

@abzokhattab, please add one more test from #34894

Create a random expense report

Open the report and edit the amount so that the last decimal digit is 0 (e.g. 23.20)

Open the report again

Verify the amount is displayed correctly, the last digit is 0

abzokhattab · 2024-05-29T21:42:01Z

@eVoloshchak done

dangrous

kk, let's go for it!

OSBotify · 2024-06-04T17:05:25Z

✋ 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 · 2024-06-11T23:31:07Z

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.81-11 🚀

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

Preserve transactions amount in create IOU

894c310

abzokhattab requested a review from a team as a code owner April 11, 2024 02:15

melvin-bot bot requested review from eVoloshchak and removed request for a team April 11, 2024 02:15

abzokhattab mentioned this pull request Apr 11, 2024

[HOLD for payment 2024-07-26][$500] When amending the amount, if the last digit is a 0, we don't show it. #34894

Closed

6 tasks

Merge remote-tracking branch 'origin' into preserve-transaction-amoun…

f52f90f

…t-in-the-amount-formm

fixing types

5f0df22

Merge branch 'main' into preserve-transaction-amount-in-the-amount-formm

16055d6

eVoloshchak approved these changes Apr 18, 2024

View reviewed changes

melvin-bot bot requested a review from dangrous April 18, 2024 22:07

dangrous requested changes Apr 19, 2024

View reviewed changes

Merge branch 'main' into preserve-transaction-amount-in-the-amount-formm

d3ae6e7

abzokhattab requested review from dangrous and eVoloshchak April 23, 2024 05:00

dangrous assigned dangrous and abzokhattab and unassigned dangrous May 7, 2024

eVoloshchak suggested changes May 10, 2024

View reviewed changes

Refactoring

e202ba9

abzokhattab requested a review from eVoloshchak May 22, 2024 11:57

eVoloshchak approved these changes May 23, 2024

View reviewed changes

Merge remote-tracking branch 'origin/main' into preserve-transaction-…

ef90ae2

…amount-in-the-amount-formm

dangrous previously approved these changes May 28, 2024

View reviewed changes

Merge remote-tracking branch 'origin/main' into preserve-transaction-…

22f8224

…amount-in-the-amount-formm

abzokhattab dismissed dangrous’s stale review via 22f8224 May 29, 2024 19:32

abzokhattab requested a review from dangrous May 29, 2024 19:33

eVoloshchak approved these changes May 29, 2024

View reviewed changes

dangrous approved these changes Jun 4, 2024

View reviewed changes

dangrous merged commit 4de7af8 into Expensify:main Jun 4, 2024
18 checks passed

github-actions bot mentioned this pull request Jun 6, 2024

Deploy Checklist: New Expensify 2024-06-06 #43168

Closed

This was referenced Jun 6, 2024

Expense - Inconsistency in showing last digits as 0 when spliting, submitting and paying #43214

Closed

[HOLD for payment 2024-07-26] [$250] Expense- Zeros are added to currency that does not support decimal and unable to delete amount #43215

Closed

luacmartins mentioned this pull request Jun 7, 2024

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

Closed

6 tasks

melvin-bot bot mentioned this pull request Jun 11, 2024

[HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [HOLD for payment 2024-04-15] [HOLD for payment 2024-03-22] [$250] LHN chat row has large spacing #33647

Closed

6 tasks

	const frontendAmount = newAmount ? CurrencyUtils.convertToFrontendAmountAsString(newAmount).toString() : '';
	const frontendAmount = CurrencyUtils.convertToFrontendAmountAsString(newAmount);

Preserve transactions amount in create IOU #40062

Preserve transactions amount in create IOU #40062

Conversation

abzokhattab commented Apr 11, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Apr 11, 2024

abzokhattab commented Apr 11, 2024

dangrous commented Apr 12, 2024

abzokhattab commented Apr 15, 2024

eVoloshchak commented Apr 16, 2024

abzokhattab commented Apr 17, 2024

eVoloshchak commented Apr 18, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eVoloshchak left a comment

Choose a reason for hiding this comment

dangrous left a comment

Choose a reason for hiding this comment

dangrous Apr 19, 2024

Choose a reason for hiding this comment

abzokhattab Apr 23, 2024

Choose a reason for hiding this comment

abzokhattab commented Apr 23, 2024 • edited Loading

abzokhattab commented Apr 23, 2024

allgandalf commented Apr 24, 2024

dangrous commented Apr 26, 2024

eVoloshchak commented May 3, 2024

dangrous commented May 7, 2024

eVoloshchak May 10, 2024

Choose a reason for hiding this comment

abzokhattab May 19, 2024

Choose a reason for hiding this comment

eVoloshchak May 21, 2024

Choose a reason for hiding this comment

abzokhattab May 22, 2024

Choose a reason for hiding this comment

dangrous commented May 16, 2024

abzokhattab commented May 19, 2024 • edited Loading

eVoloshchak left a comment

Choose a reason for hiding this comment

dangrous commented May 23, 2024

eVoloshchak commented May 27, 2024

abzokhattab commented May 28, 2024

dangrous left a comment

Choose a reason for hiding this comment

dangrous commented May 29, 2024

abzokhattab commented May 29, 2024

dangrous commented May 29, 2024

abzokhattab commented May 29, 2024

eVoloshchak commented May 29, 2024

abzokhattab commented May 29, 2024

dangrous left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 4, 2024

OSBotify commented Jun 11, 2024

abzokhattab commented Apr 11, 2024 •

edited

Loading

eVoloshchak commented Apr 18, 2024 •

edited

Loading

abzokhattab commented Apr 23, 2024 •

edited

Loading

abzokhattab commented May 19, 2024 •

edited

Loading