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

Feature: [P2P Distance] Enable P2P/splits in App #37185

Merged
merged 17 commits into from
Mar 6, 2024

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Feb 25, 2024

Details

Enable P2P/Splits in App following this plan.

Fixed Issues

$ #36984
PROPOSAL: #36984 (comment)

Tests

  1. Go to global create (+) > Request money
  2. Change the request type to Distance
  3. Choose and submit the start/finish points
  4. Verify that the header title is ‘Distance’
  5. Verify that you see both workspaces and individual users in the participants list
  6. Verify that you can search for a user or a workspace
  7. Verify that for each user/workspace the “Split” button is displayed
  8. Choose one user and go to the confirmation page
  9. Verify that the distance is displayed correctly (Route pending... for P2P request, or73.45 miles @ $0.66 / mile for workspace)
  10. Verify that clicking the distance field navigates to the distance editing page
  11. Change the waypoints >> Next
  12. Verify the distance is modified accordingly
  13. Go to any policy expense chat >> (+) >> Request money
  14. Repeat step 2 - 4 and 9 - 12
  15. Go to any group chat >> (+) >> Split bill
  16. Verify user can create Distance split bill
  17. Go to any DM >> (+) >> Request money
  18. Verify user can create Distance split bill
  • Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

  1. Go to global create (+) > Request money
  2. Change the request type to Distance
  3. Choose and submit the start/finish points
  4. Verify that the header title is ‘Distance’
  5. Verify that you see both workspaces and individual users in the participants list
  6. Verify that you can search for a user or a workspace
  7. Verify that for each user/workspace the “Split” button is displayed
  8. Choose one user and go to the confirmation page
  9. Verify that the distance is displayed correctly (Route pending... for P2P request, or73.45 miles @ $0.66 / mile for workspace)
  10. Verify that clicking the distance field navigates to the distance editing page
  11. Change the waypoints >> Next
  12. Verify the distance is modified accordingly
  13. Go to any policy expense chat >> (+) >> Request money
  14. Repeat step 2 - 4 and 9 - 12
  15. Go to any group chat >> (+) >> Split bill
  16. Verify user can create Distance split bill
  17. Go to any DM >> (+) >> Request money
  18. Verify user can create Distance split bill
  • Verify that no errors appear in the JS console

PR Author Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for the expected offline behavior in the Offline steps section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
    • I tested this PR with a High Traffic account against the staging or production API to ensure there are no regressions (e.g. long loading states that impact usability).
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • Android: Native
    • Android: mWeb Chrome
    • iOS: Native
    • iOS: mWeb Safari
    • MacOS: Chrome / Safari
    • MacOS: Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that the left part of a conditional rendering a React component is a boolean and NOT a string, e.g. myBool && <MyComponent />.
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product is localized by adding it to src/languages/* files and using the translation method
      • If any non-english text was added/modified, I verified the translation was requested/reviewed in #expensify-open-source and it was approved by an internal Expensify engineer. Link to Slack message:
    • I verified all numbers, amounts, dates and phone numbers shown in the product are using the localization methods
    • I verified any copy / text that was added to the app is grammatically correct in English. It adheres to proper capitalization guidelines (note: only the first word of header/labels should be capitalized), and is approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • I verified that if a function's arguments changed that all usages have also been updated correctly
  • If any new file was added I verified that:
    • The file has a description of what it does and/or why is needed at the top of the file if the code is not self explanatory
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(theme.componentBG))
  • If the PR modifies code that runs when editing or sending messages, I tested and verified there is no unexpected behavior for all supported markdown - URLs, single line code, code blocks, quotes, headings, bold, strikethrough, and italic.
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • If the PR modifies a component or page that can be accessed by a direct deeplink, I verified that the code functions as expected when the deeplink is used - from a logged in and logged out account.
  • If the PR modifies the form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.

Screenshots/Videos

Android: Native
Screen.Recording.2024-02-26.at.15.26.25-compressed.mov
Android: mWeb Chrome
Screen.Recording.2024-02-26.at.15.31.02-compressed.mov
iOS: Native
1.mov
2.mov
iOS: mWeb Safari
Screen.Recording.2024-02-26.at.15.21.55-compressed.mov
MacOS: Chrome / Safari
Screen.Recording.2024-03-04.at.15.45.43-compressed.mov
Screen.Recording.2024-03-04.at.15.44.46-compressed.mov
Screen.Recording.2024-03-04.at.15.47.11-compressed.mov
MacOS: Desktop
Screen.Recording.2024-03-04.at.15.45.43-compressed.mov
Screen.Recording.2024-03-04.at.15.44.46-compressed.mov
Screen.Recording.2024-03-04.at.15.47.11-compressed.mov

@tienifr
Copy link
Contributor Author

tienifr commented Feb 26, 2024

Pending confirmation in #36984 (comment) before marking PR ready.

@tienifr tienifr marked this pull request as ready for review February 26, 2024 08:25
@tienifr tienifr requested a review from a team as a code owner February 26, 2024 08:25
@melvin-bot melvin-bot bot requested review from alitoshmatov and removed request for a team February 26, 2024 08:25
Copy link

melvin-bot bot commented Feb 26, 2024

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

@neil-marcellini neil-marcellini self-requested a review February 26, 2024 20:28
Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

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

Looking pretty good, suggested some tweaks.

@tienifr
Copy link
Contributor Author

tienifr commented Feb 28, 2024

I've resolved all the feedbacks!

@tienifr
Copy link
Contributor Author

tienifr commented Feb 29, 2024

One thing to confirm: For group chat, do we allow distance split? @neil-marcellini

@neil-marcellini
Copy link
Contributor

One thing to confirm: For group chat, do we allow distance split? @neil-marcellini

Yes, let's make that work too.

Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

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

Looking really good now, thanks for the updates! There's one thing I would like to see changed, and it sounds like we also need to enable this for group chats.

After that we can probably get this merged. The backend is almost done, but it will be a little while longer to finish up. Since we have the beta, I think it's ok if this goes out before the backend is done.

@tienifr
Copy link
Contributor Author

tienifr commented Mar 4, 2024

we also need to enable this for group chats

@neil-marcellini @koko57 I've enabled distance request for both group chats and DMs. I also think we should reflect this in design doc.

@neil-marcellini
Copy link
Contributor

I also think we should reflect this in design doc.

Sounds good. Please go ahead and make a suggestion there for how you would like to see it updated. I'll then review/accept it.

Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

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

Good to go, pending C+ testing 🙂

@alitoshmatov
Copy link
Contributor

Reviewing

@alitoshmatov
Copy link
Contributor

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 approved by marketing by adding the Waiting for Copy label for a copy review on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I 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 form input styles:
    • I verified that all the inputs inside a form are aligned with each other.
    • I added Design label so the design team can review the changes.
  • If a new page is added, I verified it's using the ScrollView component to make it scrollable when more elements are added to the page.
  • If the main branch was merged into this PR after a review, I tested again and verified the outcome was still expected according to the Test steps.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
p2p-android.mov
Android: mWeb Chrome
p2p-mweb.mov
iOS: Native https://github.com/Expensify/App/assets/59907218/3c5a5f45-d308-4518-9759-7f9d5b8a66dc
iOS: mWeb Safari
p2p-safari.mp4
MacOS: Chrome / Safari
p2p-web.mov
MacOS: Desktop
compressed-p2p-desktop.mov

Copy link
Contributor

@alitoshmatov alitoshmatov left a comment

Choose a reason for hiding this comment

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

Changes looks good to me

@melvin-bot melvin-bot bot requested a review from neil-marcellini March 6, 2024 13:04
Copy link
Contributor

@neil-marcellini neil-marcellini left a comment

Choose a reason for hiding this comment

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

Mostly looks good, but I don't understand why we are showing "Route pending..." for the distance field on P2P distance requests. It should display with the proper rate and distance text just like for a workspace.

Oh I see, it's because we need getRateForDisplay from this issue [$500] [P2P Distance] Create a new Rate field.

I'm fine if it doesn't fully work at this point, because it's under beta and we want to keep the PRs small 👍. I also can't think of any other reasonable way to do it, so looks good.

@neil-marcellini
Copy link
Contributor

❗❗❗ Note to QA/bug reporters ❗❗❗

Please refrain from creating deploy blockers related to this PR/issue. The feature is under a beta that is only available to expensify accounts while we build the feature. It's expected to be incomplete right now.

@neil-marcellini neil-marcellini merged commit 6c320c4 into Expensify:main Mar 6, 2024
16 of 17 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Mar 6, 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.

@OSBotify
Copy link
Contributor

OSBotify commented Mar 6, 2024

🚀 Deployed to staging by https://github.com/neil-marcellini in version: 1.4.48-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented Mar 7, 2024

🚀 Deployed to production by https://github.com/roryabraham in version: 1.4.48-0 🚀

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

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