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

VickyStash · 2024-06-04T14:45:16Z

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

Login to the app as User A. The user should be the admin of any workspace.
Go to FAB -> Select "Send invoice"
Send Invoice to the User B (user should be the admin of his primary workspace)
Login as User B and open the invoice room from step 3.
Tap Pay button and select Pay as business -> Pay elsewhere
Verify that:

the invoice got paid
the room is turned into B2B invoices room, the title and avatars got updated.

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

Screenshots/Videos

Android: Native

android_receiver.mp4

Android: mWeb Chrome

android_web_receiver.mp4

iOS: Native

ios_receiver.mp4

iOS: mWeb Safari

ios_web_receiver.mp4

MacOS: Chrome / Safari

web_receiver.mp4

MacOS: Desktop

desktop_receiver.mp4

# Conflicts: # src/libs/ReportUtils.ts

# Conflicts: # src/components/ReportActionItem/ReportPreview.tsx # src/components/SettlementButton.tsx

VickyStash · 2024-06-13T12:24:21Z

src/languages/es.ts

@@ -674,6 +674,7 @@ export default {
        settledExpensify: 'Pagado',
        settledElsewhere: 'Pagado de otra forma',
        individual: 'Individual',
+        business: 'Empresa',


I've asked about translation confirmation in the slack

melvin-bot · 2024-06-13T12:29:29Z

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

kubabutkiewicz · 2024-06-13T12:37:36Z

src/components/SettlementButton.tsx

@@ -252,7 +274,7 @@ function SettlementButton({

    return (
        <KYCWall
-            onSuccessfulKYC={onPress}
+            onSuccessfulKYC={(paymentType) => onPress(paymentType)}


Suggested change

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

onSuccessfulKYC={onPress}

I think it will work right?

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

jjcoffee · 2024-06-13T13:00:00Z

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

VickyStash · 2024-06-13T14:45:42Z

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?

VickyStash · 2024-06-13T15:02:11Z

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

As User A, go to FAB -> Send invoice to User B

As User B pay the invoice

As User A, switch back to the chat created in step 1

Use the inline + in the composer to send a new invoice

Check User B's chat

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

VickyStash · 2024-06-13T15:20:46Z

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

# Conflicts: # src/libs/actions/Policy/Policy.ts

jjcoffee · 2024-06-14T09:20:18Z

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 · 2024-06-14T09:38:04Z

@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

VickyStash · 2024-06-28T08:48:29Z

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 · 2024-06-28T10:39:19Z

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 · 2024-06-28T14:36:39Z

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 · 2024-06-28T18:47:33Z

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.

jjcoffee

LGTM!

…business

OSBotify · 2024-07-03T12:47:11Z

✋ 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 · 2024-07-03T12:55:59Z

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 · 2024-07-03T20:00:09Z

🚀 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 · 2024-07-04T22:12:36Z

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

…s-business" This reverts commit 35ae731, reversing changes made to 9babbda.

…438-pay-as-business" This reverts commit 35ae731, reversing changes made to 9babbda.

OSBotify · 2024-07-08T09:57:19Z

🚀 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 · 2024-07-08T10:53:39Z

🚀 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 · 2024-07-08T13:28:22Z

@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 · 2024-07-09T16:07:33Z

@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 · 2024-07-09T20:23:18Z

@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 · 2024-07-09T21:43:58Z

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

VickyStash added 4 commits June 4, 2024 16:28

Support invoice paying as business

9229520

UI updates to support B2B invoices rooms

7f6e6eb

Minor improvements

5064821

Lint fix

74e0b25

VickyStash mentioned this pull request Jun 4, 2024

[$500] [HOLD for payment 2024-08-19] CRITICAL: Add Pay as Business option for invoices sent to an individual who is admin of their primary workspace #40438

Closed

VickyStash added 5 commits June 7, 2024 09:20

Merge branch 'main' into feature/40438-pay-as-business

e940e2d

# Conflicts: # src/libs/ReportUtils.ts

Minor UI fixes

1ea212e

Improve the check

97bf8d6

Merge branch 'main' into feature/40438-pay-as-business

9ca57be

# Conflicts: # src/components/ReportActionItem/ReportPreview.tsx # src/components/SettlementButton.tsx

Fix ts error

ef5f19b

VickyStash commented Jun 13, 2024

View reviewed changes

VickyStash marked this pull request as ready for review June 13, 2024 12:29

VickyStash requested a review from a team as a code owner June 13, 2024 12:29

melvin-bot bot removed the request for review from a team June 13, 2024 12:29

melvin-bot bot requested a review from jjcoffee June 13, 2024 12:29

kubabutkiewicz reviewed Jun 13, 2024

View reviewed changes

This comment was marked as resolved.

Sign in to view

VickyStash added 2 commits June 14, 2024 09:39

Merge branch 'main' into feature/40438-pay-as-business

37f1863

# Conflicts: # src/libs/actions/Policy/Policy.ts

Minor fix

db1aa8a

This comment was marked as resolved.

Sign in to view

Update the check

f780f3d

jjcoffee approved these changes Jul 1, 2024

View reviewed changes

cristipaval self-requested a review July 3, 2024 12:14

Merge remote-tracking branch 'origin/main' into feature/40438-pay-as-…

4a17fdc

…business

cristipaval approved these changes Jul 3, 2024

View reviewed changes

cristipaval merged commit 35ae731 into Expensify:main Jul 3, 2024
14 checks passed

github-actions bot mentioned this pull request Jul 3, 2024

Deploy Checklist: New Expensify 2024-07-03 #44782

Closed

m-natarajan mentioned this pull request Jul 4, 2024

Send invoice - Workspace avatar and name are incorrect after paying invoice as a business #44806

Closed

6 tasks

mountiny added a commit that referenced this pull request Jul 5, 2024

Revert "Merge pull request #43036 from VickyStash/feature/40438-pay-a…

b0ade3f

…s-business" This reverts commit 35ae731, reversing changes made to 9babbda.

mountiny mentioned this pull request Jul 5, 2024

[CP Staging] Revert "Add Pay as Business option for invoices sent to an individual who is admin of their primary workspace" #44891

Merged

50 tasks

kosmydel pushed a commit to software-mansion-labs/expensify-app-fork that referenced this pull request Jul 5, 2024

Revert "Merge pull request Expensify#43036 from VickyStash/feature/40…

d3ac5d5

…438-pay-as-business" This reverts commit 35ae731, reversing changes made to 9babbda.

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

Deploy Checklist: New Expensify 2024-07-08 #44947

Closed

86 tasks

VickyStash mentioned this pull request Jul 8, 2024

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

Merged

50 tasks

carlosmiceli mentioned this pull request Jul 9, 2024

[$250 BLOCKED BY #44388] Send invoice - Invoice report appears broken #44992

Closed

6 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

VickyStash commented Jun 4, 2024 •

edited

Loading

VickyStash Jun 13, 2024

melvin-bot bot commented Jun 13, 2024

kubabutkiewicz Jun 13, 2024

VickyStash Jun 13, 2024

jjcoffee commented Jun 13, 2024 •

edited

Loading

This comment was marked as resolved.

VickyStash commented Jun 13, 2024

This comment was marked as resolved.

This comment was marked as resolved.

VickyStash commented Jun 13, 2024

This comment was marked as resolved.

VickyStash commented Jun 13, 2024

jjcoffee commented Jun 14, 2024

jjcoffee commented Jun 14, 2024

This comment was marked as resolved.

VickyStash commented Jun 28, 2024 •

edited

Loading

VickyStash commented Jun 28, 2024

VickyStash commented Jun 28, 2024

cristipaval commented Jun 28, 2024

jjcoffee left a comment

OSBotify commented Jul 3, 2024

cristipaval commented Jul 3, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 8, 2024

kbecciv commented Jul 8, 2024

Julesssss commented Jul 9, 2024

cristipaval commented Jul 9, 2024

mountiny commented Jul 9, 2024

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

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

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

Conversation

VickyStash commented Jun 4, 2024 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

VickyStash Jun 13, 2024

Choose a reason for hiding this comment

melvin-bot bot commented Jun 13, 2024

kubabutkiewicz Jun 13, 2024

Choose a reason for hiding this comment

VickyStash Jun 13, 2024

Choose a reason for hiding this comment

jjcoffee commented Jun 13, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

This comment was marked as resolved.

VickyStash commented Jun 13, 2024

This comment was marked as resolved.

This comment was marked as resolved.

VickyStash commented Jun 13, 2024

This comment was marked as resolved.

VickyStash commented Jun 13, 2024

jjcoffee commented Jun 14, 2024

jjcoffee commented Jun 14, 2024

This comment was marked as resolved.

VickyStash commented Jun 28, 2024 • edited Loading

VickyStash commented Jun 28, 2024

VickyStash commented Jun 28, 2024

cristipaval commented Jun 28, 2024

jjcoffee left a comment

Choose a reason for hiding this comment

OSBotify commented Jul 3, 2024

cristipaval commented Jul 3, 2024

OSBotify commented Jul 3, 2024

OSBotify commented Jul 4, 2024

OSBotify commented Jul 8, 2024

OSBotify commented Jul 8, 2024

kbecciv commented Jul 8, 2024

Julesssss commented Jul 9, 2024

cristipaval commented Jul 9, 2024

mountiny commented Jul 9, 2024

VickyStash commented Jun 4, 2024 •

edited

Loading

jjcoffee commented Jun 13, 2024 •

edited

Loading

VickyStash commented Jun 28, 2024 •

edited

Loading