Skip to content

Commit f7f2f11

Browse files
committed
Merge branch 'main' into dustin/engine_playground
2 parents 00005e3 + 4ae50f5 commit f7f2f11

File tree

822 files changed

+9501
-28990
lines changed

Some content is hidden

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

822 files changed

+9501
-28990
lines changed

.changeset/perfect-bananas-behave.md

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

.changeset/seven-olives-applaud.md

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

.changeset/stupid-buses-wink.md

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
---
2+
"thirdweb": minor
3+
---
4+
5+
Add 2 new Pay functions: convertFiatToCrypto and convertCryptoToFiat
6+
7+
Examples:
8+
9+
### Convert fiat (USD) to crypto
10+
```ts
11+
import { convertFiatToCrypto } from "thirdweb/pay";
12+
import { ethereum } from "thirdweb/chains";
13+
14+
// Convert 2 cents to ETH
15+
const result = await convertFiatToCrypto({
16+
from: "USD",
17+
// the token address. For native token, use NATIVE_TOKEN_ADDRESS
18+
to: "0x...",
19+
// the chain (of the chain where the token belong to)
20+
chain: ethereum,
21+
// 2 cents
22+
fromAmount: 0.02,
23+
});
24+
// Result: 0.0000057 (a number)
25+
```
26+
27+
### Convert crypto to fiat (USD)
28+
29+
```ts
30+
import { convertCryptoToFiat } from "thirdweb/pay";
31+
32+
// Get Ethereum price
33+
const result = convertCryptoToFiat({
34+
fromTokenAddress: NATIVE_TOKEN_ADDRESS,
35+
to: "USD",
36+
chain: ethereum,
37+
fromAmount: 1,
38+
});
39+
40+
// Result: 3404.11 (number)
41+
```

.changeset/wild-games-vanish.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+
Handle 0 value for maxPriorityFeePerGas in 712 transactions

.github/workflows/CI.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ jobs:
8787

8888
- run: pnpm test
8989

90-
- name: Upload coverage reports to Codecov
90+
- name: Code Coverage
9191
uses: codecov/codecov-action@v5
9292
with:
9393
directory: packages/

.github/workflows/issue.yml

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
name: Linked Issue
2+
3+
on:
4+
pull_request:
5+
types: [opened, edited]
6+
7+
env:
8+
VALID_ISSUE_PREFIXES: "CNCT|DASH"
9+
10+
jobs:
11+
linear:
12+
name: Linear
13+
runs-on: ubuntu-latest
14+
steps:
15+
- name: Check for linked issue
16+
uses: actions/github-script@v7
17+
with:
18+
script: |
19+
const pr = await github.rest.pulls.get({
20+
owner: context.repo.owner,
21+
repo: context.repo.repo,
22+
pull_number: context.issue.number
23+
});
24+
25+
const body = pr.data.body || '';
26+
const branchName = pr.data.head.ref;
27+
const issueRegex = new RegExp(`(${process.env.VALID_ISSUE_PREFIXES})-\\d+`, 'i');
28+
const branchIssueRegex = new RegExp(`(${process.env.VALID_ISSUE_PREFIXES.toLowerCase()})-\\d+`, 'i');
29+
30+
if (!issueRegex.test(body) && !branchIssueRegex.test(branchName)) {
31+
core.setFailed(
32+
`No valid issue reference found. PR body or branch name must contain an issue ID with one of these prefixes: ${process.env.VALID_ISSUE_PREFIXES}`
33+
);
34+
return;
35+
}
36+
37+
const matches = body.match(issueRegex) || branchName.match(branchIssueRegex);
38+
console.log(`Found issue reference: ${matches[0]}`);

.github/workflows/linear.yml

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

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22

apps/dashboard/package.json

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
"@chakra-ui/react": "^2.8.2",
2626
"@chakra-ui/styled-system": "^2.9.2",
2727
"@chakra-ui/theme-tools": "^2.1.2",
28-
"@emotion/react": "11.13.3",
29-
"@emotion/styled": "11.13.0",
28+
"@emotion/react": "11.13.5",
29+
"@emotion/styled": "11.13.5",
3030
"@hookform/resolvers": "^3.9.1",
31-
"@marsidev/react-turnstile": "^1.0.2",
31+
"@marsidev/react-turnstile": "^1.1.0",
3232
"@n8tb1t/use-scroll-position": "^2.0.3",
3333
"@radix-ui/react-accordion": "^1.2.1",
3434
"@radix-ui/react-alert-dialog": "^1.1.2",
@@ -46,16 +46,16 @@
4646
"@radix-ui/react-slot": "^1.1.0",
4747
"@radix-ui/react-switch": "^1.1.1",
4848
"@radix-ui/react-tooltip": "1.1.4",
49-
"@sentry/nextjs": "8.38.0",
50-
"@shazow/whatsabi": "^0.16.0",
51-
"@tanstack/react-query": "5.60.2",
49+
"@sentry/nextjs": "8.40.0",
50+
"@shazow/whatsabi": "^0.17.0",
51+
"@tanstack/react-query": "5.61.4",
5252
"@tanstack/react-table": "^8.17.3",
5353
"@thirdweb-dev/service-utils": "workspace:*",
5454
"@vercel/functions": "^1.4.2",
55-
"@vercel/og": "^0.6.2",
55+
"@vercel/og": "^0.6.4",
5656
"abitype": "1.0.6",
5757
"chakra-react-select": "^4.7.6",
58-
"class-variance-authority": "^0.7.0",
58+
"class-variance-authority": "^0.7.1",
5959
"clsx": "^2.1.1",
6060
"color": "^4.2.3",
6161
"compare-versions": "^6.1.0",
@@ -66,8 +66,7 @@
6666
"input-otp": "^1.4.1",
6767
"ioredis": "^5.4.1",
6868
"ipaddr.js": "^2.2.0",
69-
"lottie-react": "^2.4.0",
70-
"lucide-react": "0.456.0",
69+
"lucide-react": "0.461.0",
7170
"next": "15.0.3",
7271
"next-plausible": "^3.12.4",
7372
"next-seo": "^6.5.0",
@@ -93,8 +92,8 @@
9392
"shiki": "1.22.2",
9493
"sonner": "^1.7.0",
9594
"spdx-correct": "^3.2.0",
96-
"swagger-ui-react": "^5.17.14",
97-
"tailwind-merge": "^2.5.4",
95+
"swagger-ui-react": "^5.18.2",
96+
"tailwind-merge": "^2.5.5",
9897
"tailwindcss-animate": "^1.0.7",
9998
"thirdweb": "workspace:*",
10099
"tiny-invariant": "^1.3.3",
@@ -106,18 +105,18 @@
106105
"@chromatic-com/storybook": "3.2.2",
107106
"@next/bundle-analyzer": "15.0.3",
108107
"@next/eslint-plugin-next": "15.0.3",
109-
"@playwright/test": "1.48.2",
110-
"@storybook/addon-essentials": "8.4.4",
111-
"@storybook/addon-interactions": "8.4.4",
112-
"@storybook/addon-links": "8.4.4",
113-
"@storybook/addon-onboarding": "8.4.4",
114-
"@storybook/addon-viewport": "8.4.4",
115-
"@storybook/blocks": "8.4.4",
116-
"@storybook/nextjs": "8.4.4",
117-
"@storybook/react": "8.4.4",
118-
"@storybook/test": "8.4.4",
108+
"@playwright/test": "1.49.0",
109+
"@storybook/addon-essentials": "8.4.5",
110+
"@storybook/addon-interactions": "8.4.5",
111+
"@storybook/addon-links": "8.4.5",
112+
"@storybook/addon-onboarding": "8.4.5",
113+
"@storybook/addon-viewport": "8.4.5",
114+
"@storybook/blocks": "8.4.5",
115+
"@storybook/nextjs": "8.4.5",
116+
"@storybook/react": "8.4.5",
117+
"@storybook/test": "8.4.5",
119118
"@types/color": "4.2.0",
120-
"@types/node": "20.14.9",
119+
"@types/node": "22.10.0",
121120
"@types/papaparse": "^5.3.15",
122121
"@types/pluralize": "^0.0.33",
123122
"@types/qrcode": "^1.5.5",
@@ -129,16 +128,16 @@
129128
"@typescript-eslint/eslint-plugin": "7.14.1",
130129
"@typescript-eslint/parser": "7.14.1",
131130
"autoprefixer": "^10.4.19",
132-
"checkly": "^4.8.1",
131+
"checkly": "^4.11.0",
133132
"eslint": "8.57.0",
134133
"eslint-config-biome": "1.9.3",
135-
"eslint-plugin-react-compiler": "19.0.0-beta-a7bf2bd-20241110",
136-
"eslint-plugin-storybook": "^0.9.0",
137-
"knip": "5.37.0",
134+
"eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
135+
"eslint-plugin-storybook": "^0.11.1",
136+
"knip": "5.38.0",
138137
"next-sitemap": "^4.2.3",
139138
"postcss": "8.4.49",
140-
"storybook": "8.4.4",
139+
"storybook": "8.4.5",
141140
"tailwindcss": "3.4.15",
142-
"typescript": "5.6.3"
141+
"typescript": "5.7.2"
143142
}
144143
}

apps/dashboard/public/assets/about/coin-ventures.svg

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)