Invert amount money request amount from negative to positive and vice-versa by mollfpr · Pull Request #18783 · Expensify/App

mollfpr · 2023-05-11T17:13:49Z

Details

Transaction amounts for Expense reports are stored as negative values in the database. This is because there are instances where you can get a credit back on your card, or you enter a negative expense to “offset” future expenses. So in theory, the total of your expenseReport could be a negative.

Based on the information, the negative values for the Expense report total will be displayed as a positive values and vice-versa. For the IOU report total remains the same.

In building the Expense report optimistic data, the total amount should be negative too.

Also, in the IOU actions we should subtract the total for the Expense report when requesting money. In this way, we will not see the total reduced for a few seconds before getting the correct total from the database.

Screen.Recording.2023-05-11.at.22.06.44.mov

Fixed Issues

$ #18749

Tests

Prerequisite

Use a new account in NewDot and create a new workspace, this will make the test easier to see the report on LHN
Set the API to using the Staging API by the Settings -> Preference -> Use Staging Server

Go to the workspace report
Request money using the action menu item
Put any amount
Submit the requested money
Verify that the IOU preview is shown with a positive amount
Verify that the amount on the Expense report that just added in LHN has a positive amount
Navigate to the Expense report that just added
Verify that the report header shows a positive amount
Back to the workspace report and do request money again
Verify again step 5, 6, and 8

Verify that no errors appear in the JS console

Offline tests

Same as the Tests

QA Steps

Same as the Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

18749.Web.mov

Mobile Web - Chrome

18749.mWeb.Chrome.mov

Mobile Web - Safari

18749.mWeb.Safari.mp4

Desktop

18749.Desktop.mov

iOS

18749.iOS.mp4

Android

18749.Android.mov

melvin-bot · 2023-05-11T17:13:54Z

@luacmartins @sobitneupane One of you needs to 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]

mollfpr · 2023-05-12T08:40:25Z

The OpenReport API response seems to be missing the total value.

luacmartins

One last comment

luacmartins · 2023-05-12T08:58:21Z

+        if (moneyRequestReport) {
+            return moneyRequestReport.total;
+        }


Is this right? Don't we still want to run the logic below for moneyRequestReports?

Ahh yes. You're right!

luacmartins · 2023-05-12T09:00:33Z

The OpenReport API response seems to be missing the total value.

@mollfpr we are aware and working on it here. Thanks for pointing that out though!

luacmartins · 2023-05-12T09:09:42Z

I see some unit tests failing too

luacmartins · 2023-05-12T09:24:29Z

@mollfpr unit tests are failing

mollfpr · 2023-05-12T09:33:45Z

@luacmartins Fixed the failing Jest!

luacmartins · 2023-05-12T09:35:00Z

@mollfpr conflicts 😢

mollfpr · 2023-05-12T09:39:31Z

Minor conflict fixed 🚀

luacmartins · 2023-05-12T09:45: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 / Chrome
- iOS / native
- iOS / 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(themeColors.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 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

Adding only Web

Web

Screen.Recording.2023-05-12.at.1.16.45.PM.mov

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

luacmartins · 2023-05-12T09:51:29Z

@mollfpr can we update this new line too? The ReportPreview is showing the wrong amount

App/src/components/ReportActionItem/ReportPreview.js

Line 90 in 4905557

    
           const reportAmount = CurrencyUtils.convertToDisplayString(props.iouReport.total, props.iouReport.currency);

mollfpr · 2023-05-12T09:52:43Z

@luacmartins Great find! Yes, we can use the getMoneyRequestTotal for that.

OSBotify · 2023-05-12T10:24:27Z

✋ 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 · 2023-05-15T09:19:53Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.14-0 🚀

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

OSBotify · 2023-05-17T00:19:43Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.14-14 🚀

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

aldo-expensify · 2023-08-01T02:20:46Z

        state: CONST.REPORT.STATE.SUBMITTED,
        stateNum: CONST.REPORT.STATE_NUM.PROCESSING,


Lol, the state and stateNum set optimistically are not the same

I think we are not really using state, are we?

Wrong PR to leave this comment

mollfpr added 3 commits May 11, 2023 23:50

update the expense reports optimistic data

fa59b16

new method to returns money request amount based on the type

17d9e06

get the correct amount of money request

85ce825

mollfpr requested a review from a team as a code owner May 11, 2023 17:13

melvin-bot Bot requested review from luacmartins and removed request for a team May 11, 2023 17:13

melvin-bot Bot requested a review from sobitneupane May 11, 2023 17:13

luacmartins requested changes May 11, 2023

View reviewed changes

Comment thread src/components/MoneyRequestHeader.js Outdated

Comment thread src/libs/ReportUtils.js Outdated

Comment thread src/libs/actions/IOU.js Outdated

Comment thread src/libs/ReportUtils.js Outdated

Comment thread src/libs/actions/IOU.js

trjExpensify assigned mollfpr May 11, 2023

mollfpr added 5 commits May 12, 2023 15:21

use currency utils instead

9db047c

move the negates to build optimistic method

0414068

return early to prevent the negates 0

138cfa8

rename getIOUTotal to getMoneyRequestTotal

5b329ec

use getMoneyRequestTotal

5d74a9d

make the amount absolute

a1f6a83

luacmartins reviewed May 12, 2023

View reviewed changes

update logic to get money request total

572bff6

luacmartins previously approved these changes May 12, 2023

View reviewed changes

fix sidebar order tests

e18a6f5

mollfpr dismissed luacmartins’s stale review via e18a6f5 May 12, 2023 09:31

Merge branch 'main' of https://github.com/mollfpr/App into mollfpr-18749

4905557

luacmartins previously approved these changes May 12, 2023

View reviewed changes

update report preview to use getMoneyRequestTotal

1698b54

mollfpr dismissed luacmartins’s stale review via 1698b54 May 12, 2023 09:54

mollfpr requested a review from luacmartins May 12, 2023 09:56

luacmartins approved these changes May 12, 2023

View reviewed changes

luacmartins merged commit d76e066 into Expensify:main May 12, 2023

trjExpensify mentioned this pull request May 13, 2023

[$1000] [HOLD for payment 2023-05-25] After send money it will show "$0.00" in preview card #18881

Closed

6 tasks

luacmartins mentioned this pull request May 14, 2023

Standardize on CurrencyUtils.convertToDisplayString #18784

Closed

57 tasks

OSBotify mentioned this pull request May 15, 2023

Deploy Checklist: New Expensify 2023-05-15 #18938

Closed

67 tasks

kbecciv mentioned this pull request May 16, 2023

Chat- Unexpected error when requesting money in Workspace chat #19035

Closed

6 tasks

melvin-bot Bot mentioned this pull request May 16, 2023

[HOLD for payment 2023-05-23] [$1000] [Manual Requests] Ensure correct amount is displayed in the IOUPreview #18749

Closed

aldo-expensify reviewed Aug 1, 2023

View reviewed changes

		state: CONST.REPORT.STATE.SUBMITTED,
		stateNum: CONST.REPORT.STATE_NUM.PROCESSING,

Uh oh!

Conversation

mollfpr commented May 11, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented May 11, 2023

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

mollfpr commented May 12, 2023

Uh oh!

luacmartins left a comment

Choose a reason for hiding this comment

Uh oh!

luacmartins May 12, 2023

Choose a reason for hiding this comment

Uh oh!

mollfpr May 12, 2023

Choose a reason for hiding this comment

Uh oh!

luacmartins commented May 12, 2023

Uh oh!

luacmartins commented May 12, 2023

Uh oh!

luacmartins commented May 12, 2023

Uh oh!

mollfpr commented May 12, 2023

Uh oh!

luacmartins commented May 12, 2023

Uh oh!

mollfpr commented May 12, 2023

Uh oh!

luacmartins commented May 12, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

luacmartins commented May 12, 2023

Uh oh!

mollfpr commented May 12, 2023

Uh oh!

OSBotify commented May 12, 2023

Uh oh!

OSBotify commented May 15, 2023

Uh oh!

OSBotify commented May 17, 2023

Uh oh!

aldo-expensify Aug 1, 2023

Choose a reason for hiding this comment

Uh oh!

aldo-expensify Aug 1, 2023

Choose a reason for hiding this comment

Uh oh!

aldo-expensify Aug 1, 2023

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

luacmartins commented May 12, 2023 •

edited

Loading