Merge pull request #31481 from tienifr/fix/28932

Fix: App crashes on open notification
Expensify · Dec 8, 2023 · c96718a · c96718a
2 parents 6129c67 + 9a7627a
commit c96718a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -1781,8 +1781,13 @@ function shouldShowReportActionNotification(reportID, action = null, isRemote =
         return false;
     }
 
-    // If this notification was delayed and the user saw the message already, don't show it
     const report = allReports[reportID];
+    if (!report || (report && report.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE)) {
+        Log.info(`${tag} No notification because the report does not exist or is pending deleted`, false);
+        return false;
+    }
+
+    // If this notification was delayed and the user saw the message already, don't show it
     if (action && report && report.lastReadTime >= action.created) {
         Log.info(`${tag} No notification because the comment was already read`, false, {created: action.created, lastReadTime: report.lastReadTime});
         return false;

diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
@@ -528,8 +528,9 @@ function subscribeToUserEvents() {
                 return;
             }
 
-            const onyxUpdatePromise = Onyx.update(pushJSON);
-            triggerNotifications(pushJSON);
+            const onyxUpdatePromise = Onyx.update(pushJSON).then(() => {
+                triggerNotifications(pushJSON);
+            });
 
             // Return a promise when Onyx is done updating so that the OnyxUpdatesManager can properly apply all
             // the onyx updates in order