Skip to content

Commit 7a571e2

Browse files
committed
Merge branch 'main' into mintable-module
2 parents aab676f + 15358d7 commit 7a571e2

File tree

7 files changed

+223
-199
lines changed

7 files changed

+223
-199
lines changed

apps/dashboard/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"scripts": {
66
"preinstall": "npx only-allow pnpm",
7-
"dev": "next dev --turbopack",
7+
"dev": "next dev",
88
"build": "next build",
99
"start": "next start",
1010
"format": "biome format ./src --write",
@@ -46,7 +46,7 @@
4646
"@radix-ui/react-slot": "^1.1.0",
4747
"@radix-ui/react-switch": "^1.1.1",
4848
"@radix-ui/react-tooltip": "1.1.3",
49-
"@sentry/nextjs": "8.36.0",
49+
"@sentry/nextjs": "8.37.1",
5050
"@shazow/whatsabi": "^0.16.0",
5151
"@stripe/react-stripe-js": "^2.8.1",
5252
"@stripe/stripe-js": "^3.5.0",

apps/dashboard/src/@/components/ui/select.tsx

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -73,19 +73,7 @@ const SelectContent = React.forwardRef<
7373
>(({ className, children, position = "popper", ...props }, ref) => (
7474
<SelectPrimitive.Portal>
7575
<SelectPrimitive.Content
76-
// Fixes https://github.com/radix-ui/primitives/issues/1658
77-
ref={(instance) => {
78-
if (typeof ref === "function") {
79-
ref(instance);
80-
} else if (ref) {
81-
ref.current = instance;
82-
}
83-
if (!instance) return;
84-
85-
instance.ontouchstart = (e) => {
86-
e.preventDefault();
87-
};
88-
}}
76+
ref={ref}
8977
className={cn(
9078
"data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 relative z-50 max-h-96 min-w-[8rem] overflow-hidden rounded-md border border-border bg-popover text-popover-foreground shadow-md data-[state=closed]:animate-out data-[state=open]:animate-in",
9179
position === "popper" &&

apps/dashboard/src/@/constants/thirdweb.client.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,10 @@ export function useThirdwebClient(jwt?: string) {
2424
throw new Error("Failed to get auth token");
2525
}
2626
const json = (await res.json()) as GetAuthTokenResponse;
27-
return json.jwt || undefined;
27+
if (!json.jwt) {
28+
throw new Error("No JWT in response");
29+
}
30+
return json.jwt;
2831
},
2932
});
3033

apps/dashboard/src/app/(dashboard)/(chain)/[chain_id]/[contractAddress]/_components/claim-conditions/claim-conditions-form/hooks.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ function toBigInt(value: string | number | undefined): bigint | undefined {
208208
if (value === "unlimited") {
209209
return maxUint256;
210210
}
211+
return BigInt(value);
211212
}
212213

213214
// The input from client-side is non-wei, but the extension is expecting value in wei

apps/dashboard/src/lib/wallet/nfts/types.ts

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ import {
4747
xai,
4848
xaiSepolia,
4949
zkSync,
50+
zkSyncSepolia,
5051
zora,
5152
zoraSepolia,
5253
} from "thirdweb/chains";
@@ -85,6 +86,50 @@ const moralisSupportedChainIdsMap: Record<number, string> = {
8586
[gnosis.id]: "",
8687
[gnosisChiadoTestnet.id]: "",
8788
[base.id]: "",
89+
[polygonAmoy.id]: "",
90+
[optimism.id]: "",
91+
[linea.id]: "",
92+
// Chiliz
93+
[88888]: "",
94+
// Chiliz testnet
95+
[88882]: "",
96+
// Holesky
97+
[17000]: "",
98+
// Pulse chain
99+
[369]: "",
100+
[moonbeam.id]: "",
101+
// Moonriver
102+
[1285]: "",
103+
// Moonbase Alpha
104+
[1287]: "",
105+
[blast.id]: "",
106+
[blastSepolia.id]: "",
107+
[zkSync.id]: "",
108+
[zkSyncSepolia.id]: "",
109+
// Mantle
110+
[5000]: "",
111+
// Mantle Sepolia
112+
[5003]: "",
113+
// opBNB
114+
[204]: "",
115+
[polygonZkEvm.id]: "",
116+
[polygonZkEvmTestnet.id]: "",
117+
// Zeta chain
118+
[7000]: "",
119+
// Zeta chain testnet
120+
[7001]: "",
121+
// Flow
122+
[747]: "",
123+
// Flow testnet
124+
[545]: "",
125+
// Ronin
126+
[2020]: "",
127+
// Ronin Saigon testnet
128+
[2021]: "",
129+
// Lisk
130+
[1135]: "",
131+
// Lisk Sepolia testnet
132+
[4202]: "",
88133
};
89134

90135
// List: https://docs.simplehash.com/reference/supported-chains-testnets

packages/thirdweb/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,14 @@
211211
"@radix-ui/react-icons": "1.3.1",
212212
"@radix-ui/react-tooltip": "1.1.3",
213213
"@tanstack/react-query": "5.59.19",
214-
"@walletconnect/ethereum-provider": "2.17.1",
215-
"@walletconnect/sign-client": "2.17.1",
214+
"@walletconnect/ethereum-provider": "2.17.2",
215+
"@walletconnect/sign-client": "2.17.2",
216216
"abitype": "1.0.6",
217217
"fuse.js": "7.0.0",
218218
"input-otp": "^1.4.1",
219219
"mipd": "0.0.7",
220220
"uqr": "0.1.2",
221-
"viem": "2.21.40"
221+
"viem": "2.21.41"
222222
},
223223
"peerDependencies": {
224224
"@aws-sdk/client-lambda": "^3",
@@ -350,7 +350,7 @@
350350
"ethers6": "npm:ethers@6",
351351
"expo-linking": "6.3.1",
352352
"expo-web-browser": "13.0.3",
353-
"happy-dom": "^15.9.0",
353+
"happy-dom": "^15.10.2",
354354
"knip": "5.36.2",
355355
"msw": "^2.6.0",
356356
"prettier": "^3.3.2",

0 commit comments

Comments
 (0)