Skip to content
Merged
Changes from all commits
Commits
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
23 changes: 19 additions & 4 deletions src/libs/Navigation/guards/OnboardingGuard.ts
Original file line number Diff line number Diff line change
Expand Up @@ -179,16 +179,20 @@ const OnboardingGuard: NavigationGuard = {
return {type: 'REDIRECT', route: ROUTES.HOME};
}

const skipOnboardingConfig = CONFIG.SKIP_ONBOARDING;
const isLoading = context.isLoading;
const isNavigatingWithReplace = isNavigatingToOnboardingFlowWithReplaceAction(action);

const shouldSkipOnboarding =
CONFIG.SKIP_ONBOARDING ||
context.isLoading ||
skipOnboardingConfig ||
isLoading ||
isTransitioning ||
isOnboardingCompleted ||
isMigratedUser ||
isSingleEntry ||
needsExplanationModal ||
isInvitedOrGroupMember ||
isNavigatingToOnboardingFlowWithReplaceAction(action);
isNavigatingWithReplace;

if (shouldSkipOnboarding) {
return {type: 'ALLOW'};
Expand All @@ -197,7 +201,18 @@ const OnboardingGuard: NavigationGuard = {
// User needs onboarding - calculate the correct step and redirect
const onboardingRoute = getOnboardingRoute();

Log.info('[OnboardingGuard] Redirecting to onboarding route', false, {onboardingRoute});
Log.info('[OnboardingGuard] Redirecting to onboarding route', false, {
onboardingRoute,
skipOnboardingConfig,
isLoading,
isTransitioning,
isOnboardingCompleted,
isMigratedUser,
isSingleEntry,
needsExplanationModal,
isInvitedOrGroupMember,
isNavigatingWithReplace,
});

return {
type: 'REDIRECT',
Expand Down
Loading