check for account.isLoading

src/pages/signin/SAMLSignInPage/index.native.js

@@ -20,13 +20,20 @@ const propTypes = {
         /** The email/phone the user logged in with */
         login: PropTypes.string,
     }),
+
+    /** State of the logging in user's account */
+    account: PropTypes.shape({
+        /** Whether the account is loading */
+        isLoading: PropTypes.bool,
+    }),
 };
 
 const defaultProps = {
     credentials: {},
+    account: {},
 };
 
-function SAMLSignInPage({credentials}) {
+function SAMLSignInPage({credentials, account}) {
     const samlLoginURL = `${CONFIG.EXPENSIFY.SAML_URL}?email=${credentials.login}&referer=${CONFIG.EXPENSIFY.EXPENSIFY_CASH_REFERER}&platform=${getPlatform()}`;
     const [showNavigation, shouldShowNavigation] = useState(true);
 
@@ -44,7 +51,7 @@ function SAMLSignInPage({credentials}) {
             }
 
             const searchParams = new URLSearchParams(new URL(url).search);
-            if (searchParams.has('shortLivedAuthToken')) {
+            if (searchParams.has('shortLivedAuthToken') && !account.isLoading) {
                 Log.info('SAMLSignInPage - Successfully received shortLivedAuthToken. Signing in...');
                 const shortLivedAuthToken = searchParams.get('shortLivedAuthToken');
                 Session.signInWithShortLivedAuthToken(credentials.login, shortLivedAuthToken);
@@ -57,7 +64,7 @@ function SAMLSignInPage({credentials}) {
                 Navigation.navigate(ROUTES.HOME);
             }
         },
-        [credentials.login, shouldShowNavigation],
+        [credentials.login, shouldShowNavigation, account.isLoading],
     );
 
     return (
@@ -95,4 +102,5 @@ SAMLSignInPage.displayName = 'SAMLSignInPage';
 
 export default withOnyx({
     credentials: {key: ONYXKEYS.CREDENTIALS},
+    account: {key: ONYXKEYS.ACCOUNT},
 })(SAMLSignInPage);