Skip to content

Commit fb91e4f

Browse files
authored
Merge pull request #50071 from VickyStash/bugfix/49342-xero-connection
Fix Connection complete page display after Xero connection
2 parents 2987fc0 + 35b4f87 commit fb91e4f

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/components/DeeplinkWrapper/index.website.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,12 +67,14 @@ function DeeplinkWrapper({children, isAuthenticated, autoAuthState, initialUrl}:
6767
// According to the design, we don't support unlink in Desktop app https://github.com/Expensify/App/issues/19681#issuecomment-1610353099
6868
const routeRegex = new RegExp(CONST.REGEX.ROUTES.UNLINK_LOGIN);
6969
const isUnsupportedDeeplinkRoute = routeRegex.test(window.location.pathname);
70+
const isConnectionCompleteRoute = window.location.pathname.replace('/', '') === ROUTES.CONNECTION_COMPLETE;
7071

7172
// Making a few checks to exit early before checking authentication status
7273
if (
7374
!isMacOSWeb() ||
7475
isUnsupportedDeeplinkRoute ||
7576
hasShownPrompt ||
77+
isConnectionCompleteRoute ||
7678
CONFIG.ENVIRONMENT === CONST.ENVIRONMENT.DEV ||
7779
autoAuthState === CONST.AUTO_AUTH_STATE.NOT_STARTED ||
7880
Session.isAnonymousUser()

src/libs/Navigation/AppNavigator/AuthScreens.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,7 @@ function AuthScreens() {
564564
/>
565565
<RootStack.Screen
566566
name={SCREENS.CONNECTION_COMPLETE}
567-
options={defaultScreenOptions}
567+
options={screenOptions.fullScreen}
568568
component={ConnectionCompletePage}
569569
/>
570570
{Object.entries(CENTRAL_PANE_SCREENS).map(([screenName, componentGetter]) => {

0 commit comments

Comments
 (0)