Fix settlement button #48863

shubham1206agra · 2024-09-10T06:54:43Z

Details

Here are the reimbursement states with expected button preview results:

Reimbursement enabled, indirect (no VBBA) -> show Pay elsewhere
Reimbursement enabled, direct (with VBBA) -> show Pay elsewhere and Pay with Expensify
Reimbursement disabled -> no pay button

Fixed Issues

$ #48657

Pre-requisite

Create a workspace
Go to More features > Enable Workflows
Go to Workflows > Enable approvals and payments
Click Connect bank account and add a VBBA

Tests

Submit an expense report on the workspace
Go to the expense report
Observe the Pay button has 2 options

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as Tests

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 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
  - If any non-english text was added/modified, I verified the translation was requested/reviewed 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.js 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.
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 · 2024-09-10T06:54:48Z

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

trjExpensify · 2024-09-10T10:50:34Z

@aimane-chnaif are you going to be able to review this PR today? We're keen to get it into the deploy.

aimane-chnaif · 2024-09-10T18:01:57Z

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

android.mp4

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

web.mov

MacOS: Desktop

aimane-chnaif · 2024-09-10T18:40:14Z

src/components/SettlementButton.tsx

-        !isPaidGroupPolicy ||
-        (!shouldHidePaymentOptions && ReportUtils.isPayer(session, iouReport) && policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL);
-    const shouldShowPayElsewhereOption = (!isPaidGroupPolicy || policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL) && !isInvoiceReport;
+    const shouldShowPaywithExpensifyOption = !shouldHidePaymentOptions && policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;


Now that ReportUtils.isPayer(session, iouReport) condition is removed, please make sure that this button never shows on payee side.

shouldHidePaymentOptions covers this condition already. So there's no need here.

aimane-chnaif · 2024-09-10T18:43:30Z

src/components/SettlementButton.tsx

-        (!shouldHidePaymentOptions && ReportUtils.isPayer(session, iouReport) && policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL);
-    const shouldShowPayElsewhereOption = (!isPaidGroupPolicy || policy?.reimbursementChoice === CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL) && !isInvoiceReport;
+    const shouldShowPaywithExpensifyOption = !shouldHidePaymentOptions && policy?.reimbursementChoice !== CONST.POLICY.REIMBURSEMENT_CHOICES.REIMBURSEMENT_MANUAL;
+    const shouldShowPayElsewhereOption = !shouldHidePaymentOptions && !isInvoiceReport;


This also includes REIMBURSEMENT_NO (None). Is that expected?
I thought we're showing this button only for Direct and Indirect.

shouldHidePaymentOptions covers this condition already. So there's no need here.

mountiny · 2024-09-10T22:41:22Z

@shubham1206agra lets try to wrap this up before the Card Address flow PR

shubham1206agra · 2024-09-11T01:15:36Z

@aimane-chnaif Please look into canIOUBePaid method in IOU to clear any doubts about the conditions.

trjExpensify · 2024-09-11T18:34:22Z

@aimane-chnaif thoughts on the above? Very keen to get this resolved as it's a mainline flow. Thanks!

aimane-chnaif · 2024-09-11T20:13:36Z

@aimane-chnaif Please look into canIOUBePaid method in IOU to clear any doubts about the conditions.

Thanks. No doubts now

aimane-chnaif

Looks like const session = useSession(); is not used anywhere.
Please pull main and fix lint

mountiny · 2024-09-12T21:34:14Z

@shubham1206agra lets address this one quickly in the morning, thanks!

mountiny · 2024-09-13T23:53:41Z

wtf there are conflicts on those 7 lines all the time 😢

shubham1206agra · 2024-09-14T01:51:55Z

@mountiny Fixed conflicts again.

OSBotify · 2024-09-14T08:07: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.

OSBotify · 2024-09-16T18:41:20Z

🚀 Deployed to staging by https://github.com/mountiny in version: 9.0.36-0 🚀

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

OSBotify · 2024-09-17T20:31:33Z

🚀 Deployed to production by https://github.com/grgia in version: 9.0.36-2 🚀

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

Fix settlement button

e638981

shubham1206agra requested a review from a team as a code owner September 10, 2024 06:54

melvin-bot bot requested a review from aimane-chnaif September 10, 2024 06:54

melvin-bot bot removed the request for review from a team September 10, 2024 06:54

aimane-chnaif reviewed Sep 10, 2024

View reviewed changes

mountiny assigned shubham1206agra Sep 10, 2024

aimane-chnaif approved these changes Sep 12, 2024

View reviewed changes

melvin-bot bot requested a review from mountiny September 12, 2024 19:10

aimane-chnaif suggested changes Sep 12, 2024

View reviewed changes

shubham1206agra and others added 2 commits September 13, 2024 08:32

Merge branch 'Expensify:main' into settlement-button-fix

4558f2a

Fix lint

b2b90b2

aimane-chnaif approved these changes Sep 13, 2024

View reviewed changes

Merge main

6fdfb3c

mountiny approved these changes Sep 14, 2024

View reviewed changes

mountiny merged commit 0c618ac into Expensify:main Sep 14, 2024
15 checks passed

github-actions bot mentioned this pull request Sep 16, 2024

Deploy Checklist: New Expensify 2024-09-16 #49287

Closed

38 tasks

grgia mentioned this pull request Sep 17, 2024

[AWAITING PAYMENT] [$250] Expense - Payment option is not selected from the dropdown unless it is reselected #49331

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix settlement button #48863

Fix settlement button #48863

shubham1206agra commented Sep 10, 2024 •

edited

Loading

melvin-bot bot commented Sep 10, 2024

trjExpensify commented Sep 10, 2024

aimane-chnaif commented Sep 10, 2024 •

edited

Loading

aimane-chnaif Sep 10, 2024

shubham1206agra Sep 11, 2024

aimane-chnaif Sep 10, 2024

shubham1206agra Sep 11, 2024

mountiny commented Sep 10, 2024

shubham1206agra commented Sep 11, 2024

trjExpensify commented Sep 11, 2024

aimane-chnaif commented Sep 11, 2024

aimane-chnaif left a comment

mountiny commented Sep 12, 2024

mountiny commented Sep 13, 2024

shubham1206agra commented Sep 14, 2024

OSBotify commented Sep 14, 2024

OSBotify commented Sep 16, 2024

OSBotify commented Sep 17, 2024

Fix settlement button #48863

Fix settlement button #48863

Conversation

shubham1206agra commented Sep 10, 2024 • edited Loading

Details

Fixed Issues

Pre-requisite

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Sep 10, 2024

trjExpensify commented Sep 10, 2024

aimane-chnaif commented Sep 10, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

aimane-chnaif Sep 10, 2024

Choose a reason for hiding this comment

shubham1206agra Sep 11, 2024

Choose a reason for hiding this comment

aimane-chnaif Sep 10, 2024

Choose a reason for hiding this comment

shubham1206agra Sep 11, 2024

Choose a reason for hiding this comment

mountiny commented Sep 10, 2024

shubham1206agra commented Sep 11, 2024

trjExpensify commented Sep 11, 2024

aimane-chnaif commented Sep 11, 2024

aimane-chnaif left a comment

Choose a reason for hiding this comment

mountiny commented Sep 12, 2024

mountiny commented Sep 13, 2024

shubham1206agra commented Sep 14, 2024

OSBotify commented Sep 14, 2024

OSBotify commented Sep 16, 2024

OSBotify commented Sep 17, 2024

shubham1206agra commented Sep 10, 2024 •

edited

Loading

aimane-chnaif commented Sep 10, 2024 •

edited

Loading