Skip to content

fix: Fix Trezor signing and connecting [cherry-pick]#26885

Merged
Gudahtt merged 1 commit intoVersion-v12.1.2from
cherry-pick/fix-trezor-connections
Sep 4, 2024
Merged

fix: Fix Trezor signing and connecting [cherry-pick]#26885
Gudahtt merged 1 commit intoVersion-v12.1.2from
cherry-pick/fix-trezor-connections

Conversation

@Gudahtt
Copy link
Copy Markdown
Member

@Gudahtt Gudahtt commented Sep 4, 2024

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

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:

Screen.Recording.2024-09-03.at.21.55.10.mov

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

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.

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.

Fixes #26875
@Gudahtt
Copy link
Copy Markdown
Member Author

Gudahtt commented Sep 4, 2024

This is ready for testing, but I'll leave it in draft until after #26882 is merged

@Gudahtt Gudahtt added team-accounts-framework Accounts team team-extension-platform Extension Platform team team-hardware-wallets-deprecated DEPRECATED: please use "team-accounts-framework" instead labels Sep 4, 2024
@codecov
Copy link
Copy Markdown

codecov bot commented Sep 4, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 69.87%. Comparing base (5aa83d0) to head (436682f).

Additional details and impacted files
@@               Coverage Diff                @@
##           Version-v12.1.2   #26885   +/-   ##
================================================
  Coverage            69.87%   69.87%           
================================================
  Files                 1372     1372           
  Lines                48839    48839           
  Branches             13486    13486           
================================================
  Hits                 34122    34122           
  Misses               14717    14717           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@metamaskbot
Copy link
Copy Markdown
Collaborator

Builds ready [436682f]
Page Load Metrics (499 ± 404 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint844681368742
domContentLoaded1091342110
load532692499842404
domInteractive1091342110

@Gudahtt Gudahtt marked this pull request as ready for review September 4, 2024 11:16
@Gudahtt Gudahtt requested a review from a team as a code owner September 4, 2024 11:16
@Gudahtt Gudahtt merged commit 5f1e1ca into Version-v12.1.2 Sep 4, 2024
@Gudahtt Gudahtt deleted the cherry-pick/fix-trezor-connections branch September 4, 2024 11:16
@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-accounts-framework Accounts team team-extension-platform Extension Platform team team-hardware-wallets-deprecated DEPRECATED: please use "team-accounts-framework" instead

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants