diff --git a/components/BenefitTasks.tsx b/components/BenefitTasks.tsx
index 321e3d6ca..b2408a47d 100644
--- a/components/BenefitTasks.tsx
+++ b/components/BenefitTasks.tsx
@@ -11,12 +11,10 @@ interface Tasks {
   id: string
 }
 
-interface TaskListProps {
+export interface TaskListProps {
   title: string
-  dataCy: string
   tasks: Tasks[]
 }
-
 interface BenefitTasksProps {
   locale: string
   taskList: TaskListProps
diff --git a/components/Card.tsx b/components/Card.tsx
index 883262e2b..991f434fa 100644
--- a/components/Card.tsx
+++ b/components/Card.tsx
@@ -9,8 +9,6 @@ interface AlertProps {
   type: string
   alertHeading: string
   alertBody: string
-  alert_icon_alt_text: string
-  alert_icon_id: string
 }
 interface CardProps {
   cardTitle: string
@@ -31,8 +29,6 @@ const Card = ({
       type: '',
       alertHeading: '',
       alertBody: '',
-      alert_icon_alt_text: '',
-      alert_icon_id: '',
     },
   ],
   locale,
diff --git a/graphql/mappers/decision-reviews.ts b/graphql/mappers/decision-reviews.ts
index e2bfdeec1..1452cf28c 100644
--- a/graphql/mappers/decision-reviews.ts
+++ b/graphql/mappers/decision-reviews.ts
@@ -35,7 +35,7 @@ interface GetSchDecisionReviewsV1 {
             scDestinationURLEn: string
             scDestinationURLFr: string
             schBetaPopUp: boolean
-            schURLType: string
+            schURLType?: string
           }>
         }>
       }
@@ -95,7 +95,7 @@ export async function getDecisionReviewsContent(): Promise<DecisionReviewContent
             areaLabel: askFragment?.scFragments[0].scLinkTextAssistiveEn,
             link: buildLink(
               askFragment?.scFragments[0].schURLType,
-              askFragment?.scFragments[0].scDestinationURLEn,
+              askFragment?.scFragments[0].scDestinationURLEn ?? '',
             ),
             betaPopUp: askFragment?.scFragments[0].schBetaPopUp,
           },
@@ -108,7 +108,7 @@ export async function getDecisionReviewsContent(): Promise<DecisionReviewContent
             areaLabel: appealFragment?.scFragments[0].scLinkTextAssistiveEn,
             link: buildLink(
               appealFragment?.scFragments[0].schURLType,
-              appealFragment?.scFragments[0].scDestinationURLEn,
+              appealFragment?.scFragments[0].scDestinationURLEn ?? '',
             ),
             betaPopUp: appealFragment?.scFragments[0].schBetaPopUp,
           },
@@ -138,7 +138,7 @@ export async function getDecisionReviewsContent(): Promise<DecisionReviewContent
             areaLabel: askFragment?.scFragments[0].scLinkTextAssistiveFr,
             link: buildLink(
               askFragment?.scFragments[0].schURLType,
-              askFragment?.scFragments[0].scDestinationURLFr,
+              askFragment?.scFragments[0].scDestinationURLFr ?? '',
             ),
             betaPopUp: askFragment?.scFragments[0].schBetaPopUp,
           },
@@ -151,7 +151,7 @@ export async function getDecisionReviewsContent(): Promise<DecisionReviewContent
             areaLabel: appealFragment?.scFragments[0].scLinkTextAssistiveFr,
             link: buildLink(
               appealFragment?.scFragments[0].schURLType,
-              appealFragment?.scFragments[0].scDestinationURLFr,
+              appealFragment?.scFragments[0].scDestinationURLFr ?? '',
             ),
             betaPopUp: appealFragment?.scFragments[0].schBetaPopUp,
           },
diff --git a/graphql/mappers/my-dashboard.ts b/graphql/mappers/my-dashboard.ts
index 0d277598a..5b96536d7 100644
--- a/graphql/mappers/my-dashboard.ts
+++ b/graphql/mappers/my-dashboard.ts
@@ -96,7 +96,7 @@ const getCachedContent = () => {
   })
 }
 
-export async function getMyDashboardContent() {
+export async function getMyDashboardContent(): Promise<MyDashboardContent> {
   const response = await getCachedContent()
   const pageAlertContent = response?.data.schPageV1ByPath.item.schAlerts
 
@@ -209,3 +209,88 @@ export async function getMyDashboardContent() {
   }
   return mappedHome
 }
+
+export interface MyDashboardContent {
+  err?: string
+  en?: {
+    pageName: string | undefined
+    heading: string | undefined
+    pageAlerts:
+      | {
+          id: string | undefined
+          alertHeading: string | undefined
+          alertBody: string | undefined
+          type: string[] | undefined
+        }[]
+      | undefined
+    cards:
+      | {
+          id: string
+          title: string
+          dropdownText: string
+          cardAlerts:
+            | {
+                id: string
+                alertHeading: string
+                alertBody: string | undefined
+                type: string[] | undefined
+              }[]
+            | undefined
+          lists: {
+            title: string
+            tasks: {
+              id: string
+              title: string
+              areaLabel: string
+              link: string
+              icon: string
+              betaPopUp: boolean
+            }[]
+          }[]
+        }[]
+      | undefined
+    exitBeta: { title: null | undefined; link: string | undefined }
+  }
+  fr?: {
+    pageName: string | undefined
+    heading: string | undefined
+    pageAlerts:
+      | {
+          id: string | undefined
+          alertHeading: string | undefined
+          alertBody: string | undefined
+          type: string[] | undefined
+        }[]
+      | undefined
+    cards:
+      | (
+          | {
+              id: string
+              title: string
+              dropdownText: string
+              cardAlerts:
+                | {
+                    id: string
+                    alertHeading: string
+                    alertBody: string | undefined
+                    type: string[] | undefined
+                  }[]
+                | undefined
+              lists: {
+                title: string
+                tasks: {
+                  id: string
+                  title: string
+                  areaLabel: string
+                  link: string
+                  icon: string
+                  betaPopUp: boolean
+                }[]
+              }[]
+            }
+          | undefined
+        )[]
+      | undefined
+    exitBeta: { title: null | undefined; link: string | undefined }
+  }
+}
diff --git a/graphql/mappers/security-settings.ts b/graphql/mappers/security-settings.ts
index 231b9f237..3ffbf464f 100644
--- a/graphql/mappers/security-settings.ts
+++ b/graphql/mappers/security-settings.ts
@@ -154,7 +154,7 @@ export async function getSecuritySettingsContent(): Promise<SecuritySettingsCont
           text: securityQuestions?.scLinkTextEn,
           link: buildLink(
             securityQuestions?.schURLType,
-            securityQuestions?.scDestinationURLEn,
+            securityQuestions?.scDestinationURLEn ?? '',
           ),
         },
         subTitle: securityQuestions?.scDescriptionEn.json[0].content[0].value,
@@ -186,7 +186,7 @@ export async function getSecuritySettingsContent(): Promise<SecuritySettingsCont
           text: securityQuestions?.scLinkTextFr,
           link: buildLink(
             securityQuestions?.schURLType,
-            securityQuestions?.scDestinationURLFr,
+            securityQuestions?.scDestinationURLFr ?? '',
           ),
         },
         subTitle: securityQuestions?.scDescriptionFr.json[0].content[0].value,
diff --git a/lib/links.js b/lib/links.ts
similarity index 88%
rename from lib/links.js
rename to lib/links.ts
index 5519def7e..afa1b8a94 100644
--- a/lib/links.js
+++ b/lib/links.ts
@@ -1,5 +1,5 @@
 //build links is used to prepend links with their corresponding environment. ie MSCA with their test vs prod environment
-export function buildLink(linkType, link) {
+export function buildLink(linkType: string | undefined, link: string) {
   //If no type assume full or relative link
   if (linkType === undefined) {
     return link
diff --git a/lib/loadIcons.js b/lib/loadIcons.ts
similarity index 100%
rename from lib/loadIcons.js
rename to lib/loadIcons.ts
diff --git a/lib/programs.js b/lib/programs.ts
similarity index 82%
rename from lib/programs.js
rename to lib/programs.ts
index 128555a36..52a35c878 100644
--- a/lib/programs.js
+++ b/lib/programs.ts
@@ -1,4 +1,4 @@
-export const programs = (acronym) => {
+export const programs = (acronym: string) => {
   switch (acronym.toLowerCase()) {
     case 'ei':
       return 'Employment Insurance'
diff --git a/locales/en.js b/locales/en.ts
similarity index 100%
rename from locales/en.js
rename to locales/en.ts
diff --git a/locales/fr.js b/locales/fr.ts
similarity index 100%
rename from locales/fr.js
rename to locales/fr.ts
diff --git a/pages/_document.js b/pages/_document.tsx
similarity index 100%
rename from pages/_document.js
rename to pages/_document.tsx
diff --git a/pages/my-dashboard.js b/pages/my-dashboard.tsx
similarity index 71%
rename from pages/my-dashboard.js
rename to pages/my-dashboard.tsx
index 738673dc9..7ebaad4de 100644
--- a/pages/my-dashboard.js
+++ b/pages/my-dashboard.tsx
@@ -5,8 +5,14 @@ import Card from '../components/Card'
 import Heading from '../components/Heading'
 import ContextualAlert from '../components/ContextualAlert'
 import InfoMessage from '../components/InfoMessage'
-import { getMyDashboardContent } from '../graphql/mappers/my-dashboard'
-import { getAuthModalsContent } from '../graphql/mappers/auth-modals'
+import {
+  getMyDashboardContent,
+  MyDashboardContent,
+} from '../graphql/mappers/my-dashboard'
+import {
+  AuthModalsContent,
+  getAuthModalsContent,
+} from '../graphql/mappers/auth-modals'
 import { getLogger } from '../logging/log-util'
 import {
   AuthIsDisabled,
@@ -15,19 +21,61 @@ import {
   Redirect,
   getIdToken,
 } from '../lib/auth'
-import { authOptions } from '../pages/api/auth/[...nextauth]'
+import { authOptions } from './api/auth/[...nextauth]'
 import { getServerSession } from 'next-auth/next'
-import BenefitTasks from './../components/BenefitTasks'
-import MostReqTasks from './../components/MostReqTasks'
+import BenefitTasks, { TaskListProps } from '../components/BenefitTasks'
+import MostReqTasks from '../components/MostReqTasks'
 import { acronym } from '../lib/acronym'
 import ErrorPage from '../components/ErrorPage'
+import { GetServerSidePropsContext } from 'next'
+import { Key } from 'react'
 
-export default function MyDashboard(props) {
+interface MyDashboardProps {
+  locale: string
+  content: {
+    err?: '500' | '404' | '503'
+    heading: string
+    pageAlerts: {
+      id: string
+      alertHeading: string | undefined
+      alertBody: string
+      type: string[]
+    }[]
+    cards: {
+      id: string
+      title: string
+      dropdownText: string
+      cardAlerts: {
+        id: string
+        alertHeading: string
+        alertBody: string
+        type: string
+      }[]
+      lists: {
+        title: string
+        tasks: {
+          id: string
+          title: string
+          areaLabel: string
+          link: string
+          icon: string
+          betaPopUp: boolean
+        }[]
+      }[]
+    }[]
+  }
+  bannerContent?: { err?: '500' | '404' | '503' }
+  popupContent?: { err?: '500' | '404' | '503' }
+  popupContentNA?: { err?: '500' | '404' | '503' }
+  authModals?: { err?: '500' | '404' | '503' }
+  aaPrefix: string
+}
+export default function MyDashboard(props: MyDashboardProps) {
   /* istanbul ignore next */
   const t = props.locale === 'en' ? en : fr
 
   const errorCode =
-    props.content?.err ||
+    props.content.err ||
     props.bannerContent?.err ||
     props.popupContent?.err ||
     props.popupContentNA?.err ||
@@ -35,14 +83,14 @@ export default function MyDashboard(props) {
   if (errorCode !== undefined) {
     return (
       <ErrorPage
-        lang={props.locale !== undefined ? props.locale : 'en'}
+        lang={props.locale}
         errType={errorCode}
         isAuth={false}
         homePageLink={
           props.locale === 'en' ? '/en/my-dashboard' : '/fr/mon-tableau-de-bord'
         }
         accountPageLink={
-          props?.locale === 'en'
+          props.locale === 'en'
             ? 'https://srv136.services.gc.ca/sc/msca-mdsc/portal-portail/pro/home-accueil?Lang=eng'
             : 'https://srv136.services.gc.ca/sc/msca-mdsc/portal-portail/pro/home-accueil?Lang=fra'
         }
@@ -58,7 +106,6 @@ export default function MyDashboard(props) {
       <Heading id="my-dashboard-heading" title={props.content.heading} />
 
       <InfoMessage
-        id="dashboard-info-message"
         label={t.dashboardInfo.label}
         messageText={t.dashboardInfo.messageText}
         messageLinkText={t.dashboardInfo.messageLinkText}
@@ -87,7 +134,7 @@ export default function MyDashboard(props) {
       })}
       {props.content.cards.map((card) => {
         const mostReq = card.lists[0]
-        var tasks = card.lists.slice(1, card.lists.length)
+        const tasks = card.lists.slice(1, card.lists.length)
         return (
           <Card
             key={card.id}
@@ -112,7 +159,7 @@ export default function MyDashboard(props) {
               className="gap-x-[60px] pl-3 pt-8 sm:pl-8 md:columns-2 md:px-15"
               data-cy="task-list"
             >
-              {tasks.map((taskList, index) => {
+              {tasks.map((taskList: TaskListProps, index: Key) => {
                 return (
                   <div key={index} data-cy="Task">
                     <BenefitTasks
@@ -133,7 +180,15 @@ export default function MyDashboard(props) {
   )
 }
 
-export async function getServerSideProps({ req, res, locale }) {
+export async function getServerSideProps({
+  req,
+  res,
+  locale,
+}: {
+  req: GetServerSidePropsContext['req']
+  res: GetServerSidePropsContext['res']
+  locale: string
+}) {
   const session = await getServerSession(req, res, authOptions)
 
   if (!AuthIsDisabled() && !(await AuthIsValid(req, session)))
@@ -173,15 +228,19 @@ export async function getServerSideProps({ req, res, locale }) {
   const logger = getLogger('my-dashboard')
   logger.level = 'error'
 
-  const content = await getMyDashboardContent().catch((error) => {
-    logger.error(error)
-    return { err: '500' }
-  })
+  const content = await getMyDashboardContent().catch(
+    (error): MyDashboardContent => {
+      logger.error(error)
+      return { err: '500' }
+    },
+  )
 
-  const authModals = await getAuthModalsContent().catch((error) => {
-    logger.error(error)
-    return { err: '500' }
-  })
+  const authModals = await getAuthModalsContent().catch(
+    (error): AuthModalsContent => {
+      logger.error(error)
+      return { err: '500' }
+    },
+  )
 
   if (locale === 'und') {
     locale = 'en'
@@ -217,30 +276,30 @@ export async function getServerSideProps({ req, res, locale }) {
       locale,
       langToggleLink,
       content:
-        content?.err !== undefined
+        content.err !== undefined
           ? content
           : locale === 'en'
             ? content.en
             : content.fr,
       meta,
       aaPrefix:
-        content?.err !== undefined
+        content.err !== undefined
           ? ''
-          : `ESDC-EDSC_MSCA-MSDC-SCH:${content.en?.heading || content.en?.title}`,
+          : `ESDC-EDSC_MSCA-MSDC-SCH:${content.en?.heading}`,
       aaMenuPrefix:
-        content?.err !== undefined ? '' : `ESDC-EDSC_MSCA-MSDC-SCH:Nav Menu`,
+        content.err !== undefined ? '' : `ESDC-EDSC_MSCA-MSDC-SCH:Nav Menu`,
       popupStaySignedIn:
-        authModals?.err !== undefined
+        authModals.err !== undefined
           ? authModals
           : locale === 'en'
-            ? authModals.mappedPopupStaySignedIn.en
-            : authModals.mappedPopupStaySignedIn.fr,
+            ? authModals.mappedPopupStaySignedIn?.en
+            : authModals.mappedPopupStaySignedIn?.fr,
       popupYouHaveBeenSignedout:
-        authModals?.err !== undefined
+        authModals.err !== undefined
           ? authModals
           : locale === 'en'
-            ? authModals.mappedPopupSignedOut.en
-            : authModals.mappedPopupSignedOut.fr,
+            ? authModals.mappedPopupSignedOut?.en
+            : authModals.mappedPopupSignedOut?.fr,
     },
   }
 }