Open switch to expensify classic on the same tab for web

src/libs/actions/Link.ts

@@ -65,13 +65,13 @@ function buildOldDotURL(url: string, shortLivedAuthToken?: string): Promise<stri
 /**
  * @param shouldSkipCustomSafariLogic When true, we will use `Linking.openURL` even if the browser is Safari.
  */
-function openExternalLink(url: string, shouldSkipCustomSafariLogic = false) {
-    asyncOpenURL(Promise.resolve(), url, shouldSkipCustomSafariLogic);
+function openExternalLink(url: string, shouldSkipCustomSafariLogic = false, shouldOpenInSameTab = false) {
+    asyncOpenURL(Promise.resolve(), url, shouldSkipCustomSafariLogic, shouldOpenInSameTab);
 }
 
-function openOldDotLink(url: string) {
+function openOldDotLink(url: string, shouldOpenInSameTab = false) {
     if (isNetworkOffline) {
-        buildOldDotURL(url).then((oldDotURL) => openExternalLink(oldDotURL));
+        buildOldDotURL(url).then((oldDotURL) => openExternalLink(oldDotURL, undefined, shouldOpenInSameTab));
         return;
     }
 
@@ -82,6 +82,8 @@ function openOldDotLink(url: string) {
             .then((response) => (response ? buildOldDotURL(url, response.shortLivedAuthToken) : buildOldDotURL(url)))
             .catch(() => buildOldDotURL(url)),
         (oldDotURL) => oldDotURL,
+        undefined,
+        shouldOpenInSameTab,
     );
 }
 

src/libs/asyncOpenURL/index.website.ts

@@ -1,22 +1,26 @@
 import {Linking} from 'react-native';
+import type {Linking as LinkingWeb} from 'react-native-web';
+import getPlatform from '@libs/getPlatform';
 import Log from '@libs/Log';
+import CONST from '@src/CONST';
 import type AsyncOpenURL from './types';
 
 /**
  * Prevents Safari from blocking pop-up window when opened within async call.
  * @param shouldSkipCustomSafariLogic When true, we will use `Linking.openURL` even if the browser is Safari.
  */
-const asyncOpenURL: AsyncOpenURL = (promise, url, shouldSkipCustomSafariLogic) => {
+const asyncOpenURL: AsyncOpenURL = (promise, url, shouldSkipCustomSafariLogic, shouldOpenInSameTab) => {
     if (!url) {
         return;
     }
 
     const isSafari = /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+    const canOpenURLInSameTab = getPlatform() === CONST.PLATFORM.WEB;
 
-    if (!isSafari || shouldSkipCustomSafariLogic) {
+    if (!isSafari || !!shouldSkipCustomSafariLogic || !!shouldOpenInSameTab) {
         promise
             .then((params) => {
-                Linking.openURL(typeof url === 'string' ? url : url(params));
+                (Linking.openURL as LinkingWeb['openURL'])(typeof url === 'string' ? url : url(params), shouldOpenInSameTab && canOpenURLInSameTab ? '_self' : undefined);
             })
             .catch(() => {
                 Log.warn('[asyncOpenURL] error occured while opening URL', {url});

src/libs/asyncOpenURL/types.ts

@@ -1,3 +1,3 @@
-type AsyncOpenURL = <T>(promise: Promise<T>, url: string | ((params: T) => string), shouldSkipCustomSafariLogic?: boolean) => void;
+type AsyncOpenURL = <T>(promise: Promise<T>, url: string | ((params: T) => string), shouldSkipCustomSafariLogic?: boolean, shouldOpenInSameTab?: boolean) => void;
 
 export default AsyncOpenURL;

src/pages/settings/ExitSurvey/ExitSurveyConfirmPage.tsx

@@ -83,7 +83,7 @@ function ExitSurveyConfirmPage({route, navigation}: ExitSurveyConfirmPageProps)
                     onPress={() => {
                         ExitSurvey.switchToOldDot();
                         Navigation.dismissModal();
-                        Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX);
+                        Link.openOldDotLink(CONST.OLDDOT_URLS.INBOX, true);
                     }}
                     isDisabled={isOffline}
                 />