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

updated to function component #28625

Merged
merged 34 commits into from
Nov 21, 2023

Conversation

keisyrzk
Copy link
Contributor

@keisyrzk keisyrzk commented Oct 2, 2023

Details

Updated the component so it is now built with a function.

Fixed Issues

$ #16119

Tests

  1. Log in to the app
  2. click avatar
  3. click avatar placed over user's email
    4a. click every row in the list and go back
    4b. click on the avatar so the bottom sheet appears
  4. click "upload photo"
    6a. click on the screen outside the sheet - check if closes without issues
    6b. click on the "gallery" option
  5. Gallery - pick a photo
  6. Edit photo and "save"
  7. When taken back to profile view click again on the avatar (already set) so the bottom sheet appears with new set of options
    10a. click on the screen outside the sheet - check if closes without issues
    10b. click "view photo" and then go back
    10c. click "upload photo" and repeat the proccess of picking a photo
    10d. click "remove photo" - see if avatar changed to default one
  8. exit the view to the app's main view and return back here to verify if the default avatar persists on every screen
  9. do the same with the avatar set with some photo
  • ✅ Verify that no errors appear in the JS console

Offline tests

NA

QA Steps

The same as described in "Tests" section.

  • [ x] 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(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.

Screenshots/Videos

Web https://github.com/Expensify/App/assets/18525360/63ad1dc3-6658-4ea3-b1ce-f1d9dc2d89ee https://github.com/Expensify/App/assets/18525360/3c79afc2-beff-4b3c-9211-c5e03389727d
Mobile Web - Chrome https://github.com/Expensify/App/assets/18525360/191935fc-244a-4786-a5f5-60a8f83002bc
Mobile Web - Safari https://github.com/Expensify/App/assets/18525360/fbeadfcb-c3b7-4c7a-b7bf-aeea8334951d
Desktop https://github.com/Expensify/App/assets/18525360/e313dbec-f336-4cf0-b790-2a3b19d491d5
iOS https://github.com/Expensify/App/assets/18525360/b4b57df2-48dd-4b84-b97b-0269b32fcfa9
Android https://github.com/Expensify/App/assets/18525360/adfc88ae-db17-4188-8275-33e8d5e73e16
Extra - workspace avatar Uploading workspaceAvatar.mov…

@github-actions
Copy link
Contributor

github-actions bot commented Oct 2, 2023

CLA Assistant Lite bot All contributors have signed the CLA ✍️ ✅

ios/Podfile.lock Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
Copy link
Contributor

@rezkiy37 rezkiy37 left a comment

Choose a reason for hiding this comment

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

LGTM, after resolving comments.

@keisyrzk
Copy link
Contributor Author

keisyrzk commented Oct 3, 2023

I have read the CLA Document and I hereby sign the CLA

Copy link
Contributor

@blazejkustra blazejkustra left a comment

Choose a reason for hiding this comment

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

Vit asked me to review once PR is up, I left some notes from the previous PR that I worked on.

src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
ios/Podfile.lock Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
@keisyrzk keisyrzk marked this pull request as ready for review October 5, 2023 09:27
@keisyrzk keisyrzk requested a review from a team as a code owner October 5, 2023 09:27
@melvin-bot melvin-bot bot requested review from eVoloshchak and removed request for a team October 5, 2023 09:27
@melvin-bot
Copy link

melvin-bot bot commented Oct 5, 2023

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

src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Show resolved Hide resolved
src/components/AvatarWithImagePicker.js Outdated Show resolved Hide resolved
@keisyrzk
Copy link
Contributor Author

@eVoloshchak I have merged the newest main and resolved conflicts. I did also fix the linter error and warnings.

@eVoloshchak
Copy link
Contributor

@keisyrzk, the order of imports should be different, the Lint check will still fail
run npm run prettier and commit the changes

@keisyrzk
Copy link
Contributor Author

@eVoloshchak ran prettier and linter again and pushed updates

Copy link
Contributor

@eVoloshchak eVoloshchak left a comment

Choose a reason for hiding this comment

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

SpinningIndicatorAnimation isn't deleted anymore, must have been a mismatch during merge

@keisyrzk
Copy link
Contributor Author

keisyrzk commented Nov 6, 2023

@eVoloshchak ok I have added the SpinningIndicatorAnimation

@blazejkustra
Copy link
Contributor

@keisyrzk @eVoloshchak Why SpinningIndicator was restored? It wasn't used before, context

@eVoloshchak
Copy link
Contributor

ok I have added the SpinningIndicatorAnimation

@keisyrzk, I meant we need to delete the SpinningIndicatorAnimation.js file

@deetergp
Copy link
Contributor

deetergp commented Nov 7, 2023

…and resolve the merge conflict 😬

@keisyrzk
Copy link
Contributor Author

keisyrzk commented Nov 8, 2023

@eVoloshchak oh ok, I misunderstood your comment. I have removed the SpinningIndicatorAnimation.js file and the animation code I added last time. Changes pushed.

Copy link
Contributor

@eVoloshchak eVoloshchak left a comment

Choose a reason for hiding this comment

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

Bug:
when selecting an image, you can select other files (pdf, mp4, etc. files are not greyed out)
Screenshot 2023-11-08 at 16 49 42

Here's how it looks on the current main, only images can be selected
Screenshot 2023-11-08 at 16 48 26

Co-authored-by: Eugene Voloshchak <copyreading@gmail.com>
Copy link
Contributor

@eVoloshchak eVoloshchak left a comment

Choose a reason for hiding this comment

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

Crash on Android

Screen.Recording.2023-11-12.at.14.28.23.mov

@eVoloshchak
Copy link
Contributor

eVoloshchak commented Nov 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: 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(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 reviewer checklist, including those that don't apply to this PR.

Screenshots/Videos

Android: Native
Screen.Recording.2023-11-21.at.13.14.48.mov
Android: mWeb Chrome
Screen.Recording.2023-11-21.at.13.17.12.mov
iOS: Native
Screen.Recording.2023-11-21.at.13.24.27.mov
iOS: mWeb Safari
Screen.Recording.2023-11-21.at.13.30.09.mov
MacOS: Chrome / Safari
Screen.Recording.2023-11-20.at.17.47.08.mov
MacOS: Desktop
Screen.Recording.2023-11-21.at.13.32.14.mov

Copy link
Contributor

@eVoloshchak eVoloshchak left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@deetergp deetergp left a comment

Choose a reason for hiding this comment

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

LGTM2! Nice to see this one get over the finish line. Thanks for the hard work @keisyrzk & @eVoloshchak!

@deetergp deetergp merged commit ae0a68e into Expensify:main Nov 21, 2023
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

🚀 Deployed to staging by https://github.com/deetergp in version: 1.4.2-0 🚀

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

@OSBotify
Copy link
Contributor

🚀 Deployed to production by https://github.com/luacmartins in version: 1.4.2-3 🚀

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.

9 participants