Fix Copying Sent Money Report Action text copies a wrong text #27889

rayane-djouah · 2023-09-20T20:26:38Z

Details

Fixed Issues

coming from #27142
$ #27114
$ #26531
$ #27858

Tests

Open a tab where user A is signed in
Request money from user B
Open a tab where user B is signed in
Open the chat with user A > Click on 'IOU preview component'
Click on 'Pay elsewhere' button
Hover over the new paid elsewhere message
Click on 'copy to clipboard' icon
Past the copied text
Verify that pasted text should reflect what was copied from the message

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests above.

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

MacinCloud_LowGraphics_Popup.-.EU798.macincloud.com_6000.-.Remote.Desktop.Connection.2023-09-20.22-27-59.mp4

Mobile Web - Chrome

MacinCloud_LowGraphics_Popup.-.EU798.macincloud.com_6000.-.Remote.Desktop.Connection.2023-09-20.22-33-58.mp4

Mobile Web - Safari

MacinCloud_LowGraphics_Popup.-.EU798.macincloud.com_6000.-.Remote.Desktop.Connection.2023-09-20.22-30-50.mp4

Desktop

MacinCloud_LowGraphics_Popup.-.EU798.macincloud.com_6000.-.Remote.Desktop.Connection.2023-09-20.22-37-20.mp4

iOS

MacinCloud_LowGraphics_Popup.-.EU798.macincloud.com_6000.-.Remote.Desktop.Connection.2023-09-20.22-46-13.mp4

Android

melvin-bot · 2023-09-20T20:26:44Z

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

…ead of ReportActionsUtils

rayane-djouah · 2023-09-20T21:55:41Z

@mananjadhav could you please review this PR? the issue is a deploy blocker

rayane-djouah · 2023-09-20T22:50:49Z

@narefyev91 could you review as well? thanks.

narefyev91 · 2023-09-21T07:26:58Z

src/pages/home/report/ContextMenu/ContextMenuActions.js

-                    });
-                    Clipboard.setString(displaymessage);
+                    let displayMessage;
+                    if (originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {


i think we can move all logic from if to some util function and return here just displayMessage
getTaskReportActionMessage for reference

narefyev91 · 2023-09-21T07:33:59Z

@rayane-djouah seems when payment issued from workspace - copy message is not reflecting

rayane-djouah · 2023-09-21T08:32:07Z

@narefyev91 what are the reproduction steps?

narefyev91 · 2023-09-21T08:36:12Z

Request money
choose any workspace
Pay elsewhere
Get last message in chat
Copy comment and paste

rayane-djouah · 2023-09-22T10:35:11Z

@narefyev91 could you review please

narefyev91 · 2023-09-22T11:29:21Z

@rayane-djouah looks better but now - getting this

src/libs/ReportUtils.js

…-clipboard-text-for-requested

rayane-djouah · 2023-09-22T14:53:02Z

Fixed @narefyev91

MacinCloud_LowGraphics_Popup.-.EU798.macincloud.com_6000.-.Remote.Desktop.Connection.2023-09-22.15-47-55.mp4

rayane-djouah · 2023-09-22T14:54:18Z

@narefyev91 PR ready for another review

src/libs/ReportUtils.js

mananjadhav

Raised 2 comments - one of them is about deprecated method.

mananjadhav

Based on @mountiny's responses, the code changes are fine for me.

I'll work on the checklist after the small changes of renaming the method are done.

rayane-djouah · 2023-09-25T15:57:30Z

changes are done! @mananjadhav please proceed with the checklist

mananjadhav · 2023-09-25T16:45:17Z

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

web-copy-iou-message.mov

Mobile Web - Chrome

mweb-chrome-copy-iou-message.mov

Mobile Web - Safari

mweb-safari-copy-iou-message.mov

Desktop

desktop-copy-iou-message.mov

iOS

iou-copy-iou-message.mov

Android

android-copy-iou-message.mov

mananjadhav · 2023-09-25T17:14:46Z

I am waiting on the Android build, it's taking some time.

mananjadhav · 2023-09-25T19:11:17Z

@mountiny @joelbettner I've completed the checklisted.

mountiny

All yours @joelbettner

joelbettner

👍 LGTM, but there are conflicts.

…-text-for-requested

rayane-djouah · 2023-09-26T09:58:38Z

@joelbettner conflicts resolved

rayane-djouah · 2023-09-26T09:59:07Z

All yours @joelbettner

mountiny

Joel approved so going to merge now so we avoid future conflicts

OSBotify · 2023-09-26T10:32:31Z

✋ 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-09-28T19:19:15Z

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

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

OSBotify · 2023-10-02T17:23:11Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.75-12 🚀

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

OSBotify · 2023-10-02T17:51:49Z

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

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

OSBotify · 2023-10-03T15:52:46Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.76-6 🚀

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

cubuspl42 · 2023-11-14T11:37:01Z

src/libs/ReportUtils.js

+    const originalMessage = _.get(reportAction, 'originalMessage', {});
+    let displayMessage;
+    if (originalMessage.type === CONST.IOU.REPORT_ACTION_TYPE.PAY) {
+        const {amount, currency, IOUReportID} = originalMessage;


Coming from #29441

The REPORT_ACTION_TYPE.PAY action type is used for both fulfilling existing requests and sending money. To differentiate between these two scenarios, we should have checked if the originalMessage contains the IOUDetails property. If it does, it indicates that this is a 'Send money' action.

Fix Copying Sent Money Report Action text copies the wrong text

eda02a0

rayane-djouah requested a review from a team as a code owner September 20, 2023 20:26

melvin-bot bot requested review from mananjadhav and removed request for a team September 20, 2023 20:26

rayane-djouah added 2 commits September 20, 2023 21:05

Fix Copying Sent Money Report Action text copies the wrong text

540dfa1

using getDisplayNameForParticipant function lib from ReportUtils inst…

0167ae1

…ead of ReportActionsUtils

rayane-djouah mentioned this pull request Sep 20, 2023

[HOLD for payment 2023-10-09] Web - Copying 'paid elsewhere' text copies the wrong text #27858

Closed

6 tasks

narefyev91 reviewed Sep 21, 2023

View reviewed changes

Fix Copying IOU Report Action text copies a wrong text

6f3221d

rayane-djouah requested a review from narefyev91 September 21, 2023 17:37

correct comment

4c9641d

narefyev91 reviewed Sep 22, 2023

View reviewed changes

src/libs/ReportUtils.js Outdated Show resolved Hide resolved

rayane-djouah added 3 commits September 22, 2023 14:48

Merge branch 'Expensify:main' into fix-app-does-not-translate-copy-to…

9e35343

…-clipboard-text-for-requested

remove paypal paymentType

b0bdad6

fix payer name

0deecc6

rayane-djouah requested a review from narefyev91 September 22, 2023 14:48

mananjadhav reviewed Sep 24, 2023

View reviewed changes

src/libs/ReportUtils.js Show resolved Hide resolved

mananjadhav reviewed Sep 24, 2023

View reviewed changes

src/libs/ReportUtils.js Show resolved Hide resolved

mananjadhav reviewed Sep 24, 2023

View reviewed changes

src/libs/ReportUtils.js Show resolved Hide resolved

mananjadhav reviewed Sep 24, 2023

View reviewed changes

mananjadhav approved these changes Sep 25, 2023

View reviewed changes

melvin-bot bot requested a review from joelbettner September 25, 2023 09:50

rename getIOUReportActionDisplayMessage method

d3afa28

rayane-djouah requested a review from mananjadhav September 25, 2023 15:57

mananjadhav approved these changes Sep 25, 2023

View reviewed changes

mountiny previously approved these changes Sep 26, 2023

View reviewed changes

joelbettner reviewed Sep 26, 2023

View reviewed changes

Merge branch 'main' into fix-app-does-not-translate-copy-to-clipboard…

1a07991

…-text-for-requested

rayane-djouah dismissed mountiny’s stale review via 1a07991 September 26, 2023 09:56

rayane-djouah requested a review from joelbettner September 26, 2023 09:56

mountiny approved these changes Sep 26, 2023

View reviewed changes

mountiny merged commit 0477b33 into Expensify:main Sep 26, 2023
12 checks passed

OSBotify mentioned this pull request Sep 28, 2023

Deploy Checklist: New Expensify 2023-09-28 #28412

Closed

lanitochka17 mentioned this pull request Sep 29, 2023

[HOLD for payment 2023-10-25] Chat - Pasted text reflects Full Display name #28521

Closed

6 tasks

OSBotify mentioned this pull request Oct 2, 2023

Deploy Checklist: New Expensify 2023-10-02 #28635

Closed

cubuspl42 reviewed Nov 14, 2023

View reviewed changes

cubuspl42 mentioned this pull request Nov 14, 2023

[WAITING ON CHECKLIST] Send money - Amount sent is copied as NaN in send money report page #29441

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Copying Sent Money Report Action text copies a wrong text #27889

Fix Copying Sent Money Report Action text copies a wrong text #27889

rayane-djouah commented Sep 20, 2023 •

edited by mountiny

Loading

melvin-bot bot commented Sep 20, 2023

rayane-djouah commented Sep 20, 2023

rayane-djouah commented Sep 20, 2023

narefyev91 Sep 21, 2023

narefyev91 commented Sep 21, 2023

rayane-djouah commented Sep 21, 2023

narefyev91 commented Sep 21, 2023

rayane-djouah commented Sep 22, 2023

narefyev91 commented Sep 22, 2023

rayane-djouah commented Sep 22, 2023

rayane-djouah commented Sep 22, 2023

mananjadhav left a comment

mananjadhav left a comment

rayane-djouah commented Sep 25, 2023

mananjadhav commented Sep 25, 2023 •

edited

Loading

mananjadhav commented Sep 25, 2023

mananjadhav commented Sep 25, 2023

mountiny left a comment

joelbettner left a comment

rayane-djouah commented Sep 26, 2023

rayane-djouah commented Sep 26, 2023

mountiny left a comment

OSBotify commented Sep 26, 2023

OSBotify commented Sep 28, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

cubuspl42 Nov 14, 2023

Fix Copying Sent Money Report Action text copies a wrong text #27889

Fix Copying Sent Money Report Action text copies a wrong text #27889

Conversation

rayane-djouah commented Sep 20, 2023 • edited by mountiny Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 20, 2023

rayane-djouah commented Sep 20, 2023

rayane-djouah commented Sep 20, 2023

narefyev91 Sep 21, 2023

Choose a reason for hiding this comment

narefyev91 commented Sep 21, 2023

rayane-djouah commented Sep 21, 2023

narefyev91 commented Sep 21, 2023

rayane-djouah commented Sep 22, 2023

narefyev91 commented Sep 22, 2023

rayane-djouah commented Sep 22, 2023

rayane-djouah commented Sep 22, 2023

mananjadhav left a comment

Choose a reason for hiding this comment

mananjadhav left a comment

Choose a reason for hiding this comment

rayane-djouah commented Sep 25, 2023

mananjadhav commented Sep 25, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

mananjadhav commented Sep 25, 2023

mananjadhav commented Sep 25, 2023

mountiny left a comment

Choose a reason for hiding this comment

joelbettner left a comment

Choose a reason for hiding this comment

rayane-djouah commented Sep 26, 2023

rayane-djouah commented Sep 26, 2023

mountiny left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 26, 2023

OSBotify commented Sep 28, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 2, 2023

OSBotify commented Oct 3, 2023

cubuspl42 Nov 14, 2023

Choose a reason for hiding this comment

rayane-djouah commented Sep 20, 2023 •

edited by mountiny

Loading

mananjadhav commented Sep 25, 2023 •

edited

Loading