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

VickyStash · 2024-07-08T14:09:42Z

Details

This PR implements the Pay as business option in the App for the individuals who are admins of their primary workspace.
Previous PR with this functionality was reverted.

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/components/SettlementButton.tsx

VickyStash · 2024-07-11T10:36:27Z

ON HOLD till:

the API related issue is resolved: [HOLD for payment 2024-07-22] [$250] Invoice - App crashes after receiver deletes all workspaces and sender is unable to send invoice #44818
UI issue is fixed: [$250 BLOCKED BY #44388] Send invoice - Invoice report appears broken #44992

# Conflicts: # src/libs/ReportUtils.ts

VickyStash · 2024-07-18T12:45:07Z

During the testing, I've found the next problem:

User A sends an invoice to User B (User A and User B never had invoices between each other before)
User B pays the invoice as business.
API sends multiple updates to the Onyx of User A. All of the data to let User A know that the invoice got paid, the invoice room got updated to B2B as well as the info about User B policy.
The updates are sent in one order but applied in another order. As you can see policy update goes first but applied last (and even if it's send last, it's still applied last, just in case).

Notes to the screenshot:
1 - multiple updates from the API received with the Pusher, policy update goes first in the array
2 - report related updates applied to onyx
3 - policy update applied to onyx

Problem: Report-related components are re-rendered only when repor/report actions are updated. The new report's data relies on the policy info which needs to be inserted. But at the moment of the re-rendering, the policy hasn't been inserted yet, which affects the UI display of invoice receiver policy-related data.

I don't think that adding re-renders to report related components when a policy is added is a good idea from the performance side. So I guess it should be possible to affect the order Onyx updates are applied.

The App calls Onyx.update method

App/src/libs/actions/User.ts

Lines 629 to 631 in f81addc

    
           const onyxUpdatePromise = Onyx.update(pushJSON).then(() => { 
        
               triggerNotifications(pushJSON); 
        
           });

I saw there were some updates in Onyx related to this functionality, here is the PR. And I tested my PR over onyx version 2.0.57 and had the same result.

Screenshot of example using onyx 2.0.57

@paultsimura Since you were working on the mentioned Onyx PR related to Onyx.update operation, maybe you have an idea why policy update is applied last and how can I affect it?

cc @cristipaval

paultsimura · 2024-07-18T14:25:39Z

Hi @VickyStash, could you please log the pushJSON that goes into Onyx.update(pushJSON) and share it?
Is it a single Onyx.update operation, or a couple of them?

VickyStash · 2024-07-18T15:43:52Z

@paultsimura pushJSON is the array:

Is it a single Onyx.update operation, or a couple of them?

Single operation with array passed.

VickyStash · 2024-07-22T07:39:52Z

@paultsimura Do you have any thoughts?

paultsimura · 2024-07-22T09:59:02Z

Hey @VickyStash, unfortunately, my PR didn't touch the order of the updates in this matter – it was aimed to fix only the race conditions of updates of the same collections. Seems like here you've found yet another Onyx issue.

# Conflicts: # src/ROUTES.ts # src/libs/Navigation/types.ts # src/libs/ReportUtils.ts # src/libs/actions/Policy/Policy.ts # src/pages/ReportAvatar.tsx

# Conflicts: # src/ROUTES.ts # src/libs/Navigation/types.ts # src/pages/ReportAvatar.tsx

# Conflicts: # src/libs/ReportUtils.ts

VickyStash · 2024-08-01T13:24:56Z

I've investigated the issue above more, and overall when API provides updates to the app it calls Onyx.update with an array of updates.
Inside Onyx.update the updates can be grouped, but overall it's applied using Promise.all, so I can't affect the order updates are applied.
There was an idea to firstly push a new policy, and only then the report-related updates. But as it was internally discussed with @cristipaval we decided to fix this FE issues on the FE side, so this commit 5123bb5 adds updates to fix the problem.

melvin-bot · 2024-08-02T12:18:41Z

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

jjcoffee · 2024-08-02T12:53:52Z

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-08-07_11.11.42.mp4

Android: mWeb Chrome

android-chrome-2024-08-07_11.13.45.mp4

iOS: Native

ios-app-2024-08-06_12.14.37.mp4

iOS: mWeb Safari

ios-safari-2024-08-06_12.18.58.mp4

MacOS: Chrome / Safari

desktop-chrome-2024-08-02_15.32.01.mp4

MacOS: Desktop

desktop-app-2024-08-02_15.53.00.mp4

VickyStash · 2024-08-05T09:45:48Z

@jjcoffee I've tested the scenario several times on ios+web and on the web+desktop, and there is no disappearing for me.
See the video, maybe I miss something?

Working_example12.mp4

jjcoffee · 2024-08-05T12:00:54Z

@VickyStash Ah sorry, that was my fault - I didn't explain the pre-requisite fully! The first expense was created on a different session, so in your video you'd have to sign out of User B's account once the first expense is paid before signing back in and proceeding. (I'm assuming it was something to do with there being a fresh session for User B as it happened when I switched test platforms).

So I think the reproduction steps should be:

User A sends invoice to User B (personally)
User B pays invoice as business
User B signs out and back in
Repeat steps 1 & 2.

VickyStash · 2024-08-05T13:33:53Z

@jjcoffee I've tried to logout/login on web, and then on ios and both times it was okay

ex-web-desktop1.mp4

ios_part2.mp4

# Conflicts: # src/libs/SidebarUtils.ts # src/libs/actions/IOU.ts

VickyStash · 2024-08-06T08:35:25Z

@jjcoffee Could you please check if you still can reproduce that issue?

VickyStash · 2024-08-06T11:06:08Z

Should the invoice chat be visible under User B's primary workspace if I switch to it via the workspace switcher? I can only access it from the main view ("Expensify") currently, whereas for User A the invoice chat appears under their workspace.

@cristipaval @davidcardoza

Should the invoice room chat appear under the workspace chats view for the invoice sender?
Should the invoice room chat appear under the workspace chats view for the invoice payer?

cristipaval · 2024-08-06T11:36:35Z

Should the invoice chat be visible under User B's primary workspace if I switch to it via the workspace switcher? I can only access it from the main view ("Expensify") currently, whereas for User A the invoice chat appears under their workspace.

@cristipaval @davidcardoza

Should the invoice room chat appear under the workspace chats view for the invoice sender?

Should the invoice room chat appear under the workspace chats view for the invoice payer?

Great question! I'll discuss this internally

# Conflicts: # src/libs/ReportUtils.ts # src/pages/home/HeaderView.tsx

VickyStash · 2024-08-06T20:42:19Z

@jjcoffee According to internal discussion now the invoice room should be visible under the selected workspace for the both - sender and payer

davidcardoza · 2024-08-07T03:27:57Z

Should the invoice room chat appear under the workspace chats view for the invoice sender?
Should the invoice room chat appear under the workspace chats view for the invoice payer?

Discussed here - https://expensify.slack.com/archives/CSL3XBCCR/p1722944405023039

jjcoffee · 2024-08-07T09:19:27Z

All working well now from my testing! We've agreed the Onyx flicker should be handled as a follow-up, but I'm not sure about the avatar reverting to the default one when deleting all workspaces - should this be a blocker @cristipaval?

cristipaval · 2024-08-07T10:24:29Z

but I'm not sure about the avatar reverting to the default one when deleting all workspaces - should this be a blocker @cristipaval?

I think this is also a NAB. Let's not block this PR on it.

jjcoffee

LGTM!

cristipaval · 2024-08-07T16:48:40Z

Thanks a lot for the rigorous testing @jjcoffee! 🙌
Thanks a million to you as well, @VickyStash, for pushing this.

OSBotify · 2024-08-07T17:03:12Z

✋ 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-07T22:11:30Z

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

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

OSBotify · 2024-08-12T10:02:44Z

🚀 Deployed to production by https://github.com/mountiny in version: 9.0.18-10 🚀

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

rojiphil · 2024-10-02T05:00:13Z

src/pages/home/HeaderView.tsx

@@ -129,7 +131,7 @@ function HeaderView({report, personalDetails, parentReport, parentReportAction,

    const shouldShowSubscript = ReportUtils.shouldReportShowSubscript(report);
    const defaultSubscriptSize = ReportUtils.isExpenseRequest(report) ? CONST.AVATAR_SIZE.SMALL_NORMAL : CONST.AVATAR_SIZE.DEFAULT;
-    const icons = ReportUtils.getIcons(reportHeaderData, personalDetails);
+    const icons = ReportUtils.getIcons(reportHeaderData, personalDetails, null, '', -1, undefined, invoiceReceiverPolicy);


When we fetched icons (and also report name), we also had to pass policy here. Not doing this caused issue #48710

dominictb · 2024-12-12T11:29:38Z

src/libs/ReportUtils.ts

+
+    let payerOrApproverName;
+    if (isExpenseReport(report)) {
+        payerOrApproverName = getPolicyName(report, false, policy);


Policy name might come from parent report as well. Missing it caused #52388.

Implement Pay as business functionality

ebecd03

VickyStash mentioned this pull request Jul 8, 2024

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

Closed

6 tasks

VickyStash added 2 commits July 9, 2024 14:16

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

9574719

# Conflicts: # src/components/SettlementButton.tsx

Fix workspace details display

85c45dd

VickyStash changed the title ~~Add Pay as Business option for invoices sent to an individual who is admin of their primary workspace~~ [ON HOLD] Add Pay as Business option for invoices sent to an individual who is admin of their primary workspace Jul 11, 2024

VickyStash mentioned this pull request Jul 11, 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

Merge branch 'refs/heads/main' into feature/pay-invoice-as-business

d188e2a

# Conflicts: # src/libs/ReportUtils.ts

VickyStash added 9 commits July 22, 2024 14:51

Merge branch 'refs/heads/main' into feature/pay-invoice-as-business

d763f94

# Conflicts: # src/ROUTES.ts # src/libs/Navigation/types.ts # src/libs/ReportUtils.ts # src/libs/actions/Policy/Policy.ts # src/pages/ReportAvatar.tsx

Fixes after merging main

e422516

Fix report avatar displays for invoice chats

2811559

Merge branch 'refs/heads/main' into feature/pay-invoice-as-business

c15a62b

# Conflicts: # src/ROUTES.ts # src/libs/Navigation/types.ts # src/pages/ReportAvatar.tsx

Fix after merging main

cf51892

Minor improvement

6c4ef69

Merge branch 'refs/heads/main' into feature/pay-invoice-as-business

842e95d

# Conflicts: # src/libs/ReportUtils.ts

Merge branch 'refs/heads/main' into feature/pay-invoice-as-business

fbcaef9

Fix invoice room and report display after receiver policy is added

5123bb5

VickyStash changed the title ~~[ON HOLD] Add Pay as Business option for invoices sent to an individual who is admin of their primary workspace~~ Add Pay as Business option for invoices sent to an individual who is admin of their primary workspace Aug 2, 2024

VickyStash marked this pull request as ready for review August 2, 2024 12:18

VickyStash requested a review from a team as a code owner August 2, 2024 12:18

melvin-bot bot removed the request for review from a team August 2, 2024 12:18

melvin-bot bot requested a review from jjcoffee August 2, 2024 12:18

This comment was marked as resolved.

Sign in to view

Merge branch 'refs/heads/main' into feature/pay-invoice-as-business

2515bdd

Merge branch 'refs/heads/main' into feature/pay-invoice-as-business

4ac4b24

# Conflicts: # src/libs/SidebarUtils.ts # src/libs/actions/IOU.ts

This comment was marked as resolved.

Sign in to view

VickyStash added 3 commits August 6, 2024 18:56

Merge branch 'refs/heads/main' into feature/pay-invoice-as-business

57d12d3

# Conflicts: # src/libs/ReportUtils.ts # src/pages/home/HeaderView.tsx

Fixes after merging main

7d19455

Show invoice room under receiver workspace reports

a39aa22

jjcoffee approved these changes Aug 7, 2024

View reviewed changes

melvin-bot bot requested a review from cristipaval August 7, 2024 10:57

cristipaval approved these changes Aug 7, 2024

View reviewed changes

cristipaval merged commit 5f89592 into Expensify:main Aug 7, 2024
15 checks passed

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

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

Closed

88 tasks

rlinoz mentioned this pull request Aug 9, 2024

[Awaiting Payment 2024-09-19][$250] [HIGH] Invoicing V1 - Archive B2B invoice room when the receiver workspace is deleted #47170

Closed

6 tasks

rojiphil reviewed Oct 2, 2024

View reviewed changes

rojiphil mentioned this pull request Oct 2, 2024

[Hold for payment 2024-10-07][$250] Workspace – Workspace name/avatar not updated on another device if workspace chat is open #48710

Closed

6 tasks

dominictb reviewed Dec 12, 2024

View reviewed changes

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 #44970

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

VickyStash commented Jul 8, 2024

VickyStash commented Jul 11, 2024

VickyStash commented Jul 18, 2024

paultsimura commented Jul 18, 2024

VickyStash commented Jul 18, 2024

VickyStash commented Jul 22, 2024

paultsimura commented Jul 22, 2024

VickyStash commented Aug 1, 2024

melvin-bot bot commented Aug 2, 2024

jjcoffee commented Aug 2, 2024 •

edited

Loading

This comment was marked as resolved.

VickyStash commented Aug 5, 2024

jjcoffee commented Aug 5, 2024 •

edited

Loading

VickyStash commented Aug 5, 2024

VickyStash commented Aug 6, 2024

This comment was marked as resolved.

VickyStash commented Aug 6, 2024

cristipaval commented Aug 6, 2024

VickyStash commented Aug 6, 2024

davidcardoza commented Aug 7, 2024

jjcoffee commented Aug 7, 2024

cristipaval commented Aug 7, 2024 •

edited

Loading

jjcoffee left a comment

cristipaval commented Aug 7, 2024

OSBotify commented Aug 7, 2024

OSBotify commented Aug 7, 2024

OSBotify commented Aug 12, 2024

rojiphil Oct 2, 2024

dominictb Dec 12, 2024

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

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

Conversation

VickyStash commented Jul 8, 2024

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

VickyStash commented Jul 11, 2024

VickyStash commented Jul 18, 2024

paultsimura commented Jul 18, 2024

VickyStash commented Jul 18, 2024

VickyStash commented Jul 22, 2024

paultsimura commented Jul 22, 2024

VickyStash commented Aug 1, 2024

melvin-bot bot commented Aug 2, 2024

jjcoffee commented Aug 2, 2024 • edited Loading

Reviewer Checklist

Screenshots/Videos

This comment was marked as resolved.

VickyStash commented Aug 5, 2024

jjcoffee commented Aug 5, 2024 • edited Loading

VickyStash commented Aug 5, 2024

VickyStash commented Aug 6, 2024

This comment was marked as resolved.

VickyStash commented Aug 6, 2024

cristipaval commented Aug 6, 2024

VickyStash commented Aug 6, 2024

davidcardoza commented Aug 7, 2024

jjcoffee commented Aug 7, 2024

cristipaval commented Aug 7, 2024 • edited Loading

jjcoffee left a comment

Choose a reason for hiding this comment

cristipaval commented Aug 7, 2024

OSBotify commented Aug 7, 2024

OSBotify commented Aug 7, 2024

OSBotify commented Aug 12, 2024

rojiphil Oct 2, 2024

Choose a reason for hiding this comment

dominictb Dec 12, 2024

Choose a reason for hiding this comment

jjcoffee commented Aug 2, 2024 •

edited

Loading

jjcoffee commented Aug 5, 2024 •

edited

Loading

cristipaval commented Aug 7, 2024 •

edited

Loading