aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/metamask-controller.js
diff options
context:
space:
mode:
authorWhymarrh Whitby <whymarrh.whitby@gmail.com>2019-02-14 22:13:56 +0800
committerGitHub <noreply@github.com>2019-02-14 22:13:56 +0800
commitce543f059ed2778f0ad94fbbaf97ae42040f0c4f (patch)
treefd351e15e8580e60081c11ada28f48df912e1a31 /app/scripts/metamask-controller.js
parent1d8d129305da747b9d8232dd4a1a8d417e36fe15 (diff)
parent92cc60f425e33fd3de31efd004e5144cb270b924 (diff)
downloadtangerine-wallet-browser-ce543f059ed2778f0ad94fbbaf97ae42040f0c4f.tar
tangerine-wallet-browser-ce543f059ed2778f0ad94fbbaf97ae42040f0c4f.tar.gz
tangerine-wallet-browser-ce543f059ed2778f0ad94fbbaf97ae42040f0c4f.tar.bz2
tangerine-wallet-browser-ce543f059ed2778f0ad94fbbaf97ae42040f0c4f.tar.lz
tangerine-wallet-browser-ce543f059ed2778f0ad94fbbaf97ae42040f0c4f.tar.xz
tangerine-wallet-browser-ce543f059ed2778f0ad94fbbaf97ae42040f0c4f.tar.zst
tangerine-wallet-browser-ce543f059ed2778f0ad94fbbaf97ae42040f0c4f.zip
Merge pull request #6137 from whymarrh/es6-background
Sprinkle ES6 onto background files
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r--app/scripts/metamask-controller.js10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 622eb78af..65cc2d3eb 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -19,7 +19,7 @@ const createSubscriptionManager = require('eth-json-rpc-filters/subscriptionMana
const createOriginMiddleware = require('./lib/createOriginMiddleware')
const createLoggerMiddleware = require('./lib/createLoggerMiddleware')
const createProviderMiddleware = require('./lib/createProviderMiddleware')
-const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex
+const {setupMultiplex} = require('./lib/stream-utils.js')
const KeyringController = require('eth-keyring-controller')
const NetworkController = require('./controllers/network')
const PreferencesController = require('./controllers/preferences')
@@ -42,9 +42,9 @@ const ProviderApprovalController = require('./controllers/provider-approval')
const nodeify = require('./lib/nodeify')
const accountImporter = require('./account-import-strategies')
const getBuyEthUrl = require('./lib/buy-eth-url')
-const Mutex = require('await-semaphore').Mutex
-const version = require('../manifest.json').version
-const BN = require('ethereumjs-util').BN
+const {Mutex} = require('await-semaphore')
+const {version} = require('../manifest.json')
+const {BN} = require('ethereumjs-util')
const GWEI_BN = new BN('1000000000')
const percentile = require('percentile')
const seedPhraseVerifier = require('./lib/seed-phrase-verifier')
@@ -208,7 +208,7 @@ module.exports = class MetamaskController extends EventEmitter {
})
this.networkController.on('networkDidChange', () => {
this.balancesController.updateAllBalances()
- var currentCurrency = this.currencyController.getCurrentCurrency()
+ const currentCurrency = this.currencyController.getCurrentCurrency()
this.setCurrentCurrency(currentCurrency, function () {})
})
this.balancesController.updateAllBalances()