Merge pull request #7633 from Expensify/neil-ios-notifications-link

Make push notifications navigate to the correct chat - iOS
Expensify · Feb 21, 2022 · 75c7986 · 75c7986
2 parents c873776 + 86f877f
commit 75c7986
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js
@@ -829,8 +829,13 @@ function subscribeToReportCommentPushNotifications() {
 
     // Open correct report when push notification is clicked
     PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, ({reportID}) => {
-        Navigation.setDidTapNotification();
-        Linking.openURL(`${CONST.DEEPLINK_BASE_URL}${ROUTES.getReportRoute(reportID)}`);
+        if (Navigation.isReady()) {
+            Navigation.navigate(ROUTES.getReportRoute(reportID));
+        } else {
+            // Navigation container is not yet ready, use deep linking to open the correct report instead
+            Navigation.setDidTapNotification();
+            Linking.openURL(`${CONST.DEEPLINK_BASE_URL}${ROUTES.getReportRoute(reportID)}`);
+        }
     });
 }