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

Allow Adding a category to a Split Bill #27936

Merged

Conversation

rezkiy37
Copy link
Contributor

@rezkiy37 rezkiy37 commented Sep 21, 2023

Details

The PR introduces categories for split bills when a participant is a workspace. The app shows categories only for workspace participants with categories. All other cases users cannot add a category to a split bill request.

By the way, we unified a fix to get a reportID for categories and tags. More info here - #27936 (comment).

Fixed Issues

$ #26506
PROPOSAL: N/A

Tests

Note: the backend is not ready yet to handle categories for split bills. Also, there is no UI to verify that in a newly created split bill there is a category.

1. Split bill with a category

  1. Click on "+" (FAB).
  2. Click on "Request Money".
  3. Click on "Split" on a participant that is a workspace and has categories.
  4. Click on "Show more".
  5. Verify that there is "Category" field.
  6. Click on the field.
  7. Verify that you can select/deselect a category.
  8. Click on "Split".
  9. Verify that the app redirects you to a chat page with a newly created split bill.
  10. Verify that no errors happened.

2. Split bill without a category

  1. Click on "+" (FAB).
  2. Click on "Request Money".
  3. Click on "Split" on any participant that does not have categories like a regular user.
  4. Click on "Show more".
  5. Verify that there isn't "Category" field.
  6. Click on "Split".
  7. Verify that the app redirects you to a chat page with a newly created split bill.
  8. Verify that no errors happened.

3. Request money with a tag

  1. Click on "+" (FAB).
  2. Click on "Request Money".
  3. Click on a participant that is a workspace and has tags.
  4. Click on "Show more".
  5. Verify that there is "Tag" field.
  6. Click on "Request".
  7. Verify that the app redirects you to a chat page with a newly created money request.
  8. Verify that no errors happened.

4. Request money without a tag

  1. Click on "+" (FAB).
  2. Click on "Request Money".
  3. Click on any participant that does not have tags like a regular user.
  4. Click on "Show more".
  5. Verify that there isn't "Tag" field.
  6. Click on "Request".
  7. Verify that the app redirects you to a chat page with a newly created money request.
  8. Verify that no errors happened.
  • Verify that no errors appear in the JS console

Offline tests

Same as "Tests".

QA Steps

Same as "Tests".

  • 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 / Chrome
    • iOS / native
    • iOS / 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 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
    • If we are not using the full Onyx data that we loaded, I've added the proper selector in order to ensure the component only re-renders when the data it is using changes
    • 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(themeColors.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 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 author checklist, including those that don't apply to this PR.

Screenshots/Videos

Web
Chrome.mp4
Chrome.Offline.mp4
Safari.mp4
SB.Tag.mp4
Mobile Web - Chrome
Android.Chrome.mp4
Mobile Web - Safari
IOS.Safari.mp4
Desktop
Desktop.mp4
iOS
IOS.mp4
Android
Android.mp4

src/libs/actions/IOU.js Outdated Show resolved Hide resolved
@rezkiy37 rezkiy37 marked this pull request as ready for review September 26, 2023 13:22
@rezkiy37 rezkiy37 requested a review from a team as a code owner September 26, 2023 13:22
@melvin-bot melvin-bot bot requested review from hoangzinh and removed request for a team September 26, 2023 13:22
@melvin-bot
Copy link

melvin-bot bot commented Sep 26, 2023

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

Copy link
Contributor

@hoangzinh hoangzinh left a comment

Choose a reason for hiding this comment

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

I think we could split this PR into 2 PR: one for "Adding a category" and another PR to fix bugs. It will make it easier to code review and only revert the related PR if it causes any regression bugs.

src/components/MoneyRequestConfirmationList.js Outdated Show resolved Hide resolved
src/libs/actions/IOU.js Show resolved Hide resolved
src/pages/iou/MoneyRequestTagPage.js Outdated Show resolved Hide resolved
src/libs/actions/IOU.js Outdated Show resolved Hide resolved
@rezkiy37
Copy link
Contributor Author

rezkiy37 commented Oct 4, 2023

@hoangzinh, I've fixed a case when the app saves category and tag between different split bills/money requests here -
df19f03. I included a tag value as well, because it is from the same feature Wave 6 and should have the same behaviour.

Clear.values.mp4

@hoangzinh
Copy link
Contributor

@rezkiy37 Could you share how to setup tags for a policy in OldDot? I tried to find it in OldDot but I couldn't, I can only found tags for Individual polices. Thanks

Screen.Recording.2023-10-04.at.22.00.51.mov

@rezkiy37
Copy link
Contributor Author

rezkiy37 commented Oct 4, 2023

@hoangzinh, please check it out - #28151 (comment).

Copy link
Contributor

@hoangzinh hoangzinh left a comment

Choose a reason for hiding this comment

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

LGTM. Great work @rezkiy37

@melvin-bot melvin-bot bot requested a review from puneetlath October 4, 2023 17:09
Copy link
Contributor

@puneetlath puneetlath left a comment

Choose a reason for hiding this comment

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

One small comment. Otherwise, looks great!

src/libs/actions/Policy.js Outdated Show resolved Hide resolved
@rezkiy37 rezkiy37 requested a review from puneetlath October 9, 2023 13:08
@puneetlath puneetlath merged commit 068e59e into Expensify:main Oct 9, 2023
12 checks passed
@OSBotify
Copy link
Contributor

OSBotify commented Oct 9, 2023

✋ 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 Oct 9, 2023

🚀 Deployed to staging by https://github.com/puneetlath in version: 1.3.80-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.80-3 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by https://github.com/puneetlath in version: 1.3.81-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

platform result
🤖 android 🤖 skipped 🚫
🖥 desktop 🖥 skipped 🚫
🍎 iOS 🍎 skipped 🚫
🕸 web 🕸 skipped 🚫

2 similar comments
@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

platform result
🤖 android 🤖 skipped 🚫
🖥 desktop 🖥 skipped 🚫
🍎 iOS 🍎 skipped 🚫
🕸 web 🕸 skipped 🚫

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

platform result
🤖 android 🤖 skipped 🚫
🖥 desktop 🖥 skipped 🚫
🍎 iOS 🍎 skipped 🚫
🕸 web 🕸 skipped 🚫

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.83-11 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.84-10 🚀

platform result
🤖 android 🤖 skipped 🚫
🖥 desktop 🖥 skipped 🚫
🍎 iOS 🍎 skipped 🚫
🕸 web 🕸 skipped 🚫

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/francoisl in version: 1.3.84-10 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 failure ❌
🕸 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