Hide approve/pay buttons if the report contains violations by abzokhattab · Pull Request #51133 · Expensify/App

abzokhattab · 2024-10-19T22:57:15Z

Details

Fixed Issues

$ #50479
PROPOSAL: #50479 (comment)

Tests

Create two accounts: User A and User B.
In User A, create a workspace and invite User B.
Go to workspace settings > More Features and toggle on the Workflows and Rules options.
Go to the workflow page and assign User B as the first approver.
Create an expense report with a high amount, ensuring that it triggers a violation, then submit the report for approval.
Open the expense report and verify that a violation error is displayed appropriately.
In User B's account, go to the submitted expense report and ensure that the Approve button is not visible both in the report preview and the report header.

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-10-19T22:57:19Z

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

hoangzinh · 2024-10-22T10:45:49Z

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 either coming verbatim from figma or has been approved by marketing (in order to get marketing approval, ask the Bug Zero team member to add the Waiting for copy label to the issue)
- 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 UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
- I verified that all the inputs inside a form are aligned with each other.
- I added Design label and/or tagged @Expensify/design 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-11-20.at.17.51.14.android.mov

Android: mWeb Chrome

Screen.Recording.2024-11-20.at.17.48.45.android.chrome.mov

iOS: Native

Screen.Recording.2024-11-20.at.17.52.55.ios.mov

iOS: mWeb Safari

Screen.Recording.2024-11-20.at.17.54.22.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-20.at.17.38.06.web.mov

MacOS: Desktop

Screen.Recording.2024-11-20.at.17.45.10.desktop.mov

hoangzinh · 2024-10-22T15:53:32Z

@abzokhattab can you recheck your recordings?

hoangzinh · 2024-10-22T16:00:56Z

Bug 1: App shows the "Paid" button in the step 7 of Testing steps

abzokhattab · 2024-10-22T16:35:09Z

@abzokhattab can you recheck your recordings?

oh sorry i needed to insert a new line for the images to render

Bug 1: App shows the "Paid" button in the step 7 of Testing steps

Should we also hide the pay button if there is a violation ?

hoangzinh · 2024-10-23T10:08:34Z

Sorry for late response, I thought we won't' show pay button until an expense is approved 👀

abzokhattab · 2024-10-28T13:53:01Z

sorry i missed your comment.

I am trying to reproduce the bug you have but i am not able to ... is there a specific step i am missing?

here is the result with another account

hoangzinh · 2024-10-30T22:45:40Z

Hi @abzokhattab I finally found it. If you're policy owner/admin and also an approver, then instead of hide both Approve and Paid button, we only hide Approve and show Paid

Screen.Recording.2024-10-31.at.05.41.56.mov

I think it's related to this logic

App/src/libs/actions/IOU.ts

Line 7102 in 30b0b8d

!shouldBeApproved &&

abzokhattab · 2024-11-02T11:51:55Z

Good catch!

Thank you, @hoangzinh, for identifying this issue. I’ve disabled the pay button whenever the report contains violations.

hoangzinh · 2024-11-03T23:33:36Z

Bug 2: App still shows the "Approve" button in the report screen, it will hide when you go to IOU details then go back to the report screen

Screen.Recording.2024-11-04.at.06.31.21.mov

hoangzinh · 2024-11-06T11:02:32Z

cc @abzokhattab on the above bug ^

…n-if-expense-has-violatiosn

abzokhattab · 2024-11-07T23:58:02Z

i tried couple of times to reproduce the previous bug but i cannot ... i always get the submit button after submitting the report then after submission no other buttons are shown... is there a step am i missing?

hoangzinh · 2024-11-08T01:50:45Z

It's not always reproducible @abzokhattab. I'm guessing because the component doesn't subscribe to Onyx allTransactionViolations, and we get allTransactionViolations in the memory of util src/libs/actions/IOU.ts. If there is a gap between the data of allTransactionViolations in the memory is not updated when component is rerender -> it still show the "Approve" btn. What do you think?

abzokhattab · 2024-11-10T13:51:12Z

i see .. but the thing is i am not able to reproduce it so i cant tell how it could be solved, i always get the submit button after submitting the report unlike your case (the approve btn). is there a specific reproduction step i am missing?

hoangzinh · 2024-11-11T09:33:36Z

It can be reproducible in native apps (specific Android).

Step to reproduce:

[On Android] Sign in as an approver
[On Android] Go to Workspace chat
[On Web] Sign in as an employee
[On Web] Submit expense with violations
[On Android] Wait expense request is updated in workspace chat

Example: #51133 (comment)

abzokhattab · 2024-11-12T00:14:29Z

following those steps i am still not able to reproduce your case.. can you please recheck that its still reproducible?

ios

Screen.Recording.2024-11-12.at.01.02.07.mov

android

Untitled.mov

hoangzinh · 2024-11-12T10:27:43Z

It's weird that I can still reproduce it in both Android & IOS. Can you confirm if you're logged in as approver in Android/IOS device? Also can you take a step further by go to IOU, then fix error and verify if the Approve button is displayed? Thank you.

Screen.Recording.2024-11-12.at.17.25.22.mov

abzokhattab · 2024-11-18T00:34:49Z

Sorry for the late response ... i had an emergency the last few days ...

Yes i am logged in as an approver ... here is the full rerproduction steps starting from creating a workspace and inviting the other user ... please let me know which step is wrong in this case:

Screen.Recording.2024-11-18.at.01.29.41.mov

hoangzinh · 2024-11-18T09:58:40Z

Hi @abzokhattab can you change to "auto-submit" then in the approver device (mobile device)? And can you go to IOU page and then fix error to see if the approve button appears after resolving all errors?

abzokhattab · 2024-11-19T09:39:12Z

I am now able to reproduce it ... i agree we should pass the violations object as a param to the can approve and pay functions..

the bug is fixed on my side after this change ... can you please double check

hoangzinh · 2024-11-20T10:22:25Z

Looks good. Thanks @abzokhattab I will review today

hoangzinh

LGTM

Gonals · 2024-11-20T14:32:32Z

There are some conflicts @abzokhattab

…n-if-expense-has-violatiosn

abzokhattab · 2024-11-20T19:18:06Z

thanks @Gonals, i have just resolved the conflicts

Gonals · 2024-11-22T14:57:58Z

We have conflicts again 😅

…n-if-expense-has-violatiosn

abzokhattab · 2024-11-23T01:40:01Z

ops .. just merged again :D

src/libs/actions/IOU.ts

hoangzinh · 2024-11-23T02:45:46Z

src/libs/SearchUIUtils.ts


    if (
-        IOU.canIOUBePaid(report, chatReport, policy, allReportTransactions, false, chatReportRNVP, invoiceReceiverPolicy) &&
+        IOU.canIOUBePaid(report, chatReport, policy, allReportTransactions, undefined, false, chatReportRNVP, invoiceReceiverPolicy) &&


Is there any util that returns transaction violations? So we can get and pass here.

We can use oynx.connect to link to the transaction violations at the top of the file. However, from a performance perspective, I thought it would be better to make it optional and use the existing one in the IOU file as a fallback.

let me know if you think we should use the oynx.connect

No worry. I think it's fine for now. Can you do a quick test to ensure everything still good?

OSBotify · 2024-11-26T00:06:11Z

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

github-actions · 2024-11-26T16:40:18Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.67-0 🚀

platform	result
🤖 android 🤖	false ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

…tton-if-expense-has-violatiosn" This reverts commit 24c0770, reversing changes made to 0354bae.

github-actions · 2024-11-28T14:21:21Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.67-9 🚀

platform	result
🤖 android 🤖	skipped 🚫
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

github-actions · 2024-11-28T14:47:03Z

🚀 Deployed to staging by https://github.com/Gonals in version: 9.0.68-0 🚀

platform	result
🤖 android 🤖	false ❌
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	success ✅
🍎🔄 iOS HybridApp 🍎🔄	success ✅

github-actions · 2024-11-30T13:51:38Z

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

platform	result
🤖 android 🤖	skipped 🚫
🖥 desktop 🖥	success ✅
🍎 iOS 🍎	success ✅
🕸 web 🕸	success ✅
🤖🔄 android HybridApp 🤖🔄	failure ❌
🍎🔄 iOS HybridApp 🍎🔄	failure ❌

Hide approve button if report has violations

c8084ff

abzokhattab requested a review from a team as a code owner October 19, 2024 22:57

melvin-bot bot requested a review from hoangzinh October 19, 2024 22:57

melvin-bot bot removed the request for review from a team October 19, 2024 22:57

abzokhattab added 2 commits November 2, 2024 12:39

Disable the pay button if the report has violaitons

3204148

minor edit

f760f27

abzokhattab changed the title ~~Hide approve button if report has violations~~ Hide approve/pay buttons if the report contains violations Nov 2, 2024

abzokhattab added 3 commits November 2, 2024 12:45

minor edit

38a5650

minor edit

7af0e6a

minor edit

6c716bb

Merge remote-tracking branch 'origin/main' into disable-approve-butto…

150d783

…n-if-expense-has-violatiosn

hoangzinh approved these changes Nov 20, 2024

View reviewed changes

melvin-bot bot requested a review from Gonals November 20, 2024 10:57

Gonals previously approved these changes Nov 20, 2024

View reviewed changes

Gonals assigned abzokhattab Nov 20, 2024

Merge remote-tracking branch 'origin/main' into disable-approve-butto…

c3a9f27

…n-if-expense-has-violatiosn

abzokhattab dismissed Gonals’s stale review via c3a9f27 November 20, 2024 16:14

minor

d53ec65

Merge remote-tracking branch 'origin/main' into disable-approve-butto…

68ce50b

…n-if-expense-has-violatiosn

hoangzinh reviewed Nov 23, 2024

View reviewed changes

minor

140bbaa

Gonals approved these changes Nov 25, 2024

View reviewed changes

Gonals merged commit 24c0770 into Expensify:main Nov 25, 2024

bernhardoj mentioned this pull request Nov 26, 2024

Fix missing sound when pay invoice #53129

Merged

50 tasks

github-actions bot mentioned this pull request Nov 26, 2024

Deploy Checklist: New Expensify 2024-11-26 #53142

Closed

75 tasks

mountiny mentioned this pull request Nov 26, 2024

[HOLD for payment 2024-12-07] [HOLD for payment 2024-12-05] Held expense - Pay button disappears after holding one of the expenses #53166

Closed

8 tasks

mountiny added a commit that referenced this pull request Nov 27, 2024

Revert "Merge pull request #51133 from abzokhattab/disable-approve-bu…

5869428

…tton-if-expense-has-violatiosn" This reverts commit 24c0770, reversing changes made to 0354bae.

mountiny mentioned this pull request Nov 27, 2024

[CP Staging] Revert not showing approve and pay buttons if report has violations #53230

Merged

50 tasks

github-actions bot mentioned this pull request Nov 28, 2024

Deploy Checklist: New Expensify 2024-11-28 #53245

Closed

72 tasks

melvin-bot bot mentioned this pull request Nov 28, 2024

[$250] "Approve" button appears even if the report has a violation on it #50479

Closed

6 tasks

Conversation

abzokhattab commented Oct 19, 2024 • 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 Oct 19, 2024

Uh oh!

hoangzinh commented Oct 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

hoangzinh commented Oct 22, 2024

Uh oh!

hoangzinh commented Oct 22, 2024

Uh oh!

abzokhattab commented Oct 22, 2024

Uh oh!

hoangzinh commented Oct 23, 2024

Uh oh!

abzokhattab commented Oct 28, 2024

Uh oh!

hoangzinh commented Oct 30, 2024

Uh oh!

abzokhattab commented Nov 2, 2024

Uh oh!

hoangzinh commented Nov 3, 2024

Uh oh!

hoangzinh commented Nov 6, 2024

Uh oh!

abzokhattab commented Nov 7, 2024

Uh oh!

hoangzinh commented Nov 8, 2024

Uh oh!

abzokhattab commented Nov 10, 2024

Uh oh!

hoangzinh commented Nov 11, 2024

Uh oh!

abzokhattab commented Nov 12, 2024

Uh oh!

hoangzinh commented Nov 12, 2024

Uh oh!

abzokhattab commented Nov 18, 2024

Uh oh!

hoangzinh commented Nov 18, 2024

Uh oh!

abzokhattab commented Nov 19, 2024

Uh oh!

hoangzinh commented Nov 20, 2024

Uh oh!

hoangzinh left a comment

Choose a reason for hiding this comment

Uh oh!

Gonals commented Nov 20, 2024

Uh oh!

abzokhattab commented Nov 20, 2024

Uh oh!

Gonals commented Nov 22, 2024

Uh oh!

abzokhattab commented Nov 23, 2024

Uh oh!

Uh oh!

hoangzinh Nov 23, 2024

Choose a reason for hiding this comment

Uh oh!

abzokhattab Nov 23, 2024

Choose a reason for hiding this comment

Uh oh!

hoangzinh Nov 24, 2024

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Nov 26, 2024

Uh oh!

github-actions bot commented Nov 26, 2024

abzokhattab commented Oct 19, 2024 •

edited

Loading

hoangzinh commented Oct 22, 2024 •

edited

Loading