From b556d2b8cac5f07cf05c0bb1f6f5b85dcf37ac4e Mon Sep 17 00:00:00 2001
From: Dmitry Pokidov <124110+dooman87@users.noreply.github.com>
Date: Mon, 16 Dec 2024 22:50:38 +1100
Subject: [PATCH] Pushed twitter to the end and updated contact email

---
 components/global/Footer/socialLinks.tsx | 16 ++++++++--------
 config/conference.ts                     |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/global/Footer/socialLinks.tsx b/components/global/Footer/socialLinks.tsx
index 1834da6a..0d37fdb3 100644
--- a/components/global/Footer/socialLinks.tsx
+++ b/components/global/Footer/socialLinks.tsx
@@ -18,14 +18,6 @@ interface SocialLinksArgs {
 
 export const SocialLinks = ({ socials }: SocialLinksArgs) => (
   <StyledSocialLinks>
-    {socials.Twitter.Name && (
-      <li>
-        <StyledSocialLink href={`https://twitter.com/${socials.Twitter.Name}`} target="_blank" rel="noopener nofollow">
-          <TwitterIcon />
-          <span>Twitter, opens in new window</span>
-        </StyledSocialLink>
-      </li>
-    )}
     {socials.Facebook && (
       <li>
         <StyledSocialLink href={`https://facebook.com/${socials.Facebook}`} target="_blank" rel="noopener nofollow">
@@ -106,5 +98,13 @@ export const SocialLinks = ({ socials }: SocialLinksArgs) => (
         </StyledSocialLink>
       </li>
     )}
+    {socials.Twitter.Name && (
+      <li>
+        <StyledSocialLink href={`https://twitter.com/${socials.Twitter.Name}`} target="_blank" rel="noopener nofollow">
+          <TwitterIcon />
+          <span>Twitter, opens in new window</span>
+        </StyledSocialLink>
+      </li>
+    )}
   </StyledSocialLinks>
 )
diff --git a/config/conference.ts b/config/conference.ts
index 4a4f998c..c825357b 100644
--- a/config/conference.ts
+++ b/config/conference.ts
@@ -105,7 +105,7 @@ const Conference: IConference = {
   PreviouslySubmittedTopics:
     'Agile, building great teams, UI design, UX, software testing, virtual reality, women in tech, web accessibility, open source software, workplace culture, mental health, unconscious bias, building engaged teams, self-employment tips, mentoring, Scrum, pair programming, bots, IoT, machine learning, neural networks, quantum encryption, security, reverse engineering, blockchain, Assembly language, automated deployments, mobile development, mobile test automation, Domain Driven Design, cloud native, architecture, microservices, serverless, service meshes, stream programming and Rx, APIs, GraphQL, actors, JavaScript, SPAs, TypeScript, authentication, React, UWP, Elm, HTML, HTTP protocol, Git, Docker and pointers',
 
-  ContactEmail: 'dddmelbourne@gmail.com',
+  ContactEmail: 'info@dddmelbourne.com',
   SponsorshipEmail: 'sponsorship@dddmelbourne.com',
   MentoringEmail: 'speakers@dddmelbourne.com',
   EmergencyContactName: 'Bron Thulke',