Skip to content

Sync master with develop#10652

Merged
Gudahtt merged 6 commits intodevelopfrom
sync-master
Mar 15, 2021
Merged

Sync master with develop#10652
Gudahtt merged 6 commits intodevelopfrom
sync-master

Conversation

@Gudahtt
Copy link
Copy Markdown
Member

@Gudahtt Gudahtt commented Mar 15, 2021

This brings develop up-to-date with v9.2.0

metamaskbot and others added 6 commits March 10, 2021 15:37
All user-facing changes have been included, and descriptions have been
updated to be more easily understood.
* origin/develop:
  Position the 3dot menu in the same spot on asset screen and home screen (#10642)
  Move swaps constants to the shared constants directory (#10614)
  prefer chainId over networkId in most cases (#10594)
  no more node:console (#10640)
  fix: speedup cancellation (#10579)
  Setting balance to 0x0 when the original value is undefined (#10634)
  Hide zero balance tokens at useTokenTracker layer (#10630)
  Removing double click bug from delete custom network modal (#10628)
  remove transactionCategory in favor of more types (#10615)
  Ensure permission log will only store JSON-able data (#10524)
  Replace logic for eth swap token in fetchQuotesAndSetQuoteState with getSwapsEthToken call (#10624)
  add trezor HD path for ledger wallets (#10616)
@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 March 15, 2021 16:05
@Gudahtt Gudahtt requested a review from a team as a code owner March 15, 2021 16:05
@Gudahtt Gudahtt requested a review from ryanml March 15, 2021 16:05
@metamaskbot
Copy link
Copy Markdown
Collaborator

Builds ready [9ce7b31]
Page Load Metrics (612 ± 36 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint4410960147
domContentLoaded3547606117536
load3567616127536
domInteractive3547596107436

@Gudahtt Gudahtt merged commit 3319d05 into develop Mar 15, 2021
@Gudahtt Gudahtt deleted the sync-master branch March 15, 2021 16:18
@github-actions github-actions bot locked and limited conversation to collaborators Mar 15, 2021
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