From 2e089f7f77d0566aa1c8588ae34ee652039771ec Mon Sep 17 00:00:00 2001
From: Codex Agent <codex-agent@example.com>
Date: Thu, 22 Jan 2026 17:17:10 +0100
Subject: [PATCH] Unify setup status block

---
 .../js/admin/i18n/locales/de/dashboard.json   |  1 +
 .../js/admin/i18n/locales/en/dashboard.json   |  1 +
 resources/js/admin/mobile/DashboardPage.tsx   | 77 +++++++++++--------
 .../mobile/components/SetupChecklist.tsx      | 42 ++++++----
 4 files changed, 75 insertions(+), 46 deletions(-)

diff --git a/resources/js/admin/i18n/locales/de/dashboard.json b/resources/js/admin/i18n/locales/de/dashboard.json
index c971bd0..191c834 100644
--- a/resources/js/admin/i18n/locales/de/dashboard.json
+++ b/resources/js/admin/i18n/locales/de/dashboard.json
@@ -50,6 +50,7 @@
   "readiness": {
     "title": "Bereit für den Eventstart",
     "description": "Erledige diese Schritte, damit Gäste ohne Reibung loslegen können.",
+    "nextStepTitle": "Nächster Schritt",
     "pending": "Noch offen",
     "complete": "Erledigt",
     "items": {
diff --git a/resources/js/admin/i18n/locales/en/dashboard.json b/resources/js/admin/i18n/locales/en/dashboard.json
index 8ec9593..92d0c93 100644
--- a/resources/js/admin/i18n/locales/en/dashboard.json
+++ b/resources/js/admin/i18n/locales/en/dashboard.json
@@ -50,6 +50,7 @@
   "readiness": {
     "title": "Ready for event day",
     "description": "Complete these steps so guests can join without friction.",
+    "nextStepTitle": "Next step",
     "pending": "Pending",
     "complete": "Done",
     "items": {
diff --git a/resources/js/admin/mobile/DashboardPage.tsx b/resources/js/admin/mobile/DashboardPage.tsx
index 9378b01..963d188 100644
--- a/resources/js/admin/mobile/DashboardPage.tsx
+++ b/resources/js/admin/mobile/DashboardPage.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
 import { useQuery } from '@tanstack/react-query';
-import { AlertCircle, Bell, CalendarDays, Camera, CheckCircle2, ChevronRight, Download, Image as ImageIcon, Layout, ListTodo, Megaphone, QrCode, Settings, ShieldCheck, Sparkles, TrendingUp, Tv, Users } from 'lucide-react';
+import { AlertCircle, Bell, CalendarDays, Camera, CheckCircle2, ChevronRight, Circle, Download, Image as ImageIcon, Layout, ListTodo, Megaphone, QrCode, Settings, ShieldCheck, Sparkles, TrendingUp, Tv, Users } from 'lucide-react';
 import { Button } from '@tamagui/button';
 import { Card } from '@tamagui/card';
 import { YGroup } from '@tamagui/group';
@@ -218,15 +218,6 @@ export default function MobileDashboardPage() {
             variant="embedded"
           />
 
-          {/* 1b. SETUP CHECKLIST */}
-          {phase === 'setup' && (
-            <SetupChecklist
-              steps={readiness.steps}
-              title={t('dashboard:readiness.title', 'Bereit für den Eventstart')}
-              variant="embedded"
-            />
-          )}
-
           {/* 2. PULSE STRIP */}
           <Separator backgroundColor={theme.border} opacity={0.6} />
           <PulseStrip event={activeEvent} stats={stats} />
@@ -398,9 +389,7 @@ function LifecycleHero({ event, stats, locale, navigate, readiness, variant = 'd
 
   // SETUP
   const nextStep = readiness.nextStep;
-  const ctaLabel = nextStep ? nextStep.ctaLabel : t('dashboard:onboarding.hero.cta', 'Setup Complete');
-  const ctaAction = nextStep ? () => navigate(adminPath(nextStep.targetPath)) : undefined;
-  const showCta = Boolean(nextStep);
+  const showNextStep = Boolean(nextStep);
   
   return (
     <YStack space="$2">
@@ -424,24 +413,52 @@ function LifecycleHero({ event, stats, locale, navigate, readiness, variant = 'd
             </YStack>
           </XStack>
 
-          {showCta ? <Separator backgroundColor={theme.border} opacity={0.6} /> : null}
-
-          {showCta ? (
-            <Button
-              onPress={ctaAction}
-              backgroundColor={theme.primary}
-              borderColor="transparent"
-              height={48}
-              borderRadius={16}
-            >
-              <XStack alignItems="center" space="$2">
-                <Text fontSize="$sm" fontWeight="800" color="white">
-                  {ctaLabel}
-                </Text>
-                <ChevronRight size={16} color="white" />
-              </XStack>
-            </Button>
+          {showNextStep ? (
+            <YStack space="$2">
+              <Text fontSize="$xs" fontWeight="700" color={theme.muted} textTransform="uppercase" letterSpacing={1}>
+                {t('dashboard:readiness.nextStepTitle', 'Next step')}
+              </Text>
+              <YGroup {...({ borderRadius: "$4", borderWidth: 1, borderColor: theme.border, overflow: "hidden" } as any)}>
+                <YGroup.Item>
+                  <ListItem
+                    hoverTheme
+                    pressTheme
+                    paddingVertical="$2"
+                    paddingHorizontal="$3"
+                    onPress={() => navigate(adminPath(nextStep.targetPath))}
+                    title={
+                      <XStack alignItems="center" space="$2">
+                        <Circle size={18} color={theme.primary} strokeWidth={2.5} />
+                        <Text fontSize="$sm" fontWeight="700" color={theme.textStrong}>
+                          {nextStep.label}
+                        </Text>
+                      </XStack>
+                    }
+                    subTitle={
+                      nextStep.description ? (
+                        <Text fontSize="$xs" color={theme.muted}>
+                          {nextStep.description}
+                        </Text>
+                      ) : undefined
+                    }
+                    iconAfter={
+                      <XStack alignItems="center" space="$1">
+                        <PillBadge tone="success">{nextStep.ctaLabel}</PillBadge>
+                        <ChevronRight size={16} color={theme.muted} />
+                      </XStack>
+                    }
+                  />
+                </YGroup.Item>
+              </YGroup>
+            </YStack>
           ) : null}
+
+          <Separator backgroundColor={theme.border} opacity={0.6} />
+          <SetupChecklist
+            steps={readiness.steps}
+            title={t('dashboard:readiness.title', 'Bereit für den Eventstart')}
+            variant="inline"
+          />
         </YStack>
       </DashboardCard>
     </YStack>
diff --git a/resources/js/admin/mobile/components/SetupChecklist.tsx b/resources/js/admin/mobile/components/SetupChecklist.tsx
index 565193f..f0da4d0 100644
--- a/resources/js/admin/mobile/components/SetupChecklist.tsx
+++ b/resources/js/admin/mobile/components/SetupChecklist.tsx
@@ -22,32 +22,21 @@ export function SetupChecklist({
 }: {
   steps: ReadinessStep[];
   title: string;
-  variant?: 'card' | 'embedded';
+  variant?: 'card' | 'inline';
 }) {
   const theme = useAdminTheme();
   const { t } = useTranslation('dashboard');
   const navigate = useNavigate();
   const isAllComplete = steps.every(s => s.isComplete);
-  const [collapsed, setCollapsed] = React.useState(isAllComplete);
-  const isEmbedded = variant === 'embedded';
+  const [collapsed, setCollapsed] = React.useState(true);
+  const isInline = variant === 'inline';
 
   const completedCount = steps.filter(s => s.isComplete).length;
   const totalSteps = steps.length;
   const progressValue = totalSteps > 0 ? Math.round((completedCount / totalSteps) * 100) : 0;
 
-  return (
-    <Card
-      backgroundColor={theme.surface}
-      borderRadius={isEmbedded ? 16 : 20}
-      borderWidth={1}
-      borderColor={theme.border}
-      padding="$0"
-      overflow="hidden"
-      shadowColor={theme.shadow}
-      shadowOpacity={isEmbedded ? 0 : 0.16}
-      shadowRadius={isEmbedded ? 0 : 16}
-      shadowOffset={isEmbedded ? { width: 0, height: 0 } : { width: 0, height: 10 }}
-    >
+  const content = (
+    <YStack>
       <Pressable onPress={() => setCollapsed(!collapsed)}>
         <YStack padding="$3" paddingVertical="$2.5" space="$2">
           <XStack alignItems="center" justifyContent="space-between">
@@ -132,6 +121,27 @@ export function SetupChecklist({
           </YGroup>
         </YStack>
       )}
+    </YStack>
+  );
+
+  if (isInline) {
+    return content;
+  }
+
+  return (
+    <Card
+      backgroundColor={theme.surface}
+      borderRadius={20}
+      borderWidth={1}
+      borderColor={theme.border}
+      padding="$0"
+      overflow="hidden"
+      shadowColor={theme.shadow}
+      shadowOpacity={0.16}
+      shadowRadius={16}
+      shadowOffset={{ width: 0, height: 10 }}
+    >
+      {content}
     </Card>
   );
 }