Skip to content

Commit

Permalink
Merge pull request #26961 from MetaMask/merge-v12.1.3-to-v12.2.0
Browse files Browse the repository at this point in the history
Merge v12.1.3 to v12.2.0
  • Loading branch information
Gudahtt authored Sep 6, 2024
2 parents 215e4d5 + 535c139 commit a60dbcb
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
7 changes: 6 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [12.2.0]

## [12.1.3]
### Fixed
- Fix `eth_signTypedData` error when `verifyingContract` is not provided ([#26914](https://github.com/MetaMask/metamask-extension/pull/26914))

## [12.1.2]
### Fixed
- Fix Trezor signing and connecting accounts ([#26882](https://github.com/MetaMask/metamask-extension/pull/26882))
Expand Down Expand Up @@ -5013,7 +5017,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c


[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.2.0...HEAD
[12.2.0]: https://github.com/MetaMask/metamask-extension/compare/v12.1.2...v12.2.0
[12.2.0]: https://github.com/MetaMask/metamask-extension/compare/v12.1.3...v12.2.0
[12.1.3]: https://github.com/MetaMask/metamask-extension/compare/v12.1.2...v12.1.3
[12.1.2]: https://github.com/MetaMask/metamask-extension/compare/v12.1.1...v12.1.2
[12.1.1]: https://github.com/MetaMask/metamask-extension/compare/v12.1.0...v12.1.1
[12.1.0]: https://github.com/MetaMask/metamask-extension/compare/v12.0.6...v12.1.0
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@
"@metamask/design-tokens": "^4.0.0",
"@metamask/ens-controller": "^10.0.1",
"@metamask/eth-json-rpc-filters": "^7.0.0",
"@metamask/eth-json-rpc-middleware": "^14.0.0",
"@metamask/eth-json-rpc-middleware": "^14.0.1",
"@metamask/eth-ledger-bridge-keyring": "patch:@metamask/eth-ledger-bridge-keyring@npm%3A2.0.1#~/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch",
"@metamask/eth-query": "^4.0.0",
"@metamask/eth-sig-util": "^7.0.1",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5105,9 +5105,9 @@ __metadata:
languageName: node
linkType: hard

"@metamask/eth-json-rpc-middleware@npm:^14.0.0":
version: 14.0.0
resolution: "@metamask/eth-json-rpc-middleware@npm:14.0.0"
"@metamask/eth-json-rpc-middleware@npm:^14.0.1":
version: 14.0.1
resolution: "@metamask/eth-json-rpc-middleware@npm:14.0.1"
dependencies:
"@metamask/eth-block-tracker": "npm:^11.0.1"
"@metamask/eth-json-rpc-provider": "npm:^4.1.1"
Expand All @@ -5120,7 +5120,7 @@ __metadata:
klona: "npm:^2.0.6"
pify: "npm:^5.0.0"
safe-stable-stringify: "npm:^2.4.3"
checksum: 10/1b62b1b2f2cce21cc4d7c4ccaf33024552119f09258cad1af683c317b90a5bbbb33311e3cb22a44913032deb93876ffdcbd591ed0269043af560a7a50a8ea6d9
checksum: 10/39beecb0d2be19854b132fd615aee1f29195602d3db902f52755260b26a2c37c0a91cd635a09d4dc16f922d32bb229003b338228ae29577c5151d880fad04637
languageName: node
linkType: hard

Expand Down Expand Up @@ -25272,7 +25272,7 @@ __metadata:
"@metamask/eslint-config-typescript": "npm:^9.0.1"
"@metamask/eslint-plugin-design-tokens": "npm:^1.1.0"
"@metamask/eth-json-rpc-filters": "npm:^7.0.0"
"@metamask/eth-json-rpc-middleware": "npm:^14.0.0"
"@metamask/eth-json-rpc-middleware": "npm:^14.0.1"
"@metamask/eth-ledger-bridge-keyring": "patch:@metamask/eth-ledger-bridge-keyring@npm%3A2.0.1#~/.yarn/patches/@metamask-eth-ledger-bridge-keyring-npm-2.0.1-7a5d815b2d.patch"
"@metamask/eth-query": "npm:^4.0.0"
"@metamask/eth-sig-util": "npm:^7.0.1"
Expand Down

0 comments on commit a60dbcb

Please sign in to comment.