migrate FloatingActionButtonAndPopover to function component #21851

dayana7204 · 2023-06-29T00:36:44Z

Details

Refactor FloatingActionButtonAndPopover.js to functional component

Fixed Issues

$ #16273

Tests

Verify that FAB menu is opened when click FAB
Verify that FAB menu is closed when click menu item or other space
Verify that FAB menu is closed when drag&drop file to app
Verify that FAB menu is auto opened for new user login.

Verify that no errors appear in the JS console

Offline tests

Same as Tests

QA Steps

Same as local 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
- 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 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

mobile.web.chrome.mov

Mobile Web - Safari

mobile.web.safari.mov

Desktop

desktop.mov

iOS

iphone.mov

Android

android.mov

melvin-bot · 2023-06-29T00:36:49Z

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

github-actions · 2023-06-29T00:36:59Z

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

dayana7204 · 2023-06-29T02:39:32Z

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

dayana7204 · 2023-06-29T02:43:14Z

recheck

abdulrahuman5196 · 2023-07-05T14:26:13Z

Starting to review now.

abdulrahuman5196 · 2023-07-05T14:26:26Z

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 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 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

Screen.Recording.2023-07-10.at.2.37.48.PM.mp4

Mobile Web - Chrome

az_recorder_20230710_155210.mp4

Mobile Web - Safari

Untitled.3.mp4

Desktop

Screen.Recording.2023-07-10.at.9.36.23.PM.mp4

iOS

Screen.Recording.2023-07-10.at.10.34.43.PM.mp4

Android

Untitled.mp4

abdulrahuman5196 · 2023-07-05T14:28:46Z

@dayana7204 could you kindly fix the merge conflicts. Anyways I will do initial testing on the code change

abdulrahuman5196 · 2023-07-05T14:31:01Z

And @dayana7204 FloatingActionButtonAndPopover is not only limited to the above mentioned cases, It should auto open in case of new accounts. Have we tested the same? If so can we update the tests section

dayana7204 · 2023-07-05T15:06:59Z

@abdulrahuman5196 thanks for your review.
I removed conflicts.
I tested FAB menu auto open case for new user and it works as well.
I updated test case. :)

abdulrahuman5196 · 2023-07-05T15:14:02Z

Thank you @dayana7204 . Will continue review

abdulrahuman5196 · 2023-07-05T18:03:25Z

Checked code on high level. Seems fine to me. will test again in my morning and approve if no issues are found.

dayana7204 · 2023-07-07T03:21:58Z

@abdulrahuman5196 Could you please review?

alitoshmatov · 2023-07-10T07:26:59Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

@@ -274,4 +286,12 @@ export default compose(
            key: ONYXKEYS.IS_LOADING_REPORT_DATA,


Looks like there is two withWindowDimensions is used, one should be removed.
Coming from - https://expensify.slack.com/archives/C01GTK53T8Q/p1688970802542999

Yes, I checked and removed the duplication. It was from the original class component.
Thank you for your kind review. :)

…funcCompMigration-16273

abdulrahuman5196 · 2023-07-10T17:21:26Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

@@ -56,51 +57,29 @@ const propTypes = {

    /** Indicated whether the report data is loading */
    isLoading: PropTypes.bool,
+


@dayana7204 Kindly add comment for this?

done. thank you :)

abdulrahuman5196 · 2023-07-10T17:48:14Z

@dayana7204 I am good with the changes and completed the reviewer's checklist. Once you have added the comment as requested above, I can approve.

…funcCompMigration-16273

dayana7204 · 2023-07-10T18:35:27Z

@abdulrahuman5196 I've added a comment along with your request.
Hope to get approved soon :)

abdulrahuman5196 · 2023-07-13T08:39:51Z

C+ approved comment is here #21851 (review).

All yours @NikkiWines

NikkiWines

Couple very small comments but overall looks good

NikkiWines · 2023-07-13T22:40:49Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

+            }
+
+            setIsCreateMenuActive(true);
+


NAB: extra blank line

removed extra blank line.

NikkiWines · 2023-07-13T22:41:03Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

+            if (!props.isFocused && props.isSmallScreenWidth) {
+                return;
+            }
+


NAB: extra blank line

removed extra blank line.

NikkiWines · 2023-07-13T22:43:07Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

+            hideCreateMenu();
+        },
+    }));
+    // Workspaces are policies with type === 'free'


Add a blank line above the comment please

Added a blank line.

NikkiWines · 2023-07-13T23:34:26Z

src/pages/home/sidebar/SidebarScreen/FloatingActionButtonAndPopover.js

+        if (!props.isFocused && prevIsFocused) {
            return true;
        }

        return false;


Suggested change

if (!props.isFocused && prevIsFocused) {

return true;

}

return false;

return !props.isFocused && prevIsFocused;

Updated as your suggestion.

dayana7204 · 2023-07-14T03:50:03Z

@NikkiWines Thank you for your kind review. :)
I updated all along with your comments.

NikkiWines

👍

…funcCompMigration-16273

dayana7204 · 2023-07-14T21:10:09Z

@NikkiWines I fixed lint issue, could you please check and approve?

NikkiWines

NikkiWines · 2023-07-15T01:38:02Z

@dayana7204 looks like you've still got linter errors

dayana7204 · 2023-07-15T16:32:19Z

@NikkiWines fixed and pushed again.
Please check!

OSBotify · 2023-07-17T18:11:53Z

✋ 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 · 2023-07-17T19:37:47Z

🚀 Deployed to staging by https://github.com/NikkiWines in version: 1.3.42-0 🚀

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

OSBotify · 2023-07-19T17:59:32Z

🚀 Deployed to production by https://github.com/jasperhuangg in version: 1.3.42-26 🚀

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

migrate FloatingActionButtonAndPopover to function component

dac3d1f

dayana7204 requested a review from a team as a code owner June 29, 2023 00:36

melvin-bot bot requested review from abdulrahuman5196 and removed request for a team June 29, 2023 00:36

melvin-bot bot mentioned this pull request Jun 30, 2023

[Snyk] Fix for 3 vulnerabilities #21425

Closed

57 tasks

dayana7204 mentioned this pull request Jul 3, 2023

[HOLD for payment 2023-07-26] [$250] Migrate FloatingActionButtonAndPopover.js to function component #16273

Closed

1 task

merge main branch

fc0304a

sync main branch

4a3baa4

MelvinBot mentioned this pull request Jul 8, 2023

[Snyk] Fix for 1 vulnerabilities #22462

Closed

58 tasks

melvin-bot bot mentioned this pull request Jul 8, 2023

[HOLD for payment 2023-08-17] [Snyk] Fix for 1 vulnerabilities #22463

Closed

alitoshmatov reviewed Jul 10, 2023

View reviewed changes

dayana7204 added 2 commits July 10, 2023 10:09

Merge branch 'main' of https://github.com/dayana7204/App into dayana-…

1786713

…funcCompMigration-16273

remove withWindowDimensions duplication

1759451

abdulrahuman5196 suggested changes Jul 10, 2023

View reviewed changes

dayana7204 added 2 commits July 10, 2023 14:24

Merge branch 'main' of https://github.com/dayana7204/App into dayana-…

15c3a22

…funcCompMigration-16273

add comment for innerRef

6353d5d

NikkiWines requested changes Jul 13, 2023

View reviewed changes

update review feedback, sync

a7863fa

NikkiWines previously approved these changes Jul 14, 2023

View reviewed changes

dayana7204 added 2 commits July 14, 2023 17:07

Merge branch 'main' of https://github.com/dayana7204/App into dayana-…

1d830cf

…funcCompMigration-16273

fix lint issue, sync

139dbeb

dayana7204 dismissed NikkiWines’s stale review via 139dbeb July 14, 2023 21:09

NikkiWines previously approved these changes Jul 14, 2023

View reviewed changes

fix lint issue

63b77e8

dayana7204 dismissed NikkiWines’s stale review via 63b77e8 July 15, 2023 16:31

NikkiWines approved these changes Jul 17, 2023

View reviewed changes

NikkiWines merged commit c77d896 into Expensify:main Jul 17, 2023
11 checks passed

OSBotify mentioned this pull request Jul 17, 2023

Deploy Checklist: New Expensify 2023-07-17 #23033

Closed

melvin-bot bot mentioned this pull request Jul 17, 2023

[Snyk] Fix for 3 vulnerabilities #21426

Closed

hoangzinh mentioned this pull request Jul 20, 2023

[$1000] DEV: Console Error after changing language #23201

Closed

6 tasks

MelvinBot mentioned this pull request Jan 29, 2024

[Snyk] Fix for 25 vulnerabilities #35341

Closed

50 tasks

melvin-bot bot mentioned this pull request Jan 29, 2024

[Snyk] Fix for 25 vulnerabilities #35342

Closed

MelvinBot mentioned this pull request Feb 12, 2024

[Snyk] Security upgrade @storybook/react from 6.5.10 to 7.0.0 #36331

Closed

50 tasks

melvin-bot bot mentioned this pull request Feb 12, 2024

[Snyk] Security upgrade @storybook/react from 6.5.10 to 7.0.0 #36332

Closed

MelvinBot mentioned this pull request Mar 14, 2024

[Snyk] Fix for 3 vulnerabilities #38311

Closed

50 tasks

melvin-bot bot mentioned this pull request Mar 14, 2024

[Snyk] Fix for 3 vulnerabilities #38312

Closed

MelvinBot mentioned this pull request Mar 22, 2024

[Snyk] Security upgrade @storybook/react from 6.5.10 to 7.0.0 #38809

Closed

50 tasks

melvin-bot bot mentioned this pull request Mar 22, 2024

[Snyk] Security upgrade @storybook/react from 6.5.10 to 7.0.0 #38810

Closed

		@@ -274,4 +286,12 @@ export default compose(
		key: ONYXKEYS.IS_LOADING_REPORT_DATA,

		@@ -56,51 +57,29 @@ const propTypes = {

		/** Indicated whether the report data is loading */
		isLoading: PropTypes.bool,

migrate FloatingActionButtonAndPopover to function component #21851

migrate FloatingActionButtonAndPopover to function component #21851

Conversation

dayana7204 commented Jun 29, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

melvin-bot bot commented Jun 29, 2023

github-actions bot commented Jun 29, 2023 • edited Loading

dayana7204 commented Jun 29, 2023

dayana7204 commented Jun 29, 2023

abdulrahuman5196 commented Jul 5, 2023

abdulrahuman5196 commented Jul 5, 2023 • edited Loading

Reviewer Checklist

Screenshots/Videos

abdulrahuman5196 commented Jul 5, 2023

abdulrahuman5196 commented Jul 5, 2023

dayana7204 commented Jul 5, 2023

abdulrahuman5196 commented Jul 5, 2023

abdulrahuman5196 commented Jul 5, 2023

dayana7204 commented Jul 7, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abdulrahuman5196 commented Jul 10, 2023

dayana7204 commented Jul 10, 2023

abdulrahuman5196 commented Jul 13, 2023

NikkiWines left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dayana7204 commented Jul 14, 2023

NikkiWines left a comment

Choose a reason for hiding this comment

dayana7204 commented Jul 14, 2023

NikkiWines left a comment

Choose a reason for hiding this comment

NikkiWines commented Jul 15, 2023

dayana7204 commented Jul 15, 2023

OSBotify commented Jul 17, 2023

OSBotify commented Jul 17, 2023

OSBotify commented Jul 19, 2023

dayana7204 commented Jun 29, 2023 •

edited

Loading

github-actions bot commented Jun 29, 2023 •

edited

Loading

abdulrahuman5196 commented Jul 5, 2023 •

edited

Loading