Fix the settled preview message #23110

mountiny · 2023-07-18T17:28:38Z

Details

Updating the settled message on the money request preview to say using Expensify in case admin has reimbursed the employee or when Wallet has been used (hard to test).

Additionally, this PR should ensure the optimistic payment message will always have positive payment amount.

Part of it is on hold for https://github.com/Expensify/Web-Expensify/pull/38210 but its not really important as the current behaviour is already a bit buggy

Fixed Issues

$ #23022

Tests

Have accounts on the policyExpenseChat bet
Create workspace and invite an employee to the workspace
Chat some in the workspace chat
Set up the admin account with active VBBA account using steps from here to OPEN state
Using cliTools add credit bank account to the employee
As employee request money from the workspace
As admin, force yourself offline
Pay the money request

Verify its showing paid with expensify in the LHN

Go back online and confirm the messages stay the same
Go to the Expense report and verify the message says Paid $XX.XX using Expensify

Verify that no errors appear in the JS console

Offline tests

As tests

QA Steps

As tests We can QA with @anmurali

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Admin on left and employee on the right

expense report detail

Mobile Web - Chrome

Mobile Web - Safari

Notce the Expensify correctly written in the LHN

Desktop

Same as web

iOS

Android

melvin-bot · 2023-07-18T23:03:24Z

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

luacmartins · 2023-07-19T17:02:34Z

src/libs/ReportUtils.js

    let paymentMethodMessage;
    switch (paymentType) {
        case CONST.IOU.PAYMENT_TYPE.ELSEWHERE:
            paymentMethodMessage = ' elsewhere';
            break;
+        case CONST.IOU.PAYMENT_TYPE.VBBA:


What about PAYMENT_TYPE.EXPENSIFY?

The payment type is Expensify so this will Just Work

using ${paymentType};

mountiny · 2023-07-19T21:11:28Z

Responded

luacmartins · 2023-07-19T21:19:50Z

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

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

luacmartins · 2023-07-19T22:01:55Z

Gonna merge this. Just noting that while the optimistic response will be correct, it will be reverted to the incorrect one until we merge/deploy the web PR

OSBotify · 2023-07-19T22:07:13Z

✋ 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-07-21T18:51:18Z

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

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

OSBotify · 2023-07-25T01:25:15Z

🚀 Deployed to production by https://github.com/marcaaron in version: 1.3.44-2 🚀

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

OSBotify · 2023-07-25T01:45:54Z

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

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

OSBotify · 2023-07-26T15:55:25Z

🚀 Deployed to production by https://github.com/mountiny in version: 1.3.45-7 🚀

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

mountiny added 3 commits July 18, 2023 17:07

Use Expensify in case of ACH payment method

285cd71

Use absolute value for the paid amount total

ce297e9

Update the language constants to be more in line with other iou messages

9138da8

mountiny self-assigned this Jul 18, 2023

mountiny added 4 commits July 18, 2023 20:30

Merge branch 'main' into vit-fixSettledMessage

54397c4

Merge branch 'vit-fixMissingSettlementButton' into vit-fixSettledMessage

c67c236

Make sure correct payment messages are shown in LHN

5a8a80f

Add Billing to the state options

d86d4bb

mountiny added the InternalQA This pull request required internal QA label Jul 18, 2023

mountiny marked this pull request as ready for review July 18, 2023 23:03

mountiny requested a review from a team as a code owner July 18, 2023 23:03

melvin-bot bot requested review from abdulrahuman5196 and removed request for a team July 18, 2023 23:03

mountiny removed the request for review from abdulrahuman5196 July 18, 2023 23:08

luacmartins self-requested a review July 18, 2023 23:16

luacmartins reviewed Jul 19, 2023

View reviewed changes

Merge branch 'main' into vit-fixSettledMessage

8689bb2

mountiny requested a review from luacmartins July 19, 2023 21:11

luacmartins approved these changes Jul 19, 2023

View reviewed changes

luacmartins merged commit 471b139 into main Jul 19, 2023

luacmartins deleted the vit-fixSettledMessage branch July 19, 2023 22:02

OSBotify mentioned this pull request Jul 21, 2023

Deploy Checklist: New Expensify 2023-07-21 #23362

Closed

OSBotify mentioned this pull request Jul 25, 2023

Deploy Checklist: New Expensify 2023-07-25 #23522

Closed

melvin-bot bot mentioned this pull request Jul 25, 2023

[HOLD for payment 2023-08-01] Incorrect payment type showing when expense report paid optimistically #23022

Closed

rushatgabhane mentioned this pull request Aug 2, 2023

[HOLD for payment 2023-07-24] [$1000] When paying an IOU with a gold wallet, the paid message says undefined #21535

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix the settled preview message #23110

Fix the settled preview message #23110

mountiny commented Jul 18, 2023 •

edited

Loading

melvin-bot bot commented Jul 18, 2023

luacmartins Jul 19, 2023

mountiny Jul 19, 2023

mountiny commented Jul 19, 2023

luacmartins commented Jul 19, 2023 •

edited

Loading

luacmartins commented Jul 19, 2023

OSBotify commented Jul 19, 2023

OSBotify commented Jul 21, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 26, 2023

Fix the settled preview message #23110

Fix the settled preview message #23110

Conversation

mountiny commented Jul 18, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jul 18, 2023

luacmartins Jul 19, 2023

Choose a reason for hiding this comment

mountiny Jul 19, 2023

Choose a reason for hiding this comment

mountiny commented Jul 19, 2023

luacmartins commented Jul 19, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

luacmartins commented Jul 19, 2023

OSBotify commented Jul 19, 2023

OSBotify commented Jul 21, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 25, 2023

OSBotify commented Jul 26, 2023

mountiny commented Jul 18, 2023 •

edited

Loading

luacmartins commented Jul 19, 2023 •

edited

Loading