Compare commits
1 Commits
codex/add-
...
codex/refa
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a0efdb5001 |
@@ -280,10 +280,11 @@ const InitialRouteHandler: React.FC = () => {
|
||||
);
|
||||
}
|
||||
|
||||
// Loading state - only wait for onboarding init, not subscription check
|
||||
// Subscription check is non-blocking and happens in background
|
||||
const waitingForOnboardingInit = loading || !data;
|
||||
if (loading || waitingForOnboardingInit) {
|
||||
// Only block on onboarding initialization once we know the user has an active subscription.
|
||||
// This allows no-subscription/inactive flows to continue even when onboarding data is still null.
|
||||
const isActiveSubscriber = Boolean(subscription && subscription.active && subscription.plan !== 'none');
|
||||
const waitingForOnboardingInit = isActiveSubscriber && (loading || !data);
|
||||
if (waitingForOnboardingInit) {
|
||||
return (
|
||||
<Box
|
||||
display="flex"
|
||||
@@ -295,7 +296,7 @@ const InitialRouteHandler: React.FC = () => {
|
||||
>
|
||||
<CircularProgress size={60} />
|
||||
<Typography variant="h6" color="textSecondary">
|
||||
{subscriptionLoading ? 'Checking subscription...' : 'Preparing your workspace...'}
|
||||
Preparing your workspace...
|
||||
</Typography>
|
||||
</Box>
|
||||
);
|
||||
|
||||
@@ -72,39 +72,6 @@ const PricingPage: React.FC = () => {
|
||||
fetchPlans();
|
||||
}, []);
|
||||
|
||||
const isPodcastOnlyDemoMode = () => {
|
||||
const appMode = (localStorage.getItem('app_mode') || '').toLowerCase();
|
||||
const demoMode = (localStorage.getItem('demo_mode') || '').toLowerCase();
|
||||
const podcastOnlyDemoMode = (localStorage.getItem('podcast_only_demo_mode') || '').toLowerCase();
|
||||
const envAppMode = (process.env.REACT_APP_APP_MODE || '').toLowerCase();
|
||||
const envDemoMode = (process.env.REACT_APP_DEMO_MODE || '').toLowerCase();
|
||||
|
||||
return (
|
||||
podcastOnlyDemoMode === 'true' ||
|
||||
appMode === 'podcast-only' ||
|
||||
demoMode === 'podcast-only' ||
|
||||
envAppMode === 'podcast-only' ||
|
||||
envDemoMode === 'podcast-only'
|
||||
);
|
||||
};
|
||||
|
||||
const redirectAfterSubscription = () => {
|
||||
// In podcast-only demo mode, always force users into podcast flow.
|
||||
// Never send demo users to onboarding.
|
||||
if (isPodcastOnlyDemoMode()) {
|
||||
navigate('/podcast-maker');
|
||||
return;
|
||||
}
|
||||
|
||||
// Full mode keeps existing onboarding redirect behavior.
|
||||
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
|
||||
if (onboardingComplete) {
|
||||
navigate('/dashboard');
|
||||
} else {
|
||||
navigate('/onboarding');
|
||||
}
|
||||
};
|
||||
|
||||
const fetchPlans = async () => {
|
||||
try {
|
||||
setLoading(true);
|
||||
@@ -166,7 +133,14 @@ const PricingPage: React.FC = () => {
|
||||
// Refresh subscription status
|
||||
window.dispatchEvent(new CustomEvent('subscription-updated'));
|
||||
|
||||
redirectAfterSubscription();
|
||||
// After subscription, check if onboarding is complete
|
||||
// If not complete, redirect to onboarding; otherwise to dashboard
|
||||
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
|
||||
if (onboardingComplete) {
|
||||
navigate('/dashboard');
|
||||
} else {
|
||||
navigate('/onboarding');
|
||||
}
|
||||
} catch (err) {
|
||||
console.error('Error subscribing:', err);
|
||||
setError('Failed to process subscription');
|
||||
@@ -266,13 +240,10 @@ const PricingPage: React.FC = () => {
|
||||
setTimeout(() => {
|
||||
clearInterval(countdownInterval);
|
||||
|
||||
// In podcast-only demo mode, always route users to podcast flow.
|
||||
if (isPodcastOnlyDemoMode()) {
|
||||
navigate('/podcast-maker');
|
||||
} else {
|
||||
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
|
||||
|
||||
if (onboardingComplete) {
|
||||
// After subscription, check if onboarding is complete
|
||||
// If not complete, redirect to onboarding; otherwise to dashboard
|
||||
const onboardingComplete = localStorage.getItem('onboarding_complete') === 'true';
|
||||
if (onboardingComplete) {
|
||||
// Restore navigation state (path, phase, tool) if available
|
||||
const navState = restoreNavigationState();
|
||||
|
||||
@@ -295,8 +266,7 @@ const PricingPage: React.FC = () => {
|
||||
}
|
||||
}
|
||||
} else {
|
||||
navigate('/onboarding');
|
||||
}
|
||||
navigate('/onboarding');
|
||||
}
|
||||
}, 3000);
|
||||
} catch (err) {
|
||||
|
||||
Reference in New Issue
Block a user