From fbe65225f39c335d9c7a5ab557da9471f50a94da Mon Sep 17 00:00:00 2001
From: lassejaco <lasse.jacobsen@ethereum.org>
Date: Thu, 31 Oct 2024 12:26:47 +0100
Subject: [PATCH 1/2] nav order

---
 .../src/components/domain/app/Layout.tsx      | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/devcon-app/src/components/domain/app/Layout.tsx b/devcon-app/src/components/domain/app/Layout.tsx
index 4a7bec119..a7d7acb1a 100644
--- a/devcon-app/src/components/domain/app/Layout.tsx
+++ b/devcon-app/src/components/domain/app/Layout.tsx
@@ -313,6 +313,18 @@ const navItems = (isLoggedIn: boolean, pathname: string) => [
     href: '/',
     size: 17,
   },
+  {
+    label: 'Schedule',
+    icon: pathname === '/schedule' ? ScheduleFillIcon : ScheduleIcon,
+    href: '/schedule',
+    size: 18,
+  },
+  {
+    label: 'Speakers',
+    icon: pathname === '/speakers' ? SpeakerFillIcon : SpeakerIcon,
+    href: '/speakers',
+    size: 18,
+  },
   {
     icon: pathname === '/account' ? UserFillIcon : UserIcon,
     label: isLoggedIn ? 'Account' : 'Log In',
@@ -325,18 +337,6 @@ const navItems = (isLoggedIn: boolean, pathname: string) => [
   //   href: '/venue',
   //   size: 18,
   // },
-  {
-    label: 'Speakers',
-    icon: pathname === '/speakers' ? SpeakerFillIcon : SpeakerIcon,
-    href: '/speakers',
-    size: 18,
-  },
-  {
-    label: 'Schedule',
-    icon: pathname === '/schedule' ? ScheduleFillIcon : ScheduleIcon,
-    href: '/schedule',
-    size: 18,
-  },
 ]
 
 export const useWindowWidth = () => {

From c50513b88a8a6328ea57653503df659ddfe2b91d Mon Sep 17 00:00:00 2001
From: lassejaco <lasse.jacobsen@ethereum.org>
Date: Thu, 31 Oct 2024 14:55:21 +0100
Subject: [PATCH 2/2] time formatting and link bug

---
 .../src/components/domain/app/dc7/dashboard/index.tsx       | 2 +-
 devcon-app/src/components/domain/app/dc7/sessions/index.tsx | 6 +++---
 2 files changed, 4 insertions(+), 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
index 2d27edcbe..6e77ec100 100644
--- 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
index c4f24dae0..c43aade8f 100644
--- 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>