Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master sync following v10.22.2 #16548

Merged
merged 26 commits into from
Nov 17, 2022
+16 −2
Merged

Master sync following v10.22.2 #16548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d91ce9c
Revert "Merge pull request #16353 from MetaMask/Version-v10.22.0"
Gudahtt Nov 15, 2022
6c942db
Version v10.22.1
metamaskbot Nov 15, 2022
12d0fc4
Restore v10.22.0 changelog
Gudahtt Nov 15, 2022
6473b7d
Prevent user from editing a contract interaction created by a dapp (#…
danjm Nov 15, 2022
097c8a2
Update changelog
Gudahtt Nov 15, 2022
3da175c
Ignore advisary related to 3Box
Gudahtt Nov 15, 2022
69ccb37
Fix e2e test
Gudahtt Nov 15, 2022
ffd1e58
Merge pull request #16504 from MetaMask/Version-v10.22.1
Gudahtt Nov 15, 2022
6035bbf
Revert "Fix e2e test"
Gudahtt Nov 15, 2022
205d60f
Revert "Ignore advisary related to 3Box"
Gudahtt Nov 15, 2022
ace7b0c
Revert "Revert "Merge pull request #16353 from MetaMask/Version-v10.2…
Gudahtt Nov 15, 2022
1b602d8
Version v10.22.2
metamaskbot Nov 15, 2022
821cf78
Update changelog
Gudahtt Nov 15, 2022
f754d81
Configure smart transactions controller to support goerli (#16500)
danjm Nov 16, 2022
2bc4408
Update SmartTransactionsController to v3 (#16511)
Gudahtt Nov 16, 2022
66c0a60
policies + yarn
seaona Nov 16, 2022
636eddd
yarn dedupe + policies + changelog
seaona Nov 16, 2022
05bc2fd
Update CHANGELOG.md entry
seaona Nov 16, 2022
8b1980d
[e2e] Fix RPC flaky test (#16530)
seaona Nov 16, 2022
72e49f4
Add mocks for E2E tests (#16527)
dan437 Nov 16, 2022
7ea05e2
policies update
seaona Nov 16, 2022
dc0097d
Update package json
seaona Nov 16, 2022
d386f05
yarn deduplicate
seaona Nov 16, 2022
34a167d
policies (hopefully last one)
seaona Nov 16, 2022
5f1a5d1
Merge pull request #16516 from MetaMask/Version-v10.22.2
danjm Nov 17, 2022
d7adbcd
Merge remote-tracking branch 'origin/develop' into master-sync
danjm Nov 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [10.22.2]
### Changed
- Restore changes from v10.22.0
- Fix deadlock encountered while performing Swaps on unsupported testnets ([#16511](https://github.com/MetaMask/metamask-extension/pull/16511))

## [10.22.1]
### Changed
- Temporarily revert v10.22.0

### Fixed
- Prevent user from editing a contract interaction initiated by a dapp ([#16498](https://github.com/MetaMask/metamask-extension/pull/16498))

## [10.22.0]
### Added
- Add Aurora network to the Popular Custom Network list ([#16039](https://github.com/MetaMask/metamask-extension/pull/16039))
Expand Down Expand Up @@ -3289,7 +3301,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Uncategorized
- Added the ability to restore accounts from seed words.

[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.22.0...HEAD
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.22.2...HEAD
[10.22.2]: https://github.com/MetaMask/metamask-extension/compare/v10.22.1...v10.22.2
[10.22.1]: https://github.com/MetaMask/metamask-extension/compare/v10.22.0...v10.22.1
[10.22.0]: https://github.com/MetaMask/metamask-extension/compare/v10.21.2...v10.22.0
[10.21.2]: https://github.com/MetaMask/metamask-extension/compare/v10.21.1...v10.21.2
[10.21.1]: https://github.com/MetaMask/metamask-extension/compare/v10.21.0...v10.21.1
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metamask-crx",
"version": "10.22.0",
"version": "10.22.2",
"private": true,
"repository": {
"type": "git",
Expand Down