Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(onboarding): ff (#5232)

teo6eabb0e6e33e
diff --git a/apps/web/src/components/app/Layout.tsx b/apps/web/src/components/app/Layout.tsx
index 717956c6ce..839859ccca 100644
--- a/apps/web/src/components/app/Layout.tsx
+++ b/apps/web/src/components/app/Layout.tsx
@@ -26,6 +26,7 @@ import {
import { MacroMcpSetupModal } from '@app/features/integrations/mcp-setup/MacroMcpSetupModal';
import { Paywall } from '@app/features/paywall/Paywall';
import { PropertyEditorModal } from '@app/features/property/editor/PropertyEditorModal';
+import { useOnboardingV4Flag } from '@app/features/setup/flow/useOnboardingV4Flag';
import { GlobalShareModal } from '@app/features/sharing/global-share-modal/GlobalShareModal';
import { IosShareSheet } from '@app/features/sharing/ios-share-sheet/IosShareSheet';
import { mountGlobalFocusListener } from '@app/signal/focus';
@@ -45,7 +46,6 @@ import {
SidebarVisibilityContext,
} from '@components/app/sidebarVisibility';
import { useIsAuthenticated } from '@core/auth';
-import { ENABLE_ONBOARDING_V4 } from '@core/constant/featureFlags';
import { usePaywallState } from '@core/constant/PaywallState';
import { isSoloSettings } from '@core/constant/SettingsState';
import { attachGlobalDOMScope } from '@core/hotkey/hotkeys';
@@ -292,9 +292,10 @@ function NewOnboardingRedirect() {
const userInfoQuery = useUserInfoQuery();
const navigate = useNavigate();
const location = useLocation();
+ const onboardingV4 = useOnboardingV4Flag();
createEffect(() => {
- if (!ENABLE_ONBOARDING_V4 || isMobile() || isNativeMobilePlatform()) {
+ if (!onboardingV4().enabled || isMobile() || isNativeMobilePlatform()) {
return;
}
const data = userInfoQuery.data;
diff --git a/apps/web/src/features/auth/EmailAuth.tsx b/apps/web/src/features/auth/EmailAuth.tsx
index c5e15bf444..04b9b3160f 100644
--- a/apps/web/src/features/auth/EmailAuth.tsx
+++ b/apps/web/src/features/auth/EmailAuth.tsx
@@ -1,10 +1,10 @@
import { ShareInboxConflictDialog } from '@app/features/inbox/ShareInboxConflictDialog';
+import { useOnboardingV4Flag } from '@app/features/setup/flow/useOnboardingV4Flag';
import { useAnalytics } from '@app/lib/analytics/analytics-context';
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 { ENABLE_ONBOARDING_V4 } from '@core/constant/featureFlags';
import { useSettingsState } from '@core/constant/SettingsState';
import { useEmailLinks } from '@core/email-link';
import { isMobile } from '@core/mobile/isMobile';
@@ -118,6 +118,7 @@ function EmailLinkCallback(props: Pick<EmailAuthParams, 'successPath'>) {
};
const userInfoQuery = useUserInfoQuery();
+ const onboardingV4 = useOnboardingV4Flag();
// The desktop settings split doesn't exist on mobile, so the callback
// returns mobile users to the list view with the toast as confirmation.
@@ -126,7 +127,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 (
- ENABLE_ONBOARDING_V4 &&
+ onboardingV4().enabled &&
!isMobile() &&
!isNativeMobilePlatform() &&
userInfoQuery.data?.tutorialComplete === false
diff --git a/apps/web/src/features/auth/LoginNew.tsx b/apps/web/src/features/auth/LoginNew.tsx
index 14d49e088f..c108122570 100644
--- a/apps/web/src/features/auth/LoginNew.tsx
+++ b/apps/web/src/features/auth/LoginNew.tsx
@@ -1,10 +1,10 @@
import { ROUTER_BASE_CONCAT } from '@app/constants/routerBase';
import { OnboardingFlow } from '@app/features/setup/flow/OnboardingFlow';
import { NoiseBackground } from '@app/features/setup/flow/shared';
+import { useOnboardingV4Flag } from '@app/features/setup/flow/useOnboardingV4Flag';
import { useAnalytics } from '@app/lib/analytics/analytics-context';
import { GOOGLE_GMAIL_IDP } from '@core/auth/email';
import { LoadingBlock } from '@core/component/LoadingBlock';
-import { ENABLE_ONBOARDING_V4 } from '@core/constant/featureFlags';
import { useEmailLinks } from '@core/email-link';
import { isMobile } from '@core/mobile/isMobile';
import { isNativeMobilePlatform } from '@core/mobile/isNativeMobilePlatform';
@@ -73,17 +73,27 @@ function PostLoginRedirect() {
*/
function PostAuthGate() {
const userInfoQuery = useUserInfoQuery();
+ const onboardingV4 = useOnboardingV4Flag();
- const needsOnboarding = () =>
- ENABLE_ONBOARDING_V4 &&
+ const isFirstTimeDesktopUser = () =>
!isMobile() &&
!isNativeMobilePlatform() &&
userInfoQuery.data?.authenticated === true &&
userInfoQuery.data.tutorialComplete === false;
+ const needsOnboarding = () =>
+ 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();
+
return (
- <Show when={needsOnboarding()} fallback={<PostLoginRedirect />}>
- <OnboardingFlow />
+ <Show when={!waitingOnFlag()} fallback={<LoadingBlock />}>
+ <Show when={needsOnboarding()} fallback={<PostLoginRedirect />}>
+ <OnboardingFlow />
+ </Show>
</Show>
);
}
diff --git a/apps/web/src/features/setup/flow/useOnboardingV4Flag.ts b/apps/web/src/features/setup/flow/useOnboardingV4Flag.ts
new file mode 100644
index 0000000000..2f00fc14e7
--- /dev/null
+++ b/apps/web/src/features/setup/flow/useOnboardingV4Flag.ts
@@ -0,0 +1,47 @@
+import { useFeatureFlag, usePosthog } from '@app/lib/analytics/posthog';
+import {
+ ENABLE_ONBOARDING_V4_FLAG,
+ ENABLE_ONBOARDING_V4_OVERRIDE,
+} from '@core/constant/featureFlags';
+import { type Accessor, createSignal, onCleanup } from 'solid-js';
+
+/**
+ * How long to treat "PostHog hasn't answered yet" as loading before falling
+ * back to the flag's default (off). Without this a blocked or failing PostHog
+ * would leave onboarding gates spinning forever.
+ */
+const FLAG_WAIT_MS = 3_000;
+
+/** Reactive result of the onboarding-v4 gate. */
+export type OnboardingV4Flag = {
+ /** Whether onboarding v4 is on for this user. */
+ enabled: boolean;
+ /**
+ * PostHog hasn't reported flags yet. Call sites that would navigate away
+ * should wait on this rather than reading `enabled: false` as "off".
+ */
+ loading: boolean;
+};
+
+/**
+ * Gate for onboarding v4, controlled by the `enable-onboarding-v4` PostHog
+ * flag and overridable locally with `VITE_ENABLE_ONBOARDING_V4`.
+ */
+export function useOnboardingV4Flag(): Accessor<OnboardingV4Flag> {
+ const posthog = usePosthog();
+ const flag = useFeatureFlag(ENABLE_ONBOARDING_V4_FLAG, {
+ enabledOverride: ENABLE_ONBOARDING_V4_OVERRIDE,
+ });
+
+ const [waited, setWaited] = createSignal(false);
+ const timer = setTimeout(() => setWaited(true), FLAG_WAIT_MS);
+ onCleanup(() => clearTimeout(timer));
+
+ return () => ({
+ enabled: flag().enabled,
+ loading:
+ ENABLE_ONBOARDING_V4_OVERRIDE === undefined &&
+ !posthog.featureFlags().length &&
+ !waited(),
+ });
+}
diff --git a/apps/web/src/lib/core/constant/featureFlags.ts b/apps/web/src/lib/core/constant/featureFlags.ts
index 918d7ef2ee..58480eac5a 100644
--- a/apps/web/src/lib/core/constant/featureFlags.ts
+++ b/apps/web/src/lib/core/constant/featureFlags.ts
@@ -546,8 +546,13 @@ export const BOT_MANAGEMENT_OVERRIDE =
// Onboarding v4: the full-screen stepper new users land in after signup
// (unified with /login), driving the import machinery with auto-import.
-// Dev-mode default; override with VITE_ENABLE_ONBOARDING_V4.
-export const ENABLE_ONBOARDING_V4 = resolveFeatureFlag(
- 'ENABLE_ONBOARDING_V4',
- DEV_MODE_ENV
-);
+// PostHog-gated with a dev-mode default; override with
+// VITE_ENABLE_ONBOARDING_V4. Read it through `useOnboardingV4Flag()` so the
+// gate reacts when PostHog answers (and so callers can wait instead of
+// treating "flags not loaded yet" as "off").
+export const ENABLE_ONBOARDING_V4_FLAG = 'enable-onboarding-v4';
+// Honor an explicit VITE_ENABLE_ONBOARDING_V4=false (don't coerce it to
+// undefined), else default on in dev and defer to PostHog in prod.
+export const ENABLE_ONBOARDING_V4_OVERRIDE =
+ getFeatureFlagOverride('ENABLE_ONBOARDING_V4') ??
+ (DEV_MODE_ENV ? true : undefined);
diff --git a/apps/web/src/routes/Root.tsx b/apps/web/src/routes/Root.tsx
index a203202cd6..f28d31b017 100644
--- a/apps/web/src/routes/Root.tsx
+++ b/apps/web/src/routes/Root.tsx
@@ -14,6 +14,7 @@ import { InteractiveOnboardingModal } from '@app/features/onboarding/Interactive
import MobileWebSignup from '@app/features/onboarding/MobileWebSignup';
import { useCheckoutCompletionListener } from '@app/features/paywall/use-checkout-completion-listener';
import { OnboardingFlow } from '@app/features/setup/flow/OnboardingFlow';
+import { useOnboardingV4Flag } from '@app/features/setup/flow/useOnboardingV4Flag';
import { TeamInviteAcceptance } from '@app/features/team-invitations/TeamInviteAcceptance';
import {
AnalyticsContextProvider,
@@ -34,8 +35,8 @@ import { ReactiveFavicon } from '@components/app/ReactiveFavicon';
import { LAYOUT_ROUTE } from '@components/app/split-layout/SplitLayoutRoute';
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 { ENABLE_ONBOARDING_V4 } from '@core/constant/featureFlags';
import { ChannelsContextProvider } from '@core/context/channels';
import { EmailLinksContextProvider } from '@core/context/emailLinks';
import { QuickAccessProvider } from '@core/context/quickAccess';
@@ -115,6 +116,7 @@ import {
onCleanup,
onMount,
type ParentProps,
+ Show,
Suspense,
Switch,
} from 'solid-js';
@@ -308,6 +310,40 @@ function SetupRedirect() {
return <Navigate href={`/onboarding${location.search}`} />;
}
+/**
+ * The old split-screen /setup surface is retired; the onboarding flow lives at
+ * /onboarding now. Flag off, /setup must go home — forwarding would land
+ * flag-off web users on /login and native users on MobileOnboarding.
+ */
+function SetupRoute() {
+ const onboardingV4 = useOnboardingV4Flag();
+
+ return (
+ <Show when={!onboardingV4().loading} fallback={<LoadingBlock />}>
+ <Show when={onboardingV4().enabled} fallback={<Navigate href="/" />}>
+ <SetupRedirect />
+ </Show>
+ </Show>
+ );
+}
+
+/**
+ * Web/desktop gate for /onboarding. Waits for PostHog to report flags before
+ * bouncing: with the flag on but not yet loaded, a direct visit (or a reload
+ * mid-flow) would otherwise get kicked to /login and lose its ?next.
+ */
+function OnboardingRoute() {
+ const onboardingV4 = useOnboardingV4Flag();
+
+ return (
+ <Show when={!onboardingV4().loading} fallback={<LoadingBlock />}>
+ <Show when={onboardingV4().enabled} fallback={<Navigate href="/login" />}>
+ <OnboardingFlow />
+ </Show>
+ </Show>
+ );
+}
+
const ROUTES: RouteDefinition[] = [
LAYOUT_ROUTE,
/** BEGIN - APP ROUTES */
@@ -430,22 +466,12 @@ const ROUTES: RouteDefinition[] = [
// direct visit must not touch the onboarding backend (reading it
// creates the flow's row and starts gathers).
component: () =>
- isNativeMobilePlatform() ? (
- <MobileOnboarding />
- ) : !ENABLE_ONBOARDING_V4 ? (
- <Navigate href="/login" />
- ) : (
- <OnboardingFlow />
- ),
+ isNativeMobilePlatform() ? <MobileOnboarding /> : <OnboardingRoute />,
},
{
- // The old split-screen /setup surface is retired; the onboarding flow
- // lives at /onboarding now. Preserve the query (?next deep links).
- // Flag off, /setup must go home — forwarding would land flag-off web
- // users on /login and native users on the MobileOnboarding screen.
+ // Preserve the query (?next deep links) when forwarding to /onboarding.
path: '/setup',
- component: () =>
- ENABLE_ONBOARDING_V4 ? <SetupRedirect /> : <Navigate href="/" />,
+ component: SetupRoute,
},
{
path: '/team-invite',
@@ -576,14 +602,16 @@ function QuerySyncProviderWithUserId() {
function InitialInteractiveOnboardingModal() {
const userInfoQuery = useUserInfoQuery();
+ const onboardingV4 = useOnboardingV4Flag();
const [open, setOpen] = createSignal(true);
const [onboardingStarted, setOnboardingStarted] = createSignal(false);
const modalOpen = () =>
open() &&
// Onboarding-v4 replaces this modal on desktop; the Layout redirect
- // sends first-time users to /onboarding instead.
- (!ENABLE_ONBOARDING_V4 || isMobile()) &&
+ // sends first-time users to /onboarding instead. Desktop waits for the
+ // flag to resolve so this doesn't flash before that redirect fires.
+ (isMobile() || (!onboardingV4().loading && !onboardingV4().enabled)) &&
!isNativeMobilePlatform() &&
userInfoQuery.data?.authenticated === true &&
(userInfoQuery.data.tutorialComplete === false || onboardingStarted());