From 2ba66cd531200ae16aab317964b934318a73eec7 Mon Sep 17 00:00:00 2001 From: Rory Abraham <47436092+roryabraham@users.noreply.github.com> Date: Thu, 14 Oct 2021 20:49:19 -0700 Subject: [PATCH] Merge pull request #5868 from Expensify/aldo_fix-missing-workspace-mobile (cherry picked from commit 3aeb62f9a7f0e06a417f004360ac34e54354e738) --- src/libs/Navigation/AppNavigator/AuthScreens.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/libs/Navigation/AppNavigator/AuthScreens.js b/src/libs/Navigation/AppNavigator/AuthScreens.js index 10f22a0ca3cd..809d6d1bffb8 100644 --- a/src/libs/Navigation/AppNavigator/AuthScreens.js +++ b/src/libs/Navigation/AppNavigator/AuthScreens.js @@ -170,10 +170,15 @@ class AuthScreens extends React.Component { // Load policies, maybe creating a new policy first. Linking.getInitialURL() .then((url) => { - const path = new URL(url).pathname; - const exitTo = new URLSearchParams(url).get('exitTo'); - const shouldCreateFreePolicy = Str.startsWith(path, Str.normalizeUrl(ROUTES.LOGIN_WITH_SHORT_LIVED_TOKEN)) && exitTo === ROUTES.WORKSPACE_NEW; - getPolicyList(shouldCreateFreePolicy); + // url is null on mobile unless the app was opened via a deeplink + if (url) { + const path = new URL(url).pathname; + const exitTo = new URLSearchParams(url).get('exitTo'); + const shouldCreateFreePolicy = Str.startsWith(path, Str.normalizeUrl(ROUTES.LOGIN_WITH_SHORT_LIVED_TOKEN)) && exitTo === ROUTES.WORKSPACE_NEW; + getPolicyList(shouldCreateFreePolicy); + } else { + getPolicyList(false); + } }); // Refresh the personal details, timezone and betas every 30 minutes