From 248caa7029f48569af39fca2e5ff09e2f66e1888 Mon Sep 17 00:00:00 2001
From: Tanuja Pansare <tanuja@stratawiz.com>
Date: Fri, 10 Jul 2026 12:32:57 +0530
Subject: [PATCH] merge

---
 .../components/dashboard/EventHomeModules.tsx | 22 ++++++++-----------
 .../panels/FormSubmissionsPanel.tsx           |  5 +----
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/src/app/components/dashboard/EventHomeModules.tsx b/src/app/components/dashboard/EventHomeModules.tsx
index 08d30238..48a8fe58 100644
--- a/src/app/components/dashboard/EventHomeModules.tsx
+++ b/src/app/components/dashboard/EventHomeModules.tsx
@@ -1,9 +1,5 @@
 import React, { useCallback, useEffect, useState } from "react";
-<<<<<<< HEAD
-import { BarChart2, CalendarDays, FileText, Plus, ShieldCheck, Tag, Ticket, Trophy, Upload } from "lucide-react";
-=======
-import { BarChart2, CalendarDays, Check, FileText, Globe, Link2, Plus, ShieldCheck, Tag, Ticket, Trophy } from "lucide-react";
->>>>>>> aed52029c61eaa3a9376202a3d34d546a6f56b28
+import { BarChart2, CalendarDays, Check, FileText, Globe, Link2, Plus, ShieldCheck, Tag, Ticket, Trophy, Upload } from "lucide-react";
 import { useBreakpoint } from "../../hooks/useBreakpoint";
 import { useAppNav } from "../../contexts/AppNavContext";
 import { eventsApi } from "../../../services/api/events";
@@ -1088,19 +1084,19 @@ export function EventHomeModules() {
         />
       ) : null}
 
-<<<<<<< HEAD
-      {showDocumentsPanel && selectedEventId ? (
-        <EventDocumentsPanel
-          eventId={selectedEventId}
-          eventName={eventName ?? undefined}
-          onClose={() => setShowDocumentsPanel(false)}
-=======
       {staticMicrositeOpen && selectedEventId ? (
         <ManageStaticMicrositePanel
           eventId={selectedEventId}
           onClose={() => setStaticMicrositeOpen(false)}
           onSaved={() => void loadStaticMicrositeMeta()}
->>>>>>> aed52029c61eaa3a9376202a3d34d546a6f56b28
+        />
+      ) : null}
+
+      {showDocumentsPanel && selectedEventId ? (
+        <EventDocumentsPanel
+          eventId={selectedEventId}
+          eventName={eventName ?? undefined}
+          onClose={() => setShowDocumentsPanel(false)}
         />
       ) : null}
     </>
diff --git a/src/app/components/panels/FormSubmissionsPanel.tsx b/src/app/components/panels/FormSubmissionsPanel.tsx
index a9d63608..57849d15 100644
--- a/src/app/components/panels/FormSubmissionsPanel.tsx
+++ b/src/app/components/panels/FormSubmissionsPanel.tsx
@@ -29,16 +29,13 @@ function participantEmail(
   return p.email?.trim() || "—";
 }
 
-<<<<<<< HEAD
 function participantName(p: FormSubmissionRecord["participant"]): string {
   if (!p || typeof p === "string") return "there";
-  return [p.firstName, p.lastName].filter(Boolean).join(" ").trim() || "there";
-=======
+  return [p.firstName, p.lastName].filter(Boolean).join(" ").trim() || "there";}
 function eventNameFromForm(form: Form | null): string {
   const ev = form?.event;
   if (ev && typeof ev === "object" && ev.name?.trim()) return ev.name.trim();
   return "Event";
->>>>>>> aed52029c61eaa3a9376202a3d34d546a6f56b28
 }
 
 type Props = {