Open Expensify desktop upon arrival to an authorized screen

Expensify · May 25, 2023 · 081bb61 · 081bb61
1 parent 13133eb
commit 081bb61
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Expensify.js b/src/Expensify.js
@@ -24,7 +24,6 @@ import withLocalize, {withLocalizePropTypes} from './components/withLocalize';
 import * as User from './libs/actions/User';
 import NetworkConnection from './libs/NetworkConnection';
 import Navigation from './libs/Navigation/Navigation';
-import DeeplinkWrapper from './components/DeeplinkWrapper';
 import PopoverReportActionContextMenu from './pages/home/report/ContextMenu/PopoverReportActionContextMenu';
 import * as ReportActionContextMenu from './pages/home/report/ContextMenu/ReportActionContextMenu';
 import KeyboardShortcutsModal from './components/KeyboardShortcutsModal';
@@ -178,7 +177,7 @@ function Expensify(props) {
     }
 
     return (
-        <DeeplinkWrapper>
+        <>
             {!isSplashShown && (
                 <>
                     <KeyboardShortcutsModal />
@@ -204,7 +203,7 @@ function Expensify(props) {
                 onReady={setNavigationReady}
                 authenticated={isAuthenticated}
             />
-        </DeeplinkWrapper>
+        </>
     );
 }
 

diff --git a/src/components/DeeplinkWrapper/index.website.js b/src/components/DeeplinkWrapper/index.website.js
@@ -53,11 +53,7 @@ class DeeplinkWrapper extends PureComponent {
         const expensifyUrl = new URL(CONFIG.EXPENSIFY.NEW_EXPENSIFY_URL);
         const params = new URLSearchParams();
         params.set('exitTo', `${window.location.pathname}${window.location.search}${window.location.hash}`);
-        if (!this.props.session.authToken) {
-            const expensifyDeeplinkUrl = `${CONST.DEEPLINK_BASE_URL}${expensifyUrl.host}/transition?${params.toString()}`;
-            this.openRouteInDesktopApp(expensifyDeeplinkUrl);
-            return;
-        }
+
         Authentication.getShortLivedAuthToken()
             .then((shortLivedAuthToken) => {
                 params.set('email', this.props.session.email);

diff --git a/src/libs/Navigation/AppNavigator/index.js b/src/libs/Navigation/AppNavigator/index.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import PropTypes from 'prop-types';
+import DeeplinkWrapper from '../../../components/DeeplinkWrapper';
 
 const propTypes = {
     /** If we have an authToken this is true */
@@ -11,7 +12,11 @@ const AppNavigator = (props) => {
         const AuthScreens = require('./AuthScreens').default;
 
         // These are the protected screens and only accessible when an authToken is present
-        return <AuthScreens />;
+        return (
+            <DeeplinkWrapper>
+                <AuthScreens />
+            </DeeplinkWrapper>
+        );
     }
     const PublicScreens = require('./PublicScreens').default;
     return <PublicScreens />;