Merge branch 'main' into feat/bff-my-pages

island-is · Nov 29, 2024 · bc062c0 · bc062c0
2 parents 46b1319 + f1ac9e5
commit bc062c0
Show file tree

Hide file tree

Showing 41 changed files with 81 additions and 65 deletions.
diff --git a/apps/native/app/src/ui/lib/accordion/accordion-item.tsx b/apps/native/app/src/ui/lib/accordion/accordion-item.tsx
@@ -27,7 +27,7 @@ const PlusMinus = styled(Animated.View)`
   height: ${({ theme }) => theme.spacing[3]}px;
   width: ${({ theme }) => theme.spacing[3]}px;
   background-color: ${({ theme }) => theme.color.blue100};
-  border-radius: ${({ theme }) => theme.border.radius.circle};
+  border-radius: ${({ theme }) => theme.border.radius.full};
   justify-content: center;
   align-items: center;
 `

diff --git a/apps/native/app/src/ui/lib/card/expandable-card.tsx b/apps/native/app/src/ui/lib/card/expandable-card.tsx
@@ -47,7 +47,7 @@ const IconWrapper = styled.View`
   background-color: white;
   justify-content: center;
   align-items: center;
-  border-radius: ${({ theme }) => theme.border.radius.circle};
+  border-radius: ${({ theme }) => theme.border.radius.full};
   margin-right: ${({ theme }) => theme.spacing[1]}px;
 `
 

diff --git a/apps/native/app/src/ui/lib/card/notification-card.tsx b/apps/native/app/src/ui/lib/card/notification-card.tsx
@@ -45,7 +45,7 @@ const Icon = styled.View<{ unread?: boolean }>`
   width: 42px;
   align-items: center;
   justify-content: center;
-  border-radius: ${({ theme }) => theme.border.radius.circle};
+  border-radius: ${({ theme }) => theme.border.radius.full};
   flex-direction: column;
 `
 

diff --git a/apps/native/app/src/ui/lib/detail/header.tsx b/apps/native/app/src/ui/lib/detail/header.tsx
@@ -37,7 +37,7 @@ const LogoBackground = styled.View`
   width: 24px;
   justify-content: center;
   align-items: center;
-  border-radius: ${({ theme }) => theme.border.radius.circle};
+  border-radius: ${({ theme }) => theme.border.radius.full};
   margin-right: ${({ theme }) => theme.spacing[1]}px;
 `
 

diff --git a/apps/native/app/src/ui/lib/list/list-item.tsx b/apps/native/app/src/ui/lib/list/list-item.tsx
@@ -30,7 +30,7 @@ const Icon = styled.View<{ unread?: boolean }>`
   width: 42px;
   align-items: center;
   justify-content: center;
-  border-radius: ${({ theme }) => theme.border.radius.circle};
+  border-radius: ${({ theme }) => theme.border.radius.full};
   flex-direction: column;
 `
 

diff --git a/apps/portals/my-pages/src/components/Notifications/NotificationButton.tsx b/apps/portals/my-pages/src/components/Notifications/NotificationButton.tsx
@@ -80,7 +80,7 @@ const NotificationButton = ({
       />
       {data?.userNotificationsOverview?.data.length ? (
         <Box
-          borderRadius="circle"
+          borderRadius="full"
           className={cn({ [styles.badge]: showBadge })}
         />
       ) : undefined}

diff --git a/apps/portals/my-pages/src/components/Notifications/NotificationMenu.tsx b/apps/portals/my-pages/src/components/Notifications/NotificationMenu.tsx
@@ -87,7 +87,7 @@ const NotificationMenu = ({
             marginTop={2}
           >
             <Box
-              borderRadius="circle"
+              borderRadius="full"
               background="blue100"
               display="flex"
               justifyContent="center"

diff --git a/apps/portals/my-pages/src/components/Sidemenu/Sidemenu.tsx b/apps/portals/my-pages/src/components/Sidemenu/Sidemenu.tsx
@@ -83,7 +83,7 @@ const Sidemenu = ({
             marginTop={2}
           >
             <Box
-              borderRadius="circle"
+              borderRadius="full"
               background="blue100"
               display="flex"
               justifyContent="center"

diff --git a/apps/portals/my-pages/src/screens/Dashboard/Dashboard.tsx b/apps/portals/my-pages/src/screens/Dashboard/Dashboard.tsx
@@ -130,7 +130,7 @@ export const Dashboard = () => {
 
                       {navRoot.subscribesTo === 'documents' && (
                         <Box
-                          borderRadius="circle"
+                          borderRadius="full"
                           className={cn(styles.badge[badgeActive])}
                         />
                       )}
@@ -223,7 +223,7 @@ export const Dashboard = () => {
                     </Text>
 
                     <Box
-                      borderRadius="circle"
+                      borderRadius="full"
                       className={cn(styles.badge[badgeActive])}
                     />
                   </Box>

diff --git a/apps/skilavottord/web/components/FormStepper/FormStepperMobile.tsx b/apps/skilavottord/web/components/FormStepper/FormStepperMobile.tsx
@@ -48,7 +48,7 @@ export const FormStepperMobile = ({
               className={styles.inProgressIcon}
               display="flex"
               background="purple200"
-              borderRadius="circle"
+              borderRadius="full"
               marginRight={1}
             ></Box>
           )}
@@ -68,7 +68,7 @@ const IconBackground = ({ children }: IconBackgroundProps) => (
     className={styles.activeIcon}
     display="flex"
     background="purple400"
-    borderRadius="circle"
+    borderRadius="full"
     justifyContent="center"
     alignItems="center"
     marginRight={1}

diff --git a/apps/web/components/Charts/v2/renderers/ChartNumberBox/ChartNumberBox.tsx b/apps/web/components/Charts/v2/renderers/ChartNumberBox/ChartNumberBox.tsx
@@ -87,7 +87,7 @@ export const ChartNumberBox = ({ slice }: ChartNumberBoxRendererProps) => {
   }, [slice, numberOfDataPoints, activeLocale])
 
   if (queryResult.loading) {
-    return <SkeletonLoader width="100%" height={130} borderRadius="xl" />
+    return <SkeletonLoader width="100%" height={130} borderRadius="lg" />
   }
 
   if (!queryResult.data || queryResult.data.length === 0) {

diff --git a/apps/web/components/Charts/v2/renderers/ChartRenderer.tsx b/apps/web/components/Charts/v2/renderers/ChartRenderer.tsx
@@ -154,7 +154,7 @@ export const Chart = ({ slice }: ChartProps) => {
           slice.displayAsCard,
           expanded,
         )}
-        borderRadius="xl"
+        borderRadius="lg"
       />
     )
   }

diff --git a/apps/web/components/DefaultHeader/DefaultHeader.tsx b/apps/web/components/DefaultHeader/DefaultHeader.tsx
@@ -87,7 +87,7 @@ export const DefaultHeader: React.FC<
                   className={cn(styles.logoContainer, {
                     [styles.logoContainerSubpage]: isSubpage,
                   })}
-                  borderRadius="circle"
+                  borderRadius="full"
                   background="white"
                 >
                   <img
@@ -144,7 +144,7 @@ export const DefaultHeader: React.FC<
                       className={cn(styles.logoContainerMobile, {
                         [styles.logoContainerMobileSubpage]: isSubpage,
                       })}
-                      borderRadius="circle"
+                      borderRadius="full"
                       background="white"
                     >
                       <img

diff --git a/...on/Wrapper/Themes/RettindagaeslaFatladsFolksTheme/RettindagaeslaFatladsFolksHeader.css.ts b/...on/Wrapper/Themes/RettindagaeslaFatladsFolksTheme/RettindagaeslaFatladsFolksHeader.css.ts
@@ -88,7 +88,7 @@ export const logoContainer = style({
   placeItems: 'center',
   margin: '0 auto',
   marginBottom: 4,
-  borderRadius: theme.border.radius.circle,
+  borderRadius: theme.border.radius.full,
   background: theme.color.white,
 
   ...themeUtils.responsiveStyle({

diff --git a/apps/web/screens/Adgerdir/components/UI/Breadcrumbs/Breadcrumbs.tsx b/apps/web/screens/Adgerdir/components/UI/Breadcrumbs/Breadcrumbs.tsx
@@ -68,7 +68,7 @@ export const Breadcrumbs: FC<React.PropsWithChildren<BreadcrumbsProps>> = ({
               : renderCrumb}
             {items.length - 1 > index && (
               <Box
-                borderRadius={'circle'}
+                borderRadius="full"
                 display={'inlineBlock'}
                 marginY={0}
                 marginX={1}

diff --git a/apps/web/screens/Grants/SearchResults/SearchResultsContent.tsx b/apps/web/screens/Grants/SearchResults/SearchResultsContent.tsx
@@ -114,7 +114,7 @@ export const SearchResultsContent = ({ grants, subheader, locale }: Props) => {
           justifyContent="center"
           background="white"
           borderWidth="standard"
-          borderRadius="xl"
+          borderRadius="lg"
           borderColor="blue200"
           flexDirection={['columnReverse', 'columnReverse', 'row']}
           columnGap={[2, 4, 8, 8, 20]}

diff --git a/libs/application/templates/general-fishing-license/src/fields/Declined/WarningSection.tsx b/libs/application/templates/general-fishing-license/src/fields/Declined/WarningSection.tsx
@@ -34,7 +34,7 @@ export const WarningSection: FC<
         alignItems="center"
         justifyContent="center"
         position="absolute"
-        borderRadius="circle"
+        borderRadius="full"
         background="red600"
         color="red600"
         className={styles.sectionNumber}

diff --git a/libs/application/templates/health-insurance/src/fields/PrerequisiteSummary/SummaryItem.tsx b/libs/application/templates/health-insurance/src/fields/PrerequisiteSummary/SummaryItem.tsx
@@ -53,7 +53,7 @@ export const SummaryItem = ({
           alignItems="center"
           justifyContent="center"
           position="absolute"
-          borderRadius="circle"
+          borderRadius="full"
           className={styles.sectionNumber}
         >
           {prerequisiteMet ? (

diff --git a/libs/application/templates/inheritance-report/src/forms/sections/applicant.ts b/libs/application/templates/inheritance-report/src/forms/sections/applicant.ts
@@ -10,6 +10,7 @@ import { format as formatNationalId } from 'kennitala'
 import { removeCountryCode } from '@island.is/application/ui-components'
 import { m } from '../../lib/messages'
 import { RelationEnum } from '../../types'
+import { PREPAID_INHERITANCE } from '../../lib/constants'
 
 export const applicant = buildSection({
   id: 'applicantsInformation',
@@ -18,7 +19,10 @@ export const applicant = buildSection({
     buildMultiField({
       id: 'applicant',
       title: m.applicantsInfo,
-      description: m.applicantsInfoSubtitle,
+      description: ({ answers }) =>
+        answers.applicationFor === PREPAID_INHERITANCE
+          ? m.applicantsInfoPrePaidSubtitle
+          : m.applicantsInfoSubtitle,
       children: [
         buildTextField({
           id: 'applicant.nationalId',

diff --git a/libs/application/templates/inheritance-report/src/forms/sections/heirs.ts b/libs/application/templates/inheritance-report/src/forms/sections/heirs.ts
@@ -22,6 +22,7 @@ import {
   shouldShowCustomSpouseShare,
   valueToNumber,
 } from '../../lib/utils/helpers'
+import { PREPAID_INHERITANCE } from '../../lib/constants'
 
 export const heirs = buildSection({
   id: 'heirs',
@@ -81,7 +82,10 @@ export const heirs = buildSection({
         buildMultiField({
           id: 'heirs',
           title: m.heirsAndPartition,
-          description: m.heirsAndPartitionDescription,
+          description: ({ answers }) =>
+            answers.applicationFor === PREPAID_INHERITANCE
+              ? m.heirsAndPartitionPrePaidDescription
+              : m.heirsAndPartitionDescription,
           children: [
             buildDescriptionField({
               id: 'heirs.total',

diff --git a/libs/application/templates/inheritance-report/src/lib/messages.ts b/libs/application/templates/inheritance-report/src/lib/messages.ts
@@ -232,6 +232,12 @@ export const m = defineMessages({
       'Vinsamlegast farðu yfir upplýsingarnar og athugaðu hvort þær séu réttar.',
     description: '',
   },
+  applicantsInfoPrePaidSubtitle: {
+    id: 'ir.application:applicantsInfoPrePaidSubtitle',
+    defaultMessage:
+      'Vinsamlegast farðu yfir upplýsingarnar og staðfestu hvort þær séu réttar.',
+    description: '',
+  },
   applicantsPrePaidInfoSubtitle: {
     id: 'ir.application:applicantsPrePaidInfoSubtitle',
     defaultMessage:
@@ -345,6 +351,11 @@ export const m = defineMessages({
       'Vinsamlegast tilgreindu allar hjúskapareignir beggja hjóna utan einstaklingsatvinnurekstrar á dánardegi hins látna. Einnig séreign hins látna. Ef hinn látni átti ekki fasteign vinsamlegast haltu áfram í ferlinu.',
     description: '',
   },
+  propertiesDescriptionPrePaidAssets: {
+    id: 'ir.application:propertiesDescriptionPrePaidAssets#markdown',
+    defaultMessage: 'Lorem ipsum lorem ipsum',
+    description: '',
+  },
   propertiesDescriptionInventory: {
     id: 'ir.application:propertiesDescriptionInventory#markdown',
     defaultMessage:
@@ -395,11 +406,6 @@ export const m = defineMessages({
   },
 
   // Estate Properties - Prepaid
-  propertiesDescriptionPrePaidAssets: {
-    id: 'ir.application:propertiesDescriptionPrePaidAssets#markdown',
-    defaultMessage: 'Lorem ipsum lorem ipsum',
-    description: '',
-  },
   propertiesDescriptionPrePaidStocks: {
     id: 'ir.application:propertiesDescriptionPrePaidStocks#markdown',
     defaultMessage: 'Lorem ipsum lorem ipsum',
@@ -1376,6 +1382,12 @@ export const m = defineMessages({
       'Skrá skal netfang erfingja vegna tilkynninga skattstjóra skv. 9. og 10. gr. laga nr. 14/2004.',
     description: '',
   },
+  heirsAndPartitionPrePaidDescription: {
+    id: 'ir.application:heirsAndPartitionPrePaidDescription',
+    defaultMessage:
+      'Skrá skal netfang erfingja vegna tilkynninga skattstjóra skv. 9. og 10. gr. laga nr. 14/2004.',
+    description: '',
+  },
   heirsReminderToFillInSpouse: {
     id: 'ir.application:heirsReminderToFillInSpouse',
     defaultMessage: 'Athugið að passa þarf að skrá inn upplýsingar um maka.',

diff --git a/libs/island-ui/core/src/lib/ActionCard/ActionCard.tsx b/libs/island-ui/core/src/lib/ActionCard/ActionCard.tsx
@@ -102,7 +102,7 @@ export const ActionCard: React.FC<React.PropsWithChildren<ActionCardProps>> = ({
         alignItems="center"
         flexShrink={0}
         marginRight={[2, 3]}
-        borderRadius="circle"
+        borderRadius="full"
         background={avatarColors.circle}
         className={styles.avatar}
       >

diff --git a/libs/island-ui/core/src/lib/Breadcrumbs/Breadcrumbs.tsx b/libs/island-ui/core/src/lib/Breadcrumbs/Breadcrumbs.tsx
@@ -83,7 +83,7 @@ export const Breadcrumbs: FC<React.PropsWithChildren<BreadcrumbsProps>> = ({
               : renderCrumb}
             {visibleItems.length - 1 > index && (
               <Box
-                borderRadius={'circle'}
+                borderRadius="full"
                 display={'inlineBlock'}
                 marginY={0}
                 marginX={1}

diff --git a/libs/island-ui/core/src/lib/ButtonDeprecated/Button.tsx b/libs/island-ui/core/src/lib/ButtonDeprecated/Button.tsx
@@ -318,7 +318,7 @@ const LeftContentContainer: FC<React.PropsWithChildren<unknown>> = ({
           display="flex"
           alignItems="center"
           justifyContent="center"
-          borderRadius="circle"
+          borderRadius="full"
           overflow="hidden"
           className={styles.leftContent}
         >

diff --git a/libs/island-ui/core/src/lib/Input/Input.tsx b/libs/island-ui/core/src/lib/Input/Input.tsx
@@ -280,7 +280,7 @@ function AsideIcons({
   return (
     <div className={styles.aside}>
       {loading ? (
-        <Box className={styles.spinner} flexShrink={0} borderRadius="circle" />
+        <Box className={styles.spinner} flexShrink={0} borderRadius="full" />
       ) : displayedIcon ? (
         <div
           className={styles.iconWrapper({ size })}

diff --git a/libs/island-ui/core/src/lib/PhoneInput/PhoneInput.tsx b/libs/island-ui/core/src/lib/PhoneInput/PhoneInput.tsx
@@ -386,7 +386,7 @@ export const PhoneInput = forwardRef(
               <Box
                 className={styles.spinner}
                 flexShrink={0}
-                borderRadius="circle"
+                borderRadius="full"
               />
             )}
             {!loading && hasError && (

diff --git a/libs/island-ui/core/src/lib/ProblemTemplate/ProblemTemplate.css.ts b/libs/island-ui/core/src/lib/ProblemTemplate/ProblemTemplate.css.ts
@@ -5,7 +5,7 @@ import { recipe } from '@vanilla-extract/recipes'
 export const problemTemplateContainer = recipe({
   base: {
     borderWidth: theme.border.width.standard,
-    borderRadius: theme.border.radius.xl,
+    borderRadius: theme.border.radius.lg,
   },
   variants: {
     red: {

diff --git a/libs/island-ui/core/src/lib/UserAvatar/UserAvatar.tsx b/libs/island-ui/core/src/lib/UserAvatar/UserAvatar.tsx
@@ -46,7 +46,7 @@ export const UserAvatar = ({
     alignItems="center"
     flexShrink={0}
     flexGrow={0}
-    borderRadius="circle"
+    borderRadius="full"
     className={[
       styles.avatarSize[size],
       styles.avatarColor[isDelegation ? 'isDelegation' : color],

diff --git a/libs/island-ui/theme/src/lib/theme.ts b/libs/island-ui/theme/src/lib/theme.ts
@@ -101,8 +101,6 @@ export const theme = {
       large: `${radius.default.$value ?? 8}px`, // TODO: check with designers to keep as large
       md: `${radius.md.$value ?? 12}px`,
       lg: `${radius.lg.$value ?? 16}px`,
-      xl: '24px', // TODO: should be added to figma?
-      circle: '50%', // TODO: should be added to figma?
       full: `${radius.full.$value ?? 9999}px`,
     },
     width: {

diff --git a/libs/portals/my-pages/core/src/components/ActionCard/ActionCard.tsx b/libs/portals/my-pages/core/src/components/ActionCard/ActionCard.tsx
@@ -120,7 +120,7 @@ export const ActionCard: React.FC<React.PropsWithChildren<ActionCardProps>> = ({
           alignItems="center"
           flexShrink={0}
           marginRight={[2, 3]}
-          borderRadius="circle"
+          borderRadius="full"
           background="blue100"
           className={cn(styles.avatar, styles.image)}
         >
@@ -144,7 +144,7 @@ export const ActionCard: React.FC<React.PropsWithChildren<ActionCardProps>> = ({
           alignItems="center"
           flexShrink={0}
           marginRight={[2, 3]}
-          borderRadius="circle"
+          borderRadius="full"
         >
           <img className={styles.image} src={image.url} alt="" />
         </Box>
@@ -158,7 +158,7 @@ export const ActionCard: React.FC<React.PropsWithChildren<ActionCardProps>> = ({
           alignItems="center"
           flexShrink={0}
           marginRight={[2, 3]}
-          borderRadius="circle"
+          borderRadius="full"
           background={image.active ? 'white' : 'blue100'}
           className={cn(styles.avatar, styles.image)}
         >