fix: web does not show not show notifications for not active window #18065

tienifr · 2023-04-27T05:07:51Z

Details

Adding window.hasFocus() into isVisible can cause the regression because this function is using in many places. In this case, we just want to fix the notification problem, so I suggest to add a new function named hasFocus and use it in Report.js.

Fixed Issues

$ #17242
$ #17969

Tests

Fix issue 17242:

Login with account A on Web
Go to any chat with account B
Open any other app so that the browser window gets defocused
Login with account B on another device
Send message from that device to account A
Verify that the account A's device receives new message notification

Fix issue 17969:

Begin sign in with an account with 2fa enabled
Click in the magic link
Head back to the initial tab
Insert the 2fa code
Verify the user gets straight into the App

Verify that no errors appear in the JS console

Offline tests

Same as above

QA Steps

Fix issue 17242:

Login with account A on Web
Go to any chat with account B
Open any other app so that the browser window gets defocused
Login with account B on another device
Send message from that device to account A
Verify that the account A's device receives new message notification

Fix issue 17969:

Begin sign in with an account with 2fa enabled
Click in the magic link
Head back to the initial tab
Insert the 2fa code
Verify the user gets straight into the App

Verify that no errors appear in the JS console

PR Author Checklist

Screenshots/Videos

Web

Screencast from 17-04-2023 15:59:02.webm
Screencast from 27-04-2023 14:04:28.webm

Mobile Web - Chrome

Mobile Web - Safari

Desktop

iOS

Android

MelvinBot · 2023-04-27T07:36:25Z

@cristipaval @Santhosh-Sellavel 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]

tienifr · 2023-04-27T07:37:42Z

@cristipaval @Santhosh-Sellavel This is basically a refactor where we separate hasFocus and isVisible. Please take a look,

Santhosh-Sellavel · 2023-04-27T17:55:40Z

src/libs/Visibility/index.native.js

+function hasFocus() {
+    return true;
+}


Assuming it has focus is weird?

bump @tienifr

cc: @luacmartins thoughts?

I think it's fine since checking isVisible should be enough on the native case.

I see your point @Santhosh-Sellavel. In the future, we might want this function to behave as onResume-onPause lifecycle on Android. I mean, for instance, sometimes the App might be foregrounded and partially visible but not focused because there is a system alert on top of it. But I also do agree with @luacmartins that this might be out of scope for now.

src/libs/actions/Report.js

src/libs/Visibility/index.js

src/libs/actions/Report.js

Santhosh-Sellavel · 2023-04-28T16:33:10Z

Can you update the issue title to something meaning full

cristipaval

Minor comments, nothing else to add.

Santhosh-Sellavel · 2023-05-01T19:07:24Z

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

#### Notifications

Screen.Recording.2023-05-02.at.12.27.24.AM.mov

TFA

Screen.Recording.2023-05-02.at.12.36.23.AM.mov

Santhosh-Sellavel

LGTM, tests well!

Santhosh-Sellavel · 2023-05-01T19:08:50Z

cc: @luacmartins or @cristipaval

luacmartins · 2023-05-01T19:14:02Z

Gonna merge since @cristipaval's comment are addressed as well.

OSBotify · 2023-05-01T19:21:32Z

✋ 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-05-03T00:07:41Z

🚀 Deployed to staging by https://github.com/luacmartins in version: 1.3.9-12 🚀

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

mountiny · 2023-05-04T07:03:39Z

@Santhosh-Sellavel @cristipaval Could you confirm the QA worked fine on this one?

mountiny · 2023-05-04T14:05:31Z

QA noted this does not work in mWeb, is it supposed to work there?

Santhosh-Sellavel · 2023-05-04T14:42:02Z

No it won't on mWeb. We don't support notifications on mWeb.

mountiny · 2023-05-04T21:30:42Z

Nice thats what I suspected, thanks

OSBotify · 2023-05-09T04:07:40Z

🚀 Deployed to production by https://github.com/roryabraham in version: 1.3.12-0 🚀

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

fix: 17242-17969

940490d

tienifr marked this pull request as ready for review April 27, 2023 07:36

tienifr requested a review from a team as a code owner April 27, 2023 07:36

melvin-bot bot requested review from cristipaval and Santhosh-Sellavel and removed request for a team April 27, 2023 07:36

Santhosh-Sellavel suggested changes Apr 27, 2023

View reviewed changes

luacmartins reviewed Apr 28, 2023

View reviewed changes

src/libs/Visibility/index.js Outdated Show resolved Hide resolved

src/libs/Visibility/index.js Show resolved Hide resolved

src/libs/actions/Report.js Show resolved Hide resolved

cristipaval reviewed May 1, 2023

View reviewed changes

tienifr changed the title ~~fix: 17242-17969~~ fix: Web does not show not show notifications for not active window May 1, 2023

tienifr changed the title ~~fix: Web does not show not show notifications for not active window~~ fix: web does not show not show notifications for not active window May 1, 2023

fix: update func comment

bc2124f

Santhosh-Sellavel approved these changes May 1, 2023

View reviewed changes

luacmartins approved these changes May 1, 2023

View reviewed changes

luacmartins merged commit ce3b938 into Expensify:main May 1, 2023

OSBotify mentioned this pull request May 2, 2023

Deploy Checklist: New Expensify 2023-05-02 #18315

Closed

marcaaron mentioned this pull request May 3, 2023

Deploy Checklist: New Expensify 2023-05-02 #18322

Closed

59 tasks

0xmiros mentioned this pull request May 4, 2023

[$1000] The emoji recommendation list closes on switching to next tab #16576

Closed

6 tasks

This was referenced May 9, 2023

[HOLD for payment 2023-05-16] [$1000] Web does not show not show notifications for not active window. #17242

Closed

[HOLD for payment 2023-05-04] Never ending spinner when signing with magic link into an account with 2fa enabled #17969

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: web does not show not show notifications for not active window #18065

fix: web does not show not show notifications for not active window #18065

tienifr commented Apr 27, 2023 •

edited

Loading

MelvinBot commented Apr 27, 2023

tienifr commented Apr 27, 2023

Santhosh-Sellavel Apr 27, 2023

Santhosh-Sellavel Apr 28, 2023

luacmartins May 1, 2023

cristipaval May 1, 2023

Santhosh-Sellavel commented Apr 28, 2023

cristipaval left a comment

Santhosh-Sellavel commented May 1, 2023

TFA

Santhosh-Sellavel left a comment

Santhosh-Sellavel commented May 1, 2023

luacmartins commented May 1, 2023

OSBotify commented May 1, 2023

OSBotify commented May 3, 2023

mountiny commented May 4, 2023

mountiny commented May 4, 2023

Santhosh-Sellavel commented May 4, 2023

mountiny commented May 4, 2023

OSBotify commented May 9, 2023

fix: web does not show not show notifications for not active window #18065

fix: web does not show not show notifications for not active window #18065

Conversation

tienifr commented Apr 27, 2023 • edited Loading

Details

Fixed Issues

Tests

Offline tests

QA Steps

PR Author Checklist

Screenshots/Videos

MelvinBot commented Apr 27, 2023

tienifr commented Apr 27, 2023

Santhosh-Sellavel Apr 27, 2023

Choose a reason for hiding this comment

Santhosh-Sellavel Apr 28, 2023

Choose a reason for hiding this comment

luacmartins May 1, 2023

Choose a reason for hiding this comment

cristipaval May 1, 2023

Choose a reason for hiding this comment

Santhosh-Sellavel commented Apr 28, 2023

cristipaval left a comment

Choose a reason for hiding this comment

Santhosh-Sellavel commented May 1, 2023

Reviewer Checklist

Screenshots/Videos

TFA

Santhosh-Sellavel left a comment

Choose a reason for hiding this comment

Santhosh-Sellavel commented May 1, 2023

luacmartins commented May 1, 2023

OSBotify commented May 1, 2023

OSBotify commented May 3, 2023

mountiny commented May 4, 2023

mountiny commented May 4, 2023

Santhosh-Sellavel commented May 4, 2023

mountiny commented May 4, 2023

OSBotify commented May 9, 2023

tienifr commented Apr 27, 2023 •

edited

Loading