From 4da0f3a6adf2374fb80635260a0805911433c58b Mon Sep 17 00:00:00 2001
From: Nat Budin <nbudin@actbluetech.com>
Date: Mon, 9 Mar 2026 09:16:33 -0700
Subject: [PATCH 1/2] Rename "New and returning attendees" to "Attendance
 history"

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 locales/en.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/locales/en.json b/locales/en.json
index e59edbb81d..9976c0c0dd 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -211,7 +211,7 @@
         "attendanceByPaymentAmount": "Attendance by payment amount",
         "eventProvidedTickets": "Event-provided {{ ticketNamePlural }}",
         "eventsByChoice": "Events by choice",
-        "newAndReturningAttendees": "New and returning attendees",
+        "newAndReturningAttendees": "Attendance history",
         "signupSpy": "Signup spy",
         "eventsByTime": "Events by time",
         "perEventReport": "Per event report",
@@ -227,7 +227,7 @@
         "nameHeader": "Name",
         "newAttendeesLabel": "New attendees",
         "returningAttendeesLabel": "Returning attendees",
-        "title": "New and returning attendees",
+        "title": "Attendance history",
         "totalLabel": "Total"
       }
     },

From d5544043538f53044a58d055fbdeed0089110268 Mon Sep 17 00:00:00 2001
From: Nat Budin <nbudin@actbluetech.com>
Date: Mon, 9 Mar 2026 09:18:16 -0700
Subject: [PATCH 2/2] Fix report menu order to be alphabetical after rename

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 app/javascript/Reports/index.tsx | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/javascript/Reports/index.tsx b/app/javascript/Reports/index.tsx
index 5368489ec4..dd75fede38 100644
--- a/app/javascript/Reports/index.tsx
+++ b/app/javascript/Reports/index.tsx
@@ -27,26 +27,26 @@ function ReportsMenu() {
         <div className="card-body">
           <ul className="mb-0">
             {data.convention.ticket_mode !== 'disabled' && (
-              <>
-                <li>
-                  <Link to="/reports/attendance_by_payment_amount">
-                    {t('admin.reports.menu.attendanceByPaymentAmount')}
-                  </Link>
-                </li>
-                <li>
-                  <Link to="/reports/event_provided_tickets">
-                    {t('admin.reports.menu.eventProvidedTickets', {
-                      ticketNamePlural: data.convention.ticketNamePlural,
-                    })}
-                  </Link>
-                </li>
-              </>
+              <li>
+                <Link to="/reports/attendance_by_payment_amount">
+                  {t('admin.reports.menu.attendanceByPaymentAmount')}
+                </Link>
+              </li>
             )}
             <li>
-              <Link to="/reports/events_by_choice">{t('admin.reports.menu.eventsByChoice')}</Link>
+              <Link to="/reports/new_and_returning_attendees">{t('admin.reports.menu.newAndReturningAttendees')}</Link>
             </li>
+            {data.convention.ticket_mode !== 'disabled' && (
+              <li>
+                <Link to="/reports/event_provided_tickets">
+                  {t('admin.reports.menu.eventProvidedTickets', {
+                    ticketNamePlural: data.convention.ticketNamePlural,
+                  })}
+                </Link>
+              </li>
+            )}
             <li>
-              <Link to="/reports/new_and_returning_attendees">{t('admin.reports.menu.newAndReturningAttendees')}</Link>
+              <Link to="/reports/events_by_choice">{t('admin.reports.menu.eventsByChoice')}</Link>
             </li>
             <li>
               <Link to="/reports/signup_spy">{t('admin.reports.menu.signupSpy')}</Link>