diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signer.tsx b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signer.tsx index fd332e7c50a..2bcd28c4926 100644 --- a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signer.tsx +++ b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signer.tsx @@ -1,9 +1,10 @@ import { WalletAddress } from "@/components/blocks/wallet-address"; +import { Badge } from "@/components/ui/badge"; import { Flex, SimpleGrid, useBreakpointValue } from "@chakra-ui/react"; import { formatDistance } from "date-fns/formatDistance"; import { useAllChainsData } from "hooks/chains/allChains"; import { useActiveAccount } from "thirdweb/react"; -import { Badge, Card, Heading, Text } from "tw-components"; +import { Card, Heading, Text } from "tw-components"; export type AccountSignerType = { signer: string; @@ -45,19 +46,9 @@ export const AccountSigner: React.FC = ({
- {isAdmin ? ( - - Admin Key - - ) : ( - - Scoped key - - )} + {isAdmin ? Admin Key : Scoped key} {signer === address && ( - - Currently connected - + Currently connected )}
diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/token-id.tsx b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/token-id.tsx index 2eb4ad41d63..2e024736687 100644 --- a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/token-id.tsx +++ b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/token-id.tsx @@ -27,7 +27,8 @@ import type { ThirdwebContract } from "thirdweb"; import { getNFT as getErc721NFT } from "thirdweb/extensions/erc721"; import { getNFT as getErc1155NFT } from "thirdweb/extensions/erc1155"; import { useReadContract } from "thirdweb/react"; -import { Badge, Button, Card, Heading, Text } from "tw-components"; +import {} from "tw-components"; +import { Button, Card, Heading, Text } from "tw-components"; import { NFTMediaWithEmptyState } from "tw-components/nft-media"; import { shortenString } from "utils/usedapp-external"; import { NftProperty } from "../components/nft-property"; @@ -237,11 +238,7 @@ export const TokenIdPage: React.FC = ({ Token Standard - - - {nft.type} - - + {nft.type} {nft.type !== "ERC721" && ( <> diff --git a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage.tsx b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage.tsx index 0134c9729b0..e2770c6e44e 100644 --- a/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage.tsx +++ b/apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage.tsx @@ -1,5 +1,8 @@ "use client"; +import { Badge } from "@/components/ui/badge"; +import { Button } from "@/components/ui/button"; +import { Card } from "@/components/ui/card"; import { useDashboardRouter } from "@/lib/DashboardRouter"; import { useResolveContractAbi } from "@3rdweb-sdk/react/hooks/useResolveContractAbi"; import { @@ -21,7 +24,7 @@ import { CircleCheckIcon, CircleXIcon } from "lucide-react"; import { useMemo, useState } from "react"; import { toast } from "sonner"; import type { ThirdwebContract } from "thirdweb"; -import { Badge, Button, Card, Heading } from "tw-components"; +import { Heading } from "tw-components"; interface ContractSourcesPageProps { contract: ThirdwebContract; @@ -91,9 +94,7 @@ const VerifyContractModal: React.FC< Contract Verification - - beta - + beta @@ -213,11 +214,11 @@ export const ContractSourcesPage: React.FC = ({ chainId={contract.chain.id} contractAddress={contract.address} /> - - + @@ -264,7 +265,7 @@ function RefreshContractMetadataButton(props: { return ( ); } diff --git a/apps/dashboard/src/components/badges/opensea.tsx b/apps/dashboard/src/components/badges/opensea.tsx index c2b3a5dafd7..0b30699d8f8 100644 --- a/apps/dashboard/src/components/badges/opensea.tsx +++ b/apps/dashboard/src/components/badges/opensea.tsx @@ -1,17 +1,10 @@ +import { Badge } from "@/components/ui/badge"; import { ToolTipLabel } from "@/components/ui/tooltip"; -import { Badge, type BadgeProps } from "tw-components"; -export const OpenSeaPropertyBadge: React.FC = (props) => { +export const OpenSeaPropertyBadge: React.FC = () => { return ( - - OpenSea - + OpenSea ); }; diff --git a/apps/dashboard/src/components/homepage/sections/PricingCard.tsx b/apps/dashboard/src/components/homepage/sections/PricingCard.tsx index 241c5999fba..f1fe0e2cf75 100644 --- a/apps/dashboard/src/components/homepage/sections/PricingCard.tsx +++ b/apps/dashboard/src/components/homepage/sections/PricingCard.tsx @@ -1,7 +1,7 @@ +import { Badge } from "@/components/ui/badge"; import { type AccountPlan, accountPlan } from "@3rdweb-sdk/react/hooks/useApi"; import { Box, type CardProps, Flex } from "@chakra-ui/react"; import { - Badge, Card, Heading, Text, @@ -60,7 +60,7 @@ export const PricingCard: React.FC = ({ > -
+
= ({ > {plan.title} - {current && ( - - Current plan - - )} + {current && Current plan}
{plan.description} diff --git a/apps/dashboard/src/components/onboarding/ApplyForOpCreditsModal.tsx b/apps/dashboard/src/components/onboarding/ApplyForOpCreditsModal.tsx index 183eb2a777b..05bc9d5d467 100644 --- a/apps/dashboard/src/components/onboarding/ApplyForOpCreditsModal.tsx +++ b/apps/dashboard/src/components/onboarding/ApplyForOpCreditsModal.tsx @@ -1,3 +1,4 @@ +import { Badge } from "@/components/ui/badge"; import { type AccountPlan, accountPlan, @@ -16,7 +17,7 @@ import { import { useTrack } from "hooks/analytics/useTrack"; import { useLocalStorage } from "hooks/useLocalStorage"; import { useEffect, useMemo, useState } from "react"; -import { Badge, Button, Card, Heading, Text } from "tw-components"; +import { Button, Card, Heading, Text } from "tw-components"; import { ApplyForOpCreditsForm } from "./ApplyForOpCreditsForm"; import { LazyOnboardingBilling } from "./LazyOnboardingBilling"; import { OnboardingModal } from "./Modal"; @@ -114,13 +115,10 @@ export const ApplyForOpCreditsModal: React.FC = () => { {creditsRecord.title} diff --git a/apps/dashboard/src/components/onboarding/PlanCard.tsx b/apps/dashboard/src/components/onboarding/PlanCard.tsx index 0bf9b8f688c..cae49dcae91 100644 --- a/apps/dashboard/src/components/onboarding/PlanCard.tsx +++ b/apps/dashboard/src/components/onboarding/PlanCard.tsx @@ -1,5 +1,6 @@ +import { Badge } from "@/components/ui/badge"; import { Flex, ListItem, UnorderedList } from "@chakra-ui/react"; -import { Badge, Card, Heading, LinkButton, Text } from "tw-components"; +import { Card, Heading, LinkButton, Text } from "tw-components"; import type { CreditsRecord } from "./ApplyForOpCreditsModal"; interface PlanCardProps { @@ -12,13 +13,10 @@ export const PlanCard: React.FC = ({ creditsRecord }) => {
{creditsRecord.title} diff --git a/apps/dashboard/src/components/settings/Account/Billing/Header.tsx b/apps/dashboard/src/components/settings/Account/Billing/Header.tsx index 2ee8385390c..a951911c51b 100644 --- a/apps/dashboard/src/components/settings/Account/Billing/Header.tsx +++ b/apps/dashboard/src/components/settings/Account/Billing/Header.tsx @@ -1,6 +1,7 @@ +import { Badge } from "@/components/ui/badge"; import { Flex } from "@chakra-ui/react"; import { AlertCircleIcon, CheckCircleIcon, InfoIcon } from "lucide-react"; -import { Badge, Text } from "tw-components"; +import { Text } from "tw-components"; interface BillingHeaderProps { validPayment: boolean; @@ -20,13 +21,7 @@ export const BillingHeader: React.FC = ({ Manage your payment methods, billing information and invoices. - + {
Your current plan is - + {PLANS[account.plan as keyof typeof PLANS].title}
diff --git a/apps/dashboard/src/tw-components/badge.tsx b/apps/dashboard/src/tw-components/badge.tsx deleted file mode 100644 index 9742e32ce01..00000000000 --- a/apps/dashboard/src/tw-components/badge.tsx +++ /dev/null @@ -1,37 +0,0 @@ -import { - Badge as ChakraBadge, - type BadgeProps as ChakraBadgeProps, - LightMode, - forwardRef, -} from "@chakra-ui/react"; -import type { TextSizes } from "theme/typography"; -import { Text } from "./text"; - -export interface BadgeProps extends ChakraBadgeProps { - size?: TextSizes; -} - -export const Badge = forwardRef( - ({ py = 1, children, size = "label.md", ...props }, ref) => { - if (props.colorScheme && props.variant && props.variant === "outline") { - return ( - - - - {children} - - - - ); - } - return ( - - - {children} - - - ); - }, -); - -Badge.displayName = "Badge"; diff --git a/apps/dashboard/src/tw-components/index.ts b/apps/dashboard/src/tw-components/index.ts index 0a29b0e9d65..152a7b72d53 100644 --- a/apps/dashboard/src/tw-components/index.ts +++ b/apps/dashboard/src/tw-components/index.ts @@ -1,4 +1,3 @@ -export * from "./badge"; export * from "./button"; export * from "./card"; export * from "./checkbox";