From ae8dfb4e6027f11fd7c3cac005b11a979664d678 Mon Sep 17 00:00:00 2001
From: Etienne Lemay <etienne@heliom.ca>
Date: Mon, 18 Jul 2016 15:14:46 -0400
Subject: [PATCH] Fix search results when rendering emojis from object

---
 src/components/category.js | 2 +-
 src/components/emoji.js    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/category.js b/src/components/category.js
index bb91a0767..6d341a966 100644
--- a/src/components/category.js
+++ b/src/components/category.js
@@ -138,7 +138,7 @@ export default class Category extends React.Component {
 
       {emojis && emojis.map((emoji) =>
         <Emoji
-          key={emoji}
+          key={emoji.short_name || emoji}
           emoji={emoji}
           {...emojiProps}
         />
diff --git a/src/components/emoji.js b/src/components/emoji.js
index 8955ed975..ed227fc85 100644
--- a/src/components/emoji.js
+++ b/src/components/emoji.js
@@ -32,7 +32,7 @@ export default class Emoji extends React.Component {
     }
 
     if (this.hasSkinVariations && skin > 1) {
-      emojiData = JSON.parse(JSON.stringify(data.emojis[emoji]))
+      emojiData = JSON.parse(JSON.stringify(emojiData))
 
       var skinKey = SKINS[skin - 1],
           variationKey = `${emojiData.unified}-${skinKey}`,