Skip to content

Commit

Permalink
Merge branch 'main' into greg/cnct-2535-useactiveaccount-should-be-un…
Browse files Browse the repository at this point in the history
…defined-when-disconnect-with-aa
  • Loading branch information
gregfromstl committed Dec 7, 2024
2 parents a8ebdbb + 625febb commit 0942bdb
Show file tree
Hide file tree
Showing 13 changed files with 567 additions and 170 deletions.
5 changes: 0 additions & 5 deletions .changeset/blue-bees-ring.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/little-kids-wash.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/ninety-foxes-refuse.md

This file was deleted.

22 changes: 0 additions & 22 deletions .changeset/odd-coats-cheer.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/silent-hats-melt.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/strong-beans-pump.md

This file was deleted.

6 changes: 3 additions & 3 deletions apps/dashboard/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"@radix-ui/react-tooltip": "1.1.4",
"@sentry/nextjs": "8.42.0",
"@shazow/whatsabi": "^0.17.0",
"@tanstack/react-query": "5.62.2",
"@tanstack/react-query": "5.62.3",
"@tanstack/react-table": "^8.17.3",
"@thirdweb-dev/service-utils": "workspace:*",
"@vercel/functions": "^1.5.1",
Expand Down Expand Up @@ -119,8 +119,8 @@
"@types/papaparse": "^5.3.15",
"@types/pluralize": "^0.0.33",
"@types/qrcode": "^1.5.5",
"@types/react": "19.0.0",
"@types/react-dom": "19.0.0",
"@types/react": "19.0.1",
"@types/react-dom": "19.0.1",
"@types/react-table": "^7.7.20",
"@types/spdx-correct": "^3.1.3",
"@types/swagger-ui-react": "^4.18.3",
Expand Down
6 changes: 3 additions & 3 deletions apps/playground-web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"@radix-ui/react-switch": "^1.1.1",
"@radix-ui/react-tabs": "^1.1.1",
"@radix-ui/react-tooltip": "1.1.4",
"@tanstack/react-query": "5.62.2",
"@tanstack/react-query": "5.62.3",
"@thirdweb-dev/engine": "^0.0.16",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
Expand All @@ -47,8 +47,8 @@
},
"devDependencies": {
"@types/node": "22.10.1",
"@types/react": "19.0.0",
"@types/react-dom": "19.0.0",
"@types/react": "19.0.1",
"@types/react-dom": "19.0.1",
"eslint": "8.57.0",
"eslint-config-next": "15.0.4",
"eslint-plugin-react-compiler": "19.0.0-beta-df7b47d-20241124",
Expand Down
6 changes: 3 additions & 3 deletions apps/portal/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"@radix-ui/react-dropdown-menu": "^2.1.2",
"@radix-ui/react-slot": "^1.1.0",
"@radix-ui/react-tabs": "^1.1.1",
"@tanstack/react-query": "5.62.2",
"@tanstack/react-query": "5.62.3",
"@tryghost/content-api": "^1.11.21",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
Expand Down Expand Up @@ -55,8 +55,8 @@
"@types/flexsearch": "^0.7.6",
"@types/mdx": "^2.0.13",
"@types/node": "22.10.1",
"@types/react": "19.0.0",
"@types/react-dom": "19.0.0",
"@types/react": "19.0.1",
"@types/react-dom": "19.0.1",
"@types/react-html-parser": "^2.0.6",
"@types/tryghost__content-api": "^1.3.16",
"@typescript-eslint/eslint-plugin": "7.14.1",
Expand Down
6 changes: 3 additions & 3 deletions apps/wallet-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@radix-ui/react-label": "^2.1.0",
"@radix-ui/react-popover": "^1.1.2",
"@radix-ui/react-slot": "^1.1.0",
"@tanstack/react-query": "5.62.2",
"@tanstack/react-query": "5.62.3",
"class-variance-authority": "^0.7.1",
"clsx": "^2.1.1",
"cmdk": "^1.0.4",
Expand All @@ -37,8 +37,8 @@
"devDependencies": {
"@next/eslint-plugin-next": "15.0.4",
"@types/node": "22.10.1",
"@types/react": "19.0.0",
"@types/react-dom": "19.0.0",
"@types/react": "19.0.1",
"@types/react-dom": "19.0.1",
"@typescript-eslint/eslint-plugin": "7.14.1",
"@typescript-eslint/parser": "7.14.1",
"eslint": "8.57.0",
Expand Down
35 changes: 35 additions & 0 deletions packages/thirdweb/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,40 @@
# thirdweb

## 5.75.0

### Minor Changes

- [#5598](https://github.com/thirdweb-dev/js/pull/5598) [`16e5347`](https://github.com/thirdweb-dev/js/commit/16e534714e65af831553d47496d9018dfc73995c) Thanks [@gregfromstl](https://github.com/gregfromstl)! - Update underlying APIs to use Ox for transaction serialization

### Patch Changes

- [#5639](https://github.com/thirdweb-dev/js/pull/5639) [`ed0886a`](https://github.com/thirdweb-dev/js/commit/ed0886a89f06f4c4065e37aa791d99eff2ce59d1) Thanks [@jnsdls](https://github.com/jnsdls)! - default account components to not retry on failure

- [#5640](https://github.com/thirdweb-dev/js/pull/5640) [`5070e76`](https://github.com/thirdweb-dev/js/commit/5070e76d35d88868c56df86ab673527b159b0d9c) Thanks [@jnsdls](https://github.com/jnsdls)! - accept `react 19` as peer explicitly

- [#5487](https://github.com/thirdweb-dev/js/pull/5487) [`5574c15`](https://github.com/thirdweb-dev/js/commit/5574c15ec887c963a148cb54f04e5c0b5d3cff8e) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - BETA support for 7579 modular smart accounts

You can now create modular smart wallets using the 7579 preset.

Keep in mind that this is in BETA, and there might be breaking API changes.

```typescript
import { sepolia } from "thirdweb/chains";
import { smartWallet, Config } from "thirdweb/wallets/smart";
const modularSmartWallet = smartWallet(
Config.erc7579({
chain: sepolia,
sponsorGas: true,
factoryAddress: "0x...", // the 7579 factory address
validatorAddress: "0x...", // the default validator module address
}),
});
```

- [#5630](https://github.com/thirdweb-dev/js/pull/5630) [`0aa2416`](https://github.com/thirdweb-dev/js/commit/0aa24165ce66f837d3c22d6e1841de984e335863) Thanks [@kien-ngo](https://github.com/kien-ngo)! - Add erc20Value to buyFromListing transaction

- [#5641](https://github.com/thirdweb-dev/js/pull/5641) [`d1716fc`](https://github.com/thirdweb-dev/js/commit/d1716fc793d8cc57908192674f3aefe8ee66a5f8) Thanks [@joaquim-verges](https://github.com/joaquim-verges)! - Support ERC6492 for smart account signatures

## 5.74.0

### Minor Changes
Expand Down
12 changes: 6 additions & 6 deletions packages/thirdweb/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "thirdweb",
"version": "5.74.0",
"version": "5.75.0",
"repository": {
"type": "git",
"url": "git+https://github.com/thirdweb-dev/js.git#main"
Expand Down Expand Up @@ -210,7 +210,7 @@
"@radix-ui/react-focus-scope": "1.1.0",
"@radix-ui/react-icons": "1.3.2",
"@radix-ui/react-tooltip": "1.1.4",
"@tanstack/react-query": "5.62.2",
"@tanstack/react-query": "5.62.3",
"@walletconnect/ethereum-provider": "2.17.2",
"@walletconnect/sign-client": "2.17.2",
"abitype": "1.0.7",
Expand Down Expand Up @@ -342,7 +342,7 @@
"@testing-library/react": "^16.1.0",
"@testing-library/user-event": "^14.5.2",
"@types/cross-spawn": "^6.0.6",
"@types/react": "19.0.0",
"@types/react": "19.0.1",
"@viem/anvil": "0.0.10",
"@vitejs/plugin-react": "^4.3.4",
"@vitest/coverage-v8": "2.1.8",
Expand All @@ -355,15 +355,15 @@
"expo-web-browser": "14.0.1",
"happy-dom": "15.11.7",
"knip": "5.39.2",
"msw": "2.6.6",
"msw": "2.6.7",
"prettier": "3.3.3",
"react": "19.0.0",
"react-dom": "19.0.0",
"react-native": "0.76.3",
"react-native": "0.76.4",
"react-native-aes-gcm-crypto": "0.2.2",
"react-native-passkey": "3.0.0",
"react-native-quick-crypto": "0.7.8",
"react-native-svg": "15.9.0",
"react-native-svg": "15.10.1",
"rimraf": "6.0.1",
"sharp": "^0.33.5",
"size-limit": "11.1.6",
Expand Down
Loading

0 comments on commit 0942bdb

Please sign in to comment.