diff --git a/src/DeepLinkHandler.tsx b/src/DeepLinkHandler.tsx index 25f214661d0b..1745e2c8ede4 100644 --- a/src/DeepLinkHandler.tsx +++ b/src/DeepLinkHandler.tsx @@ -28,16 +28,16 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) { const linkingChangeListener = useRef(null); const initialUrlProcessed = useRef(false); - const [allReports, allReportsMetadata] = useOnyx(ONYXKEYS.COLLECTION.REPORT); + const [allReports] = useOnyx(ONYXKEYS.COLLECTION.REPORT); const [, sessionMetadata] = useOnyx(ONYXKEYS.SESSION); - const [conciergeReportID, conciergeReportIDMetadata] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); - const [introSelected, introSelectedMetadata] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED); + const [conciergeReportID] = useOnyx(ONYXKEYS.CONCIERGE_REPORT_ID); + const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED); const [isSelfTourViewed, isSelfTourViewedMetadata] = useOnyx(ONYXKEYS.NVP_ONBOARDING, {selector: hasSeenTourSelector}); - const [betas, betasMetadata] = useOnyx(ONYXKEYS.BETAS); + const [betas] = useOnyx(ONYXKEYS.BETAS); const isAuthenticated = useIsAuthenticated(); useEffect(() => { - if (isLoadingOnyxValue(allReportsMetadata, sessionMetadata, conciergeReportIDMetadata, introSelectedMetadata, isSelfTourViewedMetadata, betasMetadata)) { + if (isLoadingOnyxValue(sessionMetadata, isSelfTourViewedMetadata)) { return; } @@ -111,17 +111,7 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) { linkingChangeListener.current?.remove(); }; // eslint-disable-next-line react-hooks/exhaustive-deps -- intentionally excluding allReports, isAuthenticated, and onInitialUrl to avoid re-triggering deep link handling on every report update - }, [ - conciergeReportID, - introSelected, - betas, - allReportsMetadata.status, - sessionMetadata.status, - conciergeReportIDMetadata.status, - introSelectedMetadata.status, - isSelfTourViewedMetadata.status, - betasMetadata.status, - ]); + }, [sessionMetadata?.status, conciergeReportID, introSelected, isSelfTourViewedMetadata, betas]); // Safety net: if getInitialURL() resolves before the session loads, hasAuthToken() may return false // for an authenticated user, causing openReportFromDeepLink to take the wrong path. Once isAuthenticated