Merge pull request #25706 from infinitered/cdanwards/issue-25679

Fix for frozen UI state on desktop after redirect from 3rd party sign in

(cherry picked from commit fc9378e)

src/libs/Browser/index.web.js

@@ -1,5 +1,6 @@
 import CONST from '../../CONST';
 import CONFIG from '../../CONFIG';
+import ROUTES from '../../ROUTES';
 
 /**
  * Fetch browser name from UA string
@@ -72,7 +73,10 @@ function isSafari() {
  */
 function openRouteInDesktopApp(shortLivedAuthToken = '', email = '') {
     const params = new URLSearchParams();
-    params.set('exitTo', `${window.location.pathname}${window.location.search}${window.location.hash}`);
+    // If the user is opening the desktop app through a third party signin flow, we need to manually add the exitTo param
+    // so that the desktop app redirects to the correct home route after signin is complete.
+    const openingFromDesktopRedirect = window.location.pathname === `/${ROUTES.DESKTOP_SIGN_IN_REDIRECT}`;
+    params.set('exitTo', `${openingFromDesktopRedirect ? '/r' : window.location.pathname}${window.location.search}${window.location.hash}`);
     if (email && shortLivedAuthToken) {
         params.set('email', email);
         params.set('shortLivedAuthToken', shortLivedAuthToken);