rkey as direct link + better ux on zupass gating

Author: lassejaco

lib/components/event-schedule-new/atproto-to-calendar-format.tsx

@@ -71,6 +71,7 @@ export const atprotoToCalendarFormat = (event: any) => {
 
   return {
     id: event.id,
+    rkey: event.rkey,
     name: event.title,
     description: event.description,
     location: event.location.name,
@@ -104,6 +105,7 @@ export const apiResultToCalendarFormat = (atprotoEventsData: any) => {
     return atprotoToCalendarFormat({
       ...record,
       id: event.id,
+      rkey: event.rkey,
       isCoreEvent: event.is_core_event,
       // showTimeOfDay: updatedAfterSep3,
     });

lib/components/event-schedule-new/index.tsx

@@ -199,7 +199,9 @@ const NewScheduleIndex = ({
     if (eventParam && events.length > 0) {
       // Try to find event by id or name (converted to slug format)
       const targetEvent = events.find(
-        (event) => event.id.toString() === eventParam.toString()
+        (event) =>
+          event.id.toString() === eventParam.toString() ||
+          event.rkey.toString() === eventParam.toLowerCase()
       );
 
       if (targetEvent) {

lib/components/event-schedule-new/model.ts

@@ -1,5 +1,6 @@
 export interface Event {
   id: string;
+  rkey: string;
   name: string;
   isFairEvent?: boolean;
   isCoreEvent?: boolean;

lib/components/event-schedule-new/zupass/zupass.tsx

@@ -248,10 +248,6 @@ const EventVoucher = ({
   const couponFetchedButNoCoupon =
     connected && couponFetchingComplete && !coupon;
 
-  console.log(coupon, "coupon");
-
-  console.log(connectionState, "connectionState");
-
   const requestCoupon = useCallback(async () => {
     if (connectionState !== ClientConnectionState.CONNECTED) return;
     if (fetchingCoupon) return;
@@ -352,7 +348,7 @@ const EventVoucher = ({
               color={
                 connectionState === ClientConnectionState.CONNECTED
                   ? "green-1"
-                  : "blue-1"
+                  : "green-1"
               }
               onClick={() => {
                 if (connectionState === ClientConnectionState.DISCONNECTED) {
@@ -430,7 +426,7 @@ const EventVoucher = ({
         </div>
       )}
 
-      {connectedWithNoTicket && (
+      {!connectedWithTicket && !couponFetchedButNoCoupon && (
         <>
           <div className="text-sm font-semibold text-gray-600 mt-1">
             You need a Devconnect ticket to attend this event.