Expense Report header should not show violation info by narefyev91 · Pull Request #56753 · Expensify/App

narefyev91 · 2025-02-12T12:06:31Z

Explanation of Change

Mark as cash button and "next steps" (Violation flow) should not appear in the expense report, should appear only in the expense page

Fixed Issues

$ #55821
PROPOSAL: #55821 (comment)

Tests

Submit expenses
The expense report should have card expenses and any of the expense should have violation problems
Verify that Mark as Cash button is not presenting
Verify that no icon and description is shown under report name

Verify that no errors appear in the JS console

Offline tests

No changes

QA Steps

Submit expenses
The expense report should have card expenses and any of the expense should have violation problems
Verify that Mark as Cash button is not presenting
Verify that no icon and description is shown under report name

Verify that no errors appear in the JS console

PR Author Checklist

I linked the correct issue in the ### Fixed Issues section above
I wrote clear testing steps that cover the changes made in this PR
- I added steps for local testing in the Tests section
- I added steps for the expected offline behavior in the Offline steps section
- I added steps for Staging and/or Production testing in the QA steps section
- I added steps to cover 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 tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
I included screenshots or videos for tests on all platforms
I ran the tests on all platforms & verified they passed on:
- Android: Native
- Android: mWeb Chrome
- iOS: Native
- iOS: mWeb Safari
- MacOS: Chrome / Safari
- MacOS: Desktop
I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
I followed proper code patterns (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
  - If any non-english text was added/modified, I used JaimeGPT to get English > Spanish translation. I then posted it in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
- 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 followed the guidelines as stated in the Review Guidelines
I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
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
I verified that if a function's arguments changed that all usages have also been updated correctly
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.
I added unit tests for any new feature or bug fix in this PR to help automatically prevent regressions in this user 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2025-02-12T12:06:37Z

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

ZhenjaHorbach · 2025-02-12T17:22:23Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

ZhenjaHorbach · 2025-02-13T11:19:30Z

LGTM !

rafecolton · 2025-02-13T15:55:22Z

+        !!transactionThreadReportID &&
+        (hasAllPendingRTERViolations || (shouldShowBrokenConnectionViolation && (!isPolicyAdmin(policy) || isCurrentUserSubmitter(moneyRequestReport?.reportID))));


Can you add some comments please explaining what these do and why they are necessary?

hey @rafecolton ! all these checks were initially there - i just add !!transactionThreadReportID - do you want me to add explanation for each of them?

Yes please, it would be helpful for the next person who views this code

@rafecolton add notes for hasAllPendingRTERViolations and shouldShowBrokenConnectionViolation
rest of them are using a lot in the code

rafecolton · 2025-02-13T19:12:43Z

    const hasAllPendingRTERViolations = allHavePendingRTERViolation(transactionIDs);
-    const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(transactionIDs, moneyRequestReport, policy);
+    // Check if user should see broken connection violation warning.
+    const shouldShowBrokenConnectionViolation = shouldShowBrokenConnectionViolationTransactionUtils(transactionIDs, moneyRequestReport, policy) && !!transactionThreadReportID;


I see you include !!transactionThreadReportID, then it is included again below in the shouldShowMarkAsCashButton assignment. Can any of that logic be simplified?

hmm not really - there are some different flows which can be happened.
For example why we need both checks here and below
If we open expense page - !!transactionThreadReportID - will be true,
hasAllPendingRTERViolations - maybe false (because for example one transaction is already submitted and one is still pending)
shouldShowBrokenConnectionViolation - is checking if we have any violation errors - based on && condition right side !!transactionThreadReportID - will be true and left side maybe false (because no violation) - and in that case we do not need to show markAsCash button.

Generally markAsCash button should be shown in 2 cases:

When expense page + all transaction pending violations

When expense page - any of transaction has violation + not policy admin or current submitter

Also shouldShowBrokenConnectionViolation check a lot more in the below code - which is not related to shouldShowMarkAsCashButton

Sounds good, thanks for explaining!

OSBotify · 2025-02-14T21:20:05Z

✋ 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 · 2025-02-17T09:24:34Z

🚀 Deployed to staging by https://github.com/rafecolton in version: 9.0.99-0 🚀

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

izarutskaya · 2025-02-17T20:52:46Z

Hi @narefyev91 We can create card expenses only using this steps, how can we receive violation problems ?

github-actions · 2025-02-18T06:16:37Z

🚀 Deployed to production by https://github.com/francoisl in version: 9.0.99-2 🚀

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

narefyev91 added 2 commits February 12, 2025 13:34

Expense Report header should not show violation info

b4cdc99

fix mark as cash visibility

b55f991

narefyev91 requested a review from a team as a code owner February 12, 2025 12:06

melvin-bot Bot requested review from ZhenjaHorbach and removed request for a team February 12, 2025 12:06

ZhenjaHorbach approved these changes Feb 13, 2025

View reviewed changes

melvin-bot Bot requested a review from rafecolton February 13, 2025 11:19

rafecolton reviewed Feb 13, 2025

View reviewed changes

add some notes

23ef0eb

rafecolton reviewed Feb 13, 2025

View reviewed changes

rafecolton approved these changes Feb 14, 2025

View reviewed changes

rafecolton merged commit 73da07d into Expensify:main Feb 14, 2025

dominictb mentioned this pull request Feb 16, 2025

[$250] Mark as cash appears in the expense report instead of the expense page #56498

Closed

8 tasks

github-actions Bot mentioned this pull request Feb 17, 2025

Deploy Checklist: New Expensify 2025-02-17 #56922

Closed

46 tasks

melvin-bot Bot mentioned this pull request Feb 18, 2025

[Due for payment 2025-02-25] [$250] Report header is missing all the information #55821

Closed

8 tasks

		!!transactionThreadReportID &&
		(hasAllPendingRTERViolations \|\| (shouldShowBrokenConnectionViolation && (!isPolicyAdmin(policy) \|\| isCurrentUserSubmitter(moneyRequestReport?.reportID))));

Uh oh!

Conversation

narefyev91 commented Feb 12, 2025

Explanation of Change

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

Uh oh!

melvin-bot Bot commented Feb 12, 2025

Uh oh!

ZhenjaHorbach commented Feb 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Reviewer Checklist

Screenshots/Videos

Uh oh!

ZhenjaHorbach commented Feb 13, 2025

Uh oh!

rafecolton Feb 13, 2025

Choose a reason for hiding this comment

Uh oh!

narefyev91 Feb 13, 2025

Choose a reason for hiding this comment

Uh oh!

rafecolton Feb 13, 2025

Choose a reason for hiding this comment

Uh oh!

narefyev91 Feb 13, 2025

Choose a reason for hiding this comment

Uh oh!

rafecolton Feb 13, 2025

Choose a reason for hiding this comment

Uh oh!

narefyev91 Feb 14, 2025

Choose a reason for hiding this comment

Uh oh!

rafecolton Feb 14, 2025

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Feb 14, 2025

Uh oh!

github-actions Bot commented Feb 17, 2025

Uh oh!

izarutskaya commented Feb 17, 2025

Uh oh!

github-actions Bot commented Feb 18, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

ZhenjaHorbach commented Feb 12, 2025 •

edited

Loading