Skip to content

Sync master with develop#9890

Merged
Gudahtt merged 13 commits intodevelopfrom
sync-master
Nov 16, 2020
Merged

Sync master with develop#9890
Gudahtt merged 13 commits intodevelopfrom
sync-master

Conversation

@Gudahtt
Copy link
Copy Markdown
Member

@Gudahtt Gudahtt commented Nov 16, 2020

This brings develop up to date with the v8.1.4 release.

This PR also includes a revert of the revert of the new main quote designs (i.e. they have been restored).

Gudahtt and others added 13 commits November 13, 2020 15:03
This reverts commit f30d261.

The custom HD path option was found to be unsafe to use, because the
displayed list of accounts would differ depending on which application
was open on the Ledger device. Essentially Ledger was accepting invalid
inputs, and returning junk responses.

This was too dangerous to ship, as it could leave users with an account
that they can't reliably recover. If we don't know how the derivation
is happening, then allowing this import puts our users at risk of
losing funds.

We can re-introduce this functionality after adding validation to
ensure that we only allow inputs that are handled correctly by Ledger.
`PropTypes.oneOf` was used accidentally instead of
`PropTypes.oneOfType`. `oneOf` expects literal values, not types.
`PropTypes.function` was used accidentally instead of `PropType.func`
Changes that aren't user-facing have been omitted.
A few new user-facing features have been pulled into the release, and
the custom HD path support has been reverted.
The hardware wallet error handling improvements have been added to the
release.
* origin/develop:
  Move add contact button in fullscreen/expanded view lower. (#9883)
  Remove CoinSwitch from Deposit screen(#9869)
  Consolidate notification UI openers (#9885)
  Prevent jump when hovering over asset list items
  @metamask/controllers@4.2.0 (#9849)
  Properly detect U2F errors in hardware wallet
  Fix malformed PropType declaraton (#9876)
  Fix broken LoadingScreen PropType declaration (#9877)
  Revert "Add custom hd path option (#9367)" (#9875)
  Update fee card designs to show savings and MM fee (#9629)
  Make editable actoin item a button, autofocus input contents
  Provide alternative text for images where appropriate
@github-actions
Copy link
Copy Markdown
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.

@Gudahtt Gudahtt marked this pull request as ready for review November 16, 2020 20:27
@Gudahtt Gudahtt requested a review from a team as a code owner November 16, 2020 20:27
@Gudahtt Gudahtt requested a review from danjm November 16, 2020 20:27
Copy link
Copy Markdown
Member

@rekmarks rekmarks left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The date on the changelog is wrong, but I don't know that we care

## Current Develop Branch
- [#9612](https://github.com/MetaMask/metamask-extension/pull/9612): Update main-quote-summary designs/styles

## 8.1.4 Tue Nov 10 2020
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This ain't right

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of the dates in this changelog are wrong 😅 The date is generated when the changelog is updated.

I think we should update the changelog script to omit a date altogether. Then maybe add it manually in this sync PR. I'll leave that for another day - the real dates can be applied retroactively by looking at the GitHub releases at least.

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh and once we automate our release process, this step can be automated as well.

@metamaskbot
Copy link
Copy Markdown
Collaborator

Builds ready [f9613b2]
Page Load Metrics (379 ± 38 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint3010345199
domContentLoaded2665783787938
load2675793797938
domInteractive2665773787938

@Gudahtt Gudahtt merged commit 7ca77fa into develop Nov 16, 2020
@Gudahtt Gudahtt deleted the sync-master branch November 16, 2020 20:48
@github-actions github-actions bot locked and limited conversation to collaborators Nov 16, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants