From 69b80bf3c2ddaac3fd465ff3b7cac392f5a78a72 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Wed, 13 Dec 2023 03:27:49 +0700
Subject: [PATCH 1/2] not show promp open in desktop app for magic link

---
 src/Expensify.js                                | 7 ++++++-
 src/components/DeeplinkWrapper/index.website.js | 8 +++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Expensify.js b/src/Expensify.js
index aece93c0ff4d..bc0d10390ee9 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -13,6 +13,7 @@ import AppleAuthWrapper from './components/SignInButtons/AppleAuthWrapper';
 import SplashScreenHider from './components/SplashScreenHider';
 import UpdateAppModal from './components/UpdateAppModal';
 import withLocalize, {withLocalizePropTypes} from './components/withLocalize';
+import CONST from './CONST';
 import * as DemoActions from './libs/actions/DemoActions';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
 import * as Report from './libs/actions/Report';
@@ -112,6 +113,7 @@ function Expensify(props) {
     }, [props.isCheckingPublicRoom]);
 
     const isAuthenticated = useMemo(() => Boolean(lodashGet(props.session, 'authToken', null)), [props.session]);
+    const autoAuthState = useMemo(() => lodashGet(props.session, 'autoAuthState', ''), [props.session]);
 
     const contextValue = useMemo(
         () => ({
@@ -207,7 +209,10 @@ function Expensify(props) {
     }
 
     return (
-        <DeeplinkWrapper isAuthenticated={isAuthenticated}>
+        <DeeplinkWrapper
+            isAuthenticated={isAuthenticated}
+            autoAuthState={autoAuthState}
+        >
             {shouldInit && (
                 <>
                     <GrowlNotification ref={Growl.growlRef} />
diff --git a/src/components/DeeplinkWrapper/index.website.js b/src/components/DeeplinkWrapper/index.website.js
index 166818e4ae27..d81c99657dd8 100644
--- a/src/components/DeeplinkWrapper/index.website.js
+++ b/src/components/DeeplinkWrapper/index.website.js
@@ -16,6 +16,8 @@ const propTypes = {
     children: PropTypes.node.isRequired,
     /** User authentication status */
     isAuthenticated: PropTypes.bool.isRequired,
+    /** The auto authentication status */
+    autoAuthState: PropTypes.string,
 };
 
 function isMacOSWeb() {
@@ -36,7 +38,7 @@ function promptToOpenInDesktopApp() {
         App.beginDeepLinkRedirect(!isMagicLink);
     }
 }
-function DeeplinkWrapper({children, isAuthenticated}) {
+function DeeplinkWrapper({children, isAuthenticated, autoAuthState}) {
     const [currentScreen, setCurrentScreen] = useState();
     const [hasShownPrompt, setHasShownPrompt] = useState(false);
     const removeListener = useRef();
@@ -69,7 +71,7 @@ function DeeplinkWrapper({children, isAuthenticated}) {
             return routeRegex.test(window.location.pathname);
         });
         // Making a few checks to exit early before checking authentication status
-        if (!isMacOSWeb() || isUnsupportedDeeplinkRoute || CONFIG.ENVIRONMENT === CONST.ENVIRONMENT.DEV || hasShownPrompt) {
+        if (!isMacOSWeb() || isUnsupportedDeeplinkRoute || hasShownPrompt || CONFIG.ENVIRONMENT === CONST.ENVIRONMENT.DEV || autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED) {
             return;
         }
         // We want to show the prompt immediately if the user is already authenticated.
@@ -92,7 +94,7 @@ function DeeplinkWrapper({children, isAuthenticated}) {
             promptToOpenInDesktopApp();
             setHasShownPrompt(true);
         }
-    }, [currentScreen, hasShownPrompt, isAuthenticated]);
+    }, [currentScreen, hasShownPrompt, isAuthenticated, autoAuthState]);
 
     return children;
 }

From e0d309e5f337362bf7952a9130fa038add8328b7 Mon Sep 17 00:00:00 2001
From: dukenv0307 <dukenv0307@gmail.com>
Date: Wed, 13 Dec 2023 03:28:13 +0700
Subject: [PATCH 2/2] fix lint

---
 src/Expensify.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Expensify.js b/src/Expensify.js
index bc0d10390ee9..756df5b79b88 100644
--- a/src/Expensify.js
+++ b/src/Expensify.js
@@ -13,7 +13,6 @@ import AppleAuthWrapper from './components/SignInButtons/AppleAuthWrapper';
 import SplashScreenHider from './components/SplashScreenHider';
 import UpdateAppModal from './components/UpdateAppModal';
 import withLocalize, {withLocalizePropTypes} from './components/withLocalize';
-import CONST from './CONST';
 import * as DemoActions from './libs/actions/DemoActions';
 import * as EmojiPickerAction from './libs/actions/EmojiPickerAction';
 import * as Report from './libs/actions/Report';