Merge pull request Expensify#83657 from nkdengineer/fix/82362

fix: Travel opens travel.expensify.com in external browser instead of in-app webview

Author: francoisl

src/libs/openTravelDotLink/index.native.ts

@@ -2,7 +2,11 @@ import {getTravelDotLink} from '@libs/actions/Link';
 import Navigation from '@libs/Navigation/Navigation';
 import ROUTES from '@src/ROUTES';
 
-const openTravelDotLink = (activePolicyID?: string, postLoginPath?: string) => {
+const openTravelDotLink = (activePolicyID?: string, postLoginPath?: string, spotnanaToken?: string, isTestAccount?: boolean) => {
+    if (spotnanaToken) {
+        Navigation.navigate(ROUTES.TRAVEL_DOT_LINK_WEB_VIEW.getRoute(spotnanaToken, isTestAccount, postLoginPath));
+        return;
+    }
     getTravelDotLink(activePolicyID)
         ?.then((response) => {
             if (response.spotnanaToken) {

src/libs/openTravelDotLink/index.ts

@@ -1,8 +1,13 @@
-import {openTravelDotLink as openTravelDotLinkWeb} from '@libs/actions/Link';
+import {buildTravelDotURL, openTravelDotLink as openTravelDotLinkWeb} from '@libs/actions/Link';
+import asyncOpenURL from '@libs/asyncOpenURL';
 import Navigation from '@libs/Navigation/Navigation';
 import ROUTES from '@src/ROUTES';
 
-const openTravelDotLink = (activePolicyID?: string, postLoginPath?: string) => {
+const openTravelDotLink = (activePolicyID?: string, postLoginPath?: string, spotnanaToken?: string, isTestAccount?: boolean) => {
+    if (spotnanaToken) {
+        asyncOpenURL(Promise.resolve(), () => buildTravelDotURL(spotnanaToken, isTestAccount ?? false, postLoginPath));
+        return;
+    }
     openTravelDotLinkWeb(activePolicyID, postLoginPath)
         ?.then(() => {})
         ?.catch(() => {

src/pages/Travel/TravelTerms.tsx

@@ -20,13 +20,12 @@ import useOnyx from '@hooks/useOnyx';
 import usePermissions from '@hooks/usePermissions';
 import useStyleUtils from '@hooks/useStyleUtils';
 import useThemeStyles from '@hooks/useThemeStyles';
-import {buildTravelDotURL} from '@libs/actions/Link';
 import {addComment} from '@libs/actions/Report';
 import {acceptSpotnanaTerms, cleanupTravelProvisioningSession} from '@libs/actions/Travel';
-import asyncOpenURL from '@libs/asyncOpenURL';
 import {getLatestErrorMessage} from '@libs/ErrorUtils';
 import Navigation from '@libs/Navigation/Navigation';
 import type {TravelNavigatorParamList} from '@libs/Navigation/types';
+import {openTravelDotLink} from '@libs/openTravelDotLink';
 import colors from '@styles/theme/colors';
 import CONFIG from '@src/CONFIG';
 import CONST from '@src/CONST';
@@ -78,8 +77,8 @@ function TravelTerms({route}: TravelTermsPageProps) {
     };
 
     const acceptTermsAndOpenTravelDot = () => {
-        asyncOpenURL(
-            acceptSpotnanaTerms(domain, policyID).then((response) => {
+        acceptSpotnanaTerms(domain, policyID)
+            .then((response) => {
                 // Extract the error code from onyxData - the backend sets errors in TRAVEL_PROVISIONING via onyxData
                 const travelProvisioningData = response?.onyxData?.find((data) => data.key === ONYXKEYS.TRAVEL_PROVISIONING);
                 const errorCode = (travelProvisioningData?.value as Partial<TravelProvisioning> | undefined)?.error;
@@ -120,18 +119,19 @@ function TravelTerms({route}: TravelTermsPageProps) {
                     return Promise.reject(new Error('Request failed'));
                 }
 
-                // Handle success - build URL, cleanup, and return URL for asyncOpenURL to open
+                // Handle success - open travel in-app webview on native, or in browser on web
                 if (response?.spotnanaToken) {
-                    const travelDotURL = buildTravelDotURL(response.spotnanaToken, response.isTestAccount ?? false);
                     Navigation.closeRHPFlow();
                     cleanupTravelProvisioningSession();
-                    return travelDotURL;
+                    openTravelDotLink(policyID, undefined, response.spotnanaToken, response.isTestAccount ?? false);
+                    return;
                 }
 
                 return Promise.reject(new Error('No token received'));
-            }),
-            (travelDotURL) => travelDotURL ?? '',
-        );
+            })
+            .catch(() => {
+                // Errors are surfaced via TRAVEL_PROVISIONING in Onyx
+            });
     };
 
     return (