Skip to content
This repository has been archived by the owner on Jan 26, 2022. It is now read-only.

Metamask v7.7.9 Upstream Rebase #145

Merged
merged 20 commits into from
Jun 22, 2020
Merged

Metamask v7.7.9 Upstream Rebase #145

merged 20 commits into from
Jun 22, 2020

Conversation

ryanml
Copy link
Contributor

@ryanml ryanml commented Jun 19, 2020

Changelog:

  • #8446: Fix popup not opening
  • #8449: Skip adding history entry for empty txMeta diffs
  • #8447: Delete Dai/Sai migration notification
  • #8460: Update deposit copy for Wyre
  • #8458: Snapshot txMeta without cloning history
  • #8459: Fix method registry initialization
  • #8455: Add Dai/Sai to currency display
  • #8461: Prevent network switch upon close of network timeout overlay
  • #8457: Add INR currency option
  • #8462: Fix display of Kovan and Rinkeby chain IDs
  • #8465: Use ethereum-ens-network-map for network support
  • #8463: Update deprecated Etherscam link
  • #8474: Only update pending transactions upon block update
  • #8476: Update eth-contract-metadata
  • #8509: Fix Tohen Typo

metamaskbot and others added 19 commits June 19, 2020 12:17
This is a backport of #8314. Here's the original description:

MetaMask would sometimes get into a state where the notification popup
would never open. This could happen if the notification window was
closed shortly after being opened. After this happened, no popups would
show up until after the extension was reset.

This was happening because the background thought the popup was already
open. The variable it uses to track whether the popup was open or not
was being set to `true` immediately after the background asked the
browser to open a new window, before a handler was attached that could
respond to the window being closed.

Removing this line seems to solve the problem.

This line was added originally in #5437, which dealt with batch
transactions. Batches of transactions seem to work just fine without
this line though (from local testing), and I can't think of why this
would be required.

Closes #7051
This backports the deletion of the Dai/Sai migration notification
(#8418). Note that the migration to delete the now unused background
state has not been included, as it is non-essential and would have been
more difficult to backport. The migration to delete the unused state
will be included in the next major release instead.
Backport #7654 to v7.7.9

Co-authored-by: Tyson Malchow <tyson.malchow@gmail.com>
This is backported to make it easier to backport #7986

Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Backport #8363 to v7.7.9. Note that this uses `clone` instead of
`cloneDeep`, because `clone` hadn't yet been replaced by `cloneDeep` on
`master`.

Backporting that change as well would have been very disruptive, so
I've updated this to use `clone` instead to minimize conflicts. It is
functionally equivalent.

Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Backport #8200 to v7.7.9. Original commit description:

The method registry was being initialized with the global variable
`ethereumProvider` before that variable was set. As a result, the
method registry was falling back to an internally constructed provider
that used the wrong provider URL (an obsolete Infura API). This was
resulting in an error with the message "Project ID not found".

The method registry is now initialized lazily, when it's first needed.
This should be well after the initialization of `ethereumProvider`,
which occurs during the UI initialization.
…455)

Backport #7986 onto v7.7.9. The original commit message follows:

With the change from infura to cryptocompare https://github.com/MetaMask/gaba/pull/30/files#diff-50c3c47cc5fa12e5213a6cc900476f41L41-R48 we have numerous conversion rates to go through and add if we like to.

Co-authored-by: Thomas Huang <tmashuang@users.noreply.github.com>
Backport #8197 to v7.7.9.

Co-authored-by: Brad Decker <bhdecker84@gmail.com>
Backport #7673 to v7.7.9.

Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Backport #7762 to v7.7.9

Co-authored-by: Sirius Tsou <sirius.tsou@gmail.com>
…#8465)

Backport #7960 to v7.7.9

Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Backport #7464 to v7.7.9

Co-authored-by: Alice Henshaw <34962750+alicevhenshaw@users.noreply.github.com>
Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
…8474)

Backport #8445 to v7.7.9. Original commit description:

* Don't updatePendingTxs outside of block updates

Refs #8377

Reverts 507397f (#5431)

* Check for new block data on unlock

Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Backport #8466 to v7.7.9

Co-authored-by: Erik Marks <25517051+rekmarks@users.noreply.github.com>
Backport #7808 to v7.7.9

Co-authored-by: Lenard Frommelt <lenny09918050@googlemail.com>
@ryanml ryanml requested a review from bbondy June 19, 2020 19:26
bbondy
bbondy previously approved these changes Jun 22, 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