From 6e6041bb5b086daf9fda8e4557b18aa42cf81f1d Mon Sep 17 00:00:00 2001
From: Timo Knuth <timo.knuth@atos.net>
Date: Mon, 6 Jul 2026 13:05:25 +0200
Subject: [PATCH] =?UTF-8?q?feat(app):=20remove=20hard-paywall=20redirect?=
 =?UTF-8?q?=20=E2=80=94=20signed-in=20free=20users=20reach=20the=20app?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
---
 app/_layout.tsx | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/app/_layout.tsx b/app/_layout.tsx
index d188864..d11595c 100644
--- a/app/_layout.tsx
+++ b/app/_layout.tsx
@@ -96,11 +96,8 @@ function RootLayoutInner() {
     colorPalette,
     signOut,
     session,
-    billingSummary,
-    isActivatingEntitlement,
     isInitializing,
     isLoadingPlants,
-    isLoadingBilling,
   } = useApp();
   const colors = useColors(isDarkMode, colorPalette);
   const pathname = usePathname();
@@ -118,19 +115,11 @@ function RootLayoutInner() {
   }, [signOut]);
 
   const isAppReady = installCheckDone && !isInitializing && !isLoadingPlants;
-  const hasActiveEntitlement = isActivatingEntitlement
-    || (billingSummary?.entitlement?.plan === 'pro'
-      && billingSummary?.entitlement?.status === 'active');
   const isAllowedWithoutSession = pathname.includes('onboarding')
     || pathname.includes('auth/')
     || pathname.includes('scanner')
     || isShareIntentCallbackPath(pathname)
     || pathname.includes('profile/billing');
-  const isAllowedWithoutEntitlement = pathname.includes('auth/')
-    || pathname.includes('onboarding')
-    || pathname.includes('scanner')
-    || isShareIntentCallbackPath(pathname)
-    || pathname.includes('profile/billing');
 
   let content = null;
 
@@ -148,10 +137,12 @@ function RootLayoutInner() {
             }}
           >
             <Stack.Screen name="onboarding" options={{ animation: 'none' }} />
+            <Stack.Screen name="onboarding/slides" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="onboarding/source" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="onboarding/goal" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="onboarding/experience" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="onboarding/customize" options={{ animation: 'slide_from_right' }} />
+            <Stack.Screen name="onboarding/personalizing" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="auth/login" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="auth/signup" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen
@@ -166,12 +157,6 @@ function RootLayoutInner() {
           </Stack>
         );
       }
-    } else if (!hasActiveEntitlement && !isLoadingBilling && billingSummary && !isAllowedWithoutEntitlement) {
-      // Signed-in but confirmed non-pro: send to the paywall, not back to
-      // onboarding — bouncing a logged-in user to onboarding looks like an
-      // app restart. billingSummary === null means "unknown" (fetch failed),
-      // never redirect on unknown.
-      content = <Redirect href="/profile/billing" />;
     } else {
       content = (
         <>
@@ -182,10 +167,12 @@ function RootLayoutInner() {
             }}
           >
             <Stack.Screen name="onboarding" options={{ animation: 'none' }} />
+            <Stack.Screen name="onboarding/slides" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="onboarding/source" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="onboarding/goal" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="onboarding/experience" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="onboarding/customize" options={{ animation: 'slide_from_right' }} />
+            <Stack.Screen name="onboarding/personalizing" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="auth/login" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="auth/signup" options={{ animation: 'slide_from_right' }} />
             <Stack.Screen name="(tabs)" options={{ animation: 'none' }} />