Copy email with text when IOU settled message is copied #26151

huzaifa-99 · 2023-08-29T07:52:02Z

Details

Fixed Issues

$ #25567
PROPOSAL: #25567 (comment)

Tests

From User A, request money from User B.
From User B settle the money request report
On the settled money request message, right-click (on the web) or long press (on mobile) and copy to the clipboard.
Now paste this text and verify it contains User A's name or email.
(Web Only) On the same settled money request message, hover over the message, click the copy icon from the mini context menu, and validate step 4.
In the LHN, validate that the report's last message does not contain User A's name/email.

Verify that no errors appear in the JS console

Offline tests

We need to have settled a Money request report online.

On the settled money request message, right-click (on the web) or long press (on mobile) and copy to the clipboard.
Now paste this text and verify it contains User A's name or email.
(Web Only) On the same settled money request message, hover over the message, click the copy icon from the mini context menu, and validate step 4.
In the LHN, validate that the report's last message does not contain User A's name/email.

QA Steps

Same as "Tests" section above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Chrome

Web.Chrome.mp4

Safari

Web.Safari.mp4

Mobile Web - Chrome

mWeb.Chrome.mp4

Mobile Web - Safari

mWeb.Safari.mp4

Desktop

Desktop.Native.mp4

iOS

IOS.Native.mp4

Android

Android.Native.mp4

melvin-bot · 2023-08-29T07:52:06Z

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

huzaifa-99 · 2023-08-29T07:55:01Z

@Ollyws I noticed that we show name/email with the "Owns" message in LHN

I think for consistency we should match behaviour for "Owns" and "Paid" message in LHN, i.e either show name/email for both in LHN or hide or both in LHN. Thoughts?

Ollyws · 2023-08-29T17:22:34Z

@huzaifa-99 Yes I'm inclined to agree, that is inconsistent. I've asked in Slack.

Ollyws · 2023-08-29T22:01:35Z

@Beamanator What do you think about this comment? I've asked on slack but no replies.
Was there a particular reason we are not adding the name in the paid $... elsewhere message as we do with other messages?

huzaifa-99 · 2023-08-29T22:29:34Z

Was there a particular reason we are not adding the name in the paid $... elsewhere message as we do with other messages?

@Ollyws, just to be clear you mean for the LHN right and not for the report message?

Ollyws · 2023-08-29T22:36:03Z

Yeah in the LHN

huzaifa-99 · 2023-09-04T09:08:58Z

@Ollyws I saw some discussion on Slack suggestion fixing the other texts/msgs for IOU reports in LHN. I don't know the full list of msgs/texts there but will investigate today and update here.

huzaifa-99 · 2023-09-05T13:14:15Z

Discussion is still ongoing. I left a message in slack here.

Edit: Internal engineers are busy with the new feature launch. Will ping them again in a day or 2.

huzaifa-99 · 2023-09-11T10:50:48Z

I have bumped the message in slack, will wait for the team's response.

huzaifa-99 · 2023-09-12T10:59:50Z

Bumped the convo again in slack.

cc: @Ollyws

huzaifa-99 · 2023-09-13T11:07:03Z

From the slack convo, we seem to align on showing the username in LHN for paid messages and for other messages (which we are already doing). I have updated the PR to show the payer name for paid IOU/Expense messages in LHN.

cc: @Ollyws

huzaifa-99 · 2023-09-13T11:54:00Z

Updated test videos. This is ready for review again.

Ollyws · 2023-09-13T19:16:03Z

src/languages/types.ts

@@ -124,11 +124,11 @@ type WaitingOnBankAccountParams = {submitterDisplayName: string};

 type SettledAfterAddedBankAccountParams = {submitterDisplayName: string; amount: string};

-type PaidElsewhereWithAmountParams = {amount: string};
+type PaidElsewhereWithAmountParams = {payer: string; amount: number};


Why have we set this type as number while all the others are string?

@Ollyws My bad, fixed ef07817

Ollyws · 2023-09-14T10:17:09Z

src/languages/en.ts

-        paidWithExpensifyWithAmount: ({amount}: PaidWithExpensifyWithAmountParams) => `paid ${amount} with Expensify`,
+        paidElsewhereWithAmount: ({payer, amount}: PaidElsewhereWithAmountParams) => `${payer} paid ${amount} elsewhere`,
+        paidUsingPaypalWithAmount: ({payer, amount}: PaidUsingPaypalWithAmountParams) => `${payer} paid ${amount} using Paypal.me`,
+        paidWithExpensifyWithAmount: ({payer, amount}: PaidWithExpensifyWithAmountParams) => `${payer} paid ${amount} using Expensify`,


Just wondering why we're changing this from with to using, was that something from the slack discussion?

paidElsewhereWithAmount and paidUsingPaypalWithAmount are the same as main. paidUsingExpensifyWithAmount was changed to paidWithExpensifyWithAmount in #27006.

@Ollyws

Ollyws · 2023-09-14T17:50:05Z

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

MacOS_Chrome.mp4

Mobile Web - Chrome

Android_Chrome.mp4

Mobile Web - Safari

iOS_Safari.mp4

Desktop

MacOS_Desktop.mp4

iOS

iOS_Native.mp4

Android

Android_Native.mp4

Ollyws

Thanks for all your effort here @huzaifa-99!
LGTM.

Beamanator · 2023-09-19T03:20:40Z

Thanks so much for your efforts @Ollyws and @huzaifa-99 ! 🙏

So sorry for the delay, but I should be back and ready to help push this forward :D

@huzaifa-99 again sorry for my delay, it looks like there's conflicts now 🙃

huzaifa-99 · 2023-09-19T22:28:15Z

Thanks so much for your efforts @Ollyws and @huzaifa-99 ! 🙏
@huzaifa-99 again sorry for my delay, it looks like there's conflicts now 🙃

@Beamanator Thank you and no worries 😊. I fixed the merge conflicts.

Beamanator

LGTM

OSBotify · 2023-09-20T02:41:12Z

✋ 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-20T08:44:00Z

🚀 Deployed to staging by https://github.com/Beamanator in version: 1.3.72-0 🚀

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

OSBotify · 2023-09-22T13:25:55Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.3.72-11 🚀

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

Copy email with text when iou message is copied

c7ce3e0

huzaifa-99 requested a review from a team as a code owner August 29, 2023 07:52

melvin-bot bot removed the request for review from a team August 29, 2023 07:52

melvin-bot bot requested a review from Ollyws August 29, 2023 07:52

huzaifa-99 mentioned this pull request Aug 29, 2023

[HOLD for payment 2023-09-29] [$1000] Web - IOU - Account email is not present in the copied content after IOU has been settled #25567

Closed

6 tasks

huzaifa-99 added 2 commits September 11, 2023 13:04

Merge branch 'main' into 25567-fix-email-in-iou-copied-text

123c352

Fix lint

2e3f86b

huzaifa-99 added 3 commits September 12, 2023 16:08

Merge branch 'main' into 25567-fix-email-in-iou-copied-text

9f4d17b

Merge branch 'main' into 25567-fix-email-in-iou-copied-text

6a6328c

Show payer name for paid iou/expense msg in LHN

3816507

huzaifa-99 added 2 commits September 13, 2023 16:08

Removed payer as option param for translate messgae

f532680

Removed unnecessary default param arg

96a2a1f

Ollyws reviewed Sep 13, 2023

View reviewed changes

Use correct type

ef07817

Ollyws reviewed Sep 14, 2023

View reviewed changes

Ollyws approved these changes Sep 14, 2023

View reviewed changes

melvin-bot bot requested a review from Beamanator September 14, 2023 17:51

Merge branch 'main' into 25567-fix-email-in-iou-copied-text

4efc199

Beamanator approved these changes Sep 20, 2023

View reviewed changes

Beamanator merged commit 9fd7d46 into Expensify:main Sep 20, 2023
11 checks passed

OSBotify mentioned this pull request Sep 20, 2023

Deploy Checklist: New Expensify 2023-09-20 #27837

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Copy email with text when IOU settled message is copied #26151

Copy email with text when IOU settled message is copied #26151

huzaifa-99 commented Aug 29, 2023 •

edited

Loading

melvin-bot bot commented Aug 29, 2023

huzaifa-99 commented Aug 29, 2023

Ollyws commented Aug 29, 2023

Ollyws commented Aug 29, 2023

huzaifa-99 commented Aug 29, 2023

Ollyws commented Aug 29, 2023

huzaifa-99 commented Sep 4, 2023

huzaifa-99 commented Sep 5, 2023 •

edited

Loading

huzaifa-99 commented Sep 11, 2023

huzaifa-99 commented Sep 12, 2023

huzaifa-99 commented Sep 13, 2023

huzaifa-99 commented Sep 13, 2023 •

edited

Loading

Ollyws Sep 13, 2023

huzaifa-99 Sep 13, 2023 •

edited

Loading

Ollyws Sep 14, 2023

huzaifa-99 Sep 14, 2023

Ollyws commented Sep 14, 2023

Ollyws left a comment •

edited

Loading

Beamanator commented Sep 19, 2023

huzaifa-99 commented Sep 19, 2023

Beamanator left a comment

OSBotify commented Sep 20, 2023

OSBotify commented Sep 20, 2023

OSBotify commented Sep 22, 2023

Copy email with text when IOU settled message is copied #26151

Copy email with text when IOU settled message is copied #26151

Conversation

huzaifa-99 commented Aug 29, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Aug 29, 2023

huzaifa-99 commented Aug 29, 2023

Ollyws commented Aug 29, 2023

Ollyws commented Aug 29, 2023

huzaifa-99 commented Aug 29, 2023

Ollyws commented Aug 29, 2023

huzaifa-99 commented Sep 4, 2023

huzaifa-99 commented Sep 5, 2023 • edited Loading

huzaifa-99 commented Sep 11, 2023

huzaifa-99 commented Sep 12, 2023

huzaifa-99 commented Sep 13, 2023

huzaifa-99 commented Sep 13, 2023 • edited Loading

Ollyws Sep 13, 2023

Choose a reason for hiding this comment

huzaifa-99 Sep 13, 2023 • edited Loading

Choose a reason for hiding this comment

Ollyws Sep 14, 2023

Choose a reason for hiding this comment

huzaifa-99 Sep 14, 2023

Choose a reason for hiding this comment

Ollyws commented Sep 14, 2023

Reviewer Checklist

Screenshots/Videos

Ollyws left a comment • edited Loading

Choose a reason for hiding this comment

Beamanator commented Sep 19, 2023

huzaifa-99 commented Sep 19, 2023

Beamanator left a comment

Choose a reason for hiding this comment

OSBotify commented Sep 20, 2023

OSBotify commented Sep 20, 2023

OSBotify commented Sep 22, 2023

huzaifa-99 commented Aug 29, 2023 •

edited

Loading

huzaifa-99 commented Sep 5, 2023 •

edited

Loading

huzaifa-99 commented Sep 13, 2023 •

edited

Loading

huzaifa-99 Sep 13, 2023 •

edited

Loading

Ollyws left a comment •

edited

Loading