colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use isShortName function

Browse Source
This commit is contained in:
Ken Powers
2019-05-30 13:12:21 -04:00
committed by Scott Nonnenberg
parent a0e892bf12
commit 67660e1e39
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ts/components/emoji/lib.ts
View File

@@ -112,10 +112,6 @@ export const dataByCategory = mapValues(
arr => sortBy(arr, 'sort_order') arr => sortBy(arr, 'sort_order')
); );
export function isShortNameValid(shortName: string) {
return Boolean(dataByShortName[shortName]);
}
export function getSheetCoordinates( export function getSheetCoordinates(
shortName: keyof typeof dataByShortName, shortName: keyof typeof dataByShortName,
skinTone?: SkinToneKey | number skinTone?: SkinToneKey | number

4
ts/state/smart/EmojiButton.tsx
View File

@@ -5,12 +5,12 @@ import { mapDispatchToProps } from '../actions';
import { EmojiButton, Props } from '../../components/emoji/EmojiButton'; import { EmojiButton, Props } from '../../components/emoji/EmojiButton';
import { StateType } from '../reducer'; import { StateType } from '../reducer';
import { isShortNameValid } from '../../components/emoji/lib'; import { isShortName } from '../../components/emoji/lib';
import { getIntl } from '../selectors/user'; import { getIntl } from '../selectors/user';
const selectRecentEmojis = createSelector( const selectRecentEmojis = createSelector(
({ emojis }: StateType) => emojis.recents, ({ emojis }: StateType) => emojis.recents,
recents => recents.filter(isShortNameValid) recents => recents.filter(isShortName)
); );
const mapStateToProps = (state: StateType) => { const mapStateToProps = (state: StateType) => {