Skip to content
Open
Show file tree
Hide file tree
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
8 changes: 7 additions & 1 deletion apps/web/src/components/app/Layout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ import { useIsAuthenticated } from '@core/auth';
import {
ENABLE_REMINDERS_FLAG,
ENABLE_REMINDERS_OVERRIDE,
LOCAL_ONLY,
} from '@core/constant/featureFlags';
import { usePaywallState } from '@core/constant/PaywallState';
import { isSoloSettings } from '@core/constant/SettingsState';
Expand Down Expand Up @@ -315,7 +316,12 @@ function NewOnboardingRedirect() {
const onboardingV4 = useOnboardingV4Flag();

createEffect(() => {
if (!onboardingV4().enabled || isMobile() || isNativeMobilePlatform()) {
if (
LOCAL_ONLY ||
!onboardingV4().enabled ||
isMobile() ||
isNativeMobilePlatform()
) {
return;
}
const data = userInfoQuery.data;
Expand Down
2 changes: 2 additions & 0 deletions apps/web/src/features/auth/EmailAuth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { updateUserAuth } from '@core/auth';
import { redirectToEmailAuth } from '@core/auth/email';
import { LoadingBlock } from '@core/component/LoadingBlock';
import { toast } from '@core/component/Toast/Toast';
import { LOCAL_ONLY } from '@core/constant/featureFlags';
import { useSettingsState } from '@core/constant/SettingsState';
import { useEmailLinks } from '@core/email-link';
import { isMobile } from '@core/mobile/isMobile';
Expand Down Expand Up @@ -127,6 +128,7 @@ function EmailLinkCallback(props: Pick<EmailAuthParams, 'successPath'>) {
// return straight to it. Landing in mail settings would mount the app
// shell mid-onboarding just for NewOnboardingRedirect to bounce back.
if (
!LOCAL_ONLY &&
onboardingV4().enabled &&
!isMobile() &&
!isNativeMobilePlatform() &&
Expand Down
5 changes: 3 additions & 2 deletions apps/web/src/features/auth/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import { useOnboardingV4Flag } from '@app/features/setup/flow/useOnboardingV4Fla
import { useAnalytics } from '@app/lib/analytics/analytics-context';
import { GOOGLE_GMAIL_IDP } from '@core/auth/email';
import { LoadingBlock } from '@core/component/LoadingBlock';
import { LOCAL_ONLY } from '@core/constant/featureFlags';
import { useEmailLinks } from '@core/email-link';
import { isMobile } from '@core/mobile/isMobile';
import { isNativeMobilePlatform } from '@core/mobile/isNativeMobilePlatform';
Expand Down Expand Up @@ -82,12 +83,12 @@ function PostAuthGate() {
userInfoQuery.data.tutorialComplete === false;

const needsOnboarding = () =>
onboardingV4().enabled && isFirstTimeDesktopUser();
!LOCAL_ONLY && onboardingV4().enabled && isFirstTimeDesktopUser();

// Don't redirect into the app while the gate is still unknown: a first-time
// user would land on home for a beat and then get yanked to /onboarding.
const waitingOnFlag = () =>
onboardingV4().loading && isFirstTimeDesktopUser();
!LOCAL_ONLY && onboardingV4().loading && isFirstTimeDesktopUser();

return (
<Suspense fallback={<LoadingBlock />}>
Expand Down
5 changes: 5 additions & 0 deletions apps/web/src/routes/Root.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ import { clearLocalAuthSession } from '@core/auth/logout';
import { ChatAttachmentsInit } from '@core/component/AI/signal/globalAttachments';
import { LoadingBlock } from '@core/component/LoadingBlock';
import { ToastRegion } from '@core/component/Toast/ToastRegion';
import { LOCAL_ONLY } from '@core/constant/featureFlags';
import { ChannelsContextProvider } from '@core/context/channels';
import { EmailLinksContextProvider } from '@core/context/emailLinks';
import { QuickAccessProvider } from '@core/context/quickAccess';
Expand Down Expand Up @@ -314,6 +315,8 @@ function SetupRedirect() {
* flag-off web users on /login and native users on MobileOnboarding.
*/
function SetupRoute() {
if (LOCAL_ONLY) return <Navigate href="/" />;

const onboardingV4 = useOnboardingV4Flag();

return (
Expand All @@ -331,6 +334,8 @@ function SetupRoute() {
* mid-flow) would otherwise get kicked to /login and lose its ?next.
*/
function OnboardingRoute() {
if (LOCAL_ONLY) return <Navigate href="/" />;

const onboardingV4 = useOnboardingV4Flag();

return (
Expand Down
Loading