Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Pay as Business option for invoices sent to an individual who is admin of their primary workspace #43036

Merged
merged 20 commits into from
Jul 3, 2024

Conversation

VickyStash
Copy link
Contributor

@VickyStash VickyStash commented Jun 4, 2024

Details

This PR implements the Pay as business option in the App for the individuals who are admins of their primary workspace.

Fixed Issues

$ #40438
PROPOSAL: N/A

Tests

  • Verify that no errors appear in the JS console
  1. Login to the app as User A. The user should be the admin of any workspace.
  2. Go to FAB -> Select "Send invoice"
  3. Send Invoice to the User B (user should be the admin of his primary workspace)
  4. Login as User B and open the invoice room from step 3.
  5. Tap Pay button and select Pay as business -> Pay elsewhere
  6. Verify that:
  • the invoice got paid
  • the room is turned into B2B invoices room, the title and avatars got updated.
  1. Login as User A and open the same invoice room. Verify B2B invoices room looks as expected for the invoice sender as well.

Offline tests

Repeat steps 5-7 from the Tests section.

QA Steps

  • Verify that no errors appear in the JS console

Same as in the Tests section

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 explxanatory
  • 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_sender

android_receiver.mp4
Android: mWeb Chrome
android_web_receiver.mp4

android_web_receiver1

android_web_sender

iOS: Native
ios_receiver.mp4
ios_sender
iOS: mWeb Safari

ios_web_sender

ios_web_receiver.mp4
MacOS: Chrome / Safari web_sender
web_receiver.mp4
MacOS: Desktop
desktop_receiver.mp4

desktop_sender

# Conflicts:
#	src/libs/ReportUtils.ts
# Conflicts:
#	src/components/ReportActionItem/ReportPreview.tsx
#	src/components/SettlementButton.tsx
@@ -674,6 +674,7 @@ export default {
settledExpensify: 'Pagado',
settledElsewhere: 'Pagado de otra forma',
individual: 'Individual',
business: 'Empresa',
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've asked about translation confirmation in the slack

@VickyStash VickyStash marked this pull request as ready for review June 13, 2024 12:29
@VickyStash VickyStash requested a review from a team as a code owner June 13, 2024 12:29
@melvin-bot melvin-bot bot removed the request for review from a team June 13, 2024 12:29
Copy link

melvin-bot bot commented Jun 13, 2024

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

@melvin-bot melvin-bot bot requested a review from jjcoffee June 13, 2024 12:29
@@ -252,7 +274,7 @@ function SettlementButton({

return (
<KYCWall
onSuccessfulKYC={onPress}
onSuccessfulKYC={(paymentType) => onPress(paymentType)}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
onSuccessfulKYC={(paymentType) => onPress(paymentType)}
onSuccessfulKYC={onPress}

I think it will work right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not really, it gives TS error, cause the second params are incompatible
image

@jjcoffee
Copy link
Contributor

jjcoffee commented Jun 13, 2024

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-app-2024-06-14_13.30.00.mp4
Android: mWeb Chrome
android-chrome-2024-06-14_13.33.55.mp4
iOS: Native
ios-app-2024-06-14_13.20.03.mp4
iOS: mWeb Safari
ios-safari-2024-06-14_13.17.55.mp4
MacOS: Chrome / Safari
desktop-chrome-2024-06-13_16.29.43.mp4
MacOS: Desktop
desktop-app-2024-06-14_11.31.09.mp4

@jjcoffee

This comment was marked as resolved.

@VickyStash
Copy link
Contributor Author

Testing well so far! I'm seeing an issue though, where the first invoice sent initially displays with the correct (personal) avatar of User B. However, once the SendInvoice request completes it switches to this avatar without any title

@jjcoffee It's a known issue caused by API returns empty invoiceReceiver for the invoice room report in the SendInvoice response. Since in this PR uses room invoiceReceiver data to show avatars it's so noticeable.

cc @cristipaval Have you had a chance to take a look at it?

@jjcoffee

This comment was marked as resolved.

@jjcoffee

This comment was marked as resolved.

@VickyStash
Copy link
Contributor Author

@VickyStash Gotcha, thanks! One other thing, should it work to send a new invoice within the workspace-to-individual chat that's initially created after you send the first invoice? It doesn't seem to come through for User B.

  1. As User A, go to FAB -> Send invoice to User B
  2. As User B pay the invoice
  3. As User A, switch back to the chat created in step 1
  4. Use the inline + in the composer to send a new invoice
  5. Check User B's chat

I think I've tested this use case and it worked for me, could you provide a video please 🙏

@jjcoffee

This comment was marked as resolved.

@VickyStash
Copy link
Contributor Author

BUG?: After sending the initial invoice from Workspace 1, invoices sent (using FAB -> Send Invoice) from any other workspace (e.g. Workspace 2) don't come through to User B.

@jjcoffee It looks like it works for me, did I miss something?

INV1.mp4

@jjcoffee
Copy link
Contributor

It looks like it works for me, did I miss something?

@VickyStash Hmm, interesting! What if you try with User B as a new account that User A has never chatted with before?

@jjcoffee
Copy link
Contributor

@VickyStash I guess this is related to the empty invoiceReceiver from here? User A briefly sees their own workspace name as the payer in the ... paid: text.

desktop-app-delayed.mp4

@jjcoffee

This comment was marked as resolved.

@VickyStash
Copy link
Contributor Author

VickyStash commented Jun 28, 2024

Just to cover all bases, if User B has no workspace set up yet should they actually be able to pay as business? Currently this will create a B2B room with User B's Expenses as the title. cc @cristipaval

@jjcoffee I've re-checked and I don't see option to Pay as business in the account without workspaces. Is there anything special about your account?
Update: reproduced in a brand new account

@VickyStash
Copy link
Contributor Author

BUG: If the workspace that User A sends the invoice from has a custom avatar, this does not reflect in User B's chat.

Same issue is reproduced on the main branch, so it would be better to fix it separately

@VickyStash
Copy link
Contributor Author

Issues, that should be fixed by API updates:

  • BUG: Avatars and name for the room don't update for User A after User B pays as business. This happens when the invoice room doesn't already exist. (link)
  • BUG: I'm still seeing the issue with the avatar and name (shows as User A's workspace) initially displaying incorrectly after User B pays. I'm seeing this when User B is a completely new account. (link)

Bug exists on main, should be tracked in a separate ticket:

  • BUG: If the workspace that User A sends the invoice from has a custom avatar, this does not reflect in User B's chat. (link)

Let's leave it to a follow up:

  • This might be more one for a followup. For cases where we send an invoice to user B again (directly to their personal email), we probably want to redirect to the invoice room if one already exists. (link)

Fixed in the app:

  • User is able to Pay as business without workspaces set up (link)

@jjcoffee @cristipaval

Note: I'm going to be OOO Jul 1- Jul 7 🌴

@cristipaval
Copy link
Contributor

Thanks for the summary @VickyStash!

@jjcoffee, I think you can approve the PR, and I can test it when the backend fixes get into production. If nothing else occurs, I'll merge this PR and @VickyStash will create a follow-up issue to fix the redirection when the invoice is moved to an existing b2b invoice room. This way you can go ooo and don't worry about this PR.

Copy link
Contributor

@jjcoffee jjcoffee left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@cristipaval cristipaval self-requested a review July 3, 2024 12:14
@cristipaval cristipaval merged commit 35ae731 into Expensify:main Jul 3, 2024
14 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Jul 3, 2024

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@cristipaval
Copy link
Contributor

The issue with the avatar is still reproducible on the room header, but I think we can fix it in a follow-up PR to keep things going

@OSBotify
Copy link
Contributor

OSBotify commented Jul 3, 2024

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.0.4-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jul 4, 2024

🚀 Cherry-picked to staging by https://github.com/tgolen in version: 9.0.4-5 🚀

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

@Expensify/applauseleads please QA this PR and check it off on the deploy checklist if it passes.

mountiny added a commit that referenced this pull request Jul 5, 2024
…s-business"

This reverts commit 35ae731, reversing
changes made to 9babbda.
kosmydel pushed a commit to software-mansion-labs/expensify-app-fork that referenced this pull request Jul 5, 2024
…438-pay-as-business"

This reverts commit 35ae731, reversing
changes made to 9babbda.
@OSBotify
Copy link
Contributor

OSBotify commented Jul 8, 2024

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.0.5-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Jul 8, 2024

🚀 Deployed to staging by https://github.com/cristipaval in version: 9.0.5-2 🚀

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

@kbecciv
Copy link

kbecciv commented Jul 8, 2024

@mountinyThe QA team is only seeing the "Pay as individual" option. This was reverted in this PR. Are we good to check it off?

Recording.3432.mp4

@Julesssss
Copy link
Contributor

@mountinyThe QA team is only seeing the "Pay as individual" option. This was reverted in this PR. Are we good to check it off?

@cristipaval could you please verify this before closing the issue? In the meantime I am checking this off our checklist as it isn't a blocker.

@cristipaval
Copy link
Contributor

@mountinyThe QA team is only seeing the "Pay as individual" option. This was reverted in this PR. Are we good to check it off?

@cristipaval could you please verify this before closing the issue? In the meantime I am checking this off our checklist as it isn't a blocker.

This PR was reverted, @Julesssss

@mountiny
Copy link
Contributor

mountiny commented Jul 9, 2024

This is the PR that should not have been added to the checklist, it was reverted

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants