Merge branch 'dev'

efdevcon · Oct 31, 2024 · d24303f · d24303f
2 parents 27c2a4e + c50513b
commit d24303f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/devcon-app/src/components/domain/app/dc7/dashboard/index.tsx b/devcon-app/src/components/domain/app/dc7/dashboard/index.tsx
@@ -228,7 +228,7 @@ export const Dashboard = () => {
             </div>
             <Link
               {...draggableLink}
-              to="/login"
+              to={accountContext?.account ? '/account' : '/login'}
               className={cn(featuredClass, 'bg-gradient-to-br from-[#4d56ff] via-[#4799f2] to-[#3467ff]')}
             >
               <p className="text-white font-semibold">Personalization</p>

diff --git a/devcon-app/src/components/domain/app/dc7/sessions/index.tsx b/devcon-app/src/components/domain/app/dc7/sessions/index.tsx
@@ -360,7 +360,7 @@ export const SessionCard = ({ session, className }: { session: SessionType; clas
                   const startTime = start
                   const endTime = end
 
-                  return `${startTime.format('MMM Do')} — ${startTime.format('HH:mm A')} - ${endTime.format('HH:mm A')}`
+                  return `${startTime.format('MMM Do')} — ${startTime.format('h:mm A')} - ${endTime.format('h:mm A')}`
                 })()}
               </p>
             </div>
@@ -1236,8 +1236,8 @@ export const SessionView = ({ session, standalone }: { session: SessionType | nu
           <IconClock className="icon flex shrink-0" style={{ '--color-icon': 'black' }} />
           <span className="text-sm text-[black]">
             {moment.utc(session.slot_start).add(7, 'hours').format('MMM Do')} —{' '}
-            {moment.utc(session.slot_start).add(7, 'hours').format('HH:mm A')} -{' '}
-            {moment.utc(session.slot_end).add(7, 'hours').format('HH:mm A')}
+            {moment.utc(session.slot_start).add(7, 'hours').format('h:mm A')} -{' '}
+            {moment.utc(session.slot_end).add(7, 'hours').format('h:mm A')}
           </span>
         </div>