Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version v7.7.9 RC #8444

Merged
merged 18 commits into from
May 4, 2020
Merged
Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a7911ce
Version v7.7.9
metamaskbot Apr 28, 2020
2a51399
Backport "Fix popup not opening (#8314)" (#8446)
Gudahtt Apr 29, 2020
8fb615c
Backport "Skip adding history entry for empty txMeta diffs (#8379)" (…
Gudahtt Apr 29, 2020
57fdc03
Backport "Delete Dai/Sai migration notification (#8418)" (#8447)
Gudahtt Apr 29, 2020
08fd6cf
Backport "Update deposit copy for Wyre (#7654)" (#8460)
Gudahtt Apr 29, 2020
50b48b7
Backport "Clean up list of available currencies (#7667)" (#8454)
Gudahtt Apr 29, 2020
f91bd3a
Backport "Snapshot txMeta without cloning history (#8363)" (#8458)
Gudahtt Apr 29, 2020
3dc8387
Backport "Fix method registry initialization (#8200)" (#8459)
Gudahtt Apr 29, 2020
361c571
Backport "Fixes #5706 - Adds Dai/Sai to currency display (#7986)" (#8…
Gudahtt Apr 29, 2020
4d9d732
Backport "fix destructuring of lastSelectedProvider (#8197)" (#8461)
Gudahtt Apr 29, 2020
0232954
Backport "Add INR currency option (#7673)" (#8457)
Gudahtt Apr 29, 2020
8a8c774
Backport "Fix Kovan and Rinkeby chain IDs (#7762)" (#8462)
Gudahtt Apr 29, 2020
aab262a
Backport "Use ethereum-ens-network-map for network support (#7960)" (…
Gudahtt Apr 29, 2020
2d36d42
Backport "Updating deprecated Etherscam link (#7464)" (#8463)
Gudahtt Apr 29, 2020
14d4c10
Backport "Don't updatePendingTxs outside of block updates (#8445)" (#…
Gudahtt Apr 30, 2020
b64cbbd
Backport "update eth-contract-metadata (#8466)" (#8476)
Gudahtt Apr 30, 2020
8d8a17d
Update changelog for v7.7.9 (#8477)
Gudahtt Apr 30, 2020
b81558a
Backport "fixed Tohen Typo (#7808)" (#8509)
Gudahtt May 4, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
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>
  • Loading branch information
Gudahtt and whymarrh authored Apr 30, 2020
commit 14d4c107e54e2a3000a826818b00667635033611
1 change: 0 additions & 1 deletion app/scripts/controllers/transactions/index.js
Original file line number Diff line number Diff line change
@@ -724,7 +724,6 @@ class TransactionController extends EventEmitter {
Updates the memStore in transaction controller
*/
_updateMemstore () {
this.pendingTxTracker.updatePendingTxs()
const unapprovedTxs = this.txStateManager.getUnapprovedTxList()
const selectedAddressTxList = this.txStateManager.getFilteredTxList({
from: this.getSelectedAddress(),
2 changes: 1 addition & 1 deletion app/scripts/metamask-controller.js
Original file line number Diff line number Diff line change
@@ -767,7 +767,7 @@ module.exports = class MetamaskController extends EventEmitter {
}

await this.preferencesController.syncAddresses(accounts)
await this.txController.pendingTxTracker.updatePendingTxs()
await this.blockTracker.checkForLatestBlock()

try {
const threeBoxSyncingAllowed = this.threeBoxController.getThreeBoxSyncingState()