boundlessfi
diff --git a/‎app/(landing)/hackathons/preview/[orgId]/[draftId]/page.tsx‎
Lines changed: 21 additions & 2 deletions b/‎app/(landing)/hackathons/preview/[orgId]/[draftId]/page.tsx‎
Lines changed: 21 additions & 2 deletions
diff --git a/‎app/(landing)/organizations/[id]/hackathons/[hackathonId]/rewards/page.tsx‎
Lines changed: 26 additions & 0 deletions b/‎app/(landing)/organizations/[id]/hackathons/[hackathonId]/rewards/page.tsx‎
Lines changed: 26 additions & 0 deletions
@@ -4,6 +4,7 @@ import { useState, useEffect, useMemo } from 'react';
 import { useRouter, useSearchParams } from 'next/navigation';
 import { ArrowLeft } from 'lucide-react';
 import { getDraft, PrizeTier, VenueType } from '@/lib/api/hackathons';
+import { getOrganization } from '@/lib/api/organization';
 import { HackathonBanner } from '@/components/hackathons/hackathonBanner';
 import { HackathonNavTabs } from '@/components/hackathons/hackathonNavTabs';
 import { HackathonOverview } from '@/components/hackathons/overview/hackathonOverview';
@@ -93,6 +94,18 @@ export default function DraftPreviewPage({ params }: PreviewPageProps) {
           resolvedParams.orgId,
           resolvedParams.draftId
         );
+        let organizationData = { name: '', logo: '' };
+        try {
+          const orgRes = await getOrganization(resolvedParams.orgId);
+          if (orgRes) {
+            organizationData = {
+              name: orgRes.name,
+              logo: orgRes.logo || '',
+            };
+          }
+        } catch (orgErr) {
+          console.error('Failed to fetch organization for preview:', orgErr);
+        }
 
         if (response.success && response.data) {
           const draft = response.data;
@@ -111,8 +124,8 @@ export default function DraftPreviewPage({ params }: PreviewPageProps) {
             organizationId: resolvedParams.orgId,
             organization: {
               id: resolvedParams.orgId,
-              name: '', // We don't have organizer name from draft
-              logo: '',
+              name: organizationData.name,
+              logo: organizationData.logo,
             },
 
             status: 'DRAFT',
@@ -144,6 +157,12 @@ export default function DraftPreviewPage({ params }: PreviewPageProps) {
             submissionDeadline: draft.data.timeline?.submissionDeadline || '',
             registrationDeadline:
               draft.data.participation?.registrationDeadline || '',
+            judgingStart: draft.data.timeline?.judgingStart || '',
+            judgingEnd: draft.data.timeline?.judgingEnd || '',
+            winnersAnnouncedAt:
+              draft.data.timeline?.winnersAnnouncedAt ||
+              draft.data.timeline?.winnerAnnouncementDate ||
+              '',
             customRegistrationDeadline:
               draft.data.participation?.registrationDeadline || null,
 
 
@@ -7,6 +7,7 @@ import PublishWinnersWizard from '@/components/organization/hackathons/rewards/P
 import { RewardsPageHeader } from '@/components/organization/hackathons/rewards/RewardsPageHeader';
 import { RewardsPageContent } from '@/components/organization/hackathons/rewards/RewardsPageContent';
 import { useHackathonRewards } from '@/hooks/use-hackathon-rewards';
+import { useRewardDistributionStatus } from '@/hooks/use-reward-distribution-status';
 import { useRankAssignment } from '@/hooks/use-rank-assignment';
 import { Alert, AlertDescription, AlertTitle } from '@/components/ui/alert';
 import { AuthGuard } from '@/components/auth';
@@ -27,11 +28,21 @@ export default function RewardsPage() {
     isLoadingSubmissions,
     error,
     refreshEscrow,
+    refetchHackathon,
+    resultsPublished,
+    hackathon,
   } = useHackathonRewards(organizationId, hackathonId);
 
   const { handleRankChange } = useRankAssignment();
   const [isPublishWizardOpen, setIsPublishWizardOpen] = useState(false);
 
+  const {
+    distributionStatus,
+    isLoading: isLoadingDistributionStatus,
+    error: distributionError,
+    refetch: refetchDistributionStatus,
+  } = useRewardDistributionStatus(organizationId, hackathonId);
+
   const maxRank = useMemo(() => prizeTiers.length, [prizeTiers.length]);
   const winners = useMemo(
     () => submissions.filter(s => s.rank && s.rank <= maxRank),
@@ -56,6 +67,8 @@ export default function RewardsPage() {
 
   const handlePublishSuccess = () => {
     refreshEscrow();
+    refetchDistributionStatus();
+    refetchHackathon();
   };
 
   return (
@@ -85,6 +98,14 @@ export default function RewardsPage() {
           </Alert>
         )}
 
+        {!isLoading && distributionError && (
+          <Alert variant='destructive' className='mb-8'>
+            <AlertCircle className='h-4 w-4' />
+            <AlertTitle>Distribution Status Error</AlertTitle>
+            <AlertDescription>{distributionError}</AlertDescription>
+          </Alert>
+        )}
+
         {!isLoading && !error && (
           <RewardsPageContent
             submissions={submissions}
@@ -95,6 +116,11 @@ export default function RewardsPage() {
             hasWinners={hasWinners}
             onPublishClick={() => setIsPublishWizardOpen(true)}
             onRankChange={handleRankChangeWrapper}
+            distributionStatus={distributionStatus}
+            isLoadingDistributionStatus={isLoadingDistributionStatus}
+            onRefreshDistributionStatus={refetchDistributionStatus}
+            resultsPublished={resultsPublished}
+            escrowAddress={hackathon?.escrowAddress || hackathon?.contractId}
           />
         )}