Skip to content

Commit

Permalink
Merge branch 'develop' into brian/token-detection-network-switch
Browse files Browse the repository at this point in the history
  • Loading branch information
bergeron authored Feb 8, 2024
2 parents 6550633 + 3fa4cd6 commit 2ad1f4f
Show file tree
Hide file tree
Showing 744 changed files with 6,429 additions and 4,183 deletions.
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/dist/KeyringController.js b/dist/KeyringController.js
index da9523afe0a83e3fa298b47a518cb583eb509e52..8fe701103975335ff02ed8195f250f35eedccbab 100644
index da3fb9c0bf437e07f1927bca0bbfc94ed8454c2d..a3211dc83edb5d18daf328adc5a63fee920dd321 100644
--- a/dist/KeyringController.js
+++ b/dist/KeyringController.js
@@ -662,7 +662,6 @@ class KeyringController extends base_controller_1.BaseControllerV2 {
@@ -713,7 +713,6 @@ class KeyringController extends base_controller_1.BaseController {
throw new Error('Seed phrase imported different accounts.');
}
});
Expand Down
34 changes: 33 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [11.8.0]
### Added
- Enhanced the Networks List with drag and drop functionality ([#21163] (https://github.com/MetaMask/metamask-extension/pull/21163))
- Added a deprecation warning for the Aurora network to inform users about its upcoming removal ([#21933] (https://github.com/MetaMask/metamask-extension/pull/21933))

### Changed
- Corrected a typo and improved the alignment of 'Terms of use' ([#22227] (https://github.com/MetaMask/metamask-extension/pull/22227))
- Changed the title of MetaMask pop-up window to 'MetaMask Dialog' ([#21680] (https://github.com/MetaMask/metamask-extension/pull/21680))
- Refined the Max fee calculation in Smart Swaps to ensure it does not exceed twice the estimated gas fee ([#22127] (https://github.com/MetaMask/metamask-extension/pull/22127))
- [MMI] Enabled the Cancel and Speed Up options for non-custodial accounts in MetaMask Institutional ([#22164] (https://github.com/MetaMask/metamask-extension/pull/22164))
- [MMI] Updated Consensys URLs from .net to .io ([#22107] (https://github.com/MetaMask/metamask-extension/pull/22107))
- [FLASK] Updated the background color of the Snap Avatar ([#22137] (https://github.com/MetaMask/metamask-extension/pull/22137))
- [FLASK] Updated the color of the tooltip icon in the transaction confirmation section ([#22144] (https://github.com/MetaMask/metamask-extension/pull/22144))
- [FLASK] Updated the weighting of permissions ([#22063] (https://github.com/MetaMask/metamask-extension/pull/22063))

### Fixed
- Improved the token autodetection feature to automatically trigger detection when the setting is enabled ([#21749] (https://github.com/MetaMask/metamask-extension/pull/21749))
- Fixed an issue causing duplicate entries for confirmed incoming transactions ([#21840] (https://github.com/MetaMask/metamask-extension/pull/21840))
- Fixed a rounding issue causing incorrect gas fee displays on the Optimism network ([#19960] (https://github.com/MetaMask/metamask-extension/pull/19960))
- Fixed an issue causing incorrect EIP-6963 provider names in MetaMask production builds ([#22090] (https://github.com/MetaMask/metamask-extension/pull/22090))
- Fixed a crash that occurred when the list of ordered networks was empty ([#22109] (https://github.com/MetaMask/metamask-extension/pull/22109))
- Fixed an issue where the settings search function only supported English and numbers ([#21013] (https://github.com/MetaMask/metamask-extension/pull/21013))

## [11.7.5]
### Fixed
- Fix compatability of MetaMask Extension and Chrome versions v122 and higher [#22590](https://github.com/MetaMask/metamask-extension/pull/22590)

## [11.7.4]

## [11.7.3]
### Fixed
- Ensure fiat token balances are displayed on the homescreen [#22295](https://github.com/MetaMask/metamask-extension/pull/22295)
Expand Down Expand Up @@ -4266,7 +4295,10 @@ Update styles and spacing on the critical error page ([#20350](https://github.c
### Uncategorized
- Added the ability to restore accounts from seed words.

[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.7.3...HEAD
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.8.0...HEAD
[11.8.0]: https://github.com/MetaMask/metamask-extension/compare/v11.7.5...v11.8.0
[11.7.5]: https://github.com/MetaMask/metamask-extension/compare/v11.7.4...v11.7.5
[11.7.4]: https://github.com/MetaMask/metamask-extension/compare/v11.7.3...v11.7.4
[11.7.3]: https://github.com/MetaMask/metamask-extension/compare/v11.7.2...v11.7.3
[11.7.2]: https://github.com/MetaMask/metamask-extension/compare/v11.7.1...v11.7.2
[11.7.1]: https://github.com/MetaMask/metamask-extension/compare/v11.7.0...v11.7.1
Expand Down
56 changes: 48 additions & 8 deletions app/_locales/en/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/background.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html>
<html dir="ltr">
<head>
<meta charset="utf-8">
</head>
Expand Down
5 changes: 2 additions & 3 deletions app/home.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
<!doctype html>
<html>
<html dir="ltr">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
<title>MetaMask</title>
{{@if(it.isMMI)}}
<title>MetaMask Institutional</title>
{{/if}}
<link rel="stylesheet" type="text/css" href="./index.css" title="ltr">
<link rel="stylesheet" type="text/css" href="./index-rtl.css" title="rtl" disabled>
<link rel="stylesheet" type="text/css" href="./index.css">
</head>
<body>
<div id="app-content">
Expand Down
Loading

0 comments on commit 2ad1f4f

Please sign in to comment.