Merge branch 'main' of github.com:efdevcon/monorepo

Author: lassejaco

devcon-api/src/controllers/account.ts

@@ -11,6 +11,7 @@ import { decryptFile } from '@/utils/encrypt'
 import { parseCSV } from '@/utils/files'
 import { ValidateTicketPod } from '@/utils/zupass'
 import { GenerateRandomUsername, GetEnsAddress, GetEnsAvatar, GetEnsName } from '@/utils/account'
+import { apikeyHandler } from '@/middleware/apikey'
 import dayjs from 'dayjs'
 
 const client = new PrismaClient()
@@ -32,6 +33,7 @@ accountRouter.get(`/account/speakers`, FollowedSpeakers)
 accountRouter.get(`/account/speakers/recommended`, RecommendedSpeakers)
 accountRouter.get(`/account/sessions`, FollowedSessions)
 accountRouter.get(`/account/sessions/recommended`, RecommendedSessions)
+accountRouter.post(`/account/accreditation/email`, apikeyHandler, SendAccreditationEmail)
 
 async function GetAccount(req: Request, res: Response) {
   // #swagger.tags = ['Account']
@@ -725,6 +727,48 @@ async function RecommendedSessions(req: Request, res: Response) {
   return res.status(200).send({ code: 200, message: '', data: sessions })
 }
 
+async function SendAccreditationEmail(req: Request, res: Response) {
+  // #swagger.tags = ['Account']
+  // Private route: requires apiKey
+  // #swagger.ignore = true
+
+  const { email, name, insuranceLink } = req.body
+
+  if (!email || !name || !insuranceLink) {
+    return res.status(400).send({
+      code: 400,
+      message: 'Missing required fields: email, name, insuranceLink'
+    })
+  }
+
+  try {
+    // Import the email service
+    const { sendAccreditationConfirmationEmail } = await import('@/services/email')
+
+    // Send the accreditation confirmation email
+    const success = await sendAccreditationConfirmationEmail(email, name, insuranceLink)
+
+    if (success) {
+      return res.status(200).send({
+        code: 200,
+        message: 'Accreditation confirmation email sent successfully',
+        data: { email, name, insuranceLink }
+      })
+    } else {
+      return res.status(500).send({
+        code: 500,
+        message: 'Failed to send accreditation email'
+      })
+    }
+  } catch (error) {
+    console.error('Error in SendAccreditationEmail:', error)
+    return res.status(500).send({
+      code: 500,
+      message: 'Internal server error'
+    })
+  }
+}
+
 async function parseProfileData(attendeeEmail: string) {
   const normalizedEmail = attendeeEmail.toLowerCase()
 

devcon-api/src/services/email-templates.json

@@ -2,7 +2,7 @@ import nodemailer from 'nodemailer'
 import { SERVER_CONFIG } from '@/utils/config'
 import emailTemplates from './email-templates.json'
 
-type EmailTemplates = 'default-email' | 'email-cta'
+type EmailTemplates = 'default-email' | 'email-cta' | 'accreditation-confirmation'
 
 const transporter = nodemailer.createTransport({
   host: SERVER_CONFIG.SMTP_SERVICE,
@@ -22,6 +22,9 @@ export async function sendMail(to: string, template: EmailTemplates, subject: st
   if (template === 'email-cta') {
     text = replace(emailTemplates.ctaEmail.text.join('\n'), properties)
     html = replace(emailTemplates.ctaEmail.html, properties).replace(/(?:\r\n|\r|\n)/g, '<br>')
+  } else if (template === 'accreditation-confirmation') {
+    text = replace(emailTemplates.accreditationConfirmation.text.join('\n'), properties)
+    html = replace(emailTemplates.accreditationConfirmation.html, properties).replace(/(?:\r\n|\r|\n)/g, '<br>')
   }
 
   const response = await transporter.sendMail({
@@ -35,6 +38,25 @@ export async function sendMail(to: string, template: EmailTemplates, subject: st
   return response.accepted.length > 0
 }
 
+// Example usage for accreditation confirmation
+export async function sendAccreditationConfirmationEmail(
+  to: string,
+  name: string,
+  insuranceLink: string
+) {
+  const properties = {
+    Name: name,
+    InsuranceLink: insuranceLink
+  }
+
+  return sendMail(
+    to,
+    'accreditation-confirmation',
+    '🎉 Your Accreditation Has Been Confirmed!',
+    properties
+  )
+}
+
 function replace(template: string, data: any) {
   const pattern = /{%\s*(\w+?)\s*%}/g // {%property%}
   return template.replace(pattern, (_, token) => data[token] || '')

devcon-api/src/services/email.ts

@@ -33,8 +33,8 @@
     "@pcd/pod": "^0.5.1",
     "@radix-ui/react-dialog": "^1.1.14",
     "@radix-ui/react-slot": "^1.2.3",
-    "@reown/appkit": "^1.7.17",
-    "@reown/appkit-adapter-wagmi": "^1.7.17",
+    "@reown/appkit": "^1.8.1",
+    "@reown/appkit-adapter-wagmi": "^1.8.1",
     "@solana-mobile/wallet-adapter-mobile": "^2.2.2",
     "@solana/wallet-adapter-base": "^0.9.27",
     "@solana/wallet-adapter-react": "^0.15.39",
@@ -65,7 +65,7 @@
     "tailwind-merge": "^3.3.1",
     "usehooks-ts": "^3.1.1",
     "viem": "^2.33.0",
-    "wagmi": "^2.16.0",
+    "wagmi": "^2.16.8",
     "zustand": "^5.0.7"
   },
   "devDependencies": {

devconnect-app/package.json

@@ -1,40 +1,46 @@
 'use client';
 
+import { useEffect, useRef } from 'react';
 import Onboarding from '@/components/Onboarding';
 import ConnectedWallet from '@/components/ConnectedWallet';
 import { useUnifiedConnection } from '@/hooks/useUnifiedConnection';
 
 export default function HomePage() {
-  // Unified connection status
+  // Unified connection status - trust the unified hook completely
   const { isConnected, address, isPara } = useUnifiedConnection();
 
-  console.log('Is Para wallet:', isPara);
-  console.log('Unified connection status:', {
-    isConnected,
-    address,
-    isPara,
-  });
+  // Only log significant connection changes to avoid spam
+  const lastLoggedState = useRef<string | null>(null);
+  useEffect(() => {
+    const stateKey = `${isConnected}-${address}-${isPara}`;
+    if (stateKey !== lastLoggedState.current) {
+      console.log('🔗 [PAGE] Connection state:', {
+        isConnected,
+        hasAddress: !!address,
+        isPara,
+        address: address ? `${address.slice(0, 6)}...${address.slice(-4)}` : undefined
+      });
+      lastLoggedState.current = stateKey;
+    }
+  }, [isConnected, address, isPara]);
 
   return (
     <>
-      {!isConnected ? (
-        <div className="min-h-screen flex items-center justify-center">
+      {!isConnected || !address ? (
+        <div className="min-h-screen flex items-center justify-center p-4">
           <div className="max-w-md w-full">
-            <div className="m-6">
-              <Onboarding />
-            </div>
+            <Onboarding />
           </div>
         </div>
-              ) : (
-          <div className="min-h-screen bg-white w-full absolute top-0 left-0">
-            <div className="w-full flex flex-col items-center py-8 pb-20">
-              <div className="max-w-md w-full">
-                <ConnectedWallet address={address!} isPara={isPara} />
-              </div>
+      ) : (
+        <div className="min-h-screen bg-white">
+          <div className="w-full flex flex-col items-center py-8 pb-20 px-4">
+            <div className="max-w-md w-full">
+              <ConnectedWallet address={address} />
             </div>
           </div>
-        )}
+        </div>
+      )}
     </>
   );
 }
-