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

Jump to bottom

Version v11.12.3 #23547

Merged
merged 3 commits into from
Mar 19, 2024
Merged

Version v11.12.3 #23547

merged 3 commits into from
Mar 19, 2024
+48 −3

Conversation

zone-live
Copy link
Contributor

Description

No conflicts when cherry picking the two commits.

Adds two fixes for MMI build, cherry picked from develop.
#23516
#23494

5222d6f24b3099e3dfcc617335b4d65a7195e853
466e7ecf003a3d6c6d8ccfd1b7ff187b5d3f0f51

Related issues

Fixes:

Manual testing steps

  1. Go to this page...

Screenshots/Recordings

Before

After

Pre-merge author checklist

  • I’ve followed MetaMask Coding Standards.
  • I've clearly explained what problem this PR is solving and how it is solved.
  • I've linked related issues
  • I've included manual testing steps
  • I've included screenshots/recordings if applicable
  • I’ve included tests if applicable
  • I’ve documented my code using JSDoc format if applicable
  • I’ve applied the right labels on the PR (see labeling guidelines). Not required for external contributors.
  • I’ve properly set the pull request status:
    • In case it's not yet "ready for review", I've set it to "draft".
    • In case it's "ready for review", I've changed it from "draft" to "non-draft".

Pre-merge reviewer checklist

  • I've manually tested the PR (e.g. pull and build branch, run the app, test code being changed).
  • I confirm that this PR addresses all acceptance criteria described in the ticket it closes and includes the necessary testing evidence such as recordings and or screenshots.

zone-live and others added 3 commits March 18, 2024 12:33
@zone-live
chore: MMI adds fallback property when environment key doesnt exist (#…
f604c73 
…23494)

## **Description**

We need to add the `service` key value as a fallback for when the
custodian doesn't send an `environment` property.

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
@zone-live @metamaskbot
chore: adds a needed code fence and blockaid to MMI build (#23516)
ae36b16 
## **Description**

In MMI build we currently don't have `blockaid` in our features
(builds.yml), so this caused a bug, addressed now by this PR. The
problem is that the `appStateController` being used inside
`app/scripts/lib/createRPCMethodTrackingMiddleware.js `is not code
fenced.

https://github.com/MetaMask/metamask-extension/blob/b5fda83000f8f8c945de88fb05086fa5215361c8/app/scripts/lib/createRPCMethodTrackingMiddleware.js#L322

It's being passed in `metamask-controller` protected by the code fence:
https://github.com/MetaMask/metamask-extension/blob/b5fda83000f8f8c945de88fb05086fa5215361c8/app/scripts/metamask-controller.js#L4728
But inside the createRPCMethodTrackingMiddleware it's being used without
the `blockaid` code fence, so in our case since we didn't have
`blockaid` added in the yml to our build type, the `appStateController`
would always be undefined.

This was introduced in this PR
https://github.com/MetaMask/metamask-extension/pull/22874/files and the
[author
mentioned](https://github.com/MetaMask/metamask-extension/pull/22874/files#r1483023840)
that it should be code fenced, but never did btw.


## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->

### **After**

<!-- [screenshots/recordings] -->

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.

---------

Co-authored-by: MetaMask Bot <[email protected]>
@zone-live
chore: updates changelog and package json
55f21f7
@zone-live zone-live added the team-mmi PRs from the MMI team label Mar 18, 2024
@zone-live zone-live requested review from a team as code owners March 18, 2024 12:41
@github-actions GitHub Actions
Copy link
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

@metamaskbot
Copy link
Collaborator

Builds ready [55f21f7]
Page Load Metrics (1715 ± 110 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint1254311916833
domContentLoaded1078362211
load143425391715229110
domInteractive1078362211

@metamaskbot metamaskbot added the release-11.12.3 Issue or pull request that will be included in release 11.12.3 label Mar 18, 2024
This was referenced Mar 18, 2024
Merged
Merged
@zone-live zone-live requested a review from danjm March 18, 2024 14:43
@danjm danjm merged commit a06fd11 into master Mar 19, 2024
69 of 71 checks passed
@danjm danjm deleted the Version-v11.12.3 branch March 19, 2024 10:09
@github-actions github-actions bot locked and limited conversation to collaborators Mar 19, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@danjm danjm danjm approved these changes

@albertolive albertolive albertolive approved these changes

Assignees
No one assigned
Labels
release-11.12.3 Issue or pull request that will be included in release 11.12.3 team-mmi PRs from the MMI team
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zone-live @metamaskbot @albertolive @danjm