Merge branch 'master' into i1473-dappDefaultGasPrice

3 files changed, 51 insertions, 1 deletions

diff --git a/app/scripts/controllers/infura.js b/app/scripts/controllers/infura.js
new file mode 100644
index 000000000..98375b446
--- /dev/null
+++ b/app/scripts/controllers/infura.js
@@ -0,0 +1,42 @@
+const ObservableStore = require('obs-store')
+const extend = require('xtend')
+
+// every ten minutes
+const POLLING_INTERVAL = 300000
+
+class InfuraController {
+
+  constructor (opts = {}) {
+    const initState = extend({
+      infuraNetworkStatus: {},
+    }, opts.initState)
+    this.store = new ObservableStore(initState)
+  }
+
+  //
+  // PUBLIC METHODS
+  //
+
+  // 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,
+        })
+      })
+  }
+
+  scheduleInfuraNetworkCheck () {
+    if (this.conversionInterval) {
+      clearInterval(this.conversionInterval)
+    }
+    this.conversionInterval = setInterval(() => {
+      this.checkInfuraNetworkStatus()
+    }, POLLING_INTERVAL)
+  }
+}
+
+module.exports = InfuraController
diff --git a/app/scripts/controllers/preferences.js b/app/scripts/controllers/preferences.js
index 7212c7c43..aa8e05fcc 100644
--- a/app/scripts/controllers/preferences.js
+++ b/app/scripts/controllers/preferences.js
@@ -7,6 +7,7 @@ class PreferencesController {
   constructor (opts = {}) {
     const initState = extend({
       frequentRpcList: [],
+      currentAccountTab: 'history',
     }, opts.initState)
     this.store = new ObservableStore(initState)
   }
@@ -35,6 +36,13 @@ class PreferencesController {
       })
   }
 
+  setCurrentAccountTab (currentAccountTab) {
+    return new Promise((resolve, reject) => {
+      this.store.updateState({ currentAccountTab })
+      resolve()
+    })
+  }
+
   addToFrequentRpcList (_url) {
     const rpcList = this.getFrequentRpcList()
     const index = rpcList.findIndex((element) => { return element === _url })
diff --git a/app/scripts/controllers/transactions.js b/app/scripts/controllers/transactions.js
index e3c2d74d3..1efa96610 100644
--- a/app/scripts/controllers/transactions.js
+++ b/app/scripts/controllers/transactions.js
@@ -384,13 +384,13 @@ module.exports = class TransactionController extends EventEmitter {
   //    - `'signed'` the tx is signed
   //    - `'submitted'` the tx is sent to a server
   //    - `'confirmed'` the tx has been included in a block.
+  //    - `'failed'` the tx failed for some reason, included on tx data.
   _setTxStatus (txId, status) {
     var txMeta = this.getTx(txId)
     txMeta.status = status
     this.emit(`${txMeta.id}:${status}`, txId)
     if (status === 'submitted' || status === 'rejected') {
       this.emit(`${txMeta.id}:finished`, txMeta)
-
     }
     this.updateTx(txMeta)
     this.emit('updateBadge')