fix(Violations): fix behaviour of merchant errors by trevor-coleman · Pull Request #36550 · Expensify/App

trevor-coleman · 2024-02-14T23:28:22Z

Details

Fix regression error in #36517

Fixed Issues

$ #36517
PROPOSAL:

Tests

As Employee start the request money flow > "Scan" receipt from Workspace chat
Upload a blurry receipt
Complete the money request flow
Wait for request to fail
Manually edit the amount field
Note that Merchant has a red dot for both Employee and Admin.
As Admin pay the request
The RBR should disappear because the request is paid.

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-02-15.at.5.50.31.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-02-15.at.5.44.24.AM.mov

iOS: Native

iOS: mWeb Safari

Screen.Recording.2024-02-15.at.5.21.05.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-15.at.5.08.15.AM.mov

MacOS: Desktop

Screen.Recording.2024-02-15.at.5.14.50.AM.mov

melvin-bot · 2024-02-14T23:30:59Z

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

allroundexperts · 2024-02-14T23:39:06Z

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-15.at.5.50.31.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-02-15.at.5.44.24.AM.mov

iOS: Native

Screen.Recording.2024-02-15.at.5.36.19.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-02-15.at.5.21.05.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-02-15.at.5.08.15.AM.mov

MacOS: Desktop

Screen.Recording.2024-02-15.at.5.14.50.AM.mov

trevor-coleman · 2024-02-14T23:48:35Z

No merchant field error appears after request is settled.

trevor-coleman · 2024-02-14T23:49:19Z

Checked the unchecked box.

allroundexperts

Works well!

…merchant-fix fix(Violations): fix behaviour of merchant errors (cherry picked from commit 68b9350)

OSBotify · 2024-02-15T01:03:33Z

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

…ing-36550-1 🍒 Cherry pick PR #36550 to staging 🍒

OSBotify · 2024-02-15T01:40:14Z

🚀 Deployed to staging by https://github.com/AndrewGable in version: 1.4.41-12 🚀

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

OSBotify · 2024-02-15T05:26:31Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.41-12 🚀

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

fix(Violations): fix behaviour of merchant errors

afce0a7

trevor-coleman marked this pull request as ready for review February 14, 2024 23:30

trevor-coleman requested a review from a team as a code owner February 14, 2024 23:30

melvin-bot Bot requested review from Gonals and removed request for a team February 14, 2024 23:30

AndrewGable requested review from AndrewGable and allroundexperts and removed request for Gonals February 14, 2024 23:42

allroundexperts approved these changes Feb 15, 2024

View reviewed changes

AndrewGable approved these changes Feb 15, 2024

View reviewed changes

AndrewGable merged commit 68b9350 into Expensify:main Feb 15, 2024

OSBotify pushed a commit that referenced this pull request Feb 15, 2024

Merge pull request #36550 from infinitered/trevor-coleman/violations/…

682e4f5

…merchant-fix fix(Violations): fix behaviour of merchant errors (cherry picked from commit 68b9350)

os-botify Bot mentioned this pull request Feb 15, 2024

🍒 Cherry pick PR #36550 to staging 🍒 #36554

Merged

AndrewGable added a commit that referenced this pull request Feb 15, 2024

Merge pull request #36554 from Expensify/AndrewGable-cherry-pick-stag…

22f023f

…ing-36550-1 🍒 Cherry pick PR #36550 to staging 🍒

github-actions Bot mentioned this pull request Feb 15, 2024

Deploy Checklist: New Expensify 2024-02-13 #36429

Closed

melvin-bot Bot mentioned this pull request Feb 19, 2024

[HOLD for payment 2024-02-26] IOU - Merchant error remains when Admin pay the request #36517

Closed

6 tasks done

Navigation Menu

Repository navigation

fix(Violations): fix behaviour of merchant errors - #36550

fix(Violations): fix behaviour of merchant errors#36550
AndrewGable merged 1 commit into
Expensify:mainfrom
infinitered:trevor-coleman/violations/merchant-fix

trevor-coleman commented Feb 14, 2024 •

edited by AndrewGable

Loading

Uh oh!

melvin-bot Bot commented Feb 14, 2024

Uh oh!

allroundexperts commented Feb 14, 2024 •

edited

Loading

Uh oh!

trevor-coleman commented Feb 14, 2024

Uh oh!

trevor-coleman commented Feb 14, 2024

Uh oh!

allroundexperts left a comment

Uh oh!

OSBotify commented Feb 15, 2024

Uh oh!

OSBotify commented Feb 15, 2024

Uh oh!

OSBotify commented Feb 15, 2024

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

trevor-coleman commented Feb 14, 2024 • edited by AndrewGable Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Details

Fixed Issues

Tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Feb 14, 2024

Uh oh!

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

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

trevor-coleman commented Feb 14, 2024

Uh oh!

trevor-coleman commented Feb 14, 2024

Uh oh!

allroundexperts left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Feb 15, 2024

Uh oh!

OSBotify commented Feb 15, 2024

Uh oh!

OSBotify commented Feb 15, 2024

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

trevor-coleman commented Feb 14, 2024 •

edited by AndrewGable

Loading

allroundexperts commented Feb 14, 2024 •

edited

Loading