diff --git a/src/pages/Bootcamp.tsx b/src/pages/Bootcamp.tsx
index d8d1d34..03e3b83 100644
--- a/src/pages/Bootcamp.tsx
+++ b/src/pages/Bootcamp.tsx
@@ -40,6 +40,15 @@ interface Progress {
   completed_at: string;
 }
 
+interface UserReview {
+  id: string;
+  rating: number;
+  title: string;
+  body: string;
+  is_approved: boolean;
+  created_at: string;
+}
+
 export default function Bootcamp() {
   const { slug } = useParams<{ slug: string }>();
   const navigate = useNavigate();
@@ -52,7 +61,7 @@ export default function Bootcamp() {
   const [loading, setLoading] = useState(true);
   const [sidebarOpen, setSidebarOpen] = useState(true);
   const [mobileMenuOpen, setMobileMenuOpen] = useState(false);
-  const [hasReviewed, setHasReviewed] = useState(false);
+  const [userReview, setUserReview] = useState<UserReview | null>(null);
   const [reviewModalOpen, setReviewModalOpen] = useState(false);
 
   useEffect(() => {
@@ -135,12 +144,17 @@ export default function Bootcamp() {
     // Check if user has already reviewed this bootcamp
     const { data: reviewData } = await supabase
       .from('reviews')
-      .select('id')
+      .select('id, rating, title, body, is_approved, created_at')
       .eq('user_id', user!.id)
       .eq('product_id', productData.id)
+      .order('created_at', { ascending: false })
       .limit(1);
-    
-    setHasReviewed(!!(reviewData && reviewData.length > 0));
+
+    if (reviewData && reviewData.length > 0) {
+      setUserReview(reviewData[0] as UserReview);
+    } else {
+      setUserReview(null);
+    }
 
     setLoading(false);
   };
@@ -435,14 +449,59 @@ export default function Bootcamp() {
 
               {/* Bootcamp completion review prompt */}
               {isBootcampCompleted && (
-                <Card className="border-2 border-primary/20 mt-6">
-                  <CardContent className="py-4">
-                    {hasReviewed ? (
-                      <div className="flex items-center gap-2 text-muted-foreground">
-                        <CheckCircle className="w-5 h-5 text-accent" />
-                        <span>Terima kasih atas ulasan Anda (menunggu moderasi)</span>
-                      </div>
+                <Card className={`border-2 mt-6 ${userReview?.is_approved ? 'bg-gradient-to-br from-brand-accent/10 to-primary/10 border-brand-accent/30' : 'border-primary/20'}`}>
+                  <CardContent className="py-6">
+                    {userReview ? (
+                      userReview.is_approved ? (
+                        // Approved review - celebratory display
+                        <div className="space-y-4">
+                          <div className="flex items-start gap-3">
+                            <div className="rounded-full bg-brand-accent p-2">
+                              <CheckCircle className="w-6 h-6 text-white" />
+                            </div>
+                            <div className="flex-1">
+                              <div className="flex items-center gap-2 mb-1">
+                                <h3 className="text-lg font-bold">Ulasan Anda Terbit!</h3>
+                                <Badge className="bg-brand-accent text-white rounded-full">Disetujui</Badge>
+                              </div>
+                              <p className="text-sm text-muted-foreground">Terima kasih telah berbagi pengalaman Anda. Ulasan Anda membantu peserta lain!</p>
+                            </div>
+                          </div>
+
+                          {/* User's review display */}
+                          <div className="bg-background/50 backdrop-blur rounded-lg p-4 border border-brand-accent/20">
+                            <div className="flex gap-0.5 mb-2">
+                              {[1, 2, 3, 4, 5].map((i) => (
+                                <Star
+                                  key={i}
+                                  className={`w-5 h-5 ${i <= userReview.rating ? 'fill-brand-accent text-brand-accent' : 'text-muted-foreground'}`}
+                                />
+                              ))}
+                            </div>
+                            <h4 className="font-semibold text-base mb-1">{userReview.title}</h4>
+                            {userReview.body && (
+                              <p className="text-sm text-muted-foreground">{userReview.body}</p>
+                            )}
+                          </div>
+
+                          <div className="text-xs text-muted-foreground">
+                            Diterbitkan pada {new Date(userReview.created_at).toLocaleDateString('id-ID', { day: 'numeric', month: 'long', year: 'numeric' })}
+                          </div>
+                        </div>
+                      ) : (
+                        // Pending review
+                        <div className="flex items-center gap-3 text-muted-foreground">
+                          <div className="rounded-full bg-amber-500/10 p-2">
+                            <Clock className="w-5 h-5 text-amber-500" />
+                          </div>
+                          <div>
+                            <p className="font-medium text-foreground">Ulasan Anda sedang ditinjau</p>
+                            <p className="text-sm">Terima kasih! Ulasan akan muncul setelah disetujui admin.</p>
+                          </div>
+                        </div>
+                      )
                     ) : (
+                      // No review yet - prompt to review
                       <div className="flex items-center justify-between gap-4 flex-wrap">
                         <div>
                           <p className="font-medium">🎉 Selamat menyelesaikan bootcamp!</p>
@@ -482,7 +541,22 @@ export default function Bootcamp() {
           productId={product.id}
           type="bootcamp"
           contextLabel={product.title}
-          onSuccess={() => setHasReviewed(true)}
+          onSuccess={() => {
+            // Refresh review data
+            const refreshReview = async () => {
+              const { data } = await supabase
+                .from('reviews')
+                .select('id, rating, title, body, is_approved, created_at')
+                .eq('user_id', user.id)
+                .eq('product_id', product.id)
+                .order('created_at', { ascending: false })
+                .limit(1);
+              if (data && data.length > 0) {
+                setUserReview(data[0] as UserReview);
+              }
+            };
+            refreshReview();
+          }}
         />
       )}
     </div>
diff --git a/src/pages/member/MemberAccess.tsx b/src/pages/member/MemberAccess.tsx
index e9b26a1..38aede5 100644
--- a/src/pages/member/MemberAccess.tsx
+++ b/src/pages/member/MemberAccess.tsx
@@ -93,30 +93,43 @@ export default function MemberAccess() {
           </Button>
         );
       case 'webinar':
-        return (
-          <div className="flex gap-2 flex-wrap">
-            {item.product.meeting_link && (
-              <Button asChild variant="outline" className="border-2">
-                <a href={item.product.meeting_link} target="_blank" rel="noopener noreferrer">
-                  <Video className="w-4 h-4 mr-2" />
-                  Gabung Webinar
-                </a>
-              </Button>
-            )}
-            {item.product.recording_url && (
-              <Button onClick={() => navigate(`/webinar/${item.product.slug}`)} className="shadow-sm">
+        // Check if webinar has ended
+        const webinarEnded = item.product.event_start && new Date(item.product.event_start) <= new Date();
+
+        // If recording exists, show it
+        if (item.product.recording_url) {
+          return (
+            <Button onClick={() => navigate(`/webinar/${item.product.slug}`)} className="shadow-sm">
+              <Video className="w-4 h-4 mr-2" />
+              Tonton Rekaman
+              <ArrowRight className="w-4 h-4 ml-2" />
+            </Button>
+          );
+        }
+
+        // Only show join link if webinar hasn't ended
+        if (!webinarEnded && item.product.meeting_link) {
+          return (
+            <Button asChild variant="outline" className="border-2">
+              <a href={item.product.meeting_link} target="_blank" rel="noopener noreferrer">
                 <Video className="w-4 h-4 mr-2" />
-                Tonton Rekaman
-                <ArrowRight className="w-4 h-4 ml-2" />
-              </Button>
-            )}
-          </div>
-        );
+                Gabung Webinar
+              </a>
+            </Button>
+          );
+        }
+
+        // Webinar ended but no recording yet
+        if (webinarEnded) {
+          return <Badge className="bg-muted text-primary">Rekaman segera tersedia</Badge>;
+        }
+
+        return null;
       case 'bootcamp':
         return (
           <Button onClick={() => navigate(`/bootcamp/${item.product.slug}`)} className="shadow-sm">
             <BookOpen className="w-4 h-4 mr-2" />
-            Lanjutkan Bootcamp
+            Mulai Bootcamp
             <ArrowRight className="w-4 h-4 ml-2" />
           </Button>
         );