Skip to content

Commit 0c2d80f

Browse files
committed
Merge branch 'main' into greg/fix-wagmi-adapter-autoconnect
2 parents 2fe5e97 + 073b25a commit 0c2d80f

File tree

68 files changed

+6216
-4542
lines changed

Some content is hidden

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

68 files changed

+6216
-4542
lines changed

apps/dashboard/package.json

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -31,29 +31,29 @@
3131
"@marsidev/react-turnstile": "^1.1.0",
3232
"@n8tb1t/use-scroll-position": "^2.0.3",
3333
"@radix-ui/react-accordion": "^1.2.2",
34-
"@radix-ui/react-alert-dialog": "^1.1.4",
34+
"@radix-ui/react-alert-dialog": "^1.1.5",
3535
"@radix-ui/react-avatar": "^1.1.2",
3636
"@radix-ui/react-checkbox": "^1.1.3",
37-
"@radix-ui/react-dialog": "1.1.4",
38-
"@radix-ui/react-dropdown-menu": "^2.1.3",
39-
"@radix-ui/react-hover-card": "^1.1.3",
37+
"@radix-ui/react-dialog": "1.1.5",
38+
"@radix-ui/react-dropdown-menu": "^2.1.5",
39+
"@radix-ui/react-hover-card": "^1.1.5",
4040
"@radix-ui/react-label": "^2.1.1",
41-
"@radix-ui/react-popover": "^1.1.3",
41+
"@radix-ui/react-popover": "^1.1.5",
4242
"@radix-ui/react-progress": "^1.1.1",
4343
"@radix-ui/react-radio-group": "^1.2.2",
44-
"@radix-ui/react-select": "^2.1.3",
44+
"@radix-ui/react-select": "^2.1.5",
4545
"@radix-ui/react-separator": "^1.1.1",
4646
"@radix-ui/react-slot": "^1.1.1",
4747
"@radix-ui/react-switch": "^1.1.2",
48-
"@radix-ui/react-tooltip": "1.1.5",
49-
"@sentry/nextjs": "8.45.1",
50-
"@shazow/whatsabi": "^0.18.0",
51-
"@tanstack/react-query": "5.62.16",
48+
"@radix-ui/react-tooltip": "1.1.7",
49+
"@sentry/nextjs": "8.51.0",
50+
"@shazow/whatsabi": "^0.19.0",
51+
"@tanstack/react-query": "5.65.0",
5252
"@tanstack/react-table": "^8.20.6",
5353
"@thirdweb-dev/service-utils": "workspace:*",
5454
"@vercel/functions": "^1.5.2",
55-
"@vercel/og": "^0.6.4",
56-
"abitype": "1.0.7",
55+
"@vercel/og": "^0.6.5",
56+
"abitype": "1.0.8",
5757
"chakra-react-select": "^4.7.6",
5858
"class-variance-authority": "^0.7.1",
5959
"clsx": "^2.1.1",
@@ -62,19 +62,19 @@
6262
"date-fns": "4.1.0",
6363
"fetch-event-stream": "0.1.5",
6464
"flat": "^6.0.1",
65-
"framer-motion": "11.15.0",
65+
"framer-motion": "12.0.6",
6666
"fuse.js": "7.0.0",
6767
"input-otp": "^1.4.1",
6868
"ioredis": "^5.4.1",
6969
"ipaddr.js": "^2.2.0",
70-
"lucide-react": "0.468.0",
71-
"next": "15.1.4",
70+
"lucide-react": "0.474.0",
71+
"next": "15.1.6",
7272
"next-plausible": "^3.12.4",
7373
"next-themes": "^0.4.4",
7474
"nextjs-toploader": "^1.6.12",
7575
"openapi-types": "^12.1.3",
7676
"p-limit": "^6.2.0",
77-
"papaparse": "^5.4.1",
77+
"papaparse": "^5.5.1",
7878
"pluralize": "^8.0.0",
7979
"posthog-js": "1.67.1",
8080
"qrcode": "^1.5.3",
@@ -87,11 +87,11 @@
8787
"react-hook-form": "7.54.2",
8888
"react-markdown": "^9.0.1",
8989
"react-table": "^7.8.0",
90-
"recharts": "2.14.1",
90+
"recharts": "2.15.1",
9191
"remark-gfm": "^4.0.0",
9292
"server-only": "^0.0.1",
9393
"shiki": "1.27.0",
94-
"sonner": "^1.7.1",
94+
"sonner": "^1.7.2",
9595
"spdx-correct": "^3.2.0",
9696
"swagger-ui-react": "^5.18.2",
9797
"tailwind-merge": "^2.6.0",
@@ -103,29 +103,29 @@
103103
},
104104
"devDependencies": {
105105
"@chakra-ui/cli": "^2.4.1",
106-
"@chromatic-com/storybook": "3.2.2",
107-
"@next/bundle-analyzer": "15.1.4",
108-
"@next/eslint-plugin-next": "15.1.4",
109-
"@playwright/test": "1.49.1",
110-
"@storybook/addon-essentials": "8.4.7",
111-
"@storybook/addon-interactions": "8.4.7",
112-
"@storybook/addon-links": "8.4.7",
113-
"@storybook/addon-onboarding": "8.4.7",
114-
"@storybook/addon-viewport": "8.4.7",
115-
"@storybook/blocks": "8.4.7",
116-
"@storybook/nextjs": "8.4.7",
117-
"@storybook/react": "8.5.0",
118-
"@storybook/test": "8.4.7",
106+
"@chromatic-com/storybook": "3.2.4",
107+
"@next/bundle-analyzer": "15.1.6",
108+
"@next/eslint-plugin-next": "15.1.6",
109+
"@playwright/test": "1.50.0",
110+
"@storybook/addon-essentials": "8.5.2",
111+
"@storybook/addon-interactions": "8.5.2",
112+
"@storybook/addon-links": "8.5.2",
113+
"@storybook/addon-onboarding": "8.5.2",
114+
"@storybook/addon-viewport": "8.5.2",
115+
"@storybook/blocks": "8.5.2",
116+
"@storybook/nextjs": "8.5.2",
117+
"@storybook/react": "8.5.2",
118+
"@storybook/test": "8.5.2",
119119
"@types/color": "4.2.0",
120-
"@types/node": "22.10.2",
120+
"@types/node": "22.10.10",
121121
"@types/papaparse": "^5.3.15",
122122
"@types/pluralize": "^0.0.33",
123123
"@types/qrcode": "^1.5.5",
124-
"@types/react": "19.0.2",
124+
"@types/react": "19.0.8",
125125
"@types/react-dom": "19.0.3",
126126
"@types/react-table": "^7.7.20",
127127
"@types/spdx-correct": "^3.1.3",
128-
"@types/swagger-ui-react": "^4.18.3",
128+
"@types/swagger-ui-react": "^4.19.0",
129129
"@typescript-eslint/eslint-plugin": "7.14.1",
130130
"@typescript-eslint/parser": "7.14.1",
131131
"autoprefixer": "^10.4.19",
@@ -134,11 +134,11 @@
134134
"eslint-config-biome": "1.9.4",
135135
"eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
136136
"eslint-plugin-storybook": "^0.11.1",
137-
"knip": "5.41.0",
137+
"knip": "5.43.5",
138138
"next-sitemap": "^4.2.3",
139-
"postcss": "8.4.49",
140-
"storybook": "8.4.7",
139+
"postcss": "8.5.1",
140+
"storybook": "8.5.2",
141141
"tailwindcss": "3.4.17",
142-
"typescript": "5.7.2"
142+
"typescript": "5.7.3"
143143
}
144144
}

apps/dashboard/src/app/(dashboard)/tools/unixtime-converter/components/UnixTimeConverter.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
"use client";
22

3-
import {} from "@/components/ui/alert";
43
import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
54
import { Input } from "@/components/ui/input";
65
import { Label } from "@/components/ui/label";

apps/dashboard/src/app/nebula-app/(app)/components/ExecuteTransactionCard.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { CopyTextButton } from "@/components/ui/CopyTextButton";
22
import { Spinner } from "@/components/ui/Spinner/Spinner";
3-
import {} from "@/components/ui/accordion";
43
import { Button } from "@/components/ui/button";
54
import { CodeClient } from "@/components/ui/code/code.client";
65
import type { Account as TWAccount } from "@3rdweb-sdk/react/hooks/useApi";

apps/dashboard/src/app/team/[team_slug]/[project_slug]/connect/in-app-wallets/page.tsx

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
import type { Range } from "components/analytics/date-range-selector";
22
import { InAppWalletAnalytics } from "components/embedded-wallets/Analytics";
3+
import { notFound } from "next/navigation";
4+
import { getProject } from "../../../../../../@/api/projects";
5+
import { getAPIKeyForProjectId } from "../../../../../api/lib/getAPIKeys";
36

47
export default async function Page(props: {
58
params: Promise<{ team_slug: string; project_slug: string }>;
@@ -27,9 +30,19 @@ export default async function Page(props: {
2730
? (searchParams.interval as "day" | "week")
2831
: "week";
2932

33+
const project = await getProject(params.team_slug, params.project_slug);
34+
if (!project) {
35+
notFound();
36+
}
37+
38+
const apiKey = await getAPIKeyForProjectId(project.id);
39+
if (!apiKey) {
40+
notFound();
41+
}
42+
3043
return (
3144
<InAppWalletAnalytics
32-
clientId={params.project_slug}
45+
clientId={apiKey.key}
3346
interval={interval}
3447
range={range as Range}
3548
/>

apps/dashboard/src/app/team/[team_slug]/[project_slug]/settings/ProjectGeneralSettingsPage.stories.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,16 @@ function Story() {
6060
payConfig: "/payConfig",
6161
}}
6262
onKeyUpdated={undefined}
63+
rotateSecretKey={async () => {
64+
await new Promise((resolve) => setTimeout(resolve, 1000));
65+
return {
66+
data: {
67+
secret: new Array(86).fill("x").join(""),
68+
secretHash: new Array(64).fill("x").join(""),
69+
secretMasked: "123...4567",
70+
},
71+
};
72+
}}
6373
showNebulaSettings={false}
6474
/>
6575

0 commit comments

Comments
 (0)