Skip to content

Commit d6c2414

Browse files
kien-ngokien-ngo
authored
Merge branch 'main' into kien/temp-fix-reveal-button
2 parents 67383d7 + 3a141e7 commit d6c2414

File tree

385 files changed

+12824
-6780
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

385 files changed

+12824
-6780
lines changed

‎.changeset/cuddly-pandas-impress.md‎

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

‎.changeset/tricky-clouds-swim.md‎

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

‎.changeset/warm-snakes-notice.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": minor
3+
---
4+
5+
Adds twitch auth strategy

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,8 @@
2121
},
2222
"[markdown]": {
2323
"editor.defaultFormatter": "esbenp.prettier-vscode"
24+
},
25+
"[javascript]": {
26+
"editor.defaultFormatter": "biomejs.biome"
2427
}
2528
}

‎apps/dashboard/next-sitemap.config.js‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
*
44
*/
55
async function fetchChainsFromApi() {
6-
const res = await fetch(`https://api.thirdweb.com/v1/chains`, {
6+
const res = await fetch("https://api.thirdweb.com/v1/chains", {
77
headers: {
88
"Content-Type": "application/json",
99
},
@@ -55,7 +55,9 @@ module.exports = {
5555
],
5656
},
5757
exclude: ["/chain/validate"],
58-
transform: async (config, path) => {
58+
transform: async (config, _path) => {
59+
let path = _path;
60+
5961
// ignore og image paths
6062
if (path.includes("_og")) {
6163
return null;

‎apps/dashboard/next.config.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,11 @@ const securityHeaders = [
4040
const redirects = require("./redirects");
4141

4242
// add framer paths here
43-
const FRAMER_PATHS = ["/connect/sign-in", "/contracts/modular-contracts"];
43+
const FRAMER_PATHS = [
44+
"/connect/sign-in",
45+
"/contracts/modular-contracts",
46+
"/unlimited-wallets",
47+
];
4448

4549
/**
4650
* @returns {import('next').RemotePattern[]}

‎apps/dashboard/package.json‎

Lines changed: 42 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,45 @@
3030
"@emotion/styled": "11.13.0",
3131
"@hookform/resolvers": "^3.9.0",
3232
"@n8tb1t/use-scroll-position": "^2.0.3",
33-
"@radix-ui/react-alert-dialog": "^1.1.1",
34-
"@radix-ui/react-avatar": "^1.1.0",
35-
"@radix-ui/react-checkbox": "^1.1.1",
36-
"@radix-ui/react-dialog": "1.1.1",
37-
"@radix-ui/react-dropdown-menu": "^2.1.1",
38-
"@radix-ui/react-hover-card": "^1.1.1",
33+
"@radix-ui/react-alert-dialog": "^1.1.2",
34+
"@radix-ui/react-avatar": "^1.1.1",
35+
"@radix-ui/react-checkbox": "^1.1.2",
36+
"@radix-ui/react-dialog": "1.1.2",
37+
"@radix-ui/react-dropdown-menu": "^2.1.2",
38+
"@radix-ui/react-hover-card": "^1.1.2",
3939
"@radix-ui/react-label": "^2.1.0",
40-
"@radix-ui/react-popover": "^1.1.1",
40+
"@radix-ui/react-popover": "^1.1.2",
4141
"@radix-ui/react-progress": "^1.1.0",
42-
"@radix-ui/react-radio-group": "^1.2.0",
43-
"@radix-ui/react-select": "^2.1.1",
42+
"@radix-ui/react-radio-group": "^1.2.1",
43+
"@radix-ui/react-select": "^2.1.2",
4444
"@radix-ui/react-separator": "^1.1.0",
4545
"@radix-ui/react-slot": "^1.1.0",
46-
"@radix-ui/react-switch": "^1.1.0",
47-
"@radix-ui/react-tooltip": "1.1.2",
48-
"@sentry/nextjs": "8.32.0",
49-
"@shazow/whatsabi": "^0.14.1",
50-
"@stripe/react-stripe-js": "^2.7.3",
46+
"@radix-ui/react-switch": "^1.1.1",
47+
"@radix-ui/react-tooltip": "1.1.3",
48+
"@sentry/nextjs": "8.34.0",
49+
"@shazow/whatsabi": "^0.15.3",
50+
"@stripe/react-stripe-js": "^2.8.1",
5151
"@stripe/stripe-js": "^3.5.0",
52-
"@tanstack/react-query": "5.56.2",
52+
"@tanstack/react-query": "5.59.13",
5353
"@tanstack/react-table": "^8.17.3",
5454
"@thirdweb-dev/service-utils": "workspace:*",
5555
"@vercel/og": "^0.6.2",
56-
"abitype": "1.0.5",
56+
"abitype": "1.0.6",
5757
"chakra-react-select": "^4.7.6",
5858
"class-variance-authority": "^0.7.0",
5959
"clsx": "^2.1.1",
6060
"color": "^4.2.3",
6161
"compare-versions": "^6.1.0",
62-
"date-fns": "^3.6.0",
62+
"date-fns": "4.1.0",
6363
"flat": "^6.0.1",
64-
"framer-motion": "11.9.0",
64+
"framer-motion": "11.11.8",
6565
"fuse.js": "7.0.0",
6666
"input-otp": "^1.2.4",
6767
"ioredis": "^5.4.1",
6868
"ipaddr.js": "^2.2.0",
6969
"lottie-react": "^2.4.0",
70-
"lucide-react": "0.441.0",
71-
"next": "14.2.13",
70+
"lucide-react": "0.452.0",
71+
"next": "14.2.15",
7272
"next-plausible": "^3.12.0",
7373
"next-seo": "^6.5.0",
7474
"next-themes": "^0.3.0",
@@ -83,48 +83,47 @@
8383
"react-children-utilities": "^2.10.0",
8484
"react-day-picker": "^8.10.1",
8585
"react-dom": "18.3.1",
86-
"react-dropzone": "^14.2.3",
86+
"react-dropzone": "^14.2.9",
8787
"react-hook-form": "7.52.0",
88-
"react-icons": "^5.2.1",
8988
"react-intersection-observer": "^9.10.3",
9089
"react-markdown": "^9.0.1",
9190
"react-responsive-carousel": "^3.2.23",
9291
"react-table": "^7.8.0",
93-
"recharts": "^2.12.7",
92+
"recharts": "^2.13.0",
9493
"remark-gfm": "^4.0.0",
9594
"server-only": "^0.0.1",
9695
"sonner": "^1.5.0",
9796
"spdx-correct": "^3.2.0",
9897
"swagger-ui-react": "^5.17.14",
99-
"tailwind-merge": "^2.5.2",
98+
"tailwind-merge": "^2.5.4",
10099
"tailwindcss-animate": "^1.0.7",
101100
"thirdweb": "workspace:*",
102101
"tiny-invariant": "^1.3.3",
103-
"use-debounce": "^10.0.1",
102+
"use-debounce": "^10.0.4",
104103
"zod": "3.23.8"
105104
},
106105
"devDependencies": {
107106
"@chakra-ui/cli": "^2.4.1",
108107
"@chromatic-com/storybook": "2.0.2",
109-
"@next/bundle-analyzer": "14.2.13",
110-
"@next/eslint-plugin-next": "14.2.13",
108+
"@next/bundle-analyzer": "14.2.15",
109+
"@next/eslint-plugin-next": "14.2.15",
111110
"@playwright/test": "1.47.2",
112-
"@storybook/addon-essentials": "8.3.4",
113-
"@storybook/addon-interactions": "8.3.4",
114-
"@storybook/addon-links": "8.3.4",
115-
"@storybook/addon-onboarding": "8.3.4",
116-
"@storybook/addon-viewport": "8.3.4",
117-
"@storybook/blocks": "8.3.4",
118-
"@storybook/nextjs": "8.3.4",
119-
"@storybook/react": "8.3.4",
120-
"@storybook/test": "8.3.4",
111+
"@storybook/addon-essentials": "8.3.5",
112+
"@storybook/addon-interactions": "8.3.5",
113+
"@storybook/addon-links": "8.3.5",
114+
"@storybook/addon-onboarding": "8.3.5",
115+
"@storybook/addon-viewport": "8.3.5",
116+
"@storybook/blocks": "8.3.5",
117+
"@storybook/nextjs": "8.3.5",
118+
"@storybook/react": "8.3.5",
119+
"@storybook/test": "8.3.5",
121120
"@types/color": "^3.0.6",
122121
"@types/node": "20.14.9",
123122
"@types/papaparse": "^5.3.14",
124123
"@types/pluralize": "^0.0.33",
125124
"@types/qrcode": "^1.5.5",
126-
"@types/react": "^18.3.10",
127-
"@types/react-dom": "^18",
125+
"@types/react": "^18.3.11",
126+
"@types/react-dom": "^18.3.1",
128127
"@types/react-table": "^7.7.20",
129128
"@types/spdx-correct": "^3.1.3",
130129
"@types/swagger-ui-react": "^4.18.3",
@@ -133,14 +132,14 @@
133132
"autoprefixer": "^10.4.19",
134133
"checkly": "^4.8.1",
135134
"eslint": "8.57.0",
136-
"eslint-config-biome": "1.8.4",
137-
"eslint-plugin-react-compiler": "0.0.0-experimental-ca16900-20240916",
135+
"eslint-config-biome": "1.9.3",
136+
"eslint-plugin-react-compiler": "0.0.0-experimental-fa06e2c-20241014",
138137
"eslint-plugin-storybook": "^0.9.0",
139-
"knip": "^5.30.6",
138+
"knip": "^5.33.3",
140139
"next-sitemap": "^4.2.3",
141140
"postcss": "8.4.47",
142-
"storybook": "8.3.4",
141+
"storybook": "8.3.5",
143142
"tailwindcss": "3.4.13",
144-
"typescript": "5.6.2"
143+
"typescript": "5.6.3"
145144
}
146145
}

‎apps/dashboard/src/@/api/team-members.ts‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import "server-only";
2-
import { COOKIE_ACTIVE_ACCOUNT, COOKIE_PREFIX_TOKEN } from "@/constants/cookie";
32
import { API_SERVER_URL } from "@/constants/env";
4-
import { cookies } from "next/headers";
3+
import { getAuthToken } from "../../app/api/lib/getAuthToken";
54

65
const TeamAccountRole = {
76
OWNER: "OWNER",
@@ -26,14 +25,10 @@ export type TeamMember = {
2625
};
2726

2827
export async function getMembers(teamSlug: string) {
29-
const cookiesManager = cookies();
30-
const activeAccount = cookiesManager.get(COOKIE_ACTIVE_ACCOUNT)?.value;
31-
const token = activeAccount
32-
? cookiesManager.get(COOKIE_PREFIX_TOKEN + activeAccount)?.value
33-
: null;
28+
const token = getAuthToken();
3429

3530
if (!token) {
36-
return [];
31+
return undefined;
3732
}
3833

3934
const teamsRes = await fetch(
@@ -44,8 +39,10 @@ export async function getMembers(teamSlug: string) {
4439
},
4540
},
4641
);
42+
4743
if (teamsRes.ok) {
4844
return (await teamsRes.json())?.result as TeamMember[];
4945
}
50-
return [];
46+
47+
return undefined;
5148
}

‎apps/dashboard/src/@/components/blocks/Avatars/ProjectAvatar.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ export function ProjectAvatar(props: {
99
return (
1010
<Img
1111
src={props.src}
12-
className={cn("rounded-lg border", props.className)}
12+
className={cn("rounded-lg border border-border", props.className)}
1313
alt={""}
1414
fallback={
1515
<div className="flex items-center justify-center bg-muted/50">

‎apps/dashboard/src/@/components/blocks/FormFieldSetup.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export function FormFieldSetup(props: {
77
label: string;
88
errorMessage: React.ReactNode | undefined;
99
children: React.ReactNode;
10-
tooltip: React.ReactNode | undefined;
10+
tooltip?: React.ReactNode;
1111
isRequired: boolean;
1212
}) {
1313
return (

0 commit comments

Comments
 (0)