fix: Description/Merchant does not show in request preview. #39228

Krishna2323 · 2024-03-29T09:40:39Z

Details

Fixed Issues

$ #38506
PROPOSAL: #38506 (comment)

Tests

Go to a DM with no money request
Select money request using + button in the composer
Create a money request with description
Verify description is shown in preview
Open request details page and enter merchant
Go back to DM report
Verify merchant is shown
Repeat step 2 & 3
Verify number of request is shown instead of description/merchant

Verify that no errors appear in the JS console

Offline tests

Go to a DM with no money request
Select money request using + button in the composer
Create a money request with description
Verify description is shown in preview
Open request details page and enter merchant
Go back to DM report
Verify merchant is shown
Repeat step 2 & 3
Verify number of request is shown instead of description/merchant

QA Steps

Go to a DM with no money request
Select money request using + button in the composer
Create a money request with description
Verify description is shown in preview
Open request details page and enter merchant
Go back to DM report
Verify merchant is shown
Repeat step 2 & 3
Verify number of request is shown instead of description/merchant

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

android_native.mp4

Android: mWeb Chrome

android_chrome.mp4

iOS: Native

ios_native.mp4

iOS: mWeb Safari

ios_safari.mp4

MacOS: Chrome / Safari

web_chrome.mp4

MacOS: Desktop

desktop_app.mp4

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

melvin-bot · 2024-03-29T09:40:43Z

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

eh2077 · 2024-03-29T15:24:29Z

src/components/ReportActionItem/ReportPreview.tsx

@@ -228,7 +231,8 @@ function ReportPreview({
       In this case, we don't want to show the merchant because it says: "Pending route...", which is already displayed in the amount field.
     */
    const shouldShowSingleRequestMerchant = numberOfRequests === 1 && !!formattedMerchant && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend);


Can we just change this line?

Suggested change

const shouldShowSingleRequestMerchant = numberOfRequests === 1 && !!formattedMerchant && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend);

const shouldShowSingleRequestMerchantOrDescription = numberOfRequests === 1 && (!!formattedMerchant || !!formattedDescription) && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend);

Yeah we can, updated.

eh2077 · 2024-03-29T15:25:43Z

src/components/ReportActionItem/ReportPreview.tsx

@@ -228,7 +231,8 @@ function ReportPreview({
       In this case, we don't want to show the merchant because it says: "Pending route...", which is already displayed in the amount field.


It'll be great to get the above comment updated as well.

@eh2077, updated.

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

eh2077 · 2024-03-30T09:32:42Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

0-web.mp4

MacOS: Desktop

eh2077

LGTM and tested well!

hayata-suenaga

🟢

melvin-bot · 2024-04-01T15:16:26Z

@hayata-suenaga looks like this was merged without a test passing. Please add a note explaining why this was done and remove the Emergency label if this is not an emergency.

hayata-suenaga · 2024-04-01T15:18:01Z

not emergency. checks were all green

OSBotify · 2024-04-01T15:25:14Z

✋ 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-04-02T11:15:27Z

🚀 Deployed to staging by https://github.com/hayata-suenaga in version: 1.4.59-0 🚀

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

OSBotify · 2024-04-08T10:56:50Z

🚀 Deployed to production by https://github.com/Julesssss in version: 1.4.60-13 🚀

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

fix: Description/Merchant does not show in request preview.

1416897

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

Krishna2323 requested a review from a team as a code owner March 29, 2024 09:40

melvin-bot bot removed the request for review from a team March 29, 2024 09:40

melvin-bot bot requested a review from eh2077 March 29, 2024 09:40

eh2077 suggested changes Mar 29, 2024

View reviewed changes

update according to suggestions.

cc757f0

Signed-off-by: Krishna Gupta <belivethatkg@gmail.com>

eh2077 approved these changes Mar 30, 2024

View reviewed changes

melvin-bot bot requested a review from hayata-suenaga March 30, 2024 09:38

hayata-suenaga approved these changes Apr 1, 2024

View reviewed changes

hayata-suenaga merged commit 5facc1c into Expensify:main Apr 1, 2024
16 of 18 checks passed

melvin-bot bot added the Emergency label Apr 1, 2024

hayata-suenaga removed the Emergency label Apr 1, 2024

github-actions bot mentioned this pull request Apr 2, 2024

Deploy Checklist: New Expensify 2024-04-02 #39399

Closed

87 tasks

melvin-bot bot mentioned this pull request Apr 8, 2024

[HOLD for payment 2024-04-15] [$500] Description/Merchant does not show in request preview #38506

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: Description/Merchant does not show in request preview. #39228

fix: Description/Merchant does not show in request preview. #39228

Krishna2323 commented Mar 29, 2024 •

edited

Loading

melvin-bot bot commented Mar 29, 2024

eh2077 Mar 29, 2024

Krishna2323 Mar 29, 2024

eh2077 Mar 29, 2024

Krishna2323 Mar 29, 2024

eh2077 commented Mar 30, 2024 •

edited

Loading

eh2077 left a comment

hayata-suenaga left a comment

melvin-bot bot commented Apr 1, 2024

hayata-suenaga commented Apr 1, 2024 •

edited

Loading

OSBotify commented Apr 1, 2024

OSBotify commented Apr 2, 2024

OSBotify commented Apr 8, 2024

	const shouldShowSingleRequestMerchant = numberOfRequests === 1 && !!formattedMerchant && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend);
	const shouldShowSingleRequestMerchantOrDescription = numberOfRequests === 1 && (!!formattedMerchant \|\| !!formattedDescription) && !(hasOnlyTransactionsWithPendingRoutes && !totalDisplaySpend);

		@@ -228,7 +231,8 @@ function ReportPreview({
		In this case, we don't want to show the merchant because it says: "Pending route...", which is already displayed in the amount field.

fix: Description/Merchant does not show in request preview. #39228

fix: Description/Merchant does not show in request preview. #39228

Conversation

Krishna2323 commented Mar 29, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Mar 29, 2024

eh2077 Mar 29, 2024

Choose a reason for hiding this comment

Krishna2323 Mar 29, 2024

Choose a reason for hiding this comment

eh2077 Mar 29, 2024

Choose a reason for hiding this comment

Krishna2323 Mar 29, 2024

Choose a reason for hiding this comment

eh2077 commented Mar 30, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

eh2077 left a comment

Choose a reason for hiding this comment

hayata-suenaga left a comment

Choose a reason for hiding this comment

melvin-bot bot commented Apr 1, 2024

hayata-suenaga commented Apr 1, 2024 • edited Loading

OSBotify commented Apr 1, 2024

OSBotify commented Apr 2, 2024

OSBotify commented Apr 8, 2024

Krishna2323 commented Mar 29, 2024 •

edited

Loading

eh2077 commented Mar 30, 2024 •

edited

Loading

hayata-suenaga commented Apr 1, 2024 •

edited

Loading