fix: display thread of send money request as normal thread #43742

nkdengineer · 2024-06-14T06:55:16Z

Details

Display thread of send money request as normal thread

Fixed Issues

$ #41645
#43183
PROPOSAL: #41645 (comment)

Tests

Go to a DM and create a send money request
Click on report preview to open iou report
Verify that a paid system message appears
Reply in thread this system message
Verify that the thread is displayed as a normal thread

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Go to a DM and create a send money request
Click on report preview to open iou report
Verify that a paid system message appears
Reply in thread this system message
Verify that the thread is displayed as a normal thread

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-06-14.at.13.45.14.mov

Android: mWeb Chrome

Screen.Recording.2024-06-14.at.13.44.22.mov

iOS: Native

Screen.Recording.2024-06-14.at.13.47.32.mov

iOS: mWeb Safari

Screen.Recording.2024-06-14.at.13.46.17.mov

MacOS: Chrome / Safari

Screen.Recording.2024-06-14.at.13.43.33.mov

MacOS: Desktop

Screen.Recording.2024-06-14.at.13.50.28.mov

melvin-bot · 2024-06-14T06:55:45Z

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

ahmedGaber93 · 2024-06-16T18:56:30Z

Bug: replies related to reportAction type PAY display in parent expense report

20240616214800492.mp4

nkdengineer · 2024-06-17T03:43:30Z

@ahmedGaber93 Because the child report is transaction thread report so all report actions in this report will appear in the combine report in this case.

ahmedGaber93 · 2024-06-17T05:16:15Z

That is correct, but we should fix this

#43183 Expected behavior

reply sent in Step 6 will not appear in the transaction thread

nkdengineer · 2024-06-17T05:27:34Z

@ahmedGaber93 Updated to fix this case.

ahmedGaber93 · 2024-06-20T17:36:30Z

src/libs/ReportActionsUtils.ts

+    if (isEmptyObject(transactionThreadReportActions) || reportActions.some((action) => isSentMoneyReportAction(action))) {
        return reportActions;


Can you add more context about this change? Also, reportActions are not sorted which make last message in pay report in LHN is not correct

In this case we well return all report action of the expense report which have already been sorted in the report screen.

What does reportActions.some((action) => isSentMoneyReportAction(action)) mean? Is this mean this a pay report? If that, can this condition return true on any other reports

Also, we need to fix this

reportActions are not sorted which make last message in pay report in LHN is not correct

No, this only return true when we open the report preview of send money request.

I think it will be more clean if we define it in a const and add some coments why we return reportActions in SentMoneyReport

const isSentMoneyReport = reportActions.some((action) => isSentMoneyReportAction(action))

@ahmedGaber93 I updated.

@nkdengineer We still need to fix this #43742 (comment)
Steps to reproduce

set Priority mode to most recent

pay someone

open pay report

send message
the message you sent it in step 3 not visible in LHN as last message you sent

@ahmedGaber93 I fixed this case.

ahmedGaber93

LGTM!

ahmedGaber93 · 2024-06-24T11:38:36Z

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

a.mp4

Android: mWeb Chrome

aw.mp4

iOS: Native

i.mp4

iOS: mWeb Safari

iw.mp4

MacOS: Chrome / Safari

20240624143548299.mp4

MacOS: Desktop

d.mp4

stitesExpensify

Apologies for the delay I was OOO. Code LGTM, however there are a couple of conflicts now

nkdengineer · 2024-06-27T03:07:42Z

@stitesExpensify I merged main. Please help to check again.

stitesExpensify

LGTM

OSBotify · 2024-06-27T18:42:07Z

✋ 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-07-03T19:38:12Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 9.0.3-7 🚀

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

OSBotify · 2024-07-10T10:56:26Z

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

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

eVoloshchak · 2024-08-05T15:53:23Z

👋 Coming from #44586
System message thread after you 'Pay someone' didn't show in LHN.
Previously, the paid system message was combined into the one-transaction report so it was not possible for the user to open the paid system message thread manually, but now we show it so the users know the paid method. However, this is a one-transaction thread and we hide those from LHN
We resolved this by adding an exception to isOneTransactionThread method if action is isSentMoneyReportAction

nkdengineer added 2 commits June 14, 2024 13:32

fix: display thread of send money request as normal thread

5bdf2f3

fix report name of send money request action

f23c552

nkdengineer marked this pull request as ready for review June 14, 2024 06:55

nkdengineer requested a review from a team as a code owner June 14, 2024 06:55

melvin-bot bot requested review from ahmedGaber93 and removed request for a team June 14, 2024 06:55

nkdengineer mentioned this pull request Jun 14, 2024

[HOLD for payment 2024-07-10] [HOLD for payment 2024-06-20] [HOLD for payment 2024-06-18] [$250] Pay someone flow doesn’t include a reportAction to distinguish the payment method used (Expensify or elsewhere) #41645

Closed

6 tasks

nkdengineer added 2 commits June 17, 2024 12:21

Merge branch 'main' into fix/41645

7c15fd7

not display report actions of send money action thread in combine report

5821e4d

ahmedGaber93 reviewed Jun 20, 2024

View reviewed changes

nkdengineer added 4 commits June 21, 2024 13:59

merge main

762448c

merge main

73c0363

Merge branch 'main' into fix/41645

b07b37f

fix wrong last message text in LHN

5b0b40a

ahmedGaber93 approved these changes Jun 24, 2024

View reviewed changes

melvin-bot bot requested a review from stitesExpensify June 24, 2024 11:33

ahmedGaber93 approved these changes Jun 24, 2024

View reviewed changes

stitesExpensify reviewed Jun 26, 2024

View reviewed changes

merge main

d68624b

stitesExpensify approved these changes Jun 27, 2024

View reviewed changes

stitesExpensify merged commit d136101 into Expensify:main Jun 27, 2024
14 checks passed

github-actions bot mentioned this pull request Jun 27, 2024

Deploy Checklist: New Expensify 2024-06-27 #44575

Closed

85 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: display thread of send money request as normal thread #43742

fix: display thread of send money request as normal thread #43742

nkdengineer commented Jun 14, 2024

melvin-bot bot commented Jun 14, 2024

ahmedGaber93 commented Jun 16, 2024

nkdengineer commented Jun 17, 2024

ahmedGaber93 commented Jun 17, 2024

nkdengineer commented Jun 17, 2024

ahmedGaber93 Jun 20, 2024 •

edited

Loading

nkdengineer Jun 21, 2024

ahmedGaber93 Jun 21, 2024 •

edited

Loading

ahmedGaber93 Jun 21, 2024

nkdengineer Jun 21, 2024

ahmedGaber93 Jun 21, 2024

nkdengineer Jun 21, 2024

ahmedGaber93 Jun 21, 2024

nkdengineer Jun 24, 2024

ahmedGaber93 left a comment

ahmedGaber93 commented Jun 24, 2024 •

edited

Loading

stitesExpensify left a comment

nkdengineer commented Jun 27, 2024

stitesExpensify left a comment

OSBotify commented Jun 27, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 10, 2024

eVoloshchak commented Aug 5, 2024

		if (isEmptyObject(transactionThreadReportActions) \|\| reportActions.some((action) => isSentMoneyReportAction(action))) {
		return reportActions;

fix: display thread of send money request as normal thread #43742

fix: display thread of send money request as normal thread #43742

Conversation

nkdengineer commented Jun 14, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 14, 2024

ahmedGaber93 commented Jun 16, 2024

nkdengineer commented Jun 17, 2024

ahmedGaber93 commented Jun 17, 2024

nkdengineer commented Jun 17, 2024

ahmedGaber93 Jun 20, 2024 • edited Loading

Choose a reason for hiding this comment

nkdengineer Jun 21, 2024

Choose a reason for hiding this comment

ahmedGaber93 Jun 21, 2024 • edited Loading

Choose a reason for hiding this comment

ahmedGaber93 Jun 21, 2024

Choose a reason for hiding this comment

nkdengineer Jun 21, 2024

Choose a reason for hiding this comment

ahmedGaber93 Jun 21, 2024

Choose a reason for hiding this comment

nkdengineer Jun 21, 2024

Choose a reason for hiding this comment

ahmedGaber93 Jun 21, 2024

Choose a reason for hiding this comment

nkdengineer Jun 24, 2024

Choose a reason for hiding this comment

ahmedGaber93 left a comment

Choose a reason for hiding this comment

ahmedGaber93 commented Jun 24, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

stitesExpensify left a comment

Choose a reason for hiding this comment

nkdengineer commented Jun 27, 2024

stitesExpensify left a comment

Choose a reason for hiding this comment

OSBotify commented Jun 27, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 10, 2024

eVoloshchak commented Aug 5, 2024

ahmedGaber93 Jun 20, 2024 •

edited

Loading

ahmedGaber93 Jun 21, 2024 •

edited

Loading

ahmedGaber93 commented Jun 24, 2024 •

edited

Loading