Skip to content

Commit 468f071

Browse files
kien-ngokien-ngo
committed
update
1 parent 9584885 commit 468f071

File tree

11 files changed

+40
-120
lines changed

11 files changed

+40
-120
lines changed

‎apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/account-permissions/components/account-signer.tsx

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import { WalletAddress } from "@/components/blocks/wallet-address";
2+
import { Badge } from "@/components/ui/badge";
23
import { Flex, SimpleGrid, useBreakpointValue } from "@chakra-ui/react";
34
import { formatDistance } from "date-fns/formatDistance";
45
import { useAllChainsData } from "hooks/chains/allChains";
56
import { useActiveAccount } from "thirdweb/react";
6-
import { Badge, Card, Heading, Text } from "tw-components";
7+
import { Card, Heading, Text } from "tw-components";
78

89
export type AccountSignerType = {
910
signer: string;
@@ -45,19 +46,9 @@ export const AccountSigner: React.FC<AccountSignerProps> = ({
4546
<WalletAddress shortenAddress={isMobile} address={signer} />
4647
</Heading>
4748
<div className="flex flex-row gap-2">
48-
{isAdmin ? (
49-
<Badge borderRadius="lg" p={1.5}>
50-
Admin Key
51-
</Badge>
52-
) : (
53-
<Badge borderRadius="lg" p={1.5}>
54-
Scoped key
55-
</Badge>
56-
)}
49+
{isAdmin ? <Badge>Admin Key</Badge> : <Badge>Scoped key</Badge>}
5750
{signer === address && (
58-
<Badge colorScheme="green" borderRadius="lg" p={1.5}>
59-
Currently connected
60-
</Badge>
51+
<Badge variant="success">Currently connected</Badge>
6152
)}
6253
</div>
6354
</Flex>

‎apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/nfts/[tokenId]/token-id.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import type { ThirdwebContract } from "thirdweb";
2626
import { getNFT as getErc721NFT } from "thirdweb/extensions/erc721";
2727
import { getNFT as getErc1155NFT } from "thirdweb/extensions/erc1155";
2828
import { useReadContract } from "thirdweb/react";
29-
import { Badge, Button, Card, CodeBlock, Heading, Text } from "tw-components";
29+
import { Button, Card, CodeBlock, Heading, Text } from "tw-components";
3030
import { NFTMediaWithEmptyState } from "tw-components/nft-media";
3131
import { shortenString } from "utils/usedapp-external";
3232
import { NftProperty } from "../components/nft-property";
@@ -236,11 +236,7 @@ export const TokenIdPage: React.FC<TokenIdPageProps> = ({
236236
<GridItem colSpan={4}>
237237
<Heading size="label.md">Token Standard</Heading>
238238
</GridItem>
239-
<GridItem colSpan={8}>
240-
<Badge size="label.sm" variant="subtle">
241-
{nft.type}
242-
</Badge>
243-
</GridItem>
239+
<GridItem colSpan={8}>{nft.type}</GridItem>
244240
{nft.type !== "ERC721" && (
245241
<>
246242
<GridItem colSpan={4}>

‎apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/sources/ContractSourcesPage.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
"use client";
22

3+
import { Badge } from "@/components/ui/badge";
4+
import { Button } from "@/components/ui/button";
5+
import { Card } from "@/components/ui/card";
36
import { useDashboardRouter } from "@/lib/DashboardRouter";
47
import { useResolveContractAbi } from "@3rdweb-sdk/react/hooks/useResolveContractAbi";
58
import {
@@ -21,7 +24,7 @@ import { CircleCheckIcon, CircleXIcon } from "lucide-react";
2124
import { useMemo, useState } from "react";
2225
import { toast } from "sonner";
2326
import type { ThirdwebContract } from "thirdweb";
24-
import { Badge, Button, Card, Heading } from "tw-components";
27+
import { Heading } from "tw-components";
2528

2629
interface ContractSourcesPageProps {
2730
contract: ThirdwebContract;
@@ -91,9 +94,7 @@ const VerifyContractModal: React.FC<
9194
<ModalHeader>
9295
<Flex gap={2} align="center">
9396
<Heading size="subtitle.md">Contract Verification</Heading>
94-
<Badge variant="outline" colorScheme="purple" rounded="md" px={2}>
95-
beta
96-
</Badge>
97+
<Badge>beta</Badge>
9798
</Flex>
9899
</ModalHeader>
99100
<ModalCloseButton mt={2} />
@@ -213,11 +214,11 @@ export const ContractSourcesPage: React.FC<ContractSourcesPageProps> = ({
213214
chainId={contract.chain.id}
214215
contractAddress={contract.address}
215216
/>
216-
<Button variant="solid" colorScheme="purple" onClick={onOpen}>
217+
<Button variant="primary" onClick={onOpen}>
217218
Verify contract
218219
</Button>
219220
</Flex>
220-
<Card p={0}>
221+
<Card>
221222
<SourcesPanel sources={sources} abi={abiQuery.data} />
222223
</Card>
223224
</Flex>
@@ -264,7 +265,7 @@ function RefreshContractMetadataButton(props: {
264265

265266
return (
266267
<Button
267-
isLoading={contractCacheMutation.isPending}
268+
disabled={contractCacheMutation.isPending}
268269
variant="outline"
269270
onClick={() => {
270271
toast.promise(contractCacheMutation.mutateAsync(), {
@@ -274,8 +275,9 @@ function RefreshContractMetadataButton(props: {
274275
error: (e) => e?.message || "Failed to refresh contract data.",
275276
});
276277
}}
278+
className="w-[182px]"
277279
>
278-
Refresh Contract Data
280+
{contractCacheMutation.isPending ? <Spinner /> : "Refresh Contract Data"}
279281
</Button>
280282
);
281283
}

‎apps/dashboard/src/components/badges/opensea.tsx

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1+
import { Badge } from "@/components/ui/badge";
12
import { ToolTipLabel } from "@/components/ui/tooltip";
2-
import { Badge, type BadgeProps } from "tw-components";
33

4-
export const OpenSeaPropertyBadge: React.FC<BadgeProps> = (props) => {
4+
export const OpenSeaPropertyBadge: React.FC = () => {
55
return (
66
<ToolTipLabel label="This property is supported on OpenSea">
7-
<Badge
8-
{...props}
9-
borderRadius="full"
10-
variant="outline"
11-
colorScheme="opensea"
12-
>
13-
OpenSea
14-
</Badge>
7+
<Badge>OpenSea</Badge>
158
</ToolTipLabel>
169
);
1710
};

‎apps/dashboard/src/components/homepage/sections/PricingCard.tsx

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import { Badge } from "@/components/ui/badge";
12
import { type AccountPlan, accountPlan } from "@3rdweb-sdk/react/hooks/useApi";
23
import { Box, type CardProps, Flex } from "@chakra-ui/react";
34
import {
4-
Badge,
55
Card,
66
Heading,
77
Text,
@@ -60,25 +60,15 @@ export const PricingCard: React.FC<PricingCardProps> = ({
6060
>
6161
<Flex flexDir="column" gap={6}>
6262
<Flex flexDir="column" gap={3}>
63-
<div className="flex flex-row gap-2">
63+
<div className="flex flex-row items-center gap-2">
6464
<Heading
6565
as="h3"
6666
size={size === "lg" ? "title.lg" : "title.sm"}
6767
textTransform="capitalize"
6868
>
6969
{plan.title}
7070
</Heading>
71-
{current && (
72-
<Badge
73-
borderRadius="md"
74-
size="label.sm"
75-
px={3}
76-
py={1.5}
77-
textTransform="capitalize"
78-
>
79-
Current plan
80-
</Badge>
81-
)}
71+
{current && <Badge className="capitalize">Current plan</Badge>}
8272
</div>
8373
<Text maxW={320} h={12}>
8474
{plan.description}

‎apps/dashboard/src/components/onboarding/ApplyForOpCreditsModal.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { Badge } from "@/components/ui/badge";
12
import {
23
type AccountPlan,
34
accountPlan,
@@ -16,7 +17,7 @@ import {
1617
import { useTrack } from "hooks/analytics/useTrack";
1718
import { useLocalStorage } from "hooks/useLocalStorage";
1819
import { useEffect, useMemo, useState } from "react";
19-
import { Badge, Button, Card, Heading, Text } from "tw-components";
20+
import { Button, Card, Heading, Text } from "tw-components";
2021
import { ApplyForOpCreditsForm } from "./ApplyForOpCreditsForm";
2122
import { LazyOnboardingBilling } from "./LazyOnboardingBilling";
2223
import { OnboardingModal } from "./Modal";
@@ -114,13 +115,10 @@ export const ApplyForOpCreditsModal: React.FC = () => {
114115
<Card position="relative">
115116
<Box position="absolute">
116117
<Badge
117-
borderRadius="full"
118-
size="label.sm"
119-
px={3}
120-
bgColor={creditsRecord.color}
121-
color="#fff"
122-
textTransform="capitalize"
123-
fontWeight="bold"
118+
className="rounded-full px-3 font-bold text-white capitalize"
119+
style={{
120+
backgroundColor: creditsRecord.color,
121+
}}
124122
>
125123
{creditsRecord.title}
126124
</Badge>

‎apps/dashboard/src/components/onboarding/PlanCard.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1+
import { Badge } from "@/components/ui/badge";
12
import { Flex, ListItem, UnorderedList } from "@chakra-ui/react";
2-
import { Badge, Card, Heading, LinkButton, Text } from "tw-components";
3+
import { Card, Heading, LinkButton, Text } from "tw-components";
34
import type { CreditsRecord } from "./ApplyForOpCreditsModal";
45

56
interface PlanCardProps {
@@ -12,13 +13,10 @@ export const PlanCard: React.FC<PlanCardProps> = ({ creditsRecord }) => {
1213
<Flex flexDir="column" gap={2}>
1314
<div>
1415
<Badge
15-
borderRadius="full"
16-
size="label.sm"
17-
px={3}
18-
bgColor={creditsRecord.color}
19-
color="#fff"
20-
textTransform="capitalize"
21-
fontWeight="bold"
16+
className="font-bold text-white capitalize"
17+
style={{
18+
backgroundColor: creditsRecord.color,
19+
}}
2220
>
2321
{creditsRecord.title}
2422
</Badge>

‎apps/dashboard/src/components/settings/Account/Billing/Header.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { Badge } from "@/components/ui/badge";
12
import { Flex } from "@chakra-ui/react";
23
import { AlertCircleIcon, CheckCircleIcon, InfoIcon } from "lucide-react";
3-
import { Badge, Text } from "tw-components";
4+
import { Text } from "tw-components";
45

56
interface BillingHeaderProps {
67
validPayment: boolean;
@@ -20,13 +21,7 @@ export const BillingHeader: React.FC<BillingHeaderProps> = ({
2021
Manage your payment methods, billing information and invoices.
2122
</Text>
2223

23-
<Badge
24-
borderRadius="md"
25-
size="label.sm"
26-
px={3}
27-
py={1.5}
28-
textTransform="capitalize"
29-
>
24+
<Badge className="capitalize" variant="outline">
3025
<span className="flex flex-row items-center gap-2">
3126
<Icon
3227
validPayment={validPayment}

‎apps/dashboard/src/components/settings/Account/Billing/PlanCard.tsx

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1+
import { Badge } from "@/components/ui/badge";
12
import { useAccount, useAccountCredits } from "@3rdweb-sdk/react/hooks/useApi";
23
import { Flex } from "@chakra-ui/react";
3-
import { Badge, Card, Heading, Text } from "tw-components";
4+
import { Card, Heading, Text } from "tw-components";
45
import { PLANS } from "utils/pricing";
56
import { CreditsItem } from "./CreditsItem";
67

@@ -19,13 +20,7 @@ export const BillingPlanCard = () => {
1920
<Card as={Flex} flexDir="column" gap={2}>
2021
<div className="flex flex-row items-center gap-2">
2122
<Heading size="title.xs">Your current plan is</Heading>
22-
<Badge
23-
borderRadius="md"
24-
size="label.sm"
25-
textTransform="capitalize"
26-
px={3}
27-
py={1.5}
28-
>
23+
<Badge className="capitalize">
2924
{PLANS[account.plan as keyof typeof PLANS].title}
3025
</Badge>
3126
</div>

‎apps/dashboard/src/tw-components/badge.tsx

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)