Skip to content

Commit 4ca020e

Browse files
authored
Merge branch 'main' into yash/ref-constructor-params
2 parents 4585de5 + c8ad066 commit 4ca020e

File tree

1,297 files changed

+34473
-35753
lines changed

Some content is hidden

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

1,297 files changed

+34473
-35753
lines changed

.changeset/fifty-foxes-rescue.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+
Added global transaction decorator, better eip712 transaction support

.changeset/hot-bees-turn.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+
Use maxFeePerGas for Pay gas cost estimations in transaction flow

.changeset/slimy-pots-camp.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+
Adds chain ID to tracked analytics

.github/stale.yml

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

.github/workflows/linear.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
name: Check for linked issue in pull request body
2+
3+
on:
4+
pull_request:
5+
types:
6+
- opened
7+
- edited
8+
9+
jobs:
10+
check_linear_in_pr_body:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- name: Check for linked issue in pull request body
14+
run: |
15+
pr_body=$(curl -s \
16+
-H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
17+
https://api.github.com/repos/${{ github.repository }}/pulls/${{ github.event.number }} | jq -r .body)
18+
19+
echo "Pull Request Body: $pr_body"
20+
21+
if echo "$pr_body" | grep -iE "CNCT|DASH"; then
22+
echo "Linked issue found in the pull request body."
23+
else
24+
echo "No linked issue found in the pull request body."
25+
exit 1
26+
fi

.github/workflows/stale.yml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
name: 'Close stale issues and PRs'
2+
on:
3+
schedule:
4+
- cron: '30 1 * * *'
5+
6+
jobs:
7+
stale:
8+
runs-on: ubuntu-latest
9+
steps:
10+
- uses: actions/stale@v9
11+
with:
12+
stale-issue-message: 'This issue has been inactive for 30 days. It is now marked as stale and will be closed in 5 days if no further activity occurs.'
13+
stale-pr-message: 'This PR has been inactive for 30 days. It is now marked as stale and will be closed in 5 days if no further activity occurs.'
14+
days-before-stale: 30
15+
days-before-close: 5

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,5 @@ packages/*/typedoc/*
2929
*storybook.log
3030
storybook-static
3131
.aider*
32+
33+
tsconfig.tsbuildinfo

apps/dashboard/.env.example

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,15 +75,6 @@ GITHUB_API_TOKEN="ghp_..."
7575
# Upload server url
7676
NEXT_PUBLIC_DASHBOARD_UPLOAD_SERVER="https://storage.thirdweb-preview.com"
7777

78-
# Payments Admin Secret. For dev, get this value from paper-web-dev (on Zeet)'s "HASURA_ADMIN_SECRET_KEY" env var
79-
PAYMENTS_ADMIN_SECRET=""
80-
81-
# Disable telemetry
82-
NEXT_TELEMETRY_DISABLED=1
83-
84-
# Use trench for KYC
85-
NEXT_PUBLIC_TRENCH_2_API_ENDPOINT=""
86-
8778
# Unthread variables - only required for submitting the support form in /support
8879
UNTHREAD_API_KEY=""
8980
UNTHREAD_TRIAGE_CHANNEL_ID=""
@@ -100,4 +91,7 @@ API_SERVER_SECRET=""
10091

10192
# Used for the Faucet page (/<chain_id>)
10293
NEXT_PUBLIC_TURNSTILE_SITE_KEY=""
103-
TURNSTILE_SECRET_KEY=""
94+
TURNSTILE_SECRET_KEY=""
95+
REDIS_URL=""
96+
97+
ANALYTICS_SERVICE_URL=""

apps/dashboard/.eslintrc.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ module.exports = {
5959
"FormHelperText",
6060
"FormErrorMessage",
6161
"MenuGroup",
62-
"MenuItem",
6362
"VStack",
6463
"HStack",
6564
"AspectRatio",

apps/dashboard/.storybook/preview.tsx

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@ import type { Preview } from "@storybook/react";
22
import "@/styles/globals.css";
33
import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
44
import { MoonIcon, SunIcon } from "lucide-react";
5+
import { ThemeProvider, useTheme } from "next-themes";
56
import { Inter as interFont } from "next/font/google";
67
// biome-ignore lint/style/useImportType: <explanation>
7-
import React, { useState } from "react";
8+
import React from "react";
89
import { useEffect } from "react";
910
import { Button } from "../src/@/components/ui/button";
1011

11-
// Note: Wrapping the Stoy with AppRouterProviders makes the storybook server time SUPER SLOW
12-
// so let's just not have it there - all stories should be independent from context anyway and just rely on props
13-
1412
const queryClient = new QueryClient();
1513

1614
const fontSans = interFont({
@@ -31,9 +29,16 @@ const preview: Preview = {
3129
decorators: [
3230
(Story) => {
3331
return (
34-
<StoryLayout>
35-
<Story />
36-
</StoryLayout>
32+
<ThemeProvider
33+
attribute="class"
34+
disableTransitionOnChange
35+
enableSystem={false}
36+
defaultTheme="dark"
37+
>
38+
<StoryLayout>
39+
<Story />
40+
</StoryLayout>
41+
</ThemeProvider>
3742
);
3843
},
3944
],
@@ -44,34 +49,36 @@ export default preview;
4449
function StoryLayout(props: {
4550
children: React.ReactNode;
4651
}) {
47-
const [theme, setTheme] = useState<"light" | "dark">("dark");
52+
const { setTheme, theme } = useTheme();
4853

4954
useEffect(() => {
50-
document.body.className = `font-sans antialiased ${fontSans.variable} ${theme === "dark" ? " dark" : ""}`;
51-
}, [theme]);
55+
document.body.className = `font-sans antialiased ${fontSans.variable}`;
56+
}, []);
5257

5358
return (
5459
<QueryClientProvider client={queryClient}>
55-
<div className="min-h-screen flex flex-col bg-background text-foreground min-w-0">
56-
<div className="flex justify-end p-4 border-b gap-2">
60+
<div className="flex min-h-screen min-w-0 flex-col bg-background text-foreground">
61+
<div className="flex justify-end gap-2 border-b p-4">
5762
<Button
5863
onClick={() => setTheme("dark")}
5964
size="sm"
60-
variant={theme === "dark" ? "default" : "ghost"}
65+
variant={theme === "dark" ? "default" : "outline"}
66+
className="h-auto w-auto rounded-full p-2"
6167
>
62-
<MoonIcon className="size-5" />
68+
<MoonIcon className="size-4" />
6369
</Button>
6470

6571
<Button
6672
onClick={() => setTheme("light")}
6773
size="sm"
68-
variant={theme === "light" ? "default" : "ghost"}
74+
variant={theme === "light" ? "default" : "outline"}
75+
className="h-auto w-auto rounded-full p-2"
6976
>
70-
<SunIcon className="size-5" />
77+
<SunIcon className="size-4" />
7178
</Button>
7279
</div>
7380

74-
<div className="grow flex flex-col min-w-0">{props.children}</div>
81+
<div className="flex min-w-0 grow flex-col">{props.children}</div>
7582
</div>
7683
</QueryClientProvider>
7784
);

0 commit comments

Comments
 (0)