Skip to content

Commit b869ead

Browse files
authored
Merge branch 'main' into joe-UB-Route-Discovery
2 parents 43c9e1e + 005acce commit b869ead

File tree

165 files changed

+5501
-831
lines changed

Some content is hidden

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

165 files changed

+5501
-831
lines changed

.changeset/blue-comics-doubt.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+
Better error messages in PayEmbed

.changeset/blue-mice-prove.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+
Better error messages for 403 responses
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+
Allow limiting the selectable countries for SMS login via a new `allowedSmsCountryCodes` option placed alongside `defaultSmsCountryCode`.

.changeset/shy-pigs-drive.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 avatar image detection on Node

.changeset/slick-apes-do.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 loading spinner theme color in PayEmbed

.changeset/tired-rice-kiss.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+
Payment link support in PayEmbed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,4 +31,5 @@ storybook-static
3131
.aider*
3232

3333
tsconfig.tsbuildinfo
34-
.cursor
34+
.cursor
35+
apps/dashboard/node-compile-cache
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
"use server";
2+
3+
import { revalidatePath } from "next/cache";
4+
5+
export async function revalidatePathAction(
6+
path: string,
7+
type: "page" | "layout",
8+
) {
9+
revalidatePath(path, type);
10+
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export async function getDefaultTeam() {
8484
return null;
8585
}
8686

87-
export async function getLastVisitedTeamOrDefaultTeam() {
87+
export async function getLastVisitedTeam() {
8888
const token = await getAuthToken();
8989
if (!token) {
9090
return null;
@@ -100,5 +100,5 @@ export async function getLastVisitedTeamOrDefaultTeam() {
100100
}
101101
}
102102

103-
return getDefaultTeam();
103+
return null;
104104
}
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
import "server-only";
2+
3+
import { DASHBOARD_THIRDWEB_SECRET_KEY } from "@/constants/server-envs";
4+
import { UB_BASE_URL } from "./constants";
5+
6+
type PaymentLink = {
7+
clientId: string;
8+
title?: string;
9+
imageUrl?: string;
10+
receiver: string;
11+
destinationToken: {
12+
address: string;
13+
symbol: string;
14+
decimals: number;
15+
chainId: number;
16+
};
17+
amount: bigint | undefined;
18+
purchaseData: unknown;
19+
};
20+
21+
export async function getPaymentLink(props: {
22+
paymentId: string;
23+
}) {
24+
const res = await fetch(`${UB_BASE_URL}/v1/links/${props.paymentId}`, {
25+
method: "GET",
26+
headers: {
27+
"Content-Type": "application/json",
28+
"x-secret-key": DASHBOARD_THIRDWEB_SECRET_KEY,
29+
},
30+
});
31+
32+
if (!res.ok) {
33+
const text = await res.text();
34+
throw new Error(text);
35+
}
36+
37+
const { data } = await res.json();
38+
return {
39+
clientId: data.clientId,
40+
title: data.title,
41+
imageUrl: data.imageUrl,
42+
receiver: data.receiver,
43+
destinationToken: data.destinationToken,
44+
amount: data.amount ? BigInt(data.amount) : undefined,
45+
purchaseData: data.purchaseData,
46+
} as PaymentLink;
47+
}

0 commit comments

Comments
 (0)