Use Paid in money request preview by mountiny · Pull Request #33020 · Expensify/App

mountiny · 2023-12-13T21:35:18Z

Details

The IOU create action does not know what payment type has been used to settle a report so lets just use the generic Paid message in the report.

The payment type is captured in the Pay action which is then at the end of the report.

Fixed Issues

Partially #32412

Tests

Create an IOU report
Pay it
Verify the request preview says Paid
Verify the pay action states the payment type used

Repeat same for the expense report

Notice the card says Paid but the message below says the payment type

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as tests

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Simple logic change

Android: mWeb Chrome

Simple logic change

iOS: Native

Simple logic change

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

Same as web

melvin-bot · 2023-12-13T21:35:54Z

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

mountiny · 2023-12-13T21:41:01Z

    const getSettledMessage = () => {
        if (isExpensifyCardTransaction) {
-            return props.translate('common.done');
-        }
-        switch (lodashGet(props.action, 'originalMessage.paymentType', '')) {
-            case CONST.IOU.PAYMENT_TYPE.EXPENSIFY:
-                return props.translate('iou.settledExpensify');
-            default:
-                return props.translate('iou.settledElsewhere');
+            return translate('common.done');
        }
+        return translate('iou.settledExpensify');


This is the important change, the rest is beauty

luacmartins · 2023-12-13T22:38:01Z

@mountiny lint is failing

luacmartins · 2023-12-13T22:53:54Z

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 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

MacOS: Desktop

OSBotify · 2023-12-13T23:24:43Z

✋ 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-12-14T16:06:22Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.13-0 🚀

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

OSBotify · 2023-12-14T16:46:10Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.4.13-0 🚀

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

OSBotify · 2023-12-19T02:02:31Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.4.13-8 🚀

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

mountiny added 2 commits December 13, 2023 21:07

Also VBBA is paid via expensify

820b50c

Use Paid in money request preview consistently

4db49a7

mountiny self-assigned this Dec 13, 2023

mountiny requested a review from a team as a code owner December 13, 2023 21:35

melvin-bot Bot requested review from blimpich and removed request for a team December 13, 2023 21:35

mountiny commented Dec 13, 2023

View reviewed changes

Resolve merge conflicts

05e17a1

luacmartins previously approved these changes Dec 13, 2023

View reviewed changes

Prettier

517f7b5

mountiny dismissed luacmartins’s stale review via 517f7b5 December 13, 2023 22:52

luacmartins approved these changes Dec 13, 2023

View reviewed changes

luacmartins merged commit fe2d0d1 into main Dec 13, 2023

luacmartins deleted the vit-fixPaymentMessage2 branch December 13, 2023 23:20

github-actions Bot mentioned this pull request Dec 14, 2023

Deploy Checklist: New Expensify 2023-12-14 #33072

Closed

77 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Use Paid in money request preview#33020

Use Paid in money request preview#33020
luacmartins merged 4 commits into
mainfrom
vit-fixPaymentMessage2

mountiny commented Dec 13, 2023 •

edited

Loading

Uh oh!

melvin-bot Bot commented Dec 13, 2023

Uh oh!

mountiny Dec 13, 2023

Uh oh!

luacmartins commented Dec 13, 2023

Uh oh!

luacmartins commented Dec 13, 2023 •

edited

Loading

Uh oh!

OSBotify commented Dec 13, 2023

Uh oh!

OSBotify commented Dec 14, 2023

Uh oh!

OSBotify commented Dec 14, 2023

Uh oh!

OSBotify commented Dec 19, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

mountiny commented Dec 13, 2023 • edited 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!

melvin-bot Bot commented Dec 13, 2023

Uh oh!

mountiny Dec 13, 2023

Choose a reason for hiding this comment

Uh oh!

luacmartins commented Dec 13, 2023

Uh oh!

luacmartins commented Dec 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

OSBotify commented Dec 13, 2023

Uh oh!

OSBotify commented Dec 14, 2023

Uh oh!

OSBotify commented Dec 14, 2023

Uh oh!

OSBotify commented Dec 19, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

mountiny commented Dec 13, 2023 •

edited

Loading

luacmartins commented Dec 13, 2023 •

edited

Loading