Design clean-up and consistency across expense reports and requests #26603

mountiny · 2023-09-03T11:59:09Z

Details

The app has several inaccuracies for previewing a description and merchant of expense reports and expense requests. Also, we are fixing the whisper effect on messages and removing right carets form all report and request previews.
NOTE: the initial proposal has more items to implement, but not all of them were decided to fix. Please read the "Tests" block below to check all fixed scenarios.

Fixed Issues

$ #26138
PROPOSAL: #26138 (comment)

Tests

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

Open any workspace chat.
Request any type/amount of money requests.
Verify that there is no any right carets.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

Open any workspace chat.
Request default cash requests with/without description.
Verify that there is no merchant on requests.
Verify there is a description on requests where you've added it.

3. When a merchant name exists for an expense / request preview, we only show the merchant.

Open any workspace chat.
Request a scan receipt requests with/without description.
Verify that there is no description on requests.
Verify there is a merchant on requests.

4. Normal "Cash" requests are missing the `X requests` logic.

Open any workspace chat.
Request a few times default cash requests.
Verify that starts from 2+ requests, there is a counter.

5. Receipt whisper cards are no visible when they are inside "Only visible for you" message.

Open any workspace chat.
Request a receipt request.
Verify that their cards are contrast with the background.

6. (none) is showing as a merchant for receipts being scanned

Open any workspace chat.
Request a receipt request without customizing the merchant
Verify that the card does not show (none) as a merchant
Click into the detail of the request
Verify the Merchant is (none)

7. Rounded bottom corners of the images in the report preview

Open any workspace chat.
Make a distance or receipt request
Verify that the report preview and the request preview inside the expense report has bottom corners rounded as well

8. On Report Preview for requests made to Saastr or SBE workspaces, there is no user email in the workspace name

Open workspace chat with SaaStr or SBE workspace
Make a request to such workspace
Verify that the message says SBE owes $xx.xx or SaaStr owes $xx.xx and there is no email prepending the SBE

Verify that no errors appear in the JS console

Offline tests

Same as "Tests"

QA Steps

Same as "Tests"

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the `X requests` logic.

5. Cards are no visible when they are inside "Only visible for you" message.

6. (none) is not showing for the smartscanning receipts

7. Rounded bottom corners of the images in the report preview

8. On Report Preview for requests made to Saastr or SBE workspaces, there is no user email in the workspace name

Mobile Web - Chrome

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the `X requests` logic.

5. Cards are no visible when they are inside "Only visible for you" message.

Mobile Web - Safari

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the `X requests` logic.

5. Cards are no visible when they are inside "Only visible for you" message.

Desktop

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the `X requests` logic.

5. Cards are no visible when they are inside "Only visible for you" message.

iOS

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the `X requests` logic.

5. Cards are no visible when they are inside "Only visible for you" message.

Android

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the `X requests` logic.

5. Cards are no visible when they are inside "Only visible for you" message.

…/26138-design-clean-up-report-request

This reverts commit 5e66460.

…/26138-design-clean-up-report-request

situchan · 2023-09-03T12:16:43Z

I see @rezkiy37 raised PR already. Is it different purpose?

melvin-bot · 2023-09-03T12:34:39Z

@shawnborton @rushatgabhane @luacmartins 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]

mountiny · 2023-09-03T19:18:05Z

Not from this PR, but I can do endless payment with $0. After click Pay elsewhere, it says paid and then Pay button reappears. This is repeated

So this is an admin on its own workspace right?

I think this will be because the smartscans are not valid and we dont handle the errors well. Its not critical for the conference

mountiny · 2023-09-03T19:28:21Z

Pushed in some small clean up I missed before

situchan · 2023-09-04T04:58:22Z

This is super minor but it looks nicer when image border color is same as bottom background when hovered (or whisper) so that it feels image is fully inside card view

Screen.Recording.2023-09-04.at.10.54.51.AM.mov

situchan · 2023-09-04T05:04:31Z

Tests

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

web1.mov

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

web2.mov

3. When a merchant name exists for an expense / request preview, we only show the merchant.

web3.mov

4. Normal "Cash" requests are missing the `X requests` logic.

web4.mov

5. Receipt whisper cards are no visible when they are inside "Only visible for you" message.

web5.mov

6. (none) is showing as a merchant for receipts being scanned

web6.mov

7. Rounded bottom corners of the images in the report preview

web7.mov

8. On Report Preview for requests made to Saastr or SBE workspaces, there is no user email in the workspace name

situchan · 2023-09-04T05:52:35Z

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

#26603 (comment)

Mobile Web - Chrome

mchrome.mov

Mobile Web - Safari

msafari.mov

Desktop

desktop.mov

iOS

ios.mov

Android

android.mov

situchan · 2023-09-04T05:55:16Z

Bug: [mobile] hover flickering on long-press (happening on main)

Screen.Recording.2023-09-04.at.11.53.15.AM.mov

situchan

Julesssss

Tests well for me 👍

OSBotify · 2023-09-04T10:54:19Z

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

shawnborton · 2023-09-04T12:36:11Z

Something still feels off here... the corners of the receipt don't feel very crisp:

I also wanted to confirm that the inner border on those receipt images is 4px?

OSBotify · 2023-09-04T16:49:46Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.63-0 🚀

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

OSBotify · 2023-09-05T18:42:21Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.63-2 🚀

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

OSBotify · 2023-09-05T19:12:44Z

🚀 Deployed to staging by https://github.com/Julesssss in version: 1.3.64-0 🚀

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

OSBotify · 2023-09-06T18:55:19Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.64-2 🚀

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

allroundexperts · 2023-11-26T21:45:45Z

src/components/ReportActionItem/MoneyRequestPreview.js

+    // Show the merchant for IOUs and expenses only if they are custom or not related to scanning smartscan
+    const shouldShowMerchant =
+        !_.isEmpty(requestMerchant) && !props.isBillSplit && requestMerchant !== CONST.TRANSACTION.PARTIAL_TRANSACTION_MERCHANT && requestMerchant !== CONST.TRANSACTION.DEFAULT_MERCHANT;
+    const shouldShowDescription = !_.isEmpty(description) && !shouldShowMerchant;


We should have checked if the receipt was not being scanned here. Not doing so caused #31104.

Okay, thank you for letting me know. AFAIK, the bug already fixed.

rezkiy37 and others added 18 commits August 30, 2023 14:45

remove caret of report/money preview

840c7be

hide marchant for iou preview

06be8ff

improve showing description and merchant

1f4d975

improve description hiding

f321566

fix twice merchant for distance request

7cdcc72

partly fix remaining counter position

5e66460

enable counter for normal cash requests

88792f1

pass isWhisper to ReportPreview

8bcad7c

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…

4c033c1

…/26138-design-clean-up-report-request

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…

2a8f0bc

…/26138-design-clean-up-report-request

tweak show merchant condition

78a0104

Revert "partly fix remaining counter position"

1b16e09

This reverts commit 5e66460.

fix usage of whisper var

aaac5b5

Merge branch 'main' of https://github.com/rezkiy37/Expensify into fix…

7daf4aa

…/26138-design-clean-up-report-request

fix whisper effect of MoneyRequestPreview

ec2d986

change order of arguments

a8f5cec

Merge branch 'main' into vit-26503theft

3d3950a

Improve the shouldShowMerchant logic

ed07c38

mountiny self-assigned this Sep 3, 2023

mountiny requested a review from situchan September 3, 2023 12:13

mountiny marked this pull request as ready for review September 3, 2023 12:34

mountiny requested a review from a team as a code owner September 3, 2023 12:34

melvin-bot bot requested review from luacmartins, rushatgabhane and shawnborton and removed request for a team September 3, 2023 12:34

mountiny added 2 commits September 3, 2023 20:41

Add bottom rounded corners

8c53c60

Merge branch 'main' into vit-26503theft

8449727

mountiny added 2 commits September 4, 2023 03:25

Update outdated comment

de9dacc

Clean up

05d63ca

situchan approved these changes Sep 4, 2023

View reviewed changes

melvin-bot bot requested a review from nkuoch September 4, 2023 05:56

This was referenced Sep 4, 2023

Design clean-up and consistency across expense reports and requests #26503

Closed

feat(26270): Add Skeleton UI for Money Requests #26613

Merged

Expensify deleted a comment from melvin-bot bot Sep 4, 2023

mountiny mentioned this pull request Sep 4, 2023

Update empty field check logic #26643

Merged

59 tasks

Julesssss approved these changes Sep 4, 2023

View reviewed changes

Julesssss merged commit a7cba2d into main Sep 4, 2023

Julesssss deleted the vit-26503theft branch September 4, 2023 10:47

OSBotify mentioned this pull request Sep 4, 2023

Deploy Checklist: New Expensify 2023-09-04 #26686

Closed

35 tasks

s-alves10 mentioned this pull request Sep 5, 2023

[HOLD for payment 2023-09-29] [$500] Web - 2 requests appears for few seconds on click of pay elsewhere button #26767

Closed

6 tasks

OSBotify mentioned this pull request Sep 5, 2023

Deploy Checklist: New Expensify 2023-09-05 #26820

Closed

48 tasks

melvin-bot bot mentioned this pull request Sep 5, 2023

[HOLD for payment 2023-09-12] Design clean-up and consistency across expense reports and requests. #26138

Closed

aimane-chnaif mentioned this pull request Sep 13, 2023

[$500] Web - Incorrect border color for thumbnail image on hovering the money request with receipt #26384

Closed

6 tasks

allroundexperts reviewed Nov 26, 2023

View reviewed changes

allroundexperts mentioned this pull request Nov 26, 2023

[HOLD for payment 2023-11-30] [$500] IOU-Description is shown in preview in manual request while receipt is uploading. #31104

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Design clean-up and consistency across expense reports and requests #26603

Design clean-up and consistency across expense reports and requests #26603

mountiny commented Sep 3, 2023 •

edited

Loading

situchan commented Sep 3, 2023

melvin-bot bot commented Sep 3, 2023

mountiny commented Sep 3, 2023

mountiny commented Sep 3, 2023

situchan commented Sep 4, 2023

situchan commented Sep 4, 2023

situchan commented Sep 4, 2023

situchan commented Sep 4, 2023

situchan left a comment

Julesssss left a comment

OSBotify commented Sep 4, 2023

shawnborton commented Sep 4, 2023

OSBotify commented Sep 4, 2023

OSBotify commented Sep 5, 2023

OSBotify commented Sep 5, 2023

OSBotify commented Sep 6, 2023

allroundexperts Nov 26, 2023

rezkiy37 Nov 27, 2023

Design clean-up and consistency across expense reports and requests #26603

Design clean-up and consistency across expense reports and requests #26603

Conversation

mountiny commented Sep 3, 2023 • edited Loading

Details

Fixed Issues

Tests

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, IOU reports are showing the merchant when they should instead be showing the description (because IOUs always have the same merchant, which is **Request**).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the X requests logic.

5. Receipt whisper cards are no visible when they are inside "Only visible for you" message.

6. (none) is showing as a merchant for receipts being scanned

7. Rounded bottom corners of the images in the report preview

8. On Report Preview for requests made to Saastr or SBE workspaces, there is no user email in the workspace name

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, IOU reports are showing the merchant when they should instead be showing the description (because IOUs always have the same merchant, which is **Request**).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the X requests logic.

5. Cards are no visible when they are inside "Only visible for you" message.

6. (none) is not showing for the smartscanning receipts

7. Rounded bottom corners of the images in the report preview

8. On Report Preview for requests made to Saastr or SBE workspaces, there is no user email in the workspace name

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, IOU reports are showing the merchant when they should instead be showing the description (because IOUs always have the same merchant, which is **Request**).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the X requests logic.

5. Cards are no visible when they are inside "Only visible for you" message.

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, IOU reports are showing the merchant when they should instead be showing the description (because IOUs always have the same merchant, which is **Request**).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the X requests logic.

5. Cards are no visible when they are inside "Only visible for you" message.

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, IOU reports are showing the merchant when they should instead be showing the description (because IOUs always have the same merchant, which is **Request**).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the X requests logic.

5. Cards are no visible when they are inside "Only visible for you" message.

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, IOU reports are showing the merchant when they should instead be showing the description (because IOUs always have the same merchant, which is **Request**).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the X requests logic.

5. Cards are no visible when they are inside "Only visible for you" message.

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, IOU reports are showing the merchant when they should instead be showing the description (because IOUs always have the same merchant, which is **Request**).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the X requests logic.

5. Cards are no visible when they are inside "Only visible for you" message.

situchan commented Sep 3, 2023

melvin-bot bot commented Sep 3, 2023

mountiny commented Sep 3, 2023

mountiny commented Sep 3, 2023

situchan commented Sep 4, 2023

situchan commented Sep 4, 2023

Tests

1. We're showing right carets for all report and request previews, when instead right carets should be removed from all request and report previews.

2. Similarly, IOU reports are showing the merchant when they should instead be showing the description (because IOUs always have the same merchant, which is **Request**).

3. When a merchant name exists for an expense / request preview, we only show the merchant.

4. Normal "Cash" requests are missing the X requests logic.

5. Receipt whisper cards are no visible when they are inside "Only visible for you" message.

6. (none) is showing as a merchant for receipts being scanned

7. Rounded bottom corners of the images in the report preview

8. On Report Preview for requests made to Saastr or SBE workspaces, there is no user email in the workspace name

situchan commented Sep 4, 2023

Reviewer Checklist

Screenshots/Videos

situchan commented Sep 4, 2023

situchan left a comment

Choose a reason for hiding this comment

Julesssss left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 4, 2023

shawnborton commented Sep 4, 2023

OSBotify commented Sep 4, 2023

OSBotify commented Sep 5, 2023

OSBotify commented Sep 5, 2023

mountiny commented Sep 3, 2023 •

edited

Loading

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

4. Normal "Cash" requests are missing the `X requests` logic.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

4. Normal "Cash" requests are missing the `X requests` logic.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

4. Normal "Cash" requests are missing the `X requests` logic.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

4. Normal "Cash" requests are missing the `X requests` logic.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

4. Normal "Cash" requests are missing the `X requests` logic.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

4. Normal "Cash" requests are missing the `X requests` logic.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

4. Normal "Cash" requests are missing the `X requests` logic.

2. Similarly, `IOU` reports are showing the merchant when they should instead be showing the description (because `IOUs` always have the same merchant, which is Request).

4. Normal "Cash" requests are missing the `X requests` logic.