Consolidate options on settlement "Pay" button #37174

brandonhenry · 2024-02-24T18:03:27Z

Details

Fixed Issues

$ #36301
PROPOSAL: #36301 (comment)

Tests

Create an IOU
Attempt to pay IOU and notice updated Pay Button

Verify that no errors appear in the JS console

Offline tests

QA Steps

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 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 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 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 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.

Screenshots/Videos

Android: Native

Android: mWeb Chrome

iOS: Native

iOS: mWeb Safari

MacOS: Chrome / Safari

MacOS: Desktop

melvin-bot · 2024-02-24T18:03:32Z

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

github-actions · 2024-02-24T18:03:40Z

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

bondydaa · 2024-02-26T23:22:24Z

not sure why @allroundexperts didn't get assign here since you reviewed the proposals #36301 (comment) so added you.

allroundexperts · 2024-02-27T05:57:12Z

Hi @brandonhenry!
Can you please sign the CLA and complete the checklist? For future, please convert your pr to draft state if its not ready for review.

brandonhenry · 2024-02-28T17:39:13Z

Still working through this. @allroundexperts did you happen to see the comments I made in this PR? You can see them in them in the commented out lines

brandonhenry · 2024-02-28T17:39:35Z

I have read the CLA Document and I hereby sign the CLA

src/types/onyx/OriginalMessage.ts

…ent-options

allroundexperts · 2024-03-04T20:24:07Z

did you happen to see the comments I made in this PR? You can see them in them in the commented out lines

@brandonhenry Can you please ask the questions as comments in this PR thread, instead of the code? This way it would be visible to everyone.

brandonhenry · 2024-03-04T23:16:35Z

hi @allroundexperts my main question revolves around this comment here. I think we are good as long as we map the current dropdown from the changes we proposed in this PR to how it is currently in prod.

The request tied to this PR asks for the dropdown to contain

Pay with business bank account
Pay with personal bank account
Pay with debit card
Pay elsewhere

How should I map each? Basically, what payment type should be sent to BE for each of these?

I would say pay with business bank account, pay with personal bank account would link to VBBA and pay with debit card would link to Expensify. Is that right?

If you're unsure, I'm going to go with that assumption - then finish this PR.

…ent_methods

allroundexperts · 2024-03-07T22:40:12Z

hi @allroundexperts my main question revolves around this comment here. I think we are good as long as we map the current dropdown from the changes we proposed in this PR to how it is currently in prod.

The request tied to this PR asks for the dropdown to contain
Pay with business bank account
Pay with personal bank account
Pay with debit card
Pay elsewhere
How should I map each? Basically, what payment type should be sent to BE for each of these?

I would say pay with business bank account, pay with personal bank account would link to VBBA and pay with debit card would link to Expensify. Is that right?

If you're unsure, I'm going to go with that assumption - then finish this PR.

@tgolen Can you answer the above? I don't have enough backend context for this.

brandonhenry · 2024-03-08T02:34:41Z

@allroundexperts @tgolen think I made the appropriate changes to not affect this. I still needed to update the payment type, but I am still using the same functionality that exists in the app (just removed the extra dropdown we had)

brandonhenry · 2024-03-08T16:22:02Z

just about wrapped up here, just need to fix one file which had merge conflicts

brandonhenry · 2024-03-09T01:34:17Z

this is ready for review @allroundexperts @eh2077

…ent-options

brandonhenry · 2024-08-23T03:20:36Z

@allroundexperts final fix applied here. lemme know what you think

brandonhenry · 2024-08-23T14:20:57Z

@allroundexperts pinging for final check

Cc. @joekaufmanexpensify

allroundexperts · 2024-08-25T22:12:15Z

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

Screen.Recording.2024-08-26.at.3.00.22.AM.mov

Android: mWeb Chrome

Screen.Recording.2024-08-26.at.2.59.48.AM.mov

iOS: Native

Screen.Recording.2024-08-26.at.2.58.24.AM.mov

iOS: mWeb Safari

Screen.Recording.2024-08-26.at.2.57.57.AM.mov

MacOS: Chrome / Safari

Screen.Recording.2024-08-26.at.2.52.27.AM.mov

MacOS: Desktop

Screen.Recording.2024-08-26.at.2.55.12.AM.mov

src/components/SettlementButton.tsx

…ent-options

allroundexperts

Looks good!

…ent-options

OSBotify · 2024-08-26T17:49:16Z

✋ 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-08-26T23:17:45Z

🚀 Deployed to staging by https://github.com/bondydaa in version: 9.0.25-0 🚀

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

OSBotify · 2024-08-27T00:08:07Z

🚀 Deployed to staging by https://github.com/bondydaa in version: 9.0.25-0 🚀

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

bondydaa · 2024-08-27T21:15:34Z

this was reverted on #48117 b/c it caused #48103

brandonhenry · 2024-08-28T00:43:24Z

@allroundexperts any ideas here? i'm testing now but curious if you had any thoughts. definitely doesn't make any sense to me, didn't touch styling here. First thought are somehow using a different component that works differently in ios...?

brandonhenry · 2024-08-28T00:44:07Z

Confused because nothing was added.. only removed..

ikevin127 · 2024-10-11T22:55:13Z

src/components/SettlementButton.tsx

+            iouPaymentType === CONST.PAYMENT_METHODS.BUSINESS_BANK_ACCOUNT ||
+            iouPaymentType === CONST.PAYMENT_METHODS.PERSONAL_BANK_ACCOUNT ||
+            iouPaymentType === CONST.PAYMENT_METHODS.DEBIT_CARD
+        ) {
            triggerKYCFlow(event, iouPaymentType);
            BankAccounts.setPersonalBankAccountContinueKYCOnSuccess(ROUTES.ENABLE_PAYMENTS);


Looks like this logic caused the following issue:

[HOLD for payment 2024-10-14] [$250] Web - Pay - Not here page opens when Gmail user Pay with Expensify #49523

Because on unvalidated (gmail) accounts, when a user tries to Pay someone with Expensify, the RHP opens with this page cannot be found screen because of this code from AddPersonalBankAccountPage. We fixed by routing the user to verify their account before Pay with Expensify in case it's unverified.

consolidated settlement pay button

a534dd8

brandonhenry requested a review from a team as a code owner February 24, 2024 18:03

melvin-bot bot requested review from eh2077 and removed request for a team February 24, 2024 18:03

bondydaa requested a review from allroundexperts February 26, 2024 23:21

brandonhenry marked this pull request as draft February 27, 2024 15:27

brandonhenry commented Feb 28, 2024

View reviewed changes

src/types/onyx/OriginalMessage.ts Show resolved Hide resolved

brandonhenry added 3 commits February 29, 2024 10:19

Merge remote-tracking branch 'upstream/main' into 36301-clean-up-paym…

f9cdaf1

…ent-options

Merge remote-tracking branch 'upstream/main' into 36301-clean-up-paym…

686227e

…ent-options

Merge remote-tracking branch 'upstream/main' into 36301-clean-up-paym…

3808611

…ent-options

removal of extra payment window and re-organized to properly use paym…

08a1fc1

…ent_methods

brandonhenry added 3 commits March 8, 2024 09:42

updated with main

9b32a12

Update SettlementButton to match main

c825bc0

Update SettlementButton match main even more

c3d9865

brandonhenry added 2 commits March 8, 2024 15:51

updated with main

f3336e0

removed default case

d468376

brandonhenry marked this pull request as ready for review March 9, 2024 01:33

Merge remote-tracking branch 'upstream/main' into 36301-clean-up-paym…

1aa89d3

…ent-options

Merge remote-tracking branch 'upstream/main' into 36301-clean-up-paym…

dd375ce

…ent-options

allroundexperts reviewed Aug 25, 2024

View reviewed changes

src/components/SettlementButton.tsx Show resolved Hide resolved

brandonhenry added 2 commits August 26, 2024 00:21

Merge remote-tracking branch 'upstream/main' into 36301-clean-up-paym…

1df72c8

…ent-options

Added back in personalbankaccount set

2f9c1d6

This comment was marked as outdated.

Sign in to view

allroundexperts approved these changes Aug 26, 2024

View reviewed changes

melvin-bot bot requested a review from bondydaa August 26, 2024 07:33

Merge remote-tracking branch 'upstream/main' into 36301-clean-up-paym…

969b5c2

…ent-options

bondydaa approved these changes Aug 26, 2024

View reviewed changes

bondydaa merged commit 04b7aa1 into Expensify:main Aug 26, 2024
15 checks passed

brandonhenry deleted the 36301-clean-up-payment-options branch August 26, 2024 18:42

github-actions bot mentioned this pull request Aug 26, 2024

Deploy Checklist: New Expensify 2024-08-26 #48035

Closed

yuwenmemon mentioned this pull request Aug 27, 2024

Revert "Consolidate options on settlement "Pay" button" #48117

Merged

53 tasks

bondydaa mentioned this pull request Aug 27, 2024

[$250] iOS - Expense - Payment button shows black gradient #48103

Closed

6 tasks

bondydaa mentioned this pull request Sep 2, 2024

Revert "Revert "Consolidate options on settlement "Pay" button"" #48421

Merged

50 tasks

jaydamani mentioned this pull request Sep 3, 2024

[$250] Invoice - No option 'Pay via Expensify' for receiver #48486

Closed

6 tasks

trjExpensify mentioned this pull request Sep 5, 2024

[$250] Approvers Flow - Admin gets error when paying expense to employee without bank account #48545

Closed

6 tasks

mountiny mentioned this pull request Sep 5, 2024

[CP Staging] Revert "Consolidate options on settlement "Pay" button" #48637

Closed

jaydamani mentioned this pull request Oct 2, 2024

[$250] Pay with business BA - System message is "paid x", while thread header is "paid x elsewhere" #48560

Closed

6 tasks

ikevin127 reviewed Oct 11, 2024

View reviewed changes

ikevin127 mentioned this pull request Oct 11, 2024

[HOLD for payment 2024-10-14] [$250] Web - Pay - Not here page opens when Gmail user Pay with Expensify #49523

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Consolidate options on settlement "Pay" button #37174

Consolidate options on settlement "Pay" button #37174

brandonhenry commented Feb 24, 2024 •

edited

Loading

melvin-bot bot commented Feb 24, 2024

github-actions bot commented Feb 24, 2024 •

edited

Loading

bondydaa commented Feb 26, 2024

allroundexperts commented Feb 27, 2024

brandonhenry commented Feb 28, 2024

brandonhenry commented Feb 28, 2024

allroundexperts commented Mar 4, 2024

brandonhenry commented Mar 4, 2024 •

edited

Loading

allroundexperts commented Mar 7, 2024

brandonhenry commented Mar 8, 2024

brandonhenry commented Mar 8, 2024

brandonhenry commented Mar 9, 2024

brandonhenry commented Aug 23, 2024

brandonhenry commented Aug 23, 2024

allroundexperts commented Aug 25, 2024

This comment was marked as outdated.

allroundexperts left a comment

OSBotify commented Aug 26, 2024

OSBotify commented Aug 26, 2024

OSBotify commented Aug 27, 2024

bondydaa commented Aug 27, 2024

brandonhenry commented Aug 28, 2024

brandonhenry commented Aug 28, 2024

ikevin127 Oct 11, 2024

Consolidate options on settlement "Pay" button #37174

Consolidate options on settlement "Pay" button #37174

Conversation

brandonhenry commented Feb 24, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Feb 24, 2024

github-actions bot commented Feb 24, 2024 • edited Loading

bondydaa commented Feb 26, 2024

allroundexperts commented Feb 27, 2024

brandonhenry commented Feb 28, 2024

brandonhenry commented Feb 28, 2024

allroundexperts commented Mar 4, 2024

brandonhenry commented Mar 4, 2024 • edited Loading

allroundexperts commented Mar 7, 2024

brandonhenry commented Mar 8, 2024

brandonhenry commented Mar 8, 2024

brandonhenry commented Mar 9, 2024

brandonhenry commented Aug 23, 2024

brandonhenry commented Aug 23, 2024

allroundexperts commented Aug 25, 2024

Reviewer Checklist

Screenshots/Videos

This comment was marked as outdated.

allroundexperts left a comment

Choose a reason for hiding this comment

OSBotify commented Aug 26, 2024

OSBotify commented Aug 26, 2024

OSBotify commented Aug 27, 2024

bondydaa commented Aug 27, 2024

brandonhenry commented Aug 28, 2024

brandonhenry commented Aug 28, 2024

ikevin127 Oct 11, 2024

Choose a reason for hiding this comment

brandonhenry commented Feb 24, 2024 •

edited

Loading

github-actions bot commented Feb 24, 2024 •

edited

Loading

brandonhenry commented Mar 4, 2024 •

edited

Loading