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

Ledger trezor display #18637

Merged
merged 2 commits into from
Apr 18, 2023
Merged

Ledger trezor display #18637

merged 2 commits into from
Apr 18, 2023

Conversation

danjm
Copy link
Contributor

@danjm danjm commented Apr 18, 2023

Fixes #18582

Explanation

Previous to this PR, we were showing ledger specific info on the token allowance screen if the sending address was any hardware wallet. This PR fixes this so that we only show the ledger information if the sending address is a ledger account.

Manual Testing Steps

  • create a token allowance with a ledger account, you should see a 'Prior to clicking confirm:' message for ledger
  • create a token allowance tx with a trezor wallet, you should not see that message

Pre-merge author checklist

  • I've clearly explained:
    • What problem this PR is solving
    • How this problem was solved
    • How reviewers can test my changes
  • Sufficient automated test coverage has been added

Pre-merge reviewer checklist

  • Manual testing (e.g. pull and build branch, run in browser, test code being changed)
  • PR is linked to the appropriate GitHub issue
  • IF this PR fixes a bug in the release milestone, add this PR to the release milestone

If further QA is required (e.g. new feature, complex testing steps, large refactor), add the Extension QA Board label.

In this case, a QA Engineer approval will be be required.

@danjm danjm requested a review from a team as a code owner April 18, 2023 12:08
@danjm danjm requested a review from bergarces April 18, 2023 12:08
@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 [87de22a]
Page Load Metrics (1502 ± 39 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint84129101115
domContentLoaded1354165114837235
load1354165315028239
domInteractive1354165114837235
Bundle size diffs
  • background: 0 bytes
  • ui: 39 bytes
  • common: 0 bytes

@PeterYinusa PeterYinusa added the release-10.29.0 Issue or pull request that will be included in release 10.29.0 label Apr 18, 2023
@danjm danjm merged commit 39f6042 into develop Apr 18, 2023
@danjm danjm deleted the ledger-trezor-display branch April 18, 2023 19:49
@github-actions github-actions bot locked and limited conversation to collaborators Apr 18, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
rc-cherry-picked release-10.29.0 Issue or pull request that will be included in release 10.29.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug]: Ledger live dialog appears on approval screen of for Trezor confirmation
5 participants