Display Money Request reports as Cards in the chat #20900

Gonals · 2023-06-16T11:52:11Z

Details

Not adding comment/number of request display here, as it will require changes all the way from Auth. I've created an issue for it here

Fixed Issues

$ #20893

Tests

Log into an account in newdot
Start a chat with someone (account B) and click + > Request Money
Follow the process to request money.
Confirm that the request report is displayed like a card in chat:

Log into account B and pay the request. Confirm a green checkmark shows now:

Try again requesting from a workspace, instead of a person. It should work the same.

Verify that no errors appear in the JS console

Offline tests

Not relevant

QA Steps

Same as tests

Verify that no errors appear in the JS console

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 / Chrome
- iOS / native
- iOS / 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 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 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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

melvin-bot · 2023-06-16T11:52:16Z

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

melvin-bot · 2023-06-20T13:23:04Z

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

src/components/ReportActionItem/ReportPreview.js

Gonals · 2023-06-21T09:29:18Z

Comment addressed!

narefyev91 · 2023-06-21T10:48:34Z

src/components/ReportActionItem/ReportPreview.js

+                                {props.iouReport.hasOutstandingIOU ? (
+                                    <Text style={[styles.textLabelSupporting, styles.lh16]}>{props.translate('iou.payerOwes', {payer: managerName})}</Text>
+                                ) : (
+                                    <Text style={[styles.textLabelSupporting, styles.lh16]}>{props.translate('iou.payerPaid', {payer: managerName})}</Text>


suggested change
instead of 2 of Text tag render one like
<Text style={[styles.textLabelSupporting, styles.lh16]}>{props.translate(props.iouReport.hasOutstandingIOU ? 'iou.payerPaid' :'iou.payerPaid' , {payer: managerName})}</Text>

narefyev91 · 2023-06-21T10:51:33Z

src/components/ReportActionItem/ReportPreview.js

-    const managerName = ReportUtils.isPolicyExpenseChat(props.chatReport) ? ReportUtils.getPolicyName(props.chatReport) : ReportUtils.getDisplayNameForParticipant(managerEmail, true);
+    const managerAccountID = props.iouReport.managerID || 0;
+    const managerName =
+        (ReportUtils.isPolicyExpenseChat(props.chatReport) ? ReportUtils.getPolicyName(props.chatReport) : ReportUtils.getDisplayNameForParticipant(managerAccountID, true)) || managerEmail;


do you need () around ReportUtils.isPolicyExpenseChat(props.chatReport)?

Seems like it

narefyev91 · 2023-06-21T11:02:30Z

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

Gonals · 2023-06-21T11:32:18Z

Comments addressed!

Gonals · 2023-07-05T09:37:13Z

Conflicts and lint issues gone!

mountiny

Code changes look good to me, but would like to wait for @narefyev91 to re-test the latest updates if possible.

narefyev91 · 2023-07-05T11:15:07Z

Code changes look good to me, but would like to wait for @narefyev91 to re-test the latest updates if possible.

Tested and updated all results in Review - LGTM!

luacmartins

LGTM! @shawnborton all yours.

shawnborton · 2023-07-05T18:37:57Z

For this screen here:

Can you confirm how much spacing is in between the top line and the amount line and the description/merchant? Ideally there should be 4px gap between them. Then there should be 12px of margin between the button (when there is one) and the last line of text above it.

Gonals · 2023-07-06T08:36:28Z

Ok @shawnborton! I have manually added the 4/12 margins (I wasn't sure what you meant before) and moved the button inside the card (it used to be outside). Current screenshots:

shawnborton · 2023-07-06T12:23:54Z

Much better! Looks like we have some inconsistency between the green checkmarks though. Can you make them both look like this one please:

Gonals · 2023-07-07T09:57:25Z

Much better! Looks like we have some inconsistency between the green checkmarks though. Can you make them both look like this one please:

I actually see that one! 😆

Done:

shawnborton · 2023-07-07T13:39:03Z

Looks good, let's get this thing merged!

OSBotify · 2023-07-07T18:00:11Z

✋ 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-07-11T00:21:10Z

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

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

OSBotify · 2023-07-13T01:45:12Z

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.39-11 🚀

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

Gonals added 4 commits June 16, 2023 13:45

Display IOUs as card

32c17e7

add arrow

f80c5f5

remove extra arrow

aca525e

style

4db3f62

Gonals requested a review from a team as a code owner June 16, 2023 11:52

Gonals self-assigned this Jun 16, 2023

melvin-bot bot requested review from narefyev91 and removed request for a team June 16, 2023 11:52

Gonals added 5 commits June 16, 2023 13:57

prettier

4b76b00

conflicts

5721370

conflicts

6456f1b

import issue

64b4380

fix display

e6b9b7b

Gonals requested a review from a team June 20, 2023 13:23

melvin-bot bot removed the request for review from a team June 20, 2023 13:23

Gonals added 3 commits June 20, 2023 16:02

lint

80cc624

typo

3ea662b

translation

4425403

Gonals changed the title ~~[WIP] Display Money Request reports as Cards in the chat~~ Display Money Request reports as Cards in the chat Jun 21, 2023

narefyev91 reviewed Jun 21, 2023

View reviewed changes

src/components/ReportActionItem/ReportPreview.js Outdated Show resolved Hide resolved

styles

172c7ef

narefyev91 reviewed Jun 21, 2023

View reviewed changes

better syntax

34d5f7c

prettier

6f79bb7

Gonals added 2 commits July 5, 2023 11:06

conflicts

7591fc8

remove unneeded imports

392f9d8

Gonals dismissed mountiny’s stale review via 392f9d8 July 5, 2023 09:06

remove map

777c1fa

mountiny previously approved these changes Jul 5, 2023

View reviewed changes

mountiny requested a review from luacmartins July 5, 2023 10:26

luacmartins previously approved these changes Jul 5, 2023

View reviewed changes

styles

e45ae49

Gonals dismissed stale reviews from luacmartins and mountiny via e45ae49 July 6, 2023 08:33

Merge branch 'main' into alberto-card

e68594b

checkmark style

7f02e90

shawnborton approved these changes Jul 7, 2023

View reviewed changes

luacmartins merged commit 28561c3 into main Jul 7, 2023

luacmartins deleted the alberto-card branch July 7, 2023 17:56

luacmartins mentioned this pull request Jul 10, 2023

Optimistic report previews #21578

Merged

57 tasks

OSBotify mentioned this pull request Jul 10, 2023

Deploy Checklist: New Expensify 2023-07-10 #22598

Closed

76 tasks

StevenKKC mentioned this pull request Jul 11, 2023

[$1000] Web - Owed information is wrong when sending money request between accounts #22197

Closed

6 tasks

melvin-bot bot mentioned this pull request Jul 13, 2023

[HOLD for payment 2023-07-20] Display money request reports as a card in the chat report #20893

Closed

hungvu193 mentioned this pull request Jul 13, 2023

[$1000] Request Money: The name doesn’t update dynamically on a new workspace chat #19847

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Display Money Request reports as Cards in the chat #20900

Display Money Request reports as Cards in the chat #20900

Gonals commented Jun 16, 2023 •

edited

Loading

melvin-bot bot commented Jun 16, 2023

melvin-bot bot commented Jun 20, 2023

Gonals commented Jun 21, 2023

narefyev91 Jun 21, 2023 •

edited

Loading

narefyev91 Jun 21, 2023

Gonals Jun 21, 2023

narefyev91 commented Jun 21, 2023 •

edited

Loading

Gonals commented Jun 21, 2023

Gonals commented Jul 5, 2023

mountiny left a comment

narefyev91 commented Jul 5, 2023

luacmartins left a comment

shawnborton commented Jul 5, 2023 •

edited

Loading

Gonals commented Jul 6, 2023

shawnborton commented Jul 6, 2023

Gonals commented Jul 7, 2023

shawnborton commented Jul 7, 2023

OSBotify commented Jul 7, 2023

OSBotify commented Jul 11, 2023

OSBotify commented Jul 13, 2023

Display Money Request reports as Cards in the chat #20900

Display Money Request reports as Cards in the chat #20900

Conversation

Gonals commented Jun 16, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 16, 2023

melvin-bot bot commented Jun 20, 2023

Gonals commented Jun 21, 2023

narefyev91 Jun 21, 2023 • edited Loading

Choose a reason for hiding this comment

narefyev91 Jun 21, 2023

Choose a reason for hiding this comment

Gonals Jun 21, 2023

Choose a reason for hiding this comment

narefyev91 commented Jun 21, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

Gonals commented Jun 21, 2023

Gonals commented Jul 5, 2023

mountiny left a comment

Choose a reason for hiding this comment

narefyev91 commented Jul 5, 2023

luacmartins left a comment

Choose a reason for hiding this comment

shawnborton commented Jul 5, 2023 • edited Loading

Gonals commented Jul 6, 2023

shawnborton commented Jul 6, 2023

Gonals commented Jul 7, 2023

shawnborton commented Jul 7, 2023

OSBotify commented Jul 7, 2023

OSBotify commented Jul 11, 2023

OSBotify commented Jul 13, 2023

Gonals commented Jun 16, 2023 •

edited

Loading

narefyev91 Jun 21, 2023 •

edited

Loading

narefyev91 commented Jun 21, 2023 •

edited

Loading

shawnborton commented Jul 5, 2023 •

edited

Loading