Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Aug 22, 2023
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7872ce
Adds check in Browser lib to replace pathname if coming from desktop …
cdanwards Aug 22, 2023
70ffa1b
Update to use route CONST
cdanwards Aug 22, 2023
6d04fda
Added some comments
cdanwards Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/libs/Browser/index.web.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import CONST from '../../CONST';
import CONFIG from '../../CONFIG';
import ROUTES from '../../ROUTES';

/**
* Fetch browser name from UA string
Expand Down Expand Up @@ -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);
Expand Down
Loading