Get basic ENS working

& merge master into ENS branch.

1 files changed, 0 insertions, 33 deletions

diff --git a/app/scripts/lib/controllers/preferences.js b/app/scripts/lib/controllers/preferences.js
deleted file mode 100644
index c5e93a5b9..000000000
--- a/app/scripts/lib/controllers/preferences.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const ObservableStore = require('obs-store')
-const normalizeAddress = require('eth-sig-util').normalize
-
-class PreferencesController {
-
-  constructor (opts = {}) {
-    const initState = opts.initState || {}
-    this.store = new ObservableStore(initState)
-  }
-
-  //
-  // PUBLIC METHODS
-  //
-
-  setSelectedAddress(_address) {
-    return new Promise((resolve, reject) => {
-      const address = normalizeAddress(_address)
-      this.store.updateState({ selectedAddress: address })
-      resolve()
-    })
-  }
-
-  getSelectedAddress(_address) {
-    return this.store.getState().selectedAddress
-  }
-
-  //
-  // PRIVATE METHODS
-  //
-
-}
-
-module.exports = PreferencesController