Skip to content

Sync master with develop#10025

Merged
Gudahtt merged 8 commits intodevelopfrom
sync-master
Dec 9, 2020
Merged

Sync master with develop#10025
Gudahtt merged 8 commits intodevelopfrom
sync-master

Conversation

@Gudahtt
Copy link
Copy Markdown
Member

@Gudahtt Gudahtt commented Dec 9, 2020

This brings develop up-to-date with the v8.1.7 release

Gudahtt and others added 8 commits December 9, 2020 01:00
* origin/develop:
  Add hidden tokens to store (#9320)
  @metamask/inpage-provider@^8.0.0 (#8640)
  Log persistence errors with Sentry (#10018)
  Fix SES lockdown on older browsers (#10014)
  Reapply view quote screen designs (#9905)
  Fix unbound metrics track function (#10016)
  Deobfuscate error message (#10012)
  Add SES lockdown and Sentry to all pages (#10013)
  Remove web3 injection (#9156)
  Initialize network controller provider chainId to the appropriate default networks (#9999)
  Fix Infura network chain IDs (#8629)
  Prevent props error in swaps gas modal (#10001)
  Fix 9906 - Prevent unwanted 'no quotes available' message when going back to build quote screen while having insufficient funds (#9994)
  Fix 9988 - Don't allow more than 15% slippage (#9991)
  Bump highlight.js from 10.4.0 to 10.4.1 (#10004)
  Add timeout to `wait-until-called` (#9996)
  Update transaction params validation (#9992)
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Dec 9, 2020

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
Copy link
Copy Markdown
Member Author

Gudahtt commented Dec 9, 2020

I decided to revert both of the v8.1.7 reverts to avoid conflicts. We can resolve the issue independently on develop.

@metamaskbot
Copy link
Copy Markdown
Collaborator

Builds ready [427268b]
Page Load Metrics (556 ± 15 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint325944105
domContentLoaded5096265553115
load5106275563115
domInteractive5096255543115

@Gudahtt Gudahtt marked this pull request as ready for review December 9, 2020 05:36
@Gudahtt Gudahtt requested a review from a team as a code owner December 9, 2020 05:36
@Gudahtt Gudahtt requested a review from rekmarks December 9, 2020 05:36
@Gudahtt Gudahtt merged commit b7d9ed5 into develop Dec 9, 2020
@Gudahtt Gudahtt deleted the sync-master branch December 9, 2020 05:38
@github-actions github-actions bot locked and limited conversation to collaborators Dec 9, 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.

4 participants