-
Notifications
You must be signed in to change notification settings - Fork 3k
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: 8329: Resolve fabmenu open multiple time #8692
fix: 8329: Resolve fabmenu open multiple time #8692
Conversation
@rushatgabhane PR updated. |
@dharmik please add screenshots for all platforms And update the tests to something like this -
Thanks! |
@@ -58,14 +59,23 @@ class SidebarScreen extends Component { | |||
Timing.start(CONST.TIMING.SIDEBAR_LOADED, true); | |||
|
|||
const routes = lodashGet(this.props.navigation.getState(), 'routes', []); | |||
WelcomeAction.show({routes, toggleCreateMenu: this.toggleCreateMenu}); | |||
WelcomeAction.show({routes, hideCreateMenu: this.hideCreateMenu}); | |||
} | |||
|
|||
/** | |||
* Method called when a Create Menu item is selected. | |||
*/ | |||
onCreateMenuItemSelected() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If this method only does one thing, which is call another method, then this method should be removed and just call this.hideCreateMenu()
instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tgolen You mean to say we need to make the change like this?
- WelcomeAction.show({routes, hideCreateMenu: this.hideCreateMenu});
+ this.hideCreateMenu();
If yes? WelcomeActions.js we are managing this condition and call method in if statement.
if (!Policy.isAdminOfFreePolicy(allPolicies) && !isDisplayingWorkspaceRoute) {
hideCreateMenu();
}
Any thoughts on it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dharmik, onCreateMenuItemSelected()
just calls hideCreateMenu()
.
So you need to
- Remove
onCreateMenuItemSelected()
, and - Replace all calls to it with
hideCreateMenu()
Let me know if you have any questions.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rushatgabhane Resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rushatgabhane @tgolen Can you please share your opinion on it? #8692 (comment)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you please share your opinion on it? #8692 (comment)
@dharmik I'm sorry, I don't understand. I thought this conversation was resolved.
Only action required by you is to address #8692 (comment)
Please let me know if you have any questions, thanks so much!
src/libs/actions/WelcomeActions.js
Outdated
@@ -75,7 +75,7 @@ function show({routes, toggleCreateMenu}) { | |||
// It's also possible that we already have a workspace policy. In either case we will not toggle the menu but do still want to set the NVP in this case |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This comment needs to be updated now (since it specifically mentions toggling)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@dharmik ig you missed this
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@rushatgabhane PR updated.
@rushatgabhane I updated videos in PR description is that okay? |
@rushatgabhane Can you please recheck this PR & let me know if I miss something? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@tgolen Looks good!
#### 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 verified the steps for local testing are in the
- 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 notonIconClick
). - 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
- 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.
- 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. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor) - Any internal methods bound to
this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
) - 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 thatAvatar
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.
@dharmik sorry for the delay, you just need to address this comment. Thanks so much! |
I added all videos in PR description |
if in those video testes are not clear so in screenshot how clear? Appreciate your suggestion |
Ohh I see. Forget the video completely. As per the suggestions here update these tests in the PR description 👇 |
PR description updated @rushatgabhane |
Btw, PR is approved! |
✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release. |
Sorry if I'm missing some context but doesn't this PR break the "automatic" opening on the create menu for a first time user sign in since we are only "hiding" it now? I find it kind of weird that we are calling |
App/src/libs/actions/WelcomeActions.js Lines 43 to 81 in db6fab7
Anyone can tell us where in this function we "show" something? |
Thinking maybe it should have been |
(context: While looking into the issue here realized the code no longer makes sense since we're not showing anything) |
Those are pretty good questions. I actually think there is quite a bit about the welcome actions code that is an anti-pattern (like passing callback functions into the action file, the use of the setTimeout(), etc.). I would say there aren't really any good answers, and I would be in favor of just doing a bit of an over-haul and cleanup to this code. |
I agree, but this PR still broke existing behavior. We are calling a function that doesn't show anything and won't hide something because nothing is shown in the first place. |
Yeah, so in that case, it's definitely a regression that needs fixed regardless. You are right. |
@marcaaron : I realize it, thanks for point it out. File: In src/libs/actions/WelcomeActions.js we only display it to Show menu item first time for isFirstTimeNewExpensifyUser = true Changes: - WelcomeAction.show({routes, hideCreateMenu: this.hideCreateMenu});
+ WelcomeAction.show({routes, showCreateMenu: this.showCreateMenu});
File: src/libs/actions/WelcomeActions.js - * @param {Function} params.hideCreateMenu
+ * @param {Function} params.showCreateMenu
*/
-function show({routes, hideCreateMenu}) {
+function show({routes, showCreateMenu}) {
if (!Policy.isAdminOfFreePolicy(allPolicies) && !isDisplayingWorkspaceRoute) {
- hideCreateMenu();
+ showCreateMenu();
@marcaaron Is it okay? |
🚀 Deployed to production by @chiragsalian in version: 1.1.57-17 🚀
|
Details
Fixed Issues
$ 8329
Tests
tests to something like this -
1 Login to New expensify
2 In RHN, tap on the green +
Double tap on new chat
3 Verify that the new chat page opens
PR Review Checklist
Contributor (PR Author) Checklist
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
)src/languages/*
filesSTYLE.md
) were followedAvatar
, I verified the components usingAvatar
are working as expected)/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)PR Reviewer Checklist
### Fixed Issues
section aboveTests
sectionQA steps
sectiontoggleReport
and notonIconClick
).src/languages/*
filesSTYLE.md
) were followed/** comment above it */
displayName
propertythis
properly so there are no scoping issues (i.e. foronClick={this.submit}
the methodthis.submit
should be bound tothis
in the constructor)this
are necessary to be bound (i.e. avoidthis.submit = this.submit.bind(this);
ifthis.submit
is never passed to a component event handler likeonClick
)StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG
)Avatar
is modified, I verified thatAvatar
is working as expected in all cases)QA Steps
tests to something like this -
1 Login to New expensify
2 In RHN, tap on the green +
Double tap on new chat
3 Verify that the new chat page opens
Video
iOS
Screen.Recording.2022-04-15.at.10.47.49.AM.mov
android
162147410-a7ee7d7d-de03-4086-ac2c-ed19091aa655.mp4
Macos
Screen.Recording.2022-04-19.at.11.15.18.PM.mov
MWeb
Screen.Recording.2022-04-20.at.11.56.42.PM.mov
Web
Screen.Recording.2022-04-20.at.11.58.54.PM.mov