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

Commits on Jun 19, 2020

  1. Version v7.7.9

    metamaskbot authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    e1f7f73 View commit details
    Browse the repository at this point in the history
  2. Backport "Fix popup not opening (#8314)" (#8446)

    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
    Gudahtt authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    7383e02 View commit details
    Browse the repository at this point in the history
  3. Backport "Skip adding history entry for empty txMeta diffs (#8379)" (…

    …#8449)
    
    Backport #8379 to v7.7.9
    Gudahtt authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    95ce4fc View commit details
    Browse the repository at this point in the history
  4. Backport "Delete Dai/Sai migration notification (#8418)" (#8447)

    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.
    Gudahtt authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    428a5ca View commit details
    Browse the repository at this point in the history
  5. Backport "Update deposit copy for Wyre (#7654)" (#8460)

    Backport #7654 to v7.7.9
    
    Co-authored-by: Tyson Malchow <tyson.malchow@gmail.com>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    4c91e53 View commit details
    Browse the repository at this point in the history
  6. Backport "Clean up list of available currencies (#7667)" (#8454)

    This is backported to make it easier to backport #7986
    
    Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    c2e9d15 View commit details
    Browse the repository at this point in the history
  7. Backport "Snapshot txMeta without cloning history (#8363)" (#8458)

    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>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    0afea30 View commit details
    Browse the repository at this point in the history
  8. Backport "Fix method registry initialization (#8200)" (#8459)

    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.
    Gudahtt authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    8910a05 View commit details
    Browse the repository at this point in the history
  9. Backport "Fixes #5706 - Adds Dai/Sai to currency display (#7986)" (#8…

    …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>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    a8c2e32 View commit details
    Browse the repository at this point in the history
  10. Backport "fix destructuring of lastSelectedProvider (#8197)" (#8461)

    Backport #8197 to v7.7.9.
    
    Co-authored-by: Brad Decker <bhdecker84@gmail.com>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    a26eb0e View commit details
    Browse the repository at this point in the history
  11. Backport "Add INR currency option (#7673)" (#8457)

    Backport #7673 to v7.7.9.
    
    Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    114c2d9 View commit details
    Browse the repository at this point in the history
  12. Backport "Fix Kovan and Rinkeby chain IDs (#7762)" (#8462)

    Backport #7762 to v7.7.9
    
    Co-authored-by: Sirius Tsou <sirius.tsou@gmail.com>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    ff4e2d5 View commit details
    Browse the repository at this point in the history
  13. Backport "Use ethereum-ens-network-map for network support (#7960)" (…

    …#8465)
    
    Backport #7960 to v7.7.9
    
    Co-authored-by: Whymarrh Whitby <whymarrh.whitby@gmail.com>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    8f587eb View commit details
    Browse the repository at this point in the history
  14. Backport "Updating deprecated Etherscam link (#7464)" (#8463)

    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>
    3 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    3e66396 View commit details
    Browse the repository at this point in the history
  15. Backport "Don't updatePendingTxs outside of block updates (#8445)" (#…

    …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>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    98da9bd View commit details
    Browse the repository at this point in the history
  16. Backport "update eth-contract-metadata (#8466)" (#8476)

    Backport #8466 to v7.7.9
    
    Co-authored-by: Erik Marks <25517051+rekmarks@users.noreply.github.com>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    9e5dc87 View commit details
    Browse the repository at this point in the history
  17. Update changelog for v7.7.9 (#8477)

    Gudahtt authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    30d56fb View commit details
    Browse the repository at this point in the history
  18. Backport "fixed Tohen Typo (#7808)" (#8509)

    Backport #7808 to v7.7.9
    
    Co-authored-by: Lenard Frommelt <lenny09918050@googlemail.com>
    2 people authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    af2bb7f View commit details
    Browse the repository at this point in the history
  19. Merge pull request #8444 from MetaMask/Version-v7.7.9

    Version v7.7.9 RC
    tmashuang authored and ryanml committed Jun 19, 2020
    Configuration menu
    Copy the full SHA
    3c81540 View commit details
    Browse the repository at this point in the history

Commits on Jun 22, 2020

  1. Removing DaiV1Token selector

    ryanml committed Jun 22, 2020
    Configuration menu
    Copy the full SHA
    478200f View commit details
    Browse the repository at this point in the history