Merge pull request #18065 from tienifr/fix/17242-17969

fix: web does not show not show notifications for not active window
Expensify · May 1, 2023 · ce3b938 · ce3b938
2 parents 9b7d6cd + bc2124f
commit ce3b938
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 1 deletion.
diff --git a/src/libs/Visibility/index.desktop.js b/src/libs/Visibility/index.desktop.js
@@ -11,6 +11,13 @@ function isVisible() {
     return window.electron.sendSync(ELECTRON_EVENTS.REQUEST_VISIBILITY);
 }
 
+/**
+ * @returns {Boolean}
+ */
+function hasFocus() {
+    return true;
+}
+
 /**
  * Adds event listener for changes in visibility state
  *
@@ -32,4 +39,5 @@ function onVisibilityChange(callback) {
 export default {
     isVisible,
     onVisibilityChange,
+    hasFocus,
 };
diff --git a/src/libs/Visibility/index.js b/src/libs/Visibility/index.js
@@ -9,6 +9,15 @@ function isVisible() {
     return document.visibilityState === 'visible';
 }
 
+/**
+ * Whether the app is focused.
+ *
+ * @returns {Boolean}
+ */
+function hasFocus() {
+    return document.hasFocus();
+}
+
 /**
  * Adds event listener for changes in visibility state
  *
@@ -25,5 +34,6 @@ function onVisibilityChange(callback) {
 
 export default {
     isVisible,
+    hasFocus,
     onVisibilityChange,
 };
diff --git a/src/libs/Visibility/index.native.js b/src/libs/Visibility/index.native.js
@@ -8,6 +8,13 @@ import {AppState} from 'react-native';
  */
 const isVisible = () => AppState.currentState === 'active';
 
+/**
+ * @returns {Boolean}
+ */
+function hasFocus() {
+    return true;
+}
+
 /**
  * Adds event listener for changes in visibility state
  *
@@ -24,5 +31,6 @@ function onVisibilityChange(callback) {
 
 export default {
     isVisible,
+    hasFocus,
     onVisibilityChange,
 };
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -1218,7 +1218,7 @@ function shouldShowReportActionNotification(reportID, action = null, isRemote =
     }
 
     // If we are currently viewing this report do not show a notification.
-    if (reportID === Navigation.getReportIDFromRoute() && Visibility.isVisible()) {
+    if (reportID === Navigation.getReportIDFromRoute() && Visibility.isVisible() && Visibility.hasFocus()) {
         Log.info(`${tag} No notification because it was a comment for the current report`);
         return false;
     }