Merge pull request #4712 from MetaMask/lint-fix

Lint - Lint all the things (without conflicts!)

125 files changed, 689 insertions, 738 deletions

diff --git a/.eslintignore b/.eslintignore
index e4cade21c..44b38c3de 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,6 +1,20 @@
+node_modules/**
+dist/**
+builds/**
+docs/**
+
+development/bundle.js
+development/states.js
+
 app/scripts/lib/extension-instance.js
+app/scripts/chromereload.js
+
+ui/lib/blockies.js
+
+mascara/src/app/first-time/spinner.js
+mascara/test/jquery-3.1.0.min.js
+
 test/integration/bundle.js
 test/integration/jquery-3.1.0.min.js
 test/integration/helpers.js
 test/integration/lib/first-time.js
-ui/lib/blockies.js
\ No newline at end of file
diff --git a/.eslintrc b/.eslintrc
index b49a7a28a..1317864d1 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -37,7 +37,9 @@
     "document": false,
     "navigator": false,
     "web3": true,
-    "window": false
+    "window": false,
+    "$": false,
+    "QUnit": false
   },
 
   "rules": {
@@ -159,5 +161,6 @@
     "yield-star-spacing": [2, "both"],
     "yoda": [2, "never"],
     "prefer-const": 1,
+    "mocha/no-exclusive-tests": "error"
   }
 }
diff --git a/app/scripts/background.js b/app/scripts/background.js
index 2451cddb6..54511631f 100644
--- a/app/scripts/background.js
+++ b/app/scripts/background.js
@@ -378,7 +378,7 @@ function setupController (initState, initLangCode) {
   }
 
   // communication with page or other extension
-  function connectExternal(remotePort) {
+  function connectExternal (remotePort) {
     const originDomain = urlUtil.parse(remotePort.sender.url).hostname
     const portStream = new PortStream(remotePort)
     controller.setupUntrustedCommunication(portStream, originDomain)
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 75e0a95b3..b35a70dd2 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -115,8 +115,8 @@ function logStreamDisconnectWarning (remoteLabel, err) {
  * @returns {boolean} {@code true} if Web3 should be injected
  */
 function shouldInjectWeb3 () {
-  return doctypeCheck() && suffixCheck()
-    && documentElementCheck() && !blacklistedDomainCheck()
+  return doctypeCheck() && suffixCheck() &&
+    documentElementCheck() && !blacklistedDomainCheck()
 }
 
 /**
diff --git a/app/scripts/controllers/balance.js b/app/scripts/controllers/balance.js
index 86619fce1..4c97810a3 100644
--- a/app/scripts/controllers/balance.js
+++ b/app/scripts/controllers/balance.js
@@ -60,7 +60,7 @@ class BalanceController {
    * Sets up listeners and subscriptions which should trigger an update of ethBalance. These updates include:
    * - when a transaction changes state to 'submitted', 'confirmed' or 'failed'
    * - when the current account changes (i.e. a new account is selected)
-   * - when there is a block update 
+   * - when there is a block update
    *
    * @private
    *
@@ -100,7 +100,7 @@ class BalanceController {
 
   /**
    * Gets the pending transactions (i.e. those with a 'submitted' status). These are accessed from the
-   * TransactionController passed to this BalanceController during construction. 
+   * TransactionController passed to this BalanceController during construction.
    *
    * @private
    * @returns {Promise<array>} Promises an array of transaction objects.
diff --git a/app/scripts/controllers/blacklist.js b/app/scripts/controllers/blacklist.js
index f100c4525..1d2191433 100644
--- a/app/scripts/controllers/blacklist.js
+++ b/app/scripts/controllers/blacklist.js
@@ -87,7 +87,7 @@ class BlacklistController {
    *
    * @private
    * @param {object} config A config object like that found at {@link https://github.com/MetaMask/eth-phishing-detect/blob/master/src/config.json}
-   * 
+   *
    */
   _setupPhishingDetector (config) {
     this._phishingDetector = new PhishingDetector(config)
diff --git a/app/scripts/controllers/computed-balances.js b/app/scripts/controllers/computed-balances.js
index 1a6802f9a..e04ce2ef7 100644
--- a/app/scripts/controllers/computed-balances.js
+++ b/app/scripts/controllers/computed-balances.js
@@ -18,7 +18,7 @@ class ComputedbalancesController {
   /**
    * Creates a new controller instance
    *
-   * @param {ComputedBalancesOptions} [opts] Controller configuration parameters 
+   * @param {ComputedBalancesOptions} [opts] Controller configuration parameters
    */
   constructor (opts = {}) {
     const { accountTracker, txController, blockTracker } = opts
diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js
index 480c08b1c..a93aff49b 100644
--- a/app/scripts/controllers/currency.js
+++ b/app/scripts/controllers/currency.js
@@ -16,9 +16,9 @@ class CurrencyController {
    * currentCurrency, conversionRate and conversionDate properties
    * @property {string} currentCurrency A 2-4 character shorthand that describes a specific currency, currently
    * selected by the user
-   * @property {number} conversionRate The conversion rate from ETH to the selected currency. 
+   * @property {number} conversionRate The conversion rate from ETH to the selected currency.
    * @property {string} conversionDate The date at which the conversion rate was set. Expressed in in milliseconds
-   * since midnight of January 1, 1970 
+   * since midnight of January 1, 1970
    * @property {number} conversionInterval The id of the interval created by the scheduleConversionInterval method.
    * Used to clear an existing interval on subsequent calls of that method.
    *
@@ -59,7 +59,7 @@ class CurrencyController {
   /**
    * A getter for the conversionRate property
    *
-   * @returns {string} The conversion rate from ETH to the selected currency. 
+   * @returns {string} The conversion rate from ETH to the selected currency.
    *
    */
   getConversionRate () {
@@ -80,7 +80,7 @@ class CurrencyController {
    * A getter for the conversionDate property
    *
    * @returns {string} The date at which the conversion rate was set. Expressed in milliseconds since midnight of
-   * January 1, 1970 
+   * January 1, 1970
    *
    */
   getConversionDate () {
diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js
index 5e0c63e7d..a50f6dc45 100644
--- a/app/scripts/controllers/network/network.js
+++ b/app/scripts/controllers/network/network.js
@@ -132,7 +132,7 @@ module.exports = class NetworkController extends EventEmitter {
     } else if (type === LOCALHOST) {
       this._configureStandardProvider({ rpcUrl: LOCALHOST_RPC_URL })
     // url-based rpc endpoints
-    } else if (type === 'rpc'){
+    } else if (type === 'rpc') {
       this._configureStandardProvider({ rpcUrl: rpcTarget })
     } else {
       throw new Error(`NetworkController - _configureProvider - unknown type "${type}"`)
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 8411e3a28..b314745f5 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -111,9 +111,9 @@ class PreferencesController {
    * @returns {Promise<string>} selectedAddress the selected address.
    */
   syncAddresses (addresses) {
-    let { identities, lostIdentities } = this.store.getState()
+    const { identities, lostIdentities } = this.store.getState()
 
-    let newlyLost = {}
+    const newlyLost = {}
     Object.keys(identities).forEach((identity) => {
       if (!addresses.includes(identity)) {
         newlyLost[identity] = identities[identity]
@@ -128,7 +128,7 @@ class PreferencesController {
       if (this.diagnostics) this.diagnostics.reportOrphans(newlyLost)
 
       // store lost accounts
-      for (let key in newlyLost) {
+      for (const key in newlyLost) {
         lostIdentities[key] = newlyLost[key]
       }
     }
diff --git a/app/scripts/controllers/recent-blocks.js b/app/scripts/controllers/recent-blocks.js
index 033ef1d7e..926268691 100644
--- a/app/scripts/controllers/recent-blocks.js
+++ b/app/scripts/controllers/recent-blocks.js
@@ -117,7 +117,7 @@ class RecentBlocksController {
    *
    * @returns {Promise<void>} Promises undefined
    */
-  async backfill() {
+  async backfill () {
     this.blockTracker.once('block', async (block) => {
       const currentBlockNumber = Number.parseInt(block.number, 16)
       const blocksToFetch = Math.min(currentBlockNumber, this.historyLength)
diff --git a/app/scripts/controllers/transactions/tx-gas-utils.js b/app/scripts/controllers/transactions/tx-gas-utils.js
index 36b5cdbc9..ab4031faa 100644
--- a/app/scripts/controllers/transactions/tx-gas-utils.js
+++ b/app/scripts/controllers/transactions/tx-gas-utils.js
@@ -126,4 +126,4 @@ class TxGasUtil {
   }
 }
 
-module.exports = TxGasUtil
\ No newline at end of file
+module.exports = TxGasUtil
diff --git a/app/scripts/lib/cleanErrorStack.js b/app/scripts/lib/cleanErrorStack.js
index fe1bfb0ce..8adf55db7 100644
--- a/app/scripts/lib/cleanErrorStack.js
+++ b/app/scripts/lib/cleanErrorStack.js
@@ -3,7 +3,7 @@
  * @param {Error} err - error
  * @returns {Error} Error with clean stack trace.
  */
-function cleanErrorStack(err){
+function cleanErrorStack (err) {
   var name = err.name
   name = (name === undefined) ? 'Error' : String(name)
 
diff --git a/app/scripts/lib/createErrorMiddleware.js b/app/scripts/lib/createErrorMiddleware.js
index c70beddfd..7f6a4bd73 100644
--- a/app/scripts/lib/createErrorMiddleware.js
+++ b/app/scripts/lib/createErrorMiddleware.js
@@ -64,4 +64,4 @@ function createErrorMiddleware ({ override = true } = {}) {
   }
 }
 
-module.exports = createErrorMiddleware
\ No newline at end of file
+module.exports = createErrorMiddleware
diff --git a/app/scripts/lib/createStreamSink.js b/app/scripts/lib/createStreamSink.js
index cf9416fea..b93dbc089 100644
--- a/app/scripts/lib/createStreamSink.js
+++ b/app/scripts/lib/createStreamSink.js
@@ -4,7 +4,7 @@ const promiseToCallback = require('promise-to-callback')
 module.exports = createStreamSink
 
 
-function createStreamSink(asyncWriteFn, _opts) {
+function createStreamSink (asyncWriteFn, _opts) {
   return new AsyncWritableStream(asyncWriteFn, _opts)
 }
 
diff --git a/app/scripts/lib/diagnostics-reporter.js b/app/scripts/lib/diagnostics-reporter.js
index aa4ca6e26..569eb3268 100644
--- a/app/scripts/lib/diagnostics-reporter.js
+++ b/app/scripts/lib/diagnostics-reporter.js
@@ -5,7 +5,7 @@ class DiagnosticsReporter {
     this.version = version
   }
 
-  async reportOrphans(orphans) {
+  async reportOrphans (orphans) {
     try {
       return await this.submit({
         accounts: Object.keys(orphans),
@@ -19,7 +19,7 @@ class DiagnosticsReporter {
     }
   }
 
-  async reportMultipleKeyrings(rawKeyrings) {
+  async reportMultipleKeyrings (rawKeyrings) {
     try {
       const keyrings = await Promise.all(rawKeyrings.map(async (keyring, index) => {
         return {
@@ -55,7 +55,7 @@ class DiagnosticsReporter {
 
 }
 
-function postData(data) {
+function postData (data) {
   const uri = 'https://diagnostics.metamask.io/v1/orphanedAccounts'
   return fetch(uri, {
     body: JSON.stringify(data), // must match 'Content-Type' header
diff --git a/app/scripts/lib/extractEthjsErrorMessage.js b/app/scripts/lib/extractEthjsErrorMessage.js
index 0f100756f..4891075c3 100644
--- a/app/scripts/lib/extractEthjsErrorMessage.js
+++ b/app/scripts/lib/extractEthjsErrorMessage.js
@@ -10,13 +10,13 @@ module.exports = extractEthjsErrorMessage
  *
  * @param {string} errorMessage The error message to parse
  * @returns {string} Returns an error message, either the same as was passed, or the ending message portion of an isEthjsRpcError
- * 
+ *
  * @example
  * // returns 'Transaction Failed: replacement transaction underpriced'
  * extractEthjsErrorMessage(`Error: [ethjs-rpc] rpc error with payload {"id":3947817945380,"jsonrpc":"2.0","params":["0xf8eb8208708477359400830398539406012c8cf97bead5deae237070f9587f8e7a266d80b8843d7d3f5a0000000000000000000000000000000000000000000000000000000000081d1a000000000000000000000000000000000000000000000000001ff973cafa800000000000000000000000000000000000000000000000000000038d7ea4c68000000000000000000000000000000000000000000000000000000000000003f48025a04c32a9b630e0d9e7ff361562d850c86b7a884908135956a7e4a336fa0300d19ca06830776423f25218e8d19b267161db526e66895567147015b1f3fc47aef9a3c7"],"method":"eth_sendRawTransaction"} Error: replacement transaction underpriced`)
  *
 */
-function extractEthjsErrorMessage(errorMessage) {
+function extractEthjsErrorMessage (errorMessage) {
   const isEthjsRpcError = errorMessage.includes(ethJsRpcSlug)
   if (isEthjsRpcError) {
     const payloadAndError = errorMessage.slice(ethJsRpcSlug.length)
diff --git a/app/scripts/lib/get-first-preferred-lang-code.js b/app/scripts/lib/get-first-preferred-lang-code.js
index 41a886d74..170d508c1 100644
--- a/app/scripts/lib/get-first-preferred-lang-code.js
+++ b/app/scripts/lib/get-first-preferred-lang-code.js
@@ -28,7 +28,7 @@ async function getFirstPreferredLangCode () {
 
   // safeguard for Brave Browser until they implement chrome.i18n.getAcceptLanguages
   // https://github.com/MetaMask/metamask-extension/issues/4270
-  if (!userPreferredLocaleCodes){
+  if (!userPreferredLocaleCodes) {
     userPreferredLocaleCodes = []
   }
 
diff --git a/app/scripts/lib/getObjStructure.js b/app/scripts/lib/getObjStructure.js
index 52250d3fb..9c92879fb 100644
--- a/app/scripts/lib/getObjStructure.js
+++ b/app/scripts/lib/getObjStructure.js
@@ -18,12 +18,12 @@ module.exports = getObjStructure
  * Creates an object that represents the structure of the given object. It replaces all values with the result of their
  * type.
  *
- * @param {object} obj The object for which a 'structure' will be returned. Usually a plain object and not a class. 
+ * @param {object} obj The object for which a 'structure' will be returned. Usually a plain object and not a class.
  * @returns {object} The "mapped" version of a deep clone of the passed object, with each non-object property value
  * replaced with the javascript type of that value.
  *
  */
-function getObjStructure(obj) {
+function getObjStructure (obj) {
   const structure = clone(obj)
   return deepMap(structure, (value) => {
     return value === null ? 'null' : typeof value
@@ -38,7 +38,7 @@ function getObjStructure(obj) {
  * @param {Function} visit The modifier to apply to each non-object property value
  * @returns {object} The modified object
  */
-function deepMap(target = {}, visit) {
+function deepMap (target = {}, visit) {
   Object.entries(target).forEach(([key, value]) => {
     if (typeof value === 'object' && value !== null) {
       target[key] = deepMap(value, visit)
diff --git a/app/scripts/lib/local-store.js b/app/scripts/lib/local-store.js
index 139ff86bd..fbcba09cd 100644
--- a/app/scripts/lib/local-store.js
+++ b/app/scripts/lib/local-store.js
@@ -8,7 +8,7 @@ module.exports = class ExtensionStore {
   /**
    * @constructor
    */
-  constructor() {
+  constructor () {
     this.isSupported = !!(extension.storage.local)
     if (!this.isSupported) {
       log.error('Storage local API not available.')
@@ -19,7 +19,7 @@ module.exports = class ExtensionStore {
    * Returns all of the keys currently saved
    * @return {Promise<*>}
    */
-  async get() {
+  async get () {
     if (!this.isSupported) return undefined
     const result = await this._get()
     // extension.storage.local always returns an obj
@@ -36,7 +36,7 @@ module.exports = class ExtensionStore {
    * @param {object} state - The state to set
    * @return {Promise<void>}
    */
-  async set(state) {
+  async set (state) {
     return this._set(state)
   }
 
@@ -45,7 +45,7 @@ module.exports = class ExtensionStore {
    * @private
    * @return {object} the key-value map from local storage
    */
-  _get() {
+  _get () {
     const local = extension.storage.local
     return new Promise((resolve, reject) => {
       local.get(null, (/** @type {any} */ result) => {
@@ -65,7 +65,7 @@ module.exports = class ExtensionStore {
    * @return {Promise<void>}
    * @private
    */
-  _set(obj) {
+  _set (obj) {
     const local = extension.storage.local
     return new Promise((resolve, reject) => {
       local.set(obj, () => {
@@ -85,6 +85,6 @@ module.exports = class ExtensionStore {
  * @param {object} obj - The object to check
  * @returns {boolean}
  */
-function isEmpty(obj) {
+function isEmpty (obj) {
   return Object.keys(obj).length === 0
 }
diff --git a/app/scripts/lib/port-stream.js b/app/scripts/lib/port-stream.js
index 5c4224fd9..fd65d94f3 100644
--- a/app/scripts/lib/port-stream.js
+++ b/app/scripts/lib/port-stream.js
@@ -58,7 +58,7 @@ PortDuplexStream.prototype._read = noop
 /**
  * Called internally when data should be written to
  * this writable stream.
- * 
+ *
  * @private
  * @param {*} msg Arbitrary object to write
  * @param {string} encoding Encoding to use when writing payload
diff --git a/app/scripts/lib/reportFailedTxToSentry.js b/app/scripts/lib/reportFailedTxToSentry.js
index e09f4f1f8..df5661e59 100644
--- a/app/scripts/lib/reportFailedTxToSentry.js
+++ b/app/scripts/lib/reportFailedTxToSentry.js
@@ -7,7 +7,7 @@ module.exports = reportFailedTxToSentry
 // for sending to sentry
 //
 
-function reportFailedTxToSentry({ raven, txMeta }) {
+function reportFailedTxToSentry ({ raven, txMeta }) {
   const errorMessage = 'Transaction Failed: ' + extractEthjsErrorMessage(txMeta.err.message)
   raven.captureMessage(errorMessage, {
     // "extra" key is required by Sentry
diff --git a/app/scripts/lib/setupMetamaskMeshMetrics.js b/app/scripts/lib/setupMetamaskMeshMetrics.js
index 02690a948..fd3b93fc4 100644
--- a/app/scripts/lib/setupMetamaskMeshMetrics.js
+++ b/app/scripts/lib/setupMetamaskMeshMetrics.js
@@ -4,7 +4,7 @@ module.exports = setupMetamaskMeshMetrics
 /**
  * Injects an iframe into the current document for testing
  */
-function setupMetamaskMeshMetrics() {
+function setupMetamaskMeshMetrics () {
   const testingContainer = document.createElement('iframe')
   testingContainer.src = 'https://metamask.github.io/mesh-testing/'
   console.log('Injecting MetaMask Mesh testing client')
diff --git a/app/scripts/lib/setupRaven.js b/app/scripts/lib/setupRaven.js
index 77aefb00a..3f69fb3bb 100644
--- a/app/scripts/lib/setupRaven.js
+++ b/app/scripts/lib/setupRaven.js
@@ -7,7 +7,7 @@ const DEV = 'https://f59f3dd640d2429d9d0e2445a87ea8e1@sentry.io/273496'
 module.exports = setupRaven
 
 // Setup raven / sentry remote error reporting
-function setupRaven(opts) {
+function setupRaven (opts) {
   const { release } = opts
   let ravenTarget
 
@@ -21,7 +21,7 @@ function setupRaven(opts) {
 
   const client = Raven.config(ravenTarget, {
     release,
-    transport: function(opts) {
+    transport: function (opts) {
       const report = opts.data
       try {
         // handle error-like non-error exceptions
@@ -42,7 +42,7 @@ function setupRaven(opts) {
   return Raven
 }
 
-function rewriteErrorLikeExceptions(report) {
+function rewriteErrorLikeExceptions (report) {
   // handle errors that lost their error-ness in serialization (e.g. dnode)
   rewriteErrorMessages(report, (errorMessage) => {
     if (!errorMessage.includes('Non-Error exception captured with keys:')) return errorMessage
@@ -51,7 +51,7 @@ function rewriteErrorLikeExceptions(report) {
   })
 }
 
-function simplifyErrorMessages(report) {
+function simplifyErrorMessages (report) {
   rewriteErrorMessages(report, (errorMessage) => {
     // simplify ethjs error messages
     errorMessage = extractEthjsErrorMessage(errorMessage)
@@ -64,7 +64,7 @@ function simplifyErrorMessages(report) {
   })
 }
 
-function rewriteErrorMessages(report, rewriteFn) {
+function rewriteErrorMessages (report, rewriteFn) {
   // rewrite top level message
   if (report.message) report.message = rewriteFn(report.message)
   // rewrite each exception message
@@ -75,7 +75,7 @@ function rewriteErrorMessages(report, rewriteFn) {
   }
 }
 
-function rewriteReportUrls(report) {
+function rewriteReportUrls (report) {
   // update request url
   report.request.url = toMetamaskUrl(report.request.url)
   // update exception stack trace
@@ -88,7 +88,7 @@ function rewriteReportUrls(report) {
   }
 }
 
-function toMetamaskUrl(origUrl) {
+function toMetamaskUrl (origUrl) {
   const filePath = origUrl.split(location.origin)[1]
   if (!filePath) return origUrl
   const metamaskUrl = `metamask${filePath}`
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index d40a351a5..b4d39031a 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -405,7 +405,6 @@ module.exports = class MetamaskController extends EventEmitter {
   }
 
 
-
 //=============================================================================
 // VAULT / KEYRING RELATED METHODS
 //=============================================================================
@@ -962,7 +961,7 @@ module.exports = class MetamaskController extends EventEmitter {
    * Allows a user to begin the seed phrase recovery process.
    * @param {Function} cb - A callback function called when complete.
    */
-  markPasswordForgotten(cb) {
+  markPasswordForgotten (cb) {
     this.configManager.setPasswordForgotten(true)
     this.sendUpdate()
     cb()
@@ -972,7 +971,7 @@ module.exports = class MetamaskController extends EventEmitter {
    * Allows a user to end the seed phrase recovery process.
    * @param {Function} cb - A callback function called when complete.
    */
-  unMarkPasswordForgotten(cb) {
+  unMarkPasswordForgotten (cb) {
     this.configManager.setPasswordForgotten(false)
     this.sendUpdate()
     cb()
diff --git a/app/scripts/migrations/013.js b/app/scripts/migrations/013.js
index 15a9b28d4..fb7131f8e 100644
--- a/app/scripts/migrations/013.js
+++ b/app/scripts/migrations/013.js
@@ -28,7 +28,7 @@ module.exports = {
 function transformState (state) {
   const newState = state
   const { config } = newState
-  if ( config && config.provider ) {
+  if (config && config.provider) {
     if (config.provider.type === 'testnet') {
       newState.config.provider.type = 'ropsten'
     }
diff --git a/app/scripts/migrations/023.js b/app/scripts/migrations/023.js
index 151496b06..18493a789 100644
--- a/app/scripts/migrations/023.js
+++ b/app/scripts/migrations/023.js
@@ -35,10 +35,10 @@ function transformState (state) {
 
     if (transactions.length <= 40) return newState
 
-    let reverseTxList = transactions.reverse()
+    const reverseTxList = transactions.reverse()
     let stripping = true
     while (reverseTxList.length > 40 && stripping) {
-      let txIndex = reverseTxList.findIndex((txMeta) => {
+      const txIndex = reverseTxList.findIndex((txMeta) => {
         return (txMeta.status === 'failed' ||
         txMeta.status === 'rejected' ||
         txMeta.status === 'confirmed' ||
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index 6325b8a8d..db885ec93 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -12,7 +12,7 @@ module.exports = initializePopup
 /**
  * Asynchronously initializes the MetaMask popup UI
  *
- * @param {{ container: Element, connectionStream: * }} config Popup configuration object 
+ * @param {{ container: Element, connectionStream: * }} config Popup configuration object
  * @param {Function} cb Called when initialization is complete
  */
 function initializePopup ({ container, connectionStream }, cb) {
diff --git a/app/scripts/ui.js b/app/scripts/ui.js
index bdab29c1e..9bf97be87 100644
--- a/app/scripts/ui.js
+++ b/app/scripts/ui.js
@@ -14,7 +14,7 @@ const log = require('loglevel')
 
 start().catch(log.error)
 
-async function start() {
+async function start () {
 
   // create platform global
   global.platform = new ExtensionPlatform()
diff --git a/development/announcer.js b/development/announcer.js
index e97ea65b6..ea1bfdd36 100644
--- a/development/announcer.js
+++ b/development/announcer.js
@@ -7,6 +7,6 @@ var changelog = fs.readFileSync(path.join(__dirname, '..', 'CHANGELOG.md')).toSt
 
 var log = changelog.split(version)[1].split('##')[0].trim()
 
-let msg = `*MetaMask ${version}* now published! It should auto-update soon!\n${log}`
+const msg = `*MetaMask ${version}* now published! It should auto-update soon!\n${log}`
 
 console.log(msg)
diff --git a/development/backGroundConnectionModifiers.js b/development/backGroundConnectionModifiers.js
index ffbe49d4d..665f72898 100644
--- a/development/backGroundConnectionModifiers.js
+++ b/development/backGroundConnectionModifiers.js
@@ -1,5 +1,5 @@
 module.exports = {
-  "confirm sig requests": {
+  'confirm sig requests': {
     signMessage: (msgData, cb) => {
       const stateUpdate = {
         unapprovedMsgs: {},
diff --git a/development/beefy.js b/development/beefy.js
index 9eff94320..c1c436cb6 100644
--- a/development/beefy.js
+++ b/development/beefy.js
@@ -1,17 +1,14 @@
 const beefy = require('beefy')
 const http = require('http')
-const fs = require('fs')
-const path = require('path')
-
 const port = 8124
 
 const handler = beefy({
-    entries: {'mocker.js': 'bundle.js'}
-  , cwd: __dirname
-  , live: true
-  , open: true
-  , quiet: false
-  , bundlerFlags: ['-t', 'brfs']
+    entries: {'mocker.js': 'bundle.js'},
+   cwd: __dirname,
+   live: true,
+   open: true,
+   quiet: false,
+   bundlerFlags: ['-t', 'brfs'],
 })
 
 
diff --git a/development/metamaskbot-build-announce.js b/development/metamaskbot-build-announce.js
index 88614ca5c..96b5572fe 100755
--- a/development/metamaskbot-build-announce.js
+++ b/development/metamaskbot-build-announce.js
@@ -4,7 +4,7 @@ const VERSION = require('../dist/chrome/manifest.json').version
 
 start().catch(console.error)
 
-async function start() {
+async function start () {
 
   const GITHUB_COMMENT_TOKEN = process.env.GITHUB_COMMENT_TOKEN
   const CIRCLE_PULL_REQUEST = process.env.CIRCLE_PULL_REQUEST
@@ -20,7 +20,7 @@ async function start() {
   }
 
   const CIRCLE_PR_NUMBER = CIRCLE_PULL_REQUEST.split('/').pop()
-  const SHORT_SHA1 = CIRCLE_SHA1.slice(0,7)
+  const SHORT_SHA1 = CIRCLE_SHA1.slice(0, 7)
   const BUILD_LINK_BASE = `https://${CIRCLE_BUILD_NUM}-42009758-gh.circle-artifacts.com/0`
 
   const MASCARA = `${BUILD_LINK_BASE}/builds/mascara/home.html`
diff --git a/development/mock-dev.js b/development/mock-dev.js
index f332633d5..15f6ad4bf 100644
--- a/development/mock-dev.js
+++ b/development/mock-dev.js
@@ -12,7 +12,6 @@
  * To use, run `npm run mock`.
  */
 
-const extend = require('xtend')
 const render = require('react-dom').render
 const h = require('react-hyperscript')
 const Root = require('../ui/app/root')
@@ -24,7 +23,6 @@ const Selector = require('./selector')
 const MetamaskController = require('../app/scripts/metamask-controller')
 const firstTimeState = require('../app/scripts/first-time-state')
 const ExtensionPlatform = require('../app/scripts/platforms/extension')
-const extension = require('./mockExtension')
 const noop = function () {}
 
 const log = require('loglevel')
@@ -81,14 +79,14 @@ const controller = new MetamaskController({
   initState: firstTimeState,
 })
 global.metamaskController = controller
-global.platform = new ExtensionPlatform
+global.platform = new ExtensionPlatform()
 
 //
 // User Interface
 //
 
 actions._setBackgroundConnection(controller.getApi())
-actions.update = function(stateName) {
+actions.update = function (stateName) {
   selectedView = stateName
   updateQueryParams(stateName)
   const newState = states[selectedView]
@@ -98,7 +96,7 @@ actions.update = function(stateName) {
   }
 }
 
-function modifyBackgroundConnection(backgroundConnectionModifier) {
+function modifyBackgroundConnection (backgroundConnectionModifier) {
   const modifiedBackgroundConnection = Object.assign({}, controller.getApi(), backgroundConnectionModifier)
   actions._setBackgroundConnection(modifiedBackgroundConnection)
 }
@@ -112,7 +110,7 @@ var store = configureStore(firstState)
 // start app
 startApp()
 
-function startApp(){
+function startApp () {
   const body = document.body
   const container = document.createElement('div')
   container.id = 'test-container'
diff --git a/development/mockExtension.js b/development/mockExtension.js
index ac03d965c..634d4263a 100644
--- a/development/mockExtension.js
+++ b/development/mockExtension.js
@@ -39,6 +39,6 @@ extension.runtime.reload = noop
 extension.tabs.create = noop
 extension.runtime.getManifest = function () {
   return {
-    version: 'development'
+    version: 'development',
   }
-}
\ No newline at end of file
+}
diff --git a/development/run-version-bump.js b/development/run-version-bump.js
index 98757f58e..32fed1865 100644
--- a/development/run-version-bump.js
+++ b/development/run-version-bump.js
@@ -11,7 +11,7 @@ const bumpType = normalizeType(process.argv[2])
 
 start().catch(console.error)
 
-async function start() {
+async function start () {
 
   const changeBuffer = await readFile(changelogPath)
   const changelog = changeBuffer.toString()
diff --git a/development/selector.js b/development/selector.js
index fd387df15..2673d0fe3 100644
--- a/development/selector.js
+++ b/development/selector.js
@@ -11,7 +11,7 @@ function NewComponent () {
 
 NewComponent.prototype.render = function () {
   const props = this.props
-  let {
+  const {
     states,
     selectedKey,
     actions,
@@ -28,7 +28,7 @@ NewComponent.prototype.render = function () {
       margin: '20px 20px 0px',
     },
     value: selected,
-    onChange:(event) => {
+    onChange: (event) => {
       const selectedKey = event.target.value
       const backgroundConnectionModifier = backGroundConnectionModifiers[selectedKey]
       modifyBackgroundConnection(backgroundConnectionModifier || {})
diff --git a/development/sentry-publish.js b/development/sentry-publish.js
index ab3acabbd..7a6d55115 100644
--- a/development/sentry-publish.js
+++ b/development/sentry-publish.js
@@ -5,7 +5,7 @@ const VERSION = require('../dist/chrome/manifest.json').version
 
 start().catch(console.error)
 
-async function start(){
+async function start () {
   const authWorked = await checkIfAuthWorks()
   if (!authWorked) {
     console.log(`Sentry auth failed...`)
@@ -31,21 +31,21 @@ async function start(){
   console.log('all done!')
 }
 
-async function checkIfAuthWorks() {
+async function checkIfAuthWorks () {
   const itWorked = await doesNotFail(async () => {
     await exec(`sentry-cli releases --org 'metamask' --project 'metamask' list`)
   })
   return itWorked
 }
 
-async function checkIfVersionExists() {
+async function checkIfVersionExists () {
   const versionAlreadyExists = await doesNotFail(async () => {
     await exec(`sentry-cli releases --org 'metamask' --project 'metamask' info ${VERSION}`)
   })
   return versionAlreadyExists
 }
 
-async function doesNotFail(asyncFn) {
+async function doesNotFail (asyncFn) {
   try {
     await asyncFn()
     return true
diff --git a/development/sourcemap-validator.js b/development/sourcemap-validator.js
index edc97667a..143888128 100644
--- a/development/sourcemap-validator.js
+++ b/development/sourcemap-validator.js
@@ -1,6 +1,6 @@
 const fs = require('fs')
 const { SourceMapConsumer } = require('source-map')
-
+const path = require('path')
 //
 // Utility to help check if sourcemaps are working
 //
@@ -11,9 +11,11 @@ const { SourceMapConsumer } = require('source-map')
 
 start()
 
-async function start() {
-  const rawBuild = fs.readFileSync(__dirname + '/../dist/chrome/inpage.js', 'utf8')
-  const rawSourceMap = fs.readFileSync(__dirname + '/../dist/sourcemaps/inpage.js.map', 'utf8')
+
+async function start () {
+  const rawBuild = fs.readFileSync(path.join(__dirname, '/../dist/chrome/', 'inpage.js')
+  , 'utf8')
+  const rawSourceMap = fs.readFileSync(path.join(__dirname, '/../dist/sourcemaps/', 'inpage.js.map'), 'utf8')
   const consumer = await new SourceMapConsumer(rawSourceMap)
 
   console.log('hasContentsOfAllSources:', consumer.hasContentsOfAllSources(), '\n')
@@ -34,7 +36,7 @@ async function start() {
       if (result.source === 'node_modules/web3/dist/web3.min.js') return // minified mess
       const sourceContent = consumer.sourceContentFor(result.source)
       const sourceLines = sourceContent.split('\n')
-      const line = sourceLines[result.line-1]
+      const line = sourceLines[result.line - 1]
       console.log(`\n========================== ${result.source} ====================================\n`)
       console.log(line)
       console.log(`\n==============================================================================\n`)
@@ -42,8 +44,9 @@ async function start() {
   })
 }
 
-function indicesOf(substring, string) {
-  var a=[],i=-1;
-  while((i=string.indexOf(substring,i+1)) >= 0) a.push(i);
-  return a;
+function indicesOf (substring, string) {
+  var a = []
+  var i = -1
+  while ((i = string.indexOf(substring, i + 1)) >= 0) a.push(i)
+  return a
 }
diff --git a/development/ui-dev.js b/development/ui-dev.js
index cac433909..bae0ce50e 100644
--- a/development/ui-dev.js
+++ b/development/ui-dev.js
@@ -29,9 +29,8 @@ log.setDefaultLevel(1)
 
 // Query String
 const qs = require('qs')
-let queryString = qs.parse(window.location.href.split('#')[1])
+const queryString = qs.parse(window.location.href.split('#')[1])
 let selectedView = queryString.view || 'first time'
-const firstState = states[selectedView]
 updateQueryParams(selectedView)
 
 // CSS
@@ -39,15 +38,15 @@ const MetaMaskUiCss = require('../ui/css')
 const injectCss = require('inject-css')
 
 
-function updateQueryParams(newView) {
+function updateQueryParams (newView) {
   queryString.view = newView
   const params = qs.stringify(queryString)
   window.location.href = window.location.href.split('#')[0] + `#${params}`
 }
 
 const actions = {
-  _setBackgroundConnection(){},
-  update: function(stateName) {
+  _setBackgroundConnection () {},
+  update: function (stateName) {
     selectedView = stateName
     updateQueryParams(stateName)
     const newState = states[selectedView]
@@ -67,7 +66,7 @@ var store = configureStore(states[selectedView])
 // start app
 startApp()
 
-function startApp(){
+function startApp () {
   const body = document.body
   const container = document.createElement('div')
   container.id = 'test-container'
diff --git a/development/verify-locale-strings.js b/development/verify-locale-strings.js
index 8dc0a30f1..0eef2b35d 100644
--- a/development/verify-locale-strings.js
+++ b/development/verify-locale-strings.js
@@ -1,4 +1,4 @@
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 //
 // Locale verification script
 //
@@ -8,7 +8,7 @@
 //
 // will check the given locale against the strings in english
 //
-////////////////////////////////////////////////////////////////////////////////
+// //////////////////////////////////////////////////////////////////////////////
 
 const fs = require('fs')
 const path = require('path')
@@ -20,7 +20,7 @@ const specifiedLocale = process.argv[2]
 if (specifiedLocale) {
 	console.log(`Verifying selected locale "${specifiedLocale}":\n\n`)
 	const locale = localeIndex.find(localeMeta => localeMeta.code === specifiedLocale)
-	verifyLocale({ localeMeta })
+	verifyLocale({ locale })
 } else {
 	console.log('Verifying all locales:\n\n')
 	localeIndex.forEach(localeMeta => {
@@ -30,16 +30,16 @@ if (specifiedLocale) {
 }
 
 
-
-function verifyLocale({ localeMeta }) {
+function verifyLocale ({ localeMeta }) {
 	const localeCode = localeMeta.code
 	const localeName = localeMeta.name
+	let targetLocale, englishLocale
 
 	try {
 		const localeFilePath = path.join(process.cwd(), 'app', '_locales', localeCode, 'messages.json')
-		targetLocale = JSON.parse(fs.readFileSync(localeFilePath, 'utf8'));
+		targetLocale = JSON.parse(fs.readFileSync(localeFilePath, 'utf8'))
 	} catch (e) {
-		if (e.code == 'ENOENT') {
+		if (e.code === 'ENOENT') {
 			console.log('Locale file not found')
 		} else {
 			console.log(`Error opening your locale ("${localeCode}") file: `, e)
@@ -49,9 +49,9 @@ function verifyLocale({ localeMeta }) {
 
 	try {
 		const englishFilePath = path.join(process.cwd(), 'app', '_locales', 'en', 'messages.json')
-		englishLocale = JSON.parse(fs.readFileSync(englishFilePath, 'utf8'));
+		englishLocale = JSON.parse(fs.readFileSync(englishFilePath, 'utf8'))
 	} catch (e) {
-		if(e.code == 'ENOENT') {
+		if (e.code === 'ENOENT') {
 			console.log('English File not found')
 		} else {
 			console.log('Error opening english locale file: ', e)
@@ -71,7 +71,7 @@ function verifyLocale({ localeMeta }) {
 
 	if (extraItems.length) {
 		console.log('\nMissing from english locale:')
-		extraItems.forEach(function(key) {
+		extraItems.forEach(function (key) {
 			console.log(`  - [ ] ${key}`)
 		})
 	} else {
@@ -80,7 +80,7 @@ function verifyLocale({ localeMeta }) {
 
 	if (missingItems.length) {
 		console.log(`\nMissing:`)
-		missingItems.forEach(function(key) {
+		missingItems.forEach(function (key) {
 			console.log(`  - [ ] ${key}`)
 		})
 	} else {
@@ -92,6 +92,6 @@ function verifyLocale({ localeMeta }) {
 	}
 }
 
-function compareLocalesForMissingItems({ base, subject }) {
+function compareLocalesForMissingItems ({ base, subject }) {
 	return Object.keys(base).filter((key) => !subject[key])
 }
diff --git a/development/version-bump.js b/development/version-bump.js
index bedf87c01..fa20e9f75 100644
--- a/development/version-bump.js
+++ b/development/version-bump.js
@@ -1,6 +1,6 @@
 const clone = require('clone')
 
-async function versionBump(bumpType, changelog, oldManifest) {
+async function versionBump (bumpType, changelog, oldManifest) {
   const manifest = clone(oldManifest)
   const newVersion = newVersionFrom(manifest, bumpType)
 
@@ -19,13 +19,13 @@ async function versionBump(bumpType, changelog, oldManifest) {
   return {
     version: newVersion,
     manifest: manifest,
-    changelog: logLines.join('\n')
+    changelog: logLines.join('\n'),
   }
 }
 
 function newVersionFrom (manifest, bumpType) {
   const string = manifest.version
-  let segments = string.split('.').map((str) => parseInt(str))
+  const segments = string.split('.').map((str) => parseInt(str))
 
   switch (bumpType) {
     case 'major':
@@ -45,8 +45,4 @@ function newVersionFrom (manifest, bumpType) {
   return segments.map(String).join('.')
 }
 
-function bumpManifest (manifest, bumpType) {
-
-}
-
 module.exports = versionBump
diff --git a/gentests.js b/gentests.js
index 08232e10f..9c591e98c 100644
--- a/gentests.js
+++ b/gentests.js
@@ -1,6 +1,6 @@
 const fs = require('fs')
-const async = require('async')
 const path = require('path')
+const async = require('async')
 const promisify = require('pify')
 
 // start(/\.selectors.js/, generateSelectorTest).catch(console.error)
@@ -8,7 +8,6 @@ const promisify = require('pify')
 startContainer(/\.container.js/, generateContainerTest).catch(console.error)
 
 async function getAllFileNames (dirName) {
-  const rootPath = path.join(__dirname, dirName)
   const allNames = (await promisify(fs.readdir)(dirName))
   const fileNames = allNames.filter(name => name.match(/^.+\./))
   const dirNames = allNames.filter(name => name.match(/^[^.]+$/))
@@ -16,7 +15,7 @@ async function getAllFileNames (dirName) {
   const fullPathDirNames = dirNames.map(d => `${dirName}/${d}`)
   const subNameArrays = await promisify(async.map)(fullPathDirNames, getAllFileNames)
   let subNames = []
-  subNameArrays.forEach(subNameArray => subNames = [...subNames, ...subNameArray])
+  subNameArrays.forEach(subNameArray => { subNames = [...subNames, ...subNameArray] })
 
   return [
     ...fileNames.map(name => dirName + '/' + name),
@@ -24,14 +23,15 @@ async function getAllFileNames (dirName) {
   ]
 }
 
+/*
 async function start (fileRegEx, testGenerator) {
   const fileNames = await getAllFileNames('./ui/app')
   const sFiles = fileNames.filter(name => name.match(fileRegEx))
-  
+
   let sFileMethodNames
   let testFilePath
   async.each(sFiles, async (sFile, cb) => {
-    let [, sRootPath, sPath] = sFile.match(/^(.+\/)([^/]+)$/)
+    const [, sRootPath, sPath] = sFile.match(/^(.+\/)([^/]+)$/)
     sFileMethodNames = Object.keys(require(__dirname + '/' + sFile))
 
     testFilePath = sPath.replace('.', '-').replace('.', '.test.')
@@ -44,92 +44,96 @@ async function start (fileRegEx, testGenerator) {
   }, (err) => {
     console.log(err)
   })
-  
+
 }
+*/
 
 async function startContainer (fileRegEx, testGenerator) {
   const fileNames = await getAllFileNames('./ui/app')
   const sFiles = fileNames.filter(name => name.match(fileRegEx))
-  
-  let sFileMethodNames
+
   async.each(sFiles, async (sFile, cb) => {
-    console.log(`sFile`, sFile);
-    let [, sRootPath, sPath] = sFile.match(/^(.+\/)([^/]+)$/)
-    
-    let testFilePath = sPath.replace('.', '-').replace('.', '.test.')
+    console.log(`sFile`, sFile)
+    const [, sRootPath, sPath] = sFile.match(/^(.+\/)([^/]+)$/)
+
+    const testFilePath = sPath.replace('.', '-').replace('.', '.test.')
 
     await promisify(fs.readFile)(
-      __dirname + '/' + sFile,
+      path.join(__dirname, sFile),
       'utf8',
       async (err, result) => {
-        console.log(`result`, result.length);
-        const returnObjectStrings = result
-          .match(/return\s(\{[\s\S]+?})\n}/g)
-          .map(str => {
-            return str
-              .slice(0, str.length - 1)
-              .slice(7)
-              .replace(/\n/g, '')
-              .replace(/\s\s+/g, ' ')
-              
+        if (err) {
+          console.log('Error: ', err)
+        } else {
+          console.log(`result`, result.length)
+          const returnObjectStrings = result
+            .match(/return\s(\{[\s\S]+?})\n}/g)
+            .map(str => {
+              return str
+                .slice(0, str.length - 1)
+                .slice(7)
+                .replace(/\n/g, '')
+                .replace(/\s\s+/g, ' ')
+
+            })
+          const mapStateToPropsAssertionObject = returnObjectStrings[0]
+            .replace(/\w+:\s\w+\([\w,\s]+\),/g, str => {
+              const strKey = str.match(/^\w+/)[0]
+              return strKey + ': \'mock' + str.match(/^\w+/)[0].replace(/^./, c => c.toUpperCase()) + ':mockState\',\n'
+            })
+            .replace(/{\s\w.+/, firstLinePair => `{\n ${firstLinePair.slice(2)}`)
+            .replace(/\w+:.+,/g, s => `       ${s}`)
+            .replace(/}/g, s => `     ${s}`)
+          let mapDispatchToPropsMethodNames
+          if (returnObjectStrings[1]) {
+            mapDispatchToPropsMethodNames = returnObjectStrings[1].match(/\s\w+:\s/g).map(str => str.match(/\w+/)[0])
+          }
+          const proxyquireObject = ('{\n  ' + result
+            .match(/import\s{[\s\S]+?}\sfrom\s.+/g)
+            .map(s => s.replace(/\n/g, ''))
+            .map((s, i) => {
+              const proxyKeys = s.match(/{.+}/)[0].match(/\w+/g)
+              return '\'' + s.match(/'(.+)'/)[1] + '\': { ' + (proxyKeys.length > 1
+                  ? '\n    ' + proxyKeys.join(': () => {},\n    ') + ': () => {},\n '
+                  : proxyKeys[0] + ': () => {},') + ' }'
+            })
+            .join(',\n  ') + '\n}')
+            .replace('{ connect: () => {}, },', `{
+      connect: (ms, md) => {
+        mapStateToProps = ms
+        mapDispatchToProps = md
+        return () => ({})
+      },
+    },`)
+            // console.log(`proxyquireObject`, proxyquireObject);
+          // console.log(`mapStateToPropsAssertionObject`, mapStateToPropsAssertionObject);
+          // console.log(`mapDispatchToPropsMethodNames`, mapDispatchToPropsMethodNames);
+
+          const containerTest = generateContainerTest(sPath, {
+            mapStateToPropsAssertionObject,
+            mapDispatchToPropsMethodNames,
+            proxyquireObject,
           })
-        const mapStateToPropsAssertionObject = returnObjectStrings[0]
-          .replace(/\w+:\s\w+\([\w,\s]+\),/g, str => {
-            const strKey = str.match(/^\w+/)[0]
-            return strKey + ': \'mock' + str.match(/^\w+/)[0].replace(/^./, c => c.toUpperCase()) + ':mockState\',\n'
-          })
-          .replace(/{\s\w.+/, firstLinePair => `{\n ${firstLinePair.slice(2)}`)
-          .replace(/\w+:.+,/g, s => `       ${s}`)
-          .replace(/}/g, s => `     ${s}`)
-        let mapDispatchToPropsMethodNames
-        if (returnObjectStrings[1]) {
-          mapDispatchToPropsMethodNames = returnObjectStrings[1].match(/\s\w+:\s/g).map(str => str.match(/\w+/)[0])
+          // console.log(`containerTest`, `${__dirname}/${sRootPath}tests/${testFilePath}`, containerTest);
+          console.log('----')
+          console.log(`sRootPath`, sRootPath)
+          console.log(`testFilePath`, testFilePath)
+          await promisify(fs.writeFile)(
+            `${__dirname}/${sRootPath}tests/${testFilePath}`,
+            containerTest,
+            'utf8'
+          )
         }
-        const proxyquireObject = ('{\n  ' + result
-          .match(/import\s{[\s\S]+?}\sfrom\s.+/g)
-          .map(s => s.replace(/\n/g, ''))
-          .map((s, i) => {
-            const proxyKeys = s.match(/{.+}/)[0].match(/\w+/g)
-            return '\'' + s.match(/'(.+)'/)[1] + '\': { ' + (proxyKeys.length > 1
-                ? '\n    ' + proxyKeys.join(': () => {},\n    ') + ': () => {},\n '
-                : proxyKeys[0] + ': () => {},') + ' }'
-          })
-          .join(',\n  ') + '\n}')
-          .replace('{ connect: () => {}, },', `{
-    connect: (ms, md) => {
-      mapStateToProps = ms
-      mapDispatchToProps = md
-      return () => ({})
-    },
-  },`)
-          // console.log(`proxyquireObject`, proxyquireObject);
-        // console.log(`mapStateToPropsAssertionObject`, mapStateToPropsAssertionObject);
-        // console.log(`mapDispatchToPropsMethodNames`, mapDispatchToPropsMethodNames);
-
-        const containerTest = generateContainerTest(sPath, {
-          mapStateToPropsAssertionObject,
-          mapDispatchToPropsMethodNames,
-          proxyquireObject,
-        })
-        // console.log(`containerTest`, `${__dirname}/${sRootPath}tests/${testFilePath}`, containerTest);
-        console.log('----')
-        console.log(`sRootPath`, sRootPath);
-        console.log(`testFilePath`, testFilePath);
-        await promisify(fs.writeFile)(
-          `${__dirname}/${sRootPath}tests/${testFilePath}`,
-          containerTest,
-          'utf8'
-        )
       }
     )
   }, (err) => {
     console.log('123', err)
   })
-  
-}
 
+}
+/*
 function generateMethodList (methodArray) {
-  return methodArray.map(n => '  ' + n).join(',\n') + ',' 
+  return methodArray.map(n => '  ' + n).join(',\n') + ','
 }
 
 function generateMethodDescribeBlock (methodName, index) {
@@ -143,7 +147,7 @@ function generateMethodDescribeBlock (methodName, index) {
   })`
   return describeBlock
 }
-
+*/
 function generateDispatchMethodDescribeBlock (methodName, index) {
   const describeBlock =
   `${index ? '    ' : ''}describe('${methodName}()', () => {
@@ -154,12 +158,13 @@ function generateDispatchMethodDescribeBlock (methodName, index) {
     })`
   return describeBlock
 }
-
+/*
 function generateMethodDescribeBlocks (methodArray) {
   return methodArray
     .map((methodName, index) => generateMethodDescribeBlock(methodName, index))
     .join('\n\n')
 }
+*/
 
 function generateDispatchMethodDescribeBlocks (methodArray) {
   return methodArray
@@ -167,6 +172,7 @@ function generateDispatchMethodDescribeBlocks (methodArray) {
     .join('\n\n')
 }
 
+/*
 function generateSelectorTest (name, methodArray) {
 return `import assert from 'assert'
 import {
@@ -192,6 +198,7 @@ describe('${name.match(/^[^.]+/)} utils', () => {
 
 })`
 }
+*/
 
 function generateContainerTest (sPath, {
   mapStateToPropsAssertionObject,
@@ -231,4 +238,4 @@ describe('${sPath.match(/^[^.]+/)} container', () => {
   })
 
 })`
-}
\ No newline at end of file
+}
diff --git a/gulpfile.js b/gulpfile.js
index 4dca7089f..480f544d8 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -13,27 +13,21 @@ const zip = require('gulp-zip')
 const assign = require('lodash.assign')
 const livereload = require('gulp-livereload')
 const del = require('del')
-const eslint = require('gulp-eslint')
 const fs = require('fs')
 const path = require('path')
 const manifest = require('./app/manifest.json')
-const replace = require('gulp-replace')
 const mkdirp = require('mkdirp')
-const asyncEach = require('async/each')
-const exec = require('child_process').exec
 const sass = require('gulp-sass')
 const autoprefixer = require('gulp-autoprefixer')
 const gulpStylelint = require('gulp-stylelint')
 const stylefmt = require('gulp-stylefmt')
 const uglify = require('gulp-uglify-es').default
-const babel = require('gulp-babel')
-const debug = require('gulp-debug')
 const pify = require('pify')
 const gulpMultiProcess = require('gulp-multi-process')
 const endOfStream = pify(require('end-of-stream'))
 
 function gulpParallel (...args) {
-  return function spawnGulpChildProcess(cb) {
+  return function spawnGulpChildProcess (cb) {
     return gulpMultiProcess(args, cb, true)
   }
 }
@@ -48,12 +42,12 @@ const commonPlatforms = [
   // browser webapp
   'mascara',
   // browser extensions
-  ...browserPlatforms
+  ...browserPlatforms,
 ]
 
 // browser reload
 
-gulp.task('dev:reload', function() {
+gulp.task('dev:reload', function () {
   livereload.listen({
     port: 35729,
   })
@@ -108,7 +102,7 @@ createCopyTasks('html:mascara', {
   destinations: [`./dist/mascara/`],
 })
 
-function createCopyTasks(label, opts) {
+function createCopyTasks (label, opts) {
   if (!opts.devOnly) {
     const copyTaskName = `copy:${label}`
     copyTask(copyTaskName, opts)
@@ -119,7 +113,7 @@ function createCopyTasks(label, opts) {
   copyDevTaskNames.push(copyDevTaskName)
 }
 
-function copyTask(taskName, opts){
+function copyTask (taskName, opts) {
   const source = opts.source
   const destination = opts.destination
   const destinations = opts.destinations || [destination]
@@ -137,12 +131,12 @@ function copyTask(taskName, opts){
     return performCopy()
   })
 
-  function performCopy() {
+  function performCopy () {
     // stream from source
     let stream = gulp.src(source + pattern, { base: source })
 
     // copy to destinations
-    destinations.forEach(function(destination) {
+    destinations.forEach(function (destination) {
       stream = stream.pipe(gulp.dest(destination))
     })
 
@@ -152,40 +146,40 @@ function copyTask(taskName, opts){
 
 // manifest tinkering
 
-gulp.task('manifest:chrome', function() {
+gulp.task('manifest:chrome', function () {
   return gulp.src('./dist/chrome/manifest.json')
-  .pipe(jsoneditor(function(json) {
+  .pipe(jsoneditor(function (json) {
     delete json.applications
     return json
   }))
   .pipe(gulp.dest('./dist/chrome', { overwrite: true }))
 })
 
-gulp.task('manifest:opera', function() {
+gulp.task('manifest:opera', function () {
   return gulp.src('./dist/opera/manifest.json')
-  .pipe(jsoneditor(function(json) {
+  .pipe(jsoneditor(function (json) {
     json.permissions = [
-      "storage",
-      "tabs",
-      "clipboardWrite",
-      "clipboardRead",
-      "http://localhost:8545/"
+      'storage',
+      'tabs',
+      'clipboardWrite',
+      'clipboardRead',
+      'http://localhost:8545/',
     ]
     return json
   }))
   .pipe(gulp.dest('./dist/opera', { overwrite: true }))
 })
 
-gulp.task('manifest:production', function() {
+gulp.task('manifest:production', function () {
   return gulp.src([
     './dist/firefox/manifest.json',
     './dist/chrome/manifest.json',
     './dist/edge/manifest.json',
     './dist/opera/manifest.json',
-  ],{base: './dist/'})
+  ], {base: './dist/'})
 
   // Exclude chromereload script in production:
-  .pipe(jsoneditor(function(json) {
+  .pipe(jsoneditor(function (json) {
     json.background.scripts = json.background.scripts.filter((script) => {
       return !script.includes('chromereload')
     })
@@ -212,29 +206,6 @@ gulp.task('dev:copy',
   )
 )
 
-// lint js
-
-const lintTargets = ['app/**/*.json', 'app/**/*.js', '!app/scripts/vendor/**/*.js', 'ui/**/*.js', 'old-ui/**/*.js', 'mascara/src/*.js', 'mascara/server/*.js', '!node_modules/**', '!dist/firefox/**', '!docs/**', '!app/scripts/chromereload.js', '!mascara/test/jquery-3.1.0.min.js']
-
-gulp.task('lint', function () {
-  // Ignoring node_modules, dist/firefox, and docs folders:
-  return gulp.src(lintTargets)
-    .pipe(eslint(fs.readFileSync(path.join(__dirname, '.eslintrc'))))
-    // eslint.format() outputs the lint results to the console.
-    // Alternatively use eslint.formatEach() (see Docs).
-    .pipe(eslint.format())
-    // To have the process exit with an error code (1) on
-    // lint error, return the stream and pipe to failAfterError last.
-    .pipe(eslint.failAfterError())
-});
-
-gulp.task('lint:fix', function () {
-  return gulp.src(lintTargets)
-    .pipe(eslint(Object.assign(fs.readFileSync(path.join(__dirname, '.eslintrc')), {fix: true})))
-    .pipe(eslint.format())
-    .pipe(eslint.failAfterError())
-});
-
 // scss compilation and autoprefixing tasks
 
 gulp.task('build:scss', createScssBuildTask({
@@ -250,7 +221,7 @@ gulp.task('dev:scss', createScssBuildTask({
   pattern: 'ui/app/**/*.scss',
 }))
 
-function createScssBuildTask({ src, dest, devMode, pattern }) {
+function createScssBuildTask ({ src, dest, devMode, pattern }) {
   return function () {
     if (devMode) {
       watch(pattern, async (event) => {
@@ -262,7 +233,7 @@ function createScssBuildTask({ src, dest, devMode, pattern }) {
     return buildScss()
   }
 
-  function buildScss() {
+  function buildScss () {
     return gulp.src(src)
       .pipe(sourcemaps.init())
       .pipe(sass().on('error', sass.logError))
@@ -272,22 +243,22 @@ function createScssBuildTask({ src, dest, devMode, pattern }) {
   }
 }
 
-gulp.task('lint-scss', function() {
+gulp.task('lint-scss', function () {
   return gulp
     .src('ui/app/css/itcss/**/*.scss')
     .pipe(gulpStylelint({
       reporters: [
-        { formatter: 'string', console: true }
+        { formatter: 'string', console: true },
       ],
       fix: true,
-    }));
-});
+    }))
+})
 
 gulp.task('fmt-scss', function () {
   return gulp.src('ui/app/css/itcss/**/*.scss')
     .pipe(stylefmt())
-    .pipe(gulp.dest('ui/app/css/itcss'));
-});
+    .pipe(gulp.dest('ui/app/css/itcss'))
+})
 
 // build js
 
@@ -300,11 +271,11 @@ const buildJsFiles = [
 
 // bundle tasks
 createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'dev:extension:js', devMode: true })
-createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'build:extension:js'  })
+createTasksForBuildJsExtension({ buildJsFiles, taskPrefix: 'build:extension:js' })
 createTasksForBuildJsMascara({ taskPrefix: 'build:mascara:js' })
 createTasksForBuildJsMascara({ taskPrefix: 'dev:mascara:js', devMode: true })
 
-function createTasksForBuildJsExtension({ buildJsFiles, taskPrefix, devMode, bundleTaskOpts = {} }) {
+function createTasksForBuildJsExtension ({ buildJsFiles, taskPrefix, devMode, bundleTaskOpts = {} }) {
   // inpage must be built before all other scripts:
   const rootDir = './app/scripts'
   const nonInpageFiles = buildJsFiles.filter(file => file !== 'inpage')
@@ -322,7 +293,7 @@ function createTasksForBuildJsExtension({ buildJsFiles, taskPrefix, devMode, bun
   createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1, buildPhase2 })
 }
 
-function createTasksForBuildJsMascara({ taskPrefix, devMode, bundleTaskOpts = {} }) {
+function createTasksForBuildJsMascara ({ taskPrefix, devMode, bundleTaskOpts = {} }) {
   // inpage must be built before all other scripts:
   const rootDir = './mascara/src/'
   const buildPhase1 = ['ui', 'proxy', 'background', 'metamascara']
@@ -338,7 +309,7 @@ function createTasksForBuildJsMascara({ taskPrefix, devMode, bundleTaskOpts = {}
   createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1 })
 }
 
-function createTasksForBuildJs({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1 = [], buildPhase2 = [] }) {
+function createTasksForBuildJs ({ rootDir, taskPrefix, bundleTaskOpts, destinations, buildPhase1 = [], buildPhase2 = [] }) {
   // bundle task for each file
   const jsFiles = [].concat(buildPhase1, buildPhase2)
   jsFiles.forEach((jsFile) => {
@@ -367,7 +338,7 @@ gulp.task('disc', gulp.parallel(buildJsFiles.map(jsFile => `disc:${jsFile}`)))
 
 // clean dist
 
-gulp.task('clean', function clean() {
+gulp.task('clean', function clean () {
   return del(['./dist/*'])
 })
 
@@ -460,7 +431,7 @@ gulp.task('dist',
 
 // task generators
 
-function zipTask(target) {
+function zipTask (target) {
   return () => {
     return gulp.src(`dist/${target}/**`)
     .pipe(zip(`metamask-${target}-${manifest.version}.zip`))
@@ -468,7 +439,7 @@ function zipTask(target) {
   }
 }
 
-function generateBundler(opts, performBundle) {
+function generateBundler (opts, performBundle) {
   const browserifyOpts = assign({}, watchify.args, {
     entries: [opts.filepath],
     plugin: 'browserify-derequire',
@@ -497,7 +468,7 @@ function generateBundler(opts, performBundle) {
   return bundler
 }
 
-function discTask(opts) {
+function discTask (opts) {
   opts = Object.assign({
     buildWithFullPaths: true,
   }, opts)
@@ -508,7 +479,7 @@ function discTask(opts) {
 
   return performBundle
 
-  function performBundle(){
+  function performBundle () {
     // start "disc" build
     const discDir = path.join(__dirname, 'disc')
     mkdirp.sync(discDir)
@@ -523,14 +494,14 @@ function discTask(opts) {
 }
 
 
-function bundleTask(opts) {
+function bundleTask (opts) {
   const bundler = generateBundler(opts, performBundle)
   // output build logs to terminal
   bundler.on('log', gutil.log)
 
   return performBundle
 
-  function performBundle(){
+  function performBundle () {
     let buildStream = bundler.bundle()
 
     // handle errors
@@ -562,7 +533,7 @@ function bundleTask(opts) {
       buildStream = buildStream
       .pipe(uglify({
         mangle: {
-          reserved: [ 'MetamaskInpageProvider' ]
+          reserved: [ 'MetamaskInpageProvider' ],
         },
       }))
     }
diff --git a/mascara/example/app.js b/mascara/example/app.js
index 598e2c84c..7b6421fdc 100644
--- a/mascara/example/app.js
+++ b/mascara/example/app.js
@@ -3,7 +3,7 @@ const EthQuery = require('ethjs-query')
 window.addEventListener('load', loadProvider)
 window.addEventListener('message', console.warn)
 
-async function loadProvider() {
+async function loadProvider () {
   const ethereumProvider = window.metamask.createDefaultProvider({ host: 'http://localhost:9001' })
   const ethQuery = new EthQuery(ethereumProvider)
   const accounts = await ethQuery.accounts()
@@ -13,7 +13,7 @@ async function loadProvider() {
 }
 
 
-function logToDom(message, context){
+function logToDom (message, context) {
   document.getElementById(context).innerText = message
   console.log(message)
 }
@@ -35,4 +35,4 @@ function setupButtons (ethQuery) {
     })
     logToDom(txHash, 'cb-value')
   })
-}
\ No newline at end of file
+}
diff --git a/mascara/example/server.js b/mascara/example/server.js
index d39c19600..bdb1efa16 100644
--- a/mascara/example/server.js
+++ b/mascara/example/server.js
@@ -1,8 +1,8 @@
 const express = require('express')
+const path = require('path')
 const createMetamascaraServer = require('../server/')
 const createBundle = require('../server/util').createBundle
 const serveBundle = require('../server/util').serveBundle
-
 //
 // Iframe Server
 //
@@ -23,7 +23,7 @@ const dappServer = express()
 
 // serve dapp bundle
 serveBundle(dappServer, '/app.js', createBundle(require.resolve('./app.js')))
-dappServer.use(express.static(__dirname + '/app/'))
+dappServer.use(express.static(path.join(__dirname, '/app/')))
 
 // start the server
 const dappPort = '9002'
diff --git a/mascara/src/app/first-time/breadcrumbs.js b/mascara/src/app/first-time/breadcrumbs.js
index b81a9fb9b..d86e10d48 100644
--- a/mascara/src/app/first-time/breadcrumbs.js
+++ b/mascara/src/app/first-time/breadcrumbs.js
@@ -8,7 +8,7 @@ export default class Breadcrumbs extends Component {
     currentIndex: PropTypes.number,
   };
 
-  render() {
+  render () {
     const {total, currentIndex} = this.props
     return (
       <div className="breadcrumbs">
@@ -20,7 +20,7 @@ export default class Breadcrumbs extends Component {
           />
         ))}
       </div>
-    );
+    )
   }
 
 }
diff --git a/mascara/src/app/first-time/buy-ether-screen.js b/mascara/src/app/first-time/buy-ether-screen.js
index c5a560638..e270392e1 100644
--- a/mascara/src/app/first-time/buy-ether-screen.js
+++ b/mascara/src/app/first-time/buy-ether-screen.js
@@ -54,7 +54,7 @@ class BuyEtherScreen extends Component {
 
     return (
       <div
-        className='buy-ether__do-it-later'
+        className="buy-ether__do-it-later"
         onClick={() => showAccountDetail(address)}
       >
         Do it later
@@ -64,17 +64,17 @@ class BuyEtherScreen extends Component {
 
   renderCoinbaseLogo () {
     return (
-      <svg width='140px' height='49px' viewBox='0 0 579 126' version='1.1'>
-        <g id='Page-1' stroke='none' strokeWidth={1} fill='none' fillRule='evenodd'>
-          <g id='Imported-Layers' fill='#0081C9'>
-            <path d='M37.752,125.873 C18.824,125.873 0.369,112.307 0.369,81.549 C0.369,50.79 18.824,37.382 37.752,37.382 C47.059,37.382 54.315,39.749 59.52,43.219 L53.841,55.68 C50.371,53.156 45.166,51.579 39.961,51.579 C28.604,51.579 18.193,60.57 18.193,81.391 C18.193,102.212 28.919,111.361 39.961,111.361 C45.166,111.361 50.371,109.783 53.841,107.26 L59.52,120.036 C54.157,123.664 47.059,125.873 37.752,125.873' id='Fill-1' />
-            <path d='M102.898,125.873 C78.765,125.873 65.515,106.786 65.515,81.549 C65.515,56.311 78.765,37.382 102.898,37.382 C127.032,37.382 140.282,56.311 140.282,81.549 C140.282,106.786 127.032,125.873 102.898,125.873 L102.898,125.873 Z M102.898,51.105 C89.491,51.105 82.866,63.093 82.866,81.391 C82.866,99.688 89.491,111.834 102.898,111.834 C116.306,111.834 122.931,99.688 122.931,81.391 C122.931,63.093 116.306,51.105 102.898,51.105 L102.898,51.105 Z' id='Fill-2' />
-            <path d='M163.468,23.659 C157.79,23.659 153.215,19.243 153.215,13.88 C153.215,8.517 157.79,4.1 163.468,4.1 C169.146,4.1 173.721,8.517 173.721,13.88 C173.721,19.243 169.146,23.659 163.468,23.659 L163.468,23.659 Z M154.793,39.118 L172.144,39.118 L172.144,124.138 L154.793,124.138 L154.793,39.118 Z' id='Fill-3' />
-            <path d='M240.443,124.137 L240.443,67.352 C240.443,57.415 234.449,51.263 222.619,51.263 C216.31,51.263 210.473,52.367 207.003,53.787 L207.003,124.137 L189.81,124.137 L189.81,43.376 C198.328,39.906 209.212,37.382 222.461,37.382 C246.28,37.382 257.794,47.793 257.794,65.775 L257.794,124.137 L240.443,124.137' id='Fill-4' />
-            <path d='M303.536,125.873 C292.494,125.873 281.611,123.191 274.986,119.879 L274.986,0.314 L292.179,0.314 L292.179,41.326 C296.28,39.433 302.905,37.856 308.741,37.856 C330.667,37.856 345.494,53.629 345.494,79.656 C345.494,111.676 328.931,125.873 303.536,125.873 L303.536,125.873 Z M305.744,51.263 C301.012,51.263 295.491,52.367 292.179,54.103 L292.179,109.941 C294.703,111.045 299.593,112.149 304.482,112.149 C318.205,112.149 328.301,102.685 328.301,80.918 C328.301,62.305 319.467,51.263 305.744,51.263 L305.744,51.263 Z' id='Fill-5' />
-            <path d='M392.341,125.873 C367.892,125.873 355.589,115.935 355.589,99.215 C355.589,75.555 380.826,71.296 406.537,69.876 L406.537,64.513 C406.537,53.787 399.439,50.001 388.555,50.001 C380.511,50.001 370.731,52.525 365.053,55.207 L360.636,43.376 C367.419,40.379 378.933,37.382 390.29,37.382 C410.638,37.382 422.942,45.269 422.942,66.248 L422.942,119.879 C416.79,123.191 404.329,125.873 392.341,125.873 L392.341,125.873 Z M406.537,81.391 C389.186,82.337 371.835,83.757 371.835,98.9 C371.835,107.89 378.776,113.411 391.868,113.411 C397.389,113.411 403.856,112.465 406.537,111.203 L406.537,81.391 L406.537,81.391 Z' id='Fill-6' />
-            <path d='M461.743,125.873 C451.806,125.873 441.395,123.191 435.244,119.879 L441.08,106.629 C445.496,109.31 454.803,112.149 461.27,112.149 C470.576,112.149 476.728,107.575 476.728,100.477 C476.728,92.748 470.261,89.751 461.586,86.596 C450.228,82.337 437.452,77.132 437.452,61.201 C437.452,47.162 448.336,37.382 467.264,37.382 C477.517,37.382 486.035,39.906 492.029,43.376 L486.665,55.364 C482.88,52.998 475.309,50.317 469.157,50.317 C460.166,50.317 455.118,55.049 455.118,61.201 C455.118,68.93 461.428,71.611 469.788,74.766 C481.618,79.183 494.71,84.072 494.71,100.635 C494.71,115.935 483.038,125.873 461.743,125.873' id='Fill-7' />
-            <path d='M578.625,81.233 L522.155,89.12 C523.89,104.42 533.828,112.149 548.182,112.149 C556.699,112.149 565.848,110.099 571.684,106.944 L576.732,119.879 C570.107,123.349 558.75,125.873 547.078,125.873 C520.262,125.873 505.277,108.679 505.277,81.549 C505.277,55.522 519.789,37.382 543.607,37.382 C565.69,37.382 578.782,51.894 578.782,74.766 C578.782,76.816 578.782,79.025 578.625,81.233 L578.625,81.233 Z M543.292,50.001 C530.042,50.001 521.367,60.097 521.051,77.763 L562.22,72.084 C562.062,57.257 554.649,50.001 543.292,50.001 L543.292,50.001 Z' id='Fill-8' />
+      <svg width="140px" height="49px" viewBox="0 0 579 126" version="1.1">
+        <g id="Page-1" stroke="none" strokeWidth={1} fill="none" fillRule="evenodd">
+          <g id="Imported-Layers" fill="#0081C9">
+            <path d="M37.752,125.873 C18.824,125.873 0.369,112.307 0.369,81.549 C0.369,50.79 18.824,37.382 37.752,37.382 C47.059,37.382 54.315,39.749 59.52,43.219 L53.841,55.68 C50.371,53.156 45.166,51.579 39.961,51.579 C28.604,51.579 18.193,60.57 18.193,81.391 C18.193,102.212 28.919,111.361 39.961,111.361 C45.166,111.361 50.371,109.783 53.841,107.26 L59.52,120.036 C54.157,123.664 47.059,125.873 37.752,125.873" id="Fill-1" />
+            <path d="M102.898,125.873 C78.765,125.873 65.515,106.786 65.515,81.549 C65.515,56.311 78.765,37.382 102.898,37.382 C127.032,37.382 140.282,56.311 140.282,81.549 C140.282,106.786 127.032,125.873 102.898,125.873 L102.898,125.873 Z M102.898,51.105 C89.491,51.105 82.866,63.093 82.866,81.391 C82.866,99.688 89.491,111.834 102.898,111.834 C116.306,111.834 122.931,99.688 122.931,81.391 C122.931,63.093 116.306,51.105 102.898,51.105 L102.898,51.105 Z" id="Fill-2" />
+            <path d="M163.468,23.659 C157.79,23.659 153.215,19.243 153.215,13.88 C153.215,8.517 157.79,4.1 163.468,4.1 C169.146,4.1 173.721,8.517 173.721,13.88 C173.721,19.243 169.146,23.659 163.468,23.659 L163.468,23.659 Z M154.793,39.118 L172.144,39.118 L172.144,124.138 L154.793,124.138 L154.793,39.118 Z" id="Fill-3" />
+            <path d="M240.443,124.137 L240.443,67.352 C240.443,57.415 234.449,51.263 222.619,51.263 C216.31,51.263 210.473,52.367 207.003,53.787 L207.003,124.137 L189.81,124.137 L189.81,43.376 C198.328,39.906 209.212,37.382 222.461,37.382 C246.28,37.382 257.794,47.793 257.794,65.775 L257.794,124.137 L240.443,124.137" id="Fill-4" />
+            <path d="M303.536,125.873 C292.494,125.873 281.611,123.191 274.986,119.879 L274.986,0.314 L292.179,0.314 L292.179,41.326 C296.28,39.433 302.905,37.856 308.741,37.856 C330.667,37.856 345.494,53.629 345.494,79.656 C345.494,111.676 328.931,125.873 303.536,125.873 L303.536,125.873 Z M305.744,51.263 C301.012,51.263 295.491,52.367 292.179,54.103 L292.179,109.941 C294.703,111.045 299.593,112.149 304.482,112.149 C318.205,112.149 328.301,102.685 328.301,80.918 C328.301,62.305 319.467,51.263 305.744,51.263 L305.744,51.263 Z" id="Fill-5" />
+            <path d="M392.341,125.873 C367.892,125.873 355.589,115.935 355.589,99.215 C355.589,75.555 380.826,71.296 406.537,69.876 L406.537,64.513 C406.537,53.787 399.439,50.001 388.555,50.001 C380.511,50.001 370.731,52.525 365.053,55.207 L360.636,43.376 C367.419,40.379 378.933,37.382 390.29,37.382 C410.638,37.382 422.942,45.269 422.942,66.248 L422.942,119.879 C416.79,123.191 404.329,125.873 392.341,125.873 L392.341,125.873 Z M406.537,81.391 C389.186,82.337 371.835,83.757 371.835,98.9 C371.835,107.89 378.776,113.411 391.868,113.411 C397.389,113.411 403.856,112.465 406.537,111.203 L406.537,81.391 L406.537,81.391 Z" id="Fill-6" />
+            <path d="M461.743,125.873 C451.806,125.873 441.395,123.191 435.244,119.879 L441.08,106.629 C445.496,109.31 454.803,112.149 461.27,112.149 C470.576,112.149 476.728,107.575 476.728,100.477 C476.728,92.748 470.261,89.751 461.586,86.596 C450.228,82.337 437.452,77.132 437.452,61.201 C437.452,47.162 448.336,37.382 467.264,37.382 C477.517,37.382 486.035,39.906 492.029,43.376 L486.665,55.364 C482.88,52.998 475.309,50.317 469.157,50.317 C460.166,50.317 455.118,55.049 455.118,61.201 C455.118,68.93 461.428,71.611 469.788,74.766 C481.618,79.183 494.71,84.072 494.71,100.635 C494.71,115.935 483.038,125.873 461.743,125.873" id="Fill-7" />
+            <path d="M578.625,81.233 L522.155,89.12 C523.89,104.42 533.828,112.149 548.182,112.149 C556.699,112.149 565.848,110.099 571.684,106.944 L576.732,119.879 C570.107,123.349 558.75,125.873 547.078,125.873 C520.262,125.873 505.277,108.679 505.277,81.549 C505.277,55.522 519.789,37.382 543.607,37.382 C565.69,37.382 578.782,51.894 578.782,74.766 C578.782,76.816 578.782,79.025 578.625,81.233 L578.625,81.233 Z M543.292,50.001 C530.042,50.001 521.367,60.097 521.051,77.763 L562.22,72.084 C562.062,57.257 554.649,50.001 543.292,50.001 L543.292,50.001 Z" id="Fill-8" />
           </g>
         </g>
       </svg>
@@ -85,13 +85,13 @@ class BuyEtherScreen extends Component {
     const {goToCoinbase, address} = this.props
 
     return (
-      <div className='buy-ether__action-content-wrapper'>
+      <div className="buy-ether__action-content-wrapper">
         <div>{this.renderCoinbaseLogo()}</div>
-        <div className='buy-ether__body-text'>Coinbase is the world’s most popular way to buy and sell bitcoin, ethereum, and litecoin.</div>
-        <a className='first-time-flow__link buy-ether__faq-link'>What is Ethereum?</a>
-        <div className='buy-ether__buttons'>
+        <div className="buy-ether__body-text">Coinbase is the world’s most popular way to buy and sell bitcoin, ethereum, and litecoin.</div>
+        <a className="first-time-flow__link buy-ether__faq-link">What is Ethereum?</a>
+        <div className="buy-ether__buttons">
           <button
-            className='first-time-flow__button'
+            className="first-time-flow__button"
             onClick={() => goToCoinbase(address)}
           >
             Buy
@@ -114,23 +114,23 @@ class BuyEtherScreen extends Component {
         return this.renderCoinbaseForm()
       case OPTION_VALUES.SHAPESHIFT:
         return (
-          <div className='buy-ether__action-content-wrapper'>
-            <div className='shapeshift-logo' />
-            <div className='buy-ether__body-text'>
+          <div className="buy-ether__action-content-wrapper">
+            <div className="shapeshift-logo" />
+            <div className="buy-ether__body-text">
               Trade any leading blockchain asset for any other. Protection by Design. No Account Needed.
             </div>
-            <ShapeShiftForm btnClass='first-time-flow__button' />
+            <ShapeShiftForm btnClass="first-time-flow__button" />
           </div>
           )
       case OPTION_VALUES.QR_CODE:
         return (
-          <div className='buy-ether__action-content-wrapper'>
+          <div className="buy-ether__action-content-wrapper">
             <div dangerouslySetInnerHTML={{ __html: qrImage.createTableTag(4) }} />
-            <div className='buy-ether__body-text'>Deposit Ether directly into your account.</div>
-            <div className='buy-ether__small-body-text'>(This is the account address that MetaMask created for you to recieve funds.)</div>
-            <div className='buy-ether__buttons'>
+            <div className="buy-ether__body-text">Deposit Ether directly into your account.</div>
+            <div className="buy-ether__small-body-text">(This is the account address that MetaMask created for you to recieve funds.)</div>
+            <div className="buy-ether__buttons">
               <button
-                className='first-time-flow__button'
+                className="first-time-flow__button"
                 onClick={this.copyToClipboard}
                 disabled={justCopied}
               >
@@ -149,19 +149,19 @@ class BuyEtherScreen extends Component {
     const { selectedOption } = this.state
 
     return (
-      <div className='buy-ether'>
+      <div className="buy-ether">
         <Identicon address={this.props.address} diameter={70} />
-        <div className='buy-ether__title'>Deposit Ether</div>
-        <div className='buy-ether__body-text'>
+        <div className="buy-ether__title">Deposit Ether</div>
+        <div className="buy-ether__body-text">
           MetaMask works best if you have Ether in your account to pay for transaction gas fees and more. To get Ether, choose from one of these methods.
         </div>
-        <div className='buy-ether__content-wrapper'>
-          <div className='buy-ether__content-headline-wrapper'>
-            <div className='buy-ether__content-headline'>Deposit Options</div>
+        <div className="buy-ether__content-wrapper">
+          <div className="buy-ether__content-headline-wrapper">
+            <div className="buy-ether__content-headline">Deposit Options</div>
             {this.renderSkip()}
           </div>
-          <div className='buy-ether__content'>
-            <div className='buy-ether__side-panel'>
+          <div className="buy-ether__content">
+            <div className="buy-ether__side-panel">
               {OPTIONS.map(({ name, value }) => (
                 <div
                   key={value}
@@ -170,16 +170,16 @@ class BuyEtherScreen extends Component {
                   })}
                   onClick={() => this.setState({ selectedOption: value })}
                 >
-                  <div className='buy-ether__side-panel-item-name'>{name}</div>
+                  <div className="buy-ether__side-panel-item-name">{name}</div>
                   {value === selectedOption && (
-                    <svg viewBox='0 0 574 1024' id='si-ant-right' width='15px' height='15px'>
-                      <path d='M10 9Q0 19 0 32t10 23l482 457L10 969Q0 979 0 992t10 23q10 9 24 9t24-9l506-480q10-10 10-23t-10-23L58 9Q48 0 34 0T10 9z' />
+                    <svg viewBox="0 0 574 1024" id="si-ant-right" width="15px" height="15px">
+                      <path d="M10 9Q0 19 0 32t10 23l482 457L10 969Q0 979 0 992t10 23q10 9 24 9t24-9l506-480q10-10 10-23t-10-23L58 9Q48 0 34 0T10 9z" />
                     </svg>
                   )}
                 </div>
               ))}
             </div>
-            <div className='buy-ether__action-content'>
+            <div className="buy-ether__action-content">
               {this.renderContent()}
             </div>
           </div>
diff --git a/mascara/src/app/first-time/loading-screen.js b/mascara/src/app/first-time/loading-screen.js
index 01e1c1998..596f818ca 100644
--- a/mascara/src/app/first-time/loading-screen.js
+++ b/mascara/src/app/first-time/loading-screen.js
@@ -2,7 +2,7 @@ import React from 'react'
 import PropTypes from 'prop-types'
 import Spinner from './spinner'
 
-export default function LoadingScreen({ className = '', loadingMessage }) {
+export default function LoadingScreen ({ className = '', loadingMessage }) {
   return (
     <div className={`${className} loading-screen`}>
       <Spinner color="#1B344D" />
diff --git a/mascara/src/app/shapeshift-form/index.js b/mascara/src/app/shapeshift-form/index.js
index 53a63403a..6f3307487 100644
--- a/mascara/src/app/shapeshift-form/index.js
+++ b/mascara/src/app/shapeshift-form/index.js
@@ -79,11 +79,11 @@ export class ShapeShiftForm extends Component {
 
   renderMetadata (label, value) {
     return (
-      <div className='shapeshift-form__metadata-wrapper'>
-        <div className='shapeshift-form__metadata-label'>
+      <div className="shapeshift-form__metadata-wrapper">
+        <div className="shapeshift-form__metadata-label">
           {label}:
         </div>
-        <div className='shapeshift-form__metadata-value'>
+        <div className="shapeshift-form__metadata-value">
           {value}
         </div>
       </div>
@@ -101,7 +101,7 @@ export class ShapeShiftForm extends Component {
     } = tokenExchangeRates[coinPair] || {}
 
     return (
-      <div className='shapeshift-form__metadata'>
+      <div className="shapeshift-form__metadata">
         {this.renderMetadata('Status', limit ? 'Available' : 'Unavailable')}
         {this.renderMetadata('Limit', limit)}
         {this.renderMetadata('Exchange Rate', rate)}
@@ -117,13 +117,13 @@ export class ShapeShiftForm extends Component {
     qrImage.make()
 
     return (
-      <div className='shapeshift-form'>
-        <div className='shapeshift-form__deposit-instruction'>
+      <div className="shapeshift-form">
+        <div className="shapeshift-form__deposit-instruction">
           Deposit your BTC to the address bellow:
         </div>
-        <div className='shapeshift-form__qr-code'>
+        <div className="shapeshift-form__qr-code">
           {isLoading
-            ? <img src='images/loading.svg' style={{ width: '60px' }} />
+            ? <img src="images/loading.svg" style={{ width: '60px' }} />
             : <div dangerouslySetInnerHTML={{ __html: qrImage.createTableTag(4) }} />
           }
         </div>
@@ -141,14 +141,14 @@ export class ShapeShiftForm extends Component {
 
     return showQrCode ? this.renderQrCode() : (
       <div>
-        <div className='shapeshift-form'>
-          <div className='shapeshift-form__selectors'>
-            <div className='shapeshift-form__selector'>
-              <div className='shapeshift-form__selector-label'>
+        <div className="shapeshift-form">
+          <div className="shapeshift-form__selectors">
+            <div className="shapeshift-form__selector">
+              <div className="shapeshift-form__selector-label">
                 Deposit
               </div>
               <select
-                className='shapeshift-form__selector-input'
+                className="shapeshift-form__selector-input"
                 value={this.state.depositCoin}
                 onChange={this.onCoinChange}
               >
@@ -160,14 +160,14 @@ export class ShapeShiftForm extends Component {
               </select>
             </div>
             <div
-              className='icon shapeshift-form__caret'
+              className="icon shapeshift-form__caret"
               style={{ backgroundImage: 'url(images/caret-right.svg)'}}
             />
-            <div className='shapeshift-form__selector'>
-              <div className='shapeshift-form__selector-label'>
+            <div className="shapeshift-form__selector">
+              <div className="shapeshift-form__selector-label">
                 Receive
               </div>
-              <div className='shapeshift-form__selector-input'>
+              <div className="shapeshift-form__selector-input">
                 ETH
               </div>
             </div>
@@ -177,18 +177,18 @@ export class ShapeShiftForm extends Component {
               'shapeshift-form__address-input-wrapper--error': errorMessage,
             })}
           >
-            <div className='shapeshift-form__address-input-label'>
+            <div className="shapeshift-form__address-input-label">
               Your Refund Address
             </div>
             <input
-              type='text'
-              className='shapeshift-form__address-input'
+              type="text"
+              className="shapeshift-form__address-input"
               onChange={e => this.setState({
                 refundAddress: e.target.value,
                 errorMessage: '',
               })}
             />
-            <div className='shapeshift-form__address-input-error-message'>
+            <div className="shapeshift-form__address-input-error-message">
               {errorMessage}
             </div>
           </div>
diff --git a/mascara/src/background.js b/mascara/src/background.js
index 40a684f3d..d8d1c8c54 100644
--- a/mascara/src/background.js
+++ b/mascara/src/background.js
@@ -37,7 +37,7 @@ const dbController = new DbController({
 
 start().catch(log.error)
 
-async function start() {
+async function start () {
   log.debug('MetaMask initializing...')
   const initState = await loadStateFromPersistence()
   await setupController(initState)
diff --git a/mascara/src/ui.js b/mascara/src/ui.js
index f35a11fc4..f9e7670ea 100644
--- a/mascara/src/ui.js
+++ b/mascara/src/ui.js
@@ -43,7 +43,7 @@ console.log('starting service worker')
 swController.startWorker()
 
 // Setup listener for when the service worker is read
-function connectApp() {
+function connectApp () {
   const connectionStream = SwStream({
     serviceWorker: swController.getWorker(),
     context: name,
diff --git a/mascara/test/helpers.js b/mascara/test/helpers.js
index eede103b4..8fc5c816b 100644
--- a/mascara/test/helpers.js
+++ b/mascara/test/helpers.js
@@ -1,6 +1,6 @@
-function wait(time) {
-  return new Promise(function(resolve, reject) {
-    setTimeout(function() {
+export default function wait (time) {
+  return new Promise(function (resolve, reject) {
+    setTimeout(function () {
       resolve()
     }, time * 3 || 1500)
   })
diff --git a/mascara/test/index.js b/mascara/test/index.js
index 0134cdf00..d62e43705 100644
--- a/mascara/test/index.js
+++ b/mascara/test/index.js
@@ -1,9 +1,9 @@
 var fs = require('fs')
 var path = require('path')
-var browserify = require('browserify');
+var browserify = require('browserify')
 var tests = fs.readdirSync(path.join(__dirname, 'lib'))
 var bundlePath = path.join(__dirname, 'test-bundle.js')
-var b = browserify();
+var b = browserify()
 
 // Remove old bundle
 try {
@@ -14,9 +14,9 @@ try {
 
 var writeStream = fs.createWriteStream(bundlePath)
 
-tests.forEach(function(fileName) {
+tests.forEach(function (fileName) {
   b.add(path.join(__dirname, 'lib', fileName))
 })
 
-b.bundle().pipe(writeStream);
+b.bundle().pipe(writeStream)
 
diff --git a/mascara/test/test-ui.js b/mascara/test/test-ui.js
index b9bc42dff..16b2c206a 100644
--- a/mascara/test/test-ui.js
+++ b/mascara/test/test-ui.js
@@ -1,5 +1,3 @@
-const Helper = require('./util/mascara-test-helper.js')
-
 window.addEventListener('load', () => {
   window.METAMASK_SKIP_RELOAD = true
   // inject app container
diff --git a/mascara/test/util/mascara-test-helper.js b/mascara/test/util/mascara-test-helper.js
index 9cf4fa900..0439fbba3 100644
--- a/mascara/test/util/mascara-test-helper.js
+++ b/mascara/test/util/mascara-test-helper.js
@@ -2,27 +2,29 @@ const EventEmitter = require('events')
 const IDB = require('idb-global')
 const KEY = 'metamask-test-config'
 module.exports = class Helper extends EventEmitter {
-  constructor () {
-    super()
-  }
 
   tryToCleanContext () {
     this.unregister()
     .then(() => this.clearDb())
     .then(() => super.emit('complete'))
-    .catch((err) => super.emit('complete'))
+    .catch((err) => {
+      if (err) {
+        super.emit('complete')
+      }
+    })
   }
 
   unregister () {
     return global.navigator.serviceWorker.getRegistration()
     .then((registration) => {
-      if (registration) return registration.unregister()
+      if (registration) {
+ return registration.unregister()
       .then((b) => b ? Promise.resolve() : Promise.reject())
-      else return Promise.resolve()
+} else return Promise.resolve()
     })
   }
   clearDb () {
-    return new Promise ((resolve, reject) => {
+    return new Promise((resolve, reject) => {
       const deleteRequest = global.indexDB.deleteDatabase(KEY)
       deleteRequest.addEventListener('success', resolve)
       deleteRequest.addEventListener('error', reject)
@@ -33,7 +35,7 @@ module.exports = class Helper extends EventEmitter {
     const db = new IDB({
       version: 2,
       key: KEY,
-      initialState: state
+      initialState: state,
     })
     return db.open()
   }
diff --git a/notices/notices.js b/notices/notices.js
index 4ba925408..6392b6381 100644
--- a/notices/notices.js
+++ b/notices/notices.js
@@ -1,5 +1,6 @@
 // fs.readFileSync is inlined by browserify transform "brfs"
 const fs = require('fs')
+const path = require('path')
 
 module.exports = [
   {
@@ -7,14 +8,14 @@ module.exports = [
     read: false,
     date: 'Thu Feb 09 2017',
     title: 'Terms of Use',
-    body: fs.readFileSync(__dirname + '/archive/notice_0.md', 'utf8'),
+    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_0.md'), 'utf8'),
   },
   {
     id: 2,
     read: false,
     date: 'Mon May 08 2017',
     title: 'Privacy Notice',
-    body: fs.readFileSync(__dirname + '/archive/notice_2.md', 'utf8'),
+    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_2.md'), 'utf8'),
   },
   {
     id: 3,
@@ -22,13 +23,13 @@ module.exports = [
     date: 'Tue Nov 28 2017',
     title: 'Seed Phrase Alert',
     firstVersion: '<=3.12.0',
-    body: fs.readFileSync(__dirname + '/archive/notice_3.md', 'utf8'),
+    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_3.md'), 'utf8'),
   },
   {
     id: 4,
     read: false,
     date: 'Wed Jun 13 2018',
     title: 'Phishing Warning',
-    body: fs.readFileSync(__dirname + '/archive/notice_4.md', 'utf8'),
-  }
+    body: fs.readFileSync(path.join(__dirname, '/archive', 'notice_4.md'), 'utf8'),
+  },
 ]
diff --git a/old-ui/app/components/ens-input.js b/old-ui/app/components/ens-input.js
index 7e06fa9f1..9c46f77d7 100644
--- a/old-ui/app/components/ens-input.js
+++ b/old-ui/app/components/ens-input.js
@@ -20,7 +20,7 @@ function EnsInput () {
 EnsInput.prototype.render = function () {
   const props = this.props
 
-  function onInputChange() {
+  function onInputChange () {
     const network = this.props.network
     const networkHasEnsSupport = getNetworkEnsSupport(network)
     if (!networkHasEnsSupport) return
diff --git a/old-ui/app/components/loading.js b/old-ui/app/components/loading.js
index b8e2eb599..2a29361f9 100644
--- a/old-ui/app/components/loading.js
+++ b/old-ui/app/components/loading.js
@@ -28,7 +28,7 @@ LoadingIndicator.prototype.render = function () {
         background: 'rgba(255, 255, 255, 0.8)',
       },
     }, [
-      canBypass ? h( 'i.fa.fa-close.cursor-pointer.close-loading', {
+      canBypass ? h('i.fa.fa-close.cursor-pointer.close-loading', {
         style: {
           position: 'absolute',
           top: '1px',
diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js
index b9f82c668..e9280419a 100644
--- a/old-ui/app/components/transaction-list-item.js
+++ b/old-ui/app/components/transaction-list-item.js
@@ -40,8 +40,8 @@ TransactionListItem.prototype.showRetryButton = function () {
   const currentNonceTxs = transactions.filter(tx => tx.txParams.nonce === currentNonce)
   const currentNonceSubmittedTxs = currentNonceTxs.filter(tx => tx.status === 'submitted')
   const lastSubmittedTxWithCurrentNonce = currentNonceSubmittedTxs[0]
-  const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce
-    && lastSubmittedTxWithCurrentNonce.id === transaction.id
+  const currentTxIsLatestWithNonce = lastSubmittedTxWithCurrentNonce &&
+    lastSubmittedTxWithCurrentNonce.id === transaction.id
 
   return currentTxIsLatestWithNonce && Date.now() - submittedTime > 30000
 }
diff --git a/old-ui/app/config.js b/old-ui/app/config.js
index 508770bd4..392a6dba7 100644
--- a/old-ui/app/config.js
+++ b/old-ui/app/config.js
@@ -31,7 +31,7 @@ ConfigScreen.prototype.render = function () {
 
   return (
     h('.flex-column.flex-grow', {
-      style:{
+      style: {
         maxHeight: '585px',
         overflowY: 'auto',
       },
diff --git a/package.json b/package.json
index 0094f7949..dbde69f83 100644
--- a/package.json
+++ b/package.json
@@ -38,8 +38,8 @@
     "test:mascara:build:tests": "browserify test/integration/lib/first-time.js -o dist/mascara/tests.js",
     "ganache:start": "ganache-cli -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'",
     "sentry:publish": "node ./development/sentry-publish.js",
-    "lint": "gulp lint",
-    "lint:fix": "gulp lint:fix",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
     "ui": "npm run test:flat:build:states && beefy development/ui-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
     "mock": "beefy development/mock-dev.js:bundle.js --live --open --index=./development/index.html --cwd ./",
     "watch": "mocha watch --recursive \"test/unit/**/*.js\"",
@@ -239,7 +239,6 @@
     "gifencoder": "^1.1.0",
     "gulp": "github:gulpjs/gulp#6d71a658c61edb3090221579d8f97dbe086ba2ed",
     "gulp-babel": "^7.0.0",
-    "gulp-eslint": "^4.0.0",
     "gulp-json-editor": "^2.2.1",
     "gulp-livereload": "^3.8.1",
     "gulp-multi-process": "^1.3.1",
diff --git a/test/base.conf.js b/test/base.conf.js
index 956dce011..ccb91cc65 100644
--- a/test/base.conf.js
+++ b/test/base.conf.js
@@ -1,7 +1,7 @@
 // Karma configuration
 // Generated on Mon Sep 11 2017 18:45:48 GMT-0700 (PDT)
 
-module.exports = function(config) {
+module.exports = function (config) {
   return {
     // base path that will be used to resolve all patterns (eg. files, exclude)
     basePath: process.cwd(),
diff --git a/test/e2e/beta/contract-test/contract.js b/test/e2e/beta/contract-test/contract.js
index 19c29e5c1..18c866f21 100644
--- a/test/e2e/beta/contract-test/contract.js
+++ b/test/e2e/beta/contract-test/contract.js
@@ -28,21 +28,24 @@ The `piggybankContract` is compiled from:
   }
 */
 
-var piggybankContract = web3.eth.contract([{"constant":false,"inputs":[{"name":"withdrawAmount","type":"uint256"}],"name":"withdraw","outputs":[{"name":"remainingBal","type":"uint256"}],"payable":false,"stateMutability":"nonpayable","type":"function"},{"constant":true,"inputs":[],"name":"owner","outputs":[{"name":"","type":"address"}],"payable":false,"stateMutability":"view","type":"function"},{"constant":false,"inputs":[],"name":"deposit","outputs":[{"name":"","type":"uint256"}],"payable":true,"stateMutability":"payable","type":"function"},{"inputs":[],"payable":false,"stateMutability":"nonpayable","type":"constructor"}]);
+var piggybankContract = web3.eth.contract([{'constant': false, 'inputs': [{'name': 'withdrawAmount', 'type': 'uint256'}], 'name': 'withdraw', 'outputs': [{'name': 'remainingBal', 'type': 'uint256'}], 'payable': false, 'stateMutability': 'nonpayable', 'type': 'function'}, {'constant': true, 'inputs': [], 'name': 'owner', 'outputs': [{'name': '', 'type': 'address'}], 'payable': false, 'stateMutability': 'view', 'type': 'function'}, {'constant': false, 'inputs': [], 'name': 'deposit', 'outputs': [{'name': '', 'type': 'uint256'}], 'payable': true, 'stateMutability': 'payable', 'type': 'function'}, {'inputs': [], 'payable': false, 'stateMutability': 'nonpayable', 'type': 'constructor'}])
+const deployButton = document.getElementById('deployButton')
+const depositButton = document.getElementById('depositButton')
+const withdrawButton = document.getElementById('withdrawButton')
 
-deployButton.addEventListener('click', function (event) {
-    
-    var piggybank = piggybankContract.new(
+deployButton.addEventListener('click', async function (event) {
+
+    var piggybank = await piggybankContract.new(
        {
-         from: web3.eth.accounts[0], 
-         data: '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029', 
-         gas: '4700000'
-       }, function (e, contract){
-        console.log(e, contract);
+         from: web3.eth.accounts[0],
+         data: '0x608060405234801561001057600080fd5b5033600160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055506000808190555061023b806100686000396000f300608060405260043610610057576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680632e1a7d4d1461005c5780638da5cb5b1461009d578063d0e30db0146100f4575b600080fd5b34801561006857600080fd5b5061008760048036038101908080359060200190929190505050610112565b6040518082815260200191505060405180910390f35b3480156100a957600080fd5b506100b26101d0565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b6100fc6101f6565b6040518082815260200191505060405180910390f35b6000600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff163373ffffffffffffffffffffffffffffffffffffffff1614151561017057600080fd5b8160008082825403925050819055503373ffffffffffffffffffffffffffffffffffffffff166108fc839081150290604051600060405180830381858888f193505050501580156101c5573d6000803e3d6000fd5b506000549050919050565b600160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1681565b60003460008082825401925050819055506000549050905600a165627a7a72305820f237db3ec816a52589d82512117bc85bc08d3537683ffeff9059108caf3e5d400029',
+         gas: '4700000',
+       }, function (e, contract) {
+        console.log(e, contract)
         if (typeof contract.address !== 'undefined') {
-          console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash);
+          console.log('Contract mined! address: ' + contract.address + ' transactionHash: ' + contract.transactionHash)
 
-          console.log(`contract`, contract);
+          console.log(`contract`, contract)
 
           depositButton.addEventListener('click', function (event) {
            contract.deposit({ from: web3.eth.accounts[0], value: '0x29a2241af62c0000' }, function (result) {
@@ -58,4 +61,6 @@ deployButton.addEventListener('click', function (event) {
         }
      })
 
-})
\ No newline at end of file
+     console.log(piggybank)
+
+})
diff --git a/test/e2e/beta/from-import-beta-ui.spec.js b/test/e2e/beta/from-import-beta-ui.spec.js
index 38fdedcec..b396dc5b9 100644
--- a/test/e2e/beta/from-import-beta-ui.spec.js
+++ b/test/e2e/beta/from-import-beta-ui.spec.js
@@ -12,7 +12,6 @@ const {
 } = require('../func')
 const {
   checkBrowserForConsoleErrors,
-  loadExtension,
   verboseReportOnFailure,
   findElement,
   findElements,
@@ -22,14 +21,12 @@ const {
 describe('Using MetaMask with an existing account', function () {
   let extensionId
   let driver
-  let tokenAddress
 
   const testSeedPhrase = 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'
   const testAddress = '0xE18035BF8712672935FDB4e5e431b1a0183d2DFC'
   const testPrivateKey2 = '14abe6f4aab7f9f626fe981c864d0adeb5685f289ac9270c27b8fd790b4235d6'
   const regularDelayMs = 1000
   const largeDelayMs = regularDelayMs * 2
-  const waitingNewPageDelayMs = regularDelayMs * 10
 
   this.timeout(0)
   this.bail(true)
@@ -98,15 +95,16 @@ describe('Using MetaMask with an existing account', function () {
       await delay(regularDelayMs)
 
       // Close all other tabs
-      let [oldUi, infoPage, newUi] = await driver.getAllWindowHandles()
-      newUi = newUi || infoPage
+      const [oldUi, infoPage, newUi] = await driver.getAllWindowHandles()
+
+      const newUiOrInfoPage = newUi || infoPage
       await driver.switchTo().window(oldUi)
       await driver.close()
-      if (infoPage !== newUi) {
+      if (infoPage !== newUiOrInfoPage) {
         await driver.switchTo().window(infoPage)
         await driver.close()
       }
-      await driver.switchTo().window(newUi)
+      await driver.switchTo().window(newUiOrInfoPage)
       await delay(regularDelayMs)
 
       const continueBtn = await findElement(driver, By.css('.welcome-screen__button'))
@@ -322,5 +320,5 @@ describe('Using MetaMask with an existing account', function () {
       await delay(regularDelayMs)
     })
   })
-  
+
 })
diff --git a/test/e2e/beta/metamask-beta-ui.spec.js b/test/e2e/beta/metamask-beta-ui.spec.js
index 0f424abcc..5f270b52b 100644
--- a/test/e2e/beta/metamask-beta-ui.spec.js
+++ b/test/e2e/beta/metamask-beta-ui.spec.js
@@ -28,7 +28,6 @@ describe('MetaMask', function () {
   const tinyDelayMs = 1000
   const regularDelayMs = tinyDelayMs * 2
   const largeDelayMs = regularDelayMs * 2
-  const waitingNewPageDelayMs = regularDelayMs * 30
 
   this.timeout(0)
   this.bail(true)
@@ -100,7 +99,7 @@ describe('MetaMask', function () {
       await delay(regularDelayMs)
 
       // Close all other tabs
-      let [oldUi, tab1, tab2] = await driver.getAllWindowHandles()
+      const [oldUi, tab1, tab2] = await driver.getAllWindowHandles()
       await driver.switchTo().window(oldUi)
       await driver.close()
 
@@ -245,7 +244,7 @@ describe('MetaMask', function () {
 
         await word10.click()
         await delay(tinyDelayMs)
-      
+
         const word11 = await findElement(driver, By.xpath(`//button[contains(text(), '${words[11]}')]`), 10000)
         await word11.click()
         await delay(tinyDelayMs)
@@ -281,7 +280,7 @@ describe('MetaMask', function () {
       await driver.findElement(By.css('.qr-wrapper')).isDisplayed()
       await delay(regularDelayMs)
 
-      let accountModal = await driver.findElement(By.css('span .modal'))
+      const accountModal = await driver.findElement(By.css('span .modal'))
 
       await driver.executeScript("document.querySelector('.account-modal-close').click()")
 
@@ -499,7 +498,7 @@ describe('MetaMask', function () {
       await configureGas.click()
       await delay(regularDelayMs)
 
-      let gasModal = await driver.findElement(By.css('span .modal'))
+      const gasModal = await driver.findElement(By.css('span .modal'))
       await driver.wait(until.elementLocated(By.css('.send-v2__customize-gas__title')))
 
       const [gasPriceInput, gasLimitInput] = await findElements(driver, By.css('.customize-gas-input'))
@@ -700,7 +699,7 @@ describe('MetaMask', function () {
       if (process.env.SELENIUM_BROWSER !== 'firefox') {
         await driver.wait(until.elementTextMatches(txValues[0], /50\sTST/), 10000)
       }
-      
+
       const txStatuses = await findElements(driver, By.css('.tx-list-status'))
       const tx = await driver.wait(until.elementTextMatches(txStatuses[0], /Confirmed|Failed/), 10000)
       assert.equal(await tx.getText(), 'Confirmed')
@@ -712,7 +711,7 @@ describe('MetaMask', function () {
     it('sends an already created token', async () => {
      openNewPage(driver, `https://tokenfactory.surge.sh/#/token/${tokenAddress}`)
 
-      const [extension, tokenFactory] = await driver.getAllWindowHandles()
+      const [extension] = await driver.getAllWindowHandles()
 
       const [
         transferToAddress,
@@ -759,7 +758,7 @@ describe('MetaMask', function () {
       await gasLimitInput.sendKeys(Key.chord(Key.CONTROL, 'e'))
 
       // Needed for different behaviour of input in different versions of firefox
-      const gasLimitInputValue = await gasLimitInput.getAttribute('value') 
+      const gasLimitInputValue = await gasLimitInput.getAttribute('value')
       if (gasLimitInputValue === '600001') {
         await gasLimitInput.sendKeys(Key.BACK_SPACE)
       }
diff --git a/test/e2e/metamask.spec.js b/test/e2e/metamask.spec.js
index 6ab21dfcd..a32b924b8 100644
--- a/test/e2e/metamask.spec.js
+++ b/test/e2e/metamask.spec.js
@@ -335,7 +335,7 @@ describe('Metamask popup page', function () {
     await driver.executeScript('window.metamask.setProviderType(arguments[0])', type)
   }
 
-  async function checkBrowserForConsoleErrors() {
+  async function checkBrowserForConsoleErrors () {
     const ignoredLogTypes = ['WARNING']
     const ignoredErrorMessages = [
       // React throws error warnings on "dataset", but still sets the data-* properties correctly
diff --git a/test/flat.conf.js b/test/flat.conf.js
index cd2dbdcdc..1c9ec3dcd 100644
--- a/test/flat.conf.js
+++ b/test/flat.conf.js
@@ -1,6 +1,6 @@
 const getBaseConfig = require('./base.conf.js')
 
-module.exports = function(config) {
+module.exports = function (config) {
   const settings = getBaseConfig(config)
   settings.files.push('development/bundle.js')
   settings.files.push('test/integration/bundle.js')
diff --git a/test/integration/lib/add-token.js b/test/integration/lib/add-token.js
index 5a08c90cd..6de7574c4 100644
--- a/test/integration/lib/add-token.js
+++ b/test/integration/lib/add-token.js
@@ -75,7 +75,7 @@ async function runAddTokenFlowTest (assert, done) {
   tokenWrapper[0].click()
 
   // Click Next button
-  let nextButton = await queryAsync($, 'button.btn-primary.btn--large')
+  const nextButton = await queryAsync($, 'button.btn-primary.btn--large')
   assert.equal(nextButton[0].textContent, 'Next', 'next button rendered')
   nextButton[0].click()
 
diff --git a/test/integration/lib/confirm-sig-requests.js b/test/integration/lib/confirm-sig-requests.js
index d5ed7c77c..5613c0dcb 100644
--- a/test/integration/lib/confirm-sig-requests.js
+++ b/test/integration/lib/confirm-sig-requests.js
@@ -1,10 +1,7 @@
 const reactTriggerChange = require('react-trigger-change')
 const {
-  timeout,
   queryAsync,
-  findAsync,
 } = require('../../lib/util')
-const PASSWORD = 'password123'
 
 QUnit.module('confirm sig requests')
 
@@ -16,8 +13,8 @@ QUnit.test('successful confirmation of sig requests', (assert) => {
   })
 })
 
-async function runConfirmSigRequestsTest(assert, done) {
-  let selectState = await queryAsync($, 'select')
+async function runConfirmSigRequestsTest (assert, done) {
+  const selectState = await queryAsync($, 'select')
   selectState.val('confirm sig requests')
   reactTriggerChange(selectState[0])
 
@@ -32,7 +29,7 @@ async function runConfirmSigRequestsTest(assert, done) {
   let confirmSigHeadline = await queryAsync($, '.request-signature__headline')
   assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested')
 
-  let confirmSigMessage = await queryAsync($, '.request-signature__notice')
+  const confirmSigMessage = await queryAsync($, '.request-signature__notice')
   assert.ok(confirmSigMessage[0].textContent.match(/^Signing\sthis\smessage/))
 
   let confirmSigRowValue = await queryAsync($, '.request-signature__row-value')
@@ -45,7 +42,7 @@ async function runConfirmSigRequestsTest(assert, done) {
   assert.equal(confirmSigHeadline[0].textContent, 'Your signature is being requested')
 
   confirmSigRowValue = await queryAsync($, '.request-signature__row-value')
-  assert.ok(confirmSigRowValue[0].textContent.match(/^\#\sTerms\sof\sUse/))
+  assert.ok(confirmSigRowValue[0].textContent.match(/^#\sTerms\sof\sUse/))
 
   confirmSigSignButton = await queryAsync($, 'button.btn-primary.btn--large')
   confirmSigSignButton[0].click()
diff --git a/test/integration/lib/currency-localization.js b/test/integration/lib/currency-localization.js
index 7705c9720..3ad1a23e5 100644
--- a/test/integration/lib/currency-localization.js
+++ b/test/integration/lib/currency-localization.js
@@ -15,7 +15,7 @@ QUnit.test('renders localized currency', (assert) => {
   })
 })
 
-async function runCurrencyLocalizationTest(assert, done) {
+async function runCurrencyLocalizationTest (assert, done) {
   console.log('*** start runCurrencyLocalizationTest')
   const selectState = await queryAsync($, 'select')
   selectState.val('currency localization')
diff --git a/test/integration/lib/mascara-first-time.js b/test/integration/lib/mascara-first-time.js
index f43a30c74..8bbdb4410 100644
--- a/test/integration/lib/mascara-first-time.js
+++ b/test/integration/lib/mascara-first-time.js
@@ -42,7 +42,7 @@ async function runFirstTimeUsageTest (assert, done) {
   assert.equal(created.textContent, 'Your unique account image', 'unique image screen')
 
   // Agree button
-  let button = (await findAsync(app, 'button'))[0]
+  const button = (await findAsync(app, 'button'))[0]
   assert.ok(button, 'button present')
   button.click()
 
diff --git a/test/integration/lib/send-new-ui.js b/test/integration/lib/send-new-ui.js
index 72e4a8cb1..241358135 100644
--- a/test/integration/lib/send-new-ui.js
+++ b/test/integration/lib/send-new-ui.js
@@ -5,8 +5,6 @@ const {
   findAsync,
 } = require('../../lib/util')
 
-const PASSWORD = 'password123'
-
 QUnit.module('new ui send flow')
 
 QUnit.test('successful send flow', (assert) => {
@@ -54,7 +52,7 @@ async function customizeGas (assert, price, limit, ethFee, usdFee) {
   )
 }
 
-async function runSendFlowTest(assert, done) {
+async function runSendFlowTest (assert, done) {
   console.log('*** start runSendFlowTest')
   const selectState = await queryAsync($, 'select')
   selectState.val('send new ui')
@@ -87,7 +85,7 @@ async function runSendFlowTest(assert, done) {
   sendFromFieldItemAddress = await queryAsync($, '.account-list-item__account-name')
   assert.equal(sendFromFieldItemAddress[0].textContent, 'Send Account 2', 'send from field dropdown changes account name')
 
-  let sendToFieldInput = await queryAsync($, '.send-v2__to-autocomplete__input')
+  const sendToFieldInput = await queryAsync($, '.send-v2__to-autocomplete__input')
   sendToFieldInput[0].focus()
 
   const sendToDropdownList = await queryAsync($, '.send-v2__from-dropdown__list')
diff --git a/test/integration/lib/tx-list-items.js b/test/integration/lib/tx-list-items.js
index 4856b3852..6b67b1d2e 100644
--- a/test/integration/lib/tx-list-items.js
+++ b/test/integration/lib/tx-list-items.js
@@ -1,6 +1,5 @@
 const reactTriggerChange = require('../../lib/react-trigger-change')
 const {
-  timeout,
   queryAsync,
   findAsync,
 } = require('../../lib/util')
@@ -15,7 +14,7 @@ QUnit.test('renders list items successfully', (assert) => {
   })
 })
 
-async function runTxListItemsTest(assert, done) {
+async function runTxListItemsTest (assert, done) {
   console.log('*** start runTxListItemsTest')
   const selectState = await queryAsync($, 'select')
   selectState.val('tx list items')
diff --git a/test/lib/mock-encryptor.js b/test/lib/mock-encryptor.js
index ef229a82f..48aa9e52c 100644
--- a/test/lib/mock-encryptor.js
+++ b/test/lib/mock-encryptor.js
@@ -31,6 +31,6 @@ module.exports = {
 
   getRandomValues () {
     return 'SOO RANDO!!!1'
-  }
+  },
 
 }
diff --git a/test/lib/mock-tx-gen.js b/test/lib/mock-tx-gen.js
index 7aea09c59..106101500 100644
--- a/test/lib/mock-tx-gen.js
+++ b/test/lib/mock-tx-gen.js
@@ -17,14 +17,14 @@ class TxGenerator {
   }
 
   generate (tx = {}, opts = {}) {
-    let { count, fromNonce } = opts
+    const { count, fromNonce } = opts
     let nonce = fromNonce || this.txs.length
-    let txs = []
+    const txs = []
     for (let i = 0; i < count; i++) {
       txs.push(extend(template, {
         txParams: {
           nonce: hexify(nonce++),
-        }
+        },
       }, tx))
     }
     this.txs = this.txs.concat(txs)
diff --git a/test/lib/react-trigger-change.js b/test/lib/react-trigger-change.js
index a25ddff00..d169dd614 100644
--- a/test/lib/react-trigger-change.js
+++ b/test/lib/react-trigger-change.js
@@ -1,7 +1,7 @@
 // Trigger React's synthetic change events on input, textarea and select elements
 // https://github.com/vitalyq/react-trigger-change
 
-/******************IMPORTANT NOTE******************/
+/** ****************IMPORTANT NOTE******************/
 /* This file is a modification of the             */
 /* 'react-trigger-change' library linked above.   */
 /* That library breaks when 'onFocus' events are  */
@@ -11,13 +11,13 @@
 /* This modification removes the accomodations    */
 /* 'react-trigger-change' makes for IE to ensure  */
 /* our tests can pass in chrome and firefox.      */
-/**************************************************/
+/** ************************************************/
 
-'use strict';
+'use strict'
 
 // Constants and functions are declared inside the closure.
 // In this way, reactTriggerChange can be passed directly to executeScript in Selenium.
-module.exports = function reactTriggerChange(node) {
+module.exports = function reactTriggerChange (node) {
   var supportedInputTypes = {
     color: true,
     date: true,
@@ -33,47 +33,47 @@ module.exports = function reactTriggerChange(node) {
     text: true,
     time: true,
     url: true,
-    week: true
-  };
-  var nodeName = node.nodeName.toLowerCase();
-  var type = node.type;
-  var event;
-  var descriptor;
-  var initialValue;
-  var initialChecked;
-  var initialCheckedRadio;
+    week: true,
+  }
+  var nodeName = node.nodeName.toLowerCase()
+  var type = node.type
+  var event
+  var descriptor
+  var initialValue
+  var initialChecked
+  var initialCheckedRadio
 
   // Do not try to delete non-configurable properties.
   // Value and checked properties on DOM elements are non-configurable in PhantomJS.
-  function deletePropertySafe(elem, prop) {
-    var desc = Object.getOwnPropertyDescriptor(elem, prop);
+  function deletePropertySafe (elem, prop) {
+    var desc = Object.getOwnPropertyDescriptor(elem, prop)
     if (desc && desc.configurable) {
-      delete elem[prop];
+      delete elem[prop]
     }
   }
 
-  function getCheckedRadio(radio) {
-    var name = radio.name;
-    var radios;
-    var i;
+  function getCheckedRadio (radio) {
+    var name = radio.name
+    var radios
+    var i
     if (name) {
-      radios = document.querySelectorAll('input[type="radio"][name="' + name + '"]');
+      radios = document.querySelectorAll('input[type="radio"][name="' + name + '"]')
       for (i = 0; i < radios.length; i += 1) {
         if (radios[i].checked) {
-          return radios[i] !== radio ? radios[i] : null;
+          return radios[i] !== radio ? radios[i] : null
         }
       }
     }
-    return null;
+    return null
   }
 
-  function preventChecking(e) {
-    e.preventDefault();
+  function preventChecking (e) {
+    e.preventDefault()
     if (!initialChecked) {
-      e.target.checked = false;
+      e.target.checked = false
     }
     if (initialCheckedRadio) {
-      initialCheckedRadio.checked = true;
+      initialCheckedRadio.checked = true
     }
   }
 
@@ -81,81 +81,81 @@ module.exports = function reactTriggerChange(node) {
     (nodeName === 'input' && type === 'file')) {
     // IE9-IE11, non-IE
     // Dispatch change.
-    event = document.createEvent('HTMLEvents');
-    event.initEvent('change', true, false);
-    node.dispatchEvent(event);
+    event = document.createEvent('HTMLEvents')
+    event.initEvent('change', true, false)
+    node.dispatchEvent(event)
   } else if ((nodeName === 'input' && supportedInputTypes[type]) ||
     nodeName === 'textarea') {
     // React 16
     // Cache artificial value property descriptor.
     // Property doesn't exist in React <16, descriptor is undefined.
-    descriptor = Object.getOwnPropertyDescriptor(node, 'value');
+    descriptor = Object.getOwnPropertyDescriptor(node, 'value')
 
     // Update inputValueTracking cached value.
     // Remove artificial value property.
     // Restore initial value to trigger event with it.
-    initialValue = node.value;
-    node.value = initialValue + '#';
-    deletePropertySafe(node, 'value');
-    node.value = initialValue;
+    initialValue = node.value
+    node.value = initialValue + '#'
+    deletePropertySafe(node, 'value')
+    node.value = initialValue
 
     // React 0.14: IE10-IE11, non-IE
     // React 15: non-IE
     // React 16: IE10-IE11, non-IE
-    event = document.createEvent('HTMLEvents');
-    event.initEvent('input', true, false);
-    node.dispatchEvent(event);
+    event = document.createEvent('HTMLEvents')
+    event.initEvent('input', true, false)
+    node.dispatchEvent(event)
 
     // React 16
     // Restore artificial value property descriptor.
     if (descriptor) {
-      Object.defineProperty(node, 'value', descriptor);
+      Object.defineProperty(node, 'value', descriptor)
     }
   } else if (nodeName === 'input' && type === 'checkbox') {
     // Invert inputValueTracking cached value.
-    node.checked = !node.checked;
+    node.checked = !node.checked
 
     // Dispatch click.
     // Click event inverts checked value.
-    event = document.createEvent('MouseEvents');
-    event.initEvent('click', true, true);
-    node.dispatchEvent(event);
+    event = document.createEvent('MouseEvents')
+    event.initEvent('click', true, true)
+    node.dispatchEvent(event)
   } else if (nodeName === 'input' && type === 'radio') {
     // Cache initial checked value.
-    initialChecked = node.checked;
+    initialChecked = node.checked
 
     // Find and cache initially checked radio in the group.
-    initialCheckedRadio = getCheckedRadio(node);
+    initialCheckedRadio = getCheckedRadio(node)
 
     // React 16
     // Cache property descriptor.
     // Invert inputValueTracking cached value.
     // Remove artificial checked property.
     // Restore initial value, otherwise preventDefault will eventually revert the value.
-    descriptor = Object.getOwnPropertyDescriptor(node, 'checked');
-    node.checked = !initialChecked;
-    deletePropertySafe(node, 'checked');
-    node.checked = initialChecked;
+    descriptor = Object.getOwnPropertyDescriptor(node, 'checked')
+    node.checked = !initialChecked
+    deletePropertySafe(node, 'checked')
+    node.checked = initialChecked
 
     // Prevent toggling during event capturing phase.
     // Set checked value to false if initialChecked is false,
     // otherwise next listeners will see true.
     // Restore initially checked radio in the group.
-    node.addEventListener('click', preventChecking, true);
+    node.addEventListener('click', preventChecking, true)
 
     // Dispatch click.
     // Click event inverts checked value.
-    event = document.createEvent('MouseEvents');
-    event.initEvent('click', true, true);
-    node.dispatchEvent(event);
+    event = document.createEvent('MouseEvents')
+    event.initEvent('click', true, true)
+    node.dispatchEvent(event)
 
     // Remove listener to stop further change prevention.
-    node.removeEventListener('click', preventChecking, true);
+    node.removeEventListener('click', preventChecking, true)
 
     // React 16
     // Restore artificial checked property descriptor.
     if (descriptor) {
-      Object.defineProperty(node, 'checked', descriptor);
+      Object.defineProperty(node, 'checked', descriptor)
     }
   }
-};
+}
diff --git a/test/lib/util.js b/test/lib/util.js
index 626280745..858565bb9 100644
--- a/test/lib/util.js
+++ b/test/lib/util.js
@@ -11,7 +11,7 @@ function timeout (time) {
   })
 }
 
-async function findAsync(container, selector, opts) {
+async function findAsync (container, selector, opts) {
   try {
     return await pollUntilTruthy(() => {
       const result = container.find(selector)
@@ -22,7 +22,7 @@ async function findAsync(container, selector, opts) {
   }
 }
 
-async function queryAsync(jQuery, selector, opts) {
+async function queryAsync (jQuery, selector, opts) {
   try {
     return await pollUntilTruthy(() => {
       const result = jQuery(selector)
@@ -33,7 +33,7 @@ async function queryAsync(jQuery, selector, opts) {
   }
 }
 
-async function pollUntilTruthy(fn, opts = {}){
+async function pollUntilTruthy (fn, opts = {}) {
   const pollingInterval = opts.pollingInterval || 100
   const timeoutInterval = opts.timeoutInterval || 5000
   const start = Date.now()
diff --git a/test/mascara.conf.js b/test/mascara.conf.js
index 97e53fc2b..faf3147bd 100644
--- a/test/mascara.conf.js
+++ b/test/mascara.conf.js
@@ -1,13 +1,13 @@
 const getBaseConfig = require('./base.conf.js')
 
-module.exports = function(config) {
+module.exports = function (config) {
   const settings = getBaseConfig(config)
 
   // ui and tests
   settings.files.push('dist/mascara/ui.js')
   settings.files.push('dist/mascara/tests.js')
   // service worker background
-  settings.files.push({ pattern: 'dist/mascara/background.js', watched: false, included: false, served: true }),
+  settings.files.push({ pattern: 'dist/mascara/background.js', watched: false, included: false, served: true })
   settings.proxies['/background.js'] = '/base/dist/mascara/background.js'
 
   // use this to keep the browser open for debugging
diff --git a/test/screens/new-ui.js b/test/screens/new-ui.js
index e3ba7f6ab..92d1b8378 100644
--- a/test/screens/new-ui.js
+++ b/test/screens/new-ui.js
@@ -12,7 +12,7 @@ const pngFileStream = require('png-file-stream')
 const sizeOfPng = require('image-size/lib/types/png')
 const By = webdriver.By
 const localesIndex = require('../../app/_locales/index.json')
-const { delay, buildChromeWebDriver, buildFirefoxWebdriver, installWebExt, getExtensionIdChrome, getExtensionIdFirefox } = require('../e2e/func')
+const { delay, buildChromeWebDriver, getExtensionIdChrome } = require('../e2e/func')
 
 const eth = new Ethjs(new Ethjs.HttpProvider('http://localhost:8545'))
 
@@ -41,11 +41,9 @@ captureAllScreens()
 })
 
 
-async function captureAllScreens() {
+async function captureAllScreens () {
   // common names
-  let button
   let tabs
-  let element
 
   await cleanScreenShotDir()
 
@@ -108,7 +106,7 @@ async function captureAllScreens() {
   await captureLanguageScreenShots('terms')
 
   await delay(300)
-  element = driver.findElement(By.linkText('Attributions'))
+  const element = driver.findElement(By.linkText('Attributions'))
   await driver.executeScript('arguments[0].scrollIntoView(true)', element)
   await delay(300)
   await captureLanguageScreenShots('terms-scrolled')
@@ -134,10 +132,10 @@ async function captureAllScreens() {
   // enter seed phrase
   const seedPhraseButtons = await driver.findElements(By.css('.backup-phrase__confirm-seed-options > button'))
   const seedPhraseButtonWords = await Promise.all(seedPhraseButtons.map(button => button.getText()))
-  for (let targetWord of seedPhraseWords) {
+  for (const targetWord of seedPhraseWords) {
     const wordIndex = seedPhraseButtonWords.indexOf(targetWord)
     if (wordIndex === -1) throw new Error(`Captured seed phrase word "${targetWord}" not in found seed phrase button options ${seedPhraseButtonWords.join(' ')}`)
-    await driver.findElement(By.css(`.backup-phrase__confirm-seed-options > button:nth-child(${wordIndex+1})`)).click()
+    await driver.findElement(By.css(`.backup-phrase__confirm-seed-options > button:nth-child(${wordIndex + 1})`)).click()
     await delay(100)
   }
   await captureLanguageScreenShots('confirm secret backup phrase - words selected correctly')
@@ -191,11 +189,11 @@ async function captureAllScreens() {
 }
 
 
-async function captureLanguageScreenShots(label) {
+async function captureLanguageScreenShots (label) {
   const nonEnglishLocales = localesIndex.filter(localeMeta => localeMeta.code !== 'en')
   // take english shot
   await captureScreenShot(`${label} (en)`)
-  for (let localeMeta of nonEnglishLocales) {
+  for (const localeMeta of nonEnglishLocales) {
     // set locale and take shot
     await setLocale(localeMeta.code)
     await delay(300)
@@ -206,19 +204,19 @@ async function captureLanguageScreenShots(label) {
   await delay(300)
 }
 
-async function setLocale(code) {
+async function setLocale (code) {
   await driver.executeScript('window.metamask.updateCurrentLocale(arguments[0])', code)
 }
 
-async function setProviderType(type) {
+async function setProviderType (type) {
   await driver.executeScript('window.metamask.setProviderType(arguments[0])', type)
 }
 
-async function cleanScreenShotDir() {
+async function cleanScreenShotDir () {
   await pify(rimraf)(`./test-artifacts/screens/`)
 }
 
-async function captureScreenShot(label) {
+async function captureScreenShot (label) {
   const shotIndex = screenshotCount.toString().padStart(4, '0')
   screenshotCount++
   const artifactDir = `./test-artifacts/screens/`
@@ -228,7 +226,7 @@ async function captureScreenShot(label) {
   await pify(fs.writeFile)(`${artifactDir}/${shotIndex} - ${label}.png`, screenshot, { encoding: 'base64' })
 }
 
-async function generateGif(){
+async function generateGif () {
   // calculate screenshot size
   const screenshot = await driver.takeScreenshot()
   const pngBuffer = Buffer.from(screenshot, 'base64')
@@ -244,7 +242,7 @@ async function generateGif(){
   await pify(endOfStream)(stream)
 }
 
-async function verboseReportOnFailure(test) {
+async function verboseReportOnFailure (test) {
   const artifactDir = `./test-artifacts/${test.title}`
   const filepathBase = `${artifactDir}/test-failure`
   await pify(mkdirp)(artifactDir)
@@ -256,7 +254,7 @@ async function verboseReportOnFailure(test) {
   await pify(fs.writeFile)(`${filepathBase}-dom.html`, htmlSource)
 }
 
-async function requestEther(address) {
+async function requestEther (address) {
   const accounts = await eth.accounts()
   await eth.sendTransaction({ from: accounts[0], to: address, value: 1 * 1e18, data: '0x0' })
 }
diff --git a/test/unit/app/account-import-strategies.spec.js b/test/unit/app/account-import-strategies.spec.js
index 216c2f698..d20ba0f0b 100644
--- a/test/unit/app/account-import-strategies.spec.js
+++ b/test/unit/app/account-import-strategies.spec.js
@@ -1,5 +1,4 @@
 const assert = require('assert')
-const path = require('path')
 const ethUtil = require('ethereumjs-util')
 const accountImporter = require('../../../app/scripts/account-import-strategies/index')
 const { assertRejects } = require('../test-utils')
@@ -15,7 +14,7 @@ describe('Account Import Strategies', function () {
     })
 
     it('throws an error for empty string private key', async () => {
-      assertRejects(async function() {
+      assertRejects(async function () {
         await accountImporter.importAccount('Private Key', [ '' ])
       }, Error, 'no empty strings')
     })
diff --git a/test/unit/app/controllers/address-book-controller.js b/test/unit/app/controllers/address-book-controller.js
index dc4b8e3ff..1350e1a61 100644
--- a/test/unit/app/controllers/address-book-controller.js
+++ b/test/unit/app/controllers/address-book-controller.js
@@ -12,7 +12,7 @@ const stubPreferencesStore = {
       },
     }
   },
-};
+}
 
 describe('address-book-controller', function () {
   var addressBookController
diff --git a/test/unit/app/controllers/network-contoller-test.js b/test/unit/app/controllers/network-contoller-test.js
index 789850ef3..e16fb104e 100644
--- a/test/unit/app/controllers/network-contoller-test.js
+++ b/test/unit/app/controllers/network-contoller-test.js
@@ -5,9 +5,6 @@ const {
   getNetworkDisplayName,
 } = require('../../../../app/scripts/controllers/network/util')
 
-const { createTestProviderTools } = require('../../../stub/provider')
-const providerResultStub = {}
-
 describe('# Network Controller', function () {
   let networkController
   const noop = () => {}
diff --git a/test/unit/app/controllers/transactions/nonce-tracker-test.js b/test/unit/app/controllers/transactions/nonce-tracker-test.js
index fc852458c..6c0ac759f 100644
--- a/test/unit/app/controllers/transactions/nonce-tracker-test.js
+++ b/test/unit/app/controllers/transactions/nonce-tracker-test.js
@@ -1,12 +1,10 @@
 const assert = require('assert')
 const NonceTracker = require('../../../../../app/scripts/controllers/transactions/nonce-tracker')
 const MockTxGen = require('../../../../lib/mock-tx-gen')
-let providerResultStub = {}
+const providerResultStub = {}
 
 describe('Nonce Tracker', function () {
-  let nonceTracker, provider
-  let getPendingTransactions, pendingTxs
-  let getConfirmedTransactions, confirmedTxs
+  let nonceTracker, pendingTxs, confirmedTxs
 
   describe('#getNonceLock', function () {
 
@@ -182,8 +180,8 @@ describe('Nonce Tracker', function () {
     describe('When all three return different values', function () {
       beforeEach(function () {
         const txGen = new MockTxGen()
-        const confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 10 })
-        const pendingTxs = txGen.generate({
+        confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 10 })
+        pendingTxs = txGen.generate({
           status: 'submitted',
           nonce: 100,
         }, { count: 1 })
@@ -202,8 +200,8 @@ describe('Nonce Tracker', function () {
     describe('Faq issue 67', function () {
       beforeEach(function () {
         const txGen = new MockTxGen()
-        const confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 64 })
-        const pendingTxs = txGen.generate({
+        confirmedTxs = txGen.generate({ status: 'confirmed' }, { count: 64 })
+        pendingTxs = txGen.generate({
           status: 'submitted',
         }, { count: 10 })
                                          // 0x40 is 64 in hex:
diff --git a/test/unit/app/controllers/transactions/pending-tx-test.js b/test/unit/app/controllers/transactions/pending-tx-test.js
index e7705c594..8bf2da6f8 100644
--- a/test/unit/app/controllers/transactions/pending-tx-test.js
+++ b/test/unit/app/controllers/transactions/pending-tx-test.js
@@ -1,20 +1,12 @@
 const assert = require('assert')
-const ethUtil = require('ethereumjs-util')
-const EthTx = require('ethereumjs-tx')
-const ObservableStore = require('obs-store')
-const clone = require('clone')
 const { createTestProviderTools } = require('../../../../stub/provider')
 const PendingTransactionTracker = require('../../../../../app/scripts/controllers/transactions/pending-tx-tracker')
 const MockTxGen = require('../../../../lib/mock-tx-gen')
 const sinon = require('sinon')
-const noop = () => true
-const currentNetworkId = 42
-const otherNetworkId = 36
-const privKey = new Buffer('8718b9618a37d1fc78c436511fc6df3c8258d3250635bba617f33003270ec03e', 'hex')
 
 
 describe('PendingTransactionTracker', function () {
-  let pendingTxTracker, txMeta, txMetaNoHash, txMetaNoRawTx, providerResultStub,
+  let pendingTxTracker, txMeta, txMetaNoHash, providerResultStub,
   provider, txMeta3, txList, knownErrors
   this.timeout(10000)
   beforeEach(function () {
@@ -34,11 +26,7 @@ describe('PendingTransactionTracker', function () {
       status: 'signed',
       txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d'},
     }
-    txMetaNoRawTx = {
-      hash: '0x0593ee121b92e10d63150ad08b4b8f9c7857d1bd160195ee648fb9a0f8d00eeb',
-      status: 'signed',
-      txParams: { from: '0x1678a085c290ebd122dc42cba69373b5953b831d'},
-    }
+
     providerResultStub = {}
     provider = createTestProviderTools({ scaffold: providerResultStub }).provider
 
@@ -47,10 +35,10 @@ describe('PendingTransactionTracker', function () {
       nonceTracker: {
         getGlobalLock: async () => {
           return { releaseLock: () => {} }
-        }
+        },
       },
-      getPendingTransactions: () => {return []},
-      getCompletedTransactions: () => {return []},
+      getPendingTransactions: () => { return [] },
+      getCompletedTransactions: () => { return [] },
       publishTransaction: () => {},
     })
   })
@@ -133,22 +121,20 @@ describe('PendingTransactionTracker', function () {
   })
   describe('#queryPendingTxs', function () {
     it('should call #_checkPendingTxs if their is no oldBlock', function (done) {
-      let newBlock, oldBlock
-      newBlock = { number: '0x01' }
+      let oldBlock
+      const newBlock = { number: '0x01' }
       pendingTxTracker._checkPendingTxs = done
       pendingTxTracker.queryPendingTxs({ oldBlock, newBlock })
     })
     it('should call #_checkPendingTxs if oldBlock and the newBlock have a diff of greater then 1', function (done) {
-      let newBlock, oldBlock
-      oldBlock = { number: '0x01' }
-      newBlock = { number: '0x03' }
+      const oldBlock = { number: '0x01' }
+      const newBlock = { number: '0x03' }
       pendingTxTracker._checkPendingTxs = done
       pendingTxTracker.queryPendingTxs({ oldBlock, newBlock })
     })
     it('should not call #_checkPendingTxs if oldBlock and the newBlock have a diff of 1 or less', function (done) {
-      let newBlock, oldBlock
-      oldBlock = { number: '0x1' }
-      newBlock = { number: '0x2' }
+      const oldBlock = { number: '0x1' }
+      const newBlock = { number: '0x2' }
       pendingTxTracker._checkPendingTxs = () => {
         const err = new Error('should not call #_checkPendingTxs if oldBlock and the newBlock have a diff of 1 or less')
         done(err)
@@ -189,7 +175,7 @@ describe('PendingTransactionTracker', function () {
       txMeta2.id = 2
       txMeta3.id = 3
       txList = [txMeta, txMeta2, txMeta3].map((tx) => {
-        tx.processed = new Promise ((resolve) => { tx.resolve = resolve })
+        tx.processed = new Promise((resolve) => { tx.resolve = resolve })
         return tx
       })
     })
@@ -197,7 +183,6 @@ describe('PendingTransactionTracker', function () {
     it('should warp all txMeta\'s in #_checkPendingTx', function (done) {
       pendingTxTracker.getPendingTransactions = () => txList
       pendingTxTracker._checkPendingTx = (tx) => { tx.resolve(tx) }
-      const list = txList.map
       Promise.all(txList.map((tx) => tx.processed))
       .then((txCompletedList) => done())
       .catch(done)
@@ -207,11 +192,11 @@ describe('PendingTransactionTracker', function () {
   })
 
   describe('#resubmitPendingTxs', function () {
-    const blockStub = { number: '0x0' };
+    const blockStub = { number: '0x0' }
     beforeEach(function () {
     const txMeta2 = txMeta3 = txMeta
     txList = [txMeta, txMeta2, txMeta3].map((tx) => {
-        tx.processed = new Promise ((resolve) => { tx.resolve = resolve })
+        tx.processed = new Promise((resolve) => { tx.resolve = resolve })
         return tx
       })
     })
@@ -228,7 +213,7 @@ describe('PendingTransactionTracker', function () {
       pendingTxTracker.resubmitPendingTxs(blockStub)
     })
     it('should not emit \'tx:failed\' if the txMeta throws a known txError', function (done) {
-      knownErrors =[
+      knownErrors = [
         // geth
         '     Replacement transaction Underpriced            ',
         '       known transaction',
@@ -275,7 +260,7 @@ describe('PendingTransactionTracker', function () {
   })
   describe('#_resubmitTx', function () {
     const mockFirstRetryBlockNumber = '0x1'
-    let txMetaToTestExponentialBackoff
+    let txMetaToTestExponentialBackoff, enoughBalance
 
     beforeEach(() => {
       pendingTxTracker.getBalance = (address) => {
@@ -298,7 +283,7 @@ describe('PendingTransactionTracker', function () {
     })
 
     it('should publish the transaction', function (done) {
-      const enoughBalance = '0x100000'
+      enoughBalance = '0x100000'
 
       // Stubbing out current account state:
       // Adding the fake tx:
@@ -313,7 +298,7 @@ describe('PendingTransactionTracker', function () {
     })
 
     it('should not publish the transaction if the limit of retries has been exceeded', function (done) {
-      const enoughBalance = '0x100000'
+      enoughBalance = '0x100000'
       const mockLatestBlockNumber = '0x5'
 
       pendingTxTracker._resubmitTx(txMetaToTestExponentialBackoff, mockLatestBlockNumber)
@@ -327,7 +312,7 @@ describe('PendingTransactionTracker', function () {
     })
 
     it('should publish the transaction if the number of blocks since last retry exceeds the last set limit', function (done) {
-      const enoughBalance = '0x100000'
+      enoughBalance = '0x100000'
       const mockLatestBlockNumber = '0x11'
 
       pendingTxTracker._resubmitTx(txMetaToTestExponentialBackoff, mockLatestBlockNumber)
@@ -342,8 +327,8 @@ describe('PendingTransactionTracker', function () {
   })
 
   describe('#_checkIfNonceIsTaken', function () {
-    beforeEach ( function () {
-      let confirmedTxList = [{
+    beforeEach(function () {
+      const confirmedTxList = [{
         id: 1,
         hash: '0x0593ee121b92e10d63150ad08b4b8f9c7857d1bd160195ee648fb9a0f8d00eeb',
         status: 'confirmed',
diff --git a/test/unit/app/controllers/transactions/recipient-blacklist-checker-test.js b/test/unit/app/controllers/transactions/recipient-blacklist-checker-test.js
index 56e8d50db..cb413545f 100644
--- a/test/unit/app/controllers/transactions/recipient-blacklist-checker-test.js
+++ b/test/unit/app/controllers/transactions/recipient-blacklist-checker-test.js
@@ -28,7 +28,7 @@ describe('Recipient Blacklist Checker', function () {
     it('does not fail on test networks', function () {
       let callCount = 0
       const networks = [ROPSTEN_CODE, RINKEYBY_CODE, KOVAN_CODE]
-      for (let networkId in networks) {
+      for (const networkId in networks) {
         publicAccounts.forEach((account) => {
            recipientBlackListChecker.checkAccount(networkId, account)
             callCount++
@@ -61,7 +61,7 @@ describe('Recipient Blacklist Checker', function () {
       } catch (err) {
         assert.equal(err.message, 'Recipient is a public account')
       }
-    }) 
+    })
 
     it('fails for public account - lowercase', async function () {
       const mainnetId = 1
@@ -72,6 +72,6 @@ describe('Recipient Blacklist Checker', function () {
       } catch (err) {
         assert.equal(err.message, 'Recipient is a public account')
       }
-    }) 
+    })
   })
 })
diff --git a/test/unit/app/controllers/transactions/tx-controller-test.js b/test/unit/app/controllers/transactions/tx-controller-test.js
index 9bdfe7c1a..d4c5ff0ec 100644
--- a/test/unit/app/controllers/transactions/tx-controller-test.js
+++ b/test/unit/app/controllers/transactions/tx-controller-test.js
@@ -1,20 +1,17 @@
 const assert = require('assert')
 const ethUtil = require('ethereumjs-util')
 const EthTx = require('ethereumjs-tx')
-const EthjsQuery = require('ethjs-query')
 const ObservableStore = require('obs-store')
 const sinon = require('sinon')
 const TransactionController = require('../../../../../app/scripts/controllers/transactions')
-const TxGasUtils = require('../../../../../app/scripts/controllers/transactions/tx-gas-utils')
 const { createTestProviderTools, getTestAccounts } = require('../../../../stub/provider')
 
 const noop = () => true
 const currentNetworkId = 42
-const otherNetworkId = 36
 
 
 describe('Transaction Controller', function () {
-  let txController, provider, providerResultStub, query, fromAccount
+  let txController, provider, providerResultStub, fromAccount
 
   beforeEach(function () {
     providerResultStub = {
@@ -24,7 +21,6 @@ describe('Transaction Controller', function () {
       eth_getCode: '0x',
     }
     provider = createTestProviderTools({ scaffold: providerResultStub }).provider
-    query = new EthjsQuery(provider)
     fromAccount = getTestAccounts()[0]
 
     txController = new TransactionController({
@@ -388,7 +384,7 @@ describe('Transaction Controller', function () {
 
   describe('#retryTransaction', function () {
     it('should create a new txMeta with the same txParams as the original one', function (done) {
-      let txParams = {
+      const txParams = {
         nonce: '0x00',
         from: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4',
         to: '0xB09d8505E1F4EF1CeA089D47094f5DD3464083d4',
diff --git a/test/unit/app/controllers/transactions/tx-gas-util-test.js b/test/unit/app/controllers/transactions/tx-gas-util-test.js
index d1ee86033..31defd6ed 100644
--- a/test/unit/app/controllers/transactions/tx-gas-util-test.js
+++ b/test/unit/app/controllers/transactions/tx-gas-util-test.js
@@ -1,6 +1,5 @@
 const assert = require('assert')
 const Transaction = require('ethereumjs-tx')
-const BN = require('bn.js')
 
 
 const { hexToBn, bnToHex } = require('../../../../../app/scripts/lib/util')
diff --git a/test/unit/app/controllers/transactions/tx-state-history-helper-test.js b/test/unit/app/controllers/transactions/tx-state-history-helper-test.js
index f4c3a6be1..fba0e7fda 100644
--- a/test/unit/app/controllers/transactions/tx-state-history-helper-test.js
+++ b/test/unit/app/controllers/transactions/tx-state-history-helper-test.js
@@ -2,16 +2,16 @@ const assert = require('assert')
 const txStateHistoryHelper = require('../../../../../app/scripts/controllers/transactions/lib/tx-state-history-helper')
 const testVault = require('../../../../data/v17-long-history.json')
 
-describe ('Transaction state history helper', function () {
+describe('Transaction state history helper', function () {
 
   describe('#snapshotFromTxMeta', function () {
     it('should clone deep', function () {
       const input = {
         foo: {
           bar: {
-            bam: 'baz'
-          }
-        }
+            bam: 'baz',
+          },
+        },
       }
       const output = txStateHistoryHelper.snapshotFromTxMeta(input)
       assert('foo' in output, 'has a foo key')
@@ -50,14 +50,14 @@ describe ('Transaction state history helper', function () {
     it('replaying history does not mutate the original obj', function () {
       const initialState = { test: true, message: 'hello', value: 1 }
       const diff1 = [{
-        "op": "replace",
-        "path": "/message",
-        "value": "haay",
+        'op': 'replace',
+        'path': '/message',
+        'value': 'haay',
       }]
       const diff2 = [{
-        "op": "replace",
-        "path": "/value",
-        "value": 2,
+        'op': 'replace',
+        'path': '/value',
+        'value': 2,
       }]
       const history = [initialState, diff1, diff2]
 
@@ -72,15 +72,15 @@ describe ('Transaction state history helper', function () {
 
   describe('#generateHistoryEntry', function () {
 
-    function generateHistoryEntryTest(note) {
+    function generateHistoryEntryTest (note) {
 
       const prevState = {
         someValue: 'value 1',
         foo: {
           bar: {
-            bam: 'baz'
-          }
-        }
+            bam: 'baz',
+          },
+        },
       }
 
       const nextState = {
@@ -89,9 +89,9 @@ describe ('Transaction state history helper', function () {
         foo: {
           newPropFirstLevel: 'new property - first level',
           bar: {
-            bam: 'baz'
-          }
-        }
+            bam: 'baz',
+          },
+        },
       }
 
       const before = new Date().getTime()
@@ -106,8 +106,7 @@ describe ('Transaction state history helper', function () {
       assert.equal(result[0].path, expectedEntry1.path)
       assert.equal(result[0].value, expectedEntry1.value)
       assert.equal(result[0].value, expectedEntry1.value)
-      if (note) 
-        assert.equal(result[0].note, note)
+      if (note) { assert.equal(result[0].note, note) }
 
       assert.ok(result[0].timestamp >= before && result[0].timestamp <= after)
 
@@ -124,6 +123,6 @@ describe ('Transaction state history helper', function () {
 
     it('should add note to first entry', function () {
       generateHistoryEntryTest('custom note')
-    })    
+    })
   })
-})
\ No newline at end of file
+})
diff --git a/test/unit/app/controllers/transactions/tx-state-manager-test.js b/test/unit/app/controllers/transactions/tx-state-manager-test.js
index 20bc08b94..2f91b1545 100644
--- a/test/unit/app/controllers/transactions/tx-state-manager-test.js
+++ b/test/unit/app/controllers/transactions/tx-state-manager-test.js
@@ -1,6 +1,4 @@
 const assert = require('assert')
-const clone = require('clone')
-const ObservableStore = require('obs-store')
 const TxStateManager = require('../../../../../app/scripts/controllers/transactions/tx-state-manager')
 const txStateHistoryHelper = require('../../../../../app/scripts/controllers/transactions/lib/tx-state-history-helper')
 const noop = () => true
@@ -16,23 +14,23 @@ describe('TransactionStateManager', function () {
         transactions: [],
       },
       txHistoryLimit: 10,
-      getNetwork: () => currentNetworkId
+      getNetwork: () => currentNetworkId,
     })
   })
 
   describe('#setTxStatusSigned', function () {
     it('sets the tx status to signed', function () {
-      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx, noop)
       txStateManager.setTxStatusSigned(1)
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 1)
       assert.equal(result[0].status, 'signed')
     })
 
     it('should emit a signed event to signal the exciton of callback', (done) => {
-      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
       const noop = function () {
         assert(true, 'event listener has been triggered and noop executed')
         done()
@@ -46,21 +44,24 @@ describe('TransactionStateManager', function () {
 
   describe('#setTxStatusRejected', function () {
     it('sets the tx status to rejected', function () {
-      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx)
       txStateManager.setTxStatusRejected(1)
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 1)
       assert.equal(result[0].status, 'rejected')
     })
 
     it('should emit a rejected event to signal the exciton of callback', (done) => {
-      let tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx)
       const noop = function (err, txId) {
-        assert(true, 'event listener has been triggered and noop executed')
-        done()
+          if (err) {
+            console.log('Error: ', err)
+          }
+          assert(true, 'event listener has been triggered and noop executed')
+          done()
       }
       txStateManager.on('1:rejected', noop)
       txStateManager.setTxStatusRejected(1)
@@ -69,7 +70,7 @@ describe('TransactionStateManager', function () {
 
   describe('#getFullTxList', function () {
     it('when new should return empty array', function () {
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 0)
     })
@@ -77,7 +78,7 @@ describe('TransactionStateManager', function () {
 
   describe('#getTxList', function () {
     it('when new should return empty array', function () {
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 0)
     })
@@ -85,21 +86,21 @@ describe('TransactionStateManager', function () {
 
   describe('#addTx', function () {
     it('adds a tx returned in getTxList', function () {
-      let tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(tx, noop)
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.ok(Array.isArray(result))
       assert.equal(result.length, 1)
       assert.equal(result[0].id, 1)
     })
 
     it('does not override txs from other networks', function () {
-      let tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
-      let tx2 = { id: 2, status: 'confirmed', metamaskNetworkId: otherNetworkId, txParams: {} }
+      const tx = { id: 1, status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const tx2 = { id: 2, status: 'confirmed', metamaskNetworkId: otherNetworkId, txParams: {} }
       txStateManager.addTx(tx, noop)
       txStateManager.addTx(tx2, noop)
-      let result = txStateManager.getFullTxList()
-      let result2 = txStateManager.getTxList()
+      const result = txStateManager.getFullTxList()
+      const result2 = txStateManager.getTxList()
       assert.equal(result.length, 2, 'txs were deleted')
       assert.equal(result2.length, 1, 'incorrect number of txs on network.')
     })
@@ -110,7 +111,7 @@ describe('TransactionStateManager', function () {
         const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
         txStateManager.addTx(tx, noop)
       }
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
       assert.equal(result[0].id, 1, 'early txs truncted')
     })
@@ -121,20 +122,20 @@ describe('TransactionStateManager', function () {
         const tx = { id: i, time: new Date(), status: 'rejected', metamaskNetworkId: currentNetworkId, txParams: {} }
         txStateManager.addTx(tx, noop)
       }
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
       assert.equal(result[0].id, 1, 'early txs truncted')
     })
 
     it('cuts off early txs beyond a limit but does not cut unapproved txs', function () {
-      let unconfirmedTx = { id: 0, time: new Date(), status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
+      const unconfirmedTx = { id: 0, time: new Date(), status: 'unapproved', metamaskNetworkId: currentNetworkId, txParams: {} }
       txStateManager.addTx(unconfirmedTx, noop)
       const limit = txStateManager.txHistoryLimit
       for (let i = 1; i < limit + 1; i++) {
         const tx = { id: i, time: new Date(), status: 'confirmed', metamaskNetworkId: currentNetworkId, txParams: {} }
         txStateManager.addTx(tx, noop)
       }
-      let result = txStateManager.getTxList()
+      const result = txStateManager.getTxList()
       assert.equal(result.length, limit, `limit of ${limit} txs enforced`)
       assert.equal(result[0].id, 0, 'first tx should still be there')
       assert.equal(result[0].status, 'unapproved', 'first tx should be unapproved')
@@ -149,7 +150,7 @@ describe('TransactionStateManager', function () {
       const txMeta = txStateManager.getTx('1')
       txMeta.hash = 'foo'
       txStateManager.updateTx(txMeta)
-      let result = txStateManager.getTx('1')
+      const result = txStateManager.getTx('1')
       assert.equal(result.hash, 'foo')
     })
 
@@ -166,8 +167,6 @@ describe('TransactionStateManager', function () {
         },
       }
 
-      const updatedMeta = clone(txMeta)
-
       txStateManager.addTx(txMeta)
       const updatedTx = txStateManager.getTx('1')
       // verify tx was initialized correctly
@@ -185,7 +184,7 @@ describe('TransactionStateManager', function () {
       // validate history was updated
       assert.equal(result.history.length, 2, 'two history items (initial + diff)')
       assert.equal(result.history[1].length, 1, 'two history state items (initial + diff)')
-      
+
       const expectedEntry = { op: 'replace', path: '/txParams/gasPrice', value: desiredGasPrice }
       assert.deepEqual(result.history[1][0].op, expectedEntry.op, 'two history items (initial + diff) operation')
       assert.deepEqual(result.history[1][0].path, expectedEntry.path, 'two history items (initial + diff) path')
diff --git a/test/unit/app/controllers/transactions/tx-utils-test.js b/test/unit/app/controllers/transactions/tx-utils-test.js
index 115127f85..029fab4d5 100644
--- a/test/unit/app/controllers/transactions/tx-utils-test.js
+++ b/test/unit/app/controllers/transactions/tx-utils-test.js
@@ -27,7 +27,7 @@ describe('txUtils', function () {
 
   describe('#normalizeTxParams', () => {
     it('should normalize txParams', () => {
-      let txParams = {
+      const txParams = {
         chainId: '0x1',
         from: 'a7df1beDBF813f57096dF77FCd515f0B3900e402',
         to: null,
@@ -91,7 +91,7 @@ describe('txUtils', function () {
       assert.throws(() => { txUtils.validateFrom(txParams) }, Error, `Invalid from address`)
 
       // should run
-      txParams.from ='0x1678a085c290ebd122dc42cba69373b5953b831d'
+      txParams.from = '0x1678a085c290ebd122dc42cba69373b5953b831d'
       txUtils.validateFrom(txParams)
       })
   })
diff --git a/test/unit/app/edge-encryptor-test.js b/test/unit/app/edge-encryptor-test.js
index cc9777389..1a6255b36 100644
--- a/test/unit/app/edge-encryptor-test.js
+++ b/test/unit/app/edge-encryptor-test.js
@@ -11,7 +11,7 @@ global.crypto = global.crypto || {
       array[i] = Math.random() * 100
     }
     return array
-  }
+  },
 }
 
 describe('EdgeEncryptor', function () {
@@ -33,10 +33,10 @@ describe('EdgeEncryptor', function () {
     it('should return proper format.', function (done) {
       edgeEncryptor.encrypt(password, data)
         .then(function (encryptedData) {
-          let encryptedObject = JSON.parse(encryptedData)
+          const encryptedObject = JSON.parse(encryptedData)
           assert.ok(encryptedObject.data, 'there is no data')
-          assert.ok(encryptedObject.iv && encryptedObject.iv.length != 0, 'there is no iv')
-          assert.ok(encryptedObject.salt && encryptedObject.salt.length != 0, 'there is no salt')
+          assert.ok(encryptedObject.iv && encryptedObject.iv.length !== 0, 'there is no iv')
+          assert.ok(encryptedObject.salt && encryptedObject.salt.length !== 0, 'there is no salt')
           done()
         }).catch(function (err) {
           done(err)
@@ -56,7 +56,7 @@ describe('EdgeEncryptor', function () {
         assert.notEqual(encryptedData[1].length, 0)
         done()
       })
-    })    
+    })
   })
 
   describe('decrypt', function () {
diff --git a/test/unit/app/nodeify-test.js b/test/unit/app/nodeify-test.js
index 901603c8b..938b76c68 100644
--- a/test/unit/app/nodeify-test.js
+++ b/test/unit/app/nodeify-test.js
@@ -13,8 +13,12 @@ describe('nodeify', function () {
   it('should retain original context', function (done) {
     var nodified = nodeify(obj.promiseFunc, obj)
     nodified('baz', function (err, res) {
-      assert.equal(res, 'barbaz')
-      done()
+      if (!err) {
+        assert.equal(res, 'barbaz')
+        done()
+      } else {
+        done(new Error(err.toString()))
+      }
     })
   })
 
diff --git a/test/unit/app/pending-balance-test.js b/test/unit/app/pending-balance-test.js
index 1418e4a4e..508635c46 100644
--- a/test/unit/app/pending-balance-test.js
+++ b/test/unit/app/pending-balance-test.js
@@ -2,7 +2,6 @@ const assert = require('assert')
 const PendingBalanceCalculator = require('../../../app/scripts/lib/pending-balance-calculator')
 const MockTxGen = require('../../lib/mock-tx-gen')
 const BN = require('ethereumjs-util').BN
-let providerResultStub = {}
 
 const zeroBn = new BN(0)
 const etherBn = new BN(String(1e18))
@@ -20,7 +19,7 @@ describe('PendingBalanceCalculator', function () {
           value: ether,
           gasPrice: '0x0',
           gas: '0x0',
-        }
+        },
       }, { count: 1 })
 
       const balanceCalculator = generateBalanceCalcWith([], zeroBn)
@@ -36,7 +35,7 @@ describe('PendingBalanceCalculator', function () {
           value: '0x0',
           gasPrice: '0x2',
           gas: '0x3',
-        }
+        },
       }, { count: 1 })
 
       const balanceCalculator = generateBalanceCalcWith([], zeroBn)
@@ -66,7 +65,7 @@ describe('PendingBalanceCalculator', function () {
           value: ether,
           gasPrice: '0x0',
           gas: '0x0',
-        }
+        },
       }, { count: 1 })
 
       balanceCalculator = generateBalanceCalcWith(pendingTxs, etherBn)
diff --git a/test/unit/app/seed-phrase-verifier-test.js b/test/unit/app/seed-phrase-verifier-test.js
index b0da534da..d8720d5a0 100644
--- a/test/unit/app/seed-phrase-verifier-test.js
+++ b/test/unit/app/seed-phrase-verifier-test.js
@@ -9,11 +9,10 @@ describe('SeedPhraseVerifier', function () {
 
   describe('verifyAccounts', function () {
 
-    let password = 'passw0rd1'
-    let hdKeyTree = 'HD Key Tree'
+    const password = 'passw0rd1'
+    const hdKeyTree = 'HD Key Tree'
 
     let keyringController
-    let vault
     let primaryKeyring
 
     beforeEach(async function () {
@@ -24,60 +23,60 @@ describe('SeedPhraseVerifier', function () {
 
       assert(keyringController)
 
-      vault = await keyringController.createNewVaultAndKeychain(password)
+      await keyringController.createNewVaultAndKeychain(password)
       primaryKeyring = keyringController.getKeyringsByType(hdKeyTree)[0]
     })
 
     it('should be able to verify created account with seed words', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = serialized.mnemonic
+      const serialized = await primaryKeyring.serialize()
+      const seedWords = serialized.mnemonic
       assert.notEqual(seedWords.length, 0)
-    
-      let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
+
+      await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
     })
 
     it('should be able to verify created account (upper case) with seed words', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let upperCaseAccounts = [createdAccounts[0].toUpperCase()]
+      const upperCaseAccounts = [createdAccounts[0].toUpperCase()]
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = serialized.mnemonic
+      const serialized = await primaryKeyring.serialize()
+      const seedWords = serialized.mnemonic
       assert.notEqual(seedWords.length, 0)
-    
-      let result = await seedPhraseVerifier.verifyAccounts(upperCaseAccounts, seedWords)
+
+      await seedPhraseVerifier.verifyAccounts(upperCaseAccounts, seedWords)
     })
 
     it('should be able to verify created account (lower case) with seed words', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
-      let lowerCaseAccounts = [createdAccounts[0].toLowerCase()]
+      const lowerCaseAccounts = [createdAccounts[0].toLowerCase()]
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = serialized.mnemonic
+      const serialized = await primaryKeyring.serialize()
+      const seedWords = serialized.mnemonic
       assert.notEqual(seedWords.length, 0)
-    
-      let result = await seedPhraseVerifier.verifyAccounts(lowerCaseAccounts, seedWords)
+
+      await seedPhraseVerifier.verifyAccounts(lowerCaseAccounts, seedWords)
     })
 
     it('should return error with good but different seed words', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
-      
-      try { 
-        let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
-        assert.fail("Should reject")
+      await primaryKeyring.serialize()
+      const seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
+
+      try {
+        await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
+        assert.fail('Should reject')
       } catch (err) {
         assert.ok(err.message.indexOf('Not identical accounts!') >= 0, 'Wrong error message')
       }
@@ -85,15 +84,15 @@ describe('SeedPhraseVerifier', function () {
 
     it('should return error with undefined existing accounts', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
+      await primaryKeyring.serialize()
+      const seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
 
-      try { 
-        let result = await seedPhraseVerifier.verifyAccounts(undefined, seedWords)
-        assert.fail("Should reject")
+      try {
+        await seedPhraseVerifier.verifyAccounts(undefined, seedWords)
+        assert.fail('Should reject')
       } catch (err) {
         assert.equal(err.message, 'No created accounts defined.')
       }
@@ -101,15 +100,15 @@ describe('SeedPhraseVerifier', function () {
 
     it('should return error with empty accounts array', async function () {
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 1)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
+      await primaryKeyring.serialize()
+      const seedWords = 'debris dizzy just program just float decrease vacant alarm reduce speak stadium'
 
-      try { 
-        let result = await seedPhraseVerifier.verifyAccounts([], seedWords)
-        assert.fail("Should reject")
+      try {
+        await seedPhraseVerifier.verifyAccounts([], seedWords)
+        assert.fail('Should reject')
       } catch (err) {
         assert.equal(err.message, 'No created accounts defined.')
       }
@@ -117,17 +116,17 @@ describe('SeedPhraseVerifier', function () {
 
     it('should be able to verify more than one created account with seed words', async function () {
 
-      const keyState = await keyringController.addNewAccount(primaryKeyring)
-      const keyState2 = await keyringController.addNewAccount(primaryKeyring)
+      await keyringController.addNewAccount(primaryKeyring)
+      await keyringController.addNewAccount(primaryKeyring)
 
-      let createdAccounts = await primaryKeyring.getAccounts()
+      const createdAccounts = await primaryKeyring.getAccounts()
       assert.equal(createdAccounts.length, 3)
 
-      let serialized = await primaryKeyring.serialize()
-      let seedWords = serialized.mnemonic
+      const serialized = await primaryKeyring.serialize()
+      const seedWords = serialized.mnemonic
       assert.notEqual(seedWords.length, 0)
-    
-      let result = await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
+
+      await seedPhraseVerifier.verifyAccounts(createdAccounts, seedWords)
     })
   })
 })
diff --git a/test/unit/app/util-test.js b/test/unit/app/util-test.js
index 670bc4d22..656b22d92 100644
--- a/test/unit/app/util-test.js
+++ b/test/unit/app/util-test.js
@@ -38,4 +38,4 @@ describe('SufficientBalance', function () {
     const result = sufficientBalance(tx, balance)
     assert.ok(!result, 'insufficient balance found.')
   })
-})
\ No newline at end of file
+})
diff --git a/test/unit/components/balance-component-test.js b/test/unit/components/balance-component-test.js
index 9b1e82acf..81e6fdf9e 100644
--- a/test/unit/components/balance-component-test.js
+++ b/test/unit/components/balance-component-test.js
@@ -8,7 +8,7 @@ const mockState = {
     accounts: { abc: {} },
     network: 1,
     selectedAddress: 'abc',
-  }
+  },
 }
 
 describe('BalanceComponent', function () {
diff --git a/test/unit/components/bn-as-decimal-input-test.js b/test/unit/components/bn-as-decimal-input-test.js
index 7b9d9814f..fab396548 100644
--- a/test/unit/components/bn-as-decimal-input-test.js
+++ b/test/unit/components/bn-as-decimal-input-test.js
@@ -52,13 +52,13 @@ describe('BnInput', function () {
   it('can tolerate wei precision', function (done) {
     const renderer = ReactTestUtils.createRenderer()
 
-    let valueStr = '1000000000'
+    const valueStr = '1000000000'
 
     const value = new BN(valueStr, 10)
     const inputStr = '1.000000001'
 
 
-    let targetStr = '1000000001'
+    const targetStr = '1000000001'
 
     const target = new BN(targetStr, 10)
 
diff --git a/test/unit/components/pending-tx-test.js b/test/unit/components/pending-tx-test.js
index c6c588e1c..c68e013ac 100644
--- a/test/unit/components/pending-tx-test.js
+++ b/test/unit/components/pending-tx-test.js
@@ -13,7 +13,7 @@ const mockState = {
     identities,
     conversionRate: 10,
     selectedAddress: 'abc',
-  }
+  },
 }
 
 describe('PendingTx', function () {
diff --git a/test/unit/migrations/022-test.js b/test/unit/migrations/022-test.js
index 1333d929d..f8ee00e38 100644
--- a/test/unit/migrations/022-test.js
+++ b/test/unit/migrations/022-test.js
@@ -2,14 +2,14 @@ const assert = require('assert')
 const migration22 = require('../../../app/scripts/migrations/022')
 const properTime = (new Date()).getTime()
 const storage = {
-  "meta": {},
-  "data": {
-    "TransactionController": {
-      "transactions": [
-        { "status": "submitted" },
-        { "status": "submitted", "submittedTime": properTime },
-        {"status": "confirmed"},
-      ]
+  'meta': {},
+  'data': {
+    'TransactionController': {
+      'transactions': [
+        { 'status': 'submitted' },
+        { 'status': 'submitted', 'submittedTime': properTime },
+        {'status': 'confirmed'},
+      ],
     },
   },
 }
diff --git a/test/unit/migrations/023-test.js b/test/unit/migrations/023-test.js
index be432d9fa..7da94448d 100644
--- a/test/unit/migrations/023-test.js
+++ b/test/unit/migrations/023-test.js
@@ -1,12 +1,11 @@
 const assert = require('assert')
 const migration23 = require('../../../app/scripts/migrations/023')
-const properTime = (new Date()).getTime()
 const storage = {
-  "meta": {},
-  "data": {
-    "TransactionController": {
-      "transactions": [
-      ]
+  'meta': {},
+  'data': {
+    'TransactionController': {
+      'transactions': [
+      ],
     },
   },
 }
@@ -53,7 +52,6 @@ while (transactions20.length < 20) {
 }
 
 
-
 storage.data.TransactionController.transactions = transactions
 
 describe('storage is migrated successfully and the proper transactions are remove from state', () => {
diff --git a/test/unit/migrations/024-test.js b/test/unit/migrations/024-test.js
index c3c03d06b..c7b0611bc 100644
--- a/test/unit/migrations/024-test.js
+++ b/test/unit/migrations/024-test.js
@@ -4,13 +4,12 @@ const firstTimeState = {
   meta: {},
   data: require('../../../app/scripts/first-time-state'),
 }
-const properTime = (new Date()).getTime()
 const storage = {
-  "meta": {},
-  "data": {
-    "TransactionController": {
-      "transactions": [
-      ]
+  'meta': {},
+  'data': {
+    'TransactionController': {
+      'transactions': [
+      ],
     },
   },
 }
diff --git a/test/unit/migrations/025-test.js b/test/unit/migrations/025-test.js
index 76c25dbb6..1e56913a1 100644
--- a/test/unit/migrations/025-test.js
+++ b/test/unit/migrations/025-test.js
@@ -6,11 +6,11 @@ const firstTimeState = {
 }
 
 const storage = {
-  "meta": {},
-  "data": {
-    "TransactionController": {
-      "transactions": [
-      ]
+  'meta': {},
+  'data': {
+    'TransactionController': {
+      'transactions': [
+      ],
     },
   },
 }
diff --git a/test/unit/migrations/template-test.js b/test/unit/migrations/template-test.js
index 35060e2fe..0db69d65a 100644
--- a/test/unit/migrations/template-test.js
+++ b/test/unit/migrations/template-test.js
@@ -1,6 +1,5 @@
 const assert = require('assert')
 const migrationTemplate = require('../../../app/scripts/migrations/template')
-const properTime = (new Date()).getTime()
 const storage = {
   meta: {},
   data: {},
diff --git a/test/unit/responsive/components/dropdown-test.js b/test/unit/responsive/components/dropdown-test.js
index 982d8c6ec..493b01918 100644
--- a/test/unit/responsive/components/dropdown-test.js
+++ b/test/unit/responsive/components/dropdown-test.js
@@ -1,24 +1,24 @@
-const assert = require('assert');
+const assert = require('assert')
 
-const h = require('react-hyperscript');
-const sinon = require('sinon');
-const path = require('path');
-const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdowns', 'index.js')).Dropdown;
+const h = require('react-hyperscript')
+const sinon = require('sinon')
+const path = require('path')
+const Dropdown = require(path.join(__dirname, '..', '..', '..', '..', 'ui', 'app', 'components', 'dropdowns', 'index.js')).Dropdown
 
 const { createMockStore } = require('redux-test-utils')
 const { mountWithStore } = require('../../../lib/shallow-with-store')
 
 const mockState = {
   metamask: {
-  }
+  },
 }
 
 describe('Dropdown components', function () {
-  let onClickOutside;
-  let closeMenu;
-  let onClick;
+  let onClickOutside
+  let closeMenu
+  let onClick
 
-  let dropdownComponentProps = {
+  const dropdownComponentProps = {
     isOpen: true,
     zIndex: 11,
     onClickOutside,
@@ -34,9 +34,9 @@ describe('Dropdown components', function () {
   let store
   let component
   beforeEach(function () {
-    onClickOutside = sinon.spy();
-    closeMenu = sinon.spy();
-    onClick = sinon.spy();
+    onClickOutside = sinon.spy()
+    closeMenu = sinon.spy()
+    onClick = sinon.spy()
 
     store = createMockStore(mockState)
     component = mountWithStore(h(
@@ -61,21 +61,21 @@ describe('Dropdown components', function () {
   })
 
   it('can render two items', function () {
-    const items = dropdownComponent.find('li');
-    assert.equal(items.length, 2);
-  });
+    const items = dropdownComponent.find('li')
+    assert.equal(items.length, 2)
+  })
 
-  it('closes when item clicked', function() {
-    const items = dropdownComponent.find('li');
-    const node = items.at(0);
-    node.simulate('click');
-    assert.equal(node.props().closeMenu, closeMenu);
-  });
+  it('closes when item clicked', function () {
+    const items = dropdownComponent.find('li')
+    const node = items.at(0)
+    node.simulate('click')
+    assert.equal(node.props().closeMenu, closeMenu)
+  })
 
-  it('invokes click handler when item clicked', function() {
-    const items = dropdownComponent.find('li');
-    const node = items.at(0);
-    node.simulate('click');
-    assert.equal(onClick.calledOnce, true);
-  });
-});
+  it('invokes click handler when item clicked', function () {
+    const items = dropdownComponent.find('li')
+    const node = items.at(0)
+    node.simulate('click')
+    assert.equal(onClick.calledOnce, true)
+  })
+})
diff --git a/ui/app/components/dropdowns/token-menu-dropdown.js b/ui/app/components/dropdowns/token-menu-dropdown.js
index fac7c451b..5a794c7c1 100644
--- a/ui/app/components/dropdowns/token-menu-dropdown.js
+++ b/ui/app/components/dropdowns/token-menu-dropdown.js
@@ -54,7 +54,7 @@ TokenMenuDropdown.prototype.render = function () {
         showHideTokenConfirmationModal(this.props.token)
         this.props.onClose()
       },
-      text: this.context.t('hideToken'), 
+      text: this.context.t('hideToken'),
     }),
     h(Item, {
       onClick: (e) => {
@@ -62,7 +62,7 @@ TokenMenuDropdown.prototype.render = function () {
         copyToClipboard(this.props.token.address)
         this.props.onClose()
       },
-      text: this.context.t('copyContractAddress'), 
+      text: this.context.t('copyContractAddress'),
     }),
     h(Item, {
       onClick: (e) => {
@@ -71,7 +71,7 @@ TokenMenuDropdown.prototype.render = function () {
         global.platform.openWindow({ url })
         this.props.onClose()
       },
-      text: this.context.t('viewOnEtherscan'), 
+      text: this.context.t('viewOnEtherscan'),
     }),
   ])
 }
diff --git a/ui/app/components/pages/create-account/index.js b/ui/app/components/pages/create-account/index.js
index 6e3b93742..5681e43a9 100644
--- a/ui/app/components/pages/create-account/index.js
+++ b/ui/app/components/pages/create-account/index.js
@@ -42,7 +42,7 @@ class CreateAccountPage extends Component {
   render () {
     return h('div.new-account', {}, [
       h('div.new-account__header', [
-        h('div.new-account__title', this.context.t('newAccount') ),
+        h('div.new-account__title', this.context.t('newAccount')),
         this.renderTabs(),
       ]),
       h('div.new-account__form', [
diff --git a/ui/app/components/send_/account-list-item/index.js b/ui/app/components/send_/account-list-item/index.js
index 1fca540be..907485cf7 100644
--- a/ui/app/components/send_/account-list-item/index.js
+++ b/ui/app/components/send_/account-list-item/index.js
@@ -1 +1 @@
-export { default } from './account-list-item.container'
\ No newline at end of file
+export { default } from './account-list-item.container'
diff --git a/ui/app/components/send_/index.js b/ui/app/components/send_/index.js
index 9a4dd5727..b5114babc 100644
--- a/ui/app/components/send_/index.js
+++ b/ui/app/components/send_/index.js
@@ -1 +1 @@
-export { default } from './send.container'
\ No newline at end of file
+export { default } from './send.container'
diff --git a/ui/app/components/send_/send-content/index.js b/ui/app/components/send_/send-content/index.js
index 10b3c850e..891c17e6a 100644
--- a/ui/app/components/send_/send-content/index.js
+++ b/ui/app/components/send_/send-content/index.js
@@ -1 +1 @@
-export { default } from './send-content.component'
\ No newline at end of file
+export { default } from './send-content.component'
diff --git a/ui/app/components/send_/send-content/send-amount-row/amount-max-button/index.js b/ui/app/components/send_/send-content/send-amount-row/amount-max-button/index.js
index 548b51f33..ee8271494 100644
--- a/ui/app/components/send_/send-content/send-amount-row/amount-max-button/index.js
+++ b/ui/app/components/send_/send-content/send-amount-row/amount-max-button/index.js
@@ -1 +1 @@
-export { default } from './amount-max-button.container'
\ No newline at end of file
+export { default } from './amount-max-button.container'
diff --git a/ui/app/components/send_/send-content/send-amount-row/index.js b/ui/app/components/send_/send-content/send-amount-row/index.js
index 94a7da56f..abc6852fe 100644
--- a/ui/app/components/send_/send-content/send-amount-row/index.js
+++ b/ui/app/components/send_/send-content/send-amount-row/index.js
@@ -1 +1 @@
-export { default } from './send-amount-row.container'
\ No newline at end of file
+export { default } from './send-amount-row.container'
diff --git a/ui/app/components/send_/send-content/send-dropdown-list/index.js b/ui/app/components/send_/send-content/send-dropdown-list/index.js
index ee7736376..04af6536c 100644
--- a/ui/app/components/send_/send-content/send-dropdown-list/index.js
+++ b/ui/app/components/send_/send-content/send-dropdown-list/index.js
@@ -1 +1 @@
-export { default } from './send-dropdown-list.component'
\ No newline at end of file
+export { default } from './send-dropdown-list.component'
diff --git a/ui/app/components/send_/send-content/send-from-row/from-dropdown/index.js b/ui/app/components/send_/send-content/send-from-row/from-dropdown/index.js
index 6ab9a157a..2314ef4e3 100644
--- a/ui/app/components/send_/send-content/send-from-row/from-dropdown/index.js
+++ b/ui/app/components/send_/send-content/send-from-row/from-dropdown/index.js
@@ -1 +1 @@
-export { default } from './from-dropdown.component'
\ No newline at end of file
+export { default } from './from-dropdown.component'
diff --git a/ui/app/components/send_/send-content/send-from-row/index.js b/ui/app/components/send_/send-content/send-from-row/index.js
index 4a0916dba..0a79726b2 100644
--- a/ui/app/components/send_/send-content/send-from-row/index.js
+++ b/ui/app/components/send_/send-content/send-from-row/index.js
@@ -1 +1 @@
-export { default } from './send-from-row.container'
\ No newline at end of file
+export { default } from './send-from-row.container'
diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
index b1fd67412..c8d619be5 100644
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/gas-fee-display.component.js
@@ -14,7 +14,7 @@ export default class GasFeeDisplay extends Component {
     onClick: PropTypes.func,
   };
 
-  render() {
+  render () {
     const {
       conversionRate,
       gasTotal,
diff --git a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
index 66f3a94df..7cbe8d0df 100644
--- a/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
+++ b/ui/app/components/send_/send-content/send-gas-row/gas-fee-display/test/gas-fee-display.component.test.js
@@ -10,7 +10,7 @@ const propsMethodSpies = {
   showCustomizeGasModal: sinon.spy(),
 }
 
-describe('SendGasRow Component', function() {
+describe('SendGasRow Component', function () {
   let wrapper
 
   beforeEach(() => {
diff --git a/ui/app/components/send_/send-content/send-gas-row/index.js b/ui/app/components/send_/send-content/send-gas-row/index.js
index 060ed7fd3..3c7ff1d5f 100644
--- a/ui/app/components/send_/send-content/send-gas-row/index.js
+++ b/ui/app/components/send_/send-content/send-gas-row/index.js
@@ -1 +1 @@
-export { default } from './send-gas-row.container'
\ No newline at end of file
+export { default } from './send-gas-row.container'
diff --git a/ui/app/components/send_/send-content/send-row-wrapper/index.js b/ui/app/components/send_/send-content/send-row-wrapper/index.js
index 5715f55c6..d17545dcc 100644
--- a/ui/app/components/send_/send-content/send-row-wrapper/index.js
+++ b/ui/app/components/send_/send-content/send-row-wrapper/index.js
@@ -1 +1 @@
-export { default } from './send-row-wrapper.component'
\ No newline at end of file
+export { default } from './send-row-wrapper.component'
diff --git a/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/index.js b/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/index.js
index bf49c55bd..c00617f83 100644
--- a/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/index.js
+++ b/ui/app/components/send_/send-content/send-row-wrapper/send-row-error-message/index.js
@@ -1 +1 @@
-export { default } from './send-row-error-message.container'
\ No newline at end of file
+export { default } from './send-row-error-message.container'
diff --git a/ui/app/components/send_/send-content/send-to-row/index.js b/ui/app/components/send_/send-content/send-to-row/index.js
index 4e7aa9747..121f15148 100644
--- a/ui/app/components/send_/send-content/send-to-row/index.js
+++ b/ui/app/components/send_/send-content/send-to-row/index.js
@@ -1 +1 @@
-export { default } from './send-to-row.container'
\ No newline at end of file
+export { default } from './send-to-row.container'
diff --git a/ui/app/components/send_/send-footer/index.js b/ui/app/components/send_/send-footer/index.js
index cd1727330..58e91d622 100644
--- a/ui/app/components/send_/send-footer/index.js
+++ b/ui/app/components/send_/send-footer/index.js
@@ -1 +1 @@
-export { default } from './send-footer.container'
\ No newline at end of file
+export { default } from './send-footer.container'
diff --git a/ui/app/components/send_/send-header/index.js b/ui/app/components/send_/send-header/index.js
index b808eabbf..0b17f0b7d 100644
--- a/ui/app/components/send_/send-header/index.js
+++ b/ui/app/components/send_/send-header/index.js
@@ -1 +1 @@
-export { default } from './send-header.container'
\ No newline at end of file
+export { default } from './send-header.container'
diff --git a/ui/app/reducers/app.js b/ui/app/reducers/app.js
index 9cacf5fe7..f453812b9 100644
--- a/ui/app/reducers/app.js
+++ b/ui/app/reducers/app.js
@@ -684,7 +684,7 @@ function reduceApp (state, action) {
     case actions.GAS_LOADING_FINISHED:
       return extend(appState, {
         gasIsLoading: false,
-      }) 
+      })
 
     default:
       return appState
diff --git a/ui/app/token-util.js b/ui/app/token-util.js
index 8c5b37d7b..cd6a47dbc 100644
--- a/ui/app/token-util.js
+++ b/ui/app/token-util.js
@@ -20,7 +20,7 @@ async function getSymbolAndDecimals (tokenAddress, existingTokens = []) {
   if (existingToken) {
     return existingToken
   }
-  
+
   let result = []
   try {
     const token = util.getContractAtAddress(tokenAddress)