From 57ccd2a88fb0dc724329ebc3cfacd74220cddff5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81sd=C3=ADs=20Erna=20Gu=C3=B0mundsd=C3=B3ttir?=
 <disa.erna@gmail.com>
Date: Fri, 20 Dec 2024 14:53:38 +0000
Subject: [PATCH] fix: merge conflict

---
 .../components/Loader.tsx                     | 32 -------------------
 .../tables/SortedVaccinationsTable.tsx        |  2 --
 2 files changed, 34 deletions(-)
 delete mode 100644 libs/portals/my-pages/health/src/screens/OrganDonationRegistration/components/Loader.tsx

diff --git a/libs/portals/my-pages/health/src/screens/OrganDonationRegistration/components/Loader.tsx b/libs/portals/my-pages/health/src/screens/OrganDonationRegistration/components/Loader.tsx
deleted file mode 100644
index 59bf49245f20..000000000000
--- a/libs/portals/my-pages/health/src/screens/OrganDonationRegistration/components/Loader.tsx
+++ /dev/null
@@ -1,32 +0,0 @@
-import { Box, SkeletonLoader, Stack } from '@island.is/island-ui/core'
-import { useIsMobile } from '@island.is/portals/my-pages/core'
-import React from 'react'
-
-interface Props {
-  amount?: number
-}
-export const Loader = ({ amount = 3 }: Props) => {
-  const { isMobile } = useIsMobile()
-  const length = isMobile ? 200 : 500
-  const loaderItem = (
-    <Box
-      display="flex"
-      alignItems="center"
-      paddingY={[4, 3, 4]}
-      paddingX={[2, 3, 4]}
-      border="standard"
-      borderRadius="large"
-    >
-      <div>
-        <SkeletonLoader display="block" width={length} height={24} />
-      </div>
-    </Box>
-  )
-  return (
-    <Stack space={2}>
-      {Array.from({ length: amount }).map((_, i) => (
-        <React.Fragment key={i}>{loaderItem}</React.Fragment>
-      ))}
-    </Stack>
-  )
-}
diff --git a/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx
index b378cd3a27c1..6fdfa806a612 100644
--- a/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx
+++ b/libs/portals/my-pages/health/src/screens/Vaccinations/tables/SortedVaccinationsTable.tsx
@@ -7,10 +7,8 @@ import {
   SortableTable,
   formatDate,
 } from '@island.is/portals/my-pages/core'
-import { HealthTable as VaccinationsDetailTable } from '../../../components/Table/HealthTable'
 import { messages } from '../../../lib/messages'
 import { tagSelector } from '../../../utils/tagSelector'
-import { DetailHeader, DetailRow } from '../../../utils/types'
 
 interface Props {
   data?: Array<HealthDirectorateVaccination>