Hide approved button if report on policy that's on "instant submit" and "Submit and closed" mode #35470

Beamanator · 2024-01-31T13:13:59Z

Details

Approver shouldn't be able to "Approve" an expense report IFF the report's policy is a Collect Policy, on "Instant Submit" reporting frequency, with "Submit & Close" approval mode. Otherwise we want to enable this.

Fixed Issues

$ Related to https://github.com/Expensify/Expensify/issues/364086

Tests

Check out https://github.com/Expensify/Web-Expensify/pull/40718 if you're testing on dev
On OldDot: Create a collect plan, with isPolicyExpenseChatEnabled set to true (SO)
- make sure the reporting frequency is set to instant
- make sure the approval mode is set to Submit and Close (on the policy settings "members" page)
On OldDot: Invite a member as an employee
On OldDot: As the employee, create a report w/ an expense on that workspace
In NewDot: As the employee, open the report
- Verify the Next Steps still say Waiting for <admin> to pay these expenses. You can still add expenses while the report is Processing.
In NewDot: Back in the admin account, open the report
- Verify in the "Pay" dropdown, you don't see the "Approve" button anymore, you should only see "Pay elsewhere" and "Pay with Expensify"
In NewDot: Click "Pay Elsewhere" and verify it succeeds, and adds the "Paid elsewhere" report action
- Note: We currently also show You marked this report as manually reimbursed. This report will be reimbursed outside of Expensify but this is a known bug, being addressed in [$500] IOU - 'You marked this report...' message only appears on the second visit to IOU report #34003

Verify that no errors appear in the JS console

Offline tests

Can't really test offline, we don't have the ability to change a workspace's auto reporting frequency or approval mode in NewDot yet (planned for wave8) so all we can test here is data loaded from the server, so must be online

QA Steps

Same as above

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

Employee:

Admin:

MacOS: Desktop

…vedBtnIfInstantSubmitAndClosed

melvin-bot · 2024-02-05T11:22:33Z

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

amyevans · 2024-02-06T23:21:04Z

Will review tomorrow, sorry for the delay!

…vedBtnIfInstantSubmitAndClosed

Beamanator · 2024-02-07T06:17:09Z

no prob at all! i was out yesterday anyway.

merged main cuz it seems like a LOT OF SHTUFF went down recently lol

amyevans

Code LGTM 👍

amyevans · 2024-02-07T17:01:46Z

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

Employee view:

Admin view:

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

Beamanator · 2024-02-07T18:15:39Z

Web-e PR on staging! 💪

Now to figure out why performance tests are failing 🤔

amyevans · 2024-02-07T18:47:55Z

I think it just needs another merge of main, they were fixed there a few hours ago 😄

Beamanator · 2024-02-08T07:59:10Z

aah ok!! ANOTHER main merge incoming 😅

…vedBtnIfInstantSubmitAndClosed

Beamanator · 2024-02-08T08:09:12Z

Sweeeeet they passed!!

Hoping web will get to prod soonish so we can get this bad boi merged before the weekend 🙏

amyevans · 2024-02-08T16:05:25Z

Looks like https://github.com/Expensify/Web-Expensify/pull/40718 is on prod so I'll remove the hold and merge 🙌

OSBotify · 2024-02-08T16:12:44Z

✋ 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 · 2024-02-08T18:44:01Z

🚀 Deployed to staging by https://github.com/amyevans in version: 1.4.39-0 🚀

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

OSBotify · 2024-02-12T14:01:40Z

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.39-8 🚀

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

Beamanator added 3 commits January 31, 2024 14:39

Add isInstantSubmitEnabled util function

aeb546e

New util for checking submit and close

4b39c31

Hide Approve if on instant submit & submit & close

c6a4cbf

Beamanator self-assigned this Jan 31, 2024

Beamanator changed the title ~~Hide approved button if report on policy that's on "instant submit" and "Submit and closed" mode~~ [HOLD Web-E#40718] Hide approved button if report on policy that's on "instant submit" and "Submit and closed" mode Jan 31, 2024

Beamanator added 2 commits February 5, 2024 10:45

Merge branch 'main' of github.com:Expensify/App into beaman-hideAppro…

340e4d0

…vedBtnIfInstantSubmitAndClosed

prettify

e4d4faf

Beamanator marked this pull request as ready for review February 5, 2024 11:22

Beamanator requested a review from a team as a code owner February 5, 2024 11:22

melvin-bot bot requested review from amyevans and removed request for a team February 5, 2024 11:22

Merge branch 'main' of github.com:Expensify/App into beaman-hideAppro…

bf8b6d6

…vedBtnIfInstantSubmitAndClosed

amyevans approved these changes Feb 7, 2024

View reviewed changes

Merge branch 'main' of github.com:Expensify/App into beaman-hideAppro…

1176350

…vedBtnIfInstantSubmitAndClosed

amyevans changed the title ~~[HOLD Web-E#40718] Hide approved button if report on policy that's on "instant submit" and "Submit and closed" mode~~ Hide approved button if report on policy that's on "instant submit" and "Submit and closed" mode Feb 8, 2024

amyevans merged commit 22f2a48 into main Feb 8, 2024
16 checks passed

amyevans deleted the beaman-hideApprovedBtnIfInstantSubmitAndClosed branch February 8, 2024 16:06

github-actions bot mentioned this pull request Feb 8, 2024

Deploy Checklist: New Expensify 2024-02-08 #36168

Closed

77 tasks

bernhardoj mentioned this pull request Apr 2, 2024

[C+ Checklist Needs Completion] [$500] IOU - Approve button appears while approvals is disabled #39171

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hide approved button if report on policy that's on "instant submit" and "Submit and closed" mode #35470

Hide approved button if report on policy that's on "instant submit" and "Submit and closed" mode #35470

Beamanator commented Jan 31, 2024 •

edited

Loading

melvin-bot bot commented Feb 5, 2024

amyevans commented Feb 6, 2024

Beamanator commented Feb 7, 2024

amyevans left a comment

amyevans commented Feb 7, 2024 •

edited

Loading

Beamanator commented Feb 7, 2024

amyevans commented Feb 7, 2024

Beamanator commented Feb 8, 2024

Beamanator commented Feb 8, 2024

amyevans commented Feb 8, 2024

OSBotify commented Feb 8, 2024

OSBotify commented Feb 8, 2024

OSBotify commented Feb 12, 2024

Hide approved button if report on policy that's on "instant submit" and "Submit and closed" mode #35470

Hide approved button if report on policy that's on "instant submit" and "Submit and closed" mode #35470

Conversation

Beamanator commented Jan 31, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 5, 2024

amyevans commented Feb 6, 2024

Beamanator commented Feb 7, 2024

amyevans left a comment

Choose a reason for hiding this comment

amyevans commented Feb 7, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

Beamanator commented Feb 7, 2024

amyevans commented Feb 7, 2024

Beamanator commented Feb 8, 2024

Beamanator commented Feb 8, 2024

amyevans commented Feb 8, 2024

OSBotify commented Feb 8, 2024

OSBotify commented Feb 8, 2024

OSBotify commented Feb 12, 2024

Beamanator commented Jan 31, 2024 •

edited

Loading

amyevans commented Feb 7, 2024 •

edited

Loading