From 2ef127776e5612016f3772b945fefa61e1bc6d04 Mon Sep 17 00:00:00 2001 From: Andrew Gable Date: Mon, 4 Apr 2022 14:13:27 -0600 Subject: [PATCH] Use `canNavigate` instead of `isReady` --- src/libs/Navigation/Navigation.js | 10 +--------- src/libs/actions/Report.js | 2 +- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/libs/Navigation/Navigation.js b/src/libs/Navigation/Navigation.js index 96323fca0ce..360afa67afc 100644 --- a/src/libs/Navigation/Navigation.js +++ b/src/libs/Navigation/Navigation.js @@ -31,14 +31,6 @@ function setDidTapNotification() { didTapNotificationBeforeReady = true; } -/** - * Returns true if the Navigation is ready to navigate - * @returns {Boolean} - */ -function isReady() { - return navigationRef.isReady(); -} - /** * @param {String} methodName * @param {Object} params @@ -225,11 +217,11 @@ DismissModal.defaultProps = { }; export default { + canNavigate, navigate, dismissModal, isActiveRoute, getActiveRoute, - isReady, goBack, DismissModal, closeDrawer, diff --git a/src/libs/actions/Report.js b/src/libs/actions/Report.js index 371150f6e52..c7ccb84500b 100644 --- a/src/libs/actions/Report.js +++ b/src/libs/actions/Report.js @@ -797,7 +797,7 @@ function subscribeToReportCommentPushNotifications() { // Open correct report when push notification is clicked PushNotification.onSelected(PushNotification.TYPE.REPORT_COMMENT, ({reportID}) => { - if (Navigation.isReady()) { + if (Navigation.canNavigate('navigate')) { // If a chat is visible other than the one we are trying to navigate to, then we need to navigate back if (Navigation.getActiveRoute().slice(1, 2) === ROUTES.REPORT && !Navigation.isActiveRoute(`r/${reportID}`)) { Navigation.goBack();