Merge branch 'main' into update-env

thesis · Dec 11, 2024 · 661094d · 661094d
2 parents 7958140 + 3f12711
commit 661094d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 52 deletions.
diff --git a/dapp/src/assets/icons/ArrowUpRight.tsx b/dapp/src/assets/icons/ArrowUpRight.tsx
diff --git a/dapp/src/assets/icons/BoltFilled.tsx b/dapp/src/assets/icons/BoltFilled.tsx
diff --git a/dapp/src/assets/icons/index.ts b/dapp/src/assets/icons/index.ts
@@ -1,4 +1,3 @@
-export * from "./ArrowUpRight"
 export * from "./AcreLogo"
 export * from "./Pause"
 export { default as LoadingSpinnerSuccessIcon } from "./LoadingSpinnerSuccessIcon"
@@ -8,4 +7,3 @@ export * from "./MezoSignIcon"
 export * from "./AcreSignIcon"
 export * from "./BitcoinsStackErrorIcon"
 export { default as MatsIcon } from "./MatsIcon"
-export { default as BoltFilled } from "./BoltFilled"
diff --git a/dapp/src/components/Footer.tsx b/dapp/src/components/Footer.tsx
@@ -10,8 +10,9 @@ import {
   Icon,
 } from "@chakra-ui/react"
 import { EXTERNAL_HREF } from "#/constants"
-import { AcreSignIcon, ArrowUpRight } from "#/assets/icons"
+import { AcreSignIcon } from "#/assets/icons"
 import { useMobileMode } from "#/hooks"
+import { IconArrowUpRight } from "@tabler/icons-react"
 
 type FooterListItem = Pick<LinkProps, "href" | "children">
 
@@ -64,7 +65,7 @@ const getItemsList = (
           as={Link}
           __css={styles.link}
           iconSpacing={0}
-          rightIcon={<Icon as={ArrowUpRight} />}
+          rightIcon={<Icon as={IconArrowUpRight} />}
           {...link}
           isExternal
         />

diff --git a/dapp/src/components/Header/ConnectWallet.tsx b/dapp/src/components/Header/ConnectWallet.tsx
@@ -97,7 +97,7 @@ export default function ConnectWallet() {
       id: "Disconnect",
       icon: IconLogout,
       label: "Disconnect",
-      onClick: onDisconnect,
+      onClick: handleDisconnectWallet,
       closeOnSelect: true,
       isSupported: true,
     },
@@ -191,17 +191,6 @@ export default function ConnectWallet() {
                 </Tooltip>
               ),
           )}
-
-          <Tooltip size="xs" label="Disconnect">
-            <IconButton
-              variant="ghost"
-              aria-label="Disconnect"
-              icon={<Icon as={IconLogout} boxSize={5} />}
-              px={2}
-              boxSize={5}
-              onClick={handleDisconnectWallet}
-            />
-          </Tooltip>
         </HStack>
       </Flex>
     </HStack>

diff --git a/dapp/src/components/shared/ButtonLink.tsx b/dapp/src/components/shared/ButtonLink.tsx
@@ -1,16 +1,16 @@
 import React from "react"
 import { Button, ButtonProps, Icon, Link, LinkProps } from "@chakra-ui/react"
-import { ArrowUpRight } from "#/assets/icons"
+import { IconArrowUpRight, TablerIcon } from "@tabler/icons-react"
 
 type ButtonLinkProps = ButtonProps &
   LinkProps & {
-    icon?: typeof Icon
+    icon?: TablerIcon
     iconColor?: string
   }
 
 export default function ButtonLink({
   children,
-  icon = ArrowUpRight,
+  icon = IconArrowUpRight,
   iconColor = "brand.400",
   variant = "outline",
   ...props

diff --git a/dapp/src/components/shared/ProgressBar.tsx b/dapp/src/components/shared/ProgressBar.tsx
@@ -1,6 +1,6 @@
 import React from "react"
 import { Progress, ProgressProps, ProgressLabel, Icon } from "@chakra-ui/react"
-import { BoltFilled } from "#/assets/icons"
+import { IconBolt } from "@tabler/icons-react"
 
 type ProgressBarProps = ProgressProps & {
   withBoltIcon?: boolean
@@ -23,7 +23,8 @@ function ProgressBar(props: ProgressBarProps) {
           transform="auto"
           translateX="-100%"
           translateY="-50%"
-          as={BoltFilled}
+          as={IconBolt}
+          fill="currentcolor"
           mx={-1}
         />
       )}

diff --git a/dapp/src/pages/DashboardPage/AcreTVLMessage.tsx b/dapp/src/pages/DashboardPage/AcreTVLMessage.tsx
@@ -1,7 +1,7 @@
 import React from "react"
 import { Box, HStack, StackProps, VStack } from "@chakra-ui/react"
 import { useAllActivitiesCount, useStatistics, useWallet } from "#/hooks"
-import { BoltFilled } from "#/assets/icons"
+import { IconBolt } from "@tabler/icons-react"
 import { TextMd } from "#/components/shared/Typography"
 import { CurrencyBalance } from "#/components/shared/CurrencyBalance"
 
@@ -20,7 +20,9 @@ export default function AcreTVLMessage(props: AcreTVLMessageProps) {
 
   return (
     <HStack align="start" spacing={1} color="grey.500" {...props}>
-      <BoltFilled color="orange.400" my={1} />
+      <Box color="orange.400" margin="auto">
+        <IconBolt fill="currentColor" size={16} />
+      </Box>
       {tvl.isCapExceeded ? (
         <VStack align="start" spacing={0}>
           <TextMd fontWeight="semibold" color="grey.700">