Fix system paid message by dukenv0307 · Pull Request #36993 · Expensify/App

dukenv0307 · 2024-02-21T04:16:05Z

Details

Fix regression of issue

Fixed Issues

$ #33819
PROPOSAL: #33819 (comment)

Tests

Create a workspace and invite some users
As employee, create a money request with description in the workspace chat
As admin, paid this request
As employee, verify that
LHN of report preview display with the format %workspaceName% paid $100.00
LHN of expense report display with the format %payerName%: paid $100.00 [using Expensify || elsewhere]
Go to the expense report and verify that the paid message is displayed with format paid $100.00 [using Expensify || elsewhere]
Hover of long press on this message > Copy to clipboard
Paste the message to composer and verify that this is the same as the paid message display on report screen.
Hover or long press on money request preview > Copy to clipboard
Paste the message to composer and verify that the message has the correct amount and contains the description

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Create a workspace and invite some users
As employee, create a money request with description in the workspace chat
As admin, paid this request
As employee, verify that
LHN of report preview display with the format %workspaceName% paid $100.00
LHN of expense report display with the format %payerName%: paid $100.00 [using Expensify || elsewhere]
Go to the expense report and verify that the paid message is displayed with format paid $100.00 [using Expensify || elsewhere]
Hover of long press on this message > Copy to clipboard
Paste the message to composer and verify that this is the same as the paid message display on report screen.
Hover or long press on money request preview > Copy to clipboard
Paste the message to composer and verify that the message has the correct amount and contains the description

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-02-21.at.12.18.16.mp4

Android: mWeb Chrome

Screen.Recording.2024-02-21.at.11.06.13.mov

iOS: Native

Screen.Recording.2024-02-21.at.12.11.55.mp4

iOS: mWeb Safari

Screen.Recording.2024-02-21.at.11.01.51.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-21.at.10.55.21.mov

MacOS: Desktop

Screen.Recording.2024-02-21.at.11.12.18.mov

dukenv0307 · 2024-02-21T04:42:12Z

+                translationKey = 'iou.payerPaidAmount';
+                break;
+        }
+        return Localize.translateLocal(translationKey, {amount: formattedAmount, payer: ''});


From #33819, I bring the getIOUReportActionDisplayMessage back and only remove the payerName for the paid message.

dukenv0307 · 2024-02-21T04:43:00Z

            translatePhraseKey = 'iou.paidWithExpensifyWithAmount';
        }

-        let actualPayerName = report.managerID === currentUserAccountID || shouldHidePayer ? '' : getDisplayNameForParticipant(report.managerID, true);


remove shouldHidePayer param here since we will handle this case in getIOUReportActionDisplayMessage function.

DylanDylann · 2024-02-21T04:57:57Z

@dukenv0307 Let's speed up this PR

melvin-bot · 2024-02-21T05:04:20Z

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

srikarparsi · 2024-02-21T05:30:17Z

Hey @DylanDylann and @dukenv0307, what are your thoughts on merging the revert PR first. Most of these changes seem to be similar and it might be easier reviewing this PR if it branches from the already reverted PR since we know the reverted PR will solve the deploy blockers without re-introducing new issues.

dukenv0307 · 2024-02-21T05:44:57Z

@srikarparsi I think that's good.

srikarparsi · 2024-02-21T06:12:46Z

Merged the revert PR @dukenv0307, please merge main into this PR whenever you get a chance.

dukenv0307 · 2024-02-21T08:03:47Z

@DylanDylann Merged main and updated to fix the original issue.

DylanDylann · 2024-02-21T11:49:41Z

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 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(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 form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label 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

Screen.Recording.2024-02-21.at.18.45.17-compressed.mov

Android: mWeb Chrome

Screen.Recording.2024-02-21.at.18.46.40-compressed.mov

iOS: Native

Screen.Recording.2024-02-21.at.18.42.59-compressed.mov

iOS: mWeb Safari

Screen.Recording.2024-02-21.at.18.44.41-compressed.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-21.at.18.48.22.mov

MacOS: Desktop

Screen.Recording.2024-02-21.at.18.51.02.mov

srikarparsi

lgtm according to these specifications

OSBotify · 2024-02-22T04:48:42Z

✋ 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-02-26T21:10:11Z

🚀 Deployed to staging by https://github.com/srikarparsi in version: 1.4.44-0 🚀

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

OSBotify · 2024-02-28T23:58:47Z

🚀 Deployed to production by https://github.com/puneetlath in version: 1.4.44-13 🚀

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

Fix regression of issue

e13819e

dukenv0307 mentioned this pull request Feb 21, 2024

[$500] Expense - System message for paid expense shows payer, while the copied content is workspace #33819

Closed

6 tasks

dukenv0307 commented Feb 21, 2024

View reviewed changes

DylanDylann mentioned this pull request Feb 21, 2024

Revert "Consistent system paid message" #36932

Merged

dukenv0307 marked this pull request as ready for review February 21, 2024 05:04

dukenv0307 requested a review from a team as a code owner February 21, 2024 05:04

melvin-bot Bot removed the request for review from a team February 21, 2024 05:04

melvin-bot Bot requested a review from DylanDylann February 21, 2024 05:04

dukenv0307 added 3 commits February 21, 2024 14:23

merge main

5b64016

hide payment type in LHN of report preview

8ce4910

remove empty line

28375a3

DylanDylann approved these changes Feb 21, 2024

View reviewed changes

melvin-bot Bot requested a review from srikarparsi February 21, 2024 11:52

srikarparsi changed the title ~~Fix regression of issue~~ Fix system paid message Feb 22, 2024

srikarparsi approved these changes Feb 22, 2024

View reviewed changes

srikarparsi merged commit 42f1c68 into Expensify:main Feb 22, 2024

This was referenced Feb 22, 2024

Investigate workflow job failing on main: e2ePerformanceTests / Run E2E tests in AWS device farm #37070

Closed

Deploy Checklist: New Expensify 2024-02-26 #37224

Closed

kbecciv mentioned this pull request Feb 27, 2024

[$500] IOU - Message doesn't contain description when Copy to clipboard on money request #37338

Closed

6 tasks

Conversation

dukenv0307 commented Feb 21, 2024 • edited by srikarparsi Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

dukenv0307 Feb 21, 2024

Choose a reason for hiding this comment

Uh oh!

dukenv0307 Feb 21, 2024

Choose a reason for hiding this comment

Uh oh!

DylanDylann commented Feb 21, 2024

Uh oh!

melvin-bot Bot commented Feb 21, 2024

Uh oh!

srikarparsi commented Feb 21, 2024

Uh oh!

dukenv0307 commented Feb 21, 2024

Uh oh!

srikarparsi commented Feb 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dukenv0307 commented Feb 21, 2024

Uh oh!

DylanDylann commented Feb 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

srikarparsi left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Feb 22, 2024

Uh oh!

OSBotify commented Feb 26, 2024

Uh oh!

OSBotify commented Feb 28, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

dukenv0307 commented Feb 21, 2024 •

edited by srikarparsi

Loading

srikarparsi commented Feb 21, 2024 •

edited

Loading

DylanDylann commented Feb 21, 2024 •

edited

Loading