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 any individual #47862

Merged
merged 11 commits into from
Sep 11, 2024

Conversation

VickyStash
Copy link
Contributor

@VickyStash VickyStash commented Aug 22, 2024

Details

Add Pay as Business option for invoices sent to any individual

Fixed Issues

$ #41974
PROPOSAL: N/A

Tests

  • Verify that no errors appear in the JS console
  1. Sign in to the app as User A.
  2. Send invoice to the next users:
  • User B - who has no workspaces
  • User C - who has a primary workspace but he is not an admin of it
  1. Log in to the app as User B. Pay the invoice as business and make sure the new primary workspace is created for User B and he is the admin of it. The invoice should be paid by this workspace, and the room should be turned into a B2B invoice room.
  2. Log in to the app as User C. Pay the invoice as business and make sure the new primary workspace is created for User C and he is the admin of it. The invoice should be paid by this workspace, and the room should be turned into a B2B invoice room.

Offline tests

Same as in 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 explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the UI (e.g. new buttons, new UI components, changing the padding/spacing/sizing, moving components, etc) or modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label and/or tagged @Expensify/design so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
android.mp4
Android: mWeb Chrome
android_web.mp4
iOS: Native
ios1.mp4
iOS: mWeb Safari
ios_web1.mp4
MacOS: Chrome / Safari
web1.mp4
MacOS: Desktop
desktop1.mp4

@VickyStash VickyStash changed the title [WIP] Add Pay as Business option for invoices sent to any individual Add Pay as Business option for invoices sent to any individual Aug 28, 2024
@VickyStash VickyStash marked this pull request as ready for review August 28, 2024 16:59
@VickyStash VickyStash requested a review from a team as a code owner August 28, 2024 16:59
@melvin-bot melvin-bot bot requested a review from jjcoffee August 28, 2024 16:59
Copy link

melvin-bot bot commented Aug 28, 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 removed the request for review from a team August 28, 2024 16:59
@jjcoffee
Copy link
Contributor

jjcoffee commented Aug 29, 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-08-29_14.33.44.mp4
Android: mWeb Chrome
android-chrome-2024-08-29_14.37.44.mp4
iOS: Native
ios-app-2024-08-29_17.02.51.mp4
iOS: mWeb Safari
ios-safari-2024-08-29_14.58.55.mp4
MacOS: Chrome / Safari
desktop-chrome-2024-08-29_10.38.40.mp4
MacOS: Desktop

No workspaces:

desktop-app-2024-08-29_14.22.47.mp4

Existing non-admin workspace:

desktop-app-2024-08-29_14.26.55.mp4

@jjcoffee

This comment was marked as off-topic.

@jjcoffee
Copy link
Contributor

Ah looks like this is happening on staging too. @VickyStash Do you think this can be handled here or is it better off in a followup?

@jjcoffee
Copy link
Contributor

I'm also seeing this error reportArchiveReasons.invoiceReceiverPolicyDeleted was not found in the default language for User A after step 3 (from these steps), which seems like an easy fix to include here.

@VickyStash
Copy link
Contributor Author

@jjcoffee Maybe we can mention it in this ticket #47170? It looks more relevant

@jjcoffee
Copy link
Contributor

@VickyStash Oh yes, good catch! I'll report it there.

@jjcoffee
Copy link
Contributor

jjcoffee commented Aug 29, 2024

BUG: Optimistically created workspace room has page not found error.

  1. [User A] Send an invoice to User B (who has no workspaces)
  2. [User B] Pay invoice as business
  3. [User B] Try to open the newly created workspace room (Collaboration between...)
  4. Hmm... it's not there page shows
desktop-chrome-2024-08-29_10.38.40.mp4

@VickyStash
Copy link
Contributor Author

@jjcoffee nice catch!
@cristipaval It looks like API doesn't create the expenseChatReport in the PayInvoice API command.

image

No report with the ID like this, and I've looked through all of the reports and there is no expenseChatReport:

image

@jjcoffee

This comment was marked as resolved.

@VickyStash
Copy link
Contributor Author

BUG: New workspace is created even if the user has a workspace for which they are an admin and one which they are not an admin. (This maybe rests on what we define as the "primary" workspace)

  1. [User A] Add User B (who has no workspaces) to any workspace as a member
  2. [User B] Add a new workspace for which User B is the admin
  3. [User A] Send an invoice to User B
  4. [User B] Pay as business
  5. Note that another new workspace is created

User B should be the admin of the primary (active) workspace. Only in this case the new workspace won't be created.
Did you make the workspace created in step 2 to be the primary one? You can do that in the old dot

@jjcoffee
Copy link
Contributor

Did you make the workspace created in step 2 to be the primary one? You can do that in the old dot

Ahh thanks for the clarification! I hadn't made any changes in oldDot so that explains why this happened (I sort of assumed that the new workspace would automatically become the primary one).

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.

Code LGTM and tests well! There's just this that needs a BE fix.

@melvin-bot melvin-bot bot requested a review from cristipaval August 29, 2024 15:11
# Conflicts:
#	src/components/SettlementButton.tsx
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.

Re-approving so that @MariaHCD gets added as a reviewer (hopefully!).

@melvin-bot melvin-bot bot requested a review from MariaHCD September 11, 2024 08:15
@VickyStash
Copy link
Contributor Author

There is a new BE issue, announce chat isn't creating anymore by PayInvoice API call:
image
image

bug1.mp4

@MariaHCD Could you help us with it?

@MariaHCD
Copy link
Contributor

There is a new BE issue, announce chat isn't creating anymore by PayInvoice API call

Looks like we don't create the announce chat unless there are at least 3 members in the policy:

8c16cb3cd81cbbc3-WAW	db2.sjc	2024-09-11 09:57:29 894	viktoryia.kliushun+inv104@callstack.com	Policy DCC70DB8C1628587 has less than 3 members, not creating an announce chat room.

I'm not super familiar with this project but do we know if the expected behavior is that the announce room must be created when an invoice is paid?

@MariaHCD
Copy link
Contributor

MariaHCD commented Sep 11, 2024

I spoke with @madmax330 and looks this is a BE bug - created the internal issue here: https://github.com/Expensify/Expensify/issues/427525

But I don't think we need to block this PR on that? Is this feature under a beta?

@VickyStash
Copy link
Contributor Author

VickyStash commented Sep 11, 2024

@MariaHCD

I'm not super familiar with this project but do we know if the expected behavior is that the announce room must be created when an invoice is paid?

If the user pay the invoice as business, but he is not the admin of his active(primary) workspace, we create a new workspace where the user is an admin and make this workspace to be primary. I use Policy.buildPolicyData to generate optimistic data/ids for the new policy on the FE side.

Looks like we don't create the announce chat unless there are at least 3 members in the policy

It looks like it's not just this PR problem, but overall the issue in the app, cause Policy.buildPolicyData always creates the announce chat. See the video recorded on the main:

bug_example.mp4

Steps:

  1. Create workspace.
  2. Open the announce chat of the created workspace

@VickyStash
Copy link
Contributor Author

@MariaHCD Since the similar bug also exists on main (see my comment) I think we can skip it in this PR.

Is this feature under a beta?

No

@MariaHCD
Copy link
Contributor

Cool, looks like we're also handling that here: #34929

@MariaHCD MariaHCD merged commit fe6ded2 into Expensify:main Sep 11, 2024
15 checks passed
@OSBotify
Copy link
Contributor

✋ 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
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 9.0.33-4 🚀

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

@madmax330
Copy link
Contributor

@VickyStash so the conclusion for this was that we should stop creating the announce room optimistically.

@madmax330
Copy link
Contributor

I think it will be removed here: https://github.com/Expensify/App/pull/48660/files

@VickyStash
Copy link
Contributor Author

I think it will be removed here: https://github.com/Expensify/App/pull/48660/files

Yes, it should be so

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.

5 participants