fix: navigate to Concierge chat after login from deep link on web

Author: x-dev90

src/DeepLinkHandler.tsx

@@ -12,13 +12,10 @@ import {openReportFromDeepLink} from './libs/actions/Link';
 import * as Report from './libs/actions/Report';
 import {hasAuthToken, isAnonymousUser} from './libs/actions/Session';
 import Log from './libs/Log';
-import normalizePath from './libs/Navigation/helpers/normalizePath';
-import {setPendingConciergeDeepLink, setPendingHomeDeepLinkIfNoPendingConcierge} from './libs/PendingConciergeDeepLink';
 import {getReportIDFromLink} from './libs/ReportUtils';
 import {endSpan} from './libs/telemetry/activeSpans';
 import {hasSecureLinkKey} from './libs/Url';
 import ONYXKEYS from './ONYXKEYS';
-import ROUTES from './ROUTES';
 import {hasSeenTourSelector} from './selectors/Onboarding';
 import isLoadingOnyxValue from './types/utils/isLoadingOnyxValue';
 
@@ -27,36 +24,6 @@ type DeepLinkHandlerProps = {
     onInitialUrl: (url: Route | null) => void;
 };
 
-function getNormalizedCurrentPath() {
-    if (typeof window === 'undefined') {
-        return '';
-    }
-
-    return normalizePath(window.location.pathname).replace(/\/$/, '') || '/';
-}
-
-function getNormalizedPathFromURL(url: string) {
-    let path = url;
-
-    try {
-        const parsedURL = new URL(url);
-        path = parsedURL.protocol === 'http:' || parsedURL.protocol === 'https:' ? parsedURL.pathname : `${parsedURL.host}${parsedURL.pathname}`;
-    } catch {
-        // If URL parsing fails, treat the value as a route path.
-    }
-
-    return normalizePath(path).replace(/\/$/, '') || '/';
-}
-
-function isCurrentPathConcierge() {
-    return getNormalizedCurrentPath() === normalizePath(ROUTES.CONCIERGE);
-}
-
-function isCurrentPathRootOrOnboarding() {
-    const normalizedPath = getNormalizedCurrentPath();
-    return normalizedPath === '/' || normalizedPath === normalizePath(ROUTES.ONBOARDING_ROOT.route) || normalizedPath.startsWith(`${normalizePath(ROUTES.ONBOARDING_ROOT.route)}/`);
-}
-
 /**
  * Component that does not render anything but isolates the COLLECTION.REPORT Onyx subscription
  * from the root Expensify component to prevent cascading re-renders of the
@@ -130,10 +97,6 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) {
                 initialUrlProcessed.current = true;
                 onInitialUrl(url as Route);
 
-                if (!isCurrentlyAuthenticated && isCurrentPathConcierge() && (!url || getNormalizedPathFromURL(url) !== normalizePath(ROUTES.CONCIERGE))) {
-                    setPendingConciergeDeepLink();
-                }
-
                 if (url) {
                     if (conciergeReportID === undefined) {
                         Log.info('[Deep link] conciergeReportID is undefined when processing initial URL', false, {url});
@@ -144,10 +107,6 @@ function DeepLinkHandler({onInitialUrl}: DeepLinkHandlerProps) {
                     openReportFromDeepLink(url, allReports, isCurrentlyAuthenticated, conciergeReportID, introSelected, isSelfTourViewed, betas);
                     trackPendingPublicRoomFromDeepLink(url, isCurrentlyAuthenticated);
                 } else {
-                    if (!isCurrentlyAuthenticated && isCurrentPathRootOrOnboarding()) {
-                        // A missing initial URL at root/onboarding can happen during startup, so don't override a stored /concierge intent.
-                        setPendingHomeDeepLinkIfNoPendingConcierge();
-                    }
                     Report.doneCheckingPublicRoom();
                 }
 

src/hooks/useAutoCreateSubmitWorkspace.ts

@@ -1,5 +1,5 @@
 import Log from '@libs/Log';
-import {navigateToPendingDeepLinkAfterOnboarding, navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue} from '@libs/navigateAfterOnboarding';
+import {navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue} from '@libs/navigateAfterOnboarding';
 import {createDisplayName} from '@libs/PersonalDetailsUtils';
 import {canEditWorkspaceSettings, isGroupPolicy, isSubmitPolicy} from '@libs/PolicyUtils';
 
@@ -88,7 +88,6 @@ function useAutoCreateSubmitWorkspace() {
                       hasActiveAdminPolicies,
                   })
                 : {adminsChatReportID: onboardingAdminsChatReportID, policyID: onboardingPolicyID};
-            let didNavigateToPendingDeepLink = false;
 
             if (shouldCompleteOnboarding) {
                 try {
@@ -102,9 +101,6 @@ function useAutoCreateSubmitWorkspace() {
                         introSelected,
                         isSelfTourViewed,
                         conciergeChat,
-                        onBeforeOnboardingModalUnmount: () => {
-                            didNavigateToPendingDeepLink = navigateToPendingDeepLinkAfterOnboarding(conciergeReportID);
-                        },
                     });
                 } catch (error) {
                     // Swallow onboarding completion failures so a network error doesn't block workspace
@@ -126,12 +122,7 @@ function useAutoCreateSubmitWorkspace() {
                 policyIDForNavigation = existingSubmitPolicyID;
             }
 
-            if (didNavigateToPendingDeepLink) {
-                return;
-            }
-
-            // Pass conciergeReportID so true onboarding completion can honor a pending /concierge intent after refresh.
-            navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue(policyIDForNavigation, shouldUseNarrowLayout, conciergeReportID, shouldCompleteOnboarding);
+            navigateToSubmitWorkspaceAfterOnboardingWithMicrotaskQueue(policyIDForNavigation, shouldUseNarrowLayout);
         },
         [
             currentUserEmail,
@@ -153,7 +144,6 @@ function useAutoCreateSubmitWorkspace() {
             hasActiveAdminPolicies,
             shouldUseNarrowLayout,
             conciergeChat,
-            conciergeReportID,
         ],
     );
 

src/hooks/useAutoCreateTrackWorkspace.ts

@@ -1,7 +1,7 @@
 import isSidePanelReportSupported from '@components/SidePanel/isSidePanelReportSupported';
 
 import Log from '@libs/Log';
-import {navigateAfterOnboardingWithMicrotaskQueue, navigateToPendingDeepLinkAfterOnboarding} from '@libs/navigateAfterOnboarding';
+import {navigateAfterOnboardingWithMicrotaskQueue} from '@libs/navigateAfterOnboarding';
 import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
 import {createDisplayName} from '@libs/PersonalDetailsUtils';
 import {isPaidGroupPolicy, isPolicyAdmin} from '@libs/PolicyUtils';
@@ -102,7 +102,6 @@ function useAutoCreateTrackWorkspace() {
             // On mobile, hardcode trackExpensesWithConcierge since the web flow already works
             // with the CompleteGuidedSetup response and side panel isn't supported on native.
             let rhpVariant: OnboardingRHPVariant | undefined = isSidePanelReportSupported ? undefined : CONST.ONBOARDING_RHP_VARIANT.TRACK_EXPENSES_WITH_CONCIERGE;
-            let didNavigateToPendingDeepLink = false;
             try {
                 const response = await completeOnboarding({
                     engagementChoice,
@@ -117,9 +116,6 @@ function useAutoCreateTrackWorkspace() {
                     isSelfTourViewed,
                     conciergeChat,
                     selfDMReport,
-                    onBeforeOnboardingModalUnmount: () => {
-                        didNavigateToPendingDeepLink = navigateToPendingDeepLinkAfterOnboarding(conciergeChatReportID);
-                    },
                 });
 
                 if (isSidePanelReportSupported) {
@@ -137,18 +133,16 @@ function useAutoCreateTrackWorkspace() {
                 setOnboardingAdminsChatReportID();
                 setOnboardingPolicyID();
 
-                if (!didNavigateToPendingDeepLink) {
-                    navigateAfterOnboardingWithMicrotaskQueue(
-                        shouldUseNarrowLayout,
-                        isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
-                        conciergeChatReportID,
-                        reportNameValuePairs,
-                        newPolicyID,
-                        mergedAccountConciergeReportID,
-                        false,
-                        {variantOverride: rhpVariant},
-                    );
-                }
+                navigateAfterOnboardingWithMicrotaskQueue(
+                    shouldUseNarrowLayout,
+                    isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),
+                    conciergeChatReportID,
+                    reportNameValuePairs,
+                    newPolicyID,
+                    mergedAccountConciergeReportID,
+                    false,
+                    {variantOverride: rhpVariant},
+                );
             }
         },
         [

src/hooks/useCompleteOnboarding.ts

@@ -5,7 +5,7 @@ import {completeOnboarding, extractRHPVariantFromResponse} from '@libs/actions/R
 import {setOnboardingAdminsChatReportID, setOnboardingPolicyID} from '@libs/actions/Welcome';
 import type {OnboardingFeatureMapItem} from '@libs/actions/Welcome/OnboardingFeatures';
 import Log from '@libs/Log';
-import {navigateAfterOnboardingWithMicrotaskQueue, navigateToPendingDeepLinkAfterOnboarding} from '@libs/navigateAfterOnboarding';
+import {navigateAfterOnboardingWithMicrotaskQueue} from '@libs/navigateAfterOnboarding';
 import TransitionTracker from '@libs/Navigation/TransitionTracker';
 import {isGroupPolicy, isPolicyAdmin} from '@libs/PolicyUtils';
 
@@ -72,7 +72,6 @@ function useCompleteOnboarding() {
             const isAccountingEnabled = featuresMap.some((feature) => feature.id === CONST.POLICY.MORE_FEATURES.ARE_CONNECTIONS_ENABLED && feature.enabled);
             const resolvedIntegration = isAccountingEnabled ? userReportedIntegration : undefined;
             const email = currentUserPersonalDetails.email ?? '';
-            let didNavigateToPendingDeepLink = false;
 
             const {adminsChatReportID, policyID} = shouldCreateWorkspace
                 ? createWorkspace({
@@ -119,9 +118,6 @@ function useCompleteOnboarding() {
                 isSelfTourViewed,
                 conciergeChat,
                 adminsChatReport,
-                onBeforeOnboardingModalUnmount: () => {
-                    didNavigateToPendingDeepLink = navigateToPendingDeepLinkAfterOnboarding(conciergeReportID);
-                },
             });
             const rhpVariant = isSidePanelReportSupported ? extractRHPVariantFromResponse(response) : undefined;
 
@@ -133,11 +129,6 @@ function useCompleteOnboarding() {
                 waitForUpcomingTransition: true,
             });
 
-            if (didNavigateToPendingDeepLink) {
-                setIsLoading(false);
-                return;
-            }
-
             navigateAfterOnboardingWithMicrotaskQueue(
                 isSmallScreenWidth,
                 isBetaEnabled(CONST.BETAS.DEFAULT_ROOMS),

src/libs/Navigation/linkingConfig/subscribe.ts

@@ -1,9 +1,7 @@
 import {hasAuthToken} from '@libs/actions/Session';
 import continuePlaidOAuth from '@libs/continuePlaidOAuth';
-import normalizePath from '@libs/Navigation/helpers/normalizePath';
 import navigationRef from '@libs/Navigation/navigationRef';
 import type {RootNavigatorParamList} from '@libs/Navigation/types';
-import {updatePendingConciergeDeepLinkForRoute} from '@libs/PendingConciergeDeepLink';
 
 import CONST from '@src/CONST';
 import ROUTES from '@src/ROUTES';
@@ -13,8 +11,6 @@ import type {LinkingOptions} from '@react-navigation/native';
 import {findFocusedRoute} from '@react-navigation/native';
 import {Linking} from 'react-native';
 
-import prefixes from './prefixes';
-
 /**
  * Rules for dropping a deep link that would re-navigate to a screen the user is already on.
  */
@@ -33,40 +29,8 @@ const skipRules: ReadonlyArray<{urlMatcher: RegExp; focusedScreens: readonly str
     },
 ];
 
-function isInternalAppURL(url: string) {
-    if (url.startsWith('/') || prefixes.some((prefix) => url.startsWith(prefix))) {
-        return true;
-    }
-
-    try {
-        return typeof window !== 'undefined' && new URL(url).origin === window.location.origin;
-    } catch {
-        return false;
-    }
-}
-
-function getNormalizedPathFromURL(url: string) {
-    let path = url;
-
-    try {
-        const parsedURL = new URL(url);
-        path = parsedURL.protocol === 'http:' || parsedURL.protocol === 'https:' || parsedURL.pathname ? parsedURL.pathname : parsedURL.host;
-    } catch {
-        // If URL parsing fails, treat the value as a route path.
-    }
-
-    return (normalizePath(path).replace(/\/$/, '') || '/').toLowerCase();
-}
-
-const subscribe: NonNullable<LinkingOptions<RootNavigatorParamList>['subscribe']> = (listener) => {
+const subscribe: LinkingOptions<RootNavigatorParamList>['subscribe'] = (listener) => {
     const subscription = Linking.addEventListener('url', ({url}: {url: string}) => {
-        const isAuthenticated = hasAuthToken();
-        const normalizedPath = getNormalizedPathFromURL(url);
-        const route = normalizedPath === '/' ? '' : normalizedPath.slice(1);
-        if (!isAuthenticated && isInternalAppURL(url)) {
-            updatePendingConciergeDeepLinkForRoute(route, isAuthenticated);
-        }
-
         // Skip deep links to screens where the user is already focused.
         const skipRule = skipRules.find(({urlMatcher}) => urlMatcher.test(url));
         if (skipRule) {
@@ -91,7 +55,7 @@ const subscribe: NonNullable<LinkingOptions<RootNavigatorParamList>['subscribe']
         // which lives in AuthScreens and is not mounted while PublicScreens is showing. Dispatching it here
         // throws "NAVIGATE ... was not handled by any navigator". openReportFromDeepLink() already opens the
         // public room as an anonymous user and handles navigation, so defer to it instead. See #92672.
-        if (!isAuthenticated && url.includes(`/${ROUTES.REPORT}/`)) {
+        if (!hasAuthToken() && url.includes(`/${ROUTES.REPORT}/`)) {
             return;
         }
         listener(url);