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.

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

Version v11.12.3 #23547

Merged
merged 3 commits into from
Mar 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [11.12.3]
### Fixed
- [MMI] Fixes an error related with a missing code fence, when the MMI build didn't have the blockaid feature ([#23516](https://github.com/MetaMask/metamask-extension/pull/23516))
- [MMI] Fixes a bug for some custodians that don't send us the env property when connection to MMI ([#23494](https://github.com/MetaMask/metamask-extension/pull/23494))

## [11.12.2]
### Fixed
- Fix transaction confirmations so that they correctly show estimated fees instead of max possible fees
Expand Down Expand Up @@ -4502,7 +4507,8 @@ 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.12.2...HEAD
[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v11.12.3...HEAD
[11.12.3]: https://github.com/MetaMask/metamask-extension/compare/v11.12.2...v11.12.3
[11.12.2]: https://github.com/MetaMask/metamask-extension/compare/v11.12.1...v11.12.2
[11.12.1]: https://github.com/MetaMask/metamask-extension/compare/v11.12.0...v11.12.1
[11.12.0]: https://github.com/MetaMask/metamask-extension/compare/v11.11.4...v11.12.0
Expand Down
2 changes: 2 additions & 0 deletions app/scripts/lib/createRPCMethodTrackingMiddleware.js
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ export default function createRPCMethodTrackingMiddleware({

let blockaidMetricProps = {};

///: BEGIN:ONLY_INCLUDE_IF(blockaid)
if (!isDisabledRPCMethod) {
if (SIGNING_METHODS.includes(method)) {
const securityAlertResponse =
Expand All @@ -337,6 +338,7 @@ export default function createRPCMethodTrackingMiddleware({
});
}
}
///: END:ONLY_INCLUDE_IF

const properties = {
...eventProperties,
Expand Down
1 change: 1 addition & 0 deletions builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ buildTypes:
features:
- build-mmi
- snaps
- blockaid
env:
- INFURA_MMI_PROJECT_ID
- SEGMENT_MMI_WRITE_KEY
Expand Down
34 changes: 34 additions & 0 deletions lavamoat/browserify/mmi/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1827,6 +1827,40 @@
"webpack>events": true
}
},
"@metamask/ppom-validator": {
"globals": {
"URL": true,
"console.error": true,
"crypto": true
},
"packages": {
"@metamask/controller-utils": true,
"@metamask/eth-query>json-rpc-random-id": true,
"@metamask/ppom-validator>@metamask/base-controller": true,
"@metamask/ppom-validator>crypto-js": true,
"@metamask/ppom-validator>elliptic": true,
"await-semaphore": true,
"browserify>buffer": true
}
},
"@metamask/ppom-validator>@metamask/base-controller": {
"globals": {
"setTimeout": true
},
"packages": {
"immer": true
}
},
"@metamask/ppom-validator>crypto-js": {
"globals": {
"crypto": true,
"define": true,
"msCrypto": true
},
"packages": {
"browserify>browser-resolve": true
}
},
"@metamask/ppom-validator>elliptic": {
"packages": {
"@metamask/ppom-validator>elliptic>brorand": true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "metamask-crx",
"version": "11.12.2",
"version": "11.12.3",
"private": true,
"repository": {
"type": "git",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@ const ConfirmAddCustodianToken = () => {
const custodianLabel =
connectRequest.labels?.find((label) => label.key === 'service')?.value ||
t('custodian');

// Some custodians dont sent the "environment" inthe connect request
const custodian = findCustodianByEnvName(
connectRequest.environment,
connectRequest.environment || custodianLabel,
custodians,
);

Expand Down
Loading