From 8d2be8698d7d0ebdcaadc6ff70a1f21b66c44732 Mon Sep 17 00:00:00 2001
From: Kellar <kellar.base09@gmail.com>
Date: Mon, 22 Apr 2024 18:41:39 +0100
Subject: [PATCH] cleanup

---
 src/components/pages/DaoDashboard/Info/DaoInfoHeader.tsx | 7 ++-----
 .../pages/DaoDashboard/Info/InfoGovernance.tsx           | 4 ++--
 src/components/pages/DaoDashboard/Info/ParentLink.tsx    | 5 +----
 src/components/pages/DaoSettings/components/index.tsx    | 8 ++------
 src/components/ui/icons/FavoriteIcon.tsx                 | 9 +++------
 src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx      | 6 +++---
 src/components/ui/menus/OptionMenu/OptionsList.tsx       | 1 -
 src/components/ui/utils/Sort.tsx                         | 3 +--
 8 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/src/components/pages/DaoDashboard/Info/DaoInfoHeader.tsx b/src/components/pages/DaoDashboard/Info/DaoInfoHeader.tsx
index a95f170a71..557be222f4 100644
--- a/src/components/pages/DaoDashboard/Info/DaoInfoHeader.tsx
+++ b/src/components/pages/DaoDashboard/Info/DaoInfoHeader.tsx
@@ -98,13 +98,10 @@ export function DaoInfoHeader() {
                       backgroundPosition="50%"
                     />
                   )}
-                  <Text
-                    textStyle="text-lg-mono-regular"
-                    marginBottom={2}
-                  >
+                  <Text marginBottom={2}>
                     {section.title}
                   </Text>
-                  <Text textStyle="text-base-mono-regular">
+                  <Text>
                     {section.link && section.link.position === 'start' && (
                       <ExternalLink href={section.link.url}>{section.link.text}</ExternalLink>
                     )}
diff --git a/src/components/pages/DaoDashboard/Info/InfoGovernance.tsx b/src/components/pages/DaoDashboard/Info/InfoGovernance.tsx
index 02c9d8894c..50994defa3 100644
--- a/src/components/pages/DaoDashboard/Info/InfoGovernance.tsx
+++ b/src/components/pages/DaoDashboard/Info/InfoGovernance.tsx
@@ -111,7 +111,7 @@ export function InfoGovernance() {
           mb="0.25rem"
         >
           <Text color="neutral-7">{t('titleVotingPeriod')}</Text>
-          <Text textStyle="text-base-sans-regular">
+          <Text>
             {governanceAzorius.votingStrategy?.votingPeriod?.formatted}
           </Text>
         </Flex>
@@ -123,7 +123,7 @@ export function InfoGovernance() {
           mb="0.25rem"
         >
           <Text color="neutral-7">{t('titleQuorum')}</Text>
-          <Text textStyle="text-base-sans-regular">
+          <Text>
             {governanceAzorius.votingStrategy.quorumPercentage.formatted}
           </Text>
         </Flex>
diff --git a/src/components/pages/DaoDashboard/Info/ParentLink.tsx b/src/components/pages/DaoDashboard/Info/ParentLink.tsx
index d496bbdcae..929a9273b0 100644
--- a/src/components/pages/DaoDashboard/Info/ParentLink.tsx
+++ b/src/components/pages/DaoDashboard/Info/ParentLink.tsx
@@ -37,10 +37,7 @@ export function ParentLink() {
           src="/images/arrow-up-left.svg"
           alt={t('parentLink')}
         />
-        <Text
-          textStyle="text-base-mono-bold"
-          flexWrap="wrap"
-        >
+        <Text flexWrap="wrap">
           {t('parentLink')}
         </Text>
       </HStack>
diff --git a/src/components/pages/DaoSettings/components/index.tsx b/src/components/pages/DaoSettings/components/index.tsx
index 27c73bb252..0600645e5d 100644
--- a/src/components/pages/DaoSettings/components/index.tsx
+++ b/src/components/pages/DaoSettings/components/index.tsx
@@ -31,7 +31,7 @@ export function SettingsSection({
         minHeight="6.25rem"
         minWidth="65%"
       >
-        {contentHeader || <Text textStyle="text-lg-mono-bold">{contentTitle}</Text>}
+        {contentHeader || <Text>{contentTitle}</Text>}
         <Divider
           marginTop="1rem"
           color="chocolate.400"
@@ -51,11 +51,7 @@ export function SettingsSection({
           </Text>
         )}
         {descriptionContent || (
-          <Text
-            textStyle="text-sm-sans-regular"
-            color="chocolate.200"
-            mt={2}
-          >
+          <Text mt={2}>
             {descriptionText}
           </Text>
         )}
diff --git a/src/components/ui/icons/FavoriteIcon.tsx b/src/components/ui/icons/FavoriteIcon.tsx
index 14909680e4..ce4f6ac5df 100644
--- a/src/components/ui/icons/FavoriteIcon.tsx
+++ b/src/components/ui/icons/FavoriteIcon.tsx
@@ -1,4 +1,4 @@
-import { Box, BoxProps, IconButton, Tooltip } from '@chakra-ui/react';
+import { Box, BoxProps, Button, IconButton, Tooltip } from '@chakra-ui/react';
 import { Star } from '@phosphor-icons/react';
 import { utils } from 'ethers';
 import { useMemo } from 'react';
@@ -20,13 +20,10 @@ export default function FavoriteIcon({ safeAddress, ...rest }: Props) {
     <Box {...rest}>
       <Tooltip label={t('favoriteTooltip')}>
         <IconButton
-          variant="ghost"
+          variant="tertiary"
           p="0.5rem"
           size="md"
-          color={'lilac-0'}
-          borderRadius="0.25rem"
-          _hover={{ color: 'lilac--1', backgroundColor: 'white-alpha-04' }}
-          _active={{ color: 'lilac--2' }}
+          as={Button}
           icon={<Star weight={isFavorite ? 'fill' : 'regular'} />}
           onClick={() => toggleFavorite(safeAddress)}
           aria-label={t('favoriteTooltip')}
diff --git a/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx b/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx
index 886c879bfb..c00906d3f0 100644
--- a/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx
+++ b/src/components/ui/menus/ManageDAO/ManageDAOMenu.tsx
@@ -1,3 +1,4 @@
+import { Button } from '@chakra-ui/react';
 import { ERC20FreezeVoting, MultisigFreezeVoting } from '@fractal-framework/fractal-contracts';
 import { GearFine } from '@phosphor-icons/react';
 import { useMemo, useCallback, useState, useEffect } from 'react';
@@ -247,13 +248,12 @@ export function ManageDAOMenu({
       titleKey={canUserCreateProposal ? 'titleManageDAO' : 'titleViewDAODetails'}
       options={options}
       namespace="menu"
+      buttonAs={Button}
       buttonProps={{
+        variant: 'tertiary',
         borderRadius: '0.25rem',
         p: '0.5rem',
         color: 'lilac-0',
-        variant: 'ghost',
-        _hover: { color: 'lilac--1', backgroundColor: 'white-alpha-04' },
-        _active: { color: 'lilac--2' },
       }}
     />
   );
diff --git a/src/components/ui/menus/OptionMenu/OptionsList.tsx b/src/components/ui/menus/OptionMenu/OptionsList.tsx
index bb9479554e..2137756bdc 100644
--- a/src/components/ui/menus/OptionMenu/OptionsList.tsx
+++ b/src/components/ui/menus/OptionMenu/OptionsList.tsx
@@ -47,7 +47,6 @@ export function OptionsList({
                   <Checkbox
                     isChecked={option.isSelected}
                     onChange={clickListener}
-                    iconColor="black.900"
                     marginEnd="0.5rem"
                   />
                   {t(option.optionKey)}
diff --git a/src/components/ui/utils/Sort.tsx b/src/components/ui/utils/Sort.tsx
index d045b44920..80f6697439 100644
--- a/src/components/ui/utils/Sort.tsx
+++ b/src/components/ui/utils/Sort.tsx
@@ -17,14 +17,13 @@ function SortMenuItem({
   return (
     <MenuItem
       py="0.5rem"
-      color="grayscale.100"
       sx={{
         '&:hover': { bg: 'neutral-3' },
       }}
       data-testid={testId}
       onClick={onClick}
     >
-      <Text textStyle="text-sm-mono-semibold">{t(labelKey)}</Text>
+      <Text>{t(labelKey)}</Text>
     </MenuItem>
   );
 }