From 67660e1e39f5806cdc07c25aceeeead6543fef7f Mon Sep 17 00:00:00 2001
From: Ken Powers <ken@signal.org>
Date: Thu, 30 May 2019 13:12:21 -0400
Subject: [PATCH] Use isShortName function

---
 ts/components/emoji/lib.ts     | 4 ----
 ts/state/smart/EmojiButton.tsx | 4 ++--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ts/components/emoji/lib.ts b/ts/components/emoji/lib.ts
index 47c638863..bf869c971 100644
--- a/ts/components/emoji/lib.ts
+++ b/ts/components/emoji/lib.ts
@@ -112,10 +112,6 @@ export const dataByCategory = mapValues(
   arr => sortBy(arr, 'sort_order')
 );
 
-export function isShortNameValid(shortName: string) {
-  return Boolean(dataByShortName[shortName]);
-}
-
 export function getSheetCoordinates(
   shortName: keyof typeof dataByShortName,
   skinTone?: SkinToneKey | number
diff --git a/ts/state/smart/EmojiButton.tsx b/ts/state/smart/EmojiButton.tsx
index 9384642bd..a6a118290 100644
--- a/ts/state/smart/EmojiButton.tsx
+++ b/ts/state/smart/EmojiButton.tsx
@@ -5,12 +5,12 @@ import { mapDispatchToProps } from '../actions';
 import { EmojiButton, Props } from '../../components/emoji/EmojiButton';
 import { StateType } from '../reducer';
 
-import { isShortNameValid } from '../../components/emoji/lib';
+import { isShortName } from '../../components/emoji/lib';
 import { getIntl } from '../selectors/user';
 
 const selectRecentEmojis = createSelector(
   ({ emojis }: StateType) => emojis.recents,
-  recents => recents.filter(isShortNameValid)
+  recents => recents.filter(isShortName)
 );
 
 const mapStateToProps = (state: StateType) => {