[CP Staging]: Avoid hiding pay/approve buttons in case of held violations by abzokhattab · Pull Request #53176 · Expensify/App

abzokhattab · 2024-11-26T22:38:01Z

Explanation of Change

Fixed Issues

$ #53166
PROPOSAL: #53166 (comment)

Tests

[User A] Submit two expenses to user B.
[User B] Go to chat with user A.
[User B] Go to expense report.
[User B] Hold one of the expenses.
Validate that the Pay button still appears after holding the expense

Offline tests

Same as tests

QA Steps

Same as tests

PR Author Checklist

Screenshots/Videos

Android: Native

Screen.Recording.2024-11-26.at.23.08.30.mov

Android: mWeb Chrome

Screen.Recording.2024-11-26.at.23.16.44.mov

iOS: Native

Screen.Recording.2024-11-26.at.23.07.14.mov

iOS: mWeb Safari

Screen.Recording.2024-11-26.at.23.08.18.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-26.at.22.41.34.mov

MacOS: Desktop

melvin-bot · 2024-11-26T22:52:19Z

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

hoangzinh · 2024-11-26T23:32:05Z

src/libs/ReportUtils.ts

+ */
+function hasNonHoldViolations(reportID: string, transactionViolations: OnyxCollection<TransactionViolation[]>, shouldShowInReview?: boolean): boolean {
+    const transactions = reportsTransactions[reportID] ?? [];
+    return transactions.some((transaction) => TransactionUtils.hasViolation(transaction.transactionID, transactionViolations, shouldShowInReview) && !TransactionUtils.isOnHold(transaction));


I think it will cause a weird behavior when a transaction has violations, but if we put it on-hold, we can approve it.

Screen.Recording.2024-11-27.at.06.30.02.mov

We may need to filter out hold transactions here if it has not only held transactions

const transactions = reportsTransactions[reportID] ?? [];

good catch .. i have tackled this point in this commit 2ff9810

hoangzinh · 2024-11-27T10:36:47Z

Hi @abdulrahuman5196. This DB comes from our PR so let me handle this PR as a regression bug.

hoangzinh · 2024-11-27T11:39:52Z

src/libs/actions/IOU.ts

    const isArchivedReport = ReportUtils.isArchivedRoom(iouReport, reportNameValuePairs);
    const allViolations = violations ?? allTransactionViolations;
-    const hasViolations = ReportUtils.hasViolations(iouReport?.reportID ?? '-1', allViolations);
+    const hasNonHeldViolations = ReportUtils.hasViolations(iouReport?.reportID ?? '-1', allViolations) && !ReportUtils.hasOnlyHeldExpenses(iouReport?.reportID ?? '-1');


@abzokhattab I don't think it's a correct fix. A nonHeldExpense has violations but if there is a held expense, it will bypass and show the approve button.

ops i thought that's what you meant by this comment #53176 (comment) ...

thinking about it ..

What do you think about?

const transactions = reportsTransactions[reportID] ?? []; const transactionViolationsFiltered = transactionViolations.filter(x => x.name !== VIOLATIONS.HOLD) return transactions.some((transaction) => TransactionUtils.hasViolation(transaction.transactionID, transactionViolationsFiltered, shouldShowInReview));

or we can use previous implementation, but define another method TransactionUtils.hasNonHoldViolations and we filter hold violation in that method.

i was thinking about the second approach ... I believe it would be better in case we need that functionality elsewhere in the future, as it would be more maintainable.

Screen.Recording.2024-11-27.at.14.35.03.mov

There are a lot of unrelated changes. Can you revert them?

Its just for reorganizing the exports to be alphabetically ordered ... its just cleaner and easier to read ... let me know if you still think we need to revert them
i dont see other unrelated changes

hoangzinh · 2024-11-27T11:41:57Z

@abzokhattab please add a prefix "[CP Staging]" in the PR title if it's a DB fix.

src/libs/ReportUtils.ts

hoangzinh · 2024-11-27T14:28:05Z

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 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.ts 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.
For any bug fix or new feature in this PR, I verified that sufficient unit tests are included to prevent regressions in this flow.
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-27.at.21.42.06.android.mov

Android: mWeb Chrome

Screen.Recording.2024-11-27.at.21.47.17.android.chrome.mov

iOS: Native

Screen.Recording.2024-11-27.at.21.48.22.ios.mov

iOS: mWeb Safari

Screen.Recording.2024-11-27.at.21.49.59.ios.safari.mov

MacOS: Chrome / Safari

Screen.Recording.2024-11-27.at.21.32.58.web.mov

MacOS: Desktop

Screen.Recording.2024-11-27.at.21.38.21.desktop.mov

hoangzinh · 2024-11-27T14:30:58Z

@abzokhattab can you add recording for Desktop too? Thanks

mountiny · 2024-11-27T15:15:56Z

src/libs/ReportUtils.ts

+/**
+ * Checks to see if a report contains non-hold violations
+ */
+function hasNonHoldViolations(reportID: string, transactionViolations: OnyxCollection<TransactionViolation[]>, shouldShowInReview?: boolean): boolean {


NAB: technically you just care about one violation

Suggested change

function hasNonHoldViolations(reportID: string, transactionViolations: OnyxCollection<TransactionViolation[]>, shouldShowInReview?: boolean): boolean {

function hasNonHoldViolation(reportID: string, transactionViolations: OnyxCollection<TransactionViolation[]>, shouldShowInReview?: boolean): boolean {

src/libs/TransactionUtils/index.ts

mountiny · 2024-11-27T15:23:46Z

src/libs/actions/IOU.ts

    const isArchivedReport = ReportUtils.isArchivedRoom(iouReport, reportNameValuePairs);
    const allViolations = violations ?? allTransactionViolations;
-    const hasViolations = ReportUtils.hasViolations(iouReport?.reportID ?? '-1', allViolations);
+    const hasNonHeldViolations = ReportUtils.hasNonHoldViolations(iouReport?.reportID ?? '-1', allViolations);


Lets call it hold as in other places

Suggested change

const hasNonHeldViolations = ReportUtils.hasNonHoldViolations(iouReport?.reportID ?? '-1', allViolations);

const hasNonHoldViolations = ReportUtils.hasNonHoldViolations(iouReport?.reportID ?? '-1', allViolations);

mountiny

Thanks!

OSBotify · 2024-11-27T18:27:17Z

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

…en-violations-are-held (cherry picked from commit 9014956) (CP triggered by mountiny)

github-actions · 2024-11-27T19:08:35Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.67-4 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

…utton-when-violations-are-held" This reverts commit 9014956, reversing changes made to 238add9.

github-actions · 2024-11-28T14:23:30Z

🚀 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:48:54Z

🚀 Cherry-picked to staging by https://github.com/mountiny in version: 9.0.68-0 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

github-actions · 2024-11-30T13:53:29Z

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

Avoid hiding pay/approve buttons in case of held violations

04f6610

abzokhattab marked this pull request as ready for review November 26, 2024 22:52

abzokhattab requested a review from a team as a code owner November 26, 2024 22:52

melvin-bot bot requested review from abdulrahuman5196 and removed request for a team November 26, 2024 22:52

abzokhattab 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

hoangzinh reviewed Nov 26, 2024

View reviewed changes

mountiny assigned abzokhattab Nov 27, 2024

abzokhattab added 2 commits November 27, 2024 12:17

Avoid hiding pay/approve buttons in case of held violations

2ff9810

cleanup

551fac9

hoangzinh reviewed Nov 27, 2024

View reviewed changes

abzokhattab changed the title ~~Avoid hiding pay/approve buttons in case of held violations~~ [CP Staging]: Avoid hiding pay/approve buttons in case of held violations Nov 27, 2024

Avoid hiding pay/approve buttons in case of held violations

dd8e9fa

hoangzinh reviewed Nov 27, 2024

View reviewed changes

src/libs/ReportUtils.ts Outdated Show resolved Hide resolved

refactoring the hasNonHoldViolations function comment

3a1c4eb

abzokhattab requested a review from hoangzinh November 27, 2024 15:06

hoangzinh approved these changes Nov 27, 2024

View reviewed changes

melvin-bot bot requested a review from puneetlath November 27, 2024 15:08

mountiny requested changes Nov 27, 2024

View reviewed changes

minor refactoring

1668da7

abzokhattab requested a review from mountiny November 27, 2024 15:33

mountiny approved these changes Nov 27, 2024

View reviewed changes

mountiny merged commit 9014956 into Expensify:main Nov 27, 2024

OSBotify pushed a commit that referenced this pull request Nov 27, 2024

Merge pull request #53176 from abzokhattab/avoid-hiding-pay-button-wh…

9cf6fed

…en-violations-are-held (cherry picked from commit 9014956) (CP triggered by mountiny)

github-actions bot added the CP Staging marks PRs that have been CP'd to staging label Nov 27, 2024

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

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

Closed

75 tasks

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

Revert "Merge pull request #53176 from abzokhattab/avoid-hiding-pay-b…

3f9bf24

…utton-when-violations-are-held" This reverts commit 9014956, reversing changes made to 238add9.

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

	function hasNonHoldViolations(reportID: string, transactionViolations: OnyxCollection<TransactionViolation[]>, shouldShowInReview?: boolean): boolean {
	function hasNonHoldViolation(reportID: string, transactionViolations: OnyxCollection<TransactionViolation[]>, shouldShowInReview?: boolean): boolean {

	const hasNonHeldViolations = ReportUtils.hasNonHoldViolations(iouReport?.reportID ?? '-1', allViolations);
	const hasNonHoldViolations = ReportUtils.hasNonHoldViolations(iouReport?.reportID ?? '-1', allViolations);

Conversation

abzokhattab commented Nov 26, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Nov 26, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Nov 27, 2024

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abzokhattab Nov 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

abzokhattab Nov 27, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hoangzinh commented Nov 27, 2024

Uh oh!

Uh oh!

hoangzinh commented Nov 27, 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 Nov 27, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

mountiny left a comment

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Nov 27, 2024

Uh oh!

github-actions bot commented Nov 27, 2024

Uh oh!

github-actions bot commented Nov 28, 2024

Uh oh!

github-actions bot commented Nov 28, 2024

Uh oh!

github-actions bot commented Nov 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

abzokhattab commented Nov 26, 2024 •

edited

Loading

hoangzinh Nov 27, 2024 •

edited

Loading

abzokhattab Nov 27, 2024 •

edited

Loading

abzokhattab Nov 27, 2024 •

edited

Loading

hoangzinh commented Nov 27, 2024 •

edited

Loading