Skip to content

Commit e4d7c39

Browse files
authored
Merge branch 'main' into ph/newEngineDocsLink
2 parents c3ca495 + ec53366 commit e4d7c39

File tree

347 files changed

+7298
-3658
lines changed

Some content is hidden

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

347 files changed

+7298
-3658
lines changed

.changeset/khaki-items-tease.md

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

.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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@radix-ui/react-switch": "^1.1.0",
4747
"@radix-ui/react-tooltip": "1.1.2",
4848
"@sentry/nextjs": "8.32.0",
49-
"@shazow/whatsabi": "^0.14.1",
49+
"@shazow/whatsabi": "^0.15.2",
5050
"@stripe/react-stripe-js": "^2.7.3",
5151
"@stripe/stripe-js": "^3.5.0",
5252
"@tanstack/react-query": "5.56.2",
@@ -110,14 +110,14 @@
110110
"@next/eslint-plugin-next": "14.2.13",
111111
"@playwright/test": "1.47.2",
112112
"@storybook/addon-essentials": "8.3.4",
113-
"@storybook/addon-interactions": "8.3.4",
113+
"@storybook/addon-interactions": "8.3.5",
114114
"@storybook/addon-links": "8.3.4",
115115
"@storybook/addon-onboarding": "8.3.4",
116116
"@storybook/addon-viewport": "8.3.4",
117117
"@storybook/blocks": "8.3.4",
118118
"@storybook/nextjs": "8.3.4",
119119
"@storybook/react": "8.3.4",
120-
"@storybook/test": "8.3.4",
120+
"@storybook/test": "8.3.5",
121121
"@types/color": "^3.0.6",
122122
"@types/node": "20.14.9",
123123
"@types/papaparse": "^5.3.14",
Binary file not shown.
1.24 MB
Loading
-294 KB
Binary file not shown.
1.24 MB
Loading

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
}

0 commit comments

Comments
 (0)