Fix send money show "$0.00" in preview card #18902

mollfpr · 2023-05-14T05:57:01Z

Details

In the report actions list, we use the action data from originalMessage to provide the amount, currency, and comment to pass it to IOUPreview.

For request money and request money paid, the originalMessage has structured {..., amount: ..., currency: ..., comment: ...} but for the send money, the object is put in IOUDetails, so it will be {..., IOUDetails: {amount: ..., currency: ..., comment: ...}}. In this case, the component IOUPreview failed to get the data because it's not expecting it to be in the IOUDetails.

As it's confirmed by @mountiny here that it's the correct structure, we need to make a new utils method to return the {amount: ..., currency: ..., comment: ...} with checking the IOUDetails key if it's provided.

Fixed Issues

$ #18881

Tests

Prerequisite

Provide two accounts in the different browsers or platform
- Account A will be the main account to test, and the ones who request money and get paid
- Account B will be the secondary account that receive the requested money and pays the Account A

Send Money

Open the App with Account A
Go to the global actions button (The big + green button) and select Send money
Put any amount
Search the Account B
Put any description and submit the sent money
Verify that the IOU preview displays the correct amount, currency, and comment with a green checkmark as it's settled

Request Money

Open the App with Account A
Go to the global actions button (The big + green button) and select Request money
Put any amount
Search the Account B
Put any description and submit the request for money
Verify that the IOU preview displays the correct amount, currency, and comment
Open the App with Account B
Find the chat from Account A
Verify that the IOU preview displays the correct amount, currency, and comment that Account A sent
Press the Pay button and press button I'll settle up anywhere to settle the requested money
Verify that the IOU preview still displays the correct amount and currency with a green checkmark as it's settled
Open the App with Account A and open the chat with Account B
Verify that the IOU preview display new action with the correct amount and currency with a green checkmark as it's settled

Verify that no errors appear in the JS console

Offline tests

Send Money Offline

Open the App with Account A
Go to the global actions button (The big + green button) and select Send money
Put any amount
Search the Account B
Put any description and submit the sent money
Verify that the IOU preview is darker and displays the correct amount, currency, and comment with a green checkmark as it's settled

Request Money Offline

Open the App with Account A
Go to the global actions button (The big + green button) and select Request money
Put any amount
Search the Account B
Put any description and submit the request for money
Verify that the IOU preview displays the correct amount, currency, and comment
Open the App with Account B
Find the chat from Account A
Verify that the IOU preview is darker and displays the correct amount, currency, and comment that Account A sent

Requested Money from Account A

Open the App with Account B and find the chat with Account A
Press the Pay button in the IOU preview and press the button I'll settle up anywhere to settle the requested money
Verify that the IOU preview is darker and still displays the correct amount and currency with a green checkmark as it's settled

QA Steps

Same as the Tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

18881.Web.mov

Mobile Web - Chrome

18881.mWeb.Chrome.mp4

Mobile Web - Safari

18881.mWeb.Safari.mp4

Desktop

18881.Desktop.mov

iOS

18881.iOS.mp4

Android

18881.Android.mp4

mountiny

@mollfpr looking good, thanks for working on this over the weekend 🙇 When will this be ready for review?

mountiny · 2023-05-14T12:48:11Z

src/libs/ReportUtils.js

+ * @param {Number} reportAction.amount
+ * @param {String} reportAction.currency
+ * @param {String} reportAction.comment
+ * @param {Object} reportAction.IOUDetails


to make sure its clear its not there every time

Suggested change

* @param {Object} reportAction.IOUDetails

* @param {Object} [reportAction.IOUDetails]

melvin-bot · 2023-05-14T13:03:26Z

@sobitneupane @MonilBhavsar 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-14T13:04:28Z

@luacmartins @mountiny Fix the conflict and address the commented JSDoc.

mountiny · 2023-05-14T13:16:44Z

We get it @luacmartins

mountiny · 2023-05-14T13:30:57Z

@mollfpr we just merged a PR to main which as a merge conflict not, can you please resolve the conflict now, thank you!

luacmartins · 2023-05-14T13:31:12Z

lol Github was being slow so I spammed the button. oops

mollfpr · 2023-05-14T13:31:51Z

Handle it now

mountiny

Thanks @mollfpr

mountiny · 2023-05-14T22:51:33Z

@mollfpr Can you merge in main again, I think that there were some small fixes in the flow

I tested a bit and seems to work fine.

@sobitneupane will you be able to go through the testing on Monday?

mollfpr · 2023-05-15T02:31:13Z

Merged current main

sobitneupane · 2023-05-15T03:05:09Z

@sobitneupane will you be able to go through the testing on Monday?

Yup. I will test it today.

sobitneupane · 2023-05-15T07:38:48Z

@mollfpr I am not seeing IOUPreview at all on Send Money. Can you please test it in your end?

mollfpr · 2023-05-15T07:42:09Z

@sobitneupane Yeah, it's not showing in me either. It's due to changes in here #18898

@mountiny Could you confirm if we intended not to show the IOUPreview on the settled money request?

luacmartins · 2023-05-15T13:58:28Z

@sobitneupane @mollfpr yes that's intentional for deleted and pay messages

mollfpr · 2023-05-15T14:00:16Z

@luacmartins So the issue isn’t valid anymore? 🥲

luacmartins · 2023-05-15T14:27:23Z

@mollfpr Yea, I think we don't need this anymore. Sorry!

mollfpr · 2023-05-15T14:34:21Z

What do you think @mountiny? I think it's okay to close this.

trjExpensify · 2023-05-15T16:30:32Z

In the iouReport view, you would see a preview component wouldn't you? (once we move iouActions to the IOU report directly). So just checking we don't need to still merge this PR such that they don't show $0.00 there?

mountiny · 2023-05-15T16:41:23Z

the created previews will change design but we wont add a new preview for settled up

I actually cant find a mocks of Send money flow so I am not sure cc @trjExpensify

trjExpensify · 2023-05-15T17:28:53Z

the created previews will change design but we wont add a new preview for settled up

Yeah, this is what I'm asking really. Will the preview component below update to $0.00 if it's created via the Send Money flow unless we push this change?

mountiny · 2023-05-15T17:36:22Z

Looking that the send money will still add the create action and then pays it immediately so the preview should show there

mountiny · 2023-05-15T21:51:49Z

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

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

github-actions · 2023-05-15T21:51:55Z

⚠️ ⚠️ Heads up! This pull request has the CP Staging label ⚠️ ⚠️
If you applied the CP Staging label before the PR was merged, the PR will be be immediately deployed to staging even if the open StagingDeployCash deploy checklist is locked.
However if you applied the CP Staging after the PR was merged it's possible it won't be CP'ed automatically. If you need it to be CP'ed to staging, tag a member of @Expensify/mobile-deployers to CP it manually, otherwise you can wait for it to go out with the next deploy.

mountiny · 2023-05-15T21:53:59Z

Shipping this I need it for another PR

mountiny · 2023-05-15T22:00:41Z

src/components/ReportActionItem/IOUPreview.js

-    const requestCurrency = props.isIOUAction ? lodashGet(props.action, 'originalMessage.currency', CONST.CURRENCY.USD) : props.iouReport.currency;
+    const requestAmount = props.isIOUAction ? moneyRequestAction.total : ReportUtils.getMoneyRequestTotal(props.iouReport);
+    const requestCurrency = props.isIOUAction ? moneyRequestAction.currency : props.iouReport.currency;
+    const requestComment = Str.htmlDecode(moneyRequestAction.comment).trim()


Fuuu why did the prettier not catch this 😡

idk but it is creating some major weirdness for me locally. Is anyone fixing it?

mountiny · 2023-05-15T23:12:30Z

This wasnt CPed because of the linter issue so removed the label to make it clear

OSBotify · 2023-05-17T01:08:54Z

🚀 Deployed to staging by https://github.com/mountiny in version: 1.3.15-0 🚀

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

OSBotify · 2023-05-18T06:52:05Z

🚀 Deployed to production by https://github.com/yuwenmemon in version: 1.3.15-12 🚀

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

mollfpr added 2 commits May 14, 2023 12:21

new method to get money request action

0aafe65

use the formatted money request action

9e95b53

mollfpr mentioned this pull request May 14, 2023

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

Closed

6 tasks

mountiny assigned mollfpr May 14, 2023

mountiny previously approved these changes May 14, 2023

View reviewed changes

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

8deb381

mollfpr dismissed mountiny’s stale review via 8deb381 May 14, 2023 13:02

mollfpr marked this pull request as ready for review May 14, 2023 13:02

mollfpr requested a review from a team as a code owner May 14, 2023 13:02

melvin-bot bot requested review from MonilBhavsar and sobitneupane and removed request for a team May 14, 2023 13:03

fix the JSDoc object

7ea9930

luacmartins previously approved these changes May 14, 2023

View reviewed changes

mollfpr dismissed luacmartins’s stale review via 7ea9930 May 14, 2023 13:03

mollfpr requested review from mountiny and luacmartins May 14, 2023 13:04

mollfpr changed the title ~~Fix send money it will show "$0.00" in preview card~~ Fix send money show "$0.00" in preview card May 14, 2023

luacmartins approved these changes May 14, 2023

View reviewed changes

luacmartins previously approved these changes May 14, 2023

View reviewed changes

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

2fd6674

mollfpr dismissed luacmartins’s stale review via 2fd6674 May 14, 2023 13:37

mountiny approved these changes May 14, 2023

View reviewed changes

luacmartins approved these changes May 14, 2023

View reviewed changes

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

8e69ef8

MonilBhavsar approved these changes May 15, 2023

View reviewed changes

Julesssss approved these changes May 15, 2023

View reviewed changes

mountiny mentioned this pull request May 15, 2023

Show IOU preview for send money flow #18981

Merged

57 tasks

mountiny added the CP Staging label May 15, 2023

mountiny merged commit 5b6c8ce into Expensify:main May 15, 2023

mountiny reviewed May 15, 2023

View reviewed changes

mountiny mentioned this pull request May 15, 2023

[NoQA] Fix linter issue #18985

Merged

57 tasks

mountiny removed the CP Staging label May 15, 2023

OSBotify mentioned this pull request May 16, 2023

Deploy Checklist: New Expensify 2023-05-16 #19088

Closed

71 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix send money show "$0.00" in preview card #18902

Fix send money show "$0.00" in preview card #18902

mollfpr commented May 14, 2023

mountiny left a comment

mountiny May 14, 2023

melvin-bot bot commented May 14, 2023

mollfpr commented May 14, 2023

mountiny commented May 14, 2023

mountiny commented May 14, 2023

luacmartins commented May 14, 2023

mollfpr commented May 14, 2023

mountiny left a comment

mountiny commented May 14, 2023

mollfpr commented May 15, 2023

sobitneupane commented May 15, 2023

sobitneupane commented May 15, 2023

mollfpr commented May 15, 2023

luacmartins commented May 15, 2023

mollfpr commented May 15, 2023

luacmartins commented May 15, 2023 •

edited

Loading

mollfpr commented May 15, 2023

trjExpensify commented May 15, 2023

mountiny commented May 15, 2023

trjExpensify commented May 15, 2023

mountiny commented May 15, 2023

mountiny commented May 15, 2023 •

edited

Loading

github-actions bot commented May 15, 2023

mountiny commented May 15, 2023

mountiny May 15, 2023

marcaaron May 15, 2023

mountiny May 15, 2023

mountiny commented May 15, 2023

OSBotify commented May 17, 2023

OSBotify commented May 18, 2023

	* @param {Object} reportAction.IOUDetails
	* @param {Object} [reportAction.IOUDetails]

Fix send money show "$0.00" in preview card #18902

Fix send money show "$0.00" in preview card #18902

Conversation

mollfpr commented May 14, 2023

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

mountiny left a comment

Choose a reason for hiding this comment

mountiny May 14, 2023

Choose a reason for hiding this comment

melvin-bot bot commented May 14, 2023

mollfpr commented May 14, 2023

mountiny commented May 14, 2023

mountiny commented May 14, 2023

luacmartins commented May 14, 2023

mollfpr commented May 14, 2023

mountiny left a comment

Choose a reason for hiding this comment

mountiny commented May 14, 2023

mollfpr commented May 15, 2023

sobitneupane commented May 15, 2023

sobitneupane commented May 15, 2023

mollfpr commented May 15, 2023

luacmartins commented May 15, 2023

mollfpr commented May 15, 2023

luacmartins commented May 15, 2023 • edited Loading

mollfpr commented May 15, 2023

trjExpensify commented May 15, 2023

mountiny commented May 15, 2023

trjExpensify commented May 15, 2023

mountiny commented May 15, 2023

mountiny commented May 15, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

github-actions bot commented May 15, 2023

mountiny commented May 15, 2023

mountiny May 15, 2023

Choose a reason for hiding this comment

marcaaron May 15, 2023

Choose a reason for hiding this comment

mountiny May 15, 2023

Choose a reason for hiding this comment

mountiny commented May 15, 2023

OSBotify commented May 17, 2023

OSBotify commented May 18, 2023

luacmartins commented May 15, 2023 •

edited

Loading

mountiny commented May 15, 2023 •

edited

Loading