Skip to content

Commit a16bb23

Browse files
committed
merge main
2 parents cb1cff4 + cf53184 commit a16bb23

File tree

279 files changed

+8707
-4195
lines changed

Some content is hidden

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

279 files changed

+8707
-4195
lines changed

.changeset/breezy-balloons-ring.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] Helper to call client usageV2 reporting endpoint

.changeset/dull-lamps-share.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+
Batch approvals and swaps if using smart wallets

.changeset/fresh-weeks-deliver.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] Omit team_id for client usageV2 events

.changeset/hungry-books-jump.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] fix auth for cf workers

.changeset/metal-crabs-beg.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] Allow client-side usageV2 reporting

apps/dashboard/framer-rewrites.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ module.exports = [
99
// -- connect
1010
"/connect",
1111
"/connect/sign-in",
12-
"/connect/pay",
12+
"/connect/account-abstraction",
13+
"/connect/universal-bridge",
1314
// -- nebula
1415
"/nebula",
1516
// --insight

apps/dashboard/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
"react-table": "^7.8.0",
9090
"recharts": "2.15.1",
9191
"remark-gfm": "^4.0.0",
92+
"responsive-rsc": "0.0.7",
9293
"server-only": "^0.0.1",
9394
"shiki": "1.27.0",
9495
"sonner": "^1.7.4",

apps/dashboard/redirects.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,18 @@ async function redirects() {
331331
destination: "/templates/:slug",
332332
permanent: false,
333333
},
334+
// redirect /account-abstraction to /connect/account-abstraction
335+
{
336+
source: "/account-abstraction",
337+
destination: "/connect/account-abstraction",
338+
permanent: false,
339+
},
340+
// redirect /connect/pay to /connect/universal-bridge
341+
{
342+
source: "/connect/pay",
343+
destination: "/connect/universal-bridge",
344+
permanent: false,
345+
},
334346
// PREVIOUS CAMPAIGNS
335347
{
336348
source: "/unlimited-wallets",

apps/dashboard/src/@/actions/updateAccount.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { API_SERVER_URL } from "../constants/env";
55
export async function updateAccount(values: {
66
name?: string;
77
email?: string;
8+
image?: string | null;
89
}) {
910
const token = await getAuthToken();
1011

apps/dashboard/src/@/api/team.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ export async function getTeamBySlug(slug: string) {
4747
return null;
4848
}
4949

50+
export function getTeamById(id: string) {
51+
return getTeamBySlug(id);
52+
}
53+
5054
export async function getTeams() {
5155
const token = await getAuthToken();
5256
if (!token) {

0 commit comments

Comments
 (0)