Fix merge conflicts

1 files changed, 0 insertions, 33 deletions

diff --git a/ui/lib/contract-namer.js b/ui/lib/contract-namer.js
deleted file mode 100644
index f05e770c..00000000
--- a/ui/lib/contract-namer.js
+++ /dev/null
@@ -1,33 +0,0 @@
-/* CONTRACT NAMER
- *
- * Takes an address,
- * Returns a nicname if we have one stored,
- * otherwise returns null.
- */
-
-const contractMap = require('eth-contract-metadata')
-const ethUtil = require('ethereumjs-util')
-
-module.exports = function (addr, identities = {}) {
-  const checksummed = ethUtil.toChecksumAddress(addr)
-  if (contractMap[checksummed] && contractMap[checksummed].name) {
-    return contractMap[checksummed].name
-  }
-
-  const address = addr.toLowerCase()
-  const ids = hashFromIdentities(identities)
-  return addrFromHash(address, ids)
-}
-
-function hashFromIdentities (identities) {
-  const result = {}
-  for (const key in identities) {
-    result[key] = identities[key].name
-  }
-  return result
-}
-
-function addrFromHash (addr, hash) {
-  const address = addr.toLowerCase()
-  return hash[address] || null
-}