Skip to content

Commit 687a694

Browse files
committed
Merge branch 'main' into greg/cnct-2535-useactiveaccount-should-be-undefined-when-disconnect-with-aa
2 parents a32d1fb + 406c885 commit 687a694

File tree

139 files changed

+6292
-4499
lines changed

Some content is hidden

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

139 files changed

+6292
-4499
lines changed

.changeset/blue-bees-ring.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+
default account components to not retry on failure

.changeset/ninety-foxes-refuse.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+
accept `react 19` as peer explicitly

.changeset/odd-coats-cheer.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
---
2+
"thirdweb": patch
3+
---
4+
5+
BETA support for 7579 modular smart accounts
6+
7+
You can now create modular smart wallets using the 7579 preset.
8+
9+
Keep in mind that this is in BETA, and there might be breaking API changes.
10+
11+
```typescript
12+
import { sepolia } from "thirdweb/chains";
13+
import { smartWallet, Config } from "thirdweb/wallets/smart";
14+
const modularSmartWallet = smartWallet(
15+
Config.erc7579({
16+
chain: sepolia,
17+
sponsorGas: true,
18+
factoryAddress: "0x...", // the 7579 factory address
19+
validatorAddress: "0x...", // the default validator module address
20+
}),
21+
});
22+
```

.changeset/silent-hats-melt.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+
Add erc20Value to buyFromListing transaction

.changeset/strong-beans-pump.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+
Support ERC6492 for smart account signatures

.github/workflows/issue.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
types: [opened, edited]
66

77
env:
8-
VALID_ISSUE_PREFIXES: "CNCT|DASH"
8+
VALID_ISSUE_PREFIXES: "CNCT|DASH|PROT"
99

1010
jobs:
1111
linear:

apps/dashboard/framer-rewrites.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,7 @@ module.exports = [
2828
// -- TPP --
2929
"/trusted-partner-program",
3030
"/trusted-partner-program/:partner_slug",
31+
// -- legal --
32+
"/terms",
33+
"/privacy-policy",
3134
];

apps/dashboard/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
"ioredis": "^5.4.1",
6868
"ipaddr.js": "^2.2.0",
6969
"lucide-react": "0.468.0",
70-
"next": "15.0.3",
70+
"next": "15.0.4",
7171
"next-plausible": "^3.12.4",
7272
"next-seo": "^6.5.0",
7373
"next-themes": "^0.4.4",
@@ -76,10 +76,10 @@
7676
"pluralize": "^8.0.0",
7777
"posthog-js": "1.67.1",
7878
"qrcode": "^1.5.3",
79-
"react": "19.0.0-rc-69d4b800-20241021",
79+
"react": "19.0.0",
8080
"react-children-utilities": "^2.10.0",
8181
"react-day-picker": "^8.10.1",
82-
"react-dom": "19.0.0-rc-69d4b800-20241021",
82+
"react-dom": "19.0.0",
8383
"react-dropzone": "^14.3.5",
8484
"react-error-boundary": "^4.1.2",
8585
"react-hook-form": "7.53.2",
@@ -88,7 +88,7 @@
8888
"recharts": "^2.13.3",
8989
"remark-gfm": "^4.0.0",
9090
"server-only": "^0.0.1",
91-
"shiki": "1.22.2",
91+
"shiki": "1.24.0",
9292
"sonner": "^1.7.0",
9393
"spdx-correct": "^3.2.0",
9494
"swagger-ui-react": "^5.18.2",
@@ -102,8 +102,8 @@
102102
"devDependencies": {
103103
"@chakra-ui/cli": "^2.4.1",
104104
"@chromatic-com/storybook": "3.2.2",
105-
"@next/bundle-analyzer": "15.0.3",
106-
"@next/eslint-plugin-next": "15.0.3",
105+
"@next/bundle-analyzer": "15.0.4",
106+
"@next/eslint-plugin-next": "15.0.4",
107107
"@playwright/test": "1.49.0",
108108
"@storybook/addon-essentials": "8.4.7",
109109
"@storybook/addon-interactions": "8.4.7",
@@ -119,8 +119,8 @@
119119
"@types/papaparse": "^5.3.15",
120120
"@types/pluralize": "^0.0.33",
121121
"@types/qrcode": "^1.5.5",
122-
"@types/react": "npm:types-react@19.0.0-rc.1",
123-
"@types/react-dom": "npm:types-react-dom@19.0.0-rc.1",
122+
"@types/react": "19.0.0",
123+
"@types/react-dom": "19.0.0",
124124
"@types/react-table": "^7.7.20",
125125
"@types/spdx-correct": "^3.1.3",
126126
"@types/swagger-ui-react": "^4.18.3",

apps/dashboard/redirects.js

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -301,6 +301,24 @@ async function redirects() {
301301
destination: "/community/ambassadors",
302302
permanent: false,
303303
},
304+
// redirect `/tos` to `/terms`
305+
{
306+
source: "/tos",
307+
destination: "/terms",
308+
permanent: false,
309+
},
310+
// redirect `/privacy` to `/privacy-policy`
311+
{
312+
source: "/privacy",
313+
destination: "/privacy-policy",
314+
permanent: false,
315+
},
316+
// redirect `/mission` to `/home`
317+
{
318+
source: "/mission",
319+
destination: "/home",
320+
permanent: false,
321+
},
304322
...legacyDashboardToTeamRedirects,
305323
];
306324
}

apps/dashboard/src/@/components/blocks/app-footer.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,14 @@ export function AppFooter(props: AppFooterProps) {
107107
</Link>
108108
<Link
109109
className="px-[10px] py-[6px] text-muted-foreground text-sm hover:underline"
110-
href="https://thirdweb.com/privacy"
110+
href="https://thirdweb.com/privacy-policy"
111111
target="_blank"
112112
>
113113
Privacy Policy
114114
</Link>
115115
<Link
116116
className="px-[10px] py-[6px] text-muted-foreground text-sm hover:underline"
117-
href="https://thirdweb.com/tos"
117+
href="https://thirdweb.com/terms"
118118
target="_blank"
119119
>
120120
Terms of Service

0 commit comments

Comments
 (0)