Skip to content

Commit a40de04

Browse files
GWSzetoGWSzeto
authored
Merge branch 'main' into modules-ui-changes
2 parents cf98aa5 + a00233d commit a40de04

File tree

16 files changed

+2915
-2741
lines changed

16 files changed

+2915
-2741
lines changed

‎apps/dashboard/package.json‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
"@radix-ui/react-separator": "^1.1.0",
4646
"@radix-ui/react-slot": "^1.1.0",
4747
"@radix-ui/react-switch": "^1.1.1",
48-
"@radix-ui/react-tooltip": "1.1.3",
49-
"@sentry/nextjs": "8.37.1",
48+
"@radix-ui/react-tooltip": "1.1.4",
49+
"@sentry/nextjs": "8.38.0",
5050
"@shazow/whatsabi": "^0.16.0",
5151
"@stripe/react-stripe-js": "^2.8.1",
5252
"@stripe/stripe-js": "^3.5.0",
53-
"@tanstack/react-query": "5.59.20",
53+
"@tanstack/react-query": "5.60.2",
5454
"@tanstack/react-table": "^8.17.3",
5555
"@thirdweb-dev/service-utils": "workspace:*",
5656
"@vercel/functions": "^1.4.2",
@@ -63,15 +63,15 @@
6363
"compare-versions": "^6.1.0",
6464
"date-fns": "4.1.0",
6565
"flat": "^6.0.1",
66-
"framer-motion": "11.11.11",
66+
"framer-motion": "11.11.17",
6767
"fuse.js": "7.0.0",
6868
"input-otp": "^1.4.1",
6969
"ioredis": "^5.4.1",
7070
"ipaddr.js": "^2.2.0",
7171
"lottie-react": "^2.4.0",
72-
"lucide-react": "0.454.0",
72+
"lucide-react": "0.456.0",
7373
"next": "15.0.3",
74-
"next-plausible": "^3.12.3",
74+
"next-plausible": "^3.12.4",
7575
"next-seo": "^6.5.0",
7676
"next-themes": "^0.4.3",
7777
"nextjs-toploader": "^1.6.12",
@@ -109,15 +109,15 @@
109109
"@next/bundle-analyzer": "15.0.3",
110110
"@next/eslint-plugin-next": "15.0.3",
111111
"@playwright/test": "1.48.2",
112-
"@storybook/addon-essentials": "8.4.2",
113-
"@storybook/addon-interactions": "8.4.2",
114-
"@storybook/addon-links": "8.4.2",
115-
"@storybook/addon-onboarding": "8.4.2",
116-
"@storybook/addon-viewport": "8.4.2",
117-
"@storybook/blocks": "8.4.2",
118-
"@storybook/nextjs": "8.4.2",
119-
"@storybook/react": "8.4.2",
120-
"@storybook/test": "8.4.2",
112+
"@storybook/addon-essentials": "8.4.4",
113+
"@storybook/addon-interactions": "8.4.4",
114+
"@storybook/addon-links": "8.4.4",
115+
"@storybook/addon-onboarding": "8.4.4",
116+
"@storybook/addon-viewport": "8.4.4",
117+
"@storybook/blocks": "8.4.4",
118+
"@storybook/nextjs": "8.4.4",
119+
"@storybook/react": "8.4.4",
120+
"@storybook/test": "8.4.4",
121121
"@types/color": "4.2.0",
122122
"@types/node": "20.14.9",
123123
"@types/papaparse": "^5.3.15",
@@ -134,13 +134,13 @@
134134
"checkly": "^4.8.1",
135135
"eslint": "8.57.0",
136136
"eslint-config-biome": "1.9.3",
137-
"eslint-plugin-react-compiler": "19.0.0-beta-8a03594-20241020",
137+
"eslint-plugin-react-compiler": "19.0.0-beta-a7bf2bd-20241110",
138138
"eslint-plugin-storybook": "^0.9.0",
139-
"knip": "5.36.3",
139+
"knip": "5.37.0",
140140
"next-sitemap": "^4.2.3",
141-
"postcss": "8.4.47",
142-
"storybook": "8.4.2",
143-
"tailwindcss": "3.4.14",
141+
"postcss": "8.4.49",
142+
"storybook": "8.4.4",
143+
"tailwindcss": "3.4.15",
144144
"typescript": "5.6.3"
145145
}
146146
}

‎apps/dashboard/src/@3rdweb-sdk/react/hooks/useApi.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const accountPlan = {
2929
enterprise: "enterprise",
3030
} as const;
3131

32-
export type AccountStatus = (typeof accountStatus)[keyof typeof accountStatus];
32+
type AccountStatus = (typeof accountStatus)[keyof typeof accountStatus];
3333
export type AccountPlan = (typeof accountPlan)[keyof typeof accountPlan];
3434

3535
export type AuthorizedWallet = {

‎apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/modules/components/module-card.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import type { Account } from "thirdweb/wallets";
3232
import { ModuleInstance } from "./module-instance";
3333
import { useModuleContractInfo } from "./moduleContractInfo";
3434

35-
export type ModuleCardProps = {
35+
type ModuleCardProps = {
3636
moduleAddress: string;
3737
contract: ContractOptions;
3838
onRemoveModule: () => void;

‎apps/dashboard/src/instrumentation.ts‎

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

‎apps/playground-web/package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,17 @@
2020
"@radix-ui/react-label": "^2.1.0",
2121
"@radix-ui/react-popover": "^1.1.2",
2222
"@radix-ui/react-radio-group": "^1.2.1",
23-
"@radix-ui/react-scroll-area": "^1.2.0",
23+
"@radix-ui/react-scroll-area": "^1.2.1",
2424
"@radix-ui/react-select": "^2.1.2",
2525
"@radix-ui/react-separator": "^1.1.0",
2626
"@radix-ui/react-slot": "^1.1.0",
2727
"@radix-ui/react-switch": "^1.1.1",
2828
"@radix-ui/react-tabs": "^1.1.1",
29-
"@radix-ui/react-tooltip": "1.1.3",
30-
"@tanstack/react-query": "5.59.20",
29+
"@radix-ui/react-tooltip": "1.1.4",
30+
"@tanstack/react-query": "5.60.2",
3131
"class-variance-authority": "^0.7.0",
3232
"clsx": "^2.1.1",
33-
"lucide-react": "0.454.0",
33+
"lucide-react": "0.456.0",
3434
"next": "15.0.3",
3535
"next-themes": "^0.4.3",
3636
"prettier": "^3.3.2",
@@ -49,9 +49,9 @@
4949
"@types/react-dom": "npm:[email protected]",
5050
"eslint": "8.57.0",
5151
"eslint-config-next": "15.0.3",
52-
"eslint-plugin-react-compiler": "19.0.0-beta-8a03594-20241020",
53-
"postcss": "8.4.47",
54-
"tailwindcss": "3.4.14",
52+
"eslint-plugin-react-compiler": "19.0.0-beta-a7bf2bd-20241110",
53+
"postcss": "8.4.49",
54+
"tailwindcss": "3.4.15",
5555
"tailwindcss-animate": "^1.0.7",
5656
"typescript": "5.6.3"
5757
}

‎apps/portal/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@
2424
"@radix-ui/react-dropdown-menu": "^2.1.2",
2525
"@radix-ui/react-slot": "^1.1.0",
2626
"@radix-ui/react-tabs": "^1.1.1",
27-
"@tanstack/react-query": "5.59.20",
27+
"@tanstack/react-query": "5.60.2",
2828
"@tryghost/content-api": "^1.11.21",
2929
"class-variance-authority": "^0.7.0",
3030
"clsx": "^2.1.1",
3131
"date-fns": "4.1.0",
3232
"escape-string-regexp": "^5.0.0",
3333
"flexsearch": "^0.7.43",
3434
"github-slugger": "^2.0.0",
35-
"lucide-react": "0.454.0",
35+
"lucide-react": "0.456.0",
3636
"next": "15.0.3",
3737
"nextjs-toploader": "^1.6.12",
3838
"node-html-parser": "^6.1.13",
@@ -69,8 +69,8 @@
6969
"eslint-plugin-svg-jsx": "^1.2.4",
7070
"eslint-plugin-tailwindcss": "^3.17.5",
7171
"next-sitemap": "^4.2.3",
72-
"postcss": "8.4.47",
73-
"tailwindcss": "3.4.14",
72+
"postcss": "8.4.49",
73+
"tailwindcss": "3.4.15",
7474
"tsx": "4.19.2",
7575
"typescript": "5.6.3"
7676
}

‎apps/portal/src/app/connect/pay/faqs/page.mdx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ All other tokens will require an additional Buy With Crypto step.
8383

8484
### How does KYC work with Buy With Fiat
8585

86-
Pay currently requires KYC for first-time purchases. Subsequent purchases will not require KYC.
86+
Users will be required to complete KYC verification for their first purchase using 'Buy with Fiat.' After that, no further KYC will be needed for future purchases on the same platform.
8787

8888
### What cryptocurrencies does Pay support?
8989

‎apps/portal/src/components/Document/ContractDeployCard.tsx‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
import Link from "next/link";
2+
import { Paragraph } from "./Paragraph";
3+
4+
/**
5+
* Usage:
6+
* ```tsx
7+
* <ContractDeployCard contractName={"ERC20Modular"} href="deploy-link" />
8+
* ```
9+
*/
10+
export function ContractDeployCard(props: {
11+
contractName: string;
12+
description?: string;
13+
href: string;
14+
}) {
15+
return (
16+
<div className="my-4 rounded-lg border bg-b-800 p-4">
17+
<div className="mb-2 font-semibold text-lg ">
18+
Deploy {props.contractName}
19+
</div>
20+
<Paragraph className="mb-5 text-base text-f-300">
21+
{props.description ||
22+
`The ${props.contractName} is available to deploy on Explore. Deploy it now through dashboard.`}
23+
</Paragraph>
24+
<div className="flex">
25+
<Link
26+
href={props.href}
27+
target="_blank"
28+
className="inline-flex items-center rounded-lg border bg-[#DB2877] text-sm duration-200 hover:border-f-300"
29+
>
30+
<div className="border-l-2 p-2.5 font-semibold">Deploy Now</div>
31+
</Link>
32+
</div>
33+
</div>
34+
);
35+
}

‎apps/wallet-ui/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
"@radix-ui/react-popover": "^1.1.2",
1818
"@radix-ui/react-slot": "^1.1.0",
1919
"@radix-ui/react-toast": "^1.2.2",
20-
"@tanstack/react-query": "5.59.20",
20+
"@tanstack/react-query": "5.60.2",
2121
"class-variance-authority": "^0.7.0",
2222
"clsx": "^2.1.1",
2323
"cmdk": "^1.0.4",
24-
"lucide-react": "0.454.0",
24+
"lucide-react": "0.456.0",
2525
"next": "15.0.3",
2626
"next-themes": "^0.4.3",
2727
"react": "19.0.0-rc-69d4b800-20241021",
@@ -40,8 +40,8 @@
4040
"@types/react-dom": "npm:[email protected]",
4141
"eslint": "8.57.0",
4242
"eslint-config-next": "15.0.3",
43-
"postcss": "8.4.47",
44-
"tailwindcss": "3.4.14",
43+
"postcss": "8.4.49",
44+
"tailwindcss": "3.4.15",
4545
"typescript": "5.6.3"
4646
}
4747
}

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@changesets/cli": "2.27.9",
4646
"@manypkg/get-packages": "2.2.2",
4747
"@types/node": "20.14.9",
48-
"turbo": "2.2.3",
48+
"turbo": "2.3.0",
4949
"typescript": "5.6.3"
5050
},
5151
"pnpm": {

0 commit comments

Comments
 (0)