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: 15963 - Border line appears, then disappears, above the 1st search result #16094

Merged
merged 5 commits into from
Mar 24, 2023

Conversation

tienifr
Copy link
Contributor

@tienifr tienifr commented Mar 18, 2023

Details

This PR added this.props.shouldHaveOptionSeparator !== nextProps.shouldHaveOptionSeparator; to the shouldComponentUpdate of OptionRow. This will remove the redundant border line above the first item in the pronoun search.

In addition, the PR also added some other props condition in shouldComponentUpdate that should make the item in OptionRow re-render, as suggested by the reviewer. The addition props being considered are this.props.option.shouldShowSubscript, this.props.option.ownerEmail, this.props.option.subtitle, this.props.option.pendingAction.

Fixed Issues

$ #15963
PROPOSAL: #15963 (comment)

Tests

  1. Navigate to Settings > Profile > Pronouns
  2. Type Hi
  3. Observe that the border doesn't show above the first result
  4. Type Hir
  5. Verify that the border still doesn't show above the first result
  • Verify that no errors appear in the JS console

Offline tests

n/a

QA Steps

For the main issue

  1. Navigate to Settings > Profile > Pronouns
  2. Type Hi
  3. Observe that the border doesn't show above the first result
  4. Type Hir
  5. Verify that the border still doesn't show above the first result

For the other pages that could be affected

PriorityModePage
  1. Navigate to Settings > Preferences > Priority mode
  2. Verify that the border doesn't show above the first item
  3. Verify that there is no error occur
LanguagePage
  1. Navigate to Settings > Preferences > Language
  2. Verify that the border doesn't show above the first item
  3. Verify that there is no error occur
ReportParticipantsPage
  1. Navigate to a report with multiple participants
  2. Click on the user list on the top to open Details page
  3. Verify that the border doesn't show above the first item
  4. Verify that there is no error occur
IOUConfirmationList
  1. Go to a report
  2. Choose Request money or Send money
  3. Type in an amount and move to the confirmation page
  4. Verify that there is no error occur
NewChatPage
  1. Click the plus button in the LHN page, select New chat
  2. Verify that the border doesn't show above the first item
  3. Verify that there is no error occur
SearchPage
  1. Click the search button in the LHN page
  2. Verify that the border doesn't show above the first item
  3. Verify that there is no error occur
IOUCurrencySelection
  1. Go to a report
  2. Choose Request money or Send money
  3. Select the currency to enter currency selection page
  4. Verify that the border doesn't show above the first item
  5. Verify that there is no error occur
IOUParticipantsRequest
  1. Click the plus button in the LHN page, select Request money
  2. Type in an amount and proceed
  3. Search for users
  4. Verify that the border doesn't show above the first item
  5. Verify that there is no error occur
IOUParticipantsSplit
  1. Click the plus button in the LHN page, select Split bill
  2. Type in an amount and proceed
  3. Search for users
  4. Verify that the border doesn't show above the first item
  5. Verify that there is no error occur
YearPickerPage
  1. Navigate to Settings > Profile > Personal details > Date of birth
  2. Select year dropdown
  3. Search for a year
  4. Verify that the border doesn't show above the first item
  5. Verify that there is no error occur
TimezoneSelectPage
  1. Navigate to Settings > Profile > Timezone
  2. Disable automatic timezone, then go to select time zone
  3. Verify that the border doesn't show above the first item
  4. Verify that there is no error occur
WorkspaceInvitePage
  1. Go to a workspace
  2. Select Manage members > Invite
  3. Search for a user
  4. Verify that the border doesn't show above the first item
  5. Verify that there is no error occur
WorkspaceMembersPage
  1. Go to a workspace
  2. Select Manage members
  3. Verify that the border doesn't show above the first item
  4. Verify that there is no error occur
  • 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 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 correct English and 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
    • 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 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 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
web-chrome.mov
web-safari.mov
Mobile Web - Chrome
android-chrome.webm
Mobile Web - Safari
ios-safari.mov
Desktop
desktop.mov
iOS
ios-native.mov
Android
android-native.webm

@tienifr tienifr force-pushed the fix/15963 branch 3 times, most recently from 1263c36 to 9fc0a41 Compare March 19, 2023 14:46
@tienifr tienifr marked this pull request as ready for review March 20, 2023 09:57
@tienifr tienifr requested a review from a team as a code owner March 20, 2023 09:57
@melvin-bot melvin-bot bot requested review from Beamanator and s77rt and removed request for a team March 20, 2023 09:58
@MelvinBot
Copy link

@Beamanator @s77rt One of you needs to 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

@s77rt s77rt left a comment

Choose a reason for hiding this comment

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

Can you please check for other props that we should re-render the item if they got changed e.g. shouldDisableRowInnerPadding, option.isPinned, option.pendingAction, etc. Just add those that are likely to be changed.

@tienifr
Copy link
Contributor Author

tienifr commented Mar 21, 2023

@s77rt

shouldDisableRowInnerPadding, option.isPinned, option.pendingAction

shouldDisableRowInnerPadding is not necessarily to be change, since it’s used as a fixed boolean props with the OptionList component here and here. Similar thing goes for props.showTitleTooltip

option.isPinned is not used in OptionRow, so I think it wouldn’t be necessary to check it in shouldComponentUpdate.

Some attributes of props.option are added, namely shouldShowSubscript, icons, ownerEmail, subtitle, pendingAction. I agree that they should be presented since they're used in OptionRow. Their changes could affect the behavior of the render function.

Thoughts?

Copy link
Contributor

@s77rt s77rt left a comment

Choose a reason for hiding this comment

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

Thanks for the update. I have requested some minor changes. Also I think we can also add allReportErrors but not sure what cases this would cover as I'd imagine pendingAction will change too most of the time we get an error, so let's skip it for now since it's an object that is not easy to compare and no clear purpose is identified.

src/components/OptionRow.js Outdated Show resolved Hide resolved
src/components/OptionRow.js Outdated Show resolved Hide resolved
@tienifr
Copy link
Contributor Author

tienifr commented Mar 21, 2023

@s77rt Thanks for pointing that out, I've removed icons checking and moved props.shouldHaveOptionSeparator check to be after props.isSelected. Please take a look

@s77rt
Copy link
Contributor

s77rt commented Mar 21, 2023

@tienifr Thanks! Will test asap, in the meantime please update the "Details" description in the PR.

@s77rt
Copy link
Contributor

s77rt commented Mar 21, 2023

Also please remove the offline tests; write "n/a". I don't think offline tests have any different behavior than being online.

@tienifr
Copy link
Contributor Author

tienifr commented Mar 21, 2023

@s77rt Updated as suggested 🎉 Thanks!

@s77rt
Copy link
Contributor

s77rt commented Mar 21, 2023

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 / Chrome
    • iOS / native
    • iOS / 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 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 correct English and 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(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.
  • 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

Web
web.mp4
Mobile Web - Chrome
mweb-chrome.mp4
Mobile Web - Safari
mweb-safari.mp4
Desktop
desktop.mp4
iOS
ios.mp4
Android
android.mp4

Copy link
Contributor

@s77rt s77rt left a comment

Choose a reason for hiding this comment

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

LGTM! 🚀

cc @Beamanator

@tienifr
Copy link
Contributor Author

tienifr commented Mar 22, 2023

@Beamanator Could you help to check this PR?

@tienifr
Copy link
Contributor Author

tienifr commented Mar 23, 2023

@Beamanator Can you assist me in reviewing this PR?

@s77rt
Copy link
Contributor

s77rt commented Mar 23, 2023

@tienifr No need for double-tag. I'm sure Alex will check this once he get the time.

@Beamanator
Copy link
Contributor

Beamanator commented Mar 23, 2023

Ya sorry for the delay, have been quite busy and I'm mainly on vacation this week but I'll be happy to merge soon, but I do have one question:

@s77rt @tienifr did y'all test this change on all pages that have the OptionRow? We don't want to have any regressions, and right now in the QA steps I only see tests for the Pronouns page which doesn't seem sufficient

@s77rt
Copy link
Contributor

s77rt commented Mar 23, 2023

@Beamanator I confirm OptionRow is working fine on:

  • PronounsPage
  • PriorityModePage
  • LanguagePage
  • ReportParticipantsPage
  • IOUConfirmationList
  • NewChatPage
  • SearchPage
  • YearPickerPage
  • IOUCurrencySelection
  • IOUParticipantsRequest
  • IOUParticipantsSplit
  • TimezoneSelectPage
  • WorkspaceInvitePage
  • WorkspaceMembersPage

@tienifr Can you please confirm the same

@tienifr
Copy link
Contributor Author

tienifr commented Mar 24, 2023

@s77rt @Beamanator It works for me in all places

  • PronounsPage
  • PriorityModePage
  • LanguagePage
  • ReportParticipantsPage
  • IOUConfirmationList
  • NewChatPage
  • SearchPage
  • YearPickerPage
  • IOUCurrencySelection
  • IOUParticipantsRequest
  • IOUParticipantsSplit
  • TimezoneSelectPage
  • WorkspaceInvitePage
  • WorkspaceMembersPage

Copy link
Contributor

@Beamanator Beamanator left a comment

Choose a reason for hiding this comment

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

Ok great! Thanks y'all 👍

@tienifr can you please also add some kind of simple test steps for those pages in the OP as well?

@Beamanator Beamanator merged commit 9bf4fd0 into Expensify:main Mar 24, 2023
@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 staging by https://github.com/Beamanator in version: 1.2.89-0 🚀

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

@tienifr
Copy link
Contributor Author

tienifr commented Mar 25, 2023

@Beamanator Tests updated in the QA section! Everything seems good. I removed the YearPickerPage, since I think that's not relevant to the current issue.

@s77rt Just for confirmation, are you referring to the date picker page in the birthday section? If not, can you provide the location where it is used, because I cannot find a YearPickerPage component in the code.

@s77rt
Copy link
Contributor

s77rt commented Mar 25, 2023

@tienifr On birthday page, open date picker, click on year. It will take you to the year picker page which uses OptionsSelector which uses OptionRow.

@tienifr
Copy link
Contributor Author

tienifr commented Mar 25, 2023

@s77rt Thanks 🎉 I forgot to sync to the newest change

All tests for the related components are added in the QA section. All yours @Beamanator

@s77rt
Copy link
Contributor

s77rt commented Mar 25, 2023

@tienifr This has been merged already.

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.2.89-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