Skip to content

Commit 7f4f5b2

Browse files
authored
Merge branch 'main' into crosschain-ui
2 parents bb91600 + f03ded3 commit 7f4f5b2

File tree

135 files changed

+8634
-5906
lines changed

Some content is hidden

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

135 files changed

+8634
-5906
lines changed

.changeset/cuddly-pumas-wink.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@thirdweb-dev/service-utils": patch
3+
"thirdweb": patch
4+
"thirdweb-login": patch
5+
---
6+
7+
updated dependencies

.changeset/early-adults-travel.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
Skip factory entrypoint lookup for ZKsync chains
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/service-utils": patch
3+
---
4+
5+
[service-utils] Update to ESM for compression typrse

.changeset/metal-icons-end.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
Fix: Ecosystem smart wallets now properly trigger switch chain on their admin wallets

.changeset/tall-masks-shop.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"@thirdweb-dev/service-utils": patch
3+
---
4+
5+
[service-utils] switch to lz4js for compression lib

.github/pull_request_template.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
1-
---
2-
title: "[SDK/Dashboard/Portal] Feature/Fix: Concise title for the changes"
3-
---
1+
<!--
2+
3+
## title your PR with this format: "[SDK/Dashboard/Portal] Feature/Fix: Concise title for the changes"
44
55
If you did not copy the branch name from Linear, paste the issue tag here (format is TEAM-0000):
66
77
## Notes for the reviewer
8+
89
Anything important to call out? Be sure to also clarify these in your comments.
910
1011
## How to test
12+
1113
Unit tests, playground, etc.
1214
15+
-->

apps/dashboard/package.json

Lines changed: 42 additions & 42 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.53.0",
50+
"@shazow/whatsabi": "^0.19.0",
51+
"@tanstack/react-query": "5.66.0",
5252
"@tanstack/react-table": "^8.20.6",
5353
"@thirdweb-dev/service-utils": "workspace:*",
54-
"@vercel/functions": "^1.5.2",
55-
"@vercel/og": "^0.6.4",
56-
"abitype": "1.0.7",
54+
"@vercel/functions": "^1.6.0",
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.2",
7878
"pluralize": "^8.0.0",
7979
"posthog-js": "1.67.1",
8080
"qrcode": "^1.5.3",
@@ -83,17 +83,17 @@
8383
"react-day-picker": "^8.10.1",
8484
"react-dom": "19.0.0",
8585
"react-dropzone": "^14.3.5",
86-
"react-error-boundary": "^4.1.2",
86+
"react-error-boundary": "^5.0.0",
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.4",
9595
"spdx-correct": "^3.2.0",
96-
"swagger-ui-react": "^5.18.2",
96+
"swagger-ui-react": "^5.18.3",
9797
"tailwind-merge": "^2.6.0",
9898
"tailwindcss-animate": "^1.0.7",
9999
"thirdweb": "workspace:*",
@@ -103,42 +103,42 @@
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.1",
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.13.0",
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",
132-
"checkly": "^4.18.0",
132+
"checkly": "^4.19.1",
133133
"eslint": "8.57.0",
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.6",
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/@/api/team.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export type Team = {
2525
billingPlan: "pro" | "growth" | "free" | "starter";
2626
billingStatus: "validPayment" | (string & {}) | null;
2727
billingEmail: string | null;
28-
growthTrialEligible: boolean | null;
28+
growthTrialEligible: false;
2929
enabledScopes: EnabledTeamScope[];
3030
};
3131

apps/dashboard/src/@/components/blocks/wallet-address.tsx

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import {
88
import { useThirdwebClient } from "@/constants/thirdweb.client";
99
import { resolveSchemeWithErrorHandler } from "@/lib/resolveSchemeWithErrorHandler";
1010
import { useClipboard } from "hooks/useClipboard";
11-
import { Check, Copy, ExternalLinkIcon } from "lucide-react";
11+
import { Check, Copy } from "lucide-react";
1212
import { useMemo } from "react";
1313
import { type ThirdwebClient, isAddress } from "thirdweb";
1414
import { ZERO_ADDRESS } from "thirdweb";
@@ -148,21 +148,6 @@ export function WalletAddress(props: {
148148
);
149149
})
150150
)}
151-
<Button
152-
asChild
153-
variant="upsell"
154-
className="flex flex-row items-center gap-2 text-sm"
155-
size="sm"
156-
>
157-
<a
158-
target="_blank"
159-
href="https://blog.thirdweb.com/changelog/introducing-the-social-sdk?ref=dashboard-social-wallet"
160-
rel="noreferrer"
161-
>
162-
Learn more
163-
<ExternalLinkIcon className="size-4" />
164-
</a>
165-
</Button>
166151
</div>
167152
</HoverCardContent>
168153
</HoverCard>

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

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -548,41 +548,6 @@ export function useResendEmailConfirmation() {
548548
});
549549
}
550550

551-
export function useApiKeys(props: {
552-
isLoggedIn: boolean;
553-
}) {
554-
const address = useActiveAccount()?.address;
555-
return useQuery({
556-
queryKey: apiKeys.keys(address || ""),
557-
queryFn: async () => {
558-
type Result = {
559-
data: ApiKey[];
560-
error?: { message: string };
561-
};
562-
563-
const res = await apiServerProxy<Result>({
564-
pathname: "/v1/keys",
565-
method: "GET",
566-
headers: {
567-
"Content-Type": "application/json",
568-
},
569-
});
570-
571-
if (!res.ok) {
572-
throw new Error(res.error);
573-
}
574-
575-
const json = res.data;
576-
577-
if (json.error) {
578-
throw new Error(json.error.message);
579-
}
580-
return json.data;
581-
},
582-
enabled: !!address && props.isLoggedIn,
583-
});
584-
}
585-
586551
export function useCreateApiKey() {
587552
const address = useActiveAccount()?.address;
588553
const queryClient = useQueryClient();

0 commit comments

Comments
 (0)