Merge branch 'main' of github.com:thesis/acre into update-theme-names

thesis · Dec 13, 2024 · a9072f5 · a9072f5
2 parents 85d0bbd + 385daa6
commit a9072f5
Show file tree

Hide file tree

Showing 23 changed files with 6 additions and 397 deletions.
diff --git a/dapp/src/assets/images/mezo-beehive-modal-illustration.svg b/dapp/src/assets/images/mezo-beehive-modal-illustration.svg
diff --git a/dapp/src/assets/images/season-section-background.png b/dapp/src/assets/images/season-section-background.png
diff --git a/dapp/src/assets/images/season-section-foreground.png b/dapp/src/assets/images/season-section-foreground.png
diff --git a/dapp/src/assets/webps/confetti.webp b/dapp/src/assets/webps/confetti.webp
diff --git a/dapp/src/components/TransactionModal/UnsupportedBitcoinAddressModal.tsx b/dapp/src/components/TransactionModal/UnsupportedBitcoinAddressModal.tsx
diff --git a/dapp/src/components/shared/ButtonLink.tsx b/dapp/src/components/shared/ButtonLink.tsx
diff --git a/dapp/src/components/shared/IconTag.tsx b/dapp/src/components/shared/IconTag.tsx
diff --git a/dapp/src/components/shared/NavLink.tsx b/dapp/src/components/shared/NavLink.tsx
diff --git a/dapp/src/components/shared/SeasonSectionBackground.tsx b/dapp/src/components/shared/SeasonSectionBackground.tsx
diff --git a/dapp/src/constants/index.ts b/dapp/src/constants/index.ts
@@ -6,7 +6,6 @@ export * from "./externalHref"
 export { default as featureFlags } from "./featureFlags"
 export { default as queryKeysFactory } from "./queryKeysFactory"
 export { default as screen } from "./screen"
-export * from "./staking"
 export { default as tbtc } from "./tbtc"
 export * from "./time"
 export { default as wallets } from "./wallets"
diff --git a/dapp/src/constants/staking.ts b/dapp/src/constants/staking.ts
diff --git a/dapp/src/hooks/router/index.ts b/dapp/src/hooks/router/index.ts
@@ -1,2 +1 @@
-export * from "./useIsActiveRoute"
 export { default as useAppNavigate } from "./useAppNavigate"
diff --git a/dapp/src/hooks/router/useIsActiveRoute.ts b/dapp/src/hooks/router/useIsActiveRoute.ts
diff --git a/dapp/src/pages/DashboardPage/PositionDetails.tsx b/dapp/src/pages/DashboardPage/PositionDetails.tsx
@@ -10,14 +10,7 @@ import {
   useActivities,
 } from "#/hooks"
 import { ACTION_FLOW_TYPES } from "#/types"
-import {
-  Button,
-  ButtonProps,
-  Flex,
-  HStack,
-  // Tag,
-  VStack,
-} from "@chakra-ui/react"
+import { Button, ButtonProps, Flex, HStack, VStack } from "@chakra-ui/react"
 import ArrivingSoonTooltip from "#/components/ArrivingSoonTooltip"
 import UserDataSkeleton from "#/components/shared/UserDataSkeleton"
 import { featureFlags } from "#/constants"
@@ -69,22 +62,6 @@ export default function PositionDetails() {
               placement="right"
             />
           )}
-          {/* TODO: Uncomment when position will be implemented */}
-          {/* {positionPercentage && (
-            <Tag
-              px={3}
-              py={1}
-              ml={2}
-              borderWidth={0}
-              color="gold.100"
-              bg="gold.700"
-              fontWeight="bold"
-              lineHeight={5}
-              verticalAlign="baseline"
-            >
-              Top {positionPercentage}%
-            </Tag>
-          )} */}
         </HStack>
         <UserDataSkeleton>
           <VStack alignItems="start" spacing={0}>
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export * from "./useIsActiveRoute"
		export { default as useAppNavigate } from "./useAppNavigate"