4 files changed, 28 insertions, 32 deletions
diff --git a/app/scripts/controllers/blacklist.js b/app/scripts/controllers/blacklist.js
index 33c31dab9..df41c90c0 100644
--- a/app/scripts/controllers/blacklist.js
+++ b/app/scripts/controllers/blacklist.js
@@ -41,9 +41,9 @@ class BlacklistController {
 
   scheduleUpdates () {
     if (this._phishingUpdateIntervalRef) return
-    this.updatePhishingList()
+    this.updatePhishingList().catch(log.warn)
     this._phishingUpdateIntervalRef = setInterval(() => {
-      this.updatePhishingList()
+      this.updatePhishingList().catch(log.warn)
     }, POLLING_INTERVAL)
   }
 
@@ -57,4 +57,3 @@ class BlacklistController {
 }
 
 module.exports = BlacklistController
-
diff --git a/app/scripts/controllers/currency.js b/app/scripts/controllers/currency.js
index 930fc52e8..aca57dc71 100644
--- a/app/scripts/controllers/currency.js
+++ b/app/scripts/controllers/currency.js
@@ -43,20 +43,18 @@ class CurrencyController {
     this.store.updateState({ conversionDate })
   }
 
-  updateConversionRate () {
-    const currentCurrency = this.getCurrentCurrency()
-    return fetch(`https://api.infura.io/v1/ticker/eth${currentCurrency.toLowerCase()}`)
-    .then(response => response.json())
-    .then((parsedResponse) => {
+  await updateConversionRate () {
+    try {
+      const currentCurrency = this.getCurrentCurrency()
+      const response = await fetch(`https://api.infura.io/v1/ticker/eth${currentCurrency.toLowerCase()}`)
+      const parsedResponse = await response.json()
       this.setConversionRate(Number(parsedResponse.bid))
       this.setConversionDate(Number(parsedResponse.timestamp))
-    }).catch((err) => {
-      if (err) {
-        console.warn(`MetaMask - Failed to query currency conversion:`, currentCurrency, err)
-        this.setConversionRate(0)
-        this.setConversionDate('N/A')
-      }
-    })
+    } catch (err) {
+      console.warn(`MetaMask - Failed to query currency conversion:`, currentCurrency, err)
+      this.setConversionRate(0)
+      this.setConversionDate('N/A')
+    }
   }
 
   scheduleConversionInterval () {
diff --git a/app/scripts/controllers/infura.js b/app/scripts/controllers/infura.js
index 10adb1004..c6b4c9de2 100644
--- a/app/scripts/controllers/infura.js
+++ b/app/scripts/controllers/infura.js
@@ -19,15 +19,13 @@ class InfuraController {
 
   // Responsible for retrieving the status of Infura's nodes. Can return either
   // ok, degraded, or down.
-  checkInfuraNetworkStatus () {
-    return fetch('https://api.infura.io/v1/status/metamask')
-      .then(response => response.json())
-      .then((parsedResponse) => {
-        this.store.updateState({
-          infuraNetworkStatus: parsedResponse,
-        })
-        return parsedResponse
-      })
+  async checkInfuraNetworkStatus () {
+    const response = await fetch('https://api.infura.io/v1/status/metamask')
+    const parsedResponse = await response.json()
+    this.store.updateState({
+      infuraNetworkStatus: parsedResponse,
+    })
+    return parsedResponse
   }
 
   scheduleInfuraNetworkCheck () {
@@ -35,7 +33,7 @@ class InfuraController {
       clearInterval(this.conversionInterval)
     }
     this.conversionInterval = setInterval(() => {
-      this.checkInfuraNetworkStatus()
+      this.checkInfuraNetworkStatus().catch(log.warn)
     }, POLLING_INTERVAL)
   }
 }
diff --git a/app/scripts/controllers/shapeshift.js b/app/scripts/controllers/shapeshift.js
index 3d955c01f..3bbfaa1c5 100644
--- a/app/scripts/controllers/shapeshift.js
+++ b/app/scripts/controllers/shapeshift.js
@@ -45,18 +45,19 @@ class ShapeshiftController {
     })
   }
 
-  updateTx (tx) {
-    const url = `https://shapeshift.io/txStat/${tx.depositAddress}`
-    return fetch(url)
-    .then((response) => {
-      return response.json()
-    }).then((json) => {
+  async updateTx (tx) {
+    try {
+      const url = `https://shapeshift.io/txStat/${tx.depositAddress}`
+      const response = await fetch(url)
+      const json = await response.json()
       tx.response = json
       if (tx.response.status === 'complete') {
         tx.time = new Date().getTime()
       }
       return tx
-    })
+    } catch (err) {
+      log.warn(err)
+    }
   }
 
   saveTx (tx) {