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.11.2 #23310

Merged
merged 8 commits into from
Mar 6, 2024
Merged

Version v11.11.2 #23310

merged 8 commits into from
Mar 6, 2024

Conversation

danjm
Copy link
Contributor

@danjm danjm commented Mar 5, 2024

No description provided.

Copy link
Contributor

github-actions bot commented Mar 5, 2024

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.

@danjm danjm changed the title v11.11.2 Version v11.11.2 Mar 5, 2024
@metamaskbot metamaskbot added the INVALID-PR-TEMPLATE PR's body doesn't match template label Mar 5, 2024
@metamaskbot
Copy link
Collaborator

Builds ready [e16f629]
Page Load Metrics (1855 ± 84 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint1062341493818
domContentLoaded13150373115
load15132241185517584
domInteractive13150373115

@metamaskbot metamaskbot added the release-11.11.2 Issue or pull request that will be included in release 11.11.2 label Mar 5, 2024
@metamaskbot
Copy link
Collaborator

Builds ready [762c2c3]
Page Load Metrics (1657 ± 116 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint97146126136
domContentLoaded10422684
load110620051657241116
domInteractive10422684

Cherry-picks stake image commit in v11.11.2

Original PR into `develop`:
#23324
@metamaskbot
Copy link
Collaborator

Builds ready [224db80]
Page Load Metrics (1903 ± 149 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint1183211645024
domContentLoaded107234157
load147828051903311149
domInteractive107234157

@metamaskbot
Copy link
Collaborator

Builds ready [debd1fe]
Page Load Metrics (1979 ± 100 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint1012141372512
domContentLoaded104424105
load154923541979209100
domInteractive104424105

We previously added a UI validation to prevent confirming a transaction
if another was being signed or submitted, as it would lock up the UI due
to locks in the TransactionController.

Except this is impacting MMI also despite them supporting this since
they skip signing using a hook.

The quickest fix is to literally just disable the UI validation using an
MMI code fence.

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23342?quickstart=1)

Fixes: #23343

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

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

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

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

- [ ] 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".

- [ ] 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.
@danjm danjm force-pushed the Version-v11.11.2 branch from 3d9b212 to a78eb45 Compare March 6, 2024 19:32
jpuri and others added 4 commits March 6, 2024 16:21
…ell (#23348) (#23355)

## **Description**
There were no merge conflicts when picking these commits

Fixing an issue where the Preferred Currency setting appeared to be
flipped, and a different issue where the token symbol was being shown as
USD rather than ETH.
<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution? -->

[![Open in GitHub

Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/23348?quickstart=1)

## **Related issues**

Fixes:

## **Manual testing steps**

1. Open Extension
2. Make note of which preferred currency setting is currently on
3. Verify that if Fiat is toggled on, Fiat appears on top inside the
first Token Cell component, and symbols are correct.
4. Verify that if ETH is toggled on, ETH appears on top inside the first
Token Cell Component, and symbols are correct.

## **Screenshots/Recordings**

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

### **Before**

<!-- [screenshots/recordings] -->
Fiat Toggled ON:
<img width="355" alt="image"

src="https://github.com/MetaMask/metamask-extension/assets/10986371/cc165f35-e1f8-4e2c-ac15-5bb123c880b0">
<img width="355" alt="image"

src="https://github.com/MetaMask/metamask-extension/assets/10986371/ec054145-c958-4ec7-aa48-30a17c809c7d">
ETH Toggled ON:
<img width="358" alt="image"

src="https://github.com/MetaMask/metamask-extension/assets/10986371/2a2fb134-1e1d-4ed6-bacd-2c4e720bd1fa">
<img width="358" alt="image"

src="https://github.com/MetaMask/metamask-extension/assets/10986371/1bd4b01f-051e-4d9c-b66f-62a3f1ec920e">

### **After**

<!-- [screenshots/recordings] -->
Fiat Toggled ON:
<img width="355" alt="image"

src="https://github.com/MetaMask/metamask-extension/assets/10986371/6e401774-1e2d-4c42-ad23-b3ee614d37bf">
<img width="355" alt="image"

src="https://github.com/MetaMask/metamask-extension/assets/10986371/ad06b397-9a5c-4cf3-a356-b6a71fff0b2d">

ETH Toggled ON:
<img width="358" alt="image"

src="https://github.com/MetaMask/metamask-extension/assets/10986371/7d220ccf-089e-4f43-84c5-6fcdaf2a6811">
<img width="358" alt="image"

src="https://github.com/MetaMask/metamask-extension/assets/10986371/deb66faf-3288-4819-a41c-99c4e2a4c067">




## **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.

## **Description**

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/PR?quickstart=1)

## **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.
@metamaskbot
Copy link
Collaborator

Builds ready [b5fda83]
Page Load Metrics (1615 ± 195 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint882501433617
domContentLoaded11106342110
load104323261615407195
domInteractive11106342110

@danjm danjm marked this pull request as ready for review March 6, 2024 21:25
@danjm danjm requested a review from a team as a code owner March 6, 2024 21:25
@danjm danjm merged commit 08a2874 into master Mar 6, 2024
72 of 74 checks passed
@danjm danjm deleted the Version-v11.11.2 branch March 6, 2024 21:26
@github-actions github-actions bot locked and limited conversation to collaborators Mar 6, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
INVALID-PR-TEMPLATE PR's body doesn't match template release-11.11.2 Issue or pull request that will be included in release 11.11.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants