From e8efe84320ea791535b40e69a64525f7fdb3ea8a Mon Sep 17 00:00:00 2001
From: Dan Finlay <dan@danfinlay.com>
Date: Thu, 7 Jul 2016 13:21:45 -0700
Subject: Add nickname rendering for recipient address

---
 ui/app/components/pending-tx-details.js |  2 +-
 ui/lib/contract-namer.js                | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

(limited to 'ui')

diff --git a/ui/app/components/pending-tx-details.js b/ui/app/components/pending-tx-details.js
index e0b629e89..b2c16e772 100644
--- a/ui/app/components/pending-tx-details.js
+++ b/ui/app/components/pending-tx-details.js
@@ -177,7 +177,7 @@ PTXP.miniAccountPanelForRecipient = function () {
         style: {
           fontFamily: 'Montserrat Bold, Montserrat, sans-serif',
         },
-      }, nameForAddress(txParams.to)),
+      }, nameForAddress(txParams.to, props.identities)),
       h('span.font-small', {
         style: {
           fontFamily: 'Montserrat Light, Montserrat, sans-serif',
diff --git a/ui/lib/contract-namer.js b/ui/lib/contract-namer.js
index eae066ad5..62c7933e8 100644
--- a/ui/lib/contract-namer.js
+++ b/ui/lib/contract-namer.js
@@ -5,13 +5,27 @@
  * otherwise returns null.
  */
 
+// Nickname keys must be stored in lower case.
 const nicknames = {}
 
-module.exports = function(address) {
+module.exports = function(addr, identities = {}) {
 
-  if (address in nicknames) {
-    return nicknames[address]
+  const address = addr.toLowerCase()
+  const ids = hashFromIdentities(identities)
+
+  console.dir({ addr, ids })
+  return addrFromHash(address, ids) || addrFromHash(address, nicknames)
+}
+
+function hashFromIdentities(identities) {
+  const result = {}
+  for (let key in identities) {
+    result[key] = identities[key].name
   }
+  return result
+}
 
-  return null
+function addrFromHash(addr, hash) {
+  const address = addr.toLowerCase()
+  return hash[address] || null
 }
-- 
cgit