Skip to content

Update v12.2.0 with changes from v12.1.2#26895

Merged
Gudahtt merged 5 commits intoVersion-v12.2.0from
sync-v12.1.2
Sep 4, 2024
Merged

Update v12.2.0 with changes from v12.1.2#26895
Gudahtt merged 5 commits intoVersion-v12.2.0from
sync-v12.1.2

Conversation

@Gudahtt
Copy link
Copy Markdown
Member

@Gudahtt Gudahtt commented Sep 4, 2024

Description

Update v12.2.0 with changes from v12.1.2 (the Trezor bug fix)

Open in GitHub Codespaces

Related issues

N/A

Manual testing steps

N/A

Screenshots/Recordings

N/A

Pre-merge author checklist

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 and others added 4 commits September 4, 2024 00:20
This is a cherry-pick of #26882 for v12.1.2. Original description:

## **Description**

Trezor signing and connecting was broken in a recent change that
included an update to the `@trezor/connect-web` library (in #26143). The
patch had to be rewritten as part of that update, but in this rewrite an
underscore was missed in referencing a variable (the patch used
`this.settings` rather than `this._settings`).

Additionally, two more changes have been applied to ensure the modified
settings are used everywhere. One was present in the original patch but
missing from the patch in #26143. The other was not present in the
original patch (#23763) because the affected line was added in the
library update, but it seems equally necessary.

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

## **Related issues**

Fixes #26875

## **Manual testing steps**

Follow reproduction steps in #26875

## **Screenshots/Recordings**

### Before

See
https://www.loom.com/share/3e1f3d2cc57247a5b02e0ff8d61babb8?sid=1b17e423-16cf-4260-a1ed-674441e25b3a

### After:


https://github.com/user-attachments/assets/0235077f-99da-4de6-87d0-9fcd7179017c

(I stopped partway through connecting, I was already past the point of
it crashing by then).

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] 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.

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

Update changelog for v12.1.2

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

## **Related issues**

N/A

## **Manual testing steps**

N/A

## **Screenshots/Recordings**

N/A

## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] 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.

## **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.
@Gudahtt Gudahtt added the team-extension-platform Extension Platform team label Sep 4, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Sep 4, 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.

* origin/master:
  chore: Update changelog for v12.1.2 (#26886)
  fix: Fix Trezor signing and connecting [cherry-pick] (#26885)
  Version v12.1.2
@Gudahtt Gudahtt changed the base branch from develop to Version-v12.2.0 September 4, 2024 12:24
@Gudahtt Gudahtt marked this pull request as ready for review September 4, 2024 12:44
@Gudahtt Gudahtt requested a review from a team as a code owner September 4, 2024 12:44
@metamaskbot
Copy link
Copy Markdown
Collaborator

Builds ready [6fc4ede]
Page Load Metrics (1813 ± 80 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint24920911734378181
domContentLoaded14212013179016579
load14252081181316680
domInteractive146632168

@Gudahtt Gudahtt merged commit 947095c into Version-v12.2.0 Sep 4, 2024
@Gudahtt Gudahtt deleted the sync-v12.1.2 branch September 4, 2024 13:34
@github-actions github-actions bot locked and limited conversation to collaborators Sep 4, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

team-extension-platform Extension Platform team

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants