Hide pay button when auto reimbursement enabled by marcochavezf · Pull Request #33987 · Expensify/App

marcochavezf · 2024-01-05T00:22:37Z

~~On hold for https://github.com/Expensify/Web-Expensify/pull/40396~~

Details

This PR hides the Pay button after approval for group policies only if the auto-reimbursement limit is greater than or equal to the reimbursable total and if the reimbursement is enabled at the policy level.

Fixed Issues

$ #33716

Tests

Create a collect policy in OldDot with direct reimbursement

Add a withdrawal account
Set Manual reimbursement to a big number

Execute the following JS snippet in the OldDot policy to enable workspace chats creation:

if (Url.getCurrentPageName()!="policy" ){ alert('Only run this snippet from a policy editor!'); } else { var p = Policy.getCurrent(); p.policy.isPolicyExpenseChatEnabled = "true"; p.save().done(function(){$.jGrowl('Workspace chat creation enabled!')}); }

Add a member and an approver (the approver can be the policy owner too)
Login in one session as a member and in another session as the approver
As member, create a money request and submit it in the workspace chat
Verify the money request appears in the approver's workspace chat
As approver turn off the internet connection to verify easily if the Pay button is not shown
Approve the report
Verify the Pay is not shown after approval

Screen.Recording.2024-01-04.at.6.36.24.p.m.mov

Verify that no errors appear in the JS console

Offline tests

N/A

QA Steps

Same as test steps

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

MacOS: Desktop

…er component to hide Pay button

… type declaration in ReportUtils.ts

melvin-bot · 2024-01-05T00:43:02Z

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

marcochavezf · 2024-01-05T00:43:28Z

On hold for backend changes but the code can be reviewed

marcochavezf · 2024-01-09T23:05:08Z

Hi @aimane-chnaif, the backend changes were deployed to production so the PR is ready for review. Can you provide me with some emails so I can add you to a policy with auto reimbursement enabled for testing?

marcochavezf · 2024-01-12T02:14:37Z

Friendly bump @aimane-chnaif

aimane-chnaif · 2024-01-12T20:31:35Z

review & testing is in progress. expecting completion on Monday

marcochavezf · 2024-01-16T16:37:34Z

Hi @aimane-chnaif, let me know if you run into any issues during testing, happy to help if something wasn't clear in the instructions or didn't result as expected during the testing :)

aimane-chnaif · 2024-01-17T19:35:08Z

Please resolve conflict

aimane-chnaif · 2024-01-17T19:35:40Z

I am stuck here. This message doesn't disappear even if bank account is added

marcochavezf · 2024-01-17T23:58:54Z

I am stuck here. This message doesn't disappear even if bank account is added

Ah I think that system message doesn't disappear, we just process the request when the bank account is added and post another message mentioning the request was settled iirc.

What happens if you create another request after you add the bank account?

aimane-chnaif · 2024-01-18T15:35:44Z

I am not seeing Pay button after approval even before this PR.
Only admin (marco@expensifail.com) can pay in Collect test workspace?

aimane-chnaif · 2024-01-22T06:59:08Z

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

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-01-22T06:59:52Z

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

aimane-chnaif · 2024-01-22T07:01:44Z

I had to test manually by updating approver's role to admin locally

Before:

After:

stitesExpensify

LGTM

stitesExpensify · 2024-01-23T21:44:20Z

src/libs/ReportUtils.ts

+    type CurrencyType = (typeof CONST.DIRECT_REIMBURSEMENT_CURRENCIES)[number];
+    const reimbursableTotal = getMoneyRequestReimbursableTotal(report);
+    const autoReimbursementLimit = policy.autoReimbursementLimit ?? 0;
+    const isAutoReimbursable =


NAB Unnecessary variable

OSBotify · 2024-01-23T21:50:14Z

✋ 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-01-25T08:50:55Z

🚀 Deployed to production by https://github.com/thienlnam in version: 1.4.31-7 🚀

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

marcochavezf added 9 commits January 4, 2024 17:35

Add reimbursement choices to CONST.ts

f6f14c9

Add reimbursement choice and auto reimbursement limit to Policy

f5e62a5

Add new variables and conditions in ReportPreview.js to hide Pay button

bf36675

Add reimbursementChoice and autoReimbursementLimit to MoneyReportHead…

e5ceec6

…er component to hide Pay button

Add canBeAutoReimbursed function to ReportUtils.ts

22d4879

Refactor MoneyReportHeader component

23bb116

Refactor ReportPreview.js to use ReportUtils.canBeAutoReimbursed()

117d80e

Add additional currencies for direct reimbursement

78e922a

Add currency check for auto reimbursement

bb8ea40

marcochavezf self-assigned this Jan 5, 2024

Refactor DIRECT_REIMBURSEMENT_CURRENCIES array in CONST.ts and update…

cafdad7

… type declaration in ReportUtils.ts

marcochavezf marked this pull request as ready for review January 5, 2024 00:42

marcochavezf requested a review from a team as a code owner January 5, 2024 00:42

melvin-bot bot requested review from aimane-chnaif and removed request for a team January 5, 2024 00:43

marcochavezf added 2 commits January 9, 2024 16:15

Merge branch 'main' into marco-hidePayButtonWhenAutoReimbursementEnabled

636f1af

Remove unused variable and function call in ReportPreview.js

9a7b78a

marcochavezf changed the title ~~[HOLD] Hide pay button when auto reimbursement enabled~~ Hide pay button when auto reimbursement enabled Jan 9, 2024

Merge branch 'main' into marco-hidePayButtonWhenAutoReimbursementEnabled

29ccc2f

Merge branch 'main' into marco-hidePayButtonWhenAutoReimbursementEnabled

3d7008d

aimane-chnaif approved these changes Jan 22, 2024

View reviewed changes

melvin-bot bot requested a review from stitesExpensify January 22, 2024 06:59

stitesExpensify approved these changes Jan 23, 2024

View reviewed changes

stitesExpensify merged commit 6e2f058 into main Jan 23, 2024

stitesExpensify deleted the marco-hidePayButtonWhenAutoReimbursementEnabled branch January 23, 2024 21:45

github-actions bot mentioned this pull request Jan 24, 2024

Deploy Checklist: New Expensify 2024-01-24 #35037

Closed

48 tasks

melvin-bot bot mentioned this pull request Jan 25, 2024

[HOLD for payment 2024-02-01] [$500] Pay button is shown briefly after approval when the policy has auto-reimbursement enabled #33716

Closed

6 tasks

marcochavezf mentioned this pull request Feb 20, 2024

pay conditions based on reimbursement settings #36814

Merged

50 tasks

teneeto mentioned this pull request Feb 29, 2024

[$500] Web - Pay with Expensify button for approved request disappears after VBA added #35721

Closed

6 tasks

Conversation

marcochavezf commented Jan 5, 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 Jan 5, 2024

Uh oh!

marcochavezf commented Jan 5, 2024

Uh oh!

marcochavezf commented Jan 9, 2024

Uh oh!

marcochavezf commented Jan 12, 2024

Uh oh!

aimane-chnaif commented Jan 12, 2024

Uh oh!

marcochavezf commented Jan 16, 2024

Uh oh!

aimane-chnaif commented Jan 17, 2024

Uh oh!

aimane-chnaif commented Jan 17, 2024

Uh oh!

marcochavezf commented Jan 17, 2024

Uh oh!

aimane-chnaif commented Jan 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

aimane-chnaif commented Jan 22, 2024

Reviewer Checklist

Screenshots/Videos

Uh oh!

melvin-bot bot commented Jan 22, 2024

Uh oh!

aimane-chnaif commented Jan 22, 2024

Uh oh!

stitesExpensify left a comment

Choose a reason for hiding this comment

Uh oh!

stitesExpensify Jan 23, 2024

Choose a reason for hiding this comment

Uh oh!

OSBotify commented Jan 23, 2024

Uh oh!

OSBotify commented Jan 25, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

marcochavezf commented Jan 5, 2024 •

edited

Loading

aimane-chnaif commented Jan 18, 2024 •

edited

Loading