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

make maximum participants reached msg consistent #9144

Merged

Conversation

adeel0202
Copy link
Contributor

@adeel0202 adeel0202 commented May 24, 2022

Details

Consistent maximum participants reached message in Split and New Group screens

Fixed Issues

$ #8847

Tests

  1. Press + icon

  2. Select New group

  3. Choose 8 participants

  4. Press + icon

  5. Select Split bill

  6. Enter any amount and press Next

  7. Choose 8 participants

  • Verify that no errors appear in the JS console

PR Review Checklist

Contributor (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 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 included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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
  • 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 */
    • Any functional components have the displayName property
    • 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
  • 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 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.

PR Reviewer Checklist

  • 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 verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • 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 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 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 was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team 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 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 */
    • Any functional components have the displayName property
    • 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 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 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.

QA Steps

  • Verify that no errors appear in the JS console

Screenshots

Web

web-group

web-split

Mobile Web

mweb-group
mweb-split

Desktop

desktop-group

desktop-split

iOS

ios-group
ios-split

@Beamanator
Copy link
Contributor

Beamanator commented May 24, 2022

@AndrewGable @tgolen @cead22 @iwiznia @flodnv I'm not sure why y'all were all automatically assigned to review this PR - feel free to if you'd like, but I feel like we don't need everyone to review 😅

(pinged in #engineering-chat to see if anyone knows what happened here: https://expensify.slack.com/archives/C03TQ48KC/p1653400316734399)

@Beamanator
Copy link
Contributor

@mananjadhav while you're testing this PR on every platform can you please include a video or screenshot on Android so we have pics from all platforms here? 👍

@mananjadhav
Copy link
Collaborator

@mananjadhav while you're testing this PR on every platform can you please include a video or screenshot on Android so we have pics from all platforms here? 👍

Yes, I'll do that @Beamanator

@flodnv
Copy link
Contributor

flodnv commented May 25, 2022

@AndrewGable @tgolen @cead22 @iwiznia @flodnv I'm not sure why y'all were all automatically assigned to review this PR - feel free to if you'd like, but I feel like we don't need everyone to review 😅

@tgolen can we please stop that until https://github.com/Expensify/Expensify/issues/211520 is resolved?

@Beamanator
Copy link
Contributor

Beamanator commented May 25, 2022

@flodnv I believe Tim fixed / removed this yesterday here: #9146

@mananjadhav
Copy link
Collaborator

I am unwell and I need 1-2 days to get back to this. Sorry for the delay.

@@ -105,6 +105,7 @@ export default {
leaveRoom: 'Leave room',
your: 'your',
conciergeHelp: 'Please reach out to Concierge for help.',
maxParticipantsReached: ({count}) => `You've selected the maximum number (${count}) of participants.`,
Copy link
Collaborator

Choose a reason for hiding this comment

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

NAB: But any specific reason we moved it as common.maxParticipantsReached instead of messages.maxParticipantsReached ?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

All the other texts that are commonly used are in common object, so it made sense to add this one to common as well.

Copy link
Collaborator

@mananjadhav mananjadhav 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 question, the rest of the PR looks good. Will test it shortly. Also can you please take the latest main pull and resolve conflicts?

@adeel0202 adeel0202 requested a review from marcaaron as a code owner June 3, 2022 06:31
@marcaaron marcaaron removed their request for review June 3, 2022 16:39
@mananjadhav
Copy link
Collaborator

mananjadhav commented Jun 3, 2022

#### PR Reviewer Checklist

- [x] I verified the PR has a small number of commits behind `main` - [x] I verified the correct issue is linked in the `### Fixed Issues` section above - [x] I verified testing steps are clear and they cover the changes made in this PR - [x] I verified the testing environment is mentioned in the test steps - [x] I verified testing steps cover success & fail scenarios (if applicable) - [x] I checked that screenshots or videos are included for tests on [all platforms](https://github.com/Expensify/App/blob/main/CONTRIBUTING.md#make-sure-you-can-test-on-all-platforms) - [x] I verified tests pass on **all platforms** & I tested again on: - [x] iOS / native - [x] Android / native - [x] iOS / Safari - [x] Android / Chrome - [x] MacOS / Chrome - [x] MacOS / Desktop - [x] I verified there are no console errors related to changes in this PR - x ] I verified proper code patterns were followed (see [Reviewing the code](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md#reviewing-the-code)) - [ ] I verified comments were added when the code was not self explanatory - [x] I verified any copy / text shown in the product was added in all `src/languages/*` files (if applicable) - [ ] I verified proper naming convention for platform-specific files was followed (if applicable) - [ ] I verified [style guidelines](https://github.com/Expensify/App/blob/main/STYLING.md) were followed - [x] I verified the JSDocs style guidelines (in [`STYLE.md`](https://github.com/Expensify/App/blob/main/STYLE.md#jsdocs)) were followed - [x] I verified that this PR follows the guidelines as stated in the [Review Guidelines](https://github.com/Expensify/App/blob/main/PR_REVIEW_GUIDELINES.md) - [x] I verified other components are not impacted by changes in this PR (i.e. if the PR modifies a shared library or component like `Avatar`, I verified the components using `Avatar` are working as expected) - [x] I verified the UI performance was not affected (the performance is the same than `main` branch) - [ ] If a new component is created I verified that a similar component doesn't exist in the codebase

@adeel0202 Changes look good and test well.

Attaching the Android screenshots:

Screenshot 2022-06-04 at 12 53 39 AM

Screenshot 2022-06-04 at 12 51 38 AM

cc - @Beamanator

🎀 👀 🎀
C+ Review done.

@Beamanator
Copy link
Contributor

Sorry for the delay @adeel0202 but now there are conflicts, can you get those fixed so we can merge? 🙏

@adeel0202
Copy link
Contributor Author

@Beamanator, I have resolved the conflicts.

@Beamanator Beamanator merged commit fb62f9a into Expensify:main Jun 8, 2022
@OSBotify
Copy link
Contributor

OSBotify commented Jun 8, 2022

✋ 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 Jun 8, 2022

🚀 Deployed to staging by @Beamanator in version: 1.1.74-0 🚀

platform result
🤖 android 🤖 failure ❌
🖥 desktop 🖥 failure ❌
🍎 iOS 🍎 cancelled 🔪
🕸 web 🕸 failure ❌

@OSBotify
Copy link
Contributor

OSBotify commented Jun 9, 2022

🚀 Deployed to production by @yuwenmemon in version: 1.1.74-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.

None yet

5 participants