Merge branch 'develop' of github.com:MetaMask/metamask-extension into initial-trezor-support

3 files changed, 7 insertions, 13 deletions

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
index 2b212a522..564c12f86 100644
--- a/app/_locales/en/messages.json
+++ b/app/_locales/en/messages.json
@@ -554,6 +554,9 @@
   "mainnet": {
     "message": "Main Ethereum Network"
   },
+  "menu": {
+    "message": "Menu"
+  },
   "message": {
     "message": "Message"
   },
@@ -635,6 +638,9 @@
   "oldUIMessage": {
     "message": "You have returned to the old UI. You can switch back to the New UI through the option in the top right dropdown menu."
   },
+  "openInTab": {
+    "message": "Open in tab"
+  },
   "or": {
     "message": "or",
     "description": "choice between creating or importing a new account"
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index b35a70dd2..04dd51b01 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -177,6 +177,7 @@ function blacklistedDomainCheck () {
     'cdn.shopify.com/s/javascripts/tricorder/xtld-read-only-frame.html',
     'adyen.com',
     'gravityforms.com',
+    'harbourair.com',
   ]
   var currentUrl = window.location.href
   var currentRegex
diff --git a/app/scripts/controllers/transactions/nonce-tracker.js b/app/scripts/controllers/transactions/nonce-tracker.js
index 35ca08d6c..06f336eaa 100644
--- a/app/scripts/controllers/transactions/nonce-tracker.js
+++ b/app/scripts/controllers/transactions/nonce-tracker.js
@@ -129,19 +129,6 @@ class NonceTracker {
     return Number.isInteger(highest) ? highest + 1 : 0
   }
 
-  _reduceTxListToUniqueNonces (txList) {
-    const reducedTxList = txList.reduce((reducedList, txMeta, index) => {
-      if (!index) return [txMeta]
-      const nonceMatches = txList.filter((txData) => {
-        return txMeta.txParams.nonce === txData.txParams.nonce
-      })
-      if (nonceMatches.length > 1) return reducedList
-      reducedList.push(txMeta)
-      return reducedList
-    }, [])
-    return reducedTxList
-  }
-
   _getHighestNonce (txList) {
     const nonces = txList.map((txMeta) => {
       const nonce = txMeta.txParams.nonce