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

chore: Resolve conflicts v12.7.0 with latest master #28468

Merged
merged 6 commits into from
Nov 15, 2024
+6 −1
Merged

chore: Resolve conflicts v12.7.0 with latest master #28468

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
91a4ec4
Version v12.6.1
metamaskbot Nov 11, 2024
f2865d1
fix (cherry-pick): gas limit estimation (#28327) (#28405)
matthewwalsh0 Nov 11, 2024
bf078ad
chore: update changelog (#28410)
matthewwalsh0 Nov 11, 2024
aa32744
Merge pull request #28404 from MetaMask/Version-v12.6.1
danjm Nov 13, 2024
495eb87
Merge remote-tracking branch 'origin/master' into resolve-conflicts-v…
hjetpoluru Nov 14, 2024
a428b7d
Fixed lint
hjetpoluru Nov 14, 2024
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
7 changes: 6 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,6 +275,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- feat: Add performance metrics for signature requests ([#26967](https://github.com/MetaMask/metamask-extension/pull/26967))
- fix(NOTIFY-1166): rename account sync event names ([#27413](https://github.com/MetaMask/metamask-extension/pull/27413))

## [12.6.1]
### Fixed
- Fixed gas limit estimation on Base and BNB chains ([#28327](https://github.com/MetaMask/metamask-extension/pull/28327))

## [12.6.0]
### Added
- Added the APE network icon ([#27841](https://github.com/MetaMask/metamask-extension/pull/27841))
Expand Down Expand Up @@ -5573,7 +5577,8 @@ Update styles and spacing on the critical error page ([#20350](https://github.c


[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.7.0...HEAD
[12.7.0]: https://github.com/MetaMask/metamask-extension/compare/v12.6.0...v12.7.0
[12.7.0]: https://github.com/MetaMask/metamask-extension/compare/v12.6.1...v12.7.0
[12.6.1]: https://github.com/MetaMask/metamask-extension/compare/v12.6.0...v12.6.1
[12.6.0]: https://github.com/MetaMask/metamask-extension/compare/v12.5.1...v12.6.0
[12.5.1]: https://github.com/MetaMask/metamask-extension/compare/v12.5.0...v12.5.1
[12.5.0]: https://github.com/MetaMask/metamask-extension/compare/v12.4.2...v12.5.0
Expand Down
Loading