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

[Fix]: Inconsistency in limitation when adding members via FAB and group details page #40537

Merged
merged 12 commits into from
Apr 30, 2024

Conversation

allgandalf
Copy link
Contributor

@allgandalf allgandalf commented Apr 19, 2024

Details

When creating a group via FAB, we limit the number of participants to 8, but on when we add members via report details page, we do not limit the members, this PR solves this mismatch by removing the maximum participant limit on FAB.

Fixed Issues

$ #40512
PROPOSAL: #40512 (comment)

Tests

Same as QA

  • Verify that no errors appear in the JS console

Offline tests

Same as QA

QA Steps

  1. Open App
  2. Go to FAB > Start chat.
  3. Add as many people to the group as you want
  4. Verify that you can "Add to group" more than 8 participants.
  5. Click Next > Start group and verify the group chat is created successfully.
  • 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 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

MacOS: Chrome / Safari
Screen.Recording.2024-04-19.at.3.03.25.PM.mov
MacOS: Desktop
Screen.Recording.2024-04-19.at.3.06.06.PM.mov
Android: Native
group.add.mov
Android: mWeb Chrome
Screen.Recording.2024-04-22.at.6.26.11.AM.mov
iOS: Native
issu.mov
iOS: mWeb Safari
Screen.Recording.2024-04-22.at.6.24.22.AM.mov

@allgandalf allgandalf requested a review from a team as a code owner April 19, 2024 09:32
@melvin-bot melvin-bot bot requested review from cubuspl42 and removed request for a team April 19, 2024 09:32
Copy link

melvin-bot bot commented Apr 19, 2024

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

@allgandalf
Copy link
Contributor Author

Facing some issues with iOS built due to AirshipFrameworkProxy 🙃 , I'll update the videos once I build it successfully

@allgandalf
Copy link
Contributor Author

PR ready for your review @cubuspl42

@ahmedGaber93
Copy link
Contributor

ahmedGaber93 commented Apr 25, 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
a.mov
Android: mWeb Chrome
aw.mov
iOS: Native
i.mov
iOS: mWeb Safari
iw.mov
MacOS: Chrome / Safari
w.mov
MacOS: Desktop
Screen.Recording.2024-04-25.at.1.47.35.PM.mov


const [sections, firstKeyForList] = useMemo(() => {
const sectionsList: OptionsListUtils.CategorySection[] = [];
let firstKey = '';

const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(debouncedSearchTerm, selectedOptions, recentReports, personalDetails, maxParticipantsReached);
const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(debouncedSearchTerm, selectedOptions, recentReports, personalDetails, false);
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(debouncedSearchTerm, selectedOptions, recentReports, personalDetails, false);
const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(debouncedSearchTerm, selectedOptions, recentReports, personalDetails);

Copy link
Contributor

Choose a reason for hiding this comment

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

I think the default value for parameter is false, so no need to pass it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

are you sure @ahmedGaber93 ?

I see can't makes sense of the assignment:

function formatSectionsFromSearchTerm(
searchTerm: string,
selectedOptions: ReportUtils.OptionData[],
filteredRecentReports: ReportUtils.OptionData[],
filteredPersonalDetails: ReportUtils.OptionData[],
maxOptionsSelected: boolean,

Does the above assignment means it is set to false?

Copy link
Contributor

Choose a reason for hiding this comment

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

@GandalfGwaihir Ah, you are right, it is not having default value, ignore this change it is not affected.

Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we still need this param? Is there some case where maxOptionsSelected applies anymore?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Okay missed this, I will check if there are any additional constraints for this to happen, will let you know by EOD

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Also, do you know why there was a limit on Money request participant selector in the first place?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@marcaaron , made the changes, can you review it when you find time

Copy link
Contributor

Choose a reason for hiding this comment

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

Reviewing today.

Copy link
Contributor

Choose a reason for hiding this comment

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

Also, do you know why there was a limit on Money request participant selector in the first place?

Sure! And sorry, I should have caught this sooner. But it's because the "split" request lands on a Group DM between you and all the other participants. Since we had a previous restriction on that. Now that there is none for Group Chats we can do the same behavior everywhere.

@ahmedGaber93
Copy link
Contributor

@GandalfGwaihir just small change in tests step.

Instead of "The expected result here is that we will not limit the number of participants added to the group".
4. Verify that you can "Add to group" more than 8 participants.
5. Click Next > Start group and verify the group chat is created successfully.

@allgandalf
Copy link
Contributor Author

I guess we're all set @ahmedGaber93 🚀

Copy link
Contributor

@ahmedGaber93 ahmedGaber93 left a comment

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot melvin-bot bot requested a review from marcaaron April 25, 2024 12:12
Copy link
Contributor

@marcaaron marcaaron left a comment

Choose a reason for hiding this comment

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

Looks good. But I don't think there are any flows left that should have max participants at this point. Maybe I am wrong 😄 Please let me know.


const [sections, firstKeyForList] = useMemo(() => {
const sectionsList: OptionsListUtils.CategorySection[] = [];
let firstKey = '';

const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(debouncedSearchTerm, selectedOptions, recentReports, personalDetails, maxParticipantsReached);
const formatResults = OptionsListUtils.formatSectionsFromSearchTerm(debouncedSearchTerm, selectedOptions, recentReports, personalDetails, false);
Copy link
Contributor

Choose a reason for hiding this comment

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

Why do we still need this param? Is there some case where maxOptionsSelected applies anymore?

@allgandalf
Copy link
Contributor Author

I guess we're good to merge this one @marcaaron 🚀

@ahmedGaber93
Copy link
Contributor

@GandalfGwaihir are you able to test split expense with more than 8 participants?
I am blocked to test it with this error, although I never chat with some of the before!

Screenshot 2024-04-29 at 7 08 40 PM

@ahmedGaber93
Copy link
Contributor

I can test it now, but when submit split expense with more than 8 participants, API SplitBillAndOpenReport take long time > 30s to response.
I am not sure if the problem is with my network or not. Can you please test it and confirm @GandalfGwaihir?

@marcaaron
Copy link
Contributor

I am blocked to test it with this error, although I never chat with some of the before!

Gonna take a brief look in the backend to make sure we have no restriction there... I would guess there is something wrong with the optimistic data or the way we are handling it.

@marcaaron
Copy link
Contributor

Ok, there is no restriction on participant number in the backend. However, it would be helpful to see what params we are sending to the API in this case for debug purposes. There should be a chatType: 'group' param being sent. If it's not sent this could be the problem.

@allgandalf
Copy link
Contributor Author

okay, I will take a look at that , just to confirm, are we still dealing with the participant selector in this same issue right? or should we deal this case under a new issue altogether?, this issue was primarily focused on removing restriction on number of participants in group chat

@ahmedGaber93
Copy link
Contributor

@marcaaron Frontend already sent chatType: 'group' parameter with the request, also I think the user should be able to split expense with the same users who split with them before without this error There is a previously existing chat between these users., but I don't think this related to this PR so we can skip it now.

@ahmedGaber93
Copy link
Contributor

ahmedGaber93 commented Apr 29, 2024

are we still dealing with the participant selector in this same issue right?

@GandalfGwaihir if I understand you well, yes we will fix limited participants in split expense and group chat in this issue.

@allgandalf
Copy link
Contributor Author

cool @ahmedGaber93 , let me test with split expenses then!

@marcaaron
Copy link
Contributor

okay, I will take a look at that , just to confirm, are we still dealing with the participant selector in this same issue right? or should we deal this case under a new issue altogether?, this issue was primarily focused on removing restriction on number of participants in group chat

@GandalfGwaihir I don't think we need a new issue. We need to remove the restriction anywhere a "Group Chat" is created - doesn't matter which flow. Reminder that it's always possible to request comp change if you feel like the scope of work has changed enough to warrant it.

I don't think this related to this PR so we can skip it now

@ahmedGaber93 To confirm, you saying that you can reproduce this on staging or production? Could you give exact reproduction steps so we can look into them?

Thanks everyone!

@allgandalf
Copy link
Contributor Author

@marcaaron @ahmedGaber93 , pushed the latest changes allowing split expenses as well, can you review this once?

@ahmedGaber93
Copy link
Contributor

Could you give exact reproduction steps so we can look into them?

@marcaaron Sorry, I should do that from the beginning.

Bug: DEV - split expense with the same users failed in the second time.

  1. Click fab > split expense and split any amount with user A and user B.
  2. repeat the step 1 with the same users.

Split expense failed with error There is a previously existing chat between these users.

it also failed if split users contain at latest one user I split with him before.

20240430142901652.mp4

Copy link
Contributor

@ahmedGaber93 ahmedGaber93 left a comment

Choose a reason for hiding this comment

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

LGTM!

@melvin-bot melvin-bot bot requested a review from marcaaron April 30, 2024 11:54
@marcaaron
Copy link
Contributor

marcaaron commented Apr 30, 2024

Sorry, I should do that from the beginning.

No worries at all. I thank you for your thoroughness and appreciate you bringing it to our attention 🙇

It appears this is happening on staging already. Though I could only reproduce it one time (not sure what is happening here). But let's look into it in a new issue if there is a reliable reproduction.

@marcaaron marcaaron merged commit 1abad69 into Expensify:main Apr 30, 2024
17 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

OSBotify commented May 1, 2024

🚀 Deployed to staging by https://github.com/marcaaron in version: 1.4.69-0 🚀

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

@OSBotify
Copy link
Contributor

OSBotify commented May 2, 2024

🚀 Deployed to production by https://github.com/Beamanator in version: 1.4.69-2 🚀

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